Ran java Converter after the clone rebase, thanks to o11c.

Fixed all the warps to be precise and avoid some unecessary messages when we walk in front of the battle caves.
Made some improvements into rossy script too.

1 files changed, 13 insertions, 14 deletions

diff --git a/npc/025-3/barriers.txt b/npc/025-3/barriers.txt
index e3c35be4..89c13b84 100644
--- a/npc/025-3/barriers.txt
+++ b/npc/025-3/barriers.txt
@@ -1,6 +1,6 @@
 // -----------------------------------------------Warp to Cave 1--------------------------------------------------------------
 
-025-3.gat,78,128,0	script	#WarpBattleCave1	127,1,1,{
+025-3.gat,78,127,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
@@ -11,7 +11,7 @@
 
 L_StartFight:
     set @battlecave1, 1;
-    warp "025-4.gat", 41, 94;
+    warp "025-4.gat", 41, 95;
     end;
 
 L_SomeoneInside:
@@ -35,7 +35,7 @@ L_Block:
 
 // -----------------------------------------------Warp to Cave 2--------------------------------------------------------------
 
-025-3.gat,53,108,0	script	#WarpBattleCave2	127,1,1,{
+025-3.gat,53,107,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
@@ -71,7 +71,7 @@ L_Block:
 
 // -----------------------------------------------Warp to Cave 3-------------------------------------------------------------
 
-025-3.gat,71,84,0	script	#WarpBattleCave3	127,1,1,{
+025-3.gat,71,83,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
@@ -107,7 +107,7 @@ L_Block:
 
 // -----------------------------------------------Warp to Cave 4-------------------------------------------------------------
 
-025-3.gat,80,84,0	script	#WarpBattleCave4	127,1,1,{
+025-3.gat,80,83,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
@@ -143,7 +143,7 @@ L_Block:
 
 // -----------------------------------------------Warp to Cave 5-------------------------------------------------------------
 
-025-3.gat,71,31,0	script	#WarpBattleCave5	127,1,1,{
+025-3.gat,71,30,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
@@ -179,7 +179,7 @@ L_Block:
 
 // -----------------------------------------------Warp to Cave 6-------------------------------------------------------------
 
-025-3.gat,128,36,0	script	#WarpBattleCave6	127,1,1,{
+025-3.gat,128,35,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
@@ -216,7 +216,7 @@ L_Block:
 
 // -----------------------------------------------Warp to Cave 7-------------------------------------------------------------
 
-025-3.gat,70,58,0	script	#WarpBattleCave7	127,1,1,{
+025-3.gat,70,57,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
@@ -252,7 +252,7 @@ L_Block:
 
 // -----------------------------------------------Warp to Cave 8-------------------------------------------------------------
 
-025-3.gat,138,93,0	script	#WarpBattleCave8	127,1,1,{
+025-3.gat,138,92,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
@@ -288,9 +288,9 @@ L_Block:
 
 // -----------------------------------------------Warp to Cave 9-------------------------------------------------------------
 
-025-3.gat,138,159,0	script	#WarpBattleCave9	127,1,1,{
+025-3.gat,138,160,0	script	#WarpBattleCave9	127,1,1,{
 
-  if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_AlreadyHelped;
+    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
@@ -324,12 +324,11 @@ L_Block:
 
 // -----------------------------------------------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;
+025-3.gat,77,170,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;