From 8d9de1d4d43b4548aa544a995d402173e7e56af8 Mon Sep 17 00:00:00 2001 From: mekolat Date: Tue, 15 Mar 2016 12:58:11 -0400 Subject: fix spell names for puppets --- world/map/npc/001-2/pauline.txt | 2 +- world/map/npc/013-1/sagatha.txt | 6 +++--- world/map/npc/017-4/waric.txt | 2 +- world/map/npc/magic/_procedures.txt | 2 +- world/map/npc/magic/level1-experience.txt | 1 + world/map/npc/magic/level2-barrier.txt | 4 ++-- world/map/npc/magic/level2-summon-fluffies.txt | 2 +- world/map/npc/magic/level2-summon-mouboo.txt | 2 +- world/map/npc/magic/level2-summon-pinkie.txt | 2 +- world/map/npc/magic/level2-summon-spiky-mushroom.txt | 2 +- world/map/npc/magic/level2-summon-wickedmushroom.txt | 2 +- 11 files changed, 14 insertions(+), 13 deletions(-) diff --git a/world/map/npc/001-2/pauline.txt b/world/map/npc/001-2/pauline.txt index e69f8206..6925d554 100644 --- a/world/map/npc/001-2/pauline.txt +++ b/world/map/npc/001-2/pauline.txt @@ -92,7 +92,7 @@ L_Spells: L_Next1: mes "[Pauline]"; mes "\"Well I could only read the invocations. So I don't exactly know what kind of ingredients you are going to need.\""; - mes "\"The first one for the mouboo was " + get(.invocation$, "summon-mouboo") + " and the one for the pinkie was " + get(.invocation$, "summon-pinkie") +".\""; + mes "\"The first one for the mouboo was " + get(.invocation$, "smmouboo") + " and the one for the pinkie was " + get(.invocation$, "smpinkie") +".\""; next; mes "\"For the pinkie spell my suggestion is to try similar ingredients to the other Astral spells. Try a root and some item typical for pinkies.\""; mes "\"The mouboo spell might be more complicated. From what I could translate, one of the spell components is crafted by magic.\""; diff --git a/world/map/npc/013-1/sagatha.txt b/world/map/npc/013-1/sagatha.txt index fe7503a6..e113d35a 100644 --- a/world/map/npc/013-1/sagatha.txt +++ b/world/map/npc/013-1/sagatha.txt @@ -290,14 +290,14 @@ L_teach_A10: mes "\"To protect against others' magic, take a small mushroom from a shady place. Mushrooms draw things out of the earth. Rub your mushroom into pieces between your hands.\""; next; mes "[Sagatha the Witch]"; - mes "\"Then say '" + get(.invocation$, "barrier") + "' and let the mushroom's power take over.\""; + mes "\"Then say '" + get(.invocation$, "magic barrier") + "' and let the mushroom's power take over.\""; goto L_practice; L_teach_A11: if (@mexp < 200) goto L_teach_noexp; mes "[Sagatha the Witch]"; - mes "\"If you must fight, call allies. You can call spiky mushrooms out of the ground with a mushroom spike and a root. Hold up the spike and call out to them: '" + get(.invocation$, "summon-spiky-mushrooms") + "'. Then press the root to the ground.\""; + mes "\"If you must fight, call allies. You can call spiky mushrooms out of the ground with a mushroom spike and a root. Hold up the spike and call out to them: '" + get(.invocation$, "smsmushrooms") + "'. Then press the root to the ground.\""; next; mes "[Sagatha the Witch]"; mes "\"Spiky mushrooms often grow too many spikes, so you can shear the spikes off of some.\""; @@ -308,7 +308,7 @@ L_teach_A12: if (@mexp < 220) goto L_teach_noexp; mes "[Sagatha the Witch]"; - mes "\"You can call fluffies, too. But for them you must call out '" + get(.invocation$, "summon-fluffies") + "' instead, with white fluffy fur instead of a spike. And don't forget the root.\""; + mes "\"You can call fluffies, too. But for them you must call out '" + get(.invocation$, "smfluffies") + "' instead, with white fluffy fur instead of a spike. And don't forget the root.\""; goto L_practice; L_teach_N11: diff --git a/world/map/npc/017-4/waric.txt b/world/map/npc/017-4/waric.txt index 92674a00..a0f826e9 100644 --- a/world/map/npc/017-4/waric.txt +++ b/world/map/npc/017-4/waric.txt @@ -234,7 +234,7 @@ L_Mushroom: mes "\"Now that you are a student of mine, I will teach you some spells.\""; next; mes "\"We will start with an easy one. I will teach you how to summon a wicked mushroom.\""; - mes "\"The spell consumes a Small Mushroom and a Dark Crystal. Shove the Dark Crystal into the Small Mushroom and yell " + get(.invocation$, "summon-wickedmushroom") +".\""; + mes "\"The spell consumes a Small Mushroom and a Dark Crystal. Shove the Dark Crystal into the Small Mushroom and yell " + get(.invocation$, "smwmushroom") +".\""; next; mes "\"A wicked mushroom will appear to fight for you.\""; set OrumQuest, 37; diff --git a/world/map/npc/magic/_procedures.txt b/world/map/npc/magic/_procedures.txt index 5f1ea865..57a83fa9 100644 --- a/world/map/npc/magic/_procedures.txt +++ b/world/map/npc/magic/_procedures.txt @@ -12,7 +12,7 @@ function|script|magic_register function|script|magic_checks { set .@r, 0; - if(getpvpflag(1)) set .@r, 1; + if(getpvpflag(1)) set .@r, 1; // FIXME: make HIDDEN into a param if((gettimetick(2) - MAGIC_CAST_TICK) < 0) set .@r, 2; // check if last debuff ended if(Hp < 1) set .@r, 3; // can not cast when dead return .@r; diff --git a/world/map/npc/magic/level1-experience.txt b/world/map/npc/magic/level1-experience.txt index 323abc54..2c283eaa 100644 --- a/world/map/npc/magic/level1-experience.txt +++ b/world/map/npc/magic/level1-experience.txt @@ -8,6 +8,7 @@ callfunc "adjust_spellpower"; set Sp, Sp - 1; misceffect FX_MAGIC_GENERIC, strcharinfo(0); + callfunc "magic_exp"; set @ratio, ((@last_exp*10) - rand(.MAX_MAGIC_EXP[@level]/30))/.MAX_MAGIC_EXP[@level]; set @mes$, "You feel completely overwhelmed by your magic."; diff --git a/world/map/npc/magic/level2-barrier.txt b/world/map/npc/magic/level2-barrier.txt index d692bee1..8d74414a 100644 --- a/world/map/npc/magic/level2-barrier.txt +++ b/world/map/npc/magic/level2-barrier.txt @@ -1,4 +1,4 @@ --|script|barrier|32767 +-|script|magic barrier|32767 { if(call("magic_checks")) end; // << I wish we had functions that could return >> if (Sp < 15) end; @@ -14,7 +14,7 @@ if (attachrid(@target_id) != 1) end; set @target_hat, getequipid(equip_head), @asorm_caster; if (attachrid(@asorm_caster) != 1) end; - if (@target_hat == 888) end; // FIXME: this whole 5 line block could be done with only one line if we modify getequipid + if (@target_hat == 888) end; // FIXME: this whole 5 line block could be done with only one line if we modify getequipid OR make equip_ into params set MAGIC_CAST_TICK, gettimetick(2) + 1; // set the new debuff callfunc "adjust_spellpower"; diff --git a/world/map/npc/magic/level2-summon-fluffies.txt b/world/map/npc/magic/level2-summon-fluffies.txt index 77f21fab..32fcd750 100644 --- a/world/map/npc/magic/level2-summon-fluffies.txt +++ b/world/map/npc/magic/level2-summon-fluffies.txt @@ -1,4 +1,4 @@ --|script|summon-fluffies|32767 +-|script|smfluffies|32767 { end; diff --git a/world/map/npc/magic/level2-summon-mouboo.txt b/world/map/npc/magic/level2-summon-mouboo.txt index 13b51ae6..5055362f 100644 --- a/world/map/npc/magic/level2-summon-mouboo.txt +++ b/world/map/npc/magic/level2-summon-mouboo.txt @@ -1,4 +1,4 @@ --|script|summon-mouboo|32767 +-|script|smmouboo|32767 { end; diff --git a/world/map/npc/magic/level2-summon-pinkie.txt b/world/map/npc/magic/level2-summon-pinkie.txt index a3949c78..f4716749 100644 --- a/world/map/npc/magic/level2-summon-pinkie.txt +++ b/world/map/npc/magic/level2-summon-pinkie.txt @@ -1,4 +1,4 @@ --|script|summon-pinkie|32767 +-|script|smpinkie|32767 { end; diff --git a/world/map/npc/magic/level2-summon-spiky-mushroom.txt b/world/map/npc/magic/level2-summon-spiky-mushroom.txt index b39c53ad..97d916b0 100644 --- a/world/map/npc/magic/level2-summon-spiky-mushroom.txt +++ b/world/map/npc/magic/level2-summon-spiky-mushroom.txt @@ -1,4 +1,4 @@ --|script|summon-spiky-mushrooms|32767 +-|script|smsmushrooms|32767 { end; diff --git a/world/map/npc/magic/level2-summon-wickedmushroom.txt b/world/map/npc/magic/level2-summon-wickedmushroom.txt index 46e608a6..3960437a 100644 --- a/world/map/npc/magic/level2-summon-wickedmushroom.txt +++ b/world/map/npc/magic/level2-summon-wickedmushroom.txt @@ -1,4 +1,4 @@ --|script|summon-wickedmushroom|32767 +-|script|smwmushroom|32767 { end; -- cgit v1.2.3-60-g2f50