From 0f1872f4dd0ba4521f60bffe77f74b679e063ac5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C5=82awomir=20Lach?= <slawek@lach.art.pl>
Date: Fri, 17 Feb 2023 21:09:32 +0100
Subject: [PATCH] =?UTF-8?q?!OSDN:TICKET=20#47367:=20S=C5=82awomir=20Lach?=
 =?UTF-8?q?=20<slawek@lach.art.pl>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ruleset authors may read comments.txt to figure out
how to use some counter behaviour.

diff --git a/data/alien/game.ruleset b/data/alien/game.ruleset
index 492f922d69..8b7c1c4dcd 100644
--- a/data/alien/game.ruleset
+++ b/data/alien/game.ruleset
@@ -624,6 +624,10 @@ type = "Embassy"
 ;def                     = Initial value of the counter.
 ;type                    = Behavior of the counter:
 ;                          "Owned" - Increased each turn, zeroed when city changes owner
+;                          "Celebraring" - Increased each celebrates turn. In case city
+;                          does not celebrates, counter is zeroed
+;                          "Disorder" - Increased each turn city is in disorder state. In
+;                          case riots are eliminated, value is zeroed.
 ; */ <-- avoid gettext warnings
 
 [playercolors]
diff --git a/data/civ1/game.ruleset b/data/civ1/game.ruleset
index 1633a00081..42e2fa6d02 100644
--- a/data/civ1/game.ruleset
+++ b/data/civ1/game.ruleset
@@ -654,6 +654,10 @@ type = "Embassy"
 ;def                     = Initial value of the counter.
 ;type                    = Behavior of the counter:
 ;                          "Owned" - Increased each turn, zeroed when city changes owner
+;                          "Celebraring" - Increased each celebrates turn. In case city
+;                          does not celebrates, counter is zeroed
+;                          "Disorder" - Increased each turn city is in disorder state. In
+;                          case riots are eliminated, value is zeroed.
 ; */ <-- avoid gettext warnings
 
 [playercolors]
diff --git a/data/civ2/game.ruleset b/data/civ2/game.ruleset
index a76fb57433..4f524f418a 100644
--- a/data/civ2/game.ruleset
+++ b/data/civ2/game.ruleset
@@ -585,6 +585,10 @@ type = "Embassy"
 ;def                     = Initial value of the counter.
 ;type                    = Behavior of the counter:
 ;                          "Owned" - Increased each turn, zeroed when city changes owner
+;                          "Celebraring" - Increased each celebrates turn. In case city
+;                          does not celebrates, counter is zeroed
+;                          "Disorder" - Increased each turn city is in disorder state. In
+;                          case riots are eliminated, value is zeroed.
 ; */ <-- avoid gettext warnings
 
 [playercolors]
diff --git a/data/civ2civ3/game.ruleset b/data/civ2civ3/game.ruleset
index d91c8952bb..30d7fc4723 100644
--- a/data/civ2civ3/game.ruleset
+++ b/data/civ2civ3/game.ruleset
@@ -716,6 +716,10 @@ type = "Embassy"
 ;def                     = Initial value of the counter.
 ;type                    = Behavior of the counter:
 ;                          "Owned" - Increased each turn, zeroed when city changes owner
+;                          "Celebraring" - Increased each celebrates turn. In case city
+;                          does not celebrates, counter is zeroed
+;                          "Disorder" - Increased each turn city is in disorder state. In
+;                          case riots are eliminated, value is zeroed.
 ; */ <-- avoid gettext warnings
 
 [playercolors]
diff --git a/data/classic/game.ruleset b/data/classic/game.ruleset
index a865e9ccb0..16df9e3bc1 100644
--- a/data/classic/game.ruleset
+++ b/data/classic/game.ruleset
@@ -633,6 +633,10 @@ type = "Embassy"
 ;def                     = Initial value of the counter.
 ;type                    = Behavior of the counter:
 ;                          "Owned" - Increased each turn, zeroed when city changes owner
+;                          "Celebraring" - Increased each celebrates turn. In case city
+;                          does not celebrates, counter is zeroed
+;                          "Disorder" - Increased each turn city is in disorder state. In
+;                          case riots are eliminated, value is zeroed.
 ; */ <-- avoid gettext warnings
 
 [playercolors]
diff --git a/data/goldkeep/game.ruleset b/data/goldkeep/game.ruleset
index d0b6ca68db..5a2500d53f 100644
--- a/data/goldkeep/game.ruleset
+++ b/data/goldkeep/game.ruleset
@@ -652,6 +652,10 @@ type = "Embassy"
 ;def                     = Initial value of the counter.
 ;type                    = Behavior of the counter:
 ;                          "Owned" - Increased each turn, zeroed when city changes owner
+;                          "Celebraring" - Increased each celebrates turn. In case city
+;                          does not celebrates, counter is zeroed
+;                          "Disorder" - Increased each turn city is in disorder state. In
+;                          case riots are eliminated, value is zeroed.
 ; */ <-- avoid gettext warnings
 
 [playercolors]
diff --git a/data/granularity/game.ruleset b/data/granularity/game.ruleset
index e85822b276..80dc100c08 100644
--- a/data/granularity/game.ruleset
+++ b/data/granularity/game.ruleset
@@ -577,7 +577,11 @@ name = _("Goods")
 ;def                     = Initial value of the counter.
 ;type                    = Behavior of the counter:
 ;                          "Owned" - Increased each turn, zeroed when city changes owner
-; */ <-- avoid gettext warnings
+;                          "Celebraring" - Increased each celebrates turn. In case city
+;                          does not celebrates, counter is zeroed
+;                          "Disorder" - Increased each turn city is in disorder state. In
+;                          case riots are eliminated, value is zeroed.
+; /* <-- avoid gettext warnings
 
 [playercolors]
 background.r = 86
diff --git a/data/multiplayer/game.ruleset b/data/multiplayer/game.ruleset
index 8a0028644a..b2262a4591 100644
--- a/data/multiplayer/game.ruleset
+++ b/data/multiplayer/game.ruleset
@@ -606,6 +606,10 @@ type = "Embassy"
 ;def                     = Initial value of the counter.
 ;type                    = Behavior of the counter:
 ;                          "Owned" - Increased each turn, zeroed when city changes owner
+;                          "Celebraring" - Increased each celebrates turn. In case city
+;                          does not celebrates, counter is zeroed
+;                          "Disorder" - Increased each turn city is in disorder state. In
+;                          case riots are eliminated, value is zeroed.
 ; */ <-- avoid gettext warnings
 
 [playercolors]
diff --git a/data/ruledit/comments-3.2.txt b/data/ruledit/comments-3.2.txt
index 3c53bcbb6e..244170959c 100644
--- a/data/ruledit/comments-3.2.txt
+++ b/data/ruledit/comments-3.2.txt
@@ -1264,6 +1264,10 @@ counters = "\n\
 ;def                     = Initial value of the counter.\n\
 ;type                    = Behavior of the counter:\n\
 ;                          \"Owned\" - Increased each turn, zeroed when city changes owner\n\
+;                          \"Celebraring\" - Increased each celebrates turn. In case city\n\
+;                          do not celebrates, counter is zeroed\n\
+;                          \"Disorder\" - Increased each turn city is in disorder state. In\n\
+;                          case riots are eliminated, value is zeroed.\n\
 ; */ <-- avoid gettext warnings\n\
 "
 
diff --git a/data/sandbox/game.ruleset b/data/sandbox/game.ruleset
index ca2f547db4..254e667369 100644
--- a/data/sandbox/game.ruleset
+++ b/data/sandbox/game.ruleset
@@ -785,6 +785,27 @@ type = "Embassy"
 [clause_sharedtiles]
 type = "SharedTiles"
 
+; /* <-- avoid gettext warnings
+;Counter types
+;
+;name                    = translatable name as seen by user
+;rule_name               = (optional) internal name for savegames, rulesets
+;                          etc; if not present, "name" is used for this
+;                          purpose too. Since the name used in savegames must
+;                          not change, if you want to rename an item after a
+;                          ruleset has been released, you should set
+;                          "rule_name" to the original value of "name".
+;checkpoint              = Trigger value of the counter. When counter`s
+;                          value is at least this much, the "Counter" requirement
+;                          is fulfilled.
+;def                     = Initial value of the counter.
+;type                    = Behavior of the counter:
+;                          "Owned" - Increased each turn, zeroed when city changes owner
+;                          "Celebraring" - Increased each celebrates turn. In case city
+;                          does not celebrates, counter is zeroed
+;                          "Disorder" - Increased each turn city is in disorder state. In
+;                          case riots are eliminated, value is zeroed.
+; */ <-- avoid gettext warnings
 
 [playercolors]
 background.r = 86
diff --git a/data/stub/game.ruleset b/data/stub/game.ruleset
index d02bae435c..042047f62a 100644
--- a/data/stub/game.ruleset
+++ b/data/stub/game.ruleset
@@ -569,6 +569,10 @@ name = _("Goods")
 ;def                     = Initial value of the counter.
 ;type                    = Behavior of the counter:
 ;                          "Owned" - Increased each turn, zeroed when city changes owner
+;                          "Celebraring" - Increased each celebrates turn. In case city
+;                          does not celebrates, counter is zeroed
+;                          "Disorder" - Increased each turn city is in disorder state. In
+;                          case riots are eliminated, value is zeroed.
 ; */ <-- avoid gettext warnings
 
 [playercolors]
diff --git a/data/webperimental/game.ruleset b/data/webperimental/game.ruleset
index f28768eb4d..1b800e38ad 100644
--- a/data/webperimental/game.ruleset
+++ b/data/webperimental/game.ruleset
@@ -638,6 +638,10 @@ type = "Embassy"
 ;def                     = Initial value of the counter.
 ;type                    = Behavior of the counter:
 ;                          "Owned" - Increased each turn, zeroed when city changes owner
+;                          "Celebraring" - Increased each celebrates turn. In case city
+;                          does not celebrates, counter is zeroed
+;                          "Disorder" - Increased each turn city is in disorder state. In
+;                          case riots are eliminated, value is zeroed.
 ; */ <-- avoid gettext warnings
 
 [playercolors]
-- 
2.39.2

