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

Add blaster_BC_buttons #582

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
+723 −2
Open

Add blaster_BC_buttons #582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
df02d64
add destruct
NoSloppy Feb 6, 2023
6fe4def
Merge branch 'profezzorn:master' into Add-BC-Blaster
NoSloppy Aug 1, 2023
6e23e0d
Add files via upload
NoSloppy Aug 1, 2023
21fa83e
ifdef or operand syntax fix
NoSloppy Aug 4, 2023
842d2ce
adjust button held timing for on/off
NoSloppy Aug 20, 2023
4e965d1
swap mode cycle and reload button action
NoSloppy Aug 21, 2023
bf997f6
Delete blaster_BC_buttons.h
NoSloppy Aug 24, 2023
1a3205e
Add files via upload
NoSloppy Aug 24, 2023
9a15317
allow derived classes
NoSloppy Aug 24, 2023
54aef0c
SB_Effect override change to SB_Effect2
NoSloppy Mar 23, 2024
3325b63
Update SB_Effect to use EffectLocation
NoSloppy Mar 24, 2024
3b225b5
PVLOG syntax adjust
NoSloppy Dec 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions common/saber_base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ extern SaberBase* saberbases;
DEFINE_EFFECT(UNJAM) \
DEFINE_EFFECT(PLI_ON) \
DEFINE_EFFECT(PLI_OFF) \
DEFINE_EFFECT(DESTRUCT) \
Copy link
Owner

Choose a reason for hiding this comment

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

self-destruct is usually an off-type rather than an effect...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It is,

        case NEXT_ACTION_BLOW:
          Off(OFF_BLAST);
          break;

But having EFFECT_DESTRUCT allows for blade animations.

/* Mini game effects */ \
DEFINE_EFFECT(GAME_START) \
DEFINE_EFFECT(GAME_ACTION1) \
Expand Down
4 changes: 2 additions & 2 deletions props/blaster.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ class Blaster : public PROP_INHERIT_PREFIX PropBase {
SetNextAction(what, when * 1000);
}

void PollNextAction() {
virtual void PollNextAction() {
if (millis() - time_base_ > next_event_time_) {
switch (next_action_) {
case NEXT_ACTION_NOTHING:
Expand Down Expand Up @@ -307,7 +307,7 @@ class Blaster : public PROP_INHERIT_PREFIX PropBase {
SetNextActionF(NEXT_ACTION_ARM, len);
}

void selfDestruct() {
virtual void selfDestruct() {
SaberBase::DoEndLockup();
#ifdef ENABLE_AUDIO
float len = hybrid_font.GetCurrentEffectLength();
Expand Down
Loading