From 2d27628ff4ca4f553fc287f71b50470334129595 Mon Sep 17 00:00:00 2001 From: HoraK-FDF Date: Sun, 17 Sep 2023 10:34:15 +0200 Subject: fluffy magic summon names --- world/map/npc/magic/event-summon-managuardian.txt | 2 +- world/map/npc/magic/event-summon-manatyrant.txt | 2 +- world/map/npc/magic/level1-grow-alizarin.txt | 3 ++- world/map/npc/magic/level1-grow-cobalt.txt | 3 ++- world/map/npc/magic/level1-grow-gamboge.txt | 3 ++- world/map/npc/magic/level1-grow-mauve.txt | 3 ++- world/map/npc/magic/level2-summon-fluffies.txt | 3 ++- world/map/npc/magic/level2-summon-mouboo.txt | 3 ++- world/map/npc/magic/level2-summon-pinkie.txt | 3 ++- world/map/npc/magic/level2-summon-snakes.txt | 9 +++++---- world/map/npc/magic/level2-summon-spiky-mushroom.txt | 3 ++- world/map/npc/magic/level2-summon-wickedmushroom.txt | 7 ++++--- 12 files changed, 27 insertions(+), 17 deletions(-) diff --git a/world/map/npc/magic/event-summon-managuardian.txt b/world/map/npc/magic/event-summon-managuardian.txt index cf47b22e..79907d90 100644 --- a/world/map/npc/magic/event-summon-managuardian.txt +++ b/world/map/npc/magic/event-summon-managuardian.txt @@ -50,7 +50,7 @@ OnDestroy: destroy; S_SummonAll: - summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Mana Guardian Summon", 1138, 2, .lifetime; + summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Mana Guardian Summon", ManaGuard, 2, .lifetime; destroy; L_Cooldown: diff --git a/world/map/npc/magic/event-summon-manatyrant.txt b/world/map/npc/magic/event-summon-manatyrant.txt index 4ac0773c..e0fa652a 100644 --- a/world/map/npc/magic/event-summon-manatyrant.txt +++ b/world/map/npc/magic/event-summon-manatyrant.txt @@ -51,7 +51,7 @@ OnDestroy: destroy; S_SummonAll: - summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Mana Tyrant Summon", 1150, 2, .lifetime; + summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Mana Tyrant Summon", ManaTyrant, 2, .lifetime; destroy; L_Cooldown: diff --git a/world/map/npc/magic/level1-grow-alizarin.txt b/world/map/npc/magic/level1-grow-alizarin.txt index 1d7bc696..4169c729 100644 --- a/world/map/npc/magic/level1-grow-alizarin.txt +++ b/world/map/npc/magic/level1-grow-alizarin.txt @@ -8,6 +8,7 @@ delitem "Root", 1; set @_M_BLOCK, 1; // block casting, until the timer clears it addtimer 2000, "Magic Timer::OnClear"; // set the new debuff + sc_start SC_COOLDOWN, 2000, 0, BL_ID; callfunc "adjust_spellpower"; set Sp, Sp - 4; misceffect FX_MAGIC_GROW_CAST, strcharinfo(0); @@ -22,7 +23,7 @@ OnSummon: end; S_SummonAll: - summon getmap(), rand(POS_X-2,POS_X+2), rand(POS_Y-2,POS_Y+2), BL_ID, 1032, 1, (@spellpower*50)+10000; + summon getmap(), rand(POS_X-2,POS_X+2), rand(POS_Y-2,POS_Y+2), BL_ID, "Alizarin Plant Summon", AlizarinPlant, 1, (@spellpower*50)+10000; set @summon[0], @summon[0] + 1; if (@summon[0] < @summon[1]) goto S_SummonAll; return; diff --git a/world/map/npc/magic/level1-grow-cobalt.txt b/world/map/npc/magic/level1-grow-cobalt.txt index dc84318d..e50cfb39 100644 --- a/world/map/npc/magic/level1-grow-cobalt.txt +++ b/world/map/npc/magic/level1-grow-cobalt.txt @@ -8,6 +8,7 @@ delitem "Root", 1; set @_M_BLOCK, 1; // block casting, until the timer clears it addtimer 2000, "Magic Timer::OnClear"; // set the new debuff + sc_start SC_COOLDOWN, 2000, 0, BL_ID; callfunc "adjust_spellpower"; set Sp, Sp - 4; misceffect FX_MAGIC_GROW_CAST, strcharinfo(0); @@ -22,7 +23,7 @@ OnSummon: end; S_SummonAll: - summon getmap(), rand(POS_X-2,POS_X+2), rand(POS_Y-2,POS_Y+2), BL_ID, 1030, 1, (@spellpower*50)+10000; + summon getmap(), rand(POS_X-2,POS_X+2), rand(POS_Y-2,POS_Y+2), BL_ID, "Cobalt Plant Summon", CobaltPlant, 1, (@spellpower*50)+10000; set @summon[0], @summon[0] + 1; if (@summon[0] < @summon[1]) goto S_SummonAll; return; diff --git a/world/map/npc/magic/level1-grow-gamboge.txt b/world/map/npc/magic/level1-grow-gamboge.txt index 25df5b03..cb7f6221 100644 --- a/world/map/npc/magic/level1-grow-gamboge.txt +++ b/world/map/npc/magic/level1-grow-gamboge.txt @@ -8,6 +8,7 @@ delitem "Root", 1; set @_M_BLOCK, 1; // block casting, until the timer clears it addtimer 2000, "Magic Timer::OnClear"; // set the new debuff + sc_start SC_COOLDOWN, 2000, 0, BL_ID; callfunc "adjust_spellpower"; set Sp, Sp - 4; misceffect FX_MAGIC_GROW_CAST, strcharinfo(0); @@ -22,7 +23,7 @@ OnSummon: end; S_SummonAll: - summon getmap(), rand(POS_X-2,POS_X+2), rand(POS_Y-2,POS_Y+2), BL_ID, 1031, 1, (@spellpower*50)+10000; + summon getmap(), rand(POS_X-2,POS_X+2), rand(POS_Y-2,POS_Y+2), BL_ID, "Gamboge Plant Summon", GambogePlant, 1, (@spellpower*50)+10000; set @summon[0], @summon[0] + 1; if (@summon[0] < @summon[1]) goto S_SummonAll; return; diff --git a/world/map/npc/magic/level1-grow-mauve.txt b/world/map/npc/magic/level1-grow-mauve.txt index 8c0d32ff..f90b3b89 100644 --- a/world/map/npc/magic/level1-grow-mauve.txt +++ b/world/map/npc/magic/level1-grow-mauve.txt @@ -8,6 +8,7 @@ delitem "Root", 1; set @_M_BLOCK, 1; // block casting, until the timer clears it addtimer 2000, "Magic Timer::OnClear"; // set the new debuff + sc_start SC_COOLDOWN, 2000, 0, BL_ID; callfunc "adjust_spellpower"; set Sp, Sp - 4; misceffect FX_MAGIC_GROW_CAST, strcharinfo(0); @@ -22,7 +23,7 @@ OnSummon: end; S_SummonAll: - summon getmap(), rand(POS_X-2,POS_X+2), rand(POS_Y-2,POS_Y+2), BL_ID, 1029, 1, (@spellpower*50)+10000; + summon getmap(), rand(POS_X-2,POS_X+2), rand(POS_Y-2,POS_Y+2), BL_ID, "Mauve Plant Summon", MauvePlant, 1, (@spellpower*50)+10000; set @summon[0], @summon[0] + 1; if (@summon[0] < @summon[1]) goto S_SummonAll; return; diff --git a/world/map/npc/magic/level2-summon-fluffies.txt b/world/map/npc/magic/level2-summon-fluffies.txt index bae7728c..d232b96e 100644 --- a/world/map/npc/magic/level2-summon-fluffies.txt +++ b/world/map/npc/magic/level2-summon-fluffies.txt @@ -17,6 +17,7 @@ L_Pay: delitem "Root", 1; set @_M_BLOCK, 1; // block casting, until the timer clears it addtimer 20000, "Magic Timer::OnClear"; // set the new debuff + sc_start SC_COOLDOWN, 20000, 0, BL_ID; callfunc "adjust_spellpower"; set Sp, Sp - 39; misceffect FX_MAGIC_FLUFFY_CAST, strcharinfo(0); @@ -47,7 +48,7 @@ OnDestroy: destroy; S_SummonAll: - summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, 1020, 2, .lifetime; + summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Fluffy Summon", Fluffy, 2, .lifetime; set .@i, .@i + 1; if (.@i < .count) goto S_SummonAll; destroy; diff --git a/world/map/npc/magic/level2-summon-mouboo.txt b/world/map/npc/magic/level2-summon-mouboo.txt index 13d9cfb0..5b5887e7 100644 --- a/world/map/npc/magic/level2-summon-mouboo.txt +++ b/world/map/npc/magic/level2-summon-mouboo.txt @@ -17,6 +17,7 @@ L_Pay: delitem "Root", 1; set @_M_BLOCK, 1; // block casting, until the timer clears it addtimer 20000, "Magic Timer::OnClear"; // set the new debuff + sc_start SC_COOLDOWN, 20000, 0, BL_ID; callfunc "adjust_spellpower"; set Sp, Sp - 35; misceffect FX_MAGIC_MOUBOO_CAST, strcharinfo(0); @@ -47,7 +48,7 @@ OnDestroy: destroy; S_SummonAll: - summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, 1028, 2, .lifetime; + summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Mouboo Summon", Mouboo, 2, .lifetime; set .@i, .@i + 1; if (.@i < .count) goto S_SummonAll; destroy; diff --git a/world/map/npc/magic/level2-summon-pinkie.txt b/world/map/npc/magic/level2-summon-pinkie.txt index e8f46aae..e788382d 100644 --- a/world/map/npc/magic/level2-summon-pinkie.txt +++ b/world/map/npc/magic/level2-summon-pinkie.txt @@ -17,6 +17,7 @@ L_Pay: delitem "Root", 1; set @_M_BLOCK, 1; // block casting, until the timer clears it addtimer 20000, "Magic Timer::OnClear"; // set the new debuff + sc_start SC_COOLDOWN, 20000, 0, BL_ID; callfunc "adjust_spellpower"; set Sp, Sp - 35; misceffect FX_MAGIC_PINKY_CAST, strcharinfo(0); @@ -47,7 +48,7 @@ OnDestroy: destroy; S_SummonAll: - summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, 1018, 2, .lifetime; + summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Pinkie Summon", Pinkie, 2, .lifetime; set .@i, .@i + 1; if (.@i < .count) goto S_SummonAll; destroy; diff --git a/world/map/npc/magic/level2-summon-snakes.txt b/world/map/npc/magic/level2-summon-snakes.txt index f412cd22..db0d0b6c 100644 --- a/world/map/npc/magic/level2-summon-snakes.txt +++ b/world/map/npc/magic/level2-summon-snakes.txt @@ -18,6 +18,7 @@ L_Pay: delitem "SnakeEgg", 1; set @_M_BLOCK, 1; // block casting, until the timer clears it addtimer 15000, "Magic Timer::OnClear"; // set the new debuff + sc_start SC_COOLDOWN, 15000, 0, BL_ID; callfunc "adjust_spellpower"; set Sp, Sp - 40; misceffect FX_MAGIC_SNAKE_CAST, strcharinfo(0); @@ -50,10 +51,10 @@ OnDestroy: S_SummonAll: set .@sn, rand(0, 3); - if (.@sn == 0) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, 1021, 2, .lifetime; - elif (.@sn == 1) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, 1010, 2, .lifetime; - elif (.@sn == 2) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, 1026, 2, .lifetime; - elif (.@sn == 3) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, 1034, 2, .lifetime; + if (.@sn == 0) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Cave Snake Summon", CaveSnake, 2, .lifetime; + elif (.@sn == 1) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Snake Summon", Snake, 2, .lifetime; + elif (.@sn == 2) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Mountain Snake Summon", MountainSnake, 2, .lifetime; + elif (.@sn == 3) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Grass Snake Summon", GrassSnake, 2, .lifetime; set .@i, .@i + 1; if (.@i < .count) goto S_SummonAll; destroy; diff --git a/world/map/npc/magic/level2-summon-spiky-mushroom.txt b/world/map/npc/magic/level2-summon-spiky-mushroom.txt index c4158c93..1edab6f4 100644 --- a/world/map/npc/magic/level2-summon-spiky-mushroom.txt +++ b/world/map/npc/magic/level2-summon-spiky-mushroom.txt @@ -17,6 +17,7 @@ L_Pay: delitem "Root", 1; set @_M_BLOCK, 1; // block casting, until the timer clears it addtimer 20000, "Magic Timer::OnClear"; // set the new debuff + sc_start SC_COOLDOWN, 20000, 0, BL_ID; callfunc "adjust_spellpower"; set Sp, Sp - 33; misceffect FX_MAGIC_SPIKY_CAST, strcharinfo(0); @@ -47,7 +48,7 @@ OnDestroy: destroy; S_SummonAll: - summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, 1019, 2, .lifetime; + summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Spiky Mushroom Summon", SpikyMushroom, 2, .lifetime; set .@i, .@i + 1; if (.@i < .count) goto S_SummonAll; destroy; diff --git a/world/map/npc/magic/level2-summon-wickedmushroom.txt b/world/map/npc/magic/level2-summon-wickedmushroom.txt index 3b817f8d..eced8c3a 100644 --- a/world/map/npc/magic/level2-summon-wickedmushroom.txt +++ b/world/map/npc/magic/level2-summon-wickedmushroom.txt @@ -18,6 +18,7 @@ L_Pay: delitem "SmallMushroom", 1; set @_M_BLOCK, 1; // block casting, until the timer clears it addtimer 15000, "Magic Timer::OnClear"; // set the new debuff + sc_start SC_COOLDOWN, 15000, 0, BL_ID; callfunc "adjust_spellpower"; set Sp, Sp - 35; misceffect FX_MAGIC_WICKED_CAST, strcharinfo(0); @@ -50,9 +51,9 @@ OnDestroy: S_SummonAll: set .@rnd, rand(0, 9); - if (.@rnd < 6) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, 1106, 2, .lifetime; - elif (.@rnd < 9) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, 1130, 2, .lifetime; - elif (.@rnd == 9) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, 1013, 2, .lifetime; + if (.@rnd < 6) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Wicked Mushroom Summon", WickedMushroom, 2, .lifetime; + elif (.@rnd < 9) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Moonshroom Summon", Moonshroom, 2, .lifetime; + elif (.@rnd == 9) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Evil Mushroom Summon", EvilMushroom, 2, .lifetime; set .@i, .@i + 1; if (.@i < .count) goto S_SummonAll; destroy; -- cgit v1.2.3-60-g2f50