Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@672 54d463be-8e91-2dee-dedb-b68131a5f0ec

Browse Source
This commit is contained in:
Aria 2004-12-20 19:24:27 +00:00
parent c3e0d731b0
commit 11b05b3998
3 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.txt
View File

@ -1,6 +1,7 @@
Date Added
12/20
* CFixed wedding NPC halting after server reboot/crash (shadowlady put in comments but didn't add to code) [Aria]
* Added reading leveluseskillspamount.txt from the GRF to auto set sp used for each skill [celest]
* Added reading indoorrswtable.txt from the GRF to auto set 'indoor' mapflags
[celest]

1
npc/Changelog.txt
View File

@ -38,6 +38,7 @@ Date Added
======
12/20
* Changed $progress -> $@progress in wedding.txt (shadowlady put in comments but didn't add to code) [Aria]
* xmas.txt: Added Xmas Jakk, fixed 2 possible items exploits, fixed reward Box ID [Lupus]
12/18
* My NPC is back in action [Aria]

38
npc/other/wedding.txt
View File

@ -7,7 +7,7 @@
//=====By================================================
// AppleGirl and Evera(version 1.0)
//=====Current Version===================================
// 1.4
// 1.45b
//=====Compatible With:==================================
// Any eAthena Version; RO Episode 6+
//=====Description=======================================
@ -29,6 +29,8 @@
// Fixed some minor bugs. Same-sex is disabled by default now.
// Change $progress variable to $@progress, so it dont screw up the ceremony on a server crash.
// Added a Special GM Menu to enable/disable same-sex weddings and reset most variables.
////======= Version 1.45b By Aria =====================
// Added the $progress to $@progress variable change that ShadowLady put in notes, but not in code.
//=======================================================
// Variable Notes:
//
@ -45,21 +47,21 @@
// @outfit - Check if the char already got a dress or tuxedo from the npc
// Tristan
prt_church.gat,99,125,4 script Tristan the Third 108,{
if($groom$ == strcharinfo(0) && $progress != 3) goto L_GroomCeremony;
if($groom$ == strcharinfo(0) && $@progress != 3) goto L_GroomCeremony;
if(@register == 0) goto L_GroomNeedToRegister;
if($bride$ == strcharinfo(0)) goto L_BrideCeremony;
menu "Here To Attend",L_Wedding,"Here for another reason",L_OtherReason;
L_GroomCeremony:
if(@register == 0) goto L_GroomNeedToRegister;
if($progress == 1) goto L_BrideNeedToRegister;
if($progress == 0) goto L_Wedding;
if($@progress == 1) goto L_BrideNeedToRegister;
if($@progress == 0) goto L_Wedding;
if(countitem(2613) < 1) goto L_NeedRing;//Items: Diamond_Ring,
if((getequipid(2) != 2338) && (getequipid(2) != 7170)) goto L_Attire;
mes "[Tristan the Third]";
mes "Everything is ready, it's your call now...";
next;
menu "Perform Wedding.",-,"Cancel Wedding.",L_CancelWedding;
set $progress,3;
set $@progress,3;
mes "[Tristan the Third]";
mes "Well all you have to do now is the easy part input your bride's name, remember to spell it correctly.";
input $name2$;
@ -111,7 +113,7 @@ L_BrideCeremony:
L_CancelWedding:
mes "[Tristan the Third]";
mes "The wedding has been cancelled by "+strcharinfo(0)+".";
set $progress,0;
set $@progress,0;
set $groom$,"null";
set $bride$,"null";
set @register,0;
@ -156,7 +158,7 @@ L_OtherReason:
input $reason$;
next;
areaannounce "prt_church.gat",0,0,350,350,""+$reason$+"",0;
set $progress,0;
set $@progress,0;
set $groom$,"null";
set $bride$,"null";
set $name$,"null";
@ -251,7 +253,7 @@ L_DisableSameSex:
mes "Same-Sex Weddings are disabled now!";
close;
L_ResetVariables:
set $progress,0;
set $@progress,0;
set $groom$,"null";
set $bride$,"null";
set $name$,"null";
@ -377,7 +379,7 @@ L_Marry:
if($SameSex == 1) menu "I'm gonna be the Groom",-,"I,m gonna be the Bride",L_BrideRegister,"Never mind",L_Bye;
if(event_wedding == 1) goto L_Married;
if(@register >= 1) goto L_AlreadyRegistered;
if($progress >= 2) goto L_InProgress;
if($@progress >= 2) goto L_InProgress;
if(($samesex == 0) && (sex == 0)) goto L_BrideRegister;
if((countitem(2338) > 0) || (countitem(7170) > 0) || (@outfit == 1)) goto L_GroomRegister2;
mes "[Marry Happy]";
@ -393,7 +395,7 @@ L_Marry:
set $groom$,strcharinfo(0);
set @register,1;
set zeny,zeny-@costgroomA;
set $progress,1;
set $@progress,1;
if(sex == 1) getitem 7170,1;
if(sex == 0) getitem 2338,1;
set @outfit,1;
@ -409,7 +411,7 @@ L_Marry:
L_BrideRegister:
if ($name$ != strcharinfo(0)) goto L_NotBride;
if($groom$ == strcharinfo(0)) goto L_CantMarryYourself;
if($progress != 1) goto L_GroomNotRegistered;
if($@progress != 1) goto L_GroomNotRegistered;
if(@register >= 1) goto L_AlreadyRegistered;
if((countitem(2338) > 0) || (countitem(7170) > 0) || (@outfit == 1)) goto L_BrideRegister2;
mes "[Marry Happy]";
@ -425,7 +427,7 @@ L_BrideRegister:
set $bride$,strcharinfo(0);
set @register,1;
set zeny,zeny-@costbrideA;
set $progress,2;
set $@progress,2;
set event_wedding,1;
if(sex == 1) getitem 7170,1;
if(sex == 0) getitem 2338,1;
@ -456,7 +458,7 @@ L_GroomRegister2:
set $groom$,strcharinfo(0);
set @register,1;
set zeny,zeny-@costgroomB;
set $progress,1;
set $@progress,1;
mes "[Marry Happy]";
mes "You are now registered "+strcharinfo(0)+", I wish you the best of luck with your marriage.";
addtimer 300000,"weddinglimit1";
@ -480,7 +482,7 @@ L_BrideRegister2:
set $bride$,strcharinfo(0);
set @register,1;
set zeny,zeny-@costbrideB;
set $progress,2;
set $@progress,2;
set event_wedding,1;
deltimer "weddinglimit1";
addtimer 300000,"weddinglimit2";
@ -612,7 +614,7 @@ L_DivorceSystem:
prt_church.gat,99,124,0 script weddinglimit1 -1,{
announce "The bride has not registered within the alotted time frame.",3;
announce "Your wedding has been cancelled.",3;
set $progress,0;
set $@progress,0;
set $groom$,"null";
set $name$,"null";
set $name2$,"null";
@ -634,7 +636,7 @@ prt_church.gat,99,124,0 script weddinglimit1 -1,{
prt_church.gat,99,124,0 script weddinglimit2 -1,{
announce "The groom has not begun the wedding ceremony by speaking to Tristan the Third.",3;
announce "Your wedding has been cancelled.",3;
set $progress,0;
set $@progress,0;
set $groom$,"null";
set $bride$,"null";
set $name$,"null";
@ -691,7 +693,7 @@ areaannounce "prt_church.gat",0,0,350,350,"And so be it, by the powers vested in
prt_church.gat,99,124,0 script a12 -1,{
areaannounce "prt_church.gat",0,0,350,350,"I pronouce you Husband and Wife, you may kiss the bride.",0;
wedding;
set $progress,0;
set $@progress,0;
set $groom$,"null";
set $bride$,"null";
set $name$,"null";
@ -700,7 +702,7 @@ areaannounce "prt_church.gat",0,0,350,350,"I pronouce you Husband and Wife, you
prt_church.gat,99,124,0 script a13 -1,{
areaannounce "prt_church.gat",0,0,350,350,"The wedding has been cancelled.",0;
set $progress,0;
set $@progress,0;
set $groom$,"null";
set $bride$,"null";
set $name$,"null";