summaryrefslogtreecommitdiff
path: root/revert-06_Obsolete-useless-hub01-basement-1457.patch
diff options
context:
space:
mode:
Diffstat (limited to 'revert-06_Obsolete-useless-hub01-basement-1457.patch')
-rw-r--r--revert-06_Obsolete-useless-hub01-basement-1457.patch21
1 files changed, 11 insertions, 10 deletions
diff --git a/revert-06_Obsolete-useless-hub01-basement-1457.patch b/revert-06_Obsolete-useless-hub01-basement-1457.patch
index c106c70..a214370 100644
--- a/revert-06_Obsolete-useless-hub01-basement-1457.patch
+++ b/revert-06_Obsolete-useless-hub01-basement-1457.patch
@@ -555,15 +555,12 @@ index 93e999c36a..74d3c55ee5 100644
- }
}
]
-diff --git a/data/json/obsoletion/map.json b/data/json/obsoletion/map.json
-new file mode 100644
-index 0000000000..4b48616c30
---- /dev/null
+--- a/data/json/obsoletion/map.json
+++ b/data/json/obsoletion/map.json
-@@ -0,0 +1,519 @@
-+[
-+ {
-+ "type": "mapgen",
+@@ -1,6 +1,523 @@
+ [
+ {
+ "type": "mapgen",
+ "om_terrain": [
+ [ "robofachq_exe_a0", "robofachq_exe_a1", "robofachq_exe_a2", "robofachq_exe_a3" ],
+ [ "robofachq_exe_b0", "robofachq_exe_b1", "robofachq_exe_b2", "robofachq_exe_b3" ]
@@ -1078,8 +1075,12 @@ index 0000000000..4b48616c30
+ ]
+ }
+ }
-+ }
-+]
++ },
++ {
++ "type": "mapgen",
+ "method": "json",
+ "nested_mapgen_id": "bunker_mech_spawn",
+ "weight": 25,
diff --git a/data/json/npcs/robofac/NPC_Ulysses_Rourke.json b/data/json/obsoletion/npc.json
similarity index 100%
rename from data/json/npcs/robofac/NPC_Ulysses_Rourke.json