summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2022-01-25 23:12:42 -0300
committerJesusaves <cpntb1@ymail.com>2022-01-25 23:12:42 -0300
commit1112f54a00bcaff8606999623d730c8287517e3a (patch)
tree0ef08689f9b40cdb4306dcd2a3aec0d15e796671
parent799907c78c0cc894229ee6eb2e14b694cb6b030d (diff)
downloadserverdata-1112f54a00bcaff8606999623d730c8287517e3a.tar.gz
serverdata-1112f54a00bcaff8606999623d730c8287517e3a.tar.bz2
serverdata-1112f54a00bcaff8606999623d730c8287517e3a.tar.xz
serverdata-1112f54a00bcaff8606999623d730c8287517e3a.zip
To estimulate cooperation: Enforce a time penalty on your own challenges.
Allow to use the toevent command anytime
-rw-r--r--npc/001-13/main.txt5
-rw-r--r--npc/commands/event.txt14
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;
}
}