cassidy/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-05-20 08:26:59 -04:00
Code Issues Packages Projects Releases 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;

4
Data/scripts/content/SimpleContent30010.lua
View File

@@ -14,8 +14,8 @@ function onCreate(starterPlayer, contentArea, director)
mob1 = GetWorldManager().SpawnBattleNpcById(3, contentArea);
mob2 = GetWorldManager().SpawnBattleNpcById(4, contentArea);
mob3 = GetWorldManager().SpawnBattleNpcById(5, contentArea);
starterPlayer.currentParty:AddMember(papalymo.actorId);
starterPlayer.currentParty:AddMember(yda.actorId);
starterPlayer.currentParty:AddMember(papalymo.Id);
starterPlayer.currentParty:AddMember(yda.Id);
starterPlayer:SetMod(modifiersGlobal.MinimumHpLock, 1);

2
Data/scripts/effects/aegis_boon.lua
View File

@@ -14,6 +14,6 @@ function onBlock(effect, attacker, defender, skill, action, actionContainer)
--33008: You recover x HP from Aegis Boon
defender.AddHP(absorbAmount);
actionContainer.AddHPAction(defender.actorId, 33008, absorbAmount);
actionContainer.AddHPAction(defender.Id, 33008, absorbAmount);
defender.statusEffects.RemoveStatusEffect(effect, actionContainer);
end;

2
Data/scripts/effects/bloodbath.lua
View File

@@ -18,7 +18,7 @@ function onHit(effect, attacker, defender, skill, action, actionContainer)
attacker.AddHP(absorbAmount);
--30332: You absorb hp from target
actionContainer.AddHPAbsorbAction(defender.actorId, 30332, absorbAmount)
actionContainer.AddHPAbsorbAction(defender.Id, 30332, absorbAmount)
--Bloodbath is lost after absorbing hp
defender.statusEffects.RemoveStatusEffect(effect,actionContainer, 30331, false);
end

2
Data/scripts/effects/dread_spike.lua
View File

@@ -22,7 +22,7 @@ function onDamageTaken(effect, attacker, defender, skill, action, actionContaine
defender.AddHP(absorbAmount);
--30451: You recover [absorbAmount] HP.
actionContainer.AddHPAction(defender.actorId, 30451, absorbAmount)
actionContainer.AddHPAction(defender.Id, 30451, absorbAmount)
--Dread Spike is lost after absorbing hp
defender.statusEffects.RemoveStatusEffect(effect, actionContainer, 30331, false);
end

2
Data/scripts/effects/featherfoot.lua
View File

@@ -20,7 +20,7 @@ function onEvade(effect, attacker, defender, skill, action, actionContainer)
local mpToReturn = percent * action.amountMitigated;
defender.AddMP(math.ceil(mpToReturn));
--33010: You recover x MP from Featherfoot
actionContainer.AddMPAction(defender.actorId, 33010, mpToReturn);
actionContainer.AddMPAction(defender.Id, 33010, mpToReturn);
--Featherfoot is lost after evading
defender.statusEffects.RemoveStatusEffect(effect, actionContainer, 30331, false);
end;

2
Data/scripts/effects/life_surge_I.lua
View File

@@ -14,6 +14,6 @@ function onHit(effect, attacker, defender, skill, action, actionContainer)
local amount = math.floor((healPercent * action.amount) + 1);
attacker.AddHP(amount);
actionContainer.AddHPAbsorbAction(defender.actorId, 30332, amount);
actionContainer.AddHPAbsorbAction(defender.Id, 30332, amount);
end
end;

2
Data/scripts/effects/life_surge_II.lua
View File

@@ -10,6 +10,6 @@ function onHit(effect, attacker, defender, skill, action, actionContainer)
local amount = math.floor((healPercent * action.amount) + 1);
attacker.AddHP(amount);
actionContainer.AddHPAbsorbAction(defender.actorId, 30332, amount);
actionContainer.AddHPAbsorbAction(defender.Id, 30332, amount);
end
end;

2
Data/scripts/effects/life_surge_III.lua
View File

@@ -14,6 +14,6 @@ function onHit(effect, attacker, defender, skill, action, actionContainer)
local amount = math.floor((healPercent * action.amount) + 1);
attacker.AddHP(amount);
actionContainer.AddHPAbsorbAction(defender.actorId, 30332, amount);
actionContainer.AddHPAbsorbAction(defender.Id, 30332, amount);
end
end;

2
Data/scripts/effects/necrogenesis.lua
View File

@@ -6,7 +6,7 @@ function onHit(effect, attacker, defender, skill, action, actionContainer)
--Necrogenesis returns 75% of damage done rounded up(?) as MP.
local hpToReturn = math.ceil(0.75 * action.amount);
attacker.AddHP(hpToReturn);
actionContainer.AddHPAbsorbAction(defender.actorId, 33012, hpToReturn);
actionContainer.AddHPAbsorbAction(defender.Id, 33012, hpToReturn);
attacker.statusEffects.RemoveStatusEffect(effect, actionContainer, 30331, false);
end
end

2
Data/scripts/effects/outmaneuver2.lua
View File

@@ -19,6 +19,6 @@ function onBlock(effect, attacker, defender, skill, action, actionContainer)
local mpToReturn = math.ceil(0.10 * action.amount);
defender.AddMP(math.ceil(mpToReturn));
--33009: You recover x MP from Outmaneuver
actionContainer.AddMPAction(defender.actorId, 33009, mpToReturn);
actionContainer.AddMPAction(defender.Id, 33009, mpToReturn);
end
end;

2
Data/scripts/effects/rampage2.lua
View File

@@ -27,7 +27,7 @@ function onCrit(effect, attacker, defender, skill, action, actionContainer)
healAmount = math.Clamp(healAmount, 0, attacker.GetMaxHP() - attacker.GetHP());
attacker.AddHP(healAmount);
--33012: You recover [healAmount] HP.
actionContainer.AddHPAbsorbAction(defender.actorId, 33008, healAmount);
actionContainer.AddHPAbsorbAction(defender.Id, 33008, healAmount);
end;
--"Effect fades over time"

2
Data/scripts/effects/sanguine_rite2.lua
View File

@@ -4,5 +4,5 @@ require("modifiers")
function onDamageTaken(effect, attacker, defender, skill, action, actionContainer)
local mpToRestore = action.amount * 0.30;
defender.AddMP(mpToRestore);
actionContainer.AddMPAction(defender.actorId, 33011, mpToRestore);
actionContainer.AddMPAction(defender.Id, 33011, mpToRestore);
end

2
Data/scripts/effects/sanguine_rite3.lua
View File

@@ -18,5 +18,5 @@ end;
function onDamageTaken(effect, attacker, defender, skill, action, actionContainer)
local mpToRestore = action.amount * 0.30;
defender.AddMP(mpToRestore);
actionContainer.AddMPAction(defender.actorId, 33011, mpToRestore);
actionContainer.AddMPAction(defender.Id, 33011, mpToRestore);
end

2
Data/scripts/effects/vengeance.lua
View File

@@ -10,6 +10,6 @@ function onDamageTaken(effect, attacker, defender, skill, action, actionContaine
--30350: Counter! You hit target for x points of damage
--There are counter messages for blocks, can Vengeance be blocked/parried?
attacker.DelHP(amount, actionContainer);
actionContainer.AddHitAction(attacker.actorId, 30350, amount);
actionContainer.AddHitAction(attacker.Id, 30350, amount);
end;
end;