Skip to content

[lua, sql] Bastok 9-2 Behavior Adjustments#8452

Merged
Xaver-DaRed merged 1 commit intoLandSandBoat:basefrom
CriticalXI:bastok_mission_fix
Oct 23, 2025
Merged

[lua, sql] Bastok 9-2 Behavior Adjustments#8452
Xaver-DaRed merged 1 commit intoLandSandBoat:basefrom
CriticalXI:bastok_mission_fix

Conversation

@CriticalXI
Copy link
Contributor

@CriticalXI CriticalXI commented Oct 18, 2025

I affirm:

  • I understand that if I do not agree to the following points by completing the checkboxes my PR will be ignored.
  • I understand I should leave resolving conversations to the LandSandBoat team so that reviewers won't miss what was said.
  • I have read and understood the Contributing Guide and the Code of Conduct.
  • I have 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?

  • Converts Volker to new helper NPC mixin. Corrects a bug with multiple Volkers spawning with multiple players.
  • Zeid in phase two now respawns his clones after a minute delay.
  • Adds regain to Zeid, along with him occasionally TPing twice in a row.
  • Adds missing Shockwave TP move to Zeid and adjusted Abyssal Strike to stun duration observed in capture. Also added skillchain properties to great sword mob TP moves based off of capture.

Steps to test these changes

!setplayernation 1
!setrank <your_name> 9
!addmission bastok where_two_paths_converge
!setmissionstatus <your_name> 1 bastok

Source

https://youtu.be/F6klCAH51rs
https://1drv.ms/u/c/87e665e10555c452/EXWo0vcnr8NJunDEre5uFdIBpguxT25mXIFQZ77lOcRqOA?e=D0bTMS

https://youtu.be/YZKC5HkjhV0
https://drive.google.com/open?id=1X8HGWTyLpurYPcYm7_3bIRq1uTJrftri

@CriticalXI CriticalXI force-pushed the bastok_mission_fix branch 3 times, most recently from 0cd81fa to 182ef4c Compare October 18, 2025 22:55
Xaver-DaRed
Xaver-DaRed reviewed Oct 21, 2025
View reviewed changes
Xaver-DaRed
Xaver-DaRed reviewed Oct 21, 2025
View reviewed changes
@Xaver-DaRed
Copy link
Contributor

Xaver-DaRed commented Oct 21, 2025

Rebase, please

@CriticalXI CriticalXI force-pushed the bastok_mission_fix branch 4 times, most recently from dcc4aac to 5fb1281 Compare October 23, 2025 02:37
@Xaver-DaRed
Copy link
Contributor

Xaver-DaRed commented Oct 23, 2025

Sanity checks

@Xaver-DaRed Xaver-DaRed merged commit f376e11 into LandSandBoat:base Oct 23, 2025
15 checks passed
Skold177 added a commit to SlowedHaste/LSB that referenced this pull request Oct 23, 2025
@Skold177
Squashed commit of the following:
7667629 
commit ca10c4f
Merge: 6a7b3f5 0104172
Author: Skold177 <113406182+Skold177@users.noreply.github.com>
Date:   Thu Oct 23 19:31:13 2025 -0400

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

commit 0104172
Merge: 2c50e23 ee7a7a8
Author: WinterSolstice8 <60417494+WinterSolstice8@users.noreply.github.com>
Date:   Thu Oct 23 14:21:48 2025 -0600

    Merge pull request LandSandBoat#8490 from cocosolos/clang-tidy-fix

    Fix optional clang-tidy

commit ee7a7a8
Author: Corey Sotiropoulos <coco@solos.dev>
Date:   Thu Oct 23 19:38:09 2025 +0000

    Fix optional clang-tidy

    Missed a renamed var.

commit 2c50e23
Merge: b7da4a4 02b485d
Author: WinterSolstice8 <60417494+WinterSolstice8@users.noreply.github.com>
Date:   Thu Oct 23 12:58:53 2025 -0600

    Merge pull request LandSandBoat#8489 from cocosolos/docker

    Fix issue with Docker image names

commit 02b485d
Author: Corey Sotiropoulos <coco@solos.dev>
Date:   Thu Oct 23 18:20:41 2025 +0000

    Fix issue with Docker image names

commit b7da4a4
Merge: 73505ce 4cd50a9
Author: WinterSolstice8 <60417494+WinterSolstice8@users.noreply.github.com>
Date:   Thu Oct 23 11:57:31 2025 -0600

    Merge pull request LandSandBoat#8486 from cocosolos/docker

    Fix issue with docker tags and meshes

commit 4cd50a9
Author: Corey Sotiropoulos <coco@solos.dev>
Date:   Thu Oct 23 17:31:54 2025 +0000

    Fix issue with docker tags and meshes

commit 73505ce
Merge: 5c9acb5 7034493
Author: Zach Toogood <zrtoogood@gmail.com>
Date:   Thu Oct 23 18:05:00 2025 +0100

    Merge pull request LandSandBoat#8332 from cocosolos/docker

    Docker + CI Updates

commit 7034493
Author: Corey Sotiropoulos <coco@solos.dev>
Date:   Thu Oct 16 05:05:31 2025 +0000

    Retry certain CI jobs on failure

    Windows startup checks and potentially APT can be problematic.

commit e6a1aea
Author: Corey Sotiropoulos <coco@solos.dev>
Date:   Fri Jun 27 23:39:13 2025 -0400

    Add local development compose file

commit 52f3432
Author: Corey Sotiropoulos <coco@solos.dev>
Date:   Thu Jun 5 04:08:18 2025 -0400

    Update CI/CD

    Build cache on commits to base using proper cache keys.
    Use fresh cache during CI builds (big improvement to build times).
    Skip clang-tidy if no source changes during CI builds.
    Improve CI results using GitHub Actions summaries.
    Move CI test job into separate workflow.
    Combine Windows and Linux test workflows.

    Note:
    ccache cache isn't being extracted from Docker image, causing full
    rebuilds every time. Disable Docker build in CI workflows until we can
    fix this.

commit 2166942
Author: Corey Sotiropoulos <coco@solos.dev>
Date:   Thu Jun 5 04:03:48 2025 -0400

    Add Docker support

    Ubuntu and Alpine based images, with options for a GCC or Clang build.
    Caching optimized for local building.
    See docker/README.md for more info.

commit a52f0c2
Author: Corey Sotiropoulos <coco@solos.dev>
Date:   Tue Sep 9 16:50:35 2025 -0400

    Update fmt

    Fixes issue with newer clang version:
    fmt/format.h:4429:27: error: identifier '_a' preceded by whitespace in a literal operator declaration is deprecated [-Werror,-Wdeprecated-literal-operator]

commit 7bed226
Author: Corey Sotiropoulos <coco@solos.dev>
Date:   Thu Jun 5 03:54:01 2025 -0400

    Embed debug information in Windows executables

    Using external debugging info causes issues with relative paths.

commit 187621a
Author: Corey Sotiropoulos <coco@solos.dev>
Date:   Wed Oct 1 00:51:32 2025 -0400

    Format Python files with Black formatter

commit 5c9acb5
Merge: f376e11 dd43099
Author: WinterSolstice8 <60417494+WinterSolstice8@users.noreply.github.com>
Date:   Thu Oct 23 09:41:43 2025 -0600

    Merge pull request LandSandBoat#8484 from sruon/s2c_mission

    S2C: MISSION

commit f376e11
Merge: 943bb0d 4734390
Author: Xaver-DaRed <60053999+Xaver-DaRed@users.noreply.github.com>
Date:   Thu Oct 23 13:00:13 2025 +0200

    Merge pull request LandSandBoat#8452 from CriticalXI/bastok_mission_fix

    [lua, sql] Bastok 9-2 Behavior Adjustments

commit dd43099
Author: sruon <sruon@users.noreply.github.com>
Date:   Thu Oct 23 00:15:38 2025 -0600

    GP_SERV_COMMAND_MISSION

    Co-Authored-By: atom0s <atom0s@users.noreply.github.com>

commit 4734390
Author: Critical <48370698+CriticalXI@users.noreply.github.com>
Date:   Tue Oct 14 21:04:07 2025 -0600

    [lua, sql] Bastok 9-2 Behavior Adjustments
@CriticalXI CriticalXI deleted the bastok_mission_fix branch November 22, 2025 16:39
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

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@CriticalXI @Xaver-DaRed