summaryrefslogtreecommitdiff
path: root/npc/other
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-07-08 15:01:29 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-07-08 15:01:29 +0000
commit5487756030da284dd45d9114e6c820154607af6c (patch)
tree6dbcf23831a365622a24d883d8ecc75c873e5881 /npc/other
parent28e8e5b1f2d256e6df74c4bc528910df56fedee8 (diff)
downloadhercules-5487756030da284dd45d9114e6c820154607af6c.tar.gz
hercules-5487756030da284dd45d9114e6c820154607af6c.tar.bz2
hercules-5487756030da284dd45d9114e6c820154607af6c.tar.xz
hercules-5487756030da284dd45d9114e6c820154607af6c.zip
* Various fixes to NPCs, from bugreports.
- Fixed condition error in old pharmacist. (bugreport:597) - Fixed missing function in novice WoE (bugreport:1728) - Fixed a minor errors in dancer quest (bugreport:1766) - Corrected duration of wedding status (bugreport:1775) - Fixed missing function in novice WoE (bugreport:1788) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12925 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/other')
-rw-r--r--npc/other/marriage.txt7
1 files changed, 4 insertions, 3 deletions
diff --git a/npc/other/marriage.txt b/npc/other/marriage.txt
index f44684024..d5fa4890f 100644
--- a/npc/other/marriage.txt
+++ b/npc/other/marriage.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.1
+//= 1.2
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -18,6 +18,7 @@
//===== Additional Comments: =================================
//= 1.0 First version. [L0ne_W0lf]
//= 1.1 Fixed a missing ")" [L0ne_W0lf]
+//= 1.2 Corrected duration of Wedding status. [L0ne_W0lf]
//============================================================
prt_church,97,100,4 script Wedding Staff#w 71,{
@@ -703,11 +704,11 @@ prt_church,100,128,4 script Bishop#w 60,{
//Call Wedding effect
wedding;
//Give ring to Bride, and change to wedding sprite.
- sc_start SC_Wedding,3600000000,1;
+ sc_start SC_Wedding,3600000,1;
getitem 2635,1; //Bride_Ring
//Give ring to Groom, and change to wedding sprite.
attachrid(getcharid(3,$wed_groom$));
- sc_start SC_Wedding,3600000000,1;
+ sc_start SC_Wedding,3600000,1;
getitem 2634,1; //Bridegroom_Ring
detachrid;
//Switch Script progression back to Bride