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

Impliment Ziphus spawn #571

Merged
merged 5 commits into from
May 14, 2020
Merged

Impliment Ziphus spawn #571

merged 5 commits into from
May 14, 2020

Conversation

hooksta4
Copy link
Contributor

@hooksta4 hooksta4 commented May 2, 2020

Updated to Topaz from @wiggo DSP contribution a few years ago.

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

Updated to Topaz from @wiggo DSP contribution a few years ago.
scripts/zones/Misareaux_Coast/Zone.lua Outdated Show resolved Hide resolved
scripts/zones/Misareaux_Coast/Zone.lua Outdated Show resolved Hide resolved
scripts/zones/Misareaux_Coast/npcs/qm2.lua Outdated Show resolved Hide resolved
scripts/zones/Misareaux_Coast/npcs/qm2.lua Outdated Show resolved Hide resolved
scripts/zones/Misareaux_Coast/npcs/qm7.lua Show resolved Hide resolved
@hooksta4
Copy link
Contributor Author

hooksta4 commented May 3, 2020

KO thanks! I have been working with coco on the side learning how to convert the server variables to local vars. I am testing it out now and should update the commit soon.

Thanks!

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.

These are all new files~! Kill those excess parens with extreme prejudice! 🔥

scripts/zones/Misareaux_Coast/npcs/qm2.lua Outdated Show resolved Hide resolved
scripts/zones/Misareaux_Coast/npcs/qm2.lua Outdated Show resolved Hide resolved
scripts/zones/Misareaux_Coast/npcs/qm2.lua Outdated Show resolved Hide resolved
win32/vcxproj/topaz_connect.vcxproj Outdated Show resolved Hide resolved
@ibm2431 ibm2431 added the hold Requests have been made to merge label May 7, 2020
@ibm2431 ibm2431 changed the base branch from release to ziphus May 7, 2020 09:59
hooksta4 and others added 3 commits May 7, 2020 08:59
Would this work for the connect server? Just updating as it should be?
Maybe Ill learn how to do this right the first time...
Style cleanup and logic changes after retail testing.
@cocosolos
Copy link
Contributor

I went ahead and globalized these functions and cleaned up some style stuff. I also did some retail testing and found that only 1 player can trade to each QM, and only that player can check the trap, so I updated to reflect that as well. I'm pretty sure that Ziphius will always spawn from 1 random trap given that it's been baited, so I changed that as well.

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.

Looks legit!

@ibm2431 ibm2431 added merge ready reviewed and deemed ready to merge and removed hold Requests have been made to merge labels May 14, 2020
@ibm2431 ibm2431 merged commit 935b3f1 into project-topaz:ziphus May 14, 2020
@TeoTwawki
Copy link
Contributor

I went ahead and globalized these functions and cleaned up some style stuff. I also did some retail testing and found that only 1 player can trade to each QM, and only that player can check the trap, so I updated to reflect that as well. I'm pretty sure that Ziphius will always spawn from 1 random trap given that it's been baited, so I changed that as well.

I can confirm Hercules Beetle in Carpenter’s Landing works identically.

@hooksta4
Copy link
Contributor Author

Thanks for squaring all that away. Didnt know what was meant by globalize the functions. Glad someone with a lot more knowledge was able to get it sorted and implemented!

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.

6 participants