From d2f151b123e8fadcbb9156076490b1d3e74f2ebb Mon Sep 17 00:00:00 2001
From: awandke <alanwandke@gmail.com>
Date: Sat, 9 Mar 2024 15:34:57 -0500
Subject: [PATCH] feat: :sparkles: tech tree: outlined the ent thrower tree and
 filled in some bonuses

issue #137
---
 common/technologies/ents_special_techs.txt | 98 ++++++++++++++--------
 common/technologies/machines.txt           |  5 ++
 interface/countrytechtreeview.gui          | 25 +++++-
 3 files changed, 93 insertions(+), 35 deletions(-)

diff --git a/common/technologies/ents_special_techs.txt b/common/technologies/ents_special_techs.txt
index 507f75fd6..ba89832f2 100644
--- a/common/technologies/ents_special_techs.txt
+++ b/common/technologies/ents_special_techs.txt
@@ -1,10 +1,10 @@
 technologies = {
-
-    ent_society = {
-        research_speed_factor = 0.05
+	# entmoot tree
+    entmoot = {
+        max_planning = 0.15
 
         path = {
-			leads_to_tech = ent_society3
+			leads_to_tech = ent_ancient_knowledge
 			research_cost_coeff = 1
 		}
 
@@ -31,13 +31,34 @@ technologies = {
 		}
 	}
 
+	ent_ancient_knowledge = {
+        research_speed_factor = 0.08
+
+		research_cost = 1
+		start_year = 3020
+		folder = {
+			name = ents_special_folder
+			position = { x = -2 y = 4 }
+		}
+
+		ai_will_do = {
+			factor = 1
+		
+			modifier = { factor = 2 date > "3022.1.1" }
+		}
+
+        categories = {
+            lotr_ent_secrets
+		}
+	}
+
     ent_society2 = {
         research_speed_factor = 0.05
 
         path = {
-			leads_to_tech = ent_society1
+			leads_to_tech = ent_society3
 			research_cost_coeff = 1
-		}`
+		}
 
 		research_cost = 1
 		start_year = 3020
@@ -57,7 +78,7 @@ technologies = {
 		}
 	}
 
-    ent_society1 = {
+    ent_society3 = {
         research_speed_factor = 0.05
 
         research_cost = 1
@@ -78,29 +99,10 @@ technologies = {
 		}
     }
 
-    ent_society3 = {
-        research_speed_factor = 0.05
-
-		research_cost = 1
-		start_year = 3020
-		folder = {
-			name = ents_special_folder
-			position = { x = -2 y = 4 }
-		}
-
-		ai_will_do = {
-			factor = 1
-		
-			modifier = { factor = 2 date > "3022.1.1" }
-		}
-
-        categories = {
-            lotr_ent_secrets
-		}
-	}
-
-	ent_deep_roots = {
-        research_speed_factor = 0.05
+	# Ents deep roots tree
+	ent_strong_boughs = {
+        max_dig_in = 5
+		attrition = -0.05
 
 		path = {
 			leads_to_tech = ent_draught_nourishing
@@ -130,7 +132,8 @@ technologies = {
 	}
 
 	ent_draught_nourishing = {
-        research_speed_factor = 0.05
+        supply_consumption_factor = -0.05
+		fuel_gain_factor = 0.2
 
 		research_cost = 1
 		start_year = 3020
@@ -150,13 +153,15 @@ technologies = {
 	}
 
 	ent_draught_refreshing = {
-        research_speed_factor = 0.05
+        category_all_infantry = {
+			default_morale = 0.1
+		}
 
 		research_cost = 1
 		start_year = 3020
 		folder = {
 			name = ents_special_folder
-			position = { x = 0` y = 4 }
+			position = { x = 0 y = 4 }
 		}
 
 		ai_will_do = {
@@ -168,4 +173,31 @@ technologies = {
             lotr_ent_secrets
 		}
 	}
+
+	# Trebuchet
+	ent_thrower = {
+        enable_equipments = {
+            dwarven_chariot_equipment_1
+        }
+
+        dependencies = {
+			trebuchet  = 1
+		}
+
+		research_cost = 1.5
+		start_year = 3020
+		folder = {
+			name = ents_special_folder
+			position = { x = 2 y = 4 }
+		}
+
+		ai_will_do = {
+			factor = 1
+		}
+
+        categories = {
+            lotr_ent_secrets
+		}
+	}
+
 }
diff --git a/common/technologies/machines.txt b/common/technologies/machines.txt
index 503519af8..004d35e3c 100644
--- a/common/technologies/machines.txt
+++ b/common/technologies/machines.txt
@@ -913,6 +913,11 @@ technologies = {
 			position = {  x = 11 y = 8  }
 		}
 
+		folder = {
+			name = ents_special_folder
+			position = { x = 2 y = 2 }
+		}
+
 		ai_will_do = {
 			factor = 0.1
 		}
diff --git a/interface/countrytechtreeview.gui b/interface/countrytechtreeview.gui
index 50a886c72..6e4233a2e 100644
--- a/interface/countrytechtreeview.gui
+++ b/interface/countrytechtreeview.gui
@@ -3862,7 +3862,7 @@ guiTypes = {
 			}
 
 			gridboxtype = {
-				name = "ent_society_tree"
+				name = "entmoot_tree"
 				position = { x=240 y=150 }
 				size = { width = 0 height = 0 }
 				slotsize = { width=60 height= 60 }
@@ -3870,12 +3870,33 @@ guiTypes = {
 			}
 
 			gridboxtype = {
-				name = "ent_deep_roots_tree"
+				name = "ent_strong_boughs_tree"
 				position = { x=580 y=150 }
 				size = { width = 0 height = 0 }
 				slotsize = { width=60 height= 60 }
 				format = "UP"
 			}
+
+			gridboxtype = {
+				name = "basic_siege_tactics_tree"
+				position = { x = 1180 y = 150 }
+				slotsize = { width = 60 height = 60 }
+				format = "UP"
+			}
+			gridboxtype = {
+				name = "designer_basic_siege_tactics_tree"
+				position = { x = 1180 y = 150 }
+				slotsize = { width = 60 height = 60 }
+				format = "UP"
+			}
+
+			gridboxtype = {
+				name = "ent_thrower_tree"
+				position = { x=1180 y=150 }
+				size = { width = 0 height = 0 }
+				slotsize = { width=60 height= 60 }
+				format = "UP"
+			}
 		}
 
 		# folder tabs