* Some follow-ups to 5ab4d5e:

- Added Renewal changes to "God Seal Status" signpost and moved from "npc/other/sealstatus.txt" to "npc/quests/seals/seal_status.txt".
- Applied item_db changes to Pre-Renewal and SQL databases.
* Fixed issue in Cursed Spirit quest where an OnTouch NPC wouldn't activate.

Signed-off-by: Euphy <euphy@rathena.org>

db/pre-re/item_db.txt

@@ -5275,9 +5275,9 @@
 12965,Emergency_Box1,Emergency Level 1 Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12968,1; },{},{}
 12966,Emergency_Box2,Emergency Level 2 Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12969,1; },{},{}
 12967,Emergency_Box3,Emergency Level 3 Scroll Box,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12970,1; },{},{}
-12968,Emergency_Scroll1,Emergency Level 1 Scroll,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ unitskilluseid getcharid(3),"GD_ITEMEMERGENCYCALL",1; },{},{}
-12969,Emergency_Scroll2,Emergency Level 2 Scroll,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ unitskilluseid getcharid(3),"GD_ITEMEMERGENCYCALL",2; },{},{}
-12970,Emergency_Scroll3,Emergency Level 3 Scroll,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ unitskilluseid getcharid(3),"GD_ITEMEMERGENCYCALL",3; },{},{}
+12968,Emergency_Scroll1,Emergency Level 1 Scroll,11,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "GD_ITEMEMERGENCYCALL",1; },{},{}
+12969,Emergency_Scroll2,Emergency Level 2 Scroll,11,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "GD_ITEMEMERGENCYCALL",2; },{},{}
+12970,Emergency_Scroll3,Emergency Level 3 Scroll,11,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "GD_ITEMEMERGENCYCALL",3; },{},{}
 12971,Teleport_Box1,Teleport Scroll Box 1,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12977,10; },{},{}
 12972,Teleport_Box2,Teleport Scroll Box 2,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12978,10; },{},{}
 12973,Teleport_Box3,Teleport Scroll Box 3,18,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12979,10; },{},{}

doc/script_commands.txt

@@ -7216,7 +7216,7 @@ same as NPC sprite facing directions: 0=north, 1=northwest, 2=west, etc.
 
 *readbook <book id>,<page>;
 
-This will open a book item at the specified page
+This command will open a book item at the specified page.
 
 ---------------------------------------
 

npc/other/sealstatus.txt

@@ -1,37 +0,0 @@
-//===== rAthena Script ======================================= 
-//= God Item Seal Status
-//===== By: ================================================== 
-//= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.2
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
-//= Goid Item Seal Status.
-//===== Additional Comments: ================================= 
-//= 1.0 Translated from the official. [L0ne_W0lf]
-//= 1.1 Now checks proper char vars. [L0ne_W0lf]
-//= 1.2 Cleaning. [Euphy]
-//============================================================ 
-
-prontera,113,294,3	script	Sign Post	837,{
-	mes "======== God Seal Status ========";
-	setarray .@n$[1], "Sleipnir","Megingjard","Brisingamen","Mjolnir";
-	for(set .@i,1; .@i<5; set .@i,.@i+1) {
-		if (getd("$god"+.@i) == 0) mes .@n$[.@i]+" Seal: Unseen";
-		else if (getd("$god"+.@i) < 50) mes .@n$[.@i]+" Seal: Active";
-		else if (getd("$god"+.@i) < 100) mes .@n$[.@i]+" Seal: Appeared";
-		else mes .@n$[.@i]+" Seal: Released";
-	}
-	mes " ";
-	mes "======= Your Seal Status ========";
-	if (god_sl_1 < 51) mes "^ff0000Sleipnir Seal: Not Completed^000000";
-		else mes "^00ff00Sleipnir Seal: Completed^000000";
-	if (god_eremes < 28) mes "^ff0000Megingjard Seal: Not Completed^000000";
-		else mes "^00ff00Megingjard Seal: Completed^000000";
-	if (god_brising < 50) mes "^ff0000Brisingamen Seal: Not Completed^000000";
-		else mes "^00ff00Brisingamen Seal: Completed^000000";
-	if (god_mjo_0 < 11) mes "^ff0000Mjolnir Seal: Not Completed^000000";
-		else mes "^00ff00Mjolnir Seal: Completed^000000";
-	close;
-}

npc/quests/quests_lighthalzen.txt

@@ -5191,7 +5191,7 @@ OnTouch_:
 
 lhz_in03,12,162,0	warp	#to_lhz		1,1,lighthalzen,321,322
 
-lighthalzen,319,321,0	script	#li_bother	-1,3,3,{
+lighthalzen,319,321,0	script	#li_bother	-1,2,2,{ //3,3
 OnTouch_:
 	if ((lhz_curse == 24 ) || (lhz_curse == 25)) {
 		mes ".............";

npc/quests/seals/seal_status.txt

@@ -0,0 +1,52 @@
+//===== rAthena Script ======================================= 
+//= God Item Quest - Seal Status
+//===== By: ================================================== 
+//= L0ne_W0lf
+//===== Current Version: ===================================== 
+//= 1.3
+//===== Compatible With: ===================================== 
+//= rAthena SVN
+//===== Description: ========================================= 
+//= God Item Seal Status.
+//===== Additional Comments: ================================= 
+//= 1.0 Translated from the official. [L0ne_W0lf]
+//= 1.1 Now checks proper char vars. [L0ne_W0lf]
+//= 1.2 Cleaning. [Euphy]
+//= 1.3 Renewal script update. [Euphy]
+//============================================================ 
+
+prontera,113,294,3	script	Sign Post#god	837,{
+	mes "======== God Seal Status ========";
+	setarray .@seal$[1], "Sleipnir","Megingjard","Brisingamen","Mjolnir";
+	for(set .@i,1; .@i<=4; set .@i,.@i+1) {
+		set .@val, getd("$God"+.@i);
+		if (.@val == 0)
+			set .@status$,"Unseen";
+		else if (.@val < $@god_check1)
+			set .@status$,"Active";
+		else if (.@val < $@god_check2)
+			set .@status$,"Appeared";
+		else
+			set .@status$,"Released";
+		mes .@seal$[.@i]+" Seal: "+.@status$;
+	}
+	mes " ";
+	mes "======= Your Seal Status ========";
+	if (god_sl_1 < 51)
+		mes "^ff0000Sleipnir Seal: Not Completed^000000";
+	else
+		mes "^00ff00Sleipnir Seal: Completed^000000";
+	if (god_eremes < 28)
+		mes "^ff0000Megingjard Seal: Not Completed^000000";
+	else
+		mes "^00ff00Megingjard Seal: Completed^000000";
+	if (god_brising < 50)
+		mes "^ff0000Brisingamen Seal: Not Completed^000000";
+	else
+		mes "^00ff00Brisingamen Seal: Completed^000000";
+	if (god_mjo_0 < 11)
+		mes "^ff0000Mjolnir Seal: Not Completed^000000";
+	else
+		mes "^00ff00Mjolnir Seal: Completed^000000";
+	close;
+}

npc/scripts_athena.conf

@@ -191,7 +191,6 @@ npc: npc/other/monster_race.txt
 npc: npc/other/poring_war.txt
 npc: npc/other/powernpc.txt
 npc: npc/other/pvp.txt
-npc: npc/other/sealstatus.txt
 // - Turbo Track Arena
 npc: npc/other/turbo_track.txt
 
@@ -213,13 +212,15 @@ npc: npc/quests/newgears/2008_headgears.txt
 //   God Item Second Edition Quests
 npc: npc/quests/okolnir.txt
 // - The God Item Quest -----------------------------------------
-npc: npc/quests/seals/brisingamen_seal.txt
 // - Controller file, allow GMs to change variables.
 npc: npc/quests/seals/god_global.txt
+npc: npc/quests/seals/brisingamen_seal.txt
 npc: npc/quests/seals/god_weapon_creation.txt
 npc: npc/quests/seals/megingard_seal.txt
 npc: npc/quests/seals/mjolnir_seal.txt
 npc: npc/quests/seals/sleipnir_seal.txt
+// - Seal status board.
+npc: npc/quests/seals/seal_status.txt
 // --------------------------------------------------------------
 // - Wandering Minstrel Quest
 npc: npc/quests/bard_quest.txt

sql-files/item_db.sql

@@ -32,7 +32,7 @@ CREATE TABLE `item_db` (
 # Items Database
 #
 # Structure of Database:
-#REPLACE INTO `item_db` VALUES ( ID,'AegisName','Name',Type,Buy,Sell,Weight,ATK,DEF,Range,Slots,Job,Upper,Gender,Loc,wLV,eLV,Refineable,View,'Script','OnEquip_Script','OnUnequip_Script');
+#REPLACE INTO `item_db` VALUES ( ID,'AegisName','Name',Type,Buy,Sell,Weight,ATK,DEF,Range,Slots,Job,Class,Gender,Loc,wLV,eLV,Refineable,View,'Script','OnEquip_Script','OnUnequip_Script');
 #
 # Healing Items
 #=============================================================
@@ -5306,9 +5306,9 @@ REPLACE INTO `item_db` VALUES (12964,'Vesper_Core04_Box','Vesper Core 04 Box',18
 REPLACE INTO `item_db` VALUES (12965,'Emergency_Box1','Emergency Level 1 Scroll Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 12968,1;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (12966,'Emergency_Box2','Emergency Level 2 Scroll Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 12969,1;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (12967,'Emergency_Box3','Emergency Level 3 Scroll Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 12970,1;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (12968,'Emergency_Scroll1','Emergency Level 1 Scroll',11,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'itemskill "GD_EMERGENCYCALL",1;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (12969,'Emergency_Scroll2','Emergency Level 2 Scroll',11,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'itemskill "GD_EMERGENCYCALL",1;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (12970,'Emergency_Scroll3','Emergency Level 3 Scroll',11,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'itemskill "GD_EMERGENCYCALL",1;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12968,'Emergency_Scroll1','Emergency Level 1 Scroll',11,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'itemskill "GD_ITEMEMERGENCYCALL",1;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12969,'Emergency_Scroll2','Emergency Level 2 Scroll',11,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'itemskill "GD_ITEMEMERGENCYCALL",2;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12970,'Emergency_Scroll3','Emergency Level 3 Scroll',11,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'itemskill "GD_ITEMEMERGENCYCALL",3;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (12971,'Teleport_Box1','Teleport Scroll Box 1',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 12977,10;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (12972,'Teleport_Box2','Teleport Scroll Box 2',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 12978,10;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (12973,'Teleport_Box3','Teleport Scroll Box 3',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 12979,10;',NULL,NULL);

sql-files/item_db_re.sql

@@ -6274,9 +6274,9 @@ REPLACE INTO `item_db_re` VALUES (12964,'Vesper_Core04_Box','Vesper Core 04 Box'
 REPLACE INTO `item_db_re` VALUES (12965,'Emergency_Box1','Emergency Level 1 Scroll Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 12968,1;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (12966,'Emergency_Box2','Emergency Level 2 Scroll Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 12969,1;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (12967,'Emergency_Box3','Emergency Level 3 Scroll Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 12970,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12968,'Emergency_Scroll1','Emergency Level 1 Scroll',11,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemskill "GD_EMERGENCYCALL",1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12969,'Emergency_Scroll2','Emergency Level 2 Scroll',11,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemskill "GD_EMERGENCYCALL",1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12970,'Emergency_Scroll3','Emergency Level 3 Scroll',11,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemskill "GD_EMERGENCYCALL",1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12968,'Emergency_Scroll1','Emergency Level 1 Scroll',11,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemskill "GD_ITEMEMERGENCYCALL",1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12969,'Emergency_Scroll2','Emergency Level 2 Scroll',11,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemskill "GD_ITEMEMERGENCYCALL",2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12970,'Emergency_Scroll3','Emergency Level 3 Scroll',11,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemskill "GD_ITEMEMERGENCYCALL",3;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (12971,'Teleport_Box1','Teleport Scroll Box 1',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 12977,10;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (12972,'Teleport_Box2','Teleport Scroll Box 2',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 12978,10;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (12973,'Teleport_Box3','Teleport Scroll Box 3',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 12979,10;',NULL,NULL);