zydronium/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-06-08 21:44:35 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into lua_commands

Browse source 
# Conflicts:
#	FFXIVClassic Common Class Lib/packages.config
#	FFXIVClassic Lobby Server/Program.cs
#	FFXIVClassic Map Server/CommandProcessor.cs
#	FFXIVClassic Map Server/Program.cs
#	FFXIVClassic Map Server/actors/Actor.cs
This commit is contained in:
Tahir Akhlaq 2016-06-18 05:59:42 +01:00
commit 37d91480f9
24 changed files with 185 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

6
data/scripts/commands/ActivateCommand.lua
View file

@ -9,15 +9,15 @@ Switches between active and passive mode states
function onEventStarted(player, command, triggerName)
if (player:GetState() == 0) then
player:changeState(2);
player:ChangeState(2);
elseif (player:GetState() == 2) then
player:changeState(0);
player:ChangeState(0);
end
player:EndCommand();
--For Opening Tutorial
if (player:hasQuest("Man0l0") or player:hasQuest("Man0g0") or player:hasQuest("Man0u0")) then
if (player:HasQuest("Man0l0") or player:HasQuest("Man0g0") or player:HasQuest("Man0u0")) then
player:GetDirector():OnCommand(command);
end

14
data/scripts/commands/ChocoboRideCommand.lua
View file

@ -13,21 +13,21 @@ function onEventStarted(player, actor, triggerName, isGoobbue)
worldMaster = GetWorldMaster();
if (isGoobbue ~= true) then
player:changeMusic(83);
player:ChangeMusic(83);
player:SendChocoboAppearance();
player:SendGameMessage(player, worldMaster, 26001, 0x20);
player:SetMountState(1);
else
player:changeMusic(98);
player:ChangeMusic(98);
player:SendGoobbueAppearance();
player:SendGameMessage(player, worldMaster, 26019, 0x20);
player:SetMountState(2);
end
player:changeSpeed(0.0, 5.0, 10.0);
player:changeState(15);
player:ChangeSpeed(0.0, 5.0, 10.0);
player:ChangeState(15);
else
player:changeMusic(player:GetZone().bgmDay);
player:ChangeMusic(player:GetZone().bgmDay);
worldMaster = GetWorldMaster();
@ -38,8 +38,8 @@ function onEventStarted(player, actor, triggerName, isGoobbue)
end
player:SetMountState(0);
player:changeSpeed(0.0, 2.0, 5.0)
player:changeState(0);
player:ChangeSpeed(0.0, 2.0, 5.0)
player:ChangeState(0);
end
player:EndCommand();

6
data/scripts/commands/EmoteSitCommand.lua
View file

@ -8,12 +8,12 @@ function onEventStarted(player, actor, triggerName, emoteId)
if (player:GetState() == 0) then
if (emoteId == 0x2712) then
player:changeState(11);
player:ChangeState(11);
else
player:changeState(13);
player:ChangeState(13);
end
else
player:changeState(0);
player:ChangeState(0);
end
player:EndCommand();

2
data/scripts/commands/EmoteStandardCommand.lua
View file

@ -12,7 +12,7 @@ emoteTable = {
function onEventStarted(player, actor, triggerName, emoteId)
if (player:GetState() == 0) then
player:doEmote(emoteId);
player:DoEmote(emoteId);
end
player:EndCommand();

42
data/scripts/commands/EquipCommand.lua
View file

@ -137,7 +137,7 @@ function equipItem(player, equipSlot, item)
if (classId ~= nil) then
player:SendGameMessage(player, worldMaster, 30103, 0x20, 0, 0, player, classId);
player:prepareClassChange(classId);
player:PrepareClassChange(classId);
end
end
@ -161,23 +161,23 @@ function equipItem(player, equipSlot, item)
--Graphic Slot was set, otherwise it's a special case
if (graphicSlot ~= nil) then
player:graphicChange(graphicSlot, item);
if (graphicSlot == GRAPHICSLOT_MAINHAND) then player:graphicChange(GRAPHICSLOT_OFFHAND, nil); end
player:GraphicChange(graphicSlot, item);
if (graphicSlot == GRAPHICSLOT_MAINHAND) then player:GraphicChange(GRAPHICSLOT_OFFHAND, nil); end
elseif (gItem:IsNailWeapon()) then
player:graphicChange(GRAPHICSLOT_MAINHAND, item);
player:graphicChange(GRAPHICSLOT_OFFHAND, item);
player:GraphicChange(GRAPHICSLOT_MAINHAND, item);
player:GraphicChange(GRAPHICSLOT_OFFHAND, item);
elseif (gItem:IsBowWeapon()) then
player:graphicChange(GRAPHICSLOT_MAINHAND, item);
--player:graphicChange(GRAPHICSLOT_OFFHAND, item);
player:GraphicChange(GRAPHICSLOT_MAINHAND, item);
--player:GraphicChange(GRAPHICSLOT_OFFHAND, item);
elseif (equipSlot == EQUIPSLOT_EARS) then
player:graphicChange(GRAPHICSLOT_R_EAR, item);
player:graphicChange(GRAPHICSLOT_L_EAR, item);
player:GraphicChange(GRAPHICSLOT_R_EAR, item);
player:GraphicChange(GRAPHICSLOT_L_EAR, item);
end
--Load gearset for new class and begin class change
if (classId ~= nil) then
loadGearset(player, classId);
player:doClassChange(classId);
player:DoClassChange(classId);
end
end
@ -194,20 +194,20 @@ function unequipItem(player, equipSlot, item)
if (equipSlot == EQUIPSLOT_BODY) then --Show Undershirt
item = player:GetEquipment():GetItemAtSlot(EQUIPSLOT_UNDERSHIRT);
player:graphicChange(GRAPHICSLOT_BODY, item);
player:GraphicChange(GRAPHICSLOT_BODY, item);
elseif (equipSlot == EQUIPSLOT_LEGS) then --Show Undergarment
item = player:GetEquipment():GetItemAtSlot(EQUIPSLOT_UNDERGARMENT);
player:graphicChange(GRAPHICSLOT_LEGS, item);
elseif (equipSlot == EQUIPSLOT_HANDS) then player:graphicChange(15, 0, 1, 0, 0);
elseif (equipSlot == EQUIPSLOT_FEET) then player:graphicChange(16, 0, 1, 0, 0);
player:GraphicChange(GRAPHICSLOT_LEGS, item);
elseif (equipSlot == EQUIPSLOT_HANDS) then player:GraphicChange(15, 0, 1, 0, 0);
elseif (equipSlot == EQUIPSLOT_FEET) then player:GraphicChange(16, 0, 1, 0, 0);
else
if (equipSlot == EQUIPSLOT_MAINHAND) then player:graphicChange(GRAPHICSLOT_MAINHAND, nil);
elseif (equipSlot == EQUIPSLOT_OFFHAND) then player:graphicChange(GRAPHICSLOT_OFFHAND, nil);
elseif (equipSlot == EQUIPSLOT_HEAD) then player:graphicChange(GRAPHICSLOT_HEAD, nil);
elseif (equipSlot == EQUIPSLOT_WAIST) then player:graphicChange(GRAPHICSLOT_WAIST, nil);
elseif (equipSlot == EQUIPSLOT_EARS) then player:graphicChange(GRAPHICSLOT_L_EAR, nil); player:graphicChange(GRAPHICSLOT_R_EAR, nil);
elseif (equipSlot == EQUIPSLOT_RFINGER) then player:graphicChange(GRAPHICSLOT_RFINGER, nil);
elseif (equipSlot == EQUIPSLOT_LFINGER) then player:graphicChange(GRAPHICSLOT_LFINGER, nil);
if (equipSlot == EQUIPSLOT_MAINHAND) then player:GraphicChange(GRAPHICSLOT_MAINHAND, nil);
elseif (equipSlot == EQUIPSLOT_OFFHAND) then player:GraphicChange(GRAPHICSLOT_OFFHAND, nil);
elseif (equipSlot == EQUIPSLOT_HEAD) then player:GraphicChange(GRAPHICSLOT_HEAD, nil);
elseif (equipSlot == EQUIPSLOT_WAIST) then player:GraphicChange(GRAPHICSLOT_WAIST, nil);
elseif (equipSlot == EQUIPSLOT_EARS) then player:GraphicChange(GRAPHICSLOT_L_EAR, nil); player:GraphicChange(GRAPHICSLOT_R_EAR, nil);
elseif (equipSlot == EQUIPSLOT_RFINGER) then player:GraphicChange(GRAPHICSLOT_RFINGER, nil);
elseif (equipSlot == EQUIPSLOT_LFINGER) then player:GraphicChange(GRAPHICSLOT_LFINGER, nil);
end
end
return true;

2
data/scripts/commands/ItemWasteCommand.lua
View file

@ -10,6 +10,6 @@ The param "itemDBIds" has the vars: item1 and item2.
--]]
function onEventStarted(player, actor, triggerName, invActionInfo, param1, param2, param3, param4, param5, param6, param7, param8, itemDBIds)
player:GetInventory(0x00):removeItem(invActionInfo.slot);
player:GetInventory(0x00):RemoveItem(invActionInfo.slot);
player:EndCommand();
end

8
data/scripts/commands/LogoutCommand.lua
View file

@ -18,7 +18,7 @@ Countdown: 1
function onEventStarted(player, command)
--player:SetCurrentMenuId(0);
--player:RunEventFunction("delegateCommand", command, "eventConfirm");
player:logout();
player:Logout();
end
function onEventUpdate(player, command, triggerName, step, arg1, arg2)
@ -28,10 +28,10 @@ function onEventUpdate(player, command, triggerName, step, arg1, arg2)
--Menu Dialog
if (currentMenuId == 0) then
if (arg1 == 1) then --Exit
player:quitGame();
player:QuitGame();
player:EndCommand();
elseif (arg1 == 2) then --Character Screen
player:logout();
player:Logout();
player:EndCommand();
--player:SetCurrentMenuId(1);
--player:RunEventFunction("delegateCommand", command, "eventCountDown");
@ -42,7 +42,7 @@ function onEventUpdate(player, command, triggerName, step, arg1, arg2)
elseif (currentMenuId == 1) then
if (arg2 == 1) then --Logout Complete
player:logout();
player:Logout();
player:EndCommand();
elseif (arg2 == 2) then --Cancel Pressed
player:EndCommand();