summaryrefslogtreecommitdiff
path: root/world/map/npc/021-2
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2013-06-09 20:38:38 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2013-06-09 20:38:38 +0200
commit7f4410f9d5dce2884368a4b1d01139abd2e65fd5 (patch)
treee4f6cd0f6ed40b1852fa5ce28a5d78be982b0a73 /world/map/npc/021-2
parent8ac35610a416d3937ccf4b3b74a61622382e8162 (diff)
parentfa2ffc29c1ef2c33ff0a9c1baf7026a4d9ffe0b6 (diff)
downloadserverdata-7f4410f9d5dce2884368a4b1d01139abd2e65fd5.tar.gz
serverdata-7f4410f9d5dce2884368a4b1d01139abd2e65fd5.tar.bz2
serverdata-7f4410f9d5dce2884368a4b1d01139abd2e65fd5.tar.xz
serverdata-7f4410f9d5dce2884368a4b1d01139abd2e65fd5.zip
Merge remote-tracking branch 'origin/master' into waric
Conflicts: world/map/db/item_db.txt
Diffstat (limited to 'world/map/npc/021-2')
-rw-r--r--world/map/npc/021-2/_import.txt4
-rw-r--r--world/map/npc/021-2/_warps.txt11
-rw-r--r--world/map/npc/021-2/bank.txt7
-rw-r--r--world/map/npc/021-2/barber.txt11
-rw-r--r--world/map/npc/021-2/heathin.txt2
-rw-r--r--world/map/npc/021-2/hotel_receptionist.txt (renamed from world/map/npc/021-2/workshop.txt)6
-rw-r--r--world/map/npc/021-2/inya.txt2
-rw-r--r--world/map/npc/021-2/jhedia.txt2
8 files changed, 36 insertions, 9 deletions
diff --git a/world/map/npc/021-2/_import.txt b/world/map/npc/021-2/_import.txt
index bb80fc32..7b955fb5 100644
--- a/world/map/npc/021-2/_import.txt
+++ b/world/map/npc/021-2/_import.txt
@@ -4,11 +4,13 @@ map: 021-2.gat
npc: npc/021-2/_mobs.txt
npc: npc/021-2/_warps.txt
npc: npc/021-2/bakery.txt
+npc: npc/021-2/bank.txt
+npc: npc/021-2/barber.txt
npc: npc/021-2/government_building.txt
npc: npc/021-2/heathin.txt
+npc: npc/021-2/hotel_receptionist.txt
npc: npc/021-2/inya.txt
npc: npc/021-2/jhedia.txt
npc: npc/021-2/kylian.txt
npc: npc/021-2/mapflags.txt
-npc: npc/021-2/workshop.txt
npc: npc/021-2/yanis.txt
diff --git a/world/map/npc/021-2/_warps.txt b/world/map/npc/021-2/_warps.txt
index ad18520c..4614f970 100644
--- a/world/map/npc/021-2/_warps.txt
+++ b/world/map/npc/021-2/_warps.txt
@@ -2,7 +2,6 @@
// North Tulimshar Indoor warps
021-2.gat,27,30|warp|To Outside|-1,-1,021-1.gat,53,135
-021-2.gat,33,30|warp|To Outside|-1,-1,021-1.gat,55,135
021-2.gat,39,30|warp|To Outside|-1,-1,021-1.gat,57,135
021-2.gat,91,28|warp|To Outside|-1,-1,021-1.gat,103,101
021-2.gat,122,24|warp|To Roof|-1,-1,021-1.gat,103,97
@@ -13,4 +12,12 @@
021-2.gat,46,97|warp|To First Floor|0,-1,021-2.gat,46,58
021-2.gat,46,57|warp|To Second Floor|0,-1,021-2.gat,46,96
021-2.gat,70,58|warp|To Main Room|-1,-1,021-2.gat,42,54
-021-2.gat,28,130|warp|to Outside|-1,-1,021-1.gat,43,111
+021-2.gat,28,130|warp|To Outside|-1,-1,021-1.gat,43,111
+021-2.gat,28,130|warp|To Outside|-1,-1,021-1.gat,43,111
+021-2.gat,84,93|warp|To First Floor|-1,0,021-2.gat,80,125
+021-2.gat,84,123|warp|To Second Floor|-1,0,021-2.gat,81,95
+021-2.gat,79,139|warp|To Outside|-1,-1,021-1.gat,132,32
+021-2.gat,72,139|warp|To Outside|-1,-1,021-1.gat,125,32
+021-2.gat,124,69|warp|To Outside|-1,-1,021-1.gat,125,28
+021-2.gat,75,93|warp|To Outside|-1,-1,021-1.gat,133,25
+021-2.gat,33,30|warp|To Outside|-1,-1,021-1.gat,55,135
diff --git a/world/map/npc/021-2/bank.txt b/world/map/npc/021-2/bank.txt
new file mode 100644
index 00000000..5ebbe5ea
--- /dev/null
+++ b/world/map/npc/021-2/bank.txt
@@ -0,0 +1,7 @@
+// Another banker
+021-2.gat,69,135,0|script|Hydusun|149,{
+ set @npcname$, "Hydusun";
+ callfunc "Banker";
+ close;
+}
+
diff --git a/world/map/npc/021-2/barber.txt b/world/map/npc/021-2/barber.txt
new file mode 100644
index 00000000..d0ff401e
--- /dev/null
+++ b/world/map/npc/021-2/barber.txt
@@ -0,0 +1,11 @@
+// A barber (later we can make it so certain styles need to come from him, for a price)
+021-2.gat,72,101,0|script|Issay|156,{
+ mes "[Issay the Barber]";
+ mes "\"Do you need a change of style?\"";
+ next;
+ callfunc "Barber";
+ mes "[Issay the Barber]";
+ mes "\"Come again!\"";
+ close;
+}
+
diff --git a/world/map/npc/021-2/heathin.txt b/world/map/npc/021-2/heathin.txt
index 526e64e0..681f40df 100644
--- a/world/map/npc/021-2/heathin.txt
+++ b/world/map/npc/021-2/heathin.txt
@@ -1,6 +1,6 @@
//Items for NPC are incomplete. Makes "simple ring" which can be crafted into a useful ring by Inya and terranite armor.
-021-2.gat,29,55,0|script|Heathin|147,{
+021-2.gat,70,129,0|script|Heathin|147,{
set @TARROW_REQ_TERRA_ORE, 1;
set @TARROW_REQ_COAL, 5;
diff --git a/world/map/npc/021-2/workshop.txt b/world/map/npc/021-2/hotel_receptionist.txt
index ed23ab5b..0a7fcbb2 100644
--- a/world/map/npc/021-2/workshop.txt
+++ b/world/map/npc/021-2/hotel_receptionist.txt
@@ -3,9 +3,9 @@
// The receptionist
021-2.gat,22,63,0|script|Sonir|118,{
mes "[Sonir]";
- mes "\"This is Tulimshar's main workshop. Much crafting happens here.\"";
+ mes "\"Welcome to The Wizards's Rest!\"";
next;
mes "[Sonir]";
- mes "\"We also have limited housing on the second floor.\"";
+ mes "\"We have limited housing on the second floor.\"";
close;
-} \ No newline at end of file
+}
diff --git a/world/map/npc/021-2/inya.txt b/world/map/npc/021-2/inya.txt
index 946bdb33..4a70730c 100644
--- a/world/map/npc/021-2/inya.txt
+++ b/world/map/npc/021-2/inya.txt
@@ -1,7 +1,7 @@
//Gemstones: Diamond (white) , Ruby (red), Emerald (green), Sapphire (blue), Topaz (yellow), Amethyst (purple)
//The power of the gems is important to future balance of these rings. Are they related to stats, tiers of power, schools of magic?
-021-2.gat,43,62,0|script|Inya|106,{
+021-2.gat,80,134,0|script|Inya|106,{
mes "[Inya]";
mes "\"I am Inya, a jeweler of fine rings. If you have a Simple Ring and a gem, I can make a nice ring for you for 1,000,000 gold pieces.\"";
diff --git a/world/map/npc/021-2/jhedia.txt b/world/map/npc/021-2/jhedia.txt
index 32f043f3..1bffd0eb 100644
--- a/world/map/npc/021-2/jhedia.txt
+++ b/world/map/npc/021-2/jhedia.txt
@@ -1,6 +1,6 @@
// Ingot maker takes iron ore, gives ingots for future crafting purposes.
-021-2.gat,23,55,0|script|Jhedia|160,{
+021-2.gat,70,124,0|script|Jhedia|160,{
set @Cost_Per_Ingot, 1000;
set @Iron_Ore_Per, 5;