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

CentCom Dueling Refactor #2300

Draft
wants to merge 12 commits into
base: master
Choose a base branch
from

Conversation

LikeLakers2
Copy link
Contributor

@LikeLakers2 LikeLakers2 commented Jun 16, 2024

About The Pull Request

This PR attempts to refactor the dueling requestor, as well as small parts of the dueling system in general.

DONE: See Changelog section below, plus:

  • Componentizes some logic from the fight button. In particular, much of the start/end duel logic as been componentized, though the following still needs to be done (will be updated as I find more that should be added):
    • Unregistering the player if they return to ghost
    • Spawning weapons
    • Moving the player to their spawn location
    • Countdowns
    • Handling a player dying
    • Handling a player leaving

TODO List (will be updated and added to occasionally as I figure out more stuff to fix):

  • Refactor code that manages the players
    • It would also be nice to set up the system to allow for an arbitrary number of players to be registered at any one time - either as a queue system, or to allow for duels which involve more than two players.
  • Try to make the pacifist detection a bit better - in particular, see if we can't find a way to return the pacifist trait to them (with the same source) if they win

Why It's Good For The Game

The Duel Requestor 3000 is a nice way to allow players to fight each other. However, as it stands, its code is sorta shit.

Changelog

🆑 MichiRecRoom
qol: The Duel Requestor 3000 now shows duel data upon examine
fix: Donator multiplier no longer applies to being reimbursed, if player two does not have enough monkecoins.
fix: Players can no longer override each other at the dueling requestor - if two people try to set the rules at the same time, or if two people try to sign up as player two at the same time, only the first one will be accepted.
refactor: Duel Requestor 3000 maptext code has been refactored
refactor: The duel arena spawn locations are now landmarks, rather than hardcoded coordinates. As a result, some arenas now have different spawn locations - but I tried to keep them as fair as possible.
/:cl:

@LikeLakers2
Copy link
Contributor Author

Ah, I didn't realize the checks would run even on a draft PR... so I'll close this for now, to prevent from taking up github actions time that could be used on other PRs.

@LikeLakers2
Copy link
Contributor Author

Actually, I think I'll keep this open, and just push slightly less often.

@LikeLakers2 LikeLakers2 reopened this Jun 16, 2024
@DexeeXI DexeeXI added Fix fix da bug Refactor/Rework Completely redoing a larger thing / recoding a thing QoL improves quality of life labels Dec 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix fix da bug Merge Conflict QoL improves quality of life Refactor/Rework Completely redoing a larger thing / recoding a thing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants