[Magiclysm] Parabolan wool gambesons (#72054)

* Theoretical Gambeson made? * Add Quilted Parabolan Wool * Parabolan Gambesons * Minor tweak Forgot to fix proportional warmth * Gambeson Recipes * Adjust Parabolan Felt Patch Mass The patches were the same mass as the breeches you created with 20 of them, so I divided the patch mass by 20 to make logical sense. This means that the gambeson pieces I'm making are going to take far more of the patches, but that seems fitting * Adjust felt patch quantities The patch to garment mass ratio was all off for the pants, so I adjusted the patch's mass and have now adjusted the gambeson's patch quantities based on that mass * Add spawns for Parabolan Armor * Forge of Wonders Sells Parabolan Armor * Update patch mass again in accordance with discord conversation * Adjusting parabolan wool mass Adjusted per conversation on discord. .6 times the mass of cotton, or otherwise compared to wool appropriately * Gambeson recipes updated for patch mass * Update yarn to match * Fixed a forgotten word * Update data/mods/Magiclysm/recipes/tailoring.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/mods/Magiclysm/recipes/tailoring.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/mods/Magiclysm/recipes/tailoring.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/mods/Magiclysm/recipes/tailoring.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/mods/Magiclysm/recipes/tailoring.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/mods/Magiclysm/recipes/tailoring.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/mods/Magiclysm/recipes/tailoring.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/mods/Magiclysm/recipes/tailoring.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/mods/Magiclysm/recipes/tailoring.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/mods/Magiclysm/recipes/tailoring.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/mods/Magiclysm/recipes/tailoring.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/mods/Magiclysm/recipes/tailoring.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/mods/Magiclysm/recipes/tailoring.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/mods/Magiclysm/recipes/tailoring.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/mods/Magiclysm/recipes/tailoring.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Fix spelling error * Fake commit to retrigger testing after bug was fixed * Adjust based on build error, I think? * Reverting attempt to fix ubuntu test, guess I messed up somehow * Testing something to fix Clang 10 test? * Fixing Clang 10, take two --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
CleverRaven · Mar 1, 2024 · d87b5d9 · d87b5d9
1 parent 4be53f0
commit d87b5d9
Show file tree

Hide file tree

Showing 6 changed files with 521 additions and 10 deletions.
diff --git a/data/mods/Magiclysm/itemgroups/itemgroups.json b/data/mods/Magiclysm/itemgroups/itemgroups.json
@@ -519,6 +519,17 @@
       [ "bookstrap", 2 ]
     ]
   },
+  {
+    "type": "item_group",
+    "id": "parabolan_armor",
+    "items": [
+      [ "gambeson_parabolan", 10 ],
+      [ "gambeson_parabolan_thinsleeved", 5 ],
+      [ "gambeson_parabolan_vest", 5 ],
+      [ "gambeson_pants_parabolan", 3 ],
+      [ "gambeson_gloves_parabolan", 3 ]
+    ]
+  },
   {
     "type": "item_group",
     "id": "wisp_death",
@@ -1697,6 +1708,7 @@
       { "group": "enchanted_wands_greater", "prob": 30 },
       { "group": "enchanted_wands_lesser", "prob": 20 },
       { "group": "lair_black_dragon_treasure", "prob": 5 },
+      { "group": "parabolan_armor", "prob": 10 },
       { "group": "enchanted_melee_weapons_plus2", "prob": 20 },
       { "group": "enchanted_tools_plus2", "prob": 20 },
       { "group": "demon_spider_lair_treasure", "prob": 10 },

diff --git a/data/mods/Magiclysm/items/enchanted_clothes.json b/data/mods/Magiclysm/items/enchanted_clothes.json
@@ -13,7 +13,7 @@
     "name": { "str_sp": "enchanted parabolan wool blouse" },
     "description": "A loose silvery iridescent blouse in a style most often associated with pirates and renfaires.  It shimmers as you look at it.  Made of parabolan wool, it sometimes dimly shows reflections of things here and not.  This particular one has piratical flairs and glitters with enchantment.",
     "looks_like": "dress_shirt",
-    "weight": "60 g",
+    "weight": "360 g",
     "volume": "750 ml",
     "price": 200000,
     "symbol": "[",
@@ -32,7 +32,7 @@
     "type": "ARMOR",
     "name": { "str_sp": "enchanted parabolan wool breeches" },
     "description": "A well-made pair of old-fashioned pants, made of silvery iridescent material.  Comfortable, but lacks pockets.  It shimmers as you look at it.  Made of parabolan wool, it sometimes dimly shows reflections of things here and not.  This particular one has piratical flairs and glitters with enchantment.",
-    "weight": "52 g",
+    "weight": "312 g",
     "volume": "1750 ml",
     "price": 490000,
     "price_postapoc": 50000,
@@ -59,7 +59,7 @@
     "name": "parabolan wool blouse",
     "description": "A loose silvery iridescent blouse in a style most often associated with pirates and renfaires.  It shimmers as you look at it.  Made of parabolan wool, it sometimes dimly shows reflections of things here and not.",
     "looks_like": "dress_shirt",
-    "weight": "60 g",
+    "weight": "360 g",
     "volume": "750 ml",
     "price": 2000,
     "price_postapoc": 500,
@@ -78,7 +78,7 @@
     "type": "ARMOR",
     "name": { "str_sp": "parabolan wool breeches" },
     "description": "A well-made pair of old-fashioned pants, made of silvery iridescent material.  Comfortable, but lacks pockets.  It shimmers as you look at it.  Made of parabolan wool, it sometimes dimly shows reflections of things here and not.",
-    "weight": "52 g",
+    "weight": "312 g",
     "volume": "1750 ml",
     "price": 4900,
     "price_postapoc": 500,
@@ -90,6 +90,304 @@
     "material_thickness": 0.5,
     "flags": [ "VARSIZE", "FANCY", "WATER_FRIENDLY" ]
   },
+  {
+    "id": "gambeson_parabolan",
+    "type": "ARMOR",
+    "name": { "str": "parabolan wool gambeson" },
+    "description": "A padded greatcoat assembled by quilting rarely available iridescent wool that was intended as standalone armor, this is half the thickness of a historical gambeson due to the quality of its material.  Famed for its resistance to arrows in olden times, one might wonder how effective it might be against modern projectiles.",
+    "weight": "7110 g",
+    "volume": "3750 ml",
+    "price": 400000,
+    "price_postapoc": 300000,
+    "to_hit": -5,
+    "material": [ "parabolan_wool" ],
+    "symbol": "[",
+    "looks_like": "jacket_light",
+    "color": "light_gray",
+    "warmth": 6,
+    "flags": [ "VARSIZE", "STURDY", "NORMAL", "OUTER", "BLOCK_WHILE_WORN" ],
+    "armor": [
+      {
+        "material": [
+          { "type": "parabolan_wool_quilted", "covered_by_mat": 100, "thickness": 1 },
+          { "type": "parabolan_wool", "covered_by_mat": 95, "thickness": 2.75 }
+        ],
+        "covers": [ "torso" ],
+        "coverage": 100,
+        "encumbrance": 9
+      },
+      {
+        "material": [
+          { "type": "parabolan_wool_quilted", "covered_by_mat": 100, "thickness": 1 },
+          { "type": "parabolan_wool", "covered_by_mat": 95, "thickness": 2 }
+        ],
+        "covers": [ "arm_l", "arm_r" ],
+        "coverage": 100,
+        "encumbrance": 13
+      },
+      {
+        "material": [ { "type": "parabolan_wool_quilted", "covered_by_mat": 100, "thickness": 1.0 } ],
+        "covers": [ "leg_l", "leg_r" ],
+        "specifically_covers": [ "leg_draped_l", "leg_draped_r" ],
+        "coverage": 72,
+        "encumbrance": 3,
+        "layers": [ "BELTED" ],
+        "//warmth": 2
+      }
+    ]
+  },
+  {
+    "id": "xl_gambeson_parabolan",
+    "//": "surface area of XL body assumed to be 50% greater and materials used are also 50% greater.",
+    "type": "ARMOR",
+    "name": { "str": "XL parabolan wool gambeson" },
+    "copy-from": "gambeson_parabolan",
+    "proportional": { "weight": 1.5, "volume": 1.5, "price": 1.25 },
+    "extend": { "flags": [ "OVERSIZE" ] }
+  },
+  {
+    "id": "xs_gambeson_parabolan",
+    "//": "surface area of XL body assumed to be 75% size and materials used are also 75% as much.",
+    "type": "ARMOR",
+    "name": { "str": "XS parabolan wool gambeson" },
+    "copy-from": "gambeson_parabolan",
+    "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
+    "extend": { "flags": [ "UNDERSIZE" ] }
+  },
+  {
+    "id": "gambeson_parabolan_thinsleeved",
+    "type": "ARMOR",
+    "name": { "str": "thin-sleeved parabolan wool gambeson" },
+    "description": "A thick iridescent wool greatcoat famed for its resistance to arrows in olden times.  Compared to conventional wool, this is much lighter and less warm.  The sleeves are a lot thinner for flexibility and it drapes below your legs, providing additional protection there.",
+    "weight": "6288 g",
+    "volume": "3750 ml",
+    "price_postapoc": 150000,
+    "to_hit": -5,
+    "material": [ "parabolan_wool" ],
+    "symbol": "[",
+    "looks_like": "gambeson_parabolan",
+    "color": "light_gray",
+    "warmth": 6,
+    "material_thickness": 3.75,
+    "environmental_protection": 1,
+    "flags": [ "VARSIZE", "STURDY", "NORMAL", "OUTER" ],
+    "armor": [
+      {
+        "material": [
+          { "type": "parabolan_wool_quilted", "covered_by_mat": 100, "thickness": 1.0 },
+          { "type": "parabolan_wool", "covered_by_mat": 95, "thickness": 2.75 }
+        ],
+        "covers": [ "torso" ],
+        "coverage": 100,
+        "encumbrance": 9
+      },
+      {
+        "material": [
+          { "type": "parabolan_wool_quilted", "covered_by_mat": 100, "thickness": 0.5 },
+          { "type": "parabolan_wool", "covered_by_mat": 95, "thickness": 1.0 }
+        ],
+        "covers": [ "arm_l", "arm_r" ],
+        "coverage": 100,
+        "encumbrance": 12,
+        "layers": [ "NORMAL" ],
+        "//warmth": 3
+      },
+      {
+        "material": [ { "type": "parabolan_wool_quilted", "covered_by_mat": 100, "thickness": 1.0 } ],
+        "covers": [ "leg_l", "leg_r" ],
+        "specifically_covers": [ "leg_draped_l", "leg_draped_r" ],
+        "coverage": 72,
+        "encumbrance": 3,
+        "layers": [ "BELTED" ],
+        "//warmth": 2
+      }
+    ]
+  },
+  {
+    "id": "xl_gambeson_parabolan_thinsleeved",
+    "//": "surface area of XL body assumed to be 50% greater and materials used are also 50% greater.",
+    "type": "ARMOR",
+    "name": { "str": "XL thin-sleeved parabolan wool gambeson" },
+    "copy-from": "gambeson_parabolan_thinsleeved",
+    "proportional": { "weight": 1.5, "volume": 1.5, "price": 1.25 },
+    "extend": { "flags": [ "OVERSIZE" ] }
+  },
+  {
+    "id": "xs_gambeson_parabolan_thinsleeved",
+    "//": "surface area of XL body assumed to be 75% size and materials used are also 75% as much.",
+    "type": "ARMOR",
+    "name": { "str": "XS thin-sleeved parabolan wool gambeson" },
+    "copy-from": "gambeson_parabolan_thinsleeved",
+    "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
+    "extend": { "flags": [ "UNDERSIZE" ] }
+  },
+  {
+    "id": "gambeson_parabolan_vest",
+    "type": "ARMOR",
+    "name": { "str": "sleeveless parabolan wool gambeson" },
+    "description": "A thick iridescent wool surcoat famed for its resistance to arrows in the olden times.  Compared to conventional wool, this is much lighter and less warm.  It drapes below your legs, providing additional protection there, and it lacks sleeves entirely.",
+    "weight": "5472 g",
+    "volume": "3000 ml",
+    "price_postapoc": 100000,
+    "to_hit": -5,
+    "material": [ "parabolan_wool" ],
+    "symbol": "[",
+    "looks_like": "sleeveless_tunic",
+    "color": "light_gray",
+    "warmth": 6,
+    "material_thickness": 3.75,
+    "environmental_protection": 1,
+    "flags": [ "VARSIZE", "STURDY", "NORMAL", "OUTER" ],
+    "armor": [
+      {
+        "material": [
+          { "type": "parabolan_wool_quilted", "covered_by_mat": 100, "thickness": 1.0 },
+          { "type": "parabolan_wool", "covered_by_mat": 95, "thickness": 2.75 }
+        ],
+        "covers": [ "torso" ],
+        "coverage": 100,
+        "encumbrance": 9
+      },
+      {
+        "material": [ { "type": "parabolan_wool_quilted", "covered_by_mat": 100, "thickness": 1.0 } ],
+        "covers": [ "leg_l", "leg_r" ],
+        "specifically_covers": [ "leg_draped_l", "leg_draped_r" ],
+        "coverage": 72,
+        "encumbrance": 3,
+        "layers": [ "BELTED" ],
+        "//warmth": 2
+      }
+    ]
+  },
+  {
+    "id": "xl_gambeson_parabolan_vest",
+    "//": "surface area of XL body assumed to be 50% greater and materials used are also 50% greater.",
+    "type": "ARMOR",
+    "name": { "str": "XL sleeveless parabolan wool gambeson" },
+    "copy-from": "gambeson_parabolan_vest",
+    "proportional": { "weight": 1.5, "volume": 1.5, "price": 1.25 },
+    "extend": { "flags": [ "OVERSIZE" ] }
+  },
+  {
+    "id": "xs_gambeson_parabolan_vest",
+    "//": "surface area of XL body assumed to be 75% size and materials used are also 75% as much.",
+    "type": "ARMOR",
+    "name": { "str": "XS sleeveless parabolan wool gambeson" },
+    "copy-from": "gambeson_parabolan_vest",
+    "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
+    "extend": { "flags": [ "UNDERSIZE" ] }
+  },
+  {
+    "id": "gambeson_pants_parabolan",
+    "type": "ARMOR",
+    "name": { "str": "parabolan wool heavy arming pants", "str_pl": "pairs of parabolan wool heavy arming pants" },
+    "description": "Tough, fairly thick iridescent wool pants worn on their own alongside a gambeson.  These are made of layered wool quilting offering very solid protection, specifically for the purposes of stopping arrows.",
+    "weight": "1641 g",
+    "volume": "1875 ml",
+    "price_postapoc": 100000,
+    "to_hit": -5,
+    "material": [ "parabolan_wool" ],
+    "symbol": "[",
+    "looks_like": "fencing_pants",
+    "color": "light_gray",
+    "warmth": 6,
+    "material_thickness": 3.0,
+    "environmental_protection": 1,
+    "flags": [ "VARSIZE", "STURDY", "NORMAL", "OUTER" ],
+    "armor": [
+      {
+        "material": [
+          { "type": "parabolan_wool_quilted", "covered_by_mat": 100, "thickness": 1.0 },
+          { "type": "parabolan_wool", "covered_by_mat": 95, "thickness": 2.0 }
+        ],
+        "covers": [ "leg_l", "leg_r" ],
+        "coverage": 100,
+        "encumbrance": 13
+      }
+    ]
+  },
+  {
+    "id": "xl_gambeson_pants_parabolan",
+    "//": "surface area of XL body assumed to be 50% greater and materials used are also 50% greater.",
+    "type": "ARMOR",
+    "name": { "str": "XL parabolan wool heavy arming pants", "str_pl": "pairs of XL parabolan wool heavy arming pants" },
+    "copy-from": "gambeson_pants_parabolan",
+    "proportional": { "weight": 1.5, "volume": 1.5, "price": 1.25 },
+    "extend": { "flags": [ "OVERSIZE" ] }
+  },
+  {
+    "id": "xs_gambeson_pants_parabolan",
+    "//": "surface area of XL body assumed to be 75% size and materials used are also 75% as much.",
+    "type": "ARMOR",
+    "name": { "str": "XS parabolan wool heavy arming pants", "str_pl": "pairs of XS parabolan wool heavy arming pants" },
+    "copy-from": "gambeson_pants_parabolan",
+    "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
+    "extend": { "flags": [ "UNDERSIZE" ] }
+  },
+  {
+    "id": "gambeson_gloves_parabolan",
+    "type": "ARMOR",
+    "name": { "str": "parabolan wool arming mittens", "str_pl": "pairs of parabolan wool arming mittens" },
+    "description": "Thick iridescent wool gauntlets worn in lieu of metal or leather armor.  These are much less encumbering and warm than conventional wool, but they offer excellent protection against arrows.",
+    "weight": "348 g",
+    "volume": "250 ml",
+    "price_postapoc": 40000,
+    "to_hit": -1,
+    "material": [ "parabolan_wool" ],
+    "symbol": "[",
+    "looks_like": "mittens",
+    "color": "light_gray",
+    "warmth": 5,
+    "material_thickness": 3.0,
+    "environmental_protection": 1,
+    "flags": [ "VARSIZE", "STURDY", "NORMAL", "OUTER" ],
+    "armor": [
+      {
+        "material": [
+          { "type": "parabolan_wool_quilted", "covered_by_mat": 100, "thickness": 1.0 },
+          { "type": "parabolan_wool", "covered_by_mat": 90, "thickness": 2.0 }
+        ],
+        "//a": "technically, only covering 60% ish - inner hand is thinner - but fist will be clenched so inner hand should not really be hit",
+        "covers": [ "hand_l", "hand_r" ],
+        "specifically_covers": [ "hand_fingers_l", "hand_fingers_r" ],
+        "coverage": 100,
+        "encumbrance": 15
+      },
+      {
+        "material": [
+          { "type": "parabolan_wool_quilted", "covered_by_mat": 100, "thickness": 1.0 },
+          { "type": "parabolan_wool", "covered_by_mat": 95, "thickness": 2.0 }
+        ],
+        "covers": [ "hand_l", "hand_r" ],
+        "specifically_covers": [ "hand_back_l", "hand_back_r", "hand_wrist_l", "hand_wrist_r" ],
+        "coverage": 100
+      },
+      {
+        "material": [ { "type": "parabolan_wool_quilted", "covered_by_mat": 100, "thickness": 1.0 } ],
+        "covers": [ "hand_l", "hand_r" ],
+        "specifically_covers": [ "hand_palm_l", "hand_palm_r" ],
+        "coverage": 100
+      }
+    ]
+  },
+  {
+    "id": "xl_gambeson_gloves_parabolan",
+    "//": "surface area of XL body assumed to be 50% greater and materials used are also 50% greater.",
+    "type": "ARMOR",
+    "name": { "str": "XL parabolan wool arming mittens", "str_pl": "pairs of XL parabolan wool arming mittens" },
+    "copy-from": "gambeson_gloves_parabolan",
+    "proportional": { "weight": 1.5, "volume": 1.5, "price": 1.25 },
+    "extend": { "flags": [ "OVERSIZE" ] }
+  },
+  {
+    "id": "xs_gambeson_gloves_parabolan",
+    "//": "surface area of XL body assumed to be 75% size and materials used are also 75% as much.",
+    "type": "ARMOR",
+    "name": { "str": "XS parabolan wool arming mittens", "str_pl": "pairs of XS parabolan wool arming mittens" },
+    "copy-from": "gambeson_gloves_parabolan",
+    "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
+    "extend": { "flags": [ "UNDERSIZE" ] }
+  },
   {
     "id": "coat_lab_plus_one",
     "copy-from": "coat_lab",

diff --git a/data/mods/Magiclysm/items/generic.json b/data/mods/Magiclysm/items/generic.json
@@ -10,8 +10,8 @@
     "price_postapoc": 200,
     "material": [ "parabolan_wool" ],
     "flags": [ "NO_SALVAGE" ],
-    "weight": "54 g",
-    "volume": "250 ml",
+    "weight": "3 g",
+    "volume": "6 ml",
     "category": "spare_parts",
     "to_hit": -1
   },
@@ -28,9 +28,9 @@
     "description": "Parabolan wool yarn; could be used to knit iridescent wool clothing.",
     "material": [ "parabolan_wool" ],
     "volume": "250 ml",
-    "weight": "400 mg",
+    "weight": "600 mg",
     "ammo_type": "thread",
-    "count": 10,
+    "count": 50,
     "stack_size": 200
   },
   {