commit 60df6b057d676d6feb210087290fa6f3a1069bca Author: Jacob Nevins <0jacobnk.fcdev@chiark.greenend.org.uk> Date: Sat Aug 26 14:31:16 2017 +0100 Use sea ice terrains, etc. diff --git a/xpt/game.ruleset b/xpt/game.ruleset index 88aa9e5..f74cf5c 100644 --- a/xpt/game.ruleset +++ b/xpt/game.ruleset @@ -685,9 +685,8 @@ colorlist = [settings] ; freeciv game settings for the classic ruleset ; -; set = -; { "name", "value", "lock" -; "bool_set", TRUE, FALSE -; "int_set", 123, FALSE -; "str_set", "test", FALSE -; } +set = + { "name", "value", "lock" + "flatpoles", 0 + "separatepoles", "DISABLED" + } diff --git a/xpt/terrain.ruleset b/xpt/terrain.ruleset index 09b915d..26a74e4 100644 --- a/xpt/terrain.ruleset +++ b/xpt/terrain.ruleset @@ -38,11 +38,11 @@ land_channel_requirement = 10 ; Percentage of unfrozen tiles (no "Frozen" flag) required to be adjacent ; to a frozen tile before it can thaw (0-101; 0=anywhere, default 101=nowhere) -thaw_requirement = 0 +thaw_requirement = 30 ; Percentage of frozen tiles ("Frozen" flag) required to be adjacent to an ; unfrozen tile before it can freeze (0-101; 0=anywhere, default 101=nowhere) -freeze_requirement = 0 +freeze_requirement = 30 ; Bodies of water up to this size are considered freshwater lakes, if there is ; also terrain type(s) with flag "FreshWater" in the ruleset. @@ -310,9 +310,9 @@ clean_pollution_time = 3 clean_fallout_time = 3 animal = "None" warmer_wetter_result = "no" -warmer_drier_result = "Swamp" -cooler_wetter_result = "Glacier" -cooler_drier_result = "Tundra" +warmer_drier_result = "no" +cooler_wetter_result = "Frozen Lake" +cooler_drier_result = "Frozen Lake" native_to = "Sea", "Air", "Missile", "Helicopter", "Trireme" flags = "NoCities", "NoBarbs", "NoPollution", "FreshWater", "NoZoc", "NoFortify" property_ocean_depth = 0 @@ -353,9 +353,9 @@ clean_pollution_time = 3 clean_fallout_time = 3 animal = "None" warmer_wetter_result = "no" -warmer_drier_result = "Swamp" -cooler_wetter_result = "Glacier" -cooler_drier_result = "Glacier" +warmer_drier_result = "no" +cooler_wetter_result = "Sea Ice" +cooler_drier_result = "Sea Ice" native_to = "Sea", "Air", "Missile", "Helicopter", "Trireme" flags = "NoCities", "NoPollution", "UnsafeCoast", "NoZoc", "NoFortify" property_ocean_depth = 32 @@ -398,8 +398,8 @@ clean_fallout_time = 3 animal = "None" warmer_wetter_result = "no" warmer_drier_result = "no" -cooler_wetter_result = "no" -cooler_drier_result = "no" +cooler_wetter_result = "Deep Sea Ice" +cooler_drier_result = "Deep Sea Ice" native_to = "Sea", "Air", "Missile", "Helicopter" flags = "NoCities", "NoPollution", "UnsafeCoast", "NoZoc", "NoFortify" property_ocean_depth = 87 @@ -1036,10 +1036,10 @@ identifier = "T" class = "Oceanic" movement_cost = 1 defense_bonus = 0 -food = 1 +food = 0 shield = 0 -trade = 2 -resources = "Fish" +trade = 0 +;resources = "none" road_food_incr_pct = 0 road_shield_incr_pct = 0 road_trade_incr_pct = 0 @@ -1051,24 +1051,25 @@ irrigation_time = 0 mining_result = "no" mining_shield_incr = 0 mining_time = 0 -transform_result = "Swamp" -transform_time = 36 +transform_result = "no" +transform_time = 0 pillage_time = 1 clean_pollution_time = 3 clean_fallout_time = 3 animal = "None" -warmer_wetter_result = "no" -warmer_drier_result = "Swamp" -cooler_wetter_result = "Glacier" -cooler_drier_result = "Tundra" -native_to = "Sea", "Air", "Missile", "Helicopter", "Trireme" -flags = "NoCities", "NoBarbs", "NoPollution", "FreshWater", "NoZoc", "NoFortify" +warmer_wetter_result = "Lake" +warmer_drier_result = "Lake" +cooler_wetter_result = "no" +cooler_drier_result = "no" +native_to = "Air", "Missile", "Helicopter" +flags = "NoCities", "NoBarbs", "NoPollution", "UnsafeCoast", "FreshWater", "NoZoc", "NoFortify", "Frozen" property_ocean_depth = 0 -color.r = 46 -color.g = 120 -color.b = 182 +color.r = 212 +color.g = 212 +color.b = 232 helptext = _("\ -Lakes are substantial bodies of fresh water.\ +Much like sea ice, fresh water near the poles can develop a crust of thick\ + ice.\ ") [terrain_sea_ice] @@ -1079,10 +1080,10 @@ identifier = "U" class = "Oceanic" movement_cost = 1 defense_bonus = 0 -food = 1 +food = 0 shield = 0 -trade = 2 -resources = "Fish", "Whales" +trade = 0 +;resources = "none" road_food_incr_pct = 0 road_shield_incr_pct = 0 road_trade_incr_pct = 0 @@ -1094,25 +1095,24 @@ irrigation_time = 0 mining_result = "no" mining_shield_incr = 0 mining_time = 0 -transform_result = "Swamp" -transform_time = 36 +transform_result = "no" +transform_time = 0 pillage_time = 1 clean_pollution_time = 3 clean_fallout_time = 3 animal = "None" -warmer_wetter_result = "no" -warmer_drier_result = "Swamp" -cooler_wetter_result = "Glacier" -cooler_drier_result = "Glacier" -native_to = "Sea", "Air", "Missile", "Helicopter", "Trireme" -flags = "NoCities", "NoPollution", "UnsafeCoast", "NoZoc", "NoFortify" +warmer_wetter_result = "Ocean" +warmer_drier_result = "Ocean" +cooler_wetter_result = "no" +cooler_drier_result = "no" +native_to = "Air", "Missile", "Helicopter" +flags = "NoCities", "NoBarbs", "NoPollution", "UnsafeCoast", "NoZoc", "NoFortify", "Frozen" property_ocean_depth = 32 -color.r = 0 -color.g = 46 -color.b = 137 +color.r = 200 +color.g = 200 +color.b = 232 helptext = _("\ -Shallow oceans are mostly found near coastlines, and are often rich\ - sources of food and other resources.\ +Sea ice covers much of the ocean surface at the poles.\ ") [terrain_deep_sea_ice] @@ -1123,9 +1123,9 @@ identifier = "V" class = "Oceanic" movement_cost = 1 defense_bonus = 0 -food = 1 +food = 0 shield = 0 -trade = 2 +trade = 0 ;resources = "none" road_food_incr_pct = 0 road_shield_incr_pct = 0 @@ -1144,19 +1144,18 @@ pillage_time = 1 clean_pollution_time = 3 clean_fallout_time = 3 animal = "None" -warmer_wetter_result = "no" -warmer_drier_result = "no" +warmer_wetter_result = "Deep Ocean" +warmer_drier_result = "Deep Ocean" cooler_wetter_result = "no" cooler_drier_result = "no" -native_to = "Sea", "Air", "Missile", "Helicopter" -flags = "NoCities", "NoPollution", "UnsafeCoast", "NoZoc", "NoFortify" +native_to = "Air", "Missile", "Helicopter" +flags = "NoCities", "NoBarbs", "NoPollution", "UnsafeCoast", "NoZoc", "NoFortify", "Frozen" property_ocean_depth = 87 -color.r = 0 -color.g = 33 -color.b = 129 +color.r = 200 +color.g = 200 +color.b = 232 helptext = _("\ -Deep oceans cover much of the world away from coastlines, and only\ - seaworthy units (not including Triremes) can travel on them.\ +Sea ice covers much of the ocean surface at the poles.\ ") [terrain_taiga] @@ -2384,7 +2383,7 @@ warmer_drier_result = "no" cooler_wetter_result = "Plains" cooler_drier_result = "Tundra" native_to = "Land", "Air", "Missile", "Helicopter" -flags = "CanHaveRiver", "Oil" +flags = "NotGenerated", "CanHaveRiver", "Oil" property_dry = 100 property_tropical = 50 property_temperate = 20 @@ -2432,7 +2431,7 @@ warmer_drier_result = "no" cooler_wetter_result = "Plains" cooler_drier_result = "Tundra" native_to = "Land", "Air", "Missile", "Helicopter" -flags = "CanHaveRiver", "Oil" +flags = "NotGenerated", "CanHaveRiver", "Oil" property_dry = 100 property_tropical = 50 property_temperate = 20 @@ -2480,7 +2479,7 @@ warmer_drier_result = "no" cooler_wetter_result = "Plains" cooler_drier_result = "Tundra" native_to = "Land", "Air", "Missile", "Helicopter" -flags = "CanHaveRiver", "Oil" +flags = "NotGenerated", "CanHaveRiver", "Oil" property_dry = 100 property_tropical = 50 property_temperate = 20