[Quest] Convert Distant Loyalties to IF #6507

slashtangent · 2024-12-11T02:57:33Z

I affirm:

I understand that if I do not agree to the following points by completing the checkboxes my PR will be ignored.
I understand I should leave resolving conversations to the LandSandBoat team so that reviewers won't miss what was said.
I have read and understood the Contributing Guide and the Code of Conduct.
I have tested my code and the things my code has changed since the last commit in the PR and will test after any later commits.

What does this pull request do?

Converts the quest Distant Loyalties to IF

Steps to test these changes

Zone: Southern San 'dOria !zone 230
-- Femitte/Rouva !pos -17.7129 2.1000 10.1636
Talk to Rouva to test the default action
Talk to Femitte to test the default action

Set your fame level to 4 or higher for San d'Oria
!setfamelevel 0 4

Talk to Femitte and select the first option to start the quest.

Talk to Femitte and you should receive the default action text.

Talk to Rouva and you should receive the quest default text.

Zone to Bastok Markets
-- Bastok Markets !zone 235
Talk to Michea: !pos -299.2114 -15.9717 -156.0629
Trade Michea a Mythril Ingot !giveitem 653
Talk to Michea to test the quest default text.
Rezone !goto
Talk to Michea to receive KI

Zone to Southern San d'Oria !zone 230
-- Femitte/Rouva !pos -17.7129 2.1000 10.1636
Talk to Rouva, her text should not have changed and should still tell you to go to Bastok
Talk to Femitte to end the quest
Talk to Rouva to test that she has reverted to her default action

Zone to Bastok Markets
-- Bastok Markets !zone 235
Talk to Michea: !pos -299.2114 -15.9717 -156.0629
Recieve one time flavor text for the quest. Afterward, she will revert to her default action from then on.

##Captures
Distant Loyalties Quest:
https://www.youtube.com/watch?v=Q4pDVbXe7iU
https://drive.google.com/drive/folders/1VRACiqRlw0vZEO6hp3DXr95rdJQlCi0N?usp=sharing

Default Actions:
https://www.youtube.com/watch?v=8WAJx6_sjGk
https://drive.google.com/drive/folders/1WY6GYNAZMP5J0iw1Pfdxzf4QQXADn8pK?usp=sharing

slashtangent · 2024-12-11T02:59:50Z

scripts/zones/Southern_San_dOria/npcs/Femitte.lua

    else
-        player:startEvent(661)
+        return


Unsure if the return lines in the npc luas is needed. I was unsure but these should eventually get removed once wildcat gets converted to IF. Same with the Rouva.lua file on line 22.

Shouldn't be.

You can remove the else return as it will go to the DefaultActions if none of the requirements are met.

hooksta4 · 2024-12-14T14:58:09Z

scripts/quests/sandoria/Distant_Loyalties.lua

+    fame = 30,
+    fameArea = xi.fameArea.SANDORIA,
+    item = xi.item.WHITE_CAPE,


Align on the = (nit pick)

hooksta4 · 2024-12-14T14:59:24Z

scripts/quests/sandoria/Distant_Loyalties.lua

+            ['Femitte'] =
+            {
+                onTrigger = function(player, npc)
+                    local questProgress = quest:getVar(player, 'Prog')


If it is just for the 1 instance of calling it, I think its safe to not put it in the local

hooksta4 · 2024-12-14T15:02:36Z

scripts/quests/sandoria/Distant_Loyalties.lua

+                        not player:needToZone()
+                    then
+                        return quest:progressEvent(318)
+                    else


Can this be moved to Bastok_Markets/DefaultActions.lua ?

hooksta4 · 2024-12-14T15:03:24Z

scripts/zones/Southern_San_dOria/npcs/Femitte.lua

    else
-        player:startEvent(661)
+        return


Shouldn't be.

hooksta4 · 2024-12-14T15:05:14Z

scripts/zones/Southern_San_dOria/npcs/Femitte.lua

    else
-        player:startEvent(661)
+        return


You can remove the else return as it will go to the DefaultActions if none of the requirements are met.

hooksta4 · 2024-12-14T15:05:25Z

scripts/zones/Southern_San_dOria/npcs/Femitte.lua

    else
-        player:startEvent(661)
+        return


hooksta4 · 2024-12-14T15:05:32Z

scripts/zones/Southern_San_dOria/npcs/Rouva.lua

@@ -19,7 +19,7 @@ entity.onTrigger = function(player, npc)
    then
        player:startEvent(808)
    else
-        player:startEvent(664)
+        return


claywar · 2024-12-28T03:59:35Z

scripts/quests/sandoria/Distant_Loyalties.lua

+    {
+        check = function(player, status, vars)
+            return status == xi.questStatus.QUEST_AVAILABLE and
+            player:getFameLevel(xi.fameArea.SANDORIA) >= 4


One more level of indent here for multiline returns

claywar · 2024-12-28T03:59:51Z

scripts/quests/sandoria/Distant_Loyalties.lua

+        {
+            ['Femitte'] = 
+            {
+                onTrigger = function(player, npc)


onTrigger = quest:progressEvent(663),

claywar · 2024-12-28T04:00:19Z

scripts/quests/sandoria/Distant_Loyalties.lua

+                    if option == 0 then
+                        quest:begin(player)
+                        npcUtil.giveKeyItem(player, xi.ki.GOLDSMITHING_ORDER)
+                        quest:setVar(player, 'Prog', 1)


You're switching states here from available to accepted, no need to set a Prog var

* Converted Distant Loyalties to IF * Added Default Action for Rouva * Added Default Action for Femitte * Removed Quest code from Rouva, Michea, and Femitte NPC lua Co-Authored-By: hooksta4 <[email protected]>

WinterSolstice8

looks fine to me, but as always contingent on clay's approval

slashtangent · 2025-01-08T04:33:56Z

@claywar Checking in to see if you have had some time to review.

slashtangent commented Dec 11, 2024

View reviewed changes

slashtangent force-pushed the Distant_Loyalties branch from 2890969 to ab2afc8 Compare December 11, 2024 06:19

hooksta4 reviewed Dec 14, 2024

View reviewed changes

slashtangent force-pushed the Distant_Loyalties branch from ab2afc8 to 71e004a Compare December 14, 2024 21:12

claywar reviewed Dec 28, 2024

View reviewed changes

[Quest] Convert Distant Loyalties to IF

43680e9

* Converted Distant Loyalties to IF * Added Default Action for Rouva * Added Default Action for Femitte * Removed Quest code from Rouva, Michea, and Femitte NPC lua Co-Authored-By: hooksta4 <[email protected]>

slashtangent force-pushed the Distant_Loyalties branch from 71e004a to 43680e9 Compare December 28, 2024 04:22

WinterSolstice8 approved these changes Dec 30, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Quest] Convert Distant Loyalties to IF #6507

[Quest] Convert Distant Loyalties to IF #6507

slashtangent commented Dec 11, 2024

slashtangent Dec 11, 2024

hooksta4 Dec 14, 2024

hooksta4 Dec 14, 2024

hooksta4 Dec 14, 2024

hooksta4 Dec 14, 2024

hooksta4 Dec 14, 2024

hooksta4 Dec 14, 2024

hooksta4 Dec 14, 2024

hooksta4 Dec 14, 2024

hooksta4 Dec 14, 2024

hooksta4 Dec 14, 2024

claywar Dec 28, 2024

claywar Dec 28, 2024

claywar Dec 28, 2024

WinterSolstice8 left a comment

slashtangent commented Jan 8, 2025

[Quest] Convert Distant Loyalties to IF #6507

Are you sure you want to change the base?

[Quest] Convert Distant Loyalties to IF #6507

Conversation

slashtangent commented Dec 11, 2024

What does this pull request do?

Steps to test these changes

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

WinterSolstice8 left a comment

Choose a reason for hiding this comment

slashtangent commented Jan 8, 2025