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

[Feature] Add Respawn Details Into Briefing #234

Merged

Conversation

cow-co
Copy link
Contributor

@cow-co cow-co commented Nov 24, 2024

Pull Request Description

When merged this pull request will:

  • Add an entry to the briefing, containing the respawn settings for the mission, for the player's side.

Release Notes

  • Under the Framework part of the briefing, there is a new Current Respawn Settings entry.
  • No configuration needed beyond what is already there for the respawn framework.
  • Fields that are not defined for the respawn will be marked as "Not set"
  • Covers:
    • Respawn mode (friendly-named, eg. "Timed Waves, with Tickets")
    • Respawn Delay
    • Side tickets
    • player tickets

IMPORTANT

  • Testing has been completed as neccessary, depending on the nature & impact of the changes. Tested locally and on the server, for opfor, blufor, indfor, with various commbinations of respawn settings.
  • The Release Notes section below must be filled out appropriately to explain the changes made in this PR. This section will be used in Framework Changelogs.
  • If the contribution affects the wiki, please include your changes in this pull request so the wiki is consistently updated.
  • Contribution Guidelines are read, understood and applied.
  • Title of this PR uses our standard template [Descriptor] - Add|Fix|Improve|Change|Make|Remove {changes}.

@cow-co
Copy link
Contributor Author

cow-co commented Nov 24, 2024

Addresses Issue #202

@cow-co
Copy link
Contributor Author

cow-co commented Nov 24, 2024

May make another PR for a similar thing, but with medical settings.

_briefing = "";
_side = side player;

_respawnModeTimedText = str RESPAWN_MODE_TIMED;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Lord forgive me.

#endif
#ifdef RESPAWN_PLAYER_TICKETS_CIVILIAN
_individualTickets = RESPAWN_PLAYER_TICKETS_CIVILIAN;
#endif
Copy link
Contributor Author

Choose a reason for hiding this comment

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

for I have sinned.

@dgibso29 dgibso29 added this to the 1.8.0 milestone Nov 24, 2024
Copy link
Collaborator

@Bubbus Bubbus left a comment

Choose a reason for hiding this comment

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

I don't really see a better way to do this tbh, so good approach. Few minor things - fix yourself or I will in a year or two. tyvm

// CA - Respawn briefing section
// ====================================================================================

_briefing = "";
Copy link
Collaborator

Choose a reason for hiding this comment

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

Use private keyword pls

#include "../../macros.hpp"

#define RESPAWN_MODE_NAME_TIMED "Timed"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Prefer to have these in respawn_macros.hpp so they're in the same place as the things they refer to.

@Bubbus Bubbus force-pushed the feature/respawn-config-in-briefing branch from 3c6042b to 43801db Compare December 5, 2024 21:04
@Bubbus Bubbus merged commit af55bde into CombinedArmsGaming:develop Dec 5, 2024
1 check passed
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