[Compat] Rats compatibility

Fixes #152
ChoiceTheorem · Jun 17, 2024 · 7a0fe45 · 7a0fe45
1 parent 541614c
commit 7a0fe45
Show file tree

Hide file tree

Showing 43 changed files with 134 additions and 49 deletions.
diff --git a/checklist.md b/checklist.md
@@ -5,14 +5,15 @@
     - [x] Add pool addition
     - [x] Rework processors for bounty board
 2. Rat compatibility
-    - [] Create village building set
-    - [] Modify village pet shop set
-    - [] Add this through pool mod
+    - [x] Create village building set
+    - [x] Modify village pet shop set
+    - [x] Add this through pool mod
 3. Ice and Fire compatibility
-    - [] Create village building set
-    - [] Add this through pool mod
+    - [ ] Create village building set
+    - [ ] Add this through pool mod
 4. RPG Series
-    - [] Building jewelry workshop set
-    - [] Building Archery range set
-    - [] Add this through pool mod
+    - [ ] Building jewelry workshop set
+    - [ ] Building Archery range set
+    - [ ] Add this through pool mod
 5. Fuse CTOV structure set to vanilla one.
+    - [x] Done
diff --git a/...in/resources/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/beach.json b/...in/resources/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/beach.json
@@ -1,11 +1,15 @@
 {
 	"type": "lithostitched:add_template_pool_elements",
 	"predicate": {
-		"type": "lithostitched:all_of",
-			"predicates": [
+		"type": "lithostitched:any_of",
+		"predicates": [
 			{
 				"type": "lithostitched:mod_loaded",
 				"mod_id": "domesticationinnovation"
+			},
+			{
+				"type": "lithostitched:mod_loaded",
+				"mod_id": "rats"
 			}
 		]
 	},

diff --git a/...esources/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/christmas.json b/...esources/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/christmas.json
@@ -1,11 +1,15 @@
 {
 	"type": "lithostitched:add_template_pool_elements",
 	"predicate": {
-		"type": "lithostitched:all_of",
-			"predicates": [
+		"type": "lithostitched:any_of",
+		"predicates": [
 			{
 				"type": "lithostitched:mod_loaded",
 				"mod_id": "domesticationinnovation"
+    		},
+    		{
+    			"type": "lithostitched:mod_loaded",
+    			"mod_id": "rats"
 			}
 		]
 	},

diff --git a/...ources/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/dark_forest.json b/...ources/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/dark_forest.json
@@ -1,11 +1,15 @@
 {
 	"type": "lithostitched:add_template_pool_elements",
 	"predicate": {
-		"type": "lithostitched:all_of",
+		"type": "lithostitched:any_of",
 			"predicates": [
 			{
 				"type": "lithostitched:mod_loaded",
 				"mod_id": "domesticationinnovation"
+    		},
+    		{
+				"type": "lithostitched:mod_loaded",
+				"mod_id": "rats"
 			}
 		]
 	},

diff --git a/...n/resources/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/desert.json b/...n/resources/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/desert.json
@@ -1,11 +1,15 @@
 {
 	"type": "lithostitched:add_template_pool_elements",
 	"predicate": {
-		"type": "lithostitched:all_of",
-			"predicates": [
+		"type": "lithostitched:any_of",
+		"predicates": [
 			{
 				"type": "lithostitched:mod_loaded",
 				"mod_id": "domesticationinnovation"
+			},
+			{
+				"type": "lithostitched:mod_loaded",
+				"mod_id": "rats"
 			}
 		]
 	},

diff --git a/...urces/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/desert_oasis.json b/...urces/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/desert_oasis.json
@@ -1,11 +1,15 @@
 {
 	"type": "lithostitched:add_template_pool_elements",
 	"predicate": {
-		"type": "lithostitched:all_of",
-			"predicates": [
+		"type": "lithostitched:any_of",
+		"predicates": [
 			{
 				"type": "lithostitched:mod_loaded",
 				"mod_id": "domesticationinnovation"
+    		},
+			{
+				"type": "lithostitched:mod_loaded",
+				"mod_id": "rats"
 			}
 		]
 	},

diff --git a/...n/resources/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/jungle.json b/...n/resources/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/jungle.json
@@ -1,11 +1,15 @@
 {
 	"type": "lithostitched:add_template_pool_elements",
 	"predicate": {
-		"type": "lithostitched:all_of",
-			"predicates": [
+		"type": "lithostitched:any_of",
+		"predicates": [
 			{
 				"type": "lithostitched:mod_loaded",
 				"mod_id": "domesticationinnovation"
+			},
+			{
+				"type": "lithostitched:mod_loaded",
+				"mod_id": "rats"
 			}
 		]
 	},

diff --git a/...ources/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/jungle_tree.json b/...ources/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/jungle_tree.json
@@ -1,11 +1,15 @@
 {
 	"type": "lithostitched:add_template_pool_elements",
 	"predicate": {
-		"type": "lithostitched:all_of",
-			"predicates": [
+		"type": "lithostitched:any_of",
+		"predicates": [
 			{
 				"type": "lithostitched:mod_loaded",
 				"mod_id": "domesticationinnovation"
+			},
+			{
+				"type": "lithostitched:mod_loaded",
+				"mod_id": "rats"
 			}
 		]
 	},

diff --git a/...ain/resources/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/mesa.json b/...ain/resources/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/mesa.json
@@ -1,11 +1,15 @@
 {
 	"type": "lithostitched:add_template_pool_elements",
 	"predicate": {
-		"type": "lithostitched:all_of",
-			"predicates": [
+		"type": "lithostitched:any_of",
+		"predicates": [
 			{
 				"type": "lithostitched:mod_loaded",
 				"mod_id": "domesticationinnovation"
+			},
+			{
+				"type": "lithostitched:mod_loaded",
+				"mod_id": "rats"
 			}
 		]
 	},

diff --git a/...ces/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/mesa_fortified.json b/...ces/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/mesa_fortified.json
@@ -1,11 +1,15 @@
 {
 	"type": "lithostitched:add_template_pool_elements",
 	"predicate": {
-		"type": "lithostitched:all_of",
-			"predicates": [
+		"type": "lithostitched:any_of",
+		"predicates": [
 			{
 				"type": "lithostitched:mod_loaded",
 				"mod_id": "domesticationinnovation"
+			},
+			{
+				"type": "lithostitched:mod_loaded",
+				"mod_id": "rats"
 			}
 		]
 	},

diff --git a/...resources/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/mountain.json b/...resources/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/mountain.json
@@ -1,11 +1,15 @@
 {
 	"type": "lithostitched:add_template_pool_elements",
 	"predicate": {
-		"type": "lithostitched:all_of",
-			"predicates": [
+		"type": "lithostitched:any_of",
+		"predicates": [
 			{
 				"type": "lithostitched:mod_loaded",
 				"mod_id": "domesticationinnovation"
+			},
+			{
+				"type": "lithostitched:mod_loaded",
+				"mod_id": "rats"
 			}
 		]
 	},

diff --git a/...es/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/mountain_alpine.json b/...es/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/mountain_alpine.json
@@ -1,11 +1,15 @@
 {
 	"type": "lithostitched:add_template_pool_elements",
 	"predicate": {
-		"type": "lithostitched:all_of",
-			"predicates": [
+		"type": "lithostitched:any_of",
+		"predicates": [
 			{
 				"type": "lithostitched:mod_loaded",
 				"mod_id": "domesticationinnovation"
+			},
+			{
+				"type": "lithostitched:mod_loaded",
+				"mod_id": "rats"
 			}
 		]
 	},

diff --git a/...resources/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/mushroom.json b/...resources/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/mushroom.json
@@ -1,11 +1,15 @@
 {
 	"type": "lithostitched:add_template_pool_elements",
 	"predicate": {
-		"type": "lithostitched:all_of",
-			"predicates": [
+		"type": "lithostitched:any_of",
+		"predicates": [
 			{
 				"type": "lithostitched:mod_loaded",
 				"mod_id": "domesticationinnovation"
+			},
+			{
+				"type": "lithostitched:mod_loaded",
+				"mod_id": "rats"
 			}
 		]
 	},

diff --git a/...n/resources/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/plains.json b/...n/resources/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/plains.json
@@ -1,11 +1,15 @@
 {
 	"type": "lithostitched:add_template_pool_elements",
 	"predicate": {
-		"type": "lithostitched:all_of",
-			"predicates": [
+		"type": "lithostitched:any_of",
+		"predicates": [
 			{
 				"type": "lithostitched:mod_loaded",
 				"mod_id": "domesticationinnovation"
+			},
+			{
+				"type": "lithostitched:mod_loaded",
+				"mod_id": "rats"
 			}
 		]
 	},

diff --git a/...s/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/plains_fortified.json b/...s/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/plains_fortified.json
@@ -1,11 +1,15 @@
 {
 	"type": "lithostitched:add_template_pool_elements",
 	"predicate": {
-		"type": "lithostitched:all_of",
-			"predicates": [
+		"type": "lithostitched:any_of",
+		"predicates": [
 			{
 				"type": "lithostitched:mod_loaded",
 				"mod_id": "domesticationinnovation"
+			},
+			{
+				"type": "lithostitched:mod_loaded",
+				"mod_id": "rats"
 			}
 		]
 	},

diff --git a/.../resources/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/savanna.json b/.../resources/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/savanna.json
@@ -1,11 +1,15 @@
 {
 	"type": "lithostitched:add_template_pool_elements",
 	"predicate": {
-		"type": "lithostitched:all_of",
-			"predicates": [
+		"type": "lithostitched:any_of",
+		"predicates": [
 			{
 				"type": "lithostitched:mod_loaded",
 				"mod_id": "domesticationinnovation"
+			},
+			{
+				"type": "lithostitched:mod_loaded",
+				"mod_id": "rats"
 			}
 		]
 	},

diff --git a/...sources/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/savanna_na.json b/...sources/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/savanna_na.json
@@ -1,11 +1,15 @@
 {
 	"type": "lithostitched:add_template_pool_elements",
 	"predicate": {
-		"type": "lithostitched:all_of",
-			"predicates": [
+		"type": "lithostitched:any_of",
+		"predicates": [
 			{
 				"type": "lithostitched:mod_loaded",
 				"mod_id": "domesticationinnovation"
+			},
+			{
+				"type": "lithostitched:mod_loaded",
+				"mod_id": "rats"
 			}
 		]
 	},

diff --git a/...in/resources/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/snowy.json b/...in/resources/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/snowy.json
@@ -1,11 +1,15 @@
 {
 	"type": "lithostitched:add_template_pool_elements",
 	"predicate": {
-		"type": "lithostitched:all_of",
-			"predicates": [
+		"type": "lithostitched:any_of",
+		"predicates": [
 			{
 				"type": "lithostitched:mod_loaded",
 				"mod_id": "domesticationinnovation"
+			},
+			{
+				"type": "lithostitched:mod_loaded",
+				"mod_id": "rats"
 			}
 		]
 	},

diff --git a/...in/resources/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/swamp.json b/...in/resources/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/swamp.json
@@ -1,11 +1,15 @@
 {
 	"type": "lithostitched:add_template_pool_elements",
 	"predicate": {
-		"type": "lithostitched:all_of",
-			"predicates": [
+		"type": "lithostitched:any_of",
+		"predicates": [
 			{
 				"type": "lithostitched:mod_loaded",
 				"mod_id": "domesticationinnovation"
+			},
+			{
+				"type": "lithostitched:mod_loaded",
+				"mod_id": "rats"
 			}
 		]
 	},

diff --git a/...es/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/swamp_fortified.json b/...es/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/swamp_fortified.json
@@ -1,11 +1,15 @@
 {
 	"type": "lithostitched:add_template_pool_elements",
 	"predicate": {
-		"type": "lithostitched:all_of",
-			"predicates": [
+		"type": "lithostitched:any_of",
+		"predicates": [
 			{
 				"type": "lithostitched:mod_loaded",
 				"mod_id": "domesticationinnovation"
+			},
+			{
+				"type": "lithostitched:mod_loaded",
+				"mod_id": "rats"
 			}
 		]
 	},

diff --git a/...in/resources/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/taiga.json b/...in/resources/data/ctov/lithostitched/worldgen_modifier/domesticationinnovation/taiga.json
@@ -1,11 +1,15 @@
 {
 	"type": "lithostitched:add_template_pool_elements",
 	"predicate": {
-		"type": "lithostitched:all_of",
-			"predicates": [
+		"type": "lithostitched:any_of",
+		"predicates": [
 			{
 				"type": "lithostitched:mod_loaded",
 				"mod_id": "domesticationinnovation"
+			},
+			{
+				"type": "lithostitched:mod_loaded",
+				"mod_id": "rats"
 			}
 		]
 	},