Skip to content
This repository has been archived by the owner on Dec 4, 2020. It is now read-only.

Added intro to teamwork questline #582

Merged
merged 8 commits into from
May 10, 2020
Merged

Conversation

scorchedxi
Copy link
Contributor

Added three quests, intro to teamwork, intermediate teamwork, and advanced teamwork.

I affirm:

  • [] that I agree to Project Topaz's Limited Contributor License Agreement, as written on this date
  • [] that I've tested my code since the last commit in the PR, and will test after any later commits

Added three quests, intro to teamwork, intermediate teamwork, and advanced teamwork.
scorchedxi added 6 commits May 4, 2020 16:36
fixed lua style and cleaned up code
changed charVar to localVar
changed getCharVar to getLocalVar
fixed party member requirements
fixed party member requirements
@ibm2431 ibm2431 changed the base branch from release to teamwork May 5, 2020 11:55
Copy link
Contributor

@ibm2431 ibm2431 left a comment

Choose a reason for hiding this comment

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

Happy to have you here with us at Project Topaz, scorchedxi!

I'm just requesting some small changes~!

Comment on lines 19 to 23
--player:startEvent(129) -- starts the ready check for all three quests
--player:startEvent(130) -- post third quest dialog
--player:startEvent(131) -- Same job
--player:startEvent(132) -- You don't have the requirements to start the second quest
--player:startEvent(133) -- Same race
Copy link
Contributor

Choose a reason for hiding this comment

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

If these events are all implemented into the script now, we no longer need the comments describing them as separate lines~! 😉

(But do keep the comments describing them when you start them later in the file 😄 )

end
end

function onEventUpdate(player, csid, option)
-- csid 129 happens for both quests
if csid == 129 then
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there an outgoing event option that the player selects to confirm that they're ready for the check?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Believe it or not, both options are 0. The 'automated message' packet is what differentiates the response.

Comment on lines 105 to 107

-- check race for second
if (player:getRace() == tpz.race.HUME_M or player:getRace() == tpz.race.HUME_F) and (member:getRace() == tpz.race.HUME_M or member:getRace() == tpz.race.HUME_F) then
Copy link
Contributor

Choose a reason for hiding this comment

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

We could save a few CPU cycles (and line space) by assigning locals of the player's race (right after the party size requirement succeeds) and the member's race (inside the for loop), and then check those cached values in the if instead of calling member:getRace() each time:

local mRace = member:getRace()
if (pRace == tpz.race.HUME_M or pRace == tpz.race.HUME_F) and (mRace == tpz.race.HUME_M or mRace == tpz.race.HUME_F) then

scripts/zones/West_Ronfaure/npcs/Vilatroire.lua Outdated Show resolved Hide resolved
@ibm2431 ibm2431 added the hold Requests have been made to merge label May 7, 2020
Fixed spacing and comments
@ibm2431 ibm2431 added merge ready reviewed and deemed ready to merge and removed hold Requests have been made to merge labels May 10, 2020
Copy link
Contributor

@ibm2431 ibm2431 left a comment

Choose a reason for hiding this comment

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

Thanks, scorchedxi! Happy to have you here with us at Project Topaz!

@ibm2431 ibm2431 merged commit 3445d17 into project-topaz:teamwork May 10, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
merge ready reviewed and deemed ready to merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants