summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--world/map/npc/025-1/barrier.txt7
-rw-r--r--world/map/npc/025-1/reset.txt39
-rw-r--r--world/map/npc/025-4/battlecaves.txt18
3 files changed, 32 insertions, 32 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;
// }
diff --git a/world/map/npc/025-4/battlecaves.txt b/world/map/npc/025-4/battlecaves.txt
index c295362c..411e2026 100644
--- a/world/map/npc/025-4/battlecaves.txt
+++ b/world/map/npc/025-4/battlecaves.txt
@@ -40,7 +40,7 @@ L_Done:
if ($@wave_cave1 == 1) message strcharinfo(0), "As soon as you kill the last monster, your vision blacks out and you feel a strange sensation... Maybe it is not healthy to stay in this cave.";
if ($@wave_cave1 < $@CAVE1_WAVES) goto L_Summon;
- set cavefights, (cavefights ^ BATTLE_CAVE1);
+ set cavefights, (cavefights | BATTLE_CAVE1);
end;
OnMonsterDeath:
@@ -183,7 +183,7 @@ L_Done:
if ($@wave_cave2 == 1) message strcharinfo(0), "As soon as you kill the last monster, your vision blacks out and you feel a strange sensation... Maybe it is not healthy to stay in this cave.";
if ($@wave_cave2 < $@CAVE2_WAVES) goto L_Summon;
- set cavefights, (cavefights ^ BATTLE_CAVE2);
+ set cavefights, (cavefights | BATTLE_CAVE2);
end;
OnMonsterDeath:
@@ -251,7 +251,7 @@ L_Done:
if ($@wave_cave3 == 1) message strcharinfo(0), "As soon as you kill the last monster, your vision blacks out and you feel a strange sensation... Maybe it is not healthy to stay in this cave.";
if ($@wave_cave3 < $@CAVE3_WAVES) goto L_Summon;
- set cavefights, (cavefights ^ BATTLE_CAVE3);
+ set cavefights, (cavefights | BATTLE_CAVE3);
end;
OnMonsterDeath:
@@ -321,7 +321,7 @@ L_Done:
if ($@wave_cave4 == 2) message strcharinfo(0), "As soon as you kill the last monster, your vision blacks out and you feel a strange sensation... Maybe it is not healthy to stay in this cave.";
if ($@wave_cave4 < $@CAVE4_WAVES) goto L_Summon;
- set cavefights, (cavefights ^ BATTLE_CAVE4);
+ set cavefights, (cavefights | BATTLE_CAVE4);
end;
OnMonsterDeath:
@@ -392,7 +392,7 @@ L_Done:
if ($@wave_cave5 == 2) message strcharinfo(0), "As soon as you kill the last monster, your vision blacks out and you feel a strange sensation... Maybe it is not healthy to stay in this cave.";
if ($@wave_cave5 < $@CAVE5_WAVES) goto L_Summon;
- set cavefights, (cavefights ^ BATTLE_CAVE5);
+ set cavefights, (cavefights | BATTLE_CAVE5);
end;
OnMonsterDeath:
@@ -463,7 +463,7 @@ L_Done:
if ($@wave_cave6 == 2) message strcharinfo(0), "As soon as you kill the last monster, your vision blacks out and you feel a strange sensation... Maybe it is not healthy to stay in this cave.";
if ($@wave_cave6 < $@CAVE6_WAVES) goto L_Summon;
- set cavefights, (cavefights ^ BATTLE_CAVE6);
+ set cavefights, (cavefights | BATTLE_CAVE6);
end;
OnMonsterDeath:
@@ -535,7 +535,7 @@ L_Done:
if ($@wave_cave7 == 3) message strcharinfo(0), "As soon as you kill the last monster, your vision blacks out and you feel a strange sensation... Maybe it is not healthy to stay in this cave.";
if ($@wave_cave7 < $@CAVE7_WAVES) goto L_Summon;
- set cavefights, (cavefights ^ BATTLE_CAVE7);
+ set cavefights, (cavefights | BATTLE_CAVE7);
end;
OnMonsterDeath:
@@ -607,7 +607,7 @@ L_Done:
if ($@wave_cave8 == 3) message strcharinfo(0), "As soon as you kill the last monster, your vision blacks out and you feel a strange sensation... Maybe it is not healthy to stay in this cave.";
if ($@wave_cave8 < $@CAVE8_WAVES) goto L_Summon;
- set cavefights, (cavefights ^ BATTLE_CAVE8);
+ set cavefights, (cavefights | BATTLE_CAVE8);
end;
OnMonsterDeath:
@@ -679,7 +679,7 @@ L_Done:
if ($@wave_cave9 == 3) message strcharinfo(0), "As soon as you kill the last monster, your vision blacks out and you feel a strange sensation... Maybe it is not healthy to stay in this cave.";
if ($@wave_cave9 < $@CAVE9_WAVES) goto L_Summon;
- set cavefights, (cavefights ^ BATTLE_CAVE9);
+ set cavefights, (cavefights | BATTLE_CAVE9);
end;
OnMonsterDeath:
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-22 02:41:37 +0000