From 428e5cb4fd0d5da7ac511b8e5174622ef9ee4d4f Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Mon, 9 Mar 2009 13:56:47 +0100 Subject: Added two forgotten spaces to news.txt Empty lines don't show up in the news due to the way the lines are tokenized, so give them one space. --- news.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- cgit v1.2.3-70-g09d2 From 167a4ef2fd6af2a5ac8d9b9058673387714c2a11 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Mon, 9 Mar 2009 13:02:39 -0600 Subject: Remove some removed commands --- conf/atcommand_local.conf.example | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 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 -- cgit v1.2.3-70-g09d2 From 1ad4140a3a0d3a8aca5c90bff2e46781f6bde3b5 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Mon, 9 Mar 2009 13:02:52 -0600 Subject: Adjust the sex changers Xanith has been removed for now. Cost for sex change is 10k GP and you need to be atleast level 10. Server message has better wording. --- npc/020-1_Nivalis/_import.txt | 1 - npc/020-1_Nivalis/sexchanger.txt | 29 ----------------------------- npc/021-1_Tulimshar/eurni.txt | 22 ++++++++++++++++------ 3 files changed, 16 insertions(+), 36 deletions(-) delete mode 100644 npc/020-1_Nivalis/sexchanger.txt diff --git a/npc/020-1_Nivalis/_import.txt b/npc/020-1_Nivalis/_import.txt index 0e18f3ac..cda51aa5 100644 --- a/npc/020-1_Nivalis/_import.txt +++ b/npc/020-1_Nivalis/_import.txt @@ -2,6 +2,5 @@ map: 020-1.gat npc: npc/020-1_Nivalis/_mobs.txt npc: npc/020-1_Nivalis/_warps.txt npc: npc/020-1_Nivalis/amrak.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; } -- cgit v1.2.3-70-g09d2 From 7700a8695ed7710e2322ec1669353f7650f1a9b5 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Mon, 9 Mar 2009 18:22:07 -0600 Subject: Return from the soul menhir function --- npc/functions/soul_menhir.txt | 1 + 1 file changed, 1 insertion(+) 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; } -- cgit v1.2.3-70-g09d2