From 4efe164b8c025258a198b2abe024deb999d2bc32 Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Thu, 27 Apr 2023 02:14:38 -0500 Subject: [PATCH] Lil more stuff * Spaced out effects of side effects of Chaotic Mending so pain has time to ramp up if you're a fungus. * Updated Cata++ patchmod, since lasers have weapon categories in BN version, and arcana weapons can now be injected into Post-Human Combatives via categories. --- Arcana/effects.json | 13 +++++++------ Arcana/modinfo.json | 2 +- Arcana/spells/spells_item.json | 4 ++-- Arcana_BN/effects.json | 13 +++++++------ Arcana_BN/modinfo.json | 2 +- Arcana_BN/spells/spells_item.json | 4 ++-- Patchmods/BN_Arcana_Cata++_Patch/martialarts.json | 7 ------- Patchmods/BN_Arcana_Cata++_Patch/melee.json | 1 + Patchmods/BN_Arcana_Cata++_Patch/modinfo.json | 2 +- Patchmods/BN_Arcana_Cata++_Patch/ranged.json | 2 ++ 10 files changed, 24 insertions(+), 26 deletions(-) diff --git a/Arcana/effects.json b/Arcana/effects.json index 3412446f..9c6a1d82 100644 --- a/Arcana/effects.json +++ b/Arcana/effects.json @@ -1069,13 +1069,14 @@ "hypovolemia" ], "rating": "good", + "max_duration": "5 s", "base_mods": { - "rad_min": [ -25, 25 ], - "fatigue_min": [ 0, 50 ], - "health_min": [ 0, -10 ], - "h_mod_min": [ 0, -10 ], - "pain_min": [ 0, 10 ], - "hunger_min": [ 0, 25 ] + "rad_min": [ -5, 5 ], + "fatigue_min": [ 0, 10 ], + "health_min": [ 0, -2 ], + "h_mod_min": [ 0, -2 ], + "pain_min": [ 0, 2 ], + "hunger_min": [ 0, 5 ] } }, { diff --git a/Arcana/modinfo.json b/Arcana/modinfo.json index 7d4228f1..a0e3bd2d 100644 --- a/Arcana/modinfo.json +++ b/Arcana/modinfo.json @@ -5,7 +5,7 @@ "name": "Arcana and Magic Items", "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 4/25/2023", + "version": "DDA version, update 4/27/2023", "category": "content", "dependencies": [ "dda" ] } diff --git a/Arcana/spells/spells_item.json b/Arcana/spells/spells_item.json index 8ffded5a..6d09f700 100644 --- a/Arcana/spells/spells_item.json +++ b/Arcana/spells/spells_item.json @@ -1757,8 +1757,8 @@ "max_damage": -50, "effect": "attack", "shape": "blast", - "min_duration": 100, - "max_duration": 100 + "min_duration": 500, + "max_duration": 500 }, { "id": "arcana_item_scroll_nature_regrowth", diff --git a/Arcana_BN/effects.json b/Arcana_BN/effects.json index 7904526e..fed6cf96 100644 --- a/Arcana_BN/effects.json +++ b/Arcana_BN/effects.json @@ -986,13 +986,14 @@ "resist_traits": [ "THRESH_MARLOSS", "THRESH_MYCUS" ], "removes_effects": [ "blind", "deaf", "infected", "bite", "bleed", "poison", "badpoison", "spores", "fungus" ], "rating": "good", + "max_duration": "5 s", "base_mods": { - "rad_min": [ -25, 25 ], - "fatigue_min": [ 0, 50 ], - "health_min": [ 0, -10 ], - "h_mod_min": [ 0, -10 ], - "pain_min": [ 0, 10 ], - "hunger_min": [ 0, 25 ] + "rad_min": [ -5, 5 ], + "fatigue_min": [ 0, 10 ], + "health_min": [ 0, -2 ], + "h_mod_min": [ 0, -2 ], + "pain_min": [ 0, 2 ], + "hunger_min": [ 0, 5 ] } }, { diff --git a/Arcana_BN/modinfo.json b/Arcana_BN/modinfo.json index 3b212459..6e7caa01 100644 --- a/Arcana_BN/modinfo.json +++ b/Arcana_BN/modinfo.json @@ -5,7 +5,7 @@ "name": "Arcana and Magic Items", "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": "BN version, update 4/26/2023", + "version": "BN version, update 4/27/2023", "category": "content", "dependencies": [ "bn" ] } diff --git a/Arcana_BN/spells/spells_item.json b/Arcana_BN/spells/spells_item.json index 5f32a23d..c8a710bf 100644 --- a/Arcana_BN/spells/spells_item.json +++ b/Arcana_BN/spells/spells_item.json @@ -1667,8 +1667,8 @@ "min_damage": -25, "max_damage": -50, "effect": "target_attack", - "min_duration": 100, - "max_duration": 100 + "min_duration": 500, + "max_duration": 500 }, { "id": "arcana_item_scroll_nature_regrowth", diff --git a/Patchmods/BN_Arcana_Cata++_Patch/martialarts.json b/Patchmods/BN_Arcana_Cata++_Patch/martialarts.json index ee7e9548..4618f086 100644 --- a/Patchmods/BN_Arcana_Cata++_Patch/martialarts.json +++ b/Patchmods/BN_Arcana_Cata++_Patch/martialarts.json @@ -13,13 +13,6 @@ "name": { "str": "Shrike's Talons" }, "extend": { "weapons": [ "unbio_claws_weapon", "flesh_knife", "flesh_blade", "c_mi_go_claw_salvaged" ] } }, - { - "id": "style_mut_com", - "copy-from": "style_mut_com", - "type": "martial_art", - "name": { "str": "Post-Human Combatives" }, - "extend": { "weapons": [ "lucern_hexenhammer", "veilblade", "stormbringer", "stormbringer_on" ] } - }, { "id": "style_veil_chosen", "copy-from": "style_veil_chosen", diff --git a/Patchmods/BN_Arcana_Cata++_Patch/melee.json b/Patchmods/BN_Arcana_Cata++_Patch/melee.json index 24477fc1..01ae79a9 100644 --- a/Patchmods/BN_Arcana_Cata++_Patch/melee.json +++ b/Patchmods/BN_Arcana_Cata++_Patch/melee.json @@ -2,6 +2,7 @@ { "type": "GENERIC", "category": "weapons", + "weapon_category": [ "FIST_WEAPONS" ], "id": "unbio_kinetic_amplifier_weapon", "name": { "str_sp": "salvaged kinetic amplifier" }, "description": "A band of steel worn over the knuckles, etched with strange markings. Salvaged from a CBM. When used as an unarmed weapon, it can give your strikes the ability to send victims flying, with amplified damage and armor penetration. Its impacts have a chance of letting loose a blinding flashbang effect, making this weapon a double-edged sword without protection.", diff --git a/Patchmods/BN_Arcana_Cata++_Patch/modinfo.json b/Patchmods/BN_Arcana_Cata++_Patch/modinfo.json index 2265397c..7456d5f7 100644 --- a/Patchmods/BN_Arcana_Cata++_Patch/modinfo.json +++ b/Patchmods/BN_Arcana_Cata++_Patch/modinfo.json @@ -5,7 +5,7 @@ "name": "Arcana/Cata++ Patchmod", "authors": [ "Chaosvolt", "Noctifer" ], "description": "Optional patch mod that allows content in Arcana and Cataclysm++ to interact with each other.", - "version": "BN version, update 4/9/2023", + "version": "BN version, update 4/26/2023", "category": "misc_additions", "dependencies": [ "bn", "Arcana", "Cata++" ] } diff --git a/Patchmods/BN_Arcana_Cata++_Patch/ranged.json b/Patchmods/BN_Arcana_Cata++_Patch/ranged.json index d149e22f..5e9a7caa 100644 --- a/Patchmods/BN_Arcana_Cata++_Patch/ranged.json +++ b/Patchmods/BN_Arcana_Cata++_Patch/ranged.json @@ -5,6 +5,7 @@ "symbol": "(", "looks_like": "v29", "color": "magenta", + "weapon_category": [ "PISTOLS", "ENERGY_WEAPONS" ], "name": { "str": "salvaged electrothermal arc pistol" }, "description": "An exotic bionic ranged weapon converted to use as a pistol, powered by UPS. Fires bolts of exotic energy that bounces between targets, electrocuting with explosive bursts of lightning and immolating anything it hits.", "price": "8500 USD", @@ -29,6 +30,7 @@ "symbol": "(", "looks_like": "v29", "color": "magenta", + "weapon_category": [ "PISTOLS", "ENERGY_WEAPONS" ], "name": { "str": "salvaged rift focus pistol" }, "description": "An exotic bionic ranged weapon converted to use as a pistol, powered by UPS. Capable of creating small holes in reality, focusing them into beams of supernatural energy. Reasonably potent with good range, but utterly useless against robotic targets, and some otherworldly monsters are also immune to it.", "price": "9400 USD",