diff options
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/021-3/doors.txt | 2 | ||||
| -rw-r--r-- | npc/021-4/doors.txt | 3 | ||||
| -rw-r--r-- | npc/021-4/main.txt | 22 |
3 files changed, 17 insertions, 10 deletions
diff --git a/npc/021-3/doors.txt b/npc/021-3/doors.txt index 6624d07f1..f0a403f9d 100644 --- a/npc/021-3/doors.txt +++ b/npc/021-3/doors.txt @@ -8,7 +8,7 @@ 021-3,24,123,0 script #0213_Logic NPC_NO_SPRITE,1,0,{ if ($@CINDY_STATE > gettimetick(2)) goto L_Safe; if ($@CINDY_STATE % 2 == 0) goto L_Blocked; - warp "021-4", 43, 20; + warp "021-4", 67, 28; end; L_Blocked: diff --git a/npc/021-4/doors.txt b/npc/021-4/doors.txt index 456d02a08..690e70438 100644 --- a/npc/021-4/doors.txt +++ b/npc/021-4/doors.txt @@ -1,11 +1,10 @@ // TMW2 scripts. // Authors: -// The Mana World Team // Jesusalva // Description: // Cave logic -021-4,43,19,0 script #Leave0214 NPC_NO_SPRITE,0,0,{ +021-4,67,27,0 script #Leave0214 NPC_NO_SPRITE,0,0,{ if ($@CINDY_STATE % 2 == 0 && $@CINDY_STATE < 150000) goto L_Blocked; warp "021-3", 24, 123; end; diff --git a/npc/021-4/main.txt b/npc/021-4/main.txt index ab7a7bf6d..6190b2417 100644 --- a/npc/021-4/main.txt +++ b/npc/021-4/main.txt @@ -27,16 +27,17 @@ function script CindySwitch_Check_214 { if (.@st5 > 0) .@i++; return .@i; } -021-4,77,25,0 duplicate(#CindySwitch_01) #CindySwitch_06 NPC_SWITCH_OFFLINE -021-4,66,71,0 duplicate(#CindySwitch_01) #CindySwitch_07 NPC_SWITCH_OFFLINE -021-4,25,57,0 duplicate(#CindySwitch_01) #CindySwitch_08 NPC_SWITCH_OFFLINE -021-4,23,13,0 duplicate(#CindySwitch_01) #CindySwitch_09 NPC_SWITCH_OFFLINE -021-4,56,41,0 duplicate(#CindySwitch_01) #CindySwitch_10 NPC_SWITCH_OFFLINE + +021-4,101,33,0 duplicate(#CindySwitch_01) #CindySwitch_06 NPC_SWITCH_OFFLINE +021-4,90,79,0 duplicate(#CindySwitch_01) #CindySwitch_07 NPC_SWITCH_OFFLINE +021-4,49,65,0 duplicate(#CindySwitch_01) #CindySwitch_08 NPC_SWITCH_OFFLINE +021-4,47,21,0 duplicate(#CindySwitch_01) #CindySwitch_09 NPC_SWITCH_OFFLINE +021-4,80,49,0 duplicate(#CindySwitch_01) #CindySwitch_10 NPC_SWITCH_OFFLINE // Cindy // Global Variable: $@CINDY_STATE -021-4,42,41,0 script Cindy#Outside NPC_CINDY_CAGE,{ +021-4,66,49,0 script Cindy#Outside NPC_CINDY_CAGE,{ if (getq(NivalisQuest_Cindy) < 5) goto L_Cheat; if ($@CINDY_STATE > 150000) goto L_Reset; @@ -85,8 +86,15 @@ L_Begin: enablenpc "#CindySwitch_08"; enablenpc "#CindySwitch_09"; enablenpc "#CindySwitch_10"; + + .@pl = getmapusers("021-4"); + areamonster "021-4", 20, 20, 100, 80, "Yeti", Yeti, .@pl, "Cindy#Outside::OnPetDeath"; + monster "021-4", 66, 49, "Yeti", Yeti, 1, "Cindy#Outside::OnPetDeath"; close; +OnPetDeath: + end; + L_Cleanup: .lifetime=0; $@CINDY_HERO=""; @@ -100,7 +108,7 @@ L_Cleanup: OnInit: .distance=5; - .lifetime=0; + .lifetime=0; // Controls Yeti Wave $@CINDY_HERO=""; disablenpc "#CindySwitch_06"; disablenpc "#CindySwitch_07"; |