diff options
| author | Jesusaves <cpntb1@ymail.com> | 2019-08-18 15:05:32 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2019-08-18 15:05:32 -0300 |
| commit | c9173a4e2e55b0fdf4df0d99920c556548a81e4b (patch) | |
| tree | 885d66f5e10289843fa71a4316fe49a454c47c01 /npc/021-4/main.txt | |
| parent | 9222961a0b3b38aee2f01a1d53c8a08e174488e2 (diff) | |
| parent | 7c8417bb63afb65516852da1b9eb8ff0b4d2877f (diff) | |
| download | serverdata-c9173a4e2e55b0fdf4df0d99920c556548a81e4b.tar.gz serverdata-c9173a4e2e55b0fdf4df0d99920c556548a81e4b.tar.bz2 serverdata-c9173a4e2e55b0fdf4df0d99920c556548a81e4b.tar.xz serverdata-c9173a4e2e55b0fdf4df0d99920c556548a81e4b.zip | |
Merge branch 'master' into testserver
Conflicts solved with -X theirs
Diffstat (limited to 'npc/021-4/main.txt')
| -rw-r--r-- | npc/021-4/main.txt | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/npc/021-4/main.txt b/npc/021-4/main.txt index 659f77232..2bbbda804 100644 --- a/npc/021-4/main.txt +++ b/npc/021-4/main.txt @@ -107,7 +107,24 @@ 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; } - hello; end; + + // 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 + npctalk3 l("Please get me out of here!"); + end; // Start L_Start: @@ -179,13 +196,12 @@ L_Winner: if ($CINDY_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 Quesy!", bc_all|bc_npc; - Karma=Karma+1; + announce "All hail ##B"+$CINDY_WINNER$+"##b, first to complete the ##3Cindy Quest!", bc_all|bc_npc; getexp 0, 2000; getitembound DemureAxe, 1, 1; 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)); @@ -267,10 +283,11 @@ OnTimer2000: // This finishes the quest if (.@y == 0 && .canfinish) { - $@CINDY_STATE=gettimetick(2)+60*rand(55,65)*rand(4,36); // It is way too random to I say how long it takes (220min ~ 39 hours) + $@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; } .wtime+=2; @@ -307,7 +324,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!", |