summaryrefslogtreecommitdiff
path: root/world
diff options
context:
space:
mode:
Diffstat (limited to 'world')
-rw-r--r--world/map/data/001-2.wlkbin17224 -> 17224 bytes
-rw-r--r--world/map/data/080-1.wlkbin0 -> 40004 bytes
-rw-r--r--world/map/data/080-3.wlkbin0 -> 40004 bytes
-rw-r--r--world/map/data/081-1.wlkbin0 -> 16254 bytes
-rw-r--r--world/map/data/081-2.wlkbin0 -> 57924 bytes
-rw-r--r--world/map/data/081-3.wlkbin0 -> 6304 bytes
-rw-r--r--world/map/data/082-2.wlkbin0 -> 5504 bytes
-rw-r--r--world/map/data/082-3.wlkbin0 -> 40004 bytes
-rw-r--r--world/map/data/fermi.wlkbin0 -> 3604 bytes
-rw-r--r--world/map/data/guild.wlkbin0 -> 5629 bytes
-rw-r--r--world/map/data/prison.wlkbin0 -> 4804 bytes
-rw-r--r--world/map/data/resnametable.txt10
-rw-r--r--world/map/db/item_db.conf24
-rw-r--r--world/map/db/item_db_chest.txt6
-rw-r--r--world/map/db/item_db_foot.txt2
-rw-r--r--world/map/db/item_db_head.txt2
-rw-r--r--world/map/db/item_db_offhand.txt2
-rw-r--r--world/map/db/mob_db.conf8
-rw-r--r--world/map/db/mob_db_over_100.txt2
-rw-r--r--world/map/db/mob_db_over_150.txt6
-rw-r--r--world/map/npc/001-1/_warps.txt1
-rw-r--r--world/map/npc/001-2/_warps.txt2
-rw-r--r--world/map/npc/080-1/_import.txt6
-rw-r--r--world/map/npc/080-1/_mobs.txt3
-rw-r--r--world/map/npc/080-1/_nodes.txt4
-rw-r--r--world/map/npc/080-1/_warps.txt3
-rw-r--r--world/map/npc/080-3/_import.txt6
-rw-r--r--world/map/npc/080-3/_mobs.txt3
-rw-r--r--world/map/npc/080-3/_nodes.txt4
-rw-r--r--world/map/npc/080-3/_warps.txt4
-rw-r--r--world/map/npc/081-1/_import.txt6
-rw-r--r--world/map/npc/081-1/_mobs.txt3
-rw-r--r--world/map/npc/081-1/_nodes.txt4
-rw-r--r--world/map/npc/081-1/_warps.txt6
-rw-r--r--world/map/npc/081-2/_import.txt6
-rw-r--r--world/map/npc/081-2/_mobs.txt3
-rw-r--r--world/map/npc/081-2/_nodes.txt4
-rw-r--r--world/map/npc/081-2/_warps.txt5
-rw-r--r--world/map/npc/081-3/_import.txt6
-rw-r--r--world/map/npc/081-3/_mobs.txt3
-rw-r--r--world/map/npc/081-3/_nodes.txt4
-rw-r--r--world/map/npc/081-3/_warps.txt5
-rw-r--r--world/map/npc/082-2/_import.txt6
-rw-r--r--world/map/npc/082-2/_mobs.txt3
-rw-r--r--world/map/npc/082-2/_nodes.txt4
-rw-r--r--world/map/npc/082-2/_warps.txt9
-rw-r--r--world/map/npc/082-3/_import.txt6
-rw-r--r--world/map/npc/082-3/_mobs.txt3
-rw-r--r--world/map/npc/082-3/_nodes.txt4
-rw-r--r--world/map/npc/082-3/_warps.txt4
-rw-r--r--world/map/npc/_import.txt10
-rw-r--r--world/map/npc/fermi/_import.txt6
-rw-r--r--world/map/npc/fermi/_mobs.txt3
-rw-r--r--world/map/npc/fermi/_nodes.txt4
-rw-r--r--world/map/npc/fermi/_warps.txt5
-rw-r--r--world/map/npc/functions/treasure_hunt.txt11
-rw-r--r--world/map/npc/guild/_import.txt6
-rw-r--r--world/map/npc/guild/_mobs.txt3
-rw-r--r--world/map/npc/guild/_nodes.txt4
-rw-r--r--world/map/npc/guild/_warps.txt3
-rw-r--r--world/map/npc/prison/_import.txt6
-rw-r--r--world/map/npc/prison/_mobs.txt3
-rw-r--r--world/map/npc/prison/_nodes.txt4
-rw-r--r--world/map/npc/prison/_warps.txt4
64 files changed, 237 insertions, 27 deletions
diff --git a/world/map/data/001-2.wlk b/world/map/data/001-2.wlk
index 1db402b4..23af0d76 100644
--- a/world/map/data/001-2.wlk
+++ b/world/map/data/001-2.wlk
Binary files differ
diff --git a/world/map/data/080-1.wlk b/world/map/data/080-1.wlk
new file mode 100644
index 00000000..3a1f02c9
--- /dev/null
+++ b/world/map/data/080-1.wlk
Binary files differ
diff --git a/world/map/data/080-3.wlk b/world/map/data/080-3.wlk
new file mode 100644
index 00000000..102bdbee
--- /dev/null
+++ b/world/map/data/080-3.wlk
Binary files differ
diff --git a/world/map/data/081-1.wlk b/world/map/data/081-1.wlk
new file mode 100644
index 00000000..774f115d
--- /dev/null
+++ b/world/map/data/081-1.wlk
Binary files differ
diff --git a/world/map/data/081-2.wlk b/world/map/data/081-2.wlk
new file mode 100644
index 00000000..c5d6b7ee
--- /dev/null
+++ b/world/map/data/081-2.wlk
Binary files differ
diff --git a/world/map/data/081-3.wlk b/world/map/data/081-3.wlk
new file mode 100644
index 00000000..44510db5
--- /dev/null
+++ b/world/map/data/081-3.wlk
Binary files differ
diff --git a/world/map/data/082-2.wlk b/world/map/data/082-2.wlk
new file mode 100644
index 00000000..f8a1c319
--- /dev/null
+++ b/world/map/data/082-2.wlk
Binary files differ
diff --git a/world/map/data/082-3.wlk b/world/map/data/082-3.wlk
new file mode 100644
index 00000000..3726f7ef
--- /dev/null
+++ b/world/map/data/082-3.wlk
Binary files differ
diff --git a/world/map/data/fermi.wlk b/world/map/data/fermi.wlk
new file mode 100644
index 00000000..5e55dabd
--- /dev/null
+++ b/world/map/data/fermi.wlk
Binary files differ
diff --git a/world/map/data/guild.wlk b/world/map/data/guild.wlk
new file mode 100644
index 00000000..bd11ef86
--- /dev/null
+++ b/world/map/data/guild.wlk
Binary files differ
diff --git a/world/map/data/prison.wlk b/world/map/data/prison.wlk
new file mode 100644
index 00000000..249adb7e
--- /dev/null
+++ b/world/map/data/prison.wlk
Binary files differ
diff --git a/world/map/data/resnametable.txt b/world/map/data/resnametable.txt
index cfebd318..39e74814 100644
--- a/world/map/data/resnametable.txt
+++ b/world/map/data/resnametable.txt
@@ -120,6 +120,13 @@
069-2#069-2.wlk#
070-1#070-1.wlk#
070-3#070-3.wlk#
+080-1#080-1.wlk#
+080-3#080-3.wlk#
+081-1#081-1.wlk#
+081-2#081-2.wlk#
+081-3#081-3.wlk#
+082-2#082-2.wlk#
+082-3#082-3.wlk#
099-1#099-1.wlk#
099-2#099-2.wlk#
099-3#099-3.wlk#
@@ -129,3 +136,6 @@
099-7#099-7.wlk#
099-8#099-8.wlk#
botcheck#botcheck.wlk#
+fermi#fermi.wlk#
+guild#guild.wlk#
+prison#prison.wlk#
diff --git a/world/map/db/item_db.conf b/world/map/db/item_db.conf
index 4d006e21..153dd543 100644
--- a/world/map/db/item_db.conf
+++ b/world/map/db/item_db.conf
@@ -2012,8 +2012,8 @@ item_db: (
AegisName: "WarlordBoots"
Name: "WarlordBoots"
Type: "IT_ARMOR"
- Buy: 19000
- Sell: 2000
+ Buy: 141500
+ Sell: 70750
Weight: 550
Matk: -22
Def: 5
@@ -6066,8 +6066,8 @@ item_db: (
AegisName: "ChainmailShirt"
Name: "ChainmailShirt"
Type: "IT_ARMOR"
- Buy: 15000
- Sell: 1500
+ Buy: 83750
+ Sell: 41875
Weight: 800
Matk: -120
Def: 20
@@ -6084,8 +6084,8 @@ item_db: (
AegisName: "LightPlatemail"
Name: "LightPlatemail"
Type: "IT_ARMOR"
- Buy: 50000
- Sell: 2500
+ Buy: 192500
+ Sell: 96250
Weight: 1200
Matk: -150
Def: 25
@@ -6217,8 +6217,8 @@ item_db: (
AegisName: "WarlordPlate"
Name: "WarlordPlate"
Type: "IT_ARMOR"
- Buy: 100000
- Sell: 3000
+ Buy: 351250
+ Sell: 175625
Weight: 2600
Matk: -170
Def: 27
@@ -10947,8 +10947,8 @@ item_db: (
AegisName: "WarlordHelmet"
Name: "WarlordHelmet"
Type: "IT_ARMOR"
- Buy: 30000
- Sell: 3000
+ Buy: 85750
+ Sell: 42875
Weight: 900
Matk: -36
Def: 18
@@ -18460,8 +18460,8 @@ item_db: (
AegisName: "SteelShield"
Name: "SteelShield"
Type: "IT_ARMOR"
- Buy: 40000
- Sell: 3000
+ Buy: 100000
+ Sell: 50000
Weight: 2500
Matk: -200
Def: 20
diff --git a/world/map/db/item_db_chest.txt b/world/map/db/item_db_chest.txt
index 25c91cdb..dac8b7a0 100644
--- a/world/map/db/item_db_chest.txt
+++ b/world/map/db/item_db_chest.txt
@@ -6,15 +6,15 @@
546, DesertShirt, 5, 2000, 1000, 140, 0, 6, 0, -18, 0, 2, 512, 0, 0, 0, 0, {}, {}
564, Turtleneck, 5, 2000, 1000, 130, 0, 6, 0, -18, 0, 2, 512, 0, 0, 0, 0, {}, {}
624, VNeckSweater, 5, 6000, 3000, 135, 0, 8, 0, -24, 0, 2, 512, 0, 0, 0, 0, {}, {}
-625, ChainmailShirt, 5, 15000, 1500, 800, 0, 20, 0, -120, 0, 2, 512, 0, 0, 0, 0, {}, {}
-626, LightPlatemail, 5, 50000, 2500, 1200, 0, 25, 0, -150, 0, 2, 512, 0, 0, 0, 0, {}, {}
+625, ChainmailShirt, 5, 83750, 41875, 800, 0, 20, 0, -120, 0, 2, 512, 0, 0, 0, 0, {}, {}
+626, LightPlatemail, 5, 192500, 96250, 1200, 0, 25, 0, -150, 0, 2, 512, 0, 0, 0, 0, {}, {}
645, GoldenPlatemail, 5, 350000, 3000, 4500, 0, 25, 0, -100, 0, 2, 512, 0, 0, 0, 0, {}, {bonus bCriticalDef, 5;}
649, WhiteEvokersRobeBlue, 5, 8000, 4000, 50, 0, 5, 0, 20, 0, 2, 512, 0, 0, 0, 0, {}, {bonus bAgi, 1; bonus bCriticalDef, 10;}
650, BlackEvokersRobeBlue, 5, 8000, 4000, 50, 0, 5, 0, 20, 0, 2, 512, 0, 0, 0, 0, {}, {bonus bAgi, 1; bonus bCriticalDef, 10;}
651, WhiteWizardRobe, 5, 8000, 4000, 50, 0, 5, 0, 20, 0, 2, 512, 0, 0, 0, 0, {}, {}
652, BlackWizardRobe, 5, 8000, 4000, 50, 0, 5, 0, 20, 0, 2, 512, 0, 0, 0, 0, {}, {}
653, ApprenticeRobe, 5, 8000, 4000, 50, 0, 5, 0, 20, 0, 2, 512, 0, 0, 0, 0, {}, {bonus bAgi, 1; bonus bCriticalDef, 10;}
-658, WarlordPlate, 5, 100000, 3000, 2600, 0, 27, 0, -170, 0, 2, 512, 0, 0, 0, 0, {}, {}
+658, WarlordPlate, 5, 351250, 175625, 2600, 0, 27, 0, -170, 0, 2, 512, 0, 0, 0, 0, {}, {}
659, GoldenWarlordPlate, 5, 500000, 4000, 7600, 0, 27, 0, -110, 0, 2, 512, 0, 0, 0, 0, {}, {bonus bCriticalDef, 10;}
688, TankTop, 5, 800, 400, 10, 0, 2, 0, -4, 0, 2, 512, 0, 0, 0, 0, {}, {}
689, ShortTankTop, 5, 600, 300, 8, 0, 2, 0, -4, 0, 2, 512, 0, 0, 0, 0, {}, {}
diff --git a/world/map/db/item_db_foot.txt b/world/map/db/item_db_foot.txt
index 10f1d07c..c5754fbf 100644
--- a/world/map/db/item_db_foot.txt
+++ b/world/map/db/item_db_foot.txt
@@ -8,7 +8,7 @@
735, CottonBoots, 5, 2000, 500, 10, 0, 1, 0, 1, 0, 2, 64, 0, 0, 0, 0, {}, {}
757, AssassinBoots, 5, 7000, 2000, 10, 0, 3, 0, -3, 0, 2, 64, 0, 0, 0, 0, {}, {callfunc "BrawlingItem"; bonus bAgi, 4;}
792, BromenalBoots, 5, 8000, 500, 250, 0, 4, 0, -14, 0, 2, 64, 0, 0, 0, 0, {}, {}
-876, WarlordBoots, 5, 19000, 2000, 550, 0, 5, 0, -22, 0, 2, 64, 0, 0, 0, 0, {}, {}
+876, WarlordBoots, 5, 141500, 70750, 550, 0, 5, 0, -22, 0, 2, 64, 0, 0, 0, 0, {}, {}
1188, RedStockings, 5, 7000, 2000, 10, 0, 1, 0, 2, 0, 2, 64, 0, 0, 0, 0, {}, {}
2150, RedCottonBoots, 5, 2000, 500, 10, 0, 1, 0, 1, 0, 2, 64, 0, 0, 0, 0, {}, {}
2151, GreenCottonBoots, 5, 2000, 500, 10, 0, 1, 0, 1, 0, 2, 64, 0, 0, 0, 0, {}, {}
diff --git a/world/map/db/item_db_head.txt b/world/map/db/item_db_head.txt
index 374909c9..5d2470bb 100644
--- a/world/map/db/item_db_head.txt
+++ b/world/map/db/item_db_head.txt
@@ -23,7 +23,7 @@
633, ChristmasElfHat, 5, 3000, 1500, 30, 0, 13, 0, 2, 0, 2, 256, 0, 0, 0, 0, {}, {}
634, FaceMask, 5, 2500, 1250, 50, 0, 10, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {}
//ID, Name, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, Mode, {UseScript}, {EquipScript}
-636, WarlordHelmet, 5, 30000, 3000, 900, 0, 18, 0, -36, 0, 2, 256, 0, 0, 0, 0, {}, {}
+636, WarlordHelmet, 5, 85750, 42875, 900, 0, 18, 0, -36, 0, 2, 256, 0, 0, 0, 0, {}, {}
637, KnightsHelmet, 5, 20000, 2000, 600, 0, 15, 0, -30, 0, 2, 256, 0, 0, 0, 0, {}, {}
638, InfantryHelmet, 5, 15000, 1500, 400, 0, 15, 0, -30, 0, 2, 256, 0, 0, 0, 0, {}, {}
639, CrusadeHelmet, 5, 25000, 2500, 1300, 0, 18, 0, -36, 0, 2, 256, 0, 0, 0, 0, {}, {}
diff --git a/world/map/db/item_db_offhand.txt b/world/map/db/item_db_offhand.txt
index 52e500df..9bf9996b 100644
--- a/world/map/db/item_db_offhand.txt
+++ b/world/map/db/item_db_offhand.txt
@@ -3,7 +3,7 @@
//Edit item_db.conf instead!
//ID, Name, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, Mode, {UseScript}, {EquipScript}
585, ScarabArmlet, 5, 8000, 4000, 200, 0, 0, 0, 5, 0, 2, 32, 0, 1, 0, 0, {}, {bonus bInt, 1;}
-601, SteelShield, 5, 40000, 3000, 2500, 0, 20, 0, -200, 0, 2, 32, 0, 0, 0, 0, {}, {}
+601, SteelShield, 5, 100000, 50000, 2500, 0, 20, 0, -200, 0, 2, 32, 0, 0, 0, 0, {}, {}
602, WoodenShield, 5, 10000, 2000, 1500, 0, 14, 0, -70, 0, 2, 32, 0, 0, 0, 0, {}, {}
603, LeatherShield, 5, 2000, 1000, 1300, 0, 7, 0, -35, 0, 2, 32, 0, 0, 0, 0, {}, {}
//797, BromenalShield, 5, 40000, 3000, 2000, 0, 18, 0, -160, 0, 2, 32, 0, 0, 0, 0, {}, {}
diff --git a/world/map/db/mob_db.conf b/world/map/db/mob_db.conf
index 256c8e99..c97b044f 100644
--- a/world/map/db/mob_db.conf
+++ b/world/map/db/mob_db.conf
@@ -2541,6 +2541,7 @@ mob_db: (
GambogeScroll: 10
MauveScroll: 10
JoyplimScroll: 10
+ PointyWitchHat: 1
}
},
{
@@ -3447,6 +3448,7 @@ mob_db: (
GambogeScroll: 10
MauveScroll: 10
JoyplimScroll: 10
+ PointyWitchHat: 1
}
},
{
@@ -3664,6 +3666,9 @@ mob_db: (
AttackDelay: 672
AttackMotion: 672
DamageMotion: 50
+ Drops: {
+ PointyWitchHat: 1
+ }
},
{
Id: 1143
@@ -4552,6 +4557,9 @@ mob_db: (
AttackDelay: 672
AttackMotion: 672
DamageMotion: 50
+ Drops: {
+ PointyWitchHat: 1
+ }
},
{
Id: 1004
diff --git a/world/map/db/mob_db_over_100.txt b/world/map/db/mob_db_over_100.txt
index 443361a6..25e90507 100644
--- a/world/map/db/mob_db_over_100.txt
+++ b/world/map/db/mob_db_over_100.txt
@@ -20,7 +20,7 @@
1072, Yeti, Yeti, 100, 8500, 0, 9040, 726, 2, 100, 400, 60, 15, 0, 60, 5, 45, 15, 60, 32, 9, 10, 1, 0, 31, 135, 220, 1200, 672, 900, 4023, 700, 4024, 300, 4025, 400, 4027, 142, 4021, 800, 4022, 700, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30
1075, Stalker, Stalker, 120, 20000, 0, 15628, 4000, 2, 220, 500, 23, 30, 0, 35, 15, 3, 50, 50, 50, 2, 10, 1, 1, 17, 175, 340, 1800, 672, 950, 775, 75, 775, 115, 776, 135, 631, 40, 778, 500, 1198, 500, 5116, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 20
1096, SoulSnake, SoulSnake, 115, 850, 0, 325, 56, 1, 75, 90, 4, 6, 0, 20, 11, 10, 10, 35, 10, 9, 10, 1, 0, 10, 137, 900, 1300, 672, 480, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30
-1102, Luvia, Luvia, 127, 48044, 60, 315973, 12172, 5, 339, 364, 50, 92, 0, 1, 29, 55, 255, 255, 255, 31, 10, 1, 1, 37, 181, 220, 1200, 672, 50, 5141, 10, 5142, 10, 5143, 10, 5144, 10, 5145, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+1102, Luvia, Luvia, 127, 48044, 60, 315973, 12172, 5, 339, 364, 50, 92, 0, 1, 29, 55, 255, 255, 255, 31, 10, 1, 1, 37, 181, 220, 1200, 672, 50, 5141, 10, 5142, 10, 5143, 10, 5144, 10, 5145, 10, 5200, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
1106, WickedMushroom, WickedMushroom, 110, 550, 0, 220, 30, 1, 70, 80, 4, 4, 0, 16, 12, 10, 10, 35, 10, 9, 10, 1, 3, 12, 133, 800, 1800, 672, 480, 613, 600, 4007, 50, 567, 100, 566, 1000, 5334, 30, 5360, 100, 5145, 40, 5397, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 60
//ID, Name, Jname, LV, HP, SP, EXP, JEXP, Range1, ATK1, ATK2, DEF, MDEF, CRITDEF,STR, AGI, VIT, INT, DEX, LUK, Range2, Range3, Scale, Race, Element,Mode, Speed, Adelay, Amotion,Dmotion,Drop0id,Drop0%, Drop1id,Drop1%, Drop2id,Drop2%, Drop3id,Drop3%, Drop4id,Drop4%, Drop5id,Drop5%, Drop6id,Drop6%, Drop7id,Drop7%, Drop8id,Drop8%, Drop9id,Drop9%, Item1, Item2, MEXP, ExpPer, MVP1id, MVP1per,MVP2id, MVP2per,MVP3id, MVP3per,mutationcount,mutationstrength
1114, Nutcracker, Nutcracker, 110, 6000, 0, 4226, 769, 1, 81, 281, 20, 37, 0, 40, 20, 10, 5, 60, 40, 9, 10, 1, 1, 17, 133, 400, 872, 672, 900, 569, 1000, 660, 750, 539, 750, 503, 250, 640, 200, 4004, 200, 4001, 600, 1190, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30
diff --git a/world/map/db/mob_db_over_150.txt b/world/map/db/mob_db_over_150.txt
index a77baaa5..4021a887 100644
--- a/world/map/db/mob_db_over_150.txt
+++ b/world/map/db/mob_db_over_150.txt
@@ -11,12 +11,12 @@
1121, Grenadier, Grenadier, 170, 6000, 0, 4332, 999, 6, 100, 200, 8, 50, 0, 12, 10, 50, 60, 90, 70, 9, 10, 1, 0, 10, 143, 500, 2000, 672, 480, 539, 1000, 657, 1000, 701, 500, 704, 250, 700, 250, 617, 100, 765, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 40
1122, DreadPirateMarley, DreadPirateMarley, 180, 10000, 0, 17612, 20000, 6, 175, 250, 38, 32, 0, 10, 20, 40, 20, 90, 80, 9, 10, 1, 0, 10, 175, 400, 700, 672, 480, 539, 1000, 657, 1000, 701, 500, 704, 250, 700, 250, 621, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
1134, SUSAN, SUSAN, 255, 696969, 0, 69000, 1400, 1, 0, 0, 69, 69, 0, 69, 69, 69, 69, 69, 69, 9, 10, 1, 1, 17, 161, 1500, 1872, 672, 480, 838, 6000, 839, 6000, 840, 6000, 1229, 200, 1230, 500, 1231, 500, 1232, 500, 1281, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30
-1137, Tormenta, Tormenta, 200, 18000, 60, 500000, 5000, 5, 360, 374, 48, 70, 0, 1, 32, 60, 255, 255, 255, 31, 10, 1, 1, 37, 181, 210, 1200, 672, 50, 5141, 10, 5142, 10, 5143, 10, 5144, 10, 5145, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+1137, Tormenta, Tormenta, 200, 18000, 60, 500000, 5000, 5, 360, 374, 48, 70, 0, 1, 32, 60, 255, 255, 255, 31, 10, 1, 1, 37, 181, 210, 1200, 672, 50, 5141, 10, 5142, 10, 5143, 10, 5144, 10, 5145, 10, 5200, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
1138, ManaGuard, ManaGuard, 180, 20000, 280, 27000, 5000, 2, 280, 324, 22, 67, 0, 31, 22, 90, 127, 255, 95, 31, 10, 1, 1, 37, 181, 210, 1200, 672, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
1139, Virus, Virus, 170, 5000, 0, 5254, 721, 6, 45, 75, 37, 12, 0, 30, 30, 20, 20, 25, 60, 9, 10, 1, 3, 12, 143, 600, 1872, 672, 480, 787, 500, 743, 1100, 5236, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
1140, Tengu, Tengu, 180, 24000, 280, 45000, 5000, 2, 180, 224, 67, 9, 0, 31, 22, 90, 97, 255, 95, 31, 10, 1, 1, 37, 181, 310, 1200, 672, 50, 825, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
1141, Sasquatch, Sasquatch, 180, 24000, 280, 45000, 5000, 2, 420, 444, 12, 27, 0, 31, 22, 90, 97, 255, 95, 31, 10, 1, 1, 37, 181, 310, 1200, 672, 50, 825, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-1142, Kage, Kage, 200, 29999, 280, 999999, 99999, 9, 90, 124, 74, 100, 0, 199, 2, 199, 197, 255, 175, 31, 10, 1, 1, 37, 181, 210, 672, 672, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+1142, Kage, Kage, 200, 29999, 280, 999999, 99999, 9, 90, 124, 74, 100, 0, 199, 2, 199, 197, 255, 175, 31, 10, 1, 1, 37, 181, 210, 672, 672, 50, 5200, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
1143, ManaSlayer, ManaSlayer, 180, 24000, 280, 42000, 5000, 2, 260, 274, 22, 67, 0, 31, 22, 90, 127, 255, 95, 31, 10, 1, 1, 37, 181, 210, 1200, 672, 50, 825, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
1144, Dragon, Dragon, 250, 29999, 280, 1, 1, 3, 60, 90, 67, 67, 0, 199, 2, 199, 197, 255, 95, 31, 10, 1, 1, 37, 181, 210, 1200, 672, 50, 759, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
1145, KageGolem, KageGolem, 180, 29999, 280, 150000, 15000, 6, 140, 174, 72, 55, 0, 31, 22, 90, 127, 255, 125, 31, 10, 1, 1, 37, 181, 410, 1000, 672, 50, 5251, 10000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
@@ -26,7 +26,7 @@
1148, DoomGolem, DoomGolem, 180, 22000, 280, 65000, 2000, 3, 160, 180, 60, 30, 0, 31, 22, 90, 127, 255, 105, 31, 10, 1, 1, 37, 181, 320, 1000, 672, 50, 666, 30, 5253, 2, 5258, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 10
1149, Enchanter, Enchanter, 181, 19000, 280, 55000, 2000, 8, 140, 180, 30, 60, 0, 31, 22, 90, 127, 255, 105, 31, 10, 1, 1, 37, 181, 240, 800, 672, 50, 1199, 5000, 529, 5000, 5290, 50, 666, 30, 1227, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 10
1150, ManaTyrant, ManaTyrant, 180, 24000, 280, 27000, 5000, 2, 300, 325, 42, 67, 0, 31, 22, 90, 127, 255, 95, 31, 10, 1, 1, 37, 181, 180, 1050, 672, 50, 759, 1, 5237, 20, 1253, 5, 720, 100, 825, 500, 868, 20, 1172, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-1161, Xakelbael, Xakelbael, 200, 29999, 280, 999999, 99999, 9, 90, 124, 74, 100, 0, 199, 2, 199, 197, 255, 175, 31, 10, 1, 1, 37, 181, 210, 672, 672, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+1161, Xakelbael, Xakelbael, 200, 29999, 280, 999999, 99999, 9, 90, 124, 74, 100, 0, 199, 2, 199, 197, 255, 175, 31, 10, 1, 1, 37, 181, 210, 672, 672, 50, 5200, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
1170, CrystalGolem, CrystalGolem, 180, 25000, 280, 68000, 2200, 3, 170, 190, 75, 40, 0, 35, 26, 99, 127, 255, 105, 31, 30, 1, 0, 46, 169, 320, 1000, 672, 50, 5384, 400, 5384, 200, 5384, 100, 4002, 50, 4003, 50, 4004, 50, 4005, 50, 4006, 50, 4007, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
1171, BlackCrystalGolem, BlackCrystalGolem, 180, 25000, 280, 68000, 2200, 3, 170, 190, 75, 40, 0, 35, 26, 99, 127, 255, 105, 31, 30, 1, 0, 46, 169, 320, 1000, 672, 50, 5385, 400, 5385, 200, 5385, 100, 4002, 50, 4003, 50, 4004, 50, 4005, 50, 4006, 50, 4007, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
1183, MobMoubootaur, MobMoubootaur, 220, 99999, 9999, 999999, 99999, 1, 400, 500, 99, 99, 0, 99, 60, 99, 30, 255, 255, 18, 18, 1, 6, 47, 165, 240, 872, 272, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
diff --git a/world/map/npc/001-1/_warps.txt b/world/map/npc/001-1/_warps.txt
index 2b3f2dfd..8c648d70 100644
--- a/world/map/npc/001-1/_warps.txt
+++ b/world/map/npc/001-1/_warps.txt
@@ -7,6 +7,7 @@
001-1,52,71|warp|-1,-1,001-2,28,27
001-1,49,71|warp|-1,-1,001-2,25,27
001-1,114,99|warp|-1,-1,001-2,25,64
+001-1,114,82|warp|-1,-1,001-2,57,52
001-1,27,32|warp|-1,-1,001-2,28,101
001-1,37,32|warp|-1,-1,001-2,71,101
001-1,55,34|warp|0,-1,001-2,104,101
diff --git a/world/map/npc/001-2/_warps.txt b/world/map/npc/001-2/_warps.txt
index 07ebce6d..9eef0564 100644
--- a/world/map/npc/001-2/_warps.txt
+++ b/world/map/npc/001-2/_warps.txt
@@ -16,3 +16,5 @@
001-2,57,90|warp|-1,-1,001-2,35,94
001-2,36,95|warp|-1,0,001-2,58,90
001-2,65,26|warp|-1,-1,001-1,59,99
+001-2,60,50|warp|-1,-1,prison,46,23
+001-2,57,53|warp|-1,-1,001-1,114,83
diff --git a/world/map/npc/080-1/_import.txt b/world/map/npc/080-1/_import.txt
new file mode 100644
index 00000000..cafaba0c
--- /dev/null
+++ b/world/map/npc/080-1/_import.txt
@@ -0,0 +1,6 @@
+// Map 080-1: Mysterious Glade
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 080-1
+npc: npc/080-1/_mobs.txt
+npc: npc/080-1/_nodes.txt
+npc: npc/080-1/_warps.txt
diff --git a/world/map/npc/080-1/_mobs.txt b/world/map/npc/080-1/_mobs.txt
new file mode 100644
index 00000000..6fc52fa7
--- /dev/null
+++ b/world/map/npc/080-1/_mobs.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Mysterious Glade mobs
+
diff --git a/world/map/npc/080-1/_nodes.txt b/world/map/npc/080-1/_nodes.txt
new file mode 100644
index 00000000..449b6975
--- /dev/null
+++ b/world/map/npc/080-1/_nodes.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Mysterious Glade nodes
+
+// (no nodes)
diff --git a/world/map/npc/080-1/_warps.txt b/world/map/npc/080-1/_warps.txt
new file mode 100644
index 00000000..97de0f6f
--- /dev/null
+++ b/world/map/npc/080-1/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Mysterious Glade warps
+
diff --git a/world/map/npc/080-3/_import.txt b/world/map/npc/080-3/_import.txt
new file mode 100644
index 00000000..593a5e46
--- /dev/null
+++ b/world/map/npc/080-3/_import.txt
@@ -0,0 +1,6 @@
+// Map 080-3: Forgotten Glade
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 080-3
+npc: npc/080-3/_mobs.txt
+npc: npc/080-3/_nodes.txt
+npc: npc/080-3/_warps.txt
diff --git a/world/map/npc/080-3/_mobs.txt b/world/map/npc/080-3/_mobs.txt
new file mode 100644
index 00000000..5fce2024
--- /dev/null
+++ b/world/map/npc/080-3/_mobs.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Forgotten Glade mobs
+
diff --git a/world/map/npc/080-3/_nodes.txt b/world/map/npc/080-3/_nodes.txt
new file mode 100644
index 00000000..c809d136
--- /dev/null
+++ b/world/map/npc/080-3/_nodes.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Forgotten Glade nodes
+
+// (no nodes)
diff --git a/world/map/npc/080-3/_warps.txt b/world/map/npc/080-3/_warps.txt
new file mode 100644
index 00000000..e6ecce07
--- /dev/null
+++ b/world/map/npc/080-3/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Forgotten Glade warps
+
+080-3,84,155|warp|0,-1,081-3,44,23
diff --git a/world/map/npc/081-1/_import.txt b/world/map/npc/081-1/_import.txt
new file mode 100644
index 00000000..f35b3648
--- /dev/null
+++ b/world/map/npc/081-1/_import.txt
@@ -0,0 +1,6 @@
+// Map 081-1: Aethyr
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 081-1
+npc: npc/081-1/_mobs.txt
+npc: npc/081-1/_nodes.txt
+npc: npc/081-1/_warps.txt
diff --git a/world/map/npc/081-1/_mobs.txt b/world/map/npc/081-1/_mobs.txt
new file mode 100644
index 00000000..27f6cc97
--- /dev/null
+++ b/world/map/npc/081-1/_mobs.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Aethyr mobs
+
diff --git a/world/map/npc/081-1/_nodes.txt b/world/map/npc/081-1/_nodes.txt
new file mode 100644
index 00000000..4eb18abe
--- /dev/null
+++ b/world/map/npc/081-1/_nodes.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Aethyr nodes
+
+// (no nodes)
diff --git a/world/map/npc/081-1/_warps.txt b/world/map/npc/081-1/_warps.txt
new file mode 100644
index 00000000..e56660cc
--- /dev/null
+++ b/world/map/npc/081-1/_warps.txt
@@ -0,0 +1,6 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Aethyr warps
+
+081-1,68,30|warp|-1,-1,081-2,90,298
+081-1,58,104|warp|-1,-1,020-1,84,75
+081-1,44,89|warp|-1,-1,082-2,88,25
diff --git a/world/map/npc/081-2/_import.txt b/world/map/npc/081-2/_import.txt
new file mode 100644
index 00000000..60017ade
--- /dev/null
+++ b/world/map/npc/081-2/_import.txt
@@ -0,0 +1,6 @@
+// Map 081-2: Northern Lights
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 081-2
+npc: npc/081-2/_mobs.txt
+npc: npc/081-2/_nodes.txt
+npc: npc/081-2/_warps.txt
diff --git a/world/map/npc/081-2/_mobs.txt b/world/map/npc/081-2/_mobs.txt
new file mode 100644
index 00000000..fa19192a
--- /dev/null
+++ b/world/map/npc/081-2/_mobs.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Northern Lights mobs
+
diff --git a/world/map/npc/081-2/_nodes.txt b/world/map/npc/081-2/_nodes.txt
new file mode 100644
index 00000000..b4162204
--- /dev/null
+++ b/world/map/npc/081-2/_nodes.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Northern Lights nodes
+
+// (no nodes)
diff --git a/world/map/npc/081-2/_warps.txt b/world/map/npc/081-2/_warps.txt
new file mode 100644
index 00000000..0f47357f
--- /dev/null
+++ b/world/map/npc/081-2/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Northern Lights warps
+
+081-2,90,20|warp|-1,-1,081-3,44,50
+081-2,90,299|warp|-1,-1,081-1,68,31
diff --git a/world/map/npc/081-3/_import.txt b/world/map/npc/081-3/_import.txt
new file mode 100644
index 00000000..237a93c5
--- /dev/null
+++ b/world/map/npc/081-3/_import.txt
@@ -0,0 +1,6 @@
+// Map 081-3: Existential Frontier
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 081-3
+npc: npc/081-3/_mobs.txt
+npc: npc/081-3/_nodes.txt
+npc: npc/081-3/_warps.txt
diff --git a/world/map/npc/081-3/_mobs.txt b/world/map/npc/081-3/_mobs.txt
new file mode 100644
index 00000000..6493e765
--- /dev/null
+++ b/world/map/npc/081-3/_mobs.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Existential Frontier mobs
+
diff --git a/world/map/npc/081-3/_nodes.txt b/world/map/npc/081-3/_nodes.txt
new file mode 100644
index 00000000..5ca051db
--- /dev/null
+++ b/world/map/npc/081-3/_nodes.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Existential Frontier nodes
+
+// (no nodes)
diff --git a/world/map/npc/081-3/_warps.txt b/world/map/npc/081-3/_warps.txt
new file mode 100644
index 00000000..fcca59a7
--- /dev/null
+++ b/world/map/npc/081-3/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Existential Frontier warps
+
+081-3,44,22|warp|-1,-1,080-3,84,154
+081-3,44,51|warp|-1,-1,081-2,90,21
diff --git a/world/map/npc/082-2/_import.txt b/world/map/npc/082-2/_import.txt
new file mode 100644
index 00000000..5d5646d1
--- /dev/null
+++ b/world/map/npc/082-2/_import.txt
@@ -0,0 +1,6 @@
+// Map 082-2: Porthos - Frontier
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 082-2
+npc: npc/082-2/_mobs.txt
+npc: npc/082-2/_nodes.txt
+npc: npc/082-2/_warps.txt
diff --git a/world/map/npc/082-2/_mobs.txt b/world/map/npc/082-2/_mobs.txt
new file mode 100644
index 00000000..689ad2b7
--- /dev/null
+++ b/world/map/npc/082-2/_mobs.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Porthos - Frontier mobs
+
diff --git a/world/map/npc/082-2/_nodes.txt b/world/map/npc/082-2/_nodes.txt
new file mode 100644
index 00000000..9b2e0796
--- /dev/null
+++ b/world/map/npc/082-2/_nodes.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Porthos - Frontier nodes
+
+// (no nodes)
diff --git a/world/map/npc/082-2/_warps.txt b/world/map/npc/082-2/_warps.txt
new file mode 100644
index 00000000..249afc27
--- /dev/null
+++ b/world/map/npc/082-2/_warps.txt
@@ -0,0 +1,9 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Porthos - Frontier warps
+
+082-2,81,13|warp|-1,-1,000-1,22,22
+082-2,44,13|warp|-1,-1,000-1,22,22
+082-2,55,33|warp|-1,-1,000-1,22,22
+082-2,57,12|warp|-1,-1,000-1,22,22
+082-2,28,16|warp|-1,-1,082-3,111,35
+082-2,88,26|warp|-1,-1,081-1,44,90
diff --git a/world/map/npc/082-3/_import.txt b/world/map/npc/082-3/_import.txt
new file mode 100644
index 00000000..6f883e7e
--- /dev/null
+++ b/world/map/npc/082-3/_import.txt
@@ -0,0 +1,6 @@
+// Map 082-3: Aether Caves
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 082-3
+npc: npc/082-3/_mobs.txt
+npc: npc/082-3/_nodes.txt
+npc: npc/082-3/_warps.txt
diff --git a/world/map/npc/082-3/_mobs.txt b/world/map/npc/082-3/_mobs.txt
new file mode 100644
index 00000000..9d8f3638
--- /dev/null
+++ b/world/map/npc/082-3/_mobs.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Aether Caves mobs
+
diff --git a/world/map/npc/082-3/_nodes.txt b/world/map/npc/082-3/_nodes.txt
new file mode 100644
index 00000000..1de2e9c5
--- /dev/null
+++ b/world/map/npc/082-3/_nodes.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Aether Caves nodes
+
+// (no nodes)
diff --git a/world/map/npc/082-3/_warps.txt b/world/map/npc/082-3/_warps.txt
new file mode 100644
index 00000000..8bfc67ad
--- /dev/null
+++ b/world/map/npc/082-3/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Aether Caves warps
+
+082-3,111,34|warp|-1,-1,082-2,28,17
diff --git a/world/map/npc/_import.txt b/world/map/npc/_import.txt
index 2e832cdb..835d6613 100644
--- a/world/map/npc/_import.txt
+++ b/world/map/npc/_import.txt
@@ -122,6 +122,13 @@ import: npc/058-2/_import.txt
import: npc/069-2/_import.txt
import: npc/070-1/_import.txt
import: npc/070-3/_import.txt
+import: npc/080-1/_import.txt
+import: npc/080-3/_import.txt
+import: npc/081-1/_import.txt
+import: npc/081-2/_import.txt
+import: npc/081-3/_import.txt
+import: npc/082-2/_import.txt
+import: npc/082-3/_import.txt
import: npc/099-1/_import.txt
import: npc/099-2/_import.txt
import: npc/099-3/_import.txt
@@ -131,3 +138,6 @@ import: npc/099-6/_import.txt
import: npc/099-7/_import.txt
import: npc/099-8/_import.txt
import: npc/botcheck/_import.txt
+import: npc/fermi/_import.txt
+import: npc/guild/_import.txt
+import: npc/prison/_import.txt
diff --git a/world/map/npc/fermi/_import.txt b/world/map/npc/fermi/_import.txt
new file mode 100644
index 00000000..3860cda1
--- /dev/null
+++ b/world/map/npc/fermi/_import.txt
@@ -0,0 +1,6 @@
+// Map fermi: Three Fermi Land
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: fermi
+npc: npc/fermi/_mobs.txt
+npc: npc/fermi/_nodes.txt
+npc: npc/fermi/_warps.txt
diff --git a/world/map/npc/fermi/_mobs.txt b/world/map/npc/fermi/_mobs.txt
new file mode 100644
index 00000000..d49b9534
--- /dev/null
+++ b/world/map/npc/fermi/_mobs.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Three Fermi Land mobs
+
diff --git a/world/map/npc/fermi/_nodes.txt b/world/map/npc/fermi/_nodes.txt
new file mode 100644
index 00000000..2f3e21fc
--- /dev/null
+++ b/world/map/npc/fermi/_nodes.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Three Fermi Land nodes
+
+// (no nodes)
diff --git a/world/map/npc/fermi/_warps.txt b/world/map/npc/fermi/_warps.txt
new file mode 100644
index 00000000..a8a14cb8
--- /dev/null
+++ b/world/map/npc/fermi/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Three Fermi Land warps
+
+fermi,29,19|warp|-1,-1,017-9,32,31
+fermi,21,19|warp|-1,-1,009-1,42,44
diff --git a/world/map/npc/functions/treasure_hunt.txt b/world/map/npc/functions/treasure_hunt.txt
index 4db5d2ef..0e97adce 100644
--- a/world/map/npc/functions/treasure_hunt.txt
+++ b/world/map/npc/functions/treasure_hunt.txt
@@ -103,8 +103,8 @@ OnDig:
mobcount($TREASURE_MAP$, "TreasureDigAux::OnMobKill") +
mobcount($TREASURE_MAP$, "TreasureDigAux::OnPirateKill");
if ($TREASURE_DEBUG) debugmes "OnDig: mob count = " + @treasureMobs;
- if (@treasureMobs > 220) message strcharinfo(0), "Its too crowded here to dig! Perhaps kill some mob first?";
- if (@treasureMobs > 220) end; // Do not let users spam server by mobs indefinitely
+ if (@treasureMobs > 300) message strcharinfo(0), "Its too crowded here to dig! Perhaps kill some mob first?";
+ if (@treasureMobs > 300) end; // Do not let users spam server by mobs indefinitely
set .@puppet$, "#"+strnpcinfo(0)+"#"+BL_ID;
set .@puppet, puppet(getmap(), POS_X, POS_Y, .@puppet$, 127);
if (.@puppet < 1) end; // It also denies player launching N instances at once.
@@ -206,6 +206,7 @@ OnBootyRound:
L_Finalize:
addtimer 0, "TreasureDigAux::OnMainBooty", .digger; // Hand over to final reward handler.
+ mapannounce strnpcinfo(3), "Treasure : Digger " + .diggernm$ + " found treasure!", 0;
npctalk strnpcinfo(0), "Digging : ##3##B [TREASURE] Victory! Treasure hunter " + .diggernm$ + " got booty!";
destroy;
@@ -222,7 +223,7 @@ OnInit:
// Main digging round handling logic happens here, spawns + dig fallouts
// Input: Arg0: round #
// Arg1: players str
-// Returns: 0 if all ok, 1 = failure,
+// Returns: 0 if all ok, 1 = failure, 9 = max round reached.
function|script|treasure_dig_round
{
set .@round, getarg(0, -1);
@@ -432,7 +433,7 @@ OnPlayerEstimate:
// Emit few collateral items spawner
OnCollateral1:
if ($TREASURE_DEBUG) debugmes "OnCollateral1";
- setarray .@items1[0], SulphurPowder, IronPowder, BlackScorpionStinger;
+ setarray .@items1[0], SulphurPowder, IronPowder, BlackScorpionStinger, TreasureKey, Bone, Skull;
set .@itemID, .@items1[rand(getarraysize(.@items1))]; // random collateral
if ($TREASURE_DEBUG) debugmes "OnCollateral1 .@itemID=" + .@itemID;
makeitem .@itemID, 1, getmap(), rand(POS_X-2,POS_X+2), rand(POS_Y-2,POS_Y+2);
@@ -441,7 +442,7 @@ OnCollateral1:
// Emit plenty of collateral items spawner (treasure reward mode)
OnCollateral10:
if ($TREASURE_DEBUG) debugmes "OnCollateral10";
- setarray .@items10[0], Pearl, Sapphire, Amethyst, GoldenTooth, GoldOre;
+ setarray .@items10[0], Pearl, Sapphire, Amethyst, GoldenTooth, GoldOre, CoinBag;
set .@count, 0;
goto L_RandomItems;
diff --git a/world/map/npc/guild/_import.txt b/world/map/npc/guild/_import.txt
new file mode 100644
index 00000000..80ea053b
--- /dev/null
+++ b/world/map/npc/guild/_import.txt
@@ -0,0 +1,6 @@
+// Map guild: Guild Bot Area
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: guild
+npc: npc/guild/_mobs.txt
+npc: npc/guild/_nodes.txt
+npc: npc/guild/_warps.txt
diff --git a/world/map/npc/guild/_mobs.txt b/world/map/npc/guild/_mobs.txt
new file mode 100644
index 00000000..5faafe87
--- /dev/null
+++ b/world/map/npc/guild/_mobs.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Guild Bot Area mobs
+
diff --git a/world/map/npc/guild/_nodes.txt b/world/map/npc/guild/_nodes.txt
new file mode 100644
index 00000000..629ccce8
--- /dev/null
+++ b/world/map/npc/guild/_nodes.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Guild Bot Area nodes
+
+// (no nodes)
diff --git a/world/map/npc/guild/_warps.txt b/world/map/npc/guild/_warps.txt
new file mode 100644
index 00000000..748604a3
--- /dev/null
+++ b/world/map/npc/guild/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Guild Bot Area warps
+
diff --git a/world/map/npc/prison/_import.txt b/world/map/npc/prison/_import.txt
new file mode 100644
index 00000000..ba495023
--- /dev/null
+++ b/world/map/npc/prison/_import.txt
@@ -0,0 +1,6 @@
+// Map prison: Prison
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: prison
+npc: npc/prison/_mobs.txt
+npc: npc/prison/_nodes.txt
+npc: npc/prison/_warps.txt
diff --git a/world/map/npc/prison/_mobs.txt b/world/map/npc/prison/_mobs.txt
new file mode 100644
index 00000000..5f4bbb79
--- /dev/null
+++ b/world/map/npc/prison/_mobs.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Prison mobs
+
diff --git a/world/map/npc/prison/_nodes.txt b/world/map/npc/prison/_nodes.txt
new file mode 100644
index 00000000..fcfcd7e3
--- /dev/null
+++ b/world/map/npc/prison/_nodes.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Prison nodes
+
+// (no nodes)
diff --git a/world/map/npc/prison/_warps.txt b/world/map/npc/prison/_warps.txt
new file mode 100644
index 00000000..26f3dd9d
--- /dev/null
+++ b/world/map/npc/prison/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Prison warps
+
+prison,46,22|warp|-1,-1,001-2,60,49