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

Check for level sync before allowing BCNM entry #1053

Merged
merged 4 commits into from
Sep 5, 2022

Conversation

zach2good
Copy link
Contributor

@zach2good zach2good commented Nov 30, 2021

TODO:

  • BCNM Trade
  • BCNM Trigger
  • Set Sync inside BCNM
  • Instance Trade (does this exist?)
  • Instance Trigger
  • Set Sync inside Instance (can we do this inside the status effect?)
  • Other level sync things not covered by BCNM/Instance: Confrontation, Dynamis(?), Unity, ZNM pops (?)
  • Add texts to all zones and make UpdateExtractor not freak out about it

From Caps:
Attempting to enter a BCNM area with a level restriction of any king (level/master sync)

"Your party is unable to participate because certain members' levels are restricted" - Message Special + TextID

Attempting to level sync in a BCNM:
Level Sync could not be Activated
One or more party members are currently under the effect of a status which prevents synchronization - System message?

Trying to spawn Dunes Unity NM while level synched
Unable to commence Wanted battle - System message?

Trying to level sync once the Unity NM is popped:
Level Sync could not be Activated
One or more party members are currently under the effect of a status which prevents synchronization - System message?

TextIDs for every zone (from UpdateExtractor)
text_ids_level_sync.txt

I affirm:

  • I have paid attention to this example and will edit again if need be to not break the formatting, or I will be ignored
  • that I agree to LandSandBoat's Limited Contributor License Agreement, as written on this date
  • that I have read the Contributing Guide
  • that I've tested my code and things my code changed since the last commit in the PR, and will test after any later commits

@zach2good zach2good changed the title [lua] Check for level sync before allowing BCNM entry [WIP] Check for level sync before allowing BCNM entry Nov 30, 2021
@TeoTwawki TeoTwawki marked this pull request as draft December 20, 2021 18:16
@zach2good zach2good force-pushed the zach2good_bcnm_lvl_sync branch from 6de8b48 to 4248d40 Compare July 15, 2022 08:35
@WinterSolstice8 WinterSolstice8 force-pushed the zach2good_bcnm_lvl_sync branch from 4248d40 to 8287f53 Compare August 27, 2022 08:14
@WinterSolstice8
Copy link
Member

WinterSolstice8 commented Aug 27, 2022

Instances in ToAU on retail gives level cap (uncapped) status and level sync can't apply because of that.
Unchecked: WoTG instances, SoA instances

Currently Assault on LSB does not give the level capped status for level 75

@WinterSolstice8
Copy link
Member

I think this is done baking. The remaining places I found for level sync blocking interactions are tracked in #2645.

@WinterSolstice8 WinterSolstice8 marked this pull request as ready for review September 3, 2022 03:32
@WinterSolstice8 WinterSolstice8 changed the title [WIP] Check for level sync before allowing BCNM entry Check for level sync before allowing BCNM entry Sep 3, 2022
@WinterSolstice8
Copy link
Member

p.s.

some useful commands to insert messages into all zones where applicable on the commandline (should work on git for windows)

add new message to all zones

find -name "IDs.lua" -exec sed -i "/You currently have a total of <number> points./ a \        UNITY_WANTED_BATTLE_INTERACT = 0, -- 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.]" {} \;

run update extractor

remove changes from zones where it doesn't apply (msg still is zero)

find -name "IDs.lua" -exec bash -c 'grep -i "UNITY_WANTED_BATTLE_INTERACT = 0" {} && git checkout {}' \;

add remaining zones to commit

find -name "IDs.lua" -exec bash -c 'grep -i "UNITY_WANTED_BATTLE_INTERACT" {} && git add {}' \;

@claywar claywar merged commit ecd63df into base Sep 5, 2022
@zach2good zach2good deleted the zach2good_bcnm_lvl_sync branch October 1, 2022 19:17
illzbee added a commit to illzbee/LSB that referenced this pull request Oct 26, 2022
commit 9fc5dc31f0d291ae21d650ef7b4471706f71865d
Merge: c6565501a7 4e04607e64
Author: claywar <[email protected]>
Date:   Thu Sep 22 14:09:25 2022 -0400

    Merge pull request #2779 from jmcmorris/status_mob

    Unify status type between cpp and lua to have MOB rather than UPDATE

commit c6565501a79933a66470b105c245919704080a4a
Merge: 4013d31340 ada6b7efa3
Author: claywar <[email protected]>
Date:   Thu Sep 22 14:08:46 2022 -0400

    Merge pull request #2778 from LandSandBoat/appraisal-item-enum

    Add and correct items.lua for Appraisal items

commit 4e04607e649d3e3100e6b1be19e68800ba056ebb
Author: jmcmorris <[email protected]>
Date:   Thu Sep 22 10:14:04 2022 -0700

    Unify status type between cpp and lua to have MOB rather than UPDATE

commit ada6b7efa3a101cbc9405594330b2b18049c3206
Author: claywar <[email protected]>
Date:   Thu Sep 22 13:07:01 2022 -0400

    Add and correct items.lua for Appraisal items

    Additional items

commit 4013d31340a493a64f7bb782e02af3908c7162e0
Merge: ace75a3bca 49cf98e30c
Author: claywar <[email protected]>
Date:   Wed Sep 21 19:17:33 2022 -0400

    Merge pull request #2770 from neuromancerxi/inner_hor

    [sq] Inner Horutoto Ruins Mob Behavior Fix

commit ace75a3bca6f7a3ed7510f80a46f45327639ea0b
Merge: aab29b4c7a 9da53df605
Author: claywar <[email protected]>
Date:   Wed Sep 21 15:47:29 2022 -0400

    Merge pull request #2768 from LandSandBoat/check_pettype_for_petskills

    [core] Add check to petskill activation so jugpet skills don't overlap into petskills unintentionally

commit aab29b4c7abf39907dd5a1022dc5ae7b631f85e6
Merge: b8b5717afe d1e59861fd
Author: claywar <[email protected]>
Date:   Wed Sep 21 15:47:12 2022 -0400

    Merge pull request #2769 from jmcmorris/script_debugger

    Adding support for the vscode extension "Local Lua Debugger"

commit 49cf98e30c5da708b6bbf5b91be0742ec4b5ec54
Author: NeuromancerXI <[email protected]>
Date:   Wed Sep 21 09:17:06 2022 -0700

    Inner Horutoto Ruins Mob Behavior Fix

    Adjusts Deathwatch Beetle and Troika Bats to be Non-agressive / Linking.

commit d1e59861fd1d197eb62d2c59913025b548f36fa4
Author: jmcmorris <[email protected]>
Date:   Wed Sep 21 09:13:36 2022 -0700

    Cleanup lldebugger require

commit cc2e3813ec9a8e81bbe35fb37db5150e2942de5d
Author: jmcmorris <[email protected]>
Date:   Wed Sep 21 09:01:57 2022 -0700

    Adding support for the vscode extension "Local Lua Debugger"

commit 9da53df605aa005068b72bad50b72bad5a585531
Author: WinterSolstice8 <[email protected]>
Date:   Tue Sep 20 23:03:51 2022 -0700

    [core] Add check to petskill activation so jugpet skills don't overlap into petskills unintentionally

commit b8b5717afe7f8e0f3902f71117d5521922f938e9
Merge: 956c99d41a 58557373f8
Author: claywar <[email protected]>
Date:   Tue Sep 20 16:43:54 2022 -0400

    Merge pull request #2726 from WinterSolstice8/packet_backlog_nullptr_check

    [core] [packets] Add nullptr check for player's zone when checking packet backlog

commit 956c99d41adabd3e4a7c76b7d02a84fc87b3861e
Author: Jasson McMorris <[email protected]>
Date:   Tue Sep 20 13:17:12 2022 -0700

    Fixing various issues with Sagheera (#2765)

    * Fixing various issues with Sagheera

    * Refactoring events for sanity complexity

    * Fixing typo

    * Getting there with reclaiming my sanity

    * Remove unnecessary parentheses

    * Invert Sagheera charvar so it'll only last as long as it needs to

    * Using some bit math with SagheeraInteractions

    * Forgot to move the SagheeraInteraction bit 2 to bit 3

    * Revert "Forgot to move the SagheeraInteraction bit 2 to bit 3"

    This reverts commit 1935a66bea3b36347ec6b32667caefc21ece44a9.

    * Revert "Using some bit math with SagheeraInteractions"

    This reverts commit c1389ecb4822063e99dcff7db0e9768205fa9f51.

    * Add stored ABCs condition on Sagheera menu bit 2

    Co-authored-by: jmcmorris <[email protected]>

commit a12afdaf72716615baa974d3920535c42ad997ad
Merge: 112bfdbb4c f899c72d26
Author: claywar <[email protected]>
Date:   Tue Sep 20 13:10:12 2022 -0400

    Merge pull request #2764 from LandSandBoat/chore/gear-sets

    Refactor Gear Sets

commit f899c72d26072be756040e399983bbcf69d159bd
Author: claywar <[email protected]>
Date:   Tue Sep 20 12:06:58 2022 -0400

    [gear sets] Explicitly define mod values for N set pieces equipped

    Fix invalid ref

    Move global lookup table declaration below function definition

    Fix loop needing ipairs

commit ef4d6bd3c7ce2b09a857a508d62abff3cd5f866c
Author: claywar <[email protected]>
Date:   Tue Sep 20 09:59:21 2022 -0400

    [gear sets] Refactor lookups and mod application logic

    Fix modifier start index

commit 5c1596bc3e4dca9ae240914204c7cf35d95a5d88
Author: claywar <[email protected]>
Date:   Tue Sep 20 07:19:51 2022 -0400

    [gear sets] Update items to use xi.items enum

commit 112bfdbb4c66f3a38a12753e517ee7e43d942371
Merge: 659cb9feeb 2f8a57f78e
Author: claywar <[email protected]>
Date:   Tue Sep 20 06:55:56 2022 -0400

    Merge pull request #2763 from LandSandBoat/raining-mannequins-fix

    Confirm trade of mannequin parts in It's Raining Mannequins

commit 2f8a57f78e5725859eb079227aa4cc38e4d0e8df
Author: claywar <[email protected]>
Date:   Tue Sep 20 06:15:28 2022 -0400

    Confirm trade of mannequin parts in It's Raining Mannequins

    Co-authored-by: InoUno <[email protected]>

commit 1df6e6efb09eab101f77028c06bc62cb60bc2659
Author: claywar <[email protected]>
Date:   Sun Sep 18 20:48:04 2022 -0400

    [gear sets] Initial reformatting

    Initial pass, safety check-in

    Additional formatting, remove matchType, populate maxMatches for capped tier

    Format item subtable for each entry

    Format existing mod tables

commit 659cb9feeb98081dc2317a75c46587c48442e8ae
Merge: 4b3a42f0ca 7457675d0e
Author: claywar <[email protected]>
Date:   Tue Sep 20 04:53:43 2022 -0400

    Merge pull request #2754 from jmcmorris/battlefield_groups

    Battlefield Groups

commit 4b3a42f0ca8cc4f95ef647f1be49dcea23c0b628
Merge: 80d9accf93 e00e73e712
Author: claywar <[email protected]>
Date:   Tue Sep 20 04:53:24 2022 -0400

    Merge pull request #2762 from WinterSolstice8/canusespell_override_nil_fix

    [lua] Fix access nil error in canusespell_override.lua

commit 80d9accf936bb117be7bf996e10b39cdeba53f34
Merge: 7edb02d77b 8323c1ab1d
Author: claywar <[email protected]>
Date:   Tue Sep 20 04:53:07 2022 -0400

    Merge pull request #2758 from LandSandBoat/issue-template-update

    Add prompt for OS to bug report template

commit 7edb02d77b9cb743aeb98f43e4962e9e7be4a9f3
Merge: 3d0acd3863 e084e1172e
Author: claywar <[email protected]>
Date:   Tue Sep 20 04:52:51 2022 -0400

    Merge pull request #2761 from WinterSolstice8/change_pet_siren_mobpool

    [sql] Correct pet Siren mob pool

commit e00e73e712ea6c07a91b4368c294c7bc7a03dff7
Author: WinterSolstice8 <[email protected]>
Date:   Tue Sep 20 00:35:45 2022 -0700

    [lua] Fix access nil error in canusespell_override.lua

    * Fixes a nil error check in canusespell_override.lua when a job doesn't have spells granted by gifts
    * Remove debug print from canusespell_override.lua

commit e084e1172e16e6f0ad4c773d35fc3a89cd2a9ec5
Author: WinterSolstice8 <[email protected]>
Date:   Mon Sep 19 23:19:10 2022 -0700

    [sql] Correct pet Siren mob pool

commit 58557373f82dad0189f5d826902239d3351e5692
Author: WinterSolstice8 <[email protected]>
Date:   Mon Sep 19 19:02:44 2022 -0700

    [core] [packets] Add nullptr check for player's zone during packet backlog check

commit 3d0acd3863d122587630713ca21b100246fa370f
Merge: fb6f978310 40a6bfd044
Author: claywar <[email protected]>
Date:   Mon Sep 19 17:15:15 2022 -0400

    Merge pull request #2759 from LandSandBoat/gearset-items

    Add missing gear set entries into items.lua

commit 40a6bfd044bf6e26a32ed83c5e7b14bfb93f684d
Author: claywar <[email protected]>
Date:   Mon Sep 19 16:45:30 2022 -0400

    Add missing gear set entries into items.lua

commit 8323c1ab1dc9f8a318e61944bd0c91f833a19de5
Author: TeoTwawki <[email protected]>
Date:   Mon Sep 19 16:40:56 2022 -0400

    Add prompt for OS to bug report template

    This one isn't being strictly required but may help us find platform specific problems, so I thought it was worth at least the PR to add.

commit 7457675d0e9013e4e31a9996888332517cb50ad9
Author: jmcmorris <[email protected]>
Date:   Mon Sep 19 11:11:27 2022 -0700

    Disable clang-format for the lambdas

commit 5b606e024596e34f96dbd7ca5832d488724376bc
Author: jmcmorris <[email protected]>
Date:   Mon Sep 19 11:00:54 2022 -0700

    Fixing lambda formatting

commit fb6f978310c1dd0538f54aca6ae4a54542688283
Merge: 65828b15df fc977783d5
Author: claywar <[email protected]>
Date:   Mon Sep 19 13:51:01 2022 -0400

    Merge pull request #2755 from jmcmorris/trigger_event

    Add ON_TRIGGER Event

commit fc977783d5225d1f51ab21d0b00488e4afd26e61
Author: jmcmorris <[email protected]>
Date:   Mon Sep 19 08:59:13 2022 -0700

    Add a `ON_TRIGGER` event so that scripts can add listeners to when an entity is triggered

commit ffa3a017ac70aed21e6194609c11a037a73e9dd2
Author: jmcmorris <[email protected]>
Date:   Sun Sep 18 21:06:20 2022 -0700

    Whoops, that I did that. Thanks santiy checker!

commit f4f1e7db94629a26906bd12346079e03ecc5333d
Author: jmcmorris <[email protected]>
Date:   Sun Sep 18 21:02:42 2022 -0700

    Santiy change

commit e61a58091c3be14b5919f1c153d5a966aec7c061
Author: jmcmorris <[email protected]>
Date:   Sun Sep 18 20:59:07 2022 -0700

    Use mob names in battlefield groups rather than raw mob ids

commit 61c06ec28c52bdd8a7a6c8058e88e18fc8ab2396
Author: jmcmorris <[email protected]>
Date:   Sun Sep 18 20:58:23 2022 -0700

    Refactor queryEntitiesByName to live inside CZone and use memoization for optimzation.

commit f3464c6016c2e3fd0d2fc9855db96da8befd1b16
Author: jmcmorris <[email protected]>
Date:   Sun Sep 18 18:59:48 2022 -0700

    Fixing header include order for sanity reasons

commit 407ad6107ba4bac95313cb33c66a4cd37c254e37
Author: jmcmorris <[email protected]>
Date:   Sun Sep 18 18:46:07 2022 -0700

    Adding battlefield groups to support logic associated with a group of mobs

commit 65828b15df799ceb500960c6626a4fa7027943cd
Merge: 87e08d168a 7921c28710
Author: claywar <[email protected]>
Date:   Sun Sep 18 16:41:24 2022 -0400

    Merge pull request #2743 from jmcmorris/bcnm_wyvern_pet

    Fix issue with called Wyvern pets not being added to battlefields

commit 7921c2871029f22b823dd12d803a5bb9934d49f1
Author: jmcmorris <[email protected]>
Date:   Sun Sep 18 10:03:02 2022 -0700

    Remove Wyvern check since any existing pets should be added

commit 87e08d168aa254dc7f0257c26cbfa445d1d95ac5
Merge: 01428ecc2f 74f96c72e3
Author: claywar <[email protected]>
Date:   Sun Sep 18 06:44:02 2022 -0400

    Merge pull request #2727 from LandSandBoat/ci_lua_tables

    [ci] Add rules for lua table formatting

commit 01428ecc2fbc89a6c5d141e178a05fafa360d870
Merge: 78f8f36e4c 33e4c93281
Author: claywar <[email protected]>
Date:   Sun Sep 18 06:43:41 2022 -0400

    Merge pull request #2747 from jmcmorris/patrol_fix

    Fix issue with patrol stopping after awhile

commit 33e4c9328109f01ca91180a64c9e8b639bb9ef04
Author: jmcmorris <[email protected]>
Date:   Sat Sep 17 22:34:38 2022 -0700

    Fix issue with patrol stopping after awhile

commit 74f96c72e3e14b1c304ec429cb9fd66cf9684ad9
Author: claywar <[email protected]>
Date:   Sat Sep 17 20:12:30 2022 -0400

    [lua] Format tables from CI - 7

    Fix cruor prospector comments

commit f536f4ede9405197d5747c875b5d47b2fc3e9f38
Author: claywar <[email protected]>
Date:   Sat Sep 17 18:57:08 2022 -0400

    [lua] Format tables from CI - 6

commit 39fa3466732606a03546d5169934c0abecae51ab
Author: claywar <[email protected]>
Date:   Sat Sep 17 15:48:34 2022 -0400

    [lua] Format tables from CI - 5

    Additional tables, fix lua.sh error

commit d552b9d3336271f627db34c122eb0ff4eee5f8b1
Author: claywar <[email protected]>
Date:   Sat Sep 17 14:07:38 2022 -0400

    [lua] Format tables from CI - 4

commit 5d6cf4a5ace00426336532b6150c95cf797dbd56
Author: claywar <[email protected]>
Date:   Sat Sep 17 12:13:15 2022 -0400

    [lua] Format tables from CI - 3

commit ae33fdb3d63876ae0078ad08459371ea7f04e2b1
Author: claywar <[email protected]>
Date:   Sat Sep 17 10:50:57 2022 -0400

    [lua] Format tables from CI - 2

commit d6cce270a3b347ceb9b892cab2198f325286936b
Author: claywar <[email protected]>
Date:   Sat Sep 17 08:28:15 2022 -0400

    [lua] Format tables from CI - 1

commit 7098e33e6b7071e86c088328c4a04aa47fda6f98
Author: claywar <[email protected]>
Date:   Sat Sep 17 07:21:35 2022 -0400

    [lua] Format tables for Bundling NPCs, Seagull Grounded, Lower Jeuno Treasure Chest

commit aade9f5456ca7832401a77eae711f4a23dd2e57c
Author: claywar <[email protected]>
Date:   Sat Sep 17 06:58:10 2022 -0400

    [lua] Format tables for Armoury Crate NPCs

    Round 1

    Safety checkin before rebase

    QuBia, Horlais

    Sacrificial Chamber

    Temenos

    Waughroon Shrine

    Add newlines

commit d4a0f9ace8a73f11f36e3a11ce21f7ed76014723
Author: claywar <[email protected]>
Date:   Fri Sep 16 16:28:48 2022 -0400

    [lua] Format tables for remaining mixin requires

commit 70332202d3ea6fdf109b4332d1f6be3978fca9c9
Author: claywar <[email protected]>
Date:   Fri Sep 16 16:04:26 2022 -0400

    [lua] Format tables for job_special mixin

commit 929b1a2344eb25417c47574b8ba6b04a6bddcbb9
Author: claywar <[email protected]>
Date:   Fri Sep 16 16:02:06 2022 -0400

    [lua] Format tables for spawn_casket mixin, some Temenos mobs

commit 4863472b0f61ea4ded72574352067ffaf32e19be
Author: Zach Toogood <[email protected]>
Date:   Fri Sep 16 17:55:43 2022 +0300

    [ci] Add rules for lua table formatting

commit 78f8f36e4c8beaef97bba8648dda9e5ba137b89d
Merge: e87b5d893c 4f11747205
Author: claywar <[email protected]>
Date:   Sat Sep 17 11:29:51 2022 -0400

    Merge pull request #2740 from jmcmorris/patrol_scripts

    Moved over all npc/mob patrol logic over to the new version

commit dbd4fb41415426d0b16bacce2dbc9bbb8bb3ca80
Author: jmcmorris <[email protected]>
Date:   Sat Sep 17 08:24:07 2022 -0700

    Fix issue with called Wyvern pets not being added to battlefields

commit e87b5d893cfc8d35724b95fdc0a86145081e5b72
Merge: 6d739c7768 9bb2e9d3ec
Author: claywar <[email protected]>
Date:   Sat Sep 17 05:54:25 2022 -0400

    Merge pull request #2738 from GravesXI/added-wool-cuffs-recipe

    added wool cuff recipe

commit 6d739c77683b84115154cbbd6b72381011db04f4
Merge: d3d151ce36 86b852a493
Author: claywar <[email protected]>
Date:   Sat Sep 17 05:54:15 2022 -0400

    Merge pull request #2739 from jmcmorris/bomb_queen

    Add proper Bomb Queen pet spawning mechanics

commit d3d151ce36f1caa415e9d1e803af38d919fad7da
Merge: bf5b70395c 2ecb0628f6
Author: claywar <[email protected]>
Date:   Sat Sep 17 05:53:54 2022 -0400

    Merge pull request #2741 from SirGouki/CureVEnmity

    Changed Cure V enmity to current BGwiki values in core and sql

commit bf5b70395c8f92954d1c33ded02cdd1c3de4713e
Merge: e7da2972b8 6e3fed69d3
Author: claywar <[email protected]>
Date:   Sat Sep 17 05:53:42 2022 -0400

    Merge pull request #2742 from jmcmorris/restful_sleep

    Resolved issue with characters being woken up from /heal

commit 6e3fed69d33f94e0462703339334c7bdbf86fa91
Author: jmcmorris <[email protected]>
Date:   Fri Sep 16 22:08:42 2022 -0700

    Resolved issue with characters being woken up from /heal

commit 4f1174720522d8c7f15d9fbcfe83aa3e456f244d
Author: jmcmorris <[email protected]>
Date:   Fri Sep 16 20:20:48 2022 -0700

    Removing extra newlines for sanity purposes

commit 2ecb0628f6c085d6bad0a95c7fff89d235107cf4
Author: SirGouki <[email protected]>
Date:   Fri Sep 16 22:13:40 2022 -0500

    Changed Cure V enmity to current BGwiki values in core and sql
    See: #814

commit ad42254dbb20e3d8e5ebd8c184bc68930b5edda8
Author: jmcmorris <[email protected]>
Date:   Fri Sep 16 20:10:15 2022 -0700

    Moved over all npc/mob patrol logic over to the new version

commit 86b852a49369d36cbe5df4a785639f835a549566
Author: jmcmorris <[email protected]>
Date:   Fri Sep 16 18:53:01 2022 -0700

    Missed one

commit 5c50905e2c27b5d0b9f64dc5723abbda2f81cfba
Author: jmcmorris <[email protected]>
Date:   Fri Sep 16 18:51:53 2022 -0700

    Incorporating review input

commit f873dca73b0cba17ebaafb4350d8114d316421f7
Author: jmcmorris <[email protected]>
Date:   Fri Sep 16 17:52:11 2022 -0700

    Add proper Bomb Queen pet spawning mechanics

commit 9bb2e9d3ec15eca6f91be9fc7fb43ed9c66ace3b
Author: Grave Taker <[email protected]>
Date:   Fri Sep 16 20:35:00 2022 -0400

    added wool cuff recipe

    added wool cuff recipe and added links from bg wiki and jp wiki

    https://www.bg-wiki.com/ffxi/Wool_Cuffs

    http://wiki.ffo.jp/html/16852.html

commit e7da2972b8313887ada9f7a29312a60a59570da2
Merge: ce1f3b04ca 550fe983ac
Author: claywar <[email protected]>
Date:   Fri Sep 16 19:54:33 2022 -0400

    Merge pull request #2728 from jmcmorris/patrol_rework

    Patrol Rework Proposal

commit ce1f3b04caf8af82c4d30b2ccaee3472af4c2db5
Merge: 5d51fda279 515b668e25
Author: TeoTwawki <[email protected]>
Date:   Fri Sep 16 19:50:40 2022 -0400

    Merge pull request #2736 from N3ckB3ard/base

    [core] Update messageBasic for mobskills

commit 5d51fda2795d9def3ab5cde5e2b6dbc68fce937f
Merge: a6db8126a4 3f7c3d4c64
Author: TeoTwawki <[email protected]>
Date:   Fri Sep 16 19:50:20 2022 -0400

    Merge pull request #2737 from jmcmorris/jeuno_cp_items

    Resolve issue with Jeuno guards not selling CP items

commit 3f7c3d4c64574ddb30738c4ace806415a9fd1683
Author: jmcmorris <[email protected]>
Date:   Fri Sep 16 16:32:07 2022 -0700

    Resolve issue with Jeuno guards not selling CP items

commit 515b668e2525e3f29a9dec7148d78d7c23535ebc
Author: Mi <[email protected]>
Date:   Fri Sep 16 19:10:54 2022 -0400

    [core] Update messageBasic for mobskills

commit 550fe983ac58c88cd06a298996632dac83b7b59e
Author: jmcmorris <[email protected]>
Date:   Fri Sep 16 09:34:29 2022 -0700

    Old habits...

commit 2942d171f0f20f7a87ecdde784f5f4978566fc43
Author: jmcmorris <[email protected]>
Date:   Fri Sep 16 09:20:11 2022 -0700

    Cleanup examples a little

commit f9f6b9e0103f1603b760625b4f44df7da32d5536
Author: jmcmorris <[email protected]>
Date:   Fri Sep 16 09:11:59 2022 -0700

    Examples of new patrol logic

commit bdb6b1b5fbb0f334d56e08e4999efc4b4f44ea13
Author: jmcmorris <[email protected]>
Date:   Wed Sep 14 09:25:56 2022 -0700

    Greatly improve `pathThrough()` for patrolling adding in support for rotating and using previous coords in path. Usage example included.

commit 658e5b2d213622cc62ad04ebda95a35251175572
Author: jmcmorris <[email protected]>
Date:   Wed Sep 14 09:24:55 2022 -0700

    Do not clear npc pathing when being interacted with but still pause it

commit 8c0ff5f7df78c61381e4bf58d111e0a7dc510389
Author: jmcmorris <[email protected]>
Date:   Tue Sep 13 14:11:22 2022 -0700

    Introduce pathpoint_t along with foundation logic for patroling in c++

commit a6db8126a42078af01f49d2de866525c88969e58
Merge: ec67f26d6c 1b9a7a3e4f
Author: claywar <[email protected]>
Date:   Fri Sep 16 05:13:53 2022 -0400

    Merge pull request #2725 from jmcmorris/crafting_exploit_fix

    Crafting Crystal Exploit

commit ec67f26d6c4c994c004c205a2b9cd6c3862afd28
Merge: 2e02cec1b4 abfb2c0a1b
Author: claywar <[email protected]>
Date:   Fri Sep 16 05:13:36 2022 -0400

    Merge pull request #2724 from EpicTaru/HordeLullabyII

    [sql] [lua] Sing Horde Lullaby II to your enemies!

commit 1b9a7a3e4f91f4f273a762829c3f667067f0e20a
Author: jmcmorris <[email protected]>
Date:   Thu Sep 15 22:46:15 2022 -0700

    Crafting Crystal Exploit
        * Fix crafting crystal exploit by validating the provided crystal data in the packet
        * Change craft crystal quantity check to be == 0

commit abfb2c0a1b5c9eadb0790b660870f684d434d055
Author: EpicOne <[email protected]>
Date:   Thu Sep 15 16:23:42 2022 -0500

    Horde Lullaby II corrections
    * Added job/level (BRD 92) to spell_list.sql
    * Corrected base spell duration in horde_lullaby_ii.lua

    Source: BG-Wiki

commit 2e02cec1b4bce72f8359eb53cca3f7baed096267
Merge: e9c773416b d92b789b06
Author: claywar <[email protected]>
Date:   Thu Sep 15 05:29:01 2022 -0400

    Merge pull request #2717 from neuromancerxi/status_effects

    [core] [sql] Update Effect Flags, Comments, Job Change Behavior

commit d92b789b061fbf5c91c16abf26fc9b62613e4e12
Author: NeuromancerXI <[email protected]>
Date:   Wed Sep 14 08:20:25 2022 -0700

    [core] [sql] Update Effect Flags, Comments, Job Change Behavior

    Updates EFFECTFLAG_ comments
    Updates Ability Effect Flags to add `EFFECTFLAG_ON_JOBCHANGE` to relevant effects
    Updates Job Change Packet to also explicitly clear `EFFECTFLAG_ROLL` as there are no negative Corsair Rolls (Bust is not flagged as a roll).

    Changes based on Retail observations (Using Nomad Moogle in Selbina):

    1HR ability effects wears off on job change (Perfect Dodge drops when changing THF -> WAR)
    Corsair rolls wear on job change (Corsair's Roll drops when changing COR -> THF)
    Bard songs wear on job change (elegy not observed/tested)
    Quickening Wears on job change (Use Sprinter's Shoes -> Change Job)
    Meditate has no effect and TP Gain does NOT drop on job change (Use Mediate, Change SAM -> WAR, TP Still increases)

commit e9c773416bfeb790fe0b6a7e3b11442793350f3c
Merge: b563c4c257 9ccae96750
Author: claywar <[email protected]>
Date:   Tue Sep 13 10:34:55 2022 -0400

    Merge pull request #2708 from neuromancerxi/alter_hidden

    Alter Ego Extravaganza - Hide [S] Trust Vendors when campaign inactive

commit b563c4c2579469290577a0a9962d273ec2fb0094
Merge: 0b9a69ef56 47112ebc42
Author: claywar <[email protected]>
Date:   Tue Sep 13 09:10:31 2022 -0400

    Merge pull request #2709 from LandSandBoat/history/September-2022-ID-updates

    [Client update] September 2022

commit 0b9a69ef560f36ba13eb80a5997577fa2fee8b90
Author: Daywhite83 <[email protected]>
Date:   Mon Sep 12 17:44:56 2022 -0400

    [npc] Add Western Adoulin Auction Counter script (#2706)

    * Create Auction_Counter.lua

    Adds auction house to western adoulin

    * Update Auction_Counter.lua

    * Update Auction_Counter.lua

commit b920cbc660624a7fcd428d75131198a2e12fa073
Author: Daywhite83 <[email protected]>
Date:   Mon Sep 12 17:44:47 2022 -0400

    [npc] Add Eastern Adoulin Auction Counter script (#2705)

    * Create Auction_Counter.lua

    Adds auction function to Eastern Adoulin

    * Update Auction_Counter.lua

    * Update Auction_Counter.lua

commit 47112ebc420e21e4c91cb73f5c63b54f251b672a
Author: claywar <[email protected]>
Date:   Mon Sep 12 17:41:16 2022 -0400

    [update] Mob IDs

    KRT IDs.lua updates from mob shift

    Additional KRT updates

commit 9ccae9675075d8a49f4932733e036d258f5d9517
Author: NeuromancerXI <[email protected]>
Date:   Mon Sep 12 13:26:57 2022 -0700

    Alter Ego Extravaganza - Hide [S] Trust Vendors when campaign inactive

    Shadowreign Trust Vendors (Shenni, Shuvo, Shixo) do not spawn when the Summer/NY campaign is inactive. Adds logic to hide NPCs when Summer/NY campaign is inactive.
    Adds logic to hide NPCs when Summer/NY campaign is inactive.

    Source: Retail observations

commit ba9ee4138c92e2ec0f0933e0b4b26e9a63520c46
Author: claywar <[email protected]>
Date:   Mon Sep 12 15:27:03 2022 -0400

    [update] NPC IDs

commit 1fc10d80164fb3060585baf28123a285142d577e
Author: claywar <[email protected]>
Date:   Mon Sep 12 14:45:06 2022 -0400

    [update] Text IDs

    Update Nyzul Formatting

    Additional fix

    Additional nyzul formatting

    New user

    And more

    Nyzul Isle Shifts

commit d11778f62391757973025aef20dda5a1faf1ce1e
Author: claywar <[email protected]>
Date:   Mon Sep 12 06:15:52 2022 -0400

    [update] Add new titles

commit 495eb18165edc1c082eb3542ed666b00e77287f7
Author: claywar <[email protected]>
Date:   Mon Sep 12 06:15:33 2022 -0400

    [update] Version number

commit a13acb961f4685dd0d2a1973600bf3f8ac437c4d
Merge: c1264471e2 593a3ec7f5
Author: claywar <[email protected]>
Date:   Sun Sep 11 14:07:04 2022 -0400

    Merge pull request #2699 from LandSandBoat/bastok-quests-5

    Interaction - Quests: Smoke on the Mountain through Rivals

commit 593a3ec7f5dabaa366b45e680e8303ef80ef95d4
Author: claywar <[email protected]>
Date:   Sun Sep 11 13:46:17 2022 -0400

    Interaction - Quest: Rivals

    Add missing trade returns

commit 8c35e3e542bc278ea5b0fff5b5ad0f950f96d712
Author: claywar <[email protected]>
Date:   Sun Sep 11 09:09:56 2022 -0400

    Interaction - Quest: Fallen Comrades

commit 157a072031803a2ba390b7d8eb83575d1cb8e039
Author: claywar <[email protected]>
Date:   Sun Sep 11 08:50:42 2022 -0400

    Interaction - Quest: Till Death Do Us Part

    Correct syntax

    Remove repeatable status from copy-pasta

commit e7d17d80baf1b14d9932588d5010df0ea79043d9
Author: claywar <[email protected]>
Date:   Sun Sep 11 08:33:03 2022 -0400

    Interaction - Quest: Forever to Hold

commit 847c648581e624bcc7ca8b47d9ecbc5acc9fbc6e
Author: claywar <[email protected]>
Date:   Wed Sep 7 10:27:17 2022 -0400

    Interaction - Quest: Smoke on the Mountain

commit c1264471e215936b9bbed39cec79ae5865d92a2e
Merge: 6ecb3fc0dd 099954d21b
Author: TeoTwawki <[email protected]>
Date:   Sun Sep 11 00:43:08 2022 -0400

    Merge pull request #2698 from TeoTwawki/bcnm

    Restore lost ACP mission checks in bcnm.lua

commit 6ecb3fc0ddd7592c9416f6f4b15044d0bd78c46c
Merge: 79cc15c83a bde83cffaf
Author: claywar <[email protected]>
Date:   Sun Sep 11 00:29:05 2022 -0400

    Merge pull request #2694 from WinterSolstice8/haste_recast_audit

    [core] Audit battleutils::CalculateSpellRecastTime, change Haste spells to wind element

commit 79cc15c83ae53b8c381d5618383961a71416fa59
Merge: d5c923f049 dae5c06d86
Author: claywar <[email protected]>
Date:   Sun Sep 11 00:28:57 2022 -0400

    Merge pull request #2693 from WinterSolstice8/canusespell_jp_integration

    [core] [lua] Add functionality to enable use of job point granted spells

commit d5c923f049d66095ffb989fef802c11e9ba38a18
Merge: 5673b5ce01 35a68ea6e9
Author: TeoTwawki <[email protected]>
Date:   Sat Sep 10 23:49:05 2022 -0400

    Merge pull request #2695 from TeoTwawki/NM

    Fix 'METEORMAULER' (a nil value) error on server startup

commit 099954d21b5a5470f2519609ec039a6d13884f03
Author: TeoTwawki <[email protected]>
Date:   Sat Sep 10 23:08:05 2022 -0400

    Restore lost ACP mission - it's default disabled (commented out) until mob behaviors is complete (Goblin needs teleport+sneak attack mechanic)

commit 35a68ea6e9a270fb57defef1e5a9d5ba46c4e588
Author: TeoTwawki <[email protected]>
Date:   Sat Sep 10 20:24:41 2022 -0400

    Fix 'METEORMAULER' (a nil value) error on server startup by casting mobs ID to a local variable,
    adjust helper spawn rate to 1/3 for consistency with the other beastman lair NMs

commit bde83cffafcd3c74f757e8dddaae90a337caa95f
Author: WinterSolstice8 <[email protected]>
Date:   Sat Sep 10 13:02:53 2022 -0700

    [sql] Adjust Haste/Hastega/Haste II to have Wind element

commit 4acf32b8dcedc461683ade052c0693f5f0b8bd7f
Author: WinterSolstice8 <[email protected]>
Date:   Sat Sep 10 12:14:14 2022 -0700

    [core] Audit battleutils::CalculateSpellRecastTime

    * Add Inspiration FC bonus
    * Adjust FC cap to 40% recast cap like retail
    * Adjust light/dark arts logic
    * Only go over 80% spell reduction cap with SCH AF3 boots bonus with correct weather
    * Standardize percent based reduction calculations

commit 5673b5ce01a0de124015b4fa7d2f2b5dda91f3a5
Merge: d898596d86 d1c51fca2c
Author: claywar <[email protected]>
Date:   Sat Sep 10 05:34:42 2022 -0400

    Merge pull request #2692 from N3ckB3ard/base

    Interaction - Quests: TOAU Olduum fix

commit dae5c06d8682a5bd052ea1edd8faadf4dffc90a7
Author: WinterSolstice8 <[email protected]>
Date:   Fri Sep 9 20:44:14 2022 -0700

    [sql] Update job point gift granted spells in database

    * Change various job point gift only spells to have a zeroed level requirement to disable casting without job points
    * Disable Endark II/Enlight II as they have no script

commit f315c6f8267d3331b58379d29526283fac60b59f
Author: WinterSolstice8 <[email protected]>
Date:   Fri Sep 9 20:38:22 2022 -0700

    [core] [lua] Add hook to override canUseSpell with new lua

    * This will enable job point gifts of spells such as Temper II to be used when implemented
    * Update a warning message to be less cryptic about what's happening on luautils::onMagicCastingCheck

commit 6e043cf2c33c7ee73259339fdd6ac5cead231e94
Author: WinterSolstice8 <[email protected]>
Date:   Fri Sep 9 20:36:17 2022 -0700

    [core] add getSpentJobPoints binding

commit d1c51fca2ce13e4d1d8814e36e312d0bc750244c
Author: Mi <[email protected]>
Date:   Fri Sep 9 23:33:16 2022 -0400

    Fix Olduum Quest

    Corrects broken Quest Olduum in TOAU

commit d898596d8615ec8f037b89ea914356699837c00e
Author: Abdiah <[email protected]>
Date:   Fri Sep 9 13:15:04 2022 -0700

    Hostile herbivores (#2378)

    * Knock Back fix

    Basis and evidence are based off the following:
    https://www.youtube.com/watch?v=2q93do8wQKQ&ab_channel=WiggoCaptures
    https://drive.google.com/open?id=1lAiUP1bGNvEBVpIFZFshmzjonNK89Cvv

    Changes:
    - Added a unique sheep charge ability for the fighting sheep that has no prepare time as seen in the video.
    - Sheep given a 3000 regain so that they only use sheep charge as seen in the video
    - Knockback was added to the attack

    * Update sheep_charge_hostile_herbivore.lua

    Reverted damage of sheep charge to default value

    * Update Fighting_Sheep.lua

    Added sheep charge as an auto attack rather than giving the mob regain to use the ability.

    Co-Authored-By: CriticalXI <[email protected]>

    * Sheep Song addition

    Added sheep song to Fighting Sheep's skill list

    * TP fix for fighting sheep

    Co-Authored-By: CriticalXI <[email protected]>

    Changes:
    - Fetches sheep's TP before using a skill, and gives it back if the skill being used is their auto attack skill. This allows the sheep to use other mob skills.

    * Mob Skill fix

    Changed the check from mob skill list to just mob skill.

    * Fighting sheep skill list

    fixed:
    - Fixed proper ID for sheep song

    Changes:
    - Added rage to skill list as it was witnessed in the capture linked in PR

    * Knock Back fix

    Basis and evidence are based off the following:
    https://www.youtube.com/watch?v=2q93do8wQKQ&ab_channel=WiggoCaptures
    https://drive.google.com/open?id=1lAiUP1bGNvEBVpIFZFshmzjonNK89Cvv

    Changes:
    - Added a unique sheep charge ability for the fighting sheep that has no prepare time as seen in the video.
    - Sheep given a 3000 regain so that they only use sheep charge as seen in the video
    - Knockback was added to the attack

    * Update sheep_charge_hostile_herbivore.lua

    Reverted damage of sheep charge to default value

    * Rename special sheep melee skill, remove outdated comment from normal sheep charge

    * Removed scripted TP handling from fighting sheep, the flag covers this currently

    Co-authored-by: CriticalXI <[email protected]>
    Co-authored-by: TeoTwawki <[email protected]>

commit 3141c705c030eba68ff74b30f8dcf8031da832cb
Merge: 01b3f0df0e f50157b3bc
Author: claywar <[email protected]>
Date:   Fri Sep 9 16:14:25 2022 -0400

    Merge pull request #2690 from neuromancerxi/base

    Gerwitz's Soul - Update Drops

commit f50157b3bceb3fce55b5f2101cbcb388b07c5ae5
Author: NeuromancerXI <[email protected]>
Date:   Fri Sep 9 07:54:01 2022 -0700

    Gerwitz's Soul - Update Drops

    Removes drops from Gerwitz's Soul and removes comment in droplist.

commit 01b3f0df0e1ee8028005064c929483d83baa9a36
Merge: e7ce89383f 8449169968
Author: claywar <[email protected]>
Date:   Fri Sep 9 05:01:55 2022 -0400

    Merge pull request #2688 from LandSandBoat/assault-global-rename

    [lua] Rename xi.assaultUtil to xi.assault

commit 8449169968de8a134245a5453acaba1dfbaa1f35
Author: claywar <[email protected]>
Date:   Fri Sep 9 04:35:51 2022 -0400

    [lua] Rename xi.assaultUtil to xi.assault

commit e7ce89383fa3c8796dc286f2d19fd03466488ecf
Merge: 36c60fe1fb 00249cb6d1
Author: Zach Toogood <[email protected]>
Date:   Fri Sep 9 09:49:52 2022 +0300

    Merge pull request #2687 from LandSandBoat/dbtool_migration_ordering

    Ensure migrations are always run in order

commit 00249cb6d1dde7cb89b4f5169060ed157d79c238
Author: Zach Toogood <[email protected]>
Date:   Fri Sep 9 09:20:09 2022 +0300

    Ensure migrations are always run in order

    Co-authored-by: Corey <[email protected]>

commit 36c60fe1fbb8975751a24321cf386c0590bddd26
Merge: 16da1261f6 a3997625e0
Author: claywar <[email protected]>
Date:   Thu Sep 8 18:54:31 2022 -0400

    Merge pull request #2685 from LandSandBoat/nyzul-import-final

    [nyzul] Implement remaining changes from initial PR

commit a3997625e05b4c571948b0e4b009adfed77b9ae4
Author: claywar <[email protected]>
Date:   Thu Sep 8 18:21:38 2022 -0400

    [nyzul] Implement remaining changes from initial PR

    Global ref

    EOF newline

commit 16da1261f635c7f0681dfc7112bcc88972a20628
Merge: d1c7d4fde8 733020d4cf
Author: claywar <[email protected]>
Date:   Thu Sep 8 15:29:36 2022 -0400

    Merge pull request #2684 from LandSandBoat/nyzul-zone

    [nyzul] Zone global, instance, and NPC scripts

commit 733020d4cfe1b0ecea9b0b8168633bd70bff43b4
Author: claywar <[email protected]>
Date:   Thu Sep 8 15:07:40 2022 -0400

    [nyzul] Import NPC scripts

    tabs

    Remove deprecated requires

    Remove buildNpcTable ref in conquest.lua

commit 3825009c781ce4c7c1a2194308491b37c12441f0
Author: claywar <[email protected]>
Date:   Thu Sep 8 14:19:33 2022 -0400

    [nyzul] Import instance script and zone global

    Co-authored-by: David Norris <[email protected]>
    Co-authored-by: InoUno <[email protected]>
    Co-authored-by: 59blargedy <[email protected]>
    Co-authored-by: Wiggo32 <[email protected]>
    Co-authored-by: zach2good <[email protected]>
    Co-authored-by: Xaver-DaRed <[email protected]>

commit d1c7d4fde852dccbc621a3bb899bff289739dd7f
Merge: b0bfde986c 063f85c799
Author: claywar <[email protected]>
Date:   Thu Sep 8 13:17:37 2022 -0400

    Merge pull request #2683 from LandSandBoat/nyzul-mobs

    [nyzul] Import mob scripts from #1478

commit 063f85c799bf6ac978b6aee62d43f50d9a313f51
Author: claywar <[email protected]>
Date:   Thu Sep 8 13:00:40 2022 -0400

    [nyzul] Add missing mixins

    Multiple newlines

commit 80fce2f271a13346a796fb615eed60308a8a4a3d
Author: claywar <[email protected]>
Date:   Thu Sep 8 12:37:44 2022 -0400

    [nyzul] Add mob scripts T~Z

    Address CI

    More CI

commit b7b1165dcda6d7a37ed1e0375e8ce4aa4a9b4306
Author: claywar <[email protected]>
Date:   Thu Sep 8 12:20:12 2022 -0400

    [nyzul] Add mob scripts Q~S

commit b32f8006d3b234fc31fa6ab36b9c28308f4eb59e
Author: claywar <[email protected]>
Date:   Thu Sep 8 12:08:28 2022 -0400

    [nyzul] Add mob scripts M~P

commit 6f4387321a5ddfba45befbfc890edd63d286bdf1
Author: claywar <[email protected]>
Date:   Thu Sep 8 11:55:33 2022 -0400

    [nyzul] Add mob scripts G~L

commit c24bf05c153a1dd37b78014491631310ca49262c
Author: claywar <[email protected]>
Date:   Thu Sep 8 11:45:08 2022 -0400

    [nyzul] Add mob scripts C~F

commit b0bfde986c89e6813e893f97b1d87279b4ff3895
Merge: 470625e071 1e4785d1d9
Author: Zach Toogood <[email protected]>
Date:   Thu Sep 8 18:41:29 2022 +0300

    Merge pull request #2681 from LandSandBoat/garrison_part_3

    Hook up level restriction and targeting for Garrison (part 3)

commit e7a84ea5231b50ddd70982fd4f924c6fa0caae0a
Author: claywar <[email protected]>
Date:   Thu Sep 8 11:30:09 2022 -0400

    [nyzul] Add mob scripts A~B

    Co-authored-by: David Norris <[email protected]>
    Co-authored-by: InoUno <[email protected]>
    Co-authored-by: 59blargedy <[email protected]>
    Co-authored-by: Wiggo32 <[email protected]>
    Co-authored-by: zach2good <[email protected]>
    Co-authored-by: Xaver-DaRed <[email protected]>

commit 470625e07140281b07625c1cae6fb3ea4e7d218f
Merge: d4251b2cac c6b6d3ae50
Author: claywar <[email protected]>
Date:   Thu Sep 8 10:59:49 2022 -0400

    Merge pull request #2680 from LandSandBoat/nyzul-global

    Import Nyzul global from #1478

commit d4251b2cac4da41a861b07e4ea38025df321f9d9
Merge: e2f50d18a3 b332ade23a
Author: claywar <[email protected]>
Date:   Thu Sep 8 10:42:20 2022 -0400

    Merge pull request #2682 from Xaver-DaRed/Nyzul_IDs

    [Nyzul] Add IDs from nyzul branch

commit c6b6d3ae507992ca3e2ef54b6f40bccc09eadda6
Author: claywar <[email protected]>
Date:   Thu Sep 8 10:39:46 2022 -0400

    [appraisal] Rename appraisalUtil global to appraisal

    Fix xi.appraisal definition

commit b332ade23adda15a6a4f5680780803656c738bfd
Author: Xaver-DaRed <[email protected]>
Date:   Thu Sep 8 16:20:08 2022 +0200

    Add Nyzul IDs from nyzul branch

commit 1e4785d1d98f7ed77ea84fdb42365f8c681c871d
Author: Zach Toogood <[email protected]>
Date:   Thu Sep 8 14:42:49 2022 +0300

    Hook up level restriction and targetting for Garrison

commit ef35b1cb35a398cfa1f717e9dce9b61854479f55
Author: claywar <[email protected]>
Date:   Thu Sep 8 09:11:55 2022 -0400

    [lua] Import Nyzul global

    Co-authored-by: David Norris <[email protected]>
    Co-authored-by: InoUno <[email protected]>
    Co-authored-by: 59blargedy <[email protected]>
    Co-authored-by: Wiggo32 <[email protected]>
    Co-authored-by: zach2good <[email protected]>
    Co-authored-by: Xaver-DaRed <[email protected]>
    Correct renamed variable reference

commit a24487d1700c32373f6b71d402c8ad4ca8a01b75
Author: claywar <[email protected]>
Date:   Thu Sep 8 09:07:34 2022 -0400

    [lua] rename appraisalUtil.Origin table to appraisalUtil.origin

commit e2f50d18a32a92e8f9b791f93a7981d24ef1a521
Merge: dec4043fc5 a4504d9560
Author: claywar <[email protected]>
Date:   Thu Sep 8 08:24:05 2022 -0400

    Merge pull request #2679 from LandSandBoat/nyzul-items-global

    [nyzul] Add items to global, implement Instance setTimeLimit

commit a4504d9560911d8bc67aa8425cb081bb24ccdc70
Author: claywar <[email protected]>
Date:   Thu Sep 8 07:57:01 2022 -0400

    [nyzul] Add items to global, implement Instance setTimeLimit

    Thanks Eden!

    Co-authored-by: David Norris <[email protected]>
    Co-authored-by: InoUno <[email protected]>
    Co-authored-by: 59blargedy <[email protected]>
    Co-authored-by: Wiggo32 <[email protected]>
    Co-authored-by: zach2good <[email protected]>

commit dec4043fc5861824ad42558ac99dca2c4895b728
Merge: 92474dc848 8d1fe7b6f0
Author: claywar <[email protected]>
Date:   Thu Sep 8 05:56:25 2022 -0400

    Merge pull request #2173 from rebirthxi/pr/fix-faust-wandering-mechanics

    Faust wandering and only facing North and East

commit 92474dc8484b41e35f2ea265fe4784b956a59a9f
Merge: 47f62937b9 82e90bbed1
Author: claywar <[email protected]>
Date:   Thu Sep 8 05:56:01 2022 -0400

    Merge pull request #2224 from CriticalXI/kolshushu_audit

    Kolshushu Region NM Audit

commit 47f62937b94c4ae8068584deb23ba0f869ccef4d
Merge: 5245f4b715 e07d43d3ed
Author: claywar <[email protected]>
Date:   Thu Sep 8 05:55:03 2022 -0400

    Merge pull request #2662 from oldmaneraffxi/lizard-pools

    Lizard pools

commit 5245f4b7150ca9393cf81a9347e3cfc2d28cbd81
Author: austinclprojects <[email protected]>
Date:   Thu Sep 8 04:16:24 2022 -0500

    Correct DRG AF NM Sturmtiger level to 52 (#2676)

    Co-authored-by: oldmaneraffxi <[email protected]>

commit 68de8715094422c2911c361c849d9299b7832b24
Merge: 8939c42ecc 3092060609
Author: Zach Toogood <[email protected]>
Date:   Thu Sep 8 12:09:49 2022 +0300

    Merge pull request #2678 from LandSandBoat/order_dbtool_migrations

    Add ordering numbers to dbtool migrations

commit 30920606093a940841caa2b0d7e24df5660857e8
Author: Zach Toogood <[email protected]>
Date:   Thu Sep 8 10:25:39 2022 +0300

    Add ordering numbers to dbtool migrations

commit 8939c42ecc8a250a8e4358b60186ce61fe9f20b9
Merge: edde6cdc05 ab795ae3bb
Author: Zach Toogood <[email protected]>
Date:   Wed Sep 7 21:00:18 2022 +0300

    Merge pull request #2675 from LandSandBoat/garrison_part_2

    Start porting outdated Garrison impl (part 2)

commit ab795ae3bb8a98f7597b5e7683c6bac567ed8f12
Author: Zach Toogood <[email protected]>
Date:   Wed Sep 7 20:31:50 2022 +0300

    Add initial data entries for Garrison impl

    Co-Authored-By: RunAwayDSP <[email protected]>

commit edde6cdc05c7804f4d9252e9a65139086becb1cb
Merge: 249a769b7f 400e6b910a
Author: Zach Toogood <[email protected]>
Date:   Wed Sep 7 20:12:05 2022 +0300

    Merge pull request #2673 from LandSandBoat/garrison_part_1

    Start porting outdated Garrison impl (part 1)

commit 400e6b910adf21f6ba258cddfa4964a2efe051f0
Author: Zach Toogood <[email protected]>
Date:   Wed Sep 7 19:52:24 2022 +0300

    Add empty global stubs for Garrison impl

    Co-Authored-By: RunAwayDSP <[email protected]>

commit 59ee718bac47c7daa5a363e2f53276d5e639ebbe
Author: Zach Toogood <[email protected]>
Date:   Wed Sep 7 19:52:06 2022 +0300

    Add new items for Garrison impl

    Co-Authored-By: RunAwayDSP <[email protected]>

commit f96e8452f7bf87512c0fb258bf1f4e9dcedf6ad2
Author: Zach Toogood <[email protected]>
Date:   Wed Sep 7 19:51:54 2022 +0300

    Add text IDs for Garrison impl

    Co-Authored-By: RunAwayDSP <[email protected]>

commit b392659b4495a4764222af44fefe48cbae90484d
Author: Zach Toogood <[email protected]>
Date:   Wed Sep 7 19:51:41 2022 +0300

    Add settings for Garrison impl

    Co-Authored-By: RunAwayDSP <[email protected]>

commit 249a769b7f63022766684b1ffd7f6e39d6908fca
Merge: 643f31a6a5 bb96100730
Author: claywar <[email protected]>
Date:   Wed Sep 7 12:09:55 2022 -0400

    Merge pull request #2607 from EpicTaru/AuditGroup834Drops

    [sql] Drop Group 834 Audit

commit 643f31a6a5dc141f45f9746589fdaf197c9c85b6
Author: Schaedelschaden <[email protected]>
Date:   Wed Sep 7 09:43:15 2022 -0600

    [LUA] Create job_utils/thief, migrate JA functionality, and add Larceny (#2585)

    * [LUA] Create job_utils/thief, migrate JA functionality, and add Larceny functionality

    * Remove trailing whitespace

    * Remove outer parenthesis from if functions

    * Create onSteal handling, action getParam, and set up Quadav Stew mobs

    * Apply style guide to if statements

commit cbf5a367dff3e284762399343604bc8b2ae606d2
Merge: 8ce59f6ac5 df1dad447e
Author: claywar <[email protected]>
Date:   Wed Sep 7 09:34:03 2022 -0400

    Merge pull request #2671 from LandSandBoat/bastok-quests-4

    Interaction - Quests: Breaking Stones through The Elvaan Goldsmith

commit df1dad447e420ad74a9ffac05e1d7c540cbed6c1
Author: claywar <[email protected]>
Date:   Wed Sep 7 09:15:11 2022 -0400

    Interaction - Quest: The Elvaan Goldsmith

    Fix incorrect event parameter in Gourmet

commit 8ce59f6ac58f3fa6ce7536c19fea114fb66a52ec
Merge: e28974f9c7 f2766279c4
Author: claywar <[email protected]>
Date:   Wed Sep 7 09:07:27 2022 -0400

    Merge pull request #2667 from DiscipleOfEris/bugfix-scholar-levelsync-infinite-strategems

    Fix level sync'd Scholar with infinite strategems

commit e28974f9c745174235d2b2e8683486b9d91d91e1
Author: SirGouki <[email protected]>
Date:   Wed Sep 7 08:04:08 2022 -0500

    Added Kam'lanaut's Shield into item_equipment.sql and item_mods.sql (#2670)

    * Added Kam'lanaut's Shield into item_equipment.sql and item_mods.sql
    Shield size obtained from https://www.bg-wiki.com/ffxi/Kam%27lanaut%27s_Shield
    ModelID obtained using a custom GM command to change model ids in game.

    * Fixed typo in item_mods.sql and ID for kam'lanaut's shield in item_equipment.sql

commit 14dc174be842cc1107e0f2aeb997695701947b03
Author: claywar <[email protected]>
Date:   Wed Sep 7 08:15:34 2022 -0400

    Interaction - Quest: Gourmet

commit 7c4ec47fc0d103e02bc9d4620e3853b35a20e4f2
Author: claywar <[email protected]>
Date:   Wed Sep 7 06:59:01 2022 -0400

    Interaction - Quest: The Cold Light of Day

commit d1dbcdc64d0b7ca682f6c5cc8a620a6d7732eaeb
Author: claywar <[email protected]>
Date:   Wed Sep 7 06:38:21 2022 -0400

    Interaction - Quest: Breaking Stones

    Add comment to quests global

commit 5ae39b4da77b65bc818d8e569bd9a308f4c02439
Merge: 7579715b1f ea6f99a9c2
Author: claywar <[email protected]>
Date:   Wed Sep 7 05:28:33 2022 -0400

    Merge pull request #2669 from LandSandBoat/bastok-quests-3

    Interaction - Quests: The Quadav's Curse through A Foreman's Best Friend

commit ea6f99a9c2fb964adfd741d9e383415c7bf71a70
Author: claywar <[email protected]>
Date:   Tue Sep 6 17:00:00 2022 -0400

    Interaction - Quest: A Foreman's Best Friend

commit 679cef70519370bc43b498e3e07d1803dceb70fb
Author: claywar <[email protected]>
Date:   Tue Sep 6 16:34:15 2022 -0400

    Interaction - Quest: Shady Business

commit 6305c314ba1a74307ae945167f9a9a5121a26b9d
Author: claywar <[email protected]>
Date:   Tue Sep 6 15:45:29 2022 -0400

    Interaction - Quest: The Eleventh's Hour

commit ac0409982b05d8bd122e2f0a8f80e27ebd4f2a17
Author: claywar <[email protected]>
Date:   Tue Sep 6 15:00:55 2022 -0400

    Interaction - Quest: Hearts of Mythril

    Correct quest title comment

commit a4470e264a6dfb2bcafdbe6a17221045841fc8f4
Author: claywar <[email protected]>
Date:   Tue Sep 6 14:08:23 2022 -0400

    Interaction - Quest: Out of One's Shell

commit f2766279c46b7d79e62dfe66824fc62418da1703
Author: DiscipleOfEris <[email protected]>
Date:   Tue Sep 6 10:40:09 2022 -0700

    Fix level sync'd Scholar with infinite strategems

commit b91172b84c84ad3f940b8439319368777a1b990d
Author: claywar <[email protected]>
Date:   Tue Sep 6 13:26:39 2022 -0400

    Interaction - Quest: The Quadav's Curse

commit 7579715b1fed259ca2e4cb7108141771835fd03b
Merge: 5604b770f8 01b74e2e4b
Author: claywar <[email protected]>
Date:   Tue Sep 6 12:32:11 2022 -0400

    Merge pull request #2665 from LandSandBoat/bastok-quests-2

    Interaction - Quests: Welcome to Bastok, Guest of Hauteur

commit 01b74e2e4b33a57fb5a83dcfb75f188e04acb3c9
Author: claywar <[email protected]>
Date:   Tue Sep 6 08:58:11 2022 -0400

    Interaction - Quest: Guest of Hauteur

commit c35ce87251b0f92886f6aa0fd0524d6dc0a095b4
Author: claywar <[email protected]>
Date:   Tue Sep 6 08:53:07 2022 -0400

    Interaction - Quest: Welcome to Bastok

    Remove unnecessary comment

commit 5604b770f8f64a6392f5d1d2ab6c38592508e6fa
Author: austinclprojects <[email protected]>
Date:   Tue Sep 6 06:35:01 2022 -0500

    Despawn pets if Player dies. (#2663)

    Co-authored-by: oldmaneraffxi <[email protected]>

commit e07d43d3edb4c72ad764c7a81c8fa9ba5a1f927e
Merge: dc078c8606 0aabdea4a3
Author: austinclprojects <[email protected]>
Date:   Mon Sep 5 20:04:27 2022 -0500

    Merge branch 'LandSandBoat:base' into lizard-pools

commit dc078c860633da3f4c41e6c6d66f0a3baa98a135
Author: oldmaneraffxi <[email protected]>
Date:   Mon Sep 5 21:01:17 2022 -0400

    Update labyrinth lizard pools to have right skills and resistances.

commit 0aabdea4a3ca9bfb68136e9c6f54dc3ade3cd364
Merge: aa37106bfa 144750ce93
Author: claywar <[email protected]>
Date:   Mon Sep 5 18:54:33 2022 -0400

    Merge pull request #2660 from WinterSolstice8/bcnm_trust_count_enforcement

    [lua] [core] [trusts] Enforce battlefield max player count for trusts

commit aa37106bfaf5c36a5204a4aa49b6d5b0157dd79b
Merge: 909e1ea476 f0ee067314
Author: claywar <[email protected]>
Date:   Mon Sep 5 18:54:18 2022 -0400

    Merge pull request #2658 from neuromancerxi/facility_fix

    [SQL] Facility Ring Typo Fix

commit 909e1ea4762dcf25e0b53fbaa4bd7de359fa8e3b
Merge: d5a4f6e30e 394ac4f9ec
Author: claywar <[email protected]>
Date:   Mon Sep 5 18:54:01 2022 -0400

    Merge pull request #2661 from neuromancerxi/expert_craft_proper_dialog

    Update Crafting Expert quests to leverage CSynthSuggestionListPacket

commit 394ac4f9ec470920e8695d950927ba370809ef60
Author: NeuromancerXI <[email protected]>
Date:   Mon Sep 5 13:34:20 2022 -0700

    Update Crafting Expert quests to leverage CSynthSuggestionListPacket

    Updates Guild Leader scripts to provide proper Expert Quest dialog.
    Updates expertQuestStatus values in two Guild Leader scripts.

commit 144750ce93463b56a070be44ce51b026c4dc54cf
Author: WinterSolstice8 <[email protected]>
Date:   Mon Sep 5 12:19:42 2022 -0700

    [lua] [core] [trusts] Enforce battlefield max player count for trusts

commit f0ee0673142f42bae8a41cb43c4ffd2fa4b72a17
Author: NeuromancerXI <[email protected]>
Date:   Mon Sep 5 12:18:05 2022 -0700

    [SQL] Facility Ring Typo Fix

    Corrects charge count from 1 to 3.

commit d5a4f6e30e4ad24156b5721dbf224a4b432d36ec
Merge: 2bc63f2af9 a71ca25571
Author: claywar <[email protected]>
Date:   Mon Sep 5 14:38:47 2022 -0400

    Merge pull request #2657 from SirGouki/base

    Fixes Chocobo Jig II not targeting party members, but targeting user and trusts

commit a71ca255714ddd2ee72861bd3eed1dc79cf0b464
Author: SirGouki <[email protected]>
Date:   Mon Sep 5 13:05:30 2022 -0500

    Fixes Chocobo Jig II not targeting party members, but targeting user and trusts

commit 2bc63f2af99ecb2cc210488d273b9534c3e02110
Merge: ecd63dfbfb 7ab5256e9a
Author: claywar <[email protected]>
Date:   Mon Sep 5 13:47:38 2022 -0400

    Merge pull request #2655 from LandSandBoat/bastok-markets-refresh

    [lua] Add additional Default Actions to Bastok Markets, convert quests

commit 7ab5256e9a431776ebb494c1bbd06b67b1575607
Author: claywar <[email protected]>
Date:   Mon Sep 5 13:23:09 2022 -0400

    [core] Remove shadowed found variable

commit 5d991cc30d521d61c49c2e81c54ed3577c3674ec
Author: claywar <[email protected]>
Date:   Mon Sep 5 12:15:42 2022 -0400

    Interaction - Quest: Lure of the Wildcat (Bastok)

    Initial blocking for most NPCs

    Complete quest refactor

    Update quests.lua comments

commit ecd63dfbfbd56a1425ba3256ee0dd00372cf7629
Merge: 020bfa28ed 7b46062977
Author: claywar <[email protected]>
Date:   Mon Sep 5 12:06:51 2022 -0400

    Merge pull request #1053 from LandSandBoat/zach2good_bcnm_lvl_sync

    Check for level sync before allowing BCNM entry

commit 43a3b381dc7e3e9d0712b143d2e18bac678ed1da
Author: claywar <[email protected]>
Date:   Mon Sep 5 10:32:07 2022 -0400

    Interaction - Quest: A Flash in the Pan

commit a9c0847b9c3c0318e1ae2b081509cbee3fce95b6
Author: claywar <[email protected]>
Date:   Mon Sep 5 10:14:43 2022 -0400

    Interaction - Quest: The Curse Collector

commit ca63fd585bc85c78fe98d47c6d03a6a8696f0f24
Author: claywar <[email protected]>
Date:   Mon Sep 5 09:46:14 2022 -0400

    [lua] Bastok Markets - Default Actions and minor cleanup

commit 020bfa28edc8599acfaef4ce1a691bb1f204674b
Merge: 499a18db15 01ff95787b
Author: claywar <[email protected]>
Date:   Mon Sep 5 07:31:56 2022 -0400

    Merge pull request #2641 from neuromancerxi/vunkerl

    Update Robber Crab / Stygian Pugil in Vunkerl Inlet [S] to non-aggressive

commit 499a18db15748d4cf0764aac97b73c27bf9b207f
Merge: d1571920ae 963bc923f7
Author: claywar <[email protected]>
Date:   Mon Sep 5 07:31:42 2022 -0400

    Merge pull request #2649 from LandSandBoat/synth-suggestions

    [core] Implement CSynthSuggestionListPacket

commit 963bc923f7fbc7dce40cbe0a364a7344ecbb719d
Author: claywar <[email protected]>
Date:   Sun Sep 4 19:51:25 2022 -0400

    [lua] Add wrapper for craft skill level

    Fix wrapper arg

commit f92c9f078af0c8ddeca26092c27f306b4e84f889
Author: claywar <[email protected]>
Date:   Sun Sep 4 09:44:11 2022 -0400

    [core] Implement CSynthSuggestionListPacket

commit d1571920aefa5b18f6e0f44cc4982a4d577551fe
Merge: cab776dce8 f690e59906
Author: claywar <[email protected]>
Date:   Sun Sep 4 04:37:42 2022 -0400

    Merge pull request #2647 from JamesMcMinn/base

    Fix "/heal on" command so that it does not stop healing

commit f690e59906f8dc6b57785c26455eb3d71ade6adc
Author: James McMinn <[email protected]>
Date:   Sun Sep 4 02:21:26 2022 +0100

    Fix "/heal on" command so that it does not stop healing

commit cab776dce8292e059c099342d1dfac24cf455989
Author: HaxPrime <[email protected]>
Date:   Sat Sep 3 10:26:23 2022 -0500

    [LUA] Update ID Shift to DYNAMIC_LOOKUP in Bhaflau Thickets (#2614)

    * [LUA] Update ID Shift to DYNAMIC_LOOKUP in Bhaflau Thickets

    A recent retail update in Bhaflau Thickets shifted the ID's of two ZNM ID's. Setting these ID's to DYNAMIC_LOOKUP will help correct this shift. I used #2351 as a reference for my update.
    https://github.com/LandSandBoat/server/pull/2351

    * complete requested changes

    Added additional require per request. Tested and functions correctly.

    * Corrected changes to satisfy change request

    Corrected changes to satisfy change request. Tested and functions correctly.

commit c5a2a148b11efdcd5a0bef5b2d0c524b526bd2e7
Merge: 80a759e1a7 19036d153a
Author: claywar <[email protected]>
Date:   Sat Sep 3 10:41:39 2022 -0400

    Merge pull request #2646 from LandSandBoat/sql/family-mods

    [sql] Add comments to mob_pool_mods and mob_family_mods

commit 19036d153a75dc14614a32f7cdff72223b387f75
Author: claywar <[email protected]>
Date:   Sat Sep 3 09:08:35 2022 -0400

    [sql] Add comments to mob_pool_mods table

commit c86663d42905a4afccdcf53483eba50a05c786fe
Author: claywar <[email protected]>
Date:   Sat Sep 3 08:59:26 2022 -0400

    [sql] Add comments to mob_family_mods table

commit 7b4606297749953812dbee3ec39287e5ae8f7dfb
Author: WinterSolstice8 <[email protected]>
Date:   Fri Sep 2 20:23:08 2022 -0700

    [lua] [zones] Add UNITY_WANTED_BATTLE_INTERACT message id to applicable zones

commit e25f4fe776de04c2099d6e67eacad23459439b31
Author: WinterSolstice8 <[email protected]>
Date:   Fri Sep 2 20:17:43 2022 -0700

    [lua] [zones] Add MEMBERS_LEVELS_ARE_RESTRICTED message id to all zones

commit 088ceb13413aedcdc2e4908b2f703d1aad0c6f93
Author: WinterSolstice8 <[email protected]>
Date:   Sat Aug 27 01:13:52 2022 -0700

    [lua] Reject parties who interact with or trade to BCNMs with level sync active.

commit d202ffd297f9406b5a62801c6028dc380e46d063
Author: Zach Toogood <[email protected]>
Date:   Tue Nov 30 10:12:05 2021 +0200

    [lua] Check for level sync before allowing BCNM entry

commit 01ff95787b9accc80a352eac0339fcc9fb936c88
Author: NeuromancerXI <[email protected]>
Date:   Fri Sep 2 11:34:08 2022 -0700

    Update Robber Crab / Sygian Pugil in Vunker Inlet [S] to non-aggressive

    Create Pool for Robber_Crab_past, flag as aggressive 0
    Update Robber Crab in Vunkerl Inlet [S] to use new pool
    Update Stygian_Pugil_past as linking, non-aggressive

    Obtained retail confirmation that Incredibly Easy Prey Stygian Pugil did not agro in Vunkerl [S]

commit 80a759e1a79e0919676d11b2a91420cbd7f27628
Merge: 1ab417881c 5a4e9987c7
Author: claywar <[email protected]>
Date:   Fri Sep 2 07:50:55 2022 -0400

    Merge pull request #2625 from CriticalXI/sql_fixes_lsb

    Correcting IDs in mob_skill_lists.sql

commit 1ab417881c4dc5db9447110d2c0703c905ac5f0b
Merge: 1ccbe7db87 c8c4dad17a
Author: claywar <[email protected]>
Date:   Fri Sep 2 07:49:24 2022 -0400

    Merge pull request #2637 from GravesXI/add-recipe-brass-jadagna

    added recipe for Brass Jadagna

commit 1ccbe7db877c2d8183f559dded7a4a14e0ff311a
Merge: 69ca2148c8 0cee6fb35c
Author: claywar <[email protected]>
Date:   Fri Sep 2 07:49:07 2022 -0400

    Merge pull request #2638 from GravesXI/Trust]-Cherukiki-quest-fix

    [Trust] Cherukiki quest fix

commit 0cee6fb35c4d464391680d2f1ae0965df8e84245
Author: Grave Taker <[email protected]>
Date:   Thu Sep 1 15:48:10 2022 -0400

    [Trust] Cherukiki quest fix

    fixing where you have to pass the fight to receive her to anywhere pass the fight, we was having issues where people would have status 4 or higher from doing CS and couldn't get it

commit c8c4dad17a18e336807d04cf8efaa92c92cac7a8
Author: Grave Taker <[email protected]>
Date:   Thu Sep 1 15:25:54 2022 -0400

    added recipe for Brass Jadagna

    added recipe for Brass Jadagna used BG wiki and jp wiki as guides

commit 69ca2148c81516ac689e9d24793845cf76a1e830
Merge: d453add782 33013a5a18
Author: claywar <[email protected]>
Date:   Thu Sep 1 12:39:05 2022 -0400

    Merge pull request #2632 from LandSandBoat/sql/mob-spawn-mods-comments

    [sql] Add formatting and comments to mob_spawn_mods table

commit d453add782de6725c7ccf2253432ecfe8c93587a
Author: neuromancerxi <[email protected]>
Date:   Thu Sep 1 09:26:05 2022 -0700

    [Job Point Gifts] Corrections and Placeholder MOD IDs (#2618)

    * JP Gift MOD ID Audit - MNK

    Audit of MOD IDs for MNK in sql/job_point_gifts
    Creates MOD ID with TODO: notes for 1047 COUNTER_DAMAGE
    Updates MOD ID for JP550 from 959 (CARDINAL_CHANT) to 1047 (COUNTER_DAMAGE)

    * Squash Me Please: Clang Formatting

    * Corrections and Placeholder MOD IDs for Job Point Gifts

    A number of placeholder mod IDs seem to have been replaced during a previous merge.
    Re-adds Placeholder MOD IDs for Job Point Gifts (1047 -> 1060)
    Corrects MOD IDs for the following in Job Point Gifts:
    * RNG JP100/1200 Velocity Shot
    * SAM JP100/1200 Zanshin
    * SMN JP45/320/845/1620 Avatar/Spirit Phys Atk./Def.

    * Squash Me Please: Clang Format

commit 33013a5a18374acc163fb69d927821267722d0f5
Author: claywar <[email protected]>
Date:   Thu Sep 1 12:16:24 2022 -0400

    [sql] Add formatting and comments to mob_spawn_mods table

commit 1830ffe395bdbbfdf51cbf9ea81f73053f78ab04
Merge: 64158a7959 2a54e54a5f
Author: claywar <[email protected]>
Date:   Thu Sep 1 12:05:43 2022 -0400

    Merge pull request #2605 from DiscipleOfEris/feature-implement-ulxzomit-mother-baby-distinction

    Implement Ul'xzomit mother and baby distinction

commit 64158a79595fd40943e3e1eb320fa5552d1a2dbd
Author: neuromancerxi <[email protected]>
Date:   Thu Sep 1 08:51:10 2022 -0700

    Increase Array Length of m_ZonesList from 36 to 38 (#2628)

    * Increase Array Length of m_ZonesList from 36 to 37

    Closes #2627

    * Squash me: Expand from 37-38 to include zones above 295

commit aa5fdea43aa2ca3871258e744d1153a4605f8403
Merge: 747fc8255f 12b8571e7e
Author: claywar <[email protected]>
Date:   Wed Aug 31 22:36:15 2022 -0400

    Merge pull request #2619 from neuromancerxi/jp_gift_audit

    JP Gift MOD ID Audit - WHM/BLM/RDM

commit 747fc8255ffaaea909694599b9a651d55f52f498
Author: neuromancerxi <[email protected]>
Date:   Wed Aug 31 19:35:38 2022 -0700

    [TRUST] Ferreous Coffin (#2560)

    * [TRUST] Ferreous Coffin

    Updates Trust Script
    Updates Gambits, Mob Spell Container, and Spell CPP.
    Updates mob skills, spells SQL

    * Adjust Target Checks and Conditions.

    Co-authored-by: Zach Toogood <[email protected]>

    * Squash Me: Add spaces for Clang

    * Remove erroneous duplicate HPP MOD from Ferreous Coffin

    Co-authored-by: Zach Toogood <[email protected]>

commit 5a4e9987c7a6cbae0276052fb49f09ab5759573e
Author: Critical <[email protected]>
Date:   Tue Aug 30 14:42:05 2022 -0600

    Skill list corrections

commit 41519a4d94e41e8a5b6770abaf3f959e44bf8b27
Author: neuromancerxi <[email protected]>
Date:   Tue Aug 30 12:03:02 2022 -0700

    Add Commitment Effect Handling, Associated Bands, Update Corsairs Roll (#2610)

    * Add Commitment Effect Handling, Associated Bands, Update Corsairs Roll

    Adds handling for COMMITMENT effect in charutils.cpp
    Adds handling for DEDICATION / COMMITMENT items to item_utils.lua
    Creates/Updates Scripts for DEDICATION / COMMITMENT items
    Adds/Updates SQL for item_equipment and item_usable
    Updates Corsair's Roll to handle CAPACITY_BONUS
    Adds TODO note in Corsair's Roll about Exemplar Points (Not Implemented)

    References:

    https://www.bg-wiki.com/ffxi/Corsair's%20Roll
    https://ffxiclopedia.fandom.com/wiki/Commitment
    https://ffxiclopedia.fandom.com/wiki/Dedication

    Retail Observation used for Effect Application: Chariot -> Capacity -> Echad -> Trizek

    * Squash me please: Trailing Whitespace Fix

    * Convert magic numbers to enums in ring/band/beret scripts

commit 536aedbf9816bfdfe6b067429afb9bd88ca49a49
Merge: e50e59fb46 1e77a40f51
Author: claywar <[email protected]>
Date:   Tue Aug 30 14:15:24 2022 -0400

    Merge pull request #2617 from neuromancerxi/war_jp_gift_audit

    [SQL] JP Gift MOD ID Audit - WAR

commit e50e59fb46e00718ca21fecdc7e2803e385eddc1
Merge: 6b0c58f7a7 2d8354b1c3
Author: claywar <[email protected]>
Date:   Tue Aug 30 14:14:35 2022 -0400

    Merge pull request #2578 from WinterSolstice8/add_action_to_cluabaseentity

    [core] Improve CLuaBaseEntity::injectActionPacket()

commit 6b0c58f7a738dcd2af30553f9b4a4b1b16318a15
Merge: d4f5dab9a4 bbdf892bc0
Author: claywar <[email protected]>
Date:   Tue Aug 30 14:14:13 2022 -0400

    Merge pull request #2590 from CatsEyeXI/phantom_roll_recast

    Fix halving of Phantom Roll recast when rolling 11

commit d4f5dab9a424e87e372ead73df77c54cc7f3f992
Merge: 19424af2d0 a76e8e361a
Author: claywar <[email protected]>
Date:   Tue Aug 30 14:13:59 2022 -0400

    Merge pull request #2606 from EpicTaru/AuditGroup93Drops

    [sql] Drop Group 93 Audit

commit 12b8571e7e01317ab22744ef6c82dd70cdddb373
Author: NeuromancerXI <[email protected]>
Date:   Tue Aug 30 04:24:04 2022 -0700

    JP Gift MOD ID Audit - WHM/BLM/RDM

    Audit of MOD IDs/Values for WHM/BLM/RDM in sql/job_point_gifts
    Corrects RDM JP1900 Enspell Damage from 8 to 7

commit 1e77a40f51dfd42d5ee3a3def03c7b87680bafec
Author: NeuromancerXI <[email protected]>
Date:   Tue Aug 30 03:17:17 2022 -0700

    JP Gift Audit - WAR

    Audit of MOD IDs for WAR in sql/job_point_gifts
    Corrects JP60 from MEVA to MACC

commit 19424af2d0139d19c554fc6533cb65b097e07d8a
Merge: 5ea36f2672 356260113e
Author: TeoTwawki <[email protected]>
Date:   Sun Aug 28 12:15:10 2022 -0400

    Merge pull request #2612 from La…
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