diff options
| author | Jesusaves <cpntb1@ymail.com> | 2020-05-08 14:34:44 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2020-05-08 14:34:44 -0300 |
| commit | bc1f9ac4c39b6996ee41936fb3602cac52e31630 (patch) | |
| tree | 4c7d88e1fbf1558fa735063a09594b1971eb9210 | |
| parent | f9fa076a03993157898f8c8121963fbaecb2a167 (diff) | |
| download | serverdata-bc1f9ac4c39b6996ee41936fb3602cac52e31630.tar.gz serverdata-bc1f9ac4c39b6996ee41936fb3602cac52e31630.tar.bz2 serverdata-bc1f9ac4c39b6996ee41936fb3602cac52e31630.tar.xz serverdata-bc1f9ac4c39b6996ee41936fb3602cac52e31630.zip | |
The notes/signs in Kamelot will now warn about the key-less guilds.
| -rw-r--r-- | npc/042-10/ctrl.txt | 39 |
1 files changed, 32 insertions, 7 deletions
diff --git a/npc/042-10/ctrl.txt b/npc/042-10/ctrl.txt index 97996bc29..73f322add 100644 --- a/npc/042-10/ctrl.txt +++ b/npc/042-10/ctrl.txt @@ -93,7 +93,7 @@ function script KatazuliInfo { mes l("To cast, one must sit on the circle and say the chant on general chat."); mes l("The chant must be exact, without any prefix or suffix."); next; - mes l("While breaking the seal, monsters will spawn. They may drop %s.", getitemlink(DarkPetal)); + mes l("While breaking the seal, monsters will spawn. The other monsters may drop %s.", getitemlink(DarkPetal)); mes l("Drop these near the circle to make the breaking faster."); next; mes l("Multiple players may conduct Katazuli at once. If you move or stand, the spell may be aborted."); @@ -210,7 +210,7 @@ function script KatazuliCore { monster(.@m$, .@x, .@y, strmobinfo(1, MagicGoblin), MagicGoblin, rand2(3,6)); // Take away some HP and MP, but do not make you stand - percentheal -1, -1; + percentheal -1, -2; sit(); // If it took all your mana - its over @@ -426,7 +426,12 @@ function script KamelotSwitch { // TODO: NPC_PAPER_NOTE sprite 042-10,97,126,0 script #K4210Note01 NPC_SWORDS_SIGN,{ .@g=getcharid(2); - if (!($KAMELOT_KEYMASK[.@g] & $KAMELOT_KEY[.@g])) end; // Don't care + + if (!($KAMELOT_KEYMASK[.@g] & $KAMELOT_KEY[.@g])) { + mes l("Your guild does not have the key required to complete this part of the puzzle."); + close; + } + if ($KAMELOT_PASSCODE[.@g] & 1) dispbottom l("The power system is ##Bactive##b on the north."); else @@ -439,7 +444,12 @@ OnInit: } 042-10,139,98,0 script #K4210Note02 NPC_SWORDS_SIGN,{ .@g=getcharid(2); - if (!($KAMELOT_KEYMASK[.@g] & $KAMELOT_KEY[.@g])) end; // Don't care + + if (!($KAMELOT_KEYMASK[.@g] & $KAMELOT_KEY[.@g])) { + mes l("Your guild does not have the key required to complete this part of the puzzle."); + close; + } + if ($KAMELOT_PASSCODE[.@g] & 2) dispbottom l("The power system is ##Bactive##b on the south."); else @@ -452,7 +462,12 @@ OnInit: } 042-10,127,45,0 script #K4210Note04 NPC_SWORDS_SIGN,{ .@g=getcharid(2); - if (!($KAMELOT_KEYMASK[.@g] & $KAMELOT_KEY[.@g])) end; // Don't care + + if (!($KAMELOT_KEYMASK[.@g] & $KAMELOT_KEY[.@g])) { + mes l("Your guild does not have the key required to complete this part of the puzzle."); + close; + } + if ($KAMELOT_PASSCODE[.@g] & 1) dispbottom l("The power system is ##Bactive##b on the west."); else @@ -465,7 +480,12 @@ OnInit: } 042-10,33,133,0 script #K4210Note08 NPC_SWORDS_SIGN,{ .@g=getcharid(2); - if (!($KAMELOT_KEYMASK[.@g] & $KAMELOT_KEY[.@g])) end; // Don't care + + if (!($KAMELOT_KEYMASK[.@g] & $KAMELOT_KEY[.@g])) { + mes l("Your guild does not have the key required to complete this part of the puzzle."); + close; + } + if ($KAMELOT_PASSCODE[.@g] & 8) dispbottom l("The power system is ##Bactive##b on the east."); else @@ -478,7 +498,12 @@ OnInit: } 042-10,38,39,0 script #K4210Note16 NPC_SWORDS_SIGN,{ .@g=getcharid(2); - if (!($KAMELOT_KEYMASK[.@g] & $KAMELOT_KEY[.@g])) end; // Don't care + + if (!($KAMELOT_KEYMASK[.@g] & $KAMELOT_KEY[.@g])) { + mes l("Your guild does not have the key required to complete this part of the puzzle."); + close; + } + if ($KAMELOT_PASSCODE[.@g] & 16) dispbottom l("The power system is ##Bactive##b on the main."); else |