Browse Source

* Fixed a WOE:SE issue with 2nd Guardian Stone respawn. (tid:86918)
* A couple of other tiny fixes.

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

Euphy 11 years ago
parent
commit
454781a24d
3 changed files with 6 additions and 3 deletions
  1. 1 1
      db/skill_damage_db.txt
  2. 3 1
      npc/guild2/agit_main_se.txt
  3. 2 1
      npc/re/quests/eden/eden_quests.txt

+ 1 - 1
db/skill_damage_db.txt

@@ -27,7 +27,7 @@
 // 		2048 - Zone 7
 //
 // Notes:
-// 		Damage is percentage between -100 and 100000.
+//  	Damage is percentage between -100 and 100000.
 //  	Negative values decrease damage and positive values increase it (0 = no change).
 //
 // Examples:

+ 3 - 1
npc/guild2/agit_main_se.txt

@@ -967,6 +967,7 @@ OnInit:
 		mes "5 Red Gemstones";
 		next;
 		mes "^3355FFDo you want to continue?^000000";
+		next;
 		if(select("No:Continue") == 1) {
 			mes "^3355FFWork canceled.^000000";
 			close;
@@ -1504,8 +1505,9 @@ OnGuardianStoneDied:
 	end;
 
 OnTimer300000:
+	set .@num, atoi(charat(strnpcinfo(1),2));
 	set .@str$,substr(strnpcinfo(2),0,1)+substr(strnpcinfo(2),8,9);
-	donpcevent "1st Guardian Stone#"+.@str$+"::OnEnable";
+	donpcevent ((.@num == 1)?"1st":"2nd")+" Guardian Stone#"+.@str$+"::OnEnable";
 	setd "$agit_"+.@str$+"["+(atoi(charat(strnpcinfo(1),2))-1)+"]",2;
 	stopnpctimer;
 	end;

+ 2 - 1
npc/re/quests/eden/eden_quests.txt

@@ -14,7 +14,7 @@
 //=     Readded the GM helper NPC, commented out.
 //= 1.2 Some little optimization here and there. [Masao]
 //= 1.3 Added Instructor Ur and the new Quests which come
-//= alongside him. Special thanks to Chilly for the base. [Masao]
+//=     alongside him. Special thanks to Chilly for the base. [Masao]
 //= 1.4 Partial cleaning and bug fixing. [Euphy]
 //= 1.4a Added 'npcskill' command. [Euphy]
 //= 1.4b Added 'disable_items' command. [Euphy]
@@ -3360,6 +3360,7 @@ moc_para01,112,96,5	script	Administrator Michael	967,{
 		mes "[Michael]";
 		mes "You mean upgrading equipment, right?";
 		mes "We can only upgrade the Eden Group Hat.";
+		next;
 		if (para_suv02 == 3) {
 			if (countitem(5583) > 0) {
 				disable_items;