summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/012-3.wlkbin109204 -> 109204 bytes
-rw-r--r--data/027-2.wlkbin2866 -> 19504 bytes
-rw-r--r--data/resnametable.txt1
-rw-r--r--npc/001-1_Tulimshar/sandra.txt2
-rw-r--r--npc/002-1_Sandstorm/_mobs.txt4
-rw-r--r--npc/002-1_Sandstorm/_warps.txt2
-rw-r--r--npc/002-3_Desert_mines/_mobs.txt2
-rw-r--r--npc/012-3_Cave/_mobs.txt19
-rw-r--r--npc/012-3_Cave/_warps.txt1
-rw-r--r--npc/021-2_Tulimshar/_import.txt6
-rw-r--r--npc/027-2_Caretakers_House/_warps.txt2
-rw-r--r--npc/_import.txt3
12 files changed, 33 insertions, 9 deletions
diff --git a/data/012-3.wlk b/data/012-3.wlk
index cca3d324..7ad06ed0 100644
--- a/data/012-3.wlk
+++ b/data/012-3.wlk
Binary files differ
diff --git a/data/027-2.wlk b/data/027-2.wlk
index e663406f..bda9e90e 100644
--- a/data/027-2.wlk
+++ b/data/027-2.wlk
Binary files differ
diff --git a/data/resnametable.txt b/data/resnametable.txt
index 5da60146..5e1d24c7 100644
--- a/data/resnametable.txt
+++ b/data/resnametable.txt
@@ -27,6 +27,7 @@
011-5.gat#011-5.wlk#
012-1.gat#012-1.wlk#
012-3.gat#012-3.wlk#
+012-4.gat#012-4.wlk#
013-1.gat#013-1.wlk#
013-2.gat#013-2.wlk#
013-3.gat#013-3.wlk#
diff --git a/npc/001-1_Tulimshar/sandra.txt b/npc/001-1_Tulimshar/sandra.txt
index 352e953b..29f92b28 100644
--- a/npc/001-1_Tulimshar/sandra.txt
+++ b/npc/001-1_Tulimshar/sandra.txt
@@ -82,7 +82,7 @@ L_Progress:
mes "\"Excellent!";
mes "You brought me 5 [Scorpion Stinger]s!\"";
getinventorylist;
- if ((@inventorylist_count - (countitem("ScorpionStinger") == 5) > 99) - (countitem("Arrow") == 0)) goto L_TooMany;
+ if ((@inventorylist_count - (countitem("ScorpionStinger") == 5) - (countitem("Arrow") == 0) > 99)) goto L_TooMany;
delitem "ScorpionStinger", 5;
getitem "Bow", 1;
getitem "Arrow", 100;
diff --git a/npc/002-1_Sandstorm/_mobs.txt b/npc/002-1_Sandstorm/_mobs.txt
index d216b246..d30b02c8 100644
--- a/npc/002-1_Sandstorm/_mobs.txt
+++ b/npc/002-1_Sandstorm/_mobs.txt
@@ -5,14 +5,14 @@
002-1.gat,94,35,11,4 monster Maggot 1002,3,100000,30000,Mob002-1::On1002
002-1.gat,68,59,7,6 monster Maggot 1002,3,100000,30000,Mob002-1::On1002
002-1.gat,57,86,15,8 monster Maggot 1002,3,100000,30000,Mob002-1::On1002
-002-1.gat,18,94,7,8 monster Maggot 1002,3,100000,30000,Mob002-1::On1002
+002-1.gat,19,94,7,8 monster Maggot 1002,3,100000,30000,Mob002-1::On1002
002-1.gat,44,35,3,2 monster Maggot 1002,3,100000,30000,Mob002-1::On1002
002-1.gat,38,29,3,2 monster Maggot 1002,3,100000,30000,Mob002-1::On1002
002-1.gat,62,91,24,6 monster Maggot 1002,3,100000,30000,Mob002-1::On1002
002-1.gat,61,74,41,43 monster Fire Goblin 1011,15,100000,30000,Mob002-1::On1011
002-1.gat,82,24,34,15 monster Scorpion 1003,8,100000,30000,Mob002-1::On1003
002-1.gat,32,35,34,33 monster Scorpion 1003,8,100000,30000,Mob002-1::On1003
-002-1.gat,29,81,22,43 monster Scorpion 1003,8,100000,30000,Mob002-1::On1003
+002-1.gat,27,81,22,43 monster Scorpion 1003,8,100000,30000,Mob002-1::On1003
002-1.gat,95,75,15,17 monster Black Scorpion 1009,1,100000,1800000,Mob002-1::On1009
diff --git a/npc/002-1_Sandstorm/_warps.txt b/npc/002-1_Sandstorm/_warps.txt
index fa86b539..b1a49bb8 100644
--- a/npc/002-1_Sandstorm/_warps.txt
+++ b/npc/002-1_Sandstorm/_warps.txt
@@ -1,6 +1,6 @@
// 002-1 Sandstorm warps
002-1.gat,58,12 warp ToTulimshar 3,-1,001-1.gat,44,80
-002-1.gat,108,79 warp ToEasternDesert -1,1,005-1.gat,23,40
+002-1.gat,108,79 warp ToEasternDesert -1,1,005-1.gat,23,40
002-1.gat,12,66 warp ToWesternDesert -1,3,003-1.gat,168,76
002-1.gat,28,13 warp ToBeach 1,-1,004-1.gat,84,111
diff --git a/npc/002-3_Desert_mines/_mobs.txt b/npc/002-3_Desert_mines/_mobs.txt
index d2509e8a..a5249e00 100644
--- a/npc/002-3_Desert_mines/_mobs.txt
+++ b/npc/002-3_Desert_mines/_mobs.txt
@@ -3,7 +3,7 @@
002-3.gat,39,37,14,10 monster Cave Maggot 1056,5,100000,30000,Mob002-3::On1056
002-3.gat,91,41,17,20 monster Ice Goblin 1058,3,100000,30000,Mob002-3::On1058
002-3.gat,71,35,25,17 monster Cave Maggot 1056,4,100000,30000,Mob002-3::On1056
-002-3.gat,69,100,8,5 monster Ice Goblin 1058,2,100000,30000,Mob002-3::On1058
+002-3.gat,68,100,8,5 monster Ice Goblin 1058,2,100000,30000,Mob002-3::On1058
002-3.gat,68,57,26,24 monster Angry Scorpion 1057,5,100000,30000,Mob002-3::On1057
002-3.gat,48,57,3,14 monster Angry Scorpion 1057,5,100000,30000,Mob002-3::On1057
002-3.gat,38,76,15,22 monster Angry Scorpion 1057,4,100000,30000,Mob002-3::On1057
diff --git a/npc/012-3_Cave/_mobs.txt b/npc/012-3_Cave/_mobs.txt
index 70c39e3d..e3a247f6 100644
--- a/npc/012-3_Cave/_mobs.txt
+++ b/npc/012-3_Cave/_mobs.txt
@@ -1,7 +1,26 @@
// 012-3 Cave mobs
+012-3.gat,447,65,17,7 monster Moggun 1061,5,100000,30000,Mob012-3::On1061
+012-3.gat,441,45,17,7 monster Moggun 1061,5,100000,30000,Mob012-3::On1061
+012-3.gat,411,30,17,7 monster Moggun 1061,5,100000,30000,Mob012-3::On1061
+012-3.gat,345,39,7,16 monster Moggun 1061,5,100000,30000,Mob012-3::On1061
+012-3.gat,362,101,16,18 monster Moggun 1061,10,100000,30000,Mob012-3::On1061
+012-3.gat,444,81,17,7 monster Moggun 1061,5,100000,30000,Mob012-3::On1061
+012-3.gat,387,137,17,7 monster Moggun 1061,5,100000,30000,Mob012-3::On1061
+012-3.gat,408,78,7,16 monster Moggun 1061,5,100000,30000,Mob012-3::On1061
+012-3.gat,382,151,17,7 monster Moggun 1061,5,100000,30000,Mob012-3::On1061
+012-3.gat,428,116,7,16 monster Moggun 1061,5,100000,30000,Mob012-3::On1061
+012-3.gat,329,100,7,16 monster Moggun 1061,5,100000,30000,Mob012-3::On1061
+012-3.gat,268,138,16,18 monster Moggun 1061,10,100000,30000,Mob012-3::On1061
+012-3.gat,188,51,16,18 monster Moggun 1061,10,100000,30000,Mob012-3::On1061
+012-3.gat,164,105,16,18 monster Moggun 1061,10,100000,30000,Mob012-3::On1061
012-3.gat,0,0,0 script Mob012-3 -1,{
+On1061:
+ set @mobID, 1061;
+ callfunc "MobPoints";
+ break;
+
end;
}
diff --git a/npc/012-3_Cave/_warps.txt b/npc/012-3_Cave/_warps.txt
index 58e842ba..044ea2b4 100644
--- a/npc/012-3_Cave/_warps.txt
+++ b/npc/012-3_Cave/_warps.txt
@@ -9,3 +9,4 @@
012-3.gat,371,46 warp CaveExit 0,-1,012-1.gat,51,40
012-3.gat,354,79 warp CaveExit 0,-1,012-1.gat,41,48
012-3.gat,473,104 warp CaveExit -1,1,012-1.gat,146,67
+012-3.gat,448,61 warp CaveExit -1,-1,012-4.gat,194,57
diff --git a/npc/021-2_Tulimshar/_import.txt b/npc/021-2_Tulimshar/_import.txt
index 3f8e80b7..f3711b3f 100644
--- a/npc/021-2_Tulimshar/_import.txt
+++ b/npc/021-2_Tulimshar/_import.txt
@@ -1,11 +1,11 @@
map: 021-2.gat
npc: npc/021-2_Tulimshar/_mobs.txt
npc: npc/021-2_Tulimshar/_warps.txt
-npc: npc/021-2_Tulimshar/furquest.txt
npc: npc/021-2_Tulimshar/bakery.txt
+npc: npc/021-2_Tulimshar/furquest.txt
npc: npc/021-2_Tulimshar/government_building.txt
-npc: npc/021-2_Tulimshar/mapflags.txt
-npc: npc/021-2_Tulimshar/workshop.txt
npc: npc/021-2_Tulimshar/heathin.txt
npc: npc/021-2_Tulimshar/inya.txt
npc: npc/021-2_Tulimshar/jhedia.txt
+npc: npc/021-2_Tulimshar/mapflags.txt
+npc: npc/021-2_Tulimshar/workshop.txt
diff --git a/npc/027-2_Caretakers_House/_warps.txt b/npc/027-2_Caretakers_House/_warps.txt
index 8b7af158..32db1af8 100644
--- a/npc/027-2_Caretakers_House/_warps.txt
+++ b/npc/027-2_Caretakers_House/_warps.txt
@@ -1,3 +1,3 @@
// 027-2 Caretaker's House warps
-027-2.gat,26,33 warp toGraveyard -1,-1,027-1.gat,88,85
+027-2.gat,25,32 warp toGraveyard -1,-1,027-1.gat,88,85
diff --git a/npc/_import.txt b/npc/_import.txt
index 36ade972..3053d543 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -26,6 +26,9 @@ import: npc/011-4_Lake_cave/_import.txt
import: npc/011-5/_import.txt
import: npc/012-1_Woodland_Hills/_import.txt
import: npc/012-3_Cave/_import.txt
+import: npc/012-4_Cave/_import.txt
+import: npc/012-5/_import.txt
+import: npc/012-6/_import.txt
import: npc/013-1_Woodland_hills/_import.txt
import: npc/013-2_Magic_house/_import.txt
import: npc/013-3_Cave/_import.txt