DDA version Update: A Restored Ritual

Arcana/chargen/scenarios.json

@@ -175,5 +175,28 @@
       "professions": [ "arcanist_purifier", "arcanist_operator" ],
       "traits": [ "MARTIAL_ARTS_SANGUINE", "MARTIAL_ARTS_CF" ]
     }
+  },
+  {
+    "type": "scenario",
+    "id": "strong_portal_storm",
+    "copy-from": "strong_portal_storm",
+    "add_professions": true,
+    "extend": {
+      "professions": [
+        "arcanist_alchemist",
+        "arcanist_scribe",
+        "arcanist_bloodmage",
+        "arcanist_magehunter",
+        "arcanist_oathkeeper",
+        "arcanist_summoner"
+      ]
+    }
+  },
+  {
+    "type": "scenario",
+    "id": "portal_dependent",
+    "copy-from": "portal_dependent",
+    "add_professions": true,
+    "extend": { "professions": [ "arcanist_bloodmage", "arcanist_shrike", "arcanist_summoner" ] }
   }
 ]

Arcana/effects.json

@@ -4,21 +4,27 @@
     "id": "arcana_dragonblood_blood_effigy_effect",
     "max_duration": "10 s",
     "name": [ "Blood Effigy" ],
-    "desc": [ "This is just used for Arcana mutagenic effects.  If you see this, that likely means DDA has bugged out in some way again." ]
+    "desc": [
+      "This is just used for Arcana mutagenic effects.  If you see this, that likely means DDA has bugged out in some way again."
+    ]
   },
   {
     "type": "effect_type",
     "id": "arcana_dragonblood_sacramental_heart_effect",
     "max_duration": "10 s",
     "name": [ "Sacramental Heart" ],
-    "desc": [ "This is just used for Arcana mutagenic effects.  If you see this, that likely means DDA has bugged out in some way again." ]
+    "desc": [
+      "This is just used for Arcana mutagenic effects.  If you see this, that likely means DDA has bugged out in some way again."
+    ]
   },
   {
     "type": "effect_type",
     "id": "arcana_paragon_veilblade_effect",
     "max_duration": "10 s",
     "name": [ "Ritual Blade" ],
-    "desc": [ "This is just used for Arcana mutagenic effects.  If you see this, that likely means DDA has bugged out in some way again." ]
+    "desc": [
+      "This is just used for Arcana mutagenic effects.  If you see this, that likely means DDA has bugged out in some way again."
+    ]
   },
   {
     "type": "effect_type",
@@ -1117,6 +1123,14 @@
     "removes_effects": [ "winded" ],
     "base_mods": { "speed_mod": [ 25 ], "str_mod": [ 2 ], "dex_mod": [ 2 ], "per_mod": [ 1 ], "stamina_min": [ 5 ] }
   },
+  {
+    "type": "effect_type",
+    "id": "arcana_veilblade_halt_portal_storms",
+    "name": [ "Ethereal Guidance" ],
+    "desc": [
+      "Should you master the secrets of this blade, wielding it will force portal storms to burn out earlier than normal.  Only the worthy will be offered protection."
+    ]
+  },
   {
     "type": "effect_type",
     "id": "sent_to_hermit",

Arcana/furniture_and_terrain/traps.json

@@ -186,5 +186,18 @@
     "difficulty": 0,
     "drops": [ { "item": "essence_blood", "quantity": 1 } ],
     "spell_data": { "id": "arcana_trap_lichhook" }
+  },
+  {
+    "type": "trap",
+    "id": "tr_portal_crystallized",
+    "name": "crystallized portal",
+    "color": "cyan",
+    "symbol": "=",
+    "visibility": -1,
+    "avoidance": 0,
+    "difficulty": 0,
+    "action": "none",
+    "drops": [ { "item": "essence_pure", "quantity": 1 } ],
+    "benign": true
   }
 ]

Arcana/items/tools.json

@@ -2067,7 +2067,7 @@
     "type": "TOOL",
     "category": "weapons",
     "name": { "str": "restored ritual blade" },
-    "description": "A two-handed sword richly engraved with exotic runes, all in scripts not of this world.  Once corrupted and now restored, it can only serve a fragment of its original purpose.  Fueling it with crystallized essence will grant great gifts, but set you down a path you can't return from.",
+    "description": "A two-handed sword richly engraved with exotic runes, all in scripts not of this world.  Once corrupted and now restored, it can only serve a fragment of its original purpose.  Linger near a portal to collapse it into a form you can harvest crystallized essence from.  It will grant great gifts, but set you down a path you can't return from.",
     "weight": "2267 g",
     "volume": "3 L",
     "longest_side": "140 cm",
@@ -2093,7 +2093,9 @@
         {
           "has": "WIELD",
           "condition": "ALWAYS",
-          "values": [ { "value": "INTELLIGENCE", "add": 4 }, { "value": "REGEN_MANA", "multiply": 0.5 } ]
+          "values": [ { "value": "INTELLIGENCE", "add": 4 }, { "value": "REGEN_MANA", "multiply": 0.5 } ],
+          "ench_effects": [ { "effect": "arcana_veilblade_halt_portal_storms", "intensity": 1 } ],
+          "intermittent_activation": { "effects": [ { "frequency": "3 minutes", "spell_effects": [ { "id": "arcana_react_veilblade" } ] } ] }
         }
       ]
     },

Arcana/mod_tileset/mod_tileset_DP_Normal.json

@@ -467,7 +467,8 @@
               "overlay_wielded_blast_canister_arcana_air_act"
             ],
             "fg": 244
-          }
+          },
+          { "id": "tr_portal_crystallized", "fg": 245 }
         ],
         "sprite_width": 32,
         "sprite_height": 32

Arcana/mod_tileset/mod_tileset_Ultica_normal.json

@@ -16,7 +16,8 @@
           { "id": "verge_meteoric", "fg": 7 },
           { "id": "f_blade_upright", "fg": 8 },
           { "id": "ethereal_crossbow", "fg": 9 },
-          { "id": "hexenhammer", "fg": 10 }
+          { "id": "hexenhammer", "fg": 10 },
+          { "id": "tr_portal_crystallized", "fg": 11 }
         ],
         "sprite_width": 32,
         "sprite_height": 32

Arcana/monsters/monster_drops.json

@@ -1093,6 +1093,99 @@
       ]
     }
   },
+  {
+    "id": "structural_spur_drops",
+    "copy-from": "structural_spur_drops",
+    "type": "item_group",
+    "subtype": "collection",
+    "extend": {
+      "entries": [
+        { "distribution": [ { "item": "vortex_shard", "prob": 25 }, { "item": "iron_thorn", "prob": 75 } ], "prob": 50 },
+        { "item": "essence", "prob": 75, "count": [ 1, 3 ] }
+      ]
+    }
+  },
+  {
+    "id": "shrapnel_swarm_drops",
+    "copy-from": "shrapnel_swarm_drops",
+    "type": "item_group",
+    "subtype": "collection",
+    "extend": {
+      "entries": [
+        { "distribution": [ { "item": "vortex_shard", "prob": 25 }, { "item": "iron_thorn", "prob": 75 } ], "prob": 10 },
+        { "item": "essence", "prob": 25, "count": [ 1, 3 ] }
+      ]
+    }
+  },
+  {
+    "type": "item_group",
+    "id": "mon_unseen_hunter_death_drops",
+    "subtype": "collection",
+    "entries": [ { "item": "shadow_gem", "prob": 50 }, { "item": "essence", "prob": 75, "count": [ 1, 3 ] } ]
+  },
+  {
+    "type": "item_group",
+    "id": "mon_shifting_mass_death_drops",
+    "subtype": "collection",
+    "entries": [ { "item": "shadow_gem", "prob": 25 }, { "item": "essence", "prob": 50, "count": [ 1, 3 ] } ]
+  },
+  {
+    "type": "item_group",
+    "id": "mon_impossible_shape_death_drops",
+    "subtype": "collection",
+    "entries": [ { "item": "monster_tear", "prob": 25 }, { "item": "essence", "prob": 50, "count": [ 1, 3 ] } ]
+  },
+  {
+    "type": "item_group",
+    "id": "mon_absence_death_drops",
+    "subtype": "collection",
+    "entries": [ { "item": "shadow_gem", "prob": 10 }, { "item": "essence", "prob": 25, "count": [ 1, 3 ] } ]
+  },
+  {
+    "type": "item_group",
+    "id": "mon_giant_appendage_death_drops",
+    "subtype": "collection",
+    "entries": [
+      { "distribution": [ { "item": "bone_twisted", "prob": 50 }, { "item": "gracken_knuckles", "prob": 50 } ], "prob": 25 },
+      { "item": "essence", "prob": 25, "count": [ 1, 3 ] }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "mon_memory_death_drops",
+    "subtype": "collection",
+    "entries": [ { "item": "monster_tear", "prob": 5 }, { "item": "essence", "prob": 10, "count": [ 1, 3 ] } ]
+  },
+  {
+    "type": "item_group",
+    "id": "mon_swarm_structure_death_drops",
+    "subtype": "collection",
+    "entries": [
+      {
+        "distribution": [
+          { "item": "engraved_stone", "prob": 25 },
+          { "item": "iron_thorn", "prob": 25 },
+          { "item": "inflorescent_root", "prob": 10 },
+          { "item": "graboid_fang", "prob": 10 },
+          { "item": "vortex_shard", "prob": 15 },
+          { "item": "blob_gem", "prob": 5 },
+          { "item": "monster_tear", "prob": 5 },
+          { "item": "shadow_gem", "prob": 5 }
+        ],
+        "prob": 50
+      },
+      { "item": "essence", "prob": 50, "count": [ 1, 3 ] }
+    ]
+  },
+  {
+    "id": "mon_twisting_blade_death_drops",
+    "type": "item_group",
+    "subtype": "collection",
+    "entries": [
+      { "distribution": [ { "item": "engraved_stone", "prob": 50 }, { "item": "iron_thorn", "prob": 50 } ], "prob": 10 },
+      { "item": "essence", "prob": 25, "count": [ 1, 3 ] }
+    ]
+  },
   {
     "id": "mon_spirit_of_fire_death_drops",
     "type": "item_group",

Arcana/monsters/monsters.json

@@ -930,6 +930,54 @@
     "type": "MONSTER",
     "death_drops": "mon_zpider_mass_death_drops"
   },
+  {
+    "id": "mon_unseen_hunter",
+    "copy-from": "mon_unseen_hunter",
+    "type": "MONSTER",
+    "death_drops": "mon_unseen_hunter_death_drops"
+  },
+  {
+    "id": "mon_shifting_mass",
+    "copy-from": "mon_shifting_mass",
+    "type": "MONSTER",
+    "death_drops": "mon_shifting_mass_death_drops"
+  },
+  {
+    "id": "mon_impossible_shape",
+    "copy-from": "mon_impossible_shape",
+    "type": "MONSTER",
+    "death_drops": "mon_impossible_shape_death_drops"
+  },
+  {
+    "id": "mon_absence",
+    "copy-from": "mon_absence",
+    "type": "MONSTER",
+    "death_drops": "mon_absence_death_drops"
+  },
+  {
+    "id": "mon_giant_appendage",
+    "copy-from": "mon_giant_appendage",
+    "type": "MONSTER",
+    "death_drops": "mon_giant_appendage_death_drops"
+  },
+  {
+    "id": "mon_memory",
+    "copy-from": "mon_memory",
+    "type": "MONSTER",
+    "death_drops": "mon_memory_death_drops"
+  },
+  {
+    "id": "mon_swarm_structure",
+    "copy-from": "mon_swarm_structure",
+    "type": "MONSTER",
+    "death_drops": "mon_swarm_structure_death_drops"
+  },
+  {
+    "id": "mon_twisting_blade",
+    "copy-from": "mon_twisting_blade",
+    "type": "MONSTER",
+    "death_drops": "mon_twisting_blade_death_drops"
+  },
   {
     "id": "mon_spirit_of_fire",
     "type": "MONSTER",

Arcana/overmap_and_mapgen/mapgen_anomalies.json

@@ -33,7 +33,6 @@
       ],
       "palettes": [ "arcana_palette" ],
       "set": [ { "point": "trap", "id": "tr_portal", "x": [ 9, 13 ], "y": [ 9, 13 ], "repeat": 2 } ],
-      "place_loot": [ { "item": "essence_pure", "x": [ 9, 13 ], "y": [ 9, 13 ], "repeat": 2 } ],
       "place_monsters": [ { "monster": "GROUP_NETHER_PORTAL", "x": [ 3, 20 ], "y": [ 3, 20 ], "density": 0.15 } ]
     }
   },
@@ -72,7 +71,6 @@
       "palettes": [ "arcana_palette" ],
       "terrain": { "~": "t_water_sh" },
       "set": [ { "point": "trap", "id": "tr_portal", "x": [ 9, 13 ], "y": [ 9, 13 ], "repeat": 3 } ],
-      "place_loot": [ { "item": "essence_pure", "x": [ 9, 13 ], "y": [ 9, 13 ], "repeat": 3 } ],
       "place_monsters": [ { "monster": "GROUP_NETHER_PORTAL", "x": [ 3, 20 ], "y": [ 3, 20 ], "density": 0.2 } ]
     }
   },

Arcana/overmap_and_mapgen/mapgen_update.json

@@ -1,4 +1,11 @@
 [
+  {
+    "type": "ter_furn_transform",
+    "id": "arcana_veilblade",
+    "furniture": [ { "result": [ "f_null" ], "valid_furniture": [ "f_absence" ], "message": "The living emptiness wavers and crumbles." } ],
+    "field": [ { "result": [ "fd_null" ], "valid_field": [ "fd_fatigue" ], "message": "The fabric of reality around you weaves itself back together." } ],
+    "trap": [ { "result": [ "tr_portal_crystallized" ], "valid_trap": [ "tr_portal" ], "message": "The portal flickers and collapses into a floating sliver of energy!" } ]
+  },
   {
     "type": "ter_furn_transform",
     "id": "arcana_plants",

Arcana/spells/effect_on_condition.json

@@ -0,0 +1,57 @@
+[
+  {
+    "type": "effect_on_condition",
+    "id": "arcana_veilblade_halt_portal_storms",
+    "recurrence": [ "1 m", "1 m" ],
+    "condition": {
+      "and": [
+        { "or": [ { "u_has_trait": "THRESH_VEIL" }, { "u_has_trait": "PROF_CHALICE" } ] },
+        { "u_has_effect": "arcana_veilblade_halt_portal_storms" },
+        { "is_weather": "early_portal_storm" }
+      ]
+    },
+    "effect": [
+      { "arithmetic": [ { "global_val": "var", "var_name": "ps_min_length" }, "=", { "time": "2 hours" } ] },
+      { "arithmetic": [ { "global_val": "var", "var_name": "ps_max_length" }, "=", { "time": "4 hours" } ] },
+      { "arithmetic": [ { "global_val": "var", "var_name": "ps_base_str" }, "=", { "const": 1 } ] },
+      { "arithmetic": [ { "global_val": "var", "var_name": "cause_portal_storm" }, "=", { "const": 1 } ] },
+      { "arithmetic": [ { "global_val": "var", "var_name": "cause_early_portal_storm" }, "=", { "const": 0 } ] },
+      "next_weather",
+      {
+        "u_message": "Your blade resonates with the decaying fabric of reality, the air growing still.  The eye of the storm has formed around you.",
+        "type": "good"
+      },
+      { "queue_eocs": "arcana_veilblade_cancel_portal_storm", "time_in_future": [ "21 minutes", "25 minutes" ] }
+    ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "arcana_veilblade_devour_portals",
+    "effect": [
+      {
+        "u_transform_radius": 3,
+        "ter_furn_transform": "arcana_veilblade"
+      }
+    ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "arcana_veilblade_cancel_portal_storm",
+    "condition": {
+      "or": [
+        { "is_weather": "portal_storm" },
+        { "compare_int": [ { "global_val": "var", "var_name": "cause_portal_storm" }, "=", { "const": 1 } ] }
+      ]
+    },
+    "effect": [
+      { "arithmetic": [ { "global_val": "var", "var_name": "cause_portal_storm" }, "=", { "const": 0 } ] },
+      { "arithmetic": [ { "global_val": "var", "var_name": "cause_early_portal_storm" }, "=", { "const": 0 } ] },
+      "next_weather",
+      {
+        "u_message": "Reality re-asserts itself as the storm fades.  The worst has passed, as is the will of He From Beyond The Veil…",
+        "type": "good"
+      },
+      { "u_add_var": "u_witnessed_portal_storm", "type": "global", "context": "portal_storms", "value": "yes" }
+    ]
+  }
+]