Merge pull request #168 from CleverRaven/master

Finish making consume take time (CleverRaven#40177)
fengjixuchui · May 11, 2020 · 5194ae0 · 5194ae0
2 parents f3f3b68 + 6913049
commit 5194ae0
Show file tree

Hide file tree

Showing 143 changed files with 3,723 additions and 2,207 deletions.
diff --git a/Makefile b/Makefile
@@ -61,6 +61,9 @@
 #  make AUTO_BUILD_PREFIX=1
 # Install to system directories.
 #  make install
+# Install to $DIR ($DIR will contain bin and share directories).
+#  make PREFIX=$DIR
+#  make PREFIX=$DIR install
 # Use user's XDG base directories for save files and configs.
 #  make USE_XDG_DIR=1
 # Use user's home directory for save files.

diff --git a/build-scripts/mod_test_blacklist b/build-scripts/mod_test_blacklist
@@ -1,39 +1,16 @@
 blazemod
 crt_expansion
 Graphical_Overmap
-mapgen_demo
 more_locations
 sees_player_hitbutton
 sees_player_retro
 generic_guns
-RL_Classes
-Tolerate_This
-modular_turrets
-safeautodoc
-fast_healing
-Medieval_Stuff
-makeshift
 national_guard_camp
-nw_pack
-necromancy
-ew_pack
-hydroponics
 FujiStruct
 Graphical_Overmap_Fujistruct
-Tanks
-More_Survival_Tools
-Salvaged_Robots
 Graphical_Overmap_More_Locations
-Zombie_Nightvision
 mutant_npcs
-deoxymod
-Heavy miners
 Urban_Development
 Graphical_Overmap_Urban_Development
-Mundane_Zombies
-FIC_Weapons
-craftgp
 manualbionicinstall
 No_Fungi
-sleepdeprivation
-growable-pots
diff --git a/data/json/bionics.json b/data/json/bionics.json
diff --git a/data/json/furniture_and_terrain/terrain-liquids.json b/data/json/furniture_and_terrain/terrain-liquids.json
@@ -204,6 +204,7 @@
     "color": "light_blue",
     "move_cost": 5,
     "flags": [ "TRANSPARENT", "LIQUID", "NO_SCENT", "SWIMMABLE", "INDOORS", "DEEP_WATER" ],
+    "connects_to": "POOLWATER",
     "examine_action": "water_source"
   },
   {
@@ -216,6 +217,7 @@
     "color": "light_blue",
     "move_cost": 5,
     "flags": [ "TRANSPARENT", "LIQUID", "NO_SCENT", "SWIMMABLE", "INDOORS", "SHALLOW_WATER" ],
+    "connects_to": "POOLWATER",
     "examine_action": "water_source"
   },
   {
@@ -228,6 +230,7 @@
     "color": "light_blue",
     "move_cost": 5,
     "flags": [ "TRANSPARENT", "LIQUID", "NO_SCENT", "SWIMMABLE", "DEEP_WATER" ],
+    "connects_to": "POOLWATER",
     "examine_action": "water_source"
   },
   {
@@ -240,6 +243,7 @@
     "color": "light_blue",
     "move_cost": 5,
     "flags": [ "TRANSPARENT", "LIQUID", "NO_SCENT", "SWIMMABLE", "SHALLOW_WATER" ],
+    "connects_to": "POOLWATER",
     "examine_action": "water_source"
   },
   {

diff --git a/data/json/itemgroups/Food/food.json b/data/json/itemgroups/Food/food.json
@@ -318,7 +318,8 @@
       { "item": "onion", "prob": 3 },
       { "item": "garlic", "prob": 3 },
       { "item": "pine_nuts", "prob": 10 },
-      { "item": "carrot", "prob": 3 }
+      { "item": "carrot", "prob": 3 },
+      { "item": "bell_pepper", "prob": 7 }
     ]
   },
   {

diff --git a/data/json/itemgroups/Locations_MapExtras/map_extras.json b/data/json/itemgroups/Locations_MapExtras/map_extras.json
@@ -18,7 +18,11 @@
     "type": "item_group",
     "subtype": "collection",
     "id": "map_extra_military",
-    "entries": [ { "group": "mon_zombie_soldier_death_drops" }, { "item": "corpse", "damage": 3 } ]
+    "entries": [
+      { "group": "mon_zombie_soldier_death_drops" },
+      { "group": "military_standard_sniper_rifles", "prob": 10 },
+      { "item": "corpse", "damage": 3 }
+    ]
   },
   {
     "type": "item_group",

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -703,29 +703,40 @@
   },
   {
     "type": "item_group",
-    "id": "guns_cop",
-    "//": "Police issue weapons of all types",
+    "id": "longguns_cop",
+    "items": [
+      { "item": "ar15", "prob": 15, "charges": [ 0, 30 ] },
+      { "item": "cx4", "prob": 20, "charges": [ 0, 15 ] },
+      { "item": "fn_p90", "prob": 5, "charges": [ 0, 50 ] },
+      { "item": "hk_mp5", "prob": 10, "charges": [ 0, 30 ] },
+      { "item": "mossberg_500", "prob": 15, "charges": [ 0, 8 ] },
+      { "item": "remington_700", "prob": 5, "charges": [ 0, 4 ] },
+      { "item": "remington_870", "prob": 20, "charges": [ 0, 6 ] }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "sidearms_cop",
     "items": [
-      { "item": "ar15", "prob": 15, "charges-min": 0, "charges-max": 30 },
-      { "item": "cx4", "prob": 20, "charges-min": 0, "charges-max": 15 },
-      { "item": "fn57", "prob": 20, "charges-min": 0, "charges-max": 20 },
-      { "item": "fn_p90", "prob": 5, "charges-min": 0, "charges-max": 50 },
-      { "item": "glock_19", "prob": 15, "charges-min": 0, "charges-max": 15 },
-      { "item": "glock_22", "prob": 20, "charges-min": 0, "charges-max": 15 },
-      { "item": "hk_mp5", "prob": 10, "charges-min": 0, "charges-max": 30 },
-      { "item": "m9", "prob": 5, "charges-min": 0, "charges-max": 15 },
-      { "item": "mossberg_500", "prob": 15, "charges-min": 0, "charges-max": 8 },
-      { "item": "remington_700", "prob": 5, "charges-min": 0, "charges-max": 4 },
-      { "item": "remington_870", "prob": 20, "charges-min": 0, "charges-max": 6 },
-      { "item": "sig_40", "prob": 20, "charges-min": 0, "charges-max": 12 },
-      { "item": "usp_45", "prob": 10, "charges-min": 0, "charges-max": 12 },
-      { "item": "usp_9mm", "prob": 10, "charges-min": 0, "charges-max": 15 },
-      { "item": "kp32", "prob": 1, "charges-min": 0, "charges-max": 7 },
-      { "item": "kp3at", "prob": 2, "charges-min": 0, "charges-max": 6 },
-      { "item": "rugerlcp", "prob": 2, "charges-min": 0, "charges-max": 6 },
-      { "item": "kpf9", "prob": 3, "charges-min": 0, "charges-max": 7 }
+      { "item": "fn57", "prob": 20, "charges": [ 0, 20 ] },
+      { "item": "glock_19", "prob": 15, "charges": [ 0, 15 ] },
+      { "item": "glock_22", "prob": 20, "charges": [ 0, 15 ] },
+      { "item": "m9", "prob": 5, "charges": [ 0, 15 ] },
+      { "item": "sig_40", "prob": 20, "charges": [ 0, 12 ] },
+      { "item": "usp_45", "prob": 10, "charges": [ 0, 12 ] },
+      { "item": "usp_9mm", "prob": 10, "charges": [ 0, 15 ] },
+      { "item": "kp32", "prob": 1, "charges": [ 0, 7 ] },
+      { "item": "kp3at", "prob": 2, "charges": [ 0, 6 ] },
+      { "item": "rugerlcp", "prob": 2, "charges": [ 0, 6 ] },
+      { "item": "kpf9", "prob": 3, "charges": [ 0, 7 ] }
     ]
   },
+  {
+    "type": "item_group",
+    "id": "guns_cop",
+    "//": "Police issue weapons of all types",
+    "items": [ { "group": "longguns_cop", "prob": 50 }, { "group": "sidearms_cop", "prob": 50 } ]
+  },
   {
     "type": "item_group",
     "id": "guns_swat",

diff --git a/data/json/items/armor/belts.json b/data/json/items/armor/belts.json
@@ -14,6 +14,7 @@
     "looks_like": "holster",
     "color": "yellow",
     "covers": [ "TORSO" ],
+    "coverage": 5,
     "encumbrance": 4,
     "pocket_data": [
       {

diff --git a/data/json/items/battery.json b/data/json/items/battery.json
@@ -33,7 +33,8 @@
     "ammo_type": [ "battery" ],
     "capacity": 50,
     "looks_like": "battery",
-    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE" ]
+    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "battery": 50 } } ]
   },
   {
     "id": "light_minus_atomic_battery_cell",
@@ -53,7 +54,8 @@
     "count": 500,
     "capacity": 500,
     "looks_like": "battery",
-    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "LEAK_DAM", "RADIOACTIVE" ]
+    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "LEAK_DAM", "RADIOACTIVE" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "battery": 500 } } ]
   },
   {
     "id": "light_minus_disposable_cell",
@@ -72,7 +74,8 @@
     "count": 100,
     "capacity": 100,
     "looks_like": "battery",
-    "flags": [ "NO_SALVAGE", "NO_UNLOAD" ]
+    "flags": [ "NO_SALVAGE", "NO_UNLOAD" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "battery": 100 } } ]
   },
   {
     "id": "light_battery_cell",
@@ -91,7 +94,8 @@
     "ammo_type": [ "battery" ],
     "capacity": 100,
     "looks_like": "battery",
-    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE" ]
+    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "battery": 100 } } ]
   },
   {
     "id": "light_plus_battery_cell",
@@ -109,7 +113,8 @@
     "ammo_type": [ "battery" ],
     "capacity": 150,
     "looks_like": "battery",
-    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE" ]
+    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "battery": 150 } } ]
   },
   {
     "id": "light_atomic_battery_cell",
@@ -129,7 +134,8 @@
     "count": 1000,
     "capacity": 1000,
     "looks_like": "battery",
-    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "LEAK_DAM", "RADIOACTIVE" ]
+    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "LEAK_DAM", "RADIOACTIVE" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "battery": 1000 } } ]
   },
   {
     "id": "light_disposable_cell",
@@ -148,7 +154,8 @@
     "count": 300,
     "capacity": 300,
     "looks_like": "battery",
-    "flags": [ "NO_SALVAGE", "NO_UNLOAD" ]
+    "flags": [ "NO_SALVAGE", "NO_UNLOAD" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "battery": 300 } } ]
   },
   {
     "id": "medium_battery_cell",
@@ -167,7 +174,8 @@
     "ammo_type": [ "battery" ],
     "capacity": 500,
     "looks_like": "battery",
-    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE" ]
+    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "battery": 500 } } ]
   },
   {
     "id": "medium_plus_battery_cell",
@@ -185,7 +193,8 @@
     "ammo_type": [ "battery" ],
     "capacity": 600,
     "looks_like": "battery",
-    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE" ]
+    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "battery": 600 } } ]
   },
   {
     "id": "medium_atomic_battery_cell",
@@ -205,7 +214,8 @@
     "count": 5000,
     "capacity": 5000,
     "looks_like": "battery",
-    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "LEAK_DAM", "RADIOACTIVE" ]
+    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "LEAK_DAM", "RADIOACTIVE" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "battery": 5000 } } ]
   },
   {
     "id": "medium_disposable_cell",
@@ -224,7 +234,8 @@
     "count": 1200,
     "capacity": 1200,
     "looks_like": "battery",
-    "flags": [ "NO_SALVAGE", "NO_UNLOAD" ]
+    "flags": [ "NO_SALVAGE", "NO_UNLOAD" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "battery": 1200 } } ]
   },
   {
     "id": "heavy_battery_cell",
@@ -243,7 +254,8 @@
     "ammo_type": [ "battery" ],
     "capacity": 1000,
     "looks_like": "battery",
-    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE" ]
+    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "battery": 1000 } } ]
   },
   {
     "id": "heavy_plus_battery_cell",
@@ -261,7 +273,8 @@
     "ammo_type": [ "battery" ],
     "capacity": 1250,
     "looks_like": "battery",
-    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE" ]
+    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "battery": 1250 } } ]
   },
   {
     "id": "heavy_atomic_battery_cell",
@@ -281,7 +294,8 @@
     "count": 10000,
     "capacity": 10000,
     "looks_like": "battery",
-    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "LEAK_DAM", "RADIOACTIVE" ]
+    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "LEAK_DAM", "RADIOACTIVE" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "battery": 10000 } } ]
   },
   {
     "id": "huge_atomic_battery_cell",
@@ -300,7 +314,8 @@
     "count": 100000,
     "capacity": 100000,
     "looks_like": "battery",
-    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "MECH_BAT", "LEAK_DAM", "RADIOACTIVE" ]
+    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "MECH_BAT", "LEAK_DAM", "RADIOACTIVE" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "battery": 100000 } } ]
   },
   {
     "id": "heavy_disposable_cell",
@@ -319,6 +334,7 @@
     "count": 2500,
     "capacity": 2500,
     "looks_like": "battery",
-    "flags": [ "NO_SALVAGE", "NO_UNLOAD" ]
+    "flags": [ "NO_SALVAGE", "NO_UNLOAD" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "battery": 2500 } } ]
   }
 ]
diff --git a/data/json/items/comestibles/raw_veggy.json b/data/json/items/comestibles/raw_veggy.json
@@ -881,5 +881,25 @@
     "healthy": -2,
     "//": "Fiddleheads that haven't been boiled can make you sick.",
     "vitamins": [ [ "vitC", 6 ], [ "vitA", 10 ], [ "calcium", 4 ] ]
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "bell_pepper",
+    "name": { "str": "bell pepper" },
+    "weight": "113 g",
+    "color": "green",
+    "comestible_type": "FOOD",
+    "symbol": "%",
+    "quench": 2,
+    "healthy": 1,
+    "calories": 31,
+    "description": "A green bell pepper.  It could be cooked.",
+    "price": 20,
+    "material": "veggy",
+    "volume": "250 ml",
+    "flags": [ "SMOKABLE", "RAW" ],
+    "smoking_result": "dry_veggy",
+    "fun": -5,
+    "vitamins": [ [ "calcium", 2 ], [ "vitC", 12 ], [ "vitA", 8 ] ]
   }
 ]
diff --git a/data/json/items/comestibles/seed.json b/data/json/items/comestibles/seed.json
@@ -787,5 +787,14 @@
     "price": 100,
     "charges": 2,
     "seed_data": { "plant_name": "mustard", "fruit": "seed_mustard", "byproducts": [ "withered" ], "grow": "91 days" }
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "seed_bell_pepper",
+    "copy-from": "seed",
+    "price": 50,
+    "name": { "str_sp": "bell pepper seeds" },
+    "description": "Some bell pepper seeds.",
+    "seed_data": { "plant_name": "bell pepper", "fruit": "bell_pepper", "byproducts": [ "withered" ], "grow": "70 days" }
   }
 ]
diff --git a/data/json/items/comestibles/veggy_dishes.json b/data/json/items/comestibles/veggy_dishes.json
@@ -860,5 +860,18 @@
     "fun": 5,
     "healthy": 1,
     "vitamins": [ [ "vitC", 32 ], [ "vitA", 40 ], [ "calcium", 4 ] ]
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "cooked_bell_pepper",
+    "name": { "str": "cooked bell pepper" },
+    "copy-from": "bell_pepper",
+    "color": "green",
+    "spoils_in": "2 days",
+    "description": "A cored and cooked bell pepper.  It is far more enjoyable now that the seeds are removed.",
+    "price": 0,
+    "delete": { "flags": [ "RAW" ] },
+    "fun": 1,
+    "vitamins": [ [ "vitC", 32 ], [ "vitA", 40 ], [ "calcium", 4 ] ]
   }
 ]