Author: ivanovic
Date: Sun Nov 6 12:27:36 2011
New Revision: 51886
URL: http://svn.gna.org/viewcvs/wesnoth?rev=51886&view=rev
Log:
removal of khalifate (part1):
the khalifate are not stable enough so far to be in 1.10, they need a lot more
playtesting, rebalancing as well as adding d
escriptions
because of this they can't be allowed in at the time of the string and feature
freeze since adjustments would basically be
impossible then
"someone" will have to move the khalifate into an addon so that development of
them can be continued this way
this commit includes:
* removal of unit definition files
* removal of unit images
* removal of faction definition
* removal of era definition (khalifate+default era)
* removal of movement types
what was not removed:
* definition of the unit names
what someone else has to edit:
* khalifate still appear in tools/emacs_mode/wesnoth-wml-data.el but I have no
idea how to handle that file...
TODO:
* add the removal to the (players_)changelog and the release notes
Removed:
trunk/data/core/images/units/khalifate/
trunk/data/core/units/khalifate/
trunk/data/multiplayer/factions/khalifate-default.cfg
Modified:
trunk/data/core/units.cfg
trunk/data/multiplayer/eras.cfg
Modified: trunk/data/core/units.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units.cfg?rev=51886&r1=51885&r2=51886&view=diff
==============================================================================
--- trunk/data/core/units.cfg (original)
+++ trunk/data/core/units.cfg Sun Nov 6 12:27:36 2011
@@ -18,7 +18,6 @@
{core/units/goblins/}
{core/units/gryphons/}
{core/units/humans/}
- {core/units/khalifate/}
{core/units/merfolk/}
{core/units/monsters/}
{core/units/nagas/}
@@ -327,18 +326,6 @@
undead_variation=wose
markov_chain_size=3
{WOSE_NAMES}
- [/race]
-
- # wmllint: general spelling khalifate
- [race]
- id=khalifate
- male_name= _"race^Khalifate Human"
- female_name= _"race+female^Khalifate Human"
- plural_name= _"race+plural^Khalifate"
- description= _"This race does not have a description yet."
- num_traits=2
- markov_chain_size=2
- {KHALIFATE_NAMES}
[/race]
# wmllint: general spelling falcon falcons
@@ -1500,195 +1487,6 @@
arcane=130
[/resistance]
[/movetype]
-
- [movetype]
- name=khalifatefoot
- [movement_costs]
- shallow_water=3
- reef=2
- swamp_water=2
- flat=1
- sand=1
- forest=2
- hills=2
- mountains=2
- village=1
- castle=1
- cave=2
- frozen=3
- fungus=2
- [/movement_costs]
- [defense]
- shallow_water=80
- reef=70
- swamp_water=70
- flat=60
- sand=50
- forest=60
- hills=40
- mountains=40
- village=40
- castle=40
- cave=60
- frozen=80
- fungus=60
- [/defense]
- [resistance]
- blade=90
- pierce=100
- impact=110
- fire=100
- cold=100
- arcane=80
- [/resistance]
- [/movetype]
-
- [movetype]
- name=khalifatearmoredfoot
- [movement_costs]
- shallow_water=3
- reef=2
- swamp_water=3
- flat=1
- sand=1
- forest=2
- hills=2
- mountains=3
- village=1
- castle=1
- cave=2
- frozen=3
- fungus=2
- [/movement_costs]
- [defense]
- shallow_water=80
- reef=70
- swamp_water=70
- flat=60
- sand=50
- forest=60
- hills=40
- mountains=60
- village=50
- castle=40
- cave=60
- frozen=80
- fungus=60
- [/defense]
- [resistance]
- blade=80
- pierce=80
- impact=110
- fire=100
- cold=100
- arcane=80
- [/resistance]
- [/movetype]
-
- [movetype]
- name=khalifatehorse
- [movement_costs]
- shallow_water=4
- reef=3
- swamp_water=4
- flat=1
- sand=1
- forest=3
- hills=2
- mountains=4
- village=1
- castle=1
- cave=4
- frozen=2
- fungus=4
- [/movement_costs]
- [defense]
- shallow_water=80
- reef=70
- swamp_water=80
- flat=60
- sand=50
- forest=60
- hills=40
- mountains=60
- village=60
- castle=60
- cave=80
- frozen=70
- fungus=80
- [/defense]
- [resistance]
- blade=90
- pierce=110
- impact=100
- fire=100
- cold=100
- arcane=80
- [/resistance]
- [/movetype]
-
- [movetype]
- name=khalifatearmoredhorse
- [movement_costs]
- shallow_water=4
- reef=3
- swamp_water=4
- flat=1
- sand=1
- forest=3
- hills=2
- village=1
- castle=1
- cave=4
- frozen=2
- fungus=4
- [/movement_costs]
- [defense]
- shallow_water=80
- reef=70
- swamp_water=80
- flat=60
- sand=50
- forest=60
- hills=50
- village=60
- castle=50
- cave=80
- frozen=70
- fungus=80
- [/defense]
- [resistance]
- blade=70
- pierce=100
- impact=90
- fire=100
- cold=120
- arcane=80
- [/resistance]
- [/movetype]
-
- [movetype]
- name=lightfly
- flies=true
- [movement_costs]
- {FLY_MOVE}
- cave=3
- fungus=3
- [/movement_costs]
- [defense]
- {FLY_DEFENSE 40}
- cave=70
- fungus=70
- [/defense]
- [resistance]
- blade=100
- pierce=100
- impact=110
- fire=100
- cold=100
- arcane=80
- [/resistance]
- [/movetype]
[/units]
#undef WOODLAND_RESISTANCE
#undef FLY_MOVE
Modified: trunk/data/multiplayer/eras.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/multiplayer/eras.cfg?rev=51886&r1=51885&r2=51886&view=diff
==============================================================================
--- trunk/data/multiplayer/eras.cfg (original)
+++ trunk/data/multiplayer/eras.cfg Sun Nov 6 12:27:36 2011
@@ -180,24 +180,3 @@
{ERA_HEROES}
[/era]
-
-#define ERA_KHALIFATE
- {RANDOM_SIDE}
- {multiplayer/factions/loyalists-default.cfg}
- {multiplayer/factions/rebels-default.cfg}
- {multiplayer/factions/northerners-default.cfg}
- {multiplayer/factions/undead-default.cfg}
- {multiplayer/factions/knalgans-default.cfg}
- {multiplayer/factions/drakes-default.cfg}
- {multiplayer/factions/khalifate-default.cfg}
-
- {QUICK_4MP_LEADERS}
- {TURNS_OVER_ADVANTAGE}
-#enddef
-
-[era]
- id=era_khalifate
- name= _ "Default + Khalifate"
-
- {ERA_KHALIFATE}
-[/era]
Removed: trunk/data/multiplayer/factions/khalifate-default.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/multiplayer/factions/khalifate-default.cfg?rev=51885&view=auto
==============================================================================
--- trunk/data/multiplayer/factions/khalifate-default.cfg (original)
+++ trunk/data/multiplayer/factions/khalifate-default.cfg (removed)
@@ -1,15 +1,0 @@
-#textdomain wesnoth-multiplayer
-[multiplayer_side]
- id=khalifate
- name= _"Khalifate"
- image="units/khalifate/muharib.png"
- {MAGENTA_IS_THE_TEAM_COLOR}
- type=Muharib
- leader=Muharib,Ghazi,Mudafi,Monawish,Tabib
- random_leader=Muharib,Ghazi,Mudafi,Monawish,Tabib
- recruit=Jundi,Arif,Khaiyal,Rami,Hakim,Naffat,Falcon
- terrain_liked=Ss, Hh, Ha, Ww
- [ai]
- recruitment_pattern=fighter,fighter,archer,fighter,scout,archer
- [/ai]
-[/multiplayer_side]
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
