* Changed attribute_recover to no, being hit by the same element should not recover HP.

* Added monster_noteleport to Okolnir quest maps. Will fix the tarot card issue.

- Fixed Brynhild dialog in the Asprika quests. (bugreport:3085)
- Removed "Disabled" tag from Volcano base quest. (bugreport:3342)
- Attempted to fix the sign quest dancing portion. (bugreport:3382)
- Fixed Guardian in schg_cas03 using invalid coords. (bugreport:3462)
- Fixed Turbo Track records using wrong variable type. (bugreport:3484)
- Fixed the checkweights in the Crow of Fate quest. (bugreport:3500)

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

8 files changed, 24 insertions, 17 deletions

diff --git a/npc/quests/The_Sign_Quest.txt b/npc/quests/The_Sign_Quest.txt
index 4c9bb54c7..c7b42c089 100644
--- a/npc/quests/The_Sign_Quest.txt
+++ b/npc/quests/The_Sign_Quest.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= SinSloth(Most of the NPCs), MasterOfMuppets(Some of the NPCs + bug fixes) & Kargha(The quiz NPCs)
 //===== Current Version: ===================================== 
-//= 3.1
+//= 3.2
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -17,6 +17,8 @@
 //=     version, variables will attmept to be translated to the
 //=     new version, however it is untested.
 //= 3.1 Corrected time check for Sir Jore. [L0ne_W0lf]
+//= 3.2 Removed mapannounce used while debugging. [L0ne_W0lf]
+//=     Moved the disablewaitingroomevent in dancing portion.
 //============================================================ 
 
 //============================================================ 
@@ -5219,11 +5221,11 @@ OnInit:
 	end;
 
 OnStartArena:
-	disablewaitingroomevent;
 	donpcevent "s_dance_timer::Onbutton_off";
 	donpcevent "Examiner#sd::OnDisable";
 	warpwaitingpc "cmd_in01",16,15,1;
 	donpcevent "s_dance_timer::OnEnable";
+	disablewaitingroomevent;
 	end;
 
 Onreset:
@@ -5731,7 +5733,6 @@ OnTouch:
 
 Onup:
 	set .s_check,.s_check + 1;
-mapannounce "cmd_in01", "check: "+.s_check,bc_map,"0x00FF00";
 	end;
 
 OnDisable:
diff --git a/npc/quests/okolnir/godse_aru01.txt b/npc/quests/okolnir/godse_aru01.txt
index f5617f6c3..2f30bdf7b 100644
--- a/npc/quests/okolnir/godse_aru01.txt
+++ b/npc/quests/okolnir/godse_aru01.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.2
+//= 1.2a
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -21,6 +21,7 @@
 //=     Fixed message on the portal when the okolnir section is full.
 //=     Corrected non-angry Piamette not disabling.
 //=     Removed extra dialog that was used in the Brynhild quest.
+//= 1.2a Fixed Wish maiden asking for soft feathers. [L0ne_W0lf]
 //============================================================ 
 
 arug_cas01,161,371,3	script	Guide#gq_aru01	899,{
@@ -274,7 +275,7 @@ que_qaru01,345,82,3	script	Wish Maiden#gq_aru01	403,{
 				next;
 				mes "[Wish Maiden]";
 				mes "Remember...";
-				mes "You need to collect many Valhalla flowers.";
+				mes "You need to collect many soft feathers.";
 				mes "I hope that your dreams come true.";
 				next;
 				mes "[Wish Maiden]";
diff --git a/npc/quests/okolnir/godse_aru02.txt b/npc/quests/okolnir/godse_aru02.txt
index 7ae66cc87..bc006f47c 100644
--- a/npc/quests/okolnir/godse_aru02.txt
+++ b/npc/quests/okolnir/godse_aru02.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.2
+//= 1.2a
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -21,6 +21,7 @@
 //=     Fixed message on the portal when the okolnir section is full.
 //=     Corrected non-angry Piamette not disabling.
 //=     Removed extra dialog that was used in the Brynhild quest.
+//= 1.2a Fixed Wish maiden asking for soft feathers. [L0ne_W0lf]
 //============================================================ 
 
 arug_cas02,349,347,3	script	Guide#gq_aru02	899,{
@@ -274,7 +275,7 @@ que_qaru02,345,82,3	script	Wish Maiden#gq_aru02	403,{
 				next;
 				mes "[Wish Maiden]";
 				mes "Remember...";
-				mes "You need to collect many Valhalla flowers.";
+				mes "You need to collect many soft feathers.";
 				mes "I hope that your dreams come true.";
 				next;
 				mes "[Wish Maiden]";
diff --git a/npc/quests/okolnir/godse_aru03.txt b/npc/quests/okolnir/godse_aru03.txt
index ceea46902..c53637c02 100644
--- a/npc/quests/okolnir/godse_aru03.txt
+++ b/npc/quests/okolnir/godse_aru03.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.2
+//= 1.2a
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -21,6 +21,7 @@
 //=     Fixed message on the portal when the okolnir section is full.
 //=     Corrected non-angry Piamette not disabling.
 //=     Removed extra dialog that was used in the Brynhild quest.
+//= 1.2a Fixed Wish maiden asking for soft feathers. [L0ne_W0lf]
 //============================================================ 
 
 arug_cas03,324,161,3	script	Guide#gq_aru03	899,{
@@ -274,7 +275,7 @@ que_qaru03,345,82,3	script	Wish Maiden#gq_aru03	403,{
 				next;
 				mes "[Wish Maiden]";
 				mes "Remember...";
-				mes "You need to collect many Valhalla flowers.";
+				mes "You need to collect many soft feathers.";
 				mes "I hope that your dreams come true.";
 				next;
 				mes "[Wish Maiden]";
diff --git a/npc/quests/okolnir/godse_aru04.txt b/npc/quests/okolnir/godse_aru04.txt
index 425137bfc..983115ad5 100644
--- a/npc/quests/okolnir/godse_aru04.txt
+++ b/npc/quests/okolnir/godse_aru04.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.2
+//= 1.2a
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -21,6 +21,7 @@
 //=     Fixed message on the portal when the okolnir section is full.
 //=     Corrected non-angry Piamette not disabling.
 //=     Removed extra dialog that was used in the Brynhild quest.
+//= 1.2a Fixed Wish maiden asking for soft feathers. [L0ne_W0lf]
 //============================================================ 
 
 arug_cas04,324,161,3	script	Guide#gq_aru04	899,{
@@ -274,7 +275,7 @@ que_qaru04,345,82,3	script	Wish Maiden#gq_aru04	403,{
 				next;
 				mes "[Wish Maiden]";
 				mes "Remember...";
-				mes "You need to collect many Valhalla flowers.";
+				mes "You need to collect many soft feathers.";
 				mes "I hope that your dreams come true.";
 				next;
 				mes "[Wish Maiden]";
diff --git a/npc/quests/okolnir/godse_aru05.txt b/npc/quests/okolnir/godse_aru05.txt
index 116ba7015..37ca9536b 100644
--- a/npc/quests/okolnir/godse_aru05.txt
+++ b/npc/quests/okolnir/godse_aru05.txt
@@ -21,6 +21,7 @@
 //=     Fixed message on the portal when the okolnir section is full.
 //=     Corrected non-angry Piamette not disabling.
 //=     Removed extra dialog that was used in the Brynhild quest.
+//= 1.2a Fixed Wish maiden asking for soft feathers. [L0ne_W0lf]
 //============================================================ 
 
 arug_cas05,324,161,3	script	Guide#gq_aru05	899,{
@@ -274,7 +275,7 @@ que_qaru05,345,82,3	script	Wish Maiden#gq_aru05	403,{
 				next;
 				mes "[Wish Maiden]";
 				mes "Remember...";
-				mes "You need to collect many Valhalla flowers.";
+				mes "You need to collect many soft feathers.";
 				mes "I hope that your dreams come true.";
 				next;
 				mes "[Wish Maiden]";
diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt
index b0d4808ad..4970a52b6 100644
--- a/npc/quests/quests_morocc.txt
+++ b/npc/quests/quests_morocc.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= kobra_k88
 //===== Current Version: ===================================== 
-//= 2.6
+//= 2.7
 //===== Compatible With: ===================================== 
 //= eAthena 7.15 +
 //===== Description: ========================================= 
@@ -39,6 +39,7 @@
 //=     Added the two remaining episode 12.1 quests. 
 //=     Updated Satan Morroc Quest to allow peopel who have
 //=     finished it to return to the previous map.
+//= 2.7 Corrected weight checks, they only check for inventory slots. [L0ne_W0lf]
 //============================================================ 
 
 // Stop Post Quest
@@ -2017,7 +2018,7 @@ OnTimer5415000:
 // ============================================================
 moc_ruins,137,70,3	script	Book-Touching Man#garas	48,{
 	if (BaseLevel > 59) {
-		if ((wt_inven == 2) || (wt_inven == 3)) {
+		if (checkweight(703,3) == 0) {
 			mes "- You have too many items in your inventory to proceed with this quest. -";
 			close;
 		}
@@ -3030,7 +3031,7 @@ yuno_in04,117,102,3	script	Old News Scrapbook	844,{
 }
 
 yuno_in04,169,123,3	script	Suspicious Man#oliver_h	407,{
-	if ((wt_inven == 2) || (wt_inven == 3)) {
+	if (checkweight(617,3) == 0) {
 		mes "- You have too many items in your inventory to proceed with this quest. -";
 		close;
 	}
@@ -3243,7 +3244,7 @@ yuno_in04,169,123,3	script	Suspicious Man#oliver_h	407,{
 }
 
 yuno_in04,167,120,3	script	Worn-out Book#garas	111,{
-	if ((wt_inven == 2) || (wt_inven == 3)) {
+	if (checkweight(617,3) == 0) {
 		mes "- You have too many items in your inventory to proceed with this quest. -";
 		close;
 	}
diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt
index 55f83f21d..4dbfac3e5 100644
--- a/npc/quests/quests_veins.txt
+++ b/npc/quests/quests_veins.txt
@@ -21,7 +21,7 @@
 //= - Help a boy save his little sister.
 //= - Dialog partially obtained from iRO.
 //= - Variable in use: rachel_camel (max 25)
-//= Thor Volcano Base Quest (Disabled):
+//= Thor Volcano Base Quest:
 //= - Missing addition to High Priest Zhed to start quest.
 //= - Infiltrate Thor Volcano Base. What is Arunafeltz up to?
 //= - Variable in use: rachel_camel (max 27)