summaryrefslogtreecommitdiff
path: root/src/map/map.hpp
diff options
context:
space:
mode:
authorwushin <pasekei@gmail.com>2015-06-08 00:40:20 -0500
committermekolat <mekolat@users.noreply.github.com>2016-04-15 11:44:40 -0400
commit8ac49c6058db5bf7f06662b8370b1d0fdf17d578 (patch)
tree8e992ce93451edaab463bc0d145028b0d31c4a95 /src/map/map.hpp
parentc3e06ffe6437d27a2a7c6ddb2dc487ff2f007adf (diff)
downloadtmwa-8ac49c6058db5bf7f06662b8370b1d0fdf17d578.tar.gz
tmwa-8ac49c6058db5bf7f06662b8370b1d0fdf17d578.tar.bz2
tmwa-8ac49c6058db5bf7f06662b8370b1d0fdf17d578.tar.xz
tmwa-8ac49c6058db5bf7f06662b8370b1d0fdf17d578.zip
new/modified builtins
areatimer foreach aggravate Override attack animation injure summon
Diffstat (limited to 'src/map/map.hpp')
-rw-r--r--src/map/map.hpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/map/map.hpp b/src/map/map.hpp
index 47eef57..a2f2ff2 100644
--- a/src/map/map.hpp
+++ b/src/map/map.hpp
@@ -208,6 +208,7 @@ struct map_session_data : block_list, SessionData
tick_t cast_tick; // [Fate] Next tick at which spellcasting is allowed
dumb_ptr<magic::invocation> active_spells; // [Fate] Singly-linked list of active spells linked to this PC
BlockId attack_spell_override; // [Fate] When an attack spell is active for this player, they trigger it
+ NpcEvent magic_attack;
// like a weapon. Check pc_attack_timer() for details.
// Weapon equipment slot (slot 4) item override
StatusChange attack_spell_icon_override;
@@ -479,6 +480,9 @@ struct mob_data : block_list
// [Fate] mob-specific stats
earray<unsigned short, mob_stat, mob_stat::LAST> stats;
short size;
+ // Npc Runscripts
+ std::list<RString> eventqueuel;
+ Array<Timer, MAX_EVENTTIMER> eventtimer;
};
struct BlockLists