Minor fixes

- InstanceRaid Guide : Added DefaultTalk handling for the npcs we have currently.  Included a couple commented-out client functions for two of the raids.
- EmoteSitCommand : Added eventType to the function so sitting on environment objects works again.
- Man0u0 : SourceTree added hunk-change garbage during a conflict resolving during the last merge. I just replaced it with the raw of that commit so it matches what it should have been.
- DftFst : Added the Gridania InstanceRaidGuide NPCs to the list for documentation sake, even though it'd never be called from that script with how things are currently set up.

Data/scripts/base/chara/npc/populace/instanceraidguide/InstanceRaidGuide.lua

@@ -3,15 +3,54 @@
 InstanceRaidGuide Script
 
 Functions;
+askEnterInstanceRaid(arg1)   -- Opens a widget asking to enter the given Raid id.
 
 --]]
 
 require ("global")
 
 function init(npc)
-	return false, false, 0, 0;	
+    
+    if ((npc == 1002090) or (npc == 1002091))  then
+        -- This won't work due to how init() works, but old scripts had it, keeping it here for now
+        return false, false, 0, 0, 491, 2;	
+    else
+        return false, false, 0, 0;
+    end
 end
 
 function onEventStarted(player, npc, eventType, eventName)
+
+    npcId = npc:GetActorClassId()
+    
+    if (npcId == 1002090) then -- Serpent Private Hodder (Stewart) : Gcl107
+    
+        callClientFunction(player, "delegateEvent", player, GetStaticActor("DftFst"), "defaultTalkWithStewart_001"); -- "defaultTalkWithStewart_002" -- Post-Raid dialog?
+        
+        --[[
+        choice = callClientFunction(player, "delegateEvent", player, GetStaticActor("Gcl107"), "processEventStewart", 15);
+        
+        if (choice == 1) then
+            callClientFunction(player, "askEnterInstanceRaid", 15); -- Rivenroad
+        end
+        --]]
+    elseif (npcId == 1002091) then -- Serpent Private Dauremant (Trisselle) : Sum6w0
+        
+        callClientFunction(player, "delegateEvent", player, GetStaticActor("DftFst"), "defaultTalkWithTrisselle_001"); -- "defaultTalkWithTrisselle_002" -- No idea for context.
+        
+        --[[
+        choice = callClientFunction(player, "delegateEvent", player, GetStaticActor("Sum6w0"), "processEventTrisselle", 16)
+        
+        if (choice == 1) then
+            callClientFunction(player, "askEnterInstanceRaid", 16);  -- Rivenroad (Hard)
+        end
+        --]]
+    elseif (npcId == 1060022) then -- Louisoix 
+        callClientFunction(player, "delegateEvent", player, GetStaticActor("DftFst"), "defaultTalkLouisoix_001");
+    end
+        
+
+        
+        
 	player:EndEvent();
 end

Data/scripts/commands/EmoteSitCommand.lua

@@ -4,7 +4,7 @@ EmoteSitCommand Script
 
 --]]
 
-function onEventStarted(player, actor, triggerName, emoteId)
+function onEventStarted(player, actor, eventType, triggerName, emoteId)
 
 	if (player:GetState() == 0) then						
 		if (emoteId == 0x2712) then

Data/scripts/quests/dft/DftFst.lua

@@ -106,12 +106,12 @@ local defaultTalkFst = {
     [1001710] = "defaultTalkWithWillielmus_001",            -- Willielmus           (Gridania: Adv. Guild)
     [1001806] = "defaultTalkEnie_001",                      -- Enie                 (Gridania: BTN Guild)
     [1001951] = "defaultTalkWithAnselm_001",                -- Anselm               (Gridania: Adv. Guild)
-    --[1002090] = "",                                         -- Serpent Private Hodder (Gridania: Adv. Guild) - Will not fire, not PplStd.
+    --[1002090] = "defaultTalkWithStewart_001",               -- Serpent Private Hodder (Gridania: Adv. Guild) defaultTalkWithStewart_002 (Post-Raid dialog?) - Will not fire, not PplStd.
-    --[1002091] = "",                                         -- Serpent Private Daurement (Gridania: Adv. Guild) - Will not fire, not PplStd.
+    --[1002091] = "defaultTalkWithTrisselle_001",             -- Serpent Private Daurement (Gridania: Adv. Guild) defaultTalkWithTrisselle_002 (No idea for context) - Will not fire, not PplStd.
     [1002106] = "processEventELNAURE",                      -- Serpent Lieutenant Marette (Gridania: The Knot) - Foundation Day 2012 - Spl000 staticactor
     [1002107] = "processEventARISMONT",                     -- Serpent Sergeant Frilaix (Gridania: The Knot) - Foundation Day 2012 - Spl000 staticactor
     [1002108] = "processEventMERLIE",                       -- Serpent Private Tristelle (Gridania: The Knot) - Foundation Day 2012 - Spl000 staticactor
-    --[1060022] = "",                                         -- Louisoix           (Gridania: Apkallus Falls) - Will not fire, not PplStd.
+    --[1060022] = "defaultTalkLouisoix_001",                  -- Louisoix           (Gridania: Apkallus Falls) - Will not fire, not PplStd.
     [1500055] = "defaultTalkWithLionnellais_001",           -- Lionnellais          (Gridania: Adv. Guild) - Will not fire, not PplStd.  Pre-airship dialog?
     [1500056] = "defaultTalkWithHida_001",                  -- Hida                 (Gridania: Adv. Guild) - Will not fire, not PplStd.  Pre-airship dialog?
     --[1500061] = "",                                         -- Fruhdhem             (Gridania) Chocobo Taxi - Will not fire, not PplStd.
@@ -122,7 +122,7 @@ local defaultTalkFst = {
 }
 --[[ TO:DO - Map the remainder of these
 
-defaultTalkWithStewart_001  -- Hodder line according to old script?
+
 defaultTalkWithPowle_001    
 defaultTalkWithSansa_001    
 defaultTalkWithNicoliaux_001
@@ -191,7 +191,7 @@ defaultTalkWithMoogle010_001
 defaultTalkWithMoogle002_001
 defaultTalkWithAilith_001
 defaultTalkWithQZamqo_001
-defaultTalkLouisoix_001
+
 defaultTalkWithRonanKognan_001
 defaultTalkWithRonanKognan_002 arg1 arg2
 defaultTalkWithRonanKognan_Hint_00 arg1
@@ -219,10 +219,6 @@ defaultTalkWithMoogleA_001
 defaultTalkWithMoogleA_002
 defaultTalkWithMppgleB_001
 defaultTalkWithMppgleB_002
-defaultTalkWithStewart_001
-defaultTalkWithStewart_002
-defaultTalkWithTrisselle_001
-defaultTalkWithTrisselle_002
 defaultTalkWithInn_Desk
 defaultTalkWithInn_ExitDoor
 defaultTalkWithExit01

Data/scripts/quests/man/man0u0.lua

@@ -108,11 +108,6 @@ function onStateChange(player, quest, sequence)
 
     if (sequence == SEQ_000) then
         -- Setup states incase we loaded in.
-<<<<<<< HEAD
-        local data = quest:GetData();
-        
-=======
->>>>>>> origin/ioncannon/quest_system
         local asciliaCanPush = not data:GetFlag(FLAG_SEQ000_MINITUT0);
         local asciliaFlag = data:GetFlag(FLAG_SEQ000_MINITUT1) and QFLAG_NONE or QFLAG_PLATE;
         local fretfulfarmhandFlag = data:GetFlag(FLAG_SEQ000_MINITUT2) and QFLAG_NONE or QFLAG_PLATE;
@@ -141,10 +136,6 @@ function onStateChange(player, quest, sequence)
         quest:SetENpc(OPENING_STOPER_ULDAH, QFLAG_NONE, false, false, true);
 
     elseif (sequence == SEQ_010) then
-<<<<<<< HEAD
-        local data = quest:GetData();
-=======
->>>>>>> origin/ioncannon/quest_system
         local yayatokiFlag = data:GetFlag(FLAG_SEQ010_TALK0) and QFLAG_NONE or QFLAG_PLATE;
         local uldahopeningexitFlag = QFLAG_MAP;
         quest:SetENpc(KEEN_EYED_MERCHANT);
@@ -175,12 +166,8 @@ end
 function onPush(player, quest, npc)
     local sequence = quest:getSequence();
     local classId = npc:GetActorClassId();
-<<<<<<< HEAD
-    local data = quest:GetData();
-=======
 	local data = quest:GetData();
 
->>>>>>> origin/ioncannon/quest_system
     if (sequence == SEQ_000) then
         if (classId == ASCILIA) then
            callClientFunction(player, "delegateEvent", player, quest, "processTtrNomal002");
@@ -222,17 +209,6 @@ function onNotice(player, quest, target)
 end
 
 function seq000_onTalk(player, quest, npc, classId)
-<<<<<<< HEAD
-    local data = quest:GetData();
-    if (classId == ASCILIA) then
-
-        if (not data:GetFlag(FLAG_SEQ000_MINITUT0)) then -- If Talk tutorial
-            callClientFunction(player, "delegateEvent", player, quest, "processTtrNomal003");
-            data:SetFlag(FLAG_SEQ000_MINITUT0); -- Used to disable her PushEvent / Allow for her next TalkEvent
-        else
-            callClientFunction(player, "delegateEvent", player, quest, "processTtrMini001");
-            data:SetFlag(FLAG_SEQ000_MINITUT1); -- Ascilia has now been talked to.
-=======
 	local data = quest:GetData();
 
     if (classId == ASCILIA) then
@@ -242,7 +218,6 @@ function seq000_onTalk(player, quest, npc, classId)
         else
             callClientFunction(player, "delegateEvent", player, quest, "processTtrMini001");
             quest:GetData():SetFlag(FLAG_SEQ000_MINITUT1); -- Ascilia has now been talked to.
->>>>>>> origin/ioncannon/quest_system
         end
 
     elseif (classId == FRETFUL_FARMHAND) then
@@ -283,10 +258,6 @@ function seq000_onTalk(player, quest, npc, classId)
 end
 
 function seq010_onTalk(player, quest, npc, classId)
-<<<<<<< HEAD
-    local data = quest:GetData();
-=======
->>>>>>> origin/ioncannon/quest_system
     if (classId == KEEN_EYED_MERCHANT) then
         callClientFunction(player, "delegateEvent", player, quest, "processEvent020_2");
     elseif (classId == HIGH_SPIRITED_FELLOW) then
@@ -302,15 +273,9 @@ function seq010_onTalk(player, quest, npc, classId)
     elseif (classId == FULL_LIPPED_FILLE) then
         callClientFunction(player, "delegateEvent", player, quest, "processEtc002");
     elseif (classId == YAYATOKI) then
-<<<<<<< HEAD
-        if (not data:GetFlag(FLAG_SEQ010_TALK0)) then
-            callClientFunction(player, "delegateEvent", player, quest, "processEvent020_8");
-            data:SetFlag(FLAG_SEQ010_TALK0);
-=======
         if (not quest:GetData():GetFlag(FLAG_SEQ010_TALK0)) then
             callClientFunction(player, "delegateEvent", player, quest, "processEvent020_8");
             quest:GetData():SetFlag(FLAG_SEQ010_TALK0);
->>>>>>> origin/ioncannon/quest_system
         else
             callClientFunction(player, "delegateEvent", player, quest, "processEvent020_8");
         end
@@ -323,13 +288,8 @@ function getJournalMapMarkerList(player, quest)
     local sequence = quest:getSequence();
 	local data = quest:GetData();
     local possibleMarkers = {};
-    local data = quest:GetData();
 
     if (sequence == SEQ_000) then
-<<<<<<< HEAD
-    
-=======
->>>>>>> origin/ioncannon/quest_system
         if (data:GetFlag(FLAG_SEQ000_MINITUT0)) then
             if (not data:GetFlag(FLAG_SEQ000_MINITUT1)) then table.insert(possibleMarkers, MRKR_ASCILIA); end
             if (not data:GetFlag(FLAG_SEQ000_MINITUT2)) then table.insert(possibleMarkers, MRKR_FRETFUL_FARMHAND); end
@@ -349,11 +309,7 @@ end
 
 
 
-<<<<<<< HEAD
 function doExitTrigger(player, quest, npc)	
-=======
-function doExitTrigger(player, quest, npc)	
->>>>>>> origin/ioncannon/quest_system
     quest:GetData():ClearData();
     quest:StartSequence(SEQ_005);
     contentArea = player.CurrentArea:CreateContentArea(player, "/Area/PrivateArea/Content/PrivateAreaMasterSimpleContent", "man0u01", "SimpleContent30079", "Quest/QuestDirectorMan0u001");