diff options
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/001-13/main.txt | 5 | ||||
| -rw-r--r-- | npc/commands/event.txt | 14 |
2 files changed, 8 insertions, 11 deletions
diff --git a/npc/001-13/main.txt b/npc/001-13/main.txt index cdb295ddf..ce5943b53 100644 --- a/npc/001-13/main.txt +++ b/npc/001-13/main.txt @@ -184,6 +184,11 @@ OnDie: // Warp you back OnClose: + // Time Penalty every time you attack the boss yourself + if (.@new > 0 && $FYRAID_OWNER[@id] == getcharid(3)) + $FYRAID_TIME[@id] -= 300; + + // Update boss parameters .@old = $FYRAID_HP[@id]; .@dmg = .@old - .@new; debugmes "Old %d New %d Damage %d", .@old, .@new, .@dmg; diff --git a/npc/commands/event.txt b/npc/commands/event.txt index abf585f7a..db5781d1f 100644 --- a/npc/commands/event.txt +++ b/npc/commands/event.txt @@ -547,17 +547,9 @@ OnEffect: // Failed for some reason - ignore } if ($EVENT$ == "Raid") { - .@id = array_find($FYRAID_OWNER, getcharid(3)); - if (.@id >= 0) { - if ($FYRAID_TIME[.@id] > gettimetick(2) && - $FYRAID_HP[.@id] > 0) { - getmapxy(@aurora_map$, @aurora_x, @aurora_y, 0); - callfunc("FYRaid_Select"); - close; - } - // Boss expired or already defeated - ignore - } - // Have not yet taken part on boss raid - ignore + getmapxy(@aurora_map$, @aurora_x, @aurora_y, 0); + callfunc("FYRaid_Select"); + close; } } |