From cfd672f25c234b0a82a0610f09963928aedbb873 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 18 Feb 2023 23:43:04 +0200 Subject: [PATCH 6/6] Bump ruleset capstr and format_version for freeciv-3.3 See osdn #47399 Signed-off-by: Marko Lindqvist --- data/alien/actions.ruleset | 4 ++-- data/alien/buildings.ruleset | 4 ++-- data/alien/cities.ruleset | 4 ++-- data/alien/effects.ruleset | 4 ++-- data/alien/game.ruleset | 4 ++-- data/alien/governments.ruleset | 4 ++-- data/alien/nations.ruleset | 4 ++-- data/alien/styles.ruleset | 4 ++-- data/alien/techs.ruleset | 4 ++-- data/alien/terrain.ruleset | 4 ++-- data/alien/units.ruleset | 4 ++-- data/civ1/actions.ruleset | 4 ++-- data/civ1/buildings.ruleset | 4 ++-- data/civ1/cities.ruleset | 4 ++-- data/civ1/effects.ruleset | 4 ++-- data/civ1/game.ruleset | 4 ++-- data/civ1/governments.ruleset | 4 ++-- data/civ1/nations.ruleset | 4 ++-- data/civ1/styles.ruleset | 4 ++-- data/civ1/techs.ruleset | 4 ++-- data/civ1/terrain.ruleset | 4 ++-- data/civ1/units.ruleset | 4 ++-- data/civ2/actions.ruleset | 4 ++-- data/civ2/buildings.ruleset | 4 ++-- data/civ2/cities.ruleset | 4 ++-- data/civ2/effects.ruleset | 4 ++-- data/civ2/game.ruleset | 4 ++-- data/civ2/governments.ruleset | 4 ++-- data/civ2/nations.ruleset | 4 ++-- data/civ2/styles.ruleset | 4 ++-- data/civ2/techs.ruleset | 4 ++-- data/civ2/terrain.ruleset | 4 ++-- data/civ2/units.ruleset | 4 ++-- data/civ2civ3/actions.ruleset | 4 ++-- data/civ2civ3/buildings.ruleset | 4 ++-- data/civ2civ3/cities.ruleset | 4 ++-- data/civ2civ3/effects.ruleset | 4 ++-- data/civ2civ3/game.ruleset | 4 ++-- data/civ2civ3/governments.ruleset | 4 ++-- data/civ2civ3/nations.ruleset | 4 ++-- data/civ2civ3/styles.ruleset | 4 ++-- data/civ2civ3/techs.ruleset | 4 ++-- data/civ2civ3/terrain.ruleset | 4 ++-- data/civ2civ3/units.ruleset | 4 ++-- data/classic/actions.ruleset | 4 ++-- data/classic/buildings.ruleset | 4 ++-- data/classic/cities.ruleset | 4 ++-- data/classic/effects.ruleset | 4 ++-- data/classic/game.ruleset | 4 ++-- data/classic/governments.ruleset | 4 ++-- data/classic/nations.ruleset | 4 ++-- data/classic/styles.ruleset | 4 ++-- data/classic/techs.ruleset | 4 ++-- data/classic/terrain.ruleset | 4 ++-- data/classic/units.ruleset | 4 ++-- data/goldkeep/actions.ruleset | 4 ++-- data/goldkeep/buildings.ruleset | 4 ++-- data/goldkeep/cities.ruleset | 4 ++-- data/goldkeep/effects.ruleset | 4 ++-- data/goldkeep/game.ruleset | 4 ++-- data/goldkeep/governments.ruleset | 4 ++-- data/goldkeep/nations.ruleset | 4 ++-- data/goldkeep/styles.ruleset | 4 ++-- data/goldkeep/techs.ruleset | 4 ++-- data/goldkeep/terrain.ruleset | 4 ++-- data/goldkeep/units.ruleset | 4 ++-- data/granularity/actions.ruleset | 4 ++-- data/granularity/buildings.ruleset | 4 ++-- data/granularity/cities.ruleset | 4 ++-- data/granularity/effects.ruleset | 4 ++-- data/granularity/game.ruleset | 4 ++-- data/granularity/governments.ruleset | 4 ++-- data/granularity/nations.ruleset | 4 ++-- data/granularity/styles.ruleset | 4 ++-- data/granularity/techs.ruleset | 4 ++-- data/granularity/terrain.ruleset | 4 ++-- data/granularity/units.ruleset | 4 ++-- data/multiplayer/actions.ruleset | 4 ++-- data/multiplayer/buildings.ruleset | 4 ++-- data/multiplayer/cities.ruleset | 4 ++-- data/multiplayer/effects.ruleset | 4 ++-- data/multiplayer/game.ruleset | 4 ++-- data/multiplayer/governments.ruleset | 4 ++-- data/multiplayer/nations.ruleset | 4 ++-- data/multiplayer/styles.ruleset | 4 ++-- data/multiplayer/techs.ruleset | 4 ++-- data/multiplayer/terrain.ruleset | 4 ++-- data/multiplayer/units.ruleset | 4 ++-- data/sandbox/actions.ruleset | 4 ++-- data/sandbox/buildings.ruleset | 4 ++-- data/sandbox/cities.ruleset | 4 ++-- data/sandbox/effects.ruleset | 4 ++-- data/sandbox/game.ruleset | 4 ++-- data/sandbox/governments.ruleset | 4 ++-- data/sandbox/nations.ruleset | 4 ++-- data/sandbox/styles.ruleset | 4 ++-- data/sandbox/techs.ruleset | 4 ++-- data/sandbox/terrain.ruleset | 4 ++-- data/sandbox/units.ruleset | 4 ++-- data/stub/actions.ruleset | 4 ++-- data/stub/buildings.ruleset | 4 ++-- data/stub/cities.ruleset | 4 ++-- data/stub/effects.ruleset | 4 ++-- data/stub/game.ruleset | 4 ++-- data/stub/governments.ruleset | 4 ++-- data/stub/nations.ruleset | 4 ++-- data/stub/styles.ruleset | 4 ++-- data/stub/techs.ruleset | 4 ++-- data/stub/terrain.ruleset | 4 ++-- data/stub/units.ruleset | 4 ++-- data/webperimental/actions.ruleset | 4 ++-- data/webperimental/buildings.ruleset | 4 ++-- data/webperimental/cities.ruleset | 4 ++-- data/webperimental/effects.ruleset | 4 ++-- data/webperimental/game.ruleset | 4 ++-- data/webperimental/governments.ruleset | 4 ++-- data/webperimental/nations.ruleset | 4 ++-- data/webperimental/styles.ruleset | 4 ++-- data/webperimental/techs.ruleset | 4 ++-- data/webperimental/terrain.ruleset | 4 ++-- data/webperimental/units.ruleset | 4 ++-- server/ruleset.h | 10 +++++----- tools/ruleutil/rulesave.c | 3 ++- 123 files changed, 249 insertions(+), 248 deletions(-) diff --git a/data/alien/actions.ruleset b/data/alien/actions.ruleset index d40df3bd87..72dd70c2c2 100644 --- a/data/alien/actions.ruleset +++ b/data/alien/actions.ruleset @@ -12,8 +12,8 @@ ; than minor changes. [datafile] description = "Alien World actions data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [auto_attack] ; An auto attack may be triggered when another unit moves to an adjacent diff --git a/data/alien/buildings.ruleset b/data/alien/buildings.ruleset index 9555e8b622..15e6b36a36 100644 --- a/data/alien/buildings.ruleset +++ b/data/alien/buildings.ruleset @@ -13,8 +13,8 @@ [datafile] description = "Alien World buildings data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [control] diff --git a/data/alien/cities.ruleset b/data/alien/cities.ruleset index d909cb82ad..11b6d6e725 100644 --- a/data/alien/cities.ruleset +++ b/data/alien/cities.ruleset @@ -13,8 +13,8 @@ [datafile] description = "Alien World cities data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 ; /* <-- avoid gettext warnings ; diff --git a/data/alien/effects.ruleset b/data/alien/effects.ruleset index f6af856bba..d6af0e0342 100644 --- a/data/alien/effects.ruleset +++ b/data/alien/effects.ruleset @@ -13,8 +13,8 @@ [datafile] description = "Alien World effects data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 ; /* <-- avoid gettext warnings ; diff --git a/data/alien/game.ruleset b/data/alien/game.ruleset index 492f922d69..807c4a34a6 100644 --- a/data/alien/game.ruleset +++ b/data/alien/game.ruleset @@ -13,8 +13,8 @@ [datafile] description = "Alien World game rules for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 ; This section contains meta information for freeciv-ruledit to recreate the ruleset ; file in a form wanted. These have no in-game effect whatsoever diff --git a/data/alien/governments.ruleset b/data/alien/governments.ruleset index b418180c38..849831dac3 100644 --- a/data/alien/governments.ruleset +++ b/data/alien/governments.ruleset @@ -13,8 +13,8 @@ [datafile] description = "Alien World governments data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [governments] during_revolution = "Anarchy" diff --git a/data/alien/nations.ruleset b/data/alien/nations.ruleset index 997a734f70..e952696697 100644 --- a/data/alien/nations.ruleset +++ b/data/alien/nations.ruleset @@ -10,8 +10,8 @@ [datafile] description = "Alien World nations data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 ; This section contains meta information for freeciv-ruledit and freeciv-ruleup ; to recreate the ruleset file in a form wanted. diff --git a/data/alien/styles.ruleset b/data/alien/styles.ruleset index 34ff094511..a6e9ed1b64 100644 --- a/data/alien/styles.ruleset +++ b/data/alien/styles.ruleset @@ -10,8 +10,8 @@ [datafile] description = "Nation theme data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 ; /* <-- avoid gettext warnings ; diff --git a/data/alien/techs.ruleset b/data/alien/techs.ruleset index bda51e7f66..e083ac8507 100644 --- a/data/alien/techs.ruleset +++ b/data/alien/techs.ruleset @@ -13,8 +13,8 @@ [datafile] description = "Alien World technology data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [control] ; Names for custom tech flags. There can be up to 8 of these. diff --git a/data/alien/terrain.ruleset b/data/alien/terrain.ruleset index 25a35f9e28..10047d3a0a 100644 --- a/data/alien/terrain.ruleset +++ b/data/alien/terrain.ruleset @@ -13,8 +13,8 @@ [datafile] description = "Alien World tile_type data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [control] ; Names for custom terrain flags. There can be up to 10 of these. diff --git a/data/alien/units.ruleset b/data/alien/units.ruleset index b0dc2ec4db..14ec5eadca 100644 --- a/data/alien/units.ruleset +++ b/data/alien/units.ruleset @@ -13,8 +13,8 @@ [datafile] description = "Alien World unit data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [control] ; Names for custom unit type flags. There can be up to 45 of these. diff --git a/data/civ1/actions.ruleset b/data/civ1/actions.ruleset index 9a004ca473..4325a3282a 100644 --- a/data/civ1/actions.ruleset +++ b/data/civ1/actions.ruleset @@ -11,8 +11,8 @@ [datafile] description = "Civ1 actions data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [auto_attack] ; An auto attack may be triggered when another unit moves to an adjacent diff --git a/data/civ1/buildings.ruleset b/data/civ1/buildings.ruleset index 4b3ab60a7c..4f2dcf69b0 100644 --- a/data/civ1/buildings.ruleset +++ b/data/civ1/buildings.ruleset @@ -12,8 +12,8 @@ [datafile] description = "Civ1 buildings data for Freeciv (approximate)" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [control] diff --git a/data/civ1/cities.ruleset b/data/civ1/cities.ruleset index 91f400ac1c..f6cc37207b 100644 --- a/data/civ1/cities.ruleset +++ b/data/civ1/cities.ruleset @@ -9,8 +9,8 @@ [datafile] description = "Cities data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 ; /* <-- avoid gettext warnings ; diff --git a/data/civ1/effects.ruleset b/data/civ1/effects.ruleset index 463c56c3f3..2421c792de 100644 --- a/data/civ1/effects.ruleset +++ b/data/civ1/effects.ruleset @@ -11,8 +11,8 @@ [datafile] description = "Civ1 effects data for Freeciv (approximate)" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 ; /* <-- avoid gettext warnings ; diff --git a/data/civ1/game.ruleset b/data/civ1/game.ruleset index 1633a00081..6e8cf4512a 100644 --- a/data/civ1/game.ruleset +++ b/data/civ1/game.ruleset @@ -11,8 +11,8 @@ [datafile] description = "Civ1-style game rules for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 ; This section contains meta information for freeciv-ruledit to recreate the ruleset ; file in a form wanted. These have no in-game effect whatsoever diff --git a/data/civ1/governments.ruleset b/data/civ1/governments.ruleset index 6e4df390bb..07e3428ad2 100644 --- a/data/civ1/governments.ruleset +++ b/data/civ1/governments.ruleset @@ -14,8 +14,8 @@ [datafile] description = "Civilization I governments data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [governments] during_revolution = "Anarchy" diff --git a/data/civ1/nations.ruleset b/data/civ1/nations.ruleset index 6f126d4f42..a65cba0ac5 100644 --- a/data/civ1/nations.ruleset +++ b/data/civ1/nations.ruleset @@ -11,8 +11,8 @@ [datafile] description = "Civ1-equivalent nations data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 ; This section contains meta information for freeciv-ruledit and freeciv-ruleup ; to recreate the ruleset file in a form wanted. diff --git a/data/civ1/styles.ruleset b/data/civ1/styles.ruleset index 33ae2be3d2..8e99f1989c 100644 --- a/data/civ1/styles.ruleset +++ b/data/civ1/styles.ruleset @@ -9,8 +9,8 @@ [datafile] description = "Nation theme data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 ; /* <-- avoid gettext warnings ; diff --git a/data/civ1/techs.ruleset b/data/civ1/techs.ruleset index b75f08eeaa..97225d7a61 100644 --- a/data/civ1/techs.ruleset +++ b/data/civ1/techs.ruleset @@ -9,8 +9,8 @@ [datafile] description = "Civ1-style technology data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [control] ; Names for custom tech flags. There can be up to 8 of these. diff --git a/data/civ1/terrain.ruleset b/data/civ1/terrain.ruleset index d58575739f..68c56d9a0b 100644 --- a/data/civ1/terrain.ruleset +++ b/data/civ1/terrain.ruleset @@ -12,8 +12,8 @@ [datafile] description = "Civ1 tile_type data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [control] ; Names for custom terrain flags. There can be up to 10 of these. diff --git a/data/civ1/units.ruleset b/data/civ1/units.ruleset index 92c040d458..fe68589c28 100644 --- a/data/civ1/units.ruleset +++ b/data/civ1/units.ruleset @@ -10,8 +10,8 @@ [datafile] description = "Civ1-style unit_type data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [control] ; Names for custom unit type flags. There can be up to 45 of these. diff --git a/data/civ2/actions.ruleset b/data/civ2/actions.ruleset index 98373f269e..0a2385e05f 100644 --- a/data/civ2/actions.ruleset +++ b/data/civ2/actions.ruleset @@ -11,8 +11,8 @@ [datafile] description = "Civ2 actions data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [auto_attack] ; An auto attack may be triggered when another unit moves to an adjacent diff --git a/data/civ2/buildings.ruleset b/data/civ2/buildings.ruleset index ed9e72dab8..dd488f7908 100644 --- a/data/civ2/buildings.ruleset +++ b/data/civ2/buildings.ruleset @@ -12,8 +12,8 @@ [datafile] description = "Civ2 buildings data for Freeciv (incomplete)" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [control] diff --git a/data/civ2/cities.ruleset b/data/civ2/cities.ruleset index 91f400ac1c..f6cc37207b 100644 --- a/data/civ2/cities.ruleset +++ b/data/civ2/cities.ruleset @@ -9,8 +9,8 @@ [datafile] description = "Cities data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 ; /* <-- avoid gettext warnings ; diff --git a/data/civ2/effects.ruleset b/data/civ2/effects.ruleset index 6fed4172a0..b09bed0202 100644 --- a/data/civ2/effects.ruleset +++ b/data/civ2/effects.ruleset @@ -11,8 +11,8 @@ [datafile] description = "Civ2 effects data for Freeciv (incomplete)" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 ; /* <-- avoid gettext warnings ; diff --git a/data/civ2/game.ruleset b/data/civ2/game.ruleset index a76fb57433..0a098b307b 100644 --- a/data/civ2/game.ruleset +++ b/data/civ2/game.ruleset @@ -11,8 +11,8 @@ [datafile] description = "Civ2-style game rules for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 ; This section contains meta information for freeciv-ruledit to recreate the ruleset ; file in a form wanted. These have no in-game effect whatsoever diff --git a/data/civ2/governments.ruleset b/data/civ2/governments.ruleset index 2b43b53138..6f237b574f 100644 --- a/data/civ2/governments.ruleset +++ b/data/civ2/governments.ruleset @@ -12,8 +12,8 @@ [datafile] description = "Civ2 style governments data for Freeciv (Fundamentalism incomplete)" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [governments] during_revolution = "Anarchy" diff --git a/data/civ2/nations.ruleset b/data/civ2/nations.ruleset index f3cfd99b1e..dc6936ed04 100644 --- a/data/civ2/nations.ruleset +++ b/data/civ2/nations.ruleset @@ -13,8 +13,8 @@ [datafile] description = "Civ2-equivalent nations data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 ; This section contains meta information for freeciv-ruledit and freeciv-ruleup ; to recreate the ruleset file in a form wanted. diff --git a/data/civ2/styles.ruleset b/data/civ2/styles.ruleset index 33ae2be3d2..8e99f1989c 100644 --- a/data/civ2/styles.ruleset +++ b/data/civ2/styles.ruleset @@ -9,8 +9,8 @@ [datafile] description = "Nation theme data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 ; /* <-- avoid gettext warnings ; diff --git a/data/civ2/techs.ruleset b/data/civ2/techs.ruleset index 2cbf4af0b2..57d0e1a118 100644 --- a/data/civ2/techs.ruleset +++ b/data/civ2/techs.ruleset @@ -9,8 +9,8 @@ [datafile] description = "Civ2 technology data for Freeciv (incomplete)" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [control] ; Names for custom tech flags. There can be up to 8 of these. diff --git a/data/civ2/terrain.ruleset b/data/civ2/terrain.ruleset index fc62fccc49..f343c2d173 100644 --- a/data/civ2/terrain.ruleset +++ b/data/civ2/terrain.ruleset @@ -12,8 +12,8 @@ [datafile] description = "Civ2 tile_type data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [control] ; Names for custom terrain flags. There can be up to 10 of these. diff --git a/data/civ2/units.ruleset b/data/civ2/units.ruleset index bf9051c73a..0cd1f23f4b 100644 --- a/data/civ2/units.ruleset +++ b/data/civ2/units.ruleset @@ -10,8 +10,8 @@ [datafile] description = "Civ2 unit_type data for Freeciv (approximate)" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [control] ; Names for custom unit type flags. There can be up to 45 of these. diff --git a/data/civ2civ3/actions.ruleset b/data/civ2civ3/actions.ruleset index 4eb8bda48a..1bbed4155d 100644 --- a/data/civ2civ3/actions.ruleset +++ b/data/civ2civ3/actions.ruleset @@ -11,8 +11,8 @@ [datafile] description = "Civ2Civ3 actions data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 [auto_attack] ; An auto attack may be triggered when another unit moves to an adjacent diff --git a/data/civ2civ3/buildings.ruleset b/data/civ2civ3/buildings.ruleset index 685357493a..129600c001 100644 --- a/data/civ2civ3/buildings.ruleset +++ b/data/civ2civ3/buildings.ruleset @@ -12,8 +12,8 @@ [datafile] description = "Civ2Civ3 buildings data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 [control] diff --git a/data/civ2civ3/cities.ruleset b/data/civ2civ3/cities.ruleset index 782512e442..a3f60dd96b 100644 --- a/data/civ2civ3/cities.ruleset +++ b/data/civ2civ3/cities.ruleset @@ -9,8 +9,8 @@ [datafile] description = "Civ2Civ3 cities data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 ; /* <-- avoid gettext warnings ; diff --git a/data/civ2civ3/effects.ruleset b/data/civ2civ3/effects.ruleset index bbb9b4ee1a..5e511e1326 100644 --- a/data/civ2civ3/effects.ruleset +++ b/data/civ2civ3/effects.ruleset @@ -11,8 +11,8 @@ [datafile] description = "Civ2Civ3 effects data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 ; /* <-- avoid gettext warnings ; diff --git a/data/civ2civ3/game.ruleset b/data/civ2civ3/game.ruleset index d91c8952bb..1f59592aeb 100644 --- a/data/civ2civ3/game.ruleset +++ b/data/civ2civ3/game.ruleset @@ -11,8 +11,8 @@ [datafile] description = "Civ2Civ3 game rules for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 ; This section contains meta information for freeciv-ruledit to recreate the ruleset ; file in a form wanted. These have no in-game effect whatsoever diff --git a/data/civ2civ3/governments.ruleset b/data/civ2civ3/governments.ruleset index a6c1893cf3..d117507067 100644 --- a/data/civ2civ3/governments.ruleset +++ b/data/civ2civ3/governments.ruleset @@ -12,8 +12,8 @@ [datafile] description = "Civ2Civ3 governments data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 [governments] during_revolution = "Anarchy" diff --git a/data/civ2civ3/nations.ruleset b/data/civ2civ3/nations.ruleset index 660e8377f5..81b8f175c3 100644 --- a/data/civ2civ3/nations.ruleset +++ b/data/civ2civ3/nations.ruleset @@ -9,8 +9,8 @@ [datafile] description = "Default nations data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 ; This section contains meta information for freeciv-ruledit and freeciv-ruleup ; to recreate the ruleset file in a form wanted. diff --git a/data/civ2civ3/styles.ruleset b/data/civ2civ3/styles.ruleset index fd8775bbdd..1c09aabbd9 100644 --- a/data/civ2civ3/styles.ruleset +++ b/data/civ2civ3/styles.ruleset @@ -9,8 +9,8 @@ [datafile] description = "Nation theme data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 ; /* <-- avoid gettext warnings ; diff --git a/data/civ2civ3/techs.ruleset b/data/civ2civ3/techs.ruleset index b42d888011..88376f4338 100644 --- a/data/civ2civ3/techs.ruleset +++ b/data/civ2civ3/techs.ruleset @@ -9,8 +9,8 @@ [datafile] description = "Civ2Civ3 technology data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 [control] ; Names for custom tech flags. There can be up to 8 of these. diff --git a/data/civ2civ3/terrain.ruleset b/data/civ2civ3/terrain.ruleset index 8f80ae7bcf..847aae5f6b 100644 --- a/data/civ2civ3/terrain.ruleset +++ b/data/civ2civ3/terrain.ruleset @@ -12,8 +12,8 @@ [datafile] description = "Civ2Civ3 tile_type data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 [control] ; Names for custom terrain flags. There can be up to 10 of these. diff --git a/data/civ2civ3/units.ruleset b/data/civ2civ3/units.ruleset index 89805b8dc1..81bb6804cf 100644 --- a/data/civ2civ3/units.ruleset +++ b/data/civ2civ3/units.ruleset @@ -16,8 +16,8 @@ [datafile] description = "Civ2Civ3 unit_type data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 [control] ; Names for custom unit type flags. There can be up to 45 of these. diff --git a/data/classic/actions.ruleset b/data/classic/actions.ruleset index 6c52fd74f4..b9f09a248f 100644 --- a/data/classic/actions.ruleset +++ b/data/classic/actions.ruleset @@ -12,8 +12,8 @@ [datafile] description = "Classic actions data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 [auto_attack] ; An auto attack may be triggered when another unit moves to an adjacent diff --git a/data/classic/buildings.ruleset b/data/classic/buildings.ruleset index 9a1500a711..71997809cb 100644 --- a/data/classic/buildings.ruleset +++ b/data/classic/buildings.ruleset @@ -12,8 +12,8 @@ [datafile] description = "Classic buildings data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 [control] diff --git a/data/classic/cities.ruleset b/data/classic/cities.ruleset index e80ac1ec33..03f017bc6a 100644 --- a/data/classic/cities.ruleset +++ b/data/classic/cities.ruleset @@ -9,8 +9,8 @@ [datafile] description = "Classic cities data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 ; /* <-- avoid gettext warnings ; diff --git a/data/classic/effects.ruleset b/data/classic/effects.ruleset index 015236a1c8..6642091c25 100644 --- a/data/classic/effects.ruleset +++ b/data/classic/effects.ruleset @@ -11,8 +11,8 @@ [datafile] description = "Classic effects data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 ; /* <-- avoid gettext warnings ; diff --git a/data/classic/game.ruleset b/data/classic/game.ruleset index a865e9ccb0..8edb487b3d 100644 --- a/data/classic/game.ruleset +++ b/data/classic/game.ruleset @@ -11,8 +11,8 @@ [datafile] description = "Classic game rules for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 ; This section contains meta information for freeciv-ruledit to recreate the ruleset ; file in a form wanted. These have no in-game effect whatsoever diff --git a/data/classic/governments.ruleset b/data/classic/governments.ruleset index a8a65d3c75..1ded7465c0 100644 --- a/data/classic/governments.ruleset +++ b/data/classic/governments.ruleset @@ -12,8 +12,8 @@ [datafile] description = "Classic governments data for Freeciv (as Civ2, minus fundamentalism)" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 [governments] during_revolution = "Anarchy" diff --git a/data/classic/nations.ruleset b/data/classic/nations.ruleset index 9a3ee15805..141e6ad585 100644 --- a/data/classic/nations.ruleset +++ b/data/classic/nations.ruleset @@ -9,8 +9,8 @@ [datafile] description = "Classic nations data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 ; This section contains meta information for freeciv-ruledit and freeciv-ruleup ; to recreate the ruleset file in a form wanted. diff --git a/data/classic/styles.ruleset b/data/classic/styles.ruleset index 483f22ab73..7648ea28d7 100644 --- a/data/classic/styles.ruleset +++ b/data/classic/styles.ruleset @@ -9,8 +9,8 @@ [datafile] description = "Classic nation theme data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 ; /* <-- avoid gettext warnings ; diff --git a/data/classic/techs.ruleset b/data/classic/techs.ruleset index 4a69989b63..6c1eb59ccb 100644 --- a/data/classic/techs.ruleset +++ b/data/classic/techs.ruleset @@ -9,8 +9,8 @@ [datafile] description = "Classic technology data for Freeciv (as Civ2, minus a few)" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 [control] ; Names for custom tech flags. There can be up to 8 of these. diff --git a/data/classic/terrain.ruleset b/data/classic/terrain.ruleset index 47b23f8305..c81410148d 100644 --- a/data/classic/terrain.ruleset +++ b/data/classic/terrain.ruleset @@ -12,8 +12,8 @@ [datafile] description = "Classic tile_type data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 [control] ; Names for custom terrain flags. There can be up to 10 of these. diff --git a/data/classic/units.ruleset b/data/classic/units.ruleset index 74a9468a29..a2fab15635 100644 --- a/data/classic/units.ruleset +++ b/data/classic/units.ruleset @@ -16,8 +16,8 @@ [datafile] description = "Classic unit_type data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 [control] ; Names for custom unit type flags. There can be up to 45 of these. diff --git a/data/goldkeep/actions.ruleset b/data/goldkeep/actions.ruleset index 4831714e79..880d65aeac 100644 --- a/data/goldkeep/actions.ruleset +++ b/data/goldkeep/actions.ruleset @@ -15,8 +15,8 @@ [datafile] description = "Goldkeep actions data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [auto_attack] ; An auto attack may be triggered when another unit moves to an adjacent diff --git a/data/goldkeep/buildings.ruleset b/data/goldkeep/buildings.ruleset index 74af5e5a30..3816867e9c 100644 --- a/data/goldkeep/buildings.ruleset +++ b/data/goldkeep/buildings.ruleset @@ -14,8 +14,8 @@ [datafile] description = "Goldkeep buildings data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [control] diff --git a/data/goldkeep/cities.ruleset b/data/goldkeep/cities.ruleset index 6db755da67..51ecd8b727 100644 --- a/data/goldkeep/cities.ruleset +++ b/data/goldkeep/cities.ruleset @@ -11,8 +11,8 @@ [datafile] description = "Goldkeep cities data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 ; /* <-- avoid gettext warnings ; diff --git a/data/goldkeep/effects.ruleset b/data/goldkeep/effects.ruleset index 6a23a8675c..c535e8ec4f 100644 --- a/data/goldkeep/effects.ruleset +++ b/data/goldkeep/effects.ruleset @@ -14,8 +14,8 @@ [datafile] description = "Goldkeep effects data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 ; /* <-- avoid gettext warnings ; diff --git a/data/goldkeep/game.ruleset b/data/goldkeep/game.ruleset index d0b6ca68db..cb7d33b974 100644 --- a/data/goldkeep/game.ruleset +++ b/data/goldkeep/game.ruleset @@ -14,8 +14,8 @@ [datafile] description = "Goldkeep game rules for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 ; This section contains meta information for freeciv-ruledit to recreate the ruleset ; file in a form wanted. These have no in-game effect whatsoever diff --git a/data/goldkeep/governments.ruleset b/data/goldkeep/governments.ruleset index 5b0ed5c7af..4726e71467 100644 --- a/data/goldkeep/governments.ruleset +++ b/data/goldkeep/governments.ruleset @@ -14,8 +14,8 @@ [datafile] description = "Goldkeep governments data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [governments] during_revolution = "Anarchy" diff --git a/data/goldkeep/nations.ruleset b/data/goldkeep/nations.ruleset index 801974b1b0..dce489ddff 100644 --- a/data/goldkeep/nations.ruleset +++ b/data/goldkeep/nations.ruleset @@ -9,8 +9,8 @@ [datafile] description = "Goldkeep nations data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 ; This section contains meta information for freeciv-ruledit and freeciv-ruleup ; to recreate the ruleset file in a form wanted. diff --git a/data/goldkeep/styles.ruleset b/data/goldkeep/styles.ruleset index ab11ad9aff..90b6315151 100644 --- a/data/goldkeep/styles.ruleset +++ b/data/goldkeep/styles.ruleset @@ -11,8 +11,8 @@ [datafile] description = "Goldkeep nation theme data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 ; /* <-- avoid gettext warnings ; diff --git a/data/goldkeep/techs.ruleset b/data/goldkeep/techs.ruleset index c3a7d8d1c8..20cd32adba 100644 --- a/data/goldkeep/techs.ruleset +++ b/data/goldkeep/techs.ruleset @@ -11,8 +11,8 @@ [datafile] description = "Goldkeep technology data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [control] ; Names for custom tech flags. There can be up to 8 of these. diff --git a/data/goldkeep/terrain.ruleset b/data/goldkeep/terrain.ruleset index 68f3284047..ce1c9afd61 100644 --- a/data/goldkeep/terrain.ruleset +++ b/data/goldkeep/terrain.ruleset @@ -14,8 +14,8 @@ [datafile] description = "Goldkeep terrain data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [control] ; Names for custom terrain flags. There can be up to 10 of these. diff --git a/data/goldkeep/units.ruleset b/data/goldkeep/units.ruleset index 9f686287ef..08880ff1de 100644 --- a/data/goldkeep/units.ruleset +++ b/data/goldkeep/units.ruleset @@ -19,8 +19,8 @@ [datafile] description = "Goldkeep unit data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [control] ; Names for custom unit type flags. There can be up to 45 of these. diff --git a/data/granularity/actions.ruleset b/data/granularity/actions.ruleset index e67c51acfa..667c956984 100644 --- a/data/granularity/actions.ruleset +++ b/data/granularity/actions.ruleset @@ -12,8 +12,8 @@ [datafile] description = "Granularity actions data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [auto_attack] ; An auto attack may be triggered when another unit moves to an adjacent diff --git a/data/granularity/buildings.ruleset b/data/granularity/buildings.ruleset index 33d2e4d0af..b014b7be49 100644 --- a/data/granularity/buildings.ruleset +++ b/data/granularity/buildings.ruleset @@ -12,8 +12,8 @@ [datafile] description = "Granularity buildings data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [control] diff --git a/data/granularity/cities.ruleset b/data/granularity/cities.ruleset index 6027d33cd9..0921e09c41 100644 --- a/data/granularity/cities.ruleset +++ b/data/granularity/cities.ruleset @@ -9,8 +9,8 @@ [datafile] description = "Granularity cities data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 ; /* <-- avoid gettext warnings ; diff --git a/data/granularity/effects.ruleset b/data/granularity/effects.ruleset index cd4ed40c9a..c1defbd4c5 100644 --- a/data/granularity/effects.ruleset +++ b/data/granularity/effects.ruleset @@ -11,8 +11,8 @@ [datafile] description = "Granularity effects data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 ; /* <-- avoid gettext warnings ; diff --git a/data/granularity/game.ruleset b/data/granularity/game.ruleset index e85822b276..57060f0117 100644 --- a/data/granularity/game.ruleset +++ b/data/granularity/game.ruleset @@ -11,8 +11,8 @@ [datafile] description = "Granularity game rules for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 ; This section contains meta information for freeciv-ruledit to recreate the ruleset ; file in a form wanted. These have no in-game effect whatsoever diff --git a/data/granularity/governments.ruleset b/data/granularity/governments.ruleset index 87ae688c58..d652b78037 100644 --- a/data/granularity/governments.ruleset +++ b/data/granularity/governments.ruleset @@ -12,8 +12,8 @@ [datafile] description = "Granularity governments data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [governments] during_revolution = "Anarchy" diff --git a/data/granularity/nations.ruleset b/data/granularity/nations.ruleset index 6d920d19c4..7edf158999 100644 --- a/data/granularity/nations.ruleset +++ b/data/granularity/nations.ruleset @@ -9,8 +9,8 @@ [datafile] description = "Granularity nations data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 ; This section contains meta information for freeciv-ruledit and freeciv-ruleup ; to recreate the ruleset file in a form wanted. diff --git a/data/granularity/styles.ruleset b/data/granularity/styles.ruleset index 8b17a62119..191d47c0a9 100644 --- a/data/granularity/styles.ruleset +++ b/data/granularity/styles.ruleset @@ -9,8 +9,8 @@ [datafile] description = "Granularity nation theme data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 ; /* <-- avoid gettext warnings ; diff --git a/data/granularity/techs.ruleset b/data/granularity/techs.ruleset index 551152728a..c602812dac 100644 --- a/data/granularity/techs.ruleset +++ b/data/granularity/techs.ruleset @@ -9,8 +9,8 @@ [datafile] description = "Granularity technology data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [control] ; Names for custom tech flags. There can be up to 8 of these. diff --git a/data/granularity/terrain.ruleset b/data/granularity/terrain.ruleset index 882c561a46..cd2583a085 100644 --- a/data/granularity/terrain.ruleset +++ b/data/granularity/terrain.ruleset @@ -12,8 +12,8 @@ [datafile] description = "Granularity tile_type data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [control] ; Names for custom terrain flags. There can be up to 10 of these. diff --git a/data/granularity/units.ruleset b/data/granularity/units.ruleset index 0d38fe768b..2babde848c 100644 --- a/data/granularity/units.ruleset +++ b/data/granularity/units.ruleset @@ -16,8 +16,8 @@ [datafile] description = "Granularity unit_type data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [control] ; Names for custom unit type flags. There can be up to 45 of these. diff --git a/data/multiplayer/actions.ruleset b/data/multiplayer/actions.ruleset index c2c54836b5..8ed87ebf99 100644 --- a/data/multiplayer/actions.ruleset +++ b/data/multiplayer/actions.ruleset @@ -12,8 +12,8 @@ [datafile] description = "Multiplayer actions data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 [auto_attack] ; An auto attack may be triggered when another unit moves to an adjacent diff --git a/data/multiplayer/buildings.ruleset b/data/multiplayer/buildings.ruleset index 265d15dc24..55a60e33ea 100644 --- a/data/multiplayer/buildings.ruleset +++ b/data/multiplayer/buildings.ruleset @@ -11,8 +11,8 @@ [datafile] description = "Multiplayer buildings data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 [control] diff --git a/data/multiplayer/cities.ruleset b/data/multiplayer/cities.ruleset index ee34596f38..bfff20c2c2 100644 --- a/data/multiplayer/cities.ruleset +++ b/data/multiplayer/cities.ruleset @@ -8,8 +8,8 @@ [datafile] description = "Cities data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 ; /* <-- avoid gettext warnings ; diff --git a/data/multiplayer/effects.ruleset b/data/multiplayer/effects.ruleset index ef0f7df198..04b6342924 100644 --- a/data/multiplayer/effects.ruleset +++ b/data/multiplayer/effects.ruleset @@ -11,8 +11,8 @@ [datafile] description = "Multiplayer effects data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 ; /* <-- avoid gettext warnings ; diff --git a/data/multiplayer/game.ruleset b/data/multiplayer/game.ruleset index 8a0028644a..1e4c0c694b 100644 --- a/data/multiplayer/game.ruleset +++ b/data/multiplayer/game.ruleset @@ -11,8 +11,8 @@ [datafile] description = "Multiplayer game rules for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 ; This section contains meta information for freeciv-ruledit to recreate the ruleset ; file in a form wanted. These have no in-game effect whatsoever diff --git a/data/multiplayer/governments.ruleset b/data/multiplayer/governments.ruleset index fd554b4b3f..3e296f3989 100644 --- a/data/multiplayer/governments.ruleset +++ b/data/multiplayer/governments.ruleset @@ -12,8 +12,8 @@ [datafile] description = "Multiplayer governments data for Freeciv (as Civ2, minus fundamentalism)" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 [governments] during_revolution = "Anarchy" diff --git a/data/multiplayer/nations.ruleset b/data/multiplayer/nations.ruleset index 761777fc52..0b1a02f170 100644 --- a/data/multiplayer/nations.ruleset +++ b/data/multiplayer/nations.ruleset @@ -9,8 +9,8 @@ [datafile] description = "Multiplayer nations data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 ; This section contains meta information for freeciv-ruledit and freeciv-ruleup ; to recreate the ruleset file in a form wanted. diff --git a/data/multiplayer/styles.ruleset b/data/multiplayer/styles.ruleset index fd8775bbdd..1c09aabbd9 100644 --- a/data/multiplayer/styles.ruleset +++ b/data/multiplayer/styles.ruleset @@ -9,8 +9,8 @@ [datafile] description = "Nation theme data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 ; /* <-- avoid gettext warnings ; diff --git a/data/multiplayer/techs.ruleset b/data/multiplayer/techs.ruleset index 62a558fc87..5689e1d6f9 100644 --- a/data/multiplayer/techs.ruleset +++ b/data/multiplayer/techs.ruleset @@ -9,8 +9,8 @@ [datafile] description = "Multiplayer technology data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 [control] ; Names for custom tech flags. There can be up to 8 of these. diff --git a/data/multiplayer/terrain.ruleset b/data/multiplayer/terrain.ruleset index bb039bc9d9..fe467ed033 100644 --- a/data/multiplayer/terrain.ruleset +++ b/data/multiplayer/terrain.ruleset @@ -12,8 +12,8 @@ [datafile] description = "Multiplayer terrain data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 [control] ; Names for custom terrain flags. There can be up to 10 of these. diff --git a/data/multiplayer/units.ruleset b/data/multiplayer/units.ruleset index be8a843f81..5adba69eee 100644 --- a/data/multiplayer/units.ruleset +++ b/data/multiplayer/units.ruleset @@ -16,8 +16,8 @@ [datafile] description = "Unit definitions for the multiplayer ruleset." -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 [control] ; Names for custom unit type flags. There can be up to 45 of these. diff --git a/data/sandbox/actions.ruleset b/data/sandbox/actions.ruleset index 063f6881aa..dc7e7e6f07 100644 --- a/data/sandbox/actions.ruleset +++ b/data/sandbox/actions.ruleset @@ -12,8 +12,8 @@ [datafile] description = "Sandbox actions data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [auto_attack] ; An auto attack may be triggered when another unit moves to an adjacent diff --git a/data/sandbox/buildings.ruleset b/data/sandbox/buildings.ruleset index 881d2f98e9..43171c233b 100644 --- a/data/sandbox/buildings.ruleset +++ b/data/sandbox/buildings.ruleset @@ -12,8 +12,8 @@ [datafile] description = "Sandbox buildings data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [control] diff --git a/data/sandbox/cities.ruleset b/data/sandbox/cities.ruleset index bb91cb2ead..1965015533 100644 --- a/data/sandbox/cities.ruleset +++ b/data/sandbox/cities.ruleset @@ -9,8 +9,8 @@ [datafile] description = "Sandbox cities data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 ; /* <-- avoid gettext warnings ; diff --git a/data/sandbox/effects.ruleset b/data/sandbox/effects.ruleset index aecc7aa272..b33cfdd1b9 100644 --- a/data/sandbox/effects.ruleset +++ b/data/sandbox/effects.ruleset @@ -11,8 +11,8 @@ [datafile] description = "Sandbox effects data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 ; /* <-- avoid gettext warnings ; diff --git a/data/sandbox/game.ruleset b/data/sandbox/game.ruleset index ca2f547db4..2ca751e880 100644 --- a/data/sandbox/game.ruleset +++ b/data/sandbox/game.ruleset @@ -11,8 +11,8 @@ [datafile] description = "Sandbox game rules for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 ; This section contains meta information for freeciv-ruledit to recreate the ruleset ; file in a form wanted. These have no in-game effect whatsoever diff --git a/data/sandbox/governments.ruleset b/data/sandbox/governments.ruleset index 36c239314c..8e8137e5da 100644 --- a/data/sandbox/governments.ruleset +++ b/data/sandbox/governments.ruleset @@ -12,8 +12,8 @@ [datafile] description = "Sandbox governments data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [governments] during_revolution = "Anarchy" diff --git a/data/sandbox/nations.ruleset b/data/sandbox/nations.ruleset index e84e6ad893..5a509538f7 100644 --- a/data/sandbox/nations.ruleset +++ b/data/sandbox/nations.ruleset @@ -9,8 +9,8 @@ [datafile] description = "Sandbox nations data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 ; This section contains meta information for freeciv-ruledit and freeciv-ruleup ; to recreate the ruleset file in a form wanted. diff --git a/data/sandbox/styles.ruleset b/data/sandbox/styles.ruleset index 8814d51d72..5696235825 100644 --- a/data/sandbox/styles.ruleset +++ b/data/sandbox/styles.ruleset @@ -9,8 +9,8 @@ [datafile] description = "Sandbox nation theme data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 ; /* <-- avoid gettext warnings ; diff --git a/data/sandbox/techs.ruleset b/data/sandbox/techs.ruleset index 1752c9c45e..0e2fdc452e 100644 --- a/data/sandbox/techs.ruleset +++ b/data/sandbox/techs.ruleset @@ -9,8 +9,8 @@ [datafile] description = "Sandbox technology data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [control] ; Names for custom tech flags. There can be up to 8 of these. diff --git a/data/sandbox/terrain.ruleset b/data/sandbox/terrain.ruleset index 29bb5bd776..013250443a 100644 --- a/data/sandbox/terrain.ruleset +++ b/data/sandbox/terrain.ruleset @@ -12,8 +12,8 @@ [datafile] description = "Sandbox terrain data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [control] ; Names for custom terrain flags. There can be up to 10 of these. diff --git a/data/sandbox/units.ruleset b/data/sandbox/units.ruleset index d99dc56b5e..04eba27b75 100644 --- a/data/sandbox/units.ruleset +++ b/data/sandbox/units.ruleset @@ -16,8 +16,8 @@ [datafile] description = "Sandbox Units data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [control] ; Names for custom unit type flags. There can be up to 45 of these. diff --git a/data/stub/actions.ruleset b/data/stub/actions.ruleset index a191cd49f6..e954425cbc 100644 --- a/data/stub/actions.ruleset +++ b/data/stub/actions.ruleset @@ -4,8 +4,8 @@ [datafile] description = " actions data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [auto_attack] ; An auto attack may be triggered when another unit moves to an adjacent diff --git a/data/stub/buildings.ruleset b/data/stub/buildings.ruleset index d0592f1bb1..547a385db3 100644 --- a/data/stub/buildings.ruleset +++ b/data/stub/buildings.ruleset @@ -3,8 +3,8 @@ [datafile] description = " buildings data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [control] diff --git a/data/stub/cities.ruleset b/data/stub/cities.ruleset index f61d0f24e9..6380f2ad1b 100644 --- a/data/stub/cities.ruleset +++ b/data/stub/cities.ruleset @@ -3,8 +3,8 @@ [datafile] description = " cities data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 ; /* <-- avoid gettext warnings ; diff --git a/data/stub/effects.ruleset b/data/stub/effects.ruleset index fb9b31b72c..9fe122258f 100644 --- a/data/stub/effects.ruleset +++ b/data/stub/effects.ruleset @@ -3,8 +3,8 @@ [datafile] description = " effects data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 ; /* <-- avoid gettext warnings ; diff --git a/data/stub/game.ruleset b/data/stub/game.ruleset index d02bae435c..fbdcc4f213 100644 --- a/data/stub/game.ruleset +++ b/data/stub/game.ruleset @@ -3,8 +3,8 @@ [datafile] description = " game rules for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 ; This section contains meta information for freeciv-ruledit to recreate the ruleset ; file in a form wanted. These have no in-game effect whatsoever diff --git a/data/stub/governments.ruleset b/data/stub/governments.ruleset index 8f69737c9a..ea555ff283 100644 --- a/data/stub/governments.ruleset +++ b/data/stub/governments.ruleset @@ -3,8 +3,8 @@ [datafile] description = " governments data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [governments] during_revolution = "Anarchy" diff --git a/data/stub/nations.ruleset b/data/stub/nations.ruleset index 051859bfcd..ea86080733 100644 --- a/data/stub/nations.ruleset +++ b/data/stub/nations.ruleset @@ -3,8 +3,8 @@ [datafile] description = " nations data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 ; This section contains meta information for freeciv-ruledit and freeciv-ruleup ; to recreate the ruleset file in a form wanted. diff --git a/data/stub/styles.ruleset b/data/stub/styles.ruleset index d91b56ff91..9570ca6bb1 100644 --- a/data/stub/styles.ruleset +++ b/data/stub/styles.ruleset @@ -3,8 +3,8 @@ [datafile] description = " nation theme data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 ; /* <-- avoid gettext warnings ; diff --git a/data/stub/techs.ruleset b/data/stub/techs.ruleset index 791cbe2480..ebce214395 100644 --- a/data/stub/techs.ruleset +++ b/data/stub/techs.ruleset @@ -3,8 +3,8 @@ [datafile] description = " technology data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [control] ; Names for custom tech flags. There can be up to 8 of these. diff --git a/data/stub/terrain.ruleset b/data/stub/terrain.ruleset index 06a84d99e9..b1aa9c75c8 100644 --- a/data/stub/terrain.ruleset +++ b/data/stub/terrain.ruleset @@ -3,8 +3,8 @@ [datafile] description = " tile_type data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [control] ; Names for custom terrain flags. There can be up to 10 of these. diff --git a/data/stub/units.ruleset b/data/stub/units.ruleset index 98b3d8cb0a..8c59963e62 100644 --- a/data/stub/units.ruleset +++ b/data/stub/units.ruleset @@ -3,8 +3,8 @@ [datafile] description = " unit_type data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" +format_version = 40 [control] ; Names for custom unit type flags. There can be up to 45 of these. diff --git a/data/webperimental/actions.ruleset b/data/webperimental/actions.ruleset index aea4b9b5b3..36dfa0ba5e 100644 --- a/data/webperimental/actions.ruleset +++ b/data/webperimental/actions.ruleset @@ -12,8 +12,8 @@ [datafile] description = "Experimental web-client actions data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 [auto_attack] ; An auto attack may be triggered when another unit moves to an adjacent diff --git a/data/webperimental/buildings.ruleset b/data/webperimental/buildings.ruleset index 85bf98e304..29258c953a 100644 --- a/data/webperimental/buildings.ruleset +++ b/data/webperimental/buildings.ruleset @@ -12,8 +12,8 @@ [datafile] description = "Experimental web-client buildings data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 [control] diff --git a/data/webperimental/cities.ruleset b/data/webperimental/cities.ruleset index 3e6a6c13be..d0b9dd4e65 100644 --- a/data/webperimental/cities.ruleset +++ b/data/webperimental/cities.ruleset @@ -9,8 +9,8 @@ [datafile] description = "Experimental web-client city rules for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 ; /* <-- avoid gettext warnings ; diff --git a/data/webperimental/effects.ruleset b/data/webperimental/effects.ruleset index db31c65d5e..cedec60a2b 100644 --- a/data/webperimental/effects.ruleset +++ b/data/webperimental/effects.ruleset @@ -11,8 +11,8 @@ [datafile] description = "Experimental web-client effects data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 ; /* <-- avoid gettext warnings ; diff --git a/data/webperimental/game.ruleset b/data/webperimental/game.ruleset index f28768eb4d..f8ee181912 100644 --- a/data/webperimental/game.ruleset +++ b/data/webperimental/game.ruleset @@ -11,8 +11,8 @@ [datafile] description = "Experimental web-client game rules for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 ; This section contains meta information for freeciv-ruledit to recreate the ruleset ; file in a form wanted. These have no in-game effect whatsoever diff --git a/data/webperimental/governments.ruleset b/data/webperimental/governments.ruleset index aff04035c7..ecd7e33073 100644 --- a/data/webperimental/governments.ruleset +++ b/data/webperimental/governments.ruleset @@ -12,8 +12,8 @@ [datafile] description = "Experimental web-client governments data for Freeciv (as Civ2, minus fundamentalism)" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 [governments] during_revolution = "Anarchy" diff --git a/data/webperimental/nations.ruleset b/data/webperimental/nations.ruleset index 97929aaf1e..b2c57e6551 100644 --- a/data/webperimental/nations.ruleset +++ b/data/webperimental/nations.ruleset @@ -9,8 +9,8 @@ [datafile] description = "Experimental web-client nations data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 ; This section contains meta information for freeciv-ruledit and freeciv-ruleup ; to recreate the ruleset file in a form wanted. diff --git a/data/webperimental/styles.ruleset b/data/webperimental/styles.ruleset index 99d6c49ddb..fb8adee5e3 100644 --- a/data/webperimental/styles.ruleset +++ b/data/webperimental/styles.ruleset @@ -9,8 +9,8 @@ [datafile] description = "Experimental web-client nation theme data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 ; /* <-- avoid gettext warnings ; diff --git a/data/webperimental/techs.ruleset b/data/webperimental/techs.ruleset index 3b2ba3b4bc..9e9328e329 100644 --- a/data/webperimental/techs.ruleset +++ b/data/webperimental/techs.ruleset @@ -9,8 +9,8 @@ [datafile] description = "Experimental web-client technology data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 [control] ; Names for custom tech flags. There can be up to 8 of these. diff --git a/data/webperimental/terrain.ruleset b/data/webperimental/terrain.ruleset index b2bd8184ba..7bf224eaf9 100644 --- a/data/webperimental/terrain.ruleset +++ b/data/webperimental/terrain.ruleset @@ -12,8 +12,8 @@ [datafile] description = "Experimental web-client tile_type data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 [control] ; Names for custom terrain flags. There can be up to 10 of these. diff --git a/data/webperimental/units.ruleset b/data/webperimental/units.ruleset index 550573e477..71ee3af534 100644 --- a/data/webperimental/units.ruleset +++ b/data/webperimental/units.ruleset @@ -16,8 +16,8 @@ [datafile] description = "Experimental web-client unit_type data for Freeciv" -options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" -format_version = 30 +options = "+Freeciv-ruleset-3.3-Devel-2023.Feb.24 web-compatible" +format_version = 40 [control] ; Names for custom unit type flags. There can be up to 45 of these. diff --git a/server/ruleset.h b/server/ruleset.h index fc8504f2e6..647cf7583b 100644 --- a/server/ruleset.h +++ b/server/ruleset.h @@ -17,7 +17,7 @@ extern "C" { #endif /* __cplusplus */ -#define RULESET_CAPABILITIES_BASE "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" +#define RULESET_CAPABILITIES_BASE "+Freeciv-ruleset-3.3-Devel-2023.Feb.24" #ifdef FREECIV_WEB #define RULESET_CAPABILITIES RULESET_CAPABILITIES_BASE " +web-compatible" #else /* FREECIV_WEB */ @@ -26,10 +26,10 @@ extern "C" { /* * Ruleset capabilities acceptable to this program: * - * +Freeciv-3.2-ruleset - * - basic ruleset format for Freeciv versions 3.2.x; required + * +Freeciv-3.3-ruleset + * - basic ruleset format for Freeciv versions 3.3.x; required * - * +Freeciv-ruleset-Devel-YYYY.MMM.DD + * +Freeciv-ruleset-V.V-Devel-YYYY.MMM.DD * - ruleset of the development version at the given date */ @@ -41,7 +41,7 @@ struct conn_list; typedef void (*rs_conversion_logger)(const char *msg); -/* functions */ +/* Functions */ bool load_rulesets(const char *restore, const char *alt, bool compat_mode, rs_conversion_logger logger, bool act, bool buffer_script, bool load_luadata); diff --git a/tools/ruleutil/rulesave.c b/tools/ruleutil/rulesave.c index 1d1fe45a36..c3ab44de4c 100644 --- a/tools/ruleutil/rulesave.c +++ b/tools/ruleutil/rulesave.c @@ -51,8 +51,9 @@ * 10 - Freeciv-3.0 * 20 - Freeciv-3.1 * 30 - Freeciv-3.2 + * 40 - Freeciv-3.3 */ -#define FORMAT_VERSION RSFORMAT_3_2 +#define FORMAT_VERSION RSFORMAT_CURRENT /**********************************************************************//** Create new ruleset section file with common header. -- 2.39.1