* Removed mail commands that no longer exist from help.txt.

* Finally getting around to fixing a few bug reports
- Corrected some view IDs for some newer headgears. (bugreport:1842)
- 11.3 bows are now equippable by all archer classes. (bugreport:1885)
* Getting around to fixing some script bug.
- Fixed bugs in the nameless quest, and other npcs. (bugreport:1845)
- Fixed some bugs in the WoE:SE control devices. (bugreport:1848)
- Fixed minor typo in the novice grounds. (Bugreport:1877)

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

10 files changed, 39 insertions, 25 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 97258639f..3f87739c0 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,10 @@
 Date		Added
 ======
+2008/07/22
+	* Rev. 12981 Getting around to fixing some script bug. [L0ne_W0lf]
+	- Fixed bugs in the nameless quest, and other npcs. (bugreport:1845)
+	- Fixed some bugs in the WoE:SE control devices. (bugreport:1848)
+	- Fixed minor typo in the novice grounds. (Bugreport:1877)
 2008/07/13
 	* Rev. 12951 More updates to Father Bamph for nameless quest. [L0ne_W0lf]
 	* Rev. 12949 Some more modifications to the Nameless Access Quest start point.  [L0ne_W0lf]
diff --git a/npc/guild2/arug_cas01.txt b/npc/guild2/arug_cas01.txt
index 685cee1d5..6f0b615ed 100644
--- a/npc/guild2/arug_cas01.txt
+++ b/npc/guild2/arug_cas01.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -17,6 +17,7 @@
 //= 1.4 Fixed investment period not resetting. [L0ne_W0lf]
 //=     Made it so treasure won't spawn if castle is empty.
 //=     Treasure will now be killed before spawning.
+//= 1.5 Fixed error with control devices. [L0ne_W0lf]
 //============================================================
 
 arug_cas01,1,1,0	script	Manager#aru01_02	111,{
@@ -1940,7 +1941,7 @@ arug_cas01,82,172,0	script	Control Device03#aru01	111,{
 							mapannounce "arug_cas01","The 3rd Fortress Gate has been reconstructed!",bc_map,"0x00ff00";
 							setarray $agit_ar01[4],0;
 							setarray $agit_ar01[3],2;
-							donpcevent "Control Device02#aru01::OnDevice02#aru01_dlrp02";
+							donpcevent "Control Device02#aru01::OnEnable";
 							end;
 						}
 						else {
diff --git a/npc/guild2/arug_cas02.txt b/npc/guild2/arug_cas02.txt
index c127b24e3..1128a1c0a 100644
--- a/npc/guild2/arug_cas02.txt
+++ b/npc/guild2/arug_cas02.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -17,6 +17,7 @@
 //= 1.4 Fixed investment period not resetting. [L0ne_W0lf]
 //=     Made it so treasure won't spawn if castle is empty.
 //=     Treasure will now be killed before spawning.
+//= 1.5 Fixed error with control devices. [L0ne_W0lf]
 //============================================================
 
 arug_cas02,1,1,0	script	Manager#aru02_02	111,{
@@ -1703,7 +1704,7 @@ arug_cas02,118,356,0	script	Control Device02#aru02	111,{
 							mapannounce "arug_cas02","The 2nd Fortress Gate has been reconstructed!",bc_map,"0x00ff00";
 							setarray $agit_ar02[3],0; //Global Variable
 							setarray $agit_ar02[2],2; //Global Variable
-							donpcevent "Control Device01#aru02::OnDevice01#aru02_dlrp01";
+							donpcevent "Control Device01#aru02::OnEnable";
 							end;
 						}
 						else {
@@ -1942,7 +1943,7 @@ arug_cas02,56,308,0	script	Control Device03#aru02	111,{
 							mapannounce "arug_cas02","The 3rd Fortress Gate has been reconstructed!",bc_map,"0x00ff00";
 							setarray $agit_ar02[4],0;
 							setarray $agit_ar02[3],2;
-							donpcevent "Control Device02#aru02::OnDevice02#aru02_dlrp02";
+							donpcevent "Control Device02#aru02::OnEnable";
 							end;
 						}
 						else {
diff --git a/npc/guild2/arug_cas03.txt b/npc/guild2/arug_cas03.txt
index 40f8ec810..12fff2581 100644
--- a/npc/guild2/arug_cas03.txt
+++ b/npc/guild2/arug_cas03.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -18,6 +18,7 @@
 //=     Made it so treasure won't spawn if castle is empty.
 //=     Treasure will now be killed before spawning.
 //=     Should take care of event-not-found error.
+//= 1.5 Fixed error with control devices. [L0ne_W0lf]
 //============================================================
 
 arug_cas03,1,1,0	script	Manager#aru03_02	111,{
@@ -1704,7 +1705,7 @@ arug_cas03,135,212,0	script	Control Device02#aru03	111,{
 							mapannounce "arug_cas03","The 2nd Fortress Gate has been reconstructed!",bc_map,"0x00ff00";
 							setarray $agit_ar03[3],0; //Global Variable
 							setarray $agit_ar03[2],2; //Global Variable
-							donpcevent "Control Device01#aru03::OnDevice01#aru03_dlrp01";
+							donpcevent "Control Device01#aru03::OnEnable";
 							end;
 						}
 						else {
@@ -1943,7 +1944,7 @@ arug_cas03,134,266,0	script	Control Device03#aru03	111,{
 							mapannounce "arug_cas03","The 3rd Fortress Gate has been reconstructed!",bc_map,"0x00ff00";
 							setarray $agit_ar03[4],0;
 							setarray $agit_ar03[3],2;
-							donpcevent "Control Device02#aru03::OnDevice02#aru03_dlrp02";
+							donpcevent "Control Device02#aru03::OnEnable";
 							end;
 						}
 						else {
diff --git a/npc/guild2/arug_cas04.txt b/npc/guild2/arug_cas04.txt
index ff5435d4b..7348d4559 100644
--- a/npc/guild2/arug_cas04.txt
+++ b/npc/guild2/arug_cas04.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -17,6 +17,7 @@
 //= 1.4 Fixed investment period not resetting. [L0ne_W0lf]
 //=     Made it so treasure won't spawn if castle is empty.
 //=     Treasure will now be killed before spawning.
+//= 1.5 Fixed error with control devices. [L0ne_W0lf]
 //============================================================
 
 arug_cas04,1,1,0	script	Manager#aru04_02	111,{
@@ -1703,7 +1704,7 @@ arug_cas04,135,212,0	script	Control Device02#aru04	111,{
 							mapannounce "arug_cas04","The 2nd Fortress Gate has been reconstructed!",bc_map,"0x00ff00";
 							setarray $agit_ar04[3],0; //Global Variable
 							setarray $agit_ar04[2],2; //Global Variable
-							donpcevent "Control Device01#aru04::OnDevice01#aru04_dlrp01";
+							donpcevent "Control Device01#aru04::Enable";
 							end;
 						}
 						else {
@@ -1942,7 +1943,7 @@ arug_cas04,134,266,0	script	Control Device03#aru04	111,{
 							mapannounce "arug_cas04","The 3rd Fortress Gate has been reconstructed!",bc_map,"0x00ff00";
 							setarray $agit_ar04[4],0;
 							setarray $agit_ar04[3],2;
-							donpcevent "Control Device02#aru04::OnDevice02#aru04_dlrp02";
+							donpcevent "Control Device02#aru04::OnEnable";
 							end;
 						}
 						else {
diff --git a/npc/guild2/arug_cas05.txt b/npc/guild2/arug_cas05.txt
index 40e025927..5fe840ea6 100644
--- a/npc/guild2/arug_cas05.txt
+++ b/npc/guild2/arug_cas05.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -17,6 +17,7 @@
 //= 1.4 Fixed investment period not resetting. [L0ne_W0lf]
 //=     Made it so treasure won't spawn if castle is empty.
 //=     Treasure will now be killed before spawning.
+//= 1.5 Fixed error with control devices. [L0ne_W0lf]
 //============================================================
 
 arug_cas05,1,1,0	script	Manager#aru05_02	111,{
@@ -1703,7 +1704,7 @@ arug_cas05,135,212,0	script	Control Device02#aru05	111,{
 							mapannounce "arug_cas05","The 2nd Fortress Gate has been reconstructed!",bc_map,"0x00ff00";
 							setarray $agit_ar05[3],0; //Global Variable
 							setarray $agit_ar05[2],2; //Global Variable
-							donpcevent "Control Device01#aru05::OnDevice01#aru05_dlrp01";
+							donpcevent "Control Device01#aru05::OnEnable";
 							end;
 						}
 						else {
@@ -1942,7 +1943,7 @@ arug_cas05,134,266,0	script	Control Device03#aru05	111,{
 							mapannounce "arug_cas05","The 3rd Fortress Gate has been reconstructed!",bc_map,"0x00ff00";
 							setarray $agit_ar05[4],0;
 							setarray $agit_ar05[3],2;
-							donpcevent "Control Device02#aru05::OnDevice02#aru05_dlrp02";
+							donpcevent "Control Device02#aru05::OnEnable";
 							end;
 						}
 						else {
diff --git a/npc/guild2/schg_cas02.txt b/npc/guild2/schg_cas02.txt
index d42f0b8bb..395ba25ec 100644
--- a/npc/guild2/schg_cas02.txt
+++ b/npc/guild2/schg_cas02.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.7
+//= 1.8
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -20,6 +20,7 @@
 //= 1.7 Fixed investment period not resetting. [L0ne_W0lf]
 //=     Made it so treasure won't spawn if castle is empty.
 //=     Treasure will now be killed before spawning.
+//= 1.8 Fixed error with control devices. [L0ne_W0lf]
 //============================================================
 
 schg_cas02,1,1,0	script	Manager#sch02_02	111,{
@@ -1939,7 +1940,7 @@ schg_cas02,159,143,0	script	Control Device03#sch02	111,{
 							mapannounce "schg_cas02","The 3rd Fortress Gate has been reconstructed!!",bc_map,"0x00ff00";
 							setarray $agit_sc02[4],0;
 							setarray $agit_sc02[3],2;
-							donpcevent "Control Device02#sch02::OnDevice02#sch02_dlrp02";
+							donpcevent "Control Device02#sch02::OnEnable";
 							end;
 						}
 						else {
diff --git a/npc/jobs/novice/novice.txt b/npc/jobs/novice/novice.txt
index 0ae15107d..03c194501 100644
--- a/npc/jobs/novice/novice.txt
+++ b/npc/jobs/novice/novice.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Dr.Evil & MasterOfMuppets
 //===== Current Version: ===================================== 
-//= 2.0
+//= 2.1
 //===== Compatible With: ===================================== 
 //= eAthena SVN 3422+(Requires jA Script System)
 //===== Description: ========================================= 
@@ -18,12 +18,13 @@
 //=     Fixed Entrance Guard clearing vars. (bugreport:1695)
 //=     Added duplicate NPCs to combat training maps.
 //= 2.0 Fixed savepoint not being changed sometimes. [L0ne_W0lf]
+//= 2.1 Corrected spacing issue in welcome message. [L0ne_W0lf]
 //============================================================ 
 
 // Bulletin Board
 new_1-1,66,114,4	script	Bulletin Board#nv	111,{
 	mes "^FF0000=================================^000000";
-	mes "^FF0000 ^000000 ^E40CAA[Welcome] ^CC0000to^FF9000Novice^7FFF00 Training^00FF00 Grounds^E40CAA [Welcome] ^FF0000^000000";
+	mes "^FF0000 ^000000 ^E40CAA[Welcome]^CC0000 to ^FF9000Novice^7FFF00 Training ^00FF00Grounds ^E40CAA[Welcome]^FF0000^000000";
 	mes "^FF0000=================================^000000";
 	close;
 }
diff --git a/npc/quests/quests_nameless.txt b/npc/quests/quests_nameless.txt
index 64bfff6da..e50360378 100644
--- a/npc/quests/quests_nameless.txt
+++ b/npc/quests/quests_nameless.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.1a
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -33,6 +33,7 @@
 //= 1.0 First version. [L0ne_W0lf]
 //= 1.1 Made quest accessable to "Failed" gaebolg quest. [L0ne_W0lf]
 //= 1.1a Touch up to other Gaebolg fail-points. [L0ne_W0lf]
+//= 1.2 Some final tuning to Nameless Island quest. [Koca]
 //============================================================ 
 
 airplane_01,95,61,3	script	Agent#Aru	899,5,5,{
@@ -110,7 +111,7 @@ cmd_in02,174,89,7	script	Ordinary Man#pc1	97,{
 	}
 }
 
-cmd_in02,111,52,3	script	Orfinary Man#pc2	97,{
+cmd_in02,111,52,3	script	Ordinary Man#pc2	97,{
 	if (aru_monas < 3) {
 		mes "[Larjes]";
 		mes "^666666*Sigh...*^000000";
@@ -1749,7 +1750,7 @@ nameless_in,13,53,0	script	#Aru_Trigger2	-1,3,1,{
 	end;
 
 OnTouch:
-	if (aru_monas == 19 || !@mymobcount) {
+	if (aru_monas == 19 && !@mymobcount) {
 		mes "[?????]";
 		mes "Grrr......";
 		close2;
@@ -1782,7 +1783,7 @@ OnTouch:
 	}
 
 OnInit:
-	disablenpc "Aru_warp";
+	disablenpc "aru_warp";
 	end;
 }
 
diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt
index 0ebc7105d..3de2318be 100644
--- a/npc/quests/quests_veins.txt
+++ b/npc/quests/quests_veins.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.5
+//= 1.5a
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -36,6 +36,7 @@
 //= 1.4 Added missing checkweights. [L0ne_W0lf]
 //= 1.4a Corrected a typo error ";;". [Toms]
 //= 1.5 Added Nameless Island quest addition. [L0ne_W0lf]
+//= 1.5a Corrected a couple typos in Nameless Addition. [L0ne_W0lf]
 //============================================================ 
 
 // Stone Quest
@@ -3044,7 +3045,7 @@ veins,327,185,3	script	Kid#camelcamel	944,{
 				mes "Ah, and I've been taking care";
 				mes "of her, just like I promised~";
 				next;
-				mes "["+strcharinfo(0)+"";
+				mes "["+strcharinfo(0)+"]";
 				mes "Really? That's good";
 				mes "You should be proud~";
 				next;
@@ -4315,7 +4316,7 @@ veins,227,127,5	script	Ivory	940,{
 		next;
 		mes "[Organic Soap Maker Ivory]";
 		mes "And um... Don't let";
-		mes "anyone 	else know what";
+		mes "anyone else know what";
 		mes "I use to make this soap.";
 		mes "People won't buy it if they";
 		mes "knew they were washing their";