Bump to 8.0 (#89)

F1rrel · Mar 13, 2022 · b92c15c · b92c15c
1 parent 23d47d2
commit b92c15c
Show file tree

Hide file tree

Showing 12 changed files with 94 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -15,8 +15,8 @@ BaNaNaS: https://bananas.openttd.org/package/game-script/52455649
 - Industry sets: you can use any industry NewGRF
     - these are specifically supported industry NewGRF: Baseset (all climates), FIRS 1.4, 2, 3, 4.3
   (all economies), ECS 1.2 (any combination), YETI 0.1.6 
-  (all except Simplified), NAIS 1.0.6, ITI 1.6, XIS 0.6, OTIS 02, IOTC 0.1, LJI 0.1
-  Using RVG with any other unsupported industry set will contain proceduraly generated categories
+  (all except Simplified), NAIS 1.0.6, ITI 1.6, XIS 0.6, OTIS 03, IOTC 0.1, LJI 0.1, WRBI 1200
+    - using RVG with any other unsupported industry set will contain proceduraly generated categories
 
 ## Translations
 Currently available languages:

diff --git a/changelog.txt b/changelog.txt
@@ -1,6 +1,20 @@
 *** Renewed Village Growth GS Changelog ***
 
-Version 7.2(2021/10/24)
+Version 8.0 (2022/03/13)
+- new: Welcome page with description of how the GS works and where to find information
+- new: Options to change minimum population for unlocking categories. Sorts categories based on selected values
+- new: Option to allow zero days growth rate
+- new: Randomization ascending and descending
+- new: WRBI 1200 predefined cargo categories
+- new: Custom story page usefull for server rules and other
+- new: Better handling of warnings that cause GS to stop by showing story page with the warning
+- modified: OTIS 03 support (audunmaroey)
+- modified: Minimum supply percentage option is now minimum fulfilled percentage (lower is easier)
+- fix: FIRS4 Steeltown cargo categories (qamil95)
+- fix: Global goal list not removing bankrupt/merged company growth points
+- fix: Consider cargo list length to determine correct economy
+
+Version 7.2 (2021/10/24)
 - new: Lumberjack Industries 0.1.0 predefined cargo categories (2TallTyler)
 - new: Polish translation (qamil95)
 - fix: cargo hash overflow affecting economies with a lot of cargo types (XIS, FIRS 4 Steeltown)

diff --git a/info.nut b/info.nut
@@ -16,7 +16,7 @@ class MainClass extends GSInfo
     function GetAuthor()                { return "Firrel"; }
     function GetName()                  { return "Renewed Village Growth"; }
     function GetShortName()             { return "REVI"; }
-    function GetDescription()           { return "Towns require various cargo deliveries to grow. Required cargos can be randomized. Town growth is limited by percentage of transported specific cargos. Supporting all Industry NewGRF sets."; }
+    function GetDescription()           { return "Towns require various cargo deliveries to grow. Required cargos can be randomized. Town growth is limited by percentage of transported specific cargos. Supporting most Industry NewGRF sets."; }
     function GetURL()                   { return "https://www.tt-forums.net/viewtopic.php?f=65&t=87052"; }
     function GetVersion()               { return SELF_VERSION; }
     function GetDate()                  { return SELF_DATE; }

diff --git a/lang.txt b/lang.txt
@@ -5,7 +5,7 @@ forums: https://www.tt-forums.net/viewtopic.php?f=65&t=87052
 github: https://github.com/F1rrel/RenewedVillageGrowth
 
 Language                        :french
-Game script version             :7.2
+Game script version             :8.0
 
 Growth : {NUM} days             :Croissance: {NUM} jours
 Not growing                     :
@@ -45,5 +45,27 @@ To achieve requirements for a category, you can deliver any cargo belonging to i
                                 :
 Each town has a selection of {STRING} from each category. To achieve requirements for a category, you can deliver any cargo that the Town requires for that category as shown in the Town info window.
                                 :
-There are more towns on the map than the game script can save. The current number of towns is {SILVER}{NUM}{BLACK} and the maximum is {SILVER}{NUM}{BLACK}. The game script is turned off.
-                                :
+There are more towns on the map than the game script can save. The current number of towns is {SILVER}{NUM}{BLACK} and the maximum is {SILVER}{NUM}{BLACK}. {RED}The game script is turned off.{BLACK}
+                                :
+The cargo list initialization has failed. It was caused by an unknown industry newGRF for which a procedural cargo list creation was not possible. {RED}The game script is turned off.{BLACK}
+                                :
+The cargo list initialization has failed. It was caused by the industry randomization option for which the procedural industry categories could not be created. {RED}The game script is turned off.{BLACK}
+                                :
+You must set parameter {ORANGE}Environment->Towns->Town growth speed{BLACK} to something other than None. {RED}The game script is turned off.{BLACK}
+                                :
+{SILVER}Renewed Village Growth (RVG){BLACK} is a game script which {ORANGE}changes the way towns grow{BLACK} in OpenTTD. Various cargo requirements are defined for each town that need to be - partially or completely - monthly satisfied to make the towns grow faster. More information can be found in the {ORANGE}Readme file{BLACK}.
+                                :
+Economy {SILVER}{STRING}{BLACK} consists of {SILVER}{NUM} categories{BLACK}. To fulfill a category, deliver one or more of the category specific cargos to a {ORANGE}station near the town which accepts that cargo type{BLACK}. Fulfill the requirements above {SILVER}{NUM}%{BLACK} to {ORANGE}make the towns grow faster{BLACK}. More information about cargo categories are shown in the {ORANGE}Cargo categories story book page{BLACK}.
+                                :
+{SILVER}{CARGO_LIST}{BLACK} from that town can {ORANGE}stop the town growth{BLACK}. Transport at least {SILVER}{NUM}%{BLACK} of those cargo types to {ORANGE}allow town growth{BLACK}. {STRING}
+                                :
+The growth stops after {SILVER}{NUM} months{BLACK} of not fulfilling this requirement.
+                                :
+Company providing the majority of cargo to a town becomes its {ORANGE}Contributor{BLACK}. Every new population above largest population of that town is counted towards {ORANGE}growth points{BLACK} of that company. See the growth points and statistics in the {ORANGE}Goal list{BLACK}.
+                                :
+{SILVER}Eternal Love{BLACK} changes {ORANGE}local authority rating{BLACK} of each town once per month to at least {SILVER}{STRING}{BLACK}.
+                                :
+Have fun!                       :
+outstanding                     :
+good                            :
+poor                            :
diff --git a/lang/czech.txt b/lang/czech.txt
@@ -28,7 +28,7 @@ STR_SB_CARGOCAT_POP      :Minimální populáce města
 STR_SB_CARGOCAT_DECAY    :Mesíční úpadek tovaru
 STR_SB_CARGOCAT_CARGOT   :Kategorie nákladu
 STR_SB_WARNING_TITLE     :Upozornění
-STR_SB_WARNING_1         :Na mapě sa nachází víc měst než je hrací skript schopen uložit. Aktuální počet měst na mapě je {SILVER}{NUM}{BLACK} a maximum je {SILVER}{NUM}{BLACK}. Hrací skript se vypíná.
+STR_SB_WARNING_1         :Na mapě sa nachází víc měst než je hrací skript schopen uložit. Aktuální počet měst na mapě je {SILVER}{NUM}{BLACK} a maximum je {SILVER}{NUM}{BLACK}. {RED}Hrací skript se vypíná.{BLACK}
 
 ##### GOAL #####
 STR_STATISTICS_GROWTH_POINTS    :{STRING}{COMPANY}{BLACK} přírastkových bodů{ORANGE}

diff --git a/lang/french.txt b/lang/french.txt
@@ -29,7 +29,7 @@ STR_SB_CARGOCAT_POP      :Population requise
 STR_SB_CARGOCAT_DECAY    :Dégradation mensuelle des stocks
 STR_SB_CARGOCAT_CARGOT   :Types de marchandises
 STR_SB_WARNING_TITLE     :Attention
-STR_SB_WARNING_1         :Il y a plus de villes dans la carte que le script de jeu peut en sauvegarder. Il y a actuellement {SILVER}{NUM}{BLACK} villes et le nombre maximum est {SILVER}{NUM}{BLACK}. Le script de jeu est désactivé.
+STR_SB_WARNING_1         :Il y a plus de villes dans la carte que le script de jeu peut en sauvegarder. Il y a actuellement {SILVER}{NUM}{BLACK} villes et le nombre maximum est {SILVER}{NUM}{BLACK}. {RED}Le script de jeu est désactivé.{BLACK}
 
 ##### GOAL #####
 STR_STATISTICS_BIGGEST_TOWN     :{BLACK}La plus grande ville {SILVER}{TOWN}{ORANGE}

diff --git a/lang/polish.txt b/lang/polish.txt
@@ -28,7 +28,7 @@ STR_SB_CARGOCAT_POP      :Minimalny rozmiar miasta
 STR_SB_CARGOCAT_DECAY    :Miesięczny spadek
 STR_SB_CARGOCAT_CARGOT   :Typy towarów
 STR_SB_WARNING_TITLE     :UWAGA
-STR_SB_WARNING_1         :Liczba miast na mapie jest zbyt duża, skrypt nie będzie mógł zapisywać zmian. Obecna liczba miast to {SILVER}{NUM}{BLACK}, a maksymalna dozwolona liczba to {SILVER}{NUM}{BLACK}. Skrypt zostaje wyłączony.
+STR_SB_WARNING_1         :Liczba miast na mapie jest zbyt duża, skrypt nie będzie mógł zapisywać zmian. Obecna liczba miast to {SILVER}{NUM}{BLACK}, a maksymalna dozwolona liczba to {SILVER}{NUM}{BLACK}. {RED}Skrypt zostaje wyłączony.{BLACK}
 
 ##### GOAL #####
 STR_STATISTICS_GROWTH_POINTS    :{BLACK}Punkty rozwoju {STRING}{COMPANY}{ORANGE}

diff --git a/lang/simplified_chinese.txt b/lang/simplified_chinese.txt
@@ -28,7 +28,7 @@ STR_SB_CARGOCAT_POP      :最少城镇人口
 STR_SB_CARGOCAT_DECAY    :每月衰减
 STR_SB_CARGOCAT_CARGOT   :货物类型
 STR_SB_WARNING_TITLE     :警告
-STR_SB_WARNING_1         :地图上的城镇数量超出了游戏脚本可以保存的数量.当前的城镇数量为 {SILVER}{NUM}{BLACK} .最大数量为{SILVER}{NUM}{BLACK}. 游戏脚本已经关闭
+STR_SB_WARNING_1         :地图上的城镇数量超出了游戏脚本可以保存的数量.当前的城镇数量为 {SILVER}{NUM}{BLACK} .最大数量为{SILVER}{NUM}{BLACK}. {RED}游戏脚本已经关闭{BLACK}
 
 ##### GOAL #####
 STR_STATISTICS_GROWTH_POINTS    :{STRING}{COMPANY}{BLACK} 成长点{ORANGE}

diff --git a/lang/slovak.txt b/lang/slovak.txt
@@ -28,7 +28,7 @@ STR_SB_CARGOCAT_POP      :Minimálna populácia mesta
 STR_SB_CARGOCAT_DECAY    :Mesačný úpadok tovaru
 STR_SB_CARGOCAT_CARGOT   :Kategórie nákladu
 STR_SB_WARNING_TITLE     :Upozornenie
-STR_SB_WARNING_1         :Na mape sa nachádza viac miest ako je hrací skript schopný uložiť. Aktuálny počet miest na mape je {SILVER}{NUM}{BLACK} a maximum je {SILVER}{NUM}{BLACK}. Hrací skript sa vypína.
+STR_SB_WARNING_1         :Na mape sa nachádza viac miest ako je hrací skript schopný uložiť. Aktuálny počet miest na mape je {SILVER}{NUM}{BLACK} a maximum je {SILVER}{NUM}{BLACK}. {RED}Hrací skript sa vypína.{BLACK}
 
 ##### GOAL #####
 STR_STATISTICS_GROWTH_POINTS    :{STRING}{COMPANY}{BLACK} prírastkových bodov{ORANGE}

diff --git a/lang_files/simplified_chinese.txt b/lang_files/simplified_chinese.txt
@@ -45,5 +45,27 @@ To achieve requirements for a category, you can deliver any cargo belonging to i
                                 :为了达到某个类别的要求.您可以交付任何属于该类别的货物.
 Each town has a selection of {STRING} from each category. To achieve requirements for a category, you can deliver any cargo that the Town requires for that category as shown in the Town info window.
                                 :每个城镇从每个类别中选择{STRING}.要达到某个类别的要求,您可以交付城镇所需的任何货物,如"城镇信息"窗口中所示.
-There are more towns on the map than the game script can save. The current number of towns is {SILVER}{NUM}{BLACK} and the maximum is {SILVER}{NUM}{BLACK}. The game script is turned off.
-                                :地图上的城镇数量超出了游戏脚本可以保存的数量.当前的城镇数量为 {SILVER}{NUM}{BLACK} .最大数量为{SILVER}{NUM}{BLACK}. 游戏脚本已经关闭
+There are more towns on the map than the game script can save. The current number of towns is {SILVER}{NUM}{BLACK} and the maximum is {SILVER}{NUM}{BLACK}. {RED}The game script is turned off.{BLACK}
+                                :地图上的城镇数量超出了游戏脚本可以保存的数量.当前的城镇数量为 {SILVER}{NUM}{BLACK} .最大数量为{SILVER}{NUM}{BLACK}. {RED}游戏脚本已经关闭{BLACK}
+The cargo list initialization has failed. It was caused by an unknown industry newGRF for which a procedural cargo list creation was not possible. {RED}The game script is turned off.{BLACK}
+                                :
+The cargo list initialization has failed. It was caused by the industry randomization option for which the procedural industry categories could not be created. {RED}The game script is turned off.{BLACK}
+                                :
+You must set parameter {ORANGE}Environment->Towns->Town growth speed{BLACK} to something other than None. {RED}The game script is turned off.{BLACK}
+                                :
+{SILVER}Renewed Village Growth (RVG){BLACK} is a game script which {ORANGE}changes the way towns grow{BLACK} in OpenTTD. Various cargo requirements are defined for each town that need to be - partially or completely - monthly satisfied to make the towns grow faster. More information can be found in the {ORANGE}Readme file{BLACK}.
+                                :
+Economy {SILVER}{STRING}{BLACK} consists of {SILVER}{NUM} categories{BLACK}. To fulfill a category, deliver one or more of the category specific cargos to a {ORANGE}station near the town which accepts that cargo type{BLACK}. Fulfill the requirements above {SILVER}{NUM}%{BLACK} to {ORANGE}make the towns grow faster{BLACK}. More information about cargo categories are shown in the {ORANGE}Cargo categories story book page{BLACK}.
+                                :
+{SILVER}{CARGO_LIST}{BLACK} from that town can {ORANGE}stop the town growth{BLACK}. Transport at least {SILVER}{NUM}%{BLACK} of those cargo types to {ORANGE}allow town growth{BLACK}. {STRING}
+                                :
+The growth stops after {SILVER}{NUM} months{BLACK} of not fulfilling this requirement.
+                                :
+Company providing the majority of cargo to a town becomes its {ORANGE}Contributor{BLACK}. Every new population above largest population of that town is counted towards {ORANGE}growth points{BLACK} of that company. See the growth points and statistics in the {ORANGE}Goal list{BLACK}.
+                                :
+{SILVER}Eternal Love{BLACK} changes {ORANGE}local authority rating{BLACK} of each town once per month to at least {SILVER}{STRING}{BLACK}.
+                                :
+Have fun!                       :
+outstanding                     :
+good                            :
+poor                            :
diff --git a/readme.txt b/readme.txt
@@ -3,7 +3,7 @@
                 *  A GameScript for OpenTTD  *
                 ******************************
 
-Version: 7.2
+Version: 8.0
 
 Usefull URL's:
 - forum topic: https://www.tt-forums.net/viewtopic.php?f=65&t=87052
@@ -114,14 +114,19 @@ The informations that the script gives are:
     - Combined
     - Full cargo list
   See "Town info display mode" GS setting.
-- The StoryBook also gives informations: there you can find a general
-  description of the categories used in the game, according to your
-  settings. It also gives you some additional informations, such as
-  the population limit at which each category becomes necessary for
-  towns to grow.
+- The StoryBook also gives informations: 
+    - Cargo page - there you can find a general description of
+      the categories used in the game, according to your settings. 
+      It also gives you some additional informations, such as the 
+      population limit at which each category becomes necessary for
+      towns to grow.
+    - Welcome page - shows description how this GS works and where 
+      to find more information.
+    - Custom page - if enabled, shows custom information like server
+      rules.
 - The Goals display statistics of a player containing:
-    - Global goal - receive a point for every new habitant of a town 
-                    over the maximum achieved town size
+    - Growth points - receive a point for every new habitant of a town 
+                      over the maximum achieved town size
     - Average town category - average of number of categories of 
                               contributed towns
     - Number of contributed towns
@@ -187,6 +192,8 @@ Randomization settings:
     - 1,2,3,5,7 per category - fixed amount of cargos per category
     - 1-2, 1-3, 2-3, 3-5, 3-7 - minimum to maximum amount of cargos 
       per category
+    - Descending/ascending - the number of cargo types per category
+      is ascending (1 to 5) or descending (5 to 1)
 - "Randomization: Show town cargos from start": if selected, all randomized
   cargos can be visible for each town, otherwise only reached
   categories are displayed
@@ -239,7 +246,7 @@ they can safely be changed while the game is running:
   disabling completely town growth but setting it to an extremely low
   rate. The default is 880 (which means that a new house is created
   only each 880 days). It can be increased until 880.
-- "allow_0_days_growth": the town growth rate can go to zero.
+- "allow_0_days_growth": the town growth rate can go to zero days.
 
 
 3. Requirements
@@ -251,7 +258,7 @@ they can safely be changed while the game is running:
     - these are specifically supported industry NewGRF: Baseset 
     (all climates), FIRS 1.4, 2, 3, 4.3 (all economies), ECS 1.2 
     (any combination), YETI 0.1.6 (all except Simplified), 
-    NAIS 1.0.6, ITI 1.6, XIS 0.6, OTIS 02, IOTC 0.1, LJI 0.1. 
+    NAIS 1.0.6, ITI 1.6, XIS 0.6, OTIS 02, IOTC 0.1, LJI 0.1, WRBI 1200.
   Using RVG with any other unsupported industry set will contain 
   proceduraly generated categories
 

diff --git a/version.nut b/version.nut
@@ -1,6 +1,6 @@
-SELF_VERSION <- 12              // integer version of the GS, needs to be increased with each release
-SELF_MINLOADVERSION <- 10       // minimum integer version of GS that can load this version, increased when major version is increased
-SELF_MAJORVERSION <- 7          // main version of the GS, releases with same major version should be saveload compatible
-SELF_MINORVERSION <- 2          // minor version of the GS, incremental subreleases of the major version, saveload compatible
-SELF_DATE <- "2021-10-24"       // release date
+SELF_VERSION <- 80              // integer version of the GS, needs to be increased with each release
+SELF_MINLOADVERSION <- 80       // minimum integer version of GS that can load this version, increased when major version is increased
+SELF_MAJORVERSION <- 8          // main version of the GS, releases with same major version should be saveload compatible
+SELF_MINORVERSION <- 0          // minor version of the GS, incremental subreleases of the major version, saveload compatible
+SELF_DATE <- "2022-03-13"       // release date
 SELF_MAX_TOWNS <- 1400          // maximum number of towns that can be successfully saved in this release