Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AMK, Lua, SQL] Mission 9, stone hunt in quicksands caves complete #4850

Merged

Conversation

Flibe-XI
Copy link
Contributor

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?

Implementation of Rescue! A Moogles Labor of Love, mission 9 of AMK. The player needs to collect 9 'stone' key items by clicking various question marks in quicksands caves. There are 20 possible QMs, and 10 possible sets of combinations required to check. The set which is assigned randomly in this commit is then passed as an arg to the geologist event which marks the map.

Steps to test these changes

!addmission 10 8
!pos -737 -6 -550 208
Talk to goblin geologist, he will assign a marker set to you. Go around quicksands and click the markers shown on the map for your stone KIs. (alternatively, !gotoid ###, ids are in the mission lua file)
Return to goblin to get KI Navaratna Talisman.
Get CS at shimmering circle in chamber of oracles.

@Flibe-XI Flibe-XI changed the title [AMK, Lua, sql] Mission 9, stone hunt in quicksands caves complete [AMK, Lua, SQL] Mission 9, stone hunt in quicksands caves complete Dec 11, 2023
@Flibe-XI Flibe-XI force-pushed the rescue-talisman-hunt branch 3 times, most recently from b9a2b8a to aadb641 Compare December 11, 2023 04:22
@Flibe-XI Flibe-XI force-pushed the rescue-talisman-hunt branch from aadb641 to 241f2ef Compare December 12, 2023 00:57
Copy link
Contributor

@zach2good zach2good left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Getting closer, thanks for all the hard work 🖖 (there's no regular salute emoji?)

@@ -117,6 +120,26 @@ zones[xi.zone.QUICKSAND_CAVES] =
CHAINS_THAT_BIND_US_QM = 17629746,
TREASURE_COFFER = 17629747,
ANTICAN_TAG_QM = 17629769,
QM_AMK_1 = 17629668,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are still raw IDs, you need to be using GetFirstID or GetTableOfIDs to pull these from the db at load time - which makes them more shift-proof

Copy link
Contributor Author

@Flibe-XI Flibe-XI Dec 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is really cool. Had to rejig the markerSets table in the mission lua. Did it via find/replace and spot checked it. Works great!

@@ -40,6 +41,7 @@ zones[xi.zone.QUICKSAND_CAVES] =
HOMEPOINT_SET = 11435, -- Home point set!
UNITY_WANTED_BATTLE_INTERACT = 11493, -- Those who have accepted % must pay # Unity accolades to participate. The content for this Wanted battle is #. [Ready to begin?/You do not have the appropriate object set, so your rewards will be limited.]
},

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need for these additional linebreaks, none of the other ID files have them

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I had found one that did, so I thought that was the default.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See Qufim Island, the only one near it like that haha. Bad luck.

@@ -1,6 +1,7 @@
local ID = zones[xi.zone.QUICKSAND_CAVES]

return {
['qmAMK'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY },
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking at all the other qm's we have in the codebase, they're all in snake_case, can you make this match? qm_amk, etc.

sql/npc_list.sql Show resolved Hide resolved
@@ -0,0 +1,12 @@
-----------------------------------
-- Area: Quicksand Caves
-- NPC: qm (???)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Name doesn't match the filename

@@ -0,0 +1,12 @@
-----------------------------------
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the correct naming for file here, can you update npc_list and the mission script to key on this?

-----------------------------------
-- Area: Quicksand Caves
-- NPC: qm (???)
-- Mission: AMK - Rescue! A Moogle's Labor of Love
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably worth adding a comment saying this script is shared between all the AMK qm's for this mission, to avoid confusion or someone bloating out the zone with multiple empty files - one for each qm

@zach2good
Copy link
Contributor

I skipped over implementing this mission on my branch way-back-when, because it looked like a pain in the ass, thanks for getting to it 👍

@Flibe-XI
Copy link
Contributor Author

I skipped over implementing this mission on my branch way-back-when, because it looked like a pain in the ass, thanks for getting to it 👍

That seems to be the theme SE was going for with AMK missions. This one was just tedious but the puzzles were even worse.

@Flibe-XI Flibe-XI force-pushed the rescue-talisman-hunt branch 2 times, most recently from 2ffd6a7 to 555ac46 Compare December 13, 2023 03:17
@Flibe-XI Flibe-XI force-pushed the rescue-talisman-hunt branch from 555ac46 to 89bbfb8 Compare December 13, 2023 03:39
@@ -117,6 +118,7 @@ zones[xi.zone.QUICKSAND_CAVES] =
CHAINS_THAT_BIND_US_QM = 17629746,
TREASURE_COFFER = 17629747,
ANTICAN_TAG_QM = 17629769,
QM_AMK = GetTableOfIDs('qm_amk')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@zach2good zach2good merged commit cd7630b into LandSandBoat:feature/amk_missions Dec 16, 2023
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants