diff options
| -rw-r--r-- | world/map/npc/017-9/npcs.txt | 1 | ||||
| -rw-r--r-- | world/map/npc/048-2/helperAccused.txt | 3 | ||||
| -rw-r--r-- | world/map/npc/functions/superdebug.txt | 4 | ||||
| -rw-r--r-- | world/map/npc/items/warpTowels.txt | 2 |
4 files changed, 8 insertions, 2 deletions
diff --git a/world/map/npc/017-9/npcs.txt b/world/map/npc/017-9/npcs.txt index c9f9aedb..b14428c5 100644 --- a/world/map/npc/017-9/npcs.txt +++ b/world/map/npc/017-9/npcs.txt @@ -40,6 +40,7 @@ 017-9,30,28,0|script|Numa|393 { + set @from_npc, 1; callfunc "SuperDebug"; end; } diff --git a/world/map/npc/048-2/helperAccused.txt b/world/map/npc/048-2/helperAccused.txt index a0f6c2e6..95607656 100644 --- a/world/map/npc/048-2/helperAccused.txt +++ b/world/map/npc/048-2/helperAccused.txt @@ -6,7 +6,7 @@ 048-2,25,135,0|script|Peetu|130 { - if (QL_BSAGE_INVESTIGATE >= 12 && QL_BSAGE_INVESTIGATE < 13) goto L_Thank; + if (QL_BSAGE_INVESTIGATE == 12) goto L_Thank; if (QL_BSAGE_INVESTIGATE > 4 && QL_BSAGE_INVESTIGATE < 13) goto L_Investigate; if (QL_BSAGE_INVESTIGATE > 1 && QL_BSAGE_INVESTIGATE < 13) goto L_Query; if (QL_BSAGE_INVESTIGATE == 1) goto L_Help; @@ -125,6 +125,7 @@ L_ReallyMore: mes "I mean, this is alarming news, but I'm so glad that this isn't my fault and that he feels I deserve to keep my job.\""; next; mes "\"It isn't much, but please take these Silk Gloves. We use those when we have to protect our hands, but still need to perform magic.\""; + set QL_BSAGE_INVESTIGATE, 12; getitem "SilkGloves", 1; goto L_Close; diff --git a/world/map/npc/functions/superdebug.txt b/world/map/npc/functions/superdebug.txt index b9f067de..5654dd4c 100644 --- a/world/map/npc/functions/superdebug.txt +++ b/world/map/npc/functions/superdebug.txt @@ -3,9 +3,13 @@ function|script|SuperDebug { + if(@from_npc) goto L_Main; + npcaction 6, 12; + title "Numa"; goto L_Main; L_Main: + set @from_npc, 0; mes "[Numa]"; mes "How may I help you?"; next; diff --git a/world/map/npc/items/warpTowels.txt b/world/map/npc/items/warpTowels.txt index 8e9ef4ac..dd8bc71e 100644 --- a/world/map/npc/items/warpTowels.txt +++ b/world/map/npc/items/warpTowels.txt @@ -6,7 +6,7 @@ function|script|WarpTowel goto L_DontPanic; if (isin("botcheck",25,27,51,47)) goto L_Prison; - if (getmapflag(getmap(), MF_NOSAVE) || isin("009-7",$@fightclub_x1,$@fightclub_y1,$@fightclub_x2,$@fightclub_y2)) + if (getmapflag(getmap(), MF_NOSAVE) || getmapflag(getmap(), MF_NOTELEPORT) || getmapflag(getmap(), MF_NOWARP) || isin("009-7",$@fightclub_x1,$@fightclub_y1,$@fightclub_x2,$@fightclub_y2)) goto L_Forbid; callfunc "MultiWarpTowel"; |