Merge pull request #37 from CleverRaven/master

Wait, these are my own PRs
xanderrootslayer · Dec 30, 2019 · 8543e8a · 8543e8a
2 parents 4fd2800 + ace7e39
commit 8543e8a
Show file tree

Hide file tree

Showing 219 changed files with 4,438 additions and 2,302 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/build-scripts/mod_test_blacklist b/build-scripts/mod_test_blacklist
@@ -1,15 +1,10 @@
 aftershock
 blazemod
-crazy_cataclysm
 crt_expansion
-FIC_Weapons
 generic_guns
 Graphical_Overmap
 mapgen_demo
-modular_turrets
 more_locations
-my_sweet_cataclysm
-national_guard_camp
 no_medieval_items
 sees_player_hitbutton
 sees_player_retro
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
@@ -1,39 +1,39 @@
 # Cataclysm data files
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.1.4)
 
 SET(CATACLYSM_DATA_DIRS
-	${CMAKE_SOURCE_DIR}/data/font
-	${CMAKE_SOURCE_DIR}/data/json
-	${CMAKE_SOURCE_DIR}/data/mods
-	${CMAKE_SOURCE_DIR}/data/names
-	${CMAKE_SOURCE_DIR}/data/raw
-	${CMAKE_SOURCE_DIR}/data/motd
-	${CMAKE_SOURCE_DIR}/data/credits
-	${CMAKE_SOURCE_DIR}/data/title
+    ${CMAKE_SOURCE_DIR}/data/font
+    ${CMAKE_SOURCE_DIR}/data/json
+    ${CMAKE_SOURCE_DIR}/data/mods
+    ${CMAKE_SOURCE_DIR}/data/names
+    ${CMAKE_SOURCE_DIR}/data/raw
+    ${CMAKE_SOURCE_DIR}/data/motd
+    ${CMAKE_SOURCE_DIR}/data/credits
+    ${CMAKE_SOURCE_DIR}/data/title
 )
 
 IF(SOUND)
-	SET(CATACLYSM_DATA_DIRS
-		${CATACLYSM_DATA_DIRS}
-		${CMAKE_SOURCE_DIR}/data/sound
-	)
+    SET(CATACLYSM_DATA_DIRS
+      ${CATACLYSM_DATA_DIRS}
+      ${CMAKE_SOURCE_DIR}/data/sound
+    )
 ENDIF(SOUND)
 
 IF(TILES)
-	SET(CATACLYSM_DATA_DIRS
-		${CATACLYSM_DATA_DIRS}
-		${CMAKE_SOURCE_DIR}/gfx
-	)
+    SET(CATACLYSM_DATA_DIRS
+      ${CATACLYSM_DATA_DIRS}
+      ${CMAKE_SOURCE_DIR}/gfx
+    )
 ENDIF(TILES)
 
 SET(CATACLYSM_DATA_FILES
-	${CMAKE_SOURCE_DIR}/data/changelog.txt
-	${CMAKE_SOURCE_DIR}/data/cataicon.ico
-	${CMAKE_SOURCE_DIR}/data/fontdata.json
-	${CMAKE_SOURCE_DIR}/LICENSE.txt
+    ${CMAKE_SOURCE_DIR}/data/changelog.txt
+    ${CMAKE_SOURCE_DIR}/data/cataicon.ico
+    ${CMAKE_SOURCE_DIR}/data/fontdata.json
+    ${CMAKE_SOURCE_DIR}/LICENSE.txt
 )
 
 IF(RELEASE)
-	install(DIRECTORY ${CATACLYSM_DATA_DIRS} DESTINATION ${DATA_PREFIX})
-	install(FILES ${CATACLYSM_DATA_FILES} DESTINATION ${DATA_PREFIX})
+    install(DIRECTORY ${CATACLYSM_DATA_DIRS} DESTINATION ${DATA_PREFIX})
+    install(FILES ${CATACLYSM_DATA_FILES} DESTINATION ${DATA_PREFIX})
 ENDIF(RELEASE)
diff --git a/data/json/flags.json b/data/json/flags.json
@@ -7,6 +7,7 @@
   },
   {
     "id": "EFFECT_INVISIBLE",
+    "context": [  ],
     "type": "json_flag"
   },
   {
@@ -70,6 +71,7 @@
   },
   {
     "id": "EFFECT_NIGHT_VISION",
+    "context": [  ],
     "type": "json_flag"
   },
   {
@@ -144,6 +146,7 @@
   {
     "id": "ETHEREAL_ITEM",
     "type": "json_flag",
+    "context": [  ],
     "info": "This item disappears as soon as its timer runs out whether it is food or not."
   },
   {
@@ -680,38 +683,47 @@
   },
   {
     "id": "EFFECT_FEATHER_FALL",
+    "context": [  ],
     "type": "json_flag"
   },
   {
     "id": "EFFECT_BIO_IMMUNE",
+    "context": [  ],
     "type": "json_flag"
   },
   {
     "id": "EFFECT_BASH_IMMUNE",
+    "context": [  ],
     "type": "json_flag"
   },
   {
     "id": "EFFECT_CUT_IMMUNE",
+    "context": [  ],
     "type": "json_flag"
   },
   {
     "id": "EFFECT_ACID_IMMUNE",
+    "context": [  ],
     "type": "json_flag"
   },
   {
     "id": "EFFECT_STAB_IMMUNE",
+    "context": [  ],
     "type": "json_flag"
   },
   {
     "id": "EFFECT_HEAT_IMMUNE",
+    "context": [  ],
     "type": "json_flag"
   },
   {
     "id": "EFFECT_COLD_IMMUNE",
+    "context": [  ],
     "type": "json_flag"
   },
   {
     "id": "ELECTRIC_IMMUNE",
+    "context": [  ],
     "type": "json_flag"
   },
   {

diff --git a/data/json/item_actions.json b/data/json/item_actions.json
@@ -1024,6 +1024,11 @@
     "id": "place_monster",
     "name": "Activate"
   },
+  {
+    "type": "item_action",
+    "id": "place_npc",
+    "name": "Activate"
+  },
   {
     "type": "item_action",
     "id": "place_trap",

diff --git a/data/json/itemgroups/SUS/domestic.json b/data/json/itemgroups/SUS/domestic.json
@@ -607,5 +607,37 @@
       { "item": "seasoning_italian", "prob": 65 },
       { "item": "seasoning_salt", "prob": 65 }
     ]
+  },
+  {
+    "id": "SUS_bathroom_toiletries",
+    "type": "item_group",
+    "//": "SUS item groups are collections that contain a reasonable realistic distribution of items that might spawn in a given storage furniture.",
+    "//2": "This is a category for all the items which appear in bathrooms, which are NOT immediately useful medicines. This list is created in part to not ruin player's chances of finding antibiotics, antifungals and asprin, as it suppliments the current bathroom drops instead of replacing. Item probabilities are loosely based on how likely families would take an item with them when evacuating.",
+    "subtype": "collection",
+    "entries": [
+      { "item": "soap_holder", "prob": 40 },
+      { "item": "soap", "count": [ 1, 4 ], "prob": 60 },
+      { "item": "bleach", "prob": 15 },
+      { "item": "ammonia", "prob": 20 },
+      { "item": "razor_shaving", "count": [ 1, 2 ], "prob": 75 },
+      { "item": "shavingkit", "prob": 1 },
+      { "item": "mirror", "prob": 25 },
+      { "item": "toothbrush_plain", "count": [ 1, 3 ], "prob": 45 },
+      { "item": "hairbrush", "count": [ 1, 2 ], "prob": 60 },
+      { "item": "curler_hair", "prob": 25 },
+      { "item": "string_floss", "count": [ 1, 2 ], "prob": 50 },
+      { "item": "comb_pocket", "count": [ 1, 2 ], "prob": 55 },
+      { "item": "plunger_toilet", "prob": 90 },
+      { "item": "plunger_futuristic", "prob": 20 },
+      { "item": "cu_pipe", "prob": 10 },
+      { "item": "hose", "prob": 10 },
+      { "item": "sponge", "count": [ 1, 3 ], "prob": 75 },
+      { "item": "candle", "count": [ 1, 2 ], "prob": 20 },
+      { "item": "matches", "prob": 10 },
+      { "item": "toilet_paper", "prob": 80 },
+      { "item": "hair_dryer", "prob": 60 },
+      { "item": "curling_iron", "prob": 50 },
+      { "item": "brush_toilet", "prob": 75 }
+    ]
   }
 ]
diff --git a/data/json/itemgroups/SUS/garage.json b/data/json/itemgroups/SUS/garage.json
@@ -0,0 +1,28 @@
+[
+  {
+    "id": "SUS_welding_gear",
+    "type": "item_group",
+    "//": "SUS item groups are collections that contain a reasonable realistic distribution of items that might spawn in a given storage furniture.",
+    "//2": "This group is for a rack of welding gear.",
+    "subtype": "collection",
+    "entries": [
+      {
+        "distribution": [
+          {
+            "collection": [
+              { "item": "oxy_torch" },
+              { "item": "weldtank", "count": [ 1, 3 ], "prob": 80 },
+              { "item": "tinyweldtank", "count": [ 1, 3 ], "prob": 60 }
+            ],
+            "prob": 30
+          },
+          {
+            "collection": [ { "item": "welder" }, { "item": "medium_plus_battery_cell", "count": [ 1, 3 ], "prob": 80 } ],
+            "prob": 70
+          }
+        ]
+      },
+      { "distribution": [ { "item": "welding_mask", "prob": 70 }, { "item": "goggles_welding", "prob": 70 } ] }
+    ]
+  }
+]