Merge pull request cataclysmbnteam#1 from CleverRaven/master

Testing
Coolthulhu · Jun 20, 2018 · 9acc2fa · 9acc2fa
2 parents 63ff4d3 + 8bf0d6b
commit 9acc2fa
Show file tree

Hide file tree

Showing 61 changed files with 2,019 additions and 706 deletions.
diff --git a/Makefile b/Makefile
@@ -652,7 +652,7 @@ ifeq ($(TARGETSYSTEM),WINDOWS)
   RSRC = $(wildcard $(SRC_DIR)/*.rc)
   _OBJS += $(RSRC:$(SRC_DIR)/%.rc=%.o)
 endif
-OBJS = $(patsubst %,$(ODIR)/%,$(_OBJS))
+OBJS = $(sort $(patsubst %,$(ODIR)/%,$(_OBJS)))
 
 ifdef LANGUAGES
   L10N = localization

diff --git a/data/json/construction.json b/data/json/construction.json
@@ -126,7 +126,7 @@
         "required_skills" : [ [ "survival", 2 ] ],
         "time" : 60,
         "qualities": [ [
-            { "id": "AXE", "level": 2 }, { "id": "SAW_W", "level": 2 }
+            { "id": "AXE", "level": 2 }, { "id": "SAW_W", "level": 1 }
         ] ],
         "pre_terrain" : "t_trunk",
         "post_terrain" : "t_dirt",

diff --git a/data/json/harvest.json b/data/json/harvest.json
@@ -77,5 +77,16 @@
       { "drop": "acidchitin_piece", "base_num": [ 2, 6 ], "scale_num": [ 0.3, 0.6 ], "max": 10 },
       { "drop": "fat", "base_num": [ 5, 8 ], "scale_num": [ 0.6, 0.8 ], "max": 18 }
     ]
+  },
+  {
+    "id": "fungaloid_mass",
+    "type": "harvest",
+    "message": "You laboriously hack and dig through the remains of the fungal mass.",
+    "entries": [
+      { "drop": "veggy", "base_num": [ 6, 10 ], "scale_num": [ 0.6, 0.8 ], "max": 20 },
+      { "drop": "veggy_tainted", "base_num": [ 16, 25 ], "scale_num": [ 0.6, 0.8 ], "max": 50 },
+      { "drop": "plant_sac", "base_num": [ 3, 6 ], "scale_num": [ 0.7, 0.9 ], "max": 10 },
+      { "drop": "plant_fibre", "base_num": [ 4, 8 ], "scale_num": [ 0.5, 0.7 ], "max": 10 }
+    ]
   }
 ]
diff --git a/data/json/item_actions.json b/data/json/item_actions.json
@@ -459,6 +459,10 @@
         "type" : "item_action",
         "id" : "MP3_ON",
         "name" : "Turn off"
+    },{
+        "type" : "item_action",
+        "id" : "GASMASK",
+        "name" : "Prepare to use"
     },{
         "type" : "item_action",
         "id" : "MULTICOOKER",
@@ -742,7 +746,7 @@
     },
     {
         "type" : "item_action",
-        "id" : "FEEDCATTLE",
+        "id" : "CATTLEFODDER",
         "name" : "Place"
     },
     {

diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json
@@ -749,6 +749,48 @@
         "ammo_type" : "rebreather_filter",
         "count" : 30
     },
+    {
+        "type": "AMMO",
+        "id": "gasfilter_s",
+        "category": "spare_parts",
+        "price": 2500,
+        "name": "filter mask cartridge",
+        "symbol": "=",
+        "color": "light_gray",
+        "description": "Small replacement filter cartridge for air filtration masks.",
+        "volume": 1,
+        "weight": 1,
+        "ammo_type": "gasfilter_s",
+        "count": 100
+    },
+    {
+        "type": "AMMO",
+        "id": "gasfilter_m",
+        "category": "spare_parts",  
+        "price": 2500,
+        "name": "gas mask cartridge",
+        "symbol": "=",
+        "color": "light_gray",
+        "description": "Medium replacement filter cartridge for air filtration masks",
+        "volume": 1,
+        "weight": 2,
+        "ammo_type": "gasfilter_m",
+        "count": 100
+    },
+    {
+        "type": "AMMO",
+        "id": "gasfilter_l",
+        "category": "spare_parts",
+        "price": 2500,
+        "name": "hazmat mask cartridge",
+        "symbol": "=",
+        "color": "light_gray",
+        "description": "Heavy replacement filter cartridge for air filtration masks",
+        "volume": 1,
+        "weight": 3,
+        "ammo_type": "gasfilter_l",
+        "count": 100
+    },
     {   "type" : "AMMO",
         "id" : "nicotine_liquid",
         "category" : "spare_parts",

diff --git a/data/json/items/ammo_types.json b/data/json/items/ammo_types.json
@@ -371,6 +371,24 @@
         "name" : "rebreather filter",
         "default" : "rebreather_filter"
     },
+    {
+        "type": "ammunition_type",
+        "id": "gasfilter_s",
+        "name": "filter mask cartridge",
+        "default": "gasfilter_s"
+   },
+   {
+        "type": "ammunition_type",
+        "id": "gasfilter_m",
+        "name": "gas mask cartridge",
+        "default": "gasfilter_m"
+    },
+    {
+        "type": "ammunition_type",
+        "id": "gasfilter_l",
+        "name": "hazmat mask cartridge",
+        "default": "gasfilter_l"
+    },
     {
         "type" : "ammunition_type",
         "id" : "300",

diff --git a/data/json/items/armor.json b/data/json/items/armor.json
@@ -4068,7 +4068,7 @@
   {
     "id": "hat_noise_cancelling",
     "type": "ARMOR",
-    "name": "noise cancelling headgear",
+    "name": "noise canceling headgear",
     "description": "Padding over your ears kept in place by some string.  Blocks incoming sounds.",
     "weight": 72,
     "volume": 2,
@@ -6241,106 +6241,6 @@
     "material_thickness": 1,
     "environmental_protection": 2
   },
-  {
-    "id": "mask_filter",
-    "type": "ARMOR",
-    "name": "filter mask",
-    "description": "A mask that straps over your mouth and nose and filters air.  Protects from smoke, dust, and other contaminants quite well.",
-    "weight": 260,
-    "volume": 2,
-    "price": 3500,
-    "to_hit": 1,
-    "material": [ "plastic" ],
-    "symbol": "[",
-    "color": "light_gray",
-    "covers": [ "MOUTH" ],
-    "coverage": 100,
-    "encumbrance": 20,
-    "warmth": 10,
-    "material_thickness": 2,
-    "environmental_protection": 7
-  },
-  {
-    "id": "mask_fsurvivor",
-    "type": "ARMOR",
-    "category": "armor",
-    "name": "survivor firemask",
-    "description": "A custom-built, Nomex-insulated gas mask that covers the face and eyes.  It provides excellent protection from heat, smoke, teargas, and shrapnel.",
-    "weight": 708,
-    "volume": 5,
-    "price": 24000,
-    "to_hit": -3,
-    "material": [ "kevlar", "nomex" ],
-    "symbol": "[",
-    "color": "light_gray",
-    "covers": [ "MOUTH", "EYES" ],
-    "coverage": 100,
-    "encumbrance": 30,
-    "warmth": 15,
-    "material_thickness": 3,
-    "environmental_protection": 15,
-    "flags": [ "VARSIZE", "STURDY" ]
-  },
-  {
-    "id": "mask_fsurvivorxl",
-    "type": "ARMOR",
-    "category": "armor",
-    "name": "XL survivor firemask",
-    "description": "A custom-built, Nomex-insulated gas mask that covers the face and eyes regardless of your state of mutation.  It provides excellent protection from heat, smoke, teargas, and shrapnel.",
-    "weight": 1108,
-    "volume": 5,
-    "price": 24000,
-    "to_hit": -3,
-    "material": [ "kevlar", "nomex" ],
-    "symbol": "[",
-    "color": "light_gray",
-    "covers": [ "MOUTH", "EYES" ],
-    "coverage": 100,
-    "encumbrance": 35,
-    "warmth": 15,
-    "material_thickness": 3,
-    "environmental_protection": 15,
-    "flags": [ "VARSIZE", "STURDY", "OVERSIZE" ]
-  },
-  {
-    "id": "mask_gas",
-    "type": "ARMOR",
-    "name": "gas mask",
-    "description": "A full gas mask that covers the face and eyes.  Provides excellent protection from smoke, teargas, and other contaminants.",
-    "weight": 897,
-    "volume": 4,
-    "price": 4900,
-    "to_hit": -3,
-    "material": [ "plastic" ],
-    "symbol": "[",
-    "color": "dark_gray",
-    "covers": [ "MOUTH", "EYES" ],
-    "coverage": 100,
-    "encumbrance": 30,
-    "warmth": 20,
-    "material_thickness": 2,
-    "environmental_protection": 16
-  },
-  {
-    "id": "mask_gas_xl",
-    "type": "ARMOR",
-    "name": "XL gas mask",
-    "description": "A rather roomy mask with filters attached, designed to accommodate exotic anatomy.  Provides excellent protection from smoke, teargas, and other contaminants.",
-    "weight": 1397,
-    "volume": 6,
-    "price": 25000,
-    "to_hit": -3,
-    "material": [ "plastic" ],
-    "symbol": "[",
-    "color": "dark_gray",
-    "covers": [ "MOUTH", "EYES" ],
-    "coverage": 100,
-    "encumbrance": 30,
-    "warmth": 20,
-    "material_thickness": 2,
-    "environmental_protection": 16,
-    "flags": [ "OVERSIZE" ]
-  },
   {
     "id": "mask_guy_fawkes",
     "type": "ARMOR",
@@ -6384,50 +6284,6 @@
     "environmental_protection": 1,
     "flags": [ "WATER_FRIENDLY", "STURDY" ]
   },
-  {
-    "id": "mask_hsurvivor",
-    "type": "ARMOR",
-    "category": "armor",
-    "name": "heavy survivor mask",
-    "description": "A custom-built, steel reinforced gas mask that covers the face and eyes.  Provides excellent protection from smoke, teargas, and shrapnel.",
-    "weight": 858,
-    "volume": 5,
-    "price": 24000,
-    "to_hit": -3,
-    "material": [ "kevlar", "steel" ],
-    "symbol": "[",
-    "color": "dark_gray",
-    "covers": [ "MOUTH", "EYES" ],
-    "coverage": 100,
-    "encumbrance": 30,
-    "warmth": 15,
-    "material_thickness": 3,
-    "environmental_protection": 15,
-    "qualities": [ [ "GLARE", 1 ] ],
-    "flags": [ "VARSIZE", "STURDY" ]
-  },
-  {
-    "id": "mask_lsurvivor",
-    "type": "ARMOR",
-    "category": "armor",
-    "name": "light survivor mask",
-    "description": "A custom-built, reinforced gas mask that covers the face and eyes.  Provides excellent protection from smoke, teargas, and shrapnel.",
-    "weight": 466,
-    "volume": 5,
-    "price": 24000,
-    "to_hit": -3,
-    "material": [ "kevlar", "cotton" ],
-    "symbol": "[",
-    "color": "dark_gray",
-    "covers": [ "MOUTH", "EYES" ],
-    "coverage": 100,
-    "encumbrance": 20,
-    "warmth": 15,
-    "material_thickness": 3,
-    "environmental_protection": 15,
-    "qualities": [ [ "GLARE", 1 ] ],
-    "flags": [ "VARSIZE", "STURDY" ]
-  },
   {
     "id": "mask_rioter",
     "type": "ARMOR",
@@ -6448,94 +6304,6 @@
     "environmental_protection": 1,
     "flags": [ "HELMET_COMPAT" ]
   },
-  {
-    "id": "mask_survivor",
-    "type": "ARMOR",
-    "category": "armor",
-    "name": "survivor mask",
-    "description": "A custom-built, leather reinforced gas mask that covers the face and eyes.  Provides excellent protection from smoke, teargas, and shrapnel.",
-    "weight": 682,
-    "volume": 5,
-    "price": 24000,
-    "to_hit": -3,
-    "material": [ "kevlar", "leather" ],
-    "symbol": "[",
-    "color": "dark_gray",
-    "covers": [ "MOUTH", "EYES" ],
-    "coverage": 100,
-    "encumbrance": 25,
-    "warmth": 15,
-    "material_thickness": 3,
-    "environmental_protection": 15,
-    "qualities": [ [ "GLARE", 1 ] ],
-    "flags": [ "VARSIZE", "STURDY" ]
-  },
-  {
-    "id": "mask_survivorxl",
-    "type": "ARMOR",
-    "category": "armor",
-    "name": "XL survivor mask",
-    "description": "A custom-built, reinforced gas mask that covers the face and eyes regardless of your state of mutation.  Provides excellent protection from smoke, teargas, and shrapnel.",
-    "weight": 982,
-    "volume": 5,
-    "price": 24000,
-    "to_hit": -3,
-    "material": [ "kevlar", "plastic" ],
-    "symbol": "[",
-    "color": "dark_gray",
-    "covers": [ "MOUTH", "EYES" ],
-    "coverage": 100,
-    "encumbrance": 30,
-    "warmth": 15,
-    "material_thickness": 3,
-    "environmental_protection": 15,
-    "qualities": [ [ "GLARE", 1 ] ],
-    "flags": [ "VARSIZE", "STURDY", "OVERSIZE" ]
-  },
-  {
-    "id": "mask_wsurvivor",
-    "type": "ARMOR",
-    "category": "armor",
-    "name": "winter survivor mask",
-    "description": "A custom-built, fur-trimmed gas mask that covers the face and eyes.  Quite warm, it still provides excellent protection from smoke, teargas, and shrapnel.",
-    "weight": 682,
-    "volume": 5,
-    "price": 24000,
-    "to_hit": -3,
-    "material": [ "kevlar", "fur" ],
-    "symbol": "[",
-    "color": "light_gray",
-    "covers": [ "MOUTH", "EYES" ],
-    "coverage": 100,
-    "encumbrance": 30,
-    "warmth": 75,
-    "material_thickness": 3,
-    "environmental_protection": 15,
-    "qualities": [ [ "GLARE", 1 ] ],
-    "flags": [ "VARSIZE", "STURDY" ]
-  },
-  {
-    "id": "mask_wsurvivorxl",
-    "type": "ARMOR",
-    "category": "armor",
-    "name": "XL winter survivor mask",
-    "description": "A custom-built, fur-trimmed gas mask that covers the face and eyes regardless of your state of mutation.  Quite warm, it still provides excellent protection from smoke, teargas, and shrapnel.",
-    "weight": 1062,
-    "volume": 5,
-    "price": 24000,
-    "to_hit": -3,
-    "material": [ "kevlar", "fur" ],
-    "symbol": "[",
-    "color": "light_gray",
-    "covers": [ "MOUTH", "EYES" ],
-    "coverage": 100,
-    "encumbrance": 35,
-    "warmth": 75,
-    "material_thickness": 3,
-    "environmental_protection": 15,
-    "qualities": [ [ "GLARE", 1 ] ],
-    "flags": [ "VARSIZE", "STURDY", "OVERSIZE" ]
-  },
   {
     "id": "mbag",
     "type": "ARMOR",