Two small fixes/updates

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

4 files changed, 8 insertions, 4 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 6db20a34a..8ef680796 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -5,6 +5,8 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.  EV
 GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS

 

 2006/03/05

+	* Set the default for display_delay_skill_fail to 'no' as it should have been

+	  for a while (the kRO patch about that was last year, long time ago) [DracoRPG]

 	* Fixed easter.txt typo. [Lance]

 	* Extended summon command to enable custom timeouts. [Lance]

 

diff --git a/conf-tmpl/battle/skill.conf b/conf-tmpl/battle/skill.conf
index 6b163af3c..41302e0fd 100644
--- a/conf-tmpl/battle/skill.conf
+++ b/conf-tmpl/battle/skill.conf
@@ -139,7 +139,7 @@ player_land_skill_limit: yes
 monster_land_skill_limit: yes

 

 // If skill fails by delay, should it display or not.  (Note 1)

-display_delay_skill_fail: yes

+display_delay_skill_fail: no

 

 // Display Snatcher skill failures

 display_snatcher_skill_fail: yes

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 134c07a15..f8497d3de 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -28,6 +28,8 @@ Nexon
 Date		Added

 ======

 

+03/05

+	* Used "Laboratory Passport" everywhere in the cube room quest, else how can ppl guess the name? xD [DracoRPG]

 03/02

 	* Added Skotlex's updated marriage script [Vicious]

 	* Added eACC scripts, thanks to davidchak [Vicious]

diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt
index c0d9bbc26..66de44c5d 100644
--- a/npc/quests/quests_lighthalzen.txt
+++ b/npc/quests/quests_lighthalzen.txt
@@ -1140,7 +1140,7 @@ L_4:
 L4_1:

 	mes "There is a small card inside of it.";

 	next;

-	mes "You acquired the 'Laboratory Permit'.";

+	mes "You acquired the 'Laboratory Passport'.";

 	set @gotkey,1;

 	getitem 2657,1;

 	close;

@@ -1186,12 +1186,12 @@ L_3:
 	next;

 	input @answer$;

 

-	if (@answer$ == "Laboratory Permit" || @answer$ == "permit") goto L_4;

+	if (@answer$ == "Laboratory Passport" || @answer$ == "laboratory passport" || @answer$ == "passport") goto L_4;

 	mes "Nothing happened.";

 	close;

 

 L_4:

-	mes "You inserted the 'Laboratory Keycard' in the hole,";

+	mes "You inserted the 'Laboratory Passport' in the hole,";

 	mes "and the stair leading down appeared on the floor.";

 	next;

 	menu "Go down.",L4_1,"Do not go down.",-;