Merge branch 'CleverRaven:master' into master

zdlpoppa · Nov 20, 2023 · 51c9c1b · 51c9c1b
2 parents c12f5d3 + e7609bf
commit 51c9c1b
Show file tree

Hide file tree

Showing 67 changed files with 1,000 additions and 1,511 deletions.
diff --git a/data/json/itemgroups/Clothing_Gear/costumes.json b/data/json/itemgroups/Clothing_Gear/costumes.json
@@ -113,7 +113,8 @@
       { "item": "haori", "prob": 1 },
       { "item": "trenchcoat_steampunk", "prob": 15 },
       { "item": "plaguedoctor_robe", "prob": 15 },
-      { "item": "nun_habit", "prob": 10 }
+      { "item": "nun_habit", "prob": 10 },
+      { "item": "suit_bostonchan", "prob": 20 }
     ]
   },
   {
@@ -192,6 +193,7 @@
       { "item": "hat_hard", "variant": "steampunk_hat_hard", "prob": 10 },
       { "item": "hat_hard_hooded", "variant": "steampunk_hat_hard", "prob": 1 },
       { "item": "clown_wig", "prob": 15 },
+      { "item": "bostonchan_wig", "prob": 20 },
       { "item": "tricorne", "prob": 5 },
       { "item": "wizard_hat_costume", "prob": 25 },
       { "item": "pointed_hat", "prob": 20 },
@@ -298,7 +300,8 @@
       { "item": "cheerleader_skirt", "prob": 15 },
       { "item": "cheerleader_skirt_short", "prob": 15 },
       { "item": "nanoskirt", "prob": 10 },
-      { "item": "skirt_leather", "prob": 15 }
+      { "item": "skirt_leather", "prob": 15 },
+      { "item": "skirt_bostonchan", "prob": 20 }
     ]
   },
   {

diff --git a/data/json/items/ammo/38.json b/data/json/items/ammo/38.json
@@ -32,20 +32,6 @@
     "recoil": 250,
     "effects": [ "COOKOFF" ]
   },
-  {
-    "id": "38_super",
-    "copy-from": "38_special",
-    "type": "AMMO",
-    "name": { "str_sp": ".38 Super" },
-    "description": ".38 Super ammunition with a 90gr JHP bullet.  Designed in 1929, the .38 super cartridge was designed to penetrate body armor and vehicles.",
-    "price": 240,
-    "price_postapoc": 600,
-    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
-    "count": 20,
-    "ammo_type": "38super",
-    "relative": { "damage": { "damage_type": "bullet", "amount": 5, "armor_penetration": 4 }, "dispersion": -10 },
-    "proportional": { "recoil": 1.5 }
-  },
   {
     "id": "reloaded_38_fmj",
     "copy-from": "38_fmj",
@@ -66,16 +52,6 @@
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
-  {
-    "id": "reloaded_38_super",
-    "copy-from": "38_super",
-    "type": "AMMO",
-    "name": { "str_sp": ".38 Super, reloaded" },
-    "description": ".38 Super ammunition with a 90gr JHP bullet.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
   {
     "id": "bp_38_fmj",
     "copy-from": "38_fmj",

diff --git a/data/json/items/ammo/38super.json b/data/json/items/ammo/38super.json
@@ -3,7 +3,7 @@
     "id": "38super_fmj",
     "type": "AMMO",
     "name": { "str_sp": ".38 Super FMJ" },
-    "description": ".38 Super ammunition with a 147gr FMJ bullet.  The .38 Super round was developed from .38 ACP in the 1920s, designed to penetrate the body armor of the era.",
+    "description": ".38 Super ammunition with a 124gr FMJ bullet.  The .38 Super round was developed from .38 ACP in 1929 to penetrate body armor of the era.  The caliber saw some resurgence in popularity amongst competition shooters in the 1980's prior to the proliferation of double stack 9mm pistols.",
     "ascii_picture": "38super_fmj",
     "weight": "13 g",
     "volume": "97 ml",
@@ -19,19 +19,119 @@
     "ammo_type": "38super",
     "casing": "38super_casing",
     "range": 14,
-    "damage": { "damage_type": "bullet", "amount": 26 },
+    "//": ".38 Super Auto .355, 124grain FMJ, 5.8 gr Alliant UNIQUE",
+    "damage": {
+      "damage_type": "bullet",
+      "amount": 22,
+      "armor_penetration": 4,
+      "barrels": [
+        { "barrel_length": "28 mm", "amount": 14 },
+        { "barrel_length": "32 mm", "amount": 15 },
+        { "barrel_length": "38 mm", "amount": 16 },
+        { "barrel_length": "44 mm", "amount": 17 },
+        { "barrel_length": "54 mm", "amount": 18 },
+        { "barrel_length": "62 mm", "amount": 19 },
+        { "barrel_length": "76 mm", "amount": 20 },
+        { "barrel_length": "89 mm", "amount": 21 },
+        { "barrel_length": "111 mm", "amount": 22 },
+        { "barrel_length": "132 mm", "amount": 23 },
+        { "barrel_length": "168 mm", "amount": 24 },
+        { "barrel_length": "211 mm", "amount": 25 },
+        { "barrel_length": "261 mm", "amount": 26 },
+        { "barrel_length": "336 mm", "amount": 27 },
+        { "barrel_length": "461 mm", "amount": 28 },
+        { "barrel_length": "661 mm", "amount": 29 },
+        { "barrel_length": "962 mm", "amount": 30 },
+        { "barrel_length": "1252 mm", "amount": 31 }
+      ]
+    },
     "dispersion": 30,
     "recoil": 250,
     "effects": [ "COOKOFF" ]
   },
+  {
+    "id": "38_super",
+    "copy-from": "38super_fmj",
+    "type": "AMMO",
+    "name": { "str_sp": ".38 Super JHP" },
+    "description": ".38 Super ammunition with a 115gr JHP bullet.  The .38 Super round was developed from .38 ACP in 1929 to penetrate body armor of the era.  The caliber saw some resurgence in popularity amongst competition shooters in the 1980's prior to the proliferation of double stack 9mm pistols.",
+    "price": 240,
+    "price_postapoc": 600,
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+    "count": 20,
+    "ammo_type": "38super",
+    "relative": { "damage": { "damage_type": "bullet", "amount": 2, "armor_penetration": -4 } }
+  },
+  {
+    "id": "reloaded_38_super",
+    "copy-from": "38_super",
+    "type": "AMMO",
+    "name": { "str_sp": ".38 Super JHP, reloaded" },
+    "description": ".38 Super ammunition with a 115gr JHP bullet.  The .38 Super round was developed from .38 ACP in 1929 to penetrate body armor of the era.  The caliber saw some resurgence in popularity amongst competition shooters in the 1980's prior to the proliferation of double stack 9mm pistols.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
   {
     "id": "reloaded_38super_fmj",
     "copy-from": "38super_fmj",
     "type": "AMMO",
     "name": { "str_sp": ".38 Super FMJ, reloaded" },
-    "description": ".38 Super ammunition with a 147gr FMJ bullet.  The .38 Super round was developed from .38 ACP in the 1920s, designed to penetrate the body armor of the era.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
+    "description": ".38 Super ammunition with a 124gr FMJ bullet.  The .38 Super round was developed from .38 ACP in 1929 to penetrate body armor of the era.  The caliber saw some resurgence in popularity amongst competition shooters in the 1980's prior to the proliferation of double stack 9mm pistols.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "bp_38super_fmj",
+    "copy-from": "38super_fmj",
+    "type": "AMMO",
+    "name": { "str_sp": ".38 Super FMJ, black powder" },
+    "description": ".38 Super ammunition with a 124gr FMJ bullet.  The .38 Super round was developed from .38 ACP in 1929 to penetrate body armor of the era.  The caliber saw some resurgence in popularity amongst competition shooters in the 1980's prior to the proliferation of double stack 9mm pistols.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.  Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
+    "proportional": {
+      "price": 0.3,
+      "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
+      "recoil": 0.76,
+      "dispersion": 1.2
+    },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "bp_38super",
+    "copy-from": "38_super",
+    "type": "AMMO",
+    "name": { "str_sp": ".38 Super JHP black powder" },
+    "description": ".38 Super ammunition with a 115gr JHP bullet.  The .38 Super round was developed from .38 ACP in 1929 to penetrate body armor of the era.  The caliber saw some resurgence in popularity amongst competition shooters in the 1980's prior to the proliferation of double stack 9mm pistols.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.  Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
+    "proportional": {
+      "price": 0.3,
+      "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
+      "recoil": 0.76,
+      "dispersion": 1.2
+    },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "matchhead_38_super",
+    "copy-from": "38_super",
+    "type": "AMMO",
+    "//": "matchhead bullets assumed to have about 75% of the muzzle energy of black powder",
+    "name": { "str_sp": ".38 Super JHP, matchhead powder" },
+    "description": ".38 Super ammunition with a 115gr JHP bullet.  The .38 Super round was developed from .38 ACP in 1929 to penetrate body armor of the era.  The caliber saw some resurgence in popularity amongst competition shooters in the 1980's prior to the proliferation of double stack 9mm pistols.  This one was a victim of a truly desperate survivor, being loaded with powder from ground match heads.  Red phosphorous is less energetic than even black powder, but its fast burn rate also limits the amount that can be used due to the danger of blowing up the gun from overpressure.  As a result, it's even weaker than its black powder counterpart, and the ammo is still dirty and corrosive meaning it needs to be cleaned quickly or else the gun will suffer.",
+    "proportional": { "price": 0.5, "damage": { "damage_type": "bullet", "amount": 0.85 }, "dispersion": 1.1 },
+    "looks_like": "bp_30carbine",
+    "extend": { "effects": [ "MATCHHEAD" ] }
+  },
+  {
+    "id": "matchhead_38_super_fmj",
+    "copy-from": "38super_fmj",
+    "type": "AMMO",
+    "//": "matchhead bullets assumed to have about 75% of the muzzle energy of black powder",
+    "name": { "str_sp": ".38 Super FMJ, matchhead powder" },
+    "description": ".38 Super ammunition with a 124gr FMJ bullet.  The .38 Super round was developed from .38 ACP in 1929 to penetrate body armor of the era.  The caliber saw some resurgence in popularity amongst competition shooters in the 1980's prior to the proliferation of double stack 9mm pistols.  This one was a victim of a truly desperate survivor, being loaded with powder from ground match heads.  Red phosphorous is less energetic than even black powder, but its fast burn rate also limits the amount that can be used due to the danger of blowing up the gun from overpressure.  As a result, it's even weaker than its black powder counterpart, and the ammo is still dirty and corrosive meaning it needs to be cleaned quickly or else the gun will suffer.",
+    "proportional": { "price": 0.5, "damage": { "damage_type": "bullet", "amount": 0.85 }, "dispersion": 1.1 },
+    "looks_like": "bp_30carbine",
+    "extend": { "effects": [ "MATCHHEAD" ] }
   }
 ]
diff --git a/data/json/items/armor/legs_clothes.json b/data/json/items/armor/legs_clothes.json
@@ -2281,5 +2281,31 @@
         "append": true
       }
     ]
+  },
+  {
+    "id": "skirt_bostonchan",
+    "type": "ARMOR",
+    "name": { "str": "Boston-Chan skirt" },
+    "description": "A short skirt for the Boston-Chan costume.",
+    "weight": "230 g",
+    "volume": "250 ml",
+    "price": 9500,
+    "price_postapoc": 50,
+    "material": [ "cotton" ],
+    "symbol": "[",
+    "looks_like": "skirt",
+    "color": "blue",
+    "warmth": 10,
+    "material_thickness": 0.6,
+    "flags": [ "VARSIZE" ],
+    "armor": [
+      {
+        "encumbrance": 5,
+        "coverage": 100,
+        "covers": [ "leg_l", "leg_r" ],
+        "specifically_covers": [ "leg_hip_l", "leg_hip_r" ]
+      },
+      { "coverage": 38, "covers": [ "leg_l", "leg_r" ], "specifically_covers": [ "leg_upper_l", "leg_upper_r" ] }
+    ]
   }
 ]
diff --git a/data/json/items/armor/misc.json b/data/json/items/armor/misc.json
@@ -312,5 +312,24 @@
     "material_thickness": 1.0,
     "environmental_protection": 0,
     "armor": [ { "encumbrance": 15, "coverage": 10, "covers": [ "head" ] } ]
+  },
+  {
+    "id": "bostonchan_wig",
+    "type": "ARMOR",
+    "name": { "str": "Boston-Chan wig" },
+    "description": "A long blue hair wig for the Boston-Chan costume.",
+    "weight": "125 g",
+    "volume": "750 ml",
+    "price": 2500,
+    "price_postapoc": 10,
+    "to_hit": -3,
+    "material": [ "cotton" ],
+    "symbol": "[",
+    "color": "blue",
+    "warmth": 10,
+    "material_thickness": 0.2,
+    "environmental_protection": 1,
+    "flags": [ "VARSIZE" ],
+    "armor": [ { "encumbrance": 5, "coverage": 60, "covers": [ "head" ] } ]
   }
 ]