Fixes bugreport:417 and bugreport:418

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

3 files changed, 6 insertions, 7 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 8e84954a3..f019a2f8c 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,7 @@
 Date		Added
 ======
 2007/11/16
+	* Rev. 11740 Fixes bugreport:417 and bugreport:418 [L0ne_W0lf]
 	* Really fixed bugreport:407 [ultramage]
 2007/11/15
 	* Rev. 11733 Several fixes to various scripts. [L0ne_W0lf]
diff --git a/npc/cities/alberta.txt b/npc/cities/alberta.txt
index 6e1d889c0..aa95abde8 100644
--- a/npc/cities/alberta.txt
+++ b/npc/cities/alberta.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= DZeroX
 //===== Current Version: ===================================== 
-//= 1.2
+//= 1.2b
 //===== Compatible With: ===================================== 
 //= eAthena 1.0
 //===== Description: ========================================= 
@@ -12,6 +12,7 @@
 //= 1.0 Converted from Aegis 10.4 [DZeroX]
 //= 1.1 Optimized, missing next, REMOVED .GATs! again [Lupus]
 //= 1.2 Implemented progression fixes provided by $ephiroth. [L0ne_W0lf]
+//= 1.2b More pregression clean up provided by Barron-Monster. [L0ne_W0lf]
 //============================================================
 
 alberta,97,51,0	script	Fabian	84,{
@@ -435,7 +436,6 @@ alberta,190,173,4	script	Phelix	85,{
 				switch(select("As many as I can, please.","I want this many.","Never mind, I like my jellopy.")) {
 				case 1:
 					delitem 909,.@max*10;
-					next;
 					getitem 501,.@max;
 					mes "[Phelix]";
 					mes "There you go! As I promised. Don't";
@@ -469,7 +469,6 @@ alberta,190,173,4	script	Phelix	85,{
 						close;
 					}
 					delitem 909,.@amount*10;
-					next;
 					getitem 501,.@amount;
 					mes "[Phelix]";
 					mes "There you go! As I promised. Don't";
@@ -499,7 +498,6 @@ alberta,190,173,4	script	Phelix	85,{
 				switch(select("As many as I can get, please","I want this many.","Never mind, I like my jellopy.")) {
 				case 1:
 					delitem 909,.@max*3;
-					next;
 					getitem 515,.@max;
 					mes "[Phelix]";
 					mes "There you go~! As I promised. Try";
@@ -531,7 +529,6 @@ alberta,190,173,4	script	Phelix	85,{
 						close;
 					}
 					delitem 909,.@amount*3;
-					next;
 					getitem 515,.@amount;
 					mes "[Phelix]";
 					mes "There you go~! As I promised. Try";
diff --git a/npc/quests/skills/alchemist_skills.txt b/npc/quests/skills/alchemist_skills.txt
index df7c697d8..5f5f9b358 100644
--- a/npc/quests/skills/alchemist_skills.txt
+++ b/npc/quests/skills/alchemist_skills.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Lupus, Reddozen, Samuray22
 //===== Current Version: ===================================== 
-//= 2.0
+//= 2.1
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -13,6 +13,7 @@
 //===== Additional Comments: ================================= 
 //= 1.9 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //= 2.0 Rescripted (and re-added) Bio Ethics quest. [L0ne_W0lf]
+//= 2.1 Fixed a Resurrection -> Homunculus Resurrection. [L0ne_W0lf]
 //============================================================
 
 yuno_in04,33,108,4	script	Pisruik#qsk_al	883,{
@@ -1437,7 +1438,7 @@ lhz_in01,224,140,3	script	Kellasus#qsk_al	57,{
 				mes "you to resurrect Homunculi?";
 				next;
 				input .@input$;
-				if (.@input$ == "Resurrection") {
+				if (.@input$ == "Homunculus Resurrection") {
 					mes "[Kellasus]";
 					mes "So you have been putting";
 					mes "a lot of effort in studying";