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.

Sign up for GitHub

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

Jump to bottom

[Lua] Implement remaining Geomantic Reservoirs #2305

Merged
merged 6 commits into from
Jul 21, 2022
Merged

[Lua] Implement remaining Geomantic Reservoirs #2305

merged 6 commits into from
Jul 21, 2022

Conversation

CatsEyeXI
Copy link

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
  • I have read and understood the Contributing Guide
  • I've 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?

Implement remaining Geomantic Reservoirs.

ID's used:
https://github.com/zach2good/UpdateExtractor/tree/versions/2022-june/out/scripts/zones

Steps to test these changes

Starting with a fresh character, add Indi-Spells, then visit corresponding Geomantic reservoir to unlock Geo-Spell.

zach2good
zach2good requested changes Jul 17, 2022
View reviewed changes
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.

Almost there 👍

scripts/zones/Batallia_Downs/npcs/Geomantic_Reservoir.lua Outdated Show resolved Hide resolved
scripts/zones/Beadeaux/IDs.lua Show resolved Hide resolved
@zach2good zach2good added the squash Reminder to squash commits before/on merge (you can do this, or maintainers will do this for you) label Jul 17, 2022
Omnione
Omnione suggested changes Jul 18, 2022
View reviewed changes
Copy link
Contributor

@Omnione Omnione left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Other than the order, of a couple of text ID's, it looks good

scripts/zones/Sauromugue_Champaign/IDs.lua Show resolved Hide resolved
Omnione
Omnione suggested changes Jul 19, 2022
View reviewed changes
Copy link
Contributor

@Omnione Omnione left a comment

Choose a reason for hiding this comment

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

Once that comment in the header for Geo-Refresh is changed this will be good to go

scripts/zones/La_Theine_Plateau/npcs/Geomantic_Reservoir_2.lua Show resolved Hide resolved
@claywar claywar requested a review from zach2good July 19, 2022 21:11
@claywar claywar merged commit a12722a into LandSandBoat:base Jul 21, 2022
@CatsEyeXI CatsEyeXI deleted the moar_geo_reservoirs branch July 25, 2022 12:48
illzbee added a commit to illzbee/LSB that referenced this pull request Aug 14, 2022
@illzbee
Squashed commit of the following:
5779b0b 
commit 9c8e95de0c58c3f194f51bb22b4e5b6af5b2bbfd
Merge: 1f097d8847 0c69c474e9
Author: Illzbee <[email protected]>
Date:   Tue Jul 26 20:40:08 2022 -0400

    Merge branch 'base' of https://github.com/illzbee/LSB into base

commit 1f097d88478e2df2b82217182c7bae986b3c67b2
Author: Illzbee <[email protected]>
Date:   Tue Jul 26 20:36:20 2022 -0400

    Squashed commit of the following:

    commit 0c69c474e9e7bffc3e6e07a0e363e949cfb531d0
    Author: Tom-Neverwinter <[email protected]>
    Date:   Tue Jul 26 04:22:29 2022 -0500

        Chocobo Circuit zone update from caps (#2316)

        * Chocobo Circuit zone update from caps

        * Fix TAOU to TOAU [fix ABYSSEA content flag as well]

        I am not sure the expansion for mandragora assistant so it is null.

        * Gate:ChocoboC to GateChocoboC

        Gate:ChocoboC is not a valid file name. Please chage it to GateChocoboC

        * change 'NULL' to NULL

        'NULL' seemed like a safe bet. it is not.

    commit a19ce653154ffe568e86e54f45782702e2ebe0da
    Merge: b093da8856 1d755c2982
    Author: claywar <[email protected]>
    Date:   Mon Jul 25 18:20:45 2022 -0400

        Merge pull request #2254 from CriticalXI/sarutabaruta_audit

        Sarutabaruta Region NM Audit

    commit b093da88566adb183109cb0f268d8935ecbf859d
    Merge: fe41bf0c14 676bbf5c81
    Author: claywar <[email protected]>
    Date:   Mon Jul 25 17:59:01 2022 -0400

        Merge pull request #2396 from LandSandBoat/lgtm/25jul22

        [lgtm] Fix Wider type comparison and always-true conditions reported in LGTM

    commit fe41bf0c140fe57856efa6ba2e22ebda510dbe23
    Merge: d78c3282dc 6fbe7bdca9
    Author: claywar <[email protected]>
    Date:   Mon Jul 25 17:58:18 2022 -0400

        Merge pull request #2399 from LandSandBoat/bugfix/2322-t5-jp-spells

        Fix Tier 5 nuke rewards in RefreshGiftMods()

    commit 6fbe7bdca947bb8260e1fd27bad8a8ccb614b790
    Author: claywar <[email protected]>
    Date:   Mon Jul 25 17:33:42 2022 -0400

        Fix Tier 5 nuke rewards in RefreshGiftMods()

        Remove original condition

    commit d78c3282dc4a8da3f05597de412c17ea0f997d50
    Merge: 8c18837b44 c978d2d1ee
    Author: claywar <[email protected]>
    Date:   Mon Jul 25 17:10:20 2022 -0400

        Merge pull request #2395 from CatsEyeXI/wayward_automaton

        Fix ToAU: 'The Wayward Automaton' char vars

    commit 676bbf5c81f2425bca9d75837bc3a03569cc9b66
    Author: claywar <[email protected]>
    Date:   Mon Jul 25 16:45:15 2022 -0400

        Fix wider type comparison in search server HandleAuctionHouseRequest()

    commit 34ff7ace401cc162b3f5b01fb8f0efa60f25288f
    Author: claywar <[email protected]>
    Date:   Mon Jul 25 16:38:23 2022 -0400

        Fix always true condition in petutils, compare type mismatch in send_parse

    commit 26c0ba6bae6e07457f3bd1e067f9704732ff4122
    Author: claywar <[email protected]>
    Date:   Mon Jul 25 16:37:42 2022 -0400

        Add SETVAR_RETRY_MAX to settings from hardcoded value

    commit 8c18837b4483032b19e0ddeb7ccdf118900d9c48
    Merge: 1d4c1a2480 f2bac739bd
    Author: claywar <[email protected]>
    Date:   Mon Jul 25 06:15:28 2022 -0400

        Merge pull request #2393 from LandSandBoat/bugfix/prospector-enhancements

        Correct addStatusEffectEx parameters in Cruor Prospector

    commit 1d4c1a2480a539118aaca9b7514784de8beb8222
    Merge: 2dd1858c78 7fae23e1ba
    Author: claywar <[email protected]>
    Date:   Mon Jul 25 06:14:56 2022 -0400

        Merge pull request #2392 from LandSandBoat/bugfix/synth-suggest-packetguard

        Allow SUBSTATE_IN_CS for Synthesis Suggestion Packet (0x058)

    commit f2bac739bd36a0e2770b0a6860bc7c8eefb4cd3f
    Author: claywar <[email protected]>
    Date:   Mon Jul 25 05:53:45 2022 -0400

        Correct addStatusEffectEx parameters in Cruor Prospector

    commit 7fae23e1bad2e977033b8bd587114162a32ab3d9
    Author: claywar <[email protected]>
    Date:   Mon Jul 25 05:37:27 2022 -0400

        Allow SUBSTATE_IN_CS for Synthesis Suggestion Packet (0x058)

    commit 2dd1858c784d18d5aa291aea3c7d226062c37981
    Merge: 330a49fda9 4d2f883061
    Author: claywar <[email protected]>
    Date:   Mon Jul 25 05:28:57 2022 -0400

        Merge pull request #2391 from LandSandBoat/prelude-message-fmt

        Replace messageSpecial with messageName for multiline text in Prelude to a Storm

    commit 4d2f8830610f26abb342e309ea0965249c081849
    Author: claywar <[email protected]>
    Date:   Mon Jul 25 05:10:53 2022 -0400

        Replace messageSpecial with messageName for multiline text in Prelude to a Storm

    commit 330a49fda9a4ce12c30f33b32774f01ae4bc91d8
    Author: CatsEyeXI <[email protected]>
    Date:   Mon Jul 25 04:06:27 2022 -0400

        Update mods on Grape Daifuku and recipe for Sha'ir Seraweels, Lu Shang's +1 (#2371)

        * correct stats on grape_daifukus

        * update description headers on grape daifukus

        * update shair seraweels recipe using info from bgwiki and jpwiki

        * Add repair Lu Shang +1 recipe

    commit e45642dd2f1ab648b8d84bf08142fd90996ae831
    Merge: e81bc31249 fbc83e5d49
    Author: claywar <[email protected]>
    Date:   Mon Jul 25 04:05:35 2022 -0400

        Merge pull request #2388 from Schaedelschaden/blood_rage_updates

        [JAs] Update functionality for WAR JA Blood Rage

    commit e81bc31249c5134ae2057c294107a8a063d99ffc
    Merge: d2683c956f d621bcb2ca
    Author: claywar <[email protected]>
    Date:   Mon Jul 25 04:04:45 2022 -0400

        Merge pull request #2367 from Schaedelschaden/messages_updates

        [IDs] Update messages documentation with missing messages

    commit c978d2d1ee0d95ccbd450568a6acddbd1390ac63
    Author: beneliezer <[email protected]>
    Date:   Sun Jul 24 21:40:33 2022 -0400

        fix wayward auomaton char vars

    commit fbc83e5d49a8782f5a2379d2cf2982d73391d247
    Author: Schaedelschaden <[email protected]>
    Date:   Sun Jul 24 15:50:44 2022 -0600

        [JAs] Update functionality for WAR JA Blood Rage

    commit d2683c956faf20aec98c9ed63a28d2d74f886386
    Merge: 200a31ec0b bebb7c90f1
    Author: claywar <[email protected]>
    Date:   Sun Jul 24 17:49:22 2022 -0400

        Merge pull request #2387 from LandSandBoat/interaction/prelude-to-a-storm

        Interaction - Mission: Prelude to a Storm

    commit bebb7c90f1a7e2fb0e7b98b01ed75035657f253a
    Author: claywar <[email protected]>
    Date:   Sun Jul 24 17:27:11 2022 -0400

        Interaction - Mission: Prelude to a Storm

        Correct formatting in IDs

    commit 200a31ec0b0d8e20525e8349a96aa9152b429ed2
    Merge: 329bf5c15f 6ec5d2c178
    Author: claywar <[email protected]>
    Date:   Sun Jul 24 11:49:33 2022 -0400

        Merge pull request #2385 from WinterSolstice8/petskill_siren_wip

        [core] [SMN] [lua] Implement "Petskill" system, add basic Siren implementation

    commit 329bf5c15fbf888faa6bc16e65c9704651639de4
    Merge: b8b1825d64 57eef419e6
    Author: claywar <[email protected]>
    Date:   Sun Jul 24 09:21:06 2022 -0400

        Merge pull request #2386 from LandSandBoat/interaction/fate-in-haze

        Interaction - Missions: Fate in Haze through The Battle of Xarcabard

    commit 57eef419e69c23000899c1b09784f7ea7d82d376
    Author: claywar <[email protected]>
    Date:   Sun Jul 24 08:52:41 2022 -0400

        Interaction - Mission: The Battle of Xarcabard

        Add missing confirmTrade() to A Hawk in Repose

    commit 99ca9a1dd4f64792fe60257de4b7d51ab48fe410
    Author: claywar <[email protected]>
    Date:   Sun Jul 24 08:02:59 2022 -0400

        Interaction - Mission: A Hawk in Repose

        Fix mission number comment

    commit 317acbd2b7f20708665885a03afb03158124e1eb
    Author: claywar <[email protected]>
    Date:   Sun Jul 24 07:30:59 2022 -0400

        Interaction - Mission: Another World

        Add NPC comments

    commit 4c8439d1264c46f6de7b2eb424e3876b1e0e8b87
    Author: claywar <[email protected]>
    Date:   Sat Jul 23 10:49:43 2022 -0400

        Interaction - Mission: The Scent of Battle

        Refresh db entries for cs npcs

    commit 5ce8edfb55ccfb81dfc6564ac5d6776bd3a89762
    Author: claywar <[email protected]>
    Date:   Sat Jul 23 09:57:48 2022 -0400

        Interaction - Mission: Fate in Haze

    commit b8b1825d643c9bba0e6b98ee952743a9fcae1812
    Merge: 13a1cc5f4b 64d7236492
    Author: claywar <[email protected]>
    Date:   Sun Jul 24 06:39:50 2022 -0400

        Merge pull request #2373 from Schaedelschaden/restraint_updates

        [JAs] Add functionality to WAR JA Restraint

    commit 6ec5d2c178621a4c3f238716c94681b6730a3d83
    Author: WinterSolstice8 <[email protected]>
    Date:   Sun Jul 24 00:50:04 2022 -0700

        [core] Fixup dynamic casts in src/map/ai/ai_container.cpp, add comment about CLuaAbility:getAddType()
        * Adjust copyright notice to correct owner for new files

    commit 146658f3449f96eb717569dcffbb851193fd7ed8
    Author: WinterSolstice8 <[email protected]>
    Date:   Sat Jul 23 23:49:03 2022 -0700

        [sql] Adjust Welt range in abilities.sql, add source to welt.lua and summoner.lua

        * Remove debug print in summoner.lua
        * Finer control of range for SMN BP is done in summoner.lua

    commit ff79f1068e021785a8b0347403c1bfff1c7bc118
    Author: WinterSolstice8 <[email protected]>
    Date:   Sat Jul 23 23:19:44 2022 -0700

        [core] [sql] [SMN] add Siren pet, add petskill sql

    commit ae77e72f051450425cdbd7a34fb7429ac8cfe7a4
    Author: WinterSolstice8 <[email protected]>
    Date:   Sat Jul 23 23:18:12 2022 -0700

        [sql] Enable Welt, disable Composure on subjob, rename Grand Pas & disable on sub

    commit 630cb9102d6fb3e23ecf6627ae5535893d56b58c
    Author: WinterSolstice8 <[email protected]>
    Date:   Sat Jul 23 23:08:42 2022 -0700

        [core] [lua] [SMN] Implement "petskill" subsystem, implement casting of Siren, and Welt BP

        * Add SMN job helper

    commit 64d72364921c6ba065763b0262a1c66fd761eb97
    Author: Schaedelschaden <[email protected]>
    Date:   Sat Jul 23 12:18:13 2022 -0600

        Update Restraint status effect flags with ON_ZONE, LOGOUT, and ON_JOBCHANGE

    commit 13a1cc5f4bfdbca15d6cb17d3d85e79f6eec65aa
    Merge: 99a76801dd 170fea1cb8
    Author: claywar <[email protected]>
    Date:   Sat Jul 23 12:18:01 2022 -0400

        Merge pull request #2383 from LandSandBoat/consumables_audit

        [sql] Audit prices of arrows/quivers/toolbags/ninja tools/shurikens/shuriken pouches

    commit 170fea1cb8b2138de1e0a532481b71dd399ce32d
    Author: WinterSolstice8 <[email protected]>
    Date:   Sat Jul 23 08:49:57 2022 -0700

        [sql] Audit prices of arrows/quivers/toolbags/ninja tools/shurikens/shuriken pouches

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

    commit 04e4c2901e77699babf51b425097264cef1a94ac
    Author: Schaedelschaden <[email protected]>
    Date:   Sat Jul 23 01:57:55 2022 -0600

        [JAs] Add functionality to WAR JA Restraint

    commit d621bcb2ca86823671375c74b078b110c7b84475
    Author: Schaedelschaden <[email protected]>
    Date:   Wed Jul 20 21:50:08 2022 -0600

        Restore triple digit alignment to IDs 1-100 (1 to 001)

    commit 315bc88ce6d8b8263b76a8ea59ad86d7368bbcd3
    Author: Schaedelschaden <[email protected]>
    Date:   Wed Jul 20 21:40:26 2022 -0600

        Correct messages 277 and 283

    commit 97511fef13c8067f4c79c25ecc9492b2b515ae87
    Author: Schaedelschaden <[email protected]>
    Date:   Wed Jul 20 21:31:40 2022 -0600

        [IDs] Update messages documentation with missing messages

    commit 1d755c29821c490df876425331384eb0db02299e
    Author: Critical <[email protected]>
    Date:   Sun Jul 10 18:16:57 2022 -0600

        Toraimorai Canal NM Audit

    commit 6ff3a7e29fa767223d3bfe8dfe3d188bea157efb
    Author: Critical <[email protected]>
    Date:   Sun Jul 10 17:58:46 2022 -0600

        Inner Horutoto Ruins NM Audit

    commit dd6de21888e0238bd495ac5cdb6100b95f784a46
    Author: Critical <[email protected]>
    Date:   Sun Jul 10 17:47:30 2022 -0600

        Outer Horutoto Ruins NM Audit

    commit 96133e2bc63da9e394be63508b175ae529d4479a
    Author: Critical <[email protected]>
    Date:   Thu Jun 30 12:01:11 2022 -0600

        Giddeus NM Audit

    commit 715c406ff3fdf56dc75a5f92849311b9559b9155
    Author: Critical <[email protected]>
    Date:   Thu Jun 30 11:36:38 2022 -0600

        West Sarutabaruta NM audit

    commit 5a93859eb9e0aaa3b9f8d9341c354a3b22320d36
    Author: Critical <[email protected]>
    Date:   Thu Jun 30 11:28:09 2022 -0600

        East Sarutabaruta NM audit

commit 0c69c474e9e7bffc3e6e07a0e363e949cfb531d0
Author: Tom-Neverwinter <[email protected]>
Date:   Tue Jul 26 04:22:29 2022 -0500

    Chocobo Circuit zone update from caps (#2316)

    * Chocobo Circuit zone update from caps

    * Fix TAOU to TOAU [fix ABYSSEA content flag as well]

    I am not sure the expansion for mandragora assistant so it is null.

    * Gate:ChocoboC to GateChocoboC

    Gate:ChocoboC is not a valid file name. Please chage it to GateChocoboC

    * change 'NULL' to NULL

    'NULL' seemed like a safe bet. it is not.

commit a19ce653154ffe568e86e54f45782702e2ebe0da
Merge: b093da8856 1d755c2982
Author: claywar <[email protected]>
Date:   Mon Jul 25 18:20:45 2022 -0400

    Merge pull request #2254 from CriticalXI/sarutabaruta_audit

    Sarutabaruta Region NM Audit

commit b093da88566adb183109cb0f268d8935ecbf859d
Merge: fe41bf0c14 676bbf5c81
Author: claywar <[email protected]>
Date:   Mon Jul 25 17:59:01 2022 -0400

    Merge pull request #2396 from LandSandBoat/lgtm/25jul22

    [lgtm] Fix Wider type comparison and always-true conditions reported in LGTM

commit fe41bf0c140fe57856efa6ba2e22ebda510dbe23
Merge: d78c3282dc 6fbe7bdca9
Author: claywar <[email protected]>
Date:   Mon Jul 25 17:58:18 2022 -0400

    Merge pull request #2399 from LandSandBoat/bugfix/2322-t5-jp-spells

    Fix Tier 5 nuke rewards in RefreshGiftMods()

commit 6fbe7bdca947bb8260e1fd27bad8a8ccb614b790
Author: claywar <[email protected]>
Date:   Mon Jul 25 17:33:42 2022 -0400

    Fix Tier 5 nuke rewards in RefreshGiftMods()

    Remove original condition

commit d78c3282dc4a8da3f05597de412c17ea0f997d50
Merge: 8c18837b44 c978d2d1ee
Author: claywar <[email protected]>
Date:   Mon Jul 25 17:10:20 2022 -0400

    Merge pull request #2395 from CatsEyeXI/wayward_automaton

    Fix ToAU: 'The Wayward Automaton' char vars

commit 676bbf5c81f2425bca9d75837bc3a03569cc9b66
Author: claywar <[email protected]>
Date:   Mon Jul 25 16:45:15 2022 -0400

    Fix wider type comparison in search server HandleAuctionHouseRequest()

commit 34ff7ace401cc162b3f5b01fb8f0efa60f25288f
Author: claywar <[email protected]>
Date:   Mon Jul 25 16:38:23 2022 -0400

    Fix always true condition in petutils, compare type mismatch in send_parse

commit 26c0ba6bae6e07457f3bd1e067f9704732ff4122
Author: claywar <[email protected]>
Date:   Mon Jul 25 16:37:42 2022 -0400

    Add SETVAR_RETRY_MAX to settings from hardcoded value

commit 8c18837b4483032b19e0ddeb7ccdf118900d9c48
Merge: 1d4c1a2480 f2bac739bd
Author: claywar <[email protected]>
Date:   Mon Jul 25 06:15:28 2022 -0400

    Merge pull request #2393 from LandSandBoat/bugfix/prospector-enhancements

    Correct addStatusEffectEx parameters in Cruor Prospector

commit 1d4c1a2480a539118aaca9b7514784de8beb8222
Merge: 2dd1858c78 7fae23e1ba
Author: claywar <[email protected]>
Date:   Mon Jul 25 06:14:56 2022 -0400

    Merge pull request #2392 from LandSandBoat/bugfix/synth-suggest-packetguard

    Allow SUBSTATE_IN_CS for Synthesis Suggestion Packet (0x058)

commit f2bac739bd36a0e2770b0a6860bc7c8eefb4cd3f
Author: claywar <[email protected]>
Date:   Mon Jul 25 05:53:45 2022 -0400

    Correct addStatusEffectEx parameters in Cruor Prospector

commit 7fae23e1bad2e977033b8bd587114162a32ab3d9
Author: claywar <[email protected]>
Date:   Mon Jul 25 05:37:27 2022 -0400

    Allow SUBSTATE_IN_CS for Synthesis Suggestion Packet (0x058)

commit 2dd1858c784d18d5aa291aea3c7d226062c37981
Merge: 330a49fda9 4d2f883061
Author: claywar <[email protected]>
Date:   Mon Jul 25 05:28:57 2022 -0400

    Merge pull request #2391 from LandSandBoat/prelude-message-fmt

    Replace messageSpecial with messageName for multiline text in Prelude to a Storm

commit 4d2f8830610f26abb342e309ea0965249c081849
Author: claywar <[email protected]>
Date:   Mon Jul 25 05:10:53 2022 -0400

    Replace messageSpecial with messageName for multiline text in Prelude to a Storm

commit 330a49fda9a4ce12c30f33b32774f01ae4bc91d8
Author: CatsEyeXI <[email protected]>
Date:   Mon Jul 25 04:06:27 2022 -0400

    Update mods on Grape Daifuku and recipe for Sha'ir Seraweels, Lu Shang's +1 (#2371)

    * correct stats on grape_daifukus

    * update description headers on grape daifukus

    * update shair seraweels recipe using info from bgwiki and jpwiki

    * Add repair Lu Shang +1 recipe

commit e45642dd2f1ab648b8d84bf08142fd90996ae831
Merge: e81bc31249 fbc83e5d49
Author: claywar <[email protected]>
Date:   Mon Jul 25 04:05:35 2022 -0400

    Merge pull request #2388 from Schaedelschaden/blood_rage_updates

    [JAs] Update functionality for WAR JA Blood Rage

commit e81bc31249c5134ae2057c294107a8a063d99ffc
Merge: d2683c956f d621bcb2ca
Author: claywar <[email protected]>
Date:   Mon Jul 25 04:04:45 2022 -0400

    Merge pull request #2367 from Schaedelschaden/messages_updates

    [IDs] Update messages documentation with missing messages

commit c978d2d1ee0d95ccbd450568a6acddbd1390ac63
Author: beneliezer <[email protected]>
Date:   Sun Jul 24 21:40:33 2022 -0400

    fix wayward auomaton char vars

commit fbc83e5d49a8782f5a2379d2cf2982d73391d247
Author: Schaedelschaden <[email protected]>
Date:   Sun Jul 24 15:50:44 2022 -0600

    [JAs] Update functionality for WAR JA Blood Rage

commit d2683c956faf20aec98c9ed63a28d2d74f886386
Merge: 200a31ec0b bebb7c90f1
Author: claywar <[email protected]>
Date:   Sun Jul 24 17:49:22 2022 -0400

    Merge pull request #2387 from LandSandBoat/interaction/prelude-to-a-storm

    Interaction - Mission: Prelude to a Storm

commit bebb7c90f1a7e2fb0e7b98b01ed75035657f253a
Author: claywar <[email protected]>
Date:   Sun Jul 24 17:27:11 2022 -0400

    Interaction - Mission: Prelude to a Storm

    Correct formatting in IDs

commit 200a31ec0b0d8e20525e8349a96aa9152b429ed2
Merge: 329bf5c15f 6ec5d2c178
Author: claywar <[email protected]>
Date:   Sun Jul 24 11:49:33 2022 -0400

    Merge pull request #2385 from WinterSolstice8/petskill_siren_wip

    [core] [SMN] [lua] Implement "Petskill" system, add basic Siren implementation

commit 329bf5c15fbf888faa6bc16e65c9704651639de4
Merge: b8b1825d64 57eef419e6
Author: claywar <[email protected]>
Date:   Sun Jul 24 09:21:06 2022 -0400

    Merge pull request #2386 from LandSandBoat/interaction/fate-in-haze

    Interaction - Missions: Fate in Haze through The Battle of Xarcabard

commit 57eef419e69c23000899c1b09784f7ea7d82d376
Author: claywar <[email protected]>
Date:   Sun Jul 24 08:52:41 2022 -0400

    Interaction - Mission: The Battle of Xarcabard

    Add missing confirmTrade() to A Hawk in Repose

commit 99ca9a1dd4f64792fe60257de4b7d51ab48fe410
Author: claywar <[email protected]>
Date:   Sun Jul 24 08:02:59 2022 -0400

    Interaction - Mission: A Hawk in Repose

    Fix mission number comment

commit 317acbd2b7f20708665885a03afb03158124e1eb
Author: claywar <[email protected]>
Date:   Sun Jul 24 07:30:59 2022 -0400

    Interaction - Mission: Another World

    Add NPC comments

commit 4c8439d1264c46f6de7b2eb424e3876b1e0e8b87
Author: claywar <[email protected]>
Date:   Sat Jul 23 10:49:43 2022 -0400

    Interaction - Mission: The Scent of Battle

    Refresh db entries for cs npcs

commit 5ce8edfb55ccfb81dfc6564ac5d6776bd3a89762
Author: claywar <[email protected]>
Date:   Sat Jul 23 09:57:48 2022 -0400

    Interaction - Mission: Fate in Haze

commit b8b1825d643c9bba0e6b98ee952743a9fcae1812
Merge: 13a1cc5f4b 64d7236492
Author: claywar <[email protected]>
Date:   Sun Jul 24 06:39:50 2022 -0400

    Merge pull request #2373 from Schaedelschaden/restraint_updates

    [JAs] Add functionality to WAR JA Restraint

commit 6ec5d2c178621a4c3f238716c94681b6730a3d83
Author: WinterSolstice8 <[email protected]>
Date:   Sun Jul 24 00:50:04 2022 -0700

    [core] Fixup dynamic casts in src/map/ai/ai_container.cpp, add comment about CLuaAbility:getAddType()
    * Adjust copyright notice to correct owner for new files

commit 146658f3449f96eb717569dcffbb851193fd7ed8
Author: WinterSolstice8 <[email protected]>
Date:   Sat Jul 23 23:49:03 2022 -0700

    [sql] Adjust Welt range in abilities.sql, add source to welt.lua and summoner.lua

    * Remove debug print in summoner.lua
    * Finer control of range for SMN BP is done in summoner.lua

commit ff79f1068e021785a8b0347403c1bfff1c7bc118
Author: WinterSolstice8 <[email protected]>
Date:   Sat Jul 23 23:19:44 2022 -0700

    [core] [sql] [SMN] add Siren pet, add petskill sql

commit ae77e72f051450425cdbd7a34fb7429ac8cfe7a4
Author: WinterSolstice8 <[email protected]>
Date:   Sat Jul 23 23:18:12 2022 -0700

    [sql] Enable Welt, disable Composure on subjob, rename Grand Pas & disable on sub

commit 630cb9102d6fb3e23ecf6627ae5535893d56b58c
Author: WinterSolstice8 <[email protected]>
Date:   Sat Jul 23 23:08:42 2022 -0700

    [core] [lua] [SMN] Implement "petskill" subsystem, implement casting of Siren, and Welt BP

    * Add SMN job helper

commit 64d72364921c6ba065763b0262a1c66fd761eb97
Author: Schaedelschaden <[email protected]>
Date:   Sat Jul 23 12:18:13 2022 -0600

    Update Restraint status effect flags with ON_ZONE, LOGOUT, and ON_JOBCHANGE

commit 13a1cc5f4bfdbca15d6cb17d3d85e79f6eec65aa
Merge: 99a76801dd 170fea1cb8
Author: claywar <[email protected]>
Date:   Sat Jul 23 12:18:01 2022 -0400

    Merge pull request #2383 from LandSandBoat/consumables_audit

    [sql] Audit prices of arrows/quivers/toolbags/ninja tools/shurikens/shuriken pouches

commit 170fea1cb8b2138de1e0a532481b71dd399ce32d
Author: WinterSolstice8 <[email protected]>
Date:   Sat Jul 23 08:49:57 2022 -0700

    [sql] Audit prices of arrows/quivers/toolbags/ninja tools/shurikens/shuriken pouches

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

commit b41cb07cd73a9695a9981264a14ae3616ad1c075
Author: Illzbee <[email protected]>
Date:   Sat Jul 23 11:17:12 2022 -0400

    Update navmeshes

commit 17745a6b36f8407ae69300bb444a6b3a03fe6953
Merge: ff4bb18c09 99a76801dd
Author: Illzbee <[email protected]>
Date:   Sat Jul 23 11:16:33 2022 -0400

    Merge remote-tracking branch 'upstream/base' into base

commit 99a76801dd49f287a5305cdbedeffbe4cbbcae62
Merge: a8c6c43026 c400ae7a86
Author: claywar <[email protected]>
Date:   Sat Jul 23 09:11:54 2022 -0400

    Merge pull request #2382 from LandSandBoat/interaction/blood-of-heroes

    Interaction - Quest: Blood of Heroes

commit c400ae7a866e6596291f0cc670575a53fd8842cb
Author: claywar <[email protected]>
Date:   Sat Jul 23 08:49:03 2022 -0400

    Interaction - Quest: Blood of Heroes

    Fix internal name for db update

    Account for onZoneIn to not repeat

commit 04e4c2901e77699babf51b425097264cef1a94ac
Author: Schaedelschaden <[email protected]>
Date:   Sat Jul 23 01:57:55 2022 -0600

    [JAs] Add functionality to WAR JA Restraint

commit a8c6c43026c21802a2a1e95d38e805d87156ae5d
Merge: 72ab3f3013 927405621d
Author: Zach Toogood <[email protected]>
Date:   Sat Jul 23 07:53:52 2022 +0300

    Merge pull request #2380 from CatsEyeXI/a_fate_Decided

    CoP 8-2: Fix typo in mission log enum

commit 72ab3f30136c3c569c447e9192af4fc8856cfbe5
Merge: 0390508c63 bc3b8b107b
Author: Zach Toogood <[email protected]>
Date:   Sat Jul 23 07:52:09 2022 +0300

    Merge pull request #2377 from WinterSolstice8/linkshell_add_onlinemember_safety

    [core] Add some safety to adding online members to linkshell

commit 927405621de029baaec7416727c300758c8a7569
Author: beneliezer <[email protected]>
Date:   Fri Jul 22 23:05:34 2022 -0400

    fix typo in mission log enum

commit bc3b8b107bfed05bf862cd31fd7df1cc17c46306
Author: WinterSolstice8 <[email protected]>
Date:   Fri Jul 22 09:38:56 2022 -0700

    [core] Add some safety to adding online members to linkshell

    * Cleanup some "useless" self explanatory comments in linkshell.cpp

commit 0390508c63884e91f6a179696b66e4eb48805a77
Merge: 422d3af1db 4ed18867bd
Author: claywar <[email protected]>
Date:   Fri Jul 22 07:42:03 2022 -0400

    Merge pull request #2376 from LandSandBoat/interaction/songbirds

    Interaction - Quest: Songbirds in a Snowstorm

commit 422d3af1dbc0bc2dce136341addd75ffa8bd0038
Merge: de8b46a416 63a5bb1151
Author: claywar <[email protected]>
Date:   Fri Jul 22 07:41:27 2022 -0400

    Merge pull request #2375 from LandSandBoat/navmesh-submodule-ref

    Update navmesh submodule for Ship to Selbina Pirates fix

commit 4ed18867bd70ffda1e5060de58ad4cc0c1f0bff6
Author: claywar <[email protected]>
Date:   Fri Jul 22 07:07:31 2022 -0400

    Interaction - Quest: Songbirds in a Snowstorm

    Implements Quest framework.  Currently, there is no method of fishing key items, and Orcish Bloodletter requires captures for proper tuning (Currently set to Level 150)

commit 63a5bb11517ce3ea49f7c5a951b94ef5dc2249c0
Author: claywar <[email protected]>
Date:   Fri Jul 22 06:56:04 2022 -0400

    Update navmesh submodule for Ship to Selbina Pirates fix

commit de8b46a4167cbd612b41bab7e25ffbd79b09b710
Merge: a12722a8f2 0134f7d8c3
Author: claywar <[email protected]>
Date:   Thu Jul 21 15:16:55 2022 -0400

    Merge pull request #2334 from illzbee/Circle

    Circle ability revamp

commit 0134f7d8c338ce071de023a02c0efacd7f1e1cbc
Author: Illzbee <[email protected]>
Date:   Sun Jul 17 21:29:34 2022 -0400

    [lua] Update Holy Circle, Ancient Circle, Warding Circle to match retail
    * Enable job point boosts as well

commit a12722a8f2cd972ea0066cc723c5b6e60fc82fe6
Author: CatsEyeXI <[email protected]>
Date:   Thu Jul 21 05:28:59 2022 -0400

    [Lua] Implement remaining Geomantic Reservoirs (#2305)

    * Add remaining Geomantic Reservoirs

    * Fix ordering

    * Remove trailing whitespaces

    * add zoneid to !pos in comments of each npc

    * More out of order ID's...

    * Fix incorrect description

commit d621bcb2ca86823671375c74b078b110c7b84475
Author: Schaedelschaden <[email protected]>
Date:   Wed Jul 20 21:50:08 2022 -0600

    Restore triple digit alignment to IDs 1-100 (1 to 001)

commit 315bc88ce6d8b8263b76a8ea59ad86d7368bbcd3
Author: Schaedelschaden <[email protected]>
Date:   Wed Jul 20 21:40:26 2022 -0600

    Correct messages 277 and 283

commit 97511fef13c8067f4c79c25ecc9492b2b515ae87
Author: Schaedelschaden <[email protected]>
Date:   Wed Jul 20 21:31:40 2022 -0600

    [IDs] Update messages documentation with missing messages

commit ab990eb43a5629c4580125594997eb2abe42cda9
Author: neuromancerxi <[email protected]>
Date:   Wed Jul 20 17:15:02 2022 -0700

    Add missing MODs for Arasy Weapons (#2179)

    * Add missing MODs for Arasy Weapons

    Adds MODs (and applicable Pet MODs) for:

    Arasy Knife / +1
    Arasy Sword / +1
    Arasy Claymore / +1
    Arasy Tabar / +1

    * 808s and Line Breaks

commit 703797a74c2a686462b331c44d603ea9a42f7b10
Author: CatsEyeXI <[email protected]>
Date:   Wed Jul 20 20:14:40 2022 -0400

    [SQL] Add diamond_buckler and mods for kupo_suit (#2187)

    * add diamond_buckler and mods for kupo_suit

    * use correct enum values in comments

commit 5b17b2872f3d03fb290db961ad464c15906c7ac5
Author: neuromancerxi <[email protected]>
Date:   Wed Jul 20 17:14:14 2022 -0700

    [Trust] Implement Alter Ego Extravaganza and Alter Ego Expo (#2306)

    * Alter Ego Extravaganza

    Global, Functions, NPCs, Cipher Acquisition for Shadow Era NPCs

    * Add Extravaganza Menu Logic to Sparkshop

    * Add Extravaganza Menu Logic to Conquest

    * Add Extravaganza Logic to Campaign NPCs

    * Add Extravaganza Logic to SoA

    * Update Ujlei_Zelekko to include Trust Morimar

    * Add Extravaganza Logic to Vision of Abyssea Cruor Prospectors

    * Add Extravaganza Logic to Beseiged NPCs

    * Add Extravaganza Logic to Assault NPCs

    * Add Extravaganza Logic to GoV

    * Migrate Valaineral and Adelheid from Magic Numbers to ENUMs

    * Trust Alter Ego Extravaganza / Alter Ego Expo

    * Update Extravaganza Global

    * Update Beseiged Global

    * Update Conquest Global

    * Update Regimes Global

    * Update Sparkshop Global

    * Migrate Abyssea Cruor Prospector Logic to abyssea.lua

    * Update Assault NPCs

    * Update Ujlei Zelekko add missing items.lua ENUMs

    * Update [S] NPCs

    * Add configurable banners for each campaign to optionally append to the Server Message.

    * Update Server Banner to use special characters

    * Purge unused local from abyssea.lua

    * Remove debug code, migrate onTrigger items to onTrigger block

commit 3f4903e3b6b8d60dd6282b73edc0f9fd28ff98f3
Author: Illzbee <[email protected]>
Date:   Wed Jul 20 20:13:19 2022 -0400

    Update MIds (#2329)

    * Update MIds

    cut down some model ID todos

    * Update item_equipment.sql

    poroggo_cass shouldn't be in this branch

    * drop more TODOs

    set more item models to retail

commit 7953124a13ad09966d5bd866ed4981ba362973a1
Merge: 15eea8a782 0aa74009d6
Author: claywar <[email protected]>
Date:   Wed Jul 20 20:12:46 2022 -0400

    Merge pull request #2351 from LandSandBoat/dynamic_id_lookup

    [core] Add routine for dynamic mob/npc ID lookups on startup

commit 15eea8a782300c246123832132af068c0533d2ff
Merge: 313fca6a8b 97f3022ace
Author: claywar <[email protected]>
Date:   Wed Jul 20 20:12:33 2022 -0400

    Merge pull request #2361 from Xaver-DaRed/Abbysea/Attohwa

    [Abyssea] Enable Attohwa's QM's Triggers and Trades

commit 313fca6a8b97612bb3665b26478908f73f9d2b8d
Merge: 15faf4f82a 12d9acfab3
Author: Zach Toogood <[email protected]>
Date:   Wed Jul 20 18:05:16 2022 +0300

    Merge pull request #2364 from TeoTwawki/base

    Move missing navmesh error to its own existing message type

commit 12d9acfab30562263bbf3d0e9b9eca2461b14b5f
Author: TeoTwawki <[email protected]>
Date:   Wed Jul 20 10:03:37 2022 -0400

    Move missing navmesh error to its own existing message type - it's possible to intentionally run with no navmeshes, so this isn't a critical error (just a minor one).

commit 15faf4f82a72e9b03b32fdb05ca2cf431dfc2676
Author: jmcdaniel83 <[email protected]>
Date:   Wed Jul 20 08:34:35 2022 -0500

    Update TCP/UDP Settings to Reside in the new network.lua file (#2348)

    * Moving all packet configuration into the network.lua file
     + to differentiate between the two sets I've added either UDP_ or TCP_ to the key name
     + all items have been provided along with the comments specified
     + for IP rules, the TCP_ALLOW, TCP_DENY keys have been updated to contain lists
       + default is empty string (no-op) in the code during setup
       + each entry must be separated with a 'comma' character
      - removed old configuration files (no longer referenced)
      + all settings now consistent across project

    * updating dockerfile for readability
     + format changes, no logical changes

    * Adding use of the new settings get<T>() method for all configuration items.
     + added two new booleans (udp_debug, and tcp_debug) to differentiate between them (not yet used)
     + connect_check_() method for loops updated to leverage the range for loop to simplify the code and for more readabilty using the new entry element each loop
     + access_ipmask() updated to allow for emtpy strings which equate to a no-op
     + adding new methods to leverage the new settings get<T> method
       + get_access_list() takes the parsed access list string "entry,entry,..." and provides a list of AccessControl objects that have been successfully parsed, all issues with the entries will be shown in an error message.
       + socket_udp_setup() method added to setup our UDP socket (only fetches the debug setting right now)
       + socket_tcp_setup() method added to setup the TCP socket settings. Much simpler with the new get<T>() method.  Only issue I had was with the list of allow and deny IP addresses as we would need to extend the get<T>() method to allow LUA lists { "a", "b" }.  All other properties are straight forward using the get<T>() method.  The only option that is not carried over is the "import" command (not sure this is used anymore).
       - socket_config_read() now deprecated
     + socket_init_tcp() method updated to leverage new TCP setup method, some formatting for readability
     + socket_init_udp() levearging new UDP setup method

    * Moved handling of empty strings for access/deny strings to where the access list is collected
     + moved handling of empty strings from access_ipmask() to get_access_list()
     + adding more log information of what was parsed in the new socket_tcp_setup() function

    * adding some helpful critical messages when nav meshes can not be loaded during boot

    * Adding all options for TCP_ORDER setting, more examples for ALLOW and DENY

    * Reverting dockerfile back to original to make merge easier

    * Corrected proper formating to the file

    * Have added a helpful note to signify the settings that should be left alone
     + most options can render your instance unusable unless you know what you are doing.

commit 97f3022acea0e1932107ae59087dff15ac999950
Author: Xaver-DaRed <[email protected]>
Date:   Wed Jul 20 12:09:25 2022 +0200

    Change QM names from numeric to NM name

commit 86a357705b0ffd7908f36c0baffd4f5fded66f1f
Author: Xaver-DaRed <[email protected]>
Date:   Wed Jul 20 11:41:43 2022 +0200

    Enable Attohwa's QM's Triggers and Trades

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

commit 1b134be9a531a4978c43ae5c8386c24775d5a0ef
Merge: 04764831fa 636aff7aa2
Author: Zach Toogood <[email protected]>
Date:   Wed Jul 20 11:12:10 2022 +0300

    Merge pull request #2354 from LandSandBoat/sol_enable_exceptions_revert_custom_luajit_build

    [core] [cmake] [sol] Enable Sol exceptions, remove custom LuaJIT build

commit 636aff7aa29e3ffc3abb8c4f1797bd63cc194e14
Author: WinterSolstice8 <[email protected]>
Date:   Tue Jul 19 23:55:37 2022 -0700

    [core] [sol] Remove use of sol::script_pass_on_error, as we set script_pass_on_error by default now

commit f6a17591cf2568161cc26d5e55411accf9e69211
Author: WinterSolstice8 <[email protected]>
Date:   Tue Jul 19 23:01:14 2022 -0700

    [core] [sol] [cmake] Add -DSOL_DEFAULT_PASS_ON_ERROR to not crash when a global fails on hot reload

commit 04764831fafda3800a3b5cf09d6a5b462cb87fa4
Merge: fa9f72a3e0 b73ee8ea6c
Author: TeoTwawki <[email protected]>
Date:   Wed Jul 20 00:32:26 2022 -0400

    Merge pull request #2358 from LandSandBoat/TeoTwawki-patch-1

    typo fix: AVATAR_S_FAVOR -> AVATARS_FAVOR in fenrir onSpellCast

commit b73ee8ea6cac3b5a595a69043c7b8ff05a5dbcd8
Author: TeoTwawki <[email protected]>
Date:   Wed Jul 20 00:10:58 2022 -0400

    typo fix: AVATAR_S_FAVOR -> AVATARS_FAVOR in fenrir onSpellCast

    closes #2357

commit 60cbf1f0155fc0c0bc2249c70ba3aa77fc73953a
Author: WinterSolstice8 <[email protected]>
Date:   Tue Jul 19 17:59:33 2022 -0700

    [core] [cmake] [sol] Enable Sol exceptions, remove custom LuaJIT build

    * This is a follow-up from when we discovered x86_64 required a custom build of LuaJIT to disable unwinding on x86_64.
    It appears that the real root cause was that Sol was handing Lua something it couldn't handle, but Sol *can* handle it, so we are now letting Sol handle it.

commit fa9f72a3e0a505ab56438b94cffd9f0e52f7faef
Merge: 51b784cc40 02d89892f7
Author: claywar <[email protected]>
Date:   Tue Jul 19 20:25:37 2022 -0400

    Merge pull request #2353 from Schaedelschaden/tomahawk_adjustments

    [JAs] Add ammo removal for using the Tomahawk JA

commit 02d89892f7f8d7ab64e1b1636f21e1d3ba0bd9be
Author: Schaedelschaden <[email protected]>
Date:   Tue Jul 19 17:48:01 2022 -0600

    [JAs] Add ammo removal for using the JA

commit 51b784cc40e51992ad4f00792307117a29075847
Merge: 9c464bfc3c 991e13cecb
Author: claywar <[email protected]>
Date:   Tue Jul 19 16:13:42 2022 -0400

    Merge pull request #2352 from LandSandBoat/tomahawk-item-enum

    Add Throwing Tomahawk to items.lua, update lua references

commit 0aa74009d6e6d43d8d25f4f1158e12bdf2448e0e
Author: Zach Toogood <[email protected]>
Date:   Tue Jul 19 21:59:31 2022 +0300

    [core] Add routine for dynamic mob/npc ID lookups on startup

commit 991e13cecbb454dece923f318c070729a042eb10
Author: claywar <[email protected]>
Date:   Tue Jul 19 15:16:52 2022 -0400

    Add Throwing Tomahawk to items.lua, update lua references

commit 9c464bfc3c31e70cdbf1ad6da9ac17881d55291b
Merge: eb10e967f4 a90de8de5a
Author: claywar <[email protected]>
Date:   Tue Jul 19 15:06:49 2022 -0400

    Merge pull request #2349 from Schaedelschaden/war_ja_tomahawk

    [JAs] Add functionality to WAR JA Tomahawk

commit eb10e967f48dd31811000709ce00fb877b7ec6df
Merge: c3d1916c2a 5035a33f74
Author: claywar <[email protected]>
Date:   Tue Jul 19 15:04:09 2022 -0400

    Merge pull request #2350 from Xaver-DaRed/Abyssea/Cleanup

    [Abyssea] Cleanup La Theine and Konschtat QM scripts

commit a90de8de5a4c5ef1086c3609cd68bc2fddd63661
Author: Schaedelschaden <[email protected]>
Date:   Tue Jul 19 12:45:38 2022 -0600

    Revert formatting changes to status_effect.h

commit 5035a33f74b163bca860cabe26ff57dd0c8fd7e7
Author: Xaver-DaRed <[email protected]>
Date:   Tue Jul 19 20:30:01 2022 +0200

    Cleanup Abyssea-LaTheine and Abyssea-Konschtat QM's

commit 6358095dbcd227521a0b2cd0d518dcbb3a24d285
Author: Schaedelschaden <[email protected]>
Date:   Tue Jul 19 12:00:16 2022 -0600

    Remove whitespace from tomahawk.lua

commit d9faeee667bcaeadd1e1acc65220983a7f3d8ccc
Author: Schaedelschaden <[email protected]>
Date:   Tue Jul 19 11:40:36 2022 -0600

    [JAs] Add functionality to WAR JA Tomahawk

commit c3d1916c2af7bd089a2cdade9f6517e05a85ebe4
Merge: c7ff32dae2 6f08f2d57f
Author: claywar <[email protected]>
Date:   Tue Jul 19 14:00:35 2022 -0400

    Merge pull request #2347 from Xaver-DaRed/Abyssea/Altepa

    [Abyssea] Enable Altepa's QM's Triggers and Trades

commit 6f08f2d57f07ca731245373d352eec173c41716a
Author: Xaver-DaRed <[email protected]>
Date:   Tue Jul 19 19:15:38 2022 +0200

    Change QM names from numeric to NM name

commit 1a2202254ca172f6d2bbace2ca384b73ba6582e7
Author: Xaver-DaRed <[email protected]>
Date:   Tue Jul 19 18:15:13 2022 +0200

    Enable Altepa's QM's Triggers and Trades

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

commit c7ff32dae2e33d68ff6d48f9d53e78117df415a0
Merge: 24d7fe1dce dde8ebe446
Author: Zach Toogood <[email protected]>
Date:   Tue Jul 19 15:22:14 2022 +0300

    Merge pull request #2345 from LandSandBoat/remove_casket_offsets

    [lua] Replace hard-coded casket and pyxis npc lookups with dynamic lookups by name

commit dde8ebe4465e2b2e07d1e7ba1e0339058b4545aa
Author: Zach Toogood <[email protected]>
Date:   Tue Jul 19 14:09:50 2022 +0300

    [lua] Replace hard-coded pyxis npc lookups with dynamic lookups by name

commit 277a3938d16e7d8982d13fe2df6c8fa05db5ad65
Author: Zach Toogood <[email protected]>
Date:   Tue Jul 19 13:44:37 2022 +0300

    [lua] Replace hard-coded casket npc lookups with dynamic lookups by name

commit 24d7fe1dce55c7cd504a748dc36d1597b75ccdf7
Merge: 7493a0132d e90510c33e
Author: Zach Toogood <[email protected]>
Date:   Tue Jul 19 08:35:48 2022 +0300

    Merge pull request #1636 from LandSandBoat/various_fixes

    Various downstream fixes

commit ff4bb18c091bbc9417b63dbefde2dfeac8a59de7
Merge: c2bb5d0330 7493a0132d
Author: Illzbee <[email protected]>
Date:   Mon Jul 18 10:24:14 2022 -0400

    Merge branch 'LandSandBoat:base' into base

commit 7493a0132d9487c53da84f7bed5aafeff3436f66
Merge: 806f15a0f4 9a8b0bd305
Author: Zach Toogood <[email protected]>
Date:   Mon Jul 18 08:13:32 2022 +0300

    Merge pull request #2326 from Sunderous/generic_env_var_handling

    [core] Update ENV VAR handling to be more universal

commit 806f15a0f41f7cbcad861c214ad4d8d5cb48486a
Merge: a0c82e330a ee97515fb1
Author: claywar <[email protected]>
Date:   Sun Jul 17 21:13:21 2022 -0400

    Merge pull request #2333 from WinterSolstice8/add_limits_to_recast_packet

    [core] [packets] Add limit of recasts sent to player in CCharRecastPacket to prevent crash

commit ee97515fb15b2c5704ff3943af4bee17d51e8c62
Author: WinterSolstice8 <[email protected]>
Date:   Sun Jul 17 17:48:40 2022 -0700

    [core] [packets] Add limit of recasts sent to player in CCharRecastPacket to prevent crash

commit 9a8b0bd3058238265e171e2a928abe1cb137429a
Author: Sunderous <[email protected]>
Date:   Sun Jul 17 17:40:00 2022 -0300

    Updated ENV VAR handling to be more universal

commit a0c82e330a68ddb49ce00e77e9e4774475c560c9
Merge: 1ed0da1dcf 41740b84a5
Author: claywar <[email protected]>
Date:   Sun Jul 17 19:05:51 2022 -0400

    Merge pull request #2331 from WinterSolstice8/fix_libluajit_build_aarch64

    [core] [cmake] Update FindLuaJIT.cmake to only apply LuaJIT src/Makefile changes to x86_64

commit 1ed0da1dcf9320da27f48d896f947201f7718aa3
Merge: 8300058dea 6e57a83b36
Author: claywar <[email protected]>
Date:   Sun Jul 17 18:47:46 2022 -0400

    Merge pull request #2330 from LandSandBoat/interaction/lost-in-translation

    Interaction - Quest: Lost in Translocation

commit 41740b84a5b3d950889c051938114dd38435f391
Author: WinterSolstice8 <[email protected]>
Date:   Sun Jul 17 15:45:02 2022 -0700

    [core] [cmake] Update FindLuaJIT.cmake to only apply LuaJIT src/Makefile changes to x86_64

commit 6e57a83b36fc6e5e377b2feb588fe49f8771bcb3
Author: claywar <[email protected]>
Date:   Sun Jul 17 18:29:55 2022 -0400

    Interaction - Quest: Lost in Translocation

commit 8300058deaed37bb2265d76abed2da2d8ac4acf7
Merge: d5afd58553 7fbbc9f21c
Author: claywar <[email protected]>
Date:   Sun Jul 17 17:24:58 2022 -0400

    Merge pull request #2328 from LandSandBoat/bugfix/lhe-cipher

    Correct spell ID for Lhe Cipher Item

commit d5afd58553e3fb93a6b5597311453e4ccad4c5ba
Merge: 2524e4c8ec adfb33dcd5
Author: claywar <[email protected]>
Date:   Sun Jul 17 17:13:43 2022 -0400

    Merge pull request #2327 from Sunderous/remove_docker_files

    Removed Docker related files

commit 7fbbc9f21c0acfcfdc6517b49adbcb551d85f7d0
Author: claywar <[email protected]>
Date:   Sun Jul 17 17:08:20 2022 -0400

    Correct spell ID for Lhe Cipher Item

commit 2524e4c8ec4bc1dd0e3dd5c8da9785cae5e371c8
Merge: 0bfff6de0e e93923083c
Author: claywar <[email protected]>
Date:   Sun Jul 17 17:02:32 2022 -0400

    Merge pull request #2325 from LandSandBoat/bugfix/hxi-version

    Update HXIClient to use version information from settings/default/login.lua

commit adfb33dcd565e2482a2f8e203d91e8b6846ce5d4
Author: Sunderous <[email protected]>
Date:   Sun Jul 17 17:48:03 2022 -0300

    Removed Docker related files

commit e93923083c8d4a35b2697623110c194a33dda52d
Author: claywar <[email protected]>
Date:   Sun Jul 17 16:45:45 2022 -0400

    Update HXIClient to use version information from settings/default/login.lua

    Update from test

    Additional safety and future-proofing

commit 0bfff6de0eef82538856303c944227adfa7dec44
Merge: b967fdfa56 2ace80914b
Author: claywar <[email protected]>
Date:   Sun Jul 17 16:13:43 2022 -0400

    Merge pull request #2319 from Hinekri/Items

    Update items.lua for Abyssea Items

commit b967fdfa5639c3166d30527e280d5e9b33f19ec6
Merge: 9d3875136d 64520de5c1
Author: claywar <[email protected]>
Date:   Sun Jul 17 15:55:37 2022 -0400

    Merge pull request #2315 from TeoTwawki/base

    Return out of onTrigger during synthesis

commit 9d3875136df4a5839c61e96082b2c46df875ecb1
Merge: 55d7d7a4bf b927b3a4c5
Author: claywar <[email protected]>
Date:   Sun Jul 17 15:51:35 2022 -0400

    Merge pull request #2312 from LandSandBoat/unused-charavailable

    Remove unused function in RoV Desert Winds

commit 2ace80914b56310a15d7d640ca977777eb657f07
Author: Hinekri <[email protected]>
Date:   Sun Jul 17 14:08:26 2022 -0500

    Update items.lua for Abyssea

commit 64520de5c15ab110783cebcf9d10645b042da560
Author: TeoTwawki <[email protected]>
Date:   Sun Jul 17 11:37:33 2022 -0400

    Return out of onTrigger during synthesis - tested on retail in multiple places including delivery NPCs, and could not activate any of the NPCs I tried

commit b927b3a4c5eab89720430ea725ab2ffe3d24ffd5
Author: claywar <[email protected]>
Date:   Sun Jul 17 09:50:27 2022 -0400

    Remove unused function in RoV Desert Winds

    Remove unnecessary require

    Remove items require

commit 55d7d7a4bf8db87e4bbafbead45dc95ec06e7d1e
Merge: f93c346821 957189d092
Author: claywar <[email protected]>
Date:   Sun Jul 17 08:35:06 2022 -0400

    Merge pull request #2311 from LandSandBoat/lgtm-warnings

    [lgtm] Fix various reported warnings

commit f93c346821fd4c2b020108e37118713e738a2e1f
Merge: e0607ff863 d8cee9de7a
Author: claywar <[email protected]>
Date:   Sun Jul 17 08:18:36 2022 -0400

    Merge pull request #2310 from LandSandBoat/chore/paren-filenames

    [chore] Remove parentheses from usable item names

commit 957189d09253f745f38b3996acaaca1c54e067cf
Author: claywar <[email protected]>
Date:   Sun Jul 17 08:15:57 2022 -0400

    [lgtm] Fix various reported warnings

commit d8cee9de7aa0254e202497b3099bc38a8cc0fbc4
Author: claywar <[email protected]>
Date:   Sun Jul 17 07:07:56 2022 -0400

    [chore] Remove parentheses from usable item names

commit e0607ff8633af6d58673f82e0cb96f054553b911
Merge: 6c9517f408 6eafa4c327
Author: claywar <[email protected]>
Date:   Sun Jul 17 06:42:22 2022 -0400

    Merge pull request #2309 from LandSandBoat/interaction/sanguinary

    Interaction - Missions: A Sanguinary Prelude through The Will of the World

commit 6eafa4c3275262c95004e57cae6979b7e935ef6d
Author: claywar <[email protected]>
Date:   Sat Jul 16 20:25:12 2022 -0400

    Interaction - Mission: Will of the World

commit 0087e859eeac9e671475f4906123d868bb407f02
Author: claywar <[email protected]>
Date:   Sat Jul 16 17:05:31 2022 -0400

    Interaction - Mission: Distorter of Time

commit c305677b5ff7a16158649794ba0ae1312a9860fc
Author: claywar <[email protected]>
Date:   Sat Jul 16 15:40:27 2022 -0400

    Interaction - Mission: Dungeons and Dancers

commit d637115855d8d3a5b22f74d291ab5992882cb5c9
Author: claywar <[email protected]>
Date:   Sat Jul 16 15:40:06 2022 -0400

    Interaction - Mission: A Sanguinary Prelude

commit 6c9517f408b74c3935d350fc8b18a8fc3de0fa75
Merge: ff257cf51c b73df37ed1
Author: claywar <[email protected]>
Date:   Sun Jul 17 06:22:10 2022 -0400

    Merge pull request #2303 from LandSandBoat/interaction/proof-of-valor

    Interaction - Mission: Proof of Valor

commit b73df37ed1d4e8ae7801af7c12e96815196b927b
Author: claywar <[email protected]>
Date:   Sun Jul 17 05:35:51 2022 -0400

    Interaction - Mission: Proof of Valor

    Rongelouts

    Add missing parameter to event update function

    Finish missing items and update from test

    Fix conditional

    Remove additional whitespace in var declaration

commit c2bb5d0330d0d81e5d4070b2a29540e5c5d36637
Merge: afd53ce8f7 edc9e03abb
Author: Illzbee <[email protected]>
Date:   Sat Jul 16 23:35:31 2022 -0400

    Merge branch 'base' of https://github.com/illzbee/LSB into base

commit afd53ce8f7e5aede2cf80223ccb9180d6d696004
Author: Illzbee <[email protected]>
Date:   Sat Jul 16 23:33:16 2022 -0400

    Add Poroggo Cassock and Porogo Casscok +1

    <!-- Remove space and place 'x' mark between square [] brackets or click the checkbox after saving to affirm the following points: -->
    <!-- (it should look like this: - [x] I have ...) -->
    **_I affirm:_**
    - [x] I have paid attention to this example and will edit again if need be to not break the formatting, or I will be ignored
    - [x] I have read and understood the [Contributing Guide](https://github.com/LandSandBoat/server/blob/base/CONTRIBUTING.md)
    - [x] I've _**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?

    Add Poroggo Cassock and Porogo Casscok +1
     "Closes #2301"

commit e90510c33ea51771d289a26bac809b5b843cf7e6
Author: Velyn <[email protected]>
Date:   Tue Apr 26 16:28:35 2022 +0300

    Increase number of results returned from linkshell list and search

commit fdf84347c956e8d0a1d8700b086776b54a6134df
Author: Velyn <[email protected]>
Date:   Tue Apr 26 16:20:01 2022 +0300

    Update the attacking mob's HiPCLvL

commit db7a2c8b1ecf8edd91fdc3daba7dd1867184b495
Author: Zach Toogood <[email protected]>
Date:   Tue Apr 26 16:15:12 2022 +0300

    Do not treat daze sub ids as item ids

    Co-authored-by: Ari <[email protected]>
    Co-authored-by: Velyn <[email protected]>

commit 1d755c29821c490df876425331384eb0db02299e
Author: Critical <[email protected]>
Date:   Sun Jul 10 18:16:57 2022 -0600

    Toraimorai Canal NM Audit

commit 6ff3a7e29fa767223d3bfe8dfe3d188bea157efb
Author: Critical <[email protected]>
Date:   Sun Jul 10 17:58:46 2022 -0600

    Inner Horutoto Ruins NM Audit

commit dd6de21888e0238bd495ac5cdb6100b95f784a46
Author: Critical <[email protected]>
Date:   Sun Jul 10 17:47:30 2022 -0600

    Outer Horutoto Ruins NM Audit

commit 96133e2bc63da9e394be63508b175ae529d4479a
Author: Critical <[email protected]>
Date:   Thu Jun 30 12:01:11 2022 -0600

    Giddeus NM Audit

commit 715c406ff3fdf56dc75a5f92849311b9559b9155
Author: Critical <[email protected]>
Date:   Thu Jun 30 11:36:38 2022 -0600

    West Sarutabaruta NM audit

commit 5a93859eb9e0aaa3b9f8d9341c354a3b22320d36
Author: Critical <[email protected]>
Date:   Thu Jun 30 11:28:09 2022 -0600

    East Sarutabaruta NM audit

commit edc9e03abbd3e04d5188885ace38f5744229c9ac
Author: Illzbee <[email protected]>
Date:   Sun Jul 3 20:32:10 2022 -0400

    change to 41943296

commit 9c02ccd7e0e29f681ead774387731ca5e3ab1c4f
Author: Illzbee <[email protected]>
Date:   Sun Jul 3 18:50:13 2022 -0400

    Change visitant status to not be removed upon KO
rdmkyran pushed a commit to rdmkyran/LandSandBoat that referenced this pull request Dec 22, 2022
@The-Aerec
Merge pull request LandSandBoat#2305 from Scarifi3dXI/bugfixes3
bdc7169 
Update Token Moogle reference
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Xaver-DaRed Xaver-DaRed Xaver-DaRed approved these changes

@Omnione Omnione Omnione approved these changes

@zach2good zach2good zach2good approved these changes

Assignees
No one assigned
Labels
squash Reminder to squash commits before/on merge (you can do this, or maintainers will do this for you)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@CatsEyeXI @zach2good @Omnione @Xaver-DaRed @claywar