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 'develop'

Browse source 
# Conflicts:
#	FFXIVClassic Map Server/FFXIVClassic Map Server.csproj
#	FFXIVClassic Map Server/Server.cs
#	data/scripts/player.lua
#	scripts/zones/193/npcs/pplStd_11@0C100.lua
This commit is contained in:
Filip Maj 2016-04-18 13:31:55 -04:00
commit 3d5fa45730
134 changed files with 1926 additions and 242 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,15 +6,20 @@ Switches between active and passive mode states
--]]
function onEventStarted(player, actor, triggerName)
function onEventStarted(player, command, triggerName)
if (player:getState() == 0) then
player:changeState(2);
elseif (player:getState() == 2) then
player:changeState(0);
end
player:endEvent();
player:endCommand();
--For Opening Tutorial
if (player:hasQuest("Man0l0") or player:hasQuest("Man0g0") or player:hasQuest("Man0u0")) then
player:getDirector():onCommand(command);
end
end

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

@ -16,7 +16,7 @@ function onEventStarted(player, actor, triggerName)
player:sendGameMessage(worldMaster, 32503, 0x20);
end
player:endEvent();
player:endCommand();
end

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

@ -18,6 +18,6 @@ function onEventUpdate(player, actor, step, arg1)
--Submit
player:endEvent();
player:endCommand();
end

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

@ -14,6 +14,6 @@ function onEventStarted(player, commandactor, triggerName, arg1, arg2, arg3, arg
player:examinePlayer(actor);
end
player:endEvent();
player:endCommand();
end

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

@ -42,9 +42,6 @@ function onEventStarted(player, actor, triggerName, isGoobbue)
player:changeState(0);
end
player:endEvent();
player:endCommand();
end
function onEventUpdate(player, npc)
end

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

@ -15,7 +15,7 @@ function onEventStarted(player, actor, triggerName, maxNumber)
worldMaster = getWorldMaster();
player:sendGameMessage(player, worldMaster, 25342, 0x20, result, maxNumber);
player:endEvent();
player:endCommand();
end

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

@ -16,7 +16,7 @@ function onEventStarted(player, actor, triggerName, emoteId)
player:changeState(0);
end
player:endEvent();
player:endCommand();
end

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

@ -15,7 +15,7 @@ function onEventStarted(player, actor, triggerName, emoteId)
player:doEmote(emoteId);
end
player:endEvent();
player:endCommand();
end

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

@ -69,7 +69,7 @@ function onEventStarted(player, actor, triggerName, invActionInfo, param1, param
end
end
player:endEvent();
player:endCommand();
end
function loadGearset(player, classId)

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

@ -11,5 +11,5 @@ 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:endEvent();
player:endCommand();
end

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

@ -16,8 +16,9 @@ Countdown: 1
--]]
function onEventStarted(player, command)
player:setCurrentMenuId(0);
player:runEventFunction("delegateCommand", command, "eventConfirm");
--player:setCurrentMenuId(0);
--player:runEventFunction("delegateCommand", command, "eventConfirm");
player:logout();
end
function onEventUpdate(player, command, triggerName, step, arg1, arg2)
@ -28,23 +29,23 @@ function onEventUpdate(player, command, triggerName, step, arg1, arg2)
if (currentMenuId == 0) then
if (arg1 == 1) then --Exit
player:quitGame();
player:endEvent();
player:endCommand();
elseif (arg1 == 2) then --Character Screen
player:logout();
player:endEvent();
player:endCommand();
--player:setCurrentMenuId(1);
--player:runEventFunction("delegateCommand", command, "eventCountDown");
elseif (arg1 == 3) then --Cancel
player:endEvent();
player:endCommand();
end
--Countdown Dialog
elseif (currentMenuId == 1) then
if (arg2 == 1) then --Logout Complete
player:logout();
player:endEvent();
player:endCommand();
elseif (arg2 == 2) then --Cancel Pressed
player:endEvent();
player:endCommand();
end
end

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

@ -7,7 +7,3 @@ function onEventStarted(player, actor, questId)
player:sendRequestedInfo("requestedData", "activegl", 7, nil, nil, nil, nil, nil, nil, nil);
-- player:sendRequestedInfo("requestedData", "glHist", 10, 0x1D4F2, 1009, 12464, 11727, 12485, 12526);
end
function onEventUpdate(player, actor, triggerName, step, arg1)
end

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

@ -6,7 +6,3 @@
function onEventStarted(player, actor, questId)
player:sendRequestedInfo("requestedData", "qtdata", 0x1D4F2);
end
function onEventUpdate(player, actor, triggerName, step, arg1)
end

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

@ -35,17 +35,17 @@ function onEventUpdate(player, actor, step, arg1)
player:setCurrentMenuId(1);
player:runEventFunction("delegateCommand", actor, "eventAetheryte", arg1, 2, 2, 2, 4, 4, 4);
else
player:endEvent();
player:endCommand();
end
elseif (menuId == 1) then --Aetheryte
if (arg1 == nil) then
player:endEvent();
player:endCommand();
return;
end
player:setCurrentMenuId(2);
player:runEventFunction("delegateCommand", actor, "eventConfirm", false, false, 1, 138824, false);
elseif (menuId == 2) then --Confirm
player:endEvent();
player:endCommand();
end
end