diff options
Diffstat (limited to 'world/map/npc/025-1')
| -rw-r--r-- | world/map/npc/025-1/barrier.txt | 7 | ||||
| -rw-r--r-- | world/map/npc/025-1/reset.txt | 39 |
2 files changed, 23 insertions, 23 deletions
diff --git a/world/map/npc/025-1/barrier.txt b/world/map/npc/025-1/barrier.txt index 7a238480..1a7e32b7 100644 --- a/world/map/npc/025-1/barrier.txt +++ b/world/map/npc/025-1/barrier.txt @@ -1,9 +1,12 @@ // Authors: alastrim, Ali-g, Dark Mage 025-1.gat,42,79,0 script #JuliaBarrier 45,1,1,{ + + if (Rossy_Quest > 14 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_Warp; if (Rossy_Quest <= 13) goto L_Block; - if (@Alrd_Been != 1 && Rossy_Quest == 14) message strcharinfo(0), "You hear distant screams of fear."; - set @Alrd_Been, 1; + if (Rossy_Quest == 14) message strcharinfo(0), "You hear distant screams of fear."; + +L_Warp: warp "025-3.gat", 112, 97; end; diff --git a/world/map/npc/025-1/reset.txt b/world/map/npc/025-1/reset.txt index 86cb97a7..e8d7f33c 100644 --- a/world/map/npc/025-1/reset.txt +++ b/world/map/npc/025-1/reset.txt @@ -1,8 +1,5 @@ //To enable: sed 's_^// __' -i npc/025-1/reset.txt -//note by o11c: I think the logic is wrong -//it should be: cavefights | BATTLE_CAVE1, etc. - // 025-1.gat,47,84,0 script reset 145,{ // mes "Do you want to reset Rossy Quest?"; @@ -27,27 +24,27 @@ // L_Pass: // set Rossy_Quest, 15; -// set cavefights, (cavefights ^ BATTLE_CAVE1); -// set cavefights, (cavefights ^ BATTLE_CAVE2); -// set cavefights, (cavefights ^ BATTLE_CAVE3); -// set cavefights, (cavefights ^ BATTLE_CAVE4); -// set cavefights, (cavefights ^ BATTLE_CAVE5); -// set cavefights, (cavefights ^ BATTLE_CAVE6); -// set cavefights, (cavefights ^ BATTLE_CAVE7); -// set cavefights, (cavefights ^ BATTLE_CAVE8); -// set cavefights, (cavefights ^ BATTLE_CAVE9); +// set cavefights, (cavefights | BATTLE_CAVE1); +// set cavefights, (cavefights | BATTLE_CAVE2); +// set cavefights, (cavefights | BATTLE_CAVE3); +// set cavefights, (cavefights | BATTLE_CAVE4); +// set cavefights, (cavefights | BATTLE_CAVE5); +// set cavefights, (cavefights | BATTLE_CAVE6); +// set cavefights, (cavefights | BATTLE_CAVE7); +// set cavefights, (cavefights | BATTLE_CAVE8); +// set cavefights, (cavefights | BATTLE_CAVE9); // close; // L_Pass2: // set Rossy_Quest, 16; -// set cavefights, (cavefights ^ BATTLE_CAVE1); -// set cavefights, (cavefights ^ BATTLE_CAVE2); -// set cavefights, (cavefights ^ BATTLE_CAVE3); -// set cavefights, (cavefights ^ BATTLE_CAVE4); -// set cavefights, (cavefights ^ BATTLE_CAVE5); -// set cavefights, (cavefights ^ BATTLE_CAVE6); -// set cavefights, (cavefights ^ BATTLE_CAVE7); -// set cavefights, (cavefights ^ BATTLE_CAVE8); -// set cavefights, (cavefights ^ BATTLE_CAVE9); +// set cavefights, (cavefights | BATTLE_CAVE1); +// set cavefights, (cavefights | BATTLE_CAVE2); +// set cavefights, (cavefights | BATTLE_CAVE3); +// set cavefights, (cavefights | BATTLE_CAVE4); +// set cavefights, (cavefights | BATTLE_CAVE5); +// set cavefights, (cavefights | BATTLE_CAVE6); +// set cavefights, (cavefights | BATTLE_CAVE7); +// set cavefights, (cavefights | BATTLE_CAVE8); +// set cavefights, (cavefights | BATTLE_CAVE9); // close; // } |