<URL: http://bugs.freeciv.org/Ticket/Display.html?id=35708 >
On 11/02/2007, Marko Lindqvist wrote:
>
> Untested patch to limit Triremes to Ocean tiles. Applies on top of
> Deep Ocean patch #34265.
> Also, Triremes do not get move bonus from Nuclear Power.
Updated against S2_2 svn.
There is no longer dependency to #34265 (as ruleset already has more
than one ocean type).
This one contains only ruleset changes. I'll commit this one first.
Removing support for old style triremes from the codebase (Jason's
patch) is a separate issue - and I'd like to hear comments from
modpack authors before doing that.
- ML
diff -Nurd -X.diff_ignore freeciv/data/default/effects.ruleset freeciv/data/default/effects.ruleset
--- freeciv/data/default/effects.ruleset 2008-01-15 04:53:36.000000000 +0200
+++ freeciv/data/default/effects.ruleset 2008-03-24 14:23:52.000000000 +0200
@@ -905,6 +905,15 @@
"UnitClass", "Sea", "Local"
}
+[effect_coastal_defense_trireme]
+name = "Defend_Bonus"
+value = 100
+reqs =
+ { "type", "name", "range"
+ "Building", "Coastal Defense", "City"
+ "UnitClass", "Trireme", "Local"
+ }
+
[effect_colosseum]
name = "Make_Content"
value = 3
@@ -1267,6 +1276,24 @@
"UnitClass", "Sea", "Local"
}
+[effect_port_facility_trireme]
+name = "Veteran_Build"
+value = 1
+reqs =
+ { "type", "name", "range"
+ "Building", "Port Facility", "City"
+ "UnitClass", "Trireme", "Local"
+ }
+
+[effect_port_facility_trireme_1]
+name = "HP_Regen"
+value = 100
+reqs =
+ { "type", "name", "range"
+ "Building", "Port Facility", "City"
+ "UnitClass", "Trireme", "Local"
+ }
+
[effect_power_plant]
name = "Output_Bonus"
value = 25
@@ -1766,6 +1793,24 @@
"UnitClass", "Sea", "Local"
}
+[effect_lighthouse_trireme_move]
+name = "Move_Bonus"
+value = 1
+reqs =
+ { "type", "name", "range"
+ "Building", "Lighthouse", "Player"
+ "UnitClass", "Trireme", "Local"
+ }
+
+[effect_lighthouse_trireme_veteran]
+name = "Veteran_Build"
+value = 1
+reqs =
+ { "type", "name", "range"
+ "Building", "Lighthouse", "Player"
+ "UnitClass", "Trireme", "Local"
+ }
+
[effect_magellans_expedition]
name = "Move_Bonus"
value = 2
@@ -1775,6 +1820,15 @@
"UnitClass", "Sea", "Local"
}
+[effect_magellan_trireme]
+name = "Move_Bonus"
+value = 2
+reqs =
+ { "type", "name", "range"
+ "Building", "Magellan's Expedition", "Player"
+ "UnitClass", "Trireme", "Local"
+ }
+
[effect_manhattan_project]
name = "Enable_Nuke"
value = 1
diff -Nurd -X.diff_ignore freeciv/data/default/terrain.ruleset freeciv/data/default/terrain.ruleset
--- freeciv/data/default/terrain.ruleset 2007-10-29 21:10:36.000000000 +0200
+++ freeciv/data/default/terrain.ruleset 2008-03-24 14:31:02.000000000 +0200
@@ -206,7 +206,7 @@
warmer_drier_result = "no"
cooler_wetter_result = "no"
cooler_drier_result = "no"
-native_to = "Sea", "Air", "Missile", "Helicopter"
+native_to = "Sea", "Air", "Missile", "Helicopter", "Trireme"
flags = "Oceanic", "NoCities", "NoPollution", "UnsafeCoast"
property_ocean_depth = 0
helptext = _("\
@@ -244,7 +244,7 @@
warmer_drier_result = "no"
cooler_wetter_result = "no"
cooler_drier_result = "no"
-native_to = "Sea", "Air", "Missile", "Helicopter"
+native_to = "Sea", "Air", "Missile", "Helicopter", "Trireme"
flags = "Oceanic", "NoCities", "NoPollution"
property_ocean_depth = 0
helptext = _("\
@@ -282,7 +282,7 @@
warmer_drier_result = "no"
cooler_wetter_result = "no"
cooler_drier_result = "no"
-native_to = "Sea", "Air", "Missile", "Helicopter"
+native_to = "Sea", "Air", "Missile", "Helicopter", "Trireme"
flags = "Oceanic", "NoCities", "NoPollution"
property_ocean_depth = 0
helptext = _("\
@@ -320,7 +320,7 @@
warmer_drier_result = "no"
cooler_wetter_result = "no"
cooler_drier_result = "no"
-native_to = "Sea", "Air", "Missile", "Helicopter"
+native_to = "Sea", "Air", "Missile", "Helicopter", "Trireme"
flags = "Oceanic", "NoCities", "NoPollution"
property_ocean_depth = 36
helptext = _("\
@@ -358,7 +358,7 @@
warmer_drier_result = "no"
cooler_wetter_result = "no"
cooler_drier_result = "no"
-native_to = "Sea", "Air", "Missile", "Helicopter"
+native_to = "Sea", "Air", "Missile", "Helicopter", "Trireme"
flags = "Oceanic", "NoCities", "NoPollution", "UnsafeCoast"
property_ocean_depth = 48
helptext = _("\
@@ -400,8 +400,8 @@
flags = "Oceanic", "NoCities", "NoPollution", "UnsafeCoast"; "UnsafeOcean"
property_ocean_depth = 87
helptext = _("\
-Oceans cover much of the world, and only sea units (Triremes and\
- other boats) can travel on them.\
+Oceans cover much of the world, and only seaworthy units\
+ can travel on them.\
\n\n\
Ocean squares can never be polluted or subjected to fallout.\
")
@@ -438,8 +438,8 @@
flags = "Oceanic", "NoCities", "NoPollution", "UnsafeCoast"; "UnsafeOcean"
property_ocean_depth = 99
helptext = _("\
-Oceans cover much of the world, and only sea units (Triremes and\
- other boats) can travel on them.\
+Oceans cover much of the world, and only seaworthy units\
+ can travel on them.\
\n\n\
Ocean squares can never be polluted or subjected to fallout.\
")
@@ -472,7 +472,7 @@
warmer_drier_result = "no"
cooler_wetter_result = "no"
cooler_drier_result = "no"
-native_to = "Sea", "Air", "Missile", "Helicopter"
+native_to = "Sea", "Air", "Missile", "Helicopter", "Trireme"
flags = "Oceanic", "NoCities", "NoPollution", "UnsafeCoast"; "UnsafeOcean"
property_ocean_depth = 36 ; same as coast, for now
helptext = _("\
@@ -514,8 +514,8 @@
flags = "Oceanic", "NoCities", "NoPollution", "UnsafeCoast"; "UnsafeOcean"
property_ocean_depth = 36 ; same as ridge, not generated
helptext = _("\
-Oceans cover much of the world, and only sea units (Triremes and\
- other boats) can travel on them.\
+Oceans cover much of the world, and only seaworthy units\
+ can travel on them.\
\n\n\
Ocean squares can never be polluted or subjected to fallout.\
")
diff -Nurd -X.diff_ignore freeciv/data/default/units.ruleset freeciv/data/default/units.ruleset
--- freeciv/data/default/units.ruleset 2008-01-15 04:53:36.000000000 +0200
+++ freeciv/data/default/units.ruleset 2008-03-24 14:24:49.000000000 +0200
@@ -99,6 +99,13 @@
hp_loss_pct = 0
flags = "TerrainSpeed", "DamageSlows"
+[unitclass_trireme]
+name = _("Trireme")
+move_type = "Sea"
+min_speed = 2
+hp_loss_pct = 0
+flags = "TerrainSpeed", "DamageSlows"
+
[unitclass_heli]
name = _("Helicopter")
move_type = "Both"
@@ -1277,7 +1284,7 @@
[unit_trireme]
name = _("Trireme")
-class = "Sea"
+class = "Trireme"
tech_req = "Map Making"
obsolete_by = "Caravel"
graphic = "u.trireme"
@@ -1301,7 +1308,7 @@
uk_food = 0
uk_gold = 0
cargo = "Land"
-flags = "Trireme", "BadCityDefender", "No_Land_Attack"
+flags = "BadCityDefender", "No_Land_Attack"
roles = "Ferryboat"
helptext = _("\
The Trireme is your first boat unit. It can act\
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
