Commit graph

207 commits

Author SHA1 Message Date
PeachyPeachSM64
19880356eb Revert "Fix INT_HIT_FROM_ABOVE/BELOW check (#751)"
Some checks failed
Build coop / build-linux (push) Has been cancelled
Build coop / build-steamos (push) Has been cancelled
Build coop / build-windows-opengl (push) Has been cancelled
Build coop / build-windows-directx (push) Has been cancelled
Build coop / build-macos-arm (push) Has been cancelled
Build coop / build-macos-intel (push) Has been cancelled
This reverts commit d8e9cd8641.
2025-05-06 16:58:25 +02:00
Agent X
7c33bbf2fa Fix star doors in rom hacks
Some checks failed
Build coop / build-ubuntu (push) Has been cancelled
Build coop / build-windows (push) Has been cancelled
Build coop / build-macos-arm (push) Has been cancelled
Build coop / build-macos-intel (push) Has been cancelled
2025-04-30 18:49:03 -04:00
Sunk
d8e9cd8641
Fix INT_HIT_FROM_ABOVE/BELOW check (#751)
Some checks are pending
Build coop / build-ubuntu (push) Waiting to run
Build coop / build-windows (push) Waiting to run
Build coop / build-macos-arm (push) Waiting to run
Build coop / build-macos-intel (push) Waiting to run
2025-04-27 17:28:29 -04:00
Prince Frizzy
15d6f6ae07
Add some sanity checks to prevent bugs and exploits. (#767)
* Add some sanity checks to prevent bugs and exploits.

* Improve sanity check for Koopa Shell Riding.

* Sort and optimize MarioState structure.
2025-04-27 17:02:15 -04:00
Sunk
407e74ccf7
Fix water pvp (#728)
Some checks are pending
Build coop / build-macos-intel (push) Waiting to run
Build coop / build-ubuntu (push) Waiting to run
Build coop / build-windows (push) Waiting to run
Build coop / build-macos-arm (push) Waiting to run
* Fix water pvp

* Revert "Fix water pvp"

This reverts commit 95adc3206e.

* The real fix

Turns out I needed to swap the x and z facing angles for the calculations
2025-04-09 19:13:18 -04:00
Sunk
1a23932e9b
Update revamped flying damage (#722) 2025-03-28 15:11:05 +10:00
Sunk
5ba01cc232
Improvements to non-pvp player interactions (#712)
Some checks are pending
Build coop / build-ubuntu (push) Waiting to run
Build coop / build-windows (push) Waiting to run
Build coop / build-macos-arm (push) Waiting to run
Build coop / build-macos-intel (push) Waiting to run
* Add more bounce interactions

* Prevent out of bounds pushing
2025-03-21 09:06:10 +10:00
Sunk
f9b6fba0b5
Fix revamped pvp oversight (#706)
Some checks are pending
Build coop / build-ubuntu (push) Waiting to run
Build coop / build-windows (push) Waiting to run
Build coop / build-macos-arm (push) Waiting to run
Build coop / build-macos-intel (push) Waiting to run
2025-03-16 21:20:29 +10:00
Sunk
dc4ac0f681
Properly fix lua interaction flags (#704)
Some checks are pending
Build coop / build-ubuntu (push) Waiting to run
Build coop / build-windows (push) Waiting to run
Build coop / build-macos-arm (push) Waiting to run
Build coop / build-macos-intel (push) Waiting to run
Reverts a change Isaac did a little while ago and fixes the source of the issue
2025-03-14 13:47:23 -04:00
Isaac0-dev
c7df4eb071 fixed interaction flags when a mod doesn't specify an interaction type 2025-03-05 23:04:52 +10:00
Sunk
34e20e763d
Update revamped PVP (#660)
* Fix water punches to include pitch in their range
* Allow rollouts to deal damage again
2025-03-05 11:18:19 +10:00
Isaac0-dev
14680f0d25 fix custom moveset attacks 2025-02-13 20:03:34 +10:00
Isaac0-dev
9a13c298ad added HOOK_ON_INTERACTIONS
this is called after mario's interactions are processed
2025-02-11 17:58:57 +10:00
Isaac0-dev
75b71e9b4d fix nametags and collisions with mirror mario 2025-01-19 13:46:28 +10:00
Sunk
a1746ab9cf
Fix pvp bugs (#612)
Fixed:
Dives dealing 0 knockback
Breakdances not dealing damage
Rollout invincibility bleeding into classic
2025-01-06 12:23:07 +10:00
Sunk
7b8cb0254f
Make water punches have a range (#557) 2024-12-12 00:05:36 -05:00
Agent X
849b5ead50 Fix chain chomp and Eyerok cutscenes 2024-11-29 12:40:39 -05:00
Sunk
947ce9f080
Rework PvP Balance (#357)
* PvP Rework

This rearranges the damages of last PR. The underused attacks should still see some buffs.

* Adjust how punches apply invincibility

Also increase punch invincibility timer to 12

* EmeraldLoc's easy suggestions

* Rework punching pvp

Punching no longer reduces invincibility frames. Instead, punches can ignore knockback invincibility and the full punch punch kick combo can be done.

* Adjust numbers

Breakdances should not deal 3 damage

* Potential fix for more common tripping

"Trip" here refers to 1 damage kicks

* Add temporary invincibility to rollouts

This is a test to see how different pvp feels with this change. Suggestion by sausrelics.

* Fix invincibility

* Prevent low damage/low knockback kicks altogether

* Update ignored attack list

* Allow dives to be attacked by most actions

A lot of people don't want dives to be entirely invincible and some suggested to make dives be able to only pierce through jump kicks

* Slightly nerf kick knockback

Suggestion by emily

* Rework dive piercing

Instead of all actions being able to hit dives other than jumpkicks, now only slidekicks (and ground pounds) can hit dives.

* Mild kick knockback increase from nerf

* Change direct equality to checking flag

* Decrease dive and punch knockback

* Prevent trades against dives with slidekicks

* Revert "Prevent trades against dives with slidekicks"

This reverts commit 2a2c3266a7.

* Allow ground pounds to always hit a sliding player

* Add server setting to change pvp

* Add pvp settings to config

* Add selection to menu

* Fix issues + autogen

* Rewrite goto statement to not use goto
2024-11-25 20:48:40 +10:00
Sunk
9621424069
Fix early hits (#363)
Sometimes, the player can ground pound a pole before even landing or punch/kick an enemy at high speeds which will kill the enemy but not give bounce back to the player. This fixes those, although there are definitely mod incompatibilities.
2024-10-17 18:31:01 +10:00
Sunk
b2bf9abafa
Add some suggestions from issues (#354)
* Make dives knockback based on speed

Suggestion from issue #349

* Add `get_local_coopnet_id`

Suggestion from issue #264

* Readd breakdancing as an attack

Suggestion not only from me but also from a few players I talked with. However this was not a suggestion that came from issues.

* Change around pvp damage

Suggestion from issue #343 and some changes from talking with the creator of the suggestion

* Change `get_local_coopnet_id`

The function can now take in any local id and has been renamed to just `get_coopnet_id`

* Suggested fixes
2024-10-07 13:43:04 +10:00
Sunk
260a429285
Some fixes for some small bugs (#351)
- Doors now no longer will be repeatedly talked even if you don't move away. It now behaves closer to vanilla.
- Fixed the ending level name not being able to be replaced.
2024-10-07 12:35:39 +10:00
Agent X
b0e76a699c Fix players bouncing on non existent players when entering a level in an airborne action 2024-07-08 19:57:33 -04:00
Isaac0-dev
a04aa4c240
make Lua calls to interaction functions call interaction hooks (#52)
* make Lua calls to interaction functions call interaction hooks

* Revert "make Lua calls to interaction functions call interaction hooks"

This reverts commit 14c597cd340cb19acd72f7e4327f6f078bf09f1d.

* thanks peachy for a far better solution

* don't let mods lie about what interaction it is
2024-06-07 19:14:33 -04:00
Agent X
ec3fb07e76 Add @Hex4dec HOOK_ON_ATTACK_OBJECT 2024-05-11 18:44:18 -04:00
Isaac0-dev
90b071acc0
exposed a bunch of interaction functions to Lua (#22)
Renamed the function interact_unknown_08 to interact_spiny_walking
and added the constant INTERACT_SPINY_WALKING, which has the same value of INTERACT_UNKNOWN_08
INTERACT_UNKNOWN_08 is kept for compatibility with smlua, and behavior dynos bins
2024-05-03 18:38:21 +10:00
Emily♥
29b67a3ef0 Pass "interaction" to HOOK_ALLOW_PVP_ATTACK and HOOK_ON_PVP_ATTACK + Fix broken links (#566)
* Pass "interaction" to HOOK_ALLOW_PVP_ATTACK and HOOK_ON_PVP_ATTACK

This let's you test for the kind of attack in the hook; for example, you can do `interaction & INT_KICK ~= 0` to test if the attack is a kick.

* Fix broken links in wiki

Have to go up one directory
2024-03-25 18:47:27 -04:00
Isaac0-dev
f07b74c3d2 cleanup and bug fixes 2024-03-19 19:48:48 +10:00
Agent X
e48670a2ef Fix red coin, secret, caps, WF platforms and goomba bhv overrides being broken 2024-03-17 18:05:44 -04:00
Agent X
de1e24b7b9 Remove sm64ex-coop compatibility 2024-03-17 16:32:49 -04:00
Agent X
8ca0fbb322 Allow players to bounce on non grounded players' heads 2024-03-06 20:11:34 -05:00
Agent X
5fffa9e9d9 Add the ability to have global star IDs
Set gLevelValues.useGlobalStarIds on init, this value not being the same for everyone will cause desyncs.
2024-02-20 22:06:40 -05:00
Agent X
0c646018c1 Remove need to restart for coop compatibility 2023-12-27 23:50:48 -05:00
Agent X
ec876b2017 Make PVP hitboxes a little more small 2023-12-16 10:06:58 -05:00
Agent X
eb167dbe9f Remove pvp tripping and make hitboxes a bit bigger 2023-12-12 18:20:01 -05:00
Agent X
be3967ab4e Shrink PVP hitboxes and re-add angle checks 2023-12-06 18:50:50 -05:00
David Joslin
8ab0e17876 Remove built-in cheats 2023-11-08 19:48:00 -05:00
Agent X
49bca1cc01 sm64coopdx
Co-Authored-By: Yuyake <140215214+AngelicMiracles@users.noreply.github.com>
Co-Authored-By: FluffaMario <50761036+FluffaMario@users.noreply.github.com>
Co-Authored-By: Gregory Heskett <gheskett@gmail.com>
Co-Authored-By: iZePlayzYT <69536095+iZePlayzYT@users.noreply.github.com>
Co-Authored-By: Isaac0-dev <62234577+Isaac0-dev@users.noreply.github.com>
Co-Authored-By: eros71 <16540103+eros71-dev@users.noreply.github.com>
2023-10-30 01:03:36 -04:00
Isaac0-dev
c9e4efdb31
custom level fixes and fixes from other pr (#483)
clean up custom level code
    fixed a bug where custom level course numbers weren't used by dynos warps
    removed a bunch of unused dynos code
    fix demos triggering incorrectly
    allowed the right Ctrl key to be used when opening the in game console
    fixed a softlock that was possible to experience when talking to the snowman in CCM
    fixed the bug where you can permanently lose your cap (bug created by my own PR from beta 32)
    fix the moderator feature I made a while back; I am amazed it even worked at all before
    fixed dynos warp initial actions being skipped (read ec8aabc for explanation)
    completely changed the way star names and course names work
2023-10-27 16:42:27 -07:00
David Joslin
cf20658079 Eyerok can now get attacked by remote players 2023-10-27 01:03:20 -07:00
David Joslin
48d517ab0d Add a 1 second window to prevent a warp from instantly warping you back (a workaround for broken romhack ports) 2023-10-26 16:08:43 -07:00
Sunk
df7e469016
Fix not being able to talk to doors twice (#458) 2023-08-18 19:25:39 +02:00
Sunk
d1aa4aee1e
Add gLevelValues.bubbleOnDeathBarrierInCapStages (#449)
Also add a few smaller fixes with bubbles
2023-07-18 18:01:05 -04:00
MysterD
ad91385e2b Prevent dropping items on non-stop star pickup 2023-06-22 23:48:12 -07:00
MysterD
7136a06dba Prevent bubble popping on dying players, prevent collision on recently unbubbled 2023-06-21 19:08:39 -07:00
MysterD
9e0e2be194 Made player-to-player collisions respect the intangible flag 2023-06-16 17:53:04 -07:00
MysterD
3a85b7051e Cleanup 2023-06-11 14:25:28 -07:00
Sunk
a0ff975ec8
Re-introduce a few vanilla bugs under gBehaviorValues (#413)
* Properly set Mario's y vel to 0 on popping

* Re-introduce a few vanilla bugs under gBehaviorValues

The Shell Mario glitch was patched as a side effect to patching a different bug, but several romhacks use it so I need it back.
The ability to collect multiple normal caps at once is needed for hat-in-hand using the hat factory glitch.

* Fix Shell Mario fix

Found the actual reason why the glitch doesn't work and figured that this change shouldn't affect anything else, so I removed its entry from gBehaviorValues.

* Add InfiniteRenderDistance to gBehaviorValues

I'm well aware that disabling the infinite render distance will be very desync prone, however a few glitches, most notably cloning and chuckya double jump, need objects load and unload from render distance.
2023-06-11 14:24:13 -07:00
MysterD
0a41cc70e9 Buffed basic pvp attacks 2023-06-02 22:04:22 -07:00
MysterD
e70ed3ed2b Added lightmaps to arena, slight balance tweaks 2023-05-31 00:34:38 -07:00
MysterD
5598ac95e7 Merge branch 'dev' of github.com:sm64ex-coop-dev/sm64ex-coop into dev 2023-05-14 12:12:30 -07:00