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

# Conflicts:
#	FFXIVClassic Map Server/dataobjects/ConnectedPlayer.cs
#	FFXIVClassic Map Server/lua/LuaEngine.cs
#	data/scripts/global.lua

data/scripts/commands/ActivateCommand.lua

@@ -14,7 +14,7 @@ function onEventStarted(player, command, triggerName)
 		player:ChangeState(0); 
 	end
 		
-	player:EndCommand();
+	player:endEvent();
 	
 	--For Opening Tutorial
 	if (player:HasQuest("Man0l0") or player:HasQuest("Man0g0") or player:HasQuest("Man0u0")) then

data/scripts/commands/AttackWeaponSkill.lua

@@ -16,7 +16,7 @@ function onEventStarted(player, actor, triggerName)
 		player:SendGameMessage(worldMaster, 32503, 0x20);
 	end
 
-	player:EndCommand();
+	player:EndEvent();
 	
 end
 

data/scripts/commands/BonusPointCommand.lua

@@ -8,16 +8,16 @@ operateUI(pointsAvailable, pointsLimit, str, vit, dex, int, min, pie)
 
 --]]
 
+require ("global")
+
 function onEventStarted(player, actor, triggerName)
 	--local points = player:GetAttributePoints();
 	--player:RunEventFunction("delegateCommand", actor, "operateUI", points.available, points.limit, points.inSTR, points.inVIT, points.inDEX, points.inINT, points.inMIN, points.inPIT);
-	player:RunEventFunction("delegateCommand", actor, "operateUI", 10, 10, 10, 10, 10, 10, 10, 10);
-end
-
-function onEventUpdate(player, actor, step, arg1)
-
-	--Submit
+	result = callClientFunction(player, "delegateCommand", actor, "operateUI", 100, 100, 10, 10, 10, 10, 10, 10);
 	
-	player:EndCommand();
+	--Do Save
+	if (result == true) then
+	end
 	
+	player:endEvent();
 end

data/scripts/commands/CheckCommand.lua

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

data/scripts/commands/ChocoboRideCommand.lua

@@ -42,6 +42,6 @@ function onEventStarted(player, actor, triggerName, isGoobbue)
 		player:ChangeState(0); 
 	end
 	
-	player:EndCommand();
+	player:EndEvent();
 	
 end

data/scripts/commands/DiceCommand.lua

@@ -15,7 +15,7 @@ function onEventStarted(player, actor, triggerName, maxNumber)
 	worldMaster = GetWorldMaster();
 	player:SendGameMessage(player, worldMaster, 25342, 0x20, result, maxNumber);
 				
-	player:EndCommand();
+	player:EndEvent();
 	
 end
 

data/scripts/commands/EmoteSitCommand.lua

@@ -16,7 +16,7 @@ function onEventStarted(player, actor, triggerName, emoteId)
 		player:ChangeState(0);
 	end
 	
-	player:EndCommand();
+	player:EndEvent();
 	
 end
 

data/scripts/commands/EmoteStandardCommand.lua

@@ -15,7 +15,7 @@ function onEventStarted(player, actor, triggerName, emoteId)
 		player:DoEmote(emoteId);
 	end
 	
-	player:EndCommand();
+	player:EndEvent();
 	
 end
 

data/scripts/commands/EquipCommand.lua

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

data/scripts/commands/ItemWasteCommand.lua

@@ -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:EndCommand();	
+	player:EndEvent();	
 end

data/scripts/commands/LogoutCommand.lua

@@ -8,46 +8,20 @@ eventConfirm()
 eventCountDown()
 eventLogoutFade()
 
-Menu Ids:
-
-Menu: 		0	
-Countdown: 	1
-
 --]]
 
-function onEventStarted(player, command)
-	--player:SetCurrentMenuId(0);
-	--player:RunEventFunction("delegateCommand", command, "eventConfirm");
-	player:Logout();
-end
+require ("global")
 
-function onEventUpdate(player, command, triggerName, step, arg1, arg2)
+function onEventStarted(player, command, triggerName)
 
-	currentMenuId = player:GetCurrentMenuId();
+	choice = callClientFunction(player, "delegateCommand", command, "eventConfirm");	
 
-	--Menu Dialog	
-	if (currentMenuId == 0) then
-		if (arg1 == 1) then --Exit	
-			player:QuitGame();
-			player:EndCommand();	
-		elseif (arg1 == 2) then --Character Screen
-			player:Logout();
-			player:EndCommand();
-			--player:SetCurrentMenuId(1);
-			--player:RunEventFunction("delegateCommand", command, "eventCountDown");
-		elseif (arg1 == 3) then --Cancel
-			player:EndCommand();
-		end
-	--Countdown Dialog
-	elseif (currentMenuId == 1) then
-	
-		if (arg2 == 1) then --Logout Complete
-			player:Logout();
-			player:EndCommand();			
-		elseif (arg2 == 2) then --Cancel Pressed
-			player:EndCommand();
-		end
-		
+	if (choice == 1) then
+		player:QuitGame();
+	elseif (choice == 2) then
+		player:Logout();
 	end
 	
-end
+	player:EndEvent();
+	
+end

data/scripts/commands/PartyInviteCommand.lua

@@ -14,6 +14,6 @@ function onEventStarted(player, actor, triggerName, name, arg1, arg2, arg3, acto
 		GetWorldManager():CreateInvitePartyGroup(player, actorId);
 	end
 	
-	player:EndCommand();
+	player:EndEvent();
 	
 end

data/scripts/commands/PlaceDrivenCommand.lua

@@ -0,0 +1,20 @@
+--[[
+
+PlaceDrivenCommand Script
+
+Notes: 
+
+
+--]]
+
+function onEventStarted(player, commandActor, triggerName, pushCommand, unk1, unk2, unk3, ownerActorId, unk4, unk5, unk6, unk7)
+	
+	actor = player:GetActorInInstance(ownerActorId);
+	
+	if (actor != nil) then
+		player:kickEvent(actor, "pushCommand", "pushCommand");
+	else
+		player:endEvent();
+	end
+	
+end

data/scripts/commands/TeleportCommand.lua

@@ -8,22 +8,42 @@ eventRegion(numAnima)
 eventAetheryte(region, animaCost1, animaCost2, animaCost3, animaCost4, animaCost5, animaCost6)
 eventConfirm(isReturn, isInBattle, cityReturnNum, 138821, forceAskReturnOnly)
 
-Menu Ids:
-
-Region Menu:	0
-Aetheryte Menu:	1
-Confirm Menu:	2
-
 --]]
 
+require ("global")
+
+function doTeleport(region, aetheryte)
+end
+
 function onEventStarted(player, actor, triggerName, isTeleport)
-	if (isTeleport == 0) then
-		player:SetCurrentMenuId(0);
-		player:RunEventFunction("delegateCommand", actor, "eventRegion", 100);
+	if (isTeleport == 0) then		
+		while (true) do
+			regionChoice = callClientFunction(player, "delegateCommand", actor, "eventRegion", 100);
+			
+			if (regionChoice == nil) then break	end
+		
+			while (true) do
+				aetheryteChoice = callClientFunction(player, "delegateCommand", actor, "eventAetheryte", regionChoice, 2, 2, 2, 4, 4, 4);
+				
+				if (aetheryteChoice == nil) then break end
+				
+				confirmChoice = callClientFunction(player, "delegateCommand", actor, "eventConfirm", false, false, 1, 138824, false);
+				
+				if (confirmChoice == 1) then
+					doTeleport(regionChoice, aetheryteChoice);								
+				end
+				
+				player:endEvent();
+				return;
+								
+			end
+			
+		end
 	else
-		player:SetCurrentMenuId(2);
-		player:RunEventFunction("delegateCommand", actor, "eventConfirm", true, false, 1, 0x138824, false);
-	end		
+		callClientFunction(player, "delegateCommand", actor, "eventConfirm", true, false, 1, 0x138824, false);
+	end	
+
+	player:endEvent();
 end
 
 function onEventUpdate(player, actor, step, arg1)
@@ -48,4 +68,4 @@ function onEventUpdate(player, actor, step, arg1)
 		player:EndCommand();	
 	end
 	
-end
+end