Merge branch 'CleverRaven:master' into Magic-harvest

CleverRaven · Sep 1, 2024 · 4e26aac · 4e26aac
2 parents 8cdd3ce + 9ba86d3
commit 4e26aac
Show file tree

Hide file tree

Showing 116 changed files with 233,601 additions and 165,316 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -275,7 +275,7 @@
 "Mods: Sky Island":
   - data/mods/Sky_Island/**/*
 
-"Isolation Protocols ☣":
+"Mods: Isolation Protocol ☣":
   - data/mods/Isolation-Protocol/**/*
 
 "Mods":
@@ -298,7 +298,7 @@
   - "**/vehicle**"
   - "src/veh_**"
 
-"Game: Defense Mode":
+"Mods: Defense Mode":
   - "data/mods/Defense_Mode/**"
 
 "ImGui":

diff --git a/data/json/harvest.json b/data/json/harvest.json
@@ -2830,19 +2830,8 @@
     "id": "rabbit_with_skull",
     "//": "mammal_small_fur + skull_rabbit",
     "type": "harvest",
-    "entries": [
-      { "drop": "skull_rabbit", "type": "bone", "scale_num": [ 1, 1 ], "max": 1 },
-      { "drop": "meat", "type": "flesh", "mass_ratio": 0.28 },
-      { "drop": "meat_scrap", "type": "flesh", "mass_ratio": 0.05 },
-      { "drop": "lung", "type": "flesh", "mass_ratio": 0.0035 },
-      { "drop": "liver", "type": "offal", "mass_ratio": 0.01 },
-      { "drop": "brain", "type": "flesh", "mass_ratio": 0.005 },
-      { "drop": "bone", "type": "bone", "mass_ratio": 0.15 },
-      { "drop": "animal_blood", "type": "blood", "mass_ratio": 0.1 },
-      { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 },
-      { "drop": "raw_fur", "type": "skin", "mass_ratio": 0.02 },
-      { "drop": "fat", "type": "flesh", "mass_ratio": 0.07 }
-    ]
+    "copy-from": "mammal_small_fur",
+    "extend": { "entries": [ { "drop": "skull_rabbit", "type": "bone", "scale_num": [ 1, 1 ], "max": 1 } ] }
   },
   {
     "id": "mi-go",

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json
@@ -255,8 +255,17 @@
     "type": "item_group",
     "subtype": "distribution",
     "id": "magazines_22_1022",
-    "//": "Collections of magazines for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.",
-    "items": [ { "item": "ruger1022mag", "prob": 500 }, { "item": "ruger1022bigmag", "prob": 300 } ]
+    "//": "Collections of magazines for the gun.  Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.  In this case, it seems the 110 drum is quite commom for the high capacties.",
+    "items": [
+      { "item": "ruger1022mag", "prob": 500 },
+      { "item": "ruger1022mag_15", "prob": 200 },
+      { "item": "ruger1022bigmag", "prob": 300 },
+      { "item": "ruger1022mag_30", "prob": 1 },
+      { "item": "ruger1022mag_32", "prob": 5 },
+      { "item": "ruger1022mag_55", "prob": 12 },
+      { "item": "ruger1022mag_70", "prob": 16 },
+      { "item": "ruger1022mag_110", "prob": 20 }
+    ]
   },
   {
     "type": "item_group",

diff --git a/data/json/itemgroups/electronics.json b/data/json/itemgroups/electronics.json
@@ -159,7 +159,7 @@
       { "item": "light_battery_cell", "charges": 1000, "prob": 160, "count": [ 0, 8 ] },
       { "item": "light_battery_cell", "charges": 1000, "prob": 16, "count": [ 0, 16 ] },
       { "item": "light_cell_rechargeable", "charges": 1000, "prob": 16, "count": [ 0, 8 ] },
-      { "item": "light_cell_rechargeable", "charges": 1000, "prob": 1, "count": [ 0, 16 ] },
+      { "item": "light_cell_rechargeable", "charges": 1000, "prob": 1, "count": [ 0, 12 ] },
       { "item": "medium_battery_cell", "charges": 1000, "prob": 15, "count": [ 0, 4 ] }
     ]
   }

diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json
@@ -1,11 +1,11 @@
 [
   {
     "type": "COMESTIBLE",
-    "id": "egg_bird",
-    "name": { "str": "bird egg" },
+    "id": "egg_chicken",
+    "name": { "str": "chicken egg" },
     "weight": "50 g",
     "color": "brown",
-    "spoils_in": "10 days",
+    "spoils_in": "11 days",
     "comestible_type": "FOOD",
     "symbol": "o",
     "quench": 4,
@@ -17,24 +17,14 @@
     "volume": "50 ml",
     "fun": -8,
     "flags": [ "FREEZERBURN", "RAW" ],
-    "rot_spawn": "GROUP_EGG_BIRD_WILD",
-    "vitamins": [ [ "iron", "900 μg" ], [ "calcium", "28 mg" ], [ "egg_allergen", 1 ] ],
-    "rot_spawn_chance": 50
-  },
-  {
-    "type": "COMESTIBLE",
-    "id": "egg_chicken",
-    "name": { "str": "chicken egg" },
-    "spoils_in": "11 days",
-    "copy-from": "egg_bird",
     "rot_spawn": "GROUP_EGG_CHICKEN",
+    "vitamins": [ [ "iron", "900 μg" ], [ "calcium", "28 mg" ], [ "egg_allergen", 1 ] ],
     "rot_spawn_chance": 70
   },
   {
     "type": "COMESTIBLE",
     "id": "egg_bird_unfert",
-    "copy-from": "egg_bird",
-    "looks_like": "egg_bird",
+    "copy-from": "egg_chicken",
     "name": { "str": "unfertilized bird egg" },
     "description": "A nutritious egg laid by a bird.  This one is unfertilized and probably from a farm.",
     "rot_spawn_chance": 0
@@ -978,7 +968,7 @@
   {
     "type": "COMESTIBLE",
     "id": "rehydrated_eggs",
-    "copy-from": "egg_bird",
+    "copy-from": "egg_chicken",
     "name": { "str_sp": "rehydrated egg" },
     "color": "yellow",
     "symbol": "%",

diff --git a/data/json/items/comestibles/med.json b/data/json/items/comestibles/med.json
@@ -1796,7 +1796,7 @@
     },
     "//": "Yes, the vitamins are intentionally duplicated here. The consume/use/iteminfo UI needs them in use_action, but to actually pass on the vitamins they need to be in the comestible data, as below.",
     "//2": "TODO: Fix this...",
-    "vitamins": [ [ "calcium", 24, 48 ], [ "iron", 24, 48 ], [ "vitC", 24, 48 ] ]
+    "vitamins": [ [ "calcium", 36 ], [ "iron", 36 ], [ "vitC", 36 ] ]
   },
   {
     "id": "calcium_tablet",

diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json
@@ -142,7 +142,20 @@
     ],
     "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
     "pocket_data": [
-      { "magazine_well": "250 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "ruger1022mag", "ruger1022bigmag" ] }
+      {
+        "magazine_well": "34 ml",
+        "pocket_type": "MAGAZINE_WELL",
+        "item_restriction": [
+          "ruger1022mag",
+          "ruger1022mag_15",
+          "ruger1022bigmag",
+          "ruger1022mag_30",
+          "ruger1022mag_32",
+          "ruger1022mag_55",
+          "ruger1022mag_70",
+          "ruger1022mag_110"
+        ]
+      }
     ],
     "melee_damage": { "bash": 12 }
   },
@@ -413,7 +426,20 @@
     "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
     "built_in_mods": [ "bipod" ],
     "pocket_data": [
-      { "magazine_well": "250 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "ruger1022mag", "ruger1022bigmag" ] }
+      {
+        "magazine_well": "34 ml",
+        "pocket_type": "MAGAZINE_WELL",
+        "item_restriction": [
+          "ruger1022mag",
+          "ruger1022mag_15",
+          "ruger1022bigmag",
+          "ruger1022mag_30",
+          "ruger1022mag_32",
+          "ruger1022mag_55",
+          "ruger1022mag_70",
+          "ruger1022mag_110"
+        ]
+      }
     ],
     "melee_damage": { "bash": 12 }
   },

diff --git a/data/json/items/magazine/22.json b/data/json/items/magazine/22.json
@@ -118,7 +118,7 @@
     ],
     "weight": "245 g",
     "volume": "159 ml",
-    "longest_side": "185 mm",
+    "longest_side": "162 mm",
     "price": "79 USD",
     "price_postapoc": "2 USD",
     "material": [ "steel", "plastic" ],
@@ -155,6 +155,172 @@
     "flags": [ "MAG_COMPACT" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 10 } } ]
   },
+  {
+    "id": "ruger1022mag_15",
+    "looks_like": "stanag30",
+    "type": "MAGAZINE",
+    "name": { "str": "15-round varmint magazine" },
+    "description": "An extended capacity 15-round magazine, for use with .22 caliber varmint rifles.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "ruger1022mag_15",
+        "name": { "str": "Ruger 10/22 15-round magazine" },
+        "description": "An extended 15-round stick magazine for the Ruger 10/22, known as the BX-15."
+      }
+    ],
+    "weight": "147 g",
+    "volume": "95 ml",
+    "longest_side": "111 mm",
+    "price": "31 USD 95 cent",
+    "price_postapoc": "2 USD",
+    "material": [ "steel", "plastic" ],
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": [ "22" ],
+    "flags": [ "MAG_COMPACT" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 15 } } ]
+  },
+  {
+    "id": "ruger1022mag_30",
+    "looks_like": "stanag30",
+    "type": "MAGAZINE",
+    "name": { "str": "30-round varmint drum magazine" },
+    "description": "A 30-round capacity drum magazine for use in varmint rifles.  While the capacity is nothing to scoff at, it is less reliable than stick magazines.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "ruger1022mag_30",
+        "name": { "str": "Ruger 10/22 30-round drum magazine" },
+        "description": "The ProMag 30 round drum magazine is a high capacity after-market 10/22 magazine.  While a whole lot lighter and handier than larger drum mags, the fact that the capacity isn't much higher than a stick magazine makes this an unpopular choice, as it still comes with all the reliability issues drum magazines have."
+      }
+    ],
+    "weight": "232 g",
+    "volume": "170 ml",
+    "longest_side": "134 mm",
+    "price": "39 USD 99 cent",
+    "price_postapoc": "4 USD",
+    "material": [ "steel", "plastic" ],
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": [ "22" ],
+    "reload_time": 140,
+    "mag_jam_mult": 2,
+    "flags": [ "MAG_BULKY" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 55 } } ]
+  },
+  {
+    "id": "ruger1022mag_32",
+    "looks_like": "stanag30",
+    "type": "MAGAZINE",
+    "name": { "str": "32-round varmint magazine" },
+    "description": "An extended capacity 32-round magazine, for use with .22 caliber varmint rifles.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "ruger1022bigmag",
+        "name": { "str": "Ruger 10/22 32-round magazine" },
+        "description": "An extended 32-round stick magazine for the Ruger 10/22 by ProMag.  While more reliable than a drum mag, it's surprisingly not by much."
+      }
+    ],
+    "weight": "312 g",
+    "volume": "204 ml",
+    "longest_side": "208 mm",
+    "price": "20 USD 99 cent",
+    "price_postapoc": "2 USD 50 cent",
+    "material": [ "steel", "plastic" ],
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": [ "22" ],
+    "reload_time": 120,
+    "mag_jam_mult": 1.5,
+    "flags": [ "MAG_COMPACT" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 32 } } ]
+  },
+  {
+    "id": "ruger1022mag_55",
+    "looks_like": "stanag30",
+    "type": "MAGAZINE",
+    "name": { "str": "55-round varmint drum magazine" },
+    "description": "A 55-round capacity drum magazine for use in varmint rifles.  While the capacity is nothing to scoff at, it is less reliable than stick magazines.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "ruger1022mag_55",
+        "name": { "str": "Ruger 10/22 55-round drum magazine" },
+        "description": "The ProMag 55 round drum magazine is a high capacity after-market 10/22 magazine.  While cumbersome, heavy, and unreliable, the capacity is no doubt a selling factor.  While usually range toys, these mags may just make surviving a little bit easier."
+      }
+    ],
+    "weight": "426 g",
+    "volume": "311 ml",
+    "longest_side": "148 mm",
+    "price": "98 USD 99 cent",
+    "price_postapoc": "4 USD",
+    "material": [ "steel", "plastic" ],
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": [ "22" ],
+    "reload_time": 160,
+    "mag_jam_mult": 2,
+    "flags": [ "MAG_BULKY" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 55 } } ]
+  },
+  {
+    "id": "ruger1022mag_70",
+    "looks_like": "stanag30",
+    "type": "MAGAZINE",
+    "name": { "str": "70-round varmint drum magazine" },
+    "description": "A 70-round capacity drum magazine for use in varmint rifles.  While the capacity is nothing to scoff at, it is less reliable than stick magazines.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "ruger1022mag_70",
+        "name": { "str": "Ruger 10/22 70-round drum magazine" },
+        "description": "The ProMag 70 round drum magazine is a high capacity after-market 10/22 magazine.  While cumbersome, heavy, and unreliable, the capacity is no doubt a selling factor.  While usually range toys, these mags may just make surviving a little bit easier."
+      }
+    ],
+    "weight": "659 g",
+    "volume": "450 ml",
+    "longest_side": "167 mm",
+    "price": "109 USD 99 cent",
+    "price_postapoc": "6 USD",
+    "material": [ "steel", "plastic" ],
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": [ "22" ],
+    "reload_time": 180,
+    "mag_jam_mult": 2,
+    "flags": [ "MAG_BULKY" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 70 } } ]
+  },
+  {
+    "id": "ruger1022mag_110",
+    "looks_like": "stanag30",
+    "type": "MAGAZINE",
+    "name": { "str": "110-round varmint drum magazine" },
+    "description": "An 110-round capacity drum magazine for use in varmint rifles.  While the capacity is nothing to scoff at, it is less reliable than stick magazines.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "ruger1022mag_110",
+        "name": { "str": "Ruger 10/22 110-round drum magazine" },
+        "description": "The GSG-16 110 round drum magazine is the highest capacity 10/22 magazine on the (after)-market.  While cumbersome, heavy, and unreliable, the capacity is no doubt a selling factor.  While usually range toys, these mags may just make surviving a little bit easier."
+      }
+    ],
+    "weight": "1492 g",
+    "volume": "890 ml",
+    "longest_side": "344 mm",
+    "price": "88 USD 99 cent",
+    "price_postapoc": "8 USD",
+    "material": [ "steel", "plastic" ],
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": [ "22" ],
+    "reload_time": 200,
+    "mag_jam_mult": 2.3,
+    "flags": [ "MAG_BULKY" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 110 } } ]
+  },
   {
     "id": "wp22mag",
     "looks_like": "glock17_17",

diff --git a/data/json/mapgen/fema/FEMA_tlc_01.json b/data/json/mapgen/fema/FEMA_tlc_01.json
@@ -45,7 +45,7 @@
       "fill_ter": "t_dirt",
       "rows": [
         "........................",
-        ".Fffffffffffffffffffffff",
+        ".fffffffffffffffffffffff",
         ".f......................",
         ".f......................",
         ".f..========**========..",

diff --git a/data/json/mapgen/fema/FEMA_trc_01.json b/data/json/mapgen/fema/FEMA_trc_01.json
@@ -45,7 +45,7 @@
       "fill_ter": "t_dirt",
       "rows": [
         "........................",
-        ".Fffffffffffffffffffffff",
+        ".fffffffffffffffffffffff",
         ".f......................",
         ".f......................",
         ".f..========**========..",

diff --git a/data/json/mapgen/fema/FEMA_trc_03.json b/data/json/mapgen/fema/FEMA_trc_03.json
@@ -46,7 +46,7 @@
       "fill_ter": "t_dirt",
       "rows": [
         "........................",
-        ".Fffffffffffffffffffffff",
+        ".fffffffffffffffffffffff",
         ".f......................",
         ".f..tt.t................",
         ".f..--------**========..",