diff options
| -rw-r--r-- | db/mob_db.txt | 2 | ||||
| -rw-r--r-- | npc/031-3_Cave/cindyCave.txt | 15 |
2 files changed, 9 insertions, 8 deletions
diff --git a/db/mob_db.txt b/db/mob_db.txt index 6f4884fb..3ad539e0 100644 --- a/db/mob_db.txt +++ b/db/mob_db.txt @@ -69,4 +69,4 @@ 1069, Scythe, Scythe, 40, 3000, 0, 0, 500, 1, 200, 350, 30, 10, 100, 250, 1, 1, 150, 90, 1, 50, 1, 0, 40, 133, 220, 700, 672, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 0, 0 1070, BallLightning, Ball Lightning, 40, 50, 0, 0, 10, 1, 5, 10, 40, 65, 1, 200, 1, 1, 1, 1, 1, 50, 1, 0, 47, 133, 110, 1500, 672, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 0, 0 1071, IceElement, Ice Element, 20, 1000, 0, 0, 200, 2, 60, 60, 0, 20, 15, 25, 15, 15, 20, 50, 1, 1, 1, 0, 41, 135, 330, 740, 672, 400, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 2, 20 -1072, Yeti, Yeti, 35,8500, 0, 0, 300, 2,100,400,60,15,60, 5,45, 15,45,32, 1, 1, 1, 0, 61, 135,220, 1500, 672, 900, 0, 800, 0, 800, 0, 800, 0, 800, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 2, 30 +1072, Yeti, Yeti, 35,8500, 0, 0, 300, 2,100,400,60,15,60, 5,45, 15,55,32, 1, 1, 1, 0, 61, 135,220, 1500, 672, 900, 0, 800, 0, 800, 0, 800, 0, 800, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 2, 30 diff --git a/npc/031-3_Cave/cindyCave.txt b/npc/031-3_Cave/cindyCave.txt index 03bb0bde..f87000aa 100644 --- a/npc/031-3_Cave/cindyCave.txt +++ b/npc/031-3_Cave/cindyCave.txt @@ -59,6 +59,7 @@ L_Try_Cage: // initialize fight set $@FIGHT_YETI_STATUS, 1; set $@FIGHT_YETI_WAVE, 1; + set $@YETI_COUNT, 0; set $@FIGHT_YETI_PLAYER_COUNT, getareausers("031-3.gat", 80, 20, 160, 90); startnpctimer; @@ -71,10 +72,8 @@ L_Try_Cage: callsub S_Update_Mask; close; -//TODO: why close and end? L_Exit: close; - end; L_Yeti: mes "[Cindy]"; @@ -125,7 +124,7 @@ L_Full_Inv: mes "\"Oh, it seems you carry so much stuff - I will keep it for you until you can take it.\""; close; -// Fight logic +// Fight logic attached to npc OnTimer5000: setnpctimer 0; if ($@FIGHT_YETI_STATUS != 0) goto L_CaveLogic; @@ -147,11 +146,12 @@ L_NextWave: set $@FIGHT_YETI_ROUND_TIMER, 0; set $@FIGHT_YETI_WAVE, $@FIGHT_YETI_WAVE + 1; - if ($@FIGHT_YETI_WAVE >= 10) goto L_CleanUp; + if ($@FIGHT_YETI_WAVE > 10 && $@YETI_COUNT == 0) goto L_CleanUp; + if ($@FIGHT_YETI_WAVE > 10) goto L_Return_1; //TODO: adjust number of yetis spawned - set $@FIGHT_YETI_NUMBER, $@FIGHT_YETI_WAVE + $@FIGHT_YETI_WAVE * $@FIGHT_YETI_PLAYER_COUNT/30; - - set $@YETI_SUMMON, 0; +//TODO: use yeti count here + set $@FIGHT_YETI_NUMBER, $@FIGHT_YETI_WAVE + $@FIGHT_YETI_WAVE * $@FIGHT_YETI_PLAYER_COUNT/10; + set $@YETI_COUNT, $@YETI_COUNT + $@FIGHT_YETI_NUMBER; areamonster "031-3.gat", 80, 20, 160, 90, "", 1072, $@FIGHT_YETI_NUMBER, "Cindy::onPetDeath"; goto L_Return_1; @@ -163,6 +163,7 @@ onTick: end; onPetDeath: + set $@YETI_COUNT, $@YETI_COUNT - 1; end; onInit: |