summaryrefslogtreecommitdiff
path: root/world
diff options
context:
space:
mode:
Diffstat (limited to 'world')
-rw-r--r--world/map/db/item_db.txt4
-rw-r--r--world/map/npc/025-3/barriers.txt2
-rw-r--r--world/map/npc/025-4/battlecaves.txt16
3 files changed, 11 insertions, 11 deletions
diff --git a/world/map/db/item_db.txt b/world/map/db/item_db.txt
index ec61cc42..a85152b5 100644
--- a/world/map/db/item_db.txt
+++ b/world/map/db/item_db.txt
@@ -128,7 +128,7 @@
620, Circlet, Circlet, 5, 2000, 1000, 25, , 4, , 5, 0, 2, 256, , 0, 0, {}, {}, ,
621, Eyepatch, Eyepatch, 5, 1000, 500, 5, , 3, , 0, 0, 2, 256, , 0, 0, {}, {}, ,
622, Bandana, Bandana, 5, 1000, 500, 20, , 3, , 0, 0, 2, 256, , 0, 0, {}, {}, ,
-623, Scythe, Scythe, 4, 100, 50, 1200, 75, , 1, , 0, 2, 2, 1, 1, 3, {}, {}, ,
+623, Scythe, Scythe, 4, 100, 50, 1200, 75, , 1, , 0, 2, 34, 1, 1, 3, {}, {}, ,
624, VNeckSweater, V-Neck Sweater, 5, 6000, 3000, 35, , 8, , -24, 0, 2, 512, , 0, 0, {}, {}, ,
625, ChainmailShirt, Chainmail Shirt, 5, 15000, 1500, 800, , 20, , -120, 0, 2, 512, , 0, 0, {}, {}, ,
626, LightPlatemail, Light Platemail, 5, 50000, 2500, 1200, , 25, , -150, 0, 2, 512, , 0, 0, {}, {}, ,
@@ -269,7 +269,7 @@
755, AssassinShirt, Assassin Shirt, 5, 10000, 3000, 15, , 10, , -5, 0, 2, 512, , 0, 0, {}, {callfunc "UnreleasedItem";bonus bAgi, 10;}
756, AssassinGloves, Assassin Gloves, 5, 7000, 2000, 9, , 5, , -3, 0, 2, 4, , 0, 0, {}, {callfunc "UnreleasedItem";bonus bAgi, 5;}
757, AssassinBoots, Assassin Boots, 5, 7000, 2000, 10, , 5, , -3, 0, 2, 64, , 0, 0, {}, {callfunc "UnreleasedItem";bonus bAgi, 5;}
-758, WoodenStaff, Wooden Staff, 4, 4000, 2000, 1000, 50, , 1, 5, 0, 2, 2, 1, 1, 10, {}, {}
+758, WoodenStaff, Wooden Staff, 4, 4000, 2000, 1000, 50, , 1, 5, 0, 2, 34, 1, 1, 10, {}, {}
//759, PaladinsHelmet, Paladin's Helmet, , , , , , , , , , , , , , , {}, {}
//760, OverlordsHelmet, Overlord's Helmet, , , , , , , , , , , , , , , {}, {}
//761, DesertHelmet, Desert Helmet, , , , , , , , , , , , , , , {}, {}
diff --git a/world/map/npc/025-3/barriers.txt b/world/map/npc/025-3/barriers.txt
index 0196b6bf..647fbd2a 100644
--- a/world/map/npc/025-3/barriers.txt
+++ b/world/map/npc/025-3/barriers.txt
@@ -883,7 +883,7 @@ L_AlreadyClean:
L_StartFight:
set $@battlecave9, 1;
- warp "025-4.gat", 157, 224;
+ warp "025-4.gat", 157, 222;
set $@cave9fighter$, strcharinfo(0);
set $@cave9fighterdeaths, PC_DIE_COUNTER;
startnpctimer;
diff --git a/world/map/npc/025-4/battlecaves.txt b/world/map/npc/025-4/battlecaves.txt
index a7b596f4..441d966e 100644
--- a/world/map/npc/025-4/battlecaves.txt
+++ b/world/map/npc/025-4/battlecaves.txt
@@ -1,6 +1,6 @@
// --------------------------------- Cave 1 -----------------------------------
-025-4.gat,41,91,0 script #StartCaveFight1 324,{
+025-4.gat,42,80,0 script #StartCaveFight1 324,{
if ($@wave_cave1 != 0) end;
if (Rossy_Quest < 15) goto L_Cheat;
if ($@battlecave1 == 1) goto L_Start;
@@ -100,7 +100,7 @@ L_Done:
// --------------------------------- Cave 2 ---------------------------------------
-025-4.gat,110,90,0 script #StartCaveFight2 324,{
+025-4.gat,115,77,0 script #StartCaveFight2 324,{
if ($@wave_cave2 != 0) end;
if (Rossy_Quest < 15) goto L_Cheat;
if ($@battlecave2 == 1) goto L_Start;
@@ -199,7 +199,7 @@ L_Done:
}
// ------------------------------------ Cave 3 --------------------------------------
-025-4.gat,168,111,0 script #StartCaveFight3 324,{
+025-4.gat,164,103,0 script #StartCaveFight3 324,{
if ($@wave_cave3 != 0) end;
if (Rossy_Quest < 15) goto L_Cheat;
if ($@battlecave3 == 1) goto L_Start;
@@ -298,7 +298,7 @@ L_Done:
}
// --------------------------- Cave 4 --------------------------------
-025-4.gat,32,150,0 script #StartCaveFight4 324,{
+025-4.gat,39,143,0 script #StartCaveFight4 324,{
if ($@wave_cave4 != 0) end;
if (Rossy_Quest < 15) goto L_Cheat;
if ($@battlecave4 == 1) goto L_Start;
@@ -397,7 +397,7 @@ L_Done:
// ---------------------------- Cave 5 ------------------------------
-025-4.gat,100,154,0 script #StartCaveFight5 324,{
+025-4.gat,109,143,0 script #StartCaveFight5 324,{
if ($@wave_cave5 != 0) end;
if (Rossy_Quest < 15) goto L_Cheat;
if ($@battlecave5 == 1) goto L_Start;
@@ -496,7 +496,7 @@ L_Done:
// -------------------------------- Cave 6 -----------------------------------------
-025-4.gat,159,168,0 script #StartCaveFight6 324,{
+025-4.gat,162,162,0 script #StartCaveFight6 324,{
if ($@wave_cave6 != 0) end;
if (Rossy_Quest < 15) goto L_Cheat;
if ($@battlecave6 == 1) goto L_Start;
@@ -595,7 +595,7 @@ L_Done:
// -------------------------------- Cave 7 -----------------------------------
-025-4.gat,39,215,0 script #StartCaveFight7 324,{
+025-4.gat,44,202,0 script #StartCaveFight7 324,{
if ($@wave_cave7 != 0) end;
if (Rossy_Quest < 15) goto L_Cheat;
if ($@battlecave7 == 1) goto L_Start;
@@ -894,7 +894,7 @@ L_Done:
// --------------------- Boss Cave ----------------------------
-025-4.gat,157,42,0 script #StartBossCaveFight 325,{
+025-4.gat,157,30,0 script #StartBossCaveFight 325,{
if ($@wave_cave10 != 0) end;
if (Rossy_Quest >= 16) end;
if ($@battlebosscave == 1 && 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 && Rossy_Quest == 15) goto L_Start;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-14 06:47:44 +0000