zydronium/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-06-09 05:54:50 +02:00
Code Issues Projects Releases Packages Wiki Activity

More changes

Browse source
This commit is contained in:
Filip Maj 2022-02-05 18:14:23 -05:00
parent 37d04344ae
commit f374ee3be9
35 changed files with 38 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Data/scripts/commands/Ability.lua
View file

@ -14,6 +14,6 @@ local attackMagicHandlers = {
}
function onEventStarted(player, command, triggerName, arg1, arg2, arg3, arg4, targetActor, arg5, arg6, arg7, arg8)
player.Ability(command.actorId, targetActor);
player.Ability(command.Id, targetActor);
player:endEvent();
end

2
Data/scripts/commands/AttackAbility.lua
View file

@ -14,7 +14,7 @@ local attackMagicHandlers = {
}
function onEventStarted(player, command, triggerName, arg1, arg2, arg3, arg4, targetActor, arg5, arg6, arg7, arg8)
player.Ability(command.actorId, targetActor);
player.Ability(command.Id, targetActor);
player:endEvent();
end

2
Data/scripts/commands/AttackMagic.lua
View file

@ -14,6 +14,6 @@ local attackMagicHandlers = {
}
function onEventStarted(player, command, triggerName, arg1, arg2, arg3, arg4, targetActor, arg5, arg6, arg7, arg8)
player.Cast(command.actorId, targetActor);
player.Cast(command.Id, targetActor);
player:endEvent();
end;

2
Data/scripts/commands/AttackWeaponSkill.lua
View file

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

4
Data/scripts/commands/CmnAttackWeaponSkill.lua
View file

@ -133,8 +133,8 @@ function onEventStarted(player, command, triggerName)
return;
end
if (weaponskillHandlers[command.actorId] ~= nil) then
weaponskillHandlers[command.actorId](player);
if (weaponskillHandlers[command.Id] ~= nil) then
weaponskillHandlers[command.Id](player);
else
player:SendMessage(0x20, "", "That weaponskill is not implemented yet.");
end

2
Data/scripts/commands/CureMagic.lua
View file

@ -1,5 +1,5 @@
function onEventStarted(player, command, triggerName, arg1, arg2, arg3, arg4, targetActor, arg5, arg6, arg7, arg8)
player.Cast(command.actorId, targetActor);
player.Cast(command.Id, targetActor);
player:endEvent();
end

2
Data/scripts/commands/CuregaMagic.lua
View file

@ -1,5 +1,5 @@
function onEventStarted(player, command, triggerName, arg1, arg2, arg3, arg4, targetActor, arg5, arg6, arg7, arg8)
player.Cast(command.actorId, targetActor);
player.Cast(command.Id, targetActor);
player:endEvent();
end

2
Data/scripts/commands/DevideAttackWeaponSkill.lua
View file

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

2
Data/scripts/commands/EffectMagic.lua
View file

@ -1,5 +1,5 @@
function onEventStarted(player, command, triggerName, arg1, arg2, arg3, arg4, targetActor, arg5, arg6, arg7, arg8)
player.Cast(command.actorId, targetActor);
player.Cast(command.Id, targetActor);
player:endEvent();
end

2
Data/scripts/commands/EsunaMagic.lua
View file

@ -1,5 +1,5 @@
function onEventStarted(player, command, triggerName, arg1, arg2, arg3, arg4, targetActor, arg5, arg6, arg7, arg8)
player.Cast(command.actorId, targetActor);
player.Cast(command.Id, targetActor);
player:endEvent();
end

2
Data/scripts/commands/PointSearchAbility.lua
View file

@ -2,6 +2,6 @@
function onEventStarted(player, command, triggerName, arg1, arg2, arg3, arg4, targetActor, arg5, arg6, arg7, arg8)
player.Cast(command.actorId, targetActor);
player.Cast(command.Id, targetActor);
player:endEvent();
end

2
Data/scripts/commands/RaiseMagic.lua
View file

@ -1,5 +1,5 @@
function onEventStarted(player, command, triggerName, arg1, arg2, arg3, arg4, targetActor, arg5, arg6, arg7, arg8)
player.Cast(command.actorId, targetActor);
player.Cast(command.Id, targetActor);
player:endEvent();
end

2
Data/scripts/commands/ShotCommand.lua
View file

@ -10,6 +10,6 @@ Finds the correct weaponskill subscript to fire when a weaponskill actor is acti
--]]
function onEventStarted(player, command, triggerName, arg1, arg2, arg3, arg4, targetActor, arg5, arg6, arg7, arg8)
player.Ability(command.actorId, targetActor);
player.Ability(command.Id, targetActor);
player:endEvent();
end;

2
Data/scripts/commands/SongMagic.lua
View file

@ -14,6 +14,6 @@ local attackMagicHandlers = {
}
function onEventStarted(player, command, triggerName, arg1, arg2, arg3, arg4, targetActor, arg5, arg6, arg7, arg8)
player.Cast(command.actorId, targetActor);
player.Cast(command.Id, targetActor);
player:endEvent();
end;

2
Data/scripts/commands/ability/blissful_mind.lua
View file

@ -24,7 +24,7 @@ function onSkillFinish(caster, target, skill, action, actionContainer)
local amount = buff.GetExtra();
caster.AddMP(amount);
actionContainer.AddMPAction(caster.actorId, 33007, amount);
actionContainer.AddMPAction(caster.Id, 33007, amount);
caster.statusEffects.RemoveStatusEffect(buff, actionContainer, 30329);
else
--Blissful mind takes 25% of CURRENT HP and begins storing MP up to that point, at which point the buff changes to indicate its full

2
Data/scripts/commands/gm/addtoparty.lua
View file

@ -15,7 +15,7 @@ function onTrigger(player, argc)
if player then
if player.target then
print("hi")
local id = player.target.actorId
local id = player.target.Id
print("hi")
player.currentParty:AddMember(id);
player.target.currentParty = player.currentParty;

2
Data/scripts/commands/gm/getinfo.lua
View file

@ -23,7 +23,7 @@ function onTrigger(player)
player:SendMessage(messageID, sender, string.format("Position (XYZ-O): %.3f, %.3f, %.3f - %.3f", targetActor.positionX, targetActor.positionY, targetActor.positionZ, targetActor.rotation));
player:SendMessage(messageID, sender, string.format("Actor ID: 0x%X", targetActor.actorId));
player:SendMessage(messageID, sender, string.format("Actor ID: 0x%X", targetActor.Id));
player:SendMessage(messageID, sender, string.format("Class ID: %d", targetActor:GetActorClassId()));
player:SendMessage(messageID, sender, string.format("Class Name: %s", targetActor.className));
end

4
Data/scripts/commands/gm/quest.lua
View file

@ -46,13 +46,13 @@ function onTrigger(player, argc, command, var1, var2, var3)
q2 = GetStaticActor(var1);
if q2 ~= nil then
q3 = q2.actorId;
q3 = q2.Id;
message = ("removing quest "..var1);
printf(q3);
q4 = bit32.band(q3, 0xA0F00000);
printf(q4);
--player:RemoveQuest(quest.actorName);
--player:RemoveQuest(quest.Name);
end
else
message = ("remove error: either incorrect ID or quest "..var1.." isn't active on character");

2
Data/scripts/commands/gm/vdragon.lua
View file

@ -16,7 +16,7 @@ function onTrigger(player, argc)
if player and player.currentTarget then
local actor = GetWorldManager():GetActorInWorld(player.currentTarget) or nil;
actor.Ability(23459, actor.actorId);
actor.Ability(23459, actor.Id);
else
print(sender.."unable to add experience, ensure player name is valid.");

2
Data/scripts/commands/magic/holy_succor.lua
View file

@ -24,6 +24,6 @@ function onSkillFinish(caster, target, skill, action, actionContainer)
if caster != target then
caster.AddHP(action.amount / 2)
--33012: You recover [amount] HP.
actionContainer.AddHPAbsorbAction(caster.actorId, 33012, (action.amount / 2));
actionContainer.AddHPAbsorbAction(caster.Id, 33012, (action.amount / 2));
end
end;

2
Data/scripts/commands/weaponskill/sucker_punch.lua
View file

@ -39,6 +39,6 @@ function onSkillFinish(caster, target, skill, action, actionContainer)
caster.AddMP(mpToReturn);
--30452: You recover x MP.
actionContainer.AddMPAbsorbAction(caster.actorId, 30452, mpToReturn);
actionContainer.AddMPAbsorbAction(caster.Id, 30452, mpToReturn);
end
end;