Add fixes and cave fights

1 files changed, 295 insertions, 11 deletions

diff --git a/npc/025-3/barrier.txt b/npc/025-3/barrier.txt
index 96ca06e6..067cbf71 100644
--- a/npc/025-3/barrier.txt
+++ b/npc/025-3/barrier.txt
@@ -1,18 +1,302 @@
-025-3.gat,77,169,0	script	#JuliaBarrier	127,1,1,{
-	if (Battle_Caves == 0) goto L_Block;
-    warp "025-4.gat", 157, 46;
-	end;
+// -----------------------------------------------Warp to Cave 1--------------------------------------------------------------
 
-	if (Battle_Caves == 2) goto L_Block2;
-    warp "025-4.gat", 157, 46;
-	end;
+025-3.gat,78,128,0	script	#WarpBattleCave1	127,1,1,{
+
+  if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
+// Check if someone is already inside. Change the x1, y1, x2, y2 values according to the place the player will be warped
+    if (getareausers("025-4.gat", 26, 63, 60, 97) >= 1) goto L_SomeoneInside;
+// Check if you already done this fight
+    if (cavefights & BATTLE_CAVE1) goto L_AlreadyDone;
+
+L_StartFight:
+    set @battlecave1, 1;
+    warp "025-4.gat", 41, 94;
+    end;
+
+L_SomeoneInside:
+    message strcharinfo(0), $@cave1fighter$ + " is already inside.";
+    end;
+
+L_AlreadyDone:
+    message strcharinfo(0), "I already defeated the monsters in this cave.";
+    end;
+
+L_AlreadyHelped:
+    if (@juliadone == 1) end;
+    message strcharinfo(0), "I already helped that little girl. There is nothing for me inside this cave.";
+    set @juliadone, 1;
+    end;
+    
+}
+
+// -----------------------------------------------Warp to Cave 2--------------------------------------------------------------
+
+025-3.gat,53,108,0	script	#WarpBattleCave2	127,1,1,{
+
+  if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
+// Check if someone is already inside. Change the x1, y1, x2, y2 values according to the place the player will be warped
+    if (getareausers("025-4.gat", 97, 62, 126, 96) >= 1) goto L_SomeoneInside;
+// Check if you already done this fight
+    if (cavefights & BATTLE_CAVE2) goto L_AlreadyDone;
+
+L_StartFight:
+    set @battlecave2, 1;
+    warp "025-4.gat", 110, 94;
+    end;
+
+L_SomeoneInside:
+    message strcharinfo(0), $@cave2fighter$ + " is already inside.";
+    end;
+
+L_AlreadyDone:
+    message strcharinfo(0), "I already defeated the monsters in this cave.";
+    end;
+
+L_AlreadyHelped:
+    if (@juliadone == 1) end;
+    message strcharinfo(0), "I already helped that little girl. There is nothing for me inside this cave.";
+    set @juliadone, 1;
+    end;
+}
+
+// -----------------------------------------------Warp to Cave 3-------------------------------------------------------------
+
+025-3.gat,71,84,0	script	#WarpBattleCave3	127,1,1,{
+
+  if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
+// Check if someone is already inside. Change the x1, y1, x2, y2 values according to the place the player will be warped
+    if (getareausers("025-4.gat", 150, 84, 177, 117) >= 1) goto L_SomeoneInside;
+// Check if you already done this fight
+    if (cavefights & BATTLE_CAVE3) goto L_AlreadyDone;
+
+L_StartFight:
+    set @battlecave3, 1;
+    warp "025-4.gat", 168, 115;
+    end;
+
+L_SomeoneInside:
+    message strcharinfo(0), $@cave3fighter$ + " is already inside.";
+    end;
+
+L_AlreadyDone:
+    message strcharinfo(0), "I already defeated the monsters in this cave.";
+    end;
+
+L_AlreadyHelped:
+    if (@juliadone == 1) end;
+    message strcharinfo(0), "I already helped that little girl. There is nothing for me inside this cave.";
+    set @juliadone, 1;
+    end;
+}
+
+// -----------------------------------------------Warp to Cave 4-------------------------------------------------------------
+
+025-3.gat,80,84,0	script	#WarpBattleCave4	127,1,1,{
+
+  if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
+// Check if someone is already inside. Change the x1, y1, x2, y2 values according to the place the player will be warped
+    if (getareausers("025-4.gat", 28, 124, 57, 156) >= 1) goto L_SomeoneInside;
+// Check if you already done this fight
+    if (cavefights & BATTLE_CAVE4) goto L_AlreadyDone;
+
+L_StartFight:
+    set @battlecave4, 1;
+    warp "025-4.gat", 32, 154;
+    end;
+
+L_SomeoneInside:
+    message strcharinfo(0), $@cave4fighter$ + " is already inside.";
+    end;
+
+L_AlreadyDone:
+    message strcharinfo(0), "I already defeated the monsters in this cave.";
+    end;
+
+L_AlreadyHelped:
+    if (@juliadone == 1) end;
+    message strcharinfo(0), "I already helped that little girl. There is nothing for me inside this cave.";
+    set @juliadone, 1;
+    end;
+}
+
+// -----------------------------------------------Warp to Cave 5-------------------------------------------------------------
+
+025-3.gat,71,31,0	script	#WarpBattleCave5	127,1,1,{
+
+  if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
+// Check if someone is already inside. Change the x1, y1, x2, y2 values according to the place the player will be warped
+    if (getareausers("025-4.gat", 91, 131, 124, 160) >= 1) goto L_SomeoneInside;
+// Check if you already done this fight
+    if (cavefights & BATTLE_CAVE5) goto L_AlreadyDone;
+
+L_StartFight:
+    set @battlecave5, 1;
+    warp "025-4.gat", 100, 158;
+    end;
+
+L_SomeoneInside:
+    message strcharinfo(0), $@cave5fighter$ + " is already inside.";
+    end;
+
+L_AlreadyDone:
+    message strcharinfo(0), "I already defeated the monsters in this cave.";
+    end;
+
+L_AlreadyHelped:
+    if (@juliadone == 1) end;
+    message strcharinfo(0), "I already helped that little girl. There is nothing for me inside this cave.";
+    set @juliadone, 1;
+    end;
+}
+
+// -----------------------------------------------Warp to Cave 6-------------------------------------------------------------
+
+025-3.gat,128,36,0	script	#WarpBattleCave6	127,1,1,{
+
+  if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
+// Check if someone is already inside. Change the x1, y1, x2, y2 values according to the place the player will be warped
+    if (getareausers("025-4.gat", 153, 143, 178, 174) >= 1) goto L_SomeoneInside;
+// Check if you already done this fight
+    if (cavefights & BATTLE_CAVE6) goto L_AlreadyDone;
+
+L_StartFight:
+    set @battlecave6, 1;
+    warp "025-4.gat", 159, 172;
+    end;
+
+L_SomeoneInside:
+    message strcharinfo(0), $@cave6fighter$ + " is already inside.";
+    end;
+
+L_AlreadyDone:
+    message strcharinfo(0), "I already defeated the monsters in this cave.";
+    end;
+
+L_AlreadyHelped:
+    if (@juliadone == 1) end;
+    message strcharinfo(0), "I already helped that little girl. There is nothing for me inside this cave.";
+    set @juliadone, 1;
+    end;
+}
+
+// -----------------------------------------------Warp to Cave 7-------------------------------------------------------------
+
+025-3.gat,70,58,0	script	#WarpBattleCave7	127,1,1,{
 
-L_Block:
-    message strcharinfo(0), "You don't feel powerful enough to enter. You maybe should explore somewhere else before.";
+  if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
+// Check if someone is already inside. Change the x1, y1, x2, y2 values according to the place the player will be warped
+    if (getareausers("025-4.gat", 27, 185, 61, 219) >= 1) goto L_SomeoneInside;
+// Check if you already done this fight
+    if (cavefights & BATTLE_CAVE7) goto L_AlreadyDone;
+
+L_StartFight:
+    set @battlecave7, 1;
+    warp "025-4.gat", 42, 217;
+    end;
+
+L_SomeoneInside:
+    message strcharinfo(0), $@cave7fighter$ + " is already inside.";
     end;
 
-L_Block2:
-    message strcharinfo(0), "There is nothing else in this cave that seems interesting.";
+L_AlreadyDone:
+    message strcharinfo(0), "I already defeated the monsters in this cave.";
     end;
 
+L_AlreadyHelped:
+    if (@juliadone == 1) end;
+    message strcharinfo(0), "I already helped that little girl. There is nothing for me inside this cave.";
+    set @juliadone, 1;
+    end;
 }
+
+// -----------------------------------------------Warp to Cave 8-------------------------------------------------------------
+
+025-3.gat,138,93,0	script	#WarpBattleCave8	127,1,1,{
+
+  if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
+// Check if someone is already inside. Change the x1, y1, x2, y2 values according to the place the player will be warped
+    if (getareausers("025-4.gat", 90, 193, 119, 216) >= 1) goto L_SomeoneInside;
+// Check if you already done this fight
+    if (cavefights & BATTLE_CAVE8) goto L_AlreadyDone;
+
+L_StartFight:
+    set @battlecave8, 1;
+    warp "025-4.gat", 105, 214;
+    end;
+
+L_SomeoneInside:
+    message strcharinfo(0), $@cave8fighter$ + " is already inside.";
+    end;
+
+L_AlreadyDone:
+    message strcharinfo(0), "I already defeated the monsters in this cave.";
+    end;
+
+L_AlreadyHelped:
+    if (@juliadone == 1) end;
+    message strcharinfo(0), "I already helped that little girl. There is nothing for me inside this cave.";
+    set @juliadone, 1;
+    end;
+}
+
+// -----------------------------------------------Warp to Cave 9-------------------------------------------------------------
+
+025-3.gat,138,159,0	script	#WarpBattleCave9	127,1,1,{
+
+  if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
+// Check if someone is already inside. Change the x1, y1, x2, y2 values according to the place the player will be warped
+    if (getareausers("025-4.gat", 144, 192, 173, 226) >= 1) goto L_SomeoneInside;
+// Check if you already done this fight
+    if (cavefights & BATTLE_CAVE9) goto L_AlreadyDone;
+
+L_StartFight:
+    set @battlecave9, 1;
+    warp "025-4.gat", 157, 224;
+    end;
+
+L_SomeoneInside:
+    message strcharinfo(0), $@cave9fighter$ + " is already inside.";
+    end;
+
+L_AlreadyDone:
+    message strcharinfo(0), "I already defeated the monsters in this cave.";
+    end;
+
+L_AlreadyHelped:
+    if (@juliadone == 1) end;
+    message strcharinfo(0), "I already helped that little girl. There is nothing for me inside this cave.";
+    set @juliadone, 1;
+    end;
+}
+
+// -----------------------------------------------Warp to Boss Cave----------------------------------------------------------
+
+025-3.gat,77,169,0	script	#WarpBossCave	127,1,1,{
+
+    if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
+
+//Check if you can enter this cave
+    if (cavefights & BATTLE_CAVE1 & BATTLE_CAVE2 & BATTLE_CAVE3 & BATTLE_CAVE4 & BATTLE_CAVE5 & BATTLE_CAVE6 & BATTLE_CAVE7 & BATTLE_CAVE8 & BATTLE_CAVE9) goto L_StartFight;
+
+//Check if someone is already inside. Change the x1, y1, x2, y2 values according to the place the player will be warped
+    if (getareausers("025-4.gat", 142, 24, 172, 48) >= 1) goto L_SomeoneInside;
+
+    message strcharinfo(0), "It feels like something terrible is lurking inside this cave... But you can't enter before you defeat the monsters in the other caves.";
+    end;
+
+L_StartFight:
+    set @battlebosscave, 1;
+    warp "025-4.gat", 157, 46;
+    end;
+
+L_SomeoneInside:
+    message strcharinfo(0), $@cave10fighter$ + " is already inside.";
+    end;
+
+L_AlreadyHelped:
+    if (@juliadone == 1) end;
+    message strcharinfo(0), "I already helped that little girl. There is nothing for me inside this cave.";
+    set @juliadone, 1;
+    end;
+}
+