[Freeciv-Dev] [PATCH] Fixing Warriors (PR#1351)

[Raahul Kumar <raahul_da_man@xxxxxxxxx>]

This patch fixes the problem of warriors, phalanx and pikemen. The problem?
Since there is only one obsolete by field, warriors can be made obsolete by
only one unit, either phalanx or pikemen. Unfortunately, you can have pikemen
without bronze working, so the original freeciv solution of making warriors
obsolete by phalanx meant that people who went straight to feudalism still had
warriors on their build menu.

There is now a fix in CVS that makes warriors obsolete by pikemen. While an 
improvement, this means that phalanx no longer obsoletes warriors. This is bad!


This patch makes Bronze Working a pre-req for Warrior Code. Warriors are
obsoleted by phalanx, and pikemen obsoletes phalanx.


It is now only possible to build units in this order

warrior -> phalanx -> pikemen


instead of the previous

warrior -> pikemn
warrior -> phalanx
warrior -> phalanx -> pikemen


This conforms to the build order of every other freeciv unit

dragoons -> cavalry -> tanks
musketeers -> riflemen -> mechanised infantry

etc.

Nowhere else in Freeciv can you build a sucessor unit without going through 
the intermediate stages. You must go A -> B -> C, rather than A -> C.

__________________________________________________
Do You Yahoo!?
Yahoo! Movies - coverage of the 74th Academy Awards®
http://movies.yahoo.com/

diff -ruN -Xdiff_ignore /home/rkumar/test/freeciv/data/default/techs.ruleset 
/home/rkumar/test/cvs-freeciv/data/default/techs.ruleset
--- /home/rkumar/test/freeciv/data/default/techs.ruleset        Wed Dec 12 
02:05:13 2001
+++ /home/rkumar/test/cvs-freeciv/data/default/techs.ruleset    Thu Mar 28 
09:38:03 2002
@@ -567,7 +567,7 @@
 
 [advance_warrior_code]
 name     = _("Warrior Code")
-req1     = "None"
+req1     = "Bronze Working"
 req2     = "None"
 flags    = ""
 
diff -ruN -Xdiff_ignore /home/rkumar/test/freeciv/data/default/units.ruleset 
/home/rkumar/test/cvs-freeciv/data/default/units.ruleset
--- /home/rkumar/test/freeciv/data/default/units.ruleset        Mon Mar 18 
02:57:50 2002
+++ /home/rkumar/test/cvs-freeciv/data/default/units.ruleset    Thu Mar 28 
09:58:06 2002
@@ -141,7 +141,7 @@
 name          = _("Warriors")
 move_type     = "Land"
 tech_req      = "None"
-obsolete_by   = "Pikemen"
+obsolete_by   = "Phalanx"
 graphic       = "u.warriors"
 graphic_alt   = "-"
 build_cost    = 10