fix new style changes

pisskop · Oct 21, 2017 · ce216c8 · ce216c8
1 parent f84ca45
commit ce216c8
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 19 deletions.
diff --git a/locations/cave_pit.json b/locations/cave_pit.json
@@ -82,10 +82,8 @@
         "b": "f_bed",
         "D": "f_dresser",
         "F": "f_slab",
-        "8": [ "f_shackle", "f_shackle", "f_spike" ]
-      },
-      "traps": {
-        "F": "tr_brazier"
+        "8": [ "f_shackle", "f_shackle", "f_spike" ],
+        "#": "f_brazier"
       },
       "monster": {
         "c": { "monster": "mon_horror_dusk_queen" }
@@ -94,13 +92,15 @@
         { "point": "furniture", "id": "f_blade", "x": 16, "y": 16 },
         { "point": "furniture", "id": "f_spike", "x": 13, "y": 13 }
       ],
-      "place_items": [
-        { "item": "doom_victim_corpse", "chance": 65, "x": [ 3,20 ], "y": [ 2,20 ] },
-        { "item": "doom_victim_corpse", "chance": 75, "x": [ 3,20 ], "y": [ 2,20 ] }
-      ],
       "place_monsters": [
         { "monster": "GROUP_HORROR", "x": [ 6, 10 ], "y": [ 6, 10 ], "chance": 2, "repeat": [ 1, 3 ] }
-      ]
+      ],
+      "mapping": {
+        " ": { "items": [
+               { "item": "doom_victim_corpse", "chance": [ 5 ] }, { "item": "spider", "chance": [ 2 ] }, { "item": "rare", "chance": [ 1 ] }
+          ]
+        }
+      }
     }
   }
 ]
diff --git a/locations/override/cabin_strange_pk.json b/locations/override/cabin_strange_pk.json
@@ -329,7 +329,6 @@
       ],
       "mapping": {
         " ": { "items": { "item": "subway", "chance": 6 } },
-        "%": { "item": { "item": "brazier" } },
         "X": { "items": [ { "item": "art", "chance": 1 }, { "item": "medieval", "chance": 1 }, { "item": "dresser", "chance": 15 }, { "item": "church", "chance": 10 } ] },
         "B": { "furniture": "f_bookcase", "items": { "item": "novels", "chance": 40 } },
         "f": { "items": { "item": "cannedfood", "chance": 30 } },
@@ -354,7 +353,8 @@
         "X": [ "f_crate_c", "f_crate_c", "f_crate_c", "f_crate_o", "f_null", "f_null", "f_null", "f_null", "f_null", "f_null", "f_null", "f_null", "f_null", "f_null", "f_null", "f_null", "f_null", "f_null", "f_null", "f_null", "f_null", "f_null" ],
         "x": [ "f_crate_c", "f_null", "f_null", "f_null", "f_null", "f_null", "f_null", "f_null", "f_null", "f_null", "f_null", "f_null", "f_null", "f_null", "f_null", "f_null", "f_null", "f_null", "f_null", "f_null", "f_null", "f_null", "f_null", "f_null", "f_null" ],
         "L": "f_locker",
-        "1": "f_grave_monument"
+        "1": "f_grave_monument",
+        "#": "f_brazier"
       },
       "monster": {
         "*": { "monster": "mon_flesh_angel" },

diff --git a/locations/override/standing_stones.json b/locations/override/standing_stones.json
@@ -41,10 +41,8 @@
       },
       "furniture": {
         "O": "f_boulder_large",
-        "o": "f_boulder_small"
-      },
-      "traps": {
-        "#": "tr_brazier"
+        "o": "f_boulder_small",
+        "#": "f_brazier"
       },
       "loot": {
         "#": { "item": "stick", "repeat": [ 1, 2 ] }

diff --git a/modinfo.json b/modinfo.json
@@ -7,7 +7,7 @@
     "description": "Rebalances spawn list, adds new monsters and items, adds new buildings and fortifies old buildings, and strives to create a harsher enviornment to survive in.",
     "category": "creatures",
     "author": "pisskop",
-    "version": "5.5.8",   "//": "For the CDDA Launcher Program.",
+    "version": "5.5.9",   "//": "For the CDDA Launcher Program.",
     "path": ""
   },
   {

diff --git a/pk_regional_settings.json b/pk_regional_settings.json
@@ -2,7 +2,6 @@
   {
     "type": "region_settings",
     "id": "default",                "//": "identifier, when region_map is in it will determine alternatives ('desert' etc)",
-    "house_basement_chance": 5,           "//": "one_in(n) houses with basements",
     "default_oter": "field",            "//": "default oter_id (anything that isn't a house/road/etc) some become forests",
     "default_groundcover": [
       [ "t_grass", 7850 ], [ "t_dirt",  2130 ], [ "t_tree_young", 15 ], [ "t_dirtmound", 3 ], [ "t_tree", 1 ], [ "t_tree_pine", 1 ]
@@ -136,6 +135,11 @@
           "park": 4,
           "pool": 1
         },
+        "houses": {
+          "house_two_story_basement": 25,
+          "house": 1250,
+          "house_base": 225
+        },
         "shops": {                  "//": "weighted list of oterrains for commercial zoning",
           "s_gas": 5,
           "s_pharm": 3,
@@ -189,6 +193,6 @@
         "base_humidity" : 58.0,
         "base_pressure" : 1025.0,
         "base_acid" : 0.25
-     }
-   }
+    }
+  }
 ]