Merge branch 'master' into waterloo

CleverRaven · May 8, 2020 · 0ece751 · 0ece751
2 parents d1bcdf7 + 92731b4
commit 0ece751
Show file tree

Hide file tree

Showing 269 changed files with 1,040 additions and 16,946 deletions.
diff --git a/build-scripts/mod_test_blacklist b/build-scripts/mod_test_blacklist
@@ -3,40 +3,26 @@ crt_expansion
 Graphical_Overmap
 mapgen_demo
 more_locations
-no_medieval_items
 sees_player_hitbutton
 sees_player_retro
 generic_guns
 RL_Classes
-no_scifi
 Tolerate_This
-no_rivtech_guns
 modular_turrets
-No_Bees
-no_survivor_armor
 safeautodoc
-No_Acid_Zombies
 fast_healing
 Medieval_Stuff
 makeshift
 national_guard_camp
-no_mutagen
-no_filthy_clothing
 nw_pack
-no_reviving_zombies
 necromancy
 ew_pack
 hydroponics
 FujiStruct
 Graphical_Overmap_Fujistruct
 Tanks
 More_Survival_Tools
-no_flaming_weapons
 Salvaged_Robots
-no_olg_guns
-no_religious_Texts
-No_Anthills
-No_Explosive_Zombies
 Graphical_Overmap_More_Locations
 Zombie_Nightvision
 mutant_npcs
@@ -47,9 +33,7 @@ Graphical_Overmap_Urban_Development
 Mundane_Zombies
 FIC_Weapons
 craftgp
-No_Big_Zombies
 manualbionicinstall
 No_Fungi
-novitamins
 sleepdeprivation
 growable-pots
diff --git a/data/json/itemgroups/Food/food.json b/data/json/itemgroups/Food/food.json
@@ -317,7 +317,7 @@
       { "item": "wheat", "prob": 3 },
       { "item": "onion", "prob": 3 },
       { "item": "garlic", "prob": 3 },
-      { "item": "pine_nuts", "prob": 2 },
+      { "item": "pine_nuts", "prob": 10 },
       { "item": "carrot", "prob": 3 }
     ]
   },
@@ -385,7 +385,7 @@
       { "item": "blackberries", "prob": 7 },
       { "item": "cholla_bud", "prob": 3 },
       { "item": "garlic", "prob": 3 },
-      { "item": "pine_nuts", "prob": 2 }
+      { "item": "pine_nuts", "prob": 10 }
     ]
   },
   {
@@ -460,7 +460,7 @@
       { "item": "coffee_syrup", "prob": 10 },
       { "item": "fruit_leather", "prob": 25 },
       { "item": "kernels", "prob": 25 },
-      { "item": "pine_nuts", "prob": 5 },
+      { "item": "pine_nuts", "prob": 20 },
       { "group": "teabag_box", "prob": 10 }
     ]
   },
@@ -476,7 +476,7 @@
       { "item": "mintpatties", "prob": 8 },
       { "item": "choco_coffee_beans", "prob": 8 },
       { "item": "fruit_leather", "prob": 15 },
-      { "item": "pine_nuts", "prob": 4 }
+      { "item": "pine_nuts", "prob": 20 }
     ]
   },
   {

diff --git a/data/json/itemgroups/food_service.json b/data/json/itemgroups/food_service.json
@@ -89,6 +89,58 @@
       { "group": "teabag_box", "prob": 70 }
     ]
   },
+  {
+    "id": "prepared_teas",
+    "type": "item_group",
+    "subtype": "distribution",
+    "items": [
+      { "item": "tea", "prob": 60 },
+      { "item": "bee_balm_tea", "prob": 20 },
+      { "item": "dandelionburdock_tea", "prob": 20, "charges-max": 2, "container-item": "bottle_plastic" },
+      { "item": "dandelion_tea", "prob": 10, "charges-max": 2, "container-item": "bottle_plastic" },
+      { "item": "pine_tea", "prob": 10, "charges-max": 2, "container-item": "bottle_plastic" },
+      { "item": "herbal_tea", "prob": 50 },
+      { "item": "chamomile_tea", "prob": 40 },
+      { "item": "lotus_tea", "prob": 30 },
+      { "item": "spurge_tea", "prob": 20 },
+      { "item": "milk_tea", "prob": 20 },
+      { "item": "chai_tea", "prob": 30 }
+    ]
+  },
+  {
+    "id": "teashop_bulk_teas",
+    "type": "item_group",
+    "subtype": "distribution",
+    "items": [
+      { "item": "honey_bottled", "prob": 20 },
+      { "item": "honey_glassed", "prob": 20 },
+      { "item": "con_milk", "prob": 10 },
+      { "item": "tanbark", "prob": 3, "charges-min": 1, "charges-max": 2, "container-item": "jar_3l_glass" },
+      { "item": "bee_balm", "prob": 20, "charges-min": 1, "charges-max": 12, "container-item": "jar_3l_glass" },
+      { "item": "spurge", "prob": 20, "charges-min": 1, "charges-max": 2, "container-item": "jar_glass_sealed" },
+      { "item": "lotus", "prob": 20, "charges-min": 1, "charges-max": 2, "container-item": "jar_glass_sealed" },
+      { "item": "raw_burdock", "prob": 10, "charges-min": 1, "charges-max": 48, "container-item": "jar_3l_glass" },
+      { "item": "chamomile", "prob": 30, "charges-min": 1, "charges-max": 2, "container-item": "jar_glass_sealed" },
+      { "item": "tea_raw", "prob": 60, "charges-min": 10, "charges-max": 40, "container-item": "jar_glass_sealed" },
+      {
+        "item": "wild_herbs",
+        "prob": 50,
+        "charges-min": 20,
+        "charges-max": 200,
+        "container-item": "jar_glass_sealed"
+      },
+      {
+        "item": "raw_dandelion",
+        "prob": 10,
+        "charges-min": 1,
+        "charges-max": 8,
+        "container-item": "jar_glass_sealed"
+      },
+      { "item": "milk_powder", "prob": 30, "charges-min": 1, "charges-max": 8, "container-item": "jar_glass_sealed" },
+      { "item": "cinnamon", "prob": 20, "charges-min": 1, "charges-max": 200, "container-item": "jar_glass_sealed" },
+      { "item": "sugar", "prob": 40, "charges-min": 10, "charges-max": 142, "container-item": "jar_glass_sealed" }
+    ]
+  },
   {
     "id": "teashop_fridge",
     "type": "item_group",

diff --git a/data/json/items/comestibles/nuts.json b/data/json/items/comestibles/nuts.json
@@ -3,23 +3,23 @@
     "type": "COMESTIBLE",
     "id": "pine_nuts",
     "name": { "str_sp": "pine nuts" },
-    "weight": "30 g",
+    "weight": "15 g",
     "color": "brown",
     "spoils_in": 1080,
     "container": "bag_plastic",
     "comestible_type": "FOOD",
     "symbol": "%",
-    "quench": -2,
+    "quench": -1,
     "healthy": 1,
-    "calories": 202,
+    "calories": 101,
     "description": "A handful of tasty crunchy nuts from a pinecone.",
-    "price": 136,
-    "price_postapoc": 600,
+    "price": 68,
+    "price_postapoc": 300,
     "material": "nut",
-    "volume": "250 ml",
+    "volume": "125 ml",
     "flags": [ "EDIBLE_FROZEN", "NUTRIENT_OVERRIDE" ],
     "charges": 4,
-    "vitamins": [ [ "iron", 9 ] ],
+    "vitamins": [ [ "iron", 5 ] ],
     "fun": 2
   },
   {

diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json
@@ -835,7 +835,6 @@
       "CLIMATE_CONTROL"
     ],
     "turns_per_charge": 18,
-    "charges_per_use": 0,
     "revert_to": "rm13_armor",
     "use_action": "RM13ARMOR_ON",
     "environmental_protection": 40,

diff --git a/data/json/mapgen/teashop.json b/data/json/mapgen/teashop.json
@@ -101,8 +101,8 @@
         { "item": "chair_pants", "x": 2, "y": 12, "chance": 30 },
         { "item": "chair_feet", "x": 2, "y": 12, "chance": 30 },
         { "item": "displays", "x": 2, "y": [ 7, 9 ], "chance": 70, "repeat": [ 1, 8 ] },
-        { "item": "displays", "x": [ 5, 7 ], "y": 6, "chance": 70, "repeat": [ 1, 8 ] },
-        { "item": "displays", "x": [ 4, 5 ], "y": [ 8, 9 ], "chance": 30, "repeat": [ 1, 8 ] },
+        { "item": "prepared_teas", "x": [ 5, 7 ], "y": 6, "chance": 70, "repeat": [ 1, 8 ] },
+        { "item": "teashop_bulk_teas", "x": [ 4, 5 ], "y": [ 8, 9 ], "chance": 30, "repeat": [ 1, 8 ] },
         { "item": "teashop_kitchen_counter", "x": 2, "y": [ 14, 16 ], "chance": 80, "repeat": [ 1, 4 ] },
         { "item": "teashop_kitchen_counter", "x": [ 5, 6 ], "y": 14, "chance": 80, "repeat": [ 1, 3 ] },
         { "item": "teashop_fridge", "x": 4, "y": 14, "chance": 90, "repeat": [ 1, 8 ] }

diff --git a/data/json/monsterdrops/zombie.json b/data/json/monsterdrops/zombie.json
@@ -15,31 +15,6 @@
       { "item": "depowered_armor", "count": [ 0, 1 ], "prob": 20 }
     ]
   },
-  {
-    "type": "item_group",
-    "subtype": "collection",
-    "id": "mon_zombie_grenadier",
-    "entries": [
-      { "item": "tacvest", "damage": [ 1, 4 ] },
-      { "item": "bot_grenade_hack", "count": [ 0, 3 ] },
-      { "item": "bot_flashbang_hack", "prob": 50 },
-      { "item": "bot_gasbomb_hack", "prob": 50 }
-    ]
-  },
-  {
-    "type": "item_group",
-    "subtype": "collection",
-    "id": "mon_zombie_grenadier_elite",
-    "entries": [
-      { "item": "tacvest", "damage": [ 1, 4 ] },
-      { "item": "molle_pack", "damage": [ 1, 4 ] },
-      { "item": "bot_grenade_hack", "count": [ 0, 4 ] },
-      { "item": "bot_flashbang_hack", "count": [ 1, 2 ], "prob": 50 },
-      { "item": "bot_gasbomb_hack", "count": [ 1, 2 ], "prob": 50 },
-      { "item": "bot_c4_hack", "count": [ 1, 2 ], "prob": 20 },
-      { "item": "bot_mininuke_hack", "prob": 1 }
-    ]
-  },
   {
     "type": "item_group",
     "subtype": "collection",

diff --git a/data/json/monsters/zed_explosive.json b/data/json/monsters/zed_explosive.json
@@ -163,106 +163,5 @@
     "death_drops": "default_zombie_items",
     "death_function": [ "GAS" ],
     "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "POISON", "NO_BREATHE", "REVIVES", "FILTHY" ]
-  },
-  {
-    "//": "Heads up: these zombies are pending removal sometime before 0.E.",
-    "id": "mon_zombie_grenadier",
-    "type": "MONSTER",
-    "name": { "str": "zombie grenadier" },
-    "description": "Once a soldier, it is dressed head to toe in combat gear.  Its hands constantly fumble at its many pouches.",
-    "default_faction": "zombie",
-    "bodytype": "human",
-    "species": [ "ZOMBIE", "HUMAN" ],
-    "diff": 20,
-    "volume": "62500 ml",
-    "weight": "81500 g",
-    "hp": 100,
-    "speed": 90,
-    "material": [ "flesh" ],
-    "symbol": "Z",
-    "color": "blue_green",
-    "aggression": 5,
-    "morale": 100,
-    "melee_skill": 5,
-    "melee_dice": 2,
-    "melee_dice_sides": 4,
-    "melee_cut": 0,
-    "armor_bash": 6,
-    "armor_cut": 6,
-    "armor_bullet": 5,
-    "vision_day": 35,
-    "vision_night": 3,
-    "harvest": "exempt",
-    "starting_ammo": { "bot_c4_hack": 2, "bot_flashbang_hack": 3, "bot_gasbomb_hack": 3, "bot_grenade_hack": 10 },
-    "special_attacks": [ [ "GRENADIER", 6 ] ],
-    "death_drops": { "subtype": "collection", "groups": [ [ "mon_zombie_soldier_death_drops", 100 ], [ "mon_zombie_grenadier", 100 ] ] },
-    "death_function": [ "DETONATE" ],
-    "burn_into": "mon_zombie_scorched",
-    "flags": [
-      "SEES",
-      "HEARS",
-      "SMELLS",
-      "WARM",
-      "BASHES",
-      "GROUP_BASH",
-      "POISON",
-      "BLEED",
-      "NO_BREATHE",
-      "REVIVES",
-      "PUSH_MON",
-      "FILTHY"
-    ]
-  },
-  {
-    "id": "mon_zombie_grenadier_elite",
-    "type": "MONSTER",
-    "name": { "str": "zombie elite grenadier" },
-    "description": "Once a soldier, it is dressed head to toe in combat gear and wearing a MOLLE pack.  Its hands quickly open and close its many pouches.",
-    "default_faction": "zombie",
-    "bodytype": "human",
-    "species": [ "ZOMBIE", "HUMAN" ],
-    "diff": 30,
-    "volume": "62500 ml",
-    "weight": "81500 g",
-    "hp": 100,
-    "speed": 100,
-    "material": [ "flesh" ],
-    "symbol": "Z",
-    "color": "blue_magenta",
-    "aggression": 5,
-    "morale": 100,
-    "melee_skill": 5,
-    "melee_dice": 2,
-    "melee_dice_sides": 6,
-    "melee_cut": 0,
-    "dodge": 1,
-    "armor_bash": 8,
-    "armor_cut": 12,
-    "armor_bullet": 10,
-    "vision_day": 35,
-    "vision_night": 3,
-    "harvest": "exempt",
-    "starting_ammo": { "bot_c4_hack": 10, "bot_flashbang_hack": 10, "bot_gasbomb_hack": 10, "bot_grenade_hack": 20, "bot_mininuke_hack": 1 },
-    "special_attacks": [ [ "GRENADIER_ELITE", 3 ] ],
-    "death_drops": {
-      "subtype": "collection",
-      "groups": [ [ "mon_zombie_soldier_death_drops", 100 ], [ "mon_zombie_grenadier_elite", 100 ] ]
-    },
-    "death_function": [ "DETONATE" ],
-    "burn_into": "mon_zombie_scorched",
-    "flags": [
-      "SEES",
-      "HEARS",
-      "SMELLS",
-      "WARM",
-      "BASHES",
-      "GROUP_BASH",
-      "POISON",
-      "BLEED",
-      "NO_BREATHE",
-      "REVIVES",
-      "PUSH_MON",
-      "FILTHY"
-    ]
   }
 ]
diff --git a/data/json/obsolete.json b/data/json/obsolete.json
@@ -35,6 +35,7 @@
     "description": "This stripped down mini-reactor generates impressive amounts of bionic power.  There is no way to shut it down, but you can toggle additional fuel intake.  Irradiates your body when active.",
     "occupied_bodyparts": [ [ "TORSO", 55 ] ],
     "flags": [ "BIONIC_POWER_SOURCE", "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
+    "available_upgrades": [ "bio_advreactor" ],
     "included_bionics": [ "bio_plutdump" ]
   },
   {

diff --git a/data/json/professions.json b/data/json/professions.json
@@ -538,7 +538,7 @@
     "items": {
       "both": {
         "items": [ "footrags", "loincloth", "cloak_wool", "ragpouch", "small_relic", "gloves_wraps", "tunic_rag" ],
-        "entries": [ { "item": "makeshift_knife", "container-item": "sheath" } ]
+        "entries": [ { "item": "knife_baselard", "container-item": "sheath" } ]
       },
       "female": [ "chestwrap" ]
     },

diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json
@@ -2834,21 +2834,6 @@
     "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ],
     "components": [ [ [ "buckwheat", 1 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ]
   },
-  {
-    "type": "recipe",
-    "result": "pine_nuts",
-    "category": "CC_FOOD",
-    "subcategory": "CSC_FOOD_VEGGI",
-    "skill_used": "cooking",
-    "skills_required": [ "survival", 2 ],
-    "difficulty": 1,
-    "charges": 1,
-    "time": "1 m 30 s",
-    "autolearn": true,
-    "batch_time_factors": [ 80, 1 ],
-    "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
-    "components": [ [ [ "pinecone", 1 ] ] ]
-  },
   {
     "type": "recipe",
     "result": "walnut_roasted",

diff --git a/data/json/recipes/recipe_obsolete.json b/data/json/recipes/recipe_obsolete.json
@@ -2459,5 +2459,10 @@
     "type": "recipe",
     "result": "shotcanister_pebble",
     "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "pine_nuts",
+    "obsolete": true
   }
 ]