summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--db/mob_db.txt4
-rw-r--r--npc/Changelog.txt5
-rw-r--r--npc/mobs/airplane.txt7
-rw-r--r--npc/scripts_eamonsters.conf1
-rw-r--r--npc/scripts_monsters.conf1
-rw-r--r--npc/warps/other/airplane.txt6
6 files changed, 21 insertions, 3 deletions
diff --git a/db/mob_db.txt b/db/mob_db.txt
index afac37fce..8c8eb6065 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -650,8 +650,8 @@
1629,HILL_WIND,Hill Wind,Hill Wind,43,3189,0,1800,1100,1,290,480,10,15,1,42,31,50,51,23,10,12,1,2,64,671,200,336,540,432,0,0,0,0,0,0,0,0,517,1000,528,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4345,1
1630,BACSOJIN_,Bacsojin,White Lady,72,56380,0,5590,1659,1,560,1446,10,51,1,85,78,85,150,60,10,12,2,7,44,1973,130,576,960,480,2795,10000,607,5500,2513,2000,617,5000,1020,5500,603,5000,617,3000,7165,3000,7166,1000,747,500,0,0,2234,10,0,0,0,0
1631,CHUNG_E_,Chung E,Green Maiden,59,23900,0,4256,920,1,60,105,8,15,1,33,33,10,58,15,10,12,1,7,44,145,150,1728,816,1188,0,0,0,0,0,0,0,0,7053,4200,740,100,1806,10,518,500,0,0,0,0,0,0,5042,50,0,0,0,0
-1632,GREMLIN,Gremlin,Gremlin,53,9280,0,4355,1768,1,329,762,29,25,1,41,59,75,62,15,10,12,1,3,21,657,140,432,540,432,0,0,0,0,0,0,0,0,7340,3000,938,3000,719,100,2406,5,1265,1,0,0,0,0,603,2,0,0,4355,1
-1633,BEHOLDER,Beholder,Beholder,56,7950,0,4821,3822,1,723,812,17,30,1,62,25,59,85,32,10,12,1,3,21,657,190,336,840,360,0,0,0,0,0,0,0,0,576,3000,605,100,996,100,985,10,0,0,0,0,0,0,603,2,0,0,4356,1
+1632,GREMLIN,Gremlin,Gremlin,53,9280,0,4355,1768,1,329,762,29,25,1,41,59,75,62,15,10,12,2,6,47,657,140,432,540,432,0,0,0,0,0,0,0,0,7340,3000,938,3000,719,100,2406,5,1265,1,0,0,0,0,603,2,0,0,4355,1
+1633,BEHOLDER,Beholder,Beholder,56,7950,0,4821,3822,1,723,812,17,30,1,62,25,59,85,32,10,12,0,0,44,657,190,336,840,360,0,0,0,0,0,0,0,0,576,3000,605,100,996,100,985,10,0,0,0,0,0,0,603,2,0,0,4356,1
//Normal advanced class mobs
1634,SEYREN,Seyren,Seyren Windsor,91,88402,0,100000,116460,1,2100,2530,63,12,1,40,86,20,94,25,10,12,1,6,63,1693,170,76,384,288,0,0,0,0,0,0,0,0,7345,3000,13001,1,1163,300,603,50,2229,15,2317,2,1155,400,1474,1,0,0,4358,1
1635,EREMES,Eremes,Eremes Guile,87,60199,0,100000,99800,1,2020,2320,23,12,1,138,31,19,90,30,10,12,1,6,85,1693,180,76,384,288,0,0,0,0,0,0,0,0,7347,2000,603,50,1253,100,1262,7,1264,80,678,250,2336,5,2514,1,0,0,4360,1
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 96a8c3059..2603fa04c 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -38,6 +38,11 @@ Playtester
Date Added
======
+07/29
+ * Added temporary Beholder and Gremlin spawns [Playtester]
+ - their drops are needed but Airship quest isn't finished yet
+ - should be commented once Airship quest is finished
+ - also added two airship warps
07/27
* Fixed the Morroc ingredient seller to not appear [Playtester]
* Fixed some spawns and a warp in Sunken Ship [Playtester]
diff --git a/npc/mobs/airplane.txt b/npc/mobs/airplane.txt
new file mode 100644
index 000000000..ea3aca9d9
--- /dev/null
+++ b/npc/mobs/airplane.txt
@@ -0,0 +1,7 @@
+//Temporary spawns until Airship quest is finished
+
+airplane_01.gat,225,52,25,10 monster Gremlin 1632,9,7200000,3600000,1
+airplane_01.gat,225,52,25,10 monster Beholder 1633,6,7200000,3600000,1
+airplane_01.gat,225,52,25,10 monster Picky 1049,4,7200000,3600000,1
+airplane_01.gat,225,52,25,10 monster Familiar 1005,2,7200000,3600000,1
+airplane_01.gat,225,52,25,10 monster Drainliar 1111,1,7200000,3600000,1
diff --git a/npc/scripts_eamonsters.conf b/npc/scripts_eamonsters.conf
index 56bc5618c..0ea9c75b0 100644
--- a/npc/scripts_eamonsters.conf
+++ b/npc/scripts_eamonsters.conf
@@ -17,6 +17,7 @@
// --------------------------------------------------------------
npc: npc/mobs/citycleaners.txt
npc: npc/mobs/pvp.txt
+npc: npc/mobs/airplane.txt
npc: npc/eamobs/fields/comodo.txt
npc: npc/eamobs/fields/mjolnir.txt
diff --git a/npc/scripts_monsters.conf b/npc/scripts_monsters.conf
index 75fd34d84..207fa37ab 100644
--- a/npc/scripts_monsters.conf
+++ b/npc/scripts_monsters.conf
@@ -17,6 +17,7 @@
// --------------------------------------------------------------
npc: npc/mobs/citycleaners.txt
npc: npc/mobs/pvp.txt
+npc: npc/mobs/airplane.txt
npc: npc/mobs/fields/amatsu.txt
npc: npc/mobs/fields/ayothaya.txt
diff --git a/npc/warps/other/airplane.txt b/npc/warps/other/airplane.txt
index 9efc9b79a..1aaf072c2 100644
--- a/npc/warps/other/airplane.txt
+++ b/npc/warps/other/airplane.txt
@@ -72,4 +72,8 @@ airplane.gat,245,160,0 warp air_1wp02a 1,1,airplane.gat,214,54
airplane_01.gat,254,54,0 warp air_2wp01 1,1,airplane_01.gat,91,67
airplane_01.gat,87,67,0 warp air_2wp01a 1,1,airplane_01.gat,250,54
airplane_01.gat,208,53,0 warp air_2wp02 1,1,airplane_01.gat,239,160
-airplane_01.gat,245,160,0 warp air_2wp02a 1,1,airplane_01.gat,214,54 \ No newline at end of file
+airplane_01.gat,245,160,0 warp air_2wp02a 1,1,airplane_01.gat,214,54
+airplane_01.gat,104,199,0 warp air_2wp03 1,1,airplane_01.gat,105,72
+airplane_01.gat,103,72,0 warp air_2wp03a 1,1,airplane_01.gat,102,199
+airplane_01.gat,104,176,0 warp air_2wp03 1,1,airplane_01.gat,105,52
+airplane_01.gat,103,52,0 warp air_2wp03a 1,1,airplane_01.gat,102,176