Feature: Crowd Control Integration #1568

dcvz · 2022-09-23T00:33:19Z

No description provided.

…owd-control # Conflicts: # libultraship/libultraship/Lib/SDL/lib/x86/SDL2.lib # libultraship/libultraship/Lib/SDL/lib/x86/SDL2main.lib # soh/soh/Enhancements/debugconsole.cpp

This reverts commit 2aafcc1.

This reverts commit 65e76dc.

# Conflicts: # libultraship/libultraship/Window.cpp # soh/CMakeLists.txt # soh/soh/Enhancements/debugconsole.cpp # soh/src/code/z_play.c # soh/src/overlays/actors/ovl_player_actor/z_player.c

soh/src/code/z_parameter.c

* First attempt pacifier fix * Real fix for pacifist mode * Comment

garrettjoecox · 2022-09-27T18:21:43Z

I think at the very least we can prefix these variables in a way that makes it more obvious what they are when you come across them. Also because they are console commands not necessarily tied to CC I wouldn’t involve CC in the naming: eg noUI = sohTempVarNoUI

Bump on this

briaguya0 · 2022-09-27T18:26:18Z

across them. Also because they are console commands not necessarily tied to CC I wouldn’t involve CC in the naming: eg noUI = sohTempVarNoUI

Bump on this

what about "Chaos Effect" as a naming convention. I'm thinking we could add a "chaos mode" for offline play that triggers random chaos effects every so often so they aren't just limited to crowd control/console command use

briaguya0 · 2022-09-27T18:55:20Z

soh/soh/Enhancements/debugconsole.h

+extern uint32_t noUI;
+extern uint32_t giantLink;
+extern uint32_t minishLink;
+extern uint32_t paperLink;
+extern uint32_t gravityLevel;
+extern uint32_t resetLinkScale;
+extern uint32_t invisibleLink;
+extern uint32_t oneHitKO;
+extern uint32_t pacifistMode;
+extern int32_t defenseModifier;
+extern uint32_t noZ;
+extern uint32_t reverseControls;
+extern int32_t speedModifier;


Why use uint32_t for boolean values?

Original implementation had them so I kept them, can replace them with bools

Actually learned that they are indeed needed. We're using these variables in c code from the decomp and bools are not playing nice

briaguya0 · 2022-09-27T18:58:02Z

soh/src/overlays/actors/ovl_player_actor/z_player.c

+    if (gravityLevel == 2) {
+        this->actor.gravity = -4.0f;
+    }
+
+    if (gravityLevel == 0) {
+        this->actor.gravity = -0.3f;
+    }


these values feel like magic numbers, we're only checking 0 and 2 here, what is gravity level 2? seems like using #defines or and enum for these could be good

briaguya0 · 2022-09-27T18:58:49Z

soh/src/overlays/actors/ovl_player_actor/z_player.c

+        this->actor.scale.z =  paperLink == 2 ? 0.001f : 0.01f;
+    }
+
+    if (resetLinkScale == 1) {


if we just used bool instead of uint32_t for these (even if we don't) this could just be if (resetLinkScale)

…ntrol

Co-authored-by: briaguya <briaguya@alice>

* Start effects * Disable input to game when typing in console * Add gravity support * noUI placeholder * Add rest of effects to console * Remove z_play code * Add rupee modification * Add OneHit KO (HarbourMasters#27) * few fix and paper Link * Better method and now use the reset flag * Revert "Better method and now use the reset flag" This reverts commit 2aafcc1. * Revert "few fix and paper Link" This reverts commit 65e76dc. * Paper Link & few fixes (HarbourMasters#28) * Implement pacifist mode (HarbourMasters#30) * Implement cucco storm (HarbourMasters#31) * Add no UI functionality (HarbourMasters#32) * Enable CrowdControl on windows (HarbourMasters#33) * Use std::format and implement wallmaster * Implement defense modifier * Implement no_z and clean up * Implement reverse controls * Some fixes while testing CC connection * Implement speed modifier and fix defese modifier * Fail magic effects if magic is not acquired * Fix queue system * Implement rainstorm * Some cleanup * Use IS_ZERO to handle very low near zero values * Split some effects * Fix emptying magic * Don’t run cucco on pre-rendered backgrounds * Use correct method for updating ruppees * Fix decreasing speed * Remove old SDL stuff * Remove old fixes * Enable Crowd Control for both debug and release * Add missing returns * Cleanup event firing * Further clean up on event firing * Fix some bugs * CC fixes and enemy spawning (HarbourMasters#35) * Fix icetraps * Fix title screen * Fix pause screen * Fix death screen timer & Code cleanup * Fix timer during textboxes * Code cleanup * Add: Multiple enemy spawning * More enemies + more code cleanup (HarbourMasters#36) * Enums for returning effect states * Add more enemies * Update CrowdControl.cpp * Remove enums from enemies * Fix up flow for events (HarbourMasters#37) # Conflicts: # soh/soh/Enhancements/crowd-control/CrowdControl.cpp * Fix spawn position of likelike * CC temp enemy fixes (HarbourMasters#38) * Check for pause in pacifist and allow button presses (HarbourMasters#39) * Fix Pacifist mode (HarbourMasters#41) * First attempt pacifier fix * Real fix for pacifist mode * Comment * Remove cutscene and long delay from cucco_storm (HarbourMasters#40) * Some PR Fixes * Use standard types * Handle JSON parsing error and free memory * Add CC configuration file * Add: Giving deku shield option. Fix: Giant Lonk (HarbourMasters#42) * Small stalfos fix (HarbourMasters#43) * Syntax Improvements (HarbourMasters#44) * Revert bools to uint32_t * Add comment about bools * Fix cucco storm, fix empty heart (HarbourMasters#45) * Protect commands vector with mutex * prefix effects with chaosEffect (HarbourMasters#46) Co-authored-by: briaguya <briaguya@alice> Co-authored-by: Baoulettes <[email protected]> Co-authored-by: aMannus <[email protected]> Co-authored-by: briaguya <[email protected]> Co-authored-by: briaguya <briaguya@alice>

* Start effects * Disable input to game when typing in console * Add gravity support * noUI placeholder * Add rest of effects to console * Remove z_play code * Add rupee modification * Add OneHit KO (#27) * few fix and paper Link * Better method and now use the reset flag * Revert "Better method and now use the reset flag" This reverts commit 2aafcc1. * Revert "few fix and paper Link" This reverts commit 65e76dc. * Paper Link & few fixes (#28) * Implement pacifist mode (#30) * Implement cucco storm (#31) * Add no UI functionality (#32) * Enable CrowdControl on windows (#33) * Use std::format and implement wallmaster * Implement defense modifier * Implement no_z and clean up * Implement reverse controls * Some fixes while testing CC connection * Implement speed modifier and fix defese modifier * Fail magic effects if magic is not acquired * Fix queue system * Implement rainstorm * Some cleanup * Use IS_ZERO to handle very low near zero values * Split some effects * Fix emptying magic * Don’t run cucco on pre-rendered backgrounds * Use correct method for updating ruppees * Fix decreasing speed * Remove old SDL stuff * Remove old fixes * Enable Crowd Control for both debug and release * Add missing returns * Cleanup event firing * Further clean up on event firing * Fix some bugs * CC fixes and enemy spawning (#35) * Fix icetraps * Fix title screen * Fix pause screen * Fix death screen timer & Code cleanup * Fix timer during textboxes * Code cleanup * Add: Multiple enemy spawning * More enemies + more code cleanup (#36) * Enums for returning effect states * Add more enemies * Update CrowdControl.cpp * Remove enums from enemies * Fix up flow for events (#37) # Conflicts: # soh/soh/Enhancements/crowd-control/CrowdControl.cpp * Fix spawn position of likelike * CC temp enemy fixes (#38) * Check for pause in pacifist and allow button presses (#39) * Fix Pacifist mode (#41) * First attempt pacifier fix * Real fix for pacifist mode * Comment * Remove cutscene and long delay from cucco_storm (#40) * Some PR Fixes * Use standard types * Handle JSON parsing error and free memory * Add CC configuration file * Add: Giving deku shield option. Fix: Giant Lonk (#42) * Small stalfos fix (#43) * Syntax Improvements (#44) * Revert bools to uint32_t * Add comment about bools * Fix cucco storm, fix empty heart (#45) * Protect commands vector with mutex * prefix effects with chaosEffect (#46) Co-authored-by: briaguya <briaguya@alice> Co-authored-by: Baoulettes <[email protected]> Co-authored-by: aMannus <[email protected]> Co-authored-by: briaguya <[email protected]> Co-authored-by: briaguya <briaguya@alice>

dcvz and others added 30 commits August 11, 2022 17:12

Start effects

1bebf6a

Disable input to game when typing in console

d5f8dbf

Add gravity support

9e54c6d

noUI placeholder

8b0117b

Add rest of effects to console

3b0b653

Remove z_play code

745d0d2

Add rupee modification

82e5e3d

Merge remote-tracking branch 'upstream/develop-zhora' into feature/cr…

b57e44a

…owd-control # Conflicts: # libultraship/libultraship/Lib/SDL/lib/x86/SDL2.lib # libultraship/libultraship/Lib/SDL/lib/x86/SDL2main.lib # soh/soh/Enhancements/debugconsole.cpp

Add OneHit KO (#27)

af5313d

few fix and paper Link

65e76dc

Better method and now use the reset flag

2aafcc1

Revert "Better method and now use the reset flag"

2449375

This reverts commit 2aafcc1.

Revert "few fix and paper Link"

744f494

This reverts commit 65e76dc.

Paper Link & few fixes (#28)

eed1fe8

Merge branch 'develop-zhora' into feature/crowd-control

6780549

# Conflicts: # libultraship/libultraship/Window.cpp # soh/CMakeLists.txt # soh/soh/Enhancements/debugconsole.cpp # soh/src/code/z_play.c # soh/src/overlays/actors/ovl_player_actor/z_player.c

Implement pacifist mode (#30)

8cb7f81

Implement cucco storm (#31)

5c26a3d

Add no UI functionality (#32)

8503b26

Enable CrowdControl on windows (#33)

7ffc724

Use std::format and implement wallmaster

bc15483

Implement defense modifier

f51228c

Implement no_z and clean up

1d5795c

Implement reverse controls

90e9c95

Some fixes while testing CC connection

adcb8a6

Implement speed modifier and fix defese modifier

a690c14

Fail magic effects if magic is not acquired

4747410

Fix queue system

1ac5b39

Implement rainstorm

c5678c7

Some cleanup

eca1d42

Use IS_ZERO to handle very low near zero values

7b38be0

briaguya0 reviewed Sep 26, 2022

View reviewed changes

soh/src/code/z_parameter.c Outdated Show resolved Hide resolved

aMannus and others added 5 commits September 26, 2022 23:19

Fix Pacifist mode (#41)

62d9097

* First attempt pacifier fix * Real fix for pacifist mode * Comment

Remove cutscene and long delay from cucco_storm (#40)

18f99f2

Some PR Fixes

ac7421b

Use standard types

0a43f2f

Handle JSON parsing error and free memory

17f99b6

dcvz force-pushed the feature/crowd-control branch from b6d19d9 to 17f99b6 Compare September 26, 2022 21:56

dcvz and others added 2 commits September 27, 2022 16:15

Add CC configuration file

c943584

Add: Giving deku shield option. Fix: Giant Lonk (#42)

86a8b1e

dcvz marked this pull request as ready for review September 27, 2022 17:37

briaguya0 reviewed Sep 27, 2022

View reviewed changes

aMannus and others added 5 commits September 27, 2022 21:00

Small stalfos fix (#43)

d9b01dc

Syntax Improvements (#44)

7539eca

Revert bools to uint32_t

2696506

Add comment about bools

2f8e4ba

Fix cucco storm, fix empty heart (#45)

cd48426

dcvz force-pushed the feature/crowd-control branch from 705da1b to cd48426 Compare September 27, 2022 22:12

dcvz and others added 3 commits September 28, 2022 00:13

Merge remote-tracking branch 'upstream/develop' into feature/crowd-co…

8c8aead

…ntrol

Protect commands vector with mutex

5948ef6

prefix effects with chaosEffect (#46)

26d6f9a

Co-authored-by: briaguya <briaguya@alice>

Kenix3 approved these changes Sep 28, 2022

View reviewed changes

briaguya0 approved these changes Sep 28, 2022

View reviewed changes

briaguya0 merged commit 083ceb4 into HarbourMasters:develop Sep 28, 2022

dcvz deleted the feature/crowd-control branch September 28, 2022 07:44

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Feature: Crowd Control Integration #1568

Feature: Crowd Control Integration #1568

Uh oh!

dcvz commented Sep 23, 2022

Uh oh!

Uh oh!

garrettjoecox commented Sep 27, 2022

Uh oh!

briaguya0 commented Sep 27, 2022 •

edited

Loading

Uh oh!

briaguya0 Sep 27, 2022

Uh oh!

dcvz Sep 27, 2022

Uh oh!

dcvz Sep 27, 2022

Uh oh!

briaguya0 Sep 27, 2022

Uh oh!

dcvz Sep 27, 2022

Uh oh!

briaguya0 Sep 27, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Feature: Crowd Control Integration #1568

Feature: Crowd Control Integration #1568

Uh oh!

Conversation

dcvz commented Sep 23, 2022

Uh oh!

Uh oh!

garrettjoecox commented Sep 27, 2022

Uh oh!

briaguya0 commented Sep 27, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

briaguya0 Sep 27, 2022

Choose a reason for hiding this comment

Uh oh!

dcvz Sep 27, 2022

Choose a reason for hiding this comment

Uh oh!

dcvz Sep 27, 2022

Choose a reason for hiding this comment

Uh oh!

briaguya0 Sep 27, 2022

Choose a reason for hiding this comment

Uh oh!

dcvz Sep 27, 2022

Choose a reason for hiding this comment

Uh oh!

briaguya0 Sep 27, 2022

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

briaguya0 commented Sep 27, 2022 •

edited

Loading