Commit graph

2159 commits

Author SHA1 Message Date
toaster
1abfb2745a Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into new-menus 2022-09-03 22:26:28 +01:00
toaster
2c91f83a02 Store tripwire pass level on the player
Fixes tripwire leniency fadeout - previously broken two commits ago
2022-08-30 21:22:26 +01:00
toaster
6b8d729b2c Blaster polish
* Use leveltime instead of leniency for flicker, which makes it work as intended
* Make the threshold for tripwire BLASTER 200% (from 180%)
* Always colorize boost/BLASTER when you have a Flame Shield
* Hide boost/BLASTER if you're using flamedash specifically
2022-08-30 19:29:12 +01:00
toaster
97fab1ab20 Levels of tripwire pass conditions.
- Invinc and sneaker can go up to BLASTER.
- Flame shield and momentum make only the boost by themselves.
- Hyuu and grow ignore tripwire so don't make ANY aura without any of the prior also occouring.
2022-08-30 18:16:51 +01:00
James R
31835b380b Set tripwire blaster destscale instead of player's 2022-08-30 00:12:08 -07:00
toaster
bdd786d8ab BLASTER finalisation
- BLASTER >= 180% speed, smaller boost otherwise
- Flickers under 150%
- Invinc-coloured when invincibility
- Ketchup coloured when boosting, invisible otherwise
2022-08-29 18:35:38 +01:00
Sally Coolatta
b9e3bdff94 Better tripwire leniency vfx 2022-08-29 16:26:58 +01:00
JugadorXEI
904f1703c5 Fix duplicated matchgenericflags (was causing crash)
# Conflicts:
#	src/p_mobj.c
2022-08-28 16:40:50 +01:00
Sally Coolatta
107622968e Merge branch 'master' into new-menus 2022-08-27 22:36:58 -04:00
toaster
3a4b485c5d Remove P_InitAngle and its kin, considered on a case-by-case basis for also setting old_angle as well. 2022-08-25 11:35:09 +01:00
Sally Coolatta
429f61966e Merge branch 'master' into item-bungus 2022-08-23 23:42:21 -04:00
Sal
22cca911f7 Merge branch 'ring-fast-respawn' into 'master'
Speed up ring respawn for anything more than 1v1s

See merge request KartKrew/Kart!641
2022-08-23 07:48:59 +00:00
Sally Coolatta
9c71415b8f Speed up ring respawn for anything more than 1v1s 2022-08-23 00:17:38 -04:00
Sally Coolatta
7a3a74a08b Don't scale tumble height with tumble gravity
It was taking into account the tumble gravity, which meant that tumble has been actually lasting for much longer than originally designed.
2022-08-22 07:24:47 -04:00
Sally Coolatta
0a5767b0b0 Merge branch 'master' into item-bungus 2022-08-14 20:49:40 -04:00
James R
f54eaee9af Merge branch 'precip-randomanim' 2022-08-11 23:49:47 -07:00
James R
eafddb5a61 Use new pogo spring sprites, not colorized 2022-08-11 20:19:08 -07:00
James R
6d67734725 Use M_Random for precip 2022-08-09 12:41:12 -07:00
SteelT
5ebcf86d7d Merge branch 'battle-tweak-update' into 'master'
Huge Battle W

See merge request KartKrew/Kart!636
2022-08-04 16:55:26 +00:00
James R
2c1d8e86c8 Add a shadow to pogospring 2022-08-01 15:10:33 -07:00
James R
f2978c1bff Do not set scale twice in P_SpawnMobjFromMobj 2022-08-01 15:08:19 -07:00
James R
0441990abd x1.5 size pogospring 2022-08-01 15:07:51 -07:00
James R
e360270b13 Add MT_POGOSPRING, orange spring 2022-08-01 05:21:10 -07:00
James R
f18f316b8e Scale weather momz 2022-06-10 20:40:19 -07:00
James R
f1936c83fd Merge branch 'scaled-weather' into 'master'
Scale weather with MobjScale

Closes #131

See merge request KartKrew/Kart!625
2022-06-11 03:23:03 +00:00
James R
d168c2805a Merge branch 'invisible-snake' into 'master'
True death lightsnake

Closes #246

See merge request KartKrew/Kart!626
2022-06-11 03:10:32 +00:00
James R
1800970ed9 Death: respawn from where you died and take an invisible lightsnake 2022-06-09 22:49:30 -07:00
Sally Coolatta
36b8ab1eac Streamline cheats
"cheats" is a proper cvar now. Enabling it allows for cheats to be used any time, even in multiplayer, and disables gamedata saving. Turning it off undoes as many cheat commands as reasonably possible. Based a little bit off of some vanilla work I also did.

Many cheat commands are still SP-only, but can reasonably be allowed in netgames now if a net command is created for them.
2022-06-08 12:46:56 -04:00
James R
69763fd804 Spawn more precip objects under smaller MobjScale 2022-06-08 00:36:06 -07:00
Sally Coolatta
f609043b2e Fix copy-paste error in P_CalculatePrecipFloor 2022-06-05 12:59:24 -04:00
Sally Coolatta
353ac60407 Proper sector condition for water particles 2022-06-05 07:00:34 -04:00
Sally Coolatta
0e96aeec84 Add water particles 2022-06-05 06:24:55 -04:00
Sally Coolatta
6106ce1624 Add reversed weather
- Negative speed weather will spawn from a floor in a sector with a sky ceiling, and go up into the ceiling.
- (Not really the same as reverse gravity weather in that aspect, because that would be for sky floors.)
- Fixed invert precipitation flag for linedef type 8 being completely unimplemented. (How long has it been like this...?)
- Fix swapping weather on the fly having reversed momz
2022-06-05 05:39:35 -04:00
Sally Coolatta
965558c52f Fix precip interpolation
(If Ediolon reads this, I'm pretty sure this one is Ring Racers only)
2022-05-31 10:05:41 -04:00
Sally Coolatta
27c9d698be Reverse weather speed
Makes more logical sense on the user end for negative to go up, since most weather should be going down.

They need to SPAWN with reversed momz too :V
2022-05-31 09:57:53 -04:00
Sally Coolatta
e2ac698247 Make Ballhog more interesting
- No more instant fuck you button. You charge up a meter instead by holding down attack, and let go to fire as many as you charged up. Tapping fires one out of five, holding for the entire duration shoots out all five like before, but anything inbetween is also possible.
- Ballhog projectiles scale up over time (like Contra spread shot), to help make it stronger again after players started getting faster.
2022-05-27 17:51:47 -04:00
Sally Coolatta
8815b065b3 Merge branch 'master' into bot-rubberband-edit 2022-05-25 23:29:04 -04:00
toaster
d963dea4f9 Merge branch 'master' into new-menus
# Conflicts:
#	src/Sourcefile
#	src/deh_soc.c
#	src/m_menu.c
#	src/p_user.c
#	src/r_data.h
#	src/r_skins.h
2022-05-25 15:12:51 +01:00
James R
dac2f4495e Merge branch 'hyu' 2022-05-25 00:43:32 -07:00
Sally Coolatta
c678146f0c Drastically simplified bot rubberbanding 2022-05-23 23:59:18 -04:00
Sally Coolatta
d8b7967a22 Make all instances of this sine use M_TAU_FIXED 2022-05-23 13:38:53 -04:00
Sally Coolatta
61d61dcf25 Revert "EVEN MORE"
This reverts commit 5ef78cbc16.
2022-05-22 22:02:21 -04:00
Sally Coolatta
5ef78cbc16 EVEN MORE
(also removed the define replacements since didn't work)
2022-05-22 21:41:40 -04:00
toaster
54b9f3b7cc Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart.git into new-menus
# Conflicts:
#	src/Sourcefile
#	src/f_finale.c
#	src/m_menu.c
#	src/y_inter.c
2022-05-22 17:22:49 +01:00
Sally Coolatta
7891b10328 Merge branch 'master' into hyu 2022-05-21 22:38:15 -04:00
toaster
48d451cfef Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart.git into new-menus
# Conflicts:
#	src/d_ticcmd.h
#	src/deh_soc.c
#	src/deh_soc.h
#	src/deh_tables.c
#	src/dehacked.c
#	src/f_finale.c
#	src/g_game.c
#	src/m_menu.c
2022-05-21 18:57:46 +01:00
toaster
38e6cba181 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart.git into uncapped-absolution
# Conflicts:
#	src/f_finale.c
#	src/sdl/i_video.c
#	src/st_stuff.c
2022-05-21 13:40:20 +01:00
James R
8718d2c2f3 Merge branch 'rewrite-lightning' into 'master'
Lightning Shield fixes

See merge request KartKrew/Kart!589
2022-05-21 09:13:17 +00: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
Sally Coolatta
56c23339be Directional Influence
Pretty much just copy+pasted from Snap the Sentinel!!
- Hold left/right to adjust the momentum angle after hitlag, up to 22.5 degrees. (Only angle can be adjusted, so you can't adjust your speed, only your direction.)
- It's relative to your angle, so sometimes you need to use forward/back, or even diagonals (forward/back throws now store full analog data for this to work)
- Bananas flip DI direction, to make them not baby easy mode
- Tumble has x3 DI (so angle adjustments of 67.5!!), and hitlag on each bounce to allow even more control.
2022-05-20 01:45:16 -04:00