diff options
| author | Jesusaves <cpntb1@ymail.com> | 2019-08-09 18:57:02 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2019-08-09 18:57:02 -0300 |
| commit | adbd3cbef53a4933540cffadef6fff4f61741aa9 (patch) | |
| tree | 787b8605782694019d39ebd3087e56881cfb569a | |
| parent | 9c7bc9144eaf91eaca08d46686eaa50d0804c940 (diff) | |
| download | serverdata-adbd3cbef53a4933540cffadef6fff4f61741aa9.tar.gz serverdata-adbd3cbef53a4933540cffadef6fff4f61741aa9.tar.bz2 serverdata-adbd3cbef53a4933540cffadef6fff4f61741aa9.tar.xz serverdata-adbd3cbef53a4933540cffadef6fff4f61741aa9.zip | |
Bugfixes
| -rw-r--r-- | npc/021-4/main.txt | 19 | ||||
| -rw-r--r-- | npc/config/magic.txt | 2 |
2 files changed, 18 insertions, 3 deletions
diff --git a/npc/021-4/main.txt b/npc/021-4/main.txt index 66dde6cc8..862636260 100644 --- a/npc/021-4/main.txt +++ b/npc/021-4/main.txt @@ -107,6 +107,19 @@ OnInit: areamonster "021-4", 20, 20, 100, 80, "Moggun", Moggun, .@pl, "Cindy#Outside::OnPetDeath"; areamonster "021-4", 20, 20, 100, 80, "Slime Blast", SlimeBlast, $@CINDY_STATE+1; } + + // If a major bug happened, do it now + // This finishes the quest + .@y=mobcount("021-4", "Cindy#Outside::OnPetDeath"); + if (.@y == 0 && .canfinish) { + $@CINDY_STATE=gettimetick(2)+60*rand2(55,65)*rand2(4,36); // It is way too random to I say how long it takes (220min ~ 39 hours) + mapannounce "021-4", "Nivalis: Cindy is now safe!",bc_all|bc_npc; + areatimer "021-4", 20, 20, 100, 80, 10, "Cindy#Outside::OnReward"; + setnpcdisplay .name$, NPC_CINDY; + stopnpctimer; + end; + } + if (.canfinish) npctalk l("*scream*"); else @@ -184,11 +197,10 @@ L_Winner: $CINDY_WINNER$=strcharinfo(0); channelmes("#world", $CINDY_WINNER$+" is the first player to finish Cindy Quest!! GG, dude! %%N"); announce "All hail ##B"+$CINDY_WINNER$+"##b, first to complete the ##3Cindy Quest!", bc_all|bc_npc; - Karma=Karma+1; getexp 0, 2000; getitem PrismGift, 1; mesc l("CONGRATULATIONS! You are the first player to finish Cindy Quest!!"), 2; - mesc l("You just gained a Karma point, a Prism Gift, and 2000 Job Exp for your bravery!"), 2; + mesc l("You just gained a Prism Gift, and 2000 Job Exp for your bravery!"), 2; } else { if (getcharid(1) > 0) .@v$=getpartyname(getcharid(1)); @@ -274,6 +286,7 @@ OnTimer2000: mapannounce "021-4", "Nivalis: Cindy is now safe!",bc_all|bc_npc; areatimer "021-4", 20, 20, 100, 80, 10, "Cindy#Outside::OnReward"; setnpcdisplay .name$, NPC_CINDY; + stopnpctimer; end; } .wtime+=2; @@ -310,7 +323,7 @@ OnTimer2000: // To make easier, we spawn some Mogguns, too. // The ratio is Yeti 2:1 Moggun. (Third Yeti is replaced) .@mogg=.@value/3; - .@yeti=.@value-@mogg; + .@yeti=.@value-.@mogg; areamonster "021-4", 20, 20, 100, 80, "Yeti", Yeti, .@yeti, "Cindy#Outside::OnPetDeath"; areamonster "021-4", 20, 20, 100, 80, "Moggun", Moggun, .@mogg, "Cindy#Outside::OnPetDeath"; npctalk any("Yetis!", diff --git a/npc/config/magic.txt b/npc/config/magic.txt index b21a5e6e9..fddf3cb6e 100644 --- a/npc/config/magic.txt +++ b/npc/config/magic.txt @@ -74,10 +74,12 @@ function script SummonMagic { // The 35~50 is not a defect, remember skill starts at level 1... for (.@i = 0; .@i < (.@lv+(.@adj-1))/.@adj; .@i++) { .@mids=summon("Summoned Monster", .@id, rand(35,50)+.@lv*10); + /* TODO: summon() don't return GID .@bhp=getunitdata(.@mids, UDT_MAXHP); .@lvx=max(0, (.@lv-1)*.@bhp/50); setunitdata(.@mids, UDT_MAXHP, .@bhp+.@lvx); setunitdata(.@mids, UDT_HP, .@bhp+.@lvx); + */ } dispbottom l("All monsters summoned!"); return; |