Minor fixes here and there to a few scripts.

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

3 files changed, 18 insertions, 15 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 3e8706c5d..f1c1bdd9e 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,7 @@
 Date		Added
 ======
+2007/10/25
+	* Rev. 11574 Minor fixes here and there to a few scripts. [L0ne_W0lf]
 2007/10/24
 	* Rev. 11570 Added the Advanced Refiner for Enriched ores. [L0ne_W0lf]
 	- I've had this done for awhile now, but I've never submitted it. XD
diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt
index 4055cdae5..47faece1e 100644
--- a/npc/cities/jawaii.txt
+++ b/npc/cities/jawaii.txt
@@ -5,7 +5,7 @@
 //= DNett123 (1.1 - 1.5)
 //= L0ne_w0lf
 //===== Current Version: =====================================
-//= 3.2
+//= 3.3
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -30,6 +30,7 @@
 //=		replaced getpartnerid() with ispartneron() at some tri-forks [Lupus]
 //= 3.2 Reverted ispartneron() BACK to getpartnerid(). [L0ne_W0lf]
 //=	None of the NPCs need the player's partner to be online.
+//= 3.3 Just a small fix up on the Bartender. [L0ne_W0lf]
 //============================================================
 // Jawaii
 //============================================================
@@ -1057,7 +1058,6 @@ jawaii_in,28,124,0	script	Bartender#jaw	46,{
 
 		case 5:
 			callsub S_KillChar,1;
-			mes "[Bartender]";
 			mes "There are not many people who like this drink. But the ones that do like this drink, love it.";
 			next;
 			mes "[Bartender]";
diff --git a/npc/jobs/valkyrie.txt b/npc/jobs/valkyrie.txt
index 83071ac34..a27a958bd 100644
--- a/npc/jobs/valkyrie.txt
+++ b/npc/jobs/valkyrie.txt
@@ -5,7 +5,7 @@
 //= finished, optimized and tested by Lupus
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 2.8
+//= 2.9
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -34,6 +34,7 @@
 //=	scripts are comepleted.
 //= 2.7b Removed function "F_BlockHigh" as it's no longer used. [L0ne_W0lf]
 //= 2.8 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
+//= 2.9 Corrected Valkyrie case spicifying where to warp after rebirthing. [L0ne_W0lf]
 //============================================================ 
 
 valkyrie,48,86,4	script	Valkyrie#	811,{
@@ -167,24 +168,24 @@ valkyrie,48,86,4	script	Valkyrie#	811,{
 			mes "And I pray that the new life to which the goddess Skuld will guide you will be even more honorable than your last.";
 			close2;
 			switch (ADVJOB) {
-			case 4001:
-			case 4007:
-				warp "izlude",94,103; break;
-			case 4002:
 			case 4008:
-				warp "prontera",273,354; break;
-			case 4003:
+			case 4015:
+				warp "izlude",94,103; break;
 			case 4009:
-				warp "geffen",120,60; break;
-			case 4004:
+			case 4016:
+				warp "prontera",273,354; break;
 			case 4010:
+			case 4017:
+				warp "geffen",120,60; break;
+			case 4011:
+			case 4019:
 				warp "alberta",116,57; break;
-			case 4005:
 			case 4012:
-			case 4013:
+			case 4020:
+			case 4021:
 				warp "payon",69,100; break;
-			case 4006:
-			case 4011:
+			case 4013:
+			case 4018:
 				warp "morocc",154,50; break;
 			default:
 				warp "yuno_in02",93,205; break;