<URL: http://bugs.freeciv.org/Ticket/Display.html?id=40298 >
There has never been "UnsafeOcean" terrain flag and definitely will never be now that danger pathfinding is removed. Yet somebody decided to add it to comments documenting terrain.ruleset. Not that I'm completely sure how much backwards different parts of codebase have gone since last summer. Anyway, I vote for better implementations we have already agreed about instead of going back to old models. - ML
diff -Nurd -X.diff_ignore freeciv/data/civ1/terrain.ruleset freeciv/data/civ1/terrain.ruleset --- freeciv/data/civ1/terrain.ruleset 2008-06-18 19:42:34.000000000 +0300 +++ freeciv/data/civ1/terrain.ruleset 2008-06-21 23:44:54.000000000 +0300 @@ -144,8 +144,6 @@ ; separately). ; - UnsafeCoast = This terrain does not provide a safe voyage for ; F_TRIRIEME units. -; - UnsafeOcean = This terrain does not provide a safe voyage for -; F_COASTAL or F_SEAWORTHY units. ; - Oceanic = This is an "ocean" terrain. This has a big effect ; on gameplay. Naval units can move on oceanic terrain, ; while land units cannot. Oceanic tiles can be used @@ -371,7 +369,7 @@ cooler_wetter_result = "no" cooler_drier_result = "no" native_to = "Sea", "Air", "Missile" -flags = "Oceanic", "NoCities", "NoPollution", "UnsafeCoast"; "UnsafeOcean" +flags = "Oceanic", "NoCities", "NoPollution", "UnsafeCoast" property_ocean_depth = 87 helptext = _("\ Oceans cover much of the world, and only sea units (Triremes and\ @@ -406,7 +404,7 @@ cooler_wetter_result = "no" cooler_drier_result = "no" native_to = "Sea", "Air", "Missile" -flags = "Oceanic", "NoCities", "NoPollution", "UnsafeCoast"; "UnsafeOcean" +flags = "Oceanic", "NoCities", "NoPollution", "UnsafeCoast" property_ocean_depth = 99 helptext = _("\ Oceans cover much of the world, and only sea units (Triremes and\ @@ -441,7 +439,7 @@ cooler_wetter_result = "no" cooler_drier_result = "no" native_to = "Sea", "Air", "Missile" -flags = "Oceanic", "NoCities", "NoPollution", "UnsafeCoast"; "UnsafeOcean" +flags = "Oceanic", "NoCities", "NoPollution", "UnsafeCoast" property_ocean_depth = 36 ; same as coast, for now helptext = _("\ Oceans cover much of the world, and only sea units (Triremes and\ @@ -476,7 +474,7 @@ cooler_wetter_result = "no" cooler_drier_result = "no" native_to = "Sea", "Air", "Missile" -flags = "Oceanic", "NoCities", "NoPollution", "UnsafeCoast"; "UnsafeOcean" +flags = "Oceanic", "NoCities", "NoPollution", "UnsafeCoast" property_ocean_depth = 36 ; same as ridge, not generated helptext = _("\ Oceans cover much of the world, and only sea units (Triremes and\ diff -Nurd -X.diff_ignore freeciv/data/civ2/terrain.ruleset freeciv/data/civ2/terrain.ruleset --- freeciv/data/civ2/terrain.ruleset 2008-06-18 19:42:34.000000000 +0300 +++ freeciv/data/civ2/terrain.ruleset 2008-06-21 23:44:36.000000000 +0300 @@ -152,8 +152,6 @@ ; separately). ; - UnsafeCoast = This terrain does not provide a safe voyage for ; F_TRIRIEME units. -; - UnsafeOcean = This terrain does not provide a safe voyage for -; F_COASTAL or F_SEAWORTHY units. ; - Oceanic = This is an "ocean" terrain. This has a big effect ; on gameplay. Naval units can move on oceanic terrain, ; while land units cannot. Oceanic tiles can be used @@ -379,7 +377,7 @@ cooler_wetter_result = "no" cooler_drier_result = "no" native_to = "Sea", "Air", "Missile", "Helicopter" -flags = "Oceanic", "NoCities", "NoPollution", "UnsafeCoast"; "UnsafeOcean" +flags = "Oceanic", "NoCities", "NoPollution", "UnsafeCoast" property_ocean_depth = 87 helptext = _("\ Oceans cover much of the world, and only sea units (Triremes and\ @@ -414,7 +412,7 @@ cooler_wetter_result = "no" cooler_drier_result = "no" native_to = "Sea", "Air", "Missile", "Helicopter" -flags = "Oceanic", "NoCities", "NoPollution", "UnsafeCoast"; "UnsafeOcean" +flags = "Oceanic", "NoCities", "NoPollution", "UnsafeCoast" property_ocean_depth = 99 helptext = _("\ Oceans cover much of the world, and only sea units (Triremes and\ @@ -449,7 +447,7 @@ cooler_wetter_result = "no" cooler_drier_result = "no" native_to = "Sea", "Air", "Missile", "Helicopter" -flags = "Oceanic", "NoCities", "NoPollution", "UnsafeCoast"; "UnsafeOcean" +flags = "Oceanic", "NoCities", "NoPollution", "UnsafeCoast" property_ocean_depth = 36 ; same as coast, for now helptext = _("\ Oceans cover much of the world, and only sea units (Triremes and\ @@ -484,7 +482,7 @@ cooler_wetter_result = "no" cooler_drier_result = "no" native_to = "Sea", "Air", "Missile", "Helicopter" -flags = "Oceanic", "NoCities", "NoPollution", "UnsafeCoast"; "UnsafeOcean" +flags = "Oceanic", "NoCities", "NoPollution", "UnsafeCoast" property_ocean_depth = 36 ; same as ridge, not generated helptext = _("\ Oceans cover much of the world, and only sea units (Triremes and\ diff -Nurd -X.diff_ignore freeciv/data/default/terrain.ruleset freeciv/data/default/terrain.ruleset --- freeciv/data/default/terrain.ruleset 2008-06-18 19:42:34.000000000 +0300 +++ freeciv/data/default/terrain.ruleset 2008-06-21 23:44:14.000000000 +0300 @@ -152,8 +152,6 @@ ; separately). ; - UnsafeCoast = This terrain does not provide a safe voyage for ; F_TRIRIEME units. -; - UnsafeOcean = This terrain does not provide a safe voyage for -; F_COASTAL or F_SEAWORTHY units. ; - Oceanic = This is an "ocean" terrain. This has a big effect ; on gameplay. Naval units can move on oceanic terrain, ; while land units cannot. Oceanic tiles can be used @@ -397,7 +395,7 @@ cooler_wetter_result = "no" cooler_drier_result = "no" native_to = "Sea", "Air", "Missile", "Helicopter" -flags = "Oceanic", "NoCities", "NoPollution", "UnsafeCoast"; "UnsafeOcean" +flags = "Oceanic", "NoCities", "NoPollution", "UnsafeCoast" property_ocean_depth = 87 helptext = _("\ Oceans cover much of the world, and only sea units (Triremes and\ @@ -435,7 +433,7 @@ cooler_wetter_result = "no" cooler_drier_result = "no" native_to = "Sea", "Air", "Missile", "Helicopter" -flags = "Oceanic", "NoCities", "NoPollution", "UnsafeCoast"; "UnsafeOcean" +flags = "Oceanic", "NoCities", "NoPollution", "UnsafeCoast" property_ocean_depth = 99 helptext = _("\ Oceans cover much of the world, and only sea units (Triremes and\ @@ -473,7 +471,7 @@ cooler_wetter_result = "no" cooler_drier_result = "no" native_to = "Sea", "Air", "Missile", "Helicopter" -flags = "Oceanic", "NoCities", "NoPollution", "UnsafeCoast"; "UnsafeOcean" +flags = "Oceanic", "NoCities", "NoPollution", "UnsafeCoast" property_ocean_depth = 36 ; same as coast, for now helptext = _("\ Oceans cover much of the world, and only sea units (Triremes and\ @@ -511,7 +509,7 @@ cooler_wetter_result = "no" cooler_drier_result = "no" native_to = "Sea", "Air", "Missile", "Helicopter" -flags = "Oceanic", "NoCities", "NoPollution", "UnsafeCoast"; "UnsafeOcean" +flags = "Oceanic", "NoCities", "NoPollution", "UnsafeCoast" property_ocean_depth = 36 ; same as ridge, not generated helptext = _("\ Oceans cover much of the world, and only sea units (Triremes and\
_______________________________________________ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev