summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-03-10 04:26:44 -0600
committerJared Adams <jaxad0127@gmail.com>2009-03-10 04:26:44 -0600
commit181f0c4b223bf995d080387e791034a0d93b72e1 (patch)
tree81ae9b8250d19c035cd0cc8270085c58fce918ac
parente5ac95f237d5c96c39e3b5573d198138f855e30d (diff)
parent7700a8695ed7710e2322ec1669353f7650f1a9b5 (diff)
downloadserverdata-181f0c4b223bf995d080387e791034a0d93b72e1.tar.gz
serverdata-181f0c4b223bf995d080387e791034a0d93b72e1.tar.bz2
serverdata-181f0c4b223bf995d080387e791034a0d93b72e1.tar.xz
serverdata-181f0c4b223bf995d080387e791034a0d93b72e1.zip
Merge commit 'mainline/master'
Conflicts: npc/020-1_Nivalis/_import.txt
-rw-r--r--conf/atcommand_local.conf.example25
-rw-r--r--news.txt4
-rw-r--r--npc/020-1_Nivalis/_import.txt1
-rw-r--r--npc/020-1_Nivalis/sexchanger.txt29
-rw-r--r--npc/021-1_Tulimshar/eurni.txt22
-rw-r--r--npc/functions/soul_menhir.txt1
6 files changed, 26 insertions, 56 deletions
diff --git a/conf/atcommand_local.conf.example b/conf/atcommand_local.conf.example
index 6de470ef..f2f925df 100644
--- a/conf/atcommand_local.conf.example
+++ b/conf/atcommand_local.conf.example
@@ -63,24 +63,17 @@ follow: 40
// Disconnects a user from the server (1 command + right click menu for GM "(name) force to quit").
kick: 40
-// Returns list of logged in characters with their position (2 same commands).
+// Returns list of logged in characters with their position.
who: 40
-whois: 40
-
-// Returns list of logged in characters with their job.
-who2: 40
// Returns list of logged in characters with their party/guild.
-who3: 40
+whogroup: 40
// Returns list of logged in characters with their position in a specifical map.
whomap: 40
-// Returns list of logged in characters with their job in a specifical map.
-whomap2: 40
-
// Returns list of logged in characters with their party/guild in a specifical map.
-whomap3: 40
+whomapgroup: 40
// Like @who+@who2+who3, but only for GM.
whogm: 40
@@ -97,25 +90,21 @@ hide: 40
// Enables you to to jump randomly on a map (that you are already on).
jump: 40
-// Warps you to your last save point (2 same commands).
+// Warps you to your last save point.
return: 40
-load: 40
-// Warp yourself to a certain map, at (x,y) coordinates (2 same commands).
-rura: 40
+// Warp yourself to a certain map, at (x,y) coordinates.
warp: 40
// Changes GM clothes color (2 same commands)
dye: 40
ccolor: 40
-// Changes GM hair style (2 same commands)
+// Changes own hair style.
hairstyle: 40
-hstyle: 40
-// Changes GM hair color (2 same commands)
+// Changes own hair color.
haircolor: 40
-hcolor: 40
// Deletes all your items.
itemreset: 40
diff --git a/news.txt b/news.txt
index 52aa7ab4..0993e3b9 100644
--- a/news.txt
+++ b/news.txt
@@ -1,9 +1,9 @@
##3 Central Tulimshar
##3 2009-02-11
-
+
##0 Central Tulimshar is now open again. Work
##0 continues on the rest of the city.
-
+
##3 Rebalancing
##3 2009-01-19
diff --git a/npc/020-1_Nivalis/_import.txt b/npc/020-1_Nivalis/_import.txt
index 92d4b629..89ef0a63 100644
--- a/npc/020-1_Nivalis/_import.txt
+++ b/npc/020-1_Nivalis/_import.txt
@@ -1,6 +1,5 @@
map: 020-1.gat
npc: npc/020-1_Nivalis/_mobs.txt
npc: npc/020-1_Nivalis/_warps.txt
-npc: npc/020-1_Nivalis/sexchanger.txt
npc: npc/020-1_Nivalis/soul-menhir.txt
npc: npc/020-1_Nivalis/startrek.txt
diff --git a/npc/020-1_Nivalis/sexchanger.txt b/npc/020-1_Nivalis/sexchanger.txt
deleted file mode 100644
index 168f47a3..00000000
--- a/npc/020-1_Nivalis/sexchanger.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-
-020-1.gat,50,49,0 script Xanith 136,{
- mes "[Xanith the Surgeon]";
- mes "\"No sex changes right now, sorry.\"";
- close;
-
- mes "[Xanith the Surgeon]";
- mes "\"Are you tired of being what you are?\"";
- next;
-
- mes "[Xanith 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/eurni.txt b/npc/021-1_Tulimshar/eurni.txt
index 988feca9..1edfc94e 100644
--- a/npc/021-1_Tulimshar/eurni.txt
+++ b/npc/021-1_Tulimshar/eurni.txt
@@ -1,9 +1,8 @@
//
021-1.gat,141,113,0 script Eurni 136,{
- mes "[Eurni the Surgeon]";
- mes "\"No sex changes right now, sorry.\"";
- close;
+ if (BaseLevel < 10) goto L_TooYoung;
+ if (zeny < 10000) goto L_No_Money;
mes "[Eurni the Surgeon]";
mes "\"Are you tired of being what you are?\"";
@@ -14,8 +13,7 @@
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.\"";
+ mes "Warning: All characters under this login will be changed. Once it's done, you will be kicked from the server. Don't panic, as everything is fine.";
next;
menu
@@ -24,6 +22,18 @@
close;
L_Change:
-// changesex;
+ if (zeny < 10000) goto L_No_Money;
+ set zeny, zeny - 10000;
+ changesex;
+ close;
+
+L_TooYoung:
+ mes "[Eurni the Surgeon]";
+ mes "\"Move along, kid.\"";
+ close;
+
+L_NoMoney:
+ mes "[Eurni the Surgeon]";
+ mes "\"You don't have enough to pay for my services.\"";
close;
}
diff --git a/npc/functions/soul_menhir.txt b/npc/functions/soul_menhir.txt
index f807b7fb..ccedc319 100644
--- a/npc/functions/soul_menhir.txt
+++ b/npc/functions/soul_menhir.txt
@@ -31,4 +31,5 @@ L_Shortversion:
L_Save:
savepoint @map$, @x, @y;
+ return;
}