diff options
| author | Wushin <pasekei@gmail.com> | 2015-05-23 15:52:13 -0500 |
|---|---|---|
| committer | Wushin <pasekei@gmail.com> | 2015-05-23 15:52:13 -0500 |
| commit | e5264f6965fb26cb6c4e85a65be959faf2b23641 (patch) | |
| tree | b49d10564ccdabaa54eb69c93bfe489fe881a840 | |
| parent | 5cedb51071e056993658ffd5974bd2ea7496e7fe (diff) | |
| parent | 1dd5bf0c78991432af34f645b8274bef9630ec24 (diff) | |
| download | serverdata-e5264f6965fb26cb6c4e85a65be959faf2b23641.tar.gz serverdata-e5264f6965fb26cb6c4e85a65be959faf2b23641.tar.bz2 serverdata-e5264f6965fb26cb6c4e85a65be959faf2b23641.tar.xz serverdata-e5264f6965fb26cb6c4e85a65be959faf2b23641.zip | |
Merge pull request #387 from mekolat/brodomir
fix brodomir timer
| -rw-r--r-- | world/map/npc/009-6/brodomir.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/world/map/npc/009-6/brodomir.txt b/world/map/npc/009-6/brodomir.txt index 63bce759..02704447 100644 --- a/world/map/npc/009-6/brodomir.txt +++ b/world/map/npc/009-6/brodomir.txt @@ -26,7 +26,7 @@ if ($@BRODOMIR_PVP_STATUS == 2) goto L_Alreadystarted; - if ($@BRODOMIR_PVP_STATUS == 1) + if ($@BRODOMIR_PVP_STATUS == 1 && $@BRODOMIR_START_TIME > gettimetick(2)) goto L_Wait; mes "[Brodomir]"; mes "\"Hi Warrior.\""; @@ -132,6 +132,7 @@ L_Go: set $@BRODOMIR_ITEM_AMOUNT, @brodomir_item_amount; set $@BRODOMIR_MONEY, @brodomir_money; set $@brodomir_delay_seconds, 600; + set $@BRODOMIR_START_TIME, gettimetick(2) + $@brodomir_delay_seconds; set $@BRODOMIR_PVP_STATUS, 1; announce "Brodomir : In "+$@brodomir_delay_seconds/60+" minutes, I will start a PvP tournament, if at least 3 fighters are present. Make your way in Hurnscald Underground Caves!", 0; if ($@BRODOMIR_ITEM_AMOUNT > 0) @@ -140,13 +141,12 @@ L_Go: announce "Brodomir : The winner will receive " + $@BRODOMIR_MONEY + "GP and additionally 150GP per fighter.", 0; mes "[Brodomir]"; mes "\"In "+$@brodomir_delay_seconds/60+" minutes I will bring you all to the PvP cave. If there are less than 3 players here the event will not start and your money will be lost.\""; - set $@BRODOMIR_START_TIME, gettimetick(2) + $@brodomir_delay_seconds; set $@brodomir_delay_seconds, 0; initnpctimer; goto L_Close; L_Wait: - set @ms, ($@BRODOMIR_START_TIME - gettimetick(2)) * 1000; + set @seconds, $@BRODOMIR_START_TIME - gettimetick(2); callfunc "HumanTime"; mes "[Brodomir]"; mes "\"Just a little longer. I will bring you there in " + @time$ + ".\""; |