Update Arcana thanks to CV's work

Author: Kenan2000

Kenan-Modpack/Arcana/furniture_and_terrain/furniture.json

@@ -41,14 +41,14 @@
     "light_emitted": 12,
     "required_str": -1,
     "flags": [ "NOITEM", "TRANSPARENT", "USABLE_FIRE" ],
-    "deployed_item": "candle",
+    "deployed_item": "candle_warding",
     "examine_action": "deployed_furniture",
     "bash": {
       "str_min": 40,
       "str_max": 210,
       "sound": "crash!",
       "sound_fail": "whump.",
-      "items": [ { "item": "candle", "count": [ 0, 1 ] } ]
+      "items": [ { "item": "candle_warding", "count": [ 0, 1 ] } ]
     }
   },
   {

Kenan-Modpack/Arcana/items/tool_armor.json

@@ -4,10 +4,10 @@
     "copy-from": "triffid_garland",
     "type": "TOOL_ARMOR",
     "name": { "str": "verdant triffid garland" },
-    "description": "A wreath of brightly-colored flowers from another world, worn around the neck.  Elemental magic has been woven into its structure, converting it into a primitive magic item.  Using it will grant a burst of renewed stamina, recovering pain and speeding up the body's natural healing.  It will take a long time to recharge after each use, and activating it also fatigues the user.  It can hold up to 6 uses.",
+    "description": "A wreath of brightly-colored flowers from another world, worn around the neck.  Elemental magic has been woven into its structure, converting it into a primitive magic item.  Using it will grant a burst of renewed stamina, recovering pain and speeding up the body's natural healing.  It will take a long time to recharge after each use, and activating it also fatigues the user.  It can hold up to 6 uses, each use takes 25 charges.",
     "price_postapoc": "12 USD",
-    "max_charges": 600,
-    "charges_per_use": 100,
+    "max_charges": 150,
+    "charges_per_use": 25,
     "ammo": "primitive_magic_item_ammo_type",
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "primitive_magic_item_ammo_type": 600 } } ],
     "flags": [ "FANCY", "NO_RELOAD", "NO_UNLOAD", "TARDIS" ],
@@ -25,10 +25,10 @@
     "copy-from": "amulet_exotic",
     "type": "TOOL_ARMOR",
     "name": { "str": "shrouded exotic amulet" },
-    "description": "A makeshift necklace with a single gem, a charm worked from some manner of unnatural material.  Elemental magic has been woven into its structure, converting it into a primitive magic item.  Using it will shroud your life force, rendering you undetectable to the undead, in exchange for making mundane wildlife more aggressive towards you.  It will take a long time to recharge after each use, and activating it also fatigues the user.  It can hold up to 6 uses.",
+    "description": "A makeshift necklace with a single gem, a charm worked from some manner of unnatural material.  Elemental magic has been woven into its structure, converting it into a primitive magic item.  Using it will shroud your life force, rendering you undetectable to the undead, in exchange for making mundane wildlife more aggressive towards you.  It will take a long time to recharge after each use, and activating it also fatigues the user.  It can hold up to 6 uses, each use takes 25 charges.",
     "price_postapoc": "15 USD",
-    "max_charges": 600,
-    "charges_per_use": 100,
+    "max_charges": 150,
+    "charges_per_use": 25,
     "ammo": "primitive_magic_item_ammo_type",
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "primitive_magic_item_ammo_type": 600 } } ],
     "flags": [ "FANCY", "NO_RELOAD", "NO_UNLOAD", "TARDIS" ],
@@ -46,10 +46,10 @@
     "copy-from": "brooch_iridescent",
     "type": "TOOL_ARMOR",
     "name": { "str": "bolstered iridescent brooch" },
-    "description": "A hand-crafted disc brooch made from a strange, unearthly material vaguely resembling mother-of-pearl  Elemental magic has been woven into its structure, converting it into a primitive magic item.  Using it will enhance your resistance to damage.  It will take a long time to recharge after each use, and activating it also fatigues the user.  It can hold up to 6 uses.",
+    "description": "A hand-crafted disc brooch made from a strange, unearthly material vaguely resembling mother-of-pearl  Elemental magic has been woven into its structure, converting it into a primitive magic item.  Using it will double any armor or damage resistance you have.  It will take a long time to recharge after each use, and activating it also fatigues the user.  It can hold up to 6 uses, each use takes 25 charges.",
     "price_postapoc": "20 USD",
-    "max_charges": 600,
-    "charges_per_use": 100,
+    "max_charges": 150,
+    "charges_per_use": 25,
     "ammo": "primitive_magic_item_ammo_type",
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "primitive_magic_item_ammo_type": 600 } } ],
     "flags": [ "FANCY", "NO_RELOAD", "NO_UNLOAD", "TARDIS" ],

Kenan-Modpack/Arcana/items/tools.json

@@ -97,10 +97,10 @@
     "copy-from": "charm_bone",
     "type": "TOOL",
     "name": { "str": "sanctified bone charm" },
-    "description": "A small talisman made out of some form of otherworldly bone or ivory, carved with equally unearthly iconography.  Elemental magic has been woven into its structure, converting it into a primitive magic item.  Using it will heavily damage and paralyze any creatures within 8 tiles, including allies if you're not careful.  It will take a long time to recharge after each use, and activating it also fatigues the user.  It can hold up to 6 uses.",
+    "description": "A small talisman made out of some form of otherworldly bone or ivory, carved with equally unearthly iconography.  Elemental magic has been woven into its structure, converting it into a primitive magic item.  Using it will heavily damage and paralyze any creatures within 8 tiles, including allies if you're not careful.  It will take a long time to recharge after each use, and activating it also fatigues the user.  It can hold up to 6 uses, each use takes 25 charges.",
     "price_postapoc": "20 USD",
-    "max_charges": 600,
-    "charges_per_use": 100,
+    "max_charges": 150,
+    "charges_per_use": 25,
     "ammo": "primitive_magic_item_ammo_type",
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "primitive_magic_item_ammo_type": 600 } } ],
     "flags": [ "MAGIC_FOCUS", "NO_RELOAD", "NO_UNLOAD", "TARDIS" ],
@@ -118,10 +118,10 @@
     "copy-from": "stinger_flute",
     "type": "TOOL",
     "name": { "str": "quickened stinger flute" },
-    "description": "A polished flute with five finger holes, carved from the stinger of some exotic monstrosity.  Elemental magic has been woven into its structure, converting it into a primitive magic item.  Using it will greatly reduce movecosts and enhance evasion.  Stamina and attack speed are unaffected, however.  It will take a long time to recharge after each use, and activating it also fatigues the user.  It can hold up to 6 uses.",
+    "description": "A polished flute with five finger holes, carved from the stinger of some exotic monstrosity.  Elemental magic has been woven into its structure, converting it into a primitive magic item.  Using it will greatly reduce movecosts and enhance evasion.  Stamina and attack speed are unaffected, however.  It will take a long time to recharge after each use, and activating it also fatigues the user.  It can hold up to 6 uses, each use takes 25 charges.",
     "price_postapoc": "25 USD",
-    "max_charges": 600,
-    "charges_per_use": 100,
+    "max_charges": 150,
+    "charges_per_use": 25,
     "ammo": "primitive_magic_item_ammo_type",
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "primitive_magic_item_ammo_type": 600 } } ],
     "flags": [ "MAGIC_FOCUS", "NO_RELOAD", "NO_UNLOAD", "TARDIS" ],

Kenan-Modpack/Arcana/martialarts.json

@@ -136,19 +136,34 @@
       {
         "id": "buff_cleansingflame_onattack",
         "name": "Righteous Momentum",
-        "description": "Your own fury hastens that of your weapon.\n+1 Accuracy, -5 move cost.\nLasts 1 turn.  Stacks 4 times.",
+        "description": "Your own fury hastens that of your weapon.\n+1 Accuracy, -5 move cost.\nLasts 2 turns.  Stacks 4 times.",
         "melee_allowed": true,
         "skill_requirements": [ { "name": "melee", "level": 3 } ],
         "buff_duration": 2,
         "max_stacks": 4,
         "flat_bonuses": [ { "stat": "hit", "scale": 1 }, { "stat": "movecost", "scale": -5.0 } ]
+      },
+      {
+        "id": "buff_cleansingflame_onattack2",
+        "name": "Battle Ward",
+        "description": "Against the inhuman, the only defense is vigilance.\n+1 heat/cold/electric armor.\nLasts 2 turns.  Stacks 3 times.",
+        "unarmed_allowed": true,
+        "melee_allowed": true,
+        "skill_requirements": [ { "name": "melee", "level": 2 }, { "name": "magic", "level": 5 } ],
+        "buff_duration": 2,
+        "max_stacks": 3,
+        "flat_bonuses": [
+          { "stat": "armor", "type": "heat", "scale": 1 },
+          { "stat": "armor", "type": "cold", "scale": 1 },
+          { "stat": "armor", "type": "electric", "scale": 1 }
+        ]
       }
     ],
     "onhit_buffs": [
       {
         "id": "buff_cleansingflame_onhit1",
         "name": "Prudence (Hammer)",
-        "description": "With cautious ferocity, no blade may mark you.\n+1 armor.\nLasts 2 turns.  Stacks 4 times.",
+        "description": "With cautious ferocity, no blade may mark you.\n+1 bash/cut/stab armor.\nLasts 2 turns.  Stacks 4 times.",
         "melee_allowed": true,
         "skill_requirements": [ { "name": "bashing", "level": 4 }, { "name": "magic", "level": 3 } ],
         "weapon_damage_requirements": [ { "type": "bash", "min": 20 } ],

Kenan-Modpack/Arcana/modinfo.json

@@ -5,7 +5,7 @@
     "name": "Arcana and Magic Items",
     "authors": [ "Chaosvolt" ],
     "description": "Adds a new skill for creating and using magical items, and alters many anomalous monsters.",
-    "version": "DDA version, update 5/17/2021",
+    "version": "DDA version, update 6/30/2021",
     "category": "content",
     "dependencies": [ "dda" ]
   }

Kenan-Modpack/Arcana/monsters/monsters.json

@@ -534,7 +534,7 @@
   {
     "id": "mon_shadow_snake",
     "copy-from": "mon_shadow_snake",
-    "melee_damage": [ { "damage_type": "cold", "amount": 2, "armor_multiplier": 0.75 } ],
+    "melee_damage": [ { "damage_type": "cold", "amount": 1, "armor_multiplier": 0.75 } ],
     "melee_cut": 2,
     "type": "MONSTER",
     "death_drops": "mon_shadow_snake_death_drops",
@@ -1493,9 +1493,8 @@
     "categories": [ "CLASSIC" ],
     "species": [ "ARCANA_SUMMONED" ],
     "speed": 80,
-    "melee_dice_sides": 1,
-    "melee_damage": [ { "damage_type": "cold", "amount": 3, "armor_multiplier": 0.1 } ],
-    "dodge": 3,
+    "melee_damage": [ { "damage_type": "cold", "amount": 2, "armor_multiplier": 0.1 } ],
+    "dodge": 2,
     "armor_cut": 3,
     "armor_stab": 8,
     "armor_bullet": 8,
@@ -1547,7 +1546,7 @@
     "death_function": [ "MELT" ],
     "melee_dice_sides": 2,
     "melee_cut": 0,
-    "melee_damage": [ { "damage_type": "cold", "amount": 6, "armor_multiplier": 0.1 } ],
+    "melee_damage": [ { "damage_type": "cold", "amount": 2, "armor_multiplier": 0.1 } ],
     "armor_stab": 8,
     "armor_bullet": 8,
     "vision_day": 2,