Commit graph

1173 commits

Author SHA1 Message Date
Sally Coolatta
3c14931764 Merge master 2023-08-25 18:39:01 -04:00
Sally Coolatta
16e6aa423e Dialogue 2 2023-08-24 17:28:53 -04:00
toaster
e1b7cb66cb Rework the Spray Can system to ACTUALLY be what we want
Instead of being specific to each level, Spray Cans are stored in a list on gamedata that will be stepped along each Spray Can you collect.
They are only assigned to a level on collection - which prevents you from farming the same easy location for every colour in the game.

In addition, this new system is one step short of dehardcoding them entirely. Now only Spray Cans specifically asked for by the existence of UC_SPRAYCAN will be put in the list, and if a secondary parameter is either "Yes" or "True", it will be put at the head of the list. This could technically support custom skincolours one day, but the author of this commit doesn't care to do the last bit of work necessary to make it happen.

There's a slight extra overhead in that skincolor_t now also holds a `cache_spraycan` (renamed from `cachedcan`, which maps had previously)

Currently, there's no safeguard against grabbing it on a custom course - you'll lose the Spray Can as soon as you load a fresh game again - but  I consider that easy to fix (tomorrow) and necessary before merger, because the author of this commit does NOT want complaints on release because we forgot to protect users who keep on losing their skincolors.
2023-08-23 00:46:46 +01:00
toaster
f7635c4399 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into spraycans 2023-08-22 19:57:28 +01:00
toaster
dc695e7acf First pass at implementing Spray Can pickups
- Replaces a few D00DKart objects because the doomednum specifically replaced one of these
- Reports on load if the map has too many, or if one's assigned but the object doesn't exist
2023-08-19 22:21:20 +01:00
James R
4857d48633 Add "twinkle" lens flare to emeralds
- Battle: plays once the orbiting collection animation
  finishes and the player's emerald flags are updated
  - Centered on the player

- Sealed Star: plays as soon as the orbiting animation
  begins
  - Centered on the emerald
2023-08-19 03:40:17 -07:00
Lach
53b48d057c Rename Lost Colony symbols to Ark Arrows and add 10 new symbol types 2023-08-15 22:47:04 +10:00
James R
1c4ec2325e Remove semibright from emerald frames, all frames fullbright 2023-08-12 21:41:21 -07:00
James R
dc4922e41b Increase vertical hitbox of Banana, Orinbuat, Jawz, Eggman, Gachabom, Ballhog and UFO Catcher 2023-08-12 17:38:36 -07:00
SteelT
92851cbd41 Don't encore remap the inside of item capsules 2023-08-02 14:23:00 -04:00
Oni
a18982dc55 Merge branch 'splatbooster' into 'dashrings'
Hardcode MT_SNEAKERPANEL & MT_SNEAKERPANELSPAWNER

See merge request KartKrew/Kart!1349
2023-07-29 18:28:48 +00:00
Lach
fd8ba4236d Hardcode MT_SNEAKERPANELSPAWNER & adjust FF_GLOBALANIM behaviour 2023-07-29 17:51:25 +10:00
toaster
16e036a0bd Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into dashrings 2023-07-28 23:12:06 +01:00
toaster
f040523b19 Implement the Sunbeam Palm decoration
- Randomised tilt
- Randomised leaf angles
- Technically specifiable number of leaves, but the default of 5 is sane enough
2023-07-25 18:01:07 +01:00
Lach
2d7ae88586 Hardcode MT_BOOSTPAD as MT_SNEAKERPANEL 2023-07-21 19:19:28 +10:00
Lach
476d53d305 WIP: Hardcode MT_BOOSTPAD 2023-07-20 19:02:13 +10:00
Lach
a21e509a94 Hardcode MT_DASHRING & MT_RAINBOWDASHRING 2023-07-19 21:47:41 +10:00
Oni
28748725fe Merge branch 'initializing-instawhip-reject-frames' into 'master'
Initializing the instawhip reject frames

See merge request KartKrew/Kart!1334
2023-07-16 08:28:04 +00:00
VelocitOni
82c21f631f Added it in one more spot info.h, added a field for it in info.c
Dunno where else to add it, still says it's not added to dehacked...
2023-07-16 04:03:49 -04:00
VelocitOni
51058c3c19 Messed up sprite name
Changed it from a duplicate hitlag sprite to instawhip-reject name
2023-07-16 03:43:10 -04:00
VelocitOni
6f31a6d4a8 Initializing the instawhip reject frames
Setting it up to save the future coder headache
2023-07-16 03:31:03 -04:00
VelocitOni
7aec2b0732 10th frame of hitsparks added
Added biggest frame of hitsparks, only 1 to go now.
2023-07-16 02:27:25 -04:00
AJ Martinez
df940de4b0 MF_DRAWFROMFARAWAY Lost Colony signs 2023-07-11 20:17:17 -07:00
Lach
77750438ef Change symbol thing type to 4094 2023-07-11 21:51:29 +10:00
Lach
4ad383721d Add thing type number & binary conversion to symbol signs 2023-07-11 21:04:06 +10:00
Lach
64511e82c2 Merge remote-tracking branch 'origin/master' into symbol-signs 2023-07-11 20:55:44 +10:00
James R
c1d54f50f5 Give Overtime Lasers infinite draw distance 2023-07-03 06:20:17 -04:00
VelocitOni
b1054f486e Added level 8 hitsparks
Added level 8 hitsparks, 2 more to go. Gonna take MR out of draft though and do the other 2 later.
2023-07-03 06:15:03 -04:00
VelocitOni
25c0ff738c Added stages 4, 5, and 6 of hitsparks, maxhitlag 30
Now the amount of hitsparks is 7, need to do 3 more.
2023-07-01 20:48:20 -04:00
Sally Coolatta
4a98afc273 Set up future code for multi-sparks 2023-06-30 23:04:34 -07:00
VelocitOni
8c53e56f3b Set up the states for stages 1-3
Just got them ready for putting in :cantfuckingtakeit: why do you have to touch so many fucking spots for a sprite???
2023-06-30 23:04:34 -07:00
Sally Coolatta
8c273039ab Add first pass at hitlag EFX
Only 9-tic animation is here currently, so hitlag is forced to 9 tics for testing.
2023-06-30 23:04:33 -07:00
SteelT
30adb8559e Increase UFO height 2023-06-29 22:21:28 -07:00
SteelT
cfe1e44428 No player contact damage
Make UFO solid
2023-06-29 22:21:28 -07:00
SteelT
dd958dd502 Make UFO beam fullbright 2023-06-29 22:21:28 -07:00
SteelT
bf394f1f38 UFO beam spawning behavior
- Spawned from underneath the UFO and is thrusted downwards
- Is spawned as splats instead of papersprites
- Colorized to sapphire
- Despawns on any ground contact
2023-06-29 22:21:28 -07:00
SteelT
275358e394 Increase UFO radius 2023-06-29 22:21:28 -07:00
James R
d3d6d4d671 MT_BATTLEUFO_SPAWNER: spawn with thing number 3786
Binary maps: angle becomes args[0] (ID for spawning order)
2023-06-29 19:49:36 -07:00
SteelT
68f1626256 Add Battle UFO body/leg states and objects 2023-06-29 19:49:02 -07:00
James R
d747f31225 Add Power-Up Aura states
MT_POWERUP_AURA
SPR_RBOW
S_POWERUP_AURA
2023-06-29 19:31:27 -07:00
toaster
e7ee979f1a Horncode
A much more focused replacement for Hornmod, specc'd out by Tyron and Oni working together and implemented by the author of this commit because it's pretty funny.

- Followers have `hornsound` in their SOC configuration.
    - The default sound for all followers without a provided one is sfx_horn00.
- They'll play this sound if you use lookback with one following you, and there's nearby players to get the player looking all the way around.
    - Only the players who are successfully considered for lookback will hear it.
- Has a v1-like visual with less randomisation, but still netsynced.
- Also controlled by the cvar `taunthorns`, which, like `tauntvoices`, takes "Tasteful" (default), "Meme", and "Off".

TODO: make the condition for horn a little delayed, so you have to hold lookback for a little bit.
2023-06-28 17:54:23 +01:00
toaster
4344221252 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into seeecret-colors 2023-06-28 12:48:50 +01:00
Oni
93e3b2aca0 Merge branch 'conclusions' into 'master'
Conclusions

See merge request KartKrew/Kart!1300
2023-06-28 00:51:45 +00:00
Oni
f393b9782b Merge branch 'super-flicky' into 'master'
Battle: Super Flicky power-up, give power-up command, general functions for interfacing power-ups (also Lua)

See merge request KartKrew/Kart!1301
2023-06-28 00:31:53 +00:00
James R
919c669863 Drop power-ups when whipped
- Dropped power-ups become paper items (overloaded to
  store power-ups instead of items).
- The dropped power-up stores its remaining duration.
- The power-up can be picked up during any state.
  - If you already have the same kind of power-up, the
    duration is simply extended.
2023-06-27 02:08:07 -07:00
James R
fd0167a3b0 Add Super Flicky states
Adds 3DFR sprite (previously freeslotted by followers.pk3)
2023-06-27 00:49:59 -07:00
AJ Martinez
c71bb7092e Merge remote-tracking branch 'origin/master' into ringbox 2023-06-26 19:19:21 -07:00
toaster
5036719280 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into seeecret-colors
# Conflicts:
#	src/k_menudraw.c
2023-06-26 23:25:47 +01:00
AJ Martinez
45547607bd Ringbox: item respawn refactor + box visuals 2023-06-26 06:36:37 -07:00
toaster
08b471c9b2 Vaguely related request: Increase radius + height for MT_EMERALD by 8FU 2023-06-25 23:49:18 +01:00