From 10583f489a894dbcb6bf7a94832f9bf607ad4a05 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Thu, 4 Jan 2024 04:29:58 +0200
Subject: [PATCH 30/30] Granularity: Adjust and extend tech tree

See RM #125

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 data/granularity/effects.ruleset |  4 ++--
 data/granularity/techs.ruleset   | 35 ++++++++++++++++++++++++--------
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/data/granularity/effects.ruleset b/data/granularity/effects.ruleset
index dfdc23cb32..9505a4319f 100644
--- a/data/granularity/effects.ruleset
+++ b/data/granularity/effects.ruleset
@@ -114,12 +114,12 @@ reqs	=
       "Tech", "Fire", "Player"
     }
 
-[effect_max_rates_government]
+[effect_max_rates_alphabet]
 type    = "Max_Rates"
 value   = 20
 reqs	=
     { "type", "name", "range"
-      "Tech", "Government", "Player"
+      "Tech", "Alphabet", "Player"
     }
 
 [effect_base_granary_shrink]
diff --git a/data/granularity/techs.ruleset b/data/granularity/techs.ruleset
index c151aa36c2..3217d4dde8 100644
--- a/data/granularity/techs.ruleset
+++ b/data/granularity/techs.ruleset
@@ -130,7 +130,10 @@ req2        = "Spirits"
 flags       = ""
 graphic     = "a.alphabet"
 graphic_alt = "-"
-helptext    = _("First abstract symbols")
+helptext    = _("\
+Abstract symbols to mark things make it possible to adjust tax/science/lux \
+rates more freely.\
+")
 
 [advance_animal_taming]
 name        = _("Animal Taming")
@@ -141,6 +144,15 @@ graphic     = "a.animal_taming"
 graphic_alt = "-"
 ;helptext    =
 
+[advance_art]
+name        = _("Art")
+req1        = "Pottery"
+req2        = "Alphabet"
+flags       = ""
+graphic     = "a.art"
+graphic_alt = "-"
+;helptext    =
+
 [advance_carving]
 name        = _("Carving")
 req1        = "Tools"
@@ -180,8 +192,8 @@ helptext    = _("Makes it possible to use Oceanic tiles.")
 
 [advance_flight]
 name        = _("Flight")
-req1        = "Masonry"
-req2        = "Carving"
+req1        = "Maps"
+req2        = "Mining"
 flags       = ""
 graphic     = "a.flight"
 graphic_alt = "-"
@@ -189,14 +201,12 @@ helptext    = _("First flying machines.")
 
 [advance_government]
 name        = _("Government")
-req1        = "Cave Painting"
-req2        = "None"
+req1        = "Alphabet"
+req2        = "Masonry"
 flags       = ""
 graphic     = "a.government"
 graphic_alt = "-"
-helptext    = _("Knowing basics of governing your people lets you\
- adjust tax/science/luxury rates more freely.\
-")
+;helptext    =
 
 [advance_horseback_riding]
 name        = _("Horseback Riding")
@@ -227,6 +237,15 @@ graphic     = "a.masonry"
 graphic_alt = "-"
 ;helptext    =
 
+[advance_mining]
+name        = _("Mining")
+req1        = "Carving"
+req2        = "Masonry"
+flags       = ""
+graphic     = "a.mining"
+graphic_alt = "-"
+;helptext
+
 [advance_pottery]
 name        = _("Pottery")
 req1        = "Fire"
-- 
2.43.0