From 6cc8796ca2b350bd438da79aeb74045838271767 Mon Sep 17 00:00:00 2001 From: HoraK-FDF Date: Mon, 18 Sep 2023 13:19:22 +0200 Subject: fluffy summons and weapon db --- world/map/db/item_db_weapon.txt | 2 +- world/map/npc/magic/level1-summon-maggots.txt | 8 +++++--- world/map/npc/magic/level2-summon-fluffies.txt | 5 +++-- world/map/npc/magic/level2-summon-mouboo.txt | 5 +++-- world/map/npc/magic/level2-summon-pinkie.txt | 5 +++-- world/map/npc/magic/level2-summon-snakes.txt | 5 +++-- world/map/npc/magic/level2-summon-spiky-mushroom.txt | 5 +++-- world/map/npc/magic/level2-summon-wickedmushroom.txt | 5 +++-- 8 files changed, 24 insertions(+), 16 deletions(-) diff --git a/world/map/db/item_db_weapon.txt b/world/map/db/item_db_weapon.txt index 0038252d..bc18a840 100644 --- a/world/map/db/item_db_weapon.txt +++ b/world/map/db/item_db_weapon.txt @@ -58,4 +58,4 @@ 5284, Revolver, 4, 150000, 500, 3000, 120, 0, 5, 0, 0, 2, 2, 100, 1, 11, 0, {}, {callfunc "RestrictedItem"; set @LauncherType, AMMO_SLING; callfunc "CheckLauncher";} 5289, ArmorBreaker, 10, 90, 40, 2, -120, 0, 0, 0, 0, 2, 32768, 0, 0, 0, 0, {}, {bonus bCritical, 75; set @AmmoType, AMMO_BOW; callfunc "CheckAmmo";} 5290, SilverArrow, 10, 60, 30, 1, 65, 0, 0, 0, 0, 2, 32768, 0, 0, 0, 0, {}, {bonus bCritical, 1; bonus bAtkRange, 2; set @AmmoType, AMMO_BOW; callfunc "CheckAmmo";} -5291, ThornArrow, 10, 90, 40, 1, 65, 0, 0, 0, 0, 2, 32768, 0, 0, 0, 0, {}, +5291, ThornArrow, 10, 90, 40, 1, 65, 0, 0, 0, 0, 2, 32768, 0, 0, 0, 0, {}, {bonus bCritical, 10; bonus bHit, 25; set @AmmoType, AMMO_BOW; callfunc "CheckAmmo";} diff --git a/world/map/npc/magic/level1-summon-maggots.txt b/world/map/npc/magic/level1-summon-maggots.txt index 7924608b..85d32325 100644 --- a/world/map/npc/magic/level1-summon-maggots.txt +++ b/world/map/npc/magic/level1-summon-maggots.txt @@ -16,6 +16,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 - 21; misceffect FX_MAGIC_MAGGOT_CAST, strcharinfo(0); @@ -46,15 +47,16 @@ OnDestroy: destroy; S_SummonAll: - summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, 1002, 2, .lifetime; + summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Maggot Summon", Maggot, 2, .lifetime; set .@i, .@i + 1; if (.@i < .count) goto S_SummonAll; destroy; L_SpecialRules6: if ($@KIMARR_EVENT < 1) goto L_Pay; - if ($@Fluffy_FighterID == BL_ID) goto L_Pay; - message strcharinfo(0), "You can't summon here unless hunting fluffies."; + //if ($@Fluffy_FighterID == BL_ID) goto L_Pay; + //message strcharinfo(0), "You can't summon here unless hunting fluffies."; + message strcharinfo(0), "You can't use this spell here."; end; OnInit: diff --git a/world/map/npc/magic/level2-summon-fluffies.txt b/world/map/npc/magic/level2-summon-fluffies.txt index d232b96e..1390c67c 100644 --- a/world/map/npc/magic/level2-summon-fluffies.txt +++ b/world/map/npc/magic/level2-summon-fluffies.txt @@ -55,8 +55,9 @@ S_SummonAll: L_SpecialRules6: if ($@KIMARR_EVENT < 1) goto L_Pay; - if ($@Fluffy_FighterID == BL_ID) goto L_Pay; - message strcharinfo(0), "You can't summon here unless hunting fluffies."; + //if ($@Fluffy_FighterID == BL_ID) goto L_Pay; + //message strcharinfo(0), "You can't summon here unless hunting fluffies."; + message strcharinfo(0), "You can't use this spell here."; end; OnInit: diff --git a/world/map/npc/magic/level2-summon-mouboo.txt b/world/map/npc/magic/level2-summon-mouboo.txt index 5b5887e7..ecde6758 100644 --- a/world/map/npc/magic/level2-summon-mouboo.txt +++ b/world/map/npc/magic/level2-summon-mouboo.txt @@ -55,8 +55,9 @@ S_SummonAll: L_SpecialRules6: if ($@KIMARR_EVENT < 1) goto L_Pay; - if ($@Fluffy_FighterID == BL_ID) goto L_Pay; - message strcharinfo(0), "You can't summon here unless hunting fluffies."; + //if ($@Fluffy_FighterID == BL_ID) goto L_Pay; + //message strcharinfo(0), "You can't summon here unless hunting fluffies."; + message strcharinfo(0), "You can't use this spell here."; end; OnInit: diff --git a/world/map/npc/magic/level2-summon-pinkie.txt b/world/map/npc/magic/level2-summon-pinkie.txt index e788382d..6f427fb3 100644 --- a/world/map/npc/magic/level2-summon-pinkie.txt +++ b/world/map/npc/magic/level2-summon-pinkie.txt @@ -55,8 +55,9 @@ S_SummonAll: L_SpecialRules6: if ($@KIMARR_EVENT < 1) goto L_Pay; - if ($@Fluffy_FighterID == BL_ID) goto L_Pay; - message strcharinfo(0), "You can't summon here unless hunting fluffies."; + //if ($@Fluffy_FighterID == BL_ID) goto L_Pay; + //message strcharinfo(0), "You can't summon here unless hunting fluffies."; + message strcharinfo(0), "You can't use this spell here."; end; OnInit: diff --git a/world/map/npc/magic/level2-summon-snakes.txt b/world/map/npc/magic/level2-summon-snakes.txt index db0d0b6c..64329287 100644 --- a/world/map/npc/magic/level2-summon-snakes.txt +++ b/world/map/npc/magic/level2-summon-snakes.txt @@ -61,8 +61,9 @@ S_SummonAll: L_SpecialRules6: if ($@KIMARR_EVENT < 1) goto L_Pay; - if ($@Fluffy_FighterID == BL_ID) goto L_Pay; - message strcharinfo(0), "You can't summon here unless hunting fluffies."; + //if ($@Fluffy_FighterID == BL_ID) goto L_Pay; + //message strcharinfo(0), "You can't summon here unless hunting fluffies."; + message strcharinfo(0), "You can't use this spell here."; end; OnInit: diff --git a/world/map/npc/magic/level2-summon-spiky-mushroom.txt b/world/map/npc/magic/level2-summon-spiky-mushroom.txt index 1edab6f4..f0b07bc0 100644 --- a/world/map/npc/magic/level2-summon-spiky-mushroom.txt +++ b/world/map/npc/magic/level2-summon-spiky-mushroom.txt @@ -55,8 +55,9 @@ S_SummonAll: L_SpecialRules6: if ($@KIMARR_EVENT < 1) goto L_Pay; - if ($@Fluffy_FighterID == BL_ID) goto L_Pay; - message strcharinfo(0), "You can't summon here unless hunting fluffies."; + //if ($@Fluffy_FighterID == BL_ID) goto L_Pay; + //message strcharinfo(0), "You can't summon here unless hunting fluffies."; + message strcharinfo(0), "You can't use this spell here."; end; OnInit: diff --git a/world/map/npc/magic/level2-summon-wickedmushroom.txt b/world/map/npc/magic/level2-summon-wickedmushroom.txt index eced8c3a..05454c4a 100644 --- a/world/map/npc/magic/level2-summon-wickedmushroom.txt +++ b/world/map/npc/magic/level2-summon-wickedmushroom.txt @@ -60,8 +60,9 @@ S_SummonAll: L_SpecialRules6: if ($@KIMARR_EVENT < 1) goto L_Pay; - if ($@Fluffy_FighterID == BL_ID) goto L_Pay; - message strcharinfo(0), "You can't summon here unless hunting fluffies."; + //if ($@Fluffy_FighterID == BL_ID) goto L_Pay; + //message strcharinfo(0), "You can't summon here unless hunting fluffies."; + message strcharinfo(0), "You can't use this spell here."; end; OnInit: -- cgit v1.2.3-60-g2f50