summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-02-14 20:13:09 +0000
committerJared Adams <jaxad0127@gmail.com>2009-02-14 20:13:09 +0000
commit481d1eca66e38154063b078b84fe76a830e5ac0d (patch)
tree936e79882218d32d4075f46ad85aff7cec199d2a /npc
parentfe02011f477c57c7461b2bc25456bd9426e98cd7 (diff)
parentef7a69afc170e8c60af91583d7c1488a7590fcab (diff)
downloadserverdata-481d1eca66e38154063b078b84fe76a830e5ac0d.tar.gz
serverdata-481d1eca66e38154063b078b84fe76a830e5ac0d.tar.bz2
serverdata-481d1eca66e38154063b078b84fe76a830e5ac0d.tar.xz
serverdata-481d1eca66e38154063b078b84fe76a830e5ac0d.zip
Merge commit 'mainline/master'
Conflicts: db/item_db.txt
Diffstat (limited to 'npc')
-rw-r--r--npc/001-1_Tulimshar/_import.txt1
-rw-r--r--npc/001-1_Tulimshar/_warps.txt2
-rw-r--r--npc/001-1_Tulimshar/children.txt2
-rw-r--r--npc/001-1_Tulimshar/workers.txt13
-rw-r--r--npc/013-3_Cave/_warps.txt2
-rw-r--r--npc/018-3_Cave/bookcase.txt2
-rw-r--r--npc/021-1_Tulimshar/_import.txt8
-rw-r--r--npc/021-1_Tulimshar/_mobs.txt16
-rw-r--r--npc/021-1_Tulimshar/_warps.txt2
-rw-r--r--npc/021-1_Tulimshar/bakery.txt10
-rw-r--r--npc/021-1_Tulimshar/eurni.txt29
-rw-r--r--npc/021-1_Tulimshar/gate_guards.txt35
-rw-r--r--npc/021-1_Tulimshar/inac.txt13
-rw-r--r--npc/021-1_Tulimshar/magic_school.txt16
-rw-r--r--npc/021-1_Tulimshar/north_shops.txt38
-rw-r--r--npc/021-1_Tulimshar/royal_guards.txt11
-rw-r--r--npc/021-1_Tulimshar/workers.txt31
-rw-r--r--npc/_import.txt2
-rw-r--r--npc/functions/banker.txt7
-rw-r--r--npc/functions/barber.txt12
-rw-r--r--npc/functions/game_rules.txt2
21 files changed, 228 insertions, 26 deletions
diff --git a/npc/001-1_Tulimshar/_import.txt b/npc/001-1_Tulimshar/_import.txt
index 8fe3add8..b66c4168 100644
--- a/npc/001-1_Tulimshar/_import.txt
+++ b/npc/001-1_Tulimshar/_import.txt
@@ -18,4 +18,3 @@ npc: npc/001-1_Tulimshar/rules.txt
npc: npc/001-1_Tulimshar/sandra.txt
npc: npc/001-1_Tulimshar/soul-menhir.txt
npc: npc/001-1_Tulimshar/vincent.txt
-npc: npc/001-1_Tulimshar/workers.txt
diff --git a/npc/001-1_Tulimshar/_warps.txt b/npc/001-1_Tulimshar/_warps.txt
index 7e8af69d..751b0df8 100644
--- a/npc/001-1_Tulimshar/_warps.txt
+++ b/npc/001-1_Tulimshar/_warps.txt
@@ -1,5 +1,7 @@
// 001-1 Tulimshar warps
001-1.gat,44,88 warp ToSandstorm 3,-1,002-1.gat,58,17
+001-1.gat,44,20 warp toCentralTulimshar 3,-1,021-1.gat,55,145
+001-1.gat,125,20 warp toCentralTulimshar 0,-1,021-1.gat,136,146
001-1.gat,32,71 warp ToInn -1,-1,001-2.gat,25,34
001-1.gat,75,41 warp ToHouse -1,-1,001-2.gat,71,72
diff --git a/npc/001-1_Tulimshar/children.txt b/npc/001-1_Tulimshar/children.txt
index 3f3ec522..1b62953d 100644
--- a/npc/001-1_Tulimshar/children.txt
+++ b/npc/001-1_Tulimshar/children.txt
@@ -1,6 +1,6 @@
//
-001-1.gat,94,27,0 script Aisha 108,{
+001-1.gat,95,29,0 script Aisha 108,{
set @TEMP,rand(9);
if(@TEMP == 0) goto L_1;
if(@TEMP == 1) goto L_1;
diff --git a/npc/001-1_Tulimshar/workers.txt b/npc/001-1_Tulimshar/workers.txt
deleted file mode 100644
index 43ee9795..00000000
--- a/npc/001-1_Tulimshar/workers.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-
-001-1.gat,45,21,0 script Construction Worker 155,{
- mes "[Construction worker]";
- mes "\"I can't let you beyond this gate. The area is closed for renovation; most of it was destroyed during the earthquake.\"";
- close;
-}
-
-001-1.gat,124,21,0 script Construction Worker 155,{
- mes "[Construction worker]";
- mes "\"Move along.\"";
- close;
-}
diff --git a/npc/013-3_Cave/_warps.txt b/npc/013-3_Cave/_warps.txt
index 44c2d8d7..f288bdd7 100644
--- a/npc/013-3_Cave/_warps.txt
+++ b/npc/013-3_Cave/_warps.txt
@@ -19,7 +19,7 @@
013-3.gat,75,51 warp toCave -1,-1,013-3.gat,109,65
013-3.gat,109,64 warp toCave -1,-1,013-3.gat,75,50
013-3.gat,67,51 warp toCave -1,-1,018-3.gat,90,51
-013-3.gat,71,20 warp toCave -1,-1,013-3.gat,28,40
+013-3.gat,71,20 warp toCave -1,-1,013-3.gat,28,39
013-3.gat,28,40 warp toCave -1,-1,013-3.gat,71,21
013-3.gat,71,42 warp toCave -1,-1,013-3.gat,109,21
013-3.gat,109,20 warp toCave -1,-1,013-3.gat,71,41
diff --git a/npc/018-3_Cave/bookcase.txt b/npc/018-3_Cave/bookcase.txt
index d176caa3..9706d46a 100644
--- a/npc/018-3_Cave/bookcase.txt
+++ b/npc/018-3_Cave/bookcase.txt
@@ -60,5 +60,5 @@ L_Search:
mes "You begin to wonder if you read that list right.";
next;
- set QUEST_demon_mines, 1;
+ if (QUEST_demon_mines == 0) set QUEST_demon_mines, 1;
}
diff --git a/npc/021-1_Tulimshar/_import.txt b/npc/021-1_Tulimshar/_import.txt
index 81e7f2df..e6939894 100644
--- a/npc/021-1_Tulimshar/_import.txt
+++ b/npc/021-1_Tulimshar/_import.txt
@@ -1,3 +1,11 @@
map: 021-1.gat
npc: npc/021-1_Tulimshar/_mobs.txt
npc: npc/021-1_Tulimshar/_warps.txt
+npc: npc/021-1_Tulimshar/bakery.txt
+npc: npc/021-1_Tulimshar/eurni.txt
+npc: npc/021-1_Tulimshar/gate_guards.txt
+npc: npc/021-1_Tulimshar/inac.txt
+npc: npc/021-1_Tulimshar/magic_school.txt
+npc: npc/021-1_Tulimshar/north_shops.txt
+npc: npc/021-1_Tulimshar/royal_guards.txt
+npc: npc/021-1_Tulimshar/workers.txt
diff --git a/npc/021-1_Tulimshar/_mobs.txt b/npc/021-1_Tulimshar/_mobs.txt
index e488bf54..4a7227f6 100644
--- a/npc/021-1_Tulimshar/_mobs.txt
+++ b/npc/021-1_Tulimshar/_mobs.txt
@@ -1,7 +1,23 @@
// 021-1 Tulimshar mobs
+021-1.gat,126,86,3,2 monster Maggot 1002,2,0,0,Mob021-1::On1002
+021-1.gat,90,65,3,2 monster Maggot 1002,2,0,0,Mob021-1::On1002
+021-1.gat,95,124,3,2 monster Maggot 1002,2,0,0,Mob021-1::On1002
+021-1.gat,103,53,6,2 monster Maggot 1002,5,0,0,Mob021-1::On1002
+021-1.gat,44,54,6,8 monster Maggot 1002,7,0,0,Mob021-1::On1002
+021-1.gat,98,24,2,2 monster Sea Slime 1033,1,150000,100000,Mob021-1::On1033
021-1.gat,0,0,0 script Mob021-1 -1,{
+On1002:
+ set @mobID, 1002;
+ callfunc "MobPoints";
+ break;
+
+On1033:
+ set @mobID, 1033;
+ callfunc "MobPoints";
+ break;
+
end;
}
diff --git a/npc/021-1_Tulimshar/_warps.txt b/npc/021-1_Tulimshar/_warps.txt
index 7e907749..ac940f69 100644
--- a/npc/021-1_Tulimshar/_warps.txt
+++ b/npc/021-1_Tulimshar/_warps.txt
@@ -1,2 +1,4 @@
// 021-1 Tulimshar warps
+021-1.gat,55,146 warp toBazaar 3,-1,001-1.gat,44,20
+021-1.gat,136,146 warp toSouthTulimshar 0,-1,001-1.gat,124,21
diff --git a/npc/021-1_Tulimshar/bakery.txt b/npc/021-1_Tulimshar/bakery.txt
new file mode 100644
index 00000000..af0e8d87
--- /dev/null
+++ b/npc/021-1_Tulimshar/bakery.txt
@@ -0,0 +1,10 @@
+// Outside the bakery
+
+021-1.gat,105,104,0 shop Ara 163,WhiteCake :-1,ChocolateCake :-1,OrangeCake :-1,AppleCake :-1
+
+021-1.gat,108,102,0 script Itka 114,{
+ mes "[Itka]";
+ mes "\"This bakery is the best!\"";
+ mes "";
+ mes "\"Too bad they haven't fully opened yet.\"";
+}
diff --git a/npc/021-1_Tulimshar/eurni.txt b/npc/021-1_Tulimshar/eurni.txt
new file mode 100644
index 00000000..988feca9
--- /dev/null
+++ b/npc/021-1_Tulimshar/eurni.txt
@@ -0,0 +1,29 @@
+//
+
+021-1.gat,141,113,0 script Eurni 136,{
+ mes "[Eurni the Surgeon]";
+ mes "\"No sex changes right now, sorry.\"";
+ close;
+
+ mes "[Eurni the Surgeon]";
+ mes "\"Are you tired of being what you are?\"";
+ next;
+
+ mes "[Eurni the Surgeon]";
+ mes "\"Would you maybe be interested in a sex change?\"";
+ next;
+
+ mes "[Server]";
+ mes "\"Warning: All the character in your account will get the sex changed.\"";
+ mes "\"Also you probably will require to restart the client to notice a change.\"";
+ next;
+
+ menu
+ "Please do, my dear...", L_Change,
+ "Leave alone my family treasure!", -;
+ close;
+
+L_Change:
+// changesex;
+ close;
+}
diff --git a/npc/021-1_Tulimshar/gate_guards.txt b/npc/021-1_Tulimshar/gate_guards.txt
new file mode 100644
index 00000000..fcc55c87
--- /dev/null
+++ b/npc/021-1_Tulimshar/gate_guards.txt
@@ -0,0 +1,35 @@
+// Various guards at gates
+
+// Guards by the gates to the port
+021-1.gat,70,23,0 script Guard 104,{
+ mes "[Guard]";
+ mes "\"Lot's of stuff happens in the port district. Those sailors can get quite roudy.\"";
+}
+
+021-1.gat,110,23,0 script Guard 104,{
+ mes "[Guard]";
+ mes "\"I'm not quite sure why I'm here, since that bridge is out.\"";
+}
+
+// Guard near the magic school
+021-1.gat,46,65,0 script Guard 104,{
+ mes "[Guard]";
+ mes "\"I'm just here to provide a presence for the guards at this gate. The mages here can defend themselves without problem.\"";
+}
+
+// Guards by the gates to East Tulimshar
+021-1.gat,156,42,0 script Guard 104,{
+ mes "[Guard]";
+ mes "\"It's still a mess in East Tulimshar. The volcano and earthquake did a lot of damage.\"";
+}
+
+021-1.gat,156,95,0 script Guard 104,{
+ mes "[Guard]";
+ mes "\"It can get quite dangerous east of town. But for now, the passage is closed.\"";
+}
+
+// Near the bazaar, outside the government building
+021-1.gat,58,135,0 script Guard 123,{
+ mes "[Guard]";
+ mes "\"This is a government building. They have some clerical and tax offices in here. There is also a jail in the subbasement.\"";
+}
diff --git a/npc/021-1_Tulimshar/inac.txt b/npc/021-1_Tulimshar/inac.txt
new file mode 100644
index 00000000..3160ad9b
--- /dev/null
+++ b/npc/021-1_Tulimshar/inac.txt
@@ -0,0 +1,13 @@
+//
+
+021-1.gat,53,103,0 script Inac 156,{
+ mes "[Inac]";
+ mes "\"This cities water system is amazing. It was built centuries ago after the cataclysm that turned Tonori into this desert.\"";
+ next;
+ mes "[Inac]";
+ mes "\"They say that not much maintainence is needed, even though it's so old.\"";
+ next;
+ mes "[Inac]";
+ mes "\"They also say monsters have moved into the underground tunnels that bring and distribute water.\"";
+ next;
+}
diff --git a/npc/021-1_Tulimshar/magic_school.txt b/npc/021-1_Tulimshar/magic_school.txt
new file mode 100644
index 00000000..54c49d56
--- /dev/null
+++ b/npc/021-1_Tulimshar/magic_school.txt
@@ -0,0 +1,16 @@
+// Tulimshar's magic academy
+
+021-1.gat,45,54,0 script Tinris 160,{
+ mes "[Tinris]";
+ mes "\"This is a magic school.\"";
+}
+
+021-1.gat,46,41,0 script Tondar 168,{
+ mes "[Tondar]";
+ mes "\"We're not accepting any new students right now.\"";
+}
+
+021-1.gat,32,46,0 script Ched 113,{
+ mes "[Ched]";
+ mes "\"I'm a student here.\"";
+}
diff --git a/npc/021-1_Tulimshar/north_shops.txt b/npc/021-1_Tulimshar/north_shops.txt
new file mode 100644
index 00000000..9d409616
--- /dev/null
+++ b/npc/021-1_Tulimshar/north_shops.txt
@@ -0,0 +1,38 @@
+// Northern shopping plaza
+
+// More high-end stuff to satisfy the richer people in Royal Tulimshar
+
+// Some clothing
+021-1.gat,136,38,0 shop Inar 108,CottonShirt :-1,CottonShorts :-1,WhiteCottonBoots :-1,DesertShirt :-1,ChainmailShirt :-1,SilkRobe :-8,DesertHat :-6
+
+// Some general stuff
+021-1.gat,128,36,0 shop Imec 162,CoinBag :-4,EmptyBottle :-10,CasinoCoins :10,CottonCloth :-10
+
+// A snobby store that won't sell to the player
+021-1.gat,138,29,0 script Latoy 106,{
+ mes "[Latoy]";
+ mes "\"There's nothing here you could want or afford.\"";
+}
+
+// A barber (later we can make it so certain styles need to come from him, for a price)
+021-1.gat,119,29,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;
+}
+
+// Another banker
+021-1.gat,122,32,0 script Hydusun 149,{
+ set @npcName$, "Hydusun";
+ callfunc "Banker";
+}
+
+// An officer (for security)
+021-1.gat,130,38,0 script Officer 150,{
+ mes "[Officer]";
+ mes "I'm here for extra secutiry for this market.";
+}
diff --git a/npc/021-1_Tulimshar/royal_guards.txt b/npc/021-1_Tulimshar/royal_guards.txt
new file mode 100644
index 00000000..b24b0076
--- /dev/null
+++ b/npc/021-1_Tulimshar/royal_guards.txt
@@ -0,0 +1,11 @@
+//
+
+021-1.gat,141,23,0 script Guard 126,{
+ mes "[Guard]";
+ mes "\"Stay away.\"";
+}
+
+021-1.gat,147,23,0 script Guard 126,{
+ mes "[Guard]";
+ mes "\"Stay away.\"";
+}
diff --git a/npc/021-1_Tulimshar/workers.txt b/npc/021-1_Tulimshar/workers.txt
new file mode 100644
index 00000000..838d41df
--- /dev/null
+++ b/npc/021-1_Tulimshar/workers.txt
@@ -0,0 +1,31 @@
+//
+
+021-1.gat,144,22,0 script Construction Worker 155,{
+ mes "[Construction worker]";
+ mes "\"I can't let you beyond this gate. The area is closed for renovation.\"";
+ close;
+}
+
+021-1.gat,73,22,0 script Construction Worker 155,{
+ mes "[Construction worker]";
+ mes "\"The port is closed for repairs. I can't let you in without a royal order.\"";
+ close;
+}
+
+021-1.gat,113,22,0 script Construction Worker 155,{
+ mes "[Construction worker]";
+ mes "\"Move along.\"";
+ close;
+}
+
+021-1.gat,156,97,0 script Construction Worker 155,{
+ mes "[Construction worker]";
+ mes "\"East Tulimshar is closed for repairs.\"";
+ close;
+}
+
+021-1.gat,156,44,0 script Construction Worker 155,{
+ mes "[Construction worker]";
+ mes "\"East Tulimshar is closed for repairs.\"";
+ close;
+}
diff --git a/npc/_import.txt b/npc/_import.txt
index 142fd3ec..70a917f8 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -41,5 +41,3 @@ import: npc/020-2_Nivalis/_import.txt
import: npc/020-3_Ice_cave/_import.txt
import: npc/020-4_Ice_cave/_import.txt
import: npc/021-1_Tulimshar/_import.txt
-import: npc/021-2_Tulimshar/_import.txt
-import: npc/023-1_Beach_Cliffs/_import.txt
diff --git a/npc/functions/banker.txt b/npc/functions/banker.txt
index b10806cc..79a57738 100644
--- a/npc/functions/banker.txt
+++ b/npc/functions/banker.txt
@@ -5,7 +5,10 @@ function script Banker {
mes "\"Welcome to the bank!";
mes "How can I help you?\"";
next;
- menu "Deposit",L_Dep,"Withdraw",L_With,"Check my balance",L_Balance,"Nevermind",L_Nev;
+ menu "Deposit", L_Dep,
+ "Withdraw", L_With,
+ "Check my balance", L_Balance,
+ "Nevermind", L_Nev;
L_Dep:
mes "[" + @npcName$ + "]";
@@ -66,7 +69,7 @@ D_All:
goto L_Deposit;
L_Deposit:
- if (zeny < @Ammount) goto L_NoMoney;
+ if (zeny < @Amount) goto L_NoMoney;
set zeny, zeny - @Amount;
set BankAccount, BankAccount + @Amount;
goto L_Balance;
diff --git a/npc/functions/barber.txt b/npc/functions/barber.txt
index ceba8fd8..03ce9a53 100644
--- a/npc/functions/barber.txt
+++ b/npc/functions/barber.txt
@@ -11,7 +11,7 @@ function script Barber {
L_Style:
menu
"Bald", -,
- "Ponytail", -,
+ "Flat ponytail", -,
"Bowl cut", -,
"Combed back", -,
"Emo", -,
@@ -23,12 +23,15 @@ L_Style:
"Pigtails", -,
"Long and curly", -,
"Parted", -,
- "Supprise me", -,
+ "Perky ponytail", -,
+ "Wave", -,
+ "Mane", -,
+ "Bun", -,
"Nah, I'm fine", L_Done;
L_Process_Style:
set @style, @menu - 1;
- if (@style == 13) set @style, rand(13);
+ if (@style == 17) set @style, rand(17);
setlook 1, @style;
return;
@@ -44,10 +47,11 @@ L_Color:
"Light red", -,
"Blue", -,
"Dark purple", -,
+ "Black", -,
"Supprise me", -,
"Nah, I'm fine", L_Done;
set @color, @menu - 1;
- if (@color == 10) set @color, rand(10);
+ if (@color == 11) set @color, rand(11);
setlook 6, @color;
return;
diff --git a/npc/functions/game_rules.txt b/npc/functions/game_rules.txt
index dfb1182f..2870a46d 100644
--- a/npc/functions/game_rules.txt
+++ b/npc/functions/game_rules.txt
@@ -135,7 +135,7 @@ L_Polish:
goto L_End;
L_Italian:
- mes "I giocatori che infrangeranno le seguenti regole saranno bannati (anche permanentemente) o saranno resettati, a discrezione dei Game Masters:"
+ mes "I giocatori che infrangeranno le seguenti regole saranno bannati (anche permanentemente) o saranno resettati, a discrezione dei Game Masters:";
mes "1. Vietato abusare degli altri giocatori (insulti, imprecazioni e simili, diretti verso una particolare persona o gruppi di persone)";
mes "2. Vietato usare bot (ossia effettuare QUALSIASI attività quando non si è presenti alla tastiera)";
mes "3. Vietato spammare / postare ripetutamente messaggi inutili (incluso spam di richieste di scambio)";