Fixed numerous issues and added some improvements.

3 files changed, 363 insertions, 2 deletions

diff --git a/npc/025-3/_import.txt b/npc/025-3/_import.txt
index a02d4c7e..bb6cdec0 100644
--- a/npc/025-3/_import.txt
+++ b/npc/025-3/_import.txt
@@ -2,4 +2,4 @@
 map: 025-3.gat
 npc: npc/025-3/_mobs.txt
 npc: npc/025-3/_warps.txt
-npc: npc/025-3/barrier.txt
+npc: npc/025-3/barriers.txt
diff --git a/npc/025-3/barriers.txt b/npc/025-3/barriers.txt
new file mode 100644
index 00000000..e3c35be4
--- /dev/null
+++ b/npc/025-3/barriers.txt
@@ -0,0 +1,354 @@
+// -----------------------------------------------Warp to Cave 1--------------------------------------------------------------
+
+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;
+    if (Rossy_Quest < 15) goto L_Block;
+
+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;
+
+L_Block:
+    message strcharinfo(0), "I can't enter this cave. Maybe I should learn more about this place before I go inside.";
+    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;
+    if (Rossy_Quest < 15) goto L_Block;
+
+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;
+
+L_Block:
+    message strcharinfo(0), "I can't enter this cave. Maybe I should learn more about this place before I go inside.";
+    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;
+    if (Rossy_Quest < 15) goto L_Block;
+
+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;
+
+L_Block:
+    message strcharinfo(0), "I can't enter this cave. Maybe I should learn more about this place before I go inside.";
+    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;
+    if (Rossy_Quest < 15) goto L_Block;
+
+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;
+
+L_Block:
+    message strcharinfo(0), "I can't enter this cave. Maybe I should learn more about this place before I go inside.";
+    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;
+    if (Rossy_Quest < 15) goto L_Block;
+
+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;
+
+L_Block:
+    message strcharinfo(0), "I can't enter this cave. Maybe I should learn more about this place before I go inside.";
+    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;
+    if (Rossy_Quest < 15) goto L_Block;
+
+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;
+
+L_Block:
+    message strcharinfo(0), "I can't enter this cave. Maybe I should learn more about this place before I go inside.";
+    end;
+
+
+}
+
+// -----------------------------------------------Warp to Cave 7-------------------------------------------------------------
+
+025-3.gat,70,58,0	script	#WarpBattleCave7	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", 27, 185, 61, 219) >= 1) goto L_SomeoneInside;
+// Check if you already done this fight
+    if (cavefights & BATTLE_CAVE7) goto L_AlreadyDone;
+    if (Rossy_Quest < 15) goto L_Block;
+
+L_StartFight:
+    set @battlecave7, 1;
+    warp "025-4.gat", 42, 217;
+    end;
+
+L_SomeoneInside:
+    message strcharinfo(0), $@cave7fighter$ + " 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;
+
+L_Block:
+    message strcharinfo(0), "I can't enter this cave. Maybe I should learn more about this place before I go inside.";
+    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;
+    if (Rossy_Quest < 15) goto L_Block;
+
+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;
+
+L_Block:
+    message strcharinfo(0), "I can't enter this cave. Maybe I should learn more about this place before I go inside.";
+    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;
+    if (Rossy_Quest < 15) goto L_Block;
+
+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;
+
+L_Block:
+    message strcharinfo(0), "I can't enter this cave. Maybe I should learn more about this place before I go inside.";
+    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 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;
+
+//Check if you can enter this cave
+    if (cavefights & BATTLE_CAVE1 && cavefights & BATTLE_CAVE2 && cavefights & BATTLE_CAVE3 && cavefights & BATTLE_CAVE4 && cavefights & BATTLE_CAVE5 && cavefights & BATTLE_CAVE6 && cavefights & BATTLE_CAVE7 && cavefights & BATTLE_CAVE8 && cavefights & BATTLE_CAVE9) goto L_StartFight;
+
+    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;
+}
+
diff --git a/npc/025-4/julia.txt b/npc/025-4/julia.txt
index 01dc044d..4004d77c 100644
--- a/npc/025-4/julia.txt
+++ b/npc/025-4/julia.txt
@@ -2,13 +2,15 @@
 
   if (Rossy_Quest > 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_End;
   if (Rossy_Quest == 16) goto L_Done;
-  if (Rossy_Quest <= 16) goto L_Hmmm;
+  if (Rossy_Quest <= 15) goto L_Hmmm;
 
 L_Done:
   mes "[Julia]";
   mes "Oh, you saved me, thank you!";
   next;
   mes "Here is a present for you.";
+  getinventorylist;
+  if (@inventorylist_count == 100) goto L_TooMany;
   getitem "BunchOfParsley", 1;
   getexp 5000, 0;
   set Rossy_Quest, 17;
@@ -25,4 +27,9 @@ L_Hmmm:
   mes "Don't hurt me!";
   close;
 
+L_TooMany:
+  mes "[Julia]";
+  mes "\"Oh, I wanted to give you a present, but you don't have room for it. Come back when your backpack will not be full.\"";
+  close;
+
 }