fixed bug reports bugreport::2029 bugreport::2023 bugreport::1923

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

5 files changed, 10 insertions, 8 deletions

diff --git a/conf/Changelog.txt b/conf/Changelog.txt
index 2b3993201..6884ffc0b 100644
--- a/conf/Changelog.txt
+++ b/conf/Changelog.txt
@@ -1,5 +1,7 @@
 Date	Added
 
+2008/08/10
+	* Removed duplicate gef_cas mapflags [Yommy]
 2008/08/01
 	* Rev. 13033 Mapflag updates. Will need to do a complete rewrite eventually. [L0ne_W0lf]
 	- Removed several noicewall limitations from interior maps mostly.
diff --git a/conf/mapflag/nomemo.txt b/conf/mapflag/nomemo.txt
index 364b85237..f165c4dd7 100644
--- a/conf/mapflag/nomemo.txt
+++ b/conf/mapflag/nomemo.txt
@@ -6,6 +6,7 @@
 //= 1.6b Added job_knt map. [Samuray22]
 //= 1.7 Added all novice maps. [L0ne_W0lf]
 //= 1.8 Added nameless_i location [Lupus]
+//= 1.8a Removed duplicate gef_cas nomemo mapflags [Yommy]
 //===== Current Version: =====================================
 
 
@@ -449,11 +450,6 @@ prtg_cas02	mapflag	nomemo
 prtg_cas03	mapflag	nomemo
 prtg_cas04	mapflag	nomemo
 prtg_cas05	mapflag	nomemo
-gefg_cas01	mapflag	nomemo
-gefg_cas02	mapflag	nomemo
-gefg_cas03	mapflag	nomemo
-gefg_cas04	mapflag	nomemo
-gefg_cas05	mapflag	nomemo
 nguild_alde	mapflag	nomemo
 nguild_gef	mapflag	nomemo
 nguild_pay	mapflag	nomemo
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 3b8c6bde6..6f4492479 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,7 @@
 Date		Added
 ======
+2008/08/10
+	* Fixed: several typos (bugreport:2029 bugreport:2023) [Yommy]
 2008/08/08
 	* Rev. 103053 Removed unofficial inn maid from Alberta. [L0en_W0lf]
 	* Rev. 13052 Slew up NPC bug fixes and other updates. [L0ne_W0lf]
diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt
index 48685f3f3..3660dbd6f 100644
--- a/npc/jobs/2-1/blacksmith.txt
+++ b/npc/jobs/2-1/blacksmith.txt
@@ -37,6 +37,7 @@
 //= 2.4e Touched up a few issues as pointed out by Ultramage. [L0ne_W0lf]
 //= 2.5 Krongast is in Lighthalzen. (DarkValmir) [L0ne_W0lf]
 //= 2.6 Fixed 4 bugs [Lupus]
+//= 2.6a Typo fix [Yommy]
 //==============================================================
 
 ein_in01,18,28,4	script	Guildsman#BLS	731,{
@@ -90,7 +91,7 @@ ein_in01,18,28,4	script	Guildsman#BLS	731,{
 		mes "Oh, are you interested in having a weapon forged? I'm sorry to disappoint you, but I actually have a lot of business to attend to.";
 		close;
 	}
-	else if (Baselass == Job_Archer) {
+	else if (BaseClass == Job_Archer) {
 		mes "[Altiregen]";
 		mes "Oh...";
 		mes "There's not much we can offer you here. And you can't really help out around here unless you know how to make stuff...";
@@ -101,7 +102,7 @@ ein_in01,18,28,4	script	Guildsman#BLS	731,{
 		mes "Oh? What's a magic user doing here? I'm surprised. Usually this kind of rough work is beneath you intellectual types.";
 		close;
 	}
-	else if (Baseclass == Job_Acolyte) {
+	else if (BaseClass == Job_Acolyte) {
 		mes "[Altiregen]";
 		mes "Oh! Am I correct in assuming you're a member of the Clergy? Would you please bless me before you leave!";
 		close;
diff --git a/npc/quests/skills/dancer_skills.txt b/npc/quests/skills/dancer_skills.txt
index f25744c9d..6429fb5bd 100644
--- a/npc/quests/skills/dancer_skills.txt
+++ b/npc/quests/skills/dancer_skills.txt
@@ -11,9 +11,10 @@
 //= Quests for skills: Charming Wink
 //===== Additional Comments: ================================= 
 //= 1.4 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
+//= 1.4a Changed NPC location [Yommy]
 //============================================================
 
-comodo,204,127,5	script	Canell#qsk_dan01	724,{
+comodo,204,172,5	script	Canell#qsk_dan01	724,{
 	if (BaseJob == Job_Dancer && JobLevel > 39) {
 		if (DANCER_SK == 0) {
 			mes "[Canell]";