Commit graph

875 commits

Author SHA1 Message Date
Sally Coolatta
b7f0f05f84 Merge branch 'master' into new-spb 2022-09-21 02:12:53 -04:00
James R
e7b0e223e1 Fix respawning item boxes with P_RespawnBattlesBoxes 2022-09-20 10:36:32 -07:00
James R
f6ef29cf03 Refactor item debris cloud
- The "cloud" is stationary and spawned on the item box
instead of the player. Still scales up with speed.
- Single particles are spawned behind the player. No
longer scales. Lasts longer but can end early if the
player slows down.
2022-09-20 05:45:28 -07:00
James R
c2b2cd9a43 Reenable item box respawning
Old code was shit so I removed it (4d67cc632). Turns out
none of that bullshit actually mattered to make this box
respawn and it just needs to go to an invisible state!

Makes use of some nifty flickering code (that was already
there but effectively disabled) shortly before it actually
respawns.
2022-09-20 05:45:28 -07:00
Sally Coolatta
5767315787 SPB in its own file + better waypoint movement 2022-09-18 01:07:46 -04:00
James R
4d67cc6324 Replace shitty item box pop with flying debris and dust clouds
Debris flies forward and outward from the player in the
direction of momentum. Debris particles bounce once then
disappear when they hit the ground for the second time.
Clouds spawn on and trail behind the player for a short
duration.
2022-09-17 06:41:44 -07:00
spherallic
3a2fe22485 Don't read or set MT_NULL's properties in A_SkullAttack
(cherry picked from commit 878b4dc5b6025e1deef775ccb72b8a871833598a)
2022-09-05 11:56:30 -07:00
James R
72342338b1 Use P_CheckMove
(cherry picked from commit 9dfa153e7497403d874e980868b7aa6d15595286)
2022-09-05 11:56:30 -07:00
James R
b17717babe A_LobShot: remove ???
MT_NULL spawning, not cool bro.

(cherry picked from commit f6f002e70b645982dddd83d6f831a601faa0fdae)
2022-09-05 11:56:30 -07:00
James R
37c3a55dda Fix conflicts 522467a88 2022-09-05 11:56:30 -07:00
Sally Coolatta
0141ea5a7c Infinite tether uses lightning shield effects 2022-08-23 20:27:19 -04:00
AJ Martinez
bf976a7bca Make SPB match its target's hitlag 2022-05-31 17:04:41 -05:00
Sally Coolatta
8815b065b3 Merge branch 'master' into bot-rubberband-edit 2022-05-25 23:29:04 -04:00
James R
0bcabbb88a Merge branch 'grow-adjustments' into 'master'
Minor Grow scale corrections

See merge request KartKrew/Kart!605
2022-05-25 08:05:40 +00:00
toaster
bf6d257cfb Prevent rings from suddenly growing in size when a Grow player interacts with them, to match how using rings while grown or shrunk have them at mapobjectscale. 2022-05-24 18:41:13 +01:00
Sally Coolatta
c678146f0c Drastically simplified bot rubberbanding 2022-05-23 23:59:18 -04:00
Sally Coolatta
d053d5f8ba Fix blockmap WILD inconsistency when it's not PIT_CheckThing
An optimized error check was put into P_BlockThingsIterator for tmthing, but this meant that anything that was not using or even setting this variable (the supermajority of them) would exit after finding 1 thing in each block.

To keep this error check & keep it optimized, the PIT_ functions were expanded to three options instead of two: BMIT_CONTINUE lets the search continue. If used as the last mobj, it will return true when the iterator finishes. BMIT_ABORT ends the search and forces the iterator to return false.
BMIT_STOP ends the search and forces the iterator to return true.
2022-05-23 17:37:29 -04:00
Sally Coolatta
6e8e0ad0f5 Lightning Shield fixs
- Rename to Lightning Shield (it keeps fucking me up when I want to kartgiveitem it to myself)
- Fix inflictors causing damage being considered damage hitlag. Fixes the player using Lightning Shield being in damage hitlag state (most notable in the DI branch because hurting someone with it lets you DI afterwards, which also fucks with your turning)
- Rewrote attack function to use custom blockmap search instead of P_NukeEnemies.
- It can no longer attack below you, only above & around you.
- Increased the attack radius, so that it actually lines up with the sprites...
- Fixed extremely inconsistent ring blockmap search by moving it to playerafterthink (don't ask me why)
- Rings get joulsted by Lightning Shield when you pass by them without
- Added MAXRADIUS to the blockmap checks for lightning shield & mines, to reduce blockmap inconsistencies
2022-05-20 18:12:34 -04:00
James R
364651ac39 Remove Brak Eggman 2022-05-11 12:25:58 -07:00
James R
5293b151be Merge branch 'rewrite-mines' into 'master'
Rewrite mines

See merge request KartKrew/Kart!581
2022-05-09 05:15:31 +00:00
Sally Coolatta
72d77f7fb5 Invincibility updates
- You flash white while in invincibility
- Invincibility is not rainbow UNTIL you go above the initial timer.
- Increased visibility of the shield effect around invincible players.
- Invincibility sparkles have trailing afterimages.
- Disabled invincibility speed lines; they now use the normal speedlines but grey/rainbow. (The code/sprites will be used for something later.)
- Using invincibility adds time, instead of setting it.
- Player hitbox is finally bigger, to actually match the shadow size.
2022-05-08 03:43:53 -04:00
Sally Coolatta
1381a56077 Rewrite mines
Get rid of the tons of extra objects it uses for sounds & collision, do it all from the actual object PLEASE...
2022-05-07 22:59:38 -04:00
toaster
09a99fa06d * Make RunOverlays and A_OverlayThink more consistent.
* Incorporate drawangle support for both (flattened merge of STJr/SRB2!1599)
2022-03-18 20:59:18 +00:00
spherallic
07901a6364 oops 2022-03-18 20:50:24 +00:00
toaster
ed00874f5f wip: staterange actions
# Conflicts:
#	src/doomdef.h
2022-03-18 20:50:03 +00:00
toaster
1a8f07d53c Add a missing scale assignment to A_Boss3ShockThink
(flattened version of SRB2 repository SMS_Alfredo:oneline/merge request 1588)
2022-03-18 18:50:31 +00:00
lachablock
d92f4d6d50 Split up x/y/z averages in A_Boss3ShockThink 2022-03-18 18:48:36 +00:00
Monster Iestyn
2d50b76323 A_Custom3DRotate: don't scale hspeed and vspeed - they are angular speeds, not linear!
(I added the scaling to this action somewhere between 7-9 years ago, and somehow never knew I made this mistake until now, welp.)
2022-03-18 16:58:28 +00:00
toaster
f073218532 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart.git into boss
# Conflicts:
#	src/m_menu.c
2022-03-18 09:07:13 +00:00
James R
821fd41d70 Merge branch 'c99-pedantic' into 'master'
Switch compiler mode C90 to C99; enforce stricter standard conformance

See merge request KartKrew/Kart!554
2022-03-18 02:41:57 +00:00
toaster
8de92e8dca Merge branch 'master' into boss
# Conflicts:
#	src/k_bot.c
2022-03-17 16:58:42 +00:00
toaster
fcb6a4e1ab Disable the vanilla-sourced "keepbody" (rejointimeout) feature. 2022-03-14 16:33:03 +00:00
toaster
329c2a60a2 Fix item boxes not spawning in Break the Capsules.
Specifically, they turn invisible on tic 0, then make a decision about whether to replace themselves with MT_PAPERITEMSPOT or simply become visible (with an explosion puff, same as how they respawn) when starttime is reached.

This delay also applies to Race, which I think is a good thing, considering Item Capsules already are not collectable during POSITION, but I can change it if others disagree.
2022-02-27 17:11:18 +00:00
toaster
c1f3237157 Boss API + assorted relevant bugfixes, will go over the featureset of this branch with a fine toothed comb when it's time to write the merge request description so this is all you're getting right now 2022-02-24 21:19:03 +00:00
James R
bef9f502ca pedantic: cast to (void*) for printf %p 2022-02-20 03:15:51 -08:00
Sally Coolatta
7e76366fe8 Keep your large items 2022-01-09 01:16:36 -05:00
Sally Coolatta
d63ce0c803 Fix jawz reticule in uncapped 2021-12-24 22:52:38 -05:00
Sally Coolatta
cc250afd45 P_InitAngle, to fix angle interpolation on spawning objects 2021-12-24 12:45:51 -05:00
Sal
4f6121cef2 Merge branch 'landmine-explosion' into 'master'
Remove Landmine dust ring on explosion

See merge request KartKrew/Kart!495
2021-12-16 16:16:36 +00:00
James R
ccdbd9ccc9 A_ItemPop: var1 determines roulette or sphere award 2021-12-15 22:34:43 -08:00
James R
1140410e2c Spawn SPHERE BOXES randomly in Battle
They look like random item boxes (the ones in Race) but
have a blue sphere inside of them. One box is worth 10
blue spheres. More boxes spawn during Overtime.

New sprite: SBOX
2021-12-14 01:05:42 -08:00
SinnamonLat
1adbfcff03 Remove Landmine dust ring on explosion 2021-12-10 14:16:20 +01:00
SteelT
dfadd430b7 Merge branch 'landmine-explosion' into 'master'
New Landmine Explosion VFX

See merge request KartKrew/Kart!479
2021-12-08 01:53:35 +00:00
SteelT
d0caa79414 Merge branch 'snapify-hitlag' into 'master'
Snapify Hitlag 2

See merge request KartKrew/Kart!461
2021-12-08 01:53:28 +00:00
SinnamonLat
2b3da168cb New landmine explosion 2021-12-07 09:54:00 +01:00
toaster
e29f113047 Merge branch 'master' into capsules 2021-11-30 13:50:46 +00:00
Sally Coolatta
c43f8da5e6 P_SetOrigin & P_MoveOrigin to replace P_TeleportMove 2021-11-29 08:20:27 -05:00
Sally Coolatta
c1b34d4d4f A few more instances 2021-11-28 00:32:07 -05:00
Sally Coolatta
15556dce0b Quakes are scaled with map scale
Finally
2021-11-28 00:25:40 -05:00
lachablock
e2c0f6638f Fix item capsules in reverse gravity 2021-08-02 13:57:27 +10:00