From 421e060387f938a043da5a9f8c1e15b63dd6f780 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 9 Jan 2021 01:44:16 +0200 Subject: [PATCH 6/6] Bump ruleset capstr and format_version See osdn #41128 Signed-off-by: Marko Lindqvist --- 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/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/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/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/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/experimental/buildings.ruleset | 4 ++-- data/experimental/cities.ruleset | 4 ++-- data/experimental/effects.ruleset | 4 ++-- data/experimental/game.ruleset | 4 ++-- data/experimental/governments.ruleset | 4 ++-- data/experimental/nations.ruleset | 4 ++-- data/experimental/styles.ruleset | 4 ++-- data/experimental/techs.ruleset | 4 ++-- data/experimental/terrain.ruleset | 4 ++-- data/experimental/units.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/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/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/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/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 | 6 +++--- tools/ruleutil/rulesave.c | 3 ++- 112 files changed, 225 insertions(+), 224 deletions(-) diff --git a/data/alien/buildings.ruleset b/data/alien/buildings.ruleset index 4f90ab1883..74eeadbe12 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/alien/cities.ruleset b/data/alien/cities.ruleset index 115f094834..acd48df43e 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/alien/effects.ruleset b/data/alien/effects.ruleset index 02e2c33fca..1a706a5e7f 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/alien/game.ruleset b/data/alien/game.ruleset index c619c528c8..1bd1da30fd 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; 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 d5252939a7..712142e8c8 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 [governments] during_revolution = "Anarchy" diff --git a/data/alien/nations.ruleset b/data/alien/nations.ruleset index b1f917b256..9b6107aa7e 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; 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/styles.ruleset b/data/alien/styles.ruleset index 534d3741c9..021392a095 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/alien/techs.ruleset b/data/alien/techs.ruleset index d6303cebe8..9c68524298 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 [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 4b1d24252b..d755eaaed7 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 [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 6d55b041bf..e15cc66453 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 [control] ; Names for custom unit type flags. There can be up to 45 of these. diff --git a/data/civ1/buildings.ruleset b/data/civ1/buildings.ruleset index 93c4417cd2..e50df7b26a 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; Below: The individual buildings, one per section. ; (Buildings = City Improvements and Wonders) diff --git a/data/civ1/cities.ruleset b/data/civ1/cities.ruleset index bb0664f66d..8ab87da00e 100644 --- a/data/civ1/cities.ruleset +++ b/data/civ1/cities.ruleset @@ -9,8 +9,8 @@ [datafile] description="Cities data for Freeciv" -options="+Freeciv-ruleset-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/civ1/effects.ruleset b/data/civ1/effects.ruleset index e4da1162c4..d77a8599bf 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/civ1/game.ruleset b/data/civ1/game.ruleset index 15bd3265f6..54402f066c 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; 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 04793cc704..92842dce90 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 [governments] during_revolution="Anarchy" diff --git a/data/civ1/nations.ruleset b/data/civ1/nations.ruleset index fbbdc2de99..eed10464fc 100644 --- a/data/civ1/nations.ruleset +++ b/data/civ1/nations.ruleset @@ -12,8 +12,8 @@ [datafile] description="Civ1-equivalent nations data for Freeciv" -options="+Freeciv-ruleset-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; 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/styles.ruleset b/data/civ1/styles.ruleset index 4761330fa3..56fe0a716c 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/civ1/techs.ruleset b/data/civ1/techs.ruleset index b81f8d7fde..bf76112198 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 [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 21bf42577d..17858d2f4e 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 [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 c6b5933513..e67c47caaa 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 [control] ; Names for custom unit type flags. There can be up to 45 of these. diff --git a/data/civ2/buildings.ruleset b/data/civ2/buildings.ruleset index 6460b57214..cf9bb4d4e1 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/civ2/cities.ruleset b/data/civ2/cities.ruleset index bb0664f66d..8ab87da00e 100644 --- a/data/civ2/cities.ruleset +++ b/data/civ2/cities.ruleset @@ -9,8 +9,8 @@ [datafile] description="Cities data for Freeciv" -options="+Freeciv-ruleset-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/civ2/effects.ruleset b/data/civ2/effects.ruleset index 13f8b758c4..e590781a2a 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/civ2/game.ruleset b/data/civ2/game.ruleset index 46eec553de..cc17d0a0f3 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; 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 66b8ea6592..13f89135a9 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 [governments] during_revolution="Anarchy" diff --git a/data/civ2/nations.ruleset b/data/civ2/nations.ruleset index c934508345..e4c11701ac 100644 --- a/data/civ2/nations.ruleset +++ b/data/civ2/nations.ruleset @@ -14,8 +14,8 @@ [datafile] description="Civ2-equivalent nations data for Freeciv" -options="+Freeciv-ruleset-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; 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/styles.ruleset b/data/civ2/styles.ruleset index 4761330fa3..56fe0a716c 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/civ2/techs.ruleset b/data/civ2/techs.ruleset index ef7f5e7589..c2d393e2b6 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 [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 35c67631a6..bb5b2373d9 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 [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 defd386c80..567d03e1d5 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 [control] ; Names for custom unit type flags. There can be up to 45 of these. diff --git a/data/civ2civ3/buildings.ruleset b/data/civ2civ3/buildings.ruleset index 1fba428c7e..43dbc63b3b 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/civ2civ3/cities.ruleset b/data/civ2civ3/cities.ruleset index dac4b23ce4..b10a086cb5 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/civ2civ3/effects.ruleset b/data/civ2civ3/effects.ruleset index 25a6dcead8..b433c5725b 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/civ2civ3/game.ruleset b/data/civ2civ3/game.ruleset index 18c527a7bc..934988cba2 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 ; 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 d3f72b0fb6..985b70da9f 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 [governments] during_revolution="Anarchy" diff --git a/data/civ2civ3/nations.ruleset b/data/civ2civ3/nations.ruleset index 42799238d1..f6a3814b2e 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 ; 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/styles.ruleset b/data/civ2civ3/styles.ruleset index cc690357f8..17dafccf57 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/civ2civ3/techs.ruleset b/data/civ2civ3/techs.ruleset index 02a4c8719d..c372bb66ff 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 [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 d050369836..94972a0f9a 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 [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 38316021ee..4a7116ef5d 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 [control] ; Names for custom unit type flags. There can be up to 45 of these. diff --git a/data/classic/buildings.ruleset b/data/classic/buildings.ruleset index 7cb4bb8f75..4c3db2a7aa 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/classic/cities.ruleset b/data/classic/cities.ruleset index e2c3579ce8..f3a9997484 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/classic/effects.ruleset b/data/classic/effects.ruleset index 2773f7e956..25a1fbd0d7 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/classic/game.ruleset b/data/classic/game.ruleset index ca3ea4ce38..36f024ba24 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 ; 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 260df9c097..27e1f24b94 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 [governments] during_revolution="Anarchy" diff --git a/data/classic/nations.ruleset b/data/classic/nations.ruleset index 39ca21fd1b..5c617a0220 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 ; 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/styles.ruleset b/data/classic/styles.ruleset index cf5380f63b..74cfe9e0b9 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/classic/techs.ruleset b/data/classic/techs.ruleset index cb2feef7fc..86bbe3eeb8 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 [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 60037e7232..9966495824 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 [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 1eebf4977f..e68125e90a 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 [control] ; Names for custom unit type flags. There can be up to 45 of these. diff --git a/data/experimental/buildings.ruleset b/data/experimental/buildings.ruleset index 37a097de7b..7ad6dfebaa 100644 --- a/data/experimental/buildings.ruleset +++ b/data/experimental/buildings.ruleset @@ -14,8 +14,8 @@ [datafile] description="Experimental buildings data for Freeciv" -options="+Freeciv-ruleset-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/experimental/cities.ruleset b/data/experimental/cities.ruleset index 1ca9951fee..b4f6adc212 100644 --- a/data/experimental/cities.ruleset +++ b/data/experimental/cities.ruleset @@ -11,8 +11,8 @@ [datafile] description="Experimental cities data for Freeciv" -options="+Freeciv-ruleset-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/experimental/effects.ruleset b/data/experimental/effects.ruleset index 47eb735411..1390f5b242 100644 --- a/data/experimental/effects.ruleset +++ b/data/experimental/effects.ruleset @@ -14,8 +14,8 @@ [datafile] description="Experimental effects data for Freeciv" -options="+Freeciv-ruleset-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/experimental/game.ruleset b/data/experimental/game.ruleset index 46f339db8d..8c93180633 100644 --- a/data/experimental/game.ruleset +++ b/data/experimental/game.ruleset @@ -14,8 +14,8 @@ [datafile] description="Experimental game rules for Freeciv" -options="+Freeciv-ruleset-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; 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/experimental/governments.ruleset b/data/experimental/governments.ruleset index 6c8e46cae6..5383d29c8e 100644 --- a/data/experimental/governments.ruleset +++ b/data/experimental/governments.ruleset @@ -14,8 +14,8 @@ [datafile] description="Experimental governments data for Freeciv" -options="+Freeciv-ruleset-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 [governments] during_revolution="Anarchy" diff --git a/data/experimental/nations.ruleset b/data/experimental/nations.ruleset index 96b017d252..7f9e0d9e8c 100644 --- a/data/experimental/nations.ruleset +++ b/data/experimental/nations.ruleset @@ -9,8 +9,8 @@ [datafile] description="Experimental nations data for Freeciv" -options="+Freeciv-ruleset-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; 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/experimental/styles.ruleset b/data/experimental/styles.ruleset index 8b31ef0413..758c1f7aac 100644 --- a/data/experimental/styles.ruleset +++ b/data/experimental/styles.ruleset @@ -11,8 +11,8 @@ [datafile] description="Experimental nation theme data for Freeciv" -options="+Freeciv-ruleset-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/experimental/techs.ruleset b/data/experimental/techs.ruleset index 8c2902b948..965723410e 100644 --- a/data/experimental/techs.ruleset +++ b/data/experimental/techs.ruleset @@ -11,8 +11,8 @@ [datafile] description="Experimental technology data for Freeciv" -options="+Freeciv-ruleset-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 [control] ; Names for custom tech flags. There can be up to 8 of these. diff --git a/data/experimental/terrain.ruleset b/data/experimental/terrain.ruleset index edade43c45..4bf79b0861 100644 --- a/data/experimental/terrain.ruleset +++ b/data/experimental/terrain.ruleset @@ -14,8 +14,8 @@ [datafile] description="Experimental terrain data for Freeciv" -options="+Freeciv-ruleset-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 [control] ; Names for custom terrain flags. There can be up to 10 of these. diff --git a/data/experimental/units.ruleset b/data/experimental/units.ruleset index cc6aed6284..8c13c21e82 100644 --- a/data/experimental/units.ruleset +++ b/data/experimental/units.ruleset @@ -19,8 +19,8 @@ [datafile] description="Experimental unit data for Freeciv" -options="+Freeciv-ruleset-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 [control] ; Names for custom unit type flags. There can be up to 45 of these. diff --git a/data/granularity/buildings.ruleset b/data/granularity/buildings.ruleset index 0364d207c5..739fe4debf 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/granularity/cities.ruleset b/data/granularity/cities.ruleset index 1243c03257..583bafd3de 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/granularity/effects.ruleset b/data/granularity/effects.ruleset index ad4df102cd..a3eed8568e 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/granularity/game.ruleset b/data/granularity/game.ruleset index 749d67ab7e..b0c981545c 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; 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 39db2669a2..167d09ab3f 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 [governments] during_revolution = "Anarchy" diff --git a/data/granularity/nations.ruleset b/data/granularity/nations.ruleset index 86cfbeea61..99de37a8eb 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; 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/styles.ruleset b/data/granularity/styles.ruleset index 0d776b860f..300ed5eb6b 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/granularity/techs.ruleset b/data/granularity/techs.ruleset index 7b92e10213..9601d10ccc 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 [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 013598b7dd..e80c82f766 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 [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 3d56c6ec1e..341561a1d2 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 [control] ; Names for custom unit type flags. There can be up to 45 of these. diff --git a/data/multiplayer/buildings.ruleset b/data/multiplayer/buildings.ruleset index 5477853d6f..1a1fa90abe 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/multiplayer/cities.ruleset b/data/multiplayer/cities.ruleset index 105fac6417..46cf1b04e3 100644 --- a/data/multiplayer/cities.ruleset +++ b/data/multiplayer/cities.ruleset @@ -8,8 +8,8 @@ [datafile] description="Cities data for Freeciv" -options="+Freeciv-ruleset-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/multiplayer/effects.ruleset b/data/multiplayer/effects.ruleset index 987733f0bd..38dd76263e 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/multiplayer/game.ruleset b/data/multiplayer/game.ruleset index 28b7bb3d42..e0a7122f48 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 ; 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 f4747f880f..300d0fb1aa 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 [governments] during_revolution="Anarchy" diff --git a/data/multiplayer/nations.ruleset b/data/multiplayer/nations.ruleset index 58b609478c..a705972832 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 ; 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/styles.ruleset b/data/multiplayer/styles.ruleset index cc690357f8..17dafccf57 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/multiplayer/techs.ruleset b/data/multiplayer/techs.ruleset index 8aaec6e5ce..7823fa1a07 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 [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 39b0daa1d5..e25075a235 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 [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 682b457735..705ace9ec3 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 [control] ; Names for custom unit type flags. There can be up to 45 of these. diff --git a/data/sandbox/buildings.ruleset b/data/sandbox/buildings.ruleset index 32af4d3921..2050d6a52a 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/sandbox/cities.ruleset b/data/sandbox/cities.ruleset index e88e114b97..9ca8c241c3 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/sandbox/effects.ruleset b/data/sandbox/effects.ruleset index 19c46a8757..add93ad9a6 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/sandbox/game.ruleset b/data/sandbox/game.ruleset index cf21016b4c..996d3c7f47 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; 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 0a2737af1f..0d5517032b 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 [governments] during_revolution="Anarchy" diff --git a/data/sandbox/nations.ruleset b/data/sandbox/nations.ruleset index 9a67cc6327..19450159c2 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; 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/styles.ruleset b/data/sandbox/styles.ruleset index 34cae8ebfc..ab4a3c31a8 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/sandbox/techs.ruleset b/data/sandbox/techs.ruleset index bcf4532d66..52a58d7a1e 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 [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 650464e1b3..d8d576f291 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 [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 55d4130dac..8f97b7562b 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 [control] ; Names for custom unit type flags. There can be up to 45 of these. diff --git a/data/stub/buildings.ruleset b/data/stub/buildings.ruleset index 6667ee48ef..d1f9ea67ea 100644 --- a/data/stub/buildings.ruleset +++ b/data/stub/buildings.ruleset @@ -3,8 +3,8 @@ [datafile] description=" buildings data for Freeciv" -options="+Freeciv-ruleset-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/stub/cities.ruleset b/data/stub/cities.ruleset index 461f54e8c0..82eb6d3a4b 100644 --- a/data/stub/cities.ruleset +++ b/data/stub/cities.ruleset @@ -3,8 +3,8 @@ [datafile] description=" cities data for Freeciv" -options="+Freeciv-ruleset-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/stub/effects.ruleset b/data/stub/effects.ruleset index f1c0302804..655d789831 100644 --- a/data/stub/effects.ruleset +++ b/data/stub/effects.ruleset @@ -3,8 +3,8 @@ [datafile] description=" effects data for Freeciv" -options="+Freeciv-ruleset-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/stub/game.ruleset b/data/stub/game.ruleset index c44ab0810b..3948e2bcfb 100644 --- a/data/stub/game.ruleset +++ b/data/stub/game.ruleset @@ -3,8 +3,8 @@ [datafile] description=" game rules for Freeciv" -options="+Freeciv-ruleset-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; 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 74f818596a..65f0ce87dc 100644 --- a/data/stub/governments.ruleset +++ b/data/stub/governments.ruleset @@ -3,8 +3,8 @@ [datafile] description=" governments data for Freeciv" -options="+Freeciv-ruleset-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 [governments] during_revolution = "Anarchy" diff --git a/data/stub/nations.ruleset b/data/stub/nations.ruleset index 479eddc6b1..c637b80d47 100644 --- a/data/stub/nations.ruleset +++ b/data/stub/nations.ruleset @@ -3,8 +3,8 @@ [datafile] description=" nations data for Freeciv" -options="+Freeciv-ruleset-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; 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/styles.ruleset b/data/stub/styles.ruleset index c95747c0b3..d37010a248 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/stub/techs.ruleset b/data/stub/techs.ruleset index f87be46fa3..fd830df38a 100644 --- a/data/stub/techs.ruleset +++ b/data/stub/techs.ruleset @@ -3,8 +3,8 @@ [datafile] description=" technology data for Freeciv" -options="+Freeciv-ruleset-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 [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 bd5aaea650..c19e13d46f 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 [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 4aac8a3670..07dd8fc2d9 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-Devel-2017.Jan.02" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06" +format_version=30 [control] ; Names for custom unit type flags. There can be up to 45 of these. diff --git a/data/webperimental/buildings.ruleset b/data/webperimental/buildings.ruleset index 862e9959fe..244ad613bb 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/webperimental/cities.ruleset b/data/webperimental/cities.ruleset index 788424866a..f4fd8637be 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/webperimental/effects.ruleset b/data/webperimental/effects.ruleset index 220b80826d..226f59959e 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/webperimental/game.ruleset b/data/webperimental/game.ruleset index 4d7a877801..6480022bb8 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 ; 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 01492ec461..f477f5793f 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 [governments] during_revolution="Anarchy" diff --git a/data/webperimental/nations.ruleset b/data/webperimental/nations.ruleset index f27d89a5ee..36166f2c2a 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 ; 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/styles.ruleset b/data/webperimental/styles.ruleset index 50a32e8f7f..2e2c2ace7b 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 ; /* <-- avoid gettext warnings ; diff --git a/data/webperimental/techs.ruleset b/data/webperimental/techs.ruleset index 5e8d40fa51..158949ca88 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 [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 51bf6dc843..e942ecd9f5 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 [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 51cd650723..3c72ff3e50 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-Devel-2017.Jan.02 web-compatible" -format_version=20 +options="+Freeciv-ruleset-Devel-2021.Feb.06 web-compatible" +format_version=30 [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 7b3cd06467..79e7d7075a 100644 --- a/server/ruleset.h +++ b/server/ruleset.h @@ -17,7 +17,7 @@ extern "C" { #endif /* __cplusplus */ -#define RULESET_CAPABILITIES_BASE "+Freeciv-ruleset-Devel-2017.Jan.02" +#define RULESET_CAPABILITIES_BASE "+Freeciv-ruleset-Devel-2021.Feb.06" #ifdef FREECIV_WEB #define RULESET_CAPABILITIES RULESET_CAPABILITIES_BASE " +web-compatible" #else /* FREECIV_WEB */ @@ -26,8 +26,8 @@ extern "C" { /* * Ruleset capabilities acceptable to this program: * - * +Freeciv-3.1-ruleset - * - basic ruleset format for Freeciv versions 3.1.x; required + * +Freeciv-3.2-ruleset + * - basic ruleset format for Freeciv versions 3.2.x; required * * +Freeciv-ruleset-Devel-YYYY.MMM.DD * - ruleset of the development version at the given data diff --git a/tools/ruleutil/rulesave.c b/tools/ruleutil/rulesave.c index 95169a3ced..8e09a4e929 100644 --- a/tools/ruleutil/rulesave.c +++ b/tools/ruleutil/rulesave.c @@ -45,8 +45,9 @@ * 1 - Freeciv-2.6 * 10 - Freeciv-3.0 * 20 - Freeciv-3.1 + * 30 - Freeciv-3.2 */ -#define FORMAT_VERSION 20 +#define FORMAT_VERSION 30 /**********************************************************************//** Create new ruleset section file with common header. -- 2.29.2