auto update

linonetwo · Oct 30, 2024 · 61c7032 · 61c7032
1 parent 4d74c1b
commit 61c7032
Show file tree

Hide file tree

Showing 36 changed files with 387 additions and 280 deletions.
diff --git a/Kenan-Structured-Modpack/Arcana/items/tools.json b/Kenan-Structured-Modpack/Arcana/items/tools.json
@@ -191,7 +191,7 @@
     "type": "TOOL",
     "category": "weapons",
     "copy-from": "qt_arming_sword",
-    "weapon_category": [ "MEDIEVAL_SWORDS", "MEDIUM_SWORDS", "FENCING_WEAPONRY" ],
+    "weapon_category": [ "MEDIUM_SWORDS"],
     "name": { "str": "incorruptible sword" },
     "//": "Stats are a blend of the available swords you can use to make it, same deal as the mantle of shadows.",
     "description": "This is some manner of sword, decorated with a golden cross motif worked into the blade.  When powered by consecrated magical essence, it has the power to cut through darkness itself.",
@@ -1206,7 +1206,7 @@
   {
     "id": "staff_druidic",
     "type": "TOOL",
-    "weapon_category": [ "BATONS", "FENCING_WEAPONRY" ],
+    "weapon_category": [ "BATONS"],
     "name": { "str": "druidic staff", "str_pl": "druidic staves" },
     "description": "A short wooden staff decorated with engraved silver, depicting a mixture of exotic natural scenes and various holy symbols.  It is said to represent the instincts deep within the heart, tempered by restraint and reason.  Using it can repair and fortify items made of various plant or animal products and stone, but not more refined materials like metal or glass.",
     "weight": "1310 g",
@@ -1418,7 +1418,7 @@
     "id": "verge_meteoric",
     "type": "TOOL",
     "category": "weapons",
-    "weapon_category": [ "BATONS", "FENCING_WEAPONRY" ],
+    "weapon_category": [ "BATONS"],
     "name": { "str": "meteoric verge" },
     "description": "A short wooden staff, entirely covered in decorative motifs worked from a symbol of judgment.  The symbol's otherworldly presence is still evident in the twisted, flame-like prongs now entwined around a charm of dark, iridescent metal.  Using it will allow you to smite enemies with lightning, protecting you from electrical harm briefly as well.",
     "weight": "1585 g",
@@ -1797,7 +1797,7 @@
     },
     "techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP", "tec_weapon_stormbringer_slash" ],
     "flags": [ "UNBREAKABLE_MELEE", "NO_SALVAGE", "NO_UNWIELD", "NO_UNLOAD", "NO_RELOAD", "TRADER_KEEP_EQUIPPED" ],
-    "weapon_category": [ "MEDIEVAL_SWORDS", "GREAT_SWORDS" ]
+    "weapon_category": [ "GREAT_SWORDS" ]
   },
   {
     "id": "leather_journal",

diff --git a/Kenan-Structured-Modpack/Arcana/modinfo.json b/Kenan-Structured-Modpack/Arcana/modinfo.json
@@ -5,7 +5,7 @@
     "name": "<color_cyan>Arcana and Magic Items</color>",
     "authors": [ "Chaosvolt" ],
     "description": "Adds a host of craftable magic items and spells, centered around the use of Arcana skill to research and exploit otherworldly monsters and anomalies.",
-    "version": "DDA version, update 9/28/2024",
+    "version": "DDA version, update 10/28/2024",
     "category": "content",
     "dependencies": [ "dda" ]
   }

diff --git a/Kenan-Structured-Modpack/Arcana/recipes/crafting_requirements_vanilla.json b/Kenan-Structured-Modpack/Arcana/recipes/crafting_requirements_vanilla.json
@@ -0,0 +1,62 @@
+[
+  {
+    "id": "real_knives",
+    "type": "requirement",
+    "extend": { "tools": [ [ [ "blood_athame", -1 ], [ "moonstone_fang", -1 ], [ "moonstone_fang_on", -1 ] ] ] }
+  },
+  {
+    "id": "real_medium_swords",
+    "type": "requirement",
+    "extend": { "tools": [ [ [ "sun_sword", -1 ], [ "sun_sword_on", -1 ] ] ] }
+  },
+  {
+    "id": "real_great_hammers",
+    "type": "requirement",
+    "extend": { "tools": [ [ [ "hexenhammer", -1 ], [ "lucern_hexenhammer", -1 ] ] ] }
+  },
+  {
+    "id": "real_hooks",
+    "type": "requirement",
+    "extend": { "tools": [ [ [ "hexenhammer", -1 ], [ "lucern_hexenhammer", -1 ] ] ] }
+  },
+  {
+    "id": "real_polearms",
+    "type": "requirement",
+    "extend": { "tools": [ [ [ "lucern_hexenhammer", -1 ] ] ] }
+  },
+  {
+    "id": "real_spears",
+    "type": "requirement",
+    "extend": { "tools": [ [ [ "spear_pestilence", -1 ] ] ] }
+  },
+  {
+    "id": "real_axes",
+    "type": "requirement",
+    "extend": { "tools": [ [ [ "bloodaxe", -1 ], [ "bloodaxe_act", -1 ] ] ] }
+  },
+  {
+    "id": "real_thrusting_swords",
+    "type": "requirement",
+    "extend": { "tools": [ [ [ "shrike_misericorde", -1 ] ] ] }
+  },
+  {
+    "id": "real_short_swords",
+    "type": "requirement",
+    "extend": { "tools": [ [ [ "lichhook", -1 ] ] ] }
+  },
+  {
+    "id": "basic_batons",
+    "type": "requirement",
+    "extend": { "tools": [ [ [ "staff_druidic", -1 ], [ "verge_meteoric", -1 ] ] ] }
+  },
+  {
+    "id": "real_great_swords",
+    "type": "requirement",
+    "extend": { "tools": [ [ [ "veilblade", -1 ], [ "stormbringer", -1 ], [ "stormbringer_on", -1 ] ] ] }
+  },
+  {
+    "id": "real_quarterstaves",
+    "type": "requirement",
+    "extend": { "tools": [ [ [ "sanguine_staff_lifesbane", -1 ] ] ] }
+  }
+]
diff --git a/...-Structured-Modpack/Cataclysm-DDA-Touhou-Expansion/itemgroups/Weapons_Mods_Ammo/guns.json b/...-Structured-Modpack/Cataclysm-DDA-Touhou-Expansion/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -34,9 +34,9 @@
     "copy-from": "guns_smg_rare",
     "extend": { 
       "items": [ 
-        { "item": "aresfmg_folded", "prob": 4 }, 
-        { "item": "idw", "prob": 4 }, 
-        { "item": "pp19v", "prob": 4 } 
+        { "item": "aresfmg_folded", "prob": 47 }, 
+        { "item": "idw", "prob": 47 }, 
+        { "item": "pp19v", "prob": 47 } 
       ] 
     },
     "//3": "Total weight 755 / 16 = 47.19 ~ 47"

diff --git a/...Modpack/Cataclysm-DDA-Touhou-Expansion/itemgroups/Weapons_Mods_Ammo/thex_guns_nested.json b/...Modpack/Cataclysm-DDA-Touhou-Expansion/itemgroups/Weapons_Mods_Ammo/thex_guns_nested.json
@@ -151,8 +151,7 @@
       { "item": "m76", "charges-min": 0, "charges-max": 10 },
       { "item": "m76mag10" },
       { "item": "m76mag10", "prob": 50 },
-      { "group": "on_hand_792x57" },
-      { "item": "onm76_scope" }
+      { "group": "on_hand_792x57" }
     ]
   },
   {
@@ -220,8 +219,7 @@
     "entries": [
       { "item": "ots48k", "charges-min": 0, "charges-max": 5 },
       { "item": "762R_clip", "prob": 66 },
-      { "group": "on_hand_762R" },
-      { "item": "rifle_scope" }
+      { "group": "on_hand_762R" }
     ]
   },
   {
@@ -242,8 +240,7 @@
       { "item": "pgm_hecate", "charges-min": 0, "charges-max": 7 },
       { "item": "pgmmag7" },
       { "item": "pgmmag7", "prob": 50 },
-      { "group": "on_hand_50" },
-      { "item": "scrome_scope" }
+      { "group": "on_hand_50" }
     ]
   },
   {
@@ -336,8 +333,7 @@
       { "item": "svd", "charges-min": 0, "charges-max": 30 }, 
       { "group": "nested_svdmag" }, 
       { "group": "nested_svdmag", "prob": 50 }, 
-      { "group": "on_hand_792x57" },
-      { "item": "pso1_scope" } 
+      { "group": "on_hand_792x57" } 
     ]
   },
   {
@@ -432,8 +428,7 @@
       { "item": "svt40_sniper", "charges-min": 0, "charges-max": 10 }, 
       { "item": "svt40mag10" }, 
       { "item": "svt40mag10", "prob": 50 }, 
-      { "group": "on_hand_762R" },
-      { "item": "pu_scope" } 
+      { "group": "on_hand_762R" } 
    ]
   },
   {
@@ -495,8 +490,7 @@
       { "item": "vsk94", "charges-min": 0, "charges-max": 30 }, 
       { "group": "nested_9x39mag" }, 
       { "group": "nested_9x39mag", "prob": 50 }, 
-      { "group": "on_hand_9x39" }, 
-      { "item": "pso1_scope" } 
+      { "group": "on_hand_9x39" } 
     ]
   },
   {

diff --git a/Kenan-Structured-Modpack/Cataclysm-DDA-Touhou-Expansion/items/ammo/20mm.json b/Kenan-Structured-Modpack/Cataclysm-DDA-Touhou-Expansion/items/ammo/20mm.json
@@ -71,8 +71,8 @@
     "copy-from": "20mm50",
     "proportional": {
       "price": 0.33,
-      "damage": { "damage_type": "bullet", "amount": 0.77, "armor_penetration": 0.66 },
-      "recoil": 0.77,
+      "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.76 },
+      "recoil": 0.76,
       "dispersion": 1.2
     },
     "extend": { "effects": [ "BLACKPOWDER", "MUZZLE_SMOKE", "RECYCLED" ] },
@@ -85,8 +85,8 @@
     "copy-from": "20mm_v",
     "proportional": {
       "price": 0.33,
-      "damage": { "damage_type": "bullet", "amount": 0.77, "armor_penetration": 0.66 },
-      "recoil": 0.77,
+      "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.76 },
+      "recoil": 0.76,
       "dispersion": 1.2
     },
     "extend": { "effects": [ "BLACKPOWDER", "MUZZLE_SMOKE", "RECYCLED" ] },

diff --git a/Kenan-Structured-Modpack/Cataclysm-DDA-Touhou-Expansion/items/ammo/473x33.json b/Kenan-Structured-Modpack/Cataclysm-DDA-Touhou-Expansion/items/ammo/473x33.json
@@ -18,7 +18,7 @@
     "damage": { "damage_type": "bullet", "amount": 38, "armor_penetration": 6 },
     "dispersion": 7,
     "range": 64,
-    "recoil": 2200,
+    "recoil": 1416,
     "effects": [ "NEVER_MISFIRES" ],
     "flags": [ "IRREPLACEABLE_CONSUMABLE", "CASELESS_ROUNDS" ],
     "//2": "Based and scaled from 8mm_caseless . Arbitrary price. Dispersion set so hk_g11 + 473x33_dm11 = ( hk_g3 + 762_51 ) / 2 "

diff --git a/Kenan-Structured-Modpack/Cataclysm-DDA-Touhou-Expansion/items/ammo/765x53.json b/Kenan-Structured-Modpack/Cataclysm-DDA-Touhou-Expansion/items/ammo/765x53.json
@@ -19,7 +19,7 @@
     "damage": { "damage_type": "bullet", "amount": 59, "armor_penetration": 7 },
     "dispersion": 20,
     "range": 100,
-    "recoil": 3430,
+    "recoil": 3445,
     "effects": [ "COOKOFF", "NEVER_MISFIRES" ],
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "//2": "Couldn't find material data, so this is based on the 7.92x57mm Mauser S.m.E."
@@ -44,8 +44,8 @@
     "copy-from": "765x53_arg",
     "proportional": {
       "price": 0.33,
-      "damage": { "damage_type": "bullet", "amount": 0.77, "armor_penetration": 0.66 },
-      "recoil": 0.77,
+      "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.76 },
+      "recoil": 0.76,
       "dispersion": 1.2
     },
     "extend": { "effects": [ "BLACKPOWDER", "MUZZLE_SMOKE", "RECYCLED" ] },

diff --git a/Kenan-Structured-Modpack/Cataclysm-DDA-Touhou-Expansion/items/ammo/77x58.json b/Kenan-Structured-Modpack/Cataclysm-DDA-Touhou-Expansion/items/ammo/77x58.json
@@ -57,8 +57,8 @@
     "copy-from": "77x58a",
     "proportional": {
       "price": 0.33,
-      "damage": { "damage_type": "bullet", "amount": 0.77, "armor_penetration": 0.66 },
-      "recoil": 0.77,
+      "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.76 },
+      "recoil": 0.76,
       "dispersion": 1.2
     },
     "extend": { "effects": [ "BLACKPOWDER", "MUZZLE_SMOKE", "RECYCLED" ] },

diff --git a/Kenan-Structured-Modpack/Cataclysm-DDA-Touhou-Expansion/items/ammo/792x33.json b/Kenan-Structured-Modpack/Cataclysm-DDA-Touhou-Expansion/items/ammo/792x33.json
@@ -74,8 +74,8 @@
     "copy-from": "792x33_me",
     "proportional": {
       "price": 0.33,
-      "damage": { "damage_type": "bullet", "amount": 0.77, "armor_penetration": 0.66 },
-      "recoil": 0.77,
+      "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.76 },
+      "recoil": 0.76,
       "dispersion": 1.2
     },
     "extend": { "effects": [ "BLACKPOWDER", "MUZZLE_SMOKE", "RECYCLED" ] },
@@ -88,8 +88,8 @@
     "copy-from": "792x33_prvi",
     "proportional": {
       "price": 0.33,
-      "damage": { "damage_type": "bullet", "amount": 0.77, "armor_penetration": 0.66 },
-      "recoil": 0.77,
+      "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.76 },
+      "recoil": 0.76,
       "dispersion": 1.2
     },
     "extend": { "effects": [ "BLACKPOWDER", "MUZZLE_SMOKE", "RECYCLED" ] },

diff --git a/Kenan-Structured-Modpack/Cataclysm-DDA-Touhou-Expansion/items/ammo/792x57.json b/Kenan-Structured-Modpack/Cataclysm-DDA-Touhou-Expansion/items/ammo/792x57.json
@@ -72,8 +72,8 @@
     "copy-from": "792x57_m75",
     "proportional": {
       "price": 0.33,
-      "damage": { "damage_type": "bullet", "amount": 0.77, "armor_penetration": 0.66 },
-      "recoil": 0.77,
+      "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.76 },
+      "recoil": 0.76,
       "dispersion": 1.2
     },
     "extend": { "effects": [ "BLACKPOWDER", "MUZZLE_SMOKE", "RECYCLED" ] },
@@ -86,8 +86,8 @@
     "copy-from": "792x57_sme",
     "proportional": {
       "price": 0.33,
-      "damage": { "damage_type": "bullet", "amount": 0.77, "armor_penetration": 0.66 },
-      "recoil": 0.77,
+      "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.76 },
+      "recoil": 0.76,
       "dispersion": 1.2
     },
     "extend": { "effects": [ "BLACKPOWDER", "MUZZLE_SMOKE", "RECYCLED" ] },

diff --git a/Kenan-Structured-Modpack/Cataclysm-DDA-Touhou-Expansion/items/ammo/9x39.json b/Kenan-Structured-Modpack/Cataclysm-DDA-Touhou-Expansion/items/ammo/9x39.json
@@ -22,8 +22,7 @@
     "critical_multiplier": 2,
     "dispersion": 30,
     "range": 64,
-    "recoil": 960,
-    "//4": "Set retroactively from dmg^2 ",
+    "recoil": 677,
     "effects": [ "COOKOFF", "NEVER_MISFIRES" ],
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ]
   },
@@ -40,7 +39,7 @@
     "//2": "9x39 SP-6 damage is too low (754 J), so I'm increasing it by 20%",
     "critical_multiplier": 2,
     "dispersion": 20,
-    "recoil": 1090,
+    "recoil": 754,
     "//3": "Set retroactively from dmg^2 "
   },
   {
@@ -78,8 +77,8 @@
     "copy-from": "9x39_sp5",
     "proportional": {
       "price": 0.33,
-      "damage": { "damage_type": "bullet", "amount": 0.77, "armor_penetration": 0.66 },
-      "recoil": 0.77,
+      "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.76 },
+      "recoil": 0.76,
       "dispersion": 1.2
     },
     "extend": { "effects": [ "BLACKPOWDER", "MUZZLE_SMOKE", "RECYCLED" ] },
@@ -92,8 +91,8 @@
     "copy-from": "9x39_sp6",
     "proportional": {
       "price": 0.33,
-      "damage": { "damage_type": "bullet", "amount": 0.77, "armor_penetration": 0.66 },
-      "recoil": 0.77,
+      "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.76 },
+      "recoil": 0.76,
       "dispersion": 1.2
     },
     "extend": { "effects": [ "BLACKPOWDER", "MUZZLE_SMOKE", "RECYCLED" ] },