summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicksha <Micksha@users.noreply.github.com>2020-06-16 11:30:16 +0200
committerMicksha <Micksha@users.noreply.github.com>2020-06-17 12:45:12 +0200
commitc0d59861c59c9a84a4ea84a42ad641672574dc9f (patch)
treeed35e58b2bd75cb6ae44453a87093ceb4c2f671e
parent6f891b0a803130dd85fd35d2793e64e9f6d7b5c8 (diff)
downloadserverdata-c0d59861c59c9a84a4ea84a42ad641672574dc9f.tar.gz
serverdata-c0d59861c59c9a84a4ea84a42ad641672574dc9f.tar.bz2
serverdata-c0d59861c59c9a84a4ea84a42ad641672574dc9f.tar.xz
serverdata-c0d59861c59c9a84a4ea84a42ad641672574dc9f.zip
add warps and mobs on 020-1, make maps, add squirrel boots
-rw-r--r--conf/map/maps.conf1
-rw-r--r--db/map_index.txt7
-rw-r--r--db/re/item_db.conf18
-rw-r--r--maps/re/012-1.mcachebin1393 -> 1425 bytes
-rw-r--r--maps/re/020-1.mcachebin0 -> 4690 bytes
-rw-r--r--npc/008-3-4/_mobs.txt2
-rw-r--r--npc/008-3-5/_mobs.txt2
-rw-r--r--npc/020-1/_import.txt4
-rw-r--r--npc/020-1/_mobs.txt22
-rw-r--r--npc/020-1/_warps.txt4
-rw-r--r--npc/_anchors.txt5
-rw-r--r--npc/_import.txt1
12 files changed, 61 insertions, 5 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 531fd8fc..9c520b52 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -112,6 +112,7 @@ map_list: (
"012-3-1",
"012-3-2",
"012-3-3",
+ "020-1",
"sec_pri",
"test",
"testbg",
diff --git a/db/map_index.txt b/db/map_index.txt
index ca1ca981..a593a5b8 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -109,6 +109,7 @@
012-3-1 109
012-3-2 110
012-3-3 111
-sec_pri 112
-test 113
-testbg 114
+020-1 112
+sec_pri 113
+test 114
+testbg 115
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index a1b8ef09..e0aa6cc7 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -2948,6 +2948,24 @@ item_db: (
id5043: 1
}
},
+{
+ Id: 1810
+ AegisName: "SquirrelBoots"
+ Name: "Squirrel Boots"
+ Type: "IT_ARMOR"
+ Buy: 12000
+ Sell: 600
+ Weight: 10
+ Def: 1
+ Slots: 0
+ Loc: "EQP_SHOES"
+ WeaponLv: 0
+ EquipLv: 10
+ Refine: false
+ ViewSprite: 1810
+ BindOnEquip: false
+ BuyingStore: true
+},
// Gloves
{
diff --git a/maps/re/012-1.mcache b/maps/re/012-1.mcache
index 2a30e443..1fd1ac10 100644
--- a/maps/re/012-1.mcache
+++ b/maps/re/012-1.mcache
Binary files differ
diff --git a/maps/re/020-1.mcache b/maps/re/020-1.mcache
new file mode 100644
index 00000000..dfb5b8f8
--- /dev/null
+++ b/maps/re/020-1.mcache
Binary files differ
diff --git a/npc/008-3-4/_mobs.txt b/npc/008-3-4/_mobs.txt
index db3cc108..37fb788a 100644
--- a/npc/008-3-4/_mobs.txt
+++ b/npc/008-3-4/_mobs.txt
@@ -29,4 +29,4 @@
008-3-4,83,44,14,9 monster Red Slime 1074,5,10000,50000
008-3-4,115,67,13,29 monster Red Slime 1074,4,10000,50000
008-3-4,37,79,24,27 monster Yellow Slime 1073,4,10000,50000
-008-3-4,111,67,13,29 monster Red Slime 1074,8,20000,75000
+008-3-4,111,67,13,29 monster Yellow Slime 1073,8,20000,75000
diff --git a/npc/008-3-5/_mobs.txt b/npc/008-3-5/_mobs.txt
index de960072..5331e5e6 100644
--- a/npc/008-3-5/_mobs.txt
+++ b/npc/008-3-5/_mobs.txt
@@ -3,7 +3,7 @@
008-3-5,87,83,22,16 monster Cave Maggot 1027,8,2000,20000
008-3-5,79,68,54,12 monster Crafty 1018,12,2500,35000
008-3-5,71,62,49,39 monster Thief Slime 1105,3,20000,100000
-008-3-5,90,70,13,29 monster Red Slime 1074,8,20000,75000
+008-3-5,90,70,13,29 monster Yellow Slime 1073,8,20000,75000
008-3-5,79,82,21,15 monster Bandit 1063,3,2000,20000
008-3-5,74,66,38,21 monster Snake 1075,3,10000,100000
008-3-5,54,41,26,21 monster Robin Bandit 1064,2,2000,20000
diff --git a/npc/020-1/_import.txt b/npc/020-1/_import.txt
new file mode 100644
index 00000000..9af8d519
--- /dev/null
+++ b/npc/020-1/_import.txt
@@ -0,0 +1,4 @@
+// Map 020-1: Tulimshar
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-1/_mobs.txt",
+"npc/020-1/_warps.txt",
diff --git a/npc/020-1/_mobs.txt b/npc/020-1/_mobs.txt
new file mode 100644
index 00000000..a632b9d2
--- /dev/null
+++ b/npc/020-1/_mobs.txt
@@ -0,0 +1,22 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-1: Tulimshar mobs
+020-1,74,95,0,0 monster Manana Tree 1017,1,420000,240000
+020-1,165,77,14,12 monster Maggot 1026,6,5000,10000
+020-1,222,172,54,18 monster Maggot 1026,15,5000,10000
+020-1,282,114,12,39 monster Maggot 1026,5,5000,10000
+020-1,175,209,128,38 monster Desert Scorpion 1078,15,12000,36000
+020-1,59,158,18,26 monster Desert Scorpion 1078,5,12000,36000
+020-1,92,189,58,56 monster Desert Snake 1077,8,18000,72000
+020-1,60,174,23,29 monster Black Slime 1079,4,8500,36000
+020-1,188,216,84,32 monster Maggot 1026,20,5000,10000
+020-1,157,252,9,3 monster Golden Scorpion 1110,1,120000,120000
+020-1,167,81,21,11 monster Brotherhood Fighter 1081,3,6000,18000
+020-1,279,96,13,15 monster Legion Swordswoman 1066,3,6000,18000
+020-1,74,185,23,46 monster Yellow Slime 1073,6,13500,60000
+020-1,254,226,44,30 monster Desert Snake 1077,4,18000,36000
+020-1,277,248,18,10 monster Thief Slime 1105,3,11500,45000
+020-1,126,200,45,11 monster Giant Maggot 1076,2,36000,120000
+020-1,70,73,10,16 monster Giant Maggot 1076,2,36000,120000
+020-1,70,87,14,16 monster Maggot 1026,6,5000,10000
+020-1,70,74,7,10 monster Thief Slime 1105,1,11500,45000
+020-1,103,187,58,57 monster Fire Goblin 1080,10,8000,50000
diff --git a/npc/020-1/_warps.txt b/npc/020-1/_warps.txt
new file mode 100644
index 00000000..3c273cc5
--- /dev/null
+++ b/npc/020-1/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-1: Tulimshar warps
+020-1,166,242,0 warp #020-1_166_242 1,0,020-1,165,250
+020-1,166,249,0 warp #020-1_166_249 1,0,020-1,165,241
diff --git a/npc/_anchors.txt b/npc/_anchors.txt
index 36315554..56104479 100644
--- a/npc/_anchors.txt
+++ b/npc/_anchors.txt
@@ -13,6 +13,7 @@ OnInit:
htput(.ht, "^DRA|ISLAND", "000-1 62 111");
htput(.ht, "^FARM|MOUB", "008-1 71 129");
htput(.ht, "^FIRST|^DECK1?$", "000-2-0 23 28");
+ htput(.ht, "^GARDEN", "020-1 76 99");
htput(.ht, "^HARB|^MASTER", "001-2-16 28 32");
htput(.ht, "^HOLD$", "000-2-2 42 31");
htput(.ht, "^HURN", "008-1 250 109");
@@ -21,7 +22,9 @@ OnInit:
htput(.ht, "^LIB", "001-2-4 42 35");
htput(.ht, "^LIGHT", "001-2-0 37 32");
htput(.ht, "^LUVIA", "008-1 256 206");
+ htput(.ht, "^MAGIC|ACAD", "020-1 51 119");
htput(.ht, "^MERCH|^BANK", "001-2-19 28 30");
+ htput(.ht, "^MINE", "020-1 76 237");
htput(.ht, "^MOON", "001-2-2 40 34");
htput(.ht, "^NARD", "000-2-3 21 28");
htput(.ht, "^NOBLE1?$", "001-2-1 37 37");
@@ -29,6 +32,7 @@ OnInit:
htput(.ht, "^NOBLE3$", "001-2-11 45 33");
htput(.ht, "^NOBLE4$", "001-2-12 34 32");
htput(.ht, "^NOBLE5$", "001-2-15 34 38");
+ htput(.ht, "^OASIS", "020-1 287 246");
htput(.ht, "^RED|PLUSH|^INN", "001-2-28 30 35");
htput(.ht, "^ROSSY", "008-3-0 130 108");
htput(.ht, "^SECOND|^DECK2$", "000-2-1 67 32");
@@ -36,6 +40,7 @@ OnInit:
htput(.ht, "^START2$", "000-0-0 26 28");
htput(.ht, "^START3$", "000-0-1 26 28");
htput(.ht, "^START|^BEGIN", "000-0 22 24");
+ htput(.ht, "^TULIM|MARKET", "020-1 224 175");
htput(.ht, "^VEIN", "008-3-0 87 172");
htput(.ht, "^WARE", "001-2-18 37 31");
htput(.ht, "^WEST|PORT", "008-1-1 52 60");
diff --git a/npc/_import.txt b/npc/_import.txt
index dfe1ab2b..7fba4b92 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -111,6 +111,7 @@
@include "npc/012-3-1/_import.txt"
@include "npc/012-3-2/_import.txt"
@include "npc/012-3-3/_import.txt"
+@include "npc/020-1/_import.txt"
@include "npc/sec_pri/_import.txt"
@include "npc/test/_import.txt"
@include "npc/testbg/_import.txt"