Merge pull request #1 from Wyrdean/master

CleverRaven#52464

data/mods/Magiclysm/Spells/animist.json

@@ -381,5 +381,32 @@
     "base_energy_cost": 6,
     "energy_source": "HP",
     "difficulty": 6
+  },
+  {
+    "id": "rupture",
+    "type": "SPELL",
+    "name": "Rupture",
+    "description": "You pour mana into an unwilling and unprepared vessel, causing cellular break-down, internal hemorrhaging, leylines to become muddled, and electronics to overcharge. Immensely gruesome, crude, and was once illegal world-wide, not that it matters now.",
+    "effect": "attack",
+    "shape": "blast",
+    "valid_targets": [ "hostile" ],
+    "flags": [ "SOMATIC", "NO_PROJECTILE", "LOUD" ],
+    "max_level": 30,
+    "min_range": 1,
+    "max_range": 1,
+    "min_damage": 2,
+    "max_damage": 2,
+    "base_casting_time": 50,
+    "base_energy_cost": 500,
+    "spell_class": "ANIMIST",
+    "min_duration": 100,
+    "max_duration": 500,
+    "duration_increment": 15,
+    "min_dot": 10,
+    "max_dot": 100,
+    "dot_increment": 3,
+    "energy_source": "MANA",
+    "difficulty": 1,
+    "damage_type": "pure"
   }
 ]

data/mods/Magiclysm/Spells/druid.json

@@ -443,5 +443,32 @@
     "damage_increment": 4,
     "//": "The spell can only be permanent without being at maximum level because of how items with charges work",
     "flags": [ "SOMATIC", "NO_LEGS", "PERMANENT" ]
+  },
+  {
+    "id": "cause_rot",
+    "type": "SPELL",
+    "name": "Cause Rot",
+    "description": "A spell from a darker sect of druidry, created to forcibly begin the circle of life anew. For without rot, you cannot have growth. Affects a huge area, but is indiscriminate; even rusting machines into nothing but dust, and slow both in casting and effect. Once lost entirely to the passage of time, this spell was thought to be no more than a myth, the stuff of fairy tales, albeit grim ones.",
+    "effect": "attack",
+    "shape": "blast",
+    "valid_targets": [ "hostile", "ground" ],
+    "flags": [ "SOMATIC", "NO_PROJECTILE", "CONCENTRATE", "VERBAL" ],
+    "max_level": 30,
+    "spell_class": "DRUID",
+    "energy_source": "MANA",
+    "difficulty": 8,
+    "damage_type": "pure",
+    "base_casting_time": 10000,
+    "base_energy_cost": 1000,
+    "min_aoe": 5,
+    "max_aoe": 50,
+    "aoe_increment": 1.5,
+    "min_damage": 1,
+    "max_damage": 1,
+    "min_dot": 1,
+    "max_dot": 1,
+    "min_duration": 5000,
+    "max_duration": 20000,
+    "duration_increment": 500
   }
 ]

data/mods/Magiclysm/Spells/magus.json

@@ -408,5 +408,31 @@
     "base_energy_cost": 350,
     "energy_source": "MANA",
     "difficulty": 4
+  },
+  {
+    "id": "focused_bolt",
+    "type": "SPELL",
+    "name": "Focused Bolt",
+    "description": "You focus your mana into a microscopically thin pulsed beam of pure energy, capable of extreme range and precision; as well as unparalleled penetration, provided proper skill. Once the invention of a notorious assassin, this spell has slain many a king and noble. Passed on only through direct descendants over the ages, though occasionally shared by them to others.",
+    "effect": "attack",
+    "shape": "line",
+    "valid_targets": [ "hostile", "ground" ],
+    "flags": [ "SOMATIC", "NO_LEGS", "CONCENTRATE", "SILENT", "NO_PROJECTILE" ],
+    "max_level": 30,
+    "min_damage": 4,
+    "max_damage": 124,
+    "damage_increment": 4.0,
+    "damage_type": "pure",
+    "min_range": 5,
+    "max_range": 75,
+    "range_increment": 2.5,
+    "min_aoe": 5,
+    "max_aoe": 0,
+    "aoe_increment": -0.5,
+    "spell_class": "MAGUS",
+    "base_casting_time": 500,
+    "base_energy_cost": 400,
+    "energy_source": "MANA",
+    "difficulty": 6
   }
 ]

data/mods/Magiclysm/itemgroups/spellbooks.json

@@ -139,7 +139,10 @@
       [ "bio_sneeze_beam", 50 ],
       [ "spell_scroll_banishment_lesser", 30 ],
       [ "spell_scroll_nova_flare", 25 ],
-      [ "spell_scroll_freezing_touch", 40 ]
+      [ "spell_scroll_freezing_touch", 40 ],
+      [ "spell_scroll_focused_bolt", 1 ],
+      [ "spell_scroll_rupture", 1 ],
+      [ "spell_scroll_cause_rot", 1 ]
     ]
   },
   {
@@ -173,6 +176,7 @@
     "type": "item_group",
     "items": [
       [ "animist_shadows", 5 ],
+      [ "forbidden_tome", 1 ],
       [ "magus_spellbook", 15 ],
       [ "magus_spellbook_move", 30 ],
       [ "translocate_spellbook", 20 ],

data/mods/Magiclysm/items/spell_scrolls.json

@@ -110,6 +110,15 @@
     "description": "A ghostly skeleton rises from the depths of the earth to fight for you.  You may be able to summon more with a higher level in this spell.",
     "use_action": { "type": "learn_spell", "spells": [ "summon_skeleton" ] }
   },
+  {
+    "type": "BOOK",
+    "copy-from": "spell_scroll",
+    "id": "spell_scroll_rupture",
+    "//": "Animist spell",
+    "name": { "str": "Scroll of Rupture", "str_pl": "Scrolls of Rupture" },
+    "description": "You pour mana into an unwilling and unprepared vessel, causing cellular break-down, internal hemorrhaging, leylines to become muddled, and electronics to overcharge. Immensely gruesome, crude, and was once illegal world-wide, not that it matters now.",
+    "use_action": { "type": "learn_spell", "spells": [ "rupture" ] }
+  },
   {
     "type": "BOOK",
     "copy-from": "spell_scroll",
@@ -298,6 +307,15 @@
     "description": "Call to the wild for aid from some wolves.",
     "use_action": { "type": "learn_spell", "spells": [ "summon_wolf_druid" ] }
   },
+  {
+    "type": "BOOK",
+    "copy-from": "spell_scroll",
+    "id": "spell_scroll_cause_rot",
+    "//": "Druid spell",
+    "name": { "str": "Scroll of Cause Rot", "str_pl": "Scrolls of Cause Rot" },
+    "description": "A spell from a darker sect of druidry, created to forcibly begin the circle of life anew. For without rot, you cannot have growth. Affects a huge area, but is indiscriminate and slow both in casting and effect. Once lost entirely to the passage of time, this spell was thought to be no more than a myth, the stuff of fairy tales, albeit grim ones.",
+    "use_action": { "type": "learn_spell", "spells": [ "cause_rot" ] }
+  },
   {
     "type": "BOOK",
     "copy-from": "spell_scroll",
@@ -586,6 +604,15 @@
     "description": "You become wily like a fox.",
     "use_action": { "type": "learn_spell", "spells": [ "foxs_cunning" ] }
   },
+  {
+    "type": "BOOK",
+    "copy-from": "spell_scroll",
+    "id": "spell_scroll_focused_bolt",
+    "//": "Magus spell",
+    "name": { "str": "Scroll of Focused Bolt", "str_pl": "Scrolls of Focused Bolt" },
+    "description": "You focus your mana into a microscopically thin pulsed beam of pure energy, capable of extreme range and precision; as well as unparalleled penetration, provided proper skill. Once the invention of a notorious assassin, this spell has slayed many a king and noble. Passed on only through direct decendants over the ages, though occasionally shared by them to others.",
+    "use_action": { "type": "learn_spell", "spells": [ "focused_bolt" ] }
+  },
   {
     "type": "BOOK",
     "copy-from": "spell_scroll",

data/mods/Magiclysm/items/spellbooks.json

@@ -432,6 +432,21 @@
     "color": "light_blue",
     "use_action": { "type": "learn_spell", "spells": [ "translocate_self" ] }
   },
+  {
+    "id": "forbbiden_tome",
+    "id": "forbidden_tome",
+    "type": "BOOK",
+    "name": { "str": "Forbbiden Tome", "str_pl": "Forbidden Tomes" },
+    "//": "1 Magus spell, 1 Druid spell, 1 Animist spell",
+    "description": "A very, very old and heavy tome of various spells lost to the ages, either for good reason, or simply through the passage of time. There are very few copies in existance, usually owned by those of great power, and yet all of them seem to have the last dozen pages or so torn out, in haste.",
+    "weight": "2400 g",
+    "volume": "5000 ml",
+    "price": 7500,
+    "material": [ "paper" ],
+    "symbol": "?",
+    "color": "brown",
+    "use_action": { "type": "learn_spell", "spells": [ "focused_bolt", "rupture", "cause_rot" ] }
+  },
   {
     "id": "stat_up_spellbook",
     "type": "BOOK",