Fixed a documentation mistake in 'areamonster' (missing argument).

Fixed incorrect sprite used for twintowers event npc.
Fixed a mistake in changelog.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11074 54d463be-8e91-2dee-dedb-b68131a5f0ec

7 files changed, 15 insertions, 12 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 3aee110e2..0d7d9a063 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -15,7 +15,6 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 	  absorbed by the target (This is the behaviour that Tharis believes is
 	  correct). [Skotlex]
 2007/08/19
-	* Fixed small mistake in confs causing some confusion [Paradox924X]
 	* Set proper limits to drop rates, prevents int overflow during calc
 	* Cleaned/clarified some #include relationships between headers
 	- TODO: pc_read_gm_account() still accessses the RFIFO directly!
diff --git a/conf-tmpl/Changelog.txt b/conf-tmpl/Changelog.txt
index 50644ea21..e55eec89d 100644
--- a/conf-tmpl/Changelog.txt
+++ b/conf-tmpl/Changelog.txt
@@ -2,6 +2,7 @@ Date	Added
 
 2007/08/19
 	* Added 'noteleport' mapflags to Dandelion's request maps. [SinSloth]
+	* Fixed small mistake in confs causing some confusion [Paradox924X]
 2007/08/15
 	* Removed useless 'party_skill_penalty' config option
 	* Removed 'Note 3' & 'Other information' since it doesn't apply anymore
diff --git a/conf-tmpl/battle/gm.conf b/conf-tmpl/battle/gm.conf
index 981672103..040a91ef7 100644
--- a/conf-tmpl/battle/gm.conf
+++ b/conf-tmpl/battle/gm.conf
@@ -36,8 +36,8 @@ gm_all_skill: no
 // [GM] Can equip anything? (No or minimum GM level, can cause client errors.)
 gm_all_equipment: no
 
-// [GM] Can use skills without meeting the required conditions (no 
-//   blue gems? no or minimum GM level to bypass requirements.
+// [GM] Can use skills without meeting the required conditions (items, etc...)?
+// 'no' or minimum GM level to bypass requirements.
 gm_skill_unconditional: no
 
 // [GM] Can join a password protected chat? (No or mimimum GM level)
@@ -54,6 +54,9 @@ atcommand_gm_only: no
 // Is the character of a GM account set as the object of a display by @ command etc. or not?
 hide_GM_session: no
 
+// At what GM level can you see GMs and Account/Char IDs in the @who command?
+who_display_aid: 40
+
 // Ban people that try trade dupe.
 // Duration of the ban, in minutes (default: 5). To disable the ban, set 0.
 ban_hack_trade: 5
@@ -84,9 +87,6 @@ gm_cant_drop_max_lv: 0
 // no/0 can be used to disable it.
 disp_hpmeter: 0
 
-// At what GM level can users see Account/Character IDs in the @who command?
-who_display_aid: 40
-
 // Players Titles (check msg_athena.conf for title strings)
 // You may assign different titles for your Players and GMs
 title_lvl1: 1
diff --git a/db/exp.txt b/db/exp.txt
index 58310fe24..def44fd88 100644
--- a/db/exp.txt
+++ b/db/exp.txt
@@ -18,7 +18,7 @@
 50,4002:4003:4004:4005:4006:4007,1,60,86,116,152,232,360,440,544,672,1040,1208,1398,1604,1896,2250,3336,3874,4452,6080,7976,11128,12544,14042,18228,28683,38225,42228,46425,58073,70898,91195,99290,107720,131043,156238,195408,210430,226010,269028,314788,384853,479453,510878,620880,715530,965928,1024488,1205230,1273990
 //Job - Adv Second Classes
 70,4008:4009:4010:4011:4012:4013:4014:4015:4016:4017:4018:4019:4020:4021:4022,1,288,368,568,696,1206,1774,2192,3196,5080,7352,8580,9892,13358,18984,31925,35860,40013,51605,68585,87770,96443,105515,131770,167428,206720,223860,241673,294553,362303,479053,513362,548856,656197,787507,927154,985696,1046034,1231134,1449220,1678177,1773024,2182221,2534978,3043585,3782865,4461912,4672971,5971896,6250158,6875174,7562691,8318960,9150856,10065942,11877812,14015818,16538655,19515624,23028437,28094693,34275525,41816141,51015692,62239144,79666104,101972614,130524946,167071930,213852071
-//Job - Star Gladiator
+//Job - Star Gladiator/Soul Linker
 50,4047:4048,1,27434,27434,27434,27434,27434,27434,27434,27434,27434,27434,27434,27434,27434,27434,27434,27434,27434,27434,54868,70216,77154,84412,105416,133942,165376,179088,193338,235642,289842,348402,373354,399168,477234,572732,674294,716870,760752,895370,1053978,1220492,1289472,1587070,1843620,2213516,2521910,2974608,3115314,3981264,4166772
 //Job - Ninja/Gunslinger
 70,24:25,1,72,92,142,174,301,443,548,799,1270,1838,2145,2473,3339,4746,6385,7172,8002,10321,13717,17554,19288,21103,26354,33485,41344,44772,48334,58910,72460,87100,93338,99792,119308,143183,231068,257377,274363,314246,371105,431038,476309,588548,665256,801731,916689,1130023,1188623,1477408,1551289,1746582,1845236,1954741,2124555,2345698,2548763,2759555,3021488,3254111,3489547,3695474,4012251,4181112,4302211,4496584,4578951,4869523,5022114,5123654,5395117
diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 24450c4e0..17ab0b281 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -78,6 +78,8 @@
 //=       options [FlavioJS]
 //= 3.05.20070819
 //=       Removed the messy 'unitdeadsit' command reference [ultramage]
+//= 3.05.20070823
+//=       Fixed typo in 'areamonster' description (missing argument) [ultramage]
 //===== Description =======================================
 //= A reference manual for the eAthena scripting language,
 //= sorted out depending on their functionality.
@@ -4403,8 +4405,8 @@ Example(s):
 ==================================
 ---------------------------------------
 
-*monster "<map name>",<x>,<y>,"<name to show>",<mob id>,<amount>{,"<event label>"};
-*areamonster "<map name>",<x1>,<y1>,<x2>,<y2>,"<monster name>",<amount>{,"<event label>"};
+*monster     "<map name>",<x>,<y>,"<name to show>",<mob id>,<amount>{,"<event label>"};
+*areamonster "<map name>",<x1>,<y1>,<x2>,<y2>,"<name to show>",<mob id>,<amount>{,"<event label>"};
 
 This command will spawn a monster on the specified coordinates on the specified 
 map. If the script is invoked by a character, a special map name, "this", will 
diff --git a/npc/events/twintowers.txt b/npc/events/twintowers.txt
index 66266d1ea..707c3f2a0 100644
--- a/npc/events/twintowers.txt
+++ b/npc/events/twintowers.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= sEiKaN (1.0)
 //===== Current Version: =====================================
-//= 1.5
+//= 1.6
 //===== Compatible With: =====================================
 //= Any Athena Version; 0315+
 //===== Description: =========================================
@@ -12,9 +12,10 @@
 //= 1.2 by Akaru 1.3 by massdriller(Fixed typos)
 //= 1.4 fixed coords, according to off. src [Lupus]
 //= 1.5 Removed Duplicates [Silent]
+//= 1.6 Fixed wrong sprite id on main npc [ultramage]
 //============================================================
 
-prontera,146,92,4	script	Twin Towers#tt1::Twin-Towers	813,{
+prontera,146,92,4	script	Twin Towers#tt1::Twin-Towers	812,{
 	mes "[Twin Towers]";
 	mes "How are you? We are the Twin Towers.";
 	mes "It is such a pleasure to be able to meet you here.";
diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt
index 79bff59fe..73bad6967 100644
--- a/npc/quests/quests_rachel.txt
+++ b/npc/quests/quests_rachel.txt
@@ -2807,7 +2807,7 @@ rachel,157,183,3	script	Sincere Follower Urstia	916,{
 			mes "[Urstialla]";
 			mes "I managed to acquire a";
 			mes "necklace of incomparable";
-			mes "beauty from the dwarves";
+			mes "beauty from the dwarves.";
 			mes "However, the gems have dulled";
 			mes "with age and need to be shined";
 			mes "before I can offer them to Freya.";