Fixing Ferries in Mhaura #411

kaincenteno · 2020-03-12T04:53:24Z

Offset was wrong and time at dock was also wrong. This was fixed.
Issue with docking position for Ferries is still wrong, but pos in table is now retail accurate.
NPC at dock in Mhaura now moves when ferry arrives and departs, also tells you about it,
not 100% retail accurate as it needs to rotate when it reaches final location. Leaving it as a TODO
for someone else to complete it.

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

Transport

Client Version Update (30200217_0)

fix some npcids in commented rows

Fix inaccurate trade behavior

Add set constructor

no longer need mobmod with no xp pull for bcnms

…ts) for later retrieval

when storing dancers attire (M vs F), give correct key item for later retrieval

Sidestream biweekly (2020/02/15 to 2020/02/29)

Force linkage of pthread on linux platforms

* Offset was wrong and time at dock was also wrong. This was fixed. * Issue with docking position for Ferries is still wrong, but pos in table is now retail accurate. * NPC at dock in Mhaura now moves when ferry arrives and departs, also tells you about it, not 100% retail accurate as it needs to rotate when it reaches final location. Leaving it as a TODO for someone else to complete it.

ibm2431

Thanks, kain~!

Mainly just some variable shortening and prettification:

ibm2431 · 2020-03-16T21:55:53Z

scripts/globals/transport.lua

@@ -24,6 +24,33 @@ tpz.transport.messageTime =
    SILVER_SEA = 480
 }

+tpz.transport.dockPorterMhauraTrigger =


Can probably shorten these; they're already in the tpz.transport namespace, so Porter is already implied. 😉

tpz.transport.trigger.mhaura tpz.transport.offset.mhaura tpz.transport.interval.mhaura tpz.transport.pos.mhaura

ibm2431 · 2020-03-16T21:56:42Z

scripts/globals/transport.lua

+    FERRY_ARRIVING_FROM_ALZAHBI  = 0,
+    FERRY_DEPARTING_TO_ALZAHBI = 1,
+    FERRY_ARRIVING_FROM_SELBINA  = 2,
+    FERRY_DEPARTING_TO_SELBINA = 3


Picky ibm: Could you make sure the = line up all pretty like~?

ibm2431 · 2020-03-16T22:02:00Z

scripts/globals/transport.lua

+    if triggerID == tpz.transport.dockPorterMhauraTrigger.FERRY_ARRIVING_FROM_ALZAHBI or
+        triggerID == tpz.transport.dockPorterMhauraTrigger.FERRY_ARRIVING_FROM_SELBINA then


Here's a trick you could do to save some lines and space, since your "arriving" and "departing" are all even/odd:

if (triggerID % 2) == 0 then npc:pathThrough(-- arriving) else npc:pathThrough(-- departing) end

ibm2431 · 2020-03-16T22:07:50Z

scripts/globals/transport.lua

+
+tpz.transport.dockPorterMhauraMessages = function(npc, triggerID, messages)


Not going to force you to globalize this juuusstt yet, but you can save yourself a little effort later by:

tpz.transport.messages = {} tpz.transport.messages.mhaura = function(npc, triggerID, messages)

(Later we can extend this to instead be just one function which takes a dock, and then pulls the appropriate tables based on the dock, but I realize right now that the focus is to fix the ferry)

ibm2431 · 2020-03-16T22:08:47Z

scripts/zones/Mhaura/npcs/Dieh_Yamilsiah.lua

+end
+
+function onTimeTrigger(npc, triggerID)
+    tpz.transport.dockPorterMhauraMessages(npc, triggerID, messages)


And then your function call down here becomes: tpz.transport.messages.mhaura(npc, triggerID, messages)

ibm2431 · 2020-03-16T22:20:41Z

Developer: I was going to have this target the transport branch, but the commit history did not like that, so I punted back to release. I'll have to see what's going on with the transport branch later.

transport is just quite a ways behind release, which is what this was based on.

…ed system

ibm2431

Pushed review changes~!

(And she seems to be working!)

KnowOne134 and others added 28 commits February 22, 2020 14:36

no longer need mobmod with no xp pull for bcnms

c7a7895

Add set constructor

0019348

Fix inaccurate trade behavior

3be45bb

[version update] titles

585d2ae

[version update] items

04bfdac

[version update] textID shifts

420b712

Merge pull request #391 from project-topaz/transport

176b48a

Transport

[version update] npcID shifts

6383e19

[version update] version.info

dc7aeac

Merge pull request #392 from wrenffxi/version-update

4c2364f

Client Version Update (30200217_0)

Merge branch 'stable'

87ff007

fix some shifted NPC IDs in commented rows

33f80cd

Merge pull request #393 from wrenffxi/version-update

af56ca2

fix some npcids in commented rows

Merge branch 'stable'

63a666c

Merge pull request #387 from ibm2431/fix-trade

436807c

Fix inaccurate trade behavior

Merge pull request #385 from ibm2431/set

d4ba7d1

Add set constructor

Merge branch 'stable' of https://github.com/project-topaz/topaz

3db4d22

Merge pull request #375 from KnowOne134/no_drops

3cf80f8

no longer need mobmod with no xp pull for bcnms

Merge branch 'stable'

ecbeb84

when storing dancers attire, give correct key item (male vs female se…

b1a0c20

…ts) for later retrieval

Merge pull request #397 from wrenffxi/dancers-attire-storage

9587080

when storing dancers attire (M vs F), give correct key item for later retrieval

Fix IncrediblyEasyPrey typo

b55281e

Fix charm chance level and chr ratio calculations

d99c2d5

Commits from sidestream, 2020/02/15 to 2020/02/29

0ef21b6

Merge pull request #400 from zircon-tpl/sidestream-biweekly

31114b4

Sidestream biweekly (2020/02/15 to 2020/02/29)

Force linkage of pthread on linux platforms

0f99f63

Merge pull request #402 from zach2good/fix/manjaro_linkage

e7e95e9

Force linkage of pthread on linux platforms

ibm2431 changed the base branch from master to release March 12, 2020 22:26

ibm2431 suggested changes Mar 16, 2020

View reviewed changes

ibm2431 changed the base branch from release to transport March 16, 2020 22:17

ibm2431 changed the base branch from transport to release March 16, 2020 22:18

ibm2431 added hold Requests have been made to merge reviewed Has been reviewed by at least one Staff Member labels Mar 16, 2020

ibm2431 self-assigned this Mar 16, 2020

ibm2431 changed the base branch from release to transport March 17, 2020 00:14

Shorten dock-related references + a little prep work for a standardiz…

91d0a71

…ed system

ibm2431 approved these changes Mar 26, 2020

View reviewed changes

ibm2431 added merge ready reviewed and deemed ready to merge and removed hold Requests have been made to merge reviewed Has been reviewed by at least one Staff Member labels Mar 26, 2020

zircon-tpl merged commit 2071cc1 into project-topaz:transport Mar 26, 2020

kaincenteno deleted the mhaura_ferries branch March 27, 2020 03:25

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixing Ferries in Mhaura #411

Fixing Ferries in Mhaura #411

kaincenteno commented Mar 12, 2020

ibm2431 left a comment

ibm2431 Mar 16, 2020

ibm2431 Mar 16, 2020

ibm2431 Mar 16, 2020

ibm2431 Mar 16, 2020

ibm2431 Mar 16, 2020

ibm2431 commented Mar 16, 2020 •

edited

Loading

ibm2431 left a comment

		if triggerID == tpz.transport.dockPorterMhauraTrigger.FERRY_ARRIVING_FROM_ALZAHBI or
		triggerID == tpz.transport.dockPorterMhauraTrigger.FERRY_ARRIVING_FROM_SELBINA then


		tpz.transport.dockPorterMhauraMessages = function(npc, triggerID, messages)

Fixing Ferries in Mhaura #411

Fixing Ferries in Mhaura #411

Conversation

kaincenteno commented Mar 12, 2020

ibm2431 left a comment

Choose a reason for hiding this comment

ibm2431 Mar 16, 2020

Choose a reason for hiding this comment

ibm2431 Mar 16, 2020

Choose a reason for hiding this comment

ibm2431 Mar 16, 2020

Choose a reason for hiding this comment

ibm2431 Mar 16, 2020

Choose a reason for hiding this comment

ibm2431 Mar 16, 2020

Choose a reason for hiding this comment

ibm2431 commented Mar 16, 2020 • edited Loading

ibm2431 left a comment

Choose a reason for hiding this comment

ibm2431 commented Mar 16, 2020 •

edited

Loading