zydronium/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-07-27 04:48:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

cleaned up magicstate and weaponskillstate

Browse source 
- todo: fix IsFacing
- added thunder spell (todo: figure out why battleactionx10 crashes client on sending shit)
This commit is contained in:
Tahir Akhlaq 2017-08-26 04:08:26 +01:00
parent 452f1cc8c0
commit 9024f3fad6
20 changed files with 415 additions and 195 deletions
Download patch file Download diff file Expand all files Collapse all files

4
data/scripts/commands/AttackMagic.lua
View file

@ -21,7 +21,7 @@ function onEventStarted(player, command, triggerName, arg1, arg2, arg3, arg4, ta
player:endEvent();
return;
end
--Does the target exist
target = player:getZone():FindActorInArea(targetActor);
if (target == nil) then
@ -30,7 +30,7 @@ function onEventStarted(player, command, triggerName, arg1, arg2, arg3, arg4, ta
return;
end
player.Cast(command.actorId);
player.Cast(command.actorId, targetActor);
player:endEvent();
end

7
data/scripts/commands/AttackWeaponSkill.lua
View file

@ -26,7 +26,10 @@ function onEventStarted(player, command, triggerName, arg1, arg2, arg3, arg4, ta
return;
end
player.WeaponSkill(command.actorId);
player:endEvent();
if not player.aiContainer.IsEngaged() then
player.Engage(targetActor);
end;
player.WeaponSkill(command.actorId, targetActor);
player:endEvent();
end

4
data/scripts/commands/gm/effect.lua
View file

@ -19,9 +19,9 @@ function onTrigger(player, argc, effectId, magnitude, tick, duration)
player.DelHP(500);
effectId = tonumber(effectId) or 223180;
magnitude = tonumber(magnitude) or 300;
magnitude = tonumber(magnitude) or 700;
tick = tonumber(tick) or 3;
duration = tonumber(duration) or 60;
duration = tonumber(duration) or 360;
while player.statusEffects.HasStatusEffect(effectId) do
player.statusEffects.RemoveStatusEffect(effectId);