Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA

Maleclypse · Mar 24, 2021 · 6e836a9 · 6e836a9
2 parents 91405ab + 1e09f2f
commit 6e836a9
Show file tree

Hide file tree

Showing 144 changed files with 38,992 additions and 89,739 deletions.
diff --git a/Makefile b/Makefile
@@ -1196,7 +1196,7 @@ endif
 
 style-json: json_blacklist $(JSON_FORMATTER_BIN)
 ifndef CROSS
-	find data -name "*.json" -print0 | grep -v -z -F -f json_blacklist | \
+	find data gfx -name "*.json" -print0 | grep -v -z -F -f json_blacklist | \
 	  xargs -0 -L 1 $(JSON_FORMATTER_BIN)
 else
 	@echo Cannot run json formatter in cross compiles.

diff --git a/data/changelog.txt b/data/changelog.txt
diff --git a/data/credits/en.credits b/data/credits/en.credits
@@ -1,5 +1,5 @@
-# Max length of a line is 78 characters; the following line is for reference
-# Longer lines will be automatically folded
+# Lines longer than 78 characters will be wrapped automatically
+# The following line is for reference
 ##############################################################################
 <color_white>Original author:</color>    <color_white>Project Manager:</color>
 <color_yellow>Whales</color> (<color_dark_gray>retired</color>)    <color_yellow>KevinGranade</color>
@@ -25,4 +25,4 @@
 <color_cyan>https://github.com/CleverRaven/Cataclysm-DDA/contributors</color>
 
 <color_light_cyan>Cataclysm</color>: <color_light_blue>Dark Days Ahead</color> is released under <color_white>CC-BY-SA 3.0</color>:
-<color_cyan>https://creativecommons.org/licenses/by-sa/3.0/</color>
+<color_cyan>https://creativecommons.org/licenses/by-sa/3.0/</color>
diff --git a/data/credits/ru.credits b/data/credits/ru.credits
@@ -1,5 +1,5 @@
-# Max length of a line is 78 characters; the following line is for reference
-# Longer lines will be automatically folded
+# Lines longer than 78 characters will be wrapped automatically
+# The following line is for reference
 ##############################################################################
 <color_white>Оригинальный автор:</color>    <color_white>Менеджер проекта:</color>
 <color_yellow>Whales</color> (<color_dark_gray>не активен</color>)    <color_yellow>KevinGranade</color>

diff --git a/data/json/bionics.json b/data/json/bionics.json
@@ -1210,14 +1210,6 @@
     "weight_capacity_bonus": "20 kg",
     "flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ]
   },
-  {
-    "id": "bio_shock_absorber",
-    "type": "bionic",
-    "name": { "str": "Kinetic Shock Absorbers" },
-    "description": "Most of the flesh in your arms, legs, and upper torso has been replaced with industrial-strength springs and protective padding.  Clenching your fist allows you to fold and unfold this padding; while active, the hydraulic absorbers will prevent damage to your body from severe impacts, at the cost of impaired movement.",
-    "occupied_bodyparts": [ [ "torso", 1 ], [ "arm_l", 1 ], [ "arm_r", 1 ], [ "leg_l", 1 ], [ "leg_r", 1 ] ],
-    "flags": [ "BIONIC_TOGGLED" ]
-  },
   {
     "id": "bio_taste_blocker",
     "type": "bionic",

diff --git a/data/json/construction.json b/data/json/construction.json
@@ -4073,7 +4073,7 @@
     "required_skills": [ [ "fabrication", 2 ] ],
     "time": "40 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M", "level": 1 } ] ],
-    "components": [ [ [ "rigid_plastic_sheet", 2 ] ], [ [ "nail", 16 ] ], [ [ "2x4", 4 ] ] ],
+    "components": [ [ [ "rigid_plastic_sheet", 1 ] ], [ [ "nail", 16 ] ], [ [ "2x4", 4 ] ] ],
     "pre_terrain": "t_window_empty",
     "post_terrain": "t_plastic_window"
   },
@@ -4099,7 +4099,7 @@
     "required_skills": [ [ "fabrication", 2 ] ],
     "time": "40 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M", "level": 1 } ] ],
-    "components": [ [ [ "rigid_plastic_sheet", 1 ] ], [ [ "nail", 16 ] ], [ [ "2x4", 4 ] ] ],
+    "components": [ [ [ "rigid_plastic_sheet", 3 ] ], [ [ "nail", 16 ] ], [ [ "2x4", 4 ] ] ],
     "pre_terrain": "t_window_empty",
     "post_terrain": "t_reinforced_plastic_window"
   },

diff --git a/data/json/harvest.json b/data/json/harvest.json
@@ -1133,8 +1133,7 @@
       { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.08 },
       { "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 },
       { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 },
-      { "drop": "raw_tainted_leather", "type": "skin", "mass_ratio": 0.02 },
-      { "drop": "pheromone", "type": "bionic", "max": 1 }
+      { "drop": "raw_tainted_leather", "type": "skin", "mass_ratio": 0.02 }
     ]
   },
   {
@@ -1146,8 +1145,7 @@
       { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.08 },
       { "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 },
       { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 },
-      { "drop": "raw_tainted_fur", "type": "skin", "mass_ratio": 0.02 },
-      { "drop": "pheromone", "type": "bionic", "max": 1 }
+      { "drop": "raw_tainted_fur", "type": "skin", "mass_ratio": 0.02 }
     ]
   },
   {
@@ -1169,8 +1167,7 @@
       { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.25 },
       { "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 },
       { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.08 },
-      { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 },
-      { "drop": "pheromone", "type": "bionic", "max": 1 }
+      { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 }
     ]
   },
   {
@@ -1195,8 +1192,7 @@
       { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 },
       { "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 },
       { "drop": "sheet_kevlar", "type": "skin", "mass_ratio": 0.04 },
-      { "drop": "raw_tainted_leather", "type": "skin", "mass_ratio": 0.04 },
-      { "drop": "pheromone", "type": "bionic", "max": 1 }
+      { "drop": "raw_tainted_leather", "type": "skin", "mass_ratio": 0.04 }
     ]
   },
   {

diff --git a/data/json/item_actions.json b/data/json/item_actions.json
@@ -719,11 +719,6 @@
     "id": "PACK_ITEM",
     "name": { "str": "Pack an item" }
   },
-  {
-    "type": "item_action",
-    "id": "PHEROMONE",
-    "name": { "str": "Squeeze" }
-  },
   {
     "type": "item_action",
     "id": "PLANTBLECH",

diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -1279,7 +1279,6 @@
       [ "bio_resonator", 10 ],
       [ "bio_hydraulics", 10 ],
       [ "bio_weight", 12 ],
-      [ "bio_shock_absorber", 10 ],
       [ "jerrycan", 10 ],
       [ "jerrycan_big", 10 ],
       [ "gasoline_lantern", 5 ],

diff --git a/data/json/itemgroups/bionics.json b/data/json/itemgroups/bionics.json
@@ -86,7 +86,6 @@
       [ "bio_cable", 10 ],
       [ "bio_syringe", 10 ],
       [ "bio_weight", 10 ],
-      [ "bio_shock_absorber", 10 ],
       [ "bio_jointservo", 10 ],
       [ "bio_shotgun", 10 ],
       [ "bio_taste_blocker", 10 ],
@@ -284,7 +283,6 @@
       [ "bio_faraday", 10 ],
       [ "bio_nanobots", 10 ],
       [ "bio_ods", 10 ],
-      [ "bio_shock_absorber", 10 ],
       [ "bio_uncanny_dodge", 10 ]
     ]
   },
@@ -322,7 +320,6 @@
       [ "bio_watch", 20 ],
       [ "bio_faraday", 20 ],
       [ "bio_weight", 20 ],
-      [ "bio_shock_absorber", 20 ],
       [ "bio_soporific", 20 ]
     ]
   },

diff --git a/data/json/itemgroups/science_and_tech.json b/data/json/itemgroups/science_and_tech.json
@@ -73,7 +73,6 @@
       [ "RTG_coffee", 2 ],
       [ "canister_goo", 8 ],
       [ "EMPbomb", 2 ],
-      [ "pheromone", 1 ],
       [ "flux_comp_gen", 3 ],
       [ "portal", 2 ],
       [ "bot_manhack", 1 ],

diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json
@@ -371,7 +371,7 @@
     "weight": "657 g",
     "volume": "250 ml",
     "bashing": 7,
-    "damage": { "damage_type": "stab", "amount": 7 },
+    "damage": { "damage_type": "bash", "amount": 7 },
     "range": 10,
     "dispersion": 14,
     "loudness": 0,
@@ -476,7 +476,7 @@
     "volume": "200ml",
     "weight": "1 g",
     "ammo_type": "BB",
-    "damage": { "damage_type": "stab", "amount": 2 },
+    "damage": { "damage_type": "bullet", "amount": 2 },
     "dispersion": 100,
     "count": 500,
     "stack_size": 200,

diff --git a/data/json/items/bionics.json b/data/json/items/bionics.json
@@ -1011,17 +1011,6 @@
     "difficulty": 3,
     "installation_data": "AID_bio_weight"
   },
-  {
-    "id": "bio_shock_absorber",
-    "copy-from": "bionic_general",
-    "type": "BIONIC_ITEM",
-    "name": { "str": "Kinetic Shock Absorbers CBM" },
-    "looks_like": "bio_int_enhancer",
-    "description": "A set of hydraulic springs and foldable padding that replaces most of the flesh in the limbs and upper torso.  While active, these absorbers will negate damage from severe impacts such as falling, at the cost of reducing the user's ability to move effectively.",
-    "price": 10000,
-    "weight": "3000 g",
-    "difficulty": 4
-  },
   {
     "id": "bio_taste_blocker",
     "copy-from": "bionic_general",

diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json
@@ -604,7 +604,6 @@
     "snippet_category": "mutant_lung_desc",
     "description": "You're pretty sure this is lung tissue.",
     "looks_like": "lung",
-    "cooks_like": "lung_cooked",
     "proportional": { "price_postapoc": 0.1, "calories": 0.65 },
     "vitamins": [ [ "mutant_toxin", 25 ] ],
     "extend": { "flags": [ "BAD_TASTE" ] }

diff --git a/data/json/items/comestibles/drink.json b/data/json/items/comestibles/drink.json
@@ -84,7 +84,7 @@
     "description": "This serving of coffee has been created using an atomic coffee pot's FULL NUCLEAR brewing cycle.  Every possible microgram of caffeine and flavor has been carefully extracted for your enjoyment, using the power of the atom.",
     "price": 300,
     "price_postapoc": 100,
-    "flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE" ],
+    "flags": [ "EATEN_HOT" ],
     "fun": 10
   },
   {
@@ -212,7 +212,7 @@
     "material": [ "water" ],
     "volume": "250 ml",
     "phase": "liquid",
-    "flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE" ],
+    "flags": [ "EATEN_HOT" ],
     "fun": 6
   },
   {

diff --git a/data/json/items/comestibles/drink_other.json b/data/json/items/comestibles/drink_other.json
@@ -253,13 +253,14 @@
     "quench": 1,
     "healthy": -1,
     "addiction_potential": 1,
+    "calories": 116,
     "description": "A thick syrup made of water and sugar strained through coffee grounds.  Can be used to flavor many foods and beverages.",
     "price": 800,
     "price_postapoc": 100,
     "material": [ "junk" ],
     "volume": "250 ml",
     "phase": "liquid",
-    "charges": 8,
+    "charges": 3,
     "fun": 6
   }
 ]
diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json
@@ -566,8 +566,8 @@
     "price_postapoc": 500,
     "material": [ "powder" ],
     "volume": "250 ml",
-    "flags": [ "EDIBLE_FROZEN", "RAW", "IRREPLACEABLE_CONSUMABLE" ],
-    "calories": 23,
+    "flags": [ "EDIBLE_FROZEN", "RAW", "IRREPLACEABLE_CONSUMABLE", "NUTRIENT_OVERRIDE" ],
+    "calories": 2,
     "charges": 20,
     "fun": -5,
     "freezing_point": -274

diff --git a/data/json/items/comestibles/veggy_dishes.json b/data/json/items/comestibles/veggy_dishes.json
@@ -23,6 +23,7 @@
     "calories": 280,
     "spoils_in": "5 days",
     "description": "A roasted root from a cattail plant.  Its fibrous outer core is charred black, you can remove it and chew on the dry inside.",
+    "milling": { "into": "flour", "conversion_rate": 7.5 },
     "fun": -1,
     "delete": { "flags": [ "RAW" ] },
     "//": "The flag below implies that part of root got burned and has to be removed",

diff --git a/data/json/items/obsolete.json b/data/json/items/obsolete.json
@@ -3013,5 +3013,22 @@
     "reload_time": 110,
     "flags": [ "MAG_BULKY" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 20 } } ]
+  },
+  {
+    "id": "pheromone",
+    "type": "TOOL",
+    "name": { "str": "zombie pheromone" },
+    "description": "This is a disgusting ball of rotting meat of zombie origin.",
+    "weight": "238 g",
+    "volume": "250 ml",
+    "price": 4000,
+    "price_postapoc": 100,
+    "to_hit": -1,
+    "material": [ "flesh" ],
+    "symbol": "*",
+    "color": "red",
+    "initial_charges": 3,
+    "max_charges": 3,
+    "charges_per_use": 1
   }
 ]
diff --git a/data/json/items/ranged/slings.json b/data/json/items/ranged/slings.json
@@ -88,6 +88,7 @@
     "ammo": [ "rock" ],
     "weight": "2000 g",
     "volume": "3 L",
+    "longest_side": "180 cm",
     "price_postapoc": 250,
     "to_hit": 1,
     "ranged_damage": { "damage_type": "bullet", "amount": 10 },

diff --git a/data/json/items/tool/misc.json b/data/json/items/tool/misc.json
@@ -504,24 +504,6 @@
     "use_action": { "type": "inscribe", "verb": "Write", "gerund": "Written", "on_terrain": true, "material_restricted": false },
     "flags": [ "WRITE_MESSAGE", "NO_RELOAD", "NO_UNLOAD" ]
   },
-  {
-    "id": "pheromone",
-    "type": "TOOL",
-    "name": { "str": "zombie pheromone" },
-    "description": "This is a disgusting ball of rotting meat of zombie origin.  Squeezing this gland causes a small cloud of pheromones to spray into the air.  Apparently, the foul secretion can change zombies' attitude towards you, and they may ignore you for a short period of time.  Perhaps they briefly consider you as one of them.",
-    "weight": "238 g",
-    "volume": "250 ml",
-    "price": 4000,
-    "price_postapoc": 100,
-    "to_hit": -1,
-    "material": [ "flesh" ],
-    "symbol": "*",
-    "color": "red",
-    "initial_charges": 3,
-    "max_charges": 3,
-    "charges_per_use": 1,
-    "use_action": [ "PHEROMONE" ]
-  },
   {
     "id": "pocketwatch",
     "type": "TOOL",

diff --git a/data/json/mapgen/campground.json b/data/json/mapgen/campground.json
@@ -31,7 +31,7 @@
       "place_vehicles": [
         { "chance": 25, "fuel": 15, "rotation": 270, "status": -1, "vehicle": "campground_vehicles", "x": 16, "y": 2 },
         { "chance": 25, "fuel": -1, "rotation": 180, "status": -1, "vehicle": "campground_vehicles", "x": 5, "y": 19 },
-        { "chance": 50, "fuel": 20, "rotation": 0, "status": 0, "vehicle": "lux_rv", "x": 43, "y": 18 },
+        { "chance": 25, "fuel": -1, "rotation": 0, "status": -1, "vehicle": "lux_rv", "x": 43, "y": 18 },
         {
           "chance": 25,
           "fuel": 15,