Bläddra i källkod

Lots of small updates and corrections to seal quests.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13194 54d463be-8e91-2dee-dedb-b68131a5f0ec
L0ne_W0lf 16 år sedan
förälder
incheckning
12d5adad29

+ 1 - 0
npc/Changelog.txt

@@ -1,6 +1,7 @@
 Date		Added
 ======
 2008/09/06
+	* Rev. 13194 Lots of small updates and corrections to seal quests. [L0ne_W0lf]
 	* Rev. 13193 Applied bug fixes for IDs in recent quests. (bugreport:2189) [L0ne_W0lf]
 2008/09/03
 	* Rev. 13188 Fixed inconsitencies in mosk_dun spawns. (bugreport:2165) [L0ne_W0lf]

+ 4 - 15
npc/quests/seals/brisingamen_seal.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= SinSloth
 //===== Current Version: ===================================== 
-//= 1.2
+//= 1.3
 //===== Compatible With: ===================================== 
 //= eAthena
 //===== Description: ========================================= 
@@ -13,6 +13,7 @@
 //= 1.0a Removed duplicates [Toms]
 //= 1.1 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 1.2 Updated several aspects of the script. [L0ne_W0lf]
+//= 1.3 Minor Touchups to quest. [L0ne_W0lf]
 //============================================================
 
 prt_fild08,175,374,3	script	Bard#brising	51,{
@@ -1311,19 +1312,6 @@ yuno_in04,47,113,1	script	Studying Scholar#1	749,{
 			}
 		}
 		else if (god_brising == 1) {
-			mes "[Enrico Kaili]";
-			mes "How are you...ah! It is you, " + strcharinfo(0) + "!";
-			mes "Yes, I was told by Nelliorde that you will visit me.";
-			mes "He always tells me that he will";
-			mes "a good assistance for my research.";
-			mes "So, how was your travel?";
-			next;
-			mes "[Enrico Kaili]";
-			mes "Hahaha, I guess you would not have a hard time to come";
-			mes "to Juno...since there are various convenience travelling";
-			mes "methods as warp portal and kafra teleport service!";
-			mes "So, how was my joke? Hahahaha!";
-			next;
 			mes "[Enrico Kaili]";
 			mes "Ah, you've arrived!";
 			mes "" + strcharinfo(0) + ", right?";
@@ -1494,7 +1482,8 @@ prt_church,113,103,1	script	Praying Man	798,{
 	else if (god_brising > 19 && god_brising < 34) {
 		mes "[Hermite Charles]";
 		mes "I'll be waiting.";
-		mes "For some reason, I believe you'll be able to find some sort of clue about what happened these past two years one of these days.";
+		mes "For some reason, I believe you'll be able to find some sort of clue about what happened these past";
+		mes "two years one of these days.";
 		close;
 	}
 	else if (god_brising == 12) {

+ 18 - 17
npc/quests/seals/god_weapon_creation.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= SinSloth
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena
 //===== Description: ========================================= 
@@ -11,6 +11,7 @@
 //===== Additional Comments: =================================
 //= 1.0 First version. Thanks to SinSloth for scripting it. [MasterOfMuppets]
 //= 1.1 Updated several aspects of the script. [L0ne_W0lf]
+//= 1.2 Corrected several incorrect item IDs. [L0ne_W0lf]
 //============================================================
 
 gld_dun01,28,85,0	script	Grunburti#1::GodDwarf	826,{
@@ -167,7 +168,7 @@ gld_dun01,28,85,0	script	Grunburti#1::GodDwarf	826,{
 		mes "[Dwarf Grunburti]";
 		mes "First of all, I shall confirm whether or not you have brought all the necessary materials to forge a godly item! I hate it when humans come here without any purpose!";
 		next;
-		if ((countitem(7073) > 3) && (countitem(7077) > 3) && (countitem(7088) > 2) && (countitem(7090) > 2) && (countitem(7092) > 2) && (countitem(726) > 1) && (countitem(722) > 2) && (countitem(727) > 9) && (countitem(724) > 4) && (countitem(614) > 19) && (countitem(2603) > 0)) {
+		if ((countitem(7073) > 3) && (countitem(7077) > 3) && (countitem(7088) > 2) && (countitem(7090) > 2) && (countitem(7092) > 2) && (countitem(726) > 1) && (countitem(722) > 2) && (countitem(727) > 9) && (countitem(724) > 4) && (countitem(969) > 19) && (countitem(2603) > 0)) {
 			mes "[Dwarf Grunburti]";
 			mes "Hmm...";
 			mes "I guess you";
@@ -175,7 +176,7 @@ gld_dun01,28,85,0	script	Grunburti#1::GodDwarf	826,{
 			mes "^0000FFBrisingamen^000000!";
 			next;
 		}
-		else if ((countitem(7058) > 0) && (countitem(614) > 19) && (countitem(726) > 9) && (countitem(615) > 9) && (countitem(2627) > 0)){ //Gullraifnir Gold Blue_Jewel Oridecon Belt 
+		else if ((countitem(7058) > 0) && (countitem(969) > 19) && (countitem(726) > 9) && (countitem(984) > 9) && (countitem(2627) > 0)){ //Gullraifnir Gold Blue_Jewel Oridecon Belt 
 			mes "[Dwarf Grunburti]";
 			mes "Hmm...";
 			mes "I guess you";
@@ -183,7 +184,7 @@ gld_dun01,28,85,0	script	Grunburti#1::GodDwarf	826,{
 			mes "^0000FFMegingjard^000000!";
 			next;
 		}
-		else if ((countitem(7076) > 2) && (countitem(7079) > 4) && (countitem(7083) > 2) && (countitem(7086) > 3) && (countitem(7087) > 2) && (countitem(614) > 19) && (countitem(757) > 9) && (countitem(2406) > 0)) {
+		else if ((countitem(7076) > 2) && (countitem(7079) > 4) && (countitem(7083) > 2) && (countitem(7086) > 3) && (countitem(7087) > 2) && (countitem(969) > 19) && (countitem(985) > 9) && (countitem(2406) > 0)) {
 			mes "[Dwarf Grunburti]";
 			mes "Hmm...";
 			mes "I guess you";
@@ -191,7 +192,7 @@ gld_dun01,28,85,0	script	Grunburti#1::GodDwarf	826,{
 			mes "^0000FFSleipnir^000000!";
 			next;
 		}
-		else if ((countitem(7074) > 1) && (countitem(7075) > 3) && (countitem(7078) > 4) && (countitem(7089) > 4) && (countitem(7091) > 4) && (countitem(615) > 19) && (countitem(757) > 4) && (countitem(614) > 39) && (countitem(1522) > 0)) {
+		else if ((countitem(7074) > 1) && (countitem(7075) > 3) && (countitem(7078) > 4) && (countitem(7089) > 4) && (countitem(7091) > 4) && (countitem(984) > 19) && (countitem(985) > 4) && (countitem(969) > 39) && (countitem(1522) > 0)) {
 			mes "[Dwarf Grunburti]";
 			mes "Hmm...";
 			mes "I guess you";
@@ -457,7 +458,7 @@ que_god01,154,112,4	script	Grunburti#god	826,{
 		next;
 		switch(select("Make Brisingamen.:Cancel.")) {
 		case 1:
-			if ((countitem(7073) > 3) && (countitem(7077) > 3) && (countitem(7088) > 2) && (countitem(7090) > 2) && (countitem(7092) > 2) && (countitem(726) > 1) && (countitem(722) > 2) && (countitem(727) > 9) && (countitem(724) > 4) && (countitem(614) > 19) && (countitem(2603) > 0)){ //Jewel_Of_Prayer Silver_Fancy Crystal_Of_Snow Slilince_Wave Air_Stream Blue_Jewel Scarlet_Jewel White_Jewel Cardinal_Jewel_ Gold Necklace 
+			if ((countitem(7073) > 3) && (countitem(7077) > 3) && (countitem(7088) > 2) && (countitem(7090) > 2) && (countitem(7092) > 2) && (countitem(726) > 1) && (countitem(722) > 2) && (countitem(727) > 9) && (countitem(724) > 4) && (countitem(969) > 19) && (countitem(2603) > 0)){ //Jewel_Of_Prayer Silver_Fancy Crystal_Of_Snow Slilince_Wave Air_Stream Blue_Jewel Scarlet_Jewel White_Jewel Cardinal_Jewel_ Gold Necklace 
 				mes "[Dwarf Grunburti]";
 				mes "Never in my wildest";
 				mes "imaginings have I thought that I'd be crafting this masterpiece for a mere human. Give me a moment.";
@@ -487,7 +488,7 @@ que_god01,154,112,4	script	Grunburti#god	826,{
 				delitem 722,3;  //Scarlet_Jewel
 				delitem 727,10;  //White_Jewel
 				delitem 724,5;  //Cardinal_Jewel_
-				delitem 614,20;  //Gold
+				delitem 969,20;  //Gold
 				delitem 2603,1;  //Necklace
 				getitem 2630,1; // Brysinggamen
 				set $God1,0;
@@ -536,7 +537,7 @@ que_god01,154,112,4	script	Grunburti#god	826,{
 		next;
 		switch(select("Make Megingjard.:Cancel.")) {
 		case 1:
-			if ((countitem(7058) > 0) && (countitem(614) > 19) && (countitem(726) > 9) && (countitem(615) > 9) && (countitem(2627) > 0)) {
+			if ((countitem(7058) > 0) && (countitem(969) > 19) && (countitem(726) > 9) && (countitem(984) > 9) && (countitem(2627) > 0)) {
 				mes "[Dwarf Grunburti]";
 				mes "Twenty years ago,";
 				mes "I'd never believe that";
@@ -559,9 +560,9 @@ que_god01,154,112,4	script	Grunburti#god	826,{
 					close;
 				}
 				delitem 7058,1;  //Gullraifnir
-				delitem 614,20;  //Gold
+				delitem 969,20;  //Gold
 				delitem 726,10;  //Blue_Jewel
-				delitem 615,10;  //Oridecon
+				delitem 984,10;  //Oridecon
 				delitem 2627,1;  //Belt
 				getitem 2629,1; // Magingiorde
 				set $God1,0;
@@ -621,7 +622,7 @@ que_god01,154,112,4	script	Grunburti#god	826,{
 		next;
 		switch(select("Make Sleipnir.:Cancel.")) {
 		case 1:
-			if ((countitem(7076) > 2) && (countitem(7079) > 4) && (countitem(7083) > 2) && (countitem(7086) > 3) && (countitem(7087) > 2) && (countitem(614) > 19) && (countitem(757) > 9) && (countitem(2406) > 0)) {
+			if ((countitem(7076) > 2) && (countitem(7079) > 4) && (countitem(7083) > 2) && (countitem(7086) > 3) && (countitem(7087) > 2) && (countitem(969) > 19) && (countitem(985) > 9) && (countitem(2406) > 0)) {
 				mes "[Dwarf Grunburti]";
 				mes "I never believed";
 				mes "that the speed of";
@@ -650,8 +651,8 @@ que_god01,154,112,4	script	Grunburti#god	826,{
 				delitem 7083,3;  //Soul_Of_Fish
 				delitem 7086,4;  //Symbol_Of_Sun
 				delitem 7087,3;  //Breath_Of_Soul
-				delitem 614,20;  //Gold
-				delitem 757,10;  //Elunium
+				delitem 969,20;  //Gold
+				delitem 985,10;  //Elunium
 				delitem 2406,1;  //Boots_
 				getitem 2410,1; // Sleipnir
 				set $God1,0;
@@ -710,7 +711,7 @@ que_god01,154,112,4	script	Grunburti#god	826,{
 		next;
 		switch(select("Make Mjolnir.:Cancel.")) {
 		case 1:
-			if ((countitem(7074) > 1) && (countitem(7075) > 3) && (countitem(7078) > 4) && (countitem(7089) > 4) && (countitem(7091) > 4) && (countitem(615) > 19) && (countitem(757) > 4) && (countitem(614) > 39) && (countitem(1522) > 0)) {
+			if ((countitem(7074) > 1) && (countitem(7075) > 3) && (countitem(7078) > 4) && (countitem(7089) > 4) && (countitem(7091) > 4) && (countitem(984) > 19) && (countitem(985) > 4) && (countitem(969) > 39) && (countitem(1522) > 0)) {
 				mes "[Dwarf Grunburti]";
 				mes "Do not disgrace";
 				mes "Thor, lord of Thunder,";
@@ -738,9 +739,9 @@ que_god01,154,112,4	script	Grunburti#god	826,{
 				delitem 7078,5;  //Anger_Of_Valkurye
 				delitem 7089,5;  //Indication_Of_Tempest
 				delitem 7091,5;  //Rough_Billows
-				delitem 615,20;  //Oridecon
-				delitem 757,5;  //Elunium
-				delitem 614,40;  //Gold
+				delitem 984,20;  //Oridecon
+				delitem 985,5;  //Elunium
+				delitem 969,40;  //Gold
 				delitem 1522,1;  //Stunner
 				getitem 1530,1; // Mjolnir
 				set $God1,0;

+ 4 - 3
npc/quests/seals/megingard_seal.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= SinSloth
 //===== Current Version: ===================================== 
-//= 1.3
+//= 1.4
 //===== Compatible With: ===================================== 
 //= eAthena
 //===== Description: ========================================= 
@@ -13,11 +13,12 @@
 //= 1.1 fixed exploit [Lupus]
 //= 1.2 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //= 1.3 Updated several aspects of the script. [L0ne_W0lf]
+//= 1.4 Minor Touchups to quest. [L0ne_W0lf]
 //============================================================
 
 prt_castle,44,151,0	script	Rebarev Doug	56,{
 	cutin "god_rebeireb",2;
-	if ((countitem(7080) > 3) && (countitem(7081) > 4) && (countitem(7082) > 3) && (countitem(7084) > 2) && (countitem(7085) > 2)){ //Foot_Step_Of_Cat Beard_Of_Women Root_Of_Stone Saliva_Of_Bird Tendon_Of_Bear 
+	if ((countitem(7080) > 3) && (countitem(7081) > 4) && (countitem(7082) > 3) && (countitem(7084) > 2) && (countitem(7085) > 2)) {
 		mes "[Rebarev Doug]";
 		mes "What's this?";
 		mes "You...! You have";
@@ -1195,7 +1196,7 @@ prt_in,172,106,0	script	Librarian#megin	833,{
 										}
 									}
 								}
-								 else {
+								else {
 									mes "^663300[Keyword: ^996633"+.@input$+"^663300]";
 									mes "- No result has been found.-";
 									close2;

+ 81 - 23
npc/quests/seals/mjolnir_seal.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= SinSloth
 //===== Current Version: ===================================== 
-//= 1.2
+//= 1.3
 //===== Compatible With: ===================================== 
 //= eAthena
 //===== Description: ========================================= 
@@ -13,6 +13,7 @@
 //= 1.1 Fixed wrong label names [Luups]
 //= 1.1a Corrected a a typo error ";;". [Samuray22]
 //= 1.2 Updated several aspects of the script. [L0ne_W0lf]
+//= 1.3 Minor Touchups to quest. [L0ne_W0lf]
 //============================================================
 
 prontera,124,297,3	script	Tialfi	706,{
@@ -653,13 +654,11 @@ mjolnir_11,149,247,5	script	Dwarf Blacksmith#east	826,{
 							}
 						}
 					}
-					else  {
+					else {
 						mes "[Austri]";
-						mes "You don't seem to understand.";
-						mes "If you wish to prove to me that";
-						mes "you understand blacksmiths, you";
-						mes "should bring something related";
-						mes "to my work!";
+						mes "You don't seem to";
+						mes "understand. If you";
+						mes "wish to prove to me that you understand blacksmiths, you should bring something related to my work!";
 						close;
 					}
 				}
@@ -1628,10 +1627,9 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	826,{
 						specialeffect2 EF_GUARD;
 						if (.@p_def == 1) {
 							mes "--------------------";
-							mes "" + strcharinfo(0) + "";
-							mes "quickly dodged!";
-							mes "Sudri's arms were";
-							mes "too short and missed!";
+							mes "" + strcharinfo(0) + " quickly dodged,";
+							mes "Sudri's arms were too";
+							mes "short to reach at you.";
 							mes "--------------------";
 							mes "Sudri has failed to attack.";
 						}
@@ -1868,9 +1866,9 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 			mes "There's nothing like taking a relaxing break after putting your heart into your work.";
 			next;
 			mes "[Vestri]";
-			mes "What do you think, human?";
-			mes "Isn't that one of life's";
-			mes "simple pleasures?";
+			mes "What do you think,";
+			mes "human? Isn't that one";
+			mes "of life's simple pleasures?";
 			close;
 		}
 		else if(god_mjo_0 == 10) {
@@ -1940,6 +1938,36 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 				set .@strRetPart8$,getequipname(8);
 				set .@strRetPart9$,getequipname(9);
 				set .@strRetPart10$,getequipname(10);
+				if (.@strRetPart1$ == 0) {
+					set .@strPart1$,"Head ^000000[^003366Not Equipped^000000]";
+				}
+				if (.@strRetPart2$ == 0) {
+					set .@strPart2$,"Torso ^000000[^003366Not Equipped^000000]";
+				}
+				if (.@strRetPart3$ == 0) {
+					set .@strPart3$,"Left Hand ^000000[^003366Not Equipped^000000]";
+				}
+				if (.@strRetPart4$ == 0) {
+					set .@strPart4$,"Right Hand ^000000[^003366Not Equipped^000000]";
+				}
+				if (.@strRetPart5$ == 0) {
+					set .@strPart5$,"Garment ^000000[^003366Not Equipped^000000]";
+				}
+				if (.@strRetPart6$ == 0) {
+					set .@strPart6$,"Foot ^000000[^003366Not Equipped^000000]";
+				}
+				if (.@strRetPart7$ == 0) {
+					set .@strPart7$,"Accessory1 ^000000[^003366Not Equipped^000000]";
+				}
+				if (.@strRetPart8$ == 0) {
+					set .@strPart8$,"Accessory2 ^000000[^003366Not Equipped^000000]";
+				}
+				if (.@strRetPart9$ == 0) {
+					set .@strPart9$,"Head2 ^000000[^003366Not Equipped^000000]";
+				}
+				if (.@strRetPart10$ == 0) {
+					set .@strPart10$,"Head3 ^000000[^003366Not Equipped^000000]";
+				}
 				set .@menu$,.@strRetPart1$+":"+.@strRetPart2$+":"+.@strRetPart3$+":"+.@strRetPart4$+":"+.@strRetPart5$+":"+.@strRetPart6$+":"+.@strRetPart7$+":"+.@strRetPart8$+":"+.@strRetPart9$+":"+.@strRetPart10$;
 				switch(select(.@menu$)) {
 				case 1:
@@ -2080,7 +2108,7 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 					close2;
 				}
 				if (countitem(615) > 0) {
-					delitem 615,1;  //Oridecon
+					delitem 984,1; //Oridecon
 				}
 				else {
 					mes "[Vestri]";
@@ -2092,9 +2120,9 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 				}
 				if (getequippercentrefinery(.@part) > rand(100)) {
 					mes "^3355FF*Clang Clang!*^000000";
-					successrefitem @vestripart;
+					successrefitem .@part;
 					next;
-					emotion e_no1;
+					emotion e_heh;
 					mes "[Vestri]";
 					mes "Mwahahaha~";
 					mes "I've still got it!";
@@ -2106,7 +2134,7 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 				else {
 					mes "[Vestri]";
 					mes "^3355FF*Clang Clang!*^000000";
-					failedrefitem @vestripart;
+					failedrefitem .@part;
 					next;
 					emotion e_omg;
 					mes "[Vestri]";
@@ -2224,6 +2252,36 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 				set .@strRetPart8$,getequipname(8);
 				set .@strRetPart9$,getequipname(9);
 				set .@strRetPart10$,getequipname(10);
+				if (.@strRetPart1$ == 0) {
+					set .@strPart1$,"Head ^000000[^003366Not Equipped^000000]";
+				}
+				if (.@strRetPart2$ == 0) {
+					set .@strPart2$,"Torso ^000000[^003366Not Equipped^000000]";
+				}
+				if (.@strRetPart3$ == 0) {
+					set .@strPart3$,"Left Hand ^000000[^003366Not Equipped^000000]";
+				}
+				if (.@strRetPart4$ == 0) {
+					set .@strPart4$,"Right Hand ^000000[^003366Not Equipped^000000]";
+				}
+				if (.@strRetPart5$ == 0) {
+					set .@strPart5$,"Garment ^000000[^003366Not Equipped^000000]";
+				}
+				if (.@strRetPart6$ == 0) {
+					set .@strPart6$,"Foot ^000000[^003366Not Equipped^000000]";
+				}
+				if (.@strRetPart7$ == 0) {
+					set .@strPart7$,"Accessory1 ^000000[^003366Not Equipped^000000]";
+				}
+				if (.@strRetPart8$ == 0) {
+					set .@strPart8$,"Accessory2 ^000000[^003366Not Equipped^000000]";
+				}
+				if (.@strRetPart9$ == 0) {
+					set .@strPart9$,"Head2 ^000000[^003366Not Equipped^000000]";
+				}
+				if (.@strRetPart10$ == 0) {
+					set .@strPart10$,"Head3 ^000000[^003366Not Equipped^000000]";
+				}
 				set .@menu$,.@strRetPart1$+":"+.@strRetPart2$+":"+.@strRetPart3$+":"+.@strRetPart4$+":"+.@strRetPart5$+":"+.@strRetPart6$+":"+.@strRetPart7$+":"+.@strRetPart8$+":"+.@strRetPart9$+":"+.@strRetPart10$;
 				switch(select(.@menu$)) {
 				case 1:
@@ -2359,7 +2417,7 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 					close;
 				}
 				if (countitem(615) > 0) {
-					delitem 615,1;  //Oridecon
+					delitem 984,1; //Oridecon
 				}
 				else {
 					mes "[Vestri]";
@@ -2371,9 +2429,9 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 				}
 				if (getequippercentrefinery(.@part) > rand(100)) {
 					mes "^3355FF*Clang Clang!*^000000";
-					successrefitem @vestripart;
+					successrefitem .@part;
 					next;
-					emotion e_no1;
+					emotion e_heh;
 					mes "[Vestri]";
 					mes "Mwahahaha~";
 					mes "I've still got it!";
@@ -2384,8 +2442,8 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 				}
 				else {
 					mes "[Vestri]";
-					mes "Clang! Clang! Clang!";
-					failedrefitem @vestripart;
+					mes "^3355FF*Clang Clang!*^000000";
+					failedrefitem .@part;
 					next;
 					emotion e_omg;
 					mes "[Vestri]";

+ 15 - 14
npc/quests/seals/sleipnir_seal.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= MasterOfMuppets
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena
 //===== Description: ========================================= 
@@ -11,6 +11,7 @@
 //===== Additional Comments: =================================
 //= 1.0 First version. [MasterOfMuppets]
 //= 1.1 Updated several aspects of the script. [L0ne_W0lf]
+//= 1.2 Minor Touchups to quest. [L0ne_W0lf]
 //============================================================
 
 yuno,164,200,4	script	Noyee#G	101,{
@@ -83,7 +84,7 @@ que_god01,98,98,4	script	Manager#G	69,{
 			mes "Wait...!";
 			mes "I can't even remember the last";
 			mes "time I went out with a guy! At this rate, I might retire before I can find a boyfriend. Noooo, I'm still in my prime~!";
-			Emotion ET_PROFUSELY_SWAT;
+			emotion e_swt2;
 			close;
 		}
 		else if (god_sl_1 == 1) {
@@ -535,7 +536,7 @@ que_god01,98,98,4	script	Manager#G	69,{
 			mes "Wait...!";
 			mes "I can't even remember the last";
 			mes "time I went out with a guy! At this rate, I might retire before I can find a boyfriend. Noooo, I'm still in my prime~!";
-			Emotion ET_PROFUSELY_SWAT;
+			emotion e_swt2;
 			close2;
 		}
 		else if (god_sl_1 < 51) {
@@ -630,12 +631,12 @@ que_god01,66,125,6	script	Researcher#G1	89,{
 					mes "[Hallandaute]";
 					mes "A mad scientist?";
 					mes "That doesn't sound right. In my wildest dreams, I never would have suspected Metto of turning out that way...";
-					Emotion ET_SCRATCH;
+					emotion e_hmm;
 					next;
 					mes "[Hallandaute]";
 					mes "Huh. That's...";
 					mes "That's too bad. I don't know what to say. We used to go watch movies and celebrate our birthdays together. P-please give me a moment...";
-					Emotion ET_THINK;
+					emotion e_dots;
 					set god_sl_2,2;
 					close;
 				}
@@ -1909,7 +1910,7 @@ OnTouch:
 	}
 	else {
 		mes "^3355FFThe door is locked. There is some sort of security device on the right side. It seems the device needs to detect some kind of pass before you can enter.^000000";
-		close2;
+		close;
 	}
 }
 
@@ -1922,7 +1923,7 @@ que_god01,49,97,0	script	Switch#God1	111,{
 	}
 	else {
 		mes "^3355FFThe door is locked. There is some sort of security device on the right side. It seems the device needs to detect some kind of pass before you can enter.^000000";
-		close2;
+		close;
 	}
 }
 
@@ -1936,7 +1937,7 @@ OnTouch:
 	}
 	else {
 		mes "^3355FFThe door is locked. There is some sort of security device on the right side. It seems the device needs to detect some kind of pass before you can enter.^000000";
-		close2;
+		close;
 	}
 }
 
@@ -1949,7 +1950,7 @@ que_god01,19,97,0	script	Switch#God2	111,{
 	}
 	else {
 		mes "^3355FFThe door is locked. There is some sort of security device on the right side. It seems the device needs to detect some kind of pass before you can enter.^000000";
-		close2;
+		close;
 	}
 }
 
@@ -1963,7 +1964,7 @@ OnTouch:
 	}
 	else {
 		mes "^3355FFThe door is locked. There is some sort of security device on the right side. It seems the device needs to detect some kind of pass before you can enter.^000000";
-		close2;
+		close;
 	}
 }
 
@@ -1976,7 +1977,7 @@ que_god01,14,80,0	script	Switch#God3	111,{
 	}
 	else {
 		mes "^3355FFThe door is locked. There is some sort of security device on the right side. It seems the device needs to detect some kind of pass before you can enter.^000000";
-		close2;
+		close;
 	}
 }
 
@@ -1990,7 +1991,7 @@ OnTouch:
 	}
 	else {
 		mes "^3355FFThe door is locked. There is some sort of security device on the right side. It seems the device needs to detect some kind of pass before you can enter.^000000";
-		close2;
+		close;
 	}
 }
 
@@ -2003,7 +2004,7 @@ que_god01,44,80,0	script	Switch#God4	111,{
 	}
 	else {
 		mes "^3355FFThe door is locked. There is some sort of security device on the right side. It seems the device needs to detect some kind of pass before you can enter.^000000";
-		close2;
+		close;
 	}
 }
 
@@ -2017,6 +2018,6 @@ OnTouch:
 	}
 	else {
 		mes "^3355FFThe door is locked. There is some sort of security device on the right side. It seems the device needs to detect some kind of pass before you can enter.^000000";
-		close2;
+		close;
 	}
 }