Implement bastion star fort, flesh out layout (cataclysmbnteam#3351)

* Implement bastion star fort, flesh out layout * Palette and overmap terrain Easy enough, next step will be the special and likely the first bit actually copied from DDA. * Overmap special next This part's actually based off the DDA version, also included decorative trees so I guess credit for that too but I'm not using JUST t_tree like the DDA version, eh. Co-Authored-By: jokermatt999 <[email protected]> * Fix a small derp * Roof level and some fixes * style(autofix.ci): automated formatting * Add more of the stuff Co-Authored-By: jokermatt999 <[email protected]> * Cannon vehicle stuff next Also fix some stuff and add interior stairs, 2nd floor of powder magazine building now accessible. Co-Authored-By: jokermatt999 <[email protected]> * Fill out powder magazine Also adds a new container that's a better fit than regular barrels. * And do item spawn stuff Co-Authored-By: jokermatt999 <[email protected]> * Spawns go nyoom * Update Bastion_Fort.json * And more things * And that'll be the last vital additions Co-Authored-By: jokermatt999 <[email protected]> * Don't use more powder than the shell weighs Fuuuucking explosive crafting requirements I swear. * Update Bastion_Fort.json * Update locations.json * I am screm * Update locations.json fucking web editor how did I not spot that * fix: ammo type --------- Co-authored-by: jokermatt999 <[email protected]> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: scarf <[email protected]>
mythosmod · Oct 5, 2023 · e82ebec · e82ebec
1 parent 5f26a3c
commit e82ebec
Show file tree

Hide file tree

Showing 17 changed files with 1,004 additions and 3 deletions.
diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -1052,7 +1052,9 @@
       [ "shot_paper_bird", 15 ],
       [ "shot_paper_slug", 10 ],
       [ "36navy", 50 ],
-      [ "44army", 50 ]
+      [ "44army", 50 ],
+      [ "cannonball_explosive", 5 ],
+      [ "cannonball_4lb", 20 ]
     ]
   },
   {
@@ -2483,5 +2485,112 @@
       [ "coal_lump", 5 ],
       [ "material_limestone", 5 ]
     ]
+  },
+  {
+    "id": "fort_giftshop",
+    "type": "item_group",
+    "subtype": "distribution",
+    "entries": [
+      { "item": "tshirt", "prob": 40 },
+      { "item": "ceramic_mug", "prob": 10 },
+      { "item": "teapot", "prob": 14 },
+      { "group": "tinware", "prob": 10 },
+      { "item": "tricorne", "prob": 25 },
+      { "item": "survnote", "prob": 1 }
+    ]
+  },
+  {
+    "id": "fort_giftshop_rare",
+    "type": "item_group",
+    "subtype": "distribution",
+    "entries": [
+      { "item": "pocketwatch", "prob": 20 },
+      { "group": "jewelry_accessories", "prob": 30 },
+      { "item": "cavalry_sabre_fake", "container-item": "scabbard", "prob": 20 },
+      { "item": "knife_hunting", "container-item": "sheath", "prob": 5 },
+      { "item": "flintlock_pouch", "prob": 20 },
+      { "item": "bandolier_pistol", "prob": 3 },
+      { "item": "spiral_stone", "prob": 2 }
+    ]
+  },
+  {
+    "id": "fort_display_case",
+    "type": "item_group",
+    "subtype": "distribution",
+    "//": "Firearms are weighted 50% Civil War items, 30% Revolutionary War items, and 20% post-Civil War items.",
+    "entries": [
+      { "item": "tricorne", "prob": 10 },
+      { "item": "knee_high_boots", "prob": 3 },
+      { "item": "breeches", "prob": 2 },
+      { "item": "waistcoat", "prob": 3 },
+      { "item": "peacoat", "prob": 2 },
+      { "item": "greatcoat", "prob": 3 },
+      { "item": "hat_fur", "prob": 2 },
+      { "item": "cavalry_sabre", "prob": 10 },
+      { "item": "hatchet", "prob": 5 },
+      { "item": "cannonball_explosive", "prob": 10 },
+      { "item": "shotgun_paper", "prob": 10 },
+      { "item": "lemat_revolver", "prob": 5 },
+      { "item": "colt_army", "prob": 5 },
+      { "item": "colt_navy", "prob": 5 },
+      { "item": "longrifle_flintlock", "prob": 7 },
+      { "item": "rifle_flintlock", "prob": 3 },
+      { "item": "carbine_flintlock", "prob": 2 },
+      { "item": "pistol_flintlock", "prob": 3 },
+      { "item": "sharps", "prob": 8 },
+      { "item": "colt_saa", "prob": 2 }
+    ]
+  },
+  {
+    "id": "fort_historic_wardrobe",
+    "type": "item_group",
+    "subtype": "collection",
+    "entries": [
+      {
+        "distribution": [
+          { "item": "knee_high_boots", "prob": 80, "damage": [ 1, 4 ] },
+          { "item": "boots_fur", "prob": 20, "damage": [ 1, 4 ] }
+        ],
+        "prob": 20
+      },
+      {
+        "distribution": [ { "item": "breeches", "prob": 80, "damage": [ 1, 4 ] }, { "item": "pants_fur", "prob": 20, "damage": [ 1, 4 ] } ],
+        "prob": 50
+      },
+      { "item": "waistcoat", "prob": 30, "damage": [ 1, 4 ] },
+      {
+        "distribution": [ { "item": "peacoat", "prob": 80, "damage": [ 1, 4 ] }, { "item": "greatcoat", "prob": 20, "damage": [ 1, 4 ] } ],
+        "prob": 50
+      },
+      { "item": "leather_belt", "prob": 10, "damage": [ 1, 4 ] },
+      { "item": "knit_scarf", "prob": 10, "damage": [ 1, 4 ] },
+      {
+        "distribution": [ { "item": "tricorne", "prob": 80, "damage": [ 1, 4 ] }, { "item": "hat_fur", "prob": 20, "damage": [ 1, 4 ] } ],
+        "prob": 30
+      },
+      { "item": "gloves_leather", "prob": 10, "damage": [ 1, 4 ] },
+      {
+        "distribution": [
+          { "item": "stockings", "prob": 50, "damage": [ 1, 4 ] },
+          { "item": "stockings_wool", "prob": 50, "damage": [ 1, 4 ] }
+        ],
+        "prob": 30
+      }
+    ]
+  },
+  {
+    "id": "fort_crate",
+    "type": "item_group",
+    "subtype": "collection",
+    "entries": [ { "item": "cannonball_4lb", "prob": 100, "count": [ 1, 10 ] }, { "item": "rag", "prob": 50, "count": [ 1, 25 ] } ]
+  },
+  {
+    "id": "fort_powderbarrel",
+    "type": "item_group",
+    "subtype": "collection",
+    "entries": [
+      { "item": "chem_black_powder", "charges": [ 100, 2500 ], "container-item": "wooden_barrel_small" },
+      { "item": "chem_black_powder", "charges": [ 100, 2500 ], "container-item": "wooden_barrel_small", "prob": 50 }
+    ]
   }
 ]
diff --git a/data/json/items/ammo/cannon.json b/data/json/items/ammo/cannon.json
@@ -0,0 +1,45 @@
+[
+  {
+    "id": "cannon_explosive_shell",
+    "copy-from": "cannon_round_ball",
+    "type": "AMMO",
+    "name": { "str": "explosive cannon shell" },
+    "description": "A bundle of wadding, black gunpowder, and a tightly-packed explosive shell with a percussion fuse.  A Civil War era \"common shell\" for cannons of 3-inch bore, whatever it hits probably won't live to regret it.",
+    "//": "Exact weight of component items.",
+    "weight": "5051 g",
+    "volume": "1 L",
+    "price": "200 USD",
+    "price_postapoc": "20 USD",
+    "looks_like": "cannon_round_ball",
+    "//2": "Base damage of 544, rounded down to 450 to be close to 25% that of round shot, balanced as FMJ.",
+    "damage": { "damage_type": "bullet", "amount": 450, "armor_penetration": 215 },
+    "dispersion": 500,
+    "recoil": 52500,
+    "extend": { "effects": [ "EXPLOSIVE", "FRAG" ] }
+  },
+  {
+    "id": "cannon_round_ball",
+    "type": "AMMO",
+    "name": { "str": "cannon round shot" },
+    "description": "A bundle of wadding, black gunpowder, and a 3-inch cast-iron cannonball.  An explosive \"common shell\" would be preferable for a Civil War era cannon, but this can still ruin anyone's day.",
+    "//": "Exact weight of component items.",
+    "weight": "2576 g",
+    "volume": "500 ml",
+    "price": "120 USD",
+    "price_postapoc": "12 USD",
+    "material": [ "iron", "powder" ],
+    "symbol": "=",
+    "color": "white",
+    "looks_like": "blun_slug",
+    "count": 1,
+    "stack_size": 1,
+    "ammo_type": "cannon",
+    "range": 50,
+    "//2": "Base damage of 352, rounded down to 350, balanced as FMJ.",
+    "damage": { "damage_type": "bullet", "amount": 350, "armor_penetration": 150 },
+    "dispersion": 620,
+    "recoil": 26250,
+    "loudness": 900,
+    "effects": [ "COOKOFF", "MUZZLE_SMOKE", "BLACKPOWDER" ]
+  }
+]
diff --git a/data/json/items/ammo_types.json b/data/json/items/ammo_types.json
@@ -636,6 +636,12 @@
     "name": "water",
     "default": "water"
   },
+  {
+    "type": "ammunition_type",
+    "id": "cannon",
+    "name": "3-inch cannon",
+    "default": "cannon_explosive_shell"
+  },
   {
     "id": "acid",
     "type": "ammunition_type",

diff --git a/data/json/items/containers.json b/data/json/items/containers.json
@@ -1172,6 +1172,20 @@
     "watertight": true,
     "qualities": [ [ "CONTAIN", 1 ] ]
   },
+  {
+    "id": "wooden_barrel_small",
+    "copy-from": "wooden_barrel",
+    "type": "CONTAINER",
+    "name": { "str": "small wooden barrel" },
+    "description": "A wooden keg held together by copper bands, with a capacity of 20 liters.  Good for storing liquor, or more volatile substances, in a size easily transported by hand.",
+    "weight": "12 kg",
+    "volume": "20 L",
+    "price": "50 USD",
+    "price_postapoc": "1 USD",
+    "bashing": 4,
+    "material": [ "wood", "copper" ],
+    "contains": "20 L"
+  },
   {
     "id": "wrapper",
     "type": "CONTAINER",

diff --git a/data/json/items/gun/cannon.json b/data/json/items/gun/cannon.json
@@ -0,0 +1,28 @@
+[
+  {
+    "id": "cannon_3in_ordnance",
+    "copy-from": "launcher_base",
+    "weapon_category": [ "1SHOT" ],
+    "type": "GUN",
+    "name": { "str": "3-inch ordnance rifle" },
+    "description": "A light (by artillery standards) rifled cannon widely used in the American Civil War, noted for its reliability.",
+    "weight": "371946 g",
+    "volume": "134 L",
+    "price": "350 USD",
+    "price_postapoc": "10 USD",
+    "to_hit": -4,
+    "bashing": 50,
+    "material": [ "iron" ],
+    "color": "dark_gray",
+    "looks_like": "mark19",
+    "ammo": "cannon",
+    "dispersion": 855,
+    "durability": 5,
+    "blackpowder_tolerance": 96,
+    "loudness": 300,
+    "clip_size": 1,
+    "reload": 30000,
+    "valid_mod_locations": [  ],
+    "flags": [ "MOUNTED_GUN", "NEVER_JAMS" ]
+  }
+]
diff --git a/data/json/items/resources/misc.json b/data/json/items/resources/misc.json
@@ -179,5 +179,42 @@
     "flags": [ "STAB", "SHEATH_KNIFE" ],
     "price": 1000,
     "price_postapoc": 0
+  },
+  {
+    "type": "TOOL",
+    "category": "spare_parts",
+    "id": "cannonball_explosive",
+    "name": { "str": "unpacked cannon shell" },
+    "description": "A metal case tightly packed with gunpowder and an impact fuse.  With some gunpowder, wadding, and a fuse, it could be prepared to load into a cannon.",
+    "symbol": "o",
+    "color": "dark_gray",
+    "looks_like": "cannonball_4lb",
+    "weight": "4275 g",
+    "volume": "700 ml",
+    "material": [ "iron", "powder" ],
+    "to_hit": -6,
+    "flags": [ "TRADER_AVOID" ],
+    "bashing": 18,
+    "explosion": {
+      "damage": 50,
+      "radius": 3,
+      "fragment": { "impact": { "damage_type": "cut", "amount": 50, "armor_multiplier": 3 }, "range": 5 }
+    },
+    "explode_in_fire": true
+  },
+  {
+    "type": "GENERIC",
+    "id": "cannonball_4lb",
+    "category": "spare_parts",
+    "symbol": "o",
+    "color": "dark_gray",
+    "name": { "str": "cannonball" },
+    "description": "A four-pound, cast-iron cannonball.  With some gunpowder, wadding, and a fuse, it could be prepared to load into a cannon.",
+    "material": [ "iron" ],
+    "weight": "1800 g",
+    "volume": "200 ml",
+    "to_hit": -5,
+    "flags": [ "TRADER_AVOID" ],
+    "bashing": 15
   }
 ]