[Freeciv-Dev] Re: Rules changes

[Jason Dorje Short <jdorje@xxxxxxxxxxxx>]

Jason Dorje Short wrote:
> Per Inge Mathisen wrote:
>
> >  - Combine city walls and coastal fortress. The coastal fortress as it is
> > now is way too expensive, is not shown on the map, and comes too late in
> > the tech tree to be useful against the first waves of oceanic attacks.
> > Also the city wall is not as useful as it ought to be.
> >
> > Speak up if this will not be well received.
> >
> > Once I get some more time (soonish), I will also make a new ruleset for
> > quicker online games.
>
> How about this patch?
>
>   City Walls: +100% defense against all
>   City Fortress: +100% defense against all
>   Rocket Defense: +100% defense against all
>   Laser Defense: +100% defense against all
>
> building all 4 of them gives +400% defense, costs 300 shields, and takes 
> 10 gold/turn upkeep.
> Oh, this will take some code changes since the Defense effect type isn't 
> supported.

? walls.diff
Index: data/default/buildings.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/default/buildings.ruleset,v
retrieving revision 1.74
diff -p -u -r1.74 buildings.ruleset
--- data/default/buildings.ruleset      2 Aug 2005 06:39:49 -0000       1.74
+++ data/default/buildings.ruleset      7 Oct 2005 23:20:09 -0000
@@ -216,38 +216,36 @@ reqs      =
 graphic        = "b.city_walls"
 graphic_alt    = "-"
 obsolete_by    = "None"
-build_cost     = 60
-upkeep         = 0
+build_cost     = 30
+upkeep         = 1
 sabotage       = 50
 sound          = "b_city_walls"
 sound_alt      = "b_generic"
 helptext       = _("\
-City Walls make it easier to defend a city.  They triple the defence\
- strength of units within the city against ground and helicopter\
- units.  They are ineffective against airborne and sea units as well\
- as Howitzers.  City Walls also prevent the loss of population which\
- occurs when a defending unit is destroyed by a land unit.\
+City Walls make it easier to defend a city.  They double the defence\
+ strength of units within the city against all attacks, and prevent\
+ the city from losing population when it is attacked.\
 ")
 
-[building_coastal_defense]
-name           = _("Coastal Defense")
+[building_city_fortress]
+name           = _("City Defense")
 genus          = "Improvement"
+flags          = "VisibleByOthers"
 reqs   =
     { "type", "name", "range"
       "Tech", "Metallurgy", "Player"
-      "Terrain", "Ocean", "Adjacent"
     }
-graphic        = "b.coastal_defense"
-graphic_alt    = "-"
+graphic                = "b.city_fortress"
+graphic_alt    = "b.coastal_defense"
 obsolete_by    = "None"
 build_cost     = 60
-upkeep         = 1
+upkeep         = 2
 sabotage       = 100
-sound          = "b_coastal_defense"
-sound_alt      = "b_generic"
+sound          = "b_city_fortress"
+sound_alt      = "b_city_walls"
 helptext       = _("\
-Increases the defence strength of units within a city by a factor\
- of 2 when defending against bombardments from enemy ships.\
+Increases the defence strength of units within a city by 100%.\
+ Cumulative with city walls.
 ")
 
 [building_colosseum]
@@ -682,46 +680,50 @@ Together with a Library and a University
  the science production of a city by 450%.\
 ")
 
-[building_sam_battery]
-name           = _("SAM Battery")
+[building_rocket_defense]
+name           = _("Rocket Defense")
 genus          = "Improvement"
+flags          = "VisibleByOthers"
 reqs   =
     { "type", "name", "range"
       "Tech", "Rocketry", "Player"
     }
-graphic        = "b.sam_battery"
-graphic_alt    = "-"
+graphic                = "b.rocket_defenses"
+graphic_alt    = "b.sam_battery"
 obsolete_by    = "None"
-build_cost     = 70
-upkeep         = 2
+build_cost     = 90
+upkeep         = 3
 sabotage       = 100
-sound          = "b_sam_battery"
-sound_alt      = "b_generic"
+sound          = "b_rocket_defense"
+sound_alt      = "b_city_walls"
 helptext       = _("\
-Doubles the defense of all units inside the city when attacked by\
- non-nuclear air units.\
+Increases the defence strength of units within a city by 100%.\
+ Cumulative with city walls and city fortress.
 ")
 
-[building_sdi_defense]
-name           = _("SDI Defense")
+[building_laser_defense]
+name           = _("Laser Defense")
 genus          = "Improvement"
+flags          = "VisibleByOthers"
 reqs   =
     { "type", "name", "range"
       "Tech", "Laser", "Player"
     }
+graphic        = "b.laser_defense"
 graphic        = "b.sdi_defense"
-graphic_alt    = "-"
 obsolete_by    = "None"
-build_cost     = 140
+build_cost     = 120
 upkeep         = 4
 sabotage       = 100
-sound          = "b_sdi_defense"
-sound_alt      = "b_generic"
+sound          = "b_laser_defense"
+sound_alt      = "b_city_walls"
 helptext       = _("\
-Protects a city from attacks from Nuclear units.  Nuclear attacks\
- simply have no effect on the city.  Also, doubles defence against\
- non-nuclear missiles.\
+Increases the defence strength of units within a city by 100%.\
+ Cumulative with city walls, city fortress, and rocket defense. Also\
+ protects against nuclear attacks.\
 ")
+
+
 ; NOTE:
 ; Civ2 does not document the "Unit_Defend"/"Missile" aspect; does it apply or 
not?
 
Index: data/default/effects.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/default/effects.ruleset,v
retrieving revision 1.14
diff -p -u -r1.14 effects.ruleset
--- data/default/effects.ruleset        4 Oct 2005 07:27:13 -0000       1.14
+++ data/default/effects.ruleset        7 Oct 2005 23:20:09 -0000
@@ -534,8 +534,8 @@ nreqs       =
     }
 
 [effect_city_walls]
-name   = "Land_Defend"
-value  = 200
+name   = "Defend"
+value  = 100
 reqs   =
     { "type", "name", "range"
       "Building", "City Walls", "City"
@@ -553,12 +553,12 @@ reqs      =
       "Building", "City Walls", "City"
     }
 
-[effect_coastal_defense]
-name   = "Sea_Defend"
+[effect_city_fortress]
+name   = "Defend"
 value  = 100
 reqs   =
     { "type", "name", "range"
-      "Building", "Coastal Defense", "City"
+      "Building", "City Fortress", "City"
     }
 
 [effect_colosseum]
@@ -961,28 +961,28 @@ reqs      =
       "OutputType", "Science", "Local"
     }
 
-[effect_sam_battery]
-name   = "Air_Defend"
+[effect_rocket_defense]
+name   = "Defense"
 value  = 100
 reqs   =
     { "type", "name", "range"
-      "Building", "SAM Battery", "City"
+      "Building", "Rocket Defense", "City"
     }
 
-[effect_sdi_defense]
+[effect_laser_defense]
 name   = "Nuke_Proof"
 value  = 100
 reqs   =
     { "type", "name", "range"
-      "Building", "SDI Defense", "City"
+      "Building", "Laser Defense", "City"
     }
 
-[effect_sdi_defense_1]
-name   = "Missile_Defend"
+[effect_laser_defense_1]
+name   = "Defend"
 value  = 100
 reqs   =
     { "type", "name", "range"
-      "Building", "SDI Defense", "City"
+      "Building", "Laser Defense", "City"
     }
 
 [effect_sewer_system]