Skip to content

Commit d75046f

Browse files
Standing-StormStanding-Storm
authored
[Magiclysm] Rework spellcasting failure formulae (#83789)
1 parent aa349ab commit d75046f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+719
-516
lines changed

‎data/mods/Magiclysm/Spells/animist.json‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"damage_type": "light",
2424
"flags": [ "EVOCATION_SPELL", "VERBAL", "LOUD", "RANDOM_DAMAGE", "NO_HANDS", "SPLIT_DAMAGE" ],
2525
"extra_effects": [ { "id": "eoc_evocation_setup", "hit_self": true } ],
26-
"magic_type": "magiclysm_generic_magic"
26+
"magic_type": "magiclysm_evocation_magic"
2727
},
2828
{
2929
"id": "recover_mana",
@@ -38,7 +38,7 @@
3838
"effect_str": "MANA",
3939
"shape": "blast",
4040
"spell_class": "ANIMIST",
41-
"magic_type": "magiclysm_generic_magic",
41+
"magic_type": "magiclysm_restoration_magic",
4242
"components": "spell_components_rune_animist",
4343
"base_casting_time": 500,
4444
"flags": [ "RESTORATION_SPELL", "SOMATIC", "RANDOM_DAMAGE", "VERBAL", "SILENT", "NO_LEGS", "CONSUMES_RUNES" ],
@@ -55,7 +55,7 @@
5555
"max_damage": { "math": [ "(u_spell_level('recover_pain') * 2) + 10" ] },
5656
"max_level": 45,
5757
"spell_class": "ANIMIST",
58-
"magic_type": "magiclysm_generic_magic",
58+
"magic_type": "magiclysm_restoration_magic",
5959
"effect": "recover_energy",
6060
"effect_str": "PAIN",
6161
"shape": "blast",
@@ -82,7 +82,7 @@
8282
"effect_str": "EOC_SUMMON_ZOMBIE",
8383
"components": "spell_components_rune_animist",
8484
"shape": "blast",
85-
"magic_type": "magiclysm_generic_magic",
85+
"magic_type": "magiclysm_conjuration_magic",
8686
"base_energy_cost": 400,
8787
"base_casting_time": 3000,
8888
"flags": [ "CONJURATION_SPELL", "SOMATIC", "VERBAL", "CONCENTRATE", "CONSUMES_RUNES" ],
@@ -225,7 +225,7 @@
225225
"effect_str": "EOC_SUMMON_ZOMBIE_SWARM",
226226
"components": "spell_components_rune_animist_3",
227227
"shape": "blast",
228-
"magic_type": "magiclysm_generic_magic",
228+
"magic_type": "magiclysm_conjuration_magic",
229229
"base_energy_cost": 600,
230230
"base_casting_time": 3000,
231231
"flags": [ "CONJURATION_SPELL", "SOMATIC", "VERBAL", "CONCENTRATE", "CONSUMES_RUNES" ],
@@ -392,7 +392,7 @@
392392
"effect": "attack",
393393
"shape": "line",
394394
"spell_class": "ANIMIST",
395-
"magic_type": "magiclysm_generic_magic",
395+
"magic_type": "magiclysm_evocation_magic",
396396
"flags": [
397397
"EVOCATION_SPELL",
398398
"NO_LEGS",
@@ -438,7 +438,7 @@
438438
"difficulty": 0,
439439
"max_level": 0,
440440
"spell_class": "ANIMIST",
441-
"magic_type": "magiclysm_generic_magic",
441+
"magic_type": "magiclysm_channeling_magic",
442442
"energy_source": "HP",
443443
"//": "I'm not sure if this should train anything, since it's an innate ability.",
444444
"extra_effects": [ { "id": "eoc_channeling_setup", "hit_self": true } ],
@@ -476,7 +476,7 @@
476476
"final_casting_time": 30,
477477
"casting_time_increment": -14,
478478
"extra_effects": [ { "id": "eoc_enervation_setup", "hit_self": true } ],
479-
"magic_type": "magiclysm_generic_magic"
479+
"magic_type": "magiclysm_enervation_magic"
480480
},
481481
{
482482
"id": "life_detonation",
@@ -500,7 +500,7 @@
500500
"final_casting_time": 30,
501501
"casting_time_increment": -5,
502502
"base_energy_cost": 300,
503-
"magic_type": "magiclysm_generic_magic",
503+
"magic_type": "magiclysm_evocation_magic",
504504
"damage_type": "necrotic",
505505
"extra_effects": [ { "id": "life_detonation_explosion" }, { "id": "eoc_evocation_setup", "hit_self": true } ]
506506
},
@@ -548,7 +548,7 @@
548548
"base_casting_time": 30000,
549549
"final_casting_time": 1000,
550550
"casting_time_increment": -200,
551-
"magic_type": "magiclysm_generic_magic",
551+
"magic_type": "magiclysm_transformation_magic",
552552
"damage_type": "pure",
553553
"extra_effects": [ { "id": "create_rune_animist", "hit_self": true }, { "id": "eoc_transformation_setup", "hit_self": true } ]
554554
},
@@ -563,7 +563,7 @@
563563
"effect_str": "GROUP_POLYMORPH_SHADOW",
564564
"shape": "blast",
565565
"spell_class": "ANIMIST",
566-
"magic_type": "magiclysm_generic_magic",
566+
"magic_type": "magiclysm_conjuration_magic",
567567
"difficulty": 15,
568568
"min_damage": 40,
569569
"max_damage": 140,
@@ -598,7 +598,7 @@
598598
"difficulty": 3,
599599
"max_level": 20,
600600
"base_casting_time": 100,
601-
"magic_type": "magiclysm_generic_magic",
601+
"magic_type": "magiclysm_evocation_magic",
602602
"shape": "blast",
603603
"effect": "attack",
604604
"extra_effects": [ { "id": "eoc_evocation_setup", "hit_self": true } ],
@@ -619,7 +619,7 @@
619619
"effect": "summon",
620620
"effect_str": "mon_magi_shadow",
621621
"shape": "blast",
622-
"magic_type": "magiclysm_generic_magic",
622+
"magic_type": "magiclysm_conjuration_magic",
623623
"base_energy_cost": 200,
624624
"base_casting_time": 500,
625625
"min_aoe": 3,
@@ -641,7 +641,7 @@
641641
"effect": "attack",
642642
"shape": "blast",
643643
"spell_class": "ANIMIST",
644-
"magic_type": "magiclysm_generic_magic",
644+
"magic_type": "magiclysm_conveyance_magic",
645645
"difficulty": 5,
646646
"max_level": 20,
647647
"base_casting_time": 100,
@@ -675,7 +675,7 @@
675675
"max_level": 25,
676676
"base_casting_time": 100,
677677
"extra_effects": [ { "id": "eoc_conveyance_setup", "hit_self": true } ],
678-
"magic_type": "magiclysm_generic_magic"
678+
"magic_type": "magiclysm_conveyance_magic"
679679
},
680680
{
681681
"id": "summon_wisps",
@@ -687,7 +687,7 @@
687687
"effect_str": "mon_wisp",
688688
"shape": "blast",
689689
"flags": [ "CONJURATION_SPELL", "LOUD", "SOMATIC" ],
690-
"magic_type": "magiclysm_generic_magic",
690+
"magic_type": "magiclysm_conjuration_magic",
691691
"spell_class": "ANIMIST",
692692
"difficulty": 2,
693693
"base_casting_time": 250,
@@ -715,7 +715,7 @@
715715
"effect": "attack",
716716
"shape": "blast",
717717
"flags": [ "EVOCATION_SPELL", "VERBAL", "SOMATIC", "NO_LEGS", "NO_PROJECTILE", "NO_HANDS" ],
718-
"magic_type": "magiclysm_generic_magic",
718+
"magic_type": "magiclysm_evocation_magic",
719719
"spell_class": "ANIMIST",
720720
"difficulty": 2,
721721
"base_casting_time": 100,
@@ -751,7 +751,7 @@
751751
"max_duration": 360000,
752752
"duration_increment": 24000,
753753
"spell_class": "ANIMIST",
754-
"magic_type": "magiclysm_generic_magic",
754+
"magic_type": "magiclysm_conjuration_magic",
755755
"base_casting_time": 400,
756756
"base_energy_cost": 6,
757757
"energy_source": "HP",
@@ -777,7 +777,7 @@
777777
"max_duration": 2160000,
778778
"duration_increment": 72000,
779779
"spell_class": "ANIMIST",
780-
"magic_type": "magiclysm_generic_magic",
780+
"magic_type": "magiclysm_conjuration_magic",
781781
"base_casting_time": 400,
782782
"final_casting_time": 100,
783783
"casting_time_increment": -12,
@@ -813,7 +813,7 @@
813813
"duration_increment": -60,
814814
"min_dot": 5,
815815
"max_dot": 5,
816-
"magic_type": "magiclysm_generic_magic",
816+
"magic_type": "magiclysm_evocation_magic",
817817
"difficulty": 3,
818818
"extra_effects": [ { "id": "eoc_evocation_setup", "hit_self": true } ],
819819
"damage_type": "necrotic",
@@ -840,7 +840,7 @@
840840
"difficulty": 10,
841841
"max_level": 25,
842842
"base_casting_time": 100,
843-
"magic_type": "magiclysm_generic_magic",
843+
"magic_type": "magiclysm_evocation_magic",
844844
"extra_effects": [
845845
{ "id": "devour_damage" },
846846
{ "id": "devour_healing", "hit_self": true },
@@ -885,7 +885,7 @@
885885
"effect": "attack",
886886
"effect_str": "effect_sense_outsiders",
887887
"shape": "blast",
888-
"magic_type": "magiclysm_generic_magic",
888+
"magic_type": "magiclysm_enhancement_magic",
889889
"difficulty": 5,
890890
"max_level": 15,
891891
"base_energy_cost": 500,
@@ -916,7 +916,7 @@
916916
"min_duration": 24000,
917917
"max_duration": 360000,
918918
"duration_increment": 24000,
919-
"magic_type": "magiclysm_generic_magic",
919+
"magic_type": "magiclysm_conjuration_magic",
920920
"base_casting_time": 500,
921921
"base_energy_cost": 150,
922922
"extra_effects": [ { "id": "eoc_summon_setup", "hit_self": true } ]
@@ -941,7 +941,7 @@
941941
"min_aoe": 5,
942942
"max_aoe": 25,
943943
"aoe_increment": 1,
944-
"magic_type": "magiclysm_generic_magic",
944+
"magic_type": "magiclysm_enervation_magic",
945945
"base_energy_cost": 1000,
946946
"base_casting_time": 250,
947947
"ignored_monster_species": [ "ROBOT", "NETHER_EMANATION" ]
@@ -983,7 +983,7 @@
983983
"min_duration": 72000,
984984
"max_duration": 1512000,
985985
"duration_increment": 72000,
986-
"magic_type": "magiclysm_generic_magic",
986+
"magic_type": "magiclysm_conjuration_magic",
987987
"base_casting_time": 30000,
988988
"base_energy_cost": 600,
989989
"extra_effects": [ { "id": "eoc_summon_setup", "hit_self": true } ]
@@ -1005,7 +1005,7 @@
10051005
"min_duration": 3000,
10061006
"max_duration": 9000,
10071007
"duration_increment": 300,
1008-
"magic_type": "magiclysm_generic_magic",
1008+
"magic_type": "magiclysm_transformation_magic",
10091009
"base_casting_time": 300,
10101010
"base_energy_cost": 1200,
10111011
"final_energy_cost": 850,
@@ -1047,7 +1047,7 @@
10471047
"effect": "attack",
10481048
"effect_str": "effect_animist_add_evasion",
10491049
"shape": "blast",
1050-
"magic_type": "magiclysm_generic_magic",
1050+
"magic_type": "magiclysm_conjuration_magic",
10511051
"difficulty": 4,
10521052
"max_level": 15,
10531053
"base_energy_cost": 350,
@@ -1071,7 +1071,7 @@
10711071
"shape": "blast",
10721072
"difficulty": 5,
10731073
"max_level": 15,
1074-
"magic_type": "magiclysm_generic_magic",
1074+
"magic_type": "magiclysm_enhancement_magic",
10751075
"base_energy_cost": 550,
10761076
"base_casting_time": 90000,
10771077
"extra_effects": [ { "id": "eoc_enhancement_setup", "hit_self": true } ]
@@ -1111,7 +1111,7 @@
11111111
"difficulty": 1,
11121112
"max_level": 15,
11131113
"base_casting_time": 100,
1114-
"magic_type": "magiclysm_generic_magic",
1114+
"magic_type": "magiclysm_evocation_magic",
11151115
"shape": "blast",
11161116
"effect": "attack"
11171117
},
@@ -1143,7 +1143,7 @@
11431143
"min_duration": 30000,
11441144
"max_duration": 300000,
11451145
"duration_increment": 30000,
1146-
"magic_type": "magiclysm_generic_magic",
1146+
"magic_type": "magiclysm_enhancement_magic",
11471147
"base_casting_time": 250,
11481148
"base_energy_cost": 250
11491149
},
@@ -1170,7 +1170,7 @@
11701170
"min_range": 3,
11711171
"max_range": 15,
11721172
"range_increment": 0.9,
1173-
"magic_type": "magiclysm_generic_magic",
1173+
"magic_type": "magiclysm_evocation_magic",
11741174
"base_casting_time": 75,
11751175
"base_energy_cost": 350
11761176
},
@@ -1191,7 +1191,7 @@
11911191
"min_duration": 90000,
11921192
"max_duration": 690000,
11931193
"duration_increment": 30000,
1194-
"magic_type": "magiclysm_generic_magic",
1194+
"magic_type": "magiclysm_enhancement_magic",
11951195
"base_casting_time": 150,
11961196
"base_energy_cost": 275
11971197
},
@@ -1206,7 +1206,7 @@
12061206
"effect": "attack",
12071207
"effect_str": "effect_animist_see_invisibility",
12081208
"shape": "blast",
1209-
"magic_type": "magiclysm_generic_magic",
1209+
"magic_type": "magiclysm_enhancement_magic",
12101210
"components": "spell_components_animist_see_invisibility",
12111211
"difficulty": 6,
12121212
"max_level": 15,

‎data/mods/Magiclysm/Spells/attunements/Alchemist.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"base_energy_cost": 300,
2323
"final_energy_cost": 100,
2424
"energy_increment": -6,
25-
"magic_type": "magiclysm_generic_magic",
25+
"magic_type": "magiclysm_conjuration_magic",
2626
"difficulty": 5
2727
},
2828
{
@@ -42,7 +42,7 @@
4242
"damage_increment": 0.07,
4343
"max_level": 35,
4444
"spell_class": "ALCHEMIST",
45-
"magic_type": "magiclysm_generic_magic",
45+
"magic_type": "magiclysm_conjuration_magic",
4646
"base_casting_time": 180000,
4747
"final_casting_time": 12000,
4848
"casting_time_increment": -5000,
@@ -69,7 +69,7 @@
6969
"damage_increment": 0.07,
7070
"max_level": 35,
7171
"spell_class": "ALCHEMIST",
72-
"magic_type": "magiclysm_generic_magic",
72+
"magic_type": "magiclysm_conjuration_magic",
7373
"base_casting_time": 18000,
7474
"final_casting_time": 1200,
7575
"casting_time_increment": -500,

‎data/mods/Magiclysm/Spells/attunements/Artificer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"difficulty": 3,
3131
"max_level": 35,
3232
"base_casting_time": 700,
33-
"magic_type": "magiclysm_generic_magic"
33+
"magic_type": "magiclysm_channeling_magic"
3434
},
3535
{
3636
"id": "artificer_toolkit",
@@ -107,6 +107,6 @@
107107
"final_casting_time": 500,
108108
"casting_time_increment": -30,
109109
"base_energy_cost": 100,
110-
"magic_type": "magiclysm_generic_magic"
110+
"magic_type": "magiclysm_conjuration_magic"
111111
}
112112
]

‎data/mods/Magiclysm/Spells/attunements/Biotek.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"min_field_intensity": 2,
2020
"max_field_intensity": 2,
2121
"spell_class": "BIOTEK",
22-
"magic_type": "magiclysm_generic_magic",
22+
"magic_type": "magiclysm_evocation_magic",
2323
"base_casting_time": 300,
2424
"base_energy_cost": 350,
2525
"max_level": 35,
@@ -49,7 +49,7 @@
4949
"components": "jury_rig",
5050
"flags": [ "RESTORATION_SPELL", "RANDOM_DAMAGE", "SOMATIC", "VERBAL", "NO_LEGS", "CONCENTRATE", "MUST_HAVE_CLASS_TO_LEARN" ],
5151
"spell_class": "BIOTEK",
52-
"magic_type": "magiclysm_generic_magic",
52+
"magic_type": "magiclysm_restoration_magic",
5353
"difficulty": 2,
5454
"energy_source": "BIONIC"
5555
}

‎data/mods/Magiclysm/Spells/attunements/Blood_Mage.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"difficulty": 6,
2323
"max_level": 35,
2424
"base_casting_time": 100,
25-
"magic_type": "magiclysm_generic_magic"
25+
"magic_type": "magiclysm_conveyance_magic"
2626
},
2727
{
2828
"id": "demon_possession_aura",
@@ -75,7 +75,7 @@
7575
"max_level": 35,
7676
"base_casting_time": 800,
7777
"base_energy_cost": 5,
78-
"magic_type": "magiclysm_generic_magic",
78+
"magic_type": "magiclysm_conjuration_magic",
7979
"energy_source": "HP"
8080
},
8181
{

0 commit comments

Comments
 (0)