stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-27 21:01:04 +00:00
Code Issues Projects Releases Packages Wiki Activity
Kart-Public/src/k_kart.c

7946 lines
248 KiB
C
Raw Normal View History

Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
// SONIC ROBO BLAST 2 KART ~ ZarroTsu
//-----------------------------------------------------------------------------
/// \file k_kart.c
/// \brief SRB2kart general.
/// All of the SRB2kart-unique stuff.
#include "doomdef.h"
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
#include "hu_stuff.h"
#include "g_game.h"
#include "m_random.h"
#include "p_local.h"
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
#include "p_slopes.h"
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
#include "r_draw.h"
#include "r_local.h"
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
#include "s_sound.h"
#include "st_stuff.h"
#include "v_video.h"
#include "z_zone.h"
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
#include "m_misc.h"
* Lots of Record Attack love! * Record Attack Input display! * Show Record Attack emblem and emblem time on the HUD! Changes colours with the player, just like vanilla internal's. * Remove the ugly dark blue box on the singleplayer (including pause screen) whose only purpose in Kart was to contain the Record Attack emblem info! * Unrelated shit! * Improve loading Kart HUD graphics. * Fix mirrored HUD graphics being one screen pixel (not basevid pixel) offset.
2018-07-15 22:13:36 +00:00
#include "m_cond.h"
Fix warnings Possibly fix some whitespace problems
2017-03-04 22:13:19 +00:00
#include "k_kart.h"
Battle HUD stuff
2017-11-14 01:45:57 +00:00
#include "f_finale.h"
A few additions to the hud library
2018-10-30 17:24:03 +00:00
#include "lua_hud.h" // For Lua hud checks
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
// SOME IMPORTANT VARIABLES DEFINED IN DOOMDEF.H:
// gamespeed is cc (0 for easy, 1 for normal, 2 for hard)
// franticitems is Frantic Mode items, bool
Encore mode - a fresh take on mirror mode! * Palette remaps. * Branding. TODO: * Doesn't work in GL. (Mostly.) I have SOME ideas on how to tackle this, but... * Transmaps are broken in Encore for some reason. * I tried to make in-level colormaps shimmy over, but it didn't quite work, so I commented it out and only semi-fixed it.
2018-07-23 22:50:41 +00:00
// encoremode is Encore Mode (duh), bool
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
// comeback is Battle Mode's karma comeback, also bool
WANTED
2018-07-01 08:36:09 +00:00
// battlewanted is an array of the WANTED player nums, -1 for no player in that slot
SPB fixes Shrink also plays its sound, and Shrink/Grow have slower scaling speeds
2018-06-11 05:51:50 +00:00
// indirectitemcooldown is timer before anyone's allowed another Shrink/SPB
Map reset timer
2018-07-21 19:54:05 +00:00
// mapreset is set when enough players fill an empty server
Prevent spectate griefing If the player count dips below what was stored on the start of the last lap, then don't do time over so that someone can't just spectate at the end of a race out of rage. Y'all are assholes :V
2018-10-15 22:41:34 +00:00
// nospectategrief is the players in-game needed to eliminate the person in last
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
//{ SRB2kart Color Code
#define SKIN_RAMP_LENGTH 16
#define DEFAULT_STARTTRANSCOLOR 160
#define NUM_PALETTE_ENTRIES 256
More minor adjustments - Display the skin's realname in RA menus - Can no longer set your skincolor to none on the RA menu - Edited several color names to fit within 14 characters
2017-10-21 17:22:54 +00:00
// These should be within 14 characters to fit on the character select screen
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
const char *KartColor_Names[MAXSKINCOLORS] =
{
More minor adjustments - Display the skin's realname in RA menus - Can no longer set your skincolor to none on the RA menu - Edited several color names to fit within 14 characters
2017-10-21 17:22:54 +00:00
"None", // 00 // SKINCOLOR_NONE
Instead of doing productive things, I changed around skincolors again - Renamed Ivory to White, removed Nickel and old White, and improved Silver and Grey. - Improved Pink & Ruby. - Added Ketchup, replaced Canary with Mustard. - Removed Army.
2018-09-13 06:07:00 +00:00
"White", // 01 // SKINCOLOR_WHITE
"Silver", // 02 // SKINCOLOR_SILVER
More color tweaks - Renamed Grey to Nickel, and Cloudy to Grey - Updated Silver and Nickel to look a teeensy bit more inbetween White/Grey and Grey/Black, previously they both leaned more toward Grey - Drastically changed Navy to be more distinct from Jet - Replaced Indigo with Pomegranate - Moved certain colors around to match (most notably, beiges and browns are in their own little sub-section after the greyscale colors, instead of being lumped in the middle of orange and yellow) - Updated color opposite table to match
2018-09-17 06:09:22 +00:00
"Grey", // 03 // SKINCOLOR_GREY
"Nickel", // 04 // SKINCOLOR_NICKEL
Instead of doing productive things, I changed around skincolors again - Renamed Ivory to White, removed Nickel and old White, and improved Silver and Grey. - Improved Pink & Ruby. - Added Ketchup, replaced Canary with Mustard. - Removed Army.
2018-09-13 06:07:00 +00:00
"Black", // 05 // SKINCOLOR_BLACK
More color tweaks - Renamed Grey to Nickel, and Cloudy to Grey - Updated Silver and Nickel to look a teeensy bit more inbetween White/Grey and Grey/Black, previously they both leaned more toward Grey - Drastically changed Navy to be more distinct from Jet - Replaced Indigo with Pomegranate - Moved certain colors around to match (most notably, beiges and browns are in their own little sub-section after the greyscale colors, instead of being lumped in the middle of orange and yellow) - Updated color opposite table to match
2018-09-17 06:09:22 +00:00
"Sepia", // 06 // SKINCOLOR_SEPIA
"Beige", // 07 // SKINCOLOR_BEIGE
"Brown", // 08 // SKINCOLOR_BROWN
"Leather", // 09 // SKINCOLOR_LEATHER
"Salmon", // 10 // SKINCOLOR_SALMON
"Pink", // 11 // SKINCOLOR_PINK
"Rose", // 12 // SKINCOLOR_ROSE
Moved colors around yet again for nicer invincibility effect - Ruby is closer to the pinks (and where purples would be if it wrapped around) - Sapphire is closer to the cyans - Dream is right before the teals
2018-10-04 01:18:07 +00:00
"Ruby", // 13 // SKINCOLOR_RUBY
"Raspberry", // 14 // SKINCOLOR_RASPBERRY
"Red", // 15 // SKINCOLOR_RED
More color tweaks - Renamed Grey to Nickel, and Cloudy to Grey - Updated Silver and Nickel to look a teeensy bit more inbetween White/Grey and Grey/Black, previously they both leaned more toward Grey - Drastically changed Navy to be more distinct from Jet - Replaced Indigo with Pomegranate - Moved certain colors around to match (most notably, beiges and browns are in their own little sub-section after the greyscale colors, instead of being lumped in the middle of orange and yellow) - Updated color opposite table to match
2018-09-17 06:09:22 +00:00
"Crimson", // 16 // SKINCOLOR_CRIMSON
"Ketchup", // 17 // SKINCOLOR_KETCHUP
"Dawn", // 18 // SKINCOLOR_DAWN
"Creamsicle", // 19 // SKINCOLOR_CREAMSICLE
"Orange", // 20 // SKINCOLOR_ORANGE
"Pumpkin", // 21 // SKINCOLOR_PUMPKIN
"Rosewood", // 22 // SKINCOLOR_ROSEWOOD
"Burgundy", // 23 // SKINCOLOR_BURGUNDY
"Tangerine", // 24 // SKINCOLOR_TANGERINE
Instead of doing productive things, I changed around skincolors again - Renamed Ivory to White, removed Nickel and old White, and improved Silver and Grey. - Improved Pink & Ruby. - Added Ketchup, replaced Canary with Mustard. - Removed Army.
2018-09-13 06:07:00 +00:00
"Peach", // 25 // SKINCOLOR_PEACH
"Caramel", // 26 // SKINCOLOR_CARAMEL
More color tweaks - Renamed Grey to Nickel, and Cloudy to Grey - Updated Silver and Nickel to look a teeensy bit more inbetween White/Grey and Grey/Black, previously they both leaned more toward Grey - Drastically changed Navy to be more distinct from Jet - Replaced Indigo with Pomegranate - Moved certain colors around to match (most notably, beiges and browns are in their own little sub-section after the greyscale colors, instead of being lumped in the middle of orange and yellow) - Updated color opposite table to match
2018-09-17 06:09:22 +00:00
"Gold", // 27 // SKINCOLOR_GOLD
"Bronze", // 28 // SKINCOLOR_BRONZE
"Yellow", // 29 // SKINCOLOR_YELLOW
"Mustard", // 30 // SKINCOLOR_MUSTARD
"Olive", // 31 // SKINCOLOR_OLIVE
"Vomit", // 32 // SKINCOLOR_VOMIT
Instead of doing productive things, I changed around skincolors again - Renamed Ivory to White, removed Nickel and old White, and improved Silver and Grey. - Improved Pink & Ruby. - Added Ketchup, replaced Canary with Mustard. - Removed Army.
2018-09-13 06:07:00 +00:00
"Garden", // 33 // SKINCOLOR_GARDEN
"Lime", // 34 // SKINCOLOR_LIME
Moved colors around yet again for nicer invincibility effect - Ruby is closer to the pinks (and where purples would be if it wrapped around) - Sapphire is closer to the cyans - Dream is right before the teals
2018-10-04 01:18:07 +00:00
"Tea", // 35 // SKINCOLOR_TEA
"Pistachio", // 36 // SKINCOLOR_PISTACHIO
"Robo-Hood", // 37 // SKINCOLOR_ROBOHOOD
"Moss", // 38 // SKINCOLOR_MOSS
"Mint", // 39 // SKINCOLOR_MINT
"Green", // 40 // SKINCOLOR_GREEN
"Pinetree", // 41 // SKINCOLOR_PINETREE
"Emerald", // 42 // SKINCOLOR_EMERALD
"Swamp", // 43 // SKINCOLOR_SWAMP
"Dream", // 44 // SKINCOLOR_DREAM
Instead of doing productive things, I changed around skincolors again - Renamed Ivory to White, removed Nickel and old White, and improved Silver and Grey. - Improved Pink & Ruby. - Added Ketchup, replaced Canary with Mustard. - Removed Army.
2018-09-13 06:07:00 +00:00
"Aqua", // 45 // SKINCOLOR_AQUA
"Teal", // 46 // SKINCOLOR_TEAL
"Cyan", // 47 // SKINCOLOR_CYAN
More color tweaks - Renamed Grey to Nickel, and Cloudy to Grey - Updated Silver and Nickel to look a teeensy bit more inbetween White/Grey and Grey/Black, previously they both leaned more toward Grey - Drastically changed Navy to be more distinct from Jet - Replaced Indigo with Pomegranate - Moved certain colors around to match (most notably, beiges and browns are in their own little sub-section after the greyscale colors, instead of being lumped in the middle of orange and yellow) - Updated color opposite table to match
2018-09-17 06:09:22 +00:00
"Jawz", // 48 // SKINCOLOR_JAWZ
"Cerulean", // 49 // SKINCOLOR_CERULEAN
"Navy", // 50 // SKINCOLOR_NAVY
"Slate", // 51 // SKINCOLOR_SLATE
"Steel", // 52 // SKINCOLOR_STEEL
"Jet", // 53 // SKINCOLOR_JET
Moved colors around yet again for nicer invincibility effect - Ruby is closer to the pinks (and where purples would be if it wrapped around) - Sapphire is closer to the cyans - Dream is right before the teals
2018-10-04 01:18:07 +00:00
"Sapphire", // 54 // SKINCOLOR_SAPPHIRE
"Periwinkle", // 55 // SKINCOLOR_PERIWINKLE
"Blue", // 56 // SKINCOLOR_BLUE
More color tweaks - Renamed Grey to Nickel, and Cloudy to Grey - Updated Silver and Nickel to look a teeensy bit more inbetween White/Grey and Grey/Black, previously they both leaned more toward Grey - Drastically changed Navy to be more distinct from Jet - Replaced Indigo with Pomegranate - Moved certain colors around to match (most notably, beiges and browns are in their own little sub-section after the greyscale colors, instead of being lumped in the middle of orange and yellow) - Updated color opposite table to match
2018-09-17 06:09:22 +00:00
"Blueberry", // 57 // SKINCOLOR_BLUEBERRY
Rearranged color order Invincibility should look just a tad smoother now
2018-07-11 02:59:19 +00:00
"Dusk", // 58 // SKINCOLOR_DUSK
"Purple", // 59 // SKINCOLOR_PURPLE
"Lavender", // 60 // SKINCOLOR_LAVENDER
More color tweaks - Renamed Grey to Nickel, and Cloudy to Grey - Updated Silver and Nickel to look a teeensy bit more inbetween White/Grey and Grey/Black, previously they both leaned more toward Grey - Drastically changed Navy to be more distinct from Jet - Replaced Indigo with Pomegranate - Moved certain colors around to match (most notably, beiges and browns are in their own little sub-section after the greyscale colors, instead of being lumped in the middle of orange and yellow) - Updated color opposite table to match
2018-09-17 06:09:22 +00:00
"Byzantium", // 61 // SKINCOLOR_BYZANTIUM
"Pomegranate", // 62 // SKINCOLOR_POMEGRANATE
Rearranged color order Invincibility should look just a tad smoother now
2018-07-11 02:59:19 +00:00
"Lilac" // 63 // SKINCOLOR_LILAC
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
};
Hundreds of tweaks - SPB multiplier depending on 1st-2nd distance - Removed the Battle-only k_poweritemtimer (hold over from when you could easily get invuln items all of the time), replaced it with a 2 invincibility item cap in ALL modes. - Spinout is affected by boosters, *properly* - Can no longer strafe while spinning out on speed bumps - Messed with how other items interact with speed bumps, again. - Old bounce code has been ported for non-players - Fixed Karma players being able to do anything after the round has ended. - Fixed sneaker and spinout timer weirdness - Fixed Mines still being hold-use - Fixed rubber-burn turn not working - Removed redundant k_spinout and unused k_boosting variables - Filled out the Color_Opposite table with Kart's new colors. Not really relevant right now (besides some extra Lua functionality) since nothing uses it, but will be nice for if we do the signpost from the sky idea.
2018-06-20 00:20:06 +00:00
// Color_Opposite replacement; frame setting has not been changed from 8 for most, should be done later
const UINT8 KartColor_Opposite[MAXSKINCOLORS*2] =
{
More color tweaks - Renamed Grey to Nickel, and Cloudy to Grey - Updated Silver and Nickel to look a teeensy bit more inbetween White/Grey and Grey/Black, previously they both leaned more toward Grey - Drastically changed Navy to be more distinct from Jet - Replaced Indigo with Pomegranate - Moved certain colors around to match (most notably, beiges and browns are in their own little sub-section after the greyscale colors, instead of being lumped in the middle of orange and yellow) - Updated color opposite table to match
2018-09-17 06:09:22 +00:00
SKINCOLOR_NONE,8, // 00 // SKINCOLOR_NONE
SKINCOLOR_BLACK,8, // 01 // SKINCOLOR_WHITE
SKINCOLOR_NICKEL,8, // 02 // SKINCOLOR_SILVER
SKINCOLOR_GREY,8, // 03 // SKINCOLOR_GREY
SKINCOLOR_SILVER,8, // 04 // SKINCOLOR_NICKEL
SKINCOLOR_WHITE,8, // 05 // SKINCOLOR_BLACK
SKINCOLOR_LEATHER,6, // 06 // SKINCOLOR_SEPIA
SKINCOLOR_BROWN,2, // 07 // SKINCOLOR_BEIGE
SKINCOLOR_BEIGE,8, // 08 // SKINCOLOR_BROWN
SKINCOLOR_SEPIA,8, // 09 // SKINCOLOR_LEATHER
SKINCOLOR_TEA,8, // 10 // SKINCOLOR_SALMON
SKINCOLOR_PISTACHIO,8, // 11 // SKINCOLOR_PINK
SKINCOLOR_MOSS,8, // 12 // SKINCOLOR_ROSE
Moved colors around yet again for nicer invincibility effect - Ruby is closer to the pinks (and where purples would be if it wrapped around) - Sapphire is closer to the cyans - Dream is right before the teals
2018-10-04 01:18:07 +00:00
SKINCOLOR_SAPPHIRE,8, // 13 // SKINCOLOR_RUBY
SKINCOLOR_MINT,8, // 14 // SKINCOLOR_RASPBERRY
SKINCOLOR_GREEN,6, // 15 // SKINCOLOR_RED
More color tweaks - Renamed Grey to Nickel, and Cloudy to Grey - Updated Silver and Nickel to look a teeensy bit more inbetween White/Grey and Grey/Black, previously they both leaned more toward Grey - Drastically changed Navy to be more distinct from Jet - Replaced Indigo with Pomegranate - Moved certain colors around to match (most notably, beiges and browns are in their own little sub-section after the greyscale colors, instead of being lumped in the middle of orange and yellow) - Updated color opposite table to match
2018-09-17 06:09:22 +00:00
SKINCOLOR_PINETREE,6, // 16 // SKINCOLOR_CRIMSON
Minor adjustments to the endsign color back table
2018-09-21 20:54:29 +00:00
SKINCOLOR_MUSTARD,10, // 17 // SKINCOLOR_KETCHUP
More color tweaks - Renamed Grey to Nickel, and Cloudy to Grey - Updated Silver and Nickel to look a teeensy bit more inbetween White/Grey and Grey/Black, previously they both leaned more toward Grey - Drastically changed Navy to be more distinct from Jet - Replaced Indigo with Pomegranate - Moved certain colors around to match (most notably, beiges and browns are in their own little sub-section after the greyscale colors, instead of being lumped in the middle of orange and yellow) - Updated color opposite table to match
2018-09-17 06:09:22 +00:00
SKINCOLOR_DUSK,8, // 18 // SKINCOLOR_DAWN
SKINCOLOR_PERIWINKLE,8, // 19 // SKINCOLOR_CREAMSICLE
SKINCOLOR_BLUE,8, // 20 // SKINCOLOR_ORANGE
SKINCOLOR_BLUEBERRY,8, // 21 // SKINCOLOR_PUMPKIN
Minor adjustments to the endsign color back table
2018-09-21 20:54:29 +00:00
SKINCOLOR_NAVY,6, // 22 // SKINCOLOR_ROSEWOOD
SKINCOLOR_JET,8, // 23 // SKINCOLOR_BURGUNDY
More color tweaks - Renamed Grey to Nickel, and Cloudy to Grey - Updated Silver and Nickel to look a teeensy bit more inbetween White/Grey and Grey/Black, previously they both leaned more toward Grey - Drastically changed Navy to be more distinct from Jet - Replaced Indigo with Pomegranate - Moved certain colors around to match (most notably, beiges and browns are in their own little sub-section after the greyscale colors, instead of being lumped in the middle of orange and yellow) - Updated color opposite table to match
2018-09-17 06:09:22 +00:00
SKINCOLOR_LIME,8, // 24 // SKINCOLOR_TANGERINE
SKINCOLOR_CYAN,8, // 25 // SKINCOLOR_PEACH
SKINCOLOR_CERULEAN,8, // 26 // SKINCOLOR_CARAMEL
SKINCOLOR_SLATE,8, // 27 // SKINCOLOR_GOLD
SKINCOLOR_STEEL,8, // 28 // SKINCOLOR_BRONZE
SKINCOLOR_AQUA,8, // 29 // SKINCOLOR_YELLOW
SKINCOLOR_KETCHUP,8, // 30 // SKINCOLOR_MUSTARD
SKINCOLOR_TEAL,8, // 31 // SKINCOLOR_OLIVE
SKINCOLOR_ROBOHOOD,8, // 32 // SKINCOLOR_VOMIT
Minor adjustments to the endsign color back table
2018-09-21 20:54:29 +00:00
SKINCOLOR_LAVENDER,6, // 33 // SKINCOLOR_GARDEN
More color tweaks - Renamed Grey to Nickel, and Cloudy to Grey - Updated Silver and Nickel to look a teeensy bit more inbetween White/Grey and Grey/Black, previously they both leaned more toward Grey - Drastically changed Navy to be more distinct from Jet - Replaced Indigo with Pomegranate - Moved certain colors around to match (most notably, beiges and browns are in their own little sub-section after the greyscale colors, instead of being lumped in the middle of orange and yellow) - Updated color opposite table to match
2018-09-17 06:09:22 +00:00
SKINCOLOR_TANGERINE,8, // 34 // SKINCOLOR_LIME
Moved colors around yet again for nicer invincibility effect - Ruby is closer to the pinks (and where purples would be if it wrapped around) - Sapphire is closer to the cyans - Dream is right before the teals
2018-10-04 01:18:07 +00:00
SKINCOLOR_SALMON,8, // 35 // SKINCOLOR_TEA
SKINCOLOR_PINK,6, // 36 // SKINCOLOR_PISTACHIO
SKINCOLOR_VOMIT,8, // 37 // SKINCOLOR_ROBOHOOD
SKINCOLOR_ROSE,8, // 38 // SKINCOLOR_MOSS
SKINCOLOR_RASPBERRY,8, // 39 // SKINCOLOR_MINT
SKINCOLOR_RED,8, // 40 // SKINCOLOR_GREEN
SKINCOLOR_CRIMSON,8, // 41 // SKINCOLOR_PINETREE
SKINCOLOR_PURPLE,8, // 42 // SKINCOLOR_EMERALD
SKINCOLOR_BYZANTIUM,8, // 43 // SKINCOLOR_SWAMP
SKINCOLOR_POMEGRANATE,8, // 44 // SKINCOLOR_DREAM
More color tweaks - Renamed Grey to Nickel, and Cloudy to Grey - Updated Silver and Nickel to look a teeensy bit more inbetween White/Grey and Grey/Black, previously they both leaned more toward Grey - Drastically changed Navy to be more distinct from Jet - Replaced Indigo with Pomegranate - Moved certain colors around to match (most notably, beiges and browns are in their own little sub-section after the greyscale colors, instead of being lumped in the middle of orange and yellow) - Updated color opposite table to match
2018-09-17 06:09:22 +00:00
SKINCOLOR_YELLOW,8, // 45 // SKINCOLOR_AQUA
SKINCOLOR_OLIVE,8, // 46 // SKINCOLOR_TEAL
SKINCOLOR_PEACH,8, // 47 // SKINCOLOR_CYAN
Minor adjustments to the endsign color back table
2018-09-21 20:54:29 +00:00
SKINCOLOR_LILAC,10, // 48 // SKINCOLOR_JAWZ
More color tweaks - Renamed Grey to Nickel, and Cloudy to Grey - Updated Silver and Nickel to look a teeensy bit more inbetween White/Grey and Grey/Black, previously they both leaned more toward Grey - Drastically changed Navy to be more distinct from Jet - Replaced Indigo with Pomegranate - Moved certain colors around to match (most notably, beiges and browns are in their own little sub-section after the greyscale colors, instead of being lumped in the middle of orange and yellow) - Updated color opposite table to match
2018-09-17 06:09:22 +00:00
SKINCOLOR_CARAMEL,8, // 49 // SKINCOLOR_CERULEAN
SKINCOLOR_ROSEWOOD,8, // 50 // SKINCOLOR_NAVY
Minor adjustments to the endsign color back table
2018-09-21 20:54:29 +00:00
SKINCOLOR_GOLD,10, // 51 // SKINCOLOR_SLATE
SKINCOLOR_BRONZE,10, // 52 // SKINCOLOR_STEEL
SKINCOLOR_BURGUNDY,8, // 53 // SKINCOLOR_JET
Moved colors around yet again for nicer invincibility effect - Ruby is closer to the pinks (and where purples would be if it wrapped around) - Sapphire is closer to the cyans - Dream is right before the teals
2018-10-04 01:18:07 +00:00
SKINCOLOR_RUBY,6, // 54 // SKINCOLOR_SAPPHIRE
SKINCOLOR_CREAMSICLE,8, // 55 // SKINCOLOR_PERIWINKLE
SKINCOLOR_ORANGE,8, // 56 // SKINCOLOR_BLUE
More color tweaks - Renamed Grey to Nickel, and Cloudy to Grey - Updated Silver and Nickel to look a teeensy bit more inbetween White/Grey and Grey/Black, previously they both leaned more toward Grey - Drastically changed Navy to be more distinct from Jet - Replaced Indigo with Pomegranate - Moved certain colors around to match (most notably, beiges and browns are in their own little sub-section after the greyscale colors, instead of being lumped in the middle of orange and yellow) - Updated color opposite table to match
2018-09-17 06:09:22 +00:00
SKINCOLOR_PUMPKIN,8, // 57 // SKINCOLOR_BLUEBERRY
Minor adjustments to the endsign color back table
2018-09-21 20:54:29 +00:00
SKINCOLOR_DAWN,6, // 58 // SKINCOLOR_DUSK
More color tweaks - Renamed Grey to Nickel, and Cloudy to Grey - Updated Silver and Nickel to look a teeensy bit more inbetween White/Grey and Grey/Black, previously they both leaned more toward Grey - Drastically changed Navy to be more distinct from Jet - Replaced Indigo with Pomegranate - Moved certain colors around to match (most notably, beiges and browns are in their own little sub-section after the greyscale colors, instead of being lumped in the middle of orange and yellow) - Updated color opposite table to match
2018-09-17 06:09:22 +00:00
SKINCOLOR_EMERALD,8, // 59 // SKINCOLOR_PURPLE
Minor adjustments to the endsign color back table
2018-09-21 20:54:29 +00:00
SKINCOLOR_GARDEN,6, // 60 // SKINCOLOR_LAVENDER
More color tweaks - Renamed Grey to Nickel, and Cloudy to Grey - Updated Silver and Nickel to look a teeensy bit more inbetween White/Grey and Grey/Black, previously they both leaned more toward Grey - Drastically changed Navy to be more distinct from Jet - Replaced Indigo with Pomegranate - Moved certain colors around to match (most notably, beiges and browns are in their own little sub-section after the greyscale colors, instead of being lumped in the middle of orange and yellow) - Updated color opposite table to match
2018-09-17 06:09:22 +00:00
SKINCOLOR_SWAMP,8, // 61 // SKINCOLOR_BYZANTIUM
Minor adjustments to the endsign color back table
2018-09-21 20:54:29 +00:00
SKINCOLOR_DREAM,8, // 62 // SKINCOLOR_POMEGRANATE
More color tweaks - Renamed Grey to Nickel, and Cloudy to Grey - Updated Silver and Nickel to look a teeensy bit more inbetween White/Grey and Grey/Black, previously they both leaned more toward Grey - Drastically changed Navy to be more distinct from Jet - Replaced Indigo with Pomegranate - Moved certain colors around to match (most notably, beiges and browns are in their own little sub-section after the greyscale colors, instead of being lumped in the middle of orange and yellow) - Updated color opposite table to match
2018-09-17 06:09:22 +00:00
SKINCOLOR_JAWZ,6 // 63 // SKINCOLOR_LILAC
Hundreds of tweaks - SPB multiplier depending on 1st-2nd distance - Removed the Battle-only k_poweritemtimer (hold over from when you could easily get invuln items all of the time), replaced it with a 2 invincibility item cap in ALL modes. - Spinout is affected by boosters, *properly* - Can no longer strafe while spinning out on speed bumps - Messed with how other items interact with speed bumps, again. - Old bounce code has been ported for non-players - Fixed Karma players being able to do anything after the round has ended. - Fixed sneaker and spinout timer weirdness - Fixed Mines still being hold-use - Fixed rubber-burn turn not working - Removed redundant k_spinout and unused k_boosting variables - Filled out the Color_Opposite table with Kart's new colors. Not really relevant right now (besides some extra Lua functionality) since nothing uses it, but will be nice for if we do the signpost from the sky idea.
2018-06-20 00:20:06 +00:00
};
Star power translation tables Redid the part that handled the regular kart translation tables too, now uses the new table created instead of the horror of what was there before
2017-10-26 19:04:05 +00:00
UINT8 colortranslations[MAXSKINCOLORS][16] = {
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, // SKINCOLOR_NONE
Instead of doing productive things, I changed around skincolors again - Renamed Ivory to White, removed Nickel and old White, and improved Silver and Grey. - Improved Pink & Ruby. - Added Ketchup, replaced Canary with Mustard. - Removed Army.
2018-09-13 06:07:00 +00:00
{120, 120, 120, 120, 0, 1, 3, 4, 6, 7, 10, 14, 18, 22, 25, 28}, // SKINCOLOR_WHITE
More color tweaks - Renamed Grey to Nickel, and Cloudy to Grey - Updated Silver and Nickel to look a teeensy bit more inbetween White/Grey and Grey/Black, previously they both leaned more toward Grey - Drastically changed Navy to be more distinct from Jet - Replaced Indigo with Pomegranate - Moved certain colors around to match (most notably, beiges and browns are in their own little sub-section after the greyscale colors, instead of being lumped in the middle of orange and yellow) - Updated color opposite table to match
2018-09-17 06:09:22 +00:00
{ 0, 1, 2, 4, 5, 7, 8, 10, 13, 15, 18, 20, 23, 25, 28, 30}, // SKINCOLOR_SILVER
{ 1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31}, // SKINCOLOR_GREY
{ 12, 14, 16, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}, // SKINCOLOR_NICKEL
Revamped colors - The majority of all colors have been tweaked in some capacity to have higher contrast, to either make character highlights or lineart pop out more - Two new "on trial" colors that may or may not stay: Tangerine, and Dusk. Tangerine is a yellow-orange color to fill the void of yellows. Dusk is a previously removed color that looked freakin' sweet after some cleanup, why wasn't this kept?! - Turquoise & Frost have been merged. My clean up of Frost ended up looking like a combination of the two. - Caramel has been removed, Shiny Caramel takes its place. - Unleashed my inner dream as wanting to have the job of whoever gets to name crayons, and changed all two-word names. - Todo: reorganize by hue then lum for a nicer invincibility effect, redo and throughly test ColorOpposite table, double check to make sure there aren't any duplicate blendcolors for OGL
2018-07-02 07:30:33 +00:00
{ 16, 17, 19, 21, 22, 24, 26, 27, 27, 28, 28, 29, 29, 30, 30, 31}, // SKINCOLOR_BLACK
More color tweaks - Renamed Grey to Nickel, and Cloudy to Grey - Updated Silver and Nickel to look a teeensy bit more inbetween White/Grey and Grey/Black, previously they both leaned more toward Grey - Drastically changed Navy to be more distinct from Jet - Replaced Indigo with Pomegranate - Moved certain colors around to match (most notably, beiges and browns are in their own little sub-section after the greyscale colors, instead of being lumped in the middle of orange and yellow) - Updated color opposite table to match
2018-09-17 06:09:22 +00:00
{ 0, 1, 3, 5, 7, 9, 34, 36, 38, 40, 42, 44, 60, 61, 62, 63}, // SKINCOLOR_SEPIA
{ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47}, // SKINCOLOR_BEIGE
{ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63}, // SKINCOLOR_BROWN
{ 51, 52, 53, 55, 56, 57, 58, 60, 61, 63, 28, 28, 29, 29, 30, 31}, // SKINCOLOR_LEATHER
Revamped colors - The majority of all colors have been tweaked in some capacity to have higher contrast, to either make character highlights or lineart pop out more - Two new "on trial" colors that may or may not stay: Tangerine, and Dusk. Tangerine is a yellow-orange color to fill the void of yellows. Dusk is a previously removed color that looked freakin' sweet after some cleanup, why wasn't this kept?! - Turquoise & Frost have been merged. My clean up of Frost ended up looking like a combination of the two. - Caramel has been removed, Shiny Caramel takes its place. - Unleashed my inner dream as wanting to have the job of whoever gets to name crayons, and changed all two-word names. - Todo: reorganize by hue then lum for a nicer invincibility effect, redo and throughly test ColorOpposite table, double check to make sure there aren't any duplicate blendcolors for OGL
2018-07-02 07:30:33 +00:00
{120, 120, 120, 121, 121, 122, 122, 123, 124, 125, 126, 128, 129, 131, 133, 135}, // SKINCOLOR_SALMON
Edit Pink, Navy, and Jet
2018-10-04 00:48:44 +00:00
{120, 121, 121, 122, 144, 145, 146, 147, 148, 149, 150, 151, 134, 136, 138, 140}, // SKINCOLOR_PINK
Rearranged color order Invincibility should look just a tad smoother now
2018-07-11 02:59:19 +00:00
{144, 145, 146, 147, 148, 149, 150, 151, 134, 135, 136, 137, 138, 139, 140, 141}, // SKINCOLOR_ROSE
Moved colors around yet again for nicer invincibility effect - Ruby is closer to the pinks (and where purples would be if it wrapped around) - Sapphire is closer to the cyans - Dream is right before the teals
2018-10-04 01:18:07 +00:00
{121, 122, 145, 146, 147, 149, 131, 132, 133, 134, 135, 197, 197, 198, 199, 255}, // SKINCOLOR_RUBY
Revamped colors - The majority of all colors have been tweaked in some capacity to have higher contrast, to either make character highlights or lineart pop out more - Two new "on trial" colors that may or may not stay: Tangerine, and Dusk. Tangerine is a yellow-orange color to fill the void of yellows. Dusk is a previously removed color that looked freakin' sweet after some cleanup, why wasn't this kept?! - Turquoise & Frost have been merged. My clean up of Frost ended up looking like a combination of the two. - Caramel has been removed, Shiny Caramel takes its place. - Unleashed my inner dream as wanting to have the job of whoever gets to name crayons, and changed all two-word names. - Todo: reorganize by hue then lum for a nicer invincibility effect, redo and throughly test ColorOpposite table, double check to make sure there aren't any duplicate blendcolors for OGL
2018-07-02 07:30:33 +00:00
{120, 121, 122, 123, 124, 125, 126, 127, 128, 130, 131, 133, 134, 136, 137, 139}, // SKINCOLOR_RASPBERRY
Star power translation tables Redid the part that handled the regular kart translation tables too, now uses the new table created instead of the horror of what was there before
2017-10-26 19:04:05 +00:00
{125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140}, // SKINCOLOR_RED
Revamped colors - The majority of all colors have been tweaked in some capacity to have higher contrast, to either make character highlights or lineart pop out more - Two new "on trial" colors that may or may not stay: Tangerine, and Dusk. Tangerine is a yellow-orange color to fill the void of yellows. Dusk is a previously removed color that looked freakin' sweet after some cleanup, why wasn't this kept?! - Turquoise & Frost have been merged. My clean up of Frost ended up looking like a combination of the two. - Caramel has been removed, Shiny Caramel takes its place. - Unleashed my inner dream as wanting to have the job of whoever gets to name crayons, and changed all two-word names. - Todo: reorganize by hue then lum for a nicer invincibility effect, redo and throughly test ColorOpposite table, double check to make sure there aren't any duplicate blendcolors for OGL
2018-07-02 07:30:33 +00:00
{130, 131, 132, 133, 134, 136, 137, 138, 139, 139, 140, 140, 141, 141, 142, 143}, // SKINCOLOR_CRIMSON
Instead of doing productive things, I changed around skincolors again - Renamed Ivory to White, removed Nickel and old White, and improved Silver and Grey. - Improved Pink & Ruby. - Added Ketchup, replaced Canary with Mustard. - Removed Army.
2018-09-13 06:07:00 +00:00
{104, 113, 113, 85, 86, 88, 128, 129, 131, 133, 134, 136, 138, 139, 141, 143}, // SKINCOLOR_KETCHUP
Revamped colors - The majority of all colors have been tweaked in some capacity to have higher contrast, to either make character highlights or lineart pop out more - Two new "on trial" colors that may or may not stay: Tangerine, and Dusk. Tangerine is a yellow-orange color to fill the void of yellows. Dusk is a previously removed color that looked freakin' sweet after some cleanup, why wasn't this kept?! - Turquoise & Frost have been merged. My clean up of Frost ended up looking like a combination of the two. - Caramel has been removed, Shiny Caramel takes its place. - Unleashed my inner dream as wanting to have the job of whoever gets to name crayons, and changed all two-word names. - Todo: reorganize by hue then lum for a nicer invincibility effect, redo and throughly test ColorOpposite table, double check to make sure there aren't any duplicate blendcolors for OGL
2018-07-02 07:30:33 +00:00
{120, 121, 122, 123, 124, 147, 147, 148, 90, 91, 92, 93, 94, 95, 152, 154}, // SKINCOLOR_DAWN
Rearranged color order Invincibility should look just a tad smoother now
2018-07-11 02:59:19 +00:00
{120, 120, 80, 80, 81, 82, 83, 83, 84, 85, 86, 88, 89, 91, 93, 95}, // SKINCOLOR_CREAMSICLE
Revamped colors - The majority of all colors have been tweaked in some capacity to have higher contrast, to either make character highlights or lineart pop out more - Two new "on trial" colors that may or may not stay: Tangerine, and Dusk. Tangerine is a yellow-orange color to fill the void of yellows. Dusk is a previously removed color that looked freakin' sweet after some cleanup, why wasn't this kept?! - Turquoise & Frost have been merged. My clean up of Frost ended up looking like a combination of the two. - Caramel has been removed, Shiny Caramel takes its place. - Unleashed my inner dream as wanting to have the job of whoever gets to name crayons, and changed all two-word names. - Todo: reorganize by hue then lum for a nicer invincibility effect, redo and throughly test ColorOpposite table, double check to make sure there aren't any duplicate blendcolors for OGL
2018-07-02 07:30:33 +00:00
{ 80, 81, 82, 83, 84, 85, 86, 88, 89, 91, 94, 95, 154, 156, 158, 159}, // SKINCOLOR_ORANGE
{ 84, 85, 86, 87, 88, 90, 92, 93, 94, 95, 152, 153, 154, 156, 157, 159}, // SKINCOLOR_PUMPKIN
{ 90, 91, 92, 93, 94, 152, 153, 154, 155, 156, 157, 158, 159, 139, 141, 143}, // SKINCOLOR_ROSEWOOD
{ 94, 95, 152, 153, 154, 156, 157, 159, 141, 141, 141, 142, 142, 143, 143, 31}, // SKINCOLOR_BURGUNDY
More color tweaks - Renamed Grey to Nickel, and Cloudy to Grey - Updated Silver and Nickel to look a teeensy bit more inbetween White/Grey and Grey/Black, previously they both leaned more toward Grey - Drastically changed Navy to be more distinct from Jet - Replaced Indigo with Pomegranate - Moved certain colors around to match (most notably, beiges and browns are in their own little sub-section after the greyscale colors, instead of being lumped in the middle of orange and yellow) - Updated color opposite table to match
2018-09-17 06:09:22 +00:00
{ 98, 98, 112, 112, 113, 113, 84, 85, 87, 89, 91, 93, 95, 153, 156, 159}, // SKINCOLOR_TANGERINE
Revamped colors - The majority of all colors have been tweaked in some capacity to have higher contrast, to either make character highlights or lineart pop out more - Two new "on trial" colors that may or may not stay: Tangerine, and Dusk. Tangerine is a yellow-orange color to fill the void of yellows. Dusk is a previously removed color that looked freakin' sweet after some cleanup, why wasn't this kept?! - Turquoise & Frost have been merged. My clean up of Frost ended up looking like a combination of the two. - Caramel has been removed, Shiny Caramel takes its place. - Unleashed my inner dream as wanting to have the job of whoever gets to name crayons, and changed all two-word names. - Todo: reorganize by hue then lum for a nicer invincibility effect, redo and throughly test ColorOpposite table, double check to make sure there aren't any duplicate blendcolors for OGL
2018-07-02 07:30:33 +00:00
{ 64, 65, 67, 68, 70, 71, 73, 74, 76, 77, 79, 48, 50, 53, 56, 59}, // SKINCOLOR_PEACH
{ 64, 66, 68, 70, 72, 74, 76, 78, 48, 50, 52, 54, 56, 58, 60, 62}, // SKINCOLOR_CARAMEL
Rearranged color order Invincibility should look just a tad smoother now
2018-07-11 02:59:19 +00:00
{112, 112, 112, 113, 113, 114, 114, 115, 115, 116, 116, 117, 117, 118, 118, 119}, // SKINCOLOR_GOLD
More color tweaks - Renamed Grey to Nickel, and Cloudy to Grey - Updated Silver and Nickel to look a teeensy bit more inbetween White/Grey and Grey/Black, previously they both leaned more toward Grey - Drastically changed Navy to be more distinct from Jet - Replaced Indigo with Pomegranate - Moved certain colors around to match (most notably, beiges and browns are in their own little sub-section after the greyscale colors, instead of being lumped in the middle of orange and yellow) - Updated color opposite table to match
2018-09-17 06:09:22 +00:00
{112, 113, 114, 115, 116, 117, 118, 119, 156, 157, 158, 159, 141, 141, 142, 143}, // SKINCOLOR_BRONZE
Rearranged color order Invincibility should look just a tad smoother now
2018-07-11 02:59:19 +00:00
{ 96, 97, 98, 100, 101, 102, 104, 113, 114, 115, 116, 117, 118, 119, 156, 159}, // SKINCOLOR_YELLOW
Instead of doing productive things, I changed around skincolors again - Renamed Ivory to White, removed Nickel and old White, and improved Silver and Grey. - Improved Pink & Ruby. - Added Ketchup, replaced Canary with Mustard. - Removed Army.
2018-09-13 06:07:00 +00:00
{ 96, 98, 99, 112, 113, 114, 114, 106, 106, 107, 107, 108, 108, 109, 110, 111}, // SKINCOLOR_MUSTARD
Rearranged color order Invincibility should look just a tad smoother now
2018-07-11 02:59:19 +00:00
{105, 105, 105, 106, 106, 107, 107, 108, 108, 109, 109, 110, 110, 111, 111, 31}, // SKINCOLOR_OLIVE
More color tweaks - Renamed Grey to Nickel, and Cloudy to Grey - Updated Silver and Nickel to look a teeensy bit more inbetween White/Grey and Grey/Black, previously they both leaned more toward Grey - Drastically changed Navy to be more distinct from Jet - Replaced Indigo with Pomegranate - Moved certain colors around to match (most notably, beiges and browns are in their own little sub-section after the greyscale colors, instead of being lumped in the middle of orange and yellow) - Updated color opposite table to match
2018-09-17 06:09:22 +00:00
{121, 144, 145, 72, 73, 84, 114, 115, 107, 108, 109, 183, 223, 207, 30, 246}, // SKINCOLOR_VOMIT
Revamped colors - The majority of all colors have been tweaked in some capacity to have higher contrast, to either make character highlights or lineart pop out more - Two new "on trial" colors that may or may not stay: Tangerine, and Dusk. Tangerine is a yellow-orange color to fill the void of yellows. Dusk is a previously removed color that looked freakin' sweet after some cleanup, why wasn't this kept?! - Turquoise & Frost have been merged. My clean up of Frost ended up looking like a combination of the two. - Caramel has been removed, Shiny Caramel takes its place. - Unleashed my inner dream as wanting to have the job of whoever gets to name crayons, and changed all two-word names. - Todo: reorganize by hue then lum for a nicer invincibility effect, redo and throughly test ColorOpposite table, double check to make sure there aren't any duplicate blendcolors for OGL
2018-07-02 07:30:33 +00:00
{ 98, 99, 112, 101, 113, 114, 106, 179, 180, 180, 181, 182, 183, 173, 174, 175}, // SKINCOLOR_GARDEN
Rearranged color order Invincibility should look just a tad smoother now
2018-07-11 02:59:19 +00:00
{ 96, 97, 99, 100, 102, 104, 160, 162, 164, 166, 168, 171, 223, 223, 207, 31}, // SKINCOLOR_LIME
More color tweaks - Renamed Grey to Nickel, and Cloudy to Grey - Updated Silver and Nickel to look a teeensy bit more inbetween White/Grey and Grey/Black, previously they both leaned more toward Grey - Drastically changed Navy to be more distinct from Jet - Replaced Indigo with Pomegranate - Moved certain colors around to match (most notably, beiges and browns are in their own little sub-section after the greyscale colors, instead of being lumped in the middle of orange and yellow) - Updated color opposite table to match
2018-09-17 06:09:22 +00:00
{120, 120, 176, 176, 176, 177, 177, 178, 178, 179, 179, 180, 180, 181, 182, 183}, // SKINCOLOR_TEA
Revamped colors - The majority of all colors have been tweaked in some capacity to have higher contrast, to either make character highlights or lineart pop out more - Two new "on trial" colors that may or may not stay: Tangerine, and Dusk. Tangerine is a yellow-orange color to fill the void of yellows. Dusk is a previously removed color that looked freakin' sweet after some cleanup, why wasn't this kept?! - Turquoise & Frost have been merged. My clean up of Frost ended up looking like a combination of the two. - Caramel has been removed, Shiny Caramel takes its place. - Unleashed my inner dream as wanting to have the job of whoever gets to name crayons, and changed all two-word names. - Todo: reorganize by hue then lum for a nicer invincibility effect, redo and throughly test ColorOpposite table, double check to make sure there aren't any duplicate blendcolors for OGL
2018-07-02 07:30:33 +00:00
{120, 120, 176, 176, 177, 177, 178, 179, 165, 166, 167, 168, 169, 170, 171, 172}, // SKINCOLOR_PISTACHIO
More color tweaks - Renamed Grey to Nickel, and Cloudy to Grey - Updated Silver and Nickel to look a teeensy bit more inbetween White/Grey and Grey/Black, previously they both leaned more toward Grey - Drastically changed Navy to be more distinct from Jet - Replaced Indigo with Pomegranate - Moved certain colors around to match (most notably, beiges and browns are in their own little sub-section after the greyscale colors, instead of being lumped in the middle of orange and yellow) - Updated color opposite table to match
2018-09-17 06:09:22 +00:00
{176, 176, 177, 178, 165, 166, 167, 167, 168, 169, 182, 182, 182, 183, 183, 183}, // SKINCOLOR_ROBOHOOD
Revamped colors - The majority of all colors have been tweaked in some capacity to have higher contrast, to either make character highlights or lineart pop out more - Two new "on trial" colors that may or may not stay: Tangerine, and Dusk. Tangerine is a yellow-orange color to fill the void of yellows. Dusk is a previously removed color that looked freakin' sweet after some cleanup, why wasn't this kept?! - Turquoise & Frost have been merged. My clean up of Frost ended up looking like a combination of the two. - Caramel has been removed, Shiny Caramel takes its place. - Unleashed my inner dream as wanting to have the job of whoever gets to name crayons, and changed all two-word names. - Todo: reorganize by hue then lum for a nicer invincibility effect, redo and throughly test ColorOpposite table, double check to make sure there aren't any duplicate blendcolors for OGL
2018-07-02 07:30:33 +00:00
{178, 178, 178, 179, 179, 180, 181, 182, 183, 172, 172, 173, 173, 174, 174, 175}, // SKINCOLOR_MOSS
Removed Amber & Jade, added Canary & Lime, changed Blueberry & Mint
2018-07-02 17:54:01 +00:00
{120, 176, 176, 176, 177, 163, 164, 165, 167, 221, 221, 222, 223, 207, 207, 31}, // SKINCOLOR_MINT
Star power translation tables Redid the part that handled the regular kart translation tables too, now uses the new table created instead of the horror of what was there before
2017-10-26 19:04:05 +00:00
{160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175}, // SKINCOLOR_GREEN
Revamped colors - The majority of all colors have been tweaked in some capacity to have higher contrast, to either make character highlights or lineart pop out more - Two new "on trial" colors that may or may not stay: Tangerine, and Dusk. Tangerine is a yellow-orange color to fill the void of yellows. Dusk is a previously removed color that looked freakin' sweet after some cleanup, why wasn't this kept?! - Turquoise & Frost have been merged. My clean up of Frost ended up looking like a combination of the two. - Caramel has been removed, Shiny Caramel takes its place. - Unleashed my inner dream as wanting to have the job of whoever gets to name crayons, and changed all two-word names. - Todo: reorganize by hue then lum for a nicer invincibility effect, redo and throughly test ColorOpposite table, double check to make sure there aren't any duplicate blendcolors for OGL
2018-07-02 07:30:33 +00:00
{160, 161, 162, 164, 165, 167, 169, 170, 171, 171, 172, 173, 174, 175, 30, 31}, // SKINCOLOR_PINETREE
Rearranged color order Invincibility should look just a tad smoother now
2018-07-11 02:59:19 +00:00
{160, 184, 184, 185, 185, 186, 186, 187, 187, 188, 188, 189, 189, 190, 191, 175}, // SKINCOLOR_EMERALD
Revamped colors - The majority of all colors have been tweaked in some capacity to have higher contrast, to either make character highlights or lineart pop out more - Two new "on trial" colors that may or may not stay: Tangerine, and Dusk. Tangerine is a yellow-orange color to fill the void of yellows. Dusk is a previously removed color that looked freakin' sweet after some cleanup, why wasn't this kept?! - Turquoise & Frost have been merged. My clean up of Frost ended up looking like a combination of the two. - Caramel has been removed, Shiny Caramel takes its place. - Unleashed my inner dream as wanting to have the job of whoever gets to name crayons, and changed all two-word names. - Todo: reorganize by hue then lum for a nicer invincibility effect, redo and throughly test ColorOpposite table, double check to make sure there aren't any duplicate blendcolors for OGL
2018-07-02 07:30:33 +00:00
{186, 187, 188, 188, 188, 189, 189, 190, 190, 191, 175, 175, 30, 30, 31, 31}, // SKINCOLOR_SWAMP
Moved colors around yet again for nicer invincibility effect - Ruby is closer to the pinks (and where purples would be if it wrapped around) - Sapphire is closer to the cyans - Dream is right before the teals
2018-10-04 01:18:07 +00:00
{120, 120, 80, 80, 81, 177, 162, 164, 228, 228, 204, 204, 205, 205, 206, 207}, // SKINCOLOR_DREAM
Sorry, Sal! In my defense, you don't need to recompile from scratch for any of this, despite what it may look like, as the skincolour name lists are walled off from the rest of the dehacked lists... More menu/highlight things: * Rename "Default" to "Game type", to make clearer what it's doing. * Tweak race colouring slightly. * Put a highlight around the level select icon, and make it consistent with voting. * Allow setting the highlight colour to affect the intermissions. * Fix bug with gametype colour getting for record attack. A handful of skincolour things: * Rename Turqouise to Aqua, because it resembles one of my fav 2.2 colours with that name. * Fix incomplete Steel Blue -> Steel rename. * Merge the very similar Blueberry and Sapphire... * ... so Sapphire can be backported! * And Ruby too.
2018-07-02 12:20:04 +00:00
{120, 208, 208, 210, 212, 214, 220, 220, 220, 221, 221, 222, 222, 223, 223, 191}, // SKINCOLOR_AQUA
Tweak these blues Try to make all the blues using this range look a little different, you know? - Cyan is brighter, and has more contrast. - Teal has 1 more shade of blue for slightly better anti-aliasing.
2018-09-13 07:04:01 +00:00
{210, 213, 220, 220, 220, 216, 216, 221, 221, 221, 222, 222, 223, 223, 191, 31}, // SKINCOLOR_TEAL
{120, 120, 208, 208, 209, 210, 211, 212, 213, 215, 216, 217, 218, 219, 222, 223}, // SKINCOLOR_CYAN
Instead of doing productive things, I changed around skincolors again - Renamed Ivory to White, removed Nickel and old White, and improved Silver and Grey. - Improved Pink & Ruby. - Added Ketchup, replaced Canary with Mustard. - Removed Army.
2018-09-13 06:07:00 +00:00
{120, 120, 208, 209, 210, 226, 215, 216, 217, 229, 229, 205, 205, 206, 207, 31}, // SKINCOLOR_JAWZ
More color tweaks - Renamed Grey to Nickel, and Cloudy to Grey - Updated Silver and Nickel to look a teeensy bit more inbetween White/Grey and Grey/Black, previously they both leaned more toward Grey - Drastically changed Navy to be more distinct from Jet - Replaced Indigo with Pomegranate - Moved certain colors around to match (most notably, beiges and browns are in their own little sub-section after the greyscale colors, instead of being lumped in the middle of orange and yellow) - Updated color opposite table to match
2018-09-17 06:09:22 +00:00
{208, 209, 211, 213, 215, 216, 216, 217, 217, 218, 218, 219, 205, 206, 207, 207}, // SKINCOLOR_CERULEAN
Edit Pink, Navy, and Jet
2018-10-04 00:48:44 +00:00
{211, 212, 213, 215, 216, 218, 219, 205, 206, 206, 207, 207, 28, 29, 30, 31}, // SKINCOLOR_NAVY
Rearranged color order Invincibility should look just a tad smoother now
2018-07-11 02:59:19 +00:00
{120, 120, 200, 200, 200, 201, 201, 201, 202, 202, 202, 203, 204, 205, 206, 207}, // SKINCOLOR_SLATE
Revamped colors - The majority of all colors have been tweaked in some capacity to have higher contrast, to either make character highlights or lineart pop out more - Two new "on trial" colors that may or may not stay: Tangerine, and Dusk. Tangerine is a yellow-orange color to fill the void of yellows. Dusk is a previously removed color that looked freakin' sweet after some cleanup, why wasn't this kept?! - Turquoise & Frost have been merged. My clean up of Frost ended up looking like a combination of the two. - Caramel has been removed, Shiny Caramel takes its place. - Unleashed my inner dream as wanting to have the job of whoever gets to name crayons, and changed all two-word names. - Todo: reorganize by hue then lum for a nicer invincibility effect, redo and throughly test ColorOpposite table, double check to make sure there aren't any duplicate blendcolors for OGL
2018-07-02 07:30:33 +00:00
{120, 200, 200, 201, 201, 202, 202, 203, 203, 204, 204, 205, 205, 206, 207, 31}, // SKINCOLOR_STEEL
Edit Pink, Navy, and Jet
2018-10-04 00:48:44 +00:00
{225, 226, 227, 228, 229, 205, 205, 206, 207, 207, 28, 28, 29, 29, 30, 31}, // SKINCOLOR_JET
Moved colors around yet again for nicer invincibility effect - Ruby is closer to the pinks (and where purples would be if it wrapped around) - Sapphire is closer to the cyans - Dream is right before the teals
2018-10-04 01:18:07 +00:00
{208, 209, 211, 213, 215, 217, 229, 230, 232, 234, 236, 238, 240, 242, 244, 246}, // SKINCOLOR_SAPPHIRE
Rearranged color order Invincibility should look just a tad smoother now
2018-07-11 02:59:19 +00:00
{120, 224, 225, 226, 226, 227, 228, 228, 229, 230, 231, 234, 235, 237, 239, 241}, // SKINCOLOR_PERIWINKLE
Star power translation tables Redid the part that handled the regular kart translation tables too, now uses the new table created instead of the horror of what was there before
2017-10-26 19:04:05 +00:00
{224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239}, // SKINCOLOR_BLUE
Removed Amber & Jade, added Canary & Lime, changed Blueberry & Mint
2018-07-02 17:54:01 +00:00
{228, 229, 230, 231, 232, 233, 234, 235, 237, 238, 239, 240, 242, 243, 244, 245}, // SKINCOLOR_BLUEBERRY
Revamped colors - The majority of all colors have been tweaked in some capacity to have higher contrast, to either make character highlights or lineart pop out more - Two new "on trial" colors that may or may not stay: Tangerine, and Dusk. Tangerine is a yellow-orange color to fill the void of yellows. Dusk is a previously removed color that looked freakin' sweet after some cleanup, why wasn't this kept?! - Turquoise & Frost have been merged. My clean up of Frost ended up looking like a combination of the two. - Caramel has been removed, Shiny Caramel takes its place. - Unleashed my inner dream as wanting to have the job of whoever gets to name crayons, and changed all two-word names. - Todo: reorganize by hue then lum for a nicer invincibility effect, redo and throughly test ColorOpposite table, double check to make sure there aren't any duplicate blendcolors for OGL
2018-07-02 07:30:33 +00:00
{192, 192, 248, 249, 250, 251, 204, 204, 205, 205, 206, 206, 207, 29, 30, 31}, // SKINCOLOR_DUSK
{192, 192, 192, 193, 193, 194, 194, 195, 195, 196, 196, 197, 197, 198, 198, 199}, // SKINCOLOR_PURPLE
{248, 248, 248, 249, 249, 250, 250, 251, 251, 252, 252, 253, 253, 254, 254, 255}, // SKINCOLOR_LAVENDER
Rearranged color order Invincibility should look just a tad smoother now
2018-07-11 02:59:19 +00:00
{192, 248, 249, 250, 251, 252, 253, 254, 255, 255, 29, 29, 30, 30, 31, 31}, // SKINCOLOR_BYZANTIUM
More color tweaks - Renamed Grey to Nickel, and Cloudy to Grey - Updated Silver and Nickel to look a teeensy bit more inbetween White/Grey and Grey/Black, previously they both leaned more toward Grey - Drastically changed Navy to be more distinct from Jet - Replaced Indigo with Pomegranate - Moved certain colors around to match (most notably, beiges and browns are in their own little sub-section after the greyscale colors, instead of being lumped in the middle of orange and yellow) - Updated color opposite table to match
2018-09-17 06:09:22 +00:00
{144, 145, 146, 147, 148, 149, 150, 251, 251, 252, 252, 253, 254, 255, 29, 30}, // SKINCOLOR_POMEGRANATE
Rearranged color order Invincibility should look just a tad smoother now
2018-07-11 02:59:19 +00:00
{120, 120, 120, 121, 121, 122, 122, 123, 192, 248, 249, 250, 251, 252, 253, 254}, // SKINCOLOR_LILAC
Star power translation tables Redid the part that handled the regular kart translation tables too, now uses the new table created instead of the horror of what was there before
2017-10-26 19:04:05 +00:00
/* Removed Colours
Instead of doing productive things, I changed around skincolors again - Renamed Ivory to White, removed Nickel and old White, and improved Silver and Grey. - Improved Pink & Ruby. - Added Ketchup, replaced Canary with Mustard. - Removed Army.
2018-09-13 06:07:00 +00:00
{120, 121, 123, 124, 126, 127, 129, 130, 132, 133, 135, 136, 138, 139, 141, 143}, // old SKINCOLOR_RUBY, removed for other colors
{224, 225, 226, 228, 229, 231, 232, 234, 235, 237, 238, 240, 241, 243, 244, 246}, // old SKINCOLOR_SAPPHIRE, removed for other colors
More color tweaks - Renamed Grey to Nickel, and Cloudy to Grey - Updated Silver and Nickel to look a teeensy bit more inbetween White/Grey and Grey/Black, previously they both leaned more toward Grey - Drastically changed Navy to be more distinct from Jet - Replaced Indigo with Pomegranate - Moved certain colors around to match (most notably, beiges and browns are in their own little sub-section after the greyscale colors, instead of being lumped in the middle of orange and yellow) - Updated color opposite table to match
2018-09-17 06:09:22 +00:00
{ 72, 73, 74, 75, 76, 77, 78, 79, 48, 49, 50, 51, 52, 53, 54, 55}, // old SKINCOLOR_CARAMEL, new Caramel was previously Shiny Caramel
{215, 216, 217, 218, 204, 205, 206, 237, 238, 239, 240, 241, 242, 243, 244, 245}, // old SKINCOLOR_NAVY, too similar to Jet
{ 80, 81, 83, 85, 86, 88, 90, 91, 93, 95, 152, 153, 154, 156, 157, 159}, // SKINCOLOR_AMBER, removed for other colors
Removed Amber & Jade, added Canary & Lime, changed Blueberry & Mint
2018-07-02 17:54:01 +00:00
{160, 160, 160, 184, 184, 184, 185, 185, 185, 186, 187, 187, 188, 188, 189, 190}, // SKINCOLOR_JADE, removed for other colors
{224, 225, 226, 212, 213, 213, 214, 215, 220, 221, 172, 222, 173, 223, 174, 175}, // SKINCOLOR_FROST, merged into Aqua
More color tweaks - Renamed Grey to Nickel, and Cloudy to Grey - Updated Silver and Nickel to look a teeensy bit more inbetween White/Grey and Grey/Black, previously they both leaned more toward Grey - Drastically changed Navy to be more distinct from Jet - Replaced Indigo with Pomegranate - Moved certain colors around to match (most notably, beiges and browns are in their own little sub-section after the greyscale colors, instead of being lumped in the middle of orange and yellow) - Updated color opposite table to match
2018-09-17 06:09:22 +00:00
{ 96, 97, 99, 100, 102, 104, 105, 105, 106, 107, 107, 108, 109, 109, 110, 111}, // SKINCOLOR_CANARY, replaced with Mustard
{192, 193, 194, 195, 196, 197, 198, 199, 255, 255, 29, 29, 30, 30, 31, 31}, // SKINCOLOR_INDIGO, too similar to Byzantium
Revamped colors - The majority of all colors have been tweaked in some capacity to have higher contrast, to either make character highlights or lineart pop out more - Two new "on trial" colors that may or may not stay: Tangerine, and Dusk. Tangerine is a yellow-orange color to fill the void of yellows. Dusk is a previously removed color that looked freakin' sweet after some cleanup, why wasn't this kept?! - Turquoise & Frost have been merged. My clean up of Frost ended up looking like a combination of the two. - Caramel has been removed, Shiny Caramel takes its place. - Unleashed my inner dream as wanting to have the job of whoever gets to name crayons, and changed all two-word names. - Todo: reorganize by hue then lum for a nicer invincibility effect, redo and throughly test ColorOpposite table, double check to make sure there aren't any duplicate blendcolors for OGL
2018-07-02 07:30:33 +00:00
{ 1, 145, 125, 73, 83, 114, 106, 180, 187, 168, 219, 205, 236, 206, 199, 255}, // SKINCOLOR_RAINBOW, is Vomit 2.0
Star power translation tables Redid the part that handled the regular kart translation tables too, now uses the new table created instead of the horror of what was there before
2017-10-26 19:04:05 +00:00
*/
};
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
New color brightness formula Gets more accurate looking results
2018-09-17 03:28:10 +00:00
// Define for getting accurate color brightness readings according to how the human eye sees them.
// https://en.wikipedia.org/wiki/Relative_luminance
// 0.2126 to red
// 0.7152 to green
// 0.0722 to blue
// (See this same define in hw_md2.c!)
#define SETBRIGHTNESS(brightness,r,g,b) \
brightness = (UINT8)(((1063*((UINT16)r)/5000) + (3576*((UINT16)g)/5000) + (361*((UINT16)b)/5000)) / 3)
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
/** \brief Generates the rainbow colourmaps that are used when a player has the invincibility power
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
Star power translation tables Redid the part that handled the regular kart translation tables too, now uses the new table created instead of the horror of what was there before
2017-10-26 19:04:05 +00:00
\param dest_colormap colormap to populate
\param skincolor translation color
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
*/
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
void K_RainbowColormap(UINT8 *dest_colormap, UINT8 skincolor)
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
{
Alternate TC_RAINBOW Leaving behind a commented out define for now because I dunno if I like it yet
2018-09-16 22:10:29 +00:00
INT32 i;
Star power translation tables Redid the part that handled the regular kart translation tables too, now uses the new table created instead of the horror of what was there before
2017-10-26 19:04:05 +00:00
RGBA_t color;
UINT8 brightness;
Alternate TC_RAINBOW Leaving behind a commented out define for now because I dunno if I like it yet
2018-09-16 22:10:29 +00:00
INT32 j;
UINT8 colorbrightnesses[16];
Star power translation tables Redid the part that handled the regular kart translation tables too, now uses the new table created instead of the horror of what was there before
2017-10-26 19:04:05 +00:00
UINT16 brightdif;
INT32 temp;
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
Star power translation tables Redid the part that handled the regular kart translation tables too, now uses the new table created instead of the horror of what was there before
2017-10-26 19:04:05 +00:00
// first generate the brightness of all the colours of that skincolour
for (i = 0; i < 16; i++)
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
{
Star power translation tables Redid the part that handled the regular kart translation tables too, now uses the new table created instead of the horror of what was there before
2017-10-26 19:04:05 +00:00
color = V_GetColor(colortranslations[skincolor][i]);
New color brightness formula Gets more accurate looking results
2018-09-17 03:28:10 +00:00
SETBRIGHTNESS(colorbrightnesses[i], color.s.red, color.s.green, color.s.blue);
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
}
Star power translation tables Redid the part that handled the regular kart translation tables too, now uses the new table created instead of the horror of what was there before
2017-10-26 19:04:05 +00:00
// next, for every colour in the palette, choose the transcolor that has the closest brightness
for (i = 0; i < NUM_PALETTE_ENTRIES; i++)
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
{
Pure white and pure black shouldn't change on star colormap
2018-02-05 02:53:55 +00:00
if (i == 0 || i == 31 || i == 120) // pure black and pure white don't change
{
dest_colormap[i] = (UINT8)i;
continue;
}
Star power translation tables Redid the part that handled the regular kart translation tables too, now uses the new table created instead of the horror of what was there before
2017-10-26 19:04:05 +00:00
color = V_GetColor(i);
New color brightness formula Gets more accurate looking results
2018-09-17 03:28:10 +00:00
SETBRIGHTNESS(brightness, color.s.red, color.s.green, color.s.blue);
Star power translation tables Redid the part that handled the regular kart translation tables too, now uses the new table created instead of the horror of what was there before
2017-10-26 19:04:05 +00:00
brightdif = 256;
for (j = 0; j < 16; j++)
{
temp = abs((INT16)brightness - (INT16)colorbrightnesses[j]);
if (temp < brightdif)
{
brightdif = (UINT16)temp;
dest_colormap[i] = colortranslations[skincolor][j];
}
}
}
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
}
New color brightness formula Gets more accurate looking results
2018-09-17 03:28:10 +00:00
#undef SETBRIGHTNESS
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
/** \brief Generates a translation colormap for Kart, to replace R_GenerateTranslationColormap in r_draw.c
\param dest_colormap colormap to populate
\param skinnum number of skin, TC_DEFAULT or TC_BOSS
\param color translation color
\return void
*/
void K_GenerateKartColormap(UINT8 *dest_colormap, INT32 skinnum, UINT8 color)
{
INT32 i;
INT32 starttranscolor;
// Handle a couple of simple special cases
if (skinnum == TC_BOSS || skinnum == TC_ALLWHITE || skinnum == TC_METALSONIC || color == SKINCOLOR_NONE)
{
for (i = 0; i < NUM_PALETTE_ENTRIES; i++)
{
if (skinnum == TC_ALLWHITE) dest_colormap[i] = 0;
else dest_colormap[i] = (UINT8)i;
}
// White!
if (skinnum == TC_BOSS)
dest_colormap[31] = 0;
else if (skinnum == TC_METALSONIC)
dest_colormap[239] = 0;
return;
}
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
else if (skinnum == TC_RAINBOW)
Star power translation tables Redid the part that handled the regular kart translation tables too, now uses the new table created instead of the horror of what was there before
2017-10-26 19:04:05 +00:00
{
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
K_RainbowColormap(dest_colormap, color);
Star power translation tables Redid the part that handled the regular kart translation tables too, now uses the new table created instead of the horror of what was there before
2017-10-26 19:04:05 +00:00
return;
}
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
starttranscolor = (skinnum != TC_DEFAULT) ? skins[skinnum].starttranscolor : DEFAULT_STARTTRANSCOLOR;
// Fill in the entries of the palette that are fixed
for (i = 0; i < starttranscolor; i++)
dest_colormap[i] = (UINT8)i;
for (i = (UINT8)(starttranscolor + 16); i < NUM_PALETTE_ENTRIES; i++)
dest_colormap[i] = (UINT8)i;
// Build the translated ramp
for (i = 0; i < SKIN_RAMP_LENGTH; i++)
Star power translation tables Redid the part that handled the regular kart translation tables too, now uses the new table created instead of the horror of what was there before
2017-10-26 19:04:05 +00:00
{
// Sryder 2017-10-26: What was here before was most definitely not particularly readable, check above for new color translation table
dest_colormap[starttranscolor + i] = colortranslations[color][i];
}
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
}
/** \brief Pulls kart color by name, to replace R_GetColorByName in r_draw.c
\param name color name
\return 0
*/
UINT8 K_GetKartColorByName(const char *name)
{
UINT8 color = (UINT8)atoi(name);
if (color > 0 && color < MAXSKINCOLORS)
return color;
for (color = 1; color < MAXSKINCOLORS; color++)
if (!stricmp(KartColor_Names[color], name))
return color;
return 0;
}
//}
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
//{ SRB2kart Net Variables
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
void K_RegisterKartStuff(void)
{
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
CV_RegisterVar(&cv_sneaker);
CV_RegisterVar(&cv_rocketsneaker);
CV_RegisterVar(&cv_invincibility);
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
CV_RegisterVar(&cv_banana);
Rename fake item to eggman monitor
2018-03-14 01:07:08 +00:00
CV_RegisterVar(&cv_eggmanmonitor);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
CV_RegisterVar(&cv_orbinaut);
CV_RegisterVar(&cv_jawz);
CV_RegisterVar(&cv_mine);
CV_RegisterVar(&cv_ballhog);
CV_RegisterVar(&cv_selfpropelledbomb);
New invincibility effect, grow/shrink stuff Whenever grow/shrink effects get made, I'll remove the Mario-style stuttered growth and whatever else needs doing beyond that
2018-02-10 06:19:33 +00:00
CV_RegisterVar(&cv_grow);
CV_RegisterVar(&cv_shrink);
Thunder shield overlay
2018-08-04 19:48:31 +00:00
CV_RegisterVar(&cv_thundershield);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
CV_RegisterVar(&cv_hyudoro);
CV_RegisterVar(&cv_pogospring);
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
CV_RegisterVar(&cv_kitchensink);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
CV_RegisterVar(&cv_triplesneaker);
CV_RegisterVar(&cv_triplebanana);
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
CV_RegisterVar(&cv_decabanana);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
CV_RegisterVar(&cv_tripleorbinaut);
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
CV_RegisterVar(&cv_quadorbinaut);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
CV_RegisterVar(&cv_dualjawz);
Some position code
2017-02-13 04:24:49 +00:00
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
CV_RegisterVar(&cv_kartminimap);
CHECK indicator Turn it off with the kartcheck console var
2017-11-02 04:35:10 +00:00
CV_RegisterVar(&cv_kartcheck);
Better menus
2018-06-15 00:18:29 +00:00
CV_RegisterVar(&cv_kartinvinsfx);
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
CV_RegisterVar(&cv_kartspeed);
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
CV_RegisterVar(&cv_kartbumpers);
Balloon revamp Supports arbitrary balloon counts now
2017-11-01 22:46:35 +00:00
CV_RegisterVar(&cv_kartfrantic);
Battle HUD stuff
2017-11-14 01:45:57 +00:00
CV_RegisterVar(&cv_kartcomeback);
Encore mode - a fresh take on mirror mode! * Palette remaps. * Branding. TODO: * Doesn't work in GL. (Mostly.) I have SOME ideas on how to tackle this, but... * Transmaps are broken in Encore for some reason. * I tried to make in-level colormaps shimmy over, but it didn't quite work, so I commented it out and only semi-fixed it.
2018-07-23 22:50:41 +00:00
CV_RegisterVar(&cv_kartencore);
Do a bunch of major modifications to the voting system's rule change system! * Add `kartvoterulechanges`, or "Voting Rule Changes" on the menu, to allow some user control over event frequency. * "Never" - does what it says on the tin. * "Sometimes" - 1/8 chance of Encore if host has unlocked it, only gametype change when buffer is full * "Frequent" - 1/2 chance of Encore if host has unlocked it, gametype change every 5 maps * "Always" - If host has unlocked Encore, alternates between Encore and Gametype. Otherwise, always a gametype change * There's probably room for a setting between "Sometimes" and "Frequent", but I didn't want to overload the host with options and these were the ones that made sense. * Better handling of buffer refreshes, to prevent two of the same map appearing next to each other in the voting unless there literally aren't that many maps. * Mostly unrelated: Minor bugfix for Y_SetupVoteFinish, preventing music changes/random sounds playing on the You Will Join Next Race screen. (Branch-appropriate, at least.)
2018-09-11 14:41:41 +00:00
CV_RegisterVar(&cv_kartvoterulechanges);
Better menus
2018-06-15 00:18:29 +00:00
CV_RegisterVar(&cv_kartspeedometer);
Some minor things to help draw sonicitems to a close. * "kartvoices" cvar. Possible values "Never", "Tasteful" (default), and "Meme". * Added a way to move quickly through the credits, rather than skip them entirely (hold spacebar or down arrow). * Fix a few mistakes in M_ChangeCvar, some of which I introduced and some of which were weird in the first place. * Tweak the offset of the arrows that let you know you can modify a cvar by pressing left or right (some via a patch.kart change, but others via tweaking the drawing location).
2018-07-29 17:35:56 +00:00
CV_RegisterVar(&cv_kartvoices);
Added the ability to toggle the f-zero style elimination of last place specifically. Type `karteliminatelast off` to turn it off, and `karteliminatelast on` to... you know the rest.
2018-07-25 20:33:03 +00:00
CV_RegisterVar(&cv_karteliminatelast);
Functional, ready for netgame!
2018-01-28 04:52:01 +00:00
CV_RegisterVar(&cv_votetime);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
CV_RegisterVar(&cv_kartdebugitem);
CV_RegisterVar(&cv_kartdebugamount);
Shrink debug command, trailing items spawn directly on players, rainbow win 1 is more faithful, make springs more powerful for shrunk players, correct Grow/Shrink fullbright frame
2018-07-12 05:31:33 +00:00
CV_RegisterVar(&cv_kartdebugshrink);
Item distribution debugger, and oversight pointed out by this Item distribution debugger is a netvar that enables cheats, so no exploiting!
2018-08-29 18:28:28 +00:00
CV_RegisterVar(&cv_kartdebugdistribution);
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
CV_RegisterVar(&cv_kartdebughuddrop);
Item distribution debugger, and oversight pointed out by this Item distribution debugger is a netvar that enables cheats, so no exploiting!
2018-08-29 18:28:28 +00:00
CV_RegisterVar(&cv_kartdebugcheckpoint);
kartdebugnodes
2018-09-30 21:47:56 +00:00
CV_RegisterVar(&cv_kartdebugnodes);
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
}
//}
Winning positions scale with number of players Anyone in the top 50% gets winning music & blue position, everyone below gets the losing music & red position. For odd numbers, it rounds up. 2p: 1st wins, 2nd loses 3p: 1-2 win, 3rd loses 4p: 1-2 win, 3-4 lose 5p: 1-3 win, 4-5 lose 6p: 1-3 win, 4-6 lose 7p: 1-4 win, 5-7 lose 8p: 1-4 win, 5-8 lose (SMK) 12p: 1-6 win, 7-12 lose (modern MK) 16p: 1-8 win, 9-16 lose (max player count) In big netgames you won't just hear the losing music all of the time now :V
2018-02-21 00:11:09 +00:00
boolean K_IsPlayerLosing(player_t *player)
{
INT32 winningpos = 1;
UINT8 i, pcount = 0;
if (player->kartstuff[k_position] == 1)
return false;
for (i = 0; i < MAXPLAYERS; i++)
{
Change how battle music/patch is decided
2018-07-12 23:04:37 +00:00
if (!playeringame[i] || players[i].spectator)
continue;
if (players[i].kartstuff[k_position] > pcount)
pcount = players[i].kartstuff[k_position];
Winning positions scale with number of players Anyone in the top 50% gets winning music & blue position, everyone below gets the losing music & red position. For odd numbers, it rounds up. 2p: 1st wins, 2nd loses 3p: 1-2 win, 3rd loses 4p: 1-2 win, 3-4 lose 5p: 1-3 win, 4-5 lose 6p: 1-3 win, 4-6 lose 7p: 1-4 win, 5-7 lose 8p: 1-4 win, 5-8 lose (SMK) 12p: 1-6 win, 7-12 lose (modern MK) 16p: 1-8 win, 9-16 lose (max player count) In big netgames you won't just hear the losing music all of the time now :V
2018-02-21 00:11:09 +00:00
}
if (pcount <= 1)
return false;
winningpos = pcount/2;
if (pcount % 2) // any remainder?
winningpos++;
return (player->kartstuff[k_position] > winningpos);
}
WANTED
2018-07-01 08:36:09 +00:00
boolean K_IsPlayerWanted(player_t *player)
{
UINT8 i;
if (!(G_BattleGametype()))
return false;
for (i = 0; i < 4; i++)
{
if (battlewanted[i] == -1)
break;
if (player == &players[battlewanted[i]])
return true;
}
return false;
}
Removed drown, maybe extended post-race time so it doesn't jump to results immediately Added experimental player distance based items
2017-05-07 23:08:03 +00:00
//{ SRB2kart Roulette Code - Position Based
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
Made the items odds smoother! What the heck does THAT supposed to mean, I hear you ask? Well... - Mashing for items' effect on chances is now relative to how fast you pressed it! I'll give a more detailed explanation in #main_kart_dev. - Instead of coding the Auto Frantic Items setting like I said I would, I did the same effect in a completely different way! Odds will automatically get better depending on how many players below 5 there are.
2018-07-19 07:31:14 +00:00
#define NUMKARTODDS 80
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
Removed drown, maybe extended post-race time so it doesn't jump to results immediately Added experimental player distance based items
2017-05-07 23:08:03 +00:00
// Less ugly 2D arrays
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
static INT32 K_KartItemOddsRace[NUMKARTRESULTS][9] =
Removed drown, maybe extended post-race time so it doesn't jump to results immediately Added experimental player distance based items
2017-05-07 23:08:03 +00:00
{
Many things! - Position faces are now drawn in Battle, categorized first by balloons, then by points - Balloon-based items, gives people who are worse off better items, and people who are better off worse items. - You can strafe while using feather or while using a bounce pad - Reduced the strength of bounce pad thrust on items - Increased bounce pad's minimum forward push on players - Made Frantic Mode just a teeeeensy bit more frantic - Fixed being able to use Feathers mid-air - Fixed being unable to steal Feathers - Drift sparks use frameangle instead of angle
2017-11-23 02:40:17 +00:00
//P-Odds 0 1 2 3 4 5 6 7 8
Partially revert Jawz x2 changes Several races in a row with several people getting x2 Jawz in the same spot... sorry Oni, it's BAD. Kept the increase in the further behind spot, we'll see if it's any better
2018-10-24 01:13:14 +00:00
/*Sneaker*/ {20, 0, 0, 4, 6, 6, 0, 0, 0 }, // Sneaker
Item distribution experiments based on my experience in netgames Needs tested tonight. - Grow & Rocket Sneakers are slightly more in the back - Sneaker x3 gets handed out more in the back-middle - Removed 5% from Ballhog towards the front - Removed 5% from Shrink in the forward-most column it was in
2018-10-31 19:14:53 +00:00
/*Rocket Sneaker*/ { 0, 0, 0, 0, 0, 1, 3, 5, 3 }, // Rocket Sneaker
/*Invincibility*/ { 0, 0, 0, 0, 0, 1, 4, 6,14 }, // Invincibility
Revert "Rebalanced odds table again" This reverts commit fbe721e7d4e14ef91467bfe9b44e64f46e3260fc.
2018-09-08 23:50:31 +00:00
/*Banana*/ { 0, 9, 4, 2, 1, 0, 0, 0, 0 }, // Banana
Finished Jawz, item odds changes, sound effect distance increases
2018-06-19 01:52:26 +00:00
/*Eggman Monitor*/ { 0, 4, 3, 2, 0, 0, 0, 0, 0 }, // Eggman Monitor
New item odds to accomedate new SPB behavior
2018-10-23 01:09:37 +00:00
/*Orbinaut*/ { 0, 6, 5, 3, 2, 0, 0, 0, 0 }, // Orbinaut
/*Jawz*/ { 0, 0, 3, 2, 1, 1, 0, 0, 0 }, // Jawz
Item distribution experiments based on my experience in netgames Needs tested tonight. - Grow & Rocket Sneakers are slightly more in the back - Sneaker x3 gets handed out more in the back-middle - Removed 5% from Ballhog towards the front - Removed 5% from Shrink in the forward-most column it was in
2018-10-31 19:14:53 +00:00
/*Mine*/ { 0, 0, 2, 2, 1, 0, 0, 0, 0 }, // Mine
/*Ballhog*/ { 0, 0, 0, 2, 1, 0, 0, 0, 0 }, // Ballhog
Spread out SPB odds
2018-10-23 02:29:30 +00:00
/*Self-Propelled Bomb*/ { 0, 0, 1, 2, 3, 4, 2, 2, 0 }, // Self-Propelled Bomb
Item distribution experiments based on my experience in netgames Needs tested tonight. - Grow & Rocket Sneakers are slightly more in the back - Sneaker x3 gets handed out more in the back-middle - Removed 5% from Ballhog towards the front - Removed 5% from Shrink in the forward-most column it was in
2018-10-31 19:14:53 +00:00
/*Grow*/ { 0, 0, 0, 0, 0, 1, 3, 5, 3 }, // Grow
/*Shrink*/ { 0, 0, 0, 0, 0, 0, 0, 2, 0 }, // Shrink
Thunder shield overlay
2018-08-04 19:48:31 +00:00
/*Thunder Shield*/ { 0, 1, 2, 0, 0, 0, 0, 0, 0 }, // Thunder Shield
Finished Jawz, item odds changes, sound effect distance increases
2018-06-19 01:52:26 +00:00
/*Hyudoro*/ { 0, 0, 0, 0, 1, 2, 1, 0, 0 }, // Hyudoro
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
/*Pogo Spring*/ { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // Pogo Spring
/*Kitchen Sink*/ { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // Kitchen Sink
Item distribution experiments based on my experience in netgames Needs tested tonight. - Grow & Rocket Sneakers are slightly more in the back - Sneaker x3 gets handed out more in the back-middle - Removed 5% from Ballhog towards the front - Removed 5% from Shrink in the forward-most column it was in
2018-10-31 19:14:53 +00:00
/*Sneaker x3*/ { 0, 0, 0, 0, 3, 7, 9, 2, 0 }, // Sneaker x3
Revert "Rebalanced odds table again" This reverts commit fbe721e7d4e14ef91467bfe9b44e64f46e3260fc.
2018-09-08 23:50:31 +00:00
/*Banana x3*/ { 0, 0, 1, 1, 0, 0, 0, 0, 0 }, // Banana x3
Add tenfold banana, moved back SPB reach Reuses triple banana's cvar for now
2018-06-17 00:01:25 +00:00
/*Banana x10*/ { 0, 0, 0, 0, 1, 0, 0, 0, 0 }, // Banana x10
New item odds to accomedate new SPB behavior
2018-10-23 01:09:37 +00:00
/*Orbinaut x3*/ { 0, 0, 0, 1, 0, 0, 0, 0, 0 }, // Orbinaut x3
/*Orbinaut x4*/ { 0, 0, 0, 0, 1, 1, 0, 0, 0 }, // Orbinaut x4
Partially revert Jawz x2 changes Several races in a row with several people getting x2 Jawz in the same spot... sorry Oni, it's BAD. Kept the increase in the further behind spot, we'll see if it's any better
2018-10-24 01:13:14 +00:00
/*Jawz x2*/ { 0, 0, 0, 1, 2, 0, 0, 0, 0 } // Jawz x2
Many things! - Position faces are now drawn in Battle, categorized first by balloons, then by points - Balloon-based items, gives people who are worse off better items, and people who are better off worse items. - You can strafe while using feather or while using a bounce pad - Reduced the strength of bounce pad thrust on items - Increased bounce pad's minimum forward push on players - Made Frantic Mode just a teeeeensy bit more frantic - Fixed being able to use Feathers mid-air - Fixed being unable to steal Feathers - Drift sparks use frameangle instead of angle
2017-11-23 02:40:17 +00:00
};
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
static INT32 K_KartItemOddsBattle[NUMKARTRESULTS][6] =
Many things! - Position faces are now drawn in Battle, categorized first by balloons, then by points - Balloon-based items, gives people who are worse off better items, and people who are better off worse items. - You can strafe while using feather or while using a bounce pad - Reduced the strength of bounce pad thrust on items - Increased bounce pad's minimum forward push on players - Made Frantic Mode just a teeeeensy bit more frantic - Fixed being able to use Feathers mid-air - Fixed being unable to steal Feathers - Drift sparks use frameangle instead of angle
2017-11-23 02:40:17 +00:00
{
Rebalance Battle items in response to last night's netgame
2018-08-26 18:58:21 +00:00
//P-Odds 0 1 2 3 4 5
Adjustments made to address the netgame Less grow, less invinc, less ballhog, just a teensy bit less triple orbinaut, and SPB odds no longer scale with lower player counts like other power items do
2018-08-26 23:55:31 +00:00
/*Sneaker*/ { 3, 2, 2, 2, 0, 2 }, // Sneaker
Rebalance Battle items in response to last night's netgame
2018-08-26 18:58:21 +00:00
/*Rocket Sneaker*/ { 0, 0, 0, 0, 0, 0 }, // Rocket Sneaker
Adjustments made to address the netgame Less grow, less invinc, less ballhog, just a teensy bit less triple orbinaut, and SPB odds no longer scale with lower player counts like other power items do
2018-08-26 23:55:31 +00:00
/*Invincibility*/ { 0, 1, 2, 3, 4, 2 }, // Invincibility
Rebalance Battle items in response to last night's netgame
2018-08-26 18:58:21 +00:00
/*Banana*/ { 2, 1, 0, 0, 0, 0 }, // Banana
Adjustments made to address the netgame Less grow, less invinc, less ballhog, just a teensy bit less triple orbinaut, and SPB odds no longer scale with lower player counts like other power items do
2018-08-26 23:55:31 +00:00
/*Eggman Monitor*/ { 1, 1, 0, 0, 0, 0 }, // Eggman Monitor
/*Orbinaut*/ { 6, 2, 1, 0, 0, 0 }, // Orbinaut
/*Jawz*/ { 3, 3, 3, 2, 0, 2 }, // Jawz
/*Mine*/ { 2, 3, 3, 1, 0, 2 }, // Mine
/*Ballhog*/ { 0, 1, 2, 1, 0, 2 }, // Ballhog
Rebalance Battle items in response to last night's netgame
2018-08-26 18:58:21 +00:00
/*Self-Propelled Bomb*/ { 0, 0, 0, 0, 0, 0 }, // Self-Propelled Bomb
Adjustments made to address the netgame Less grow, less invinc, less ballhog, just a teensy bit less triple orbinaut, and SPB odds no longer scale with lower player counts like other power items do
2018-08-26 23:55:31 +00:00
/*Grow*/ { 0, 0, 1, 2, 4, 2 }, // Grow
Rebalance Battle items in response to last night's netgame
2018-08-26 18:58:21 +00:00
/*Shrink*/ { 0, 0, 0, 0, 0, 0 }, // Shrink
/*Thunder Shield*/ { 0, 0, 0, 0, 0, 0 }, // Thunder Shield
/*Hyudoro*/ { 1, 1, 0, 0, 0, 0 }, // Hyudoro
/*Pogo Spring*/ { 1, 1, 0, 0, 0, 0 }, // Pogo Spring
/*Kitchen Sink*/ { 0, 0, 0, 0, 0, 0 }, // Kitchen Sink
/*Sneaker x3*/ { 0, 0, 0, 2, 4, 2 }, // Sneaker x3
Adjustments made to address the netgame Less grow, less invinc, less ballhog, just a teensy bit less triple orbinaut, and SPB odds no longer scale with lower player counts like other power items do
2018-08-26 23:55:31 +00:00
/*Banana x3*/ { 1, 2, 1, 0, 0, 0 }, // Banana x3
Rebalance Battle items in response to last night's netgame
2018-08-26 18:58:21 +00:00
/*Banana x10*/ { 0, 0, 1, 1, 0, 2 }, // Banana x10
Adjustments made to address the netgame Less grow, less invinc, less ballhog, just a teensy bit less triple orbinaut, and SPB odds no longer scale with lower player counts like other power items do
2018-08-26 23:55:31 +00:00
/*Orbinaut x3*/ { 0, 1, 2, 1, 0, 0 }, // Orbinaut x3
Rebalance Battle items in response to last night's netgame
2018-08-26 18:58:21 +00:00
/*Orbinaut x4*/ { 0, 0, 1, 3, 4, 2 }, // Orbinaut x4
/*Jawz x2*/ { 0, 0, 1, 2, 4, 2 } // Jawz x2
Removed drown, maybe extended post-race time so it doesn't jump to results immediately Added experimental player distance based items
2017-05-07 23:08:03 +00:00
};
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
/** \brief Item Roulette for Kart
\param player player
\param getitem what item we're looking for
\return void
*/
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
static void K_KartGetItemResult(player_t *player, SINT8 getitem)
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
{
switch (getitem)
{
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
// Special roulettes first, then the generic ones are handled by default
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
case KRITEM_TRIPLESNEAKER: // Sneaker x3
player->kartstuff[k_itemtype] = KITEM_SNEAKER;
player->kartstuff[k_itemamount] = 3;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
break;
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
case KRITEM_TRIPLEBANANA: // Banana x3
player->kartstuff[k_itemtype] = KITEM_BANANA;
player->kartstuff[k_itemamount] = 3;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
break;
Add tenfold banana, moved back SPB reach Reuses triple banana's cvar for now
2018-06-17 00:01:25 +00:00
case KRITEM_TENFOLDBANANA: // Banana x10
player->kartstuff[k_itemtype] = KITEM_BANANA;
player->kartstuff[k_itemamount] = 10;
break;
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
case KRITEM_TRIPLEORBINAUT: // Orbinaut x3
player->kartstuff[k_itemtype] = KITEM_ORBINAUT;
player->kartstuff[k_itemamount] = 3;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
break;
Orbinaut x4
2018-08-10 02:52:22 +00:00
case KRITEM_QUADORBINAUT: // Orbinaut x4
player->kartstuff[k_itemtype] = KITEM_ORBINAUT;
player->kartstuff[k_itemamount] = 4;
break;
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
case KRITEM_DUALJAWZ: // Jawz x2
player->kartstuff[k_itemtype] = KITEM_JAWZ;
player->kartstuff[k_itemamount] = 2;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
break;
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
default:
if (getitem <= 0 || getitem >= NUMKARTRESULTS) // Sad (Fallback)
{
if (getitem != 0)
CONS_Printf("ERROR: P_KartGetItemResult - Item roulette gave bad item (%d) :(\n", getitem);
player->kartstuff[k_itemtype] = KITEM_SAD;
}
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
else
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
player->kartstuff[k_itemtype] = getitem;
player->kartstuff[k_itemamount] = 1;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
break;
}
}
/** \brief Item Roulette for Kart
\param player player object passed from P_KartPlayerThink
\return void
Winning positions scale with number of players Anyone in the top 50% gets winning music & blue position, everyone below gets the losing music & red position. For odd numbers, it rounds up. 2p: 1st wins, 2nd loses 3p: 1-2 win, 3rd loses 4p: 1-2 win, 3-4 lose 5p: 1-3 win, 4-5 lose 6p: 1-3 win, 4-6 lose 7p: 1-4 win, 5-7 lose 8p: 1-4 win, 5-8 lose (SMK) 12p: 1-6 win, 7-12 lose (modern MK) 16p: 1-8 win, 9-16 lose (max player count) In big netgames you won't just hear the losing music all of the time now :V
2018-02-21 00:11:09 +00:00
*/
Revert "Remove kart offroad variable and workings." This will likely be temporary until the sector effect is done for a default friction value. This reverts commit aff9a78d761a82846cc696251b9a5438af58ba29. # Conflicts: # src/d_player.h # src/g_game.c # src/k_kart.c
2017-03-06 02:38:35 +00:00
Made the items odds smoother! What the heck does THAT supposed to mean, I hear you ask? Well... - Mashing for items' effect on chances is now relative to how fast you pressed it! I'll give a more detailed explanation in #main_kart_dev. - Instead of coding the Auto Frantic Items setting like I said I would, I did the same effect in a completely different way! Odds will automatically get better depending on how many players below 5 there are.
2018-07-19 07:31:14 +00:00
static INT32 K_KartGetItemOdds(UINT8 pos, SINT8 item, fixed_t mashed)
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
{
SPB fixes Shrink also plays its sound, and Shrink/Grow have slower scaling speeds
2018-06-11 05:51:50 +00:00
const INT32 distvar = (64*14);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
INT32 newodds;
Fix warnings Possibly fix some whitespace problems
2017-03-04 22:13:19 +00:00
INT32 i;
Hundreds of tweaks - SPB multiplier depending on 1st-2nd distance - Removed the Battle-only k_poweritemtimer (hold over from when you could easily get invuln items all of the time), replaced it with a 2 invincibility item cap in ALL modes. - Spinout is affected by boosters, *properly* - Can no longer strafe while spinning out on speed bumps - Messed with how other items interact with speed bumps, again. - Old bounce code has been ported for non-players - Fixed Karma players being able to do anything after the round has ended. - Fixed sneaker and spinout timer weirdness - Fixed Mines still being hold-use - Fixed rubber-burn turn not working - Removed redundant k_spinout and unused k_boosting variables - Filled out the Color_Opposite table with Kart's new colors. Not really relevant right now (besides some extra Lua functionality) since nothing uses it, but will be nice for if we do the signpost from the sky idea.
2018-06-20 00:20:06 +00:00
UINT8 pingame = 0, pexiting = 0, pinvin = 0;
SPB distance required changes based on difficulty You can catch up to 1st faster on Hard vs Normal
2018-07-10 22:37:46 +00:00
SINT8 first = -1, second = -1;
Fixes
2018-06-08 04:02:28 +00:00
INT32 secondist = 0;
Fix warnings Possibly fix some whitespace problems
2017-03-04 22:13:19 +00:00
Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems # Conflicts: # src/d_netcmd.c # src/g_game.c # src/k_kart.c # src/p_enemy.c # src/p_inter.c # src/p_map.c # src/p_user.c # src/sounds.c # src/sounds.h # src/y_inter.c
2018-03-12 04:58:13 +00:00
if (G_BattleGametype())
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
newodds = K_KartItemOddsBattle[item-1][pos];
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
else
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
newodds = K_KartItemOddsRace[item-1][pos];
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
for (i = 0; i < MAXPLAYERS; i++)
{
Hundreds of tweaks - SPB multiplier depending on 1st-2nd distance - Removed the Battle-only k_poweritemtimer (hold over from when you could easily get invuln items all of the time), replaced it with a 2 invincibility item cap in ALL modes. - Spinout is affected by boosters, *properly* - Can no longer strafe while spinning out on speed bumps - Messed with how other items interact with speed bumps, again. - Old bounce code has been ported for non-players - Fixed Karma players being able to do anything after the round has ended. - Fixed sneaker and spinout timer weirdness - Fixed Mines still being hold-use - Fixed rubber-burn turn not working - Removed redundant k_spinout and unused k_boosting variables - Filled out the Color_Opposite table with Kart's new colors. Not really relevant right now (besides some extra Lua functionality) since nothing uses it, but will be nice for if we do the signpost from the sky idea.
2018-06-20 00:20:06 +00:00
if (!playeringame[i] || players[i].spectator)
continue;
pingame++;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
if (players[i].exiting)
pexiting++;
Hundreds of tweaks - SPB multiplier depending on 1st-2nd distance - Removed the Battle-only k_poweritemtimer (hold over from when you could easily get invuln items all of the time), replaced it with a 2 invincibility item cap in ALL modes. - Spinout is affected by boosters, *properly* - Can no longer strafe while spinning out on speed bumps - Messed with how other items interact with speed bumps, again. - Old bounce code has been ported for non-players - Fixed Karma players being able to do anything after the round has ended. - Fixed sneaker and spinout timer weirdness - Fixed Mines still being hold-use - Fixed rubber-burn turn not working - Removed redundant k_spinout and unused k_boosting variables - Filled out the Color_Opposite table with Kart's new colors. Not really relevant right now (besides some extra Lua functionality) since nothing uses it, but will be nice for if we do the signpost from the sky idea.
2018-06-20 00:20:06 +00:00
if (players[i].mo)
{
if (players[i].kartstuff[k_position] == 1 && first == -1)
first = i;
if (players[i].kartstuff[k_position] == 2 && second == -1)
second = i;
if (players[i].kartstuff[k_itemtype] == KITEM_INVINCIBILITY
|| players[i].kartstuff[k_itemtype] == KITEM_GROW
|| players[i].kartstuff[k_invincibilitytimer]
|| players[i].kartstuff[k_growshrinktimer] > 0)
pinvin++;
}
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
}
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
Fixes
2018-06-08 04:02:28 +00:00
if (first != -1 && second != -1) // calculate 2nd's distance from 1st, for SPB
{
secondist = P_AproxDistance(P_AproxDistance(players[first].mo->x - players[second].mo->x,
players[first].mo->y - players[second].mo->y),
Item odds, SPB fix
2018-07-05 04:38:23 +00:00
players[first].mo->z - players[second].mo->z) / mapheaderinfo[gamemap-1]->mobj_scale;
Fixes
2018-06-08 04:02:28 +00:00
if (franticitems)
secondist = (15*secondist/14);
Make the low player count distributions slightly more extreme Scales below 8 players instead of 6 players. The distance multipler in 4P is now x1.14 instead of x1.07.
2018-08-29 03:06:31 +00:00
if (pingame < 8 && !G_BattleGametype())
secondist = ((28+(8-pingame))*secondist/28);
Fixes
2018-06-08 04:02:28 +00:00
}
Made the items odds smoother! What the heck does THAT supposed to mean, I hear you ask? Well... - Mashing for items' effect on chances is now relative to how fast you pressed it! I'll give a more detailed explanation in #main_kart_dev. - Instead of coding the Auto Frantic Items setting like I said I would, I did the same effect in a completely different way! Odds will automatically get better depending on how many players below 5 there are.
2018-07-19 07:31:14 +00:00
// POWERITEMODDS handles all of the "frantic item" related functionality, for all of our powerful items.
// First, it multiplies it by 2 if franticitems is true; easy-peasy.
// Then, it multiplies it further if there's less than 5 players in game.
// This is done to make low player count races more fair & interesting. (1v1s are basically the same as franticitems false in a normal race)
// Lastly, it *divides* it by your mashed value, which was determined in K_KartItemRoulette, to punish those who are impatient.
// The last two are very fractional and complicated, very sorry!
#define POWERITEMODDS(odds) \
if (franticitems) \
odds *= 2; \
Make the low player count distributions slightly more extreme Scales below 8 players instead of 6 players. The distance multipler in 4P is now x1.14 instead of x1.07.
2018-08-29 03:06:31 +00:00
if (pingame < 8 && !G_BattleGametype()) \
odds = FixedMul(odds*FRACUNIT, FRACUNIT+min((8-pingame)*(FRACUNIT/25), FRACUNIT))/FRACUNIT; \
Made the items odds smoother! What the heck does THAT supposed to mean, I hear you ask? Well... - Mashing for items' effect on chances is now relative to how fast you pressed it! I'll give a more detailed explanation in #main_kart_dev. - Instead of coding the Auto Frantic Items setting like I said I would, I did the same effect in a completely different way! Odds will automatically get better depending on how many players below 5 there are.
2018-07-19 07:31:14 +00:00
if (mashed > 0) \
odds = FixedDiv(odds*FRACUNIT, mashed+FRACUNIT)/FRACUNIT \
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
switch (item)
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
{
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
case KITEM_SNEAKER:
SPB fixes Shrink also plays its sound, and Shrink/Grow have slower scaling speeds
2018-06-11 05:51:50 +00:00
if ((!cv_sneaker.value) && (!modeattacking)) newodds = 0;
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
break;
case KITEM_ROCKETSNEAKER:
Made the items odds smoother! What the heck does THAT supposed to mean, I hear you ask? Well... - Mashing for items' effect on chances is now relative to how fast you pressed it! I'll give a more detailed explanation in #main_kart_dev. - Instead of coding the Auto Frantic Items setting like I said I would, I did the same effect in a completely different way! Odds will automatically get better depending on how many players below 5 there are.
2018-07-19 07:31:14 +00:00
POWERITEMODDS(newodds);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
if (!cv_rocketsneaker.value) newodds = 0;
break;
case KITEM_INVINCIBILITY:
Made the items odds smoother! What the heck does THAT supposed to mean, I hear you ask? Well... - Mashing for items' effect on chances is now relative to how fast you pressed it! I'll give a more detailed explanation in #main_kart_dev. - Instead of coding the Auto Frantic Items setting like I said I would, I did the same effect in a completely different way! Odds will automatically get better depending on how many players below 5 there are.
2018-07-19 07:31:14 +00:00
POWERITEMODDS(newodds);
Fix invincibility item cap It was supposed to be capped at 2 invincibility items at a time, not 3. (may consider scaling with number of players, just not for R1)
2018-10-28 05:02:30 +00:00
if ((!cv_invincibility.value) || (pinvin >= 2)) newodds = 0;
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
break;
case KITEM_BANANA:
if (!cv_banana.value) newodds = 0;
break;
Rename fake item to eggman monitor
2018-03-14 01:07:08 +00:00
case KITEM_EGGMAN:
if (!cv_eggmanmonitor.value) newodds = 0;
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
break;
case KITEM_ORBINAUT:
if (!cv_orbinaut.value) newodds = 0;
break;
case KITEM_JAWZ:
Made the items odds smoother! What the heck does THAT supposed to mean, I hear you ask? Well... - Mashing for items' effect on chances is now relative to how fast you pressed it! I'll give a more detailed explanation in #main_kart_dev. - Instead of coding the Auto Frantic Items setting like I said I would, I did the same effect in a completely different way! Odds will automatically get better depending on how many players below 5 there are.
2018-07-19 07:31:14 +00:00
POWERITEMODDS(newodds);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
if (!cv_jawz.value) newodds = 0;
break;
case KITEM_MINE:
Made the items odds smoother! What the heck does THAT supposed to mean, I hear you ask? Well... - Mashing for items' effect on chances is now relative to how fast you pressed it! I'll give a more detailed explanation in #main_kart_dev. - Instead of coding the Auto Frantic Items setting like I said I would, I did the same effect in a completely different way! Odds will automatically get better depending on how many players below 5 there are.
2018-07-19 07:31:14 +00:00
POWERITEMODDS(newodds);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
if (!cv_mine.value) newodds = 0;
break;
case KITEM_BALLHOG:
Made the items odds smoother! What the heck does THAT supposed to mean, I hear you ask? Well... - Mashing for items' effect on chances is now relative to how fast you pressed it! I'll give a more detailed explanation in #main_kart_dev. - Instead of coding the Auto Frantic Items setting like I said I would, I did the same effect in a completely different way! Odds will automatically get better depending on how many players below 5 there are.
2018-07-19 07:31:14 +00:00
POWERITEMODDS(newodds);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
if (!cv_ballhog.value) newodds = 0;
break;
case KITEM_SPB:
Adjustments made to address the netgame Less grow, less invinc, less ballhog, just a teensy bit less triple orbinaut, and SPB odds no longer scale with lower player counts like other power items do
2018-08-26 23:55:31 +00:00
//POWERITEMODDS(newodds);
SPB fixes Shrink also plays its sound, and Shrink/Grow have slower scaling speeds
2018-06-11 05:51:50 +00:00
if ((!cv_selfpropelledbomb.value)
|| (indirectitemcooldown > 0)
|| (pexiting > 0)
Made the items odds smoother! What the heck does THAT supposed to mean, I hear you ask? Well... - Mashing for items' effect on chances is now relative to how fast you pressed it! I'll give a more detailed explanation in #main_kart_dev. - Instead of coding the Auto Frantic Items setting like I said I would, I did the same effect in a completely different way! Odds will automatically get better depending on how many players below 5 there are.
2018-07-19 07:31:14 +00:00
|| (secondist/distvar < (4+gamespeed)))
Hundreds of tweaks - SPB multiplier depending on 1st-2nd distance - Removed the Battle-only k_poweritemtimer (hold over from when you could easily get invuln items all of the time), replaced it with a 2 invincibility item cap in ALL modes. - Spinout is affected by boosters, *properly* - Can no longer strafe while spinning out on speed bumps - Messed with how other items interact with speed bumps, again. - Old bounce code has been ported for non-players - Fixed Karma players being able to do anything after the round has ended. - Fixed sneaker and spinout timer weirdness - Fixed Mines still being hold-use - Fixed rubber-burn turn not working - Removed redundant k_spinout and unused k_boosting variables - Filled out the Color_Opposite table with Kart's new colors. Not really relevant right now (besides some extra Lua functionality) since nothing uses it, but will be nice for if we do the signpost from the sky idea.
2018-06-20 00:20:06 +00:00
newodds = 0;
Made the items odds smoother! What the heck does THAT supposed to mean, I hear you ask? Well... - Mashing for items' effect on chances is now relative to how fast you pressed it! I'll give a more detailed explanation in #main_kart_dev. - Instead of coding the Auto Frantic Items setting like I said I would, I did the same effect in a completely different way! Odds will automatically get better depending on how many players below 5 there are.
2018-07-19 07:31:14 +00:00
newodds *= min((secondist/distvar)-(3+gamespeed), 3);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
break;
New invincibility effect, grow/shrink stuff Whenever grow/shrink effects get made, I'll remove the Mario-style stuttered growth and whatever else needs doing beyond that
2018-02-10 06:19:33 +00:00
case KITEM_GROW:
Made the items odds smoother! What the heck does THAT supposed to mean, I hear you ask? Well... - Mashing for items' effect on chances is now relative to how fast you pressed it! I'll give a more detailed explanation in #main_kart_dev. - Instead of coding the Auto Frantic Items setting like I said I would, I did the same effect in a completely different way! Odds will automatically get better depending on how many players below 5 there are.
2018-07-19 07:31:14 +00:00
POWERITEMODDS(newodds);
This didn't commit with for some reason...
2018-10-28 05:02:49 +00:00
if ((!cv_grow.value) || (pinvin >= 2)) newodds = 0;
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
break;
New invincibility effect, grow/shrink stuff Whenever grow/shrink effects get made, I'll remove the Mario-style stuttered growth and whatever else needs doing beyond that
2018-02-10 06:19:33 +00:00
case KITEM_SHRINK:
Made the items odds smoother! What the heck does THAT supposed to mean, I hear you ask? Well... - Mashing for items' effect on chances is now relative to how fast you pressed it! I'll give a more detailed explanation in #main_kart_dev. - Instead of coding the Auto Frantic Items setting like I said I would, I did the same effect in a completely different way! Odds will automatically get better depending on how many players below 5 there are.
2018-07-19 07:31:14 +00:00
POWERITEMODDS(newodds);
SPB fixes Shrink also plays its sound, and Shrink/Grow have slower scaling speeds
2018-06-11 05:51:50 +00:00
if ((!cv_shrink.value)
|| (indirectitemcooldown > 0)
|| (pingame-1 <= pexiting)) newodds = 0;
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
break;
Thunder shield overlay
2018-08-04 19:48:31 +00:00
case KITEM_THUNDERSHIELD:
Made the items odds smoother! What the heck does THAT supposed to mean, I hear you ask? Well... - Mashing for items' effect on chances is now relative to how fast you pressed it! I'll give a more detailed explanation in #main_kart_dev. - Instead of coding the Auto Frantic Items setting like I said I would, I did the same effect in a completely different way! Odds will automatically get better depending on how many players below 5 there are.
2018-07-19 07:31:14 +00:00
POWERITEMODDS(newodds);
Thunder shield overlay
2018-08-04 19:48:31 +00:00
if (!cv_thundershield.value) newodds = 0;
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
break;
case KITEM_HYUDORO:
if (!cv_hyudoro.value) newodds = 0;
break;
case KITEM_POGOSPRING:
if (!cv_pogospring.value) newodds = 0;
break;
Kitchen sink is back Haven't tested yet
2018-06-25 05:36:21 +00:00
case KITEM_KITCHENSINK:
newodds = 0; // Not obtained via normal means.
break;
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
case KRITEM_TRIPLESNEAKER:
Made the items odds smoother! What the heck does THAT supposed to mean, I hear you ask? Well... - Mashing for items' effect on chances is now relative to how fast you pressed it! I'll give a more detailed explanation in #main_kart_dev. - Instead of coding the Auto Frantic Items setting like I said I would, I did the same effect in a completely different way! Odds will automatically get better depending on how many players below 5 there are.
2018-07-19 07:31:14 +00:00
POWERITEMODDS(newodds);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
if (!cv_triplesneaker.value) newodds = 0;
break;
case KRITEM_TRIPLEBANANA:
Made the items odds smoother! What the heck does THAT supposed to mean, I hear you ask? Well... - Mashing for items' effect on chances is now relative to how fast you pressed it! I'll give a more detailed explanation in #main_kart_dev. - Instead of coding the Auto Frantic Items setting like I said I would, I did the same effect in a completely different way! Odds will automatically get better depending on how many players below 5 there are.
2018-07-19 07:31:14 +00:00
POWERITEMODDS(newodds);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
if (!cv_triplebanana.value) newodds = 0;
break;
Add tenfold banana, moved back SPB reach Reuses triple banana's cvar for now
2018-06-17 00:01:25 +00:00
case KRITEM_TENFOLDBANANA:
Made the items odds smoother! What the heck does THAT supposed to mean, I hear you ask? Well... - Mashing for items' effect on chances is now relative to how fast you pressed it! I'll give a more detailed explanation in #main_kart_dev. - Instead of coding the Auto Frantic Items setting like I said I would, I did the same effect in a completely different way! Odds will automatically get better depending on how many players below 5 there are.
2018-07-19 07:31:14 +00:00
POWERITEMODDS(newodds);
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
if (!cv_decabanana.value) newodds = 0;
Add tenfold banana, moved back SPB reach Reuses triple banana's cvar for now
2018-06-17 00:01:25 +00:00
break;
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
case KRITEM_TRIPLEORBINAUT:
Made the items odds smoother! What the heck does THAT supposed to mean, I hear you ask? Well... - Mashing for items' effect on chances is now relative to how fast you pressed it! I'll give a more detailed explanation in #main_kart_dev. - Instead of coding the Auto Frantic Items setting like I said I would, I did the same effect in a completely different way! Odds will automatically get better depending on how many players below 5 there are.
2018-07-19 07:31:14 +00:00
POWERITEMODDS(newodds);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
if (!cv_tripleorbinaut.value) newodds = 0;
break;
Orbinaut x4
2018-08-10 02:52:22 +00:00
case KRITEM_QUADORBINAUT:
POWERITEMODDS(newodds);
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
if (!cv_quadorbinaut.value) newodds = 0;
Orbinaut x4
2018-08-10 02:52:22 +00:00
break;
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
case KRITEM_DUALJAWZ:
Made the items odds smoother! What the heck does THAT supposed to mean, I hear you ask? Well... - Mashing for items' effect on chances is now relative to how fast you pressed it! I'll give a more detailed explanation in #main_kart_dev. - Instead of coding the Auto Frantic Items setting like I said I would, I did the same effect in a completely different way! Odds will automatically get better depending on how many players below 5 there are.
2018-07-19 07:31:14 +00:00
POWERITEMODDS(newodds);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
if (!cv_dualjawz.value) newodds = 0;
break;
default:
break;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
}
Made the items odds smoother! What the heck does THAT supposed to mean, I hear you ask? Well... - Mashing for items' effect on chances is now relative to how fast you pressed it! I'll give a more detailed explanation in #main_kart_dev. - Instead of coding the Auto Frantic Items setting like I said I would, I did the same effect in a completely different way! Odds will automatically get better depending on how many players below 5 there are.
2018-07-19 07:31:14 +00:00
#undef POWERITEMODDS
Fix up balloon-based items
2017-11-24 03:34:36 +00:00
Made Frantic Mode work in Battle Mode & provide more silly results Also fixed flashing
2017-11-07 20:04:21 +00:00
return newodds;
}
Removed drown, maybe extended post-race time so it doesn't jump to results immediately Added experimental player distance based items
2017-05-07 23:08:03 +00:00
//{ SRB2kart Roulette Code - Distance Based, no waypoints
Item distribution debugger, and oversight pointed out by this Item distribution debugger is a netvar that enables cheats, so no exploiting!
2018-08-29 18:28:28 +00:00
static INT32 K_FindUseodds(player_t *player, fixed_t mashed, INT32 pingame, INT32 bestbumper)
Removed drown, maybe extended post-race time so it doesn't jump to results immediately Added experimental player distance based items
2017-05-07 23:08:03 +00:00
{
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
const INT32 distvar = (64*14);
Removed drown, maybe extended post-race time so it doesn't jump to results immediately Added experimental player distance based items
2017-05-07 23:08:03 +00:00
INT32 i;
INT32 pdis = 0, useodds = 0;
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
UINT8 disttable[14];
UINT8 distlen = 0;
Item distribution debugger, and oversight pointed out by this Item distribution debugger is a netvar that enables cheats, so no exploiting!
2018-08-29 18:28:28 +00:00
boolean oddsvalid[9];
Removed drown, maybe extended post-race time so it doesn't jump to results immediately Added experimental player distance based items
2017-05-07 23:08:03 +00:00
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
for (i = 0; i < 9; i++)
Removed drown, maybe extended post-race time so it doesn't jump to results immediately Added experimental player distance based items
2017-05-07 23:08:03 +00:00
{
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
INT32 j;
Tweaked item odds in battle Karma items can hand out x10 banana, and being ahead in Battle is way more focused on removing just your defensive options than making all of your options Orbinaut/Banana/Eggman (there'll still be a lot of those, but it doesn't lower the chance of the other items too badly).
2018-06-25 14:18:29 +00:00
boolean available = false;
Many things! - Position faces are now drawn in Battle, categorized first by balloons, then by points - Balloon-based items, gives people who are worse off better items, and people who are better off worse items. - You can strafe while using feather or while using a bounce pad - Reduced the strength of bounce pad thrust on items - Increased bounce pad's minimum forward push on players - Made Frantic Mode just a teeeeensy bit more frantic - Fixed being able to use Feathers mid-air - Fixed being unable to steal Feathers - Drift sparks use frameangle instead of angle
2017-11-23 02:40:17 +00:00
Fix karma items in this branch
2018-06-14 01:32:33 +00:00
if (G_BattleGametype() && i > 5)
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
{
Tweaked item odds in battle Karma items can hand out x10 banana, and being ahead in Battle is way more focused on removing just your defensive options than making all of your options Orbinaut/Banana/Eggman (there'll still be a lot of those, but it doesn't lower the chance of the other items too badly).
2018-06-25 14:18:29 +00:00
oddsvalid[i] = false;
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
break;
}
for (j = 0; j < NUMKARTRESULTS; j++)
{
Intro camera can noclip, fix several compile errors
2018-06-25 13:18:30 +00:00
if (K_KartGetItemOdds(i, j, mashed) > 0)
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
{
Tweaked item odds in battle Karma items can hand out x10 banana, and being ahead in Battle is way more focused on removing just your defensive options than making all of your options Orbinaut/Banana/Eggman (there'll still be a lot of those, but it doesn't lower the chance of the other items too badly).
2018-06-25 14:18:29 +00:00
available = true;
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
break;
}
}
oddsvalid[i] = available;
}
Many things! - Position faces are now drawn in Battle, categorized first by balloons, then by points - Balloon-based items, gives people who are worse off better items, and people who are better off worse items. - You can strafe while using feather or while using a bounce pad - Reduced the strength of bounce pad thrust on items - Increased bounce pad's minimum forward push on players - Made Frantic Mode just a teeeeensy bit more frantic - Fixed being able to use Feathers mid-air - Fixed being unable to steal Feathers - Drift sparks use frameangle instead of angle
2017-11-23 02:40:17 +00:00
Fix up balloon-based items
2017-11-24 03:34:36 +00:00
for (i = 0; i < MAXPLAYERS; i++)
Many things! - Position faces are now drawn in Battle, categorized first by balloons, then by points - Balloon-based items, gives people who are worse off better items, and people who are better off worse items. - You can strafe while using feather or while using a bounce pad - Reduced the strength of bounce pad thrust on items - Increased bounce pad's minimum forward push on players - Made Frantic Mode just a teeeeensy bit more frantic - Fixed being able to use Feathers mid-air - Fixed being unable to steal Feathers - Drift sparks use frameangle instead of angle
2017-11-23 02:40:17 +00:00
{
Fixes
2018-06-08 04:02:28 +00:00
if (playeringame[i] && !players[i].spectator && players[i].mo
&& players[i].kartstuff[k_position] < player->kartstuff[k_position])
pdis += P_AproxDistance(P_AproxDistance(players[i].mo->x - player->mo->x,
players[i].mo->y - player->mo->y),
players[i].mo->z - player->mo->z) / mapheaderinfo[gamemap-1]->mobj_scale
* (pingame - players[i].kartstuff[k_position])
Flags for only drawing an object on one person's screen, for juicy Boo splitscreen support (also more item changes from last night that I just forgot to commit earlier)
2018-06-06 22:36:39 +00:00
/ ((pingame - 1) * (pingame + 1) / 3);
Fixes
2018-06-08 04:02:28 +00:00
}
Flags for only drawing an object on one person's screen, for juicy Boo splitscreen support (also more item changes from last night that I just forgot to commit earlier)
2018-06-06 22:36:39 +00:00
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
#define SETUPDISTTABLE(odds, num) \
for (i = num; i; --i) disttable[distlen++] = odds
Removed drown, maybe extended post-race time so it doesn't jump to results immediately Added experimental player distance based items
2017-05-07 23:08:03 +00:00
Made a lot of gametype checks use either G_RaceGametype or G_BattleGametype Should make it a lot easier to add more gametypes later. Also some minor fixes: - Changed up how shell speed scales in mobjscale juuuust slightly, so it's less messy - Fixed CHECK showing spectators
2018-03-04 20:27:52 +00:00
if (G_BattleGametype()) // Battle Mode
Many things! - Position faces are now drawn in Battle, categorized first by balloons, then by points - Balloon-based items, gives people who are worse off better items, and people who are better off worse items. - You can strafe while using feather or while using a bounce pad - Reduced the strength of bounce pad thrust on items - Increased bounce pad's minimum forward push on players - Made Frantic Mode just a teeeeensy bit more frantic - Fixed being able to use Feathers mid-air - Fixed being unable to steal Feathers - Drift sparks use frameangle instead of angle
2017-11-23 02:40:17 +00:00
{
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
if (oddsvalid[0]) SETUPDISTTABLE(0,1);
if (oddsvalid[1]) SETUPDISTTABLE(1,1);
if (oddsvalid[2]) SETUPDISTTABLE(2,1);
Rebalance Battle items in response to last night's netgame
2018-08-26 18:58:21 +00:00
if (oddsvalid[3]) SETUPDISTTABLE(3,1);
if (oddsvalid[4]) SETUPDISTTABLE(4,1);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
Rebalance Battle items in response to last night's netgame
2018-08-26 18:58:21 +00:00
if (player->kartstuff[k_roulettetype] == 1 && oddsvalid[5]) // 5 is the extreme odds of player-controlled "Karma" items
useodds = 5;
SUPER CHARGED KARMA ITEMS They give equal chance on a lot of good shit, instead of the normal boring pool of items, mwahaha (also calls P_CheckRacers when someone spectates)
2018-06-04 00:58:52 +00:00
else
{
Rebalance Battle items in response to last night's netgame
2018-08-26 18:58:21 +00:00
SINT8 wantedpos = (bestbumper-player->kartstuff[k_bumper]); // 0 is the best player's bumper count, 1 is a bumper below best, 2 is two bumpers below, etc
* Tweak battle odds in a few ways, as authorised by Sal. * Steal a point from Ballhog and give to Orbinaut. * Make it based on the maximum number of bumpers someone has, not the average for everyone. * Improve the odds a tad if you're Wanted. * Tweak the score multiplication to give three points for Wanted and two for removing the last bumper (both disabled if you get the hit with a fake item). * Allow Karma players to drop their Random box. * These boxes flicker out of existence after 15 seconds. * Causes a WAIT penalty, too. * Remove some redundant PF_ATTACKDOWN stuff, given under the conditions the flag would be applied, it has definitely *already* been applied.
2018-08-06 17:37:03 +00:00
if (K_IsPlayerWanted(player))
Good catch
2018-08-26 19:17:55 +00:00
wantedpos++;
Rebalance Battle items in response to last night's netgame
2018-08-26 18:58:21 +00:00
if (wantedpos > 4) // Don't run off into karma items
wantedpos = 4;
if (wantedpos < 0) // Don't go below somehow
Item odds adjustment Battle no longer does item scaling if you're ahead, only if you're behind. This means less bananas. Also, SPB increased odds, Shrink is less often.
2018-07-02 22:23:18 +00:00
wantedpos = 0;
Rebalance Battle items in response to last night's netgame
2018-08-26 18:58:21 +00:00
useodds = disttable[(wantedpos * distlen) / 5];
SUPER CHARGED KARMA ITEMS They give equal chance on a lot of good shit, instead of the normal boring pool of items, mwahaha (also calls P_CheckRacers when someone spectates)
2018-06-04 00:58:52 +00:00
}
Many things! - Position faces are now drawn in Battle, categorized first by balloons, then by points - Balloon-based items, gives people who are worse off better items, and people who are better off worse items. - You can strafe while using feather or while using a bounce pad - Reduced the strength of bounce pad thrust on items - Increased bounce pad's minimum forward push on players - Made Frantic Mode just a teeeeensy bit more frantic - Fixed being able to use Feathers mid-air - Fixed being unable to steal Feathers - Drift sparks use frameangle instead of angle
2017-11-23 02:40:17 +00:00
}
else
{
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
if (oddsvalid[1]) SETUPDISTTABLE(1,1);
if (oddsvalid[2]) SETUPDISTTABLE(2,1);
if (oddsvalid[3]) SETUPDISTTABLE(3,1);
if (oddsvalid[4]) SETUPDISTTABLE(4,2);
if (oddsvalid[5]) SETUPDISTTABLE(5,2);
if (oddsvalid[6]) SETUPDISTTABLE(6,3);
if (oddsvalid[7]) SETUPDISTTABLE(7,3);
if (oddsvalid[8]) SETUPDISTTABLE(8,1);
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
if (franticitems) // Frantic items make the distances between everyone artifically higher, for crazier items
Fixed spectating for real, messages for changing some kart cvars, Mirror Mode disallowed in Battle
2018-01-30 00:15:25 +00:00
pdis = (15*pdis/14);
Make the low player count distributions slightly more extreme Scales below 8 players instead of 6 players. The distance multipler in 4P is now x1.14 instead of x1.07.
2018-08-29 03:06:31 +00:00
if (pingame < 8 && !G_BattleGametype())
pdis = ((28+(8-pingame))*pdis/28);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
if (pingame == 1 && oddsvalid[0]) // Record Attack, or just alone
useodds = 0;
else if (pdis <= 0) // (64*14) * 0 = 0
Hopefully some medicine for the characters' sore throats from all that taunting Also my editor ate some trailing whitespace.
2018-07-04 21:25:38 +00:00
useodds = disttable[0];
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
else if (pdis > distvar * ((12 * distlen) / 14)) // (64*14) * 12 = 10752
useodds = disttable[distlen-1];
else
{
Item distribution debugger, and oversight pointed out by this Item distribution debugger is a netvar that enables cheats, so no exploiting!
2018-08-29 18:28:28 +00:00
for (i = 1; i < 13; i++)
Whoops, no break here
2018-06-11 01:05:09 +00:00
{
if (pdis <= distvar * ((i * distlen) / 14))
{
useodds = disttable[((i * distlen) / 14)];
break;
}
}
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
}
Many things! - Position faces are now drawn in Battle, categorized first by balloons, then by points - Balloon-based items, gives people who are worse off better items, and people who are better off worse items. - You can strafe while using feather or while using a bounce pad - Reduced the strength of bounce pad thrust on items - Increased bounce pad's minimum forward push on players - Made Frantic Mode just a teeeeensy bit more frantic - Fixed being able to use Feathers mid-air - Fixed being unable to steal Feathers - Drift sparks use frameangle instead of angle
2017-11-23 02:40:17 +00:00
}
Removed drown, maybe extended post-race time so it doesn't jump to results immediately Added experimental player distance based items
2017-05-07 23:08:03 +00:00
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
#undef SETUPDISTTABLE
Whoops, no break here
2018-06-11 01:05:09 +00:00
//CONS_Printf("Got useodds %d. (position: %d, distance: %d)\n", useodds, player->kartstuff[k_position], pdis);
Flags for only drawing an object on one person's screen, for juicy Boo splitscreen support (also more item changes from last night that I just forgot to commit earlier)
2018-06-06 22:36:39 +00:00
Item distribution debugger, and oversight pointed out by this Item distribution debugger is a netvar that enables cheats, so no exploiting!
2018-08-29 18:28:28 +00:00
return useodds;
}
static void K_KartItemRoulette(player_t *player, ticcmd_t *cmd)
{
INT32 i;
UINT8 pingame = 0;
UINT8 roulettestop;
INT32 useodds = 0;
INT32 spawnchance[NUMKARTRESULTS * NUMKARTODDS];
INT32 chance = 0, numchoices = 0;
INT32 bestbumper = 0;
fixed_t mashed = 0;
// This makes the roulette cycle through items - if this is 0, you shouldn't be here.
if (player->kartstuff[k_itemroulette])
player->kartstuff[k_itemroulette]++;
else
return;
// Gotta check how many players are active at this moment.
for (i = 0; i < MAXPLAYERS; i++)
{
if (!playeringame[i] || players[i].spectator)
continue;
pingame++;
if (players[i].kartstuff[k_bumper] > bestbumper)
bestbumper = players[i].kartstuff[k_bumper];
}
// This makes the roulette produce the random noises.
if ((player->kartstuff[k_itemroulette] % 3) == 1 && P_IsLocalPlayer(player))
Only play one player's roulette sounds at a time Don't stack the sounds :WutFace:
2018-10-02 18:10:38 +00:00
{
#define PLAYROULETTESND S_StartSound(NULL, sfx_mkitm1 + ((player->kartstuff[k_itemroulette] / 3) % 8));
if (splitscreen)
{
if (players[displayplayer].kartstuff[k_itemroulette])
{
if (player == &players[displayplayer])
PLAYROULETTESND;
}
else if (players[secondarydisplayplayer].kartstuff[k_itemroulette])
{
if (player == &players[secondarydisplayplayer])
PLAYROULETTESND;
}
Add a few more splitscreen checks here
2018-10-03 17:43:36 +00:00
else if (players[thirddisplayplayer].kartstuff[k_itemroulette] && splitscreen > 1)
Only play one player's roulette sounds at a time Don't stack the sounds :WutFace:
2018-10-02 18:10:38 +00:00
{
if (player == &players[thirddisplayplayer])
PLAYROULETTESND;
}
Add a few more splitscreen checks here
2018-10-03 17:43:36 +00:00
else if (players[fourthdisplayplayer].kartstuff[k_itemroulette] && splitscreen > 2)
Only play one player's roulette sounds at a time Don't stack the sounds :WutFace:
2018-10-02 18:10:38 +00:00
{
if (player == &players[fourthdisplayplayer])
PLAYROULETTESND;
}
}
else
PLAYROULETTESND;
#undef PLAYROULETTESND
}
Item distribution debugger, and oversight pointed out by this Item distribution debugger is a netvar that enables cheats, so no exploiting!
2018-08-29 18:28:28 +00:00
"TICRATE*1"?!
2018-09-27 22:44:14 +00:00
roulettestop = TICRATE + (3*(pingame - player->kartstuff[k_position]));
Item distribution debugger, and oversight pointed out by this Item distribution debugger is a netvar that enables cheats, so no exploiting!
2018-08-29 18:28:28 +00:00
// If the roulette finishes or the player presses BT_ATTACK, stop the roulette and calculate the item.
// I'm returning via the exact opposite, however, to forgo having another bracket embed. Same result either way, I think.
// Finally, if you get past this check, now you can actually start calculating what item you get.
No mashing in Record Attack
2018-09-27 22:42:42 +00:00
if ((cmd->buttons & BT_ATTACK) && !(player->kartstuff[k_eggmanheld] || player->kartstuff[k_itemheld]) && player->kartstuff[k_itemroulette] >= roulettestop && !modeattacking)
Item distribution debugger, and oversight pointed out by this Item distribution debugger is a netvar that enables cheats, so no exploiting!
2018-08-29 18:28:28 +00:00
{
// Mashing reduces your chances for the good items
mashed = FixedDiv((player->kartstuff[k_itemroulette])*FRACUNIT, ((TICRATE*3)+roulettestop)*FRACUNIT) - FRACUNIT;
}
else if (!(player->kartstuff[k_itemroulette] >= (TICRATE*3)))
return;
if (cmd->buttons & BT_ATTACK)
player->pflags |= PF_ATTACKDOWN;
if (player->kartstuff[k_roulettetype] == 2) // Fake items
{
player->kartstuff[k_eggmanexplode] = 4*TICRATE;
player->kartstuff[k_itemroulette] = 0;
player->kartstuff[k_roulettetype] = 0;
if (P_IsLocalPlayer(player))
S_StartSound(NULL, sfx_mkitmE);
return;
}
Prevent using kartdebug cvars in Time Attack. (None of this should invalidate any of YOUR existing ghosts, because none of them use these obvious cheats like, say, setting kartdebugitem 2.)
2018-11-09 20:16:12 +00:00
if (cv_kartdebugitem.value != 0 && !modeattacking)
Item distribution debugger, and oversight pointed out by this Item distribution debugger is a netvar that enables cheats, so no exploiting!
2018-08-29 18:28:28 +00:00
{
K_KartGetItemResult(player, cv_kartdebugitem.value);
player->kartstuff[k_itemamount] = cv_kartdebugamount.value;
player->kartstuff[k_itemroulette] = 0;
player->kartstuff[k_roulettetype] = 0;
if (P_IsLocalPlayer(player))
S_StartSound(NULL, sfx_dbgsal);
return;
}
// Initializes existing spawnchance values
for (i = 0; i < (NUMKARTRESULTS * NUMKARTODDS); i++)
spawnchance[i] = 0;
// Split into another function for a debug function below
useodds = K_FindUseodds(player, mashed, pingame, bestbumper);
#define SETITEMRESULT(itemnum) \
for (chance = 0; chance < K_KartGetItemOdds(useodds, itemnum, mashed); chance++) \
Made Frantic Mode work in Battle Mode & provide more silly results Also fixed flashing
2017-11-07 20:04:21 +00:00
spawnchance[numchoices++] = itemnum
Removed drown, maybe extended post-race time so it doesn't jump to results immediately Added experimental player distance based items
2017-05-07 23:08:03 +00:00
Item distribution debugger, and oversight pointed out by this Item distribution debugger is a netvar that enables cheats, so no exploiting!
2018-08-29 18:28:28 +00:00
for (i = 1; i < NUMKARTRESULTS; i++)
SETITEMRESULT(i);
Removed drown, maybe extended post-race time so it doesn't jump to results immediately Added experimental player distance based items
2017-05-07 23:08:03 +00:00
#undef SETITEMRESULT
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
// Award the player whatever power is rolled
if (numchoices > 0)
K_KartGetItemResult(player, spawnchance[P_RandomKey(numchoices)]);
else
{
player->kartstuff[k_itemtype] = KITEM_SAD;
player->kartstuff[k_itemamount] = 1;
}
Removed drown, maybe extended post-race time so it doesn't jump to results immediately Added experimental player distance based items
2017-05-07 23:08:03 +00:00
player->kartstuff[k_itemroulette] = 0; // Since we're done, clear the roulette number
WHOOPS
2018-06-04 04:29:31 +00:00
player->kartstuff[k_roulettetype] = 0; // This too
Removed drown, maybe extended post-race time so it doesn't jump to results immediately Added experimental player distance based items
2017-05-07 23:08:03 +00:00
if (P_IsLocalPlayer(player))
S_StartSound(NULL, sfx_mkitmF);
}
//}
Revert "Remove kart offroad variable and workings." This will likely be temporary until the sector effect is done for a default friction value. This reverts commit aff9a78d761a82846cc696251b9a5438af58ba29. # Conflicts: # src/d_player.h # src/g_game.c # src/k_kart.c
2017-03-06 02:38:35 +00:00
//{ SRB2kart p_user.c Stuff
More tweaking - Getting wipeout bumped into offroad slows you down - Orbinaut & Jawz are relative to your weight (Jawz is heavier), via new function K_GetMobjWeight - Reorangized where K_KartBouncing is called so that wipeout changes don't affect Eggman Items
2018-07-20 20:13:02 +00:00
static fixed_t K_GetMobjWeight(mobj_t *mobj, mobj_t *against)
{
fixed_t weight = 5<<FRACBITS;
switch (mobj->type)
{
case MT_PLAYER:
if (!mobj->player)
break;
if (against->player && !against->player->kartstuff[k_spinouttimer] && mobj->player->kartstuff[k_spinouttimer])
weight = 0; // Do not bump
else
Weight increases with speed Might be a tad weak right now, but we'll see if people want it stronger
2018-09-08 08:04:10 +00:00
{
More tweaking - Getting wipeout bumped into offroad slows you down - Orbinaut & Jawz are relative to your weight (Jawz is heavier), via new function K_GetMobjWeight - Reorangized where K_KartBouncing is called so that wipeout changes don't affect Eggman Items
2018-07-20 20:13:02 +00:00
weight = (mobj->player->kartweight)<<FRACBITS;
Weight increases with speed Might be a tad weak right now, but we'll see if people want it stronger
2018-09-08 08:04:10 +00:00
if (mobj->player->speed > K_GetKartSpeed(mobj->player, false))
weight += (mobj->player->speed - K_GetKartSpeed(mobj->player, false))/8;
}
More tweaking - Getting wipeout bumped into offroad slows you down - Orbinaut & Jawz are relative to your weight (Jawz is heavier), via new function K_GetMobjWeight - Reorangized where K_KartBouncing is called so that wipeout changes don't affect Eggman Items
2018-07-20 20:13:02 +00:00
break;
Restore the one good bit
2018-09-06 23:31:28 +00:00
case MT_FALLINGROCK:
if (against->player)
{
if (against->player->kartstuff[k_invincibilitytimer]
|| against->player->kartstuff[k_growshrinktimer] > 0)
weight = 0;
else
weight = (against->player->kartweight)<<FRACBITS;
}
break;
Orbinaut
2018-07-23 00:55:18 +00:00
case MT_ORBINAUT:
case MT_ORBINAUT_SHIELD:
More tweaking - Getting wipeout bumped into offroad slows you down - Orbinaut & Jawz are relative to your weight (Jawz is heavier), via new function K_GetMobjWeight - Reorangized where K_KartBouncing is called so that wipeout changes don't affect Eggman Items
2018-07-20 20:13:02 +00:00
if (against->player)
weight = (against->player->kartweight)<<FRACBITS;
break;
case MT_JAWZ:
case MT_JAWZ_DUD:
case MT_JAWZ_SHIELD:
if (against->player)
weight = (against->player->kartweight+3)<<FRACBITS;
else
Small correction
2018-07-20 20:13:41 +00:00
weight = 8<<FRACBITS;
More tweaking - Getting wipeout bumped into offroad slows you down - Orbinaut & Jawz are relative to your weight (Jawz is heavier), via new function K_GetMobjWeight - Reorangized where K_KartBouncing is called so that wipeout changes don't affect Eggman Items
2018-07-20 20:13:02 +00:00
break;
default:
break;
}
return weight;
}
Revert "Wrote a new function for MT_SOLID object bumping" This reverts commit b4aa01ed610770352a6474d1e7827d551468571b.
2018-09-06 23:27:07 +00:00
void K_KartBouncing(mobj_t *mobj1, mobj_t *mobj2, boolean bounce, boolean solid)
v1.3.04 - The Bouncy One -------- Hardcoded Collide.lua. Added player boolean array "Collide", used by Collide.lua. Walls are now bouncy by default again, like they were in 1.09. Buffed Orange Drift sparks, the boost now lasts 60 frames up from 40.
2017-04-17 17:18:51 +00:00
{
Bumpy
2017-10-24 04:42:06 +00:00
mobj_t *fx;
Change player collision again, they bounce away from each other naturally Need to meddle and test with a "minimum bounce" still
2017-11-04 13:19:06 +00:00
fixed_t momdifx, momdify;
fixed_t distx, disty;
fixed_t dot, p;
New collision mechanics, player's transfer their speed along movement when they collide, then bounce off at a set speed away depending on weight from each other
2017-11-03 00:43:51 +00:00
fixed_t mass1, mass2;
v1.3.08 - The Fat One -------- Driftboost formula changed to: 49 + player->kartspeed*2; (No longer factors weight from previous version) Collision code now factors character weight for players. Collision code now only plays the collision sound once, rather than per player. Weight now factors into drifting's base value. A heavier character will drift more straight with no input and have less control. Added a cheat check in SetPlayerSkinByNum(), to force speed and weight within the boundaries of 1 and 9. Nerfed orange turbo to 50 frames, down from 60.
2017-04-19 01:04:54 +00:00
New collision mechanics, player's transfer their speed along movement when they collide, then bounce off at a set speed away depending on weight from each other
2017-11-03 00:43:51 +00:00
if (!mobj1 || !mobj2)
v1.3.04 - The Bouncy One -------- Hardcoded Collide.lua. Added player boolean array "Collide", used by Collide.lua. Walls are now bouncy by default again, like they were in 1.09. Buffed Orange Drift sparks, the boost now lasts 60 frames up from 40.
2017-04-17 17:18:51 +00:00
return;
v1.3.08 - The Fat One -------- Driftboost formula changed to: 49 + player->kartspeed*2; (No longer factors weight from previous version) Collision code now factors character weight for players. Collision code now only plays the collision sound once, rather than per player. Weight now factors into drifting's base value. A heavier character will drift more straight with no input and have less control. Added a cheat check in SetPlayerSkinByNum(), to force speed and weight within the boundaries of 1 and 9. Nerfed orange turbo to 50 frames, down from 60.
2017-04-19 01:04:54 +00:00
Stop players bumping when they're reborn
2017-11-11 01:17:42 +00:00
// Don't bump when you're being reborn
if ((mobj1->player && mobj1->player->playerstate != PST_LIVE)
|| (mobj2->player && mobj2->player->playerstate != PST_LIVE))
return;
Lakitu murder & countdown improvements (I'm not SevenethSentienel! I just don't feel like logging out!)
2018-06-25 02:15:22 +00:00
if ((mobj1->player && mobj1->player->kartstuff[k_respawn])
|| (mobj2->player && mobj2->player->kartstuff[k_respawn]))
No bumping when respawning
2018-06-07 00:41:23 +00:00
return;
Tweeeeeaks - MT_FALLINGROCK bumps you instead of spinning you out! RIP annoying af apples - Made some Battle-related messages only happen in netgames - Messed with the timing on the intro
2017-12-28 23:37:25 +00:00
// Don't bump if you've recently bumped
Wipeout bumps - You can bump other people during spinout. - Bumping during spinout activates a "slow down" timer, which increases your friction after a few tics. - You have a Smash-style dust effect after a spinout bump, indicating clearly if you'll slow down or not.
2018-07-20 02:37:32 +00:00
if (mobj1->player && mobj1->player->kartstuff[k_justbumped])
Tweeeeeaks - MT_FALLINGROCK bumps you instead of spinning you out! RIP annoying af apples - Made some Battle-related messages only happen in netgames - Messed with the timing on the intro
2017-12-28 23:37:25 +00:00
{
Wipeout bumps - You can bump other people during spinout. - Bumping during spinout activates a "slow down" timer, which increases your friction after a few tics. - You have a Smash-style dust effect after a spinout bump, indicating clearly if you'll slow down or not.
2018-07-20 02:37:32 +00:00
mobj1->player->kartstuff[k_justbumped] = bumptime;
Tweeeeeaks - MT_FALLINGROCK bumps you instead of spinning you out! RIP annoying af apples - Made some Battle-related messages only happen in netgames - Messed with the timing on the intro
2017-12-28 23:37:25 +00:00
return;
}
Wipeout bumps - You can bump other people during spinout. - Bumping during spinout activates a "slow down" timer, which increases your friction after a few tics. - You have a Smash-style dust effect after a spinout bump, indicating clearly if you'll slow down or not.
2018-07-20 02:37:32 +00:00
if (mobj2->player && mobj2->player->kartstuff[k_justbumped])
Increase minimum bounce Don't run xy bouncing if objects are directly ontop of each other Don't run xy bouncing if objects are moving away from each other Move z bouncing to be done first so that returning from xy collision doesn't stop it
2017-11-05 21:33:22 +00:00
{
Wipeout bumps - You can bump other people during spinout. - Bumping during spinout activates a "slow down" timer, which increases your friction after a few tics. - You have a Smash-style dust effect after a spinout bump, indicating clearly if you'll slow down or not.
2018-07-20 02:37:32 +00:00
mobj2->player->kartstuff[k_justbumped] = bumptime;
return;
Increase minimum bounce Don't run xy bouncing if objects are directly ontop of each other Don't run xy bouncing if objects are moving away from each other Move z bouncing to be done first so that returning from xy collision doesn't stop it
2017-11-05 21:33:22 +00:00
}
More tweaking - Getting wipeout bumped into offroad slows you down - Orbinaut & Jawz are relative to your weight (Jawz is heavier), via new function K_GetMobjWeight - Reorangized where K_KartBouncing is called so that wipeout changes don't affect Eggman Items
2018-07-20 20:13:02 +00:00
mass1 = K_GetMobjWeight(mobj1, mobj2);
Revert "Wrote a new function for MT_SOLID object bumping" This reverts commit b4aa01ed610770352a6474d1e7827d551468571b.
2018-09-06 23:27:07 +00:00
if (solid == true && mass1 > 0)
mass2 = mass1;
else
mass2 = K_GetMobjWeight(mobj2, mobj1);
Change player collision again, they bounce away from each other naturally Need to meddle and test with a "minimum bounce" still
2017-11-04 13:19:06 +00:00
momdifx = mobj1->momx - mobj2->momx;
momdify = mobj1->momy - mobj2->momy;
Minimum bounce speed
2017-11-05 16:46:26 +00:00
// if the speed difference is less than this let's assume they're going proportionately faster from each other
Mobj scale fixes - MAXSTEPMOVE is affected by mobjscale - Minimum bump speeds (both wall & object) are affected by mobjscale - Minimum speed required for drifting is affected by player scale - Speedometer speeds are proportional to mobjscale - Camera no longer scales with player scale, to make the fact that you're either Lightning'd or Mega'd more obvious :V - Sevvvvvv go work on Dimension Heist
2018-01-15 21:14:45 +00:00
if (P_AproxDistance(momdifx, momdify) < (25*mapheaderinfo[gamemap-1]->mobj_scale))
Minimum bounce speed
2017-11-05 16:46:26 +00:00
{
fixed_t momdiflength = P_AproxDistance(momdifx, momdify);
fixed_t normalisedx = FixedDiv(momdifx, momdiflength);
fixed_t normalisedy = FixedDiv(momdify, momdiflength);
Mobj scale fixes - MAXSTEPMOVE is affected by mobjscale - Minimum bump speeds (both wall & object) are affected by mobjscale - Minimum speed required for drifting is affected by player scale - Speedometer speeds are proportional to mobjscale - Camera no longer scales with player scale, to make the fact that you're either Lightning'd or Mega'd more obvious :V - Sevvvvvv go work on Dimension Heist
2018-01-15 21:14:45 +00:00
momdifx = FixedMul((25*mapheaderinfo[gamemap-1]->mobj_scale), normalisedx);
momdify = FixedMul((25*mapheaderinfo[gamemap-1]->mobj_scale), normalisedy);
Minimum bounce speed
2017-11-05 16:46:26 +00:00
}
Modify distx/disty to ensure it never goes too low
2018-10-22 20:08:46 +00:00
// Adds the OTHER player's momentum, so that it reduces the chance of you being "inside" the other object
Wipeout bumps - You can bump other people during spinout. - Bumping during spinout activates a "slow down" timer, which increases your friction after a few tics. - You have a Smash-style dust effect after a spinout bump, indicating clearly if you'll slow down or not.
2018-07-20 02:37:32 +00:00
distx = (mobj1->x + mobj2->momx) - (mobj2->x + mobj1->momx);
disty = (mobj1->y + mobj2->momy) - (mobj2->y + mobj1->momy);
Increase minimum bounce Don't run xy bouncing if objects are directly ontop of each other Don't run xy bouncing if objects are moving away from each other Move z bouncing to be done first so that returning from xy collision doesn't stop it
2017-11-05 21:33:22 +00:00
Modify distx/disty to ensure it never goes too low
2018-10-22 20:08:46 +00:00
{ // Don't allow dist to get WAY too low, that it pushes you stupidly huge amounts, or backwards...
fixed_t dist = P_AproxDistance(distx, disty);
fixed_t nx = FixedDiv(distx, dist);
fixed_t ny = FixedDiv(disty, dist);
Minor mistakes on my part
2018-10-22 21:24:58 +00:00
if (P_AproxDistance(distx, disty) < (3*mobj1->radius)/4)
Modify distx/disty to ensure it never goes too low
2018-10-22 20:08:46 +00:00
{
Minor mistakes on my part
2018-10-22 21:24:58 +00:00
distx = FixedMul((3*mobj1->radius)/4, nx);
disty = FixedMul((3*mobj1->radius)/4, ny);
Modify distx/disty to ensure it never goes too low
2018-10-22 20:08:46 +00:00
}
Minor mistakes on my part
2018-10-22 21:24:58 +00:00
if (P_AproxDistance(distx, disty) < (3*mobj2->radius)/4)
Modify distx/disty to ensure it never goes too low
2018-10-22 20:08:46 +00:00
{
Minor mistakes on my part
2018-10-22 21:24:58 +00:00
distx = FixedMul((3*mobj2->radius)/4, nx);
disty = FixedMul((3*mobj2->radius)/4, ny);
Modify distx/disty to ensure it never goes too low
2018-10-22 20:08:46 +00:00
}
}
Increase minimum bounce Don't run xy bouncing if objects are directly ontop of each other Don't run xy bouncing if objects are moving away from each other Move z bouncing to be done first so that returning from xy collision doesn't stop it
2017-11-05 21:33:22 +00:00
if (distx == 0 && disty == 0)
{
// if there's no distance between the 2, they're directly on top of each other, don't run this
return;
}
Change player collision again, they bounce away from each other naturally Need to meddle and test with a "minimum bounce" still
2017-11-04 13:19:06 +00:00
dot = FixedMul(momdifx, distx) + FixedMul(momdify, disty);
Increase minimum bounce Don't run xy bouncing if objects are directly ontop of each other Don't run xy bouncing if objects are moving away from each other Move z bouncing to be done first so that returning from xy collision doesn't stop it
2017-11-05 21:33:22 +00:00
if (dot >= 0)
{
// They're moving away from each other
return;
}
Change player collision again, they bounce away from each other naturally Need to meddle and test with a "minimum bounce" still
2017-11-04 13:19:06 +00:00
p = FixedDiv(dot, FixedMul(distx, distx)+FixedMul(disty, disty));
Wipeout bumps - You can bump other people during spinout. - Bumping during spinout activates a "slow down" timer, which increases your friction after a few tics. - You have a Smash-style dust effect after a spinout bump, indicating clearly if you'll slow down or not.
2018-07-20 02:37:32 +00:00
if (bounce == true && mass2 > 0) // Perform a Goomba Bounce.
mobj1->momz = -mobj1->momz;
else
{
fixed_t newz = mobj1->momz;
if (mass2 > 0)
mobj1->momz = mobj2->momz;
Revert "Wrote a new function for MT_SOLID object bumping" This reverts commit b4aa01ed610770352a6474d1e7827d551468571b.
2018-09-06 23:27:07 +00:00
if (mass1 > 0 && solid == false)
Wipeout bumps - You can bump other people during spinout. - Bumping during spinout activates a "slow down" timer, which increases your friction after a few tics. - You have a Smash-style dust effect after a spinout bump, indicating clearly if you'll slow down or not.
2018-07-20 02:37:32 +00:00
mobj2->momz = newz;
}
Change player collision again, they bounce away from each other naturally Need to meddle and test with a "minimum bounce" still
2017-11-04 13:19:06 +00:00
Wipeout bumps - You can bump other people during spinout. - Bumping during spinout activates a "slow down" timer, which increases your friction after a few tics. - You have a Smash-style dust effect after a spinout bump, indicating clearly if you'll slow down or not.
2018-07-20 02:37:32 +00:00
if (mass2 > 0)
{
mobj1->momx = mobj1->momx - FixedMul(FixedMul(FixedDiv(2*mass2, mass1 + mass2), p), distx);
mobj1->momy = mobj1->momy - FixedMul(FixedMul(FixedDiv(2*mass2, mass1 + mass2), p), disty);
}
Change player collision again, they bounce away from each other naturally Need to meddle and test with a "minimum bounce" still
2017-11-04 13:19:06 +00:00
Revert "Wrote a new function for MT_SOLID object bumping" This reverts commit b4aa01ed610770352a6474d1e7827d551468571b.
2018-09-06 23:27:07 +00:00
if (mass1 > 0 && solid == false)
A bunch of little things - Minimum wall bounce speed decreased from 25*FRACUNIT to 15*FRACUNIT - Solid objects now bump players instead of stop them - Bounce pad strength scales with object scale - Fixed Boo stealing being inconsistent and sometimes not stealing anything
2018-01-08 20:48:19 +00:00
{
mobj2->momx = mobj2->momx - FixedMul(FixedMul(FixedDiv(2*mass1, mass1 + mass2), p), -distx);
mobj2->momy = mobj2->momy - FixedMul(FixedMul(FixedDiv(2*mass1, mass1 + mass2), p), -disty);
}
New collision mechanics, player's transfer their speed along movement when they collide, then bounce off at a set speed away depending on weight from each other
2017-11-03 00:43:51 +00:00
Wipeout bumps - You can bump other people during spinout. - Bumping during spinout activates a "slow down" timer, which increases your friction after a few tics. - You have a Smash-style dust effect after a spinout bump, indicating clearly if you'll slow down or not.
2018-07-20 02:37:32 +00:00
// Do the bump fx when we've CONFIRMED we can bump.
S_StartSound(mobj1, sfx_s3k49);
fx = P_SpawnMobj(mobj1->x/2 + mobj2->x/2, mobj1->y/2 + mobj2->y/2, mobj1->z/2 + mobj2->z/2, MT_BUMP);
if (mobj1->eflags & MFE_VERTICALFLIP)
fx->eflags |= MFE_VERTICALFLIP;
else
fx->eflags &= ~MFE_VERTICALFLIP;
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
P_SetScale(fx, mobj1->scale);
Wipeout bumps - You can bump other people during spinout. - Bumping during spinout activates a "slow down" timer, which increases your friction after a few tics. - You have a Smash-style dust effect after a spinout bump, indicating clearly if you'll slow down or not.
2018-07-20 02:37:32 +00:00
Move Player collision check into the regular collision checking
2017-11-01 18:40:32 +00:00
// Because this is done during collision now, rmomx and rmomy need to be recalculated
// so that friction doesn't immediately decide to stop the player if they're at a standstill
Tweeeeeaks - MT_FALLINGROCK bumps you instead of spinning you out! RIP annoying af apples - Made some Battle-related messages only happen in netgames - Messed with the timing on the intro
2017-12-28 23:37:25 +00:00
// Also set justbumped here
Move Player collision check into the regular collision checking
2017-11-01 18:40:32 +00:00
if (mobj1->player)
{
mobj1->player->rmomx = mobj1->momx - mobj1->player->cmomx;
mobj1->player->rmomy = mobj1->momy - mobj1->player->cmomy;
Tweeeeeaks - MT_FALLINGROCK bumps you instead of spinning you out! RIP annoying af apples - Made some Battle-related messages only happen in netgames - Messed with the timing on the intro
2017-12-28 23:37:25 +00:00
mobj1->player->kartstuff[k_justbumped] = bumptime;
Wipeout bumps - You can bump other people during spinout. - Bumping during spinout activates a "slow down" timer, which increases your friction after a few tics. - You have a Smash-style dust effect after a spinout bump, indicating clearly if you'll slow down or not.
2018-07-20 02:37:32 +00:00
if (mobj1->player->kartstuff[k_spinouttimer])
{
mobj1->player->kartstuff[k_wipeoutslow] += wipeoutslowtime+1;
mobj1->player->kartstuff[k_spinouttimer] += wipeoutslowtime+1;
}
Move Player collision check into the regular collision checking
2017-11-01 18:40:32 +00:00
}
if (mobj2->player)
{
mobj2->player->rmomx = mobj2->momx - mobj2->player->cmomx;
mobj2->player->rmomy = mobj2->momy - mobj2->player->cmomy;
Tweeeeeaks - MT_FALLINGROCK bumps you instead of spinning you out! RIP annoying af apples - Made some Battle-related messages only happen in netgames - Messed with the timing on the intro
2017-12-28 23:37:25 +00:00
mobj2->player->kartstuff[k_justbumped] = bumptime;
Wipeout bumps - You can bump other people during spinout. - Bumping during spinout activates a "slow down" timer, which increases your friction after a few tics. - You have a Smash-style dust effect after a spinout bump, indicating clearly if you'll slow down or not.
2018-07-20 02:37:32 +00:00
if (mobj2->player->kartstuff[k_spinouttimer])
{
mobj2->player->kartstuff[k_wipeoutslow] += wipeoutslowtime+1;
mobj2->player->kartstuff[k_spinouttimer] += wipeoutslowtime+1;
}
Move Player collision check into the regular collision checking
2017-11-01 18:40:32 +00:00
}
v1.3.04 - The Bouncy One -------- Hardcoded Collide.lua. Added player boolean array "Collide", used by Collide.lua. Walls are now bouncy by default again, like they were in 1.09. Buffed Orange Drift sparks, the boost now lasts 60 frames up from 40.
2017-04-17 17:18:51 +00:00
}
1.3.01 ------ Friction now correctly ignores FoFs over the sector (idk if it'll work on FoFs themselves yet) Friction reduces speed to 1/3, was 1/2.
2017-04-16 20:16:26 +00:00
/** \brief Checks that the player is on an offroad subsector for realsies
\param mo player mobj object
\return boolean
*/
Previous EXE: The Better Edition - Improve balloon-based items. Much more distinguished differences between the different ranks - Reverted Feather strafing. You can now just... properly move in the air, if you're using a Feather or a Bounce Pad. - Bounce pads are now stronger while using speed items. - Fixed the long standing bug about offroad & ziplines working when you're on FOFs above them. This is a tricky subject, so please report any issues you may come across related to this. - Shells should no longer travel to Mars, nor will they when using bounce pads. They should now do a gentle hop. - :WIP: new MP Player Setup screen, now shows character stats. Will later feature the list of characters in a row of icons, and a backported 2.2 color selector with toast's permission - Renamed "Match" to "Battle" :p - Yet MORE minor cases where kartspeed & kartweight were being read as fixed_t when they're freakin' UINT8's, people!
2017-11-28 06:13:23 +00:00
static UINT8 K_CheckOffroadCollide(mobj_t *mo, sector_t *sec)
1.3.01 ------ Friction now correctly ignores FoFs over the sector (idk if it'll work on FoFs themselves yet) Friction reduces speed to 1/3, was 1/2.
2017-04-16 20:16:26 +00:00
{
Previous EXE: The Better Edition - Improve balloon-based items. Much more distinguished differences between the different ranks - Reverted Feather strafing. You can now just... properly move in the air, if you're using a Feather or a Bounce Pad. - Bounce pads are now stronger while using speed items. - Fixed the long standing bug about offroad & ziplines working when you're on FOFs above them. This is a tricky subject, so please report any issues you may come across related to this. - Shells should no longer travel to Mars, nor will they when using bounce pads. They should now do a gentle hop. - :WIP: new MP Player Setup screen, now shows character stats. Will later feature the list of characters in a row of icons, and a backported 2.2 color selector with toast's permission - Renamed "Match" to "Battle" :p - Yet MORE minor cases where kartspeed & kartweight were being read as fixed_t when they're freakin' UINT8's, people!
2017-11-28 06:13:23 +00:00
UINT8 i;
sector_t *sec2;
1.3.01 ------ Friction now correctly ignores FoFs over the sector (idk if it'll work on FoFs themselves yet) Friction reduces speed to 1/3, was 1/2.
2017-04-16 20:16:26 +00:00
I_Assert(mo != NULL);
I_Assert(!P_MobjWasRemoved(mo));
Previous EXE: The Better Edition - Improve balloon-based items. Much more distinguished differences between the different ranks - Reverted Feather strafing. You can now just... properly move in the air, if you're using a Feather or a Bounce Pad. - Bounce pads are now stronger while using speed items. - Fixed the long standing bug about offroad & ziplines working when you're on FOFs above them. This is a tricky subject, so please report any issues you may come across related to this. - Shells should no longer travel to Mars, nor will they when using bounce pads. They should now do a gentle hop. - :WIP: new MP Player Setup screen, now shows character stats. Will later feature the list of characters in a row of icons, and a backported 2.2 color selector with toast's permission - Renamed "Match" to "Battle" :p - Yet MORE minor cases where kartspeed & kartweight were being read as fixed_t when they're freakin' UINT8's, people!
2017-11-28 06:13:23 +00:00
sec2 = P_ThingOnSpecial3DFloor(mo);
1.3.01 ------ Friction now correctly ignores FoFs over the sector (idk if it'll work on FoFs themselves yet) Friction reduces speed to 1/3, was 1/2.
2017-04-16 20:16:26 +00:00
Previous EXE: The Better Edition - Improve balloon-based items. Much more distinguished differences between the different ranks - Reverted Feather strafing. You can now just... properly move in the air, if you're using a Feather or a Bounce Pad. - Bounce pads are now stronger while using speed items. - Fixed the long standing bug about offroad & ziplines working when you're on FOFs above them. This is a tricky subject, so please report any issues you may come across related to this. - Shells should no longer travel to Mars, nor will they when using bounce pads. They should now do a gentle hop. - :WIP: new MP Player Setup screen, now shows character stats. Will later feature the list of characters in a row of icons, and a backported 2.2 color selector with toast's permission - Renamed "Match" to "Battle" :p - Yet MORE minor cases where kartspeed & kartweight were being read as fixed_t when they're freakin' UINT8's, people!
2017-11-28 06:13:23 +00:00
for (i = 2; i < 5; i++)
{
if ((sec2 && GETSECSPECIAL(sec2->special, 1) == i)
|| (P_IsObjectOnRealGround(mo, sec)
&& GETSECSPECIAL(sec->special, 1) == i))
return i;
}
return 0;
1.3.01 ------ Friction now correctly ignores FoFs over the sector (idk if it'll work on FoFs themselves yet) Friction reduces speed to 1/3, was 1/2.
2017-04-16 20:16:26 +00:00
}
Revert "Remove kart offroad variable and workings." This will likely be temporary until the sector effect is done for a default friction value. This reverts commit aff9a78d761a82846cc696251b9a5438af58ba29. # Conflicts: # src/d_player.h # src/g_game.c # src/k_kart.c
2017-03-06 02:38:35 +00:00
/** \brief Updates the Player's offroad value once per frame
\param player player object passed from K_KartPlayerThink
\return void
*/
static void K_UpdateOffroad(player_t *player)
{
fixed_t kartweight = player->kartweight;
fixed_t offroad;
sector_t *nextsector = R_PointInSubsector(
player->mo->x + player->mo->momx*2, player->mo->y + player->mo->momy*2)->sector;
v1.3.02 ------- Diagonal springs now keep your current speed if you are faster than their set speed. This only affects players for now. Offroad is no longer handled by &256, and is now handled by &2, &3, &4; Damage (Damage (Water), Damage (Fire), and Damage (Electric)) Starpost mobj radius and height have been reduced to 1*FRACUNIT, this should fix the checkpoint infinispawn bug.
2017-04-17 00:43:30 +00:00
fixed_t offroadstrength = 0;
Previous EXE: The Better Edition - Improve balloon-based items. Much more distinguished differences between the different ranks - Reverted Feather strafing. You can now just... properly move in the air, if you're using a Feather or a Bounce Pad. - Bounce pads are now stronger while using speed items. - Fixed the long standing bug about offroad & ziplines working when you're on FOFs above them. This is a tricky subject, so please report any issues you may come across related to this. - Shells should no longer travel to Mars, nor will they when using bounce pads. They should now do a gentle hop. - :WIP: new MP Player Setup screen, now shows character stats. Will later feature the list of characters in a row of icons, and a backported 2.2 color selector with toast's permission - Renamed "Match" to "Battle" :p - Yet MORE minor cases where kartspeed & kartweight were being read as fixed_t when they're freakin' UINT8's, people!
2017-11-28 06:13:23 +00:00
if (K_CheckOffroadCollide(player->mo, nextsector) == 2) // Weak Offroad
v1.3.02 ------- Diagonal springs now keep your current speed if you are faster than their set speed. This only affects players for now. Offroad is no longer handled by &256, and is now handled by &2, &3, &4; Damage (Damage (Water), Damage (Fire), and Damage (Electric)) Starpost mobj radius and height have been reduced to 1*FRACUNIT, this should fix the checkpoint infinispawn bug.
2017-04-17 00:43:30 +00:00
offroadstrength = 1;
Previous EXE: The Better Edition - Improve balloon-based items. Much more distinguished differences between the different ranks - Reverted Feather strafing. You can now just... properly move in the air, if you're using a Feather or a Bounce Pad. - Bounce pads are now stronger while using speed items. - Fixed the long standing bug about offroad & ziplines working when you're on FOFs above them. This is a tricky subject, so please report any issues you may come across related to this. - Shells should no longer travel to Mars, nor will they when using bounce pads. They should now do a gentle hop. - :WIP: new MP Player Setup screen, now shows character stats. Will later feature the list of characters in a row of icons, and a backported 2.2 color selector with toast's permission - Renamed "Match" to "Battle" :p - Yet MORE minor cases where kartspeed & kartweight were being read as fixed_t when they're freakin' UINT8's, people!
2017-11-28 06:13:23 +00:00
else if (K_CheckOffroadCollide(player->mo, nextsector) == 3) // Mid Offroad
v1.3.02 ------- Diagonal springs now keep your current speed if you are faster than their set speed. This only affects players for now. Offroad is no longer handled by &256, and is now handled by &2, &3, &4; Damage (Damage (Water), Damage (Fire), and Damage (Electric)) Starpost mobj radius and height have been reduced to 1*FRACUNIT, this should fix the checkpoint infinispawn bug.
2017-04-17 00:43:30 +00:00
offroadstrength = 2;
Previous EXE: The Better Edition - Improve balloon-based items. Much more distinguished differences between the different ranks - Reverted Feather strafing. You can now just... properly move in the air, if you're using a Feather or a Bounce Pad. - Bounce pads are now stronger while using speed items. - Fixed the long standing bug about offroad & ziplines working when you're on FOFs above them. This is a tricky subject, so please report any issues you may come across related to this. - Shells should no longer travel to Mars, nor will they when using bounce pads. They should now do a gentle hop. - :WIP: new MP Player Setup screen, now shows character stats. Will later feature the list of characters in a row of icons, and a backported 2.2 color selector with toast's permission - Renamed "Match" to "Battle" :p - Yet MORE minor cases where kartspeed & kartweight were being read as fixed_t when they're freakin' UINT8's, people!
2017-11-28 06:13:23 +00:00
else if (K_CheckOffroadCollide(player->mo, nextsector) == 4) // Strong Offroad
v1.3.02 ------- Diagonal springs now keep your current speed if you are faster than their set speed. This only affects players for now. Offroad is no longer handled by &256, and is now handled by &2, &3, &4; Damage (Damage (Water), Damage (Fire), and Damage (Electric)) Starpost mobj radius and height have been reduced to 1*FRACUNIT, this should fix the checkpoint infinispawn bug.
2017-04-17 00:43:30 +00:00
offroadstrength = 3;
Revert "Remove kart offroad variable and workings." This will likely be temporary until the sector effect is done for a default friction value. This reverts commit aff9a78d761a82846cc696251b9a5438af58ba29. # Conflicts: # src/d_player.h # src/g_game.c # src/k_kart.c
2017-03-06 02:38:35 +00:00
// If you are offroad, a timer starts. Depending on your weight value, the timer increments differently.
Fix the item box related crashes Removed Magnet item box pulling code. It's a mess, hacky, doesn't really help in races, and breaks things. We will implement something new for it soon.
2018-03-13 05:20:47 +00:00
//if ((nextsector->special & 256) && nextsector->special != 768
v1.3.02 ------- Diagonal springs now keep your current speed if you are faster than their set speed. This only affects players for now. Offroad is no longer handled by &256, and is now handled by &2, &3, &4; Damage (Damage (Water), Damage (Fire), and Damage (Electric)) Starpost mobj radius and height have been reduced to 1*FRACUNIT, this should fix the checkpoint infinispawn bug.
2017-04-17 00:43:30 +00:00
// && nextsector->special != 1024 && nextsector->special != 4864)
if (offroadstrength)
Revert "Remove kart offroad variable and workings." This will likely be temporary until the sector effect is done for a default friction value. This reverts commit aff9a78d761a82846cc696251b9a5438af58ba29. # Conflicts: # src/d_player.h # src/g_game.c # src/k_kart.c
2017-03-06 02:38:35 +00:00
{
Previous EXE: The Better Edition - Improve balloon-based items. Much more distinguished differences between the different ranks - Reverted Feather strafing. You can now just... properly move in the air, if you're using a Feather or a Bounce Pad. - Bounce pads are now stronger while using speed items. - Fixed the long standing bug about offroad & ziplines working when you're on FOFs above them. This is a tricky subject, so please report any issues you may come across related to this. - Shells should no longer travel to Mars, nor will they when using bounce pads. They should now do a gentle hop. - :WIP: new MP Player Setup screen, now shows character stats. Will later feature the list of characters in a row of icons, and a backported 2.2 color selector with toast's permission - Renamed "Match" to "Battle" :p - Yet MORE minor cases where kartspeed & kartweight were being read as fixed_t when they're freakin' UINT8's, people!
2017-11-28 06:13:23 +00:00
if (K_CheckOffroadCollide(player->mo, player->mo->subsector->sector) && player->kartstuff[k_offroad] == 0)
Revert "Remove kart offroad variable and workings." This will likely be temporary until the sector effect is done for a default friction value. This reverts commit aff9a78d761a82846cc696251b9a5438af58ba29. # Conflicts: # src/d_player.h # src/g_game.c # src/k_kart.c
2017-03-06 02:38:35 +00:00
player->kartstuff[k_offroad] = 16;
Previous EXE: The Better Edition - Improve balloon-based items. Much more distinguished differences between the different ranks - Reverted Feather strafing. You can now just... properly move in the air, if you're using a Feather or a Bounce Pad. - Bounce pads are now stronger while using speed items. - Fixed the long standing bug about offroad & ziplines working when you're on FOFs above them. This is a tricky subject, so please report any issues you may come across related to this. - Shells should no longer travel to Mars, nor will they when using bounce pads. They should now do a gentle hop. - :WIP: new MP Player Setup screen, now shows character stats. Will later feature the list of characters in a row of icons, and a backported 2.2 color selector with toast's permission - Renamed "Match" to "Battle" :p - Yet MORE minor cases where kartspeed & kartweight were being read as fixed_t when they're freakin' UINT8's, people!
2017-11-28 06:13:23 +00:00
Revert "Remove kart offroad variable and workings." This will likely be temporary until the sector effect is done for a default friction value. This reverts commit aff9a78d761a82846cc696251b9a5438af58ba29. # Conflicts: # src/d_player.h # src/g_game.c # src/k_kart.c
2017-03-06 02:38:35 +00:00
if (player->kartstuff[k_offroad] > 0)
{
if (kartweight < 1) { kartweight = 1; } if (kartweight > 9) { kartweight = 9; } // Safety Net
// 1872 is the magic number - 35 frames adds up to approximately 65536. 1872/4 = 468/3 = 156
// A higher kart weight means you can stay offroad for longer without losing speed
v1.3.02 ------- Diagonal springs now keep your current speed if you are faster than their set speed. This only affects players for now. Offroad is no longer handled by &256, and is now handled by &2, &3, &4; Damage (Damage (Water), Damage (Fire), and Damage (Electric)) Starpost mobj radius and height have been reduced to 1*FRACUNIT, this should fix the checkpoint infinispawn bug.
2017-04-17 00:43:30 +00:00
offroad = (1872 + 5*156 - kartweight*156)*offroadstrength;
Revert "Remove kart offroad variable and workings." This will likely be temporary until the sector effect is done for a default friction value. This reverts commit aff9a78d761a82846cc696251b9a5438af58ba29. # Conflicts: # src/d_player.h # src/g_game.c # src/k_kart.c
2017-03-06 02:38:35 +00:00
New invincibility effect, grow/shrink stuff Whenever grow/shrink effects get made, I'll remove the Mario-style stuttered growth and whatever else needs doing beyond that
2018-02-10 06:19:33 +00:00
//if (player->kartstuff[k_growshrinktimer] > 1) // grow slows down half as fast
= Nerfed Megas across the board. - Rarer - Speed reduced from +25% to +20% - Getting squished doesn't last as long = Nerfed the Banana Meta - or at least changed it - You don't wipeout for as long - You don't lose as much speed from wiping out (1/2 instead of 1/4) = Respawning after death is faster - Lakitu drops you faster, only three floaty sounds instead of four = Adjusted the camera to the values given by Sev
2017-10-13 19:41:36 +00:00
// offroad /= 2;
Revert "Remove kart offroad variable and workings." This will likely be temporary until the sector effect is done for a default friction value. This reverts commit aff9a78d761a82846cc696251b9a5438af58ba29. # Conflicts: # src/d_player.h # src/g_game.c # src/k_kart.c
2017-03-06 02:38:35 +00:00
player->kartstuff[k_offroad] += offroad;
}
v1.3.02 ------- Diagonal springs now keep your current speed if you are faster than their set speed. This only affects players for now. Offroad is no longer handled by &256, and is now handled by &2, &3, &4; Damage (Damage (Water), Damage (Fire), and Damage (Electric)) Starpost mobj radius and height have been reduced to 1*FRACUNIT, this should fix the checkpoint infinispawn bug.
2017-04-17 00:43:30 +00:00
if (player->kartstuff[k_offroad] > FRACUNIT*offroadstrength)
player->kartstuff[k_offroad] = FRACUNIT*offroadstrength;
Revert "Remove kart offroad variable and workings." This will likely be temporary until the sector effect is done for a default friction value. This reverts commit aff9a78d761a82846cc696251b9a5438af58ba29. # Conflicts: # src/d_player.h # src/g_game.c # src/k_kart.c
2017-03-06 02:38:35 +00:00
}
else
player->kartstuff[k_offroad] = 0;
}
Address review (for anything code I did, anyway)
2018-09-20 21:11:11 +00:00
// These have to go earlier than its sisters because of K_RespawnChecker...
Add a message for when multiple players on one node get removed Example: Chrome has been kicked (Go away) Shadow has left the game (Joined with Chrome) Kryne has left the game (Joined with Chrome) Vyce has left the game (Joined with Chrome)
2018-09-30 05:51:49 +00:00
void K_MatchGenericExtraFlags(mobj_t *mo, mobj_t *master)
Address review (for anything code I did, anyway)
2018-09-20 21:11:11 +00:00
{
// flipping
mo->eflags = (mo->eflags & ~MFE_VERTICALFLIP)|(master->eflags & MFE_VERTICALFLIP);
// visibility (usually for hyudoro)
mo->flags2 = (mo->flags2 & ~MF2_DONTDRAW)|(master->flags2 & MF2_DONTDRAW);
mo->eflags = (mo->eflags & ~MFE_DRAWONLYFORP1)|(master->eflags & MFE_DRAWONLYFORP1);
mo->eflags = (mo->eflags & ~MFE_DRAWONLYFORP2)|(master->eflags & MFE_DRAWONLYFORP2);
mo->eflags = (mo->eflags & ~MFE_DRAWONLYFORP3)|(master->eflags & MFE_DRAWONLYFORP3);
mo->eflags = (mo->eflags & ~MFE_DRAWONLYFORP4)|(master->eflags & MFE_DRAWONLYFORP4);
}
Spindash boost dust, pogo spring sfx
2018-09-20 00:13:48 +00:00
static void K_SpawnDashDustRelease(player_t *player)
{
fixed_t newx;
fixed_t newy;
mobj_t *dust;
angle_t travelangle;
INT32 i;
I_Assert(player != NULL);
I_Assert(player->mo != NULL);
I_Assert(!P_MobjWasRemoved(player->mo));
if (!P_IsObjectOnGround(player->mo))
return;
Fix dash-dust spawning not happening when drop-dashing, despite its function being called.
2018-09-27 17:39:54 +00:00
if (!player->speed && !player->kartstuff[k_startboost])
Spindash boost dust, pogo spring sfx
2018-09-20 00:13:48 +00:00
return;
travelangle = player->mo->angle;
if (player->kartstuff[k_drift] || player->kartstuff[k_driftend])
travelangle -= (ANGLE_45/5)*player->kartstuff[k_drift];
for (i = 0; i < 2; i++)
{
newx = player->mo->x + P_ReturnThrustX(player->mo, travelangle + ((i&1) ? -1 : 1)*ANGLE_90, FixedMul(48*FRACUNIT, player->mo->scale));
newy = player->mo->y + P_ReturnThrustY(player->mo, travelangle + ((i&1) ? -1 : 1)*ANGLE_90, FixedMul(48*FRACUNIT, player->mo->scale));
dust = P_SpawnMobj(newx, newy, player->mo->z, MT_FASTDUST);
P_SetTarget(&dust->target, player->mo);
dust->angle = travelangle - ((i&1) ? -1 : 1)*ANGLE_45;
dust->destscale = player->mo->scale;
P_SetScale(dust, player->mo->scale);
dust->momx = 3*player->mo->momx/5;
dust->momy = 3*player->mo->momy/5;
//dust->momz = 3*player->mo->momz/5;
Address review (for anything code I did, anyway)
2018-09-20 21:11:11 +00:00
K_MatchGenericExtraFlags(dust, player->mo);
Spindash boost dust, pogo spring sfx
2018-09-20 00:13:48 +00:00
}
}
Brake drfit effect
2018-11-01 01:35:17 +00:00
static void K_SpawnBrakeDriftSparks(player_t *player) // Be sure to update the mobj thinker case too!
{
mobj_t *sparks;
I_Assert(player != NULL);
I_Assert(player->mo != NULL);
I_Assert(!P_MobjWasRemoved(player->mo));
// Position & etc are handled in its thinker, and its spawned invisible.
// This avoids needing to dupe code if we don't need it.
sparks = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_BRAKEDRIFT);
P_SetTarget(&sparks->target, player->mo);
P_SetScale(sparks, (sparks->destscale = player->mo->scale));
K_MatchGenericExtraFlags(sparks, player->mo);
sparks->flags2 |= MF2_DONTDRAW;
}
Lakitu murder & countdown improvements (I'm not SevenethSentienel! I just don't feel like logging out!)
2018-06-25 02:15:22 +00:00
/** \brief Calculates the respawn timer and drop-boosting
v1.3.17 ------- Lakitu returns from his ironically-not-pillowshaded-cloud grave Dropboosting works on respawn Players respawn "automatically after 2 seconds" instead of "*instantaneously* while accel is held"
2017-07-16 16:04:33 +00:00
\param player player object passed from K_KartPlayerThink
\return void
*/
Lakitu murder & countdown improvements (I'm not SevenethSentienel! I just don't feel like logging out!)
2018-06-25 02:15:22 +00:00
void K_RespawnChecker(player_t *player)
v1.3.17 ------- Lakitu returns from his ironically-not-pillowshaded-cloud grave Dropboosting works on respawn Players respawn "automatically after 2 seconds" instead of "*instantaneously* while accel is held"
2017-07-16 16:04:33 +00:00
{
ticcmd_t *cmd = &player->cmd;
Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems
2018-07-21 21:45:25 +00:00
if (player->spectator)
return;
Drop Dash + alternate start boosts New respawn boost behavior, where you just hold for long enough instead of timing it with hitting the ground. Also much weaker, just gives you enough boost to get going instead of being a free sneaker. Start boosts have been severely changed. The perfect one has an extra tic on its timing window and gets Sneaker boosting special effects, but every other possible boost has been severely nerfed.
2018-09-10 05:47:23 +00:00
if (player->kartstuff[k_respawn] > 1)
v1.3.17 ------- Lakitu returns from his ironically-not-pillowshaded-cloud grave Dropboosting works on respawn Players respawn "automatically after 2 seconds" instead of "*instantaneously* while accel is held"
2017-07-16 16:04:33 +00:00
{
Lakitu murder & countdown improvements (I'm not SevenethSentienel! I just don't feel like logging out!)
2018-06-25 02:15:22 +00:00
player->kartstuff[k_respawn]--;
v1.3.17 ------- Lakitu returns from his ironically-not-pillowshaded-cloud grave Dropboosting works on respawn Players respawn "automatically after 2 seconds" instead of "*instantaneously* while accel is held"
2017-07-16 16:04:33 +00:00
player->mo->momz = 0;
player->powers[pw_flashing] = 2;
player->powers[pw_nocontrol] = 2;
Lakitu murder & countdown improvements (I'm not SevenethSentienel! I just don't feel like logging out!)
2018-06-25 02:15:22 +00:00
if (leveltime % 8 == 0)
{
Ballhog stuff
2018-06-25 22:17:03 +00:00
INT32 i;
HERE COMES A NEW CHALLENGER
2018-07-22 04:31:02 +00:00
if (!mapreset)
S_StartSound(player->mo, sfx_s3kcas);
Lakitu murder & countdown improvements (I'm not SevenethSentienel! I just don't feel like logging out!)
2018-06-25 02:15:22 +00:00
Ballhog stuff
2018-06-25 22:17:03 +00:00
for (i = 0; i < 8; i++)
Lakitu murder & countdown improvements (I'm not SevenethSentienel! I just don't feel like logging out!)
2018-06-25 02:15:22 +00:00
{
Ballhog stuff
2018-06-25 22:17:03 +00:00
mobj_t *mo;
angle_t newangle;
fixed_t newx, newy, newz;
newangle = FixedAngle(((360/8)*i)*FRACUNIT);
Fix up respawning so that it takes respawning with Shrink into account
2018-10-28 04:58:49 +00:00
newx = player->mo->x + P_ReturnThrustX(player->mo, newangle, 31<<FRACBITS); // does NOT use scale, since this effect doesn't scale properly
newy = player->mo->y + P_ReturnThrustY(player->mo, newangle, 31<<FRACBITS);
Lakitu murder & countdown improvements (I'm not SevenethSentienel! I just don't feel like logging out!)
2018-06-25 02:15:22 +00:00
if (player->mo->eflags & MFE_VERTICALFLIP)
Ballhog stuff
2018-06-25 22:17:03 +00:00
newz = player->mo->z + player->mo->height;
else
newz = player->mo->z;
mo = P_SpawnMobj(newx, newy, newz, MT_DEZLASER);
if (mo)
{
if (player->mo->eflags & MFE_VERTICALFLIP)
mo->eflags |= MFE_VERTICALFLIP;
P_SetTarget(&mo->target, player->mo);
mo->angle = newangle+ANGLE_90;
mo->momz = (8*FRACUNIT)*P_MobjFlip(player->mo);
}
Lakitu murder & countdown improvements (I'm not SevenethSentienel! I just don't feel like logging out!)
2018-06-25 02:15:22 +00:00
}
}
v1.3.17 ------- Lakitu returns from his ironically-not-pillowshaded-cloud grave Dropboosting works on respawn Players respawn "automatically after 2 seconds" instead of "*instantaneously* while accel is held"
2017-07-16 16:04:33 +00:00
}
Drop Dash + alternate start boosts New respawn boost behavior, where you just hold for long enough instead of timing it with hitting the ground. Also much weaker, just gives you enough boost to get going instead of being a free sneaker. Start boosts have been severely changed. The perfect one has an extra tic on its timing window and gets Sneaker boosting special effects, but every other possible boost has been severely nerfed.
2018-09-10 05:47:23 +00:00
else if (player->kartstuff[k_respawn] == 1)
v1.3.17 ------- Lakitu returns from his ironically-not-pillowshaded-cloud grave Dropboosting works on respawn Players respawn "automatically after 2 seconds" instead of "*instantaneously* while accel is held"
2017-07-16 16:04:33 +00:00
{
Fix up respawning so that it takes respawning with Shrink into account
2018-10-28 04:58:49 +00:00
if (player->kartstuff[k_growshrinktimer] < 0)
{
player->mo->scalespeed = mapheaderinfo[gamemap-1]->mobj_scale/TICRATE;
player->mo->destscale = 6*(mapheaderinfo[gamemap-1]->mobj_scale)/8;
Prevent using kartdebug cvars in Time Attack. (None of this should invalidate any of YOUR existing ghosts, because none of them use these obvious cheats like, say, setting kartdebugitem 2.)
2018-11-09 20:16:12 +00:00
if (cv_kartdebugshrink.value && !modeattacking && !player->bot)
Fix up respawning so that it takes respawning with Shrink into account
2018-10-28 04:58:49 +00:00
player->mo->destscale = 6*player->mo->destscale/8;
}
if (!P_IsObjectOnGround(player->mo) && !mapreset)
v1.3.17 ------- Lakitu returns from his ironically-not-pillowshaded-cloud grave Dropboosting works on respawn Players respawn "automatically after 2 seconds" instead of "*instantaneously* while accel is held"
2017-07-16 16:04:33 +00:00
{
player->powers[pw_flashing] = 2;
Drop Dash + alternate start boosts New respawn boost behavior, where you just hold for long enough instead of timing it with hitting the ground. Also much weaker, just gives you enough boost to get going instead of being a free sneaker. Start boosts have been severely changed. The perfect one has an extra tic on its timing window and gets Sneaker boosting special effects, but every other possible boost has been severely nerfed.
2018-09-10 05:47:23 +00:00
Fix up respawning so that it takes respawning with Shrink into account
2018-10-28 04:58:49 +00:00
// Sal: The old behavior was stupid and prone to accidental usage.
Drop Dash + alternate start boosts New respawn boost behavior, where you just hold for long enough instead of timing it with hitting the ground. Also much weaker, just gives you enough boost to get going instead of being a free sneaker. Start boosts have been severely changed. The perfect one has an extra tic on its timing window and gets Sneaker boosting special effects, but every other possible boost has been severely nerfed.
2018-09-10 05:47:23 +00:00
// Let's rip off Mania instead, and turn this into a Drop Dash!
v1.3.17 ------- Lakitu returns from his ironically-not-pillowshaded-cloud grave Dropboosting works on respawn Players respawn "automatically after 2 seconds" instead of "*instantaneously* while accel is held"
2017-07-16 16:04:33 +00:00
if (cmd->buttons & BT_ACCELERATE)
Drop Dash + alternate start boosts New respawn boost behavior, where you just hold for long enough instead of timing it with hitting the ground. Also much weaker, just gives you enough boost to get going instead of being a free sneaker. Start boosts have been severely changed. The perfect one has an extra tic on its timing window and gets Sneaker boosting special effects, but every other possible boost has been severely nerfed.
2018-09-10 05:47:23 +00:00
player->kartstuff[k_dropdash]++;
else
player->kartstuff[k_dropdash] = 0;
if (player->kartstuff[k_dropdash] == TICRATE/4)
S_StartSound(player->mo, sfx_ddash);
if ((player->kartstuff[k_dropdash] >= TICRATE/4)
&& (player->kartstuff[k_dropdash] & 1))
player->mo->colorized = true;
else
player->mo->colorized = false;
v1.3.17 ------- Lakitu returns from his ironically-not-pillowshaded-cloud grave Dropboosting works on respawn Players respawn "automatically after 2 seconds" instead of "*instantaneously* while accel is held"
2017-07-16 16:04:33 +00:00
}
else
{
Drop Dash + alternate start boosts New respawn boost behavior, where you just hold for long enough instead of timing it with hitting the ground. Also much weaker, just gives you enough boost to get going instead of being a free sneaker. Start boosts have been severely changed. The perfect one has an extra tic on its timing window and gets Sneaker boosting special effects, but every other possible boost has been severely nerfed.
2018-09-10 05:47:23 +00:00
if ((cmd->buttons & BT_ACCELERATE) && (player->kartstuff[k_dropdash] >= TICRATE/4))
{
S_StartSound(player->mo, sfx_s23c);
player->kartstuff[k_startboost] = 50;
Spindash boost dust, pogo spring sfx
2018-09-20 00:13:48 +00:00
K_SpawnDashDustRelease(player);
Drop Dash + alternate start boosts New respawn boost behavior, where you just hold for long enough instead of timing it with hitting the ground. Also much weaker, just gives you enough boost to get going instead of being a free sneaker. Start boosts have been severely changed. The perfect one has an extra tic on its timing window and gets Sneaker boosting special effects, but every other possible boost has been severely nerfed.
2018-09-10 05:47:23 +00:00
}
player->mo->colorized = false;
player->kartstuff[k_dropdash] = 0;
player->kartstuff[k_respawn] = 0;
v1.3.17 ------- Lakitu returns from his ironically-not-pillowshaded-cloud grave Dropboosting works on respawn Players respawn "automatically after 2 seconds" instead of "*instantaneously* while accel is held"
2017-07-16 16:04:33 +00:00
}
}
}
Re-add lost player vibration frames Separate sprites for fast moving frames Rename some frames for a more sensible naming convention
2017-11-04 17:32:47 +00:00
/** \brief Handles the state changing for moving players, moved here to eliminate duplicate code
\param player player data
\return void
*/
void K_KartMoveAnimation(player_t *player)
{
ticcmd_t *cmd = &player->cmd;
// Standing frames - S_KART_STND1 S_KART_STND1_L S_KART_STND1_R
More adjustments - Comeback timer gets higher the more you get hit - Your ghost appears over the bomb - Speed & accel is set to worst while a bomb - CHECK range scales with kartcc
2017-11-06 04:18:58 +00:00
if (player->speed == 0)
Re-add lost player vibration frames Separate sprites for fast moving frames Rename some frames for a more sensible naming convention
2017-11-04 17:32:47 +00:00
{
Lots of cmd restructuring. - cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster. - Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now. - Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request. - Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 21:12:42 +00:00
if (cmd->driftturn < 0 && !(player->mo->state >= &states[S_KART_STND1_R] && player->mo->state <= &states[S_KART_STND2_R]))
Re-add lost player vibration frames Separate sprites for fast moving frames Rename some frames for a more sensible naming convention
2017-11-04 17:32:47 +00:00
P_SetPlayerMobjState(player->mo, S_KART_STND1_R);
Lots of cmd restructuring. - cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster. - Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now. - Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request. - Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 21:12:42 +00:00
else if (cmd->driftturn > 0 && !(player->mo->state >= &states[S_KART_STND1_L] && player->mo->state <= &states[S_KART_STND2_L]))
Re-add lost player vibration frames Separate sprites for fast moving frames Rename some frames for a more sensible naming convention
2017-11-04 17:32:47 +00:00
P_SetPlayerMobjState(player->mo, S_KART_STND1_L);
Lots of cmd restructuring. - cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster. - Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now. - Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request. - Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 21:12:42 +00:00
else if (cmd->driftturn == 0 && !(player->mo->state >= &states[S_KART_STND1] && player->mo->state <= &states[S_KART_STND2]))
Re-add lost player vibration frames Separate sprites for fast moving frames Rename some frames for a more sensible naming convention
2017-11-04 17:32:47 +00:00
P_SetPlayerMobjState(player->mo, S_KART_STND1);
}
// Drifting Left - S_KART_DRIFT1_L
else if (player->kartstuff[k_drift] > 0 && P_IsObjectOnGround(player->mo))
{
if (!(player->mo->state >= &states[S_KART_DRIFT1_L] && player->mo->state <= &states[S_KART_DRIFT2_L]))
P_SetPlayerMobjState(player->mo, S_KART_DRIFT1_L);
}
// Drifting Right - S_KART_DRIFT1_R
else if (player->kartstuff[k_drift] < 0 && P_IsObjectOnGround(player->mo))
{
if (!(player->mo->state >= &states[S_KART_DRIFT1_R] && player->mo->state <= &states[S_KART_DRIFT2_R]))
P_SetPlayerMobjState(player->mo, S_KART_DRIFT1_R);
}
// Run frames - S_KART_RUN1 S_KART_RUN1_L S_KART_RUN1_R
else if (player->speed > FixedMul(player->runspeed, player->mo->scale))
{
Lots of cmd restructuring. - cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster. - Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now. - Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request. - Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 21:12:42 +00:00
if (cmd->driftturn < 0 && !(player->mo->state >= &states[S_KART_RUN1_R] && player->mo->state <= &states[S_KART_RUN2_R]))
Re-add lost player vibration frames Separate sprites for fast moving frames Rename some frames for a more sensible naming convention
2017-11-04 17:32:47 +00:00
P_SetPlayerMobjState(player->mo, S_KART_RUN1_R);
Lots of cmd restructuring. - cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster. - Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now. - Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request. - Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 21:12:42 +00:00
else if (cmd->driftturn > 0 && !(player->mo->state >= &states[S_KART_RUN1_L] && player->mo->state <= &states[S_KART_RUN2_L]))
Re-add lost player vibration frames Separate sprites for fast moving frames Rename some frames for a more sensible naming convention
2017-11-04 17:32:47 +00:00
P_SetPlayerMobjState(player->mo, S_KART_RUN1_L);
Lots of cmd restructuring. - cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster. - Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now. - Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request. - Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 21:12:42 +00:00
else if (cmd->driftturn == 0 && !(player->mo->state >= &states[S_KART_RUN1] && player->mo->state <= &states[S_KART_RUN2]))
Re-add lost player vibration frames Separate sprites for fast moving frames Rename some frames for a more sensible naming convention
2017-11-04 17:32:47 +00:00
P_SetPlayerMobjState(player->mo, S_KART_RUN1);
}
// Walk frames - S_KART_WALK1 S_KART_WALK1_L S_KART_WALK1_R
else if (player->speed <= FixedMul(player->runspeed, player->mo->scale))
{
Lots of cmd restructuring. - cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster. - Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now. - Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request. - Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 21:12:42 +00:00
if (cmd->driftturn < 0 && !(player->mo->state >= &states[S_KART_WALK1_R] && player->mo->state <= &states[S_KART_WALK2_R]))
Re-add lost player vibration frames Separate sprites for fast moving frames Rename some frames for a more sensible naming convention
2017-11-04 17:32:47 +00:00
P_SetPlayerMobjState(player->mo, S_KART_WALK1_R);
Lots of cmd restructuring. - cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster. - Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now. - Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request. - Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 21:12:42 +00:00
else if (cmd->driftturn > 0 && !(player->mo->state >= &states[S_KART_WALK1_L] && player->mo->state <= &states[S_KART_WALK2_L]))
Re-add lost player vibration frames Separate sprites for fast moving frames Rename some frames for a more sensible naming convention
2017-11-04 17:32:47 +00:00
P_SetPlayerMobjState(player->mo, S_KART_WALK1_L);
Lots of cmd restructuring. - cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster. - Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now. - Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request. - Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 21:12:42 +00:00
else if (cmd->driftturn == 0 && !(player->mo->state >= &states[S_KART_WALK1] && player->mo->state <= &states[S_KART_WALK2]))
Re-add lost player vibration frames Separate sprites for fast moving frames Rename some frames for a more sensible naming convention
2017-11-04 17:32:47 +00:00
P_SetPlayerMobjState(player->mo, S_KART_WALK1);
}
}
Hopefully some medicine for the characters' sore throats from all that taunting Also my editor ate some trailing whitespace.
2018-07-04 21:25:38 +00:00
static void K_TauntVoiceTimers(player_t *player)
{
if (!player)
return;
player->kartstuff[k_tauntvoices] = 6*TICRATE;
player->kartstuff[k_voices] = 4*TICRATE;
}
static void K_RegularVoiceTimers(player_t *player)
{
if (!player)
return;
Why I should start using defines instead of magic numbers
2018-07-04 21:37:11 +00:00
player->kartstuff[k_voices] = 4*TICRATE;
Hopefully some medicine for the characters' sore throats from all that taunting Also my editor ate some trailing whitespace.
2018-07-04 21:25:38 +00:00
if (player->kartstuff[k_tauntvoices] < 4*TICRATE)
player->kartstuff[k_tauntvoices] = 4*TICRATE;
}
New voices - Following Oni's proposal. This means taunts are split into 2 types for offensive items and boost, 2 less hurt sounds, and there's another clip for using invincibility item (or whatever other powerful items we want to apply it to later; maybe size-down?) - Win/lose quotes are played at full volume for the person who said it. - A new sound effect plays when you hit someone with voices disabled. - Reduce amount of RNG being called from the vanilla P_Play[whatever]Sound functions - Added our skin sound constants to the dehacked list. - Unrelated: finish line sfx plays in splitscreen
2018-08-28 20:29:50 +00:00
static void K_PlayAttackTaunt(mobj_t *source)
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
{
New voices - Following Oni's proposal. This means taunts are split into 2 types for offensive items and boost, 2 less hurt sounds, and there's another clip for using invincibility item (or whatever other powerful items we want to apply it to later; maybe size-down?) - Win/lose quotes are played at full volume for the person who said it. - A new sound effect plays when you hit someone with voices disabled. - Reduce amount of RNG being called from the vanilla P_Play[whatever]Sound functions - Added our skin sound constants to the dehacked list. - Unrelated: finish line sfx plays in splitscreen
2018-08-28 20:29:50 +00:00
sfxenum_t pick = P_RandomKey(2); // Gotta roll the RNG every time this is called for sync reasons
Some minor things to help draw sonicitems to a close. * "kartvoices" cvar. Possible values "Never", "Tasteful" (default), and "Meme". * Added a way to move quickly through the credits, rather than skip them entirely (hold spacebar or down arrow). * Fix a few mistakes in M_ChangeCvar, some of which I introduced and some of which were weird in the first place. * Tweak the offset of the arrows that let you know you can modify a cvar by pressing left or right (some via a patch.kart change, but others via tweaking the drawing location).
2018-07-29 17:35:56 +00:00
boolean tasteful = (!source->player || !source->player->kartstuff[k_tauntvoices]);
if (cv_kartvoices.value && (tasteful || cv_kartvoices.value == 2))
New voices - Following Oni's proposal. This means taunts are split into 2 types for offensive items and boost, 2 less hurt sounds, and there's another clip for using invincibility item (or whatever other powerful items we want to apply it to later; maybe size-down?) - Win/lose quotes are played at full volume for the person who said it. - A new sound effect plays when you hit someone with voices disabled. - Reduce amount of RNG being called from the vanilla P_Play[whatever]Sound functions - Added our skin sound constants to the dehacked list. - Unrelated: finish line sfx plays in splitscreen
2018-08-28 20:29:50 +00:00
S_StartSound(source, sfx_kattk1+pick);
Battle card animations Was hoping not to waste another variable on this, but oh well
2017-11-29 06:09:46 +00:00
Some minor things to help draw sonicitems to a close. * "kartvoices" cvar. Possible values "Never", "Tasteful" (default), and "Meme". * Added a way to move quickly through the credits, rather than skip them entirely (hold spacebar or down arrow). * Fix a few mistakes in M_ChangeCvar, some of which I introduced and some of which were weird in the first place. * Tweak the offset of the arrows that let you know you can modify a cvar by pressing left or right (some via a patch.kart change, but others via tweaking the drawing location).
2018-07-29 17:35:56 +00:00
if (!tasteful)
return;
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
Hopefully some medicine for the characters' sore throats from all that taunting Also my editor ate some trailing whitespace.
2018-07-04 21:25:38 +00:00
K_TauntVoiceTimers(source->player);
New voices - Following Oni's proposal. This means taunts are split into 2 types for offensive items and boost, 2 less hurt sounds, and there's another clip for using invincibility item (or whatever other powerful items we want to apply it to later; maybe size-down?) - Win/lose quotes are played at full volume for the person who said it. - A new sound effect plays when you hit someone with voices disabled. - Reduce amount of RNG being called from the vanilla P_Play[whatever]Sound functions - Added our skin sound constants to the dehacked list. - Unrelated: finish line sfx plays in splitscreen
2018-08-28 20:29:50 +00:00
}
Revert bad RNG
2018-07-29 19:09:20 +00:00
New voices - Following Oni's proposal. This means taunts are split into 2 types for offensive items and boost, 2 less hurt sounds, and there's another clip for using invincibility item (or whatever other powerful items we want to apply it to later; maybe size-down?) - Win/lose quotes are played at full volume for the person who said it. - A new sound effect plays when you hit someone with voices disabled. - Reduce amount of RNG being called from the vanilla P_Play[whatever]Sound functions - Added our skin sound constants to the dehacked list. - Unrelated: finish line sfx plays in splitscreen
2018-08-28 20:29:50 +00:00
static void K_PlayBoostTaunt(mobj_t *source)
{
sfxenum_t pick = P_RandomKey(2); // Gotta roll the RNG every time this is called for sync reasons
boolean tasteful = (!source->player || !source->player->kartstuff[k_tauntvoices]);
Revert bad RNG
2018-07-29 19:09:20 +00:00
New voices - Following Oni's proposal. This means taunts are split into 2 types for offensive items and boost, 2 less hurt sounds, and there's another clip for using invincibility item (or whatever other powerful items we want to apply it to later; maybe size-down?) - Win/lose quotes are played at full volume for the person who said it. - A new sound effect plays when you hit someone with voices disabled. - Reduce amount of RNG being called from the vanilla P_Play[whatever]Sound functions - Added our skin sound constants to the dehacked list. - Unrelated: finish line sfx plays in splitscreen
2018-08-28 20:29:50 +00:00
if (cv_kartvoices.value && (tasteful || cv_kartvoices.value == 2))
S_StartSound(source, sfx_kbost1+pick);
Revert bad RNG
2018-07-29 19:09:20 +00:00
New voices - Following Oni's proposal. This means taunts are split into 2 types for offensive items and boost, 2 less hurt sounds, and there's another clip for using invincibility item (or whatever other powerful items we want to apply it to later; maybe size-down?) - Win/lose quotes are played at full volume for the person who said it. - A new sound effect plays when you hit someone with voices disabled. - Reduce amount of RNG being called from the vanilla P_Play[whatever]Sound functions - Added our skin sound constants to the dehacked list. - Unrelated: finish line sfx plays in splitscreen
2018-08-28 20:29:50 +00:00
if (!tasteful)
return;
Revert bad RNG
2018-07-29 19:09:20 +00:00
K_TauntVoiceTimers(source->player);
Big voices change When using a taunt voice (item usage) there's a 5 second delay on more taunts and a 2 second delay on other voices When using other voices, there's at least a 2 second delay on all other voices
2018-06-07 18:56:26 +00:00
}
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
Whoops, accidental rename
2018-06-07 19:03:47 +00:00
static void K_PlayOvertakeSound(mobj_t *source)
Big voices change When using a taunt voice (item usage) there's a 5 second delay on more taunts and a 2 second delay on other voices When using other voices, there's at least a 2 second delay on all other voices
2018-06-07 18:56:26 +00:00
{
Some minor things to help draw sonicitems to a close. * "kartvoices" cvar. Possible values "Never", "Tasteful" (default), and "Meme". * Added a way to move quickly through the credits, rather than skip them entirely (hold spacebar or down arrow). * Fix a few mistakes in M_ChangeCvar, some of which I introduced and some of which were weird in the first place. * Tweak the offset of the arrows that let you know you can modify a cvar by pressing left or right (some via a patch.kart change, but others via tweaking the drawing location).
2018-07-29 17:35:56 +00:00
boolean tasteful = (!source->player || !source->player->kartstuff[k_voices]);
v1.3.17 ------- Lakitu returns from his ironically-not-pillowshaded-cloud grave Dropboosting works on respawn Players respawn "automatically after 2 seconds" instead of "*instantaneously* while accel is held"
2017-07-16 16:04:33 +00:00
Ballhog stuff
2018-06-25 22:17:03 +00:00
if (!G_RaceGametype()) // Only in race
return;
Slightly longer delay between voices Fix win/lose quotes to work based on actual win/lose criteria Don't play overtake sound until at least 10 seconds into the race
2018-06-08 23:04:20 +00:00
// 4 seconds from before race begins, 10 seconds afterwards
Lakitu murder & countdown improvements (I'm not SevenethSentienel! I just don't feel like logging out!)
2018-06-25 02:15:22 +00:00
if (leveltime < starttime+(10*TICRATE))
Slightly longer delay between voices Fix win/lose quotes to work based on actual win/lose criteria Don't play overtake sound until at least 10 seconds into the race
2018-06-08 23:04:20 +00:00
return;
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
Some minor things to help draw sonicitems to a close. * "kartvoices" cvar. Possible values "Never", "Tasteful" (default), and "Meme". * Added a way to move quickly through the credits, rather than skip them entirely (hold spacebar or down arrow). * Fix a few mistakes in M_ChangeCvar, some of which I introduced and some of which were weird in the first place. * Tweak the offset of the arrows that let you know you can modify a cvar by pressing left or right (some via a patch.kart change, but others via tweaking the drawing location).
2018-07-29 17:35:56 +00:00
if (cv_kartvoices.value && (tasteful || cv_kartvoices.value == 2))
New voices - Following Oni's proposal. This means taunts are split into 2 types for offensive items and boost, 2 less hurt sounds, and there's another clip for using invincibility item (or whatever other powerful items we want to apply it to later; maybe size-down?) - Win/lose quotes are played at full volume for the person who said it. - A new sound effect plays when you hit someone with voices disabled. - Reduce amount of RNG being called from the vanilla P_Play[whatever]Sound functions - Added our skin sound constants to the dehacked list. - Unrelated: finish line sfx plays in splitscreen
2018-08-28 20:29:50 +00:00
S_StartSound(source, sfx_kslow);
Some minor things to help draw sonicitems to a close. * "kartvoices" cvar. Possible values "Never", "Tasteful" (default), and "Meme". * Added a way to move quickly through the credits, rather than skip them entirely (hold spacebar or down arrow). * Fix a few mistakes in M_ChangeCvar, some of which I introduced and some of which were weird in the first place. * Tweak the offset of the arrows that let you know you can modify a cvar by pressing left or right (some via a patch.kart change, but others via tweaking the drawing location).
2018-07-29 17:35:56 +00:00
if (!tasteful)
return;
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
Hopefully some medicine for the characters' sore throats from all that taunting Also my editor ate some trailing whitespace.
2018-07-04 21:25:38 +00:00
K_RegularVoiceTimers(source->player);
New voices - Following Oni's proposal. This means taunts are split into 2 types for offensive items and boost, 2 less hurt sounds, and there's another clip for using invincibility item (or whatever other powerful items we want to apply it to later; maybe size-down?) - Win/lose quotes are played at full volume for the person who said it. - A new sound effect plays when you hit someone with voices disabled. - Reduce amount of RNG being called from the vanilla P_Play[whatever]Sound functions - Added our skin sound constants to the dehacked list. - Unrelated: finish line sfx plays in splitscreen
2018-08-28 20:29:50 +00:00
}
Revert bad RNG
2018-07-29 19:09:20 +00:00
New voices - Following Oni's proposal. This means taunts are split into 2 types for offensive items and boost, 2 less hurt sounds, and there's another clip for using invincibility item (or whatever other powerful items we want to apply it to later; maybe size-down?) - Win/lose quotes are played at full volume for the person who said it. - A new sound effect plays when you hit someone with voices disabled. - Reduce amount of RNG being called from the vanilla P_Play[whatever]Sound functions - Added our skin sound constants to the dehacked list. - Unrelated: finish line sfx plays in splitscreen
2018-08-28 20:29:50 +00:00
static void K_PlayHitEmSound(mobj_t *source)
{
if (cv_kartvoices.value)
S_StartSound(source, sfx_khitem);
else
S_StartSound(source, sfx_s1c9); // The only lost gameplay functionality with voices disabled
Revert bad RNG
2018-07-29 19:09:20 +00:00
K_RegularVoiceTimers(source->player);
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
}
New voices - Following Oni's proposal. This means taunts are split into 2 types for offensive items and boost, 2 less hurt sounds, and there's another clip for using invincibility item (or whatever other powerful items we want to apply it to later; maybe size-down?) - Win/lose quotes are played at full volume for the person who said it. - A new sound effect plays when you hit someone with voices disabled. - Reduce amount of RNG being called from the vanilla P_Play[whatever]Sound functions - Added our skin sound constants to the dehacked list. - Unrelated: finish line sfx plays in splitscreen
2018-08-28 20:29:50 +00:00
static void K_PlayPowerGloatSound(mobj_t *source)
Star colormap is decided to be used per mobj with mobj->colorize Star creates afterimages that are colorized and fullbright Star makes the player fullbright
2018-02-05 00:00:36 +00:00
{
Some minor things to help draw sonicitems to a close. * "kartvoices" cvar. Possible values "Never", "Tasteful" (default), and "Meme". * Added a way to move quickly through the credits, rather than skip them entirely (hold spacebar or down arrow). * Fix a few mistakes in M_ChangeCvar, some of which I introduced and some of which were weird in the first place. * Tweak the offset of the arrows that let you know you can modify a cvar by pressing left or right (some via a patch.kart change, but others via tweaking the drawing location).
2018-07-29 17:35:56 +00:00
if (cv_kartvoices.value)
New voices - Following Oni's proposal. This means taunts are split into 2 types for offensive items and boost, 2 less hurt sounds, and there's another clip for using invincibility item (or whatever other powerful items we want to apply it to later; maybe size-down?) - Win/lose quotes are played at full volume for the person who said it. - A new sound effect plays when you hit someone with voices disabled. - Reduce amount of RNG being called from the vanilla P_Play[whatever]Sound functions - Added our skin sound constants to the dehacked list. - Unrelated: finish line sfx plays in splitscreen
2018-08-28 20:29:50 +00:00
S_StartSound(source, sfx_kgloat);
Big voices change When using a taunt voice (item usage) there's a 5 second delay on more taunts and a 2 second delay on other voices When using other voices, there's at least a 2 second delay on all other voices
2018-06-07 18:56:26 +00:00
Hopefully some medicine for the characters' sore throats from all that taunting Also my editor ate some trailing whitespace.
2018-07-04 21:25:38 +00:00
K_RegularVoiceTimers(source->player);
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
}
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
Change momentum to be closer to the direction you're facing when not pressing the controls
2017-03-10 02:22:49 +00:00
void K_MomentumToFacing(player_t *player)
{
angle_t dangle = player->mo->angle - R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy);
if (dangle > ANGLE_180)
dangle = InvAngle(dangle);
// If you aren't on the ground or are moving in too different of a direction don't do this
Sping panel tweaks - Spring panels have a higher minimum forward speed, and you can no longer drop below that speed. - New, separate type of spring panel that has a maximum speed cap, for small jumps. - Unrelated: The SMK Donut Plains bushes now have much less thinker overhead. - Unrelated: Fixed my earlier attempt at getting momentum redirect to work when you just hit the ground.
2018-07-14 00:45:18 +00:00
if (player->mo->eflags & MFE_JUSTHITFLOOR)
; // Just hit floor ALWAYS redirects
else if (!P_IsObjectOnGround(player->mo) || dangle > ANGLE_90)
Change momentum to be closer to the direction you're facing when not pressing the controls
2017-03-10 02:22:49 +00:00
return;
Account for conveyor belts with no-accelerate movement use R_PointToDist2 instead of P_AproxDistance for player->speed, more accurate and probably won't cause too much performance trouble
2017-03-10 22:54:54 +00:00
P_Thrust(player->mo, player->mo->angle, player->speed - FixedMul(player->speed, player->mo->friction));
player->mo->momx = FixedMul(player->mo->momx - player->cmomx, player->mo->friction) + player->cmomx;
player->mo->momy = FixedMul(player->mo->momy - player->cmomy, player->mo->friction) + player->cmomy;
Change momentum to be closer to the direction you're facing when not pressing the controls
2017-03-10 02:22:49 +00:00
}
Partial rework to boost power function, uses fixed notation for more flexibility Boost function returns highest boost instead of averaging them Star gets acceleration boost Removed shrunk speed boost
2017-03-09 21:41:11 +00:00
Address review (for anything code I did, anyway)
2018-09-20 21:11:11 +00:00
// sets k_boostpower, k_speedboost, and k_accelboost to whatever we need it to be
Camera outrunning
2018-09-04 19:11:14 +00:00
static void K_GetKartBoostPower(player_t *player)
Some position code
2017-02-13 04:24:49 +00:00
{
Make sure it actually compiles
2017-04-16 18:55:21 +00:00
fixed_t boostpower = FRACUNIT;
Camera outrunning
2018-09-04 19:11:14 +00:00
fixed_t speedboost = 0, accelboost = 0;
Some position code
2017-02-13 04:24:49 +00:00
Wipeout bumps - You can bump other people during spinout. - Bumping during spinout activates a "slow down" timer, which increases your friction after a few tics. - You have a Smash-style dust effect after a spinout bump, indicating clearly if you'll slow down or not.
2018-07-20 02:37:32 +00:00
if (player->kartstuff[k_spinouttimer] && player->kartstuff[k_wipeoutslow] == 1) // Slow down after you've been bumped
Camera outrunning
2018-09-04 19:11:14 +00:00
{
Boost tweaks Fix offroad not affecting you as soon as it did before, and tweaking boost cam to be stronger
2018-09-06 17:02:08 +00:00
player->kartstuff[k_boostpower] = player->kartstuff[k_speedboost] = player->kartstuff[k_accelboost] = 0;
Camera outrunning
2018-09-04 19:11:14 +00:00
return;
}
Wipeout bumps - You can bump other people during spinout. - Bumping during spinout activates a "slow down" timer, which increases your friction after a few tics. - You have a Smash-style dust effect after a spinout bump, indicating clearly if you'll slow down or not.
2018-07-20 02:37:32 +00:00
Make sure it actually compiles
2017-04-16 18:55:21 +00:00
// Offroad is separate, it's difficult to factor it in with a variable value anyway.
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
if (!(player->kartstuff[k_invincibilitytimer] || player->kartstuff[k_hyudorotimer] || player->kartstuff[k_sneakertimer])
Camera outrunning
2018-09-04 19:11:14 +00:00
&& player->kartstuff[k_offroad] >= 0)
Hundreds of tweaks - SPB multiplier depending on 1st-2nd distance - Removed the Battle-only k_poweritemtimer (hold over from when you could easily get invuln items all of the time), replaced it with a 2 invincibility item cap in ALL modes. - Spinout is affected by boosters, *properly* - Can no longer strafe while spinning out on speed bumps - Messed with how other items interact with speed bumps, again. - Old bounce code has been ported for non-players - Fixed Karma players being able to do anything after the round has ended. - Fixed sneaker and spinout timer weirdness - Fixed Mines still being hold-use - Fixed rubber-burn turn not working - Removed redundant k_spinout and unused k_boosting variables - Filled out the Color_Opposite table with Kart's new colors. Not really relevant right now (besides some extra Lua functionality) since nothing uses it, but will be nice for if we do the signpost from the sky idea.
2018-06-20 00:20:06 +00:00
boostpower = FixedDiv(boostpower, player->kartstuff[k_offroad] + FRACUNIT);
Make sure it actually compiles
2017-04-16 18:55:21 +00:00
Heavy as shit now
2018-09-05 00:51:16 +00:00
if (player->kartstuff[k_itemtype] == KITEM_KITCHENSINK)
Lowest speed happens slower
2018-09-05 01:14:42 +00:00
boostpower = max((TICRATE/2), (5*TICRATE)-(player->kartstuff[k_bananadrag]/2))*boostpower/(5*TICRATE);
Heavy as shit now
2018-09-05 00:51:16 +00:00
else if (player->kartstuff[k_bananadrag] > TICRATE)
Banana drag slowdown, diagonal springs scale to map scale instead of object's scale, OGL skincolors average all colors
2018-07-04 23:06:45 +00:00
boostpower = 4*boostpower/5;
Camera outrunning
2018-09-04 19:11:14 +00:00
if (player->kartstuff[k_sneakertimer]) // Sneaker
{
switch (gamespeed)
Can get items during spin-outs now Collision now correctly ignores boo and squish Collision now ignores star
2017-05-12 00:49:17 +00:00
{
Camera outrunning
2018-09-04 19:11:14 +00:00
case 0:
speedboost = max(speedboost, 53740+768);
break;
case 2:
speedboost = max(speedboost, 17294+768);
break;
default:
speedboost = max(speedboost, 32768);
break;
Can get items during spin-outs now Collision now correctly ignores boo and squish Collision now ignores star
2017-05-12 00:49:17 +00:00
}
Camera outrunning
2018-09-04 19:11:14 +00:00
accelboost = max(accelboost, 8*FRACUNIT); // + 800%
Added fancypants mega shroom, fixed drift boosting
2017-02-19 17:18:43 +00:00
}
Camera outrunning
2018-09-04 19:11:14 +00:00
Drop Dash + alternate start boosts New respawn boost behavior, where you just hold for long enough instead of timing it with hitting the ground. Also much weaker, just gives you enough boost to get going instead of being a free sneaker. Start boosts have been severely changed. The perfect one has an extra tic on its timing window and gets Sneaker boosting special effects, but every other possible boost has been severely nerfed.
2018-09-10 05:47:23 +00:00
if (player->kartstuff[k_invincibilitytimer]) // Invincibility
{
speedboost = max(speedboost, 3*FRACUNIT/8); // + 37.5%
accelboost = max(accelboost, 3*FRACUNIT); // + 300%
}
if (player->kartstuff[k_growshrinktimer] > 0) // Grow
{
speedboost = max(speedboost, FRACUNIT/5); // + 20%
}
if (player->kartstuff[k_driftboost]) // Drift Boost
{
speedboost = max(speedboost, FRACUNIT/4); // + 25%
accelboost = max(accelboost, 4*FRACUNIT); // + 400%
}
if (player->kartstuff[k_startboost]) // Startup Boost
{
speedboost = max(speedboost, FRACUNIT/4); // + 25%
accelboost = max(accelboost, 6*FRACUNIT); // + 300%
}
Partial rework to boost power function, uses fixed notation for more flexibility Boost function returns highest boost instead of averaging them Star gets acceleration boost Removed shrunk speed boost
2017-03-09 21:41:11 +00:00
// don't average them anymore, this would make a small boost and a high boost less useful
// just take the highest we want instead
Some position code
2017-02-13 04:24:49 +00:00
Boost tweaks Fix offroad not affecting you as soon as it did before, and tweaking boost cam to be stronger
2018-09-06 17:02:08 +00:00
player->kartstuff[k_boostpower] = boostpower;
// value smoothing
if (speedboost > player->kartstuff[k_speedboost])
player->kartstuff[k_speedboost] = speedboost;
Camera outrunning
2018-09-04 19:11:14 +00:00
else
Boost tweaks Fix offroad not affecting you as soon as it did before, and tweaking boost cam to be stronger
2018-09-06 17:02:08 +00:00
player->kartstuff[k_speedboost] += (speedboost - player->kartstuff[k_speedboost])/(TICRATE/2);
Camera outrunning
2018-09-04 19:11:14 +00:00
Boost tweaks Fix offroad not affecting you as soon as it did before, and tweaking boost cam to be stronger
2018-09-06 17:02:08 +00:00
player->kartstuff[k_accelboost] = accelboost;
Some position code
2017-02-13 04:24:49 +00:00
}
Fix warnings Possibly fix some whitespace problems
2017-03-04 22:13:19 +00:00
Steering fixes, drifting changed, weight has effect now
2017-02-24 01:36:43 +00:00
fixed_t K_GetKartSpeed(player_t *player, boolean doboostpower)
Some position code
2017-02-13 04:24:49 +00:00
{
Larger speed difference between kartspeeds
2017-03-08 01:11:14 +00:00
fixed_t k_speed = 150;
Steering fixes, drifting changed, weight has effect now
2017-02-24 01:36:43 +00:00
fixed_t g_cc = FRACUNIT;
fixed_t xspd = 3072; // 4.6875 aka 3/64
Some more minor comeback tweaks - Comeback players are now 1 speed with -20 friction - Bombing gives 2 karma now - Item players should no longer be able to be hit - Attempted to fix instances of trying to bomb someone while they can't be touched causing you to lose all your karma and start a console message saying you're back in the game, despite not rewarding a balloon - Fixed a few places where kartspeed & kartweight were being read as fixed point numbers, despite being UINT8's - Fixed up kartstuff Lua support more, functions properly now
2017-11-20 00:39:40 +00:00
UINT8 kartspeed = player->kartspeed;
Fix really weird crash I should've checked for Make the returning of top kart speed slightly cleaner
2017-03-10 03:24:15 +00:00
fixed_t finalspeed;
Some more minor comeback tweaks - Comeback players are now 1 speed with -20 friction - Bombing gives 2 karma now - Item players should no longer be able to be hit - Attempted to fix instances of trying to bomb someone while they can't be touched causing you to lose all your karma and start a console message saying you're back in the game, despite not rewarding a balloon - Fixed a few places where kartspeed & kartweight were being read as fixed point numbers, despite being UINT8's - Fixed up kartstuff Lua support more, functions properly now
2017-11-20 00:39:40 +00:00
Experimental air speed cap Made very easy to revert if needed. tbh I can hardly notice it unless if I pay attention, and it most definitely never happens without Grow
2018-07-27 21:08:45 +00:00
if (doboostpower && !player->kartstuff[k_pogospring] && !P_IsObjectOnGround(player->mo))
return (75*mapheaderinfo[gamemap-1]->mobj_scale); // air speed cap
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
switch (gamespeed)
Driftboosting now increases player accleration Consolidated the turning and drifting values to k_kart functions for easier editing Removed 200cc. 50/100/150ccs are a weird amalgamation of the prior values.
2017-02-22 04:41:00 +00:00
{
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
case 0:
Steering fixes, drifting changed, weight has effect now
2017-02-24 01:36:43 +00:00
g_cc = 53248 + xspd; // 50cc = 81.25 + 4.69 = 85.94%
Driftboosting now increases player accleration Consolidated the turning and drifting values to k_kart functions for easier editing Removed 200cc. 50/100/150ccs are a weird amalgamation of the prior values.
2017-02-22 04:41:00 +00:00
break;
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
case 2:
Steering fixes, drifting changed, weight has effect now
2017-02-24 01:36:43 +00:00
g_cc = 77824 + xspd; // 150cc = 118.75 + 4.69 = 123.44%
Driftboosting now increases player accleration Consolidated the turning and drifting values to k_kart functions for easier editing Removed 200cc. 50/100/150ccs are a weird amalgamation of the prior values.
2017-02-22 04:41:00 +00:00
break;
default:
Steering fixes, drifting changed, weight has effect now
2017-02-24 01:36:43 +00:00
g_cc = 65536 + xspd; // 100cc = 100.00 + 4.69 = 104.69%
Driftboosting now increases player accleration Consolidated the turning and drifting values to k_kart functions for easier editing Removed 200cc. 50/100/150ccs are a weird amalgamation of the prior values.
2017-02-22 04:41:00 +00:00
break;
}
Some position code
2017-02-13 04:24:49 +00:00
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
if (G_BattleGametype() && player->kartstuff[k_bumper] <= 0)
Some more minor comeback tweaks - Comeback players are now 1 speed with -20 friction - Bombing gives 2 karma now - Item players should no longer be able to be hit - Attempted to fix instances of trying to bomb someone while they can't be touched causing you to lose all your karma and start a console message saying you're back in the game, despite not rewarding a balloon - Fixed a few places where kartspeed & kartweight were being read as fixed point numbers, despite being UINT8's - Fixed up kartstuff Lua support more, functions properly now
2017-11-20 00:39:40 +00:00
kartspeed = 1;
k_speed += kartspeed*3; // 153 - 177
Some position code
2017-02-13 04:24:49 +00:00
Fix really weird crash I should've checked for Make the returning of top kart speed slightly cleaner
2017-03-10 03:24:15 +00:00
finalspeed = FixedMul(FixedMul(k_speed<<14, g_cc), player->mo->scale);
Steering fixes, drifting changed, weight has effect now
2017-02-24 01:36:43 +00:00
if (doboostpower)
Boost tweaks Fix offroad not affecting you as soon as it did before, and tweaking boost cam to be stronger
2018-09-06 17:02:08 +00:00
return FixedMul(finalspeed, player->kartstuff[k_boostpower]+player->kartstuff[k_speedboost]);
Fix really weird crash I should've checked for Make the returning of top kart speed slightly cleaner
2017-03-10 03:24:15 +00:00
return finalspeed;
Some position code
2017-02-13 04:24:49 +00:00
}
Fix warnings Possibly fix some whitespace problems
2017-03-04 22:13:19 +00:00
Lots of small tweaks & fixes, that should make Battle a LOT more bearable - Comeback timer is now always 10 seconds instead of scaling - Takes 10 seconds before exiting - Flashing tics is doubled in Battle Mode - Removed a bunch of bomb nerfs - Bombs are back to making only 1 point per hit - Exposed K_GetKartAccel & K_GetKartFlashing to Lua - Item boxes should no longer drop while going up slopes - Trading item boxes with a bomb should turn you back into a bomb - Balloons should no longer all respawn when dying in pits in 2-player games - Flashing players are able to kill *thrown* shells again (shields and trap items are still unkillable). Prevents red shells from being able to stick to a flashing player and hurt them again as soon as they're done flashing - CHECK appears at a farther distance
2017-11-17 05:48:36 +00:00
fixed_t K_GetKartAccel(player_t *player)
Some position code
2017-02-13 04:24:49 +00:00
{
v1.3.11 ------- Braking no longer stops on a dime, and instead reduces your speed input. The effect is different between braking and accelerating at the same time, and braking on its own. Increased 'driftweight' to player->kartweight*14, up from player->kartweight*12. Changed the base drift curve formula from a range of 447 - 303, to 415 - 303. This will result in a very slightly wider drift arc at low weights. This does not effect the strength of steering while drifting. Drifting without holding a direction now has a bonus of 0.5 frames, up from 0. Added kartweight to the required number of drift frames, at half value. Lighter characters take up to 4 additional frames to earn blue sparks, 8 for orange.
2017-04-21 01:44:56 +00:00
fixed_t k_accel = 32; // 36;
Some more minor comeback tweaks - Comeback players are now 1 speed with -20 friction - Bombing gives 2 karma now - Item players should no longer be able to be hit - Attempted to fix instances of trying to bomb someone while they can't be touched causing you to lose all your karma and start a console message saying you're back in the game, despite not rewarding a balloon - Fixed a few places where kartspeed & kartweight were being read as fixed point numbers, despite being UINT8's - Fixed up kartstuff Lua support more, functions properly now
2017-11-20 00:39:40 +00:00
UINT8 kartspeed = player->kartspeed;
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
if (G_BattleGametype() && player->kartstuff[k_bumper] <= 0)
Some more minor comeback tweaks - Comeback players are now 1 speed with -20 friction - Bombing gives 2 karma now - Item players should no longer be able to be hit - Attempted to fix instances of trying to bomb someone while they can't be touched causing you to lose all your karma and start a console message saying you're back in the game, despite not rewarding a balloon - Fixed a few places where kartspeed & kartweight were being read as fixed point numbers, despite being UINT8's - Fixed up kartstuff Lua support more, functions properly now
2017-11-20 00:39:40 +00:00
kartspeed = 1;
Some position code
2017-02-13 04:24:49 +00:00
Some more minor comeback tweaks - Comeback players are now 1 speed with -20 friction - Bombing gives 2 karma now - Item players should no longer be able to be hit - Attempted to fix instances of trying to bomb someone while they can't be touched causing you to lose all your karma and start a console message saying you're back in the game, despite not rewarding a balloon - Fixed a few places where kartspeed & kartweight were being read as fixed point numbers, despite being UINT8's - Fixed up kartstuff Lua support more, functions properly now
2017-11-20 00:39:40 +00:00
//k_accel += 3 * (9 - kartspeed); // 36 - 60
k_accel += 4 * (9 - kartspeed); // 32 - 64
Some position code
2017-02-13 04:24:49 +00:00
Boost tweaks Fix offroad not affecting you as soon as it did before, and tweaking boost cam to be stronger
2018-09-06 17:02:08 +00:00
return FixedMul(k_accel, FRACUNIT+player->kartstuff[k_accelboost]);
Some position code
2017-02-13 04:24:49 +00:00
}
Fix warnings Possibly fix some whitespace problems
2017-03-04 22:13:19 +00:00
Flashing tics length depends on speed stat Change to speed-weight when the bump buff gets added
2018-08-11 04:12:41 +00:00
UINT16 K_GetKartFlashing(player_t *player)
Lots of small tweaks & fixes, that should make Battle a LOT more bearable - Comeback timer is now always 10 seconds instead of scaling - Takes 10 seconds before exiting - Flashing tics is doubled in Battle Mode - Removed a bunch of bomb nerfs - Bombs are back to making only 1 point per hit - Exposed K_GetKartAccel & K_GetKartFlashing to Lua - Item boxes should no longer drop while going up slopes - Trading item boxes with a bomb should turn you back into a bomb - Balloons should no longer all respawn when dying in pits in 2-player games - Flashing players are able to kill *thrown* shells again (shields and trap items are still unkillable). Prevents red shells from being able to stick to a flashing player and hurt them again as soon as they're done flashing - CHECK appears at a farther distance
2017-11-17 05:48:36 +00:00
{
Flashing tics length depends on speed stat Change to speed-weight when the bump buff gets added
2018-08-11 04:12:41 +00:00
UINT16 tics = flashingtics;
if (G_BattleGametype())
tics *= 2;
Flashing diff change
2018-08-14 17:15:33 +00:00
tics += (flashingtics/8) * (player->kartspeed);
Flashing tics length depends on speed stat Change to speed-weight when the bump buff gets added
2018-08-11 04:12:41 +00:00
return tics;
Lots of small tweaks & fixes, that should make Battle a LOT more bearable - Comeback timer is now always 10 seconds instead of scaling - Takes 10 seconds before exiting - Flashing tics is doubled in Battle Mode - Removed a bunch of bomb nerfs - Bombs are back to making only 1 point per hit - Exposed K_GetKartAccel & K_GetKartFlashing to Lua - Item boxes should no longer drop while going up slopes - Trading item boxes with a bomb should turn you back into a bomb - Balloons should no longer all respawn when dying in pits in 2-player games - Flashing players are able to kill *thrown* shells again (shields and trap items are still unkillable). Prevents red shells from being able to stick to a flashing player and hurt them again as soon as they're done flashing - CHECK appears at a farther distance
2017-11-17 05:48:36 +00:00
}
v1.3.10 ------- Accelcode now factors in forwardmove value rather than a boolean. This is used to enable clutching (or whatever you call it; accel+brake) to give its own result. Fixed Thwomps killing players rather than crushing them. Reverted buggy collision experiment from previous version.
2017-04-20 01:04:44 +00:00
fixed_t K_3dKartMovement(player_t *player, boolean onground, fixed_t forwardmove)
Some position code
2017-02-13 04:24:49 +00:00
{
fixed_t accelmax = 4000;
fixed_t newspeed, oldspeed, finalspeed;
Steering fixes, drifting changed, weight has effect now
2017-02-24 01:36:43 +00:00
fixed_t p_speed = K_GetKartSpeed(player, true);
Some position code
2017-02-13 04:24:49 +00:00
fixed_t p_accel = K_GetKartAccel(player);
Restored bounce pad strafe
2018-03-06 06:31:49 +00:00
if (!onground) return 0; // If the player isn't on the ground, there is no change in speed
Fix warnings Possibly fix some whitespace problems
2017-03-04 22:13:19 +00:00
Some position code
2017-02-13 04:24:49 +00:00
// ACCELCODE!!!1!11!
use R_PointToDist2 to avoid an overflow when walls glitch out and you can accelerate into them endlessly
2017-03-05 23:24:17 +00:00
oldspeed = R_PointToDist2(0, 0, player->rmomx, player->rmomy); // FixedMul(P_AproxDistance(player->rmomx, player->rmomy), player->mo->scale);
Some position code
2017-02-13 04:24:49 +00:00
newspeed = FixedDiv(FixedDiv(FixedMul(oldspeed, accelmax - p_accel) + FixedMul(p_speed, p_accel), accelmax), ORIG_FRICTION);
Sping panel tweaks - Spring panels have a higher minimum forward speed, and you can no longer drop below that speed. - New, separate type of spring panel that has a maximum speed cap, for small jumps. - Unrelated: The SMK Donut Plains bushes now have much less thinker overhead. - Unrelated: Fixed my earlier attempt at getting momentum redirect to work when you just hit the ground.
2018-07-14 00:45:18 +00:00
if (player->kartstuff[k_pogospring]) // Pogo Spring minimum/maximum thrust
{
Last touches for smk maps - different min/max on capped spring pads - turn the normally almost-useless "non-ramp sector" type into "wall sector", which disables both stepup AND stepdown instead of just stepdown
2018-08-27 22:09:32 +00:00
const fixed_t hscale = mapheaderinfo[gamemap-1]->mobj_scale /*+ (mapheaderinfo[gamemap-1]->mobj_scale - player->mo->scale)*/;
Spring jump changes for Grow & Shrink All spring jump issues on the sheet are fixed now.
2018-08-23 16:53:29 +00:00
const fixed_t minspeed = 24*hscale;
Lower capped spring pad max speed even harder, to properly fix BC3
2018-08-29 18:46:42 +00:00
const fixed_t maxspeed = 28*hscale;
Sping panel tweaks - Spring panels have a higher minimum forward speed, and you can no longer drop below that speed. - New, separate type of spring panel that has a maximum speed cap, for small jumps. - Unrelated: The SMK Donut Plains bushes now have much less thinker overhead. - Unrelated: Fixed my earlier attempt at getting momentum redirect to work when you just hit the ground.
2018-07-14 00:45:18 +00:00
if (newspeed > maxspeed && player->kartstuff[k_pogospring] == 2)
newspeed = maxspeed;
if (newspeed < minspeed)
newspeed = minspeed;
}
Some position code
2017-02-13 04:24:49 +00:00
finalspeed = newspeed - oldspeed;
v1.3.10 ------- Accelcode now factors in forwardmove value rather than a boolean. This is used to enable clutching (or whatever you call it; accel+brake) to give its own result. Fixed Thwomps killing players rather than crushing them. Reverted buggy collision experiment from previous version.
2017-04-20 01:04:44 +00:00
// forwardmove is:
// 50 while accelerating,
// 25 while clutching,
// 0 with no gas, and
// -25 when only braking.
finalspeed *= forwardmove/25;
finalspeed /= 2;
if (forwardmove < 0 && finalspeed > FRACUNIT*2)
return finalspeed/2;
else if (forwardmove < 0)
return -FRACUNIT/2;
Fixed position code, added some item numbers
2017-02-17 02:33:00 +00:00
If you'll be slowing yourself down accelerating, don't friction can take care of that
2017-03-09 21:53:57 +00:00
if (finalspeed < 0)
finalspeed = 0;
Some position code
2017-02-13 04:24:49 +00:00
return finalspeed;
}
- Instashield on failed damge - Ballhog explosion separated onto another sprite - Disabled banana jitter
2018-07-27 00:12:42 +00:00
void K_DoInstashield(player_t *player)
{
mobj_t *layera;
mobj_t *layerb;
if (player->kartstuff[k_instashield] > 0)
return;
15 tic delay on first instashield
2018-07-27 21:22:51 +00:00
player->kartstuff[k_instashield] = 15; // length of instashield animation
- Instashield on failed damge - Ballhog explosion separated onto another sprite - Disabled banana jitter
2018-07-27 00:12:42 +00:00
S_StartSound(player->mo, sfx_cdpcm9);
layera = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_INSTASHIELDA);
P_SetTarget(&layera->target, player->mo);
layerb = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_INSTASHIELDB);
P_SetTarget(&layerb->target, player->mo);
}
Battle points are visible
2018-11-01 04:57:38 +00:00
void K_SpawnBattlePoints(player_t *source, player_t *victim, UINT8 amount)
{
statenum_t st;
mobj_t *pt;
if (!source || !source->mo)
return;
if (amount == 1)
st = S_BATTLEPOINT1A;
else if (amount == 2)
st = S_BATTLEPOINT2A;
else if (amount == 3)
st = S_BATTLEPOINT3A;
else
return; // NO STATE!
pt = P_SpawnMobj(source->mo->x, source->mo->y, source->mo->z, MT_BATTLEPOINT);
P_SetTarget(&pt->target, source->mo);
P_SetMobjState(pt, st);
if (victim && victim->skincolor)
pt->color = victim->skincolor;
else
pt->color = source->skincolor;
}
WANTED
2018-07-01 08:36:09 +00:00
void K_SpinPlayer(player_t *player, mobj_t *source, INT32 type, boolean trapitem)
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
{
* Tweak battle odds in a few ways, as authorised by Sal. * Steal a point from Ballhog and give to Orbinaut. * Make it based on the maximum number of bumpers someone has, not the average for everyone. * Improve the odds a tad if you're Wanted. * Tweak the score multiplication to give three points for Wanted and two for removing the last bumper (both disabled if you get the hit with a fake item). * Allow Karma players to drop their Random box. * These boxes flicker out of existence after 15 seconds. * Causes a WAIT penalty, too. * Remove some redundant PF_ATTACKDOWN stuff, given under the conditions the flag would be applied, it has definitely *already* been applied.
2018-08-06 17:37:03 +00:00
UINT8 scoremultiply = 1;
if (!trapitem && G_BattleGametype())
{
if (K_IsPlayerWanted(player))
scoremultiply = 3;
else if (player->kartstuff[k_bumper] == 1)
scoremultiply = 2;
}
WANTED
2018-07-01 08:36:09 +00:00
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
if (player->health <= 0)
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
return;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
Hundreds of tweaks - SPB multiplier depending on 1st-2nd distance - Removed the Battle-only k_poweritemtimer (hold over from when you could easily get invuln items all of the time), replaced it with a 2 invincibility item cap in ALL modes. - Spinout is affected by boosters, *properly* - Can no longer strafe while spinning out on speed bumps - Messed with how other items interact with speed bumps, again. - Old bounce code has been ported for non-players - Fixed Karma players being able to do anything after the round has ended. - Fixed sneaker and spinout timer weirdness - Fixed Mines still being hold-use - Fixed rubber-burn turn not working - Removed redundant k_spinout and unused k_boosting variables - Filled out the Color_Opposite table with Kart's new colors. Not really relevant right now (besides some extra Lua functionality) since nothing uses it, but will be nice for if we do the signpost from the sky idea.
2018-06-20 00:20:06 +00:00
if (player->powers[pw_flashing] > 0 || player->kartstuff[k_squishedtimer] > 0 || player->kartstuff[k_spinouttimer] > 0
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
|| player->kartstuff[k_invincibilitytimer] > 0 || player->kartstuff[k_growshrinktimer] > 0 || player->kartstuff[k_hyudorotimer] > 0
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
|| (G_BattleGametype() && ((player->kartstuff[k_bumper] <= 0 && player->kartstuff[k_comebacktimer]) || player->kartstuff[k_comebackmode] == 1)))
- Instashield on failed damge - Ballhog explosion separated onto another sprite - Disabled banana jitter
2018-07-27 00:12:42 +00:00
{
K_DoInstashield(player);
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
return;
- Instashield on failed damge - Ballhog explosion separated onto another sprite - Disabled banana jitter
2018-07-27 00:12:42 +00:00
}
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
Accidentally made HitEm sounds always play, even when hitting your own items
2018-06-09 15:42:03 +00:00
if (source && source != player->mo && source->player)
K_PlayHitEmSound(source);
Voices for when you hit someone else Not totally sure on them, but it's worth a try, would make it more obvious when you hit someone with a trap item in battle anyway
2017-11-04 20:42:01 +00:00
Hundreds of tweaks - SPB multiplier depending on 1st-2nd distance - Removed the Battle-only k_poweritemtimer (hold over from when you could easily get invuln items all of the time), replaced it with a 2 invincibility item cap in ALL modes. - Spinout is affected by boosters, *properly* - Can no longer strafe while spinning out on speed bumps - Messed with how other items interact with speed bumps, again. - Old bounce code has been ported for non-players - Fixed Karma players being able to do anything after the round has ended. - Fixed sneaker and spinout timer weirdness - Fixed Mines still being hold-use - Fixed rubber-burn turn not working - Removed redundant k_spinout and unused k_boosting variables - Filled out the Color_Opposite table with Kart's new colors. Not really relevant right now (besides some extra Lua functionality) since nothing uses it, but will be nice for if we do the signpost from the sky idea.
2018-06-20 00:20:06 +00:00
//player->kartstuff[k_sneakertimer] = 0;
Added fancypants mega shroom, fixed drift boosting
2017-02-19 17:18:43 +00:00
player->kartstuff[k_driftboost] = 0;
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
Made a lot of gametype checks use either G_RaceGametype or G_BattleGametype Should make it a lot easier to add more gametypes later. Also some minor fixes: - Changed up how shell speed scales in mobjscale juuuust slightly, so it's less messy - Fixed CHECK showing spectators
2018-03-04 20:27:52 +00:00
if (G_BattleGametype())
BATLLE MODE AAAAAA
2017-10-22 07:06:35 +00:00
{
Fix Battle scoring, hopefully
2018-06-02 14:57:43 +00:00
if (source && source->player && player != source->player)
WANTED
2018-07-01 08:36:09 +00:00
{
P_AddPlayerScore(source->player, scoremultiply);
Battle points are visible
2018-11-01 04:57:38 +00:00
K_SpawnBattlePoints(source->player, player, scoremultiply);
WANTED
2018-07-01 08:36:09 +00:00
if (!trapitem)
{
source->player->kartstuff[k_wanted] -= wantedreduce;
player->kartstuff[k_wanted] -= (wantedreduce/2);
}
}
okay THIS time i actually made sure it compiled
2017-11-30 23:25:59 +00:00
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
if (player->kartstuff[k_bumper] > 0)
Everything. - Player arrows now show if a player is in the item roulette - Boo has been improved, and added back to Battle's item roulette - The CHECK HUD item is now more accurate, and should appear more often - Early comeback mechanic. Functional, but really unpolished - Attempted (again) to make the first player to join in a netgame spawn with balloons - No longer shows respawn text on death
2017-11-05 06:43:47 +00:00
{
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
if (player->kartstuff[k_bumper] == 1)
Redid how karma bombs/items work. Again The overlay object now has a hitbox which handles all of the item giving/bombing code, and no longer takes up the player's tracer. This is to give them a bigger hitbox without any bad side-effects of changing the player's hitbox directly (shadow size). Should make bombing more useful, and just sliiiightly less missed high-fives from items.
2018-06-16 04:00:46 +00:00
{
mobj_t *karmahitbox = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_KARMAHITBOX); // Player hitbox is too small!!
P_SetTarget(&karmahitbox->target, player->mo);
karmahitbox->destscale = player->mo->scale;
P_SetScale(karmahitbox, player->mo->scale);
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
CONS_Printf(M_GetText("%s lost all of their bumpers!\n"), player_names[player-players]);
Redid how karma bombs/items work. Again The overlay object now has a hitbox which handles all of the item giving/bombing code, and no longer takes up the player's tracer. This is to give them a bigger hitbox without any bad side-effects of changing the player's hitbox directly (shadow size). Should make bombing more useful, and just sliiiightly less missed high-fives from items.
2018-06-16 04:00:46 +00:00
}
Misc tweaks (mostly color related) - Smoothed out Ruby & Sepia - Made Sapphire more distinct from Blue - Made Navy more distinct from Jet - MD2 colors weight a few colors even more heavily - Revised ColorOpposite table - Fix Wanted not updating on hit - Very minor item odds adjustment for Battle
2018-07-06 18:22:48 +00:00
player->kartstuff[k_bumper]--;
WANTED recalculates on hit, tons of spectator changes
2018-07-04 01:12:25 +00:00
if (K_IsPlayerWanted(player))
K_CalculateBattleWanted();
Everything. - Player arrows now show if a player is in the item roulette - Boo has been improved, and added back to Battle's item roulette - The CHECK HUD item is now more accurate, and should appear more often - Early comeback mechanic. Functional, but really unpolished - Attempted (again) to make the first player to join in a netgame spawn with balloons - No longer shows respawn text on death
2017-11-05 06:43:47 +00:00
}
BATLLE MODE AAAAAA
2017-10-22 07:06:35 +00:00
Spawn a poof if you get hit while karmegg. (I've moved the comebacktimer set into one level up from that conditional; don't worry, I checked - there's nowhere that accesses this field while you have bumpers, it's just always set here for some dastardly reason.)
2018-10-09 21:40:42 +00:00
if (!player->kartstuff[k_bumper])
{
player->kartstuff[k_comebacktimer] = comebacktime;
Sal's request
2018-10-09 21:44:43 +00:00
if (player->kartstuff[k_comebackmode] == 2)
Spawn a poof if you get hit while karmegg. (I've moved the comebacktimer set into one level up from that conditional; don't worry, I checked - there's nowhere that accesses this field while you have bumpers, it's just always set here for some dastardly reason.)
2018-10-09 21:40:42 +00:00
{
mobj_t *poof = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_EXPLODE);
S_StartSound(poof, mobjinfo[MT_KARMAHITBOX].seesound);
player->kartstuff[k_comebackmode] = 0;
}
}
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
K_CheckBumpers();
BATLLE MODE AAAAAA
2017-10-22 07:06:35 +00:00
}
Spinout type is now passed through K_SpinPlayer This means we don't have to reset spinouttype's value immediately after using it, which means no more wipeout timer garbage.
2018-06-25 10:58:23 +00:00
player->kartstuff[k_spinouttype] = type;
Combine spinout & wipeout timers Turns out they were only 1 tic apart originally, sooo
2018-10-26 05:07:54 +00:00
if (player->kartstuff[k_spinouttype] <= 0) // type 0 is spinout, type 1 is wipeout
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
{
Hundreds of tweaks - SPB multiplier depending on 1st-2nd distance - Removed the Battle-only k_poweritemtimer (hold over from when you could easily get invuln items all of the time), replaced it with a 2 invincibility item cap in ALL modes. - Spinout is affected by boosters, *properly* - Can no longer strafe while spinning out on speed bumps - Messed with how other items interact with speed bumps, again. - Old bounce code has been ported for non-players - Fixed Karma players being able to do anything after the round has ended. - Fixed sneaker and spinout timer weirdness - Fixed Mines still being hold-use - Fixed rubber-burn turn not working - Removed redundant k_spinout and unused k_boosting variables - Filled out the Color_Opposite table with Kart's new colors. Not really relevant right now (besides some extra Lua functionality) since nothing uses it, but will be nice for if we do the signpost from the sky idea.
2018-06-20 00:20:06 +00:00
// At spinout, player speed is increased to 1/4 their regular speed, moving them forward
= Nerfed Megas across the board. - Rarer - Speed reduced from +25% to +20% - Getting squished doesn't last as long = Nerfed the Banana Meta - or at least changed it - You don't wipeout for as long - You don't lose as much speed from wiping out (1/2 instead of 1/4) = Respawning after death is faster - Lakitu drops you faster, only three floaty sounds instead of four = Adjusted the camera to the values given by Sev
2017-10-13 19:41:36 +00:00
if (player->speed < K_GetKartSpeed(player, true)/4)
P_InstaThrust(player->mo, player->mo->angle, FixedMul(K_GetKartSpeed(player, true)/4, player->mo->scale));
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
S_StartSound(player->mo, sfx_slip);
}
Combine spinout & wipeout timers Turns out they were only 1 tic apart originally, sooo
2018-10-26 05:07:54 +00:00
player->kartstuff[k_spinouttimer] = (3*TICRATE/2)+2;
Flashing tics length depends on speed stat Change to speed-weight when the bump buff gets added
2018-08-11 04:12:41 +00:00
player->powers[pw_flashing] = K_GetKartFlashing(player);
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
New player frameangle used instead of mobj angle for players Set to mobj angle except when spinning where it's set to spin Only 1 spin frame needed now
2017-11-04 14:07:53 +00:00
if (player->mo->state != &states[S_KART_SPIN])
P_SetPlayerMobjState(player->mo, S_KART_SPIN);
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
15 tic delay on first instashield
2018-07-27 21:22:51 +00:00
player->kartstuff[k_instashield] = 15;
Prevent using kartdebug cvars in Time Attack. (None of this should invalidate any of YOUR existing ghosts, because none of them use these obvious cheats like, say, setting kartdebugitem 2.)
2018-11-09 20:16:12 +00:00
if (cv_kartdebughuddrop.value && !modeattacking)
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
K_DropItems(player);
else
K_DropHnextList(player);
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
return;
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
}
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
void K_SquishPlayer(player_t *player, mobj_t *source)
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
{
* Tweak battle odds in a few ways, as authorised by Sal. * Steal a point from Ballhog and give to Orbinaut. * Make it based on the maximum number of bumpers someone has, not the average for everyone. * Improve the odds a tad if you're Wanted. * Tweak the score multiplication to give three points for Wanted and two for removing the last bumper (both disabled if you get the hit with a fake item). * Allow Karma players to drop their Random box. * These boxes flicker out of existence after 15 seconds. * Causes a WAIT penalty, too. * Remove some redundant PF_ATTACKDOWN stuff, given under the conditions the flag would be applied, it has definitely *already* been applied.
2018-08-06 17:37:03 +00:00
UINT8 scoremultiply = 1;
if (G_BattleGametype())
{
if (K_IsPlayerWanted(player))
scoremultiply = 3;
else if (player->kartstuff[k_bumper] == 1)
scoremultiply = 2;
}
WANTED
2018-07-01 08:36:09 +00:00
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
if (player->health <= 0)
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
return;
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
if (player->powers[pw_flashing] > 0 || player->kartstuff[k_squishedtimer] > 0 || player->kartstuff[k_invincibilitytimer] > 0
|| player->kartstuff[k_growshrinktimer] > 0 || player->kartstuff[k_hyudorotimer] > 0
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
|| (G_BattleGametype() && ((player->kartstuff[k_bumper] <= 0 && player->kartstuff[k_comebacktimer]) || player->kartstuff[k_comebackmode] == 1)))
- Instashield on failed damge - Ballhog explosion separated onto another sprite - Disabled banana jitter
2018-07-27 00:12:42 +00:00
{
K_DoInstashield(player);
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
return;
- Instashield on failed damge - Ballhog explosion separated onto another sprite - Disabled banana jitter
2018-07-27 00:12:42 +00:00
}
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
player->kartstuff[k_sneakertimer] = 0;
Added fancypants mega shroom, fixed drift boosting
2017-02-19 17:18:43 +00:00
player->kartstuff[k_driftboost] = 0;
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
Made a lot of gametype checks use either G_RaceGametype or G_BattleGametype Should make it a lot easier to add more gametypes later. Also some minor fixes: - Changed up how shell speed scales in mobjscale juuuust slightly, so it's less messy - Fixed CHECK showing spectators
2018-03-04 20:27:52 +00:00
if (G_BattleGametype())
BATLLE MODE AAAAAA
2017-10-22 07:06:35 +00:00
{
Fix Battle scoring, hopefully
2018-06-02 14:57:43 +00:00
if (source && source->player && player != source->player)
WANTED
2018-07-01 08:36:09 +00:00
{
P_AddPlayerScore(source->player, scoremultiply);
Battle points are visible
2018-11-01 04:57:38 +00:00
K_SpawnBattlePoints(source->player, player, scoremultiply);
WANTED
2018-07-01 08:36:09 +00:00
source->player->kartstuff[k_wanted] -= wantedreduce;
player->kartstuff[k_wanted] -= (wantedreduce/2);
}
okay THIS time i actually made sure it compiled
2017-11-30 23:25:59 +00:00
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
if (player->kartstuff[k_bumper] > 0)
Everything. - Player arrows now show if a player is in the item roulette - Boo has been improved, and added back to Battle's item roulette - The CHECK HUD item is now more accurate, and should appear more often - Early comeback mechanic. Functional, but really unpolished - Attempted (again) to make the first player to join in a netgame spawn with balloons - No longer shows respawn text on death
2017-11-05 06:43:47 +00:00
{
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
if (player->kartstuff[k_bumper] == 1)
Redid how karma bombs/items work. Again The overlay object now has a hitbox which handles all of the item giving/bombing code, and no longer takes up the player's tracer. This is to give them a bigger hitbox without any bad side-effects of changing the player's hitbox directly (shadow size). Should make bombing more useful, and just sliiiightly less missed high-fives from items.
2018-06-16 04:00:46 +00:00
{
mobj_t *karmahitbox = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_KARMAHITBOX); // Player hitbox is too small!!
P_SetTarget(&karmahitbox->target, player->mo);
karmahitbox->destscale = player->mo->scale;
P_SetScale(karmahitbox, player->mo->scale);
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
CONS_Printf(M_GetText("%s lost all of their bumpers!\n"), player_names[player-players]);
Redid how karma bombs/items work. Again The overlay object now has a hitbox which handles all of the item giving/bombing code, and no longer takes up the player's tracer. This is to give them a bigger hitbox without any bad side-effects of changing the player's hitbox directly (shadow size). Should make bombing more useful, and just sliiiightly less missed high-fives from items.
2018-06-16 04:00:46 +00:00
}
Misc tweaks (mostly color related) - Smoothed out Ruby & Sepia - Made Sapphire more distinct from Blue - Made Navy more distinct from Jet - MD2 colors weight a few colors even more heavily - Revised ColorOpposite table - Fix Wanted not updating on hit - Very minor item odds adjustment for Battle
2018-07-06 18:22:48 +00:00
player->kartstuff[k_bumper]--;
WANTED recalculates on hit, tons of spectator changes
2018-07-04 01:12:25 +00:00
if (K_IsPlayerWanted(player))
K_CalculateBattleWanted();
Everything. - Player arrows now show if a player is in the item roulette - Boo has been improved, and added back to Battle's item roulette - The CHECK HUD item is now more accurate, and should appear more often - Early comeback mechanic. Functional, but really unpolished - Attempted (again) to make the first player to join in a netgame spawn with balloons - No longer shows respawn text on death
2017-11-05 06:43:47 +00:00
}
BATLLE MODE AAAAAA
2017-10-22 07:06:35 +00:00
Spawn a poof if you get hit while karmegg. (I've moved the comebacktimer set into one level up from that conditional; don't worry, I checked - there's nowhere that accesses this field while you have bumpers, it's just always set here for some dastardly reason.)
2018-10-09 21:40:42 +00:00
if (!player->kartstuff[k_bumper])
{
player->kartstuff[k_comebacktimer] = comebacktime;
Sal's request
2018-10-09 21:44:43 +00:00
if (player->kartstuff[k_comebackmode] == 2)
Spawn a poof if you get hit while karmegg. (I've moved the comebacktimer set into one level up from that conditional; don't worry, I checked - there's nowhere that accesses this field while you have bumpers, it's just always set here for some dastardly reason.)
2018-10-09 21:40:42 +00:00
{
mobj_t *poof = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_EXPLODE);
S_StartSound(poof, mobjinfo[MT_KARMAHITBOX].seesound);
player->kartstuff[k_comebackmode] = 0;
}
}
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
K_CheckBumpers();
BATLLE MODE AAAAAA
2017-10-22 07:06:35 +00:00
}
Nerfed squishing After fixing flashing tics not being set properly, 2 seconds of being fully stopped and then another 1.5 seconds minimum of being unable to be hit just feels like an eternity :V
2018-10-31 09:35:06 +00:00
player->kartstuff[k_squishedtimer] = TICRATE;
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
Flashing tics length depends on speed stat Change to speed-weight when the bump buff gets added
2018-08-11 04:12:41 +00:00
player->powers[pw_flashing] = K_GetKartFlashing(player);
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
player->mo->flags |= MF_NOCLIP;
if (player->mo->state != &states[S_KART_SQUISH]) // Squash
P_SetPlayerMobjState(player->mo, S_KART_SQUISH);
P_PlayRinglossSound(player->mo);
15 tic delay on first instashield
2018-07-27 21:22:51 +00:00
player->kartstuff[k_instashield] = 15;
Prevent using kartdebug cvars in Time Attack. (None of this should invalidate any of YOUR existing ghosts, because none of them use these obvious cheats like, say, setting kartdebugitem 2.)
2018-11-09 20:16:12 +00:00
if (cv_kartdebughuddrop.value && !modeattacking)
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
K_DropItems(player);
else
K_DropHnextList(player);
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
return;
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
}
SPB knockback is more punishing Hopefully to prevent instances like the Megablock video, where SPB double-dips just because the 1st one wasn't enough but another is overkill
2018-10-19 00:49:30 +00:00
void K_ExplodePlayer(player_t *player, mobj_t *source, mobj_t *inflictor) // A bit of a hack, we just throw the player up higher here and extend their spinout timer
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
{
* Tweak battle odds in a few ways, as authorised by Sal. * Steal a point from Ballhog and give to Orbinaut. * Make it based on the maximum number of bumpers someone has, not the average for everyone. * Improve the odds a tad if you're Wanted. * Tweak the score multiplication to give three points for Wanted and two for removing the last bumper (both disabled if you get the hit with a fake item). * Allow Karma players to drop their Random box. * These boxes flicker out of existence after 15 seconds. * Causes a WAIT penalty, too. * Remove some redundant PF_ATTACKDOWN stuff, given under the conditions the flag would be applied, it has definitely *already* been applied.
2018-08-06 17:37:03 +00:00
UINT8 scoremultiply = 1;
if (G_BattleGametype())
{
if (K_IsPlayerWanted(player))
scoremultiply = 3;
else if (player->kartstuff[k_bumper] == 1)
scoremultiply = 2;
}
WANTED
2018-07-01 08:36:09 +00:00
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
if (player->health <= 0)
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
return;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
Huge restructuring & more fine-tuned speed, following, & turn behavior
2018-10-18 23:51:36 +00:00
if (/*player->powers[pw_flashing] > 0 || player->kartstuff[k_squishedtimer] > 0 || player->kartstuff[k_spinouttimer] > 0 // Explosions should combo, because of SPB and Eggman
||*/player->kartstuff[k_invincibilitytimer] > 0 || player->kartstuff[k_growshrinktimer] > 0 || player->kartstuff[k_hyudorotimer] > 0
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
|| (G_BattleGametype() && ((player->kartstuff[k_bumper] <= 0 && player->kartstuff[k_comebacktimer]) || player->kartstuff[k_comebackmode] == 1)))
- Instashield on failed damge - Ballhog explosion separated onto another sprite - Disabled banana jitter
2018-07-27 00:12:42 +00:00
{
K_DoInstashield(player);
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
return;
- Instashield on failed damge - Ballhog explosion separated onto another sprite - Disabled banana jitter
2018-07-27 00:12:42 +00:00
}
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
HitEm sound for K_ExplodePlayer
2018-10-09 21:24:44 +00:00
if (source && source != player->mo && source->player)
K_PlayHitEmSound(source);
General fixes - Flame trails don't spawn if you're not on the ground - Mobjscale: Shells are now the correct speed - Mobjscale: Explosion's wipeout hit height scales
2018-03-04 19:28:29 +00:00
player->mo->momz = 18*(mapheaderinfo[gamemap-1]->mobj_scale);
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
player->mo->momx = player->mo->momy = 0;
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
player->kartstuff[k_sneakertimer] = 0;
Added fancypants mega shroom, fixed drift boosting
2017-02-19 17:18:43 +00:00
player->kartstuff[k_driftboost] = 0;
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
Don't destroy all of your balloons in 3 tics
2018-10-22 21:05:44 +00:00
// This is the only part that SHOULDN'T combo :VVVVV
if (G_BattleGametype() && !(player->powers[pw_flashing] > 0 || player->kartstuff[k_squishedtimer] > 0 || player->kartstuff[k_spinouttimer] > 0))
BATLLE MODE AAAAAA
2017-10-22 07:06:35 +00:00
{
Did you know: Battle Mode - Different sizes for the balloons, depending on how many you have - Balloons are fullbright, cast shadows, and stick closer to players - Mega Mushrooms can now appear - Can steal items with Boo in Battle Mode now, as intended - Death pits make you lose only 1 balloon - Balloons disappear properly if you use Boo - Boo item icon should no longer appear if you're out of balloons - You can now properly respawn in Battle Mode - Can no longer collide with items if you are already holding one
2017-10-22 21:26:43 +00:00
if (source && source->player && player != source->player)
WANTED
2018-07-01 08:36:09 +00:00
{
P_AddPlayerScore(source->player, scoremultiply);
Battle points are visible
2018-11-01 04:57:38 +00:00
K_SpawnBattlePoints(source->player, player, scoremultiply);
WANTED
2018-07-01 08:36:09 +00:00
source->player->kartstuff[k_wanted] -= wantedreduce;
player->kartstuff[k_wanted] -= (wantedreduce/2);
}
BATLLE MODE AAAAAA
2017-10-22 07:06:35 +00:00
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
if (player->kartstuff[k_bumper] > 0)
okay THIS time i actually made sure it compiled
2017-11-30 23:25:59 +00:00
{
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
if (player->kartstuff[k_bumper] == 1)
Redid how karma bombs/items work. Again The overlay object now has a hitbox which handles all of the item giving/bombing code, and no longer takes up the player's tracer. This is to give them a bigger hitbox without any bad side-effects of changing the player's hitbox directly (shadow size). Should make bombing more useful, and just sliiiightly less missed high-fives from items.
2018-06-16 04:00:46 +00:00
{
mobj_t *karmahitbox = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_KARMAHITBOX); // Player hitbox is too small!!
P_SetTarget(&karmahitbox->target, player->mo);
karmahitbox->destscale = player->mo->scale;
P_SetScale(karmahitbox, player->mo->scale);
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
CONS_Printf(M_GetText("%s lost all of their bumpers!\n"), player_names[player-players]);
Redid how karma bombs/items work. Again The overlay object now has a hitbox which handles all of the item giving/bombing code, and no longer takes up the player's tracer. This is to give them a bigger hitbox without any bad side-effects of changing the player's hitbox directly (shadow size). Should make bombing more useful, and just sliiiightly less missed high-fives from items.
2018-06-16 04:00:46 +00:00
}
Misc tweaks (mostly color related) - Smoothed out Ruby & Sepia - Made Sapphire more distinct from Blue - Made Navy more distinct from Jet - MD2 colors weight a few colors even more heavily - Revised ColorOpposite table - Fix Wanted not updating on hit - Very minor item odds adjustment for Battle
2018-07-06 18:22:48 +00:00
player->kartstuff[k_bumper]--;
WANTED recalculates on hit, tons of spectator changes
2018-07-04 01:12:25 +00:00
if (K_IsPlayerWanted(player))
K_CalculateBattleWanted();
okay THIS time i actually made sure it compiled
2017-11-30 23:25:59 +00:00
}
Spawn a poof if you get hit while karmegg. (I've moved the comebacktimer set into one level up from that conditional; don't worry, I checked - there's nowhere that accesses this field while you have bumpers, it's just always set here for some dastardly reason.)
2018-10-09 21:40:42 +00:00
if (!player->kartstuff[k_bumper])
{
player->kartstuff[k_comebacktimer] = comebacktime;
Sal's request
2018-10-09 21:44:43 +00:00
if (player->kartstuff[k_comebackmode] == 2)
Spawn a poof if you get hit while karmegg. (I've moved the comebacktimer set into one level up from that conditional; don't worry, I checked - there's nowhere that accesses this field while you have bumpers, it's just always set here for some dastardly reason.)
2018-10-09 21:40:42 +00:00
{
mobj_t *poof = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_EXPLODE);
S_StartSound(poof, mobjinfo[MT_KARMAHITBOX].seesound);
player->kartstuff[k_comebackmode] = 0;
}
}
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
K_CheckBumpers();
BATLLE MODE AAAAAA
2017-10-22 07:06:35 +00:00
}
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
player->kartstuff[k_spinouttype] = 1;
player->kartstuff[k_spinouttimer] = 2*TICRATE+(TICRATE/2);
Flashing tics length depends on speed stat Change to speed-weight when the bump buff gets added
2018-08-11 04:12:41 +00:00
player->powers[pw_flashing] = K_GetKartFlashing(player);
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
SPB knockback is more punishing Hopefully to prevent instances like the Megablock video, where SPB double-dips just because the 1st one wasn't enough but another is overkill
2018-10-19 00:49:30 +00:00
if (inflictor && inflictor->type == MT_SPBEXPLOSION && inflictor->extravalue1)
{
Adjust spinout times to face your forward about 90% of the time
2018-10-26 04:55:20 +00:00
player->kartstuff[k_spinouttimer] = ((3*player->kartstuff[k_spinouttimer])/2)+1;
SPB knockback is more punishing Hopefully to prevent instances like the Megablock video, where SPB double-dips just because the 1st one wasn't enough but another is overkill
2018-10-19 00:49:30 +00:00
player->mo->momz *= 2;
}
New player frameangle used instead of mobj angle for players Set to mobj angle except when spinning where it's set to spin Only 1 spin frame needed now
2017-11-04 14:07:53 +00:00
if (player->mo->state != &states[S_KART_SPIN])
P_SetPlayerMobjState(player->mo, S_KART_SPIN);
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
P_PlayRinglossSound(player->mo);
Do a quake effect when hit by non-spinout things or explosions
2017-10-24 21:58:59 +00:00
if (P_IsLocalPlayer(player))
{
quake.intensity = 64*FRACUNIT;
quake.time = 5;
}
15 tic delay on first instashield
2018-07-27 21:22:51 +00:00
player->kartstuff[k_instashield] = 15;
Prevent using kartdebug cvars in Time Attack. (None of this should invalidate any of YOUR existing ghosts, because none of them use these obvious cheats like, say, setting kartdebugitem 2.)
2018-11-09 20:16:12 +00:00
K_DropItems(player);
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
return;
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
}
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
void K_StealBumper(player_t *player, player_t *victim, boolean force)
Balloon revamp Supports arbitrary balloon counts now
2017-11-01 22:46:35 +00:00
{
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
INT32 newbumper;
Balloon stealing! Mushroom is back!
2017-11-03 00:43:03 +00:00
angle_t newangle, diff;
fixed_t newx, newy;
mobj_t *newmo;
Made a lot of gametype checks use either G_RaceGametype or G_BattleGametype Should make it a lot easier to add more gametypes later. Also some minor fixes: - Changed up how shell speed scales in mobjscale juuuust slightly, so it's less messy - Fixed CHECK showing spectators
2018-03-04 20:27:52 +00:00
if (!G_BattleGametype())
Balloon revamp Supports arbitrary balloon counts now
2017-11-01 22:46:35 +00:00
return;
if (player->health <= 0 || victim->health <= 0)
return;
Hundreds of tweaks - SPB multiplier depending on 1st-2nd distance - Removed the Battle-only k_poweritemtimer (hold over from when you could easily get invuln items all of the time), replaced it with a 2 invincibility item cap in ALL modes. - Spinout is affected by boosters, *properly* - Can no longer strafe while spinning out on speed bumps - Messed with how other items interact with speed bumps, again. - Old bounce code has been ported for non-players - Fixed Karma players being able to do anything after the round has ended. - Fixed sneaker and spinout timer weirdness - Fixed Mines still being hold-use - Fixed rubber-burn turn not working - Removed redundant k_spinout and unused k_boosting variables - Filled out the Color_Opposite table with Kart's new colors. Not really relevant right now (besides some extra Lua functionality) since nothing uses it, but will be nice for if we do the signpost from the sky idea.
2018-06-20 00:20:06 +00:00
if (!force)
Some more minor comeback tweaks - Comeback players are now 1 speed with -20 friction - Bombing gives 2 karma now - Item players should no longer be able to be hit - Attempted to fix instances of trying to bomb someone while they can't be touched causing you to lose all your karma and start a console message saying you're back in the game, despite not rewarding a balloon - Fixed a few places where kartspeed & kartweight were being read as fixed point numbers, despite being UINT8's - Fixed up kartstuff Lua support more, functions properly now
2017-11-20 00:39:40 +00:00
{
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
if (victim->kartstuff[k_bumper] <= 0) // || player->kartstuff[k_bumper] >= cv_kartbumpers.value+2
Some more minor comeback tweaks - Comeback players are now 1 speed with -20 friction - Bombing gives 2 karma now - Item players should no longer be able to be hit - Attempted to fix instances of trying to bomb someone while they can't be touched causing you to lose all your karma and start a console message saying you're back in the game, despite not rewarding a balloon - Fixed a few places where kartspeed & kartweight were being read as fixed point numbers, despite being UINT8's - Fixed up kartstuff Lua support more, functions properly now
2017-11-20 00:39:40 +00:00
return;
Balloon revamp Supports arbitrary balloon counts now
2017-11-01 22:46:35 +00:00
- Instashield on failed damge - Ballhog explosion separated onto another sprite - Disabled banana jitter
2018-07-27 00:12:42 +00:00
if (player->kartstuff[k_squishedtimer] > 0 || player->kartstuff[k_spinouttimer] > 0)
return;
if (victim->powers[pw_flashing] > 0 || victim->kartstuff[k_squishedtimer] > 0 || victim->kartstuff[k_spinouttimer] > 0
|| victim->kartstuff[k_invincibilitytimer] > 0 || victim->kartstuff[k_growshrinktimer] > 0 || victim->kartstuff[k_hyudorotimer] > 0)
{
K_DoInstashield(victim);
Some more minor comeback tweaks - Comeback players are now 1 speed with -20 friction - Bombing gives 2 karma now - Item players should no longer be able to be hit - Attempted to fix instances of trying to bomb someone while they can't be touched causing you to lose all your karma and start a console message saying you're back in the game, despite not rewarding a balloon - Fixed a few places where kartspeed & kartweight were being read as fixed point numbers, despite being UINT8's - Fixed up kartstuff Lua support more, functions properly now
2017-11-20 00:39:40 +00:00
return;
- Instashield on failed damge - Ballhog explosion separated onto another sprite - Disabled banana jitter
2018-07-27 00:12:42 +00:00
}
Some more minor comeback tweaks - Comeback players are now 1 speed with -20 friction - Bombing gives 2 karma now - Item players should no longer be able to be hit - Attempted to fix instances of trying to bomb someone while they can't be touched causing you to lose all your karma and start a console message saying you're back in the game, despite not rewarding a balloon - Fixed a few places where kartspeed & kartweight were being read as fixed point numbers, despite being UINT8's - Fixed up kartstuff Lua support more, functions properly now
2017-11-20 00:39:40 +00:00
}
Balloon revamp Supports arbitrary balloon counts now
2017-11-01 22:46:35 +00:00
Remove most gameplay prints A couple of the extraneous ones (karma interactions, bumper stealing, lap start notifications) have been removed outright. The rest that I could think of have been changed to use CON_LogMessage, so that they still go into log.txt when rereading a fun chat session but not showing themselves in gameplay. Necessary gameplay prints, such as players being defeated or coming back in Battle, have been kept until there's a suitable replacement for them in the future.
2018-10-14 21:45:28 +00:00
if (netgame && player->kartstuff[k_bumper] <= 0)
CONS_Printf(M_GetText("%s is back in the game!\n"), player_names[player-players]);
Balloon revamp Supports arbitrary balloon counts now
2017-11-01 22:46:35 +00:00
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
newbumper = player->kartstuff[k_bumper];
if (newbumper <= 1)
Balloon stealing! Mushroom is back!
2017-11-03 00:43:03 +00:00
diff = 0;
else
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
diff = FixedAngle(360*FRACUNIT/newbumper);
Everything. - Player arrows now show if a player is in the item roulette - Boo has been improved, and added back to Battle's item roulette - The CHECK HUD item is now more accurate, and should appear more often - Early comeback mechanic. Functional, but really unpolished - Attempted (again) to make the first player to join in a netgame spawn with balloons - No longer shows respawn text on death
2017-11-05 06:43:47 +00:00
newangle = player->mo->angle;
Balloon stealing! Mushroom is back!
2017-11-03 00:43:03 +00:00
newx = player->mo->x + P_ReturnThrustX(player->mo, newangle + ANGLE_180, 64*FRACUNIT);
newy = player->mo->y + P_ReturnThrustY(player->mo, newangle + ANGLE_180, 64*FRACUNIT);
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
newmo = P_SpawnMobj(newx, newy, player->mo->z, MT_BATTLEBUMPER);
newmo->threshold = newbumper;
Balloon stealing! Mushroom is back!
2017-11-03 00:43:03 +00:00
P_SetTarget(&newmo->tracer, victim->mo);
P_SetTarget(&newmo->target, player->mo);
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
newmo->angle = (diff * (newbumper-1));
Balloon stealing! Mushroom is back!
2017-11-03 00:43:03 +00:00
newmo->color = victim->skincolor;
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
if (newbumper+1 < 2)
P_SetMobjState(newmo, S_BATTLEBUMPER3);
else if (newbumper+1 < 3)
P_SetMobjState(newmo, S_BATTLEBUMPER2);
Balloon stealing! Mushroom is back!
2017-11-03 00:43:03 +00:00
else
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
P_SetMobjState(newmo, S_BATTLEBUMPER1);
Balloon revamp Supports arbitrary balloon counts now
2017-11-01 22:46:35 +00:00
Some fun sound changes - Peelout sound for sneaker boosts - Flicky grab sound for stealing balloons - Adaptive sounds for start boosts (drift boost for sub-optimal boosts, sneaker boost for good boosts, super transform sound for the frame perfect boost) - Orbinaut rollling sound
2018-06-26 16:02:14 +00:00
S_StartSound(player->mo, sfx_3db06);
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
player->kartstuff[k_bumper]++;
Some more minor comeback tweaks - Comeback players are now 1 speed with -20 friction - Bombing gives 2 karma now - Item players should no longer be able to be hit - Attempted to fix instances of trying to bomb someone while they can't be touched causing you to lose all your karma and start a console message saying you're back in the game, despite not rewarding a balloon - Fixed a few places where kartspeed & kartweight were being read as fixed point numbers, despite being UINT8's - Fixed up kartstuff Lua support more, functions properly now
2017-11-20 00:39:40 +00:00
player->kartstuff[k_comebackpoints] = 0;
Flashing tics length depends on speed stat Change to speed-weight when the bump buff gets added
2018-08-11 04:12:41 +00:00
player->powers[pw_flashing] = K_GetKartFlashing(player);
Many things! - Position faces are now drawn in Battle, categorized first by balloons, then by points - Balloon-based items, gives people who are worse off better items, and people who are better off worse items. - You can strafe while using feather or while using a bounce pad - Reduced the strength of bounce pad thrust on items - Increased bounce pad's minimum forward push on players - Made Frantic Mode just a teeeeensy bit more frantic - Fixed being able to use Feathers mid-air - Fixed being unable to steal Feathers - Drift sparks use frameangle instead of angle
2017-11-23 02:40:17 +00:00
player->kartstuff[k_comebacktimer] = comebacktime;
Flashing tics length depends on speed stat Change to speed-weight when the bump buff gets added
2018-08-11 04:12:41 +00:00
/*victim->powers[pw_flashing] = K_GetKartFlashing(victim);
Battle hud stuff?!
2017-12-24 01:55:23 +00:00
victim->kartstuff[k_comebacktimer] = comebacktime;*/
Mooore tweaks - Fixed position numbers; orders by balloons first then points (before it was doing it the other way around), and the leading players should never display as like 3 or something if there's ties :v - Messed with Boo & Feather frequencies to be less common in Battle - Fixed the issue when a karma bomb steals a balloon from one of the two last people standing, kills them, and comes back, and the game ends anyway, giving two players the "win" bonus - Removed karma items being able to pass their items to other karma bombs. This never worked correctly in the first place, and I'm 95% sure it's what's been causing people to be ghosts forever
2017-11-30 22:34:48 +00:00
15 tic delay on first instashield
2018-07-27 21:22:51 +00:00
victim->kartstuff[k_instashield] = 15;
Prevent using kartdebug cvars in Time Attack. (None of this should invalidate any of YOUR existing ghosts, because none of them use these obvious cheats like, say, setting kartdebugitem 2.)
2018-11-09 20:16:12 +00:00
if (cv_kartdebughuddrop.value && !modeattacking)
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
K_DropItems(victim);
else
K_DropHnextList(victim);
Balloon revamp Supports arbitrary balloon counts now
2017-11-01 22:46:35 +00:00
return;
Balloon stealing! Mushroom is back!
2017-11-03 00:43:03 +00:00
}
Balloon revamp Supports arbitrary balloon counts now
2017-11-01 22:46:35 +00:00
Give explosion particle mobjs the target of who spawned it (bomb thrower, blue lightning user) So that explosion particles can trigger voice lines (and not crash) and add points for players in battle Also don't play voice lines when you hit yourself
2017-11-05 17:15:19 +00:00
// source is the mobj that originally threw the bomb that exploded etc.
New bomb explosion effect
2018-02-05 22:53:31 +00:00
// Spawns the sphere around the explosion that handles spinout
Give explosion particle mobjs the target of who spawned it (bomb thrower, blue lightning user) So that explosion particles can trigger voice lines (and not crash) and add points for players in battle Also don't play voice lines when you hit yourself
2017-11-05 17:15:19 +00:00
void K_SpawnKartExplosion(fixed_t x, fixed_t y, fixed_t z, fixed_t radius, INT32 number, mobjtype_t type, angle_t rotangle, boolean spawncenter, boolean ghostit, mobj_t *source)
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
{
mobj_t *mobj;
mobj_t *ghost = NULL;
INT32 i;
TVector v;
TVector *res;
fixed_t finalx, finaly, finalz, dist;
//mobj_t hoopcenter;
angle_t degrees, fa, closestangle;
fixed_t mobjx, mobjy, mobjz;
//hoopcenter.x = x;
//hoopcenter.y = y;
//hoopcenter.z = z;
//hoopcenter.z = z - mobjinfo[type].height/2;
degrees = FINEANGLES/number;
closestangle = 0;
// Create the hoop!
for (i = 0; i < number; i++)
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
{
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
fa = (i*degrees);
v[0] = FixedMul(FINECOSINE(fa),radius);
v[1] = 0;
v[2] = FixedMul(FINESINE(fa),radius);
v[3] = FRACUNIT;
res = VectorMatrixMultiply(v, *RotateXMatrix(rotangle));
M_Memcpy(&v, res, sizeof (v));
res = VectorMatrixMultiply(v, *RotateZMatrix(closestangle));
M_Memcpy(&v, res, sizeof (v));
finalx = x + v[0];
finaly = y + v[1];
finalz = z + v[2];
mobj = P_SpawnMobj(finalx, finaly, finalz, type);
mobj->z -= mobj->height>>1;
// change angle
mobj->angle = R_PointToAngle2(mobj->x, mobj->y, x, y);
// change slope
dist = P_AproxDistance(P_AproxDistance(x - mobj->x, y - mobj->y), z - mobj->z);
if (dist < 1)
dist = 1;
mobjx = mobj->x;
mobjy = mobj->y;
mobjz = mobj->z;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
if (ghostit)
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
{
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
ghost = P_SpawnGhostMobj(mobj);
P_SetMobjState(mobj, S_NULL);
mobj = ghost;
}
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
if (spawncenter)
{
mobj->x = x;
mobj->y = y;
mobj->z = z;
}
Some explosion stuff Sphere spawns at centre and quickly grows before stopping While sphere grows players get flung up Fix some issues with battle mode stuff stopping bobombs from working
2018-02-05 19:24:54 +00:00
mobj->momx = FixedMul(FixedDiv(mobjx - x, dist), FixedDiv(dist, 6*FRACUNIT));
mobj->momy = FixedMul(FixedDiv(mobjy - y, dist), FixedDiv(dist, 6*FRACUNIT));
mobj->momz = FixedMul(FixedDiv(mobjz - z, dist), FixedDiv(dist, 6*FRACUNIT));
Serious deep-cleaning to most of the kartstuff More optional fields, more careful eye placed on return values and other checks
2018-11-08 02:04:57 +00:00
if (source && !P_MobjWasRemoved(source))
P_SetTarget(&mobj->target, source);
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
}
}
New bomb explosion effect
2018-02-05 22:53:31 +00:00
// Spawns the purely visual explosion
Merge remote-tracking branch 'refs/remotes/origin/flair' into sonicitems # Conflicts: # src/k_kart.c # src/k_kart.h # src/p_enemy.c
2018-02-06 02:08:01 +00:00
void K_SpawnMineExplosion(mobj_t *source, UINT8 color)
New bomb explosion effect
2018-02-05 22:53:31 +00:00
{
INT32 i, radius, height;
mobj_t *smoldering = P_SpawnMobj(source->x, source->y, source->z, MT_SMOLDERING);
mobj_t *dust;
mobj_t *truc;
INT32 speed, speed2;
Squash a few more errors Updated my compile setup to GCC 6.3, makes it as far as m_misc.c now with ERRORMODE and DEBUGMODE, stops at some gettext related stuff I don't know how to fix now
2018-07-07 01:53:37 +00:00
smoldering->tics = TICRATE*3;
New bomb explosion effect
2018-02-05 22:53:31 +00:00
radius = source->radius>>FRACBITS;
height = source->height>>FRACBITS;
Colored boom Not tested *yet*
2018-02-06 01:10:20 +00:00
if (!color)
New SPB May not make it to R1, but oh well
2018-10-18 08:43:50 +00:00
color = SKINCOLOR_KETCHUP;
Colored boom Not tested *yet*
2018-02-06 01:10:20 +00:00
New bomb explosion effect
2018-02-05 22:53:31 +00:00
for (i = 0; i < 32; i++)
{
dust = P_SpawnMobj(source->x, source->y, source->z, MT_SMOKE);
Fix the explosion smoke ring (and warning)
2018-02-06 00:23:10 +00:00
dust->angle = (ANGLE_180/16) * i;
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
P_SetScale(dust, source->scale);
New bomb explosion effect
2018-02-05 22:53:31 +00:00
dust->destscale = source->scale*10;
No more whack-a-mole (not 100% certain all of these are correct, please check the diff closely before reinstating plusone sal)
2018-10-19 20:53:02 +00:00
dust->scalespeed = source->scale/12;
New bomb explosion effect
2018-02-05 22:53:31 +00:00
P_InstaThrust(dust, dust->angle, FixedMul(20*FRACUNIT, source->scale));
truc = P_SpawnMobj(source->x + P_RandomRange(-radius, radius)*FRACUNIT,
source->y + P_RandomRange(-radius, radius)*FRACUNIT,
The main explosion particles bounce off the floor too
2018-02-08 15:46:07 +00:00
source->z + P_RandomRange(0, height)*FRACUNIT, MT_BOOMEXPLODE);
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
P_SetScale(truc, source->scale);
New bomb explosion effect
2018-02-05 22:53:31 +00:00
truc->destscale = source->scale*6;
No more whack-a-mole (not 100% certain all of these are correct, please check the diff closely before reinstating plusone sal)
2018-10-19 20:53:02 +00:00
truc->scalespeed = source->scale/12;
New bomb explosion effect
2018-02-05 22:53:31 +00:00
speed = FixedMul(10*FRACUNIT, source->scale)>>FRACBITS;
truc->momx = P_RandomRange(-speed, speed)*FRACUNIT;
truc->momy = P_RandomRange(-speed, speed)*FRACUNIT;
speed = FixedMul(20*FRACUNIT, source->scale)>>FRACBITS;
truc->momz = P_RandomRange(-speed, speed)*FRACUNIT;
Colored boom Not tested *yet*
2018-02-06 01:10:20 +00:00
truc->color = color;
New bomb explosion effect
2018-02-05 22:53:31 +00:00
}
for (i = 0; i < 16; i++)
{
dust = P_SpawnMobj(source->x + P_RandomRange(-radius, radius)*FRACUNIT,
source->y + P_RandomRange(-radius, radius)*FRACUNIT,
source->z + P_RandomRange(0, height)*FRACUNIT, MT_SMOKE);
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
P_SetScale(dust, source->scale);
New bomb explosion effect
2018-02-05 22:53:31 +00:00
dust->destscale = source->scale*10;
No more whack-a-mole (not 100% certain all of these are correct, please check the diff closely before reinstating plusone sal)
2018-10-19 20:53:02 +00:00
dust->scalespeed = source->scale/12;
New bomb explosion effect
2018-02-05 22:53:31 +00:00
dust->tics = 30;
dust->momz = P_RandomRange(FixedMul(3*FRACUNIT, source->scale)>>FRACBITS, FixedMul(7*FRACUNIT, source->scale)>>FRACBITS)*FRACUNIT;
truc = P_SpawnMobj(source->x + P_RandomRange(-radius, radius)*FRACUNIT,
source->y + P_RandomRange(-radius, radius)*FRACUNIT,
source->z + P_RandomRange(0, height)*FRACUNIT, MT_BOOMPARTICLE);
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
P_SetScale(truc, source->scale);
New bomb explosion effect
2018-02-05 22:53:31 +00:00
truc->destscale = source->scale*5;
No more whack-a-mole (not 100% certain all of these are correct, please check the diff closely before reinstating plusone sal)
2018-10-19 20:53:02 +00:00
truc->scalespeed = source->scale/12;
New bomb explosion effect
2018-02-05 22:53:31 +00:00
speed = FixedMul(20*FRACUNIT, source->scale)>>FRACBITS;
truc->momx = P_RandomRange(-speed, speed)*FRACUNIT;
truc->momy = P_RandomRange(-speed, speed)*FRACUNIT;
speed = FixedMul(15*FRACUNIT, source->scale)>>FRACBITS;
speed2 = FixedMul(45*FRACUNIT, source->scale)>>FRACBITS;
truc->momz = P_RandomRange(speed, speed2)*FRACUNIT;
if (P_RandomChance(FRACUNIT/2))
truc->momz = -truc->momz;
truc->tics = TICRATE*2;
Colored boom Not tested *yet*
2018-02-06 01:10:20 +00:00
truc->color = color;
New bomb explosion effect
2018-02-05 22:53:31 +00:00
}
}
Fix warnings Possibly fix some whitespace problems
2017-03-04 22:13:19 +00:00
static mobj_t *K_SpawnKartMissile(mobj_t *source, mobjtype_t type, angle_t angle, INT32 flags2, fixed_t speed)
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
{
mobj_t *th;
angle_t an;
fixed_t x, y, z;
We did it, we finally fixed... The Shell Boost Bug Instead of adding to your speed, it relatively multiplies it if you're above your top speed. This is applied to ALL of Kart projectiles as well, not just shells. May we never run into our own shell that we threw on a boost pad ever again.
2018-06-05 02:53:45 +00:00
fixed_t finalspeed = speed;
Merge in battle, unfuck the code
2017-11-21 07:23:06 +00:00
mobj_t *throwmo;
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
//INT32 dir;
// angle at which you fire, is player angle
an = angle;
//if (source->player->kartstuff[k_throwdir] != 0)
// dir = source->player->kartstuff[k_throwdir];
//else
// dir = 1;
We did it, we finally fixed... The Shell Boost Bug Instead of adding to your speed, it relatively multiplies it if you're above your top speed. This is applied to ALL of Kart projectiles as well, not just shells. May we never run into our own shell that we threw on a boost pad ever again.
2018-06-05 02:53:45 +00:00
if (source->player && source->player->speed > K_GetKartSpeed(source->player, false))
finalspeed = FixedMul(speed, FixedDiv(source->player->speed, K_GetKartSpeed(source->player, false)));
x = source->x + source->momx + FixedMul(finalspeed, FINECOSINE(an>>ANGLETOFINESHIFT));
y = source->y + source->momy + FixedMul(finalspeed, FINESINE(an>>ANGLETOFINESHIFT));
Various held and thrown items tweaks "Missile" items are spawned on the ground and should follow slopes when the player is on the ground Forwards thrown items should work in reverse gravity Dropped items are dropped slightly closer (depends on player and item radius) and have their position set correctly Held items are held closer (depends on player and item radius)
2017-11-06 15:27:15 +00:00
z = source->z; // spawn on the ground please
if (P_MobjFlip(source) < 0)
{
z = source->z+source->height - mobjinfo[type].height;
}
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
th = P_SpawnMobj(x, y, z, type);
th->flags2 |= flags2;
th->threshold = 10;
#ifdef WEAPON_SFX
//Since rail and bounce have no thrown objects, this hack is necessary.
//Is creating thrown objects for rail and bounce more or less desirable than this?
if (th->info->seesound && !(th->flags2 & MF2_RAILRING) && !(th->flags2 & MF2_SCATTER))
S_StartSound(source, th->info->seesound);
#else
if (th->info->seesound)
S_StartSound(source, th->info->seesound);
#endif
P_SetTarget(&th->target, source);
Fix shells spawning under FOFs Make items dropped behind you fall on the floor properly Fix bananas getting stuck in midair if they aren't moving
2017-11-11 00:25:57 +00:00
if (P_IsObjectOnGround(source))
{
// floorz and ceilingz aren't properly set to account for FOFs and Polyobjects on spawn
// This should set it for FOFs
P_TeleportMove(th, th->x, th->y, th->z);
// spawn on the ground if the player is on the ground
if (P_MobjFlip(source) < 0)
{
th->z = th->ceilingz - th->height;
th->eflags |= MFE_VERTICALFLIP;
}
else
th->z = th->floorz;
}
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
th->angle = an;
We did it, we finally fixed... The Shell Boost Bug Instead of adding to your speed, it relatively multiplies it if you're above your top speed. This is applied to ALL of Kart projectiles as well, not just shells. May we never run into our own shell that we threw on a boost pad ever again.
2018-06-05 02:53:45 +00:00
th->momx = FixedMul(finalspeed, FINECOSINE(an>>ANGLETOFINESHIFT));
th->momy = FixedMul(finalspeed, FINESINE(an>>ANGLETOFINESHIFT));
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
Bugfix a Jawz crash Jeck got a few days ago. Not menu-based, but I guess this branch is misc PLUS menu stuff, not just menu stuff based on sal-misc.
2018-09-08 16:50:53 +00:00
switch (type)
Orbinaut
2018-07-23 00:55:18 +00:00
{
Bugfix a Jawz crash Jeck got a few days ago. Not menu-based, but I guess this branch is misc PLUS menu stuff, not just menu stuff based on sal-misc.
2018-09-08 16:50:53 +00:00
case MT_ORBINAUT:
if (source && source->player)
th->color = source->player->skincolor;
else
correct oversight in merge
2018-09-17 10:36:22 +00:00
th->color = SKINCOLOR_GREY;
Bugfix a Jawz crash Jeck got a few days ago. Not menu-based, but I guess this branch is misc PLUS menu stuff, not just menu stuff based on sal-misc.
2018-09-08 16:50:53 +00:00
break;
case MT_JAWZ:
if (source && source->player)
th->cvmem = source->player->skincolor;
else
th->cvmem = SKINCOLOR_RED;
//fallthrough
case MT_JAWZ_DUD:
S_StartSound(th, th->info->activesound);
break;
Forgot a default case.
2018-09-08 16:53:41 +00:00
default:
break;
Finishing touches on Ballhog - Ballhog has explosion + sound on death - Ballhog shrinks to nothing if it didn't hit anything - Replaced a Mario sound on Orbinaut - Fixed Jawz's sound effect - Fixed Mines not being removed on death pits
2018-07-25 02:47:09 +00:00
}
Orbinaut
2018-07-23 00:55:18 +00:00
Add graphic for throwing items Fix missing frame of clash
2017-10-24 16:19:14 +00:00
x = x + P_ReturnThrustX(source, an, source->radius + th->radius);
We did it, we finally fixed... The Shell Boost Bug Instead of adding to your speed, it relatively multiplies it if you're above your top speed. This is applied to ALL of Kart projectiles as well, not just shells. May we never run into our own shell that we threw on a boost pad ever again.
2018-06-05 02:53:45 +00:00
y = y + P_ReturnThrustY(source, an, source->radius + th->radius);
Merge in battle, unfuck the code
2017-11-21 07:23:06 +00:00
throwmo = P_SpawnMobj(x, y, z, MT_FIREDITEM);
Add graphic for throwing items Fix missing frame of clash
2017-10-24 16:19:14 +00:00
throwmo->movecount = 1;
throwmo->movedir = source->angle - an;
P_SetTarget(&throwmo->target, source);
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
return NULL;
}
New drift sparks
2018-09-11 23:52:00 +00:00
static void K_SpawnDriftSparks(player_t *player)
{
fixed_t newx;
fixed_t newy;
mobj_t *spark;
angle_t travelangle;
INT32 i;
I_Assert(player != NULL);
I_Assert(player->mo != NULL);
I_Assert(!P_MobjWasRemoved(player->mo));
if (leveltime % 2 == 1)
return;
if (!P_IsObjectOnGround(player->mo))
return;
if (!player->kartstuff[k_drift] || player->kartstuff[k_driftcharge] < K_GetKartDriftSparkValue(player))
return;
travelangle = player->mo->angle-(ANGLE_45/5)*player->kartstuff[k_drift];
for (i = 0; i < 2; i++)
{
newx = player->mo->x + P_ReturnThrustX(player->mo, travelangle + ((i&1) ? -1 : 1)*ANGLE_135, FixedMul(32*FRACUNIT, player->mo->scale));
newy = player->mo->y + P_ReturnThrustY(player->mo, travelangle + ((i&1) ? -1 : 1)*ANGLE_135, FixedMul(32*FRACUNIT, player->mo->scale));
spark = P_SpawnMobj(newx, newy, player->mo->z, MT_DRIFTSPARK);
P_SetTarget(&spark->target, player->mo);
spark->angle = travelangle-(ANGLE_45/5)*player->kartstuff[k_drift];
spark->destscale = player->mo->scale;
P_SetScale(spark, player->mo->scale);
spark->momx = player->mo->momx/2;
spark->momy = player->mo->momy/2;
//spark->momz = player->mo->momz/2;
Rainbow sparks
2018-09-14 03:39:41 +00:00
if (player->kartstuff[k_driftcharge] >= K_GetKartDriftSparkValue(player)*4)
New drift sparks
2018-09-11 23:52:00 +00:00
{
Rainbow sparks
2018-09-14 03:39:41 +00:00
spark->color = (UINT8)(1 + (leveltime % (MAXSKINCOLORS-1)));
}
else if (player->kartstuff[k_driftcharge] >= K_GetKartDriftSparkValue(player)*2)
{
if (player->kartstuff[k_driftcharge] <= (K_GetKartDriftSparkValue(player)*2)+(24*3))
Ketchup, faster drift sparks
2018-09-14 03:29:14 +00:00
spark->color = SKINCOLOR_RASPBERRY; // transition
New drift sparks
2018-09-11 23:52:00 +00:00
else
Ketchup, faster drift sparks
2018-09-14 03:29:14 +00:00
spark->color = SKINCOLOR_KETCHUP;
New drift sparks
2018-09-11 23:52:00 +00:00
}
else
spark->color = SKINCOLOR_SAPPHIRE;
if ((player->kartstuff[k_drift] > 0 && player->cmd.driftturn > 0) // Inward drifts
|| (player->kartstuff[k_drift] < 0 && player->cmd.driftturn < 0))
{
if ((player->kartstuff[k_drift] < 0 && (i & 1))
|| (player->kartstuff[k_drift] > 0 && !(i & 1)))
P_SetMobjState(spark, S_DRIFTSPARK_A1);
else if ((player->kartstuff[k_drift] < 0 && !(i & 1))
|| (player->kartstuff[k_drift] > 0 && (i & 1)))
P_SetMobjState(spark, S_DRIFTSPARK_C1);
}
else if ((player->kartstuff[k_drift] > 0 && player->cmd.driftturn < 0) // Outward drifts
|| (player->kartstuff[k_drift] < 0 && player->cmd.driftturn > 0))
{
if ((player->kartstuff[k_drift] < 0 && (i & 1))
|| (player->kartstuff[k_drift] > 0 && !(i & 1)))
P_SetMobjState(spark, S_DRIFTSPARK_C1);
else if ((player->kartstuff[k_drift] < 0 && !(i & 1))
|| (player->kartstuff[k_drift] > 0 && (i & 1)))
P_SetMobjState(spark, S_DRIFTSPARK_A1);
}
Address review (for anything code I did, anyway)
2018-09-20 21:11:11 +00:00
K_MatchGenericExtraFlags(spark, player->mo);
New drift sparks
2018-09-11 23:52:00 +00:00
}
}
angel island drift strat plus ketchup
2018-09-13 23:19:23 +00:00
static void K_SpawnAIZDust(player_t *player)
{
fixed_t newx;
fixed_t newy;
mobj_t *spark;
angle_t travelangle;
I_Assert(player != NULL);
I_Assert(player->mo != NULL);
I_Assert(!P_MobjWasRemoved(player->mo));
if (leveltime % 2 == 1)
return;
if (!P_IsObjectOnGround(player->mo))
return;
travelangle = R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy);
{
newx = player->mo->x + P_ReturnThrustX(player->mo, travelangle - (player->kartstuff[k_aizdriftstrat]*ANGLE_45), FixedMul(24*FRACUNIT, player->mo->scale));
newy = player->mo->y + P_ReturnThrustY(player->mo, travelangle - (player->kartstuff[k_aizdriftstrat]*ANGLE_45), FixedMul(24*FRACUNIT, player->mo->scale));
spark = P_SpawnMobj(newx, newy, player->mo->z, MT_AIZDRIFTSTRAT);
spark->angle = travelangle+(player->kartstuff[k_aizdriftstrat]*ANGLE_90);
P_SetScale(spark, (spark->destscale = (3*player->mo->scale)>>2));
spark->momx = (6*player->mo->momx)/5;
spark->momy = (6*player->mo->momy)/5;
//spark->momz = player->mo->momz/2;
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop # Conflicts: # src/info.c # src/k_kart.c
2018-09-21 20:05:47 +00:00
K_MatchGenericExtraFlags(spark, player->mo);
angel island drift strat plus ketchup
2018-09-13 23:19:23 +00:00
}
}
New Drift dust Applies all the time as long as the object is turning tight enough New Sound Works on Red Shells too!
2018-06-08 20:05:45 +00:00
void K_SpawnBoostTrail(player_t *player)
Updates done a while ago... Not 100% sure what they were. :x
2016-11-21 04:23:00 +00:00
{
fixed_t newx;
fixed_t newy;
fixed_t ground;
mobj_t *flame;
angle_t travelangle;
INT32 i;
I_Assert(player != NULL);
I_Assert(player->mo != NULL);
I_Assert(!P_MobjWasRemoved(player->mo));
General fixes - Flame trails don't spawn if you're not on the ground - Mobjscale: Shells are now the correct speed - Mobjscale: Explosion's wipeout hit height scales
2018-03-04 19:28:29 +00:00
if (!P_IsObjectOnGround(player->mo)
Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems # Conflicts: # src/d_netcmd.c # src/g_game.c # src/k_kart.c # src/p_enemy.c # src/p_inter.c # src/p_map.c # src/p_user.c # src/sounds.c # src/sounds.h # src/y_inter.c
2018-03-12 04:58:13 +00:00
|| player->kartstuff[k_hyudorotimer] != 0
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
|| (G_BattleGametype() && player->kartstuff[k_bumper] <= 0 && player->kartstuff[k_comebacktimer]))
General fixes - Flame trails don't spawn if you're not on the ground - Mobjscale: Shells are now the correct speed - Mobjscale: Explosion's wipeout hit height scales
2018-03-04 19:28:29 +00:00
return;
Updates done a while ago... Not 100% sure what they were. :x
2016-11-21 04:23:00 +00:00
if (player->mo->eflags & MFE_VERTICALFLIP)
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
ground = player->mo->ceilingz - FixedMul(mobjinfo[MT_SNEAKERTRAIL].height, player->mo->scale);
Updates done a while ago... Not 100% sure what they were. :x
2016-11-21 04:23:00 +00:00
else
ground = player->mo->floorz;
Fix drifting No longer does all the angle adjustments inside of the player thinker and instead does it with the controls Should hopefully avoid any desynch from drifting Also maybe fixed player 2's controls
2017-03-07 01:05:18 +00:00
if (player->kartstuff[k_drift] != 0)
Updates done a while ago... Not 100% sure what they were. :x
2016-11-21 04:23:00 +00:00
travelangle = player->mo->angle;
else
travelangle = R_PointToAngle2(0, 0, player->rmomx, player->rmomy);
for (i = 0; i < 2; i++)
{
newx = player->mo->x + P_ReturnThrustX(player->mo, travelangle + ((i&1) ? -1 : 1)*ANGLE_135, FixedMul(24*FRACUNIT, player->mo->scale));
newy = player->mo->y + P_ReturnThrustY(player->mo, travelangle + ((i&1) ? -1 : 1)*ANGLE_135, FixedMul(24*FRACUNIT, player->mo->scale));
#ifdef ESLOPE
if (player->mo->standingslope)
{
ground = P_GetZAt(player->mo->standingslope, newx, newy);
if (player->mo->eflags & MFE_VERTICALFLIP)
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
ground -= FixedMul(mobjinfo[MT_SNEAKERTRAIL].height, player->mo->scale);
Updates done a while ago... Not 100% sure what they were. :x
2016-11-21 04:23:00 +00:00
}
#endif
Merge branch 'master' into sonicitems
2018-06-10 02:50:21 +00:00
flame = P_SpawnMobj(newx, newy, ground, MT_SNEAKERTRAIL);
Updates done a while ago... Not 100% sure what they were. :x
2016-11-21 04:23:00 +00:00
P_SetTarget(&flame->target, player->mo);
flame->angle = travelangle;
flame->fuse = TICRATE*2;
flame->destscale = player->mo->scale;
P_SetScale(flame, player->mo->scale);
Address review (for anything code I did, anyway)
2018-09-20 21:11:11 +00:00
flame->eflags = (flame->eflags & ~MFE_VERTICALFLIP)|(player->mo->eflags & MFE_VERTICALFLIP); // not K_MatchGenericExtraFlags so that a stolen sneaker can be seen
Updates done a while ago... Not 100% sure what they were. :x
2016-11-21 04:23:00 +00:00
flame->momx = 8;
P_XYMovement(flame);
if (P_MobjWasRemoved(flame))
continue;
if (player->mo->eflags & MFE_VERTICALFLIP)
{
if (flame->z + flame->height < flame->ceilingz)
P_RemoveMobj(flame);
}
else if (flame->z > flame->floorz)
P_RemoveMobj(flame);
}
}
Maintenence - Fix merge issues - Update invincibility flash to use its own object instead of MT_OVERLAY, so extra hacks don't need baked into overlay thinking - K_SpawnSparkleTrail can accept mobjs now, since there really wasn't any reason it needed a player. - Comment out a few old MK/vanilla SRB2 effects for now
2018-06-10 20:10:24 +00:00
void K_SpawnSparkleTrail(mobj_t *mo)
New invincibility effect, grow/shrink stuff Whenever grow/shrink effects get made, I'll remove the Mario-style stuttered growth and whatever else needs doing beyond that
2018-02-10 06:19:33 +00:00
{
Maintenence - Fix merge issues - Update invincibility flash to use its own object instead of MT_OVERLAY, so extra hacks don't need baked into overlay thinking - K_SpawnSparkleTrail can accept mobjs now, since there really wasn't any reason it needed a player. - Comment out a few old MK/vanilla SRB2 effects for now
2018-06-10 20:10:24 +00:00
const INT32 rad = (mo->radius*2)>>FRACBITS;
New invincibility effect, grow/shrink stuff Whenever grow/shrink effects get made, I'll remove the Mario-style stuttered growth and whatever else needs doing beyond that
2018-02-10 06:19:33 +00:00
mobj_t *sparkle;
INT32 i;
Maintenence - Fix merge issues - Update invincibility flash to use its own object instead of MT_OVERLAY, so extra hacks don't need baked into overlay thinking - K_SpawnSparkleTrail can accept mobjs now, since there really wasn't any reason it needed a player. - Comment out a few old MK/vanilla SRB2 effects for now
2018-06-10 20:10:24 +00:00
I_Assert(mo != NULL);
I_Assert(!P_MobjWasRemoved(mo));
New invincibility effect, grow/shrink stuff Whenever grow/shrink effects get made, I'll remove the Mario-style stuttered growth and whatever else needs doing beyond that
2018-02-10 06:19:33 +00:00
for (i = 0; i < 3; i++)
{
Maintenence - Fix merge issues - Update invincibility flash to use its own object instead of MT_OVERLAY, so extra hacks don't need baked into overlay thinking - K_SpawnSparkleTrail can accept mobjs now, since there really wasn't any reason it needed a player. - Comment out a few old MK/vanilla SRB2 effects for now
2018-06-10 20:10:24 +00:00
fixed_t newx = mo->x + mo->momx + (P_RandomRange(-rad, rad)<<FRACBITS);
fixed_t newy = mo->y + mo->momy + (P_RandomRange(-rad, rad)<<FRACBITS);
fixed_t newz = mo->z + mo->momz + (P_RandomRange(0, mo->height>>FRACBITS)<<FRACBITS);
New invincibility effect, grow/shrink stuff Whenever grow/shrink effects get made, I'll remove the Mario-style stuttered growth and whatever else needs doing beyond that
2018-02-10 06:19:33 +00:00
sparkle = P_SpawnMobj(newx, newy, newz, MT_SPARKLETRAIL);
Fix all actionable comments in my review of sonicitems.
2018-08-09 21:59:52 +00:00
//if (i == 0)
//P_SetMobjState(sparkle, S_KARTINVULN_LARGE1);
New invincibility effect, grow/shrink stuff Whenever grow/shrink effects get made, I'll remove the Mario-style stuttered growth and whatever else needs doing beyond that
2018-02-10 06:19:33 +00:00
Maintenence - Fix merge issues - Update invincibility flash to use its own object instead of MT_OVERLAY, so extra hacks don't need baked into overlay thinking - K_SpawnSparkleTrail can accept mobjs now, since there really wasn't any reason it needed a player. - Comment out a few old MK/vanilla SRB2 effects for now
2018-06-10 20:10:24 +00:00
P_SetTarget(&sparkle->target, mo);
sparkle->destscale = mo->destscale;
P_SetScale(sparkle, mo->scale);
Address review (for anything code I did, anyway)
2018-09-20 21:11:11 +00:00
sparkle->eflags = (sparkle->eflags & ~MFE_VERTICALFLIP)|(mo->eflags & MFE_VERTICALFLIP); // not K_MatchGenericExtraFlags so that a stolen invincibility can be seen
Maintenence - Fix merge issues - Update invincibility flash to use its own object instead of MT_OVERLAY, so extra hacks don't need baked into overlay thinking - K_SpawnSparkleTrail can accept mobjs now, since there really wasn't any reason it needed a player. - Comment out a few old MK/vanilla SRB2 effects for now
2018-06-10 20:10:24 +00:00
sparkle->color = mo->color;
//sparkle->colorized = mo->colorized;
New invincibility effect, grow/shrink stuff Whenever grow/shrink effects get made, I'll remove the Mario-style stuttered growth and whatever else needs doing beyond that
2018-02-10 06:19:33 +00:00
}
Fix all actionable comments in my review of sonicitems.
2018-08-09 21:59:52 +00:00
P_SetMobjState(sparkle, S_KARTINVULN_LARGE1);
New invincibility effect, grow/shrink stuff Whenever grow/shrink effects get made, I'll remove the Mario-style stuttered growth and whatever else needs doing beyond that
2018-02-10 06:19:33 +00:00
}
Banana drag touches - Banana drag timer resets when placing one, for x3 & x10 bananas - Banana dragging spawns transulcent dust - Dragging bananas make them twitch up & down
2018-07-25 16:49:30 +00:00
void K_SpawnWipeoutTrail(mobj_t *mo, boolean translucent)
Wipeout bumps - You can bump other people during spinout. - Bumping during spinout activates a "slow down" timer, which increases your friction after a few tics. - You have a Smash-style dust effect after a spinout bump, indicating clearly if you'll slow down or not.
2018-07-20 02:37:32 +00:00
{
mobj_t *dust;
I_Assert(mo != NULL);
I_Assert(!P_MobjWasRemoved(mo));
Scale fixes
2018-09-27 21:17:04 +00:00
dust = P_SpawnMobj(mo->x + (P_RandomRange(-25,25) * mo->scale), mo->y + (P_RandomRange(-25,25) * mo->scale), mo->z, MT_WIPEOUTTRAIL);
Wipeout bumps - You can bump other people during spinout. - Bumping during spinout activates a "slow down" timer, which increases your friction after a few tics. - You have a Smash-style dust effect after a spinout bump, indicating clearly if you'll slow down or not.
2018-07-20 02:37:32 +00:00
P_SetTarget(&dust->target, mo);
dust->angle = R_PointToAngle2(0,0,mo->momx,mo->momy);
dust->destscale = mo->scale;
P_SetScale(dust, mo->scale);
Address review (for anything code I did, anyway)
2018-09-20 21:11:11 +00:00
dust->eflags = (dust->eflags & ~MFE_VERTICALFLIP)|(mo->eflags & MFE_VERTICALFLIP); // not K_MatchGenericExtraFlags because hyudoro shouldn't be able to wipeout
Banana drag touches - Banana drag timer resets when placing one, for x3 & x10 bananas - Banana dragging spawns transulcent dust - Dragging bananas make them twitch up & down
2018-07-25 16:49:30 +00:00
if (translucent)
dust->flags2 |= MF2_SHADOW;
Wipeout bumps - You can bump other people during spinout. - Bumping during spinout activates a "slow down" timer, which increases your friction after a few tics. - You have a Smash-style dust effect after a spinout bump, indicating clearly if you'll slow down or not.
2018-07-20 02:37:32 +00:00
}
New Drift dust Applies all the time as long as the object is turning tight enough New Sound Works on Red Shells too!
2018-06-08 20:05:45 +00:00
// K_DriftDustHandling
// Parameters:
// spawner: The map object that is spawning the drift dust
// Description: Spawns the drift dust for objects, players use rmomx/y, other objects use regular momx/y.
// Also plays the drift sound.
// Other objects should be angled towards where they're trying to go so they don't randomly spawn dust
// Do note that most of the function won't run in odd intervals of frames
void K_DriftDustHandling(mobj_t *spawner)
{
angle_t anglediff;
const INT16 spawnrange = spawner->radius>>FRACBITS;
if (!P_IsObjectOnGround(spawner) || leveltime % 2 != 0)
return;
if (spawner->player)
{
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
if (spawner->player->pflags & PF_SKIDDOWN)
New Drift dust Applies all the time as long as the object is turning tight enough New Sound Works on Red Shells too!
2018-06-08 20:05:45 +00:00
{
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
anglediff = abs(spawner->angle - spawner->player->frameangle);
if (leveltime % 6 == 0)
S_StartSound(spawner, sfx_screec); // repeated here because it doesn't always happen to be within the range when this is the case
New Drift dust Applies all the time as long as the object is turning tight enough New Sound Works on Red Shells too!
2018-06-08 20:05:45 +00:00
}
else
{
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
angle_t playerangle = spawner->angle;
if (spawner->player->speed < 5<<FRACBITS)
return;
if (spawner->player->cmd.forwardmove < 0)
playerangle += ANGLE_180;
anglediff = abs(playerangle - R_PointToAngle2(0, 0, spawner->player->rmomx, spawner->player->rmomy));
New Drift dust Applies all the time as long as the object is turning tight enough New Sound Works on Red Shells too!
2018-06-08 20:05:45 +00:00
}
}
else
{
if (P_AproxDistance(spawner->momx, spawner->momy) < 5<<FRACBITS)
return;
anglediff = abs(spawner->angle - R_PointToAngle2(0, 0, spawner->momx, spawner->momy));
}
if (anglediff > ANGLE_180)
anglediff = InvAngle(anglediff);
if (anglediff > ANG10*4) // Trying to turn further than 40 degrees
{
fixed_t spawnx = P_RandomRange(-spawnrange, spawnrange)<<FRACBITS;
fixed_t spawny = P_RandomRange(-spawnrange, spawnrange)<<FRACBITS;
INT32 speedrange = 2;
mobj_t *dust = P_SpawnMobj(spawner->x + spawnx, spawner->y + spawny, spawner->z, MT_DRIFTDUST);
Reverse gravity fixes pt 1: basic driving - Turning dust is spawned in the correct position - Turning dust sprites are flipped - Shadows display on the ceiling for flipped objects - Drift sparks display in the correct position for flipped players Will continue with item fixes tomorrow
2018-07-28 06:37:00 +00:00
if (spawner->eflags & MFE_VERTICALFLIP)
{
dust->z += spawner->height - dust->height;
}
Scale fixes
2018-09-27 21:17:04 +00:00
dust->momx = FixedMul(spawner->momx + (P_RandomRange(-speedrange, speedrange)<<FRACBITS), 3*(spawner->scale)/4);
dust->momy = FixedMul(spawner->momy + (P_RandomRange(-speedrange, speedrange)<<FRACBITS), 3*(spawner->scale)/4);
dust->momz = P_MobjFlip(spawner) * (P_RandomRange(1, 4) * (spawner->scale));
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
P_SetScale(dust, spawner->scale/2);
New Drift dust Applies all the time as long as the object is turning tight enough New Sound Works on Red Shells too!
2018-06-08 20:05:45 +00:00
dust->destscale = spawner->scale * 3;
No more whack-a-mole (not 100% certain all of these are correct, please check the diff closely before reinstating plusone sal)
2018-10-19 20:53:02 +00:00
dust->scalespeed = spawner->scale/12;
MFE_DRAWONLYFORPx stuff ported to OpenGL, and MT_DRIFTDUST respects Boo powers
2018-06-11 06:15:27 +00:00
New Drift dust Applies all the time as long as the object is turning tight enough New Sound Works on Red Shells too!
2018-06-08 20:05:45 +00:00
if (leveltime % 6 == 0)
S_StartSound(spawner, sfx_screec);
MFE_DRAWONLYFORPx stuff ported to OpenGL, and MT_DRIFTDUST respects Boo powers
2018-06-11 06:15:27 +00:00
Scale fixes
2018-09-27 21:17:04 +00:00
K_MatchGenericExtraFlags(dust, spawner);
New Drift dust Applies all the time as long as the object is turning tight enough New Sound Works on Red Shells too!
2018-06-08 20:05:45 +00:00
}
}
Held item changes
2018-06-27 19:58:43 +00:00
static mobj_t *K_FindLastTrailMobj(player_t *player)
Trailling items Needs redone with a linked list and remove mobjtable; it doesn't like netgames atm
2018-06-16 21:54:12 +00:00
{
First substantial commit! * PRETTY SURE I fixed that bastardacious issue with multiple shield items disappearing at once. Done via introducing lastlook to store the updated count. * Fix an issue with incorrect scale setting for shield items. * Clean up a bunch of weird shit with regards to setting of hnext/hprev chains. (Why does the player go on the opposite end to the direction you enter the chain from...) * Repair hnext chain on mobjremoval as well. May or may not remove the need for overlay/shadow thinkers; too tired/excited to dig into that atm.
2018-06-28 00:20:19 +00:00
mobj_t *trail;
Trailling items Needs redone with a linked list and remove mobjtable; it doesn't like netgames atm
2018-06-16 21:54:12 +00:00
WANTED
2018-07-01 08:36:09 +00:00
if (!player || !(trail = player->mo) || !player->mo->hnext || !player->mo->hnext->health)
Trailling items Needs redone with a linked list and remove mobjtable; it doesn't like netgames atm
2018-06-16 21:54:12 +00:00
return NULL;
Hopefully some medicine for the characters' sore throats from all that taunting Also my editor ate some trailing whitespace.
2018-07-04 21:25:38 +00:00
WANTED
2018-07-01 08:36:09 +00:00
while (trail->hnext && !P_MobjWasRemoved(trail->hnext) && trail->hnext->health)
Trailling items Needs redone with a linked list and remove mobjtable; it doesn't like netgames atm
2018-06-16 21:54:12 +00:00
{
Linked list bananas, hnext/hprev fixes
2018-06-16 23:57:08 +00:00
trail = trail->hnext;
Trailling items Needs redone with a linked list and remove mobjtable; it doesn't like netgames atm
2018-06-16 21:54:12 +00:00
}
return trail;
}
Addressed some of Chrome's thoughts - Don't drag - Shield isn't visible to anyone but yourself - Projectile is twice as heavy
2018-09-04 23:58:20 +00:00
static mobj_t *K_ThrowKartItem(player_t *player, boolean missile, mobjtype_t mapthing, INT32 defaultDir, INT32 altthrow)
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
{
mobj_t *mo;
Fixed thrown items (99% sure) Thrown items are thrown farther now; distance based on CC.
2017-10-11 14:48:32 +00:00
INT32 dir, PROJSPEED;
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
angle_t newangle;
Banana drag touches - Banana drag timer resets when placing one, for x3 & x10 bananas - Banana dragging spawns transulcent dust - Dragging bananas make them twitch up & down
2018-07-25 16:49:30 +00:00
fixed_t newx, newy, newz;
Merge in battle, unfuck the code
2017-11-21 07:23:06 +00:00
mobj_t *throwmo;
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
if (!player)
return NULL;
Chaotix sound effects, new music names
2018-02-10 21:01:09 +00:00
// Figure out projectile speed by game speed
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
switch (gamespeed)
Fixed thrown items (99% sure) Thrown items are thrown farther now; distance based on CC.
2017-10-11 14:48:32 +00:00
{
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
case 0:
Chaotix sound effects, new music names
2018-02-10 21:01:09 +00:00
PROJSPEED = 68*(mapheaderinfo[gamemap-1]->mobj_scale); // Avg Speed is 34
Fixed thrown items (99% sure) Thrown items are thrown farther now; distance based on CC.
2017-10-11 14:48:32 +00:00
break;
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
case 2:
Chaotix sound effects, new music names
2018-02-10 21:01:09 +00:00
PROJSPEED = 96*(mapheaderinfo[gamemap-1]->mobj_scale); // Avg Speed is 48
Fixed thrown items (99% sure) Thrown items are thrown farther now; distance based on CC.
2017-10-11 14:48:32 +00:00
break;
default:
Chaotix sound effects, new music names
2018-02-10 21:01:09 +00:00
PROJSPEED = 82*(mapheaderinfo[gamemap-1]->mobj_scale); // Avg Speed is 41
Fixed thrown items (99% sure) Thrown items are thrown farther now; distance based on CC.
2017-10-11 14:48:32 +00:00
break;
}
Addressed some of Chrome's thoughts - Don't drag - Shield isn't visible to anyone but yourself - Projectile is twice as heavy
2018-09-04 23:58:20 +00:00
if (altthrow)
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
{
Addressed some of Chrome's thoughts - Don't drag - Shield isn't visible to anyone but yourself - Projectile is twice as heavy
2018-09-04 23:58:20 +00:00
if (altthrow == 2) // Kitchen sink throwing
{
if (player->kartstuff[k_throwdir] == 1)
dir = 3;
else if (player->kartstuff[k_throwdir] == -1)
dir = 1;
else
dir = 2;
}
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
else
Addressed some of Chrome's thoughts - Don't drag - Shield isn't visible to anyone but yourself - Projectile is twice as heavy
2018-09-04 23:58:20 +00:00
{
if (player->kartstuff[k_throwdir] == 1)
dir = 2;
else if (player->kartstuff[k_throwdir] == -1)
dir = -1;
else
dir = 1;
}
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
}
else
{
if (player->kartstuff[k_throwdir] != 0)
dir = player->kartstuff[k_throwdir];
else
dir = defaultDir;
}
Misc tweaks just about everywhere - More Jawz states for later - Jawz orbit their user in the right direction now. - Banana trails made closer to each other - wheels.lua hardcoded - All held items take a double press, for consistency. - Fixed Karma Items not being able to be collected by invincibility or hyudoro users
2018-06-18 04:42:53 +00:00
if (missile) // Shootables
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
{
Revert MT_FIREBALL to vanilla, remove MT_FIRETRAIL, MT_BALLHOG added, bigger Jawz explosions
2018-06-25 21:12:01 +00:00
if (mapthing == MT_BALLHOG) // Messy
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
{
Fireballs work, added to roulette. Removed [k_fireballtimer] since it is not going to be used.
2017-05-13 15:14:26 +00:00
if (dir == -1)
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
{
Fireballs work, added to roulette. Removed [k_fireballtimer] since it is not going to be used.
2017-05-13 15:14:26 +00:00
// Shoot backward
- Revamped Jawz targetting for Battle Mode - Cleaned up some redundant code - Halved the speed of backwards thrown missiles (previously PROJSPEED/2, now is PROJSPEED/4)
2018-08-29 22:12:02 +00:00
mo = K_SpawnKartMissile(player->mo, mapthing, player->mo->angle + ANGLE_180 - 0x06000000, 0, PROJSPEED/4);
K_SpawnKartMissile(player->mo, mapthing, player->mo->angle + ANGLE_180 - 0x03000000, 0, PROJSPEED/4);
K_SpawnKartMissile(player->mo, mapthing, player->mo->angle + ANGLE_180, 0, PROJSPEED/4);
K_SpawnKartMissile(player->mo, mapthing, player->mo->angle + ANGLE_180 + 0x03000000, 0, PROJSPEED/4);
K_SpawnKartMissile(player->mo, mapthing, player->mo->angle + ANGLE_180 + 0x06000000, 0, PROJSPEED/4);
Fireballs work, added to roulette. Removed [k_fireballtimer] since it is not going to be used.
2017-05-13 15:14:26 +00:00
}
else
{
// Shoot forward
Various held and thrown items tweaks "Missile" items are spawned on the ground and should follow slopes when the player is on the ground Forwards thrown items should work in reverse gravity Dropped items are dropped slightly closer (depends on player and item radius) and have their position set correctly Held items are held closer (depends on player and item radius)
2017-11-06 15:27:15 +00:00
mo = K_SpawnKartMissile(player->mo, mapthing, player->mo->angle - 0x06000000, 0, PROJSPEED);
K_SpawnKartMissile(player->mo, mapthing, player->mo->angle - 0x03000000, 0, PROJSPEED);
K_SpawnKartMissile(player->mo, mapthing, player->mo->angle, 0, PROJSPEED);
K_SpawnKartMissile(player->mo, mapthing, player->mo->angle + 0x03000000, 0, PROJSPEED);
K_SpawnKartMissile(player->mo, mapthing, player->mo->angle + 0x06000000, 0, PROJSPEED);
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
}
}
Misc tweaks just about everywhere - More Jawz states for later - Jawz orbit their user in the right direction now. - Banana trails made closer to each other - wheels.lua hardcoded - All held items take a double press, for consistency. - Fixed Karma Items not being able to be collected by invincibility or hyudoro users
2018-06-18 04:42:53 +00:00
else
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
{
New SPB May not make it to R1, but oh well
2018-10-18 08:43:50 +00:00
if (dir == -1 && mapthing != MT_SPB)
Fireballs work, added to roulette. Removed [k_fireballtimer] since it is not going to be used.
2017-05-13 15:14:26 +00:00
{
// Shoot backward
- Revamped Jawz targetting for Battle Mode - Cleaned up some redundant code - Halved the speed of backwards thrown missiles (previously PROJSPEED/2, now is PROJSPEED/4)
2018-08-29 22:12:02 +00:00
mo = K_SpawnKartMissile(player->mo, mapthing, player->mo->angle + ANGLE_180, 0, PROJSPEED/4);
Fireballs work, added to roulette. Removed [k_fireballtimer] since it is not going to be used.
2017-05-13 15:14:26 +00:00
}
else
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
{
Fireballs work, added to roulette. Removed [k_fireballtimer] since it is not going to be used.
2017-05-13 15:14:26 +00:00
// Shoot forward
We did it, we finally fixed... The Shell Boost Bug Instead of adding to your speed, it relatively multiplies it if you're above your top speed. This is applied to ALL of Kart projectiles as well, not just shells. May we never run into our own shell that we threw on a boost pad ever again.
2018-06-05 02:53:45 +00:00
mo = K_SpawnKartMissile(player->mo, mapthing, player->mo->angle, 0, PROJSPEED);
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
}
}
}
else
{
* Fix various instances where bananadrag might not be reset. * Improve K_KillBananaChain to be tail recursive.
2018-08-06 15:19:07 +00:00
player->kartstuff[k_bananadrag] = 0; // RESET timer, for multiple bananas
Addressed some of Chrome's thoughts - Don't drag - Shield isn't visible to anyone but yourself - Projectile is twice as heavy
2018-09-04 23:58:20 +00:00
if (dir > 0)
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
{
// Shoot forward
I actually didn't do any of this right!! Whoops!! Also made red shells dumb in battle mode
2017-11-03 01:40:06 +00:00
mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z + player->mo->height/2, mapthing);
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
mo->threshold = 10;
P_SetTarget(&mo->target, player->mo);
Tossed and shell hitting player sound Made clash audiable from a bit further away
2017-10-24 19:59:09 +00:00
S_StartSound(player->mo, mo->info->seesound);
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
if (mo)
{
angle_t fa = player->mo->angle>>ANGLETOFINESHIFT;
Addressed some of Chrome's thoughts - Don't drag - Shield isn't visible to anyone but yourself - Projectile is twice as heavy
2018-09-04 23:58:20 +00:00
INT32 HEIGHT = (20 + (dir*10))*(mapheaderinfo[gamemap-1]->mobj_scale) + player->mo->momz;
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
Addressed some of Chrome's thoughts - Don't drag - Shield isn't visible to anyone but yourself - Projectile is twice as heavy
2018-09-04 23:58:20 +00:00
mo->momx = player->mo->momx + FixedMul(FINECOSINE(fa), (altthrow == 2 ? 2*PROJSPEED/3 : PROJSPEED));
mo->momy = player->mo->momy + FixedMul(FINESINE(fa), (altthrow == 2 ? 2*PROJSPEED/3 : PROJSPEED));
Various held and thrown items tweaks "Missile" items are spawned on the ground and should follow slopes when the player is on the ground Forwards thrown items should work in reverse gravity Dropped items are dropped slightly closer (depends on player and item radius) and have their position set correctly Held items are held closer (depends on player and item radius)
2017-11-06 15:27:15 +00:00
mo->momz = P_MobjFlip(player->mo) * HEIGHT;
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
if (player->mo->eflags & MFE_VERTICALFLIP)
mo->eflags |= MFE_VERTICALFLIP;
}
Add graphic for throwing items Fix missing frame of clash
2017-10-24 16:19:14 +00:00
Merge in battle, unfuck the code
2017-11-21 07:23:06 +00:00
throwmo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z + player->mo->height/2, MT_FIREDITEM);
Add graphic for throwing items Fix missing frame of clash
2017-10-24 16:19:14 +00:00
P_SetTarget(&throwmo->target, player->mo);
throwmo->movecount = 0; // above player
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
}
else
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
{
Trailling items Needs redone with a linked list and remove mobjtable; it doesn't like netgames atm
2018-06-16 21:54:12 +00:00
mobj_t *lasttrail = K_FindLastTrailMobj(player);
Various held and thrown items tweaks "Missile" items are spawned on the ground and should follow slopes when the player is on the ground Forwards thrown items should work in reverse gravity Dropped items are dropped slightly closer (depends on player and item radius) and have their position set correctly Held items are held closer (depends on player and item radius)
2017-11-06 15:27:15 +00:00
Trailling items Needs redone with a linked list and remove mobjtable; it doesn't like netgames atm
2018-06-16 21:54:12 +00:00
if (lasttrail)
{
newx = lasttrail->x;
newy = lasttrail->y;
Banana drag touches - Banana drag timer resets when placing one, for x3 & x10 bananas - Banana dragging spawns transulcent dust - Dragging bananas make them twitch up & down
2018-07-25 16:49:30 +00:00
newz = lasttrail->z;
Trailling items Needs redone with a linked list and remove mobjtable; it doesn't like netgames atm
2018-06-16 21:54:12 +00:00
}
else
{
// Drop it directly behind you.
fixed_t dropradius = FixedHypot(player->mo->radius, player->mo->radius) + FixedHypot(mobjinfo[mapthing].radius, mobjinfo[mapthing].radius);
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
Trailling items Needs redone with a linked list and remove mobjtable; it doesn't like netgames atm
2018-06-16 21:54:12 +00:00
newangle = player->mo->angle;
newx = player->mo->x + P_ReturnThrustX(player->mo, newangle + ANGLE_180, dropradius);
newy = player->mo->y + P_ReturnThrustY(player->mo, newangle + ANGLE_180, dropradius);
Banana drag touches - Banana drag timer resets when placing one, for x3 & x10 bananas - Banana dragging spawns transulcent dust - Dragging bananas make them twitch up & down
2018-07-25 16:49:30 +00:00
newz = player->mo->z;
Trailling items Needs redone with a linked list and remove mobjtable; it doesn't like netgames atm
2018-06-16 21:54:12 +00:00
}
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
Banana drag touches - Banana drag timer resets when placing one, for x3 & x10 bananas - Banana dragging spawns transulcent dust - Dragging bananas make them twitch up & down
2018-07-25 16:49:30 +00:00
mo = P_SpawnMobj(newx, newy, newz, mapthing);
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
Fix shells spawning under FOFs Make items dropped behind you fall on the floor properly Fix bananas getting stuck in midair if they aren't moving
2017-11-11 00:25:57 +00:00
if (P_MobjFlip(player->mo) < 0)
mo->z = player->mo->z + player->mo->height - mo->height;
Various held and thrown items tweaks "Missile" items are spawned on the ground and should follow slopes when the player is on the ground Forwards thrown items should work in reverse gravity Dropped items are dropped slightly closer (depends on player and item radius) and have their position set correctly Held items are held closer (depends on player and item radius)
2017-11-06 15:27:15 +00:00
mo->threshold = 10;
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
P_SetTarget(&mo->target, player->mo);
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
Fix shells spawning under FOFs Make items dropped behind you fall on the floor properly Fix bananas getting stuck in midair if they aren't moving
2017-11-11 00:25:57 +00:00
if (P_IsObjectOnGround(player->mo))
{
// floorz and ceilingz aren't properly set to account for FOFs and Polyobjects on spawn
// This should set it for FOFs
P_TeleportMove(mo, mo->x, mo->y, mo->z);
if (P_MobjFlip(mo) > 0)
{
if (mo->floorz > mo->target->z - mo->height)
{
mo->z = mo->floorz;
}
}
else
{
if (mo->ceilingz < mo->target->z + mo->target->height + mo->height)
{
mo->z = mo->ceilingz - mo->height;
}
}
}
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
if (mo)
{
if (player->mo->eflags & MFE_VERTICALFLIP)
mo->eflags |= MFE_VERTICALFLIP;
}
}
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
}
Orbinaut
2018-07-23 00:55:18 +00:00
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
return mo;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
}
Radius is now a define
2018-09-16 09:16:30 +00:00
#define THUNDERRADIUS 320
Thunder Shield effect hardcode.
2018-09-16 08:31:24 +00:00
Thunder shield overlay
2018-08-04 19:48:31 +00:00
static void K_DoThunderShield(player_t *player)
Fixed thwomp sectors, Added Magnet Item.
2017-02-18 18:39:25 +00:00
{
Thunder Shield effect hardcode.
2018-09-16 08:31:24 +00:00
mobj_t *mo;
int i = 0;
fixed_t sx;
fixed_t sy;
Fix the mixed declaration and code warnings that only don't appear currently because of a tiny Makefile issue.
2018-10-07 14:35:54 +00:00
angle_t an;
Changed thundershield sound
2018-09-21 23:15:04 +00:00
S_StartSound(player->mo, sfx_zio3);
Thunder shield overlay
2018-08-04 19:48:31 +00:00
//player->kartstuff[k_thunderanim] = 35;
v1.3.16 -------- Fireballs narrower Fake Item is no longer restricted while held Held items that are restricted remain in the item wheel until used Magnet now correctly hits nearby players and objects
2017-05-18 03:09:38 +00:00
P_NukeEnemies(player->mo, player->mo, RING_DIST/4);
Fix the mixed declaration and code warnings that only don't appear currently because of a tiny Makefile issue.
2018-10-07 14:35:54 +00:00
Thunder Shield effect hardcode.
2018-09-16 08:31:24 +00:00
// spawn vertical bolt
mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_THOK);
P_SetTarget(&mo->target, player->mo);
P_SetMobjState(mo, S_LZIO11);
mo->color = SKINCOLOR_TEAL;
mo->scale = player->mo->scale*3 + (player->mo->scale/2);
Fix the mixed declaration and code warnings that only don't appear currently because of a tiny Makefile issue.
2018-10-07 14:35:54 +00:00
Thunder Shield effect hardcode.
2018-09-16 08:31:24 +00:00
mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_THOK);
P_SetTarget(&mo->target, player->mo);
P_SetMobjState(mo, S_LZIO21);
mo->color = SKINCOLOR_CYAN;
mo->scale = player->mo->scale*3 + (player->mo->scale/2);
Fix the mixed declaration and code warnings that only don't appear currently because of a tiny Makefile issue.
2018-10-07 14:35:54 +00:00
Thunder Shield effect hardcode.
2018-09-16 08:31:24 +00:00
// spawn horizontal bolts;
for (i=0; i<7; i++)
{
mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_THOK);
mo->angle = P_RandomRange(0, 359)*ANG1;
mo->fuse = P_RandomRange(20, 50);
P_SetTarget(&mo->target, player->mo);
P_SetMobjState(mo, S_KLIT1);
}
Fix the mixed declaration and code warnings that only don't appear currently because of a tiny Makefile issue.
2018-10-07 14:35:54 +00:00
// spawn the radius thing:
an = ANGLE_22h;
Thunder Shield effect hardcode.
2018-09-16 08:31:24 +00:00
for (i=0; i<15; i++)
{
Radius is now a define
2018-09-16 09:16:30 +00:00
sx = player->mo->x + FixedMul((player->mo->scale*THUNDERRADIUS), FINECOSINE((an*i)>>ANGLETOFINESHIFT));
sy = player->mo->y + FixedMul((player->mo->scale*THUNDERRADIUS), FINESINE((an*i)>>ANGLETOFINESHIFT));
Thunder Shield effect hardcode.
2018-09-16 08:31:24 +00:00
mo = P_SpawnMobj(sx, sy, player->mo->z, MT_THOK);
Spark radius now follows players
2018-09-20 16:31:38 +00:00
mo-> angle = an*i;
mo->extravalue1 = THUNDERRADIUS; // Used to know whether we should teleport by radius or something.
Thunder Shield effect hardcode.
2018-09-16 08:31:24 +00:00
mo->scale = player->mo->scale*3;
Spark radius now follows players
2018-09-20 16:31:38 +00:00
P_SetTarget(&mo->target, player->mo);
Thunder Shield effect hardcode.
2018-09-16 08:31:24 +00:00
P_SetMobjState(mo, S_KSPARK1);
}
Fixed thwomp sectors, Added Magnet Item.
2017-02-18 18:39:25 +00:00
}
Did everything toaster suggested
2018-09-21 23:47:13 +00:00
#undef THUNDERRADIUS
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
static void K_DoHyudoroSteal(player_t *player)
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
{
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
INT32 i, numplayers = 0;
INT32 playerswappable[MAXPLAYERS];
A bunch of little things - Minimum wall bounce speed decreased from 25*FRACUNIT to 15*FRACUNIT - Solid objects now bump players instead of stop them - Bounce pad strength scales with object scale - Fixed Boo stealing being inconsistent and sometimes not stealing anything
2018-01-08 20:48:19 +00:00
INT32 stealplayer = -1; // The player that's getting stolen from
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
INT32 prandom = 0;
Thunder shield overlay
2018-08-04 19:48:31 +00:00
boolean sink = P_RandomChance(FRACUNIT/64);
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
for (i = 0; i < MAXPLAYERS; i++)
{
if (playeringame[i] && players[i].mo && players[i].mo->health > 0 && players[i].playerstate == PST_LIVE
A bunch of little things - Minimum wall bounce speed decreased from 25*FRACUNIT to 15*FRACUNIT - Solid objects now bump players instead of stop them - Bounce pad strength scales with object scale - Fixed Boo stealing being inconsistent and sometimes not stealing anything
2018-01-08 20:48:19 +00:00
&& player != &players[i] && !players[i].exiting && !players[i].spectator // Player in-game
// Can steal from this player
Item tweakings - Mines last twice as long - Mines can appear in 1st with a measly 5% chance, for maximum ass-blasting - Mine shiiiiink sound no longer plays globally - Thrown Bananas and Eggman Monitors bounce off walls like Mines - Hyudoro can steal from anyone - Halved invincibility alarm/music distance - Getting out Orbinaut/Jawz plays a shield sound - Using Shrink plays a devastating Chaotix sound - SPB plays a high-pitched wail when it's locked in - Hyudoro plays a ghosty sound when used - Fixed Battle arrow roulette
2018-06-15 06:18:43 +00:00
&& (G_RaceGametype() //&& players[i].kartstuff[k_position] < player->kartstuff[k_position])
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
|| (G_BattleGametype() && players[i].kartstuff[k_bumper] > 0))
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
A bunch of little things - Minimum wall bounce speed decreased from 25*FRACUNIT to 15*FRACUNIT - Solid objects now bump players instead of stop them - Bounce pad strength scales with object scale - Fixed Boo stealing being inconsistent and sometimes not stealing anything
2018-01-08 20:48:19 +00:00
// Has an item
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
&& (players[i].kartstuff[k_itemtype]
&& players[i].kartstuff[k_itemamount]
&& !players[i].kartstuff[k_itemheld]))
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
{
A bunch of little things - Minimum wall bounce speed decreased from 25*FRACUNIT to 15*FRACUNIT - Solid objects now bump players instead of stop them - Bounce pad strength scales with object scale - Fixed Boo stealing being inconsistent and sometimes not stealing anything
2018-01-08 20:48:19 +00:00
playerswappable[numplayers] = i;
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
numplayers++;
}
}
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
prandom = P_RandomFixed();
Item tweakings - Mines last twice as long - Mines can appear in 1st with a measly 5% chance, for maximum ass-blasting - Mine shiiiiink sound no longer plays globally - Thrown Bananas and Eggman Monitors bounce off walls like Mines - Hyudoro can steal from anyone - Halved invincibility alarm/music distance - Getting out Orbinaut/Jawz plays a shield sound - Using Shrink plays a devastating Chaotix sound - SPB plays a high-pitched wail when it's locked in - Hyudoro plays a ghosty sound when used - Fixed Battle arrow roulette
2018-06-15 06:18:43 +00:00
S_StartSound(player->mo, sfx_s3k92);
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
if (sink && numplayers > 0 && cv_kitchensink.value) // BEHOLD THE KITCHEN SINK
Kitchen sink is back Haven't tested yet
2018-06-25 05:36:21 +00:00
{
player->kartstuff[k_hyudorotimer] = hyudorotime;
player->kartstuff[k_stealingtimer] = stealtime;
player->kartstuff[k_itemtype] = KITEM_KITCHENSINK;
player->kartstuff[k_itemamount] = 1;
player->kartstuff[k_itemheld] = 0;
return;
}
else if ((G_RaceGametype() && player->kartstuff[k_position] == 1) || numplayers == 0) // No-one can be stolen from? Oh well...
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
{
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
player->kartstuff[k_hyudorotimer] = hyudorotime;
player->kartstuff[k_stealingtimer] = stealtime;
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
return;
}
else if (numplayers == 1) // With just 2 players, we just need to set the other player to be the one to steal from
{
A bunch of little things - Minimum wall bounce speed decreased from 25*FRACUNIT to 15*FRACUNIT - Solid objects now bump players instead of stop them - Bounce pad strength scales with object scale - Fixed Boo stealing being inconsistent and sometimes not stealing anything
2018-01-08 20:48:19 +00:00
stealplayer = playerswappable[numplayers-1];
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
}
else if (numplayers > 1) // We need to choose between the available candidates for the 2nd player
{
stealplayer = playerswappable[prandom%(numplayers-1)];
}
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
A bunch of little things - Minimum wall bounce speed decreased from 25*FRACUNIT to 15*FRACUNIT - Solid objects now bump players instead of stop them - Bounce pad strength scales with object scale - Fixed Boo stealing being inconsistent and sometimes not stealing anything
2018-01-08 20:48:19 +00:00
if (stealplayer > -1) // Now here's where we do the stealing, has to be done here because we still know the player we're stealing from
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
{
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
player->kartstuff[k_hyudorotimer] = hyudorotime;
player->kartstuff[k_stealingtimer] = stealtime;
players[stealplayer].kartstuff[k_stolentimer] = stealtime;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
player->kartstuff[k_itemtype] = players[stealplayer].kartstuff[k_itemtype];
player->kartstuff[k_itemamount] = players[stealplayer].kartstuff[k_itemamount];
player->kartstuff[k_itemheld] = 0;
players[stealplayer].kartstuff[k_itemtype] = KITEM_NONE;
players[stealplayer].kartstuff[k_itemamount] = 0;
players[stealplayer].kartstuff[k_itemheld] = 0;
Item tweakings - Mines last twice as long - Mines can appear in 1st with a measly 5% chance, for maximum ass-blasting - Mine shiiiiink sound no longer plays globally - Thrown Bananas and Eggman Monitors bounce off walls like Mines - Hyudoro can steal from anyone - Halved invincibility alarm/music distance - Getting out Orbinaut/Jawz plays a shield sound - Using Shrink plays a devastating Chaotix sound - SPB plays a high-pitched wail when it's locked in - Hyudoro plays a ghosty sound when used - Fixed Battle arrow roulette
2018-06-15 06:18:43 +00:00
Minor fixes
2018-06-15 07:02:05 +00:00
if (P_IsLocalPlayer(&players[stealplayer]) && !splitscreen)
Item tweakings - Mines last twice as long - Mines can appear in 1st with a measly 5% chance, for maximum ass-blasting - Mine shiiiiink sound no longer plays globally - Thrown Bananas and Eggman Monitors bounce off walls like Mines - Hyudoro can steal from anyone - Halved invincibility alarm/music distance - Getting out Orbinaut/Jawz plays a shield sound - Using Shrink plays a devastating Chaotix sound - SPB plays a high-pitched wail when it's locked in - Hyudoro plays a ghosty sound when used - Fixed Battle arrow roulette
2018-06-15 06:18:43 +00:00
S_StartSound(NULL, sfx_s3k92);
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
}
}
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
Rocket Sneakers appear beside you
2018-10-07 22:53:46 +00:00
void K_DoSneaker(player_t *player, INT32 type)
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
{
boostcam scales based on previous boost
2018-10-08 20:20:30 +00:00
fixed_t intendedboost;
switch (gamespeed)
{
case 0:
intendedboost = 53740+768;
break;
case 2:
intendedboost = 17294+768;
break;
default:
intendedboost = 32768;
break;
}
Boost cam
2018-09-05 15:19:00 +00:00
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
if (!player->kartstuff[k_floorboost] || player->kartstuff[k_floorboost] == 3)
Scale fixes
2018-09-27 21:17:04 +00:00
{
Some fun sound changes - Peelout sound for sneaker boosts - Flicky grab sound for stealing balloons - Adaptive sounds for start boosts (drift boost for sub-optimal boosts, sneaker boost for good boosts, super transform sound for the frame perfect boost) - Orbinaut rollling sound
2018-06-26 16:02:14 +00:00
S_StartSound(player->mo, sfx_cdfm01);
Scale fixes
2018-09-27 21:17:04 +00:00
K_SpawnDashDustRelease(player);
boostcam scales based on previous boost
2018-10-08 20:20:30 +00:00
if (intendedboost > player->kartstuff[k_speedboost])
player->kartstuff[k_destboostcam] = FixedMul(FRACUNIT, FixedDiv((intendedboost - player->kartstuff[k_speedboost]), intendedboost));
Scale fixes
2018-09-27 21:17:04 +00:00
}
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
Placeholder boost effect
2018-09-07 03:49:51 +00:00
if (!player->kartstuff[k_sneakertimer])
{
Rocket Sneakers appear beside you
2018-10-07 22:53:46 +00:00
if (type == 2)
{
if (player->mo->hnext)
{
mobj_t *cur = player->mo->hnext;
while (cur && !P_MobjWasRemoved(cur))
{
if (!cur->tracer)
{
mobj_t *overlay = P_SpawnMobj(cur->x, cur->y, cur->z, MT_BOOSTFLAME);
P_SetTarget(&overlay->target, cur);
P_SetTarget(&cur->tracer, overlay);
P_SetScale(overlay, (overlay->destscale = 3*cur->scale/4));
}
cur = cur->hnext;
}
}
}
else
{
mobj_t *overlay = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_BOOSTFLAME);
P_SetTarget(&overlay->target, player->mo);
P_SetScale(overlay, (overlay->destscale = player->mo->scale));
}
Placeholder boost effect
2018-09-07 03:49:51 +00:00
}
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
player->kartstuff[k_sneakertimer] = sneakertime;
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
Rocket Sneakers appear beside you
2018-10-07 22:53:46 +00:00
if (type != 0)
Drop Dash + alternate start boosts New respawn boost behavior, where you just hold for long enough instead of timing it with hitting the ground. Also much weaker, just gives you enough boost to get going instead of being a free sneaker. Start boosts have been severely changed. The perfect one has an extra tic on its timing window and gets Sneaker boosting special effects, but every other possible boost has been severely nerfed.
2018-09-10 05:47:23 +00:00
{
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
player->pflags |= PF_ATTACKDOWN;
Merge branch 'master' into new-voices
2018-09-22 01:13:46 +00:00
K_PlayBoostTaunt(player->mo);
Drop Dash + alternate start boosts New respawn boost behavior, where you just hold for long enough instead of timing it with hitting the ground. Also much weaker, just gives you enough boost to get going instead of being a free sneaker. Start boosts have been severely changed. The perfect one has an extra tic on its timing window and gets Sneaker boosting special effects, but every other possible boost has been severely nerfed.
2018-09-10 05:47:23 +00:00
}
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
}
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
static void K_DoShrink(player_t *player)
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
{
SPB fixes Shrink also plays its sound, and Shrink/Grow have slower scaling speeds
2018-06-11 05:51:50 +00:00
INT32 i;
Chaotix sound effects, new music names
2018-02-10 21:01:09 +00:00
Item tweakings - Mines last twice as long - Mines can appear in 1st with a measly 5% chance, for maximum ass-blasting - Mine shiiiiink sound no longer plays globally - Thrown Bananas and Eggman Monitors bounce off walls like Mines - Hyudoro can steal from anyone - Halved invincibility alarm/music distance - Getting out Orbinaut/Jawz plays a shield sound - Using Shrink plays a devastating Chaotix sound - SPB plays a high-pitched wail when it's locked in - Hyudoro plays a ghosty sound when used - Fixed Battle arrow roulette
2018-06-15 06:18:43 +00:00
S_StartSound(player->mo, sfx_kc46); // Sound the BANG!
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
player->pflags |= PF_ATTACKDOWN;
SPB fixes Shrink also plays its sound, and Shrink/Grow have slower scaling speeds
2018-06-11 05:51:50 +00:00
for (i = 0; i < MAXPLAYERS; i++)
Most items work (netgame needs testing), will do fireballs later.
2017-02-26 22:37:52 +00:00
{
SPB fixes Shrink also plays its sound, and Shrink/Grow have slower scaling speeds
2018-06-11 05:51:50 +00:00
/*if (playeringame[i])
P_FlashPal(&players[i], PAL_NUKE, 10);*/
Most items work (netgame needs testing), will do fireballs later.
2017-02-26 22:37:52 +00:00
SPB fixes Shrink also plays its sound, and Shrink/Grow have slower scaling speeds
2018-06-11 05:51:50 +00:00
if (playeringame[i] && players[i].mo && !player->spectator
&& players[i].kartstuff[k_position] < player->kartstuff[k_position])
P_DamageMobj(players[i].mo, player->mo, player->mo, 64);
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
}
}
Spring *panels* now use `sfx_kc2f` again (but pogo spring *items* still do `sfx_kpogos`, in case you were worried).
2018-09-27 17:32:07 +00:00
void K_DoPogoSpring(mobj_t *mo, fixed_t vertispeed, UINT8 sound)
Bounce pad sector type Uses Ice/Sludge sector effect (new friction doesn't need it)
2017-11-07 07:36:27 +00:00
{
Spring jump changes for Grow & Shrink All spring jump issues on the sheet are fixed now.
2018-08-23 16:53:29 +00:00
const fixed_t vscale = mapheaderinfo[gamemap-1]->mobj_scale + (mo->scale - mapheaderinfo[gamemap-1]->mobj_scale);
Sping panel tweaks - Spring panels have a higher minimum forward speed, and you can no longer drop below that speed. - New, separate type of spring panel that has a maximum speed cap, for small jumps. - Unrelated: The SMK Donut Plains bushes now have much less thinker overhead. - Unrelated: Fixed my earlier attempt at getting momentum redirect to work when you just hit the ground.
2018-07-14 00:45:18 +00:00
Bounce Pad stuff - K_DoBouncePad now uses mobj_t instead of player_t - Bounce pads can now bump thrown shells - Bounce pads now give heavier gravity to players - The suicide command now works in all gamemodes
2017-11-19 07:37:28 +00:00
if (mo->player && mo->player->spectator)
Bounce pad sector type Uses Ice/Sludge sector effect (new friction doesn't need it)
2017-11-07 07:36:27 +00:00
return;
Bounce Pad stuff - K_DoBouncePad now uses mobj_t instead of player_t - Bounce pads can now bump thrown shells - Bounce pads now give heavier gravity to players - The suicide command now works in all gamemodes
2017-11-19 07:37:28 +00:00
if (mo->eflags & MFE_SPRUNG)
Bounce pad sector type Uses Ice/Sludge sector effect (new friction doesn't need it)
2017-11-07 07:36:27 +00:00
return;
#ifdef ESLOPE
Bounce Pad stuff - K_DoBouncePad now uses mobj_t instead of player_t - Bounce pads can now bump thrown shells - Bounce pads now give heavier gravity to players - The suicide command now works in all gamemodes
2017-11-19 07:37:28 +00:00
mo->standingslope = NULL;
Bounce pad sector type Uses Ice/Sludge sector effect (new friction doesn't need it)
2017-11-07 07:36:27 +00:00
#endif
Bounce Pad stuff - K_DoBouncePad now uses mobj_t instead of player_t - Bounce pads can now bump thrown shells - Bounce pads now give heavier gravity to players - The suicide command now works in all gamemodes
2017-11-19 07:37:28 +00:00
mo->eflags |= MFE_SPRUNG;
if (mo->eflags & MFE_VERTICALFLIP)
Bounce pad sector type Uses Ice/Sludge sector effect (new friction doesn't need it)
2017-11-07 07:36:27 +00:00
vertispeed *= -1;
Bounce Pad stuff - K_DoBouncePad now uses mobj_t instead of player_t - Bounce pads can now bump thrown shells - Bounce pads now give heavier gravity to players - The suicide command now works in all gamemodes
2017-11-19 07:37:28 +00:00
if (vertispeed == 0)
{
fixed_t thrust;
if (mo->player)
{
thrust = 3*mo->player->speed/2;
if (thrust < 48<<FRACBITS)
thrust = 48<<FRACBITS;
Many things! - Position faces are now drawn in Battle, categorized first by balloons, then by points - Balloon-based items, gives people who are worse off better items, and people who are better off worse items. - You can strafe while using feather or while using a bounce pad - Reduced the strength of bounce pad thrust on items - Increased bounce pad's minimum forward push on players - Made Frantic Mode just a teeeeensy bit more frantic - Fixed being able to use Feathers mid-air - Fixed being unable to steal Feathers - Drift sparks use frameangle instead of angle
2017-11-23 02:40:17 +00:00
if (thrust > 72<<FRACBITS)
thrust = 72<<FRACBITS;
Sping panel tweaks - Spring panels have a higher minimum forward speed, and you can no longer drop below that speed. - New, separate type of spring panel that has a maximum speed cap, for small jumps. - Unrelated: The SMK Donut Plains bushes now have much less thinker overhead. - Unrelated: Fixed my earlier attempt at getting momentum redirect to work when you just hit the ground.
2018-07-14 00:45:18 +00:00
if (mo->player->kartstuff[k_pogospring] != 2)
{
if (mo->player->kartstuff[k_sneakertimer])
thrust = FixedMul(thrust, 5*FRACUNIT/4);
else if (mo->player->kartstuff[k_invincibilitytimer])
thrust = FixedMul(thrust, 9*FRACUNIT/8);
}
Bounce Pad stuff - K_DoBouncePad now uses mobj_t instead of player_t - Bounce pads can now bump thrown shells - Bounce pads now give heavier gravity to players - The suicide command now works in all gamemodes
2017-11-19 07:37:28 +00:00
}
else
{
Hundreds of tweaks - SPB multiplier depending on 1st-2nd distance - Removed the Battle-only k_poweritemtimer (hold over from when you could easily get invuln items all of the time), replaced it with a 2 invincibility item cap in ALL modes. - Spinout is affected by boosters, *properly* - Can no longer strafe while spinning out on speed bumps - Messed with how other items interact with speed bumps, again. - Old bounce code has been ported for non-players - Fixed Karma players being able to do anything after the round has ended. - Fixed sneaker and spinout timer weirdness - Fixed Mines still being hold-use - Fixed rubber-burn turn not working - Removed redundant k_spinout and unused k_boosting variables - Filled out the Color_Opposite table with Kart's new colors. Not really relevant right now (besides some extra Lua functionality) since nothing uses it, but will be nice for if we do the signpost from the sky idea.
2018-06-20 00:20:06 +00:00
thrust = FixedDiv(3*P_AproxDistance(mo->momx, mo->momy)/2, 5*FRACUNIT/2);
if (thrust < 16<<FRACBITS)
A bunch of little things - Minimum wall bounce speed decreased from 25*FRACUNIT to 15*FRACUNIT - Solid objects now bump players instead of stop them - Bounce pad strength scales with object scale - Fixed Boo stealing being inconsistent and sometimes not stealing anything
2018-01-08 20:48:19 +00:00
thrust = 16<<FRACBITS;
Hundreds of tweaks - SPB multiplier depending on 1st-2nd distance - Removed the Battle-only k_poweritemtimer (hold over from when you could easily get invuln items all of the time), replaced it with a 2 invincibility item cap in ALL modes. - Spinout is affected by boosters, *properly* - Can no longer strafe while spinning out on speed bumps - Messed with how other items interact with speed bumps, again. - Old bounce code has been ported for non-players - Fixed Karma players being able to do anything after the round has ended. - Fixed sneaker and spinout timer weirdness - Fixed Mines still being hold-use - Fixed rubber-burn turn not working - Removed redundant k_spinout and unused k_boosting variables - Filled out the Color_Opposite table with Kart's new colors. Not really relevant right now (besides some extra Lua functionality) since nothing uses it, but will be nice for if we do the signpost from the sky idea.
2018-06-20 00:20:06 +00:00
if (thrust > 32<<FRACBITS)
thrust = 32<<FRACBITS;
Bounce Pad stuff - K_DoBouncePad now uses mobj_t instead of player_t - Bounce pads can now bump thrown shells - Bounce pads now give heavier gravity to players - The suicide command now works in all gamemodes
2017-11-19 07:37:28 +00:00
}
Hundreds of tweaks - SPB multiplier depending on 1st-2nd distance - Removed the Battle-only k_poweritemtimer (hold over from when you could easily get invuln items all of the time), replaced it with a 2 invincibility item cap in ALL modes. - Spinout is affected by boosters, *properly* - Can no longer strafe while spinning out on speed bumps - Messed with how other items interact with speed bumps, again. - Old bounce code has been ported for non-players - Fixed Karma players being able to do anything after the round has ended. - Fixed sneaker and spinout timer weirdness - Fixed Mines still being hold-use - Fixed rubber-burn turn not working - Removed redundant k_spinout and unused k_boosting variables - Filled out the Color_Opposite table with Kart's new colors. Not really relevant right now (besides some extra Lua functionality) since nothing uses it, but will be nice for if we do the signpost from the sky idea.
2018-06-20 00:20:06 +00:00
Spring jump changes for Grow & Shrink All spring jump issues on the sheet are fixed now.
2018-08-23 16:53:29 +00:00
mo->momz = FixedMul(FINESINE(ANGLE_22h>>ANGLETOFINESHIFT), FixedMul(thrust, vscale));
Bounce Pad stuff - K_DoBouncePad now uses mobj_t instead of player_t - Bounce pads can now bump thrown shells - Bounce pads now give heavier gravity to players - The suicide command now works in all gamemodes
2017-11-19 07:37:28 +00:00
}
else
Spring jump changes for Grow & Shrink All spring jump issues on the sheet are fixed now.
2018-08-23 16:53:29 +00:00
mo->momz = FixedMul(vertispeed, vscale);
Bounce Pad stuff - K_DoBouncePad now uses mobj_t instead of player_t - Bounce pads can now bump thrown shells - Bounce pads now give heavier gravity to players - The suicide command now works in all gamemodes
2017-11-19 07:37:28 +00:00
Spring *panels* now use `sfx_kc2f` again (but pogo spring *items* still do `sfx_kpogos`, in case you were worried).
2018-09-27 17:32:07 +00:00
if (sound)
S_StartSound(mo, (sound == 1 ? sfx_kc2f : sfx_kpogos));
Bounce pad sector type Uses Ice/Sludge sector effect (new friction doesn't need it)
2017-11-07 07:36:27 +00:00
}
Linked list bananas, hnext/hprev fixes
2018-06-16 23:57:08 +00:00
void K_KillBananaChain(mobj_t *banana, mobj_t *inflictor, mobj_t *source)
{
* Fix various instances where bananadrag might not be reset. * Improve K_KillBananaChain to be tail recursive.
2018-08-06 15:19:07 +00:00
mobj_t *cachenext;
killnext:
cachenext = banana->hnext;
Linked list bananas, hnext/hprev fixes
2018-06-16 23:57:08 +00:00
if (banana->health)
{
if (banana->eflags & MFE_VERTICALFLIP)
banana->z -= banana->height;
else
banana->z += banana->height;
S_StartSound(banana, banana->info->deathsound);
P_KillMobj(banana, inflictor, source);
P_SetObjectMomZ(banana, 8*FRACUNIT, false);
if (inflictor)
P_InstaThrust(banana, R_PointToAngle2(inflictor->x, inflictor->y, banana->x, banana->y)+ANGLE_90, 16*FRACUNIT);
}
* Fix various instances where bananadrag might not be reset. * Improve K_KillBananaChain to be tail recursive.
2018-08-06 15:19:07 +00:00
if ((banana = cachenext))
goto killnext;
Linked list bananas, hnext/hprev fixes
2018-06-16 23:57:08 +00:00
}
No longer are orbiting/trailing objects in charge of removing themselves. * They're clearly not quick enough at the job, since it causes a bunch of silly race conditions. * Instead, K_UpdateHnextList and K_CleanHnextList are in charge of removing them, which are called in the circumstances itemamount (and itemheld/eggmanheld) is changed. * Also, tweak a few places so that trailers AND orbiters can use the same system. Also, some minor thingies. * Turn all the useless ```if (a) { A } else if (!a) { B }``` bullshit into ```if (a) { A } else { B }``` bullshit. * Fix up some minor inaccuracies in the playerarrow stuff that doesn't result in creating more sprites.
2018-08-24 14:14:18 +00:00
// Just for firing/dropping items.
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
void K_UpdateHnextList(player_t *player, boolean clean)
No longer are orbiting/trailing objects in charge of removing themselves. * They're clearly not quick enough at the job, since it causes a bunch of silly race conditions. * Instead, K_UpdateHnextList and K_CleanHnextList are in charge of removing them, which are called in the circumstances itemamount (and itemheld/eggmanheld) is changed. * Also, tweak a few places so that trailers AND orbiters can use the same system. Also, some minor thingies. * Turn all the useless ```if (a) { A } else if (!a) { B }``` bullshit into ```if (a) { A } else { B }``` bullshit. * Fix up some minor inaccuracies in the playerarrow stuff that doesn't result in creating more sprites.
2018-08-24 14:14:18 +00:00
{
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
mobj_t *work = player->mo, *nextwork;
No longer are orbiting/trailing objects in charge of removing themselves. * They're clearly not quick enough at the job, since it causes a bunch of silly race conditions. * Instead, K_UpdateHnextList and K_CleanHnextList are in charge of removing them, which are called in the circumstances itemamount (and itemheld/eggmanheld) is changed. * Also, tweak a few places so that trailers AND orbiters can use the same system. Also, some minor thingies. * Turn all the useless ```if (a) { A } else if (!a) { B }``` bullshit into ```if (a) { A } else { B }``` bullshit. * Fix up some minor inaccuracies in the playerarrow stuff that doesn't result in creating more sprites.
2018-08-24 14:14:18 +00:00
if (!work)
return;
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
nextwork = work->hnext;
No longer are orbiting/trailing objects in charge of removing themselves. * They're clearly not quick enough at the job, since it causes a bunch of silly race conditions. * Instead, K_UpdateHnextList and K_CleanHnextList are in charge of removing them, which are called in the circumstances itemamount (and itemheld/eggmanheld) is changed. * Also, tweak a few places so that trailers AND orbiters can use the same system. Also, some minor thingies. * Turn all the useless ```if (a) { A } else if (!a) { B }``` bullshit into ```if (a) { A } else { B }``` bullshit. * Fix up some minor inaccuracies in the playerarrow stuff that doesn't result in creating more sprites.
2018-08-24 14:14:18 +00:00
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
while ((work = nextwork) && !P_MobjWasRemoved(work))
No longer are orbiting/trailing objects in charge of removing themselves. * They're clearly not quick enough at the job, since it causes a bunch of silly race conditions. * Instead, K_UpdateHnextList and K_CleanHnextList are in charge of removing them, which are called in the circumstances itemamount (and itemheld/eggmanheld) is changed. * Also, tweak a few places so that trailers AND orbiters can use the same system. Also, some minor thingies. * Turn all the useless ```if (a) { A } else if (!a) { B }``` bullshit into ```if (a) { A } else { B }``` bullshit. * Fix up some minor inaccuracies in the playerarrow stuff that doesn't result in creating more sprites.
2018-08-24 14:14:18 +00:00
{
nextwork = work->hnext;
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
if (!clean && (!work->movedir || work->movedir <= (UINT16)player->kartstuff[k_itemamount]))
continue;
No longer are orbiting/trailing objects in charge of removing themselves. * They're clearly not quick enough at the job, since it causes a bunch of silly race conditions. * Instead, K_UpdateHnextList and K_CleanHnextList are in charge of removing them, which are called in the circumstances itemamount (and itemheld/eggmanheld) is changed. * Also, tweak a few places so that trailers AND orbiters can use the same system. Also, some minor thingies. * Turn all the useless ```if (a) { A } else if (!a) { B }``` bullshit into ```if (a) { A } else { B }``` bullshit. * Fix up some minor inaccuracies in the playerarrow stuff that doesn't result in creating more sprites.
2018-08-24 14:14:18 +00:00
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
P_RemoveMobj(work);
No longer are orbiting/trailing objects in charge of removing themselves. * They're clearly not quick enough at the job, since it causes a bunch of silly race conditions. * Instead, K_UpdateHnextList and K_CleanHnextList are in charge of removing them, which are called in the circumstances itemamount (and itemheld/eggmanheld) is changed. * Also, tweak a few places so that trailers AND orbiters can use the same system. Also, some minor thingies. * Turn all the useless ```if (a) { A } else if (!a) { B }``` bullshit into ```if (a) { A } else { B }``` bullshit. * Fix up some minor inaccuracies in the playerarrow stuff that doesn't result in creating more sprites.
2018-08-24 14:14:18 +00:00
}
}
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
// For getting hit!
void K_DropHnextList(player_t *player)
No longer are orbiting/trailing objects in charge of removing themselves. * They're clearly not quick enough at the job, since it causes a bunch of silly race conditions. * Instead, K_UpdateHnextList and K_CleanHnextList are in charge of removing them, which are called in the circumstances itemamount (and itemheld/eggmanheld) is changed. * Also, tweak a few places so that trailers AND orbiters can use the same system. Also, some minor thingies. * Turn all the useless ```if (a) { A } else if (!a) { B }``` bullshit into ```if (a) { A } else { B }``` bullshit. * Fix up some minor inaccuracies in the playerarrow stuff that doesn't result in creating more sprites.
2018-08-24 14:14:18 +00:00
{
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
mobj_t *work = player->mo, *nextwork, *dropwork;
INT32 flip;
mobjtype_t type;
Don't have all of your mines disappear into the aether if you have to shield-drop ONE, because they're not all out at once. (This is only really relevant to debug testing, given picking up additional HUD-dropped mines isn't very likely.
2018-10-03 19:56:43 +00:00
boolean orbit, ponground, dropall = true;
No longer are orbiting/trailing objects in charge of removing themselves. * They're clearly not quick enough at the job, since it causes a bunch of silly race conditions. * Instead, K_UpdateHnextList and K_CleanHnextList are in charge of removing them, which are called in the circumstances itemamount (and itemheld/eggmanheld) is changed. * Also, tweak a few places so that trailers AND orbiters can use the same system. Also, some minor thingies. * Turn all the useless ```if (a) { A } else if (!a) { B }``` bullshit into ```if (a) { A } else { B }``` bullshit. * Fix up some minor inaccuracies in the playerarrow stuff that doesn't result in creating more sprites.
2018-08-24 14:14:18 +00:00
if (!work)
return;
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
flip = P_MobjFlip(player->mo);
ponground = P_IsObjectOnGround(player->mo);
No longer are orbiting/trailing objects in charge of removing themselves. * They're clearly not quick enough at the job, since it causes a bunch of silly race conditions. * Instead, K_UpdateHnextList and K_CleanHnextList are in charge of removing them, which are called in the circumstances itemamount (and itemheld/eggmanheld) is changed. * Also, tweak a few places so that trailers AND orbiters can use the same system. Also, some minor thingies. * Turn all the useless ```if (a) { A } else if (!a) { B }``` bullshit into ```if (a) { A } else { B }``` bullshit. * Fix up some minor inaccuracies in the playerarrow stuff that doesn't result in creating more sprites.
2018-08-24 14:14:18 +00:00
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
if (player->kartstuff[k_itemtype] == KITEM_THUNDERSHIELD && player->kartstuff[k_itemamount])
{
K_DoThunderShield(player);
player->kartstuff[k_itemamount] = 0;
player->kartstuff[k_itemtype] = KITEM_NONE;
Thunder shield stuff! * Slightly bigger visual size! * Light-shadow! * Makes player fullbright if you have it! * Visuals finally removed instantly on shield drop! * Uses dark background for item icons! * Goes behind the player on some frames, faking layering!
2018-09-13 18:01:36 +00:00
player->kartstuff[k_curshield] = 0;
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
}
nextwork = work->hnext;
No longer are orbiting/trailing objects in charge of removing themselves. * They're clearly not quick enough at the job, since it causes a bunch of silly race conditions. * Instead, K_UpdateHnextList and K_CleanHnextList are in charge of removing them, which are called in the circumstances itemamount (and itemheld/eggmanheld) is changed. * Also, tweak a few places so that trailers AND orbiters can use the same system. Also, some minor thingies. * Turn all the useless ```if (a) { A } else if (!a) { B }``` bullshit into ```if (a) { A } else { B }``` bullshit. * Fix up some minor inaccuracies in the playerarrow stuff that doesn't result in creating more sprites.
2018-08-24 14:14:18 +00:00
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
while ((work = nextwork) && !P_MobjWasRemoved(work))
No longer are orbiting/trailing objects in charge of removing themselves. * They're clearly not quick enough at the job, since it causes a bunch of silly race conditions. * Instead, K_UpdateHnextList and K_CleanHnextList are in charge of removing them, which are called in the circumstances itemamount (and itemheld/eggmanheld) is changed. * Also, tweak a few places so that trailers AND orbiters can use the same system. Also, some minor thingies. * Turn all the useless ```if (a) { A } else if (!a) { B }``` bullshit into ```if (a) { A } else { B }``` bullshit. * Fix up some minor inaccuracies in the playerarrow stuff that doesn't result in creating more sprites.
2018-08-24 14:14:18 +00:00
{
nextwork = work->hnext;
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
switch (work->type)
{
// Kart orbit items
case MT_ORBINAUT_SHIELD:
orbit = true;
type = MT_ORBINAUT;
break;
case MT_JAWZ_SHIELD:
orbit = true;
type = MT_JAWZ_DUD;
break;
// Kart trailing items
case MT_BANANA_SHIELD:
orbit = false;
type = MT_BANANA;
break;
case MT_SSMINE_SHIELD:
orbit = false;
Don't have all of your mines disappear into the aether if you have to shield-drop ONE, because they're not all out at once. (This is only really relevant to debug testing, given picking up additional HUD-dropped mines isn't very likely.
2018-10-03 19:56:43 +00:00
dropall = false;
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
type = MT_SSMINE;
break;
The motherload: all of my Lua is hardcoded This took like 6 straight hours of work, never ask me for anything ever again
2018-10-29 09:00:08 +00:00
case MT_EGGMANITEM_SHIELD:
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
orbit = false;
The motherload: all of my Lua is hardcoded This took like 6 straight hours of work, never ask me for anything ever again
2018-10-29 09:00:08 +00:00
type = MT_EGGMANITEM;
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
break;
// intentionally do nothing
case MT_SINK_SHIELD:
Rocket Sneakers appear beside you
2018-10-07 22:53:46 +00:00
case MT_ROCKETSNEAKER:
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
return;
default:
continue;
}
dropwork = P_SpawnMobj(work->x, work->y, work->z, type);
P_SetTarget(&dropwork->target, player->mo);
dropwork->angle = work->angle;
dropwork->flags2 = work->flags2;
dropwork->flags |= MF_NOCLIPTHING;
dropwork->floorz = work->floorz;
dropwork->ceilingz = work->ceilingz;
No longer are orbiting/trailing objects in charge of removing themselves. * They're clearly not quick enough at the job, since it causes a bunch of silly race conditions. * Instead, K_UpdateHnextList and K_CleanHnextList are in charge of removing them, which are called in the circumstances itemamount (and itemheld/eggmanheld) is changed. * Also, tweak a few places so that trailers AND orbiters can use the same system. Also, some minor thingies. * Turn all the useless ```if (a) { A } else if (!a) { B }``` bullshit into ```if (a) { A } else { B }``` bullshit. * Fix up some minor inaccuracies in the playerarrow stuff that doesn't result in creating more sprites.
2018-08-24 14:14:18 +00:00
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
if (ponground)
{
// floorz and ceilingz aren't properly set to account for FOFs and Polyobjects on spawn
// This should set it for FOFs
//P_TeleportMove(dropwork, dropwork->x, dropwork->y, dropwork->z); -- handled better by above floorz/ceilingz passing
if (flip == 1)
{
if (dropwork->floorz > dropwork->target->z - dropwork->height)
{
dropwork->z = dropwork->floorz;
}
}
else
{
if (dropwork->ceilingz < dropwork->target->z + dropwork->target->height + dropwork->height)
{
dropwork->z = dropwork->ceilingz - dropwork->height;
}
}
}
if (orbit) // splay out
{
dropwork->flags2 |= MF2_AMBUSH;
dropwork->z += flip;
dropwork->momx = player->mo->momx>>1;
dropwork->momy = player->mo->momy>>1;
dropwork->momz = 3*flip*mapheaderinfo[gamemap-1]->mobj_scale;
P_Thrust(dropwork, work->angle - ANGLE_90, 6*(mapheaderinfo[gamemap-1]->mobj_scale));
dropwork->movecount = 2;
dropwork->movedir = work->angle - ANGLE_90;
P_SetMobjState(dropwork, dropwork->info->deathstate);
dropwork->tics = -1;
if (type == MT_JAWZ_DUD)
dropwork->z += 20*flip*dropwork->scale;
else
{
dropwork->color = work->color;
dropwork->angle -= ANGLE_90;
}
}
else // plop on the ground
{
dropwork->flags &= ~MF_NOCLIPTHING;
dropwork->threshold = 10;
}
P_RemoveMobj(work);
No longer are orbiting/trailing objects in charge of removing themselves. * They're clearly not quick enough at the job, since it causes a bunch of silly race conditions. * Instead, K_UpdateHnextList and K_CleanHnextList are in charge of removing them, which are called in the circumstances itemamount (and itemheld/eggmanheld) is changed. * Also, tweak a few places so that trailers AND orbiters can use the same system. Also, some minor thingies. * Turn all the useless ```if (a) { A } else if (!a) { B }``` bullshit into ```if (a) { A } else { B }``` bullshit. * Fix up some minor inaccuracies in the playerarrow stuff that doesn't result in creating more sprites.
2018-08-24 14:14:18 +00:00
}
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
{
// we need this here too because this is done in afterthink - pointers are cleaned up at the START of each tic...
P_SetTarget(&player->mo->hnext, NULL);
player->kartstuff[k_bananadrag] = 0;
if (player->kartstuff[k_eggmanheld])
player->kartstuff[k_eggmanheld] = 0;
Don't have all of your mines disappear into the aether if you have to shield-drop ONE, because they're not all out at once. (This is only really relevant to debug testing, given picking up additional HUD-dropped mines isn't very likely.
2018-10-03 19:56:43 +00:00
else if (player->kartstuff[k_itemheld]
&& (dropall || (--player->kartstuff[k_itemamount] <= 0)))
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
{
player->kartstuff[k_itemamount] = player->kartstuff[k_itemheld] = 0;
player->kartstuff[k_itemtype] = KITEM_NONE;
}
}
}
// For getting EXTRA hit!
void K_DropItems(player_t *player)
{
boolean thunderhack = (player->kartstuff[k_curshield] && player->kartstuff[k_itemtype] == KITEM_THUNDERSHIELD);
if (thunderhack)
player->kartstuff[k_itemtype] = KITEM_NONE;
K_DropHnextList(player);
if (player->mo && player->kartstuff[k_itemamount])
{
mobj_t *drop = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z + player->mo->height/2, MT_FLOATINGITEM);
* Slightly more papersprite stability! * Slightly more sane Minecraft item scaling!
2018-09-07 13:26:00 +00:00
P_SetScale(drop, drop->scale>>4);
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
drop->destscale = (3*drop->destscale)/2;;
drop->angle = player->mo->angle + ANGLE_90;
P_Thrust(drop,
FixedAngle(P_RandomFixed()*180) + player->mo->angle + ANGLE_90,
Buff the fuck out of item drop speed no, dude, don't turn right back around and pick your shit right back up, stop
2018-11-09 20:37:33 +00:00
16*(mapheaderinfo[gamemap-1]->mobj_scale));
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
drop->momz = P_MobjFlip(player->mo)*3*(mapheaderinfo[gamemap-1]->mobj_scale);
drop->threshold = (thunderhack ? KITEM_THUNDERSHIELD : player->kartstuff[k_itemtype]);
drop->movecount = player->kartstuff[k_itemamount];
drop->flags |= MF_NOCLIPTHING;
}
K_StripItems(player);
No longer are orbiting/trailing objects in charge of removing themselves. * They're clearly not quick enough at the job, since it causes a bunch of silly race conditions. * Instead, K_UpdateHnextList and K_CleanHnextList are in charge of removing them, which are called in the circumstances itemamount (and itemheld/eggmanheld) is changed. * Also, tweak a few places so that trailers AND orbiters can use the same system. Also, some minor thingies. * Turn all the useless ```if (a) { A } else if (!a) { B }``` bullshit into ```if (a) { A } else { B }``` bullshit. * Fix up some minor inaccuracies in the playerarrow stuff that doesn't result in creating more sprites.
2018-08-24 14:14:18 +00:00
}
// When an item in the hnext chain dies.
Held item changes
2018-06-27 19:58:43 +00:00
void K_RepairOrbitChain(mobj_t *orbit)
{
mobj_t *cachenext = orbit->hnext;
// First, repair the chain
WANTED
2018-07-01 08:36:09 +00:00
if (orbit->hnext && orbit->hnext->health && !P_MobjWasRemoved(orbit->hnext))
Held item changes
2018-06-27 19:58:43 +00:00
{
P_SetTarget(&orbit->hnext->hprev, orbit->hprev);
P_SetTarget(&orbit->hnext, NULL);
}
WANTED
2018-07-01 08:36:09 +00:00
if (orbit->hprev && orbit->hprev->health && !P_MobjWasRemoved(orbit->hprev))
Held item changes
2018-06-27 19:58:43 +00:00
{
P_SetTarget(&orbit->hprev->hnext, cachenext);
P_SetTarget(&orbit->hprev, NULL);
}
// Then recount to make sure item amount is correct
if (orbit->target && orbit->target->player)
{
INT32 num = 0;
First substantial commit! * PRETTY SURE I fixed that bastardacious issue with multiple shield items disappearing at once. Done via introducing lastlook to store the updated count. * Fix an issue with incorrect scale setting for shield items. * Clean up a bunch of weird shit with regards to setting of hnext/hprev chains. (Why does the player go on the opposite end to the direction you enter the chain from...) * Repair hnext chain on mobjremoval as well. May or may not remove the need for overlay/shadow thinkers; too tired/excited to dig into that atm.
2018-06-28 00:20:19 +00:00
mobj_t *cur = orbit->target->hnext;
mobj_t *prev = NULL;
Held item changes
2018-06-27 19:58:43 +00:00
First substantial commit! * PRETTY SURE I fixed that bastardacious issue with multiple shield items disappearing at once. Done via introducing lastlook to store the updated count. * Fix an issue with incorrect scale setting for shield items. * Clean up a bunch of weird shit with regards to setting of hnext/hprev chains. (Why does the player go on the opposite end to the direction you enter the chain from...) * Repair hnext chain on mobjremoval as well. May or may not remove the need for overlay/shadow thinkers; too tired/excited to dig into that atm.
2018-06-28 00:20:19 +00:00
while (cur && !P_MobjWasRemoved(cur))
Held item changes
2018-06-27 19:58:43 +00:00
{
prev = cur;
cur = cur->hnext;
First substantial commit! * PRETTY SURE I fixed that bastardacious issue with multiple shield items disappearing at once. Done via introducing lastlook to store the updated count. * Fix an issue with incorrect scale setting for shield items. * Clean up a bunch of weird shit with regards to setting of hnext/hprev chains. (Why does the player go on the opposite end to the direction you enter the chain from...) * Repair hnext chain on mobjremoval as well. May or may not remove the need for overlay/shadow thinkers; too tired/excited to dig into that atm.
2018-06-28 00:20:19 +00:00
if (++num > orbit->target->player->kartstuff[k_itemamount])
Held item changes
2018-06-27 19:58:43 +00:00
P_RemoveMobj(prev);
First substantial commit! * PRETTY SURE I fixed that bastardacious issue with multiple shield items disappearing at once. Done via introducing lastlook to store the updated count. * Fix an issue with incorrect scale setting for shield items. * Clean up a bunch of weird shit with regards to setting of hnext/hprev chains. (Why does the player go on the opposite end to the direction you enter the chain from...) * Repair hnext chain on mobjremoval as well. May or may not remove the need for overlay/shadow thinkers; too tired/excited to dig into that atm.
2018-06-28 00:20:19 +00:00
else
prev->movedir = num;
Held item changes
2018-06-27 19:58:43 +00:00
}
if (orbit->target->player->kartstuff[k_itemamount] != num)
orbit->target->player->kartstuff[k_itemamount] = num;
}
}
No longer are orbiting/trailing objects in charge of removing themselves. * They're clearly not quick enough at the job, since it causes a bunch of silly race conditions. * Instead, K_UpdateHnextList and K_CleanHnextList are in charge of removing them, which are called in the circumstances itemamount (and itemheld/eggmanheld) is changed. * Also, tweak a few places so that trailers AND orbiters can use the same system. Also, some minor thingies. * Turn all the useless ```if (a) { A } else if (!a) { B }``` bullshit into ```if (a) { A } else { B }``` bullshit. * Fix up some minor inaccuracies in the playerarrow stuff that doesn't result in creating more sprites.
2018-08-24 14:14:18 +00:00
// Move the hnext chain!
Held item changes
2018-06-27 19:58:43 +00:00
static void K_MoveHeldObjects(player_t *player)
{
if (!player->mo)
return;
if (!player->mo->hnext)
Banana drag slowdown, diagonal springs scale to map scale instead of object's scale, OGL skincolors average all colors
2018-07-04 23:06:45 +00:00
{
player->kartstuff[k_bananadrag] = 0;
Add some more safety checks to the item system. While I cannot guarantee the class of glitches that allows for additional items to be thrown/dropped has been completely obliterated, this DOES prevent the class of exploits that allows for "infinite items" (really just negative quantities not completely bounds-checked for).
2018-08-15 13:40:06 +00:00
if (player->kartstuff[k_eggmanheld])
player->kartstuff[k_eggmanheld] = 0;
else if (player->kartstuff[k_itemheld])
{
player->kartstuff[k_itemamount] = player->kartstuff[k_itemheld] = 0;
player->kartstuff[k_itemtype] = KITEM_NONE;
}
Held item changes
2018-06-27 19:58:43 +00:00
return;
Banana drag slowdown, diagonal springs scale to map scale instead of object's scale, OGL skincolors average all colors
2018-07-04 23:06:45 +00:00
}
Held item changes
2018-06-27 19:58:43 +00:00
* Fix various instances where bananadrag might not be reset. * Improve K_KillBananaChain to be tail recursive.
2018-08-06 15:19:07 +00:00
if (P_MobjWasRemoved(player->mo->hnext))
{
// we need this here too because this is done in afterthink - pointers are cleaned up at the START of each tic...
P_SetTarget(&player->mo->hnext, NULL);
player->kartstuff[k_bananadrag] = 0;
Add some more safety checks to the item system. While I cannot guarantee the class of glitches that allows for additional items to be thrown/dropped has been completely obliterated, this DOES prevent the class of exploits that allows for "infinite items" (really just negative quantities not completely bounds-checked for).
2018-08-15 13:40:06 +00:00
if (player->kartstuff[k_eggmanheld])
player->kartstuff[k_eggmanheld] = 0;
else if (player->kartstuff[k_itemheld])
{
player->kartstuff[k_itemamount] = player->kartstuff[k_itemheld] = 0;
player->kartstuff[k_itemtype] = KITEM_NONE;
}
* Fix various instances where bananadrag might not be reset. * Improve K_KillBananaChain to be tail recursive.
2018-08-06 15:19:07 +00:00
return;
}
Held item changes
2018-06-27 19:58:43 +00:00
switch (player->mo->hnext->type)
{
Orbinaut
2018-07-23 00:55:18 +00:00
case MT_ORBINAUT_SHIELD: // Kart orbit items
Held item changes
2018-06-27 19:58:43 +00:00
case MT_JAWZ_SHIELD:
{
mobj_t *cur = player->mo->hnext;
Banana drag slowdown, diagonal springs scale to map scale instead of object's scale, OGL skincolors average all colors
2018-07-04 23:06:45 +00:00
player->kartstuff[k_bananadrag] = 0; // Just to make sure
First substantial commit! * PRETTY SURE I fixed that bastardacious issue with multiple shield items disappearing at once. Done via introducing lastlook to store the updated count. * Fix an issue with incorrect scale setting for shield items. * Clean up a bunch of weird shit with regards to setting of hnext/hprev chains. (Why does the player go on the opposite end to the direction you enter the chain from...) * Repair hnext chain on mobjremoval as well. May or may not remove the need for overlay/shadow thinkers; too tired/excited to dig into that atm.
2018-06-28 00:20:19 +00:00
while (cur && !P_MobjWasRemoved(cur))
Held item changes
2018-06-27 19:58:43 +00:00
{
const fixed_t radius = FixedHypot(player->mo->radius, player->mo->radius) + FixedHypot(cur->radius, cur->radius); // mobj's distance from its Target, or Radius.
fixed_t z;
WANTED
2018-07-01 08:36:09 +00:00
if (!cur->health)
{
cur = cur->hnext;
continue;
}
Orbinaut
2018-07-23 00:55:18 +00:00
cur->color = player->skincolor;
Held item changes
2018-06-27 19:58:43 +00:00
cur->angle -= ANGLE_90;
cur->angle += FixedAngle(cur->info->speed);
Held Orbinaut & Jawz radius+scaling animation on spawn
2018-08-30 20:10:25 +00:00
if (cur->extravalue1 < radius)
cur->extravalue1 += FixedMul(P_AproxDistance(cur->extravalue1, radius), FRACUNIT/12);
if (cur->extravalue1 > radius)
cur->extravalue1 = radius;
Held item changes
2018-06-27 19:58:43 +00:00
// If the player is on the ceiling, then flip your items as well.
if (player && player->mo->eflags & MFE_VERTICALFLIP)
cur->eflags |= MFE_VERTICALFLIP;
else
cur->eflags &= ~MFE_VERTICALFLIP;
// Shrink your items if the player shrunk too.
Held Orbinaut & Jawz radius+scaling animation on spawn
2018-08-30 20:10:25 +00:00
P_SetScale(cur, (cur->destscale = FixedMul(FixedDiv(cur->extravalue1, radius), player->mo->scale)));
Held item changes
2018-06-27 19:58:43 +00:00
if (P_MobjFlip(cur) > 0)
z = player->mo->z;
else
z = player->mo->z + player->mo->height - cur->height;
cur->flags |= MF_NOCLIPTHING; // temporarily make them noclip other objects so they can't hit anyone while in the player
P_TeleportMove(cur, player->mo->x, player->mo->y, z);
Held Orbinaut & Jawz radius+scaling animation on spawn
2018-08-30 20:10:25 +00:00
cur->momx = FixedMul(FINECOSINE(cur->angle>>ANGLETOFINESHIFT), cur->extravalue1);
cur->momy = FixedMul(FINESINE(cur->angle>>ANGLETOFINESHIFT), cur->extravalue1);
Held item changes
2018-06-27 19:58:43 +00:00
cur->flags &= ~MF_NOCLIPTHING;
if (!P_TryMove(cur, player->mo->x + cur->momx, player->mo->y + cur->momy, true))
P_SlideMove(cur, true);
if (P_IsObjectOnGround(player->mo))
{
if (P_MobjFlip(cur) > 0)
{
if (cur->floorz > player->mo->z - cur->height)
z = cur->floorz;
}
else
{
if (cur->ceilingz < player->mo->z + player->mo->height + cur->height)
z = cur->ceilingz - cur->height;
}
}
Put on player's center during this animation
2018-08-30 20:28:01 +00:00
// Center it during the scale up animation
z += (FixedMul(mobjinfo[cur->type].height, player->mo->scale - cur->scale)>>1) * P_MobjFlip(cur);
Held item changes
2018-06-27 19:58:43 +00:00
cur->z = z;
cur->momx = cur->momy = 0;
cur->angle += ANGLE_90;
cur = cur->hnext;
}
}
break;
case MT_BANANA_SHIELD: // Kart trailing items
case MT_SSMINE_SHIELD:
The motherload: all of my Lua is hardcoded This took like 6 straight hours of work, never ask me for anything ever again
2018-10-29 09:00:08 +00:00
case MT_EGGMANITEM_SHIELD:
Ghost sink "shield" Sink shield that makes it double-press to use, gives the trailing item slowdown, and shows other people that you have it, but doesn't have any collision
2018-09-04 23:14:44 +00:00
case MT_SINK_SHIELD:
Held item changes
2018-06-27 19:58:43 +00:00
{
mobj_t *cur = player->mo->hnext;
mobj_t *targ = player->mo;
Heavy as shit now
2018-09-05 00:51:16 +00:00
if (P_IsObjectOnGround(player->mo) && player->speed > 0)
Sound & timer fixes - Don't decrease spinout when boosting - Don't increase banana dragging when in the air or if you're not moving (Not sure about this one, just thought that this would feel better than it always increasing once we add the visual effect) - Play a sound for banana dragging - Correct finish line sounds
2018-07-10 22:16:53 +00:00
{
player->kartstuff[k_bananadrag]++;
Banana drag touches - Banana drag timer resets when placing one, for x3 & x10 bananas - Banana dragging spawns transulcent dust - Dragging bananas make them twitch up & down
2018-07-25 16:49:30 +00:00
if (player->kartstuff[k_bananadrag] > TICRATE)
{
K_SpawnWipeoutTrail(player->mo, true);
if (leveltime % 6 == 0)
S_StartSound(player->mo, sfx_cdfm70);
}
Sound & timer fixes - Don't decrease spinout when boosting - Don't increase banana dragging when in the air or if you're not moving (Not sure about this one, just thought that this would feel better than it always increasing once we add the visual effect) - Play a sound for banana dragging - Correct finish line sounds
2018-07-10 22:16:53 +00:00
}
Banana drag slowdown, diagonal springs scale to map scale instead of object's scale, OGL skincolors average all colors
2018-07-04 23:06:45 +00:00
First substantial commit! * PRETTY SURE I fixed that bastardacious issue with multiple shield items disappearing at once. Done via introducing lastlook to store the updated count. * Fix an issue with incorrect scale setting for shield items. * Clean up a bunch of weird shit with regards to setting of hnext/hprev chains. (Why does the player go on the opposite end to the direction you enter the chain from...) * Repair hnext chain on mobjremoval as well. May or may not remove the need for overlay/shadow thinkers; too tired/excited to dig into that atm.
2018-06-28 00:20:19 +00:00
while (cur && !P_MobjWasRemoved(cur))
Held item changes
2018-06-27 19:58:43 +00:00
{
WANTED
2018-07-01 08:36:09 +00:00
const fixed_t radius = FixedHypot(targ->radius, targ->radius) + FixedHypot(cur->radius, cur->radius);
Held item changes
2018-06-27 19:58:43 +00:00
angle_t ang;
Addressed some of Chrome's thoughts - Don't drag - Shield isn't visible to anyone but yourself - Projectile is twice as heavy
2018-09-04 23:58:20 +00:00
fixed_t targx, targy, targz;
fixed_t speed, dist;
WANTED
2018-07-01 08:36:09 +00:00
Use MF_NOCLIPTHING to avoid the 1 tic spawn discrepancy bug on held items I haven't been able to replicate the original bug myself, so I can't tell if it's truly fixed, but this doesn't seem to cause any other issues either.
2018-08-13 21:46:51 +00:00
cur->flags &= ~MF_NOCLIPTHING;
WANTED
2018-07-01 08:36:09 +00:00
if (!cur->health)
{
cur = cur->hnext;
continue;
}
Held item changes
2018-06-27 19:58:43 +00:00
Apply to bananas, eggmen, and mines also
2018-08-30 20:36:46 +00:00
if (cur->extravalue1 < radius)
cur->extravalue1 += FixedMul(P_AproxDistance(cur->extravalue1, radius), FRACUNIT/12);
if (cur->extravalue1 > radius)
cur->extravalue1 = radius;
Held item changes
2018-06-27 19:58:43 +00:00
if (cur != player->mo->hnext)
{
targ = cur->hprev;
Apply to bananas, eggmen, and mines also
2018-08-30 20:36:46 +00:00
dist = cur->extravalue1/4;
Held item changes
2018-06-27 19:58:43 +00:00
}
Apply to bananas, eggmen, and mines also
2018-08-30 20:36:46 +00:00
else
dist = cur->extravalue1/2;
Held item changes
2018-06-27 19:58:43 +00:00
if (!targ || P_MobjWasRemoved(targ))
continue;
Apply to bananas, eggmen, and mines also
2018-08-30 20:36:46 +00:00
// Shrink your items if the player shrunk too.
P_SetScale(cur, (cur->destscale = FixedMul(FixedDiv(cur->extravalue1, radius), player->mo->scale)));
Held item changes
2018-06-27 19:58:43 +00:00
ang = targ->angle;
targx = targ->x + P_ReturnThrustX(cur, ang + ANGLE_180, dist);
targy = targ->y + P_ReturnThrustY(cur, ang + ANGLE_180, dist);
targz = targ->z;
speed = FixedMul(R_PointToDist2(cur->x, cur->y, targx, targy), 3*FRACUNIT/4);
if (P_IsObjectOnGround(targ))
targz = cur->floorz;
cur->angle = R_PointToAngle2(cur->x, cur->y, targx, targy);
- Instashield on failed damge - Ballhog explosion separated onto another sprite - Disabled banana jitter
2018-07-27 00:12:42 +00:00
/*if (P_IsObjectOnGround(player->mo) && player->speed > 0 && player->kartstuff[k_bananadrag] > TICRATE
Banana drag touches - Banana drag timer resets when placing one, for x3 & x10 bananas - Banana dragging spawns transulcent dust - Dragging bananas make them twitch up & down
2018-07-25 16:49:30 +00:00
&& P_RandomChance(min(FRACUNIT/2, FixedDiv(player->speed, K_GetKartSpeed(player, false))/2)))
{
if (leveltime & 1)
targz += 8*(2*FRACUNIT)/7;
else
targz -= 8*(2*FRACUNIT)/7;
- Instashield on failed damge - Ballhog explosion separated onto another sprite - Disabled banana jitter
2018-07-27 00:12:42 +00:00
}*/
Banana drag touches - Banana drag timer resets when placing one, for x3 & x10 bananas - Banana dragging spawns transulcent dust - Dragging bananas make them twitch up & down
2018-07-25 16:49:30 +00:00
Held item changes
2018-06-27 19:58:43 +00:00
if (speed > dist)
P_InstaThrust(cur, cur->angle, speed-dist);
Banana drag slowdown, diagonal springs scale to map scale instead of object's scale, OGL skincolors average all colors
2018-07-04 23:06:45 +00:00
P_SetObjectMomZ(cur, FixedMul(targz - cur->z, 7*FRACUNIT/8) - gravity, false);
Held item changes
2018-06-27 19:58:43 +00:00
if (R_PointToDist2(cur->x, cur->y, targx, targy) > 768*FRACUNIT)
P_TeleportMove(cur, targx, targy, cur->z);
cur = cur->hnext;
}
}
break;
Rocket Sneakers appear beside you
2018-10-07 22:53:46 +00:00
case MT_ROCKETSNEAKER: // Special rocket sneaker stuff
{
mobj_t *cur = player->mo->hnext;
INT32 num = 0;
while (cur && !P_MobjWasRemoved(cur))
{
const fixed_t radius = FixedHypot(player->mo->radius, player->mo->radius) + FixedHypot(cur->radius, cur->radius);
Last batch of tweaks - Rocket sneaker meter depletes more slowly when idle, but depletes much more when using it. This balances out to give it a couple more boosts when you use it well, but allows you to waste it more quickly when you don't want it anymore. Also demonstrates better to new players to not spam it like a gold shroom! - Vibrating frames on sneakers when they aren't being used. - Shoe weight is less strong.
2018-10-10 18:56:50 +00:00
boolean vibrate = ((leveltime & 1) && !cur->tracer);
Rocket Sneakers appear beside you
2018-10-07 22:53:46 +00:00
angle_t angoffset;
fixed_t targx, targy, targz;
cur->flags &= ~MF_NOCLIPTHING;
if (player->kartstuff[k_rocketsneakertimer] <= TICRATE && (leveltime & 1))
cur->flags2 |= MF2_DONTDRAW;
else
cur->flags2 &= ~MF2_DONTDRAW;
if (num & 1)
Last batch of tweaks - Rocket sneaker meter depletes more slowly when idle, but depletes much more when using it. This balances out to give it a couple more boosts when you use it well, but allows you to waste it more quickly when you don't want it anymore. Also demonstrates better to new players to not spam it like a gold shroom! - Vibrating frames on sneakers when they aren't being used. - Shoe weight is less strong.
2018-10-10 18:56:50 +00:00
P_SetMobjStateNF(cur, (vibrate ? S_ROCKETSNEAKER_LVIBRATE : S_ROCKETSNEAKER_L));
Rocket Sneakers appear beside you
2018-10-07 22:53:46 +00:00
else
Last batch of tweaks - Rocket sneaker meter depletes more slowly when idle, but depletes much more when using it. This balances out to give it a couple more boosts when you use it well, but allows you to waste it more quickly when you don't want it anymore. Also demonstrates better to new players to not spam it like a gold shroom! - Vibrating frames on sneakers when they aren't being used. - Shoe weight is less strong.
2018-10-10 18:56:50 +00:00
P_SetMobjStateNF(cur, (vibrate ? S_ROCKETSNEAKER_RVIBRATE : S_ROCKETSNEAKER_R));
Rocket Sneakers appear beside you
2018-10-07 22:53:46 +00:00
if (!player->kartstuff[k_rocketsneakertimer] || cur->extravalue2 || !cur->health)
{
num = (num+1) % 2;
cur = cur->hnext;
continue;
}
if (cur->extravalue1 < radius)
cur->extravalue1 += FixedMul(P_AproxDistance(cur->extravalue1, radius), FRACUNIT/12);
if (cur->extravalue1 > radius)
cur->extravalue1 = radius;
// Shrink your items if the player shrunk too.
P_SetScale(cur, (cur->destscale = FixedMul(FixedDiv(cur->extravalue1, radius), player->mo->scale)));
#if 1
{
Use frameangle for rocket sneakers so they rotate around you when you spinout
2018-10-31 09:28:39 +00:00
angle_t input = player->frameangle - cur->angle;
Rocket Sneakers appear beside you
2018-10-07 22:53:46 +00:00
boolean invert = (input > ANGLE_180);
if (invert)
input = InvAngle(input);
input = FixedAngle(AngleFixed(input)/4);
if (invert)
input = InvAngle(input);
cur->angle = cur->angle + input;
}
#else
Use frameangle for rocket sneakers so they rotate around you when you spinout
2018-10-31 09:28:39 +00:00
cur->angle = player->frameangle;
Rocket Sneakers appear beside you
2018-10-07 22:53:46 +00:00
#endif
angoffset = ANGLE_90 + (ANGLE_180 * num);
targx = player->mo->x + P_ReturnThrustX(cur, cur->angle + angoffset, cur->extravalue1);
targy = player->mo->y + P_ReturnThrustY(cur, cur->angle + angoffset, cur->extravalue1);
{ // bobbing, copy pasted from my kimokawaiii entry
const fixed_t pi = (22<<FRACBITS) / 7; // loose approximation, this doesn't need to be incredibly precise
fixed_t sine = 8 * FINESINE((((2*pi*(4*TICRATE)) * leveltime)>>ANGLETOFINESHIFT) & FINEMASK);
targz = (player->mo->z + (player->mo->height/2)) + sine;
}
if (cur->tracer)
{
fixed_t diffx, diffy, diffz;
diffx = targx - cur->x;
diffy = targy - cur->y;
diffz = targz - cur->z;
P_TeleportMove(cur->tracer, cur->tracer->x + diffx + P_ReturnThrustX(cur, cur->angle + angoffset, 6*cur->scale),
cur->tracer->y + diffy + P_ReturnThrustY(cur, cur->angle + angoffset, 6*cur->scale), cur->tracer->z + diffz);
P_SetScale(cur->tracer, (cur->tracer->destscale = 3*cur->scale/4));
}
P_TeleportMove(cur, targx, targy, targz);
num = (num+1) % 2;
cur = cur->hnext;
}
}
break;
Held item changes
2018-06-27 19:58:43 +00:00
default:
break;
}
}
Jawz reticule
2018-08-30 23:24:22 +00:00
player_t *K_FindJawzTarget(mobj_t *actor, player_t *source)
{
fixed_t best = -1;
player_t *wtarg = NULL;
INT32 i;
for (i = 0; i < MAXPLAYERS; i++)
{
angle_t thisang;
player_t *player;
if (!playeringame[i])
continue;
player = &players[i];
if (player->spectator)
continue; // spectator
if (!player->mo)
continue;
if (player->mo->health <= 0)
continue; // dead
// Don't target yourself, stupid.
if (player == source)
continue;
// Don't home in on teammates.
if (G_GametypeHasTeams() && source->ctfteam == player->ctfteam)
continue;
Jawz ignores targets too high/low
2018-09-04 22:47:30 +00:00
// Invisible, don't bother
if (player->kartstuff[k_hyudorotimer])
continue;
Jawz reticule
2018-08-30 23:24:22 +00:00
// Find the angle, see who's got the best.
thisang = actor->angle - R_PointToAngle2(actor->x, actor->y, player->mo->x, player->mo->y);
if (thisang > ANGLE_180)
thisang = InvAngle(thisang);
if (thisang > ANGLE_45) // Don't go for people who are behind you
continue;
// Jawz only go after the person directly ahead of you in race... sort of literally now!
if (G_RaceGametype())
{
if (player->kartstuff[k_position] >= source->kartstuff[k_position]) // Don't pay attention to people behind you
continue;
if ((best == -1) || (player->kartstuff[k_position] > best))
{
wtarg = player;
best = player->kartstuff[k_position];
}
}
else
{
fixed_t thisdist;
fixed_t thisavg;
if (player->kartstuff[k_bumper] <= 0)
continue;
More Jawz tweaking - Z pos checking is Battle-only now - Made the Z pos limit much higher - Increased its range in Battle
2018-09-06 20:05:57 +00:00
// Z pos too high/low
if (abs(player->mo->z - (actor->z + actor->momz)) > RING_DIST/8)
continue;
Jawz ignores targets too high/low
2018-09-04 22:47:30 +00:00
thisdist = P_AproxDistance(player->mo->x - (actor->x + actor->momx), player->mo->y - (actor->y + actor->momy));
Jawz reticule
2018-08-30 23:24:22 +00:00
More Jawz tweaking - Z pos checking is Battle-only now - Made the Z pos limit much higher - Increased its range in Battle
2018-09-06 20:05:57 +00:00
if (thisdist > 2*RING_DIST) // Don't go for people who are too far away
Jawz reticule
2018-08-30 23:24:22 +00:00
continue;
thisavg = (AngleFixed(thisang) + thisdist) / 2;
//CONS_Printf("got avg %d from player # %d\n", thisavg>>FRACBITS, i);
if ((best == -1) || (thisavg < best))
{
wtarg = player;
best = thisavg;
}
}
}
return wtarg;
}
New engine sounds 9 unique engine classes with 13 sounds each, which smoothly change. Each character sounds distinct now!
2018-10-09 01:31:55 +00:00
// Engine Sounds.
static void K_UpdateEngineSounds(player_t *player, ticcmd_t *cmd)
{
const INT32 numsnds = 13;
Many adjustments - Volume of your own engine is lower than default - Engine sounds get quieter with more people around, ala SMK. 16 player servers should hopefully not be loud as fuck :V - Starting countdown and drop dash revs up your engine now - Doubled sound distance
2018-10-09 18:07:05 +00:00
INT32 class = ((player->kartspeed-1)/3) + (3*((player->kartweight-1)/3)); // engine class number
UINT8 volume = 255;
Smoother NOW this is good enough to ship
2018-10-16 03:13:59 +00:00
fixed_t volumedampen = 0;
Many adjustments - Volume of your own engine is lower than default - Engine sounds get quieter with more people around, ala SMK. 16 player servers should hopefully not be loud as fuck :V - Starting countdown and drop dash revs up your engine now - Doubled sound distance
2018-10-09 18:07:05 +00:00
INT32 targetsnd = 0;
INT32 i;
Some code cleanup & minor adjustments
2018-10-10 01:11:00 +00:00
// Silence the engines
if (leveltime < 8 || player->spectator || player->exiting)
{
player->kartstuff[k_enginesnd] = 0; // Reset sound number
New engine sounds 9 unique engine classes with 13 sounds each, which smoothly change. Each character sounds distinct now!
2018-10-09 01:31:55 +00:00
return;
Some code cleanup & minor adjustments
2018-10-10 01:11:00 +00:00
}
New engine sounds 9 unique engine classes with 13 sounds each, which smoothly change. Each character sounds distinct now!
2018-10-09 01:31:55 +00:00
Some code cleanup & minor adjustments
2018-10-10 01:11:00 +00:00
#if 0
if ((leveltime % 8) != ((player-players) % 8)) // Per-player offset, to make engines sound distinct!
#else
if (leveltime % 8) // .25 seconds of wait time between engine sounds
#endif
New engine sounds 9 unique engine classes with 13 sounds each, which smoothly change. Each character sounds distinct now!
2018-10-09 01:31:55 +00:00
return;
Some code cleanup & minor adjustments
2018-10-10 01:11:00 +00:00
if ((leveltime >= starttime-(2*TICRATE) && leveltime <= starttime) || (player->kartstuff[k_respawn] == 1)) // Startup boosts
targetsnd = ((cmd->buttons & BT_ACCELERATE) ? 12 : 0);
Many adjustments - Volume of your own engine is lower than default - Engine sounds get quieter with more people around, ala SMK. 16 player servers should hopefully not be loud as fuck :V - Starting countdown and drop dash revs up your engine now - Doubled sound distance
2018-10-09 18:07:05 +00:00
else
Some code cleanup & minor adjustments
2018-10-10 01:11:00 +00:00
targetsnd = (((6*cmd->forwardmove)/25) + ((player->speed / mapheaderinfo[gamemap-1]->mobj_scale)/5))/2;
Many adjustments - Volume of your own engine is lower than default - Engine sounds get quieter with more people around, ala SMK. 16 player servers should hopefully not be loud as fuck :V - Starting countdown and drop dash revs up your engine now - Doubled sound distance
2018-10-09 18:07:05 +00:00
New engine sounds 9 unique engine classes with 13 sounds each, which smoothly change. Each character sounds distinct now!
2018-10-09 01:31:55 +00:00
if (targetsnd < 0)
targetsnd = 0;
if (targetsnd > 12)
targetsnd = 12;
if (player->kartstuff[k_enginesnd] < targetsnd)
player->kartstuff[k_enginesnd]++;
if (player->kartstuff[k_enginesnd] > targetsnd)
player->kartstuff[k_enginesnd]--;
if (player->kartstuff[k_enginesnd] < 0)
player->kartstuff[k_enginesnd] = 0;
if (player->kartstuff[k_enginesnd] > 12)
player->kartstuff[k_enginesnd] = 12;
Engine tweak
2018-10-13 21:07:30 +00:00
for (i = 0; i < MAXPLAYERS; i++)
Many adjustments - Volume of your own engine is lower than default - Engine sounds get quieter with more people around, ala SMK. 16 player servers should hopefully not be loud as fuck :V - Starting countdown and drop dash revs up your engine now - Doubled sound distance
2018-10-09 18:07:05 +00:00
{
Smoother NOW this is good enough to ship
2018-10-16 03:13:59 +00:00
UINT8 thisvol = 0;
fixed_t dist;
Engine tweak
2018-10-13 21:07:30 +00:00
if (!playeringame[i] || !players[i].mo || players[i].spectator || players[i].exiting)
continue;
Smoother NOW this is good enough to ship
2018-10-16 03:13:59 +00:00
if ((i == displayplayer)
Engine tweak
2018-10-13 21:07:30 +00:00
|| (i == secondarydisplayplayer && splitscreen)
|| (i == thirddisplayplayer && splitscreen > 1)
|| (i == fourthdisplayplayer && splitscreen > 2))
Many adjustments - Volume of your own engine is lower than default - Engine sounds get quieter with more people around, ala SMK. 16 player servers should hopefully not be loud as fuck :V - Starting countdown and drop dash revs up your engine now - Doubled sound distance
2018-10-09 18:07:05 +00:00
{
Smoother NOW this is good enough to ship
2018-10-16 03:13:59 +00:00
volumedampen += FRACUNIT; // We already know what this is gonna be, let's not waste our time.
continue;
Many adjustments - Volume of your own engine is lower than default - Engine sounds get quieter with more people around, ala SMK. 16 player servers should hopefully not be loud as fuck :V - Starting countdown and drop dash revs up your engine now - Doubled sound distance
2018-10-09 18:07:05 +00:00
}
Smoother NOW this is good enough to ship
2018-10-16 03:13:59 +00:00
dist = P_AproxDistance(P_AproxDistance(player->mo->x-players[i].mo->x,
player->mo->y-players[i].mo->y), player->mo->z-players[i].mo->z) / 2;
if (dist > 1536<<FRACBITS)
continue;
else if (dist < 160<<FRACBITS) // engine sounds' approx. range
thisvol = 255;
else
thisvol = (15 * (((160<<FRACBITS) - dist)>>FRACBITS)) / (((1536<<FRACBITS)-(160<<FRACBITS))>>(FRACBITS+4));
if (thisvol == 0)
continue;
volumedampen += (thisvol * 257); // 255 * 257 = FRACUNIT
Many adjustments - Volume of your own engine is lower than default - Engine sounds get quieter with more people around, ala SMK. 16 player servers should hopefully not be loud as fuck :V - Starting countdown and drop dash revs up your engine now - Doubled sound distance
2018-10-09 18:07:05 +00:00
}
Smoother NOW this is good enough to ship
2018-10-16 03:13:59 +00:00
if (volumedampen > FRACUNIT)
volume = FixedDiv(volume<<FRACBITS, volumedampen)>>FRACBITS;
if (volume <= 0) // Might as well
return;
Engine tweak
2018-10-13 21:07:30 +00:00
Many adjustments - Volume of your own engine is lower than default - Engine sounds get quieter with more people around, ala SMK. 16 player servers should hopefully not be loud as fuck :V - Starting countdown and drop dash revs up your engine now - Doubled sound distance
2018-10-09 18:07:05 +00:00
S_StartSoundAtVolume(player->mo, (sfx_krta00 + player->kartstuff[k_enginesnd]) + (class*numsnds), volume);
New engine sounds 9 unique engine classes with 13 sounds each, which smoothly change. Each character sounds distinct now!
2018-10-09 01:31:55 +00:00
}
Separate grow & invincibility alarms, donated by VAda
2018-11-10 02:47:36 +00:00
static void K_UpdateInvincibilitySounds(player_t *player)
{
INT32 sfxnum = sfx_None;
if (player->mo->health > 0 && !P_IsLocalPlayer(player))
{
if (cv_kartinvinsfx.value)
{
if (player->kartstuff[k_growshrinktimer] > 0) // Prioritize Grow
sfxnum = sfx_alarmg;
else if (player->kartstuff[k_invincibilitytimer] > 0)
sfxnum = sfx_alarmi;
}
else
{
if (player->kartstuff[k_growshrinktimer] > 0)
sfxnum = sfx_kgrow;
else if (player->kartstuff[k_invincibilitytimer] > 0)
sfxnum = sfx_kinvnc;
}
}
if (sfxnum != sfx_None && !S_SoundPlaying(player->mo, sfxnum))
S_StartSound(player->mo, sfxnum);
#define STOPTHIS(this) \
if (sfxnum != this && S_SoundPlaying(player->mo, this)) \
S_StopSoundByID(player->mo, this);
STOPTHIS(sfx_alarmi);
STOPTHIS(sfx_alarmg);
STOPTHIS(sfx_kinvnc);
STOPTHIS(sfx_kgrow);
#undef STOPTHIS
}
The Lightning Update - 30 sec cooldown on all lightning types - Delay before Blue Lightning hits, based off of distance - Blue Lightning can swap targets if 1st place is passed - Blue Lightning can only be handed out if 2nd is far away enough from first
2018-06-06 01:36:48 +00:00
/** \brief Decreases various kart timers and powers per frame. Called in P_PlayerThink in p_user.c
\param player player object passed from P_PlayerThink
\param cmd control input from player
\return void
*/
void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
{
K_UpdateOffroad(player);
Separate grow & invincibility alarms, donated by VAda
2018-11-10 02:47:36 +00:00
K_UpdateEngineSounds(player, cmd); // Thanks, VAda!
Camera outrunning
2018-09-04 19:11:14 +00:00
K_GetKartBoostPower(player);
The Lightning Update - 30 sec cooldown on all lightning types - Delay before Blue Lightning hits, based off of distance - Blue Lightning can swap targets if 1st place is passed - Blue Lightning can only be handed out if 2nd is far away enough from first
2018-06-06 01:36:48 +00:00
Speed lines
2018-09-14 00:26:43 +00:00
// Speed lines
Updated speed lines
2018-09-15 05:24:29 +00:00
if ((player->kartstuff[k_sneakertimer] || player->kartstuff[k_driftboost] || player->kartstuff[k_startboost]) && player->speed > 0)
Speed lines
2018-09-14 00:26:43 +00:00
{
Yet another scale fix
2018-09-27 22:26:37 +00:00
mobj_t *fast = P_SpawnMobj(player->mo->x + (P_RandomRange(-36,36) * player->mo->scale),
player->mo->y + (P_RandomRange(-36,36) * player->mo->scale),
player->mo->z + (player->mo->height/2) + (P_RandomRange(-20,20) * player->mo->scale),
Speed lines
2018-09-14 00:26:43 +00:00
MT_FASTLINE);
fast->angle = R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy);
Updated speed lines
2018-09-15 05:24:29 +00:00
fast->momx = 3*player->mo->momx/4;
fast->momy = 3*player->mo->momy/4;
fast->momz = 3*player->mo->momz/4;
Brake drfit effect
2018-11-01 01:35:17 +00:00
K_MatchGenericExtraFlags(fast, player->mo);
Speed lines
2018-09-14 00:26:43 +00:00
}
Fix up respawning so that it takes respawning with Shrink into account
2018-10-28 04:58:49 +00:00
if (player->playerstate == PST_DEAD || player->kartstuff[k_respawn] > 1) // Ensure these are set correctly here
{
player->mo->colorized = false;
player->mo->color = player->skincolor;
}
else if (player->kartstuff[k_eggmanexplode]) // You're gonna diiiiie
Odds and ends of bugfixing and polish. * Flashing Eggman-hit players. * Fix typo with Rocket Shoe item bar, and make it extensible for potential future purposes since I was fiddling with it anyways. * More complete playerarrow visuals for various items. * Eggman fake (and debug) item get sounds.
2018-08-14 14:23:38 +00:00
{
Hide non-splitscreen number for natural quantities of orbinaut spikeball. Also, minor code tweaks.
2018-08-14 21:16:33 +00:00
const INT32 flashtime = 4<<(player->kartstuff[k_eggmanexplode]/TICRATE);
Odds and ends of bugfixing and polish. * Flashing Eggman-hit players. * Fix typo with Rocket Shoe item bar, and make it extensible for potential future purposes since I was fiddling with it anyways. * More complete playerarrow visuals for various items. * Eggman fake (and debug) item get sounds.
2018-08-14 14:23:38 +00:00
if (player->kartstuff[k_eggmanexplode] == 1 || (player->kartstuff[k_eggmanexplode] % (flashtime/2) != 0))
{
player->mo->colorized = false;
player->mo->color = player->skincolor;
}
else if (player->kartstuff[k_eggmanexplode] % flashtime == 0)
{
player->mo->colorized = true;
player->mo->color = SKINCOLOR_BLACK;
}
else
{
player->mo->colorized = true;
player->mo->color = SKINCOLOR_CRIMSON;
}
}
separate var for dashpad cooldown - no longer has weirdness with pw_flashing - can now have an SA1-style effect for it
2018-08-31 02:27:18 +00:00
else if (player->kartstuff[k_invincibilitytimer]) // setting players to use the star colormap and spawning afterimages
{
mobj_t *ghost;
player->mo->colorized = true;
ghost = P_SpawnGhostMobj(player->mo);
ghost->fuse = 4;
ghost->frame |= FF_FULLBRIGHT;
}
else if (player->kartstuff[k_growshrinktimer]) // Ditto, for grow/shrink
Grow/Shrink flashing
2018-07-10 21:40:47 +00:00
{
if (player->kartstuff[k_growshrinktimer] % 5 == 0)
{
player->mo->colorized = true;
Use Periwinkle & Creamsicle instead
2018-07-11 00:27:18 +00:00
player->mo->color = (player->kartstuff[k_growshrinktimer] < 0 ? SKINCOLOR_CREAMSICLE : SKINCOLOR_PERIWINKLE);
Grow/Shrink flashing
2018-07-10 21:40:47 +00:00
}
else
{
player->mo->colorized = false;
player->mo->color = player->skincolor;
}
}
The Lightning Update - 30 sec cooldown on all lightning types - Delay before Blue Lightning hits, based off of distance - Blue Lightning can swap targets if 1st place is passed - Blue Lightning can only be handed out if 2nd is far away enough from first
2018-06-06 01:36:48 +00:00
else
{
player->mo->colorized = false;
}
separate var for dashpad cooldown - no longer has weirdness with pw_flashing - can now have an SA1-style effect for it
2018-08-31 02:27:18 +00:00
if (player->kartstuff[k_dashpadcooldown]) // Twinkle Circuit inspired afterimages
{
mobj_t *ghost;
ghost = P_SpawnGhostMobj(player->mo);
ghost->fuse = player->kartstuff[k_dashpadcooldown]+1;
ghost->momx = player->mo->momx / (player->kartstuff[k_dashpadcooldown]+1);
ghost->momy = player->mo->momy / (player->kartstuff[k_dashpadcooldown]+1);
ghost->momz = player->mo->momz / (player->kartstuff[k_dashpadcooldown]+1);
player->kartstuff[k_dashpadcooldown]--;
}
Boost cam
2018-09-05 15:19:00 +00:00
// DKR style camera for boosting
if (player->kartstuff[k_boostcam] != 0 || player->kartstuff[k_destboostcam] != 0)
{
if (player->kartstuff[k_boostcam] < player->kartstuff[k_destboostcam]
&& player->kartstuff[k_destboostcam] != 0)
{
Camera adjustments - reverted boostcam timing, different max dist - zooms out based on camera momz - drift panning is twice as slow
2018-09-08 22:45:57 +00:00
player->kartstuff[k_boostcam] += FRACUNIT/(TICRATE/4);
Boost cam
2018-09-05 15:19:00 +00:00
if (player->kartstuff[k_boostcam] >= player->kartstuff[k_destboostcam])
player->kartstuff[k_destboostcam] = 0;
}
else
{
Camera adjustments - reverted boostcam timing, different max dist - zooms out based on camera momz - drift panning is twice as slow
2018-09-08 22:45:57 +00:00
player->kartstuff[k_boostcam] -= FRACUNIT/TICRATE;
Boost cam
2018-09-05 15:19:00 +00:00
if (player->kartstuff[k_boostcam] < player->kartstuff[k_destboostcam])
player->kartstuff[k_boostcam] = player->kartstuff[k_destboostcam] = 0;
}
//CONS_Printf("cam: %d, dest: %d\n", player->kartstuff[k_boostcam], player->kartstuff[k_destboostcam]);
}
fzboom.wad hardcode
2018-10-23 21:48:09 +00:00
player->kartstuff[k_timeovercam] = 0;
CRITICAL BUGFIX Make sure flashing tics don't go down WHILE you're in a hit animation (wipeout, squished)
2018-10-26 04:56:02 +00:00
// Make ABSOLUTELY SURE that your flashing tics don't get set WHILE you're still in hit animations.
if (player->kartstuff[k_spinouttimer] != 0
|| player->kartstuff[k_wipeoutslow] != 0
|| player->kartstuff[k_squishedtimer] != 0)
{
player->powers[pw_flashing] = K_GetKartFlashing(player);
}
else if (player->powers[pw_flashing] == K_GetKartFlashing(player))
{
player->powers[pw_flashing]--;
}
Spinout type is now passed through K_SpinPlayer This means we don't have to reset spinouttype's value immediately after using it, which means no more wipeout timer garbage.
2018-06-25 10:58:23 +00:00
if (player->kartstuff[k_spinouttimer])
{
Sound & timer fixes - Don't decrease spinout when boosting - Don't increase banana dragging when in the air or if you're not moving (Not sure about this one, just thought that this would feel better than it always increasing once we add the visual effect) - Play a sound for banana dragging - Correct finish line sounds
2018-07-10 22:16:53 +00:00
if ((P_IsObjectOnGround(player->mo) || player->kartstuff[k_spinouttype] == 1)
&& (player->kartstuff[k_sneakertimer] == 0))
Wipeout bumps - You can bump other people during spinout. - Bumping during spinout activates a "slow down" timer, which increases your friction after a few tics. - You have a Smash-style dust effect after a spinout bump, indicating clearly if you'll slow down or not.
2018-07-20 02:37:32 +00:00
{
Spinout type is now passed through K_SpinPlayer This means we don't have to reset spinouttype's value immediately after using it, which means no more wipeout timer garbage.
2018-06-25 10:58:23 +00:00
player->kartstuff[k_spinouttimer]--;
Wipeout bumps - You can bump other people during spinout. - Bumping during spinout activates a "slow down" timer, which increases your friction after a few tics. - You have a Smash-style dust effect after a spinout bump, indicating clearly if you'll slow down or not.
2018-07-20 02:37:32 +00:00
if (player->kartstuff[k_wipeoutslow] > 1)
player->kartstuff[k_wipeoutslow]--;
if (player->kartstuff[k_spinouttimer] == 0)
player->kartstuff[k_spinouttype] = 0; // Reset type
}
Spinout type is now passed through K_SpinPlayer This means we don't have to reset spinouttype's value immediately after using it, which means no more wipeout timer garbage.
2018-06-25 10:58:23 +00:00
}
Wipeout bumps - You can bump other people during spinout. - Bumping during spinout activates a "slow down" timer, which increases your friction after a few tics. - You have a Smash-style dust effect after a spinout bump, indicating clearly if you'll slow down or not.
2018-07-20 02:37:32 +00:00
else
The Lightning Update - 30 sec cooldown on all lightning types - Delay before Blue Lightning hits, based off of distance - Blue Lightning can swap targets if 1st place is passed - Blue Lightning can only be handed out if 2nd is far away enough from first
2018-06-06 01:36:48 +00:00
{
Wipeout bumps - You can bump other people during spinout. - Bumping during spinout activates a "slow down" timer, which increases your friction after a few tics. - You have a Smash-style dust effect after a spinout bump, indicating clearly if you'll slow down or not.
2018-07-20 02:37:32 +00:00
if (player->kartstuff[k_wipeoutslow] == 1)
player->mo->friction = ORIG_FRICTION;
player->kartstuff[k_wipeoutslow] = 0;
if (!comeback)
player->kartstuff[k_comebacktimer] = comebacktime;
else if (player->kartstuff[k_comebacktimer])
{
player->kartstuff[k_comebacktimer]--;
if (P_IsLocalPlayer(player) && player->kartstuff[k_bumper] <= 0 && player->kartstuff[k_comebacktimer] <= 0)
comebackshowninfo = true; // client has already seen the message
}
The Lightning Update - 30 sec cooldown on all lightning types - Delay before Blue Lightning hits, based off of distance - Blue Lightning can swap targets if 1st place is passed - Blue Lightning can only be handed out if 2nd is far away enough from first
2018-06-06 01:36:48 +00:00
}
Thunder shield overlay
2018-08-04 19:48:31 +00:00
/*if (player->kartstuff[k_thunderanim])
player->kartstuff[k_thunderanim]--;*/
The Lightning Update - 30 sec cooldown on all lightning types - Delay before Blue Lightning hits, based off of distance - Blue Lightning can swap targets if 1st place is passed - Blue Lightning can only be handed out if 2nd is far away enough from first
2018-06-06 01:36:48 +00:00
Hundreds of tweaks - SPB multiplier depending on 1st-2nd distance - Removed the Battle-only k_poweritemtimer (hold over from when you could easily get invuln items all of the time), replaced it with a 2 invincibility item cap in ALL modes. - Spinout is affected by boosters, *properly* - Can no longer strafe while spinning out on speed bumps - Messed with how other items interact with speed bumps, again. - Old bounce code has been ported for non-players - Fixed Karma players being able to do anything after the round has ended. - Fixed sneaker and spinout timer weirdness - Fixed Mines still being hold-use - Fixed rubber-burn turn not working - Removed redundant k_spinout and unused k_boosting variables - Filled out the Color_Opposite table with Kart's new colors. Not really relevant right now (besides some extra Lua functionality) since nothing uses it, but will be nice for if we do the signpost from the sky idea.
2018-06-20 00:20:06 +00:00
if (player->kartstuff[k_sneakertimer])
Booster+wipeout fix
2018-09-18 00:24:03 +00:00
{
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
player->kartstuff[k_sneakertimer]--;
Booster+wipeout fix
2018-09-18 00:24:03 +00:00
if (player->kartstuff[k_wipeoutslow] > 0 && player->kartstuff[k_wipeoutslow] < wipeoutslowtime+1)
player->kartstuff[k_wipeoutslow] = wipeoutslowtime+1;
}
The Lightning Update - 30 sec cooldown on all lightning types - Delay before Blue Lightning hits, based off of distance - Blue Lightning can swap targets if 1st place is passed - Blue Lightning can only be handed out if 2nd is far away enough from first
2018-06-06 01:36:48 +00:00
if (player->kartstuff[k_floorboost])
player->kartstuff[k_floorboost]--;
if (player->kartstuff[k_driftboost])
player->kartstuff[k_driftboost]--;
Drop Dash + alternate start boosts New respawn boost behavior, where you just hold for long enough instead of timing it with hitting the ground. Also much weaker, just gives you enough boost to get going instead of being a free sneaker. Start boosts have been severely changed. The perfect one has an extra tic on its timing window and gets Sneaker boosting special effects, but every other possible boost has been severely nerfed.
2018-09-10 05:47:23 +00:00
if (player->kartstuff[k_startboost])
player->kartstuff[k_startboost]--;
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
if (player->kartstuff[k_invincibilitytimer])
player->kartstuff[k_invincibilitytimer]--;
The Lightning Update - 30 sec cooldown on all lightning types - Delay before Blue Lightning hits, based off of distance - Blue Lightning can swap targets if 1st place is passed - Blue Lightning can only be handed out if 2nd is far away enough from first
2018-06-06 01:36:48 +00:00
Fix up respawning so that it takes respawning with Shrink into account
2018-10-28 04:58:49 +00:00
if (!player->kartstuff[k_respawn])
{
if (player->kartstuff[k_growshrinktimer] > 0)
player->kartstuff[k_growshrinktimer]--;
if (player->kartstuff[k_growshrinktimer] < 0)
player->kartstuff[k_growshrinktimer]++;
}
The Lightning Update - 30 sec cooldown on all lightning types - Delay before Blue Lightning hits, based off of distance - Blue Lightning can swap targets if 1st place is passed - Blue Lightning can only be handed out if 2nd is far away enough from first
2018-06-06 01:36:48 +00:00
if (player->kartstuff[k_growshrinktimer] == 1 || player->kartstuff[k_growshrinktimer] == -1)
{
Grow/Shrink flashing
2018-07-10 21:40:47 +00:00
if (player->kartstuff[k_invincibilitytimer] == 0)
player->mo->color = player->skincolor;
The Lightning Update - 30 sec cooldown on all lightning types - Delay before Blue Lightning hits, based off of distance - Blue Lightning can swap targets if 1st place is passed - Blue Lightning can only be handed out if 2nd is far away enough from first
2018-06-06 01:36:48 +00:00
player->mo->destscale = mapheaderinfo[gamemap-1]->mobj_scale;
Prevent using kartdebug cvars in Time Attack. (None of this should invalidate any of YOUR existing ghosts, because none of them use these obvious cheats like, say, setting kartdebugitem 2.)
2018-11-09 20:16:12 +00:00
if (cv_kartdebugshrink.value && !modeattacking && !player->bot)
Shrink debug command, trailing items spawn directly on players, rainbow win 1 is more faithful, make springs more powerful for shrunk players, correct Grow/Shrink fullbright frame
2018-07-12 05:31:33 +00:00
player->mo->destscale = 6*player->mo->destscale/8;
The Lightning Update - 30 sec cooldown on all lightning types - Delay before Blue Lightning hits, based off of distance - Blue Lightning can swap targets if 1st place is passed - Blue Lightning can only be handed out if 2nd is far away enough from first
2018-06-06 01:36:48 +00:00
P_RestoreMusic(player);
}
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
if (player->kartstuff[k_stealingtimer] == 0 && player->kartstuff[k_stolentimer] == 0
&& player->kartstuff[k_rocketsneakertimer])
player->kartstuff[k_rocketsneakertimer]--;
if (player->kartstuff[k_hyudorotimer])
player->kartstuff[k_hyudorotimer]--;
The Lightning Update - 30 sec cooldown on all lightning types - Delay before Blue Lightning hits, based off of distance - Blue Lightning can swap targets if 1st place is passed - Blue Lightning can only be handed out if 2nd is far away enough from first
2018-06-06 01:36:48 +00:00
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
if (player->kartstuff[k_sadtimer])
player->kartstuff[k_sadtimer]--;
The Lightning Update - 30 sec cooldown on all lightning types - Delay before Blue Lightning hits, based off of distance - Blue Lightning can swap targets if 1st place is passed - Blue Lightning can only be handed out if 2nd is far away enough from first
2018-06-06 01:36:48 +00:00
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
if (player->kartstuff[k_stealingtimer])
player->kartstuff[k_stealingtimer]--;
The Lightning Update - 30 sec cooldown on all lightning types - Delay before Blue Lightning hits, based off of distance - Blue Lightning can swap targets if 1st place is passed - Blue Lightning can only be handed out if 2nd is far away enough from first
2018-06-06 01:36:48 +00:00
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
if (player->kartstuff[k_stolentimer])
player->kartstuff[k_stolentimer]--;
The Lightning Update - 30 sec cooldown on all lightning types - Delay before Blue Lightning hits, based off of distance - Blue Lightning can swap targets if 1st place is passed - Blue Lightning can only be handed out if 2nd is far away enough from first
2018-06-06 01:36:48 +00:00
if (player->kartstuff[k_squishedtimer])
player->kartstuff[k_squishedtimer]--;
if (player->kartstuff[k_justbumped])
player->kartstuff[k_justbumped]--;
Lap start animation
2018-08-10 01:52:02 +00:00
if (player->kartstuff[k_lapanimation])
player->kartstuff[k_lapanimation]--;
The Lightning Update - 30 sec cooldown on all lightning types - Delay before Blue Lightning hits, based off of distance - Blue Lightning can swap targets if 1st place is passed - Blue Lightning can only be handed out if 2nd is far away enough from first
2018-06-06 01:36:48 +00:00
YOU GOT EM Flashes on screen whenever you get more than 1 karma point at a time, getting you back into the game.
2018-11-01 03:34:13 +00:00
if (player->kartstuff[k_yougotem])
player->kartstuff[k_yougotem]--;
The Lightning Update - 30 sec cooldown on all lightning types - Delay before Blue Lightning hits, based off of distance - Blue Lightning can swap targets if 1st place is passed - Blue Lightning can only be handed out if 2nd is far away enough from first
2018-06-06 01:36:48 +00:00
if (G_BattleGametype() && (player->exiting || player->kartstuff[k_comebacktimer]))
{
if (player->exiting)
{
if (player->exiting < 6*TICRATE)
player->kartstuff[k_cardanimation] += ((164-player->kartstuff[k_cardanimation])/8)+1;
More FINISH stuff! * Make it two seconds exactly, instead of two and change. * Draw it in battle too! * While testing the above, I discovered 3p's karma comeback timer drawing was slightly broken. Fixed that too.
2018-07-19 14:58:07 +00:00
else if (player->exiting == 6*TICRATE)
player->kartstuff[k_cardanimation] = 0;
else if (player->kartstuff[k_cardanimation] < 2*TICRATE)
player->kartstuff[k_cardanimation]++;
The Lightning Update - 30 sec cooldown on all lightning types - Delay before Blue Lightning hits, based off of distance - Blue Lightning can swap targets if 1st place is passed - Blue Lightning can only be handed out if 2nd is far away enough from first
2018-06-06 01:36:48 +00:00
}
else
{
if (player->kartstuff[k_comebacktimer] < 6*TICRATE)
player->kartstuff[k_cardanimation] -= ((164-player->kartstuff[k_cardanimation])/8)+1;
else if (player->kartstuff[k_comebacktimer] < 9*TICRATE)
player->kartstuff[k_cardanimation] += ((164-player->kartstuff[k_cardanimation])/8)+1;
}
if (player->kartstuff[k_cardanimation] > 164)
player->kartstuff[k_cardanimation] = 164;
if (player->kartstuff[k_cardanimation] < 0)
player->kartstuff[k_cardanimation] = 0;
}
RACE FINISH ANIMATION GRAPHIC! Scrolls across the screen, magestically. Like an eagle. Piloting a blimp.
2018-07-18 22:20:08 +00:00
else if (G_RaceGametype() && player->exiting)
{
More FINISH stuff! * Make it two seconds exactly, instead of two and change. * Draw it in battle too! * While testing the above, I discovered 3p's karma comeback timer drawing was slightly broken. Fixed that too.
2018-07-19 14:58:07 +00:00
if (player->kartstuff[k_cardanimation] < 2*TICRATE)
RACE FINISH ANIMATION GRAPHIC! Scrolls across the screen, magestically. Like an eagle. Piloting a blimp.
2018-07-18 22:20:08 +00:00
player->kartstuff[k_cardanimation]++;
}
The Lightning Update - 30 sec cooldown on all lightning types - Delay before Blue Lightning hits, based off of distance - Blue Lightning can swap targets if 1st place is passed - Blue Lightning can only be handed out if 2nd is far away enough from first
2018-06-06 01:36:48 +00:00
else
player->kartstuff[k_cardanimation] = 0;
Merge branch 'master' into voice-loss-jpg # Conflicts: # src/k_kart.c
2018-06-08 23:56:39 +00:00
if (player->kartstuff[k_voices])
player->kartstuff[k_voices]--;
if (player->kartstuff[k_tauntvoices])
player->kartstuff[k_tauntvoices]--;
The Lightning Update - 30 sec cooldown on all lightning types - Delay before Blue Lightning hits, based off of distance - Blue Lightning can swap targets if 1st place is passed - Blue Lightning can only be handed out if 2nd is far away enough from first
2018-06-06 01:36:48 +00:00
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
if (G_BattleGametype() && player->kartstuff[k_bumper] > 0)
WANTED
2018-07-01 08:36:09 +00:00
player->kartstuff[k_wanted]++;
Water skipping No way to disable it yet, let's see if we even need it
2018-07-17 02:51:31 +00:00
if (P_IsObjectOnGround(player->mo))
player->kartstuff[k_waterskip] = 0;
- Instashield on failed damge - Ballhog explosion separated onto another sprite - Disabled banana jitter
2018-07-27 00:12:42 +00:00
if (player->kartstuff[k_instashield])
player->kartstuff[k_instashield]--;
eggman broken
2018-08-12 00:19:09 +00:00
if (player->kartstuff[k_eggmanexplode])
{
Fix two very likely suspects for last night's battle-hoopla. * Correct a typo on Sal's part that meant flashingtics would continually grow larger and larger, slowly drifting between different clients. * A more robust eggmanblame system.
2018-08-12 10:45:48 +00:00
if (player->spectator || (G_BattleGametype() && !player->kartstuff[k_bumper]))
player->kartstuff[k_eggmanexplode] = 0;
else
eggman broken
2018-08-12 00:19:09 +00:00
{
Fix two very likely suspects for last night's battle-hoopla. * Correct a typo on Sal's part that meant flashingtics would continually grow larger and larger, slowly drifting between different clients. * A more robust eggmanblame system.
2018-08-12 10:45:48 +00:00
player->kartstuff[k_eggmanexplode]--;
if (player->kartstuff[k_eggmanexplode] <= 0)
{
mobj_t *eggsexplode;
Huge restructuring & more fine-tuned speed, following, & turn behavior
2018-10-18 23:51:36 +00:00
//player->powers[pw_flashing] = 0;
New SPB May not make it to R1, but oh well
2018-10-18 08:43:50 +00:00
eggsexplode = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_SPBEXPLOSION);
Fix two very likely suspects for last night's battle-hoopla. * Correct a typo on Sal's part that meant flashingtics would continually grow larger and larger, slowly drifting between different clients. * A more robust eggmanblame system.
2018-08-12 10:45:48 +00:00
if (player->kartstuff[k_eggmanblame] >= 0
&& player->kartstuff[k_eggmanblame] < MAXPLAYERS
&& playeringame[player->kartstuff[k_eggmanblame]]
&& !players[player->kartstuff[k_eggmanblame]].spectator
&& players[player->kartstuff[k_eggmanblame]].mo)
P_SetTarget(&eggsexplode->target, players[player->kartstuff[k_eggmanblame]].mo);
}
eggman broken
2018-08-12 00:19:09 +00:00
}
}
The Lightning Update - 30 sec cooldown on all lightning types - Delay before Blue Lightning hits, based off of distance - Blue Lightning can swap targets if 1st place is passed - Blue Lightning can only be handed out if 2nd is far away enough from first
2018-06-06 01:36:48 +00:00
// ???
/*
if (player->kartstuff[k_jmp] > 1 && onground)
{
S_StartSound(player->mo, sfx_spring);
P_DoJump(player, false);
player->mo->momz *= player->kartstuff[k_jmp];
player->kartstuff[k_jmp] = 0;
}
*/
if (player->kartstuff[k_comebacktimer])
player->kartstuff[k_comebackmode] = 0;
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
if (P_IsObjectOnGround(player->mo) && player->mo->momz <= 0 && player->kartstuff[k_pogospring])
player->kartstuff[k_pogospring] = 0;
The Lightning Update - 30 sec cooldown on all lightning types - Delay before Blue Lightning hits, based off of distance - Blue Lightning can swap targets if 1st place is passed - Blue Lightning can only be handed out if 2nd is far away enough from first
2018-06-06 01:36:48 +00:00
if (cmd->buttons & BT_DRIFT)
player->kartstuff[k_jmp] = 1;
else
player->kartstuff[k_jmp] = 0;
Lakitu murder & countdown improvements (I'm not SevenethSentienel! I just don't feel like logging out!)
2018-06-25 02:15:22 +00:00
// Respawn Checker
if (player->kartstuff[k_respawn])
K_RespawnChecker(player);
The Lightning Update - 30 sec cooldown on all lightning types - Delay before Blue Lightning hits, based off of distance - Blue Lightning can swap targets if 1st place is passed - Blue Lightning can only be handed out if 2nd is far away enough from first
2018-06-06 01:36:48 +00:00
// Roulette Code
Fixes
2018-06-08 04:02:28 +00:00
K_KartItemRoulette(player, cmd);
The Lightning Update - 30 sec cooldown on all lightning types - Delay before Blue Lightning hits, based off of distance - Blue Lightning can swap targets if 1st place is passed - Blue Lightning can only be handed out if 2nd is far away enough from first
2018-06-06 01:36:48 +00:00
Separate grow & invincibility alarms, donated by VAda
2018-11-10 02:47:36 +00:00
// Handle invincibility sfx
K_UpdateInvincibilitySounds(player); // Also thanks, VAda!
The Lightning Update - 30 sec cooldown on all lightning types - Delay before Blue Lightning hits, based off of distance - Blue Lightning can swap targets if 1st place is passed - Blue Lightning can only be handed out if 2nd is far away enough from first
2018-06-06 01:36:48 +00:00
// Plays the music after the starting countdown.
Lakitu murder & countdown improvements (I'm not SevenethSentienel! I just don't feel like logging out!)
2018-06-25 02:15:22 +00:00
if (P_IsLocalPlayer(player) && leveltime == (starttime + (TICRATE/2)))
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
S_ChangeMusicInternal(mapmusname, true);
The Lightning Update - 30 sec cooldown on all lightning types - Delay before Blue Lightning hits, based off of distance - Blue Lightning can swap targets if 1st place is passed - Blue Lightning can only be handed out if 2nd is far away enough from first
2018-06-06 01:36:48 +00:00
}
void K_KartPlayerAfterThink(player_t *player)
{
Thunder shield stuff! * Slightly bigger visual size! * Light-shadow! * Makes player fullbright if you have it! * Visuals finally removed instantly on shield drop! * Uses dark background for item icons! * Goes behind the player on some frames, faking layering!
2018-09-13 18:01:36 +00:00
if (player->kartstuff[k_curshield]
|| player->kartstuff[k_invincibilitytimer]
Shrink debug command, trailing items spawn directly on players, rainbow win 1 is more faithful, make springs more powerful for shrunk players, correct Grow/Shrink fullbright frame
2018-07-12 05:31:33 +00:00
|| (player->kartstuff[k_growshrinktimer] != 0 && player->kartstuff[k_growshrinktimer] % 5 == 4)) // 4 instead of 0 because this is afterthink!
The Lightning Update - 30 sec cooldown on all lightning types - Delay before Blue Lightning hits, based off of distance - Blue Lightning can swap targets if 1st place is passed - Blue Lightning can only be handed out if 2nd is far away enough from first
2018-06-06 01:36:48 +00:00
{
player->mo->frame |= FF_FULLBRIGHT;
}
else
{
if (!(player->mo->state->frame & FF_FULLBRIGHT))
player->mo->frame &= ~FF_FULLBRIGHT;
}
Held item changes
2018-06-27 19:58:43 +00:00
// Move held objects (Bananas, Orbinaut, etc)
K_MoveHeldObjects(player);
Jawz reticule
2018-08-30 23:24:22 +00:00
// Jawz reticule (seeking)
if (player->kartstuff[k_itemtype] == KITEM_JAWZ && player->kartstuff[k_itemheld])
{
player_t *targ = K_FindJawzTarget(player->mo, player);
mobj_t *ret;
if (!targ)
{
player->kartstuff[k_lastjawztarget] = -1;
return;
}
ret = P_SpawnMobj(targ->mo->x, targ->mo->y, targ->mo->z, MT_PLAYERRETICULE);
P_SetTarget(&ret->target, targ->mo);
ret->frame |= ((leveltime % 10) / 2);
ret->tics = 1;
ret->color = player->skincolor;
if (targ-players != player->kartstuff[k_lastjawztarget])
{
if (P_IsLocalPlayer(player) || P_IsLocalPlayer(targ))
S_StartSound(NULL, sfx_s3k89);
else
S_StartSound(targ->mo, sfx_s3k89);
player->kartstuff[k_lastjawztarget] = targ-players;
}
}
else
{
player->kartstuff[k_lastjawztarget] = -1;
}
The Lightning Update - 30 sec cooldown on all lightning types - Delay before Blue Lightning hits, based off of distance - Blue Lightning can swap targets if 1st place is passed - Blue Lightning can only be handed out if 2nd is far away enough from first
2018-06-06 01:36:48 +00:00
}
Don't allow the player to respawn on a mapthing if it will collide them with another player Mainly effects battle where match starts are used, race will be effected at the beginning of races though
2017-11-11 03:28:20 +00:00
// Returns false if this player being placed here causes them to collide with any other player
// Used in g_game.c for match etc. respawning
// This does not check along the z because the z is not correctly set for the spawnee at this point
boolean K_CheckPlayersRespawnColliding(INT32 playernum, fixed_t x, fixed_t y)
{
INT32 i;
fixed_t p1radius = players[playernum].mo->radius;
for (i = 0; i < MAXPLAYERS; i++)
{
if (playernum == i || !playeringame[i] || players[i].spectator || !players[i].mo || players[i].mo->health <= 0
|| players[i].playerstate != PST_LIVE || (players[i].mo->flags & MF_NOCLIP) || (players[i].mo->flags & MF_NOCLIPTHING))
continue;
if (abs(x - players[i].mo->x) < (p1radius + players[i].mo->radius)
&& abs(y - players[i].mo->y) < (p1radius + players[i].mo->radius))
{
return false;
}
}
return true;
}
Support controller with drifting countersteer
2017-03-07 18:31:37 +00:00
// countersteer is how strong the controls are telling us we are turning
Further drift fixes Fix weird start drifting wrong way bug Drifting no longer adds to regular turn speed Drift boosts start as soon as you finish drifting
2017-03-07 05:00:00 +00:00
// turndir is the direction the controls are telling us to turn, -1 if turning right and 1 if turning left
Support controller with drifting countersteer
2017-03-07 18:31:37 +00:00
static INT16 K_GetKartDriftValue(player_t *player, fixed_t countersteer)
Driftboosting now increases player accleration Consolidated the turning and drifting values to k_kart functions for easier editing Removed 200cc. 50/100/150ccs are a weird amalgamation of the prior values.
2017-02-22 04:41:00 +00:00
{
Support controller with drifting countersteer
2017-03-07 18:31:37 +00:00
INT16 basedrift, driftangle;
v1.3.11 ------- Braking no longer stops on a dime, and instead reduces your speed input. The effect is different between braking and accelerating at the same time, and braking on its own. Increased 'driftweight' to player->kartweight*14, up from player->kartweight*12. Changed the base drift curve formula from a range of 447 - 303, to 415 - 303. This will result in a very slightly wider drift arc at low weights. This does not effect the strength of steering while drifting. Drifting without holding a direction now has a bonus of 0.5 frames, up from 0. Added kartweight to the required number of drift frames, at half value. Lighter characters take up to 4 additional frames to earn blue sparks, 8 for orange.
2017-04-21 01:44:56 +00:00
fixed_t driftweight = player->kartweight*14; // 12
Fix drifting No longer does all the angle adjustments inside of the player thinker and instead does it with the controls Should hopefully avoid any desynch from drifting Also maybe fixed player 2's controls
2017-03-07 01:05:18 +00:00
// If they aren't drifting or on the ground this doesn't apply
if (player->kartstuff[k_drift] == 0 || !P_IsObjectOnGround(player->mo))
return 0;
Steering fixes, drifting changed, weight has effect now
2017-02-24 01:36:43 +00:00
Support controller with drifting countersteer
2017-03-07 18:31:37 +00:00
if (player->kartstuff[k_driftend] != 0)
Fix drifting No longer does all the angle adjustments inside of the player thinker and instead does it with the controls Should hopefully avoid any desynch from drifting Also maybe fixed player 2's controls
2017-03-07 01:05:18 +00:00
{
Support controller with drifting countersteer
2017-03-07 18:31:37 +00:00
return -266*player->kartstuff[k_drift]; // Drift has ended and we are tweaking their angle back a bit
Re-implement the small turn-back after a drift ends
2017-03-07 03:27:44 +00:00
}
Driftboosting now increases player accleration Consolidated the turning and drifting values to k_kart functions for easier editing Removed 200cc. 50/100/150ccs are a weird amalgamation of the prior values.
2017-02-22 04:41:00 +00:00
v1.3.11 ------- Braking no longer stops on a dime, and instead reduces your speed input. The effect is different between braking and accelerating at the same time, and braking on its own. Increased 'driftweight' to player->kartweight*14, up from player->kartweight*12. Changed the base drift curve formula from a range of 447 - 303, to 415 - 303. This will result in a very slightly wider drift arc at low weights. This does not effect the strength of steering while drifting. Drifting without holding a direction now has a bonus of 0.5 frames, up from 0. Added kartweight to the required number of drift frames, at half value. Lighter characters take up to 4 additional frames to earn blue sparks, 8 for orange.
2017-04-21 01:44:56 +00:00
//basedrift = 90*player->kartstuff[k_drift]; // 450
//basedrift = 93*player->kartstuff[k_drift] - driftweight*3*player->kartstuff[k_drift]/10; // 447 - 303
basedrift = 83*player->kartstuff[k_drift] - (driftweight - 14)*player->kartstuff[k_drift]/5; // 415 - 303
v1.3.08 - The Fat One -------- Driftboost formula changed to: 49 + player->kartspeed*2; (No longer factors weight from previous version) Collision code now factors character weight for players. Collision code now only plays the collision sound once, rather than per player. Weight now factors into drifting's base value. A heavier character will drift more straight with no input and have less control. Added a cheat check in SetPlayerSkinByNum(), to force speed and weight within the boundaries of 1 and 9. Nerfed orange turbo to 50 frames, down from 60.
2017-04-19 01:04:54 +00:00
driftangle = abs((252 - driftweight)*player->kartstuff[k_drift]/5);
Driftboosting now increases player accleration Consolidated the turning and drifting values to k_kart functions for easier editing Removed 200cc. 50/100/150ccs are a weird amalgamation of the prior values.
2017-02-22 04:41:00 +00:00
v1.3.08 - The Fat One -------- Driftboost formula changed to: 49 + player->kartspeed*2; (No longer factors weight from previous version) Collision code now factors character weight for players. Collision code now only plays the collision sound once, rather than per player. Weight now factors into drifting's base value. A heavier character will drift more straight with no input and have less control. Added a cheat check in SetPlayerSkinByNum(), to force speed and weight within the boundaries of 1 and 9. Nerfed orange turbo to 50 frames, down from 60.
2017-04-19 01:04:54 +00:00
return basedrift + FixedMul(driftangle, countersteer);
Driftboosting now increases player accleration Consolidated the turning and drifting values to k_kart functions for easier editing Removed 200cc. 50/100/150ccs are a weird amalgamation of the prior values.
2017-02-22 04:41:00 +00:00
}
Further drift fixes Fix weird start drifting wrong way bug Drifting no longer adds to regular turn speed Drift boosts start as soon as you finish drifting
2017-03-07 05:00:00 +00:00
INT16 K_GetKartTurnValue(player_t *player, INT16 turnvalue)
{
fixed_t p_maxspeed = FixedMul(K_GetKartSpeed(player, false), 3*FRACUNIT);
fixed_t adjustangle = FixedDiv((p_maxspeed>>16) - (player->speed>>16), (p_maxspeed>>16) + player->kartweight);
Spectating is properly implemented now - Spectate button works - Spectating & objectplace controls are usable now - New spectator HUD
2018-01-23 03:18:57 +00:00
if (player->spectator)
return turnvalue;
Fix pressing drift button not allowing turning in mid-air
2017-03-07 23:12:46 +00:00
if (player->kartstuff[k_drift] != 0 && P_IsObjectOnGround(player->mo))
Further drift fixes Fix weird start drifting wrong way bug Drifting no longer adds to regular turn speed Drift boosts start as soon as you finish drifting
2017-03-07 05:00:00 +00:00
{
Support controller with drifting countersteer
2017-03-07 18:31:37 +00:00
// If we're drifting we have a completely different turning value
Further drift fixes Fix weird start drifting wrong way bug Drifting no longer adds to regular turn speed Drift boosts start as soon as you finish drifting
2017-03-07 05:00:00 +00:00
if (player->kartstuff[k_driftend] == 0)
{
Support controller with drifting countersteer
2017-03-07 18:31:37 +00:00
// 800 is the max set in g_game.c with angleturn
fixed_t countersteer = FixedDiv(turnvalue*FRACUNIT, 800*FRACUNIT);
turnvalue = K_GetKartDriftValue(player, countersteer);
Further drift fixes Fix weird start drifting wrong way bug Drifting no longer adds to regular turn speed Drift boosts start as soon as you finish drifting
2017-03-07 05:00:00 +00:00
}
else
Support controller with drifting countersteer
2017-03-07 18:31:37 +00:00
turnvalue = (INT16)(turnvalue + K_GetKartDriftValue(player, FRACUNIT));
return turnvalue;
Further drift fixes Fix weird start drifting wrong way bug Drifting no longer adds to regular turn speed Drift boosts start as soon as you finish drifting
2017-03-07 05:00:00 +00:00
}
Support controller with drifting countersteer
2017-03-07 18:31:37 +00:00
turnvalue = FixedMul(turnvalue, adjustangle); // Weight has a small effect on turning
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
if (player->kartstuff[k_invincibilitytimer] || player->kartstuff[k_sneakertimer] || player->kartstuff[k_growshrinktimer] > 0)
Support controller with drifting countersteer
2017-03-07 18:31:37 +00:00
turnvalue = FixedMul(turnvalue, FixedDiv(5*FRACUNIT, 4*FRACUNIT));
Further drift fixes Fix weird start drifting wrong way bug Drifting no longer adds to regular turn speed Drift boosts start as soon as you finish drifting
2017-03-07 05:00:00 +00:00
return turnvalue;
}
Serious deep-cleaning to most of the kartstuff More optional fields, more careful eye placed on return values and other checks
2018-11-08 02:04:57 +00:00
INT32 K_GetKartDriftSparkValue(player_t *player)
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
{
Mammoth commit! * Deaths in record attack no longer put you into a glitchy singleplayer game-over state that we somehow both kept around and also broke since we branched Kart off of Vanilla.. * Fix non-standard mapscales making the Death Egg respawn octagons dissasemble themselves. * Allow for MULTIPLE TIME EMBLEMS PER MAP, at least in the emblem UI on the timer. It shows all completed emblems plus the uncompleted emblem up to a total of three. * Major tweaks to the First Person HUD. * I know this was your baby, Sal, and some of the changes may prove controversial - so I've put the ones that are likely to cause the most fuss inside an ifndef block, so that you can toggle it as you please with minimal code changes. * Dontdraw-ness, transparency, and colorization match the player's object! * Moves around on the screen with respect to the direction of the player object's motion, to make drifting look nicer! * Flashes the colour of your drift sparks. * Did a WHOLE bunch of things with respect to music. I'm not sure how to describe this, so I'll go through step-by-step. * Countdowns now play the drowning music again. * Removed/disabled extraenous P_RestoreMusics. * Made map-ending music called by its own function, P_EndingMusic(player_t *player). * Made the ending music play on the LAST player crossing the finishing line in splitscreen, rather than first. * Make dead players spinout and clip through the floor, at least until we add the new death anims. * Fix prior pogo spring usage making dead players fall faster. * Make the time over countdown use the kart font when not splitscreen with 3 or 4 players. * Removed a weird bonus HWR_DrawCroppedPatch function signature in the hardware header.
2018-07-16 19:19:30 +00:00
UINT8 kartspeed = (G_BattleGametype() && player->kartstuff[k_bumper] <= 0)
? 1
: player->kartspeed;
return (26*4 + kartspeed*2 + (9 - player->kartweight))*8;
}
Some more minor comeback tweaks - Comeback players are now 1 speed with -20 friction - Bombing gives 2 karma now - Item players should no longer be able to be hit - Attempted to fix instances of trying to bomb someone while they can't be touched causing you to lose all your karma and start a console message saying you're back in the game, despite not rewarding a balloon - Fixed a few places where kartspeed & kartweight were being read as fixed point numbers, despite being UINT8's - Fixed up kartstuff Lua support more, functions properly now
2017-11-20 00:39:40 +00:00
Mammoth commit! * Deaths in record attack no longer put you into a glitchy singleplayer game-over state that we somehow both kept around and also broke since we branched Kart off of Vanilla.. * Fix non-standard mapscales making the Death Egg respawn octagons dissasemble themselves. * Allow for MULTIPLE TIME EMBLEMS PER MAP, at least in the emblem UI on the timer. It shows all completed emblems plus the uncompleted emblem up to a total of three. * Major tweaks to the First Person HUD. * I know this was your baby, Sal, and some of the changes may prove controversial - so I've put the ones that are likely to cause the most fuss inside an ifndef block, so that you can toggle it as you please with minimal code changes. * Dontdraw-ness, transparency, and colorization match the player's object! * Moves around on the screen with respect to the direction of the player object's motion, to make drifting look nicer! * Flashes the colour of your drift sparks. * Did a WHOLE bunch of things with respect to music. I'm not sure how to describe this, so I'll go through step-by-step. * Countdowns now play the drowning music again. * Removed/disabled extraenous P_RestoreMusics. * Made map-ending music called by its own function, P_EndingMusic(player_t *player). * Made the ending music play on the LAST player crossing the finishing line in splitscreen, rather than first. * Make dead players spinout and clip through the floor, at least until we add the new death anims. * Fix prior pogo spring usage making dead players fall faster. * Make the time over countdown use the kart font when not splitscreen with 3 or 4 players. * Removed a weird bonus HWR_DrawCroppedPatch function signature in the hardware header.
2018-07-16 19:19:30 +00:00
static void K_KartDrift(player_t *player, boolean onground)
{
Serious deep-cleaning to most of the kartstuff More optional fields, more careful eye placed on return values and other checks
2018-11-08 02:04:57 +00:00
INT32 dsone = K_GetKartDriftSparkValue(player);
INT32 dstwo = dsone*2;
INT32 dsthree = dstwo*2;
Fix warnings Possibly fix some whitespace problems
2017-03-04 22:13:19 +00:00
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
// Drifting is actually straffing + automatic turning.
// Holding the Jump button will enable drifting.
// Drift Release (Moved here so you can't "chain" drifts)
Further drift fixes Fix weird start drifting wrong way bug Drifting no longer adds to regular turn speed Drift boosts start as soon as you finish drifting
2017-03-07 05:00:00 +00:00
if ((player->kartstuff[k_drift] != -5 && player->kartstuff[k_drift] != 5)
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
// || (player->kartstuff[k_drift] >= 1 && player->kartstuff[k_turndir] != 1) || (player->kartstuff[k_drift] <= -1 && player->kartstuff[k_turndir] != -1))
Steering fixes, drifting changed, weight has effect now
2017-02-24 01:36:43 +00:00
&& player->kartstuff[k_driftcharge] < dsone
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
&& onground)
{
player->kartstuff[k_driftcharge] = 0;
}
Further drift fixes Fix weird start drifting wrong way bug Drifting no longer adds to regular turn speed Drift boosts start as soon as you finish drifting
2017-03-07 05:00:00 +00:00
else if ((player->kartstuff[k_drift] != -5 && player->kartstuff[k_drift] != 5)
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
// || (player->kartstuff[k_drift] >= 1 && player->kartstuff[k_turndir] != 1) || (player->kartstuff[k_drift] <= -1 && player->kartstuff[k_turndir] != -1))
Steering fixes, drifting changed, weight has effect now
2017-02-24 01:36:43 +00:00
&& (player->kartstuff[k_driftcharge] >= dsone && player->kartstuff[k_driftcharge] < dstwo)
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
&& onground)
{
Don't allow a new driftboost of lesser magnitude to completely cancel an existing driftboost.
2018-10-01 11:27:35 +00:00
if (player->kartstuff[k_driftboost] < 20)
player->kartstuff[k_driftboost] = 20;
Spindash go sound for boosters
2018-06-19 02:29:52 +00:00
S_StartSound(player->mo, sfx_s23c);
Spindash boost dust, pogo spring sfx
2018-09-20 00:13:48 +00:00
//K_SpawnDashDustRelease(player);
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
player->kartstuff[k_driftcharge] = 0;
}
Further drift fixes Fix weird start drifting wrong way bug Drifting no longer adds to regular turn speed Drift boosts start as soon as you finish drifting
2017-03-07 05:00:00 +00:00
else if ((player->kartstuff[k_drift] != -5 && player->kartstuff[k_drift] != 5)
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
// || (player->kartstuff[k_drift] >= 1 && player->kartstuff[k_turndir] != 1) || (player->kartstuff[k_drift] <= -1 && player->kartstuff[k_turndir] != -1))
Rainbow sparks
2018-09-14 03:39:41 +00:00
&& player->kartstuff[k_driftcharge] < dsthree
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
&& onground)
{
Don't allow a new driftboost of lesser magnitude to completely cancel an existing driftboost.
2018-10-01 11:27:35 +00:00
if (player->kartstuff[k_driftboost] < 50)
player->kartstuff[k_driftboost] = 50;
Spindash go sound for boosters
2018-06-19 02:29:52 +00:00
S_StartSound(player->mo, sfx_s23c);
Spindash boost dust, pogo spring sfx
2018-09-20 00:13:48 +00:00
//K_SpawnDashDustRelease(player);
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
player->kartstuff[k_driftcharge] = 0;
}
Rainbow sparks
2018-09-14 03:39:41 +00:00
else if ((player->kartstuff[k_drift] != -5 && player->kartstuff[k_drift] != 5)
// || (player->kartstuff[k_drift] >= 1 && player->kartstuff[k_turndir] != 1) || (player->kartstuff[k_drift] <= -1 && player->kartstuff[k_turndir] != -1))
&& player->kartstuff[k_driftcharge] >= dsthree
&& onground)
{
Don't allow a new driftboost of lesser magnitude to completely cancel an existing driftboost.
2018-10-01 11:27:35 +00:00
if (player->kartstuff[k_driftboost] < 125)
player->kartstuff[k_driftboost] = 125;
Rainbow sparks
2018-09-14 03:39:41 +00:00
S_StartSound(player->mo, sfx_s23c);
Spindash boost dust, pogo spring sfx
2018-09-20 00:13:48 +00:00
//K_SpawnDashDustRelease(player);
Rainbow sparks
2018-09-14 03:39:41 +00:00
player->kartstuff[k_driftcharge] = 0;
}
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
// Drifting: left or right?
Lots of cmd restructuring. - cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster. - Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now. - Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request. - Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 21:12:42 +00:00
if ((player->cmd.driftturn > 0) && player->speed > FixedMul(10<<16, player->mo->scale) && player->kartstuff[k_jmp] == 1
Further drift fixes Fix weird start drifting wrong way bug Drifting no longer adds to regular turn speed Drift boosts start as soon as you finish drifting
2017-03-07 05:00:00 +00:00
&& (player->kartstuff[k_drift] == 0 || player->kartstuff[k_driftend] == 1)) // && player->kartstuff[k_drift] != 1)
{
// Starting left drift
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
player->kartstuff[k_drift] = 1;
angel island drift strat plus ketchup
2018-09-13 23:19:23 +00:00
player->kartstuff[k_driftend] = player->kartstuff[k_driftcharge] = 0;
Further drift fixes Fix weird start drifting wrong way bug Drifting no longer adds to regular turn speed Drift boosts start as soon as you finish drifting
2017-03-07 05:00:00 +00:00
}
Lots of cmd restructuring. - cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster. - Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now. - Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request. - Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 21:12:42 +00:00
else if ((player->cmd.driftturn < 0) && player->speed > FixedMul(10<<16, player->mo->scale) && player->kartstuff[k_jmp] == 1
Further drift fixes Fix weird start drifting wrong way bug Drifting no longer adds to regular turn speed Drift boosts start as soon as you finish drifting
2017-03-07 05:00:00 +00:00
&& (player->kartstuff[k_drift] == 0 || player->kartstuff[k_driftend] == 1)) // && player->kartstuff[k_drift] != -1)
{
// Starting right drift
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
player->kartstuff[k_drift] = -1;
angel island drift strat plus ketchup
2018-09-13 23:19:23 +00:00
player->kartstuff[k_driftend] = player->kartstuff[k_driftcharge] = 0;
Further drift fixes Fix weird start drifting wrong way bug Drifting no longer adds to regular turn speed Drift boosts start as soon as you finish drifting
2017-03-07 05:00:00 +00:00
}
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
else if (player->kartstuff[k_jmp] == 0) // || player->kartstuff[k_turndir] == 0)
Gradual turn into drift push angle
2017-03-07 03:00:10 +00:00
{
Further drift fixes Fix weird start drifting wrong way bug Drifting no longer adds to regular turn speed Drift boosts start as soon as you finish drifting
2017-03-07 05:00:00 +00:00
// drift is not being performed so if we're just finishing set driftend and decrement counters
Gradual turn into drift push angle
2017-03-07 03:00:10 +00:00
if (player->kartstuff[k_drift] > 0)
Re-implement the small turn-back after a drift ends
2017-03-07 03:27:44 +00:00
{
Gradual turn into drift push angle
2017-03-07 03:00:10 +00:00
player->kartstuff[k_drift]--;
Re-implement the small turn-back after a drift ends
2017-03-07 03:27:44 +00:00
player->kartstuff[k_driftend] = 1;
}
Gradual turn into drift push angle
2017-03-07 03:00:10 +00:00
else if (player->kartstuff[k_drift] < 0)
Re-implement the small turn-back after a drift ends
2017-03-07 03:27:44 +00:00
{
Gradual turn into drift push angle
2017-03-07 03:00:10 +00:00
player->kartstuff[k_drift]++;
Re-implement the small turn-back after a drift ends
2017-03-07 03:27:44 +00:00
player->kartstuff[k_driftend] = 1;
}
else
player->kartstuff[k_driftend] = 0;
Gradual turn into drift push angle
2017-03-07 03:00:10 +00:00
}
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
// Incease/decrease the drift value to continue drifting in that direction
Hundreds of tweaks - SPB multiplier depending on 1st-2nd distance - Removed the Battle-only k_poweritemtimer (hold over from when you could easily get invuln items all of the time), replaced it with a 2 invincibility item cap in ALL modes. - Spinout is affected by boosters, *properly* - Can no longer strafe while spinning out on speed bumps - Messed with how other items interact with speed bumps, again. - Old bounce code has been ported for non-players - Fixed Karma players being able to do anything after the round has ended. - Fixed sneaker and spinout timer weirdness - Fixed Mines still being hold-use - Fixed rubber-burn turn not working - Removed redundant k_spinout and unused k_boosting variables - Filled out the Color_Opposite table with Kart's new colors. Not really relevant right now (besides some extra Lua functionality) since nothing uses it, but will be nice for if we do the signpost from the sky idea.
2018-06-20 00:20:06 +00:00
if (player->kartstuff[k_spinouttimer] == 0 && player->kartstuff[k_jmp] == 1 && onground && player->kartstuff[k_drift] != 0)
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
{
Lots of cmd restructuring. - cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster. - Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now. - Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request. - Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 21:12:42 +00:00
fixed_t driftadditive = 24;
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
Fix drifting No longer does all the angle adjustments inside of the player thinker and instead does it with the controls Should hopefully avoid any desynch from drifting Also maybe fixed player 2's controls
2017-03-07 01:05:18 +00:00
if (player->kartstuff[k_drift] >= 1) // Drifting to the left
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
{
player->kartstuff[k_drift]++;
Gradual turn into drift push angle
2017-03-07 03:00:10 +00:00
if (player->kartstuff[k_drift] > 5)
player->kartstuff[k_drift] = 5;
Nerf mini-turbos to be more acceptable
2017-03-13 03:28:54 +00:00
Lots of cmd restructuring. - cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster. - Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now. - Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request. - Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 21:12:42 +00:00
if (player->cmd.driftturn > 0) // Inward
Critical inconsistency fix
2018-09-08 07:24:32 +00:00
driftadditive += abs(player->cmd.driftturn)/100;
Lots of cmd restructuring. - cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster. - Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now. - Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request. - Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 21:12:42 +00:00
if (player->cmd.driftturn < 0) // Outward
Critical inconsistency fix
2018-09-08 07:24:32 +00:00
driftadditive -= abs(player->cmd.driftturn)/75;
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
}
Fix drifting No longer does all the angle adjustments inside of the player thinker and instead does it with the controls Should hopefully avoid any desynch from drifting Also maybe fixed player 2's controls
2017-03-07 01:05:18 +00:00
else if (player->kartstuff[k_drift] <= -1) // Drifting to the right
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
{
player->kartstuff[k_drift]--;
Gradual turn into drift push angle
2017-03-07 03:00:10 +00:00
if (player->kartstuff[k_drift] < -5)
player->kartstuff[k_drift] = -5;
Nerf mini-turbos to be more acceptable
2017-03-13 03:28:54 +00:00
Lots of cmd restructuring. - cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster. - Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now. - Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request. - Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 21:12:42 +00:00
if (player->cmd.driftturn < 0) // Inward
Critical inconsistency fix
2018-09-08 07:24:32 +00:00
driftadditive += abs(player->cmd.driftturn)/100;
Lots of cmd restructuring. - cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster. - Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now. - Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request. - Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 21:12:42 +00:00
if (player->cmd.driftturn > 0) // Outward
Critical inconsistency fix
2018-09-08 07:24:32 +00:00
driftadditive -= abs(player->cmd.driftturn)/75;
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
}
Nerf mini-turbos to be more acceptable
2017-03-13 03:28:54 +00:00
// This spawns the drift sparks
New drift sparks
2018-09-11 23:52:00 +00:00
if (player->kartstuff[k_driftcharge] + driftadditive >= dsone)
K_SpawnDriftSparks(player);
Nerf mini-turbos to be more acceptable
2017-03-13 03:28:54 +00:00
player->kartstuff[k_driftcharge] += driftadditive;
player->kartstuff[k_driftend] = 0;
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
}
// Stop drifting
if (player->kartstuff[k_spinouttimer] > 0 // banana peel
Mobj scale fixes - MAXSTEPMOVE is affected by mobjscale - Minimum bump speeds (both wall & object) are affected by mobjscale - Minimum speed required for drifting is affected by player scale - Speedometer speeds are proportional to mobjscale - Camera no longer scales with player scale, to make the fact that you're either Lightning'd or Mega'd more obvious :V - Sevvvvvv go work on Dimension Heist
2018-01-15 21:14:45 +00:00
|| player->speed < FixedMul(10<<16, player->mo->scale)) // you're too slow!
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
{
Brake drfit effect
2018-11-01 01:35:17 +00:00
player->kartstuff[k_drift] = player->kartstuff[k_driftcharge] = 0;
player->kartstuff[k_aizdriftstrat] = player->kartstuff[k_brakedrift] = 0;
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
}
angel island drift strat plus ketchup
2018-09-13 23:19:23 +00:00
if ((!player->kartstuff[k_sneakertimer])
|| (!player->cmd.driftturn)
|| (player->cmd.driftturn > 0) != (player->kartstuff[k_aizdriftstrat] > 0))
{
if (!player->kartstuff[k_drift])
player->kartstuff[k_aizdriftstrat] = 0;
else
player->kartstuff[k_aizdriftstrat] = ((player->kartstuff[k_drift] > 0) ? 1 : -1);
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
}
angel island drift strat plus ketchup
2018-09-13 23:19:23 +00:00
else if (player->kartstuff[k_aizdriftstrat] && !player->kartstuff[k_drift])
K_SpawnAIZDust(player);
Brake drfit effect
2018-11-01 01:35:17 +00:00
if (player->kartstuff[k_drift]
&& ((player->cmd.buttons & BT_BRAKE)
|| !(player->cmd.buttons & BT_ACCELERATE))
&& P_IsObjectOnGround(player->mo))
{
if (!player->kartstuff[k_brakedrift])
K_SpawnBrakeDriftSparks(player);
player->kartstuff[k_brakedrift] = 1;
}
else
player->kartstuff[k_brakedrift] = 0;
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
}
Some position code
2017-02-13 04:24:49 +00:00
//
// K_KartUpdatePosition
//
static void K_KartUpdatePosition(player_t *player)
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
{
Some position code
2017-02-13 04:24:49 +00:00
fixed_t position = 1;
Unfinished V_HORZSCREEN revamp
2017-12-22 15:16:41 +00:00
fixed_t oldposition = player->kartstuff[k_position];
Some position code
2017-02-13 04:24:49 +00:00
fixed_t i, ppcd, pncd, ipcd, incd;
fixed_t pmo, imo;
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
mobj_t *mo;
Some accelcode changes to let CC's work.
2017-02-10 04:57:31 +00:00
Fixed spectating for real, messages for changing some kart cvars, Mirror Mode disallowed in Battle
2018-01-30 00:15:25 +00:00
if (player->spectator || !player->mo)
return;
Some position code
2017-02-13 04:24:49 +00:00
for (i = 0; i < MAXPLAYERS; i++)
{
Fixed spectating for real, messages for changing some kart cvars, Mirror Mode disallowed in Battle
2018-01-30 00:15:25 +00:00
if (!playeringame[i] || players[i].spectator || !players[i].mo)
continue;
Made a lot of gametype checks use either G_RaceGametype or G_BattleGametype Should make it a lot easier to add more gametypes later. Also some minor fixes: - Changed up how shell speed scales in mobjscale juuuust slightly, so it's less messy - Fixed CHECK showing spectators
2018-03-04 20:27:52 +00:00
if (G_RaceGametype())
Some position code
2017-02-13 04:24:49 +00:00
{
Fixed spectating for real, messages for changing some kart cvars, Mirror Mode disallowed in Battle
2018-01-30 00:15:25 +00:00
if ((((players[i].starpostnum) + (numstarposts + 1) * players[i].laps) >
Many things! - Position faces are now drawn in Battle, categorized first by balloons, then by points - Balloon-based items, gives people who are worse off better items, and people who are better off worse items. - You can strafe while using feather or while using a bounce pad - Reduced the strength of bounce pad thrust on items - Increased bounce pad's minimum forward push on players - Made Frantic Mode just a teeeeensy bit more frantic - Fixed being able to use Feathers mid-air - Fixed being unable to steal Feathers - Drift sparks use frameangle instead of angle
2017-11-23 02:40:17 +00:00
((player->starpostnum) + (numstarposts + 1) * player->laps)))
position++;
Fixed spectating for real, messages for changing some kart cvars, Mirror Mode disallowed in Battle
2018-01-30 00:15:25 +00:00
else if (((players[i].starpostnum) + (numstarposts+1)*players[i].laps) ==
((player->starpostnum) + (numstarposts+1)*player->laps))
Many things! - Position faces are now drawn in Battle, categorized first by balloons, then by points - Balloon-based items, gives people who are worse off better items, and people who are better off worse items. - You can strafe while using feather or while using a bounce pad - Reduced the strength of bounce pad thrust on items - Increased bounce pad's minimum forward push on players - Made Frantic Mode just a teeeeensy bit more frantic - Fixed being able to use Feathers mid-air - Fixed being unable to steal Feathers - Drift sparks use frameangle instead of angle
2017-11-23 02:40:17 +00:00
{
ppcd = pncd = ipcd = incd = 0;
Some accelcode changes to let CC's work.
2017-02-10 04:57:31 +00:00
Many things! - Position faces are now drawn in Battle, categorized first by balloons, then by points - Balloon-based items, gives people who are worse off better items, and people who are better off worse items. - You can strafe while using feather or while using a bounce pad - Reduced the strength of bounce pad thrust on items - Increased bounce pad's minimum forward push on players - Made Frantic Mode just a teeeeensy bit more frantic - Fixed being able to use Feathers mid-air - Fixed being unable to steal Feathers - Drift sparks use frameangle instead of angle
2017-11-23 02:40:17 +00:00
player->kartstuff[k_prevcheck] = players[i].kartstuff[k_prevcheck] = 0;
player->kartstuff[k_nextcheck] = players[i].kartstuff[k_nextcheck] = 0;
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
Many things! - Position faces are now drawn in Battle, categorized first by balloons, then by points - Balloon-based items, gives people who are worse off better items, and people who are better off worse items. - You can strafe while using feather or while using a bounce pad - Reduced the strength of bounce pad thrust on items - Increased bounce pad's minimum forward push on players - Made Frantic Mode just a teeeeensy bit more frantic - Fixed being able to use Feathers mid-air - Fixed being unable to steal Feathers - Drift sparks use frameangle instead of angle
2017-11-23 02:40:17 +00:00
// This checks every thing on the map, and looks for MT_BOSS3WAYPOINT (the thing we're using for checkpoint wp's, for now)
Experimental: Making the ghetto waypoints we have right now their own mobj list in order to make them slightly less bullshit
2018-09-29 19:28:27 +00:00
for (mo = waypointcap; mo != NULL; mo = mo->tracer)
Many things! - Position faces are now drawn in Battle, categorized first by balloons, then by points - Balloon-based items, gives people who are worse off better items, and people who are better off worse items. - You can strafe while using feather or while using a bounce pad - Reduced the strength of bounce pad thrust on items - Increased bounce pad's minimum forward push on players - Made Frantic Mode just a teeeeensy bit more frantic - Fixed being able to use Feathers mid-air - Fixed being unable to steal Feathers - Drift sparks use frameangle instead of angle
2017-11-23 02:40:17 +00:00
{
pmo = P_AproxDistance(P_AproxDistance( mo->x - player->mo->x,
mo->y - player->mo->y),
mo->z - player->mo->z) / FRACUNIT;
imo = P_AproxDistance(P_AproxDistance( mo->x - players[i].mo->x,
mo->y - players[i].mo->y),
mo->z - players[i].mo->z) / FRACUNIT;
Fixed position code, added some item numbers
2017-02-17 02:33:00 +00:00
Many things! - Position faces are now drawn in Battle, categorized first by balloons, then by points - Balloon-based items, gives people who are worse off better items, and people who are better off worse items. - You can strafe while using feather or while using a bounce pad - Reduced the strength of bounce pad thrust on items - Increased bounce pad's minimum forward push on players - Made Frantic Mode just a teeeeensy bit more frantic - Fixed being able to use Feathers mid-air - Fixed being unable to steal Feathers - Drift sparks use frameangle instead of angle
2017-11-23 02:40:17 +00:00
if (mo->health == player->starpostnum)
{
player->kartstuff[k_prevcheck] += pmo;
ppcd++;
}
if (mo->health == (player->starpostnum + 1))
{
player->kartstuff[k_nextcheck] += pmo;
pncd++;
}
if (mo->health == players[i].starpostnum)
{
players[i].kartstuff[k_prevcheck] += imo;
ipcd++;
}
if (mo->health == (players[i].starpostnum + 1))
{
players[i].kartstuff[k_nextcheck] += imo;
incd++;
}
Fixed position code, added some item numbers
2017-02-17 02:33:00 +00:00
}
Many things! - Position faces are now drawn in Battle, categorized first by balloons, then by points - Balloon-based items, gives people who are worse off better items, and people who are better off worse items. - You can strafe while using feather or while using a bounce pad - Reduced the strength of bounce pad thrust on items - Increased bounce pad's minimum forward push on players - Made Frantic Mode just a teeeeensy bit more frantic - Fixed being able to use Feathers mid-air - Fixed being unable to steal Feathers - Drift sparks use frameangle instead of angle
2017-11-23 02:40:17 +00:00
if (ppcd > 1) player->kartstuff[k_prevcheck] /= ppcd;
if (pncd > 1) player->kartstuff[k_nextcheck] /= pncd;
if (ipcd > 1) players[i].kartstuff[k_prevcheck] /= ipcd;
if (incd > 1) players[i].kartstuff[k_nextcheck] /= incd;
if ((players[i].kartstuff[k_nextcheck] > 0 || player->kartstuff[k_nextcheck] > 0) && !player->exiting)
Fixed position code, added some item numbers
2017-02-17 02:33:00 +00:00
{
Many things! - Position faces are now drawn in Battle, categorized first by balloons, then by points - Balloon-based items, gives people who are worse off better items, and people who are better off worse items. - You can strafe while using feather or while using a bounce pad - Reduced the strength of bounce pad thrust on items - Increased bounce pad's minimum forward push on players - Made Frantic Mode just a teeeeensy bit more frantic - Fixed being able to use Feathers mid-air - Fixed being unable to steal Feathers - Drift sparks use frameangle instead of angle
2017-11-23 02:40:17 +00:00
if ((players[i].kartstuff[k_nextcheck] - players[i].kartstuff[k_prevcheck]) <
(player->kartstuff[k_nextcheck] - player->kartstuff[k_prevcheck]))
position++;
Fixed position code, added some item numbers
2017-02-17 02:33:00 +00:00
}
Many things! - Position faces are now drawn in Battle, categorized first by balloons, then by points - Balloon-based items, gives people who are worse off better items, and people who are better off worse items. - You can strafe while using feather or while using a bounce pad - Reduced the strength of bounce pad thrust on items - Increased bounce pad's minimum forward push on players - Made Frantic Mode just a teeeeensy bit more frantic - Fixed being able to use Feathers mid-air - Fixed being unable to steal Feathers - Drift sparks use frameangle instead of angle
2017-11-23 02:40:17 +00:00
else if (!player->exiting)
Fixed position code, added some item numbers
2017-02-17 02:33:00 +00:00
{
Many things! - Position faces are now drawn in Battle, categorized first by balloons, then by points - Balloon-based items, gives people who are worse off better items, and people who are better off worse items. - You can strafe while using feather or while using a bounce pad - Reduced the strength of bounce pad thrust on items - Increased bounce pad's minimum forward push on players - Made Frantic Mode just a teeeeensy bit more frantic - Fixed being able to use Feathers mid-air - Fixed being unable to steal Feathers - Drift sparks use frameangle instead of angle
2017-11-23 02:40:17 +00:00
if (players[i].kartstuff[k_prevcheck] > player->kartstuff[k_prevcheck])
position++;
Fixed position code, added some item numbers
2017-02-17 02:33:00 +00:00
}
Many things! - Position faces are now drawn in Battle, categorized first by balloons, then by points - Balloon-based items, gives people who are worse off better items, and people who are better off worse items. - You can strafe while using feather or while using a bounce pad - Reduced the strength of bounce pad thrust on items - Increased bounce pad's minimum forward push on players - Made Frantic Mode just a teeeeensy bit more frantic - Fixed being able to use Feathers mid-air - Fixed being unable to steal Feathers - Drift sparks use frameangle instead of angle
2017-11-23 02:40:17 +00:00
else
Fixed position code, added some item numbers
2017-02-17 02:33:00 +00:00
{
Many things! - Position faces are now drawn in Battle, categorized first by balloons, then by points - Balloon-based items, gives people who are worse off better items, and people who are better off worse items. - You can strafe while using feather or while using a bounce pad - Reduced the strength of bounce pad thrust on items - Increased bounce pad's minimum forward push on players - Made Frantic Mode just a teeeeensy bit more frantic - Fixed being able to use Feathers mid-air - Fixed being unable to steal Feathers - Drift sparks use frameangle instead of angle
2017-11-23 02:40:17 +00:00
if (players[i].starposttime < player->starposttime)
position++;
Fixed position code, added some item numbers
2017-02-17 02:33:00 +00:00
}
Some position code
2017-02-13 04:24:49 +00:00
}
Many things! - Position faces are now drawn in Battle, categorized first by balloons, then by points - Balloon-based items, gives people who are worse off better items, and people who are better off worse items. - You can strafe while using feather or while using a bounce pad - Reduced the strength of bounce pad thrust on items - Increased bounce pad's minimum forward push on players - Made Frantic Mode just a teeeeensy bit more frantic - Fixed being able to use Feathers mid-air - Fixed being unable to steal Feathers - Drift sparks use frameangle instead of angle
2017-11-23 02:40:17 +00:00
}
Made a lot of gametype checks use either G_RaceGametype or G_BattleGametype Should make it a lot easier to add more gametypes later. Also some minor fixes: - Changed up how shell speed scales in mobjscale juuuust slightly, so it's less messy - Fixed CHECK showing spectators
2018-03-04 20:27:52 +00:00
else if (G_BattleGametype())
Many things! - Position faces are now drawn in Battle, categorized first by balloons, then by points - Balloon-based items, gives people who are worse off better items, and people who are better off worse items. - You can strafe while using feather or while using a bounce pad - Reduced the strength of bounce pad thrust on items - Increased bounce pad's minimum forward push on players - Made Frantic Mode just a teeeeensy bit more frantic - Fixed being able to use Feathers mid-air - Fixed being unable to steal Feathers - Drift sparks use frameangle instead of angle
2017-11-23 02:40:17 +00:00
{
Battle finish music, fixed double-wanted bug
2018-07-02 21:57:22 +00:00
if (player->exiting) // End of match standings
{
*A biggie: two-tier intermission screen! * Have the entire thing slide the fuck away a short while into the intermission. * The tab screen is modified to work off similar behaviour and presentation. * To go with it, a revamp of how Battle's scoring is handled. * It's now considered "hits", and is stored in a reuse in one of the vanilla NiGHTS variables, allowing it to use exactly the same ranking mechanisms as race. * No more resetting of score between battle rounds. * Minor, unrelated general code cleanup in places. * Disable the YEEEAH in splitscreen, otherwise you'll hear it *all the time*.
2018-07-18 19:23:46 +00:00
if (players[i].marescore > player->marescore) // Only score matters
Battle finish music, fixed double-wanted bug
2018-07-02 21:57:22 +00:00
position++;
}
else
{
*A biggie: two-tier intermission screen! * Have the entire thing slide the fuck away a short while into the intermission. * The tab screen is modified to work off similar behaviour and presentation. * To go with it, a revamp of how Battle's scoring is handled. * It's now considered "hits", and is stored in a reuse in one of the vanilla NiGHTS variables, allowing it to use exactly the same ranking mechanisms as race. * No more resetting of score between battle rounds. * Minor, unrelated general code cleanup in places. * Disable the YEEEAH in splitscreen, otherwise you'll hear it *all the time*.
2018-07-18 19:23:46 +00:00
if (players[i].kartstuff[k_bumper] == player->kartstuff[k_bumper] && players[i].marescore > player->marescore)
Battle finish music, fixed double-wanted bug
2018-07-02 21:57:22 +00:00
position++;
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
else if (players[i].kartstuff[k_bumper] > player->kartstuff[k_bumper])
Battle finish music, fixed double-wanted bug
2018-07-02 21:57:22 +00:00
position++;
}
Some position code
2017-02-13 04:24:49 +00:00
}
}
Mooore tweaks - Fixed position numbers; orders by balloons first then points (before it was doing it the other way around), and the leading players should never display as like 3 or something if there's ties :v - Messed with Boo & Feather frequencies to be less common in Battle - Fixed the issue when a karma bomb steals a balloon from one of the two last people standing, kills them, and comes back, and the game ends anyway, giving two players the "win" bonus - Removed karma items being able to pass their items to other karma bombs. This never worked correctly in the first place, and I'm 95% sure it's what's been causing people to be ghosts forever
2017-11-30 22:34:48 +00:00
Lakitu murder & countdown improvements (I'm not SevenethSentienel! I just don't feel like logging out!)
2018-06-25 02:15:22 +00:00
if (leveltime < starttime || oldposition == 0)
Unfinished V_HORZSCREEN revamp
2017-12-22 15:16:41 +00:00
oldposition = position;
if (oldposition != position) // Changed places?
Banana drag slowdown, diagonal springs scale to map scale instead of object's scale, OGL skincolors average all colors
2018-07-04 23:06:45 +00:00
player->kartstuff[k_positiondelay] = 10; // Position number growth
Unfinished V_HORZSCREEN revamp
2017-12-22 15:16:41 +00:00
Some position code
2017-02-13 04:24:49 +00:00
player->kartstuff[k_position] = position;
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
}
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
Many things! - Position faces are now drawn in Battle, categorized first by balloons, then by points - Balloon-based items, gives people who are worse off better items, and people who are better off worse items. - You can strafe while using feather or while using a bounce pad - Reduced the strength of bounce pad thrust on items - Increased bounce pad's minimum forward push on players - Made Frantic Mode just a teeeeensy bit more frantic - Fixed being able to use Feathers mid-air - Fixed being unable to steal Feathers - Drift sparks use frameangle instead of angle
2017-11-23 02:40:17 +00:00
//
// K_StripItems
//
Shrink buffed HEAVILY It now does its job properly: repairing races when there is one straggler far in the back. - Wipeout instead of spinout, to prevent cheap deaths - Lose all of your items when you get shrunk. - You cannot pick up any items while shrunk. - x2 duration. - Appears in the very back, with 10% chance.
2018-06-12 20:27:51 +00:00
void K_StripItems(player_t *player)
Dang it.
2017-11-01 20:24:40 +00:00
{
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
player->kartstuff[k_itemtype] = KITEM_NONE;
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
player->kartstuff[k_itemamount] = 0;
player->kartstuff[k_itemheld] = 0;
Shrink buffed HEAVILY It now does its job properly: repairing races when there is one straggler far in the back. - Wipeout instead of spinout, to prevent cheap deaths - Lose all of your items when you get shrunk. - You cannot pick up any items while shrunk. - x2 duration. - Appears in the very back, with 10% chance.
2018-06-12 20:27:51 +00:00
player->kartstuff[k_rocketsneakertimer] = 0;
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
if (!player->kartstuff[k_itemroulette] || player->kartstuff[k_roulettetype] != 2)
{
player->kartstuff[k_itemroulette] = 0;
player->kartstuff[k_roulettetype] = 0;
}
Shrink buffed HEAVILY It now does its job properly: repairing races when there is one straggler far in the back. - Wipeout instead of spinout, to prevent cheap deaths - Lose all of your items when you get shrunk. - You cannot pick up any items while shrunk. - x2 duration. - Appears in the very back, with 10% chance.
2018-06-12 20:27:51 +00:00
player->kartstuff[k_eggmanheld] = 0;
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
player->kartstuff[k_hyudorotimer] = 0;
player->kartstuff[k_stealingtimer] = 0;
player->kartstuff[k_stolentimer] = 0;
Shrink buffed HEAVILY It now does its job properly: repairing races when there is one straggler far in the back. - Wipeout instead of spinout, to prevent cheap deaths - Lose all of your items when you get shrunk. - You cannot pick up any items while shrunk. - x2 duration. - Appears in the very back, with 10% chance.
2018-06-12 20:27:51 +00:00
Thunder shield overlay
2018-08-04 19:48:31 +00:00
player->kartstuff[k_curshield] = 0;
//player->kartstuff[k_thunderanim] = 0;
player->kartstuff[k_bananadrag] = 0;
Shrink buffed HEAVILY It now does its job properly: repairing races when there is one straggler far in the back. - Wipeout instead of spinout, to prevent cheap deaths - Lose all of your items when you get shrunk. - You cannot pick up any items while shrunk. - x2 duration. - Appears in the very back, with 10% chance.
2018-06-12 20:27:51 +00:00
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
player->kartstuff[k_sadtimer] = 0;
No longer are orbiting/trailing objects in charge of removing themselves. * They're clearly not quick enough at the job, since it causes a bunch of silly race conditions. * Instead, K_UpdateHnextList and K_CleanHnextList are in charge of removing them, which are called in the circumstances itemamount (and itemheld/eggmanheld) is changed. * Also, tweak a few places so that trailers AND orbiters can use the same system. Also, some minor thingies. * Turn all the useless ```if (a) { A } else if (!a) { B }``` bullshit into ```if (a) { A } else { B }``` bullshit. * Fix up some minor inaccuracies in the playerarrow stuff that doesn't result in creating more sprites.
2018-08-24 14:14:18 +00:00
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
K_UpdateHnextList(player, true);
}
void K_StripOther(player_t *player)
{
player->kartstuff[k_itemroulette] = 0;
player->kartstuff[k_roulettetype] = 0;
player->kartstuff[k_invincibilitytimer] = 0;
player->kartstuff[k_growshrinktimer] = 0;
Karma Eggman. Does what it says on the egg. Tried very hard not to merge conflict with `frameperfectegg`. Also includes some adjustments to: * Horizontal offset of Eggman countdown in splitscreen again. It's not perfectly centered either way, but on second thought I like this better. * Sound of Lat`'s Mine/SPB explosions - now uses same sound as Karma bombing, instead of that shitty paraloop. * Correctly wipe k_eggmanblame when it is appropriate to do so.
2018-10-07 10:40:06 +00:00
if (player->kartstuff[k_eggmanexplode])
{
player->kartstuff[k_eggmanexplode] = 0;
player->kartstuff[k_eggmanblame] = -1;
}
Dang it.
2017-11-01 20:24:40 +00:00
}
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
Some position code
2017-02-13 04:24:49 +00:00
//
// K_MoveKartPlayer
//
Fix drifting No longer does all the angle adjustments inside of the player thinker and instead does it with the controls Should hopefully avoid any desynch from drifting Also maybe fixed player 2's controls
2017-03-07 01:05:18 +00:00
void K_MoveKartPlayer(player_t *player, boolean onground)
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
{
Fix drifting No longer does all the angle adjustments inside of the player thinker and instead does it with the controls Should hopefully avoid any desynch from drifting Also maybe fixed player 2's controls
2017-03-07 01:05:18 +00:00
ticcmd_t *cmd = &player->cmd;
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
boolean ATTACK_IS_DOWN = ((cmd->buttons & BT_ATTACK) && !(player->pflags & PF_ATTACKDOWN));
Rename fake item to eggman monitor
2018-03-14 01:07:08 +00:00
boolean HOLDING_ITEM = (player->kartstuff[k_itemheld] || player->kartstuff[k_eggmanheld]);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
boolean NO_HYUDORO = (player->kartstuff[k_stolentimer] == 0 && player->kartstuff[k_stealingtimer] == 0);
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
Many things! - Position faces are now drawn in Battle, categorized first by balloons, then by points - Balloon-based items, gives people who are worse off better items, and people who are better off worse items. - You can strafe while using feather or while using a bounce pad - Reduced the strength of bounce pad thrust on items - Increased bounce pad's minimum forward push on players - Made Frantic Mode just a teeeeensy bit more frantic - Fixed being able to use Feathers mid-air - Fixed being unable to steal Feathers - Drift sparks use frameangle instead of angle
2017-11-23 02:40:17 +00:00
K_KartUpdatePosition(player);
Some position code
2017-02-13 04:24:49 +00:00
Big voices change When using a taunt voice (item usage) there's a 5 second delay on more taunts and a 2 second delay on other voices When using other voices, there's at least a 2 second delay on all other voices
2018-06-07 18:56:26 +00:00
if (!player->exiting)
Some position code
2017-02-13 04:24:49 +00:00
{
Hopefully some medicine for the characters' sore throats from all that taunting Also my editor ate some trailing whitespace.
2018-07-04 21:25:38 +00:00
if (player->kartstuff[k_oldposition] < player->kartstuff[k_position]) // But first, if you lost a place,
{
Some position code
2017-02-13 04:24:49 +00:00
player->kartstuff[k_oldposition] = player->kartstuff[k_position]; // then the other player taunts.
Hopefully some medicine for the characters' sore throats from all that taunting Also my editor ate some trailing whitespace.
2018-07-04 21:25:38 +00:00
K_RegularVoiceTimers(player); // and you can't for a bit
}
Some position code
2017-02-13 04:24:49 +00:00
else if (player->kartstuff[k_oldposition] > player->kartstuff[k_position]) // Otherwise,
{
Big voices change When using a taunt voice (item usage) there's a 5 second delay on more taunts and a 2 second delay on other voices When using other voices, there's at least a 2 second delay on all other voices
2018-06-07 18:56:26 +00:00
K_PlayOvertakeSound(player->mo); // Say "YOU'RE TOO SLOW!"
Some position code
2017-02-13 04:24:49 +00:00
player->kartstuff[k_oldposition] = player->kartstuff[k_position]; // Restore the old position,
}
Restore the removed voices
2018-06-07 18:34:13 +00:00
}
Unfinished V_HORZSCREEN revamp
2017-12-22 15:16:41 +00:00
Some position code
2017-02-13 04:24:49 +00:00
if (player->kartstuff[k_positiondelay])
player->kartstuff[k_positiondelay]--;
Updates done a while ago... Not 100% sure what they were. :x
2016-11-21 04:23:00 +00:00
if ((player->pflags & PF_ATTACKDOWN) && !(cmd->buttons & BT_ATTACK))
player->pflags &= ~PF_ATTACKDOWN;
else if (cmd->buttons & BT_ATTACK)
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
player->pflags |= PF_ATTACKDOWN;
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
No item usage while squished or respawning
2018-10-31 09:32:59 +00:00
if (player && player->mo && player->mo->health > 0 && !player->spectator && !(player->exiting || mapreset)
&& player->kartstuff[k_spinouttimer] == 0 && player->kartstuff[k_squishedtimer] == 0 && player->kartstuff[k_respawn] == 0)
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
{
Misc tweaks just about everywhere - More Jawz states for later - Jawz orbit their user in the right direction now. - Banana trails made closer to each other - wheels.lua hardcoded - All held items take a double press, for consistency. - Fixed Karma Items not being able to be collected by invincibility or hyudoro users
2018-06-18 04:42:53 +00:00
// First, the really specific, finicky items that function without the item being directly in your item slot.
* Tweak battle odds in a few ways, as authorised by Sal. * Steal a point from Ballhog and give to Orbinaut. * Make it based on the maximum number of bumpers someone has, not the average for everyone. * Improve the odds a tad if you're Wanted. * Tweak the score multiplication to give three points for Wanted and two for removing the last bumper (both disabled if you get the hit with a fake item). * Allow Karma players to drop their Random box. * These boxes flicker out of existence after 15 seconds. * Causes a WAIT penalty, too. * Remove some redundant PF_ATTACKDOWN stuff, given under the conditions the flag would be applied, it has definitely *already* been applied.
2018-08-06 17:37:03 +00:00
// Karma item dropping
if (ATTACK_IS_DOWN && player->kartstuff[k_comebackmode] && !player->kartstuff[k_comebacktimer])
{
mobj_t *newitem;
Karma Eggman. Does what it says on the egg. Tried very hard not to merge conflict with `frameperfectegg`. Also includes some adjustments to: * Horizontal offset of Eggman countdown in splitscreen again. It's not perfectly centered either way, but on second thought I like this better. * Sound of Lat`'s Mine/SPB explosions - now uses same sound as Karma bombing, instead of that shitty paraloop. * Correctly wipe k_eggmanblame when it is appropriate to do so.
2018-10-07 10:40:06 +00:00
if (player->kartstuff[k_comebackmode] == 1)
{
newitem = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_RANDOMITEM);
newitem->threshold = 69; // selected "randomly".
}
else
{
The motherload: all of my Lua is hardcoded This took like 6 straight hours of work, never ask me for anything ever again
2018-10-29 09:00:08 +00:00
newitem = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_EGGMANITEM);
Karma Eggman. Does what it says on the egg. Tried very hard not to merge conflict with `frameperfectegg`. Also includes some adjustments to: * Horizontal offset of Eggman countdown in splitscreen again. It's not perfectly centered either way, but on second thought I like this better. * Sound of Lat`'s Mine/SPB explosions - now uses same sound as Karma bombing, instead of that shitty paraloop. * Correctly wipe k_eggmanblame when it is appropriate to do so.
2018-10-07 10:40:06 +00:00
if (player->kartstuff[k_eggmanblame] >= 0
&& player->kartstuff[k_eggmanblame] < MAXPLAYERS
&& playeringame[player->kartstuff[k_eggmanblame]]
&& !players[player->kartstuff[k_eggmanblame]].spectator
&& players[player->kartstuff[k_eggmanblame]].mo)
P_SetTarget(&newitem->target, players[player->kartstuff[k_eggmanblame]].mo);
player->kartstuff[k_eggmanblame] = -1;
}
* Tweak battle odds in a few ways, as authorised by Sal. * Steal a point from Ballhog and give to Orbinaut. * Make it based on the maximum number of bumpers someone has, not the average for everyone. * Improve the odds a tad if you're Wanted. * Tweak the score multiplication to give three points for Wanted and two for removing the last bumper (both disabled if you get the hit with a fake item). * Allow Karma players to drop their Random box. * These boxes flicker out of existence after 15 seconds. * Causes a WAIT penalty, too. * Remove some redundant PF_ATTACKDOWN stuff, given under the conditions the flag would be applied, it has definitely *already* been applied.
2018-08-06 17:37:03 +00:00
newitem->flags2 = (player->mo->flags2 & MF2_OBJECTFLIP);
newitem->fuse = 15*TICRATE; // selected randomly.
Karma Eggman. Does what it says on the egg. Tried very hard not to merge conflict with `frameperfectegg`. Also includes some adjustments to: * Horizontal offset of Eggman countdown in splitscreen again. It's not perfectly centered either way, but on second thought I like this better. * Sound of Lat`'s Mine/SPB explosions - now uses same sound as Karma bombing, instead of that shitty paraloop. * Correctly wipe k_eggmanblame when it is appropriate to do so.
2018-10-07 10:40:06 +00:00
player->kartstuff[k_comebackmode] = 0;
player->kartstuff[k_comebacktimer] = comebacktime;
S_StartSound(player->mo, sfx_s254);
* Tweak battle odds in a few ways, as authorised by Sal. * Steal a point from Ballhog and give to Orbinaut. * Make it based on the maximum number of bumpers someone has, not the average for everyone. * Improve the odds a tad if you're Wanted. * Tweak the score multiplication to give three points for Wanted and two for removing the last bumper (both disabled if you get the hit with a fake item). * Allow Karma players to drop their Random box. * These boxes flicker out of existence after 15 seconds. * Causes a WAIT penalty, too. * Remove some redundant PF_ATTACKDOWN stuff, given under the conditions the flag would be applied, it has definitely *already* been applied.
2018-08-06 17:37:03 +00:00
}
eggman broken
2018-08-12 00:19:09 +00:00
// Eggman Monitor exploding
else if (player->kartstuff[k_eggmanexplode])
{
if (ATTACK_IS_DOWN && player->kartstuff[k_eggmanexplode] <= 3*TICRATE && player->kartstuff[k_eggmanexplode] > 1)
player->kartstuff[k_eggmanexplode] = 1;
}
Misc tweaks just about everywhere - More Jawz states for later - Jawz orbit their user in the right direction now. - Banana trails made closer to each other - wheels.lua hardcoded - All held items take a double press, for consistency. - Fixed Karma Items not being able to be collected by invincibility or hyudoro users
2018-06-18 04:42:53 +00:00
// Eggman Monitor throwing
* Tweak battle odds in a few ways, as authorised by Sal. * Steal a point from Ballhog and give to Orbinaut. * Make it based on the maximum number of bumpers someone has, not the average for everyone. * Improve the odds a tad if you're Wanted. * Tweak the score multiplication to give three points for Wanted and two for removing the last bumper (both disabled if you get the hit with a fake item). * Allow Karma players to drop their Random box. * These boxes flicker out of existence after 15 seconds. * Causes a WAIT penalty, too. * Remove some redundant PF_ATTACKDOWN stuff, given under the conditions the flag would be applied, it has definitely *already* been applied.
2018-08-06 17:37:03 +00:00
else if (ATTACK_IS_DOWN && player->kartstuff[k_eggmanheld])
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
{
The motherload: all of my Lua is hardcoded This took like 6 straight hours of work, never ask me for anything ever again
2018-10-29 09:00:08 +00:00
K_ThrowKartItem(player, false, MT_EGGMANITEM, -1, 0);
New voices - Following Oni's proposal. This means taunts are split into 2 types for offensive items and boost, 2 less hurt sounds, and there's another clip for using invincibility item (or whatever other powerful items we want to apply it to later; maybe size-down?) - Win/lose quotes are played at full volume for the person who said it. - A new sound effect plays when you hit someone with voices disabled. - Reduce amount of RNG being called from the vanilla P_Play[whatever]Sound functions - Added our skin sound constants to the dehacked list. - Unrelated: finish line sfx plays in splitscreen
2018-08-28 20:29:50 +00:00
K_PlayAttackTaunt(player->mo);
Rename fake item to eggman monitor
2018-03-14 01:07:08 +00:00
player->kartstuff[k_eggmanheld] = 0;
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
K_UpdateHnextList(player, true);
Fireballs work, added to roulette. Removed [k_fireballtimer] since it is not going to be used.
2017-05-13 15:14:26 +00:00
}
Misc tweaks just about everywhere - More Jawz states for later - Jawz orbit their user in the right direction now. - Banana trails made closer to each other - wheels.lua hardcoded - All held items take a double press, for consistency. - Fixed Karma Items not being able to be collected by invincibility or hyudoro users
2018-06-18 04:42:53 +00:00
// Rocket Sneaker
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
else if (ATTACK_IS_DOWN && !HOLDING_ITEM && onground && NO_HYUDORO
&& player->kartstuff[k_rocketsneakertimer] > 1)
Fireballs work, added to roulette. Removed [k_fireballtimer] since it is not going to be used.
2017-05-13 15:14:26 +00:00
{
Rocket Sneakers appear beside you
2018-10-07 22:53:46 +00:00
K_DoSneaker(player, 2);
New voices - Following Oni's proposal. This means taunts are split into 2 types for offensive items and boost, 2 less hurt sounds, and there's another clip for using invincibility item (or whatever other powerful items we want to apply it to later; maybe size-down?) - Win/lose quotes are played at full volume for the person who said it. - A new sound effect plays when you hit someone with voices disabled. - Reduce amount of RNG being called from the vanilla P_Play[whatever]Sound functions - Added our skin sound constants to the dehacked list. - Unrelated: finish line sfx plays in splitscreen
2018-08-28 20:29:50 +00:00
K_PlayBoostTaunt(player->mo);
Last batch of tweaks - Rocket sneaker meter depletes more slowly when idle, but depletes much more when using it. This balances out to give it a couple more boosts when you use it well, but allows you to waste it more quickly when you don't want it anymore. Also demonstrates better to new players to not spam it like a gold shroom! - Vibrating frames on sneakers when they aren't being used. - Shoe weight is less strong.
2018-10-10 18:56:50 +00:00
player->kartstuff[k_rocketsneakertimer] -= 2*TICRATE;
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
if (player->kartstuff[k_rocketsneakertimer] < 1)
player->kartstuff[k_rocketsneakertimer] = 1;
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
}
Add some more safety checks to the item system. While I cannot guarantee the class of glitches that allows for additional items to be thrown/dropped has been completely obliterated, this DOES prevent the class of exploits that allows for "infinite items" (really just negative quantities not completely bounds-checked for).
2018-08-15 13:40:06 +00:00
else if (player->kartstuff[k_itemamount] <= 0)
{
player->kartstuff[k_itemamount] = player->kartstuff[k_itemheld] = 0;
}
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
else
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
{
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
switch (player->kartstuff[k_itemtype])
{
case KITEM_SNEAKER:
if (ATTACK_IS_DOWN && !HOLDING_ITEM && onground && NO_HYUDORO)
{
Rocket Sneakers appear beside you
2018-10-07 22:53:46 +00:00
K_DoSneaker(player, 1);
New voices - Following Oni's proposal. This means taunts are split into 2 types for offensive items and boost, 2 less hurt sounds, and there's another clip for using invincibility item (or whatever other powerful items we want to apply it to later; maybe size-down?) - Win/lose quotes are played at full volume for the person who said it. - A new sound effect plays when you hit someone with voices disabled. - Reduce amount of RNG being called from the vanilla P_Play[whatever]Sound functions - Added our skin sound constants to the dehacked list. - Unrelated: finish line sfx plays in splitscreen
2018-08-28 20:29:50 +00:00
K_PlayBoostTaunt(player->mo);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
player->kartstuff[k_itemamount]--;
}
break;
case KITEM_ROCKETSNEAKER:
if (ATTACK_IS_DOWN && !HOLDING_ITEM && onground && NO_HYUDORO
&& player->kartstuff[k_rocketsneakertimer] == 0)
{
Rocket Sneakers appear beside you
2018-10-07 22:53:46 +00:00
INT32 moloop;
mobj_t *mo = NULL;
mobj_t *prev = player->mo;
New voices - Following Oni's proposal. This means taunts are split into 2 types for offensive items and boost, 2 less hurt sounds, and there's another clip for using invincibility item (or whatever other powerful items we want to apply it to later; maybe size-down?) - Win/lose quotes are played at full volume for the person who said it. - A new sound effect plays when you hit someone with voices disabled. - Reduce amount of RNG being called from the vanilla P_Play[whatever]Sound functions - Added our skin sound constants to the dehacked list. - Unrelated: finish line sfx plays in splitscreen
2018-08-28 20:29:50 +00:00
K_PlayBoostTaunt(player->mo);
Rocket Sneakers appear beside you
2018-10-07 22:53:46 +00:00
//player->kartstuff[k_itemheld] = 1;
S_StartSound(player->mo, sfx_s3k3a);
//K_DoSneaker(player, 2);
para
2018-10-10 21:46:23 +00:00
player->kartstuff[k_rocketsneakertimer] = (itemtime*3);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
player->kartstuff[k_itemamount]--;
Rocket Sneakers appear beside you
2018-10-07 22:53:46 +00:00
K_UpdateHnextList(player, true);
for (moloop = 0; moloop < 2; moloop++)
{
mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_ROCKETSNEAKER);
mo->flags |= MF_NOCLIPTHING;
mo->angle = player->mo->angle;
mo->threshold = 10;
mo->movecount = moloop%2;
mo->movedir = mo->lastlook = moloop+1;
P_SetTarget(&mo->target, player->mo);
P_SetTarget(&mo->hprev, prev);
P_SetTarget(&prev->hnext, mo);
prev = mo;
}
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
}
break;
case KITEM_INVINCIBILITY:
if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) // Doesn't hold your item slot hostage normally, so you're free to waste it if you have multiple
{
New invincibility effect, grow/shrink stuff Whenever grow/shrink effects get made, I'll remove the Mario-style stuttered growth and whatever else needs doing beyond that
2018-02-10 06:19:33 +00:00
if (!player->kartstuff[k_invincibilitytimer])
{
Maintenence - Fix merge issues - Update invincibility flash to use its own object instead of MT_OVERLAY, so extra hacks don't need baked into overlay thinking - K_SpawnSparkleTrail can accept mobjs now, since there really wasn't any reason it needed a player. - Comment out a few old MK/vanilla SRB2 effects for now
2018-06-10 20:10:24 +00:00
mobj_t *overlay = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_INVULNFLASH);
New invincibility effect, grow/shrink stuff Whenever grow/shrink effects get made, I'll remove the Mario-style stuttered growth and whatever else needs doing beyond that
2018-02-10 06:19:33 +00:00
P_SetTarget(&overlay->target, player->mo);
Chaotix sound effects, new music names
2018-02-10 21:01:09 +00:00
overlay->destscale = player->mo->scale;
P_SetScale(overlay, player->mo->scale);
New invincibility effect, grow/shrink stuff Whenever grow/shrink effects get made, I'll remove the Mario-style stuttered growth and whatever else needs doing beyond that
2018-02-10 06:19:33 +00:00
}
Item tweakings - Mines last twice as long - Mines can appear in 1st with a measly 5% chance, for maximum ass-blasting - Mine shiiiiink sound no longer plays globally - Thrown Bananas and Eggman Monitors bounce off walls like Mines - Hyudoro can steal from anyone - Halved invincibility alarm/music distance - Getting out Orbinaut/Jawz plays a shield sound - Using Shrink plays a devastating Chaotix sound - SPB plays a high-pitched wail when it's locked in - Hyudoro plays a ghosty sound when used - Fixed Battle arrow roulette
2018-06-15 06:18:43 +00:00
player->kartstuff[k_invincibilitytimer] = itemtime+(2*TICRATE); // 10 seconds
A bunch of little things. * Fix both cv_timelimit and cv_pointlimit as "hidden options" for people to play with if they know about them via the console. * Show GAME SPEED on the tab screen. * Fix Invincibility and Grow's music changes being broken. (I didn't test them properly when making them P_RestoreMusic calls, sorry.) * Stop showing the First Person Kart view in spectator mode, per Sal's request.
2018-07-18 20:40:04 +00:00
P_RestoreMusic(player);
Separate grow & invincibility alarms, donated by VAda
2018-11-10 02:47:36 +00:00
if (!P_IsLocalPlayer(player))
S_StartSound(player->mo, (cv_kartinvinsfx.value ? sfx_alarmi : sfx_kinvnc));
New voices - Following Oni's proposal. This means taunts are split into 2 types for offensive items and boost, 2 less hurt sounds, and there's another clip for using invincibility item (or whatever other powerful items we want to apply it to later; maybe size-down?) - Win/lose quotes are played at full volume for the person who said it. - A new sound effect plays when you hit someone with voices disabled. - Reduce amount of RNG being called from the vanilla P_Play[whatever]Sound functions - Added our skin sound constants to the dehacked list. - Unrelated: finish line sfx plays in splitscreen
2018-08-28 20:29:50 +00:00
K_PlayPowerGloatSound(player->mo);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
player->kartstuff[k_itemamount]--;
}
break;
case KITEM_BANANA:
if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO)
{
Linked list bananas, hnext/hprev fixes
2018-06-16 23:57:08 +00:00
INT32 moloop;
mobj_t *mo;
First substantial commit! * PRETTY SURE I fixed that bastardacious issue with multiple shield items disappearing at once. Done via introducing lastlook to store the updated count. * Fix an issue with incorrect scale setting for shield items. * Clean up a bunch of weird shit with regards to setting of hnext/hprev chains. (Why does the player go on the opposite end to the direction you enter the chain from...) * Repair hnext chain on mobjremoval as well. May or may not remove the need for overlay/shadow thinkers; too tired/excited to dig into that atm.
2018-06-28 00:20:19 +00:00
mobj_t *prev = player->mo;
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
New voices - Following Oni's proposal. This means taunts are split into 2 types for offensive items and boost, 2 less hurt sounds, and there's another clip for using invincibility item (or whatever other powerful items we want to apply it to later; maybe size-down?) - Win/lose quotes are played at full volume for the person who said it. - A new sound effect plays when you hit someone with voices disabled. - Reduce amount of RNG being called from the vanilla P_Play[whatever]Sound functions - Added our skin sound constants to the dehacked list. - Unrelated: finish line sfx plays in splitscreen
2018-08-28 20:29:50 +00:00
//K_PlayAttackTaunt(player->mo);
Misc tweaks just about everywhere - More Jawz states for later - Jawz orbit their user in the right direction now. - Banana trails made closer to each other - wheels.lua hardcoded - All held items take a double press, for consistency. - Fixed Karma Items not being able to be collected by invincibility or hyudoro users
2018-06-18 04:42:53 +00:00
player->kartstuff[k_itemheld] = 1;
* Change/add a handful of sounds. * Make Orbinaut Shields animate at 3 tics per frame, not 1. * Make dead items flash in and out of visibility. * Related to above, fix a few circumstances where returning was not properly handled after removing a mobj in mobjthinker.
2018-08-05 15:38:46 +00:00
S_StartSound(player->mo, sfx_s254);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
Linked list bananas, hnext/hprev fixes
2018-06-16 23:57:08 +00:00
for (moloop = 0; moloop < player->kartstuff[k_itemamount]; moloop++)
{
Shrink debug command, trailing items spawn directly on players, rainbow win 1 is more faithful, make springs more powerful for shrunk players, correct Grow/Shrink fullbright frame
2018-07-12 05:31:33 +00:00
mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_BANANA_SHIELD);
Add some more safety checks to the item system. While I cannot guarantee the class of glitches that allows for additional items to be thrown/dropped has been completely obliterated, this DOES prevent the class of exploits that allows for "infinite items" (really just negative quantities not completely bounds-checked for).
2018-08-15 13:40:06 +00:00
if (!mo)
{
player->kartstuff[k_itemamount] = moloop;
break;
}
Use MF_NOCLIPTHING to avoid the 1 tic spawn discrepancy bug on held items I haven't been able to replicate the original bug myself, so I can't tell if it's truly fixed, but this doesn't seem to cause any other issues either.
2018-08-13 21:46:51 +00:00
mo->flags |= MF_NOCLIPTHING;
Linked list bananas, hnext/hprev fixes
2018-06-16 23:57:08 +00:00
mo->threshold = 10;
mo->movecount = player->kartstuff[k_itemamount];
No longer are orbiting/trailing objects in charge of removing themselves. * They're clearly not quick enough at the job, since it causes a bunch of silly race conditions. * Instead, K_UpdateHnextList and K_CleanHnextList are in charge of removing them, which are called in the circumstances itemamount (and itemheld/eggmanheld) is changed. * Also, tweak a few places so that trailers AND orbiters can use the same system. Also, some minor thingies. * Turn all the useless ```if (a) { A } else if (!a) { B }``` bullshit into ```if (a) { A } else { B }``` bullshit. * Fix up some minor inaccuracies in the playerarrow stuff that doesn't result in creating more sprites.
2018-08-24 14:14:18 +00:00
mo->movedir = moloop+1;
Linked list bananas, hnext/hprev fixes
2018-06-16 23:57:08 +00:00
P_SetTarget(&mo->target, player->mo);
First substantial commit! * PRETTY SURE I fixed that bastardacious issue with multiple shield items disappearing at once. Done via introducing lastlook to store the updated count. * Fix an issue with incorrect scale setting for shield items. * Clean up a bunch of weird shit with regards to setting of hnext/hprev chains. (Why does the player go on the opposite end to the direction you enter the chain from...) * Repair hnext chain on mobjremoval as well. May or may not remove the need for overlay/shadow thinkers; too tired/excited to dig into that atm.
2018-06-28 00:20:19 +00:00
P_SetTarget(&mo->hprev, prev);
P_SetTarget(&prev->hnext, mo);
Linked list bananas, hnext/hprev fixes
2018-06-16 23:57:08 +00:00
prev = mo;
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
}
}
Misc tweaks just about everywhere - More Jawz states for later - Jawz orbit their user in the right direction now. - Banana trails made closer to each other - wheels.lua hardcoded - All held items take a double press, for consistency. - Fixed Karma Items not being able to be collected by invincibility or hyudoro users
2018-06-18 04:42:53 +00:00
else if (ATTACK_IS_DOWN && player->kartstuff[k_itemheld]) // Banana x3 thrown
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
{
Addressed some of Chrome's thoughts - Don't drag - Shield isn't visible to anyone but yourself - Projectile is twice as heavy
2018-09-04 23:58:20 +00:00
K_ThrowKartItem(player, false, MT_BANANA, -1, 0);
New voices - Following Oni's proposal. This means taunts are split into 2 types for offensive items and boost, 2 less hurt sounds, and there's another clip for using invincibility item (or whatever other powerful items we want to apply it to later; maybe size-down?) - Win/lose quotes are played at full volume for the person who said it. - A new sound effect plays when you hit someone with voices disabled. - Reduce amount of RNG being called from the vanilla P_Play[whatever]Sound functions - Added our skin sound constants to the dehacked list. - Unrelated: finish line sfx plays in splitscreen
2018-08-28 20:29:50 +00:00
K_PlayAttackTaunt(player->mo);
No longer are orbiting/trailing objects in charge of removing themselves. * They're clearly not quick enough at the job, since it causes a bunch of silly race conditions. * Instead, K_UpdateHnextList and K_CleanHnextList are in charge of removing them, which are called in the circumstances itemamount (and itemheld/eggmanheld) is changed. * Also, tweak a few places so that trailers AND orbiters can use the same system. Also, some minor thingies. * Turn all the useless ```if (a) { A } else if (!a) { B }``` bullshit into ```if (a) { A } else { B }``` bullshit. * Fix up some minor inaccuracies in the playerarrow stuff that doesn't result in creating more sprites.
2018-08-24 14:14:18 +00:00
player->kartstuff[k_itemamount]--;
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
K_UpdateHnextList(player, false);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
}
break;
Rename fake item to eggman monitor
2018-03-14 01:07:08 +00:00
case KITEM_EGGMAN:
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO)
{
mobj_t *mo;
player->kartstuff[k_itemamount]--;
Rename fake item to eggman monitor
2018-03-14 01:07:08 +00:00
player->kartstuff[k_eggmanheld] = 1;
* Change/add a handful of sounds. * Make Orbinaut Shields animate at 3 tics per frame, not 1. * Make dead items flash in and out of visibility. * Related to above, fix a few circumstances where returning was not properly handled after removing a mobj in mobjthinker.
2018-08-05 15:38:46 +00:00
S_StartSound(player->mo, sfx_s254);
The motherload: all of my Lua is hardcoded This took like 6 straight hours of work, never ask me for anything ever again
2018-10-29 09:00:08 +00:00
mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_EGGMANITEM_SHIELD);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
if (mo)
{
Add some more safety checks to the item system. While I cannot guarantee the class of glitches that allows for additional items to be thrown/dropped has been completely obliterated, this DOES prevent the class of exploits that allows for "infinite items" (really just negative quantities not completely bounds-checked for).
2018-08-15 13:40:06 +00:00
mo->flags |= MF_NOCLIPTHING;
mo->threshold = 10;
mo->movecount = 1;
No longer are orbiting/trailing objects in charge of removing themselves. * They're clearly not quick enough at the job, since it causes a bunch of silly race conditions. * Instead, K_UpdateHnextList and K_CleanHnextList are in charge of removing them, which are called in the circumstances itemamount (and itemheld/eggmanheld) is changed. * Also, tweak a few places so that trailers AND orbiters can use the same system. Also, some minor thingies. * Turn all the useless ```if (a) { A } else if (!a) { B }``` bullshit into ```if (a) { A } else { B }``` bullshit. * Fix up some minor inaccuracies in the playerarrow stuff that doesn't result in creating more sprites.
2018-08-24 14:14:18 +00:00
mo->movedir = 1;
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
P_SetTarget(&mo->target, player->mo);
Linked list bananas, hnext/hprev fixes
2018-06-16 23:57:08 +00:00
P_SetTarget(&player->mo->hnext, mo);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
}
}
break;
case KITEM_ORBINAUT:
if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO)
{
Held item changes
2018-06-27 19:58:43 +00:00
angle_t newangle;
Misc tweaks just about everywhere - More Jawz states for later - Jawz orbit their user in the right direction now. - Banana trails made closer to each other - wheels.lua hardcoded - All held items take a double press, for consistency. - Fixed Karma Items not being able to be collected by invincibility or hyudoro users
2018-06-18 04:42:53 +00:00
INT32 moloop;
First substantial commit! * PRETTY SURE I fixed that bastardacious issue with multiple shield items disappearing at once. Done via introducing lastlook to store the updated count. * Fix an issue with incorrect scale setting for shield items. * Clean up a bunch of weird shit with regards to setting of hnext/hprev chains. (Why does the player go on the opposite end to the direction you enter the chain from...) * Repair hnext chain on mobjremoval as well. May or may not remove the need for overlay/shadow thinkers; too tired/excited to dig into that atm.
2018-06-28 00:20:19 +00:00
mobj_t *mo = NULL;
mobj_t *prev = player->mo;
Misc tweaks just about everywhere - More Jawz states for later - Jawz orbit their user in the right direction now. - Banana trails made closer to each other - wheels.lua hardcoded - All held items take a double press, for consistency. - Fixed Karma Items not being able to be collected by invincibility or hyudoro users
2018-06-18 04:42:53 +00:00
New voices - Following Oni's proposal. This means taunts are split into 2 types for offensive items and boost, 2 less hurt sounds, and there's another clip for using invincibility item (or whatever other powerful items we want to apply it to later; maybe size-down?) - Win/lose quotes are played at full volume for the person who said it. - A new sound effect plays when you hit someone with voices disabled. - Reduce amount of RNG being called from the vanilla P_Play[whatever]Sound functions - Added our skin sound constants to the dehacked list. - Unrelated: finish line sfx plays in splitscreen
2018-08-28 20:29:50 +00:00
//K_PlayAttackTaunt(player->mo);
Misc tweaks just about everywhere - More Jawz states for later - Jawz orbit their user in the right direction now. - Banana trails made closer to each other - wheels.lua hardcoded - All held items take a double press, for consistency. - Fixed Karma Items not being able to be collected by invincibility or hyudoro users
2018-06-18 04:42:53 +00:00
player->kartstuff[k_itemheld] = 1;
S_StartSound(player->mo, sfx_s3k3a);
for (moloop = 0; moloop < player->kartstuff[k_itemamount]; moloop++)
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
{
Held item changes
2018-06-27 19:58:43 +00:00
newangle = FixedAngle(((360/player->kartstuff[k_itemamount])*moloop)*FRACUNIT) + ANGLE_90;
Held Orbinaut & Jawz radius+scaling animation on spawn
2018-08-30 20:10:25 +00:00
mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_ORBINAUT_SHIELD);
Add some more safety checks to the item system. While I cannot guarantee the class of glitches that allows for additional items to be thrown/dropped has been completely obliterated, this DOES prevent the class of exploits that allows for "infinite items" (really just negative quantities not completely bounds-checked for).
2018-08-15 13:40:06 +00:00
if (!mo)
{
player->kartstuff[k_itemamount] = moloop;
break;
}
Use MF_NOCLIPTHING to avoid the 1 tic spawn discrepancy bug on held items I haven't been able to replicate the original bug myself, so I can't tell if it's truly fixed, but this doesn't seem to cause any other issues either.
2018-08-13 21:46:51 +00:00
mo->flags |= MF_NOCLIPTHING;
Held item changes
2018-06-27 19:58:43 +00:00
mo->angle = newangle;
mo->threshold = 10;
mo->movecount = player->kartstuff[k_itemamount];
First substantial commit! * PRETTY SURE I fixed that bastardacious issue with multiple shield items disappearing at once. Done via introducing lastlook to store the updated count. * Fix an issue with incorrect scale setting for shield items. * Clean up a bunch of weird shit with regards to setting of hnext/hprev chains. (Why does the player go on the opposite end to the direction you enter the chain from...) * Repair hnext chain on mobjremoval as well. May or may not remove the need for overlay/shadow thinkers; too tired/excited to dig into that atm.
2018-06-28 00:20:19 +00:00
mo->movedir = mo->lastlook = moloop+1;
Orbinaut
2018-07-23 00:55:18 +00:00
mo->color = player->skincolor;
Held item changes
2018-06-27 19:58:43 +00:00
P_SetTarget(&mo->target, player->mo);
First substantial commit! * PRETTY SURE I fixed that bastardacious issue with multiple shield items disappearing at once. Done via introducing lastlook to store the updated count. * Fix an issue with incorrect scale setting for shield items. * Clean up a bunch of weird shit with regards to setting of hnext/hprev chains. (Why does the player go on the opposite end to the direction you enter the chain from...) * Repair hnext chain on mobjremoval as well. May or may not remove the need for overlay/shadow thinkers; too tired/excited to dig into that atm.
2018-06-28 00:20:19 +00:00
P_SetTarget(&mo->hprev, prev);
P_SetTarget(&prev->hnext, mo);
Held item changes
2018-06-27 19:58:43 +00:00
prev = mo;
Misc tweaks just about everywhere - More Jawz states for later - Jawz orbit their user in the right direction now. - Banana trails made closer to each other - wheels.lua hardcoded - All held items take a double press, for consistency. - Fixed Karma Items not being able to be collected by invincibility or hyudoro users
2018-06-18 04:42:53 +00:00
}
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
}
Misc tweaks just about everywhere - More Jawz states for later - Jawz orbit their user in the right direction now. - Banana trails made closer to each other - wheels.lua hardcoded - All held items take a double press, for consistency. - Fixed Karma Items not being able to be collected by invincibility or hyudoro users
2018-06-18 04:42:53 +00:00
else if (ATTACK_IS_DOWN && player->kartstuff[k_itemheld]) // Orbinaut x3 thrown
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
{
Addressed some of Chrome's thoughts - Don't drag - Shield isn't visible to anyone but yourself - Projectile is twice as heavy
2018-09-04 23:58:20 +00:00
K_ThrowKartItem(player, true, MT_ORBINAUT, 1, 0);
New voices - Following Oni's proposal. This means taunts are split into 2 types for offensive items and boost, 2 less hurt sounds, and there's another clip for using invincibility item (or whatever other powerful items we want to apply it to later; maybe size-down?) - Win/lose quotes are played at full volume for the person who said it. - A new sound effect plays when you hit someone with voices disabled. - Reduce amount of RNG being called from the vanilla P_Play[whatever]Sound functions - Added our skin sound constants to the dehacked list. - Unrelated: finish line sfx plays in splitscreen
2018-08-28 20:29:50 +00:00
K_PlayAttackTaunt(player->mo);
No longer are orbiting/trailing objects in charge of removing themselves. * They're clearly not quick enough at the job, since it causes a bunch of silly race conditions. * Instead, K_UpdateHnextList and K_CleanHnextList are in charge of removing them, which are called in the circumstances itemamount (and itemheld/eggmanheld) is changed. * Also, tweak a few places so that trailers AND orbiters can use the same system. Also, some minor thingies. * Turn all the useless ```if (a) { A } else if (!a) { B }``` bullshit into ```if (a) { A } else { B }``` bullshit. * Fix up some minor inaccuracies in the playerarrow stuff that doesn't result in creating more sprites.
2018-08-24 14:14:18 +00:00
player->kartstuff[k_itemamount]--;
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
K_UpdateHnextList(player, false);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
}
break;
case KITEM_JAWZ:
if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO)
{
Held item changes
2018-06-27 19:58:43 +00:00
angle_t newangle;
Misc tweaks just about everywhere - More Jawz states for later - Jawz orbit their user in the right direction now. - Banana trails made closer to each other - wheels.lua hardcoded - All held items take a double press, for consistency. - Fixed Karma Items not being able to be collected by invincibility or hyudoro users
2018-06-18 04:42:53 +00:00
INT32 moloop;
First substantial commit! * PRETTY SURE I fixed that bastardacious issue with multiple shield items disappearing at once. Done via introducing lastlook to store the updated count. * Fix an issue with incorrect scale setting for shield items. * Clean up a bunch of weird shit with regards to setting of hnext/hprev chains. (Why does the player go on the opposite end to the direction you enter the chain from...) * Repair hnext chain on mobjremoval as well. May or may not remove the need for overlay/shadow thinkers; too tired/excited to dig into that atm.
2018-06-28 00:20:19 +00:00
mobj_t *mo = NULL;
mobj_t *prev = player->mo;
Misc tweaks just about everywhere - More Jawz states for later - Jawz orbit their user in the right direction now. - Banana trails made closer to each other - wheels.lua hardcoded - All held items take a double press, for consistency. - Fixed Karma Items not being able to be collected by invincibility or hyudoro users
2018-06-18 04:42:53 +00:00
New voices - Following Oni's proposal. This means taunts are split into 2 types for offensive items and boost, 2 less hurt sounds, and there's another clip for using invincibility item (or whatever other powerful items we want to apply it to later; maybe size-down?) - Win/lose quotes are played at full volume for the person who said it. - A new sound effect plays when you hit someone with voices disabled. - Reduce amount of RNG being called from the vanilla P_Play[whatever]Sound functions - Added our skin sound constants to the dehacked list. - Unrelated: finish line sfx plays in splitscreen
2018-08-28 20:29:50 +00:00
//K_PlayAttackTaunt(player->mo);
Misc tweaks just about everywhere - More Jawz states for later - Jawz orbit their user in the right direction now. - Banana trails made closer to each other - wheels.lua hardcoded - All held items take a double press, for consistency. - Fixed Karma Items not being able to be collected by invincibility or hyudoro users
2018-06-18 04:42:53 +00:00
player->kartstuff[k_itemheld] = 1;
S_StartSound(player->mo, sfx_s3k3a);
for (moloop = 0; moloop < player->kartstuff[k_itemamount]; moloop++)
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
{
Held item changes
2018-06-27 19:58:43 +00:00
newangle = FixedAngle(((360/player->kartstuff[k_itemamount])*moloop)*FRACUNIT) + ANGLE_90;
Held Orbinaut & Jawz radius+scaling animation on spawn
2018-08-30 20:10:25 +00:00
mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_JAWZ_SHIELD);
Add some more safety checks to the item system. While I cannot guarantee the class of glitches that allows for additional items to be thrown/dropped has been completely obliterated, this DOES prevent the class of exploits that allows for "infinite items" (really just negative quantities not completely bounds-checked for).
2018-08-15 13:40:06 +00:00
if (!mo)
{
player->kartstuff[k_itemamount] = moloop;
break;
}
Use MF_NOCLIPTHING to avoid the 1 tic spawn discrepancy bug on held items I haven't been able to replicate the original bug myself, so I can't tell if it's truly fixed, but this doesn't seem to cause any other issues either.
2018-08-13 21:46:51 +00:00
mo->flags |= MF_NOCLIPTHING;
Held item changes
2018-06-27 19:58:43 +00:00
mo->angle = newangle;
mo->threshold = 10;
mo->movecount = player->kartstuff[k_itemamount];
First substantial commit! * PRETTY SURE I fixed that bastardacious issue with multiple shield items disappearing at once. Done via introducing lastlook to store the updated count. * Fix an issue with incorrect scale setting for shield items. * Clean up a bunch of weird shit with regards to setting of hnext/hprev chains. (Why does the player go on the opposite end to the direction you enter the chain from...) * Repair hnext chain on mobjremoval as well. May or may not remove the need for overlay/shadow thinkers; too tired/excited to dig into that atm.
2018-06-28 00:20:19 +00:00
mo->movedir = mo->lastlook = moloop+1;
Held item changes
2018-06-27 19:58:43 +00:00
P_SetTarget(&mo->target, player->mo);
First substantial commit! * PRETTY SURE I fixed that bastardacious issue with multiple shield items disappearing at once. Done via introducing lastlook to store the updated count. * Fix an issue with incorrect scale setting for shield items. * Clean up a bunch of weird shit with regards to setting of hnext/hprev chains. (Why does the player go on the opposite end to the direction you enter the chain from...) * Repair hnext chain on mobjremoval as well. May or may not remove the need for overlay/shadow thinkers; too tired/excited to dig into that atm.
2018-06-28 00:20:19 +00:00
P_SetTarget(&mo->hprev, prev);
P_SetTarget(&prev->hnext, mo);
Held item changes
2018-06-27 19:58:43 +00:00
prev = mo;
Misc tweaks just about everywhere - More Jawz states for later - Jawz orbit their user in the right direction now. - Banana trails made closer to each other - wheels.lua hardcoded - All held items take a double press, for consistency. - Fixed Karma Items not being able to be collected by invincibility or hyudoro users
2018-06-18 04:42:53 +00:00
}
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
}
Misc tweaks just about everywhere - More Jawz states for later - Jawz orbit their user in the right direction now. - Banana trails made closer to each other - wheels.lua hardcoded - All held items take a double press, for consistency. - Fixed Karma Items not being able to be collected by invincibility or hyudoro users
2018-06-18 04:42:53 +00:00
else if (ATTACK_IS_DOWN && HOLDING_ITEM && player->kartstuff[k_itemheld]) // Jawz thrown
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
{
if (player->kartstuff[k_throwdir] == 1 || player->kartstuff[k_throwdir] == 0)
Addressed some of Chrome's thoughts - Don't drag - Shield isn't visible to anyone but yourself - Projectile is twice as heavy
2018-09-04 23:58:20 +00:00
K_ThrowKartItem(player, true, MT_JAWZ, 1, 0);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
else if (player->kartstuff[k_throwdir] == -1) // Throwing backward gives you a dud that doesn't home in
Addressed some of Chrome's thoughts - Don't drag - Shield isn't visible to anyone but yourself - Projectile is twice as heavy
2018-09-04 23:58:20 +00:00
K_ThrowKartItem(player, true, MT_JAWZ_DUD, -1, 0);
New voices - Following Oni's proposal. This means taunts are split into 2 types for offensive items and boost, 2 less hurt sounds, and there's another clip for using invincibility item (or whatever other powerful items we want to apply it to later; maybe size-down?) - Win/lose quotes are played at full volume for the person who said it. - A new sound effect plays when you hit someone with voices disabled. - Reduce amount of RNG being called from the vanilla P_Play[whatever]Sound functions - Added our skin sound constants to the dehacked list. - Unrelated: finish line sfx plays in splitscreen
2018-08-28 20:29:50 +00:00
K_PlayAttackTaunt(player->mo);
No longer are orbiting/trailing objects in charge of removing themselves. * They're clearly not quick enough at the job, since it causes a bunch of silly race conditions. * Instead, K_UpdateHnextList and K_CleanHnextList are in charge of removing them, which are called in the circumstances itemamount (and itemheld/eggmanheld) is changed. * Also, tweak a few places so that trailers AND orbiters can use the same system. Also, some minor thingies. * Turn all the useless ```if (a) { A } else if (!a) { B }``` bullshit into ```if (a) { A } else { B }``` bullshit. * Fix up some minor inaccuracies in the playerarrow stuff that doesn't result in creating more sprites.
2018-08-24 14:14:18 +00:00
player->kartstuff[k_itemamount]--;
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
K_UpdateHnextList(player, false);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
}
break;
case KITEM_MINE:
if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO)
{
mobj_t *mo;
player->kartstuff[k_itemheld] = 1;
* Change/add a handful of sounds. * Make Orbinaut Shields animate at 3 tics per frame, not 1. * Make dead items flash in and out of visibility. * Related to above, fix a few circumstances where returning was not properly handled after removing a mobj in mobjthinker.
2018-08-05 15:38:46 +00:00
S_StartSound(player->mo, sfx_s254);
Shrink debug command, trailing items spawn directly on players, rainbow win 1 is more faithful, make springs more powerful for shrunk players, correct Grow/Shrink fullbright frame
2018-07-12 05:31:33 +00:00
mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_SSMINE_SHIELD);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
if (mo)
Linked list bananas, hnext/hprev fixes
2018-06-16 23:57:08 +00:00
{
Add some more safety checks to the item system. While I cannot guarantee the class of glitches that allows for additional items to be thrown/dropped has been completely obliterated, this DOES prevent the class of exploits that allows for "infinite items" (really just negative quantities not completely bounds-checked for).
2018-08-15 13:40:06 +00:00
mo->flags |= MF_NOCLIPTHING;
mo->threshold = 10;
mo->movecount = 1;
No longer are orbiting/trailing objects in charge of removing themselves. * They're clearly not quick enough at the job, since it causes a bunch of silly race conditions. * Instead, K_UpdateHnextList and K_CleanHnextList are in charge of removing them, which are called in the circumstances itemamount (and itemheld/eggmanheld) is changed. * Also, tweak a few places so that trailers AND orbiters can use the same system. Also, some minor thingies. * Turn all the useless ```if (a) { A } else if (!a) { B }``` bullshit into ```if (a) { A } else { B }``` bullshit. * Fix up some minor inaccuracies in the playerarrow stuff that doesn't result in creating more sprites.
2018-08-24 14:14:18 +00:00
mo->movedir = 1;
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
P_SetTarget(&mo->target, player->mo);
Linked list bananas, hnext/hprev fixes
2018-06-16 23:57:08 +00:00
P_SetTarget(&player->mo->hnext, mo);
}
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
}
Hundreds of tweaks - SPB multiplier depending on 1st-2nd distance - Removed the Battle-only k_poweritemtimer (hold over from when you could easily get invuln items all of the time), replaced it with a 2 invincibility item cap in ALL modes. - Spinout is affected by boosters, *properly* - Can no longer strafe while spinning out on speed bumps - Messed with how other items interact with speed bumps, again. - Old bounce code has been ported for non-players - Fixed Karma players being able to do anything after the round has ended. - Fixed sneaker and spinout timer weirdness - Fixed Mines still being hold-use - Fixed rubber-burn turn not working - Removed redundant k_spinout and unused k_boosting variables - Filled out the Color_Opposite table with Kart's new colors. Not really relevant right now (besides some extra Lua functionality) since nothing uses it, but will be nice for if we do the signpost from the sky idea.
2018-06-20 00:20:06 +00:00
else if (ATTACK_IS_DOWN && player->kartstuff[k_itemheld])
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
{
Addressed some of Chrome's thoughts - Don't drag - Shield isn't visible to anyone but yourself - Projectile is twice as heavy
2018-09-04 23:58:20 +00:00
K_ThrowKartItem(player, false, MT_SSMINE, 1, 1);
New voices - Following Oni's proposal. This means taunts are split into 2 types for offensive items and boost, 2 less hurt sounds, and there's another clip for using invincibility item (or whatever other powerful items we want to apply it to later; maybe size-down?) - Win/lose quotes are played at full volume for the person who said it. - A new sound effect plays when you hit someone with voices disabled. - Reduce amount of RNG being called from the vanilla P_Play[whatever]Sound functions - Added our skin sound constants to the dehacked list. - Unrelated: finish line sfx plays in splitscreen
2018-08-28 20:29:50 +00:00
K_PlayAttackTaunt(player->mo);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
player->kartstuff[k_itemamount]--;
player->kartstuff[k_itemheld] = 0;
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
K_UpdateHnextList(player, true);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
}
break;
case KITEM_BALLHOG:
if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO)
{
player->kartstuff[k_itemamount]--;
Addressed some of Chrome's thoughts - Don't drag - Shield isn't visible to anyone but yourself - Projectile is twice as heavy
2018-09-04 23:58:20 +00:00
K_ThrowKartItem(player, true, MT_BALLHOG, 1, 0);
New voices - Following Oni's proposal. This means taunts are split into 2 types for offensive items and boost, 2 less hurt sounds, and there's another clip for using invincibility item (or whatever other powerful items we want to apply it to later; maybe size-down?) - Win/lose quotes are played at full volume for the person who said it. - A new sound effect plays when you hit someone with voices disabled. - Reduce amount of RNG being called from the vanilla P_Play[whatever]Sound functions - Added our skin sound constants to the dehacked list. - Unrelated: finish line sfx plays in splitscreen
2018-08-28 20:29:50 +00:00
K_PlayAttackTaunt(player->mo);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
}
break;
case KITEM_SPB:
if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO)
{
player->kartstuff[k_itemamount]--;
New SPB May not make it to R1, but oh well
2018-10-18 08:43:50 +00:00
K_ThrowKartItem(player, true, MT_SPB, 1, 0);
New voices - Following Oni's proposal. This means taunts are split into 2 types for offensive items and boost, 2 less hurt sounds, and there's another clip for using invincibility item (or whatever other powerful items we want to apply it to later; maybe size-down?) - Win/lose quotes are played at full volume for the person who said it. - A new sound effect plays when you hit someone with voices disabled. - Reduce amount of RNG being called from the vanilla P_Play[whatever]Sound functions - Added our skin sound constants to the dehacked list. - Unrelated: finish line sfx plays in splitscreen
2018-08-28 20:29:50 +00:00
K_PlayAttackTaunt(player->mo);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
}
break;
New invincibility effect, grow/shrink stuff Whenever grow/shrink effects get made, I'll remove the Mario-style stuttered growth and whatever else needs doing beyond that
2018-02-10 06:19:33 +00:00
case KITEM_GROW:
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO
New invincibility effect, grow/shrink stuff Whenever grow/shrink effects get made, I'll remove the Mario-style stuttered growth and whatever else needs doing beyond that
2018-02-10 06:19:33 +00:00
&& player->kartstuff[k_growshrinktimer] <= 0) // Grow holds the item box hostage
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
{
New voices - Following Oni's proposal. This means taunts are split into 2 types for offensive items and boost, 2 less hurt sounds, and there's another clip for using invincibility item (or whatever other powerful items we want to apply it to later; maybe size-down?) - Win/lose quotes are played at full volume for the person who said it. - A new sound effect plays when you hit someone with voices disabled. - Reduce amount of RNG being called from the vanilla P_Play[whatever]Sound functions - Added our skin sound constants to the dehacked list. - Unrelated: finish line sfx plays in splitscreen
2018-08-28 20:29:50 +00:00
K_PlayPowerGloatSound(player->mo);
Two scale things I noticed. * Change spacing of bustable FOF debris with scale (plus increase its default a bit for less lag). * Make a few instances of scalespeed take mapheader scaling into account.
2018-10-19 20:32:29 +00:00
player->mo->scalespeed = mapheaderinfo[gamemap-1]->mobj_scale/TICRATE;
Chaotix sound effects, new music names
2018-02-10 21:01:09 +00:00
player->mo->destscale = 3*(mapheaderinfo[gamemap-1]->mobj_scale)/2;
Prevent using kartdebug cvars in Time Attack. (None of this should invalidate any of YOUR existing ghosts, because none of them use these obvious cheats like, say, setting kartdebugitem 2.)
2018-11-09 20:16:12 +00:00
if (cv_kartdebugshrink.value && !modeattacking && !player->bot)
Shrink debug command, trailing items spawn directly on players, rainbow win 1 is more faithful, make springs more powerful for shrunk players, correct Grow/Shrink fullbright frame
2018-07-12 05:31:33 +00:00
player->mo->destscale = 6*player->mo->destscale/8;
Item tweakings - Mines last twice as long - Mines can appear in 1st with a measly 5% chance, for maximum ass-blasting - Mine shiiiiink sound no longer plays globally - Thrown Bananas and Eggman Monitors bounce off walls like Mines - Hyudoro can steal from anyone - Halved invincibility alarm/music distance - Getting out Orbinaut/Jawz plays a shield sound - Using Shrink plays a devastating Chaotix sound - SPB plays a high-pitched wail when it's locked in - Hyudoro plays a ghosty sound when used - Fixed Battle arrow roulette
2018-06-15 06:18:43 +00:00
player->kartstuff[k_growshrinktimer] = itemtime+(4*TICRATE); // 12 seconds
A bunch of little things. * Fix both cv_timelimit and cv_pointlimit as "hidden options" for people to play with if they know about them via the console. * Show GAME SPEED on the tab screen. * Fix Invincibility and Grow's music changes being broken. (I didn't test them properly when making them P_RestoreMusic calls, sorry.) * Stop showing the First Person Kart view in spectator mode, per Sal's request.
2018-07-18 20:40:04 +00:00
P_RestoreMusic(player);
Separate grow & invincibility alarms, donated by VAda
2018-11-10 02:47:36 +00:00
if (!P_IsLocalPlayer(player))
S_StartSound(player->mo, (cv_kartinvinsfx.value ? sfx_alarmg : sfx_kgrow));
Chaotix sound effects, new music names
2018-02-10 21:01:09 +00:00
S_StartSound(player->mo, sfx_kc5a);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
player->kartstuff[k_itemamount]--;
}
break;
New invincibility effect, grow/shrink stuff Whenever grow/shrink effects get made, I'll remove the Mario-style stuttered growth and whatever else needs doing beyond that
2018-02-10 06:19:33 +00:00
case KITEM_SHRINK:
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO)
{
Fixes
2018-06-08 04:02:28 +00:00
K_DoShrink(player);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
player->kartstuff[k_itemamount]--;
New voices - Following Oni's proposal. This means taunts are split into 2 types for offensive items and boost, 2 less hurt sounds, and there's another clip for using invincibility item (or whatever other powerful items we want to apply it to later; maybe size-down?) - Win/lose quotes are played at full volume for the person who said it. - A new sound effect plays when you hit someone with voices disabled. - Reduce amount of RNG being called from the vanilla P_Play[whatever]Sound functions - Added our skin sound constants to the dehacked list. - Unrelated: finish line sfx plays in splitscreen
2018-08-28 20:29:50 +00:00
K_PlayPowerGloatSound(player->mo);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
}
break;
Thunder shield overlay
2018-08-04 19:48:31 +00:00
case KITEM_THUNDERSHIELD:
Play the traditional thundershield manifestation sound when a thundershield is manifested, plus a minor eye towards forward compatibility in the condition for manifestation.
2018-10-18 15:15:59 +00:00
if (player->kartstuff[k_curshield] != 1)
Thunder shield overlay
2018-08-04 19:48:31 +00:00
{
mobj_t *shield = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_THUNDERSHIELD);
Thunder shield stuff! * Slightly bigger visual size! * Light-shadow! * Makes player fullbright if you have it! * Visuals finally removed instantly on shield drop! * Uses dark background for item icons! * Goes behind the player on some frames, faking layering!
2018-09-13 18:01:36 +00:00
P_SetScale(shield, (shield->destscale = (5*shield->destscale)>>2));
Thunder shield overlay
2018-08-04 19:48:31 +00:00
P_SetTarget(&shield->target, player->mo);
Play the traditional thundershield manifestation sound when a thundershield is manifested, plus a minor eye towards forward compatibility in the condition for manifestation.
2018-10-18 15:15:59 +00:00
S_StartSound(shield, sfx_s3k41);
Thunder shield overlay
2018-08-04 19:48:31 +00:00
player->kartstuff[k_curshield] = 1;
}
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO)
{
Thunder shield overlay
2018-08-04 19:48:31 +00:00
K_DoThunderShield(player);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
player->kartstuff[k_itemamount]--;
New voices - Following Oni's proposal. This means taunts are split into 2 types for offensive items and boost, 2 less hurt sounds, and there's another clip for using invincibility item (or whatever other powerful items we want to apply it to later; maybe size-down?) - Win/lose quotes are played at full volume for the person who said it. - A new sound effect plays when you hit someone with voices disabled. - Reduce amount of RNG being called from the vanilla P_Play[whatever]Sound functions - Added our skin sound constants to the dehacked list. - Unrelated: finish line sfx plays in splitscreen
2018-08-28 20:29:50 +00:00
K_PlayAttackTaunt(player->mo);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
}
break;
case KITEM_HYUDORO:
if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO)
{
player->kartstuff[k_itemamount]--;
* Change/add a handful of sounds. * Make Orbinaut Shields animate at 3 tics per frame, not 1. * Make dead items flash in and out of visibility. * Related to above, fix a few circumstances where returning was not properly handled after removing a mobj in mobjthinker.
2018-08-05 15:38:46 +00:00
K_DoHyudoroSteal(player); // yes. yes they do.
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
}
break;
case KITEM_POGOSPRING:
if (ATTACK_IS_DOWN && !HOLDING_ITEM && onground && NO_HYUDORO
&& !player->kartstuff[k_pogospring])
{
New voices - Following Oni's proposal. This means taunts are split into 2 types for offensive items and boost, 2 less hurt sounds, and there's another clip for using invincibility item (or whatever other powerful items we want to apply it to later; maybe size-down?) - Win/lose quotes are played at full volume for the person who said it. - A new sound effect plays when you hit someone with voices disabled. - Reduce amount of RNG being called from the vanilla P_Play[whatever]Sound functions - Added our skin sound constants to the dehacked list. - Unrelated: finish line sfx plays in splitscreen
2018-08-28 20:29:50 +00:00
K_PlayBoostTaunt(player->mo);
Spring *panels* now use `sfx_kc2f` again (but pogo spring *items* still do `sfx_kpogos`, in case you were worried).
2018-09-27 17:32:07 +00:00
K_DoPogoSpring(player->mo, 32<<FRACBITS, 2);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
player->kartstuff[k_pogospring] = 1;
player->kartstuff[k_itemamount]--;
}
break;
Kitchen sink is back Haven't tested yet
2018-06-25 05:36:21 +00:00
case KITEM_KITCHENSINK:
if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO)
Ghost sink "shield" Sink shield that makes it double-press to use, gives the trailing item slowdown, and shows other people that you have it, but doesn't have any collision
2018-09-04 23:14:44 +00:00
{
mobj_t *mo;
player->kartstuff[k_itemheld] = 1;
Heavy as shit now
2018-09-05 00:51:16 +00:00
S_StartSound(player->mo, sfx_s254);
Ghost sink "shield" Sink shield that makes it double-press to use, gives the trailing item slowdown, and shows other people that you have it, but doesn't have any collision
2018-09-04 23:14:44 +00:00
mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_SINK_SHIELD);
if (mo)
{
mo->flags |= MF_NOCLIPTHING;
mo->threshold = 10;
mo->movecount = 1;
mo->movedir = 1;
P_SetTarget(&mo->target, player->mo);
P_SetTarget(&player->mo->hnext, mo);
}
}
else if (ATTACK_IS_DOWN && HOLDING_ITEM && player->kartstuff[k_itemheld]) // Sink thrown
Kitchen sink is back Haven't tested yet
2018-06-25 05:36:21 +00:00
{
Addressed some of Chrome's thoughts - Don't drag - Shield isn't visible to anyone but yourself - Projectile is twice as heavy
2018-09-04 23:58:20 +00:00
K_ThrowKartItem(player, false, MT_SINK, 1, 2);
New voices - Following Oni's proposal. This means taunts are split into 2 types for offensive items and boost, 2 less hurt sounds, and there's another clip for using invincibility item (or whatever other powerful items we want to apply it to later; maybe size-down?) - Win/lose quotes are played at full volume for the person who said it. - A new sound effect plays when you hit someone with voices disabled. - Reduce amount of RNG being called from the vanilla P_Play[whatever]Sound functions - Added our skin sound constants to the dehacked list. - Unrelated: finish line sfx plays in splitscreen
2018-08-28 20:29:50 +00:00
K_PlayAttackTaunt(player->mo);
Kitchen sink is back Haven't tested yet
2018-06-25 05:36:21 +00:00
player->kartstuff[k_itemamount]--;
player->kartstuff[k_itemheld] = 0;
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
K_UpdateHnextList(player, true);
Kitchen sink is back Haven't tested yet
2018-06-25 05:36:21 +00:00
}
break;
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
case KITEM_SAD:
if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO
&& !player->kartstuff[k_sadtimer])
{
player->kartstuff[k_sadtimer] = stealtime;
player->kartstuff[k_itemamount]--;
}
break;
default:
break;
}
Fixed thwomp sectors, Added Magnet Item.
2017-02-18 18:39:25 +00:00
}
Added feather
2017-11-07 05:57:42 +00:00
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
// No more!
No longer are orbiting/trailing objects in charge of removing themselves. * They're clearly not quick enough at the job, since it causes a bunch of silly race conditions. * Instead, K_UpdateHnextList and K_CleanHnextList are in charge of removing them, which are called in the circumstances itemamount (and itemheld/eggmanheld) is changed. * Also, tweak a few places so that trailers AND orbiters can use the same system. Also, some minor thingies. * Turn all the useless ```if (a) { A } else if (!a) { B }``` bullshit into ```if (a) { A } else { B }``` bullshit. * Fix up some minor inaccuracies in the playerarrow stuff that doesn't result in creating more sprites.
2018-08-24 14:14:18 +00:00
if (!player->kartstuff[k_itemamount])
{
player->kartstuff[k_itemheld] = 0;
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
player->kartstuff[k_itemtype] = KITEM_NONE;
No longer are orbiting/trailing objects in charge of removing themselves. * They're clearly not quick enough at the job, since it causes a bunch of silly race conditions. * Instead, K_UpdateHnextList and K_CleanHnextList are in charge of removing them, which are called in the circumstances itemamount (and itemheld/eggmanheld) is changed. * Also, tweak a few places so that trailers AND orbiters can use the same system. Also, some minor thingies. * Turn all the useless ```if (a) { A } else if (!a) { B }``` bullshit into ```if (a) { A } else { B }``` bullshit. * Fix up some minor inaccuracies in the playerarrow stuff that doesn't result in creating more sprites.
2018-08-24 14:14:18 +00:00
}
Added feather
2017-11-07 05:57:42 +00:00
Thunder shield overlay
2018-08-04 19:48:31 +00:00
if (player->kartstuff[k_itemtype] != KITEM_THUNDERSHIELD)
player->kartstuff[k_curshield] = 0;
Item tweakings - Mines last twice as long - Mines can appear in 1st with a measly 5% chance, for maximum ass-blasting - Mine shiiiiink sound no longer plays globally - Thrown Bananas and Eggman Monitors bounce off walls like Mines - Hyudoro can steal from anyone - Halved invincibility alarm/music distance - Getting out Orbinaut/Jawz plays a shield sound - Using Shrink plays a devastating Chaotix sound - SPB plays a high-pitched wail when it's locked in - Hyudoro plays a ghosty sound when used - Fixed Battle arrow roulette
2018-06-15 06:18:43 +00:00
if (player->kartstuff[k_itemtype] == KITEM_SPB
|| player->kartstuff[k_itemtype] == KITEM_SHRINK
New SPB May not make it to R1, but oh well
2018-10-18 08:43:50 +00:00
|| player->kartstuff[k_growshrinktimer] < 0)
Item tweakings - Mines last twice as long - Mines can appear in 1st with a measly 5% chance, for maximum ass-blasting - Mine shiiiiink sound no longer plays globally - Thrown Bananas and Eggman Monitors bounce off walls like Mines - Hyudoro can steal from anyone - Halved invincibility alarm/music distance - Getting out Orbinaut/Jawz plays a shield sound - Using Shrink plays a devastating Chaotix sound - SPB plays a high-pitched wail when it's locked in - Hyudoro plays a ghosty sound when used - Fixed Battle arrow roulette
2018-06-15 06:18:43 +00:00
indirectitemcooldown = 20*TICRATE;
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
if (player->kartstuff[k_hyudorotimer] > 0)
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
{
Flags for only drawing an object on one person's screen, for juicy Boo splitscreen support (also more item changes from last night that I just forgot to commit earlier)
2018-06-06 22:36:39 +00:00
if (splitscreen)
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
{
if (leveltime & 1)
player->mo->flags2 |= MF2_DONTDRAW;
else
player->mo->flags2 &= ~MF2_DONTDRAW;
Flags for only drawing an object on one person's screen, for juicy Boo splitscreen support (also more item changes from last night that I just forgot to commit earlier)
2018-06-06 22:36:39 +00:00
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
if (player->kartstuff[k_hyudorotimer] >= (1*TICRATE/2) && player->kartstuff[k_hyudorotimer] <= hyudorotime-(1*TICRATE/2))
Flags for only drawing an object on one person's screen, for juicy Boo splitscreen support (also more item changes from last night that I just forgot to commit earlier)
2018-06-06 22:36:39 +00:00
{
if (player == &players[secondarydisplayplayer])
player->mo->eflags |= MFE_DRAWONLYFORP2;
else if (player == &players[thirddisplayplayer] && splitscreen > 1)
player->mo->eflags |= MFE_DRAWONLYFORP3;
else if (player == &players[fourthdisplayplayer] && splitscreen > 2)
player->mo->eflags |= MFE_DRAWONLYFORP4;
Minor splitscreen+netgame fixes Mainly related to drawing Battle arrows or Hyudoro
2018-09-30 05:23:59 +00:00
else if (player == &players[consoleplayer])
Flags for only drawing an object on one person's screen, for juicy Boo splitscreen support (also more item changes from last night that I just forgot to commit earlier)
2018-06-06 22:36:39 +00:00
player->mo->eflags |= MFE_DRAWONLYFORP1;
Minor splitscreen+netgame fixes Mainly related to drawing Battle arrows or Hyudoro
2018-09-30 05:23:59 +00:00
else
player->mo->flags2 |= MF2_DONTDRAW;
Flags for only drawing an object on one person's screen, for juicy Boo splitscreen support (also more item changes from last night that I just forgot to commit earlier)
2018-06-06 22:36:39 +00:00
}
else
player->mo->eflags &= ~(MFE_DRAWONLYFORP1|MFE_DRAWONLYFORP2|MFE_DRAWONLYFORP3|MFE_DRAWONLYFORP4);
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
}
else
Flags for only drawing an object on one person's screen, for juicy Boo splitscreen support (also more item changes from last night that I just forgot to commit earlier)
2018-06-06 22:36:39 +00:00
{
if (player == &players[displayplayer]
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
|| (player != &players[displayplayer] && (player->kartstuff[k_hyudorotimer] < (1*TICRATE/2) || player->kartstuff[k_hyudorotimer] > hyudorotime-(1*TICRATE/2))))
Flags for only drawing an object on one person's screen, for juicy Boo splitscreen support (also more item changes from last night that I just forgot to commit earlier)
2018-06-06 22:36:39 +00:00
{
if (leveltime & 1)
player->mo->flags2 |= MF2_DONTDRAW;
else
player->mo->flags2 &= ~MF2_DONTDRAW;
}
else
player->mo->flags2 |= MF2_DONTDRAW;
}
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
player->powers[pw_flashing] = player->kartstuff[k_hyudorotimer]; // We'll do this for now, let's people know about the invisible people through subtle hints
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
}
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
else if (player->kartstuff[k_hyudorotimer] == 0)
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
{
More adjustments - Comeback timer gets higher the more you get hit - Your ghost appears over the bomb - Speed & accel is set to worst while a bomb - CHECK range scales with kartcc
2017-11-06 04:18:58 +00:00
player->mo->flags2 &= ~MF2_DONTDRAW;
Flags for only drawing an object on one person's screen, for juicy Boo splitscreen support (also more item changes from last night that I just forgot to commit earlier)
2018-06-06 22:36:39 +00:00
player->mo->eflags &= ~(MFE_DRAWONLYFORP1|MFE_DRAWONLYFORP2|MFE_DRAWONLYFORP3|MFE_DRAWONLYFORP4);
More adjustments - Comeback timer gets higher the more you get hit - Your ghost appears over the bomb - Speed & accel is set to worst while a bomb - CHECK range scales with kartcc
2017-11-06 04:18:58 +00:00
}
Yet more comeback stuff! - You can now choose to carry an item to someone instead of bombing - You need to bomb someone or give an item a combined total of three times in order to come back. - Bombing somone gives 2 points while giving items doesn't award you any points. - Position number still flashes after you've won, and it flashes rainbow for people who have won and are in 1st place! - Flashing players can no longer eat items - Fixed kartstarsfx playing the alarm in conjunction with music - Fixed some items no longer causing wipeout
2017-11-13 03:48:32 +00:00
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
if (G_BattleGametype() && player->kartstuff[k_bumper] <= 0) // dead in match? you da bomb
More adjustments - Comeback timer gets higher the more you get hit - Your ghost appears over the bomb - Speed & accel is set to worst while a bomb - CHECK range scales with kartcc
2017-11-06 04:18:58 +00:00
{
Dropping items! * Shield Drop... * Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.) * Pops your Thunder Shield. * Happens upon ANY hit, except for deathpits. * HUD Drop... * Also does the above, except for the Thunder Shield thing. * If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item! * You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type. * Happens upon Size Down and battle elimination. * Can also be forced on with `cv_kartdebughuddrop on`! * Some other random stuff. * Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity. * Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter). * Allow shrunken players to pick up item boxes again. * Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.) * Break NiGHTS a little through my machinations.
2018-09-06 21:17:29 +00:00
K_DropItems(player); //K_StripItems(player);
K_StripOther(player);
More adjustments - Comeback timer gets higher the more you get hit - Your ghost appears over the bomb - Speed & accel is set to worst while a bomb - CHECK range scales with kartcc
2017-11-06 04:18:58 +00:00
player->mo->flags2 |= MF2_SHADOW;
Redid how karma bombs/items work. Again The overlay object now has a hitbox which handles all of the item giving/bombing code, and no longer takes up the player's tracer. This is to give them a bigger hitbox without any bad side-effects of changing the player's hitbox directly (shadow size). Should make bombing more useful, and just sliiiightly less missed high-fives from items.
2018-06-16 04:00:46 +00:00
player->powers[pw_flashing] = player->kartstuff[k_comebacktimer];
More adjustments - Comeback timer gets higher the more you get hit - Your ghost appears over the bomb - Speed & accel is set to worst while a bomb - CHECK range scales with kartcc
2017-11-06 04:18:58 +00:00
}
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
else if (G_RaceGametype() || player->kartstuff[k_bumper] > 0)
More adjustments - Comeback timer gets higher the more you get hit - Your ghost appears over the bomb - Speed & accel is set to worst while a bomb - CHECK range scales with kartcc
2017-11-06 04:18:58 +00:00
{
player->mo->flags2 &= ~MF2_SHADOW;
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
}
Everything. - Player arrows now show if a player is in the item roulette - Boo has been improved, and added back to Battle's item roulette - The CHECK HUD item is now more accurate, and should appear more often - Early comeback mechanic. Functional, but really unpolished - Attempted (again) to make the first player to join in a netgame spawn with balloons - No longer shows respawn text on death
2017-11-05 06:43:47 +00:00
}
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
// Friction
if (player->speed > 0 && cmd->forwardmove == 0 && player->mo->friction == 59392)
Some more minor comeback tweaks - Comeback players are now 1 speed with -20 friction - Bombing gives 2 karma now - Item players should no longer be able to be hit - Attempted to fix instances of trying to bomb someone while they can't be touched causing you to lose all your karma and start a console message saying you're back in the game, despite not rewarding a balloon - Fixed a few places where kartspeed & kartweight were being read as fixed point numbers, despite being UINT8's - Fixed up kartstuff Lua support more, functions properly now
2017-11-20 00:39:40 +00:00
player->mo->friction += 4608;
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
if (player->speed > 0 && cmd->forwardmove < 0 && player->mo->friction == 59392)
Some more minor comeback tweaks - Comeback players are now 1 speed with -20 friction - Bombing gives 2 karma now - Item players should no longer be able to be hit - Attempted to fix instances of trying to bomb someone while they can't be touched causing you to lose all your karma and start a console message saying you're back in the game, despite not rewarding a balloon - Fixed a few places where kartspeed & kartweight were being read as fixed point numbers, despite being UINT8's - Fixed up kartstuff Lua support more, functions properly now
2017-11-20 00:39:40 +00:00
player->mo->friction += 1608;
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
if (G_BattleGametype() && player->kartstuff[k_bumper] <= 0)
Some more minor comeback tweaks - Comeback players are now 1 speed with -20 friction - Bombing gives 2 karma now - Item players should no longer be able to be hit - Attempted to fix instances of trying to bomb someone while they can't be touched causing you to lose all your karma and start a console message saying you're back in the game, despite not rewarding a balloon - Fixed a few places where kartspeed & kartweight were being read as fixed point numbers, despite being UINT8's - Fixed up kartstuff Lua support more, functions properly now
2017-11-20 00:39:40 +00:00
{
player->mo->friction += 1228;
if (player->mo->friction > FRACUNIT)
player->mo->friction = FRACUNIT;
if (player->mo->friction < 0)
player->mo->friction = 0;
player->mo->movefactor = FixedDiv(ORIG_FRICTION, player->mo->friction);
if (player->mo->movefactor < FRACUNIT)
player->mo->movefactor = 19*player->mo->movefactor - 18*FRACUNIT;
else
player->mo->movefactor = FRACUNIT; //player->mo->movefactor = ((player->mo->friction - 0xDB34)*(0xA))/0x80;
if (player->mo->movefactor < 32)
player->mo->movefactor = 32;
}
Spinout quick fix
2018-07-21 02:51:18 +00:00
if (player->kartstuff[k_spinouttimer] && player->kartstuff[k_wipeoutslow])
More tweaking - Getting wipeout bumped into offroad slows you down - Orbinaut & Jawz are relative to your weight (Jawz is heavier), via new function K_GetMobjWeight - Reorangized where K_KartBouncing is called so that wipeout changes don't affect Eggman Items
2018-07-20 20:13:02 +00:00
{
Spinout quick fix
2018-07-21 02:51:18 +00:00
player->mo->friction -= FixedMul(1228, player->kartstuff[k_offroad]);
if (player->kartstuff[k_wipeoutslow] == 1)
player->mo->friction -= 4912;
More tweaking - Getting wipeout bumped into offroad slows you down - Orbinaut & Jawz are relative to your weight (Jawz is heavier), via new function K_GetMobjWeight - Reorangized where K_KartBouncing is called so that wipeout changes don't affect Eggman Items
2018-07-20 20:13:02 +00:00
}
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
Fix drifting No longer does all the angle adjustments inside of the player thinker and instead does it with the controls Should hopefully avoid any desynch from drifting Also maybe fixed player 2's controls
2017-03-07 01:05:18 +00:00
K_KartDrift(player, onground);
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
// Quick Turning
// You can't turn your kart when you're not moving.
// So now it's time to burn some rubber!
Lakitu murder & countdown improvements (I'm not SevenethSentienel! I just don't feel like logging out!)
2018-06-25 02:15:22 +00:00
if (player->speed < 2 && leveltime > starttime && cmd->buttons & BT_ACCELERATE && cmd->buttons & BT_BRAKE && cmd->driftturn != 0)
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
{
Fix drifting No longer does all the angle adjustments inside of the player thinker and instead does it with the controls Should hopefully avoid any desynch from drifting Also maybe fixed player 2's controls
2017-03-07 01:05:18 +00:00
if (leveltime % 20 == 0)
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
S_StartSound(player->mo, sfx_mkslid);
}
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
// Squishing
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
// If a Grow player or a sector crushes you, get flattened instead of being killed.
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
if (player->kartstuff[k_squishedtimer] <= 0)
{
player->mo->flags &= ~MF_NOCLIP;
}
else
{
player->mo->flags |= MF_NOCLIP;
player->mo->momx = 0;
player->mo->momy = 0;
}
Lakitu murder & countdown improvements (I'm not SevenethSentienel! I just don't feel like logging out!)
2018-06-25 02:15:22 +00:00
// Play the starting countdown sounds
Don't play start countdown several times in splitscreen
2018-06-28 00:51:02 +00:00
if (player == &players[displayplayer]) // Don't play louder in splitscreen
{
if ((leveltime == starttime-(3*TICRATE)) || (leveltime == starttime-(2*TICRATE)) || (leveltime == starttime-TICRATE))
S_StartSound(NULL, sfx_s3ka7);
if (leveltime == starttime)
GO! interupts the start ambience
2018-06-30 00:15:42 +00:00
{
Don't play start countdown several times in splitscreen
2018-06-28 00:51:02 +00:00
S_StartSound(NULL, sfx_s3kad);
GO! interupts the start ambience
2018-06-30 00:15:42 +00:00
S_StopMusic(); // The GO! sound stops the level start ambience
}
Don't play start countdown several times in splitscreen
2018-06-28 00:51:02 +00:00
}
Lakitu murder & countdown improvements (I'm not SevenethSentienel! I just don't feel like logging out!)
2018-06-25 02:15:22 +00:00
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
// Start charging once you're given the opportunity.
GO! interupts the start ambience
2018-06-30 00:15:42 +00:00
if (leveltime >= starttime-(2*TICRATE) && leveltime <= starttime)
Hopefully some medicine for the characters' sore throats from all that taunting Also my editor ate some trailing whitespace.
2018-07-04 21:25:38 +00:00
{
GO! interupts the start ambience
2018-06-30 00:15:42 +00:00
if (cmd->buttons & BT_ACCELERATE)
player->kartstuff[k_boostcharge]++;
else
player->kartstuff[k_boostcharge] = 0;
}
Lakitu murder & countdown improvements (I'm not SevenethSentienel! I just don't feel like logging out!)
2018-06-25 02:15:22 +00:00
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
// Increase your size while charging your engine.
Lakitu murder & countdown improvements (I'm not SevenethSentienel! I just don't feel like logging out!)
2018-06-25 02:15:22 +00:00
if (leveltime < starttime+10)
Shrink debug command, trailing items spawn directly on players, rainbow win 1 is more faithful, make springs more powerful for shrunk players, correct Grow/Shrink fullbright frame
2018-07-12 05:31:33 +00:00
{
Unsuck start boosts
2018-03-30 01:43:02 +00:00
player->mo->destscale = (mapheaderinfo[gamemap-1]->mobj_scale) + (player->kartstuff[k_boostcharge]*131);
Prevent using kartdebug cvars in Time Attack. (None of this should invalidate any of YOUR existing ghosts, because none of them use these obvious cheats like, say, setting kartdebugitem 2.)
2018-11-09 20:16:12 +00:00
if (cv_kartdebugshrink.value && !modeattacking && !player->bot)
Shrink debug command, trailing items spawn directly on players, rainbow win 1 is more faithful, make springs more powerful for shrunk players, correct Grow/Shrink fullbright frame
2018-07-12 05:31:33 +00:00
player->mo->destscale = 6*player->mo->destscale/8;
}
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
// Determine the outcome of your charge.
Lakitu murder & countdown improvements (I'm not SevenethSentienel! I just don't feel like logging out!)
2018-06-25 02:15:22 +00:00
if (leveltime > starttime && player->kartstuff[k_boostcharge])
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
{
* Change/add a handful of sounds. * Make Orbinaut Shields animate at 3 tics per frame, not 1. * Make dead items flash in and out of visibility. * Related to above, fix a few circumstances where returning was not properly handled after removing a mobj in mobjthinker.
2018-08-05 15:38:46 +00:00
// Not even trying?
if (player->kartstuff[k_boostcharge] < 35)
{
if (player->kartstuff[k_boostcharge] > 17)
S_StartSound(player->mo, sfx_cdfm00); // chosen instead of a conventional skid because it's more engine-like
}
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
// Get an instant boost!
* Change/add a handful of sounds. * Make Orbinaut Shields animate at 3 tics per frame, not 1. * Make dead items flash in and out of visibility. * Related to above, fix a few circumstances where returning was not properly handled after removing a mobj in mobjthinker.
2018-08-05 15:38:46 +00:00
else if (player->kartstuff[k_boostcharge] <= 50)
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
{
Drop Dash + alternate start boosts New respawn boost behavior, where you just hold for long enough instead of timing it with hitting the ground. Also much weaker, just gives you enough boost to get going instead of being a free sneaker. Start boosts have been severely changed. The perfect one has an extra tic on its timing window and gets Sneaker boosting special effects, but every other possible boost has been severely nerfed.
2018-09-10 05:47:23 +00:00
player->kartstuff[k_startboost] = (50-player->kartstuff[k_boostcharge])+20;
if (player->kartstuff[k_boostcharge] <= 36)
Some fun sound changes - Peelout sound for sneaker boosts - Flicky grab sound for stealing balloons - Adaptive sounds for start boosts (drift boost for sub-optimal boosts, sneaker boost for good boosts, super transform sound for the frame perfect boost) - Orbinaut rollling sound
2018-06-26 16:02:14 +00:00
{
Drop Dash + alternate start boosts New respawn boost behavior, where you just hold for long enough instead of timing it with hitting the ground. Also much weaker, just gives you enough boost to get going instead of being a free sneaker. Start boosts have been severely changed. The perfect one has an extra tic on its timing window and gets Sneaker boosting special effects, but every other possible boost has been severely nerfed.
2018-09-10 05:47:23 +00:00
player->kartstuff[k_startboost] = 0;
Rocket Sneakers appear beside you
2018-10-07 22:53:46 +00:00
K_DoSneaker(player, 0);
Drop Dash + alternate start boosts New respawn boost behavior, where you just hold for long enough instead of timing it with hitting the ground. Also much weaker, just gives you enough boost to get going instead of being a free sneaker. Start boosts have been severely changed. The perfect one has an extra tic on its timing window and gets Sneaker boosting special effects, but every other possible boost has been severely nerfed.
2018-09-10 05:47:23 +00:00
player->kartstuff[k_sneakertimer] = 70; // PERFECT BOOST!!
if (!player->kartstuff[k_floorboost] || player->kartstuff[k_floorboost] == 3) // Let everyone hear this one
S_StartSound(player->mo, sfx_s25f);
Some fun sound changes - Peelout sound for sneaker boosts - Flicky grab sound for stealing balloons - Adaptive sounds for start boosts (drift boost for sub-optimal boosts, sneaker boost for good boosts, super transform sound for the frame perfect boost) - Orbinaut rollling sound
2018-06-26 16:02:14 +00:00
}
Spindash boost dust, pogo spring sfx
2018-09-20 00:13:48 +00:00
else
Drop Dash + alternate start boosts New respawn boost behavior, where you just hold for long enough instead of timing it with hitting the ground. Also much weaker, just gives you enough boost to get going instead of being a free sneaker. Start boosts have been severely changed. The perfect one has an extra tic on its timing window and gets Sneaker boosting special effects, but every other possible boost has been severely nerfed.
2018-09-10 05:47:23 +00:00
{
Spindash boost dust, pogo spring sfx
2018-09-20 00:13:48 +00:00
K_SpawnDashDustRelease(player); // already handled for perfect boosts by K_DoSneaker
if ((!player->kartstuff[k_floorboost] || player->kartstuff[k_floorboost] == 3) && P_IsLocalPlayer(player))
{
if (player->kartstuff[k_boostcharge] <= 40)
S_StartSound(player->mo, sfx_cdfm01); // You were almost there!
else
S_StartSound(player->mo, sfx_s23c); // Nope, better luck next time.
}
}
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
}
// You overcharged your engine? Those things are expensive!!!
Unsuck start boosts
2018-03-30 01:43:02 +00:00
else if (player->kartstuff[k_boostcharge] > 50)
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
{
player->powers[pw_nocontrol] = 40;
Don't look at this commit too closely until after netgame, I want to surprise yalls!! * Lots of menu changes! * Little arrows next to changeable cvars! * Show default value for sliders! * Pretty pretty pretty. * I don't know how to describe some of these changes. * Effectively nuke MIDI music support! * Skiddown at the start of a race is more interesting! * Spinning in waterslides! * Tiny bugfix in voting, plus a little celebration...
2018-06-30 22:18:13 +00:00
//S_StartSound(player->mo, sfx_kc34);
S_StartSound(player->mo, sfx_s3k83);
player->pflags |= PF_SKIDDOWN; // cheeky pflag reuse
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
}
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
player->kartstuff[k_boostcharge] = 0;
}
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
}
WANTED
2018-07-01 08:36:09 +00:00
void K_CalculateBattleWanted(void)
{
If the game would normally end in a bomb kill, then always switch their places
2018-09-05 00:16:42 +00:00
UINT8 numingame = 0, numplaying = 0, numwanted = 0;
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
SINT8 bestbumperplayer = -1, bestbumper = -1;
WANTED
2018-07-01 08:36:09 +00:00
SINT8 camppos[MAXPLAYERS]; // who is the biggest camper
UINT8 ties = 0, nextcamppos = 0;
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
boolean setbumper = false;
WANTED
2018-07-01 08:36:09 +00:00
UINT8 i, j;
if (!G_BattleGametype())
{
for (i = 0; i < 4; i++)
battlewanted[i] = -1;
return;
}
WANTED recalculates on hit, tons of spectator changes
2018-07-04 01:12:25 +00:00
wantedcalcdelay = wantedfrequency;
WANTED
2018-07-01 08:36:09 +00:00
for (i = 0; i < MAXPLAYERS; i++)
camppos[i] = -1; // initialize
for (i = 0; i < MAXPLAYERS; i++)
{
UINT8 position = 1;
if (!playeringame[i] || players[i].spectator) // Not playing
continue;
if (players[i].exiting) // We're done, don't calculate.
return;
If the game would normally end in a bomb kill, then always switch their places
2018-09-05 00:16:42 +00:00
numplaying++;
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
if (players[i].kartstuff[k_bumper] <= 0) // Not alive, so don't do anything else
WANTED
2018-07-01 08:36:09 +00:00
continue;
Move numingame count after the balloon check
2018-07-01 19:25:10 +00:00
numingame++;
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
if (bestbumper == -1 || players[i].kartstuff[k_bumper] > bestbumper)
WANTED
2018-07-01 08:36:09 +00:00
{
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
bestbumper = players[i].kartstuff[k_bumper];
bestbumperplayer = i;
WANTED
2018-07-01 08:36:09 +00:00
}
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
else if (players[i].kartstuff[k_bumper] == bestbumper)
bestbumperplayer = -1; // Tie, no one has best bumper.
WANTED
2018-07-01 08:36:09 +00:00
for (j = 0; j < MAXPLAYERS; j++)
{
if (!playeringame[j] || players[j].spectator)
continue;
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
if (players[j].kartstuff[k_bumper] <= 0)
WANTED
2018-07-01 08:36:09 +00:00
continue;
if (j == i)
continue;
*A biggie: two-tier intermission screen! * Have the entire thing slide the fuck away a short while into the intermission. * The tab screen is modified to work off similar behaviour and presentation. * To go with it, a revamp of how Battle's scoring is handled. * It's now considered "hits", and is stored in a reuse in one of the vanilla NiGHTS variables, allowing it to use exactly the same ranking mechanisms as race. * No more resetting of score between battle rounds. * Minor, unrelated general code cleanup in places. * Disable the YEEEAH in splitscreen, otherwise you'll hear it *all the time*.
2018-07-18 19:23:46 +00:00
if (players[j].kartstuff[k_wanted] == players[i].kartstuff[k_wanted] && players[j].marescore > players[i].marescore)
WANTED
2018-07-01 08:36:09 +00:00
position++;
else if (players[j].kartstuff[k_wanted] > players[i].kartstuff[k_wanted])
position++;
}
position--; // Make zero based
while (camppos[position] != -1) // Port priority!
position++;
camppos[position] = i;
}
If the game would normally end in a bomb kill, then always switch their places
2018-09-05 00:16:42 +00:00
if (numplaying <= 2 || (numingame <= 2 && bestbumper == 1)) // In 1v1s then there's no need for WANTED. In bigger netgames, don't show anyone as WANTED when they're equally matched.
WANTED
2018-07-01 08:36:09 +00:00
numwanted = 0;
else
numwanted = min(4, 1 + ((numingame-2) / 4));
for (i = 0; i < 4; i++)
{
if (i+1 > numwanted) // Not enough players for this slot to be wanted!
battlewanted[i] = -1;
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
else if (bestbumperplayer != -1 && !setbumper) // If there's a player who has an untied bumper lead over everyone else, they are the first to be wanted.
WANTED
2018-07-01 08:36:09 +00:00
{
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
battlewanted[i] = bestbumperplayer;
setbumper = true; // Don't set twice
WANTED
2018-07-01 08:36:09 +00:00
}
else
{
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
// Don't accidentally set the same player, if the bestbumperplayer is also a huge camper.
while (bestbumperplayer != -1 && camppos[nextcamppos] != -1
&& bestbumperplayer == camppos[nextcamppos])
Battle finish music, fixed double-wanted bug
2018-07-02 21:57:22 +00:00
nextcamppos++;
// Do not add *any* more people if there's too many times that are tied with others.
WANTED
2018-07-01 08:36:09 +00:00
// This could theoretically happen very easily if people don't hit each other for a while after the start of a match.
Move numingame count after the balloon check
2018-07-01 19:25:10 +00:00
// (I will be sincerely impressed if more than 2 people tie after people start hitting each other though)
WANTED
2018-07-01 08:36:09 +00:00
if (camppos[nextcamppos] == -1 // Out of entries
Battle finish music, fixed double-wanted bug
2018-07-02 21:57:22 +00:00
|| ties >= (numwanted-i)) // Already counted ties
WANTED
2018-07-01 08:36:09 +00:00
{
battlewanted[i] = -1;
continue;
}
Battle finish music, fixed double-wanted bug
2018-07-02 21:57:22 +00:00
if (ties < (numwanted-i))
WANTED
2018-07-01 08:36:09 +00:00
{
ties = 0; // Reset
for (j = 0; j < 2; j++)
{
if (camppos[nextcamppos+(j+1)] == -1) // Nothing beyond, cancel
break;
if (players[camppos[nextcamppos]].kartstuff[k_wanted] == players[camppos[nextcamppos+(j+1)]].kartstuff[k_wanted])
ties++;
}
}
Battle finish music, fixed double-wanted bug
2018-07-02 21:57:22 +00:00
if (ties < (numwanted-i)) // Is it still low enough after counting?
WANTED
2018-07-01 08:36:09 +00:00
{
battlewanted[i] = camppos[nextcamppos];
nextcamppos++;
}
else
battlewanted[i] = -1;
}
}
}
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
void K_CheckBumpers(void)
BATLLE MODE AAAAAA
2017-10-22 07:06:35 +00:00
{
UINT8 i;
Did you know: Battle Mode - Different sizes for the balloons, depending on how many you have - Balloons are fullbright, cast shadows, and stick closer to players - Mega Mushrooms can now appear - Can steal items with Boo in Battle Mode now, as intended - Death pits make you lose only 1 balloon - Balloons disappear properly if you use Boo - Boo item icon should no longer appear if you're out of balloons - You can now properly respawn in Battle Mode - Can no longer collide with items if you are already holding one
2017-10-22 21:26:43 +00:00
UINT8 numingame = 0;
Some warning fixes
2018-02-09 00:58:10 +00:00
SINT8 winnernum = -1;
Reverted scoring back to what it was before, change order-of-operations to allow switcheroos from bombs.
2018-07-01 03:35:38 +00:00
INT32 winnerscoreadd = 0;
Tweeeeeaks - MT_FALLINGROCK bumps you instead of spinning you out! RIP annoying af apples - Made some Battle-related messages only happen in netgames - Messed with the timing on the intro
2017-12-28 23:37:25 +00:00
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
if (!multiplayer)
Everything. - Player arrows now show if a player is in the item roulette - Boo has been improved, and added back to Battle's item roulette - The CHECK HUD item is now more accurate, and should appear more often - Early comeback mechanic. Functional, but really unpolished - Attempted (again) to make the first player to join in a netgame spawn with balloons - No longer shows respawn text on death
2017-11-05 06:43:47 +00:00
return;
Made a lot of gametype checks use either G_RaceGametype or G_BattleGametype Should make it a lot easier to add more gametypes later. Also some minor fixes: - Changed up how shell speed scales in mobjscale juuuust slightly, so it's less messy - Fixed CHECK showing spectators
2018-03-04 20:27:52 +00:00
if (!G_BattleGametype())
Everything. - Player arrows now show if a player is in the item roulette - Boo has been improved, and added back to Battle's item roulette - The CHECK HUD item is now more accurate, and should appear more often - Early comeback mechanic. Functional, but really unpolished - Attempted (again) to make the first player to join in a netgame spawn with balloons - No longer shows respawn text on death
2017-11-05 06:43:47 +00:00
return;
if (gameaction == ga_completed)
BATLLE MODE AAAAAA
2017-10-22 07:06:35 +00:00
return;
for (i = 0; i < MAXPLAYERS; i++)
{
Balloons message
2017-10-25 20:15:47 +00:00
if (!playeringame[i] || players[i].spectator) // not even in-game
BATLLE MODE AAAAAA
2017-10-22 07:06:35 +00:00
continue;
Battle HUD stuff
2017-11-14 01:45:57 +00:00
if (players[i].exiting) // we're already exiting! stop!
return;
Did you know: Battle Mode - Different sizes for the balloons, depending on how many you have - Balloons are fullbright, cast shadows, and stick closer to players - Mega Mushrooms can now appear - Can steal items with Boo in Battle Mode now, as intended - Death pits make you lose only 1 balloon - Balloons disappear properly if you use Boo - Boo item icon should no longer appear if you're out of balloons - You can now properly respawn in Battle Mode - Can no longer collide with items if you are already holding one
2017-10-22 21:26:43 +00:00
numingame++;
*A biggie: two-tier intermission screen! * Have the entire thing slide the fuck away a short while into the intermission. * The tab screen is modified to work off similar behaviour and presentation. * To go with it, a revamp of how Battle's scoring is handled. * It's now considered "hits", and is stored in a reuse in one of the vanilla NiGHTS variables, allowing it to use exactly the same ranking mechanisms as race. * No more resetting of score between battle rounds. * Minor, unrelated general code cleanup in places. * Disable the YEEEAH in splitscreen, otherwise you'll hear it *all the time*.
2018-07-18 19:23:46 +00:00
winnerscoreadd += players[i].marescore;
BATLLE MODE AAAAAA
2017-10-22 07:06:35 +00:00
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
if (players[i].kartstuff[k_bumper] <= 0) // if you don't have any bumpers, you're probably not a winner
Did you know: Battle Mode - Different sizes for the balloons, depending on how many you have - Balloons are fullbright, cast shadows, and stick closer to players - Mega Mushrooms can now appear - Can steal items with Boo in Battle Mode now, as intended - Death pits make you lose only 1 balloon - Balloons disappear properly if you use Boo - Boo item icon should no longer appear if you're out of balloons - You can now properly respawn in Battle Mode - Can no longer collide with items if you are already holding one
2017-10-22 21:26:43 +00:00
continue;
else if (winnernum > -1) // TWO winners? that's dumb :V
return;
Reverted scoring back to what it was before, change order-of-operations to allow switcheroos from bombs.
2018-07-01 03:35:38 +00:00
BATLLE MODE AAAAAA
2017-10-22 07:06:35 +00:00
winnernum = i;
*A biggie: two-tier intermission screen! * Have the entire thing slide the fuck away a short while into the intermission. * The tab screen is modified to work off similar behaviour and presentation. * To go with it, a revamp of how Battle's scoring is handled. * It's now considered "hits", and is stored in a reuse in one of the vanilla NiGHTS variables, allowing it to use exactly the same ranking mechanisms as race. * No more resetting of score between battle rounds. * Minor, unrelated general code cleanup in places. * Disable the YEEEAH in splitscreen, otherwise you'll hear it *all the time*.
2018-07-18 19:23:46 +00:00
winnerscoreadd -= players[i].marescore;
BATLLE MODE AAAAAA
2017-10-22 07:06:35 +00:00
}
Item dist scales with low player count instead of just odds, you can change some cvars during start countdown
2018-07-22 22:15:11 +00:00
if (numingame <= 1)
return;
Did you know: Battle Mode - Different sizes for the balloons, depending on how many you have - Balloons are fullbright, cast shadows, and stick closer to players - Mega Mushrooms can now appear - Can steal items with Boo in Battle Mode now, as intended - Death pits make you lose only 1 balloon - Balloons disappear properly if you use Boo - Boo item icon should no longer appear if you're out of balloons - You can now properly respawn in Battle Mode - Can no longer collide with items if you are already holding one
2017-10-22 21:26:43 +00:00
Reverted scoring back to what it was before, change order-of-operations to allow switcheroos from bombs.
2018-07-01 03:35:38 +00:00
if (winnernum > -1 && playeringame[winnernum])
Maybe message fix
2017-10-26 23:37:13 +00:00
{
*A biggie: two-tier intermission screen! * Have the entire thing slide the fuck away a short while into the intermission. * The tab screen is modified to work off similar behaviour and presentation. * To go with it, a revamp of how Battle's scoring is handled. * It's now considered "hits", and is stored in a reuse in one of the vanilla NiGHTS variables, allowing it to use exactly the same ranking mechanisms as race. * No more resetting of score between battle rounds. * Minor, unrelated general code cleanup in places. * Disable the YEEEAH in splitscreen, otherwise you'll hear it *all the time*.
2018-07-18 19:23:46 +00:00
players[winnernum].marescore += winnerscoreadd;
Reverted scoring back to what it was before, change order-of-operations to allow switcheroos from bombs.
2018-07-01 03:35:38 +00:00
CONS_Printf(M_GetText("%s recieved %d point%s for winning!\n"), player_names[winnernum], winnerscoreadd, (winnerscoreadd == 1 ? "" : "s"));
Maybe message fix
2017-10-26 23:37:13 +00:00
}
Did you know: Battle Mode - Different sizes for the balloons, depending on how many you have - Balloons are fullbright, cast shadows, and stick closer to players - Mega Mushrooms can now appear - Can steal items with Boo in Battle Mode now, as intended - Death pits make you lose only 1 balloon - Balloons disappear properly if you use Boo - Boo item icon should no longer appear if you're out of balloons - You can now properly respawn in Battle Mode - Can no longer collide with items if you are already holding one
2017-10-22 21:26:43 +00:00
Change how battle music/patch is decided
2018-07-12 23:04:37 +00:00
for (i = 0; i < MAXPLAYERS; i++) // This can't go in the earlier loop because winning adds points
K_KartUpdatePosition(&players[i]);
for (i = 0; i < MAXPLAYERS; i++) // and it can't be merged with this loop because it needs to be all updated before exiting... multi-loops suck...
Battle HUD stuff
2017-11-14 01:45:57 +00:00
P_DoPlayerExit(&players[i]);
BATLLE MODE AAAAAA
2017-10-22 07:06:35 +00:00
}
Spectator overhaul - New player flag, PF_WANTSTOJOIN, added for setting up a spectator queue. You are allowed to join as long as no one has started lap 2. - Map resets when two people have entered the game, so matches can start naturally without the need of an admin.
2018-07-20 23:11:36 +00:00
void K_CheckSpectateStatus(void)
{
Fix all actionable comments in my review of sonicitems.
2018-08-09 21:59:52 +00:00
UINT8 respawnlist[MAXPLAYERS];
* Make cancelling a join work on the pause menu and console. (You need to write "changeteam spectator" to cancel a PF_WANTSTOJOIN.) * Stop respawning spectators when their PF_WANTSTOJOIN request hasn't been processed yet. * Handle PF_WANTSTOJOIN requests in GS_WAITINGPLAYERS. * Refactor K_CheckSpectateStatus, and make it so PF_WANTSTOJOIN requests are processed if there's only one player in the server, even if they're on lap 2 or up. * Make the player entry mechanism in P_SpawnPlayer use the PF_WANTSTOJOIN mechanism so that it can also take advantage of the level refresh mechanism with no extra code. * NOTE: This does a bad hack in order to not send multiple mapchanges while the joining timer is low! If you can think of a better way to do this, please let me know/commit it. * Change the timer until you can hit ITEM again when a spectator who has to wait to join shorter. * (controversial, but I think necessary) - flash the ITEM text when the above-mentioned timer is nonzero.
2018-07-21 15:45:08 +00:00
UINT8 i, numingame = 0, numjoiners = 0;
Spectator overhaul - New player flag, PF_WANTSTOJOIN, added for setting up a spectator queue. You are allowed to join as long as no one has started lap 2. - Map resets when two people have entered the game, so matches can start naturally without the need of an admin.
2018-07-20 23:11:36 +00:00
Spectate / enter game in chat + New console colours + Highlight chat scroll arrow + small cleanup for consolefill
2018-10-25 11:21:44 +00:00
if (!cv_allowteamchange.value) return;
* Make cancelling a join work on the pause menu and console. (You need to write "changeteam spectator" to cancel a PF_WANTSTOJOIN.) * Stop respawning spectators when their PF_WANTSTOJOIN request hasn't been processed yet. * Handle PF_WANTSTOJOIN requests in GS_WAITINGPLAYERS. * Refactor K_CheckSpectateStatus, and make it so PF_WANTSTOJOIN requests are processed if there's only one player in the server, even if they're on lap 2 or up. * Make the player entry mechanism in P_SpawnPlayer use the PF_WANTSTOJOIN mechanism so that it can also take advantage of the level refresh mechanism with no extra code. * NOTE: This does a bad hack in order to not send multiple mapchanges while the joining timer is low! If you can think of a better way to do this, please let me know/commit it. * Change the timer until you can hit ITEM again when a spectator who has to wait to join shorter. * (controversial, but I think necessary) - flash the ITEM text when the above-mentioned timer is nonzero.
2018-07-21 15:45:08 +00:00
// Get the number of players in game, and the players to be de-spectated.
for (i = 0; i < MAXPLAYERS; i++)
{
if (!playeringame[i])
continue;
Spectator overhaul - New player flag, PF_WANTSTOJOIN, added for setting up a spectator queue. You are allowed to join as long as no one has started lap 2. - Map resets when two people have entered the game, so matches can start naturally without the need of an admin.
2018-07-20 23:11:36 +00:00
* Make cancelling a join work on the pause menu and console. (You need to write "changeteam spectator" to cancel a PF_WANTSTOJOIN.) * Stop respawning spectators when their PF_WANTSTOJOIN request hasn't been processed yet. * Handle PF_WANTSTOJOIN requests in GS_WAITINGPLAYERS. * Refactor K_CheckSpectateStatus, and make it so PF_WANTSTOJOIN requests are processed if there's only one player in the server, even if they're on lap 2 or up. * Make the player entry mechanism in P_SpawnPlayer use the PF_WANTSTOJOIN mechanism so that it can also take advantage of the level refresh mechanism with no extra code. * NOTE: This does a bad hack in order to not send multiple mapchanges while the joining timer is low! If you can think of a better way to do this, please let me know/commit it. * Change the timer until you can hit ITEM again when a spectator who has to wait to join shorter. * (controversial, but I think necessary) - flash the ITEM text when the above-mentioned timer is nonzero.
2018-07-21 15:45:08 +00:00
if (!players[i].spectator)
{
Spectator overhaul - New player flag, PF_WANTSTOJOIN, added for setting up a spectator queue. You are allowed to join as long as no one has started lap 2. - Map resets when two people have entered the game, so matches can start naturally without the need of an admin.
2018-07-20 23:11:36 +00:00
numingame++;
HERE COMES A NEW CHALLENGER
2018-07-22 04:31:02 +00:00
if (gamestate != GS_LEVEL) // Allow if you're not in a level
Map reset timer
2018-07-21 19:54:05 +00:00
continue;
HERE COMES A NEW CHALLENGER
2018-07-22 04:31:02 +00:00
if (players[i].exiting) // DON'T allow if anyone's exiting
return;
if (numingame < 2 || leveltime < starttime || mapreset) // Allow if the match hasn't started yet
Fix all actionable comments in my review of sonicitems.
2018-08-09 21:59:52 +00:00
continue;
A bunch of spectator-joining-round tweaks. * Re-enable the flashing-set thing on attempting to join with the item key. I spoke to Sal privately about this - turns out some keys ALWAYS send key presses instead of only sending one, and shift - what I have item bound to - is one of the problematic ones. * Make the no-joining-game-after-20-seconds thing happen 20 seconds after the TIMER has started, not the level (ie, take starttime into account)
2018-10-18 17:13:00 +00:00
if (leveltime > (starttime + 20*TICRATE)) // DON'T allow if the match is 20 seconds in
Don't allow joining 20 sec into the match
2018-09-10 08:29:37 +00:00
return;
HERE COMES A NEW CHALLENGER
2018-07-22 04:31:02 +00:00
if (G_RaceGametype() && players[i].laps) // DON'T allow if the race is at 2 laps
Spectator overhaul - New player flag, PF_WANTSTOJOIN, added for setting up a spectator queue. You are allowed to join as long as no one has started lap 2. - Map resets when two people have entered the game, so matches can start naturally without the need of an admin.
2018-07-20 23:11:36 +00:00
return;
* Make cancelling a join work on the pause menu and console. (You need to write "changeteam spectator" to cancel a PF_WANTSTOJOIN.) * Stop respawning spectators when their PF_WANTSTOJOIN request hasn't been processed yet. * Handle PF_WANTSTOJOIN requests in GS_WAITINGPLAYERS. * Refactor K_CheckSpectateStatus, and make it so PF_WANTSTOJOIN requests are processed if there's only one player in the server, even if they're on lap 2 or up. * Make the player entry mechanism in P_SpawnPlayer use the PF_WANTSTOJOIN mechanism so that it can also take advantage of the level refresh mechanism with no extra code. * NOTE: This does a bad hack in order to not send multiple mapchanges while the joining timer is low! If you can think of a better way to do this, please let me know/commit it. * Change the timer until you can hit ITEM again when a spectator who has to wait to join shorter. * (controversial, but I think necessary) - flash the ITEM text when the above-mentioned timer is nonzero.
2018-07-21 15:45:08 +00:00
continue;
}
else if (!(players[i].pflags & PF_WANTSTOJOIN))
continue;
Spectator overhaul - New player flag, PF_WANTSTOJOIN, added for setting up a spectator queue. You are allowed to join as long as no one has started lap 2. - Map resets when two people have entered the game, so matches can start naturally without the need of an admin.
2018-07-20 23:11:36 +00:00
* Make cancelling a join work on the pause menu and console. (You need to write "changeteam spectator" to cancel a PF_WANTSTOJOIN.) * Stop respawning spectators when their PF_WANTSTOJOIN request hasn't been processed yet. * Handle PF_WANTSTOJOIN requests in GS_WAITINGPLAYERS. * Refactor K_CheckSpectateStatus, and make it so PF_WANTSTOJOIN requests are processed if there's only one player in the server, even if they're on lap 2 or up. * Make the player entry mechanism in P_SpawnPlayer use the PF_WANTSTOJOIN mechanism so that it can also take advantage of the level refresh mechanism with no extra code. * NOTE: This does a bad hack in order to not send multiple mapchanges while the joining timer is low! If you can think of a better way to do this, please let me know/commit it. * Change the timer until you can hit ITEM again when a spectator who has to wait to join shorter. * (controversial, but I think necessary) - flash the ITEM text when the above-mentioned timer is nonzero.
2018-07-21 15:45:08 +00:00
respawnlist[numjoiners++] = i;
}
Spectator overhaul - New player flag, PF_WANTSTOJOIN, added for setting up a spectator queue. You are allowed to join as long as no one has started lap 2. - Map resets when two people have entered the game, so matches can start naturally without the need of an admin.
2018-07-20 23:11:36 +00:00
* Make cancelling a join work on the pause menu and console. (You need to write "changeteam spectator" to cancel a PF_WANTSTOJOIN.) * Stop respawning spectators when their PF_WANTSTOJOIN request hasn't been processed yet. * Handle PF_WANTSTOJOIN requests in GS_WAITINGPLAYERS. * Refactor K_CheckSpectateStatus, and make it so PF_WANTSTOJOIN requests are processed if there's only one player in the server, even if they're on lap 2 or up. * Make the player entry mechanism in P_SpawnPlayer use the PF_WANTSTOJOIN mechanism so that it can also take advantage of the level refresh mechanism with no extra code. * NOTE: This does a bad hack in order to not send multiple mapchanges while the joining timer is low! If you can think of a better way to do this, please let me know/commit it. * Change the timer until you can hit ITEM again when a spectator who has to wait to join shorter. * (controversial, but I think necessary) - flash the ITEM text when the above-mentioned timer is nonzero.
2018-07-21 15:45:08 +00:00
// literally zero point in going any further if nobody is joining
if (!numjoiners)
return;
Spectator overhaul - New player flag, PF_WANTSTOJOIN, added for setting up a spectator queue. You are allowed to join as long as no one has started lap 2. - Map resets when two people have entered the game, so matches can start naturally without the need of an admin.
2018-07-20 23:11:36 +00:00
Map reset timer
2018-07-21 19:54:05 +00:00
// Reset the match if you're in an empty server
HERE COMES A NEW CHALLENGER
2018-07-22 04:31:02 +00:00
if (!mapreset && gamestate == GS_LEVEL && leveltime >= starttime && (numingame < 2 && numingame+numjoiners >= 2))
Map reset timer
2018-07-21 19:54:05 +00:00
{
HERE COMES A NEW CHALLENGER
2018-07-22 04:31:02 +00:00
S_ChangeMusicInternal("chalng", false); // COME ON
mapreset = 3*TICRATE; // Even though only the server uses this for game logic, set for everyone for HUD in the future
Map reset timer
2018-07-21 19:54:05 +00:00
}
Spectator overhaul - New player flag, PF_WANTSTOJOIN, added for setting up a spectator queue. You are allowed to join as long as no one has started lap 2. - Map resets when two people have entered the game, so matches can start naturally without the need of an admin.
2018-07-20 23:11:36 +00:00
* Make cancelling a join work on the pause menu and console. (You need to write "changeteam spectator" to cancel a PF_WANTSTOJOIN.) * Stop respawning spectators when their PF_WANTSTOJOIN request hasn't been processed yet. * Handle PF_WANTSTOJOIN requests in GS_WAITINGPLAYERS. * Refactor K_CheckSpectateStatus, and make it so PF_WANTSTOJOIN requests are processed if there's only one player in the server, even if they're on lap 2 or up. * Make the player entry mechanism in P_SpawnPlayer use the PF_WANTSTOJOIN mechanism so that it can also take advantage of the level refresh mechanism with no extra code. * NOTE: This does a bad hack in order to not send multiple mapchanges while the joining timer is low! If you can think of a better way to do this, please let me know/commit it. * Change the timer until you can hit ITEM again when a spectator who has to wait to join shorter. * (controversial, but I think necessary) - flash the ITEM text when the above-mentioned timer is nonzero.
2018-07-21 15:45:08 +00:00
// Finally, we can de-spectate everyone!
for (i = 0; i < numjoiners; i++)
P_SpectatorJoinGame(&players[respawnlist[i]]);
Spectator overhaul - New player flag, PF_WANTSTOJOIN, added for setting up a spectator queue. You are allowed to join as long as no one has started lap 2. - Map resets when two people have entered the game, so matches can start naturally without the need of an admin.
2018-07-20 23:11:36 +00:00
}
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
//}
//{ SRB2kart HUD Code
#define NUMPOSNUMS 10
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
#define NUMPOSFRAMES 7 // White, three blues, three reds
Shrink debug command, trailing items spawn directly on players, rainbow win 1 is more faithful, make springs more powerful for shrunk players, correct Grow/Shrink fullbright frame
2018-07-12 05:31:33 +00:00
#define NUMWINFRAMES 6 // Red, yellow, green, cyan, blue, purple
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
//{ Patch Definitions
static patch_t *kp_nodraw;
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
static patch_t *kp_timesticker;
static patch_t *kp_timestickerwide;
static patch_t *kp_lapsticker;
Add a wide lap sticker for the record attack menu, so you're not looking at the same icon twice to mean two different things. https://cdn.discordapp.com/attachments/270211093761097728/508614473628647442/kart0002.png
2018-11-04 12:15:13 +00:00
static patch_t *kp_lapstickerwide;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
static patch_t *kp_lapstickernarrow;
Closer to done HUD tweaking? Splitscreen in Battle is left
2017-12-24 00:14:06 +00:00
static patch_t *kp_splitlapflag;
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
static patch_t *kp_bumpersticker;
static patch_t *kp_bumperstickerwide;
Battle HUD stuff
2017-11-14 01:45:57 +00:00
static patch_t *kp_karmasticker;
Battle hud stuff?!
2017-12-24 01:55:23 +00:00
static patch_t *kp_splitkarmabomb;
Battle HUD stuff
2017-11-14 01:45:57 +00:00
static patch_t *kp_timeoutsticker;
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
No more rescaling gfx for countdown/finish
2018-10-28 03:14:11 +00:00
static patch_t *kp_startcountdown[16];
static patch_t *kp_racefinish[6];
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
static patch_t *kp_positionnum[NUMPOSNUMS][NUMPOSFRAMES];
Yet more comeback stuff! - You can now choose to carry an item to someone instead of bombing - You need to bomb someone or give an item a combined total of three times in order to come back. - Bombing somone gives 2 points while giving items doesn't award you any points. - Position number still flashes after you've won, and it flashes rainbow for people who have won and are in 1st place! - Flashing players can no longer eat items - Fixed kartstarsfx playing the alarm in conjunction with music - Fixed some items no longer causing wipeout
2017-11-13 03:48:32 +00:00
static patch_t *kp_winnernum[NUMPOSFRAMES];
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
static patch_t *kp_facenum[MAXPLAYERS+1];
Ranking face highlights
2018-11-10 05:01:44 +00:00
static patch_t *kp_facehighlight[8];
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
static patch_t *kp_rankbumper;
Ranking face highlights
2018-11-10 05:01:44 +00:00
static patch_t *kp_tinybumper[2];
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
static patch_t *kp_ranknobumpers;
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
Battle HUD stuff
2017-11-14 01:45:57 +00:00
static patch_t *kp_battlewin;
COOL(!/?)
2018-07-18 22:42:34 +00:00
static patch_t *kp_battlecool;
Battle HUD stuff
2017-11-14 01:45:57 +00:00
static patch_t *kp_battlelose;
static patch_t *kp_battlewait;
static patch_t *kp_battleinfo;
WANTED
2018-07-01 08:36:09 +00:00
static patch_t *kp_wanted;
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
Splitscreen items (also fixed Big Ring flags)
2018-06-29 00:54:06 +00:00
static patch_t *kp_itembg[4];
hud stuff eggman nums & rocket sneaker bar
2018-08-12 14:15:55 +00:00
static patch_t *kp_itemtimer[2];
Splitscreen items (also fixed Big Ring flags)
2018-06-29 00:54:06 +00:00
static patch_t *kp_itemmulsticker[2];
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
static patch_t *kp_itemx;
Splitscreen items (also fixed Big Ring flags)
2018-06-29 00:54:06 +00:00
static patch_t *kp_sneaker[2];
static patch_t *kp_rocketsneaker[2];
static patch_t *kp_invincibility[13];
static patch_t *kp_banana[2];
static patch_t *kp_eggman[2];
Orbinaut x4
2018-08-10 02:52:22 +00:00
static patch_t *kp_orbinaut[5];
Splitscreen items (also fixed Big Ring flags)
2018-06-29 00:54:06 +00:00
static patch_t *kp_jawz[2];
static patch_t *kp_mine[2];
static patch_t *kp_ballhog[2];
static patch_t *kp_selfpropelledbomb[2];
static patch_t *kp_grow[2];
static patch_t *kp_shrink[2];
Thunder shield overlay
2018-08-04 19:48:31 +00:00
static patch_t *kp_thundershield[2];
Splitscreen items (also fixed Big Ring flags)
2018-06-29 00:54:06 +00:00
static patch_t *kp_hyudoro[2];
static patch_t *kp_pogospring[2];
static patch_t *kp_kitchensink[2];
static patch_t *kp_sadface[2];
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
New invincibility effect, grow/shrink stuff Whenever grow/shrink effects get made, I'll remove the Mario-style stuttered growth and whatever else needs doing beyond that
2018-02-10 06:19:33 +00:00
static patch_t *kp_check[6];
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
hud stuff eggman nums & rocket sneaker bar
2018-08-12 14:15:55 +00:00
static patch_t *kp_eggnum[4];
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
First person fun
2018-06-26 20:12:42 +00:00
static patch_t *kp_fpview[3];
* Lots of Record Attack love! * Record Attack Input display! * Show Record Attack emblem and emblem time on the HUD! Changes colours with the player, just like vanilla internal's. * Remove the ugly dark blue box on the singleplayer (including pause screen) whose only purpose in Kart was to contain the Record Attack emblem info! * Unrelated shit! * Improve loading Kart HUD graphics. * Fix mirrored HUD graphics being one screen pixel (not basevid pixel) offset.
2018-07-15 22:13:36 +00:00
static patch_t *kp_inputwheel[5];
First person fun
2018-06-26 20:12:42 +00:00
HERE COMES A NEW CHALLENGER
2018-07-22 04:31:02 +00:00
static patch_t *kp_challenger[25];
Lap start animation
2018-08-10 01:52:02 +00:00
static patch_t *kp_lapanim_lap[7];
static patch_t *kp_lapanim_final[11];
static patch_t *kp_lapanim_number[10][3];
Lap emblem gets replaced with a stopwatch in Record Attack
2018-11-09 00:36:05 +00:00
static patch_t *kp_lapanim_emblem[2];
Added judging hands (if'd out)
2018-11-01 03:10:38 +00:00
static patch_t *kp_lapanim_hand[3];
Lap start animation
2018-08-10 01:52:02 +00:00
YOU GOT EM Flashes on screen whenever you get more than 1 karma point at a time, getting you back into the game.
2018-11-01 03:34:13 +00:00
static patch_t *kp_yougotem;
Lap start animation
2018-08-10 01:52:02 +00:00
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
void K_LoadKartHUDGraphics(void)
{
INT32 i, j;
char buffer[9];
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
// Null Stuff
kp_nodraw = W_CachePatchName("K_TRNULL", PU_HUDGFX);
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
// Stickers
kp_timesticker = W_CachePatchName("K_STTIME", PU_HUDGFX);
kp_timestickerwide = W_CachePatchName("K_STTIMW", PU_HUDGFX);
kp_lapsticker = W_CachePatchName("K_STLAPS", PU_HUDGFX);
Add a wide lap sticker for the record attack menu, so you're not looking at the same icon twice to mean two different things. https://cdn.discordapp.com/attachments/270211093761097728/508614473628647442/kart0002.png
2018-11-04 12:15:13 +00:00
kp_lapstickerwide = W_CachePatchName("K_STLAPW", PU_HUDGFX);
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
kp_lapstickernarrow = W_CachePatchName("K_STLAPN", PU_HUDGFX);
Closer to done HUD tweaking? Splitscreen in Battle is left
2017-12-24 00:14:06 +00:00
kp_splitlapflag = W_CachePatchName("K_SPTLAP", PU_HUDGFX);
RACE FINISH ANIMATION GRAPHIC! Scrolls across the screen, magestically. Like an eagle. Piloting a blimp.
2018-07-18 22:20:08 +00:00
kp_bumpersticker = W_CachePatchName("K_STBALN", PU_HUDGFX);
kp_bumperstickerwide = W_CachePatchName("K_STBALW", PU_HUDGFX);
Battle HUD stuff
2017-11-14 01:45:57 +00:00
kp_karmasticker = W_CachePatchName("K_STKARM", PU_HUDGFX);
Battle hud stuff?!
2017-12-24 01:55:23 +00:00
kp_splitkarmabomb = W_CachePatchName("K_SPTKRM", PU_HUDGFX);
Battle HUD stuff
2017-11-14 01:45:57 +00:00
kp_timeoutsticker = W_CachePatchName("K_STTOUT", PU_HUDGFX);
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
Lakitu murder & countdown improvements (I'm not SevenethSentienel! I just don't feel like logging out!)
2018-06-25 02:15:22 +00:00
// Starting countdown
kp_startcountdown[0] = W_CachePatchName("K_CNT3A", PU_HUDGFX);
kp_startcountdown[1] = W_CachePatchName("K_CNT2A", PU_HUDGFX);
kp_startcountdown[2] = W_CachePatchName("K_CNT1A", PU_HUDGFX);
kp_startcountdown[3] = W_CachePatchName("K_CNTGOA", PU_HUDGFX);
kp_startcountdown[4] = W_CachePatchName("K_CNT3B", PU_HUDGFX);
kp_startcountdown[5] = W_CachePatchName("K_CNT2B", PU_HUDGFX);
kp_startcountdown[6] = W_CachePatchName("K_CNT1B", PU_HUDGFX);
kp_startcountdown[7] = W_CachePatchName("K_CNTGOB", PU_HUDGFX);
No more rescaling gfx for countdown/finish
2018-10-28 03:14:11 +00:00
// Splitscreen
kp_startcountdown[8] = W_CachePatchName("K_SMC3A", PU_HUDGFX);
kp_startcountdown[9] = W_CachePatchName("K_SMC2A", PU_HUDGFX);
kp_startcountdown[10] = W_CachePatchName("K_SMC1A", PU_HUDGFX);
kp_startcountdown[11] = W_CachePatchName("K_SMCGOA", PU_HUDGFX);
kp_startcountdown[12] = W_CachePatchName("K_SMC3B", PU_HUDGFX);
kp_startcountdown[13] = W_CachePatchName("K_SMC2B", PU_HUDGFX);
kp_startcountdown[14] = W_CachePatchName("K_SMC1B", PU_HUDGFX);
kp_startcountdown[15] = W_CachePatchName("K_SMCGOB", PU_HUDGFX);
// Finish
RACE FINISH ANIMATION GRAPHIC! Scrolls across the screen, magestically. Like an eagle. Piloting a blimp.
2018-07-18 22:20:08 +00:00
kp_racefinish[0] = W_CachePatchName("K_FINA", PU_HUDGFX);
kp_racefinish[1] = W_CachePatchName("K_FINB", PU_HUDGFX);
No more rescaling gfx for countdown/finish
2018-10-28 03:14:11 +00:00
// Splitscreen
kp_racefinish[2] = W_CachePatchName("K_SMFINA", PU_HUDGFX);
kp_racefinish[3] = W_CachePatchName("K_SMFINB", PU_HUDGFX);
// 2P splitscreen
kp_racefinish[4] = W_CachePatchName("K_2PFINA", PU_HUDGFX);
kp_racefinish[5] = W_CachePatchName("K_2PFINB", PU_HUDGFX);
RACE FINISH ANIMATION GRAPHIC! Scrolls across the screen, magestically. Like an eagle. Piloting a blimp.
2018-07-18 22:20:08 +00:00
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
// Position numbers
Silly fixes to absurd compiler warnings Thanks toaster
2018-07-07 22:49:34 +00:00
sprintf(buffer, "K_POSNxx");
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
for (i = 0; i < NUMPOSNUMS; i++)
{
Silly fixes to absurd compiler warnings Thanks toaster
2018-07-07 22:49:34 +00:00
buffer[6] = '0'+i;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
for (j = 0; j < NUMPOSFRAMES; j++)
{
Silly fixes to absurd compiler warnings Thanks toaster
2018-07-07 22:49:34 +00:00
//sprintf(buffer, "K_POSN%d%d", i, j);
buffer[7] = '0'+j;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
kp_positionnum[i][j] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
}
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
}
Yet more comeback stuff! - You can now choose to carry an item to someone instead of bombing - You need to bomb someone or give an item a combined total of three times in order to come back. - Bombing somone gives 2 points while giving items doesn't award you any points. - Position number still flashes after you've won, and it flashes rainbow for people who have won and are in 1st place! - Flashing players can no longer eat items - Fixed kartstarsfx playing the alarm in conjunction with music - Fixed some items no longer causing wipeout
2017-11-13 03:48:32 +00:00
* Lots of Record Attack love! * Record Attack Input display! * Show Record Attack emblem and emblem time on the HUD! Changes colours with the player, just like vanilla internal's. * Remove the ugly dark blue box on the singleplayer (including pause screen) whose only purpose in Kart was to contain the Record Attack emblem info! * Unrelated shit! * Improve loading Kart HUD graphics. * Fix mirrored HUD graphics being one screen pixel (not basevid pixel) offset.
2018-07-15 22:13:36 +00:00
sprintf(buffer, "K_POSNWx");
Shrink debug command, trailing items spawn directly on players, rainbow win 1 is more faithful, make springs more powerful for shrunk players, correct Grow/Shrink fullbright frame
2018-07-12 05:31:33 +00:00
for (i = 0; i < NUMWINFRAMES; i++)
Yet more comeback stuff! - You can now choose to carry an item to someone instead of bombing - You need to bomb someone or give an item a combined total of three times in order to come back. - Bombing somone gives 2 points while giving items doesn't award you any points. - Position number still flashes after you've won, and it flashes rainbow for people who have won and are in 1st place! - Flashing players can no longer eat items - Fixed kartstarsfx playing the alarm in conjunction with music - Fixed some items no longer causing wipeout
2017-11-13 03:48:32 +00:00
{
* Lots of Record Attack love! * Record Attack Input display! * Show Record Attack emblem and emblem time on the HUD! Changes colours with the player, just like vanilla internal's. * Remove the ugly dark blue box on the singleplayer (including pause screen) whose only purpose in Kart was to contain the Record Attack emblem info! * Unrelated shit! * Improve loading Kart HUD graphics. * Fix mirrored HUD graphics being one screen pixel (not basevid pixel) offset.
2018-07-15 22:13:36 +00:00
buffer[7] = '0'+i;
Yet more comeback stuff! - You can now choose to carry an item to someone instead of bombing - You need to bomb someone or give an item a combined total of three times in order to come back. - Bombing somone gives 2 points while giving items doesn't award you any points. - Position number still flashes after you've won, and it flashes rainbow for people who have won and are in 1st place! - Flashing players can no longer eat items - Fixed kartstarsfx playing the alarm in conjunction with music - Fixed some items no longer causing wipeout
2017-11-13 03:48:32 +00:00
kp_winnernum[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
}
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
sprintf(buffer, "OPPRNKxx");
for (i = 0; i <= MAXPLAYERS; i++)
{
buffer[6] = '0'+(i/10);
buffer[7] = '0'+(i%10);
kp_facenum[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
}
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
Ranking face highlights
2018-11-10 05:01:44 +00:00
sprintf(buffer, "K_CHILIx");
for (i = 0; i < 8; i++)
{
buffer[7] = '0'+(i+1);
kp_facehighlight[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
}
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
// Extra ranking icons
*A biggie: two-tier intermission screen! * Have the entire thing slide the fuck away a short while into the intermission. * The tab screen is modified to work off similar behaviour and presentation. * To go with it, a revamp of how Battle's scoring is handled. * It's now considered "hits", and is stored in a reuse in one of the vanilla NiGHTS variables, allowing it to use exactly the same ranking mechanisms as race. * No more resetting of score between battle rounds. * Minor, unrelated general code cleanup in places. * Disable the YEEEAH in splitscreen, otherwise you'll hear it *all the time*.
2018-07-18 19:23:46 +00:00
kp_rankbumper = W_CachePatchName("K_BLNICO", PU_HUDGFX);
Ranking face highlights
2018-11-10 05:01:44 +00:00
kp_tinybumper[0] = W_CachePatchName("K_BLNA", PU_HUDGFX);
kp_tinybumper[1] = W_CachePatchName("K_BLNB", PU_HUDGFX);
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
kp_ranknobumpers = W_CachePatchName("K_NOBLNS", PU_HUDGFX);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
Battle HUD stuff
2017-11-14 01:45:57 +00:00
// Battle graphics
kp_battlewin = W_CachePatchName("K_BWIN", PU_HUDGFX);
COOL(!/?)
2018-07-18 22:42:34 +00:00
kp_battlecool = W_CachePatchName("K_BCOOL", PU_HUDGFX);
Battle HUD stuff
2017-11-14 01:45:57 +00:00
kp_battlelose = W_CachePatchName("K_BLOSE", PU_HUDGFX);
kp_battlewait = W_CachePatchName("K_BWAIT", PU_HUDGFX);
kp_battleinfo = W_CachePatchName("K_BINFO", PU_HUDGFX);
WANTED
2018-07-01 08:36:09 +00:00
kp_wanted = W_CachePatchName("K_WANTED", PU_HUDGFX);
Battle HUD stuff
2017-11-14 01:45:57 +00:00
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
// Kart Item Windows
Splitscreen items (also fixed Big Ring flags)
2018-06-29 00:54:06 +00:00
kp_itembg[0] = W_CachePatchName("K_ITBG", PU_HUDGFX);
kp_itembg[1] = W_CachePatchName("K_ITBGD", PU_HUDGFX);
hud stuff eggman nums & rocket sneaker bar
2018-08-12 14:15:55 +00:00
kp_itemtimer[0] = W_CachePatchName("K_ITIMER", PU_HUDGFX);
Splitscreen items (also fixed Big Ring flags)
2018-06-29 00:54:06 +00:00
kp_itemmulsticker[0] = W_CachePatchName("K_ITMUL", PU_HUDGFX);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
kp_itemx = W_CachePatchName("K_ITX", PU_HUDGFX);
Splitscreen items (also fixed Big Ring flags)
2018-06-29 00:54:06 +00:00
kp_sneaker[0] = W_CachePatchName("K_ITSHOE", PU_HUDGFX);
kp_rocketsneaker[0] = W_CachePatchName("K_ITRSHE", PU_HUDGFX);
* Lots of Record Attack love! * Record Attack Input display! * Show Record Attack emblem and emblem time on the HUD! Changes colours with the player, just like vanilla internal's. * Remove the ugly dark blue box on the singleplayer (including pause screen) whose only purpose in Kart was to contain the Record Attack emblem info! * Unrelated shit! * Improve loading Kart HUD graphics. * Fix mirrored HUD graphics being one screen pixel (not basevid pixel) offset.
2018-07-15 22:13:36 +00:00
sprintf(buffer, "K_ITINVx");
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
for (i = 0; i < 7; i++)
{
* Lots of Record Attack love! * Record Attack Input display! * Show Record Attack emblem and emblem time on the HUD! Changes colours with the player, just like vanilla internal's. * Remove the ugly dark blue box on the singleplayer (including pause screen) whose only purpose in Kart was to contain the Record Attack emblem info! * Unrelated shit! * Improve loading Kart HUD graphics. * Fix mirrored HUD graphics being one screen pixel (not basevid pixel) offset.
2018-07-15 22:13:36 +00:00
buffer[7] = '1'+i;
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
kp_invincibility[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
}
Splitscreen items (also fixed Big Ring flags)
2018-06-29 00:54:06 +00:00
kp_banana[0] = W_CachePatchName("K_ITBANA", PU_HUDGFX);
kp_eggman[0] = W_CachePatchName("K_ITEGGM", PU_HUDGFX);
Orbinaut x4
2018-08-10 02:52:22 +00:00
sprintf(buffer, "K_ITORBx");
for (i = 0; i < 4; i++)
{
buffer[7] = '1'+i;
kp_orbinaut[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
}
Splitscreen items (also fixed Big Ring flags)
2018-06-29 00:54:06 +00:00
kp_jawz[0] = W_CachePatchName("K_ITJAWZ", PU_HUDGFX);
kp_mine[0] = W_CachePatchName("K_ITMINE", PU_HUDGFX);
kp_ballhog[0] = W_CachePatchName("K_ITBHOG", PU_HUDGFX);
kp_selfpropelledbomb[0] = W_CachePatchName("K_ITSPB", PU_HUDGFX);
kp_grow[0] = W_CachePatchName("K_ITGROW", PU_HUDGFX);
kp_shrink[0] = W_CachePatchName("K_ITSHRK", PU_HUDGFX);
Thunder shield overlay
2018-08-04 19:48:31 +00:00
kp_thundershield[0] = W_CachePatchName("K_ITTHNS", PU_HUDGFX);
Splitscreen items (also fixed Big Ring flags)
2018-06-29 00:54:06 +00:00
kp_hyudoro[0] = W_CachePatchName("K_ITHYUD", PU_HUDGFX);
kp_pogospring[0] = W_CachePatchName("K_ITPOGO", PU_HUDGFX);
kp_kitchensink[0] = W_CachePatchName("K_ITSINK", PU_HUDGFX);
kp_sadface[0] = W_CachePatchName("K_ITSAD", PU_HUDGFX);
// Splitscreen
kp_itembg[2] = W_CachePatchName("K_ISBG", PU_HUDGFX);
kp_itembg[3] = W_CachePatchName("K_ISBGD", PU_HUDGFX);
hud stuff eggman nums & rocket sneaker bar
2018-08-12 14:15:55 +00:00
kp_itemtimer[1] = W_CachePatchName("K_ISIMER", PU_HUDGFX);
Splitscreen items (also fixed Big Ring flags)
2018-06-29 00:54:06 +00:00
kp_itemmulsticker[1] = W_CachePatchName("K_ISMUL", PU_HUDGFX);
kp_sneaker[1] = W_CachePatchName("K_ISSHOE", PU_HUDGFX);
kp_rocketsneaker[1] = W_CachePatchName("K_ISRSHE", PU_HUDGFX);
* Lots of Record Attack love! * Record Attack Input display! * Show Record Attack emblem and emblem time on the HUD! Changes colours with the player, just like vanilla internal's. * Remove the ugly dark blue box on the singleplayer (including pause screen) whose only purpose in Kart was to contain the Record Attack emblem info! * Unrelated shit! * Improve loading Kart HUD graphics. * Fix mirrored HUD graphics being one screen pixel (not basevid pixel) offset.
2018-07-15 22:13:36 +00:00
sprintf(buffer, "K_ISINVx");
Splitscreen items (also fixed Big Ring flags)
2018-06-29 00:54:06 +00:00
for (i = 0; i < 6; i++)
{
* Lots of Record Attack love! * Record Attack Input display! * Show Record Attack emblem and emblem time on the HUD! Changes colours with the player, just like vanilla internal's. * Remove the ugly dark blue box on the singleplayer (including pause screen) whose only purpose in Kart was to contain the Record Attack emblem info! * Unrelated shit! * Improve loading Kart HUD graphics. * Fix mirrored HUD graphics being one screen pixel (not basevid pixel) offset.
2018-07-15 22:13:36 +00:00
buffer[7] = '1'+i;
Splitscreen items (also fixed Big Ring flags)
2018-06-29 00:54:06 +00:00
kp_invincibility[i+7] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
}
kp_banana[1] = W_CachePatchName("K_ISBANA", PU_HUDGFX);
kp_eggman[1] = W_CachePatchName("K_ISEGGM", PU_HUDGFX);
Orbinaut x4
2018-08-10 02:52:22 +00:00
kp_orbinaut[4] = W_CachePatchName("K_ISORBN", PU_HUDGFX);
Splitscreen items (also fixed Big Ring flags)
2018-06-29 00:54:06 +00:00
kp_jawz[1] = W_CachePatchName("K_ISJAWZ", PU_HUDGFX);
kp_mine[1] = W_CachePatchName("K_ISMINE", PU_HUDGFX);
kp_ballhog[1] = W_CachePatchName("K_ISBHOG", PU_HUDGFX);
kp_selfpropelledbomb[1] = W_CachePatchName("K_ISSPB", PU_HUDGFX);
kp_grow[1] = W_CachePatchName("K_ISGROW", PU_HUDGFX);
kp_shrink[1] = W_CachePatchName("K_ISSHRK", PU_HUDGFX);
Thunder shield overlay
2018-08-04 19:48:31 +00:00
kp_thundershield[1] = W_CachePatchName("K_ISTHNS", PU_HUDGFX);
Splitscreen items (also fixed Big Ring flags)
2018-06-29 00:54:06 +00:00
kp_hyudoro[1] = W_CachePatchName("K_ISHYUD", PU_HUDGFX);
kp_pogospring[1] = W_CachePatchName("K_ISPOGO", PU_HUDGFX);
kp_kitchensink[1] = W_CachePatchName("K_ISSINK", PU_HUDGFX);
kp_sadface[1] = W_CachePatchName("K_ISSAD", PU_HUDGFX);
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
CHECK indicator Turn it off with the kartcheck console var
2017-11-02 04:35:10 +00:00
// CHECK indicators
* Lots of Record Attack love! * Record Attack Input display! * Show Record Attack emblem and emblem time on the HUD! Changes colours with the player, just like vanilla internal's. * Remove the ugly dark blue box on the singleplayer (including pause screen) whose only purpose in Kart was to contain the Record Attack emblem info! * Unrelated shit! * Improve loading Kart HUD graphics. * Fix mirrored HUD graphics being one screen pixel (not basevid pixel) offset.
2018-07-15 22:13:36 +00:00
sprintf(buffer, "K_CHECKx");
New invincibility effect, grow/shrink stuff Whenever grow/shrink effects get made, I'll remove the Mario-style stuttered growth and whatever else needs doing beyond that
2018-02-10 06:19:33 +00:00
for (i = 0; i < 6; i++)
{
* Lots of Record Attack love! * Record Attack Input display! * Show Record Attack emblem and emblem time on the HUD! Changes colours with the player, just like vanilla internal's. * Remove the ugly dark blue box on the singleplayer (including pause screen) whose only purpose in Kart was to contain the Record Attack emblem info! * Unrelated shit! * Improve loading Kart HUD graphics. * Fix mirrored HUD graphics being one screen pixel (not basevid pixel) offset.
2018-07-15 22:13:36 +00:00
buffer[7] = '1'+i;
New invincibility effect, grow/shrink stuff Whenever grow/shrink effects get made, I'll remove the Mario-style stuttered growth and whatever else needs doing beyond that
2018-02-10 06:19:33 +00:00
kp_check[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
}
The Lightning Update - 30 sec cooldown on all lightning types - Delay before Blue Lightning hits, based off of distance - Blue Lightning can swap targets if 1st place is passed - Blue Lightning can only be handed out if 2nd is far away enough from first
2018-06-06 01:36:48 +00:00
hud stuff eggman nums & rocket sneaker bar
2018-08-12 14:15:55 +00:00
// Eggman warning numbers
sprintf(buffer, "K_EGGNx");
for (i = 0; i < 4; i++)
{
buffer[6] = '0'+i;
kp_eggnum[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
}
First person fun
2018-06-26 20:12:42 +00:00
// First person mode
kp_fpview[0] = W_CachePatchName("VIEWA0", PU_HUDGFX);
kp_fpview[1] = W_CachePatchName("VIEWB0D0", PU_HUDGFX);
kp_fpview[2] = W_CachePatchName("VIEWC0E0", PU_HUDGFX);
* Lots of Record Attack love! * Record Attack Input display! * Show Record Attack emblem and emblem time on the HUD! Changes colours with the player, just like vanilla internal's. * Remove the ugly dark blue box on the singleplayer (including pause screen) whose only purpose in Kart was to contain the Record Attack emblem info! * Unrelated shit! * Improve loading Kart HUD graphics. * Fix mirrored HUD graphics being one screen pixel (not basevid pixel) offset.
2018-07-15 22:13:36 +00:00
// Input UI Wheel
sprintf(buffer, "K_WHEELx");
for (i = 0; i < 5; i++)
{
buffer[7] = '0'+i;
kp_inputwheel[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
}
HERE COMES A NEW CHALLENGER
2018-07-22 04:31:02 +00:00
// HERE COMES A NEW CHALLENGER
sprintf(buffer, "K_CHALxx");
for (i = 0; i < 25; i++)
{
buffer[6] = '0'+((i+1)/10);
buffer[7] = '0'+((i+1)%10);
kp_challenger[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
}
Lap start animation
2018-08-10 01:52:02 +00:00
// Lap start animation
sprintf(buffer, "K_LAP0x");
for (i = 0; i < 7; i++)
{
buffer[6] = '0'+(i+1);
kp_lapanim_lap[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
}
sprintf(buffer, "K_LAPFxx");
for (i = 0; i < 11; i++)
{
buffer[6] = '0'+((i+1)/10);
buffer[7] = '0'+((i+1)%10);
kp_lapanim_final[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
}
sprintf(buffer, "K_LAPNxx");
for (i = 0; i < 10; i++)
{
buffer[6] = '0'+i;
for (j = 0; j < 3; j++)
{
buffer[7] = '0'+(j+1);
kp_lapanim_number[i][j] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
}
}
Lap emblem gets replaced with a stopwatch in Record Attack
2018-11-09 00:36:05 +00:00
sprintf(buffer, "K_LAPE0x");
for (i = 0; i < 2; i++)
{
buffer[7] = '0'+(i+1);
kp_lapanim_emblem[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
}
Added judging hands (if'd out)
2018-11-01 03:10:38 +00:00
sprintf(buffer, "K_LAPH0x");
for (i = 0; i < 3; i++)
{
buffer[7] = '0'+(i+1);
kp_lapanim_hand[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
}
Merge branch 'master' into battle-visuals
2018-11-01 21:35:01 +00:00
YOU GOT EM Flashes on screen whenever you get more than 1 karma point at a time, getting you back into the game.
2018-11-01 03:34:13 +00:00
kp_yougotem = (patch_t *) W_CachePatchName("YOUGOTEM", PU_HUDGFX);
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
}
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
// For the item toggle menu
smoll to tiny
2018-09-23 22:07:38 +00:00
const char *K_GetItemPatch(UINT8 item, boolean tiny)
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
{
switch (item)
{
case KITEM_SNEAKER:
case KRITEM_TRIPLESNEAKER:
smoll to tiny
2018-09-23 22:07:38 +00:00
return (tiny ? "K_ISSHOE" : "K_ITSHOE");
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
case KITEM_ROCKETSNEAKER:
smoll to tiny
2018-09-23 22:07:38 +00:00
return (tiny ? "K_ISRSHE" : "K_ITRSHE");
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
case KITEM_INVINCIBILITY:
smoll to tiny
2018-09-23 22:07:38 +00:00
return (tiny ? "K_ISINV1" : "K_ITINV1");
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
case KITEM_BANANA:
case KRITEM_TRIPLEBANANA:
case KRITEM_TENFOLDBANANA:
smoll to tiny
2018-09-23 22:07:38 +00:00
return (tiny ? "K_ISBANA" : "K_ITBANA");
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
case KITEM_EGGMAN:
smoll to tiny
2018-09-23 22:07:38 +00:00
return (tiny ? "K_ISEGGM" : "K_ITEGGM");
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
case KITEM_ORBINAUT:
smoll to tiny
2018-09-23 22:07:38 +00:00
return (tiny ? "K_ISORBN" : "K_ITORB1");
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
case KITEM_JAWZ:
case KRITEM_DUALJAWZ:
smoll to tiny
2018-09-23 22:07:38 +00:00
return (tiny ? "K_ISJAWZ" : "K_ITJAWZ");
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
case KITEM_MINE:
smoll to tiny
2018-09-23 22:07:38 +00:00
return (tiny ? "K_ISMINE" : "K_ITMINE");
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
case KITEM_BALLHOG:
smoll to tiny
2018-09-23 22:07:38 +00:00
return (tiny ? "K_ISBHOG" : "K_ITBHOG");
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
case KITEM_SPB:
smoll to tiny
2018-09-23 22:07:38 +00:00
return (tiny ? "K_ISSPB" : "K_ITSPB");
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
case KITEM_GROW:
smoll to tiny
2018-09-23 22:07:38 +00:00
return (tiny ? "K_ISGROW" : "K_ITGROW");
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
case KITEM_SHRINK:
smoll to tiny
2018-09-23 22:07:38 +00:00
return (tiny ? "K_ISSHRK" : "K_ITSHRK");
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
case KITEM_THUNDERSHIELD:
smoll to tiny
2018-09-23 22:07:38 +00:00
return (tiny ? "K_ISTHNS" : "K_ITTHNS");
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
case KITEM_HYUDORO:
smoll to tiny
2018-09-23 22:07:38 +00:00
return (tiny ? "K_ISHYUD" : "K_ITHYUD");
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
case KITEM_POGOSPRING:
smoll to tiny
2018-09-23 22:07:38 +00:00
return (tiny ? "K_ISPOGO" : "K_ITPOGO");
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
case KITEM_KITCHENSINK:
smoll to tiny
2018-09-23 22:07:38 +00:00
return (tiny ? "K_ISSINK" : "K_ITSINK");
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
case KRITEM_TRIPLEORBINAUT:
smoll to tiny
2018-09-23 22:07:38 +00:00
return (tiny ? "K_ISORBN" : "K_ITORB3");
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
case KRITEM_QUADORBINAUT:
smoll to tiny
2018-09-23 22:07:38 +00:00
return (tiny ? "K_ISORBN" : "K_ITORB4");
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
default:
smoll to tiny
2018-09-23 22:07:38 +00:00
return (tiny ? "K_ISSAD" : "K_ITSAD");
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 17:18:19 +00:00
}
}
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
//}
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
INT32 ITEM_X, ITEM_Y; // Item Window
INT32 TIME_X, TIME_Y; // Time Sticker
INT32 LAPS_X, LAPS_Y; // Lap Sticker
Unfinished V_HORZSCREEN revamp
2017-12-22 15:16:41 +00:00
INT32 SPDM_X, SPDM_Y; // Speedometer
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
INT32 POSI_X, POSI_Y; // Position Number
INT32 FACE_X, FACE_Y; // Top-four Faces
Lakitu murder & countdown improvements (I'm not SevenethSentienel! I just don't feel like logging out!)
2018-06-25 02:15:22 +00:00
INT32 STCD_X, STCD_Y; // Starting countdown
HUD shenanigans In battle because it messes with CHECK, and also I'm too lazy to switch branches
2017-11-06 22:31:52 +00:00
INT32 CHEK_Y; // CHECK graphic
More post processor support, HUD tweaks, SP new game fix Mirror Mode minimap, growing position nums, and general reorganization. Some stuff needs more work but I'm exhausted rn
2017-12-19 06:55:33 +00:00
INT32 MINI_X, MINI_Y; // Minimap
WANTED
2018-07-01 08:36:09 +00:00
INT32 WANT_X, WANT_Y; // Battle WANTED poster
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
static void K_initKartHUD(void)
{
/*
BASEVIDWIDTH = 320
BASEVIDHEIGHT = 200
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
Item window graphic is 41 x 33
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
Time Sticker graphic is 116 x 11
Time Font is a solid block of (8 x [12) x 14], equal to 96 x 14
Therefore, timestamp is 116 x 14 altogether
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
Lap Sticker is 80 x 11
Lap flag is 22 x 20
Lap Font is a solid block of (3 x [12) x 14], equal to 36 x 14
Therefore, lapstamp is 80 x 20 altogether
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
Position numbers are 43 x 53
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
Faces are 32 x 32
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
Faces draw downscaled at 16 x 16
Therefore, the allocated space for them is 16 x 67 altogether
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
----
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
ORIGINAL CZ64 SPLITSCREEN:
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
Item window:
if (!splitscreen) { ICONX = 139; ICONY = 20; }
else { ICONX = BASEVIDWIDTH-315; ICONY = 60; }
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
Time: 236, STRINGY( 12)
Lap: BASEVIDWIDTH-304, STRINGY(BASEVIDHEIGHT-189)
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
*/
HUD
2017-12-18 01:42:17 +00:00
// Single Screen (defaults)
// Item Window
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
ITEM_X = 5; // 5
ITEM_Y = 5; // 5
HUD
2017-12-18 01:42:17 +00:00
// Level Timer
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
TIME_X = BASEVIDWIDTH - 148; // 172
TIME_Y = 9; // 9
HUD
2017-12-18 01:42:17 +00:00
// Level Laps
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
LAPS_X = 9; // 9
LAPS_Y = BASEVIDHEIGHT - 29; // 171
HUD
2017-12-18 01:42:17 +00:00
// Speedometer
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
SPDM_X = 9; // 9
SPDM_Y = BASEVIDHEIGHT - 45; // 155
HUD
2017-12-18 01:42:17 +00:00
// Position Number
Belp - Minimap heads that aren't yours are transparent - Minimap has a visibility slider - Bomb stuff renamed to Mine
2018-02-08 03:33:27 +00:00
POSI_X = BASEVIDWIDTH - 9; // 268
POSI_Y = BASEVIDHEIGHT - 9; // 138
HUD
2017-12-18 01:42:17 +00:00
// Top-Four Faces
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
FACE_X = 9; // 9
FACE_Y = 92; // 92
Lakitu murder & countdown improvements (I'm not SevenethSentienel! I just don't feel like logging out!)
2018-06-25 02:15:22 +00:00
// Starting countdown
STCD_X = BASEVIDWIDTH/2; // 9
STCD_Y = BASEVIDHEIGHT/2; // 92
HUD
2017-12-18 01:42:17 +00:00
// CHECK graphic
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
CHEK_Y = BASEVIDHEIGHT; // 200
More post processor support, HUD tweaks, SP new game fix Mirror Mode minimap, growing position nums, and general reorganization. Some stuff needs more work but I'm exhausted rn
2017-12-19 06:55:33 +00:00
// Minimap
Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems # Conflicts: # src/dehacked.c # src/hardware/hw_main.c # src/info.c # src/info.h # src/k_kart.c # src/p_enemy.c # src/p_user.c # src/r_things.c
2018-02-06 00:08:49 +00:00
MINI_X = BASEVIDWIDTH - 50; // 270
Belp - Minimap heads that aren't yours are transparent - Minimap has a visibility slider - Bomb stuff renamed to Mine
2018-02-08 03:33:27 +00:00
MINI_Y = (BASEVIDHEIGHT/2)-16; // 84
WANTED
2018-07-01 08:36:09 +00:00
// Battle WANTED poster
WANTED 2
2018-07-01 18:11:48 +00:00
WANT_X = BASEVIDWIDTH - 55; // 270
WANT_Y = BASEVIDHEIGHT- 71; // 176
HUD
2017-12-18 01:42:17 +00:00
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
if (splitscreen) // Splitscreen
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
{
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
ITEM_X = 5;
Splitscreen items (also fixed Big Ring flags)
2018-06-29 00:54:06 +00:00
ITEM_Y = 3;
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
HUD
2017-12-18 01:42:17 +00:00
LAPS_Y = (BASEVIDHEIGHT/2)-24;
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
More post processor support, HUD tweaks, SP new game fix Mirror Mode minimap, growing position nums, and general reorganization. Some stuff needs more work but I'm exhausted rn
2017-12-19 06:55:33 +00:00
POSI_Y = (BASEVIDHEIGHT/2)- 2;
Lakitu murder & countdown improvements (I'm not SevenethSentienel! I just don't feel like logging out!)
2018-06-25 02:15:22 +00:00
STCD_Y = BASEVIDHEIGHT/4;
More post processor support, HUD tweaks, SP new game fix Mirror Mode minimap, growing position nums, and general reorganization. Some stuff needs more work but I'm exhausted rn
2017-12-19 06:55:33 +00:00
MINI_Y = (BASEVIDHEIGHT/2);
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
WANTED
2018-07-01 08:36:09 +00:00
WANT_X = BASEVIDWIDTH-8;
WANT_Y = (BASEVIDHEIGHT/2)-12;
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
if (splitscreen > 1) // 3P/4P Small Splitscreen
HUD
2017-12-18 01:42:17 +00:00
{
Splitscreen items (also fixed Big Ring flags)
2018-06-29 00:54:06 +00:00
ITEM_X = -9;
ITEM_Y = -8;
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
Closer to done HUD tweaking? Splitscreen in Battle is left
2017-12-24 00:14:06 +00:00
LAPS_X = 3;
LAPS_Y = (BASEVIDHEIGHT/2)-13;
HUD shenanigans In battle because it messes with CHECK, and also I'm too lazy to switch branches
2017-11-06 22:31:52 +00:00
Closer to done HUD tweaking? Splitscreen in Battle is left
2017-12-24 00:14:06 +00:00
POSI_X = (BASEVIDWIDTH/2)-3;
More post processor support, HUD tweaks, SP new game fix Mirror Mode minimap, growing position nums, and general reorganization. Some stuff needs more work but I'm exhausted rn
2017-12-19 06:55:33 +00:00
Lakitu murder & countdown improvements (I'm not SevenethSentienel! I just don't feel like logging out!)
2018-06-25 02:15:22 +00:00
STCD_X = BASEVIDWIDTH/4;
More post processor support, HUD tweaks, SP new game fix Mirror Mode minimap, growing position nums, and general reorganization. Some stuff needs more work but I'm exhausted rn
2017-12-19 06:55:33 +00:00
MINI_X = (3*BASEVIDWIDTH/4);
MINI_Y = (3*BASEVIDHEIGHT/4);
WANTED
2018-07-01 08:36:09 +00:00
WANT_X = (BASEVIDWIDTH/2)-8;
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
if (splitscreen > 2) // 4P-only
More post processor support, HUD tweaks, SP new game fix Mirror Mode minimap, growing position nums, and general reorganization. Some stuff needs more work but I'm exhausted rn
2017-12-19 06:55:33 +00:00
{
MINI_X = (BASEVIDWIDTH/2);
MINI_Y = (BASEVIDHEIGHT/2);
}
HUD
2017-12-18 01:42:17 +00:00
}
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
}
* Modified, maybe-improved title. May need to be selectively reverted, but... * To go with this, have the HUD fade in as the title goes away. * After complaints, only do dogear gametype indicators on the voting screen for levels which don't match the prevailing gametype, and use thin font to intrude on the level pic less. * Make the voting screen background a different graphic in battle. * Improve behaviour of DrawDiag in GL.
2018-06-28 18:07:04 +00:00
if (timeinmap > 113)
hudtrans = cv_translucenthud.value;
else if (timeinmap > 105)
hudtrans = ((((INT32)timeinmap) - 105)*cv_translucenthud.value)/(113-105);
else
hudtrans = 0;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
}
Last few finishing touches for the HUD Battle Mode cards & Race countdown timers display properly
2017-12-25 15:05:36 +00:00
INT32 K_calcSplitFlags(INT32 snapflags)
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
{
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
INT32 splitflags = 0;
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
Okay lets ACTUALLY fix it now :V
2017-12-24 14:19:59 +00:00
if (splitscreen == 0)
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
return snapflags;
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
Merge remote-tracking branch 'refs/remotes/origin/battle' into quads # Conflicts: # src/g_game.c # src/k_kart.c
2017-12-18 06:02:53 +00:00
if (stplyr != &players[displayplayer])
HUD
2017-12-18 01:42:17 +00:00
{
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
if (splitscreen == 1 && stplyr == &players[secondarydisplayplayer])
Okay lets ACTUALLY fix it now :V
2017-12-24 14:19:59 +00:00
{
HUD
2017-12-18 01:42:17 +00:00
splitflags |= V_SPLITSCREEN;
Okay lets ACTUALLY fix it now :V
2017-12-24 14:19:59 +00:00
}
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
else if (splitscreen > 1)
Merge remote-tracking branch 'refs/remotes/origin/battle' into quads # Conflicts: # src/g_game.c # src/k_kart.c
2017-12-18 06:02:53 +00:00
{
if (stplyr == &players[thirddisplayplayer] || stplyr == &players[fourthdisplayplayer])
splitflags |= V_SPLITSCREEN;
if (stplyr == &players[secondarydisplayplayer] || stplyr == &players[fourthdisplayplayer])
splitflags |= V_HORZSCREEN;
}
HUD
2017-12-18 01:42:17 +00:00
}
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
if (splitflags & V_SPLITSCREEN)
snapflags &= ~V_SNAPTOTOP;
else
snapflags &= ~V_SNAPTOBOTTOM;
Okay lets ACTUALLY fix it now :V
2017-12-24 14:19:59 +00:00
if (splitscreen > 1)
{
if (splitflags & V_HORZSCREEN)
snapflags &= ~V_SNAPTOLEFT;
else
snapflags &= ~V_SNAPTORIGHT;
}
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
return (splitflags|snapflags);
}
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
static void K_drawKartItem(void)
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
{
// ITEM_X = BASEVIDWIDTH-50; // 270
// ITEM_Y = 24; // 24
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
// Why write V_DrawScaledPatch calls over and over when they're all the same?
// Set to 'no item' just in case.
Splitscreen items (also fixed Big Ring flags)
2018-06-29 00:54:06 +00:00
const UINT8 offset = ((splitscreen > 1) ? 1 : 0);
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
patch_t *localpatch = kp_nodraw;
Hide non-splitscreen number for natural quantities of orbinaut spikeball. Also, minor code tweaks.
2018-08-14 21:16:33 +00:00
patch_t *localbg = ((offset) ? kp_itembg[2] : kp_itembg[0]);
patch_t *localinv = ((offset) ? kp_invincibility[((leveltime % (6*3)) / 3) + 7] : kp_invincibility[(leveltime % (7*3)) / 3]);
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
INT32 splitflags = K_calcSplitFlags(V_SNAPTOTOP|V_SNAPTOLEFT);
Hide non-splitscreen number for natural quantities of orbinaut spikeball. Also, minor code tweaks.
2018-08-14 21:16:33 +00:00
const INT32 numberdisplaymin = ((!offset && stplyr->kartstuff[k_itemtype] == KITEM_ORBINAUT) ? 5 : 2);
Odds and ends of bugfixing and polish. * Flashing Eggman-hit players. * Fix typo with Rocket Shoe item bar, and make it extensible for potential future purposes since I was fiddling with it anyways. * More complete playerarrow visuals for various items. * Eggman fake (and debug) item get sounds.
2018-08-14 14:23:38 +00:00
INT32 itembar = 0;
Okay lets ACTUALLY fix it now :V
2017-12-24 14:19:59 +00:00
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
if (stplyr->kartstuff[k_itemroulette])
Okay lets ACTUALLY fix it now :V
2017-12-24 14:19:59 +00:00
{
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
switch((stplyr->kartstuff[k_itemroulette] % (13*3)) / 3)
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
{
// Each case is handled in threes, to give three frames of in-game time to see the item on the roulette
Orbinaut x4
2018-08-10 02:52:22 +00:00
case 0: localpatch = kp_sneaker[offset]; break; // Sneaker
case 1: localpatch = kp_banana[offset]; break; // Banana
case 2: localpatch = kp_orbinaut[3+offset]; break; // Orbinaut
case 3: localpatch = kp_mine[offset]; break; // Mine
case 4: localpatch = kp_grow[offset]; break; // Grow
case 5: localpatch = kp_hyudoro[offset]; break; // Hyudoro
case 6: localpatch = kp_rocketsneaker[offset]; break; // Rocket Sneaker
case 7: localpatch = kp_jawz[offset]; break; // Jawz
case 8: localpatch = kp_selfpropelledbomb[offset]; break; // Self-Propelled Bomb
case 9: localpatch = kp_shrink[offset]; break; // Shrink
case 10: localpatch = localinv; break; // Invincibility
case 11: localpatch = kp_eggman[offset]; break; // Eggman Monitor
case 12: localpatch = kp_ballhog[offset]; break; // Ballhog
case 13: localpatch = kp_thundershield[offset]; break; // Thunder Shield
//case 14: localpatch = kp_pogospring[offset]; break; // Pogo Spring
//case 15: localpatch = kp_kitchensink[offset]; break; // Kitchen Sink
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
default: break;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
}
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
}
else
{
// I'm doing this a little weird and drawing mostly in reverse order
// The only actual reason is to make sneakers line up this way in the code below
// This shouldn't have any actual baring over how it functions
// Hyudoro is first, because we're drawing it on top of the player's current item
Hyudoro HUD fix Really minor gripe, but if you stole an item it wouldn't show up until you finished taking it.
2018-06-19 02:43:23 +00:00
if (stplyr->kartstuff[k_stolentimer] > 0)
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
{
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
if (leveltime & 2)
Splitscreen items (also fixed Big Ring flags)
2018-06-29 00:54:06 +00:00
localpatch = kp_hyudoro[offset];
No longer are orbiting/trailing objects in charge of removing themselves. * They're clearly not quick enough at the job, since it causes a bunch of silly race conditions. * Instead, K_UpdateHnextList and K_CleanHnextList are in charge of removing them, which are called in the circumstances itemamount (and itemheld/eggmanheld) is changed. * Also, tweak a few places so that trailers AND orbiters can use the same system. Also, some minor thingies. * Turn all the useless ```if (a) { A } else if (!a) { B }``` bullshit into ```if (a) { A } else { B }``` bullshit. * Fix up some minor inaccuracies in the playerarrow stuff that doesn't result in creating more sprites.
2018-08-24 14:14:18 +00:00
else
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
localpatch = kp_nodraw;
}
Hyudoro HUD fix Really minor gripe, but if you stole an item it wouldn't show up until you finished taking it.
2018-06-19 02:43:23 +00:00
else if ((stplyr->kartstuff[k_stealingtimer] > 0) && (leveltime & 2))
{
Splitscreen items (also fixed Big Ring flags)
2018-06-29 00:54:06 +00:00
localpatch = kp_hyudoro[offset];
Hyudoro HUD fix Really minor gripe, but if you stole an item it wouldn't show up until you finished taking it.
2018-06-19 02:43:23 +00:00
}
eggman broken
2018-08-12 00:19:09 +00:00
else if (stplyr->kartstuff[k_eggmanexplode] > 1)
{
if (leveltime & 1)
localpatch = kp_eggman[offset];
No longer are orbiting/trailing objects in charge of removing themselves. * They're clearly not quick enough at the job, since it causes a bunch of silly race conditions. * Instead, K_UpdateHnextList and K_CleanHnextList are in charge of removing them, which are called in the circumstances itemamount (and itemheld/eggmanheld) is changed. * Also, tweak a few places so that trailers AND orbiters can use the same system. Also, some minor thingies. * Turn all the useless ```if (a) { A } else if (!a) { B }``` bullshit into ```if (a) { A } else { B }``` bullshit. * Fix up some minor inaccuracies in the playerarrow stuff that doesn't result in creating more sprites.
2018-08-24 14:14:18 +00:00
else
eggman broken
2018-08-12 00:19:09 +00:00
localpatch = kp_nodraw;
}
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
else if (stplyr->kartstuff[k_rocketsneakertimer] > 1)
{
Odds and ends of bugfixing and polish. * Flashing Eggman-hit players. * Fix typo with Rocket Shoe item bar, and make it extensible for potential future purposes since I was fiddling with it anyways. * More complete playerarrow visuals for various items. * Eggman fake (and debug) item get sounds.
2018-08-14 14:23:38 +00:00
itembar = stplyr->kartstuff[k_rocketsneakertimer];
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
if (leveltime & 1)
Splitscreen items (also fixed Big Ring flags)
2018-06-29 00:54:06 +00:00
localpatch = kp_rocketsneaker[offset];
No longer are orbiting/trailing objects in charge of removing themselves. * They're clearly not quick enough at the job, since it causes a bunch of silly race conditions. * Instead, K_UpdateHnextList and K_CleanHnextList are in charge of removing them, which are called in the circumstances itemamount (and itemheld/eggmanheld) is changed. * Also, tweak a few places so that trailers AND orbiters can use the same system. Also, some minor thingies. * Turn all the useless ```if (a) { A } else if (!a) { B }``` bullshit into ```if (a) { A } else { B }``` bullshit. * Fix up some minor inaccuracies in the playerarrow stuff that doesn't result in creating more sprites.
2018-08-24 14:14:18 +00:00
else
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
localpatch = kp_nodraw;
}
else if (stplyr->kartstuff[k_growshrinktimer] > 1)
{
if (leveltime & 1)
Splitscreen items (also fixed Big Ring flags)
2018-06-29 00:54:06 +00:00
localpatch = kp_grow[offset];
No longer are orbiting/trailing objects in charge of removing themselves. * They're clearly not quick enough at the job, since it causes a bunch of silly race conditions. * Instead, K_UpdateHnextList and K_CleanHnextList are in charge of removing them, which are called in the circumstances itemamount (and itemheld/eggmanheld) is changed. * Also, tweak a few places so that trailers AND orbiters can use the same system. Also, some minor thingies. * Turn all the useless ```if (a) { A } else if (!a) { B }``` bullshit into ```if (a) { A } else { B }``` bullshit. * Fix up some minor inaccuracies in the playerarrow stuff that doesn't result in creating more sprites.
2018-08-24 14:14:18 +00:00
else
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
localpatch = kp_nodraw;
}
else if (stplyr->kartstuff[k_sadtimer] > 0)
{
if (leveltime & 2)
Splitscreen items (also fixed Big Ring flags)
2018-06-29 00:54:06 +00:00
localpatch = kp_sadface[offset];
No longer are orbiting/trailing objects in charge of removing themselves. * They're clearly not quick enough at the job, since it causes a bunch of silly race conditions. * Instead, K_UpdateHnextList and K_CleanHnextList are in charge of removing them, which are called in the circumstances itemamount (and itemheld/eggmanheld) is changed. * Also, tweak a few places so that trailers AND orbiters can use the same system. Also, some minor thingies. * Turn all the useless ```if (a) { A } else if (!a) { B }``` bullshit into ```if (a) { A } else { B }``` bullshit. * Fix up some minor inaccuracies in the playerarrow stuff that doesn't result in creating more sprites.
2018-08-24 14:14:18 +00:00
else
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
localpatch = kp_nodraw;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
}
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
else
{
No longer are orbiting/trailing objects in charge of removing themselves. * They're clearly not quick enough at the job, since it causes a bunch of silly race conditions. * Instead, K_UpdateHnextList and K_CleanHnextList are in charge of removing them, which are called in the circumstances itemamount (and itemheld/eggmanheld) is changed. * Also, tweak a few places so that trailers AND orbiters can use the same system. Also, some minor thingies. * Turn all the useless ```if (a) { A } else if (!a) { B }``` bullshit into ```if (a) { A } else { B }``` bullshit. * Fix up some minor inaccuracies in the playerarrow stuff that doesn't result in creating more sprites.
2018-08-24 14:14:18 +00:00
if (stplyr->kartstuff[k_itemamount] <= 0)
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
return;
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
switch(stplyr->kartstuff[k_itemtype])
{
Splitscreen items (also fixed Big Ring flags)
2018-06-29 00:54:06 +00:00
case KITEM_SNEAKER: localpatch = kp_sneaker[offset]; break;
case KITEM_ROCKETSNEAKER: localpatch = kp_rocketsneaker[offset]; break;
case KITEM_INVINCIBILITY: localpatch = localinv; localbg = kp_itembg[offset+1]; break;
case KITEM_BANANA: localpatch = kp_banana[offset]; break;
case KITEM_EGGMAN: localpatch = kp_eggman[offset]; break;
Orbinaut x4
2018-08-10 02:52:22 +00:00
case KITEM_ORBINAUT:
Hide non-splitscreen number for natural quantities of orbinaut spikeball. Also, minor code tweaks.
2018-08-14 21:16:33 +00:00
localpatch = kp_orbinaut[(offset ? 4
Orbinaut x4
2018-08-10 02:52:22 +00:00
: min(stplyr->kartstuff[k_itemamount]-1, 3))];
break;
Splitscreen items (also fixed Big Ring flags)
2018-06-29 00:54:06 +00:00
case KITEM_JAWZ: localpatch = kp_jawz[offset]; break;
case KITEM_MINE: localpatch = kp_mine[offset]; break;
case KITEM_BALLHOG: localpatch = kp_ballhog[offset]; break;
Dark SPB background
2018-09-13 13:36:48 +00:00
case KITEM_SPB: localpatch = kp_selfpropelledbomb[offset]; localbg = kp_itembg[offset+1]; break;
Splitscreen items (also fixed Big Ring flags)
2018-06-29 00:54:06 +00:00
case KITEM_GROW: localpatch = kp_grow[offset]; break;
case KITEM_SHRINK: localpatch = kp_shrink[offset]; break;
Thunder shield stuff! * Slightly bigger visual size! * Light-shadow! * Makes player fullbright if you have it! * Visuals finally removed instantly on shield drop! * Uses dark background for item icons! * Goes behind the player on some frames, faking layering!
2018-09-13 18:01:36 +00:00
case KITEM_THUNDERSHIELD: localpatch = kp_thundershield[offset]; localbg = kp_itembg[offset+1]; break;
Splitscreen items (also fixed Big Ring flags)
2018-06-29 00:54:06 +00:00
case KITEM_HYUDORO: localpatch = kp_hyudoro[offset]; break;
case KITEM_POGOSPRING: localpatch = kp_pogospring[offset]; break;
case KITEM_KITCHENSINK: localpatch = kp_kitchensink[offset]; break;
case KITEM_SAD: localpatch = kp_sadface[offset]; break;
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
default: return;
}
Item stuff - Keep items on death, as long as you haven't used them yet. - Restart the item roulette on spawn if you die during it. - Held items that take up your item box now flash, to be consistent with Rocket Sneaker and Grow.
2018-09-10 06:48:10 +00:00
if (stplyr->kartstuff[k_itemheld] && !(leveltime & 1))
localpatch = kp_nodraw;
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
}
}
Closer to done HUD tweaking? Splitscreen in Battle is left
2017-12-24 00:14:06 +00:00
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawScaledPatch(ITEM_X, ITEM_Y, V_HUDTRANS|splitflags, localbg);
Closer to done HUD tweaking? Splitscreen in Battle is left
2017-12-24 00:14:06 +00:00
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
// Then, the numbers:
Hide non-splitscreen number for natural quantities of orbinaut spikeball. Also, minor code tweaks.
2018-08-14 21:16:33 +00:00
if (stplyr->kartstuff[k_itemamount] >= numberdisplaymin && !stplyr->kartstuff[k_itemroulette])
Okay lets ACTUALLY fix it now :V
2017-12-24 14:19:59 +00:00
{
Splitscreen items (also fixed Big Ring flags)
2018-06-29 00:54:06 +00:00
V_DrawScaledPatch(ITEM_X, ITEM_Y, V_HUDTRANS|splitflags, kp_itemmulsticker[offset]);
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
V_DrawScaledPatch(ITEM_X, ITEM_Y, V_HUDTRANS|splitflags, localpatch);
Hide non-splitscreen number for natural quantities of orbinaut spikeball. Also, minor code tweaks.
2018-08-14 21:16:33 +00:00
if (offset)
Splitscreen items (also fixed Big Ring flags)
2018-06-29 00:54:06 +00:00
V_DrawString(ITEM_X+24, ITEM_Y+31, V_ALLOWLOWERCASE|V_HUDTRANS|splitflags, va("x%d", stplyr->kartstuff[k_itemamount]));
else
{
V_DrawScaledPatch(ITEM_X+28, ITEM_Y+41, V_HUDTRANS|splitflags, kp_itemx);
V_DrawKartString(ITEM_X+38, ITEM_Y+36, V_HUDTRANS|splitflags, va("%d", stplyr->kartstuff[k_itemamount]));
Hopefully some medicine for the characters' sore throats from all that taunting Also my editor ate some trailing whitespace.
2018-07-04 21:25:38 +00:00
}
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
}
Swoopy Start & Lap Lakitu
2017-06-03 22:19:06 +00:00
else
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
V_DrawScaledPatch(ITEM_X, ITEM_Y, V_HUDTRANS|splitflags, localpatch);
eggman broken
2018-08-12 00:19:09 +00:00
Odds and ends of bugfixing and polish. * Flashing Eggman-hit players. * Fix typo with Rocket Shoe item bar, and make it extensible for potential future purposes since I was fiddling with it anyways. * More complete playerarrow visuals for various items. * Eggman fake (and debug) item get sounds.
2018-08-14 14:23:38 +00:00
// Extensible meter, currently only used for rocket sneaker...
Fix alignment of rocket sneaker bar.
2018-08-15 13:05:13 +00:00
if (itembar && hudtrans)
hud stuff eggman nums & rocket sneaker bar
2018-08-12 14:15:55 +00:00
{
Fix to itembar visual length problem
2018-10-13 22:38:16 +00:00
const INT32 barlength = (splitscreen > 1 ? 12 : 26);
const INT32 maxl = (itemtime*3) - barlength; // timer's normal highest value
const INT32 fill = ((itembar*barlength)/maxl);
const INT32 length = min(barlength, fill);
Hide non-splitscreen number for natural quantities of orbinaut spikeball. Also, minor code tweaks.
2018-08-14 21:16:33 +00:00
const INT32 height = (offset ? 1 : 2);
const INT32 x = (offset ? 17 : 11), y = (offset ? 27 : 35);
hud stuff eggman nums & rocket sneaker bar
2018-08-12 14:15:55 +00:00
V_DrawScaledPatch(ITEM_X+x, ITEM_Y+y, V_HUDTRANS|splitflags, kp_itemtimer[offset]);
Odds and ends of bugfixing and polish. * Flashing Eggman-hit players. * Fix typo with Rocket Shoe item bar, and make it extensible for potential future purposes since I was fiddling with it anyways. * More complete playerarrow visuals for various items. * Eggman fake (and debug) item get sounds.
2018-08-14 14:23:38 +00:00
// The left dark "AA" edge
Fix alignment of rocket sneaker bar.
2018-08-15 13:05:13 +00:00
V_DrawFill(ITEM_X+x+1, ITEM_Y+y+1, (length == 2 ? 2 : 1), height, 12|splitflags);
hud stuff eggman nums & rocket sneaker bar
2018-08-12 14:15:55 +00:00
// The bar itself
Odds and ends of bugfixing and polish. * Flashing Eggman-hit players. * Fix typo with Rocket Shoe item bar, and make it extensible for potential future purposes since I was fiddling with it anyways. * More complete playerarrow visuals for various items. * Eggman fake (and debug) item get sounds.
2018-08-14 14:23:38 +00:00
if (length > 2)
hud stuff eggman nums & rocket sneaker bar
2018-08-12 14:15:55 +00:00
{
Fix alignment of rocket sneaker bar.
2018-08-15 13:05:13 +00:00
V_DrawFill(ITEM_X+x+length, ITEM_Y+y+1, 1, height, 12|splitflags); // the right one
Odds and ends of bugfixing and polish. * Flashing Eggman-hit players. * Fix typo with Rocket Shoe item bar, and make it extensible for potential future purposes since I was fiddling with it anyways. * More complete playerarrow visuals for various items. * Eggman fake (and debug) item get sounds.
2018-08-14 14:23:38 +00:00
if (height == 2)
Fix alignment of rocket sneaker bar.
2018-08-15 13:05:13 +00:00
V_DrawFill(ITEM_X+x+2, ITEM_Y+y+2, length-2, 1, 8|splitflags); // the dulled underside
V_DrawFill(ITEM_X+x+2, ITEM_Y+y+1, length-2, 1, 120|splitflags); // the shine
hud stuff eggman nums & rocket sneaker bar
2018-08-12 14:15:55 +00:00
}
eggman broken
2018-08-12 00:19:09 +00:00
}
hud stuff eggman nums & rocket sneaker bar
2018-08-12 14:15:55 +00:00
// Quick Eggman numbers
if (stplyr->kartstuff[k_eggmanexplode] > 1 /*&& stplyr->kartstuff[k_eggmanexplode] <= 3*TICRATE*/)
Karma Eggman. Does what it says on the egg. Tried very hard not to merge conflict with `frameperfectegg`. Also includes some adjustments to: * Horizontal offset of Eggman countdown in splitscreen again. It's not perfectly centered either way, but on second thought I like this better. * Sound of Lat`'s Mine/SPB explosions - now uses same sound as Karma bombing, instead of that shitty paraloop. * Correctly wipe k_eggmanblame when it is appropriate to do so.
2018-10-07 10:40:06 +00:00
V_DrawScaledPatch(ITEM_X+17, ITEM_Y+13-offset, V_HUDTRANS|splitflags, kp_eggnum[min(3, G_TicsToSeconds(stplyr->kartstuff[k_eggmanexplode]))]);
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
}
Add a wide lap sticker for the record attack menu, so you're not looking at the same icon twice to mean two different things. https://cdn.discordapp.com/attachments/270211093761097728/508614473628647442/kart0002.png
2018-11-04 12:15:13 +00:00
void K_drawKartTimestamp(tic_t drawtime, INT32 TX, INT32 TY, INT16 emblemmap, UINT8 mode)
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
{
// TIME_X = BASEVIDWIDTH-124; // 196
// TIME_Y = 6; // 6
* Prettier record attack screen! * Uses the in-game timer element to draw its times. * This includes showing them time emblems-to-get! * good night sweet prince * Make the emblem time use the same ' and " as the normal time.
2018-08-29 20:37:47 +00:00
tic_t worktime;
Further improvements to cv_timelimit support, to the point that I DO think it might be worth having on the menu (but mark the game as modified if it's touched, to discourage its overzealous use?)
2018-07-19 13:39:46 +00:00
* Prettier record attack screen! * Uses the in-game timer element to draw its times. * This includes showing them time emblems-to-get! * good night sweet prince * Make the emblem time use the same ' and " as the normal time.
2018-08-29 20:37:47 +00:00
INT32 splitflags = 0;
Add a wide lap sticker for the record attack menu, so you're not looking at the same icon twice to mean two different things. https://cdn.discordapp.com/attachments/270211093761097728/508614473628647442/kart0002.png
2018-11-04 12:15:13 +00:00
if (!mode)
Further improvements to cv_timelimit support, to the point that I DO think it might be worth having on the menu (but mark the game as modified if it's touched, to discourage its overzealous use?)
2018-07-19 13:39:46 +00:00
{
* Prettier record attack screen! * Uses the in-game timer element to draw its times. * This includes showing them time emblems-to-get! * good night sweet prince * Make the emblem time use the same ' and " as the normal time.
2018-08-29 20:37:47 +00:00
splitflags = V_HUDTRANS|K_calcSplitFlags(V_SNAPTOTOP|V_SNAPTORIGHT);
if (cv_timelimit.value && timelimitintics > 0)
{
if (drawtime >= timelimitintics)
drawtime = 0;
else
drawtime = timelimitintics - drawtime;
}
Further improvements to cv_timelimit support, to the point that I DO think it might be worth having on the menu (but mark the game as modified if it's touched, to discourage its overzealous use?)
2018-07-19 13:39:46 +00:00
}
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
Add a wide lap sticker for the record attack menu, so you're not looking at the same icon twice to mean two different things. https://cdn.discordapp.com/attachments/270211093761097728/508614473628647442/kart0002.png
2018-11-04 12:15:13 +00:00
V_DrawScaledPatch(TX, TY, splitflags, ((mode == 2) ? kp_lapstickerwide : kp_timestickerwide));
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
* Prettier record attack screen! * Uses the in-game timer element to draw its times. * This includes showing them time emblems-to-get! * good night sweet prince * Make the emblem time use the same ' and " as the normal time.
2018-08-29 20:37:47 +00:00
TX += 33;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
* Prettier record attack screen! * Uses the in-game timer element to draw its times. * This includes showing them time emblems-to-get! * good night sweet prince * Make the emblem time use the same ' and " as the normal time.
2018-08-29 20:37:47 +00:00
worktime = drawtime/(60*TICRATE);
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
Add a wide lap sticker for the record attack menu, so you're not looking at the same icon twice to mean two different things. https://cdn.discordapp.com/attachments/270211093761097728/508614473628647442/kart0002.png
2018-11-04 12:15:13 +00:00
if (mode && !drawtime)
* Prettier record attack screen! * Uses the in-game timer element to draw its times. * This includes showing them time emblems-to-get! * good night sweet prince * Make the emblem time use the same ' and " as the normal time.
2018-08-29 20:37:47 +00:00
V_DrawKartString(TX, TY+3, splitflags, va("--'--\"--"));
else if (worktime < 100) // 99:99:99 only
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
{
// zero minute
* Prettier record attack screen! * Uses the in-game timer element to draw its times. * This includes showing them time emblems-to-get! * good night sweet prince * Make the emblem time use the same ' and " as the normal time.
2018-08-29 20:37:47 +00:00
if (worktime < 10)
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
{
* Prettier record attack screen! * Uses the in-game timer element to draw its times. * This includes showing them time emblems-to-get! * good night sweet prince * Make the emblem time use the same ' and " as the normal time.
2018-08-29 20:37:47 +00:00
V_DrawKartString(TX, TY+3, splitflags, va("0"));
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
// minutes time 0 __ __
* Prettier record attack screen! * Uses the in-game timer element to draw its times. * This includes showing them time emblems-to-get! * good night sweet prince * Make the emblem time use the same ' and " as the normal time.
2018-08-29 20:37:47 +00:00
V_DrawKartString(TX+12, TY+3, splitflags, va("%d", worktime));
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
}
// minutes time 0 __ __
else
* Prettier record attack screen! * Uses the in-game timer element to draw its times. * This includes showing them time emblems-to-get! * good night sweet prince * Make the emblem time use the same ' and " as the normal time.
2018-08-29 20:37:47 +00:00
V_DrawKartString(TX, TY+3, splitflags, va("%d", worktime));
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
// apostrophe location _'__ __
* Prettier record attack screen! * Uses the in-game timer element to draw its times. * This includes showing them time emblems-to-get! * good night sweet prince * Make the emblem time use the same ' and " as the normal time.
2018-08-29 20:37:47 +00:00
V_DrawKartString(TX+24, TY+3, splitflags, va("'"));
worktime = (drawtime/TICRATE % 60);
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
// zero second _ 0_ __
* Prettier record attack screen! * Uses the in-game timer element to draw its times. * This includes showing them time emblems-to-get! * good night sweet prince * Make the emblem time use the same ' and " as the normal time.
2018-08-29 20:37:47 +00:00
if (worktime < 10)
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
{
* Prettier record attack screen! * Uses the in-game timer element to draw its times. * This includes showing them time emblems-to-get! * good night sweet prince * Make the emblem time use the same ' and " as the normal time.
2018-08-29 20:37:47 +00:00
V_DrawKartString(TX+36, TY+3, splitflags, va("0"));
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
// seconds time _ _0 __
* Prettier record attack screen! * Uses the in-game timer element to draw its times. * This includes showing them time emblems-to-get! * good night sweet prince * Make the emblem time use the same ' and " as the normal time.
2018-08-29 20:37:47 +00:00
V_DrawKartString(TX+48, TY+3, splitflags, va("%d", worktime));
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
}
// zero second _ 00 __
else
* Prettier record attack screen! * Uses the in-game timer element to draw its times. * This includes showing them time emblems-to-get! * good night sweet prince * Make the emblem time use the same ' and " as the normal time.
2018-08-29 20:37:47 +00:00
V_DrawKartString(TX+36, TY+3, splitflags, va("%d", worktime));
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
// quotation mark location _ __"__
* Prettier record attack screen! * Uses the in-game timer element to draw its times. * This includes showing them time emblems-to-get! * good night sweet prince * Make the emblem time use the same ' and " as the normal time.
2018-08-29 20:37:47 +00:00
V_DrawKartString(TX+60, TY+3, splitflags, va("\""));
worktime = G_TicsToCentiseconds(drawtime);
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
// zero tick _ __ 0_
* Prettier record attack screen! * Uses the in-game timer element to draw its times. * This includes showing them time emblems-to-get! * good night sweet prince * Make the emblem time use the same ' and " as the normal time.
2018-08-29 20:37:47 +00:00
if (worktime < 10)
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
{
* Prettier record attack screen! * Uses the in-game timer element to draw its times. * This includes showing them time emblems-to-get! * good night sweet prince * Make the emblem time use the same ' and " as the normal time.
2018-08-29 20:37:47 +00:00
V_DrawKartString(TX+72, TY+3, splitflags, va("0"));
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
// tics _ __ _0
* Prettier record attack screen! * Uses the in-game timer element to draw its times. * This includes showing them time emblems-to-get! * good night sweet prince * Make the emblem time use the same ' and " as the normal time.
2018-08-29 20:37:47 +00:00
V_DrawKartString(TX+84, TY+3, splitflags, va("%d", worktime));
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
}
// zero tick _ __ 00
* Prettier record attack screen! * Uses the in-game timer element to draw its times. * This includes showing them time emblems-to-get! * good night sweet prince * Make the emblem time use the same ' and " as the normal time.
2018-08-29 20:37:47 +00:00
else
V_DrawKartString(TX+72, TY+3, splitflags, va("%d", worktime));
* Lots of Record Attack love! * Record Attack Input display! * Show Record Attack emblem and emblem time on the HUD! Changes colours with the player, just like vanilla internal's. * Remove the ugly dark blue box on the singleplayer (including pause screen) whose only purpose in Kart was to contain the Record Attack emblem info! * Unrelated shit! * Improve loading Kart HUD graphics. * Fix mirrored HUD graphics being one screen pixel (not basevid pixel) offset.
2018-07-15 22:13:36 +00:00
}
Further improvements to cv_timelimit support, to the point that I DO think it might be worth having on the menu (but mark the game as modified if it's touched, to discourage its overzealous use?)
2018-07-19 13:39:46 +00:00
else if ((drawtime/TICRATE) & 1)
* Prettier record attack screen! * Uses the in-game timer element to draw its times. * This includes showing them time emblems-to-get! * good night sweet prince * Make the emblem time use the same ' and " as the normal time.
2018-08-29 20:37:47 +00:00
V_DrawKartString(TX, TY+3, splitflags, va("99'59\"99"));
* Lots of Record Attack love! * Record Attack Input display! * Show Record Attack emblem and emblem time on the HUD! Changes colours with the player, just like vanilla internal's. * Remove the ugly dark blue box on the singleplayer (including pause screen) whose only purpose in Kart was to contain the Record Attack emblem info! * Unrelated shit! * Improve loading Kart HUD graphics. * Fix mirrored HUD graphics being one screen pixel (not basevid pixel) offset.
2018-07-15 22:13:36 +00:00
Add a wide lap sticker for the record attack menu, so you're not looking at the same icon twice to mean two different things. https://cdn.discordapp.com/attachments/270211093761097728/508614473628647442/kart0002.png
2018-11-04 12:15:13 +00:00
if (emblemmap && (modeattacking || (mode == 1))) // emblem time!
* Lots of Record Attack love! * Record Attack Input display! * Show Record Attack emblem and emblem time on the HUD! Changes colours with the player, just like vanilla internal's. * Remove the ugly dark blue box on the singleplayer (including pause screen) whose only purpose in Kart was to contain the Record Attack emblem info! * Unrelated shit! * Improve loading Kart HUD graphics. * Fix mirrored HUD graphics being one screen pixel (not basevid pixel) offset.
2018-07-15 22:13:36 +00:00
{
* Prettier record attack screen! * Uses the in-game timer element to draw its times. * This includes showing them time emblems-to-get! * good night sweet prince * Make the emblem time use the same ' and " as the normal time.
2018-08-29 20:37:47 +00:00
INT32 workx = TX + 96, worky = TY+18;
Per Sal's request, only show the time/play the failure sound for the current time attack challenge - and if there is none, only show the emblems in a row.
2018-07-16 20:36:27 +00:00
SINT8 curemb = 0;
patch_t *emblempic[3] = {NULL, NULL, NULL};
UINT8 *emblemcol[3] = {NULL, NULL, NULL};
* Prettier record attack screen! * Uses the in-game timer element to draw its times. * This includes showing them time emblems-to-get! * good night sweet prince * Make the emblem time use the same ' and " as the normal time.
2018-08-29 20:37:47 +00:00
emblem_t *emblem = M_GetLevelEmblems(emblemmap);
* Lots of Record Attack love! * Record Attack Input display! * Show Record Attack emblem and emblem time on the HUD! Changes colours with the player, just like vanilla internal's. * Remove the ugly dark blue box on the singleplayer (including pause screen) whose only purpose in Kart was to contain the Record Attack emblem info! * Unrelated shit! * Improve loading Kart HUD graphics. * Fix mirrored HUD graphics being one screen pixel (not basevid pixel) offset.
2018-07-15 22:13:36 +00:00
while (emblem)
{
char targettext[9];
switch (emblem->type)
{
case ET_TIME:
{
Per Sal's request, only show the time/play the failure sound for the current time attack challenge - and if there is none, only show the emblems in a row.
2018-07-16 20:36:27 +00:00
static boolean canplaysound = true;
* Lots of Record Attack love! * Record Attack Input display! * Show Record Attack emblem and emblem time on the HUD! Changes colours with the player, just like vanilla internal's. * Remove the ugly dark blue box on the singleplayer (including pause screen) whose only purpose in Kart was to contain the Record Attack emblem info! * Unrelated shit! * Improve loading Kart HUD graphics. * Fix mirrored HUD graphics being one screen pixel (not basevid pixel) offset.
2018-07-15 22:13:36 +00:00
tic_t timetoreach = emblem->var;
Per Sal's request, only show the time/play the failure sound for the current time attack challenge - and if there is none, only show the emblems in a row.
2018-07-16 20:36:27 +00:00
if (emblem->collected)
{
emblempic[curemb] = W_CachePatchName(M_GetEmblemPatch(emblem), PU_CACHE);
emblemcol[curemb] = R_GetTranslationColormap(TC_DEFAULT, M_GetEmblemColor(emblem), GTC_CACHE);
if (++curemb == 3)
break;
goto bademblem;
}
* Prettier record attack screen! * Uses the in-game timer element to draw its times. * This includes showing them time emblems-to-get! * good night sweet prince * Make the emblem time use the same ' and " as the normal time.
2018-08-29 20:37:47 +00:00
snprintf(targettext, 9, "%i'%02i\"%02i",
* Lots of Record Attack love! * Record Attack Input display! * Show Record Attack emblem and emblem time on the HUD! Changes colours with the player, just like vanilla internal's. * Remove the ugly dark blue box on the singleplayer (including pause screen) whose only purpose in Kart was to contain the Record Attack emblem info! * Unrelated shit! * Improve loading Kart HUD graphics. * Fix mirrored HUD graphics being one screen pixel (not basevid pixel) offset.
2018-07-15 22:13:36 +00:00
G_TicsToMinutes(timetoreach, false),
G_TicsToSeconds(timetoreach),
G_TicsToCentiseconds(timetoreach));
Add a wide lap sticker for the record attack menu, so you're not looking at the same icon twice to mean two different things. https://cdn.discordapp.com/attachments/270211093761097728/508614473628647442/kart0002.png
2018-11-04 12:15:13 +00:00
if (!mode)
* Lots of Record Attack love! * Record Attack Input display! * Show Record Attack emblem and emblem time on the HUD! Changes colours with the player, just like vanilla internal's. * Remove the ugly dark blue box on the singleplayer (including pause screen) whose only purpose in Kart was to contain the Record Attack emblem info! * Unrelated shit! * Improve loading Kart HUD graphics. * Fix mirrored HUD graphics being one screen pixel (not basevid pixel) offset.
2018-07-15 22:13:36 +00:00
{
* Prettier record attack screen! * Uses the in-game timer element to draw its times. * This includes showing them time emblems-to-get! * good night sweet prince * Make the emblem time use the same ' and " as the normal time.
2018-08-29 20:37:47 +00:00
if (stplyr->realtime > timetoreach)
* Lots of Record Attack love! * Record Attack Input display! * Show Record Attack emblem and emblem time on the HUD! Changes colours with the player, just like vanilla internal's. * Remove the ugly dark blue box on the singleplayer (including pause screen) whose only purpose in Kart was to contain the Record Attack emblem info! * Unrelated shit! * Improve loading Kart HUD graphics. * Fix mirrored HUD graphics being one screen pixel (not basevid pixel) offset.
2018-07-15 22:13:36 +00:00
{
* Prettier record attack screen! * Uses the in-game timer element to draw its times. * This includes showing them time emblems-to-get! * good night sweet prince * Make the emblem time use the same ' and " as the normal time.
2018-08-29 20:37:47 +00:00
splitflags = (splitflags &~ V_HUDTRANS)|V_HUDTRANSHALF;
if (canplaysound)
{
S_StartSound(NULL, sfx_s3k72); //sfx_s26d); -- you STOLE fizzy lifting drinks
canplaysound = false;
}
* Lots of Record Attack love! * Record Attack Input display! * Show Record Attack emblem and emblem time on the HUD! Changes colours with the player, just like vanilla internal's. * Remove the ugly dark blue box on the singleplayer (including pause screen) whose only purpose in Kart was to contain the Record Attack emblem info! * Unrelated shit! * Improve loading Kart HUD graphics. * Fix mirrored HUD graphics being one screen pixel (not basevid pixel) offset.
2018-07-15 22:13:36 +00:00
}
* Prettier record attack screen! * Uses the in-game timer element to draw its times. * This includes showing them time emblems-to-get! * good night sweet prince * Make the emblem time use the same ' and " as the normal time.
2018-08-29 20:37:47 +00:00
else if (!canplaysound)
canplaysound = true;
* Lots of Record Attack love! * Record Attack Input display! * Show Record Attack emblem and emblem time on the HUD! Changes colours with the player, just like vanilla internal's. * Remove the ugly dark blue box on the singleplayer (including pause screen) whose only purpose in Kart was to contain the Record Attack emblem info! * Unrelated shit! * Improve loading Kart HUD graphics. * Fix mirrored HUD graphics being one screen pixel (not basevid pixel) offset.
2018-07-15 22:13:36 +00:00
}
targettext[8] = 0;
}
break;
default:
goto bademblem;
}
Mammoth commit! * Deaths in record attack no longer put you into a glitchy singleplayer game-over state that we somehow both kept around and also broke since we branched Kart off of Vanilla.. * Fix non-standard mapscales making the Death Egg respawn octagons dissasemble themselves. * Allow for MULTIPLE TIME EMBLEMS PER MAP, at least in the emblem UI on the timer. It shows all completed emblems plus the uncompleted emblem up to a total of three. * Major tweaks to the First Person HUD. * I know this was your baby, Sal, and some of the changes may prove controversial - so I've put the ones that are likely to cause the most fuss inside an ifndef block, so that you can toggle it as you please with minimal code changes. * Dontdraw-ness, transparency, and colorization match the player's object! * Moves around on the screen with respect to the direction of the player object's motion, to make drifting look nicer! * Flashes the colour of your drift sparks. * Did a WHOLE bunch of things with respect to music. I'm not sure how to describe this, so I'll go through step-by-step. * Countdowns now play the drowning music again. * Removed/disabled extraenous P_RestoreMusics. * Made map-ending music called by its own function, P_EndingMusic(player_t *player). * Made the ending music play on the LAST player crossing the finishing line in splitscreen, rather than first. * Make dead players spinout and clip through the floor, at least until we add the new death anims. * Fix prior pogo spring usage making dead players fall faster. * Make the time over countdown use the kart font when not splitscreen with 3 or 4 players. * Removed a weird bonus HWR_DrawCroppedPatch function signature in the hardware header.
2018-07-16 19:19:30 +00:00
V_DrawRightAlignedString(workx, worky, splitflags, targettext);
That's it for me. No new features, no major sprite replacements. Maybe bugfixing stuff like this I did while half-asleep just in case it turns out I missed a test case. * Oni's new 1x Bumpers and Out-Of-Bumpers competition-style 'X'! * Modify alignment for `GOTITx` emblem drawing to match new Chaos Coin sprites. * Adjust m_cond.c list to use new Chaos Coin Emblem sprite slots.
2018-11-01 00:10:34 +00:00
workx -= 67;
Per Sal's request, only show the time/play the failure sound for the current time attack challenge - and if there is none, only show the emblems in a row.
2018-07-16 20:36:27 +00:00
V_DrawSmallScaledPatch(workx + 4, worky, splitflags, W_CachePatchName("NEEDIT", PU_CACHE));
Mammoth commit! * Deaths in record attack no longer put you into a glitchy singleplayer game-over state that we somehow both kept around and also broke since we branched Kart off of Vanilla.. * Fix non-standard mapscales making the Death Egg respawn octagons dissasemble themselves. * Allow for MULTIPLE TIME EMBLEMS PER MAP, at least in the emblem UI on the timer. It shows all completed emblems plus the uncompleted emblem up to a total of three. * Major tweaks to the First Person HUD. * I know this was your baby, Sal, and some of the changes may prove controversial - so I've put the ones that are likely to cause the most fuss inside an ifndef block, so that you can toggle it as you please with minimal code changes. * Dontdraw-ness, transparency, and colorization match the player's object! * Moves around on the screen with respect to the direction of the player object's motion, to make drifting look nicer! * Flashes the colour of your drift sparks. * Did a WHOLE bunch of things with respect to music. I'm not sure how to describe this, so I'll go through step-by-step. * Countdowns now play the drowning music again. * Removed/disabled extraenous P_RestoreMusics. * Made map-ending music called by its own function, P_EndingMusic(player_t *player). * Made the ending music play on the LAST player crossing the finishing line in splitscreen, rather than first. * Make dead players spinout and clip through the floor, at least until we add the new death anims. * Fix prior pogo spring usage making dead players fall faster. * Make the time over countdown use the kart font when not splitscreen with 3 or 4 players. * Removed a weird bonus HWR_DrawCroppedPatch function signature in the hardware header.
2018-07-16 19:19:30 +00:00
Per Sal's request, only show the time/play the failure sound for the current time attack challenge - and if there is none, only show the emblems in a row.
2018-07-16 20:36:27 +00:00
break;
* Lots of Record Attack love! * Record Attack Input display! * Show Record Attack emblem and emblem time on the HUD! Changes colours with the player, just like vanilla internal's. * Remove the ugly dark blue box on the singleplayer (including pause screen) whose only purpose in Kart was to contain the Record Attack emblem info! * Unrelated shit! * Improve loading Kart HUD graphics. * Fix mirrored HUD graphics being one screen pixel (not basevid pixel) offset.
2018-07-15 22:13:36 +00:00
bademblem:
emblem = M_GetLevelEmblems(-1);
}
Per Sal's request, only show the time/play the failure sound for the current time attack challenge - and if there is none, only show the emblems in a row.
2018-07-16 20:36:27 +00:00
Add a wide lap sticker for the record attack menu, so you're not looking at the same icon twice to mean two different things. https://cdn.discordapp.com/attachments/270211093761097728/508614473628647442/kart0002.png
2018-11-04 12:15:13 +00:00
if (!mode)
* Prettier record attack screen! * Uses the in-game timer element to draw its times. * This includes showing them time emblems-to-get! * good night sweet prince * Make the emblem time use the same ' and " as the normal time.
2018-08-29 20:37:47 +00:00
splitflags = (splitflags &~ V_HUDTRANSHALF)|V_HUDTRANS;
Per Sal's request, only show the time/play the failure sound for the current time attack challenge - and if there is none, only show the emblems in a row.
2018-07-16 20:36:27 +00:00
while (curemb--)
{
That's it for me. No new features, no major sprite replacements. Maybe bugfixing stuff like this I did while half-asleep just in case it turns out I missed a test case. * Oni's new 1x Bumpers and Out-Of-Bumpers competition-style 'X'! * Modify alignment for `GOTITx` emblem drawing to match new Chaos Coin sprites. * Adjust m_cond.c list to use new Chaos Coin Emblem sprite slots.
2018-11-01 00:10:34 +00:00
workx -= 12;
Per Sal's request, only show the time/play the failure sound for the current time attack challenge - and if there is none, only show the emblems in a row.
2018-07-16 20:36:27 +00:00
V_DrawSmallMappedPatch(workx + 4, worky, splitflags, emblempic[curemb], emblemcol[curemb]);
}
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
}
}
static void K_DrawKartPositionNum(INT32 num)
{
// POSI_X = BASEVIDWIDTH - 51; // 269
// POSI_Y = BASEVIDHEIGHT- 64; // 136
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
Unfinished V_HORZSCREEN revamp
2017-12-22 15:16:41 +00:00
INT32 X = POSI_X;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
INT32 W = SHORT(kp_positionnum[0][0]->width);
More post processor support, HUD tweaks, SP new game fix Mirror Mode minimap, growing position nums, and general reorganization. Some stuff needs more work but I'm exhausted rn
2017-12-19 06:55:33 +00:00
fixed_t scale = FRACUNIT;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
patch_t *localpatch = kp_positionnum[0][0];
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
INT32 splitflags = K_calcSplitFlags(V_SNAPTOBOTTOM|V_SNAPTORIGHT);
HUD shenanigans In battle because it messes with CHECK, and also I'm too lazy to switch branches
2017-11-06 22:31:52 +00:00
Closer to done HUD tweaking? Splitscreen in Battle is left
2017-12-24 00:14:06 +00:00
if (stplyr->kartstuff[k_positiondelay] || stplyr->exiting)
Lap start animation
2018-08-10 01:52:02 +00:00
scale *= 2;
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
if (splitscreen)
Unfinished V_HORZSCREEN revamp
2017-12-22 15:16:41 +00:00
scale /= 2;
W = FixedMul(W<<FRACBITS, scale)>>FRACBITS;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
// Special case for 0
if (!num)
{
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawFixedPatch(X<<FRACBITS, POSI_Y<<FRACBITS, scale, V_HUDTRANSHALF|splitflags, kp_positionnum[0][0], NULL);
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
return;
}
I_Assert(num >= 0); // This function does not draw negative numbers
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
// Draw the number
while (num)
{
Yet more comeback stuff! - You can now choose to carry an item to someone instead of bombing - You need to bomb someone or give an item a combined total of three times in order to come back. - Bombing somone gives 2 points while giving items doesn't award you any points. - Position number still flashes after you've won, and it flashes rainbow for people who have won and are in 1st place! - Flashing players can no longer eat items - Fixed kartstarsfx playing the alarm in conjunction with music - Fixed some items no longer causing wipeout
2017-11-13 03:48:32 +00:00
if (stplyr->exiting && num == 1) // 1st place winner? You get rainbows!!
Shrink debug command, trailing items spawn directly on players, rainbow win 1 is more faithful, make springs more powerful for shrunk players, correct Grow/Shrink fullbright frame
2018-07-12 05:31:33 +00:00
localpatch = kp_winnernum[(leveltime % (NUMWINFRAMES*3)) / 3];
P_RestoreMusic restores level exit music as well Splitscreen fix
2018-06-05 06:41:55 +00:00
else if (stplyr->laps+1 >= cv_numlaps.value || stplyr->exiting) // Check for the final lap, or won
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
{
// Alternate frame every three frames
switch (leveltime % 9)
{
case 1: case 2: case 3:
Winning positions scale with number of players Anyone in the top 50% gets winning music & blue position, everyone below gets the losing music & red position. For odd numbers, it rounds up. 2p: 1st wins, 2nd loses 3p: 1-2 win, 3rd loses 4p: 1-2 win, 3-4 lose 5p: 1-3 win, 4-5 lose 6p: 1-3 win, 4-6 lose 7p: 1-4 win, 5-7 lose 8p: 1-4 win, 5-8 lose (SMK) 12p: 1-6 win, 7-12 lose (modern MK) 16p: 1-8 win, 9-16 lose (max player count) In big netgames you won't just hear the losing music all of the time now :V
2018-02-21 00:11:09 +00:00
if (K_IsPlayerLosing(stplyr))
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
localpatch = kp_positionnum[num % 10][4];
Fixed position code, added some item numbers
2017-02-17 02:33:00 +00:00
else
localpatch = kp_positionnum[num % 10][1];
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
break;
case 4: case 5: case 6:
Winning positions scale with number of players Anyone in the top 50% gets winning music & blue position, everyone below gets the losing music & red position. For odd numbers, it rounds up. 2p: 1st wins, 2nd loses 3p: 1-2 win, 3rd loses 4p: 1-2 win, 3-4 lose 5p: 1-3 win, 4-5 lose 6p: 1-3 win, 4-6 lose 7p: 1-4 win, 5-7 lose 8p: 1-4 win, 5-8 lose (SMK) 12p: 1-6 win, 7-12 lose (modern MK) 16p: 1-8 win, 9-16 lose (max player count) In big netgames you won't just hear the losing music all of the time now :V
2018-02-21 00:11:09 +00:00
if (K_IsPlayerLosing(stplyr))
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
localpatch = kp_positionnum[num % 10][5];
Fixed position code, added some item numbers
2017-02-17 02:33:00 +00:00
else
localpatch = kp_positionnum[num % 10][2];
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
break;
case 7: case 8: case 9:
Winning positions scale with number of players Anyone in the top 50% gets winning music & blue position, everyone below gets the losing music & red position. For odd numbers, it rounds up. 2p: 1st wins, 2nd loses 3p: 1-2 win, 3rd loses 4p: 1-2 win, 3-4 lose 5p: 1-3 win, 4-5 lose 6p: 1-3 win, 4-6 lose 7p: 1-4 win, 5-7 lose 8p: 1-4 win, 5-8 lose (SMK) 12p: 1-6 win, 7-12 lose (modern MK) 16p: 1-8 win, 9-16 lose (max player count) In big netgames you won't just hear the losing music all of the time now :V
2018-02-21 00:11:09 +00:00
if (K_IsPlayerLosing(stplyr))
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
localpatch = kp_positionnum[num % 10][6];
Fixed position code, added some item numbers
2017-02-17 02:33:00 +00:00
else
localpatch = kp_positionnum[num % 10][3];
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
break;
default:
localpatch = kp_positionnum[num % 10][0];
break;
}
}
else
localpatch = kp_positionnum[num % 10][0];
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawFixedPatch(X<<FRACBITS, POSI_Y<<FRACBITS, scale, V_HUDTRANSHALF|splitflags, localpatch, NULL);
More post processor support, HUD tweaks, SP new game fix Mirror Mode minimap, growing position nums, and general reorganization. Some stuff needs more work but I'm exhausted rn
2017-12-19 06:55:33 +00:00
X -= W;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
num /= 10;
}
}
* FREE PLAY! The necessary corollary to HERE COMES A NEW CHALLENGER... * Activates when there are less than two non-spectators in a netgame. * Shows flashing text at the bottom of the screen. * Prevents drawing several UI elements that only make sense with multiple players. * Prevents matchesplayed being increased. * Improve the mapreset timer's behaviour. * Now you get to see the HERE COMES A NEW CHALLENGER screen as the starting frame of the relevant map transition, since it happens on mapreset being 1 rather than 0. * Make a bunch of normal gameplay stuff that might've activated unnecessarily during mapreset now not able to. * Hide some other stuff that might've been visible for no good reason. * Improve Mirror mode. * First person now works with it! * Tweaked the minimap player heads. Although the main section of the automap is mirrored, it feels... wrong to mirror the player head? IDK, you may wish to revert this, but given that everything else is the right way around except for the level itself...* Disable the titlescreen demos, at least until we actually gear up for release and make real ones. * Disable the titlescreen demos, at least until we actually gear up for release and make real ones.
2018-07-22 15:16:03 +00:00
static boolean K_drawKartPositionFaces(void)
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
{
// FACE_X = 15; // 15
// FACE_Y = 72; // 72
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
INT32 Y = FACE_Y+9; // +9 to offset where it's being drawn if there are more than one
* Fix spectators having the "YOU ARE THIS PERSON" highlight on the minirankings be done on the person in first. * Apply the "YOU ARE THIS PERSON" highlight to all non-splitscreen circumstances that use the tiny player icons. (New locations: Tab rankings, intermission, completed votes.)
2018-11-10 12:31:41 +00:00
INT32 i, j, ranklines, strank = -1;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
boolean completed[MAXPLAYERS];
INT32 rankplayer[MAXPLAYERS];
* FREE PLAY! The necessary corollary to HERE COMES A NEW CHALLENGER... * Activates when there are less than two non-spectators in a netgame. * Shows flashing text at the bottom of the screen. * Prevents drawing several UI elements that only make sense with multiple players. * Prevents matchesplayed being increased. * Improve the mapreset timer's behaviour. * Now you get to see the HERE COMES A NEW CHALLENGER screen as the starting frame of the relevant map transition, since it happens on mapreset being 1 rather than 0. * Make a bunch of normal gameplay stuff that might've activated unnecessarily during mapreset now not able to. * Hide some other stuff that might've been visible for no good reason. * Improve Mirror mode. * First person now works with it! * Tweaked the minimap player heads. Although the main section of the automap is mirrored, it feels... wrong to mirror the player head? IDK, you may wish to revert this, but given that everything else is the right way around except for the level itself...* Disable the titlescreen demos, at least until we actually gear up for release and make real ones. * Disable the titlescreen demos, at least until we actually gear up for release and make real ones.
2018-07-22 15:16:03 +00:00
INT32 bumperx, numplayersingame = 0;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
UINT8 *colormap;
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
ranklines = 0;
memset(completed, 0, sizeof (completed));
memset(rankplayer, 0, sizeof (rankplayer));
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
for (i = 0; i < MAXPLAYERS; i++)
* FREE PLAY! The necessary corollary to HERE COMES A NEW CHALLENGER... * Activates when there are less than two non-spectators in a netgame. * Shows flashing text at the bottom of the screen. * Prevents drawing several UI elements that only make sense with multiple players. * Prevents matchesplayed being increased. * Improve the mapreset timer's behaviour. * Now you get to see the HERE COMES A NEW CHALLENGER screen as the starting frame of the relevant map transition, since it happens on mapreset being 1 rather than 0. * Make a bunch of normal gameplay stuff that might've activated unnecessarily during mapreset now not able to. * Hide some other stuff that might've been visible for no good reason. * Improve Mirror mode. * First person now works with it! * Tweaked the minimap player heads. Although the main section of the automap is mirrored, it feels... wrong to mirror the player head? IDK, you may wish to revert this, but given that everything else is the right way around except for the level itself...* Disable the titlescreen demos, at least until we actually gear up for release and make real ones. * Disable the titlescreen demos, at least until we actually gear up for release and make real ones.
2018-07-22 15:16:03 +00:00
{
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
rankplayer[i] = -1;
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
* FREE PLAY! The necessary corollary to HERE COMES A NEW CHALLENGER... * Activates when there are less than two non-spectators in a netgame. * Shows flashing text at the bottom of the screen. * Prevents drawing several UI elements that only make sense with multiple players. * Prevents matchesplayed being increased. * Improve the mapreset timer's behaviour. * Now you get to see the HERE COMES A NEW CHALLENGER screen as the starting frame of the relevant map transition, since it happens on mapreset being 1 rather than 0. * Make a bunch of normal gameplay stuff that might've activated unnecessarily during mapreset now not able to. * Hide some other stuff that might've been visible for no good reason. * Improve Mirror mode. * First person now works with it! * Tweaked the minimap player heads. Although the main section of the automap is mirrored, it feels... wrong to mirror the player head? IDK, you may wish to revert this, but given that everything else is the right way around except for the level itself...* Disable the titlescreen demos, at least until we actually gear up for release and make real ones. * Disable the titlescreen demos, at least until we actually gear up for release and make real ones.
2018-07-22 15:16:03 +00:00
if (!playeringame[i] || players[i].spectator || !players[i].mo)
Spectating is properly implemented now - Spectate button works - Spectating & objectplace controls are usable now - New spectator HUD
2018-01-23 03:18:57 +00:00
continue;
* FREE PLAY! The necessary corollary to HERE COMES A NEW CHALLENGER... * Activates when there are less than two non-spectators in a netgame. * Shows flashing text at the bottom of the screen. * Prevents drawing several UI elements that only make sense with multiple players. * Prevents matchesplayed being increased. * Improve the mapreset timer's behaviour. * Now you get to see the HERE COMES A NEW CHALLENGER screen as the starting frame of the relevant map transition, since it happens on mapreset being 1 rather than 0. * Make a bunch of normal gameplay stuff that might've activated unnecessarily during mapreset now not able to. * Hide some other stuff that might've been visible for no good reason. * Improve Mirror mode. * First person now works with it! * Tweaked the minimap player heads. Although the main section of the automap is mirrored, it feels... wrong to mirror the player head? IDK, you may wish to revert this, but given that everything else is the right way around except for the level itself...* Disable the titlescreen demos, at least until we actually gear up for release and make real ones. * Disable the titlescreen demos, at least until we actually gear up for release and make real ones.
2018-07-22 15:16:03 +00:00
numplayersingame++;
}
if (numplayersingame <= 1)
return true;
Remove indents on #ifdefs and take K_drawInput in the hud_position check
2018-11-03 21:24:45 +00:00
#ifdef HAVE_BLUA
if (!LUA_HudEnabled(hud_minirankings))
return false; // Don't proceed but still return true for free play above if HUD is disabled.
#endif
* FREE PLAY! The necessary corollary to HERE COMES A NEW CHALLENGER... * Activates when there are less than two non-spectators in a netgame. * Shows flashing text at the bottom of the screen. * Prevents drawing several UI elements that only make sense with multiple players. * Prevents matchesplayed being increased. * Improve the mapreset timer's behaviour. * Now you get to see the HERE COMES A NEW CHALLENGER screen as the starting frame of the relevant map transition, since it happens on mapreset being 1 rather than 0. * Make a bunch of normal gameplay stuff that might've activated unnecessarily during mapreset now not able to. * Hide some other stuff that might've been visible for no good reason. * Improve Mirror mode. * First person now works with it! * Tweaked the minimap player heads. Although the main section of the automap is mirrored, it feels... wrong to mirror the player head? IDK, you may wish to revert this, but given that everything else is the right way around except for the level itself...* Disable the titlescreen demos, at least until we actually gear up for release and make real ones. * Disable the titlescreen demos, at least until we actually gear up for release and make real ones.
2018-07-22 15:16:03 +00:00
for (j = 0; j < numplayersingame; j++)
{
Have HU_DrawRankings and K_drawKartPositionFaces learn a thing or two from each other, considering the latter was originally copypasted code from the former but then diverged a bit. Hopefully this solves our disconnect woes.
2018-10-30 23:01:17 +00:00
UINT8 lowestposition = MAXPLAYERS;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
for (i = 0; i < MAXPLAYERS; i++)
{
Some adjustments to the position faces. (Currently untested, but I need to merge master in and accidentially did this before that and I still have to compile from scratch for this branch, so...)
2018-10-30 22:07:35 +00:00
if (completed[i] || !playeringame[i] || players[i].spectator || !players[i].mo)
continue;
Have HU_DrawRankings and K_drawKartPositionFaces learn a thing or two from each other, considering the latter was originally copypasted code from the former but then diverged a bit. Hopefully this solves our disconnect woes.
2018-10-30 23:01:17 +00:00
if (players[i].kartstuff[k_position] >= lowestposition)
continue;
rankplayer[ranklines] = i;
lowestposition = players[i].kartstuff[k_position];
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
}
Have HU_DrawRankings and K_drawKartPositionFaces learn a thing or two from each other, considering the latter was originally copypasted code from the former but then diverged a bit. Hopefully this solves our disconnect woes.
2018-10-30 23:01:17 +00:00
*A biggie: two-tier intermission screen! * Have the entire thing slide the fuck away a short while into the intermission. * The tab screen is modified to work off similar behaviour and presentation. * To go with it, a revamp of how Battle's scoring is handled. * It's now considered "hits", and is stored in a reuse in one of the vanilla NiGHTS variables, allowing it to use exactly the same ranking mechanisms as race. * No more resetting of score between battle rounds. * Minor, unrelated general code cleanup in places. * Disable the YEEEAH in splitscreen, otherwise you'll hear it *all the time*.
2018-07-18 19:23:46 +00:00
i = rankplayer[ranklines];
completed[i] = true;
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
if (players+i == stplyr)
strank = ranklines;
//if (ranklines == 5)
//break; // Only draw the top 5 players -- we do this a different way now...
*A biggie: two-tier intermission screen! * Have the entire thing slide the fuck away a short while into the intermission. * The tab screen is modified to work off similar behaviour and presentation. * To go with it, a revamp of how Battle's scoring is handled. * It's now considered "hits", and is stored in a reuse in one of the vanilla NiGHTS variables, allowing it to use exactly the same ranking mechanisms as race. * No more resetting of score between battle rounds. * Minor, unrelated general code cleanup in places. * Disable the YEEEAH in splitscreen, otherwise you'll hear it *all the time*.
2018-07-18 19:23:46 +00:00
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
ranklines++;
}
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
if (ranklines < 5)
Y -= (9*ranklines);
else
Y -= (9*5);
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
* Fix spectators having the "YOU ARE THIS PERSON" highlight on the minirankings be done on the person in first. * Apply the "YOU ARE THIS PERSON" highlight to all non-splitscreen circumstances that use the tiny player icons. (New locations: Tab rankings, intermission, completed votes.)
2018-11-10 12:31:41 +00:00
if (G_BattleGametype() || strank <= 2) // too close to the top, or playing battle, or a spectator? would have had (strank == -1) called out, but already caught by (strank <= 2)
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
{
i = 0;
if (ranklines > 5) // could be both...
ranklines = 5;
}
else if (strank+3 > ranklines) // too close to the bottom?
Fix ghost rankings issue
2018-11-02 05:19:25 +00:00
{
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
i = ranklines - 5;
wrong var fix
2018-11-02 18:01:29 +00:00
if (i < 0)
i = 0;
Fix ghost rankings issue
2018-11-02 05:19:25 +00:00
}
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
else
{
i = strank-2;
ranklines = strank+3;
}
for (; i < ranklines; i++)
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
{
Some adjustments to the position faces. (Currently untested, but I need to merge master in and accidentially did this before that and I still have to compile from scratch for this branch, so...)
2018-10-30 22:07:35 +00:00
if (!playeringame[rankplayer[i]]) continue;
if (players[rankplayer[i]].spectator) continue;
Fixed spectating for real, messages for changing some kart cvars, Mirror Mode disallowed in Battle
2018-01-30 00:15:25 +00:00
if (!players[rankplayer[i]].mo) continue;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
That's it for me. No new features, no major sprite replacements. Maybe bugfixing stuff like this I did while half-asleep just in case it turns out I missed a test case. * Oni's new 1x Bumpers and Out-Of-Bumpers competition-style 'X'! * Modify alignment for `GOTITx` emblem drawing to match new Chaos Coin sprites. * Adjust m_cond.c list to use new Chaos Coin Emblem sprite slots.
2018-11-01 00:10:34 +00:00
bumperx = FACE_X+19;
X & balloons on ranking no i still haven't fixed the numbers yet, but the order should still be ok :V
2017-11-30 00:35:37 +00:00
*A biggie: two-tier intermission screen! * Have the entire thing slide the fuck away a short while into the intermission. * The tab screen is modified to work off similar behaviour and presentation. * To go with it, a revamp of how Battle's scoring is handled. * It's now considered "hits", and is stored in a reuse in one of the vanilla NiGHTS variables, allowing it to use exactly the same ranking mechanisms as race. * No more resetting of score between battle rounds. * Minor, unrelated general code cleanup in places. * Disable the YEEEAH in splitscreen, otherwise you'll hear it *all the time*.
2018-07-18 19:23:46 +00:00
if (players[rankplayer[i]].mo->color)
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
{
colormap = R_GetTranslationColormap(players[rankplayer[i]].skin, players[rankplayer[i]].mo->color, GTC_CACHE);
Star colormap is decided to be used per mobj with mobj->colorize Star creates afterimages that are colorized and fullbright Star makes the player fullbright
2018-02-05 00:00:36 +00:00
if (players[rankplayer[i]].mo->colorized)
Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems # Conflicts: # src/dehacked.c # src/hardware/hw_main.c # src/info.c # src/info.h # src/k_kart.c # src/p_enemy.c # src/p_user.c # src/r_things.c
2018-02-06 00:08:49 +00:00
colormap = R_GetTranslationColormap(TC_RAINBOW, players[rankplayer[i]].mo->color, GTC_CACHE);
Star colormap is decided to be used per mobj with mobj->colorize Star creates afterimages that are colorized and fullbright Star makes the player fullbright
2018-02-05 00:00:36 +00:00
else
colormap = R_GetTranslationColormap(players[rankplayer[i]].skin, players[rankplayer[i]].mo->color, GTC_CACHE);
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
V_DrawMappedPatch(FACE_X, Y, V_HUDTRANS|V_SNAPTOLEFT, facerankprefix[players[rankplayer[i]].skin], colormap);
*A biggie: two-tier intermission screen! * Have the entire thing slide the fuck away a short while into the intermission. * The tab screen is modified to work off similar behaviour and presentation. * To go with it, a revamp of how Battle's scoring is handled. * It's now considered "hits", and is stored in a reuse in one of the vanilla NiGHTS variables, allowing it to use exactly the same ranking mechanisms as race. * No more resetting of score between battle rounds. * Minor, unrelated general code cleanup in places. * Disable the YEEEAH in splitscreen, otherwise you'll hear it *all the time*.
2018-07-18 19:23:46 +00:00
if (G_BattleGametype() && players[rankplayer[i]].kartstuff[k_bumper] > 0)
X & balloons on ranking no i still haven't fixed the numbers yet, but the order should still be ok :V
2017-11-30 00:35:37 +00:00
{
Ranking face highlights
2018-11-10 05:01:44 +00:00
V_DrawMappedPatch(bumperx-2, Y, V_HUDTRANS|V_SNAPTOLEFT, kp_tinybumper[0], colormap);
That's it for me. No new features, no major sprite replacements. Maybe bugfixing stuff like this I did while half-asleep just in case it turns out I missed a test case. * Oni's new 1x Bumpers and Out-Of-Bumpers competition-style 'X'! * Modify alignment for `GOTITx` emblem drawing to match new Chaos Coin sprites. * Adjust m_cond.c list to use new Chaos Coin Emblem sprite slots.
2018-11-01 00:10:34 +00:00
for (j = 1; j < players[rankplayer[i]].kartstuff[k_bumper]; j++)
X & balloons on ranking no i still haven't fixed the numbers yet, but the order should still be ok :V
2017-11-30 00:35:37 +00:00
{
That's it for me. No new features, no major sprite replacements. Maybe bugfixing stuff like this I did while half-asleep just in case it turns out I missed a test case. * Oni's new 1x Bumpers and Out-Of-Bumpers competition-style 'X'! * Modify alignment for `GOTITx` emblem drawing to match new Chaos Coin sprites. * Adjust m_cond.c list to use new Chaos Coin Emblem sprite slots.
2018-11-01 00:10:34 +00:00
bumperx += 5;
Ranking face highlights
2018-11-10 05:01:44 +00:00
V_DrawMappedPatch(bumperx, Y, V_HUDTRANS|V_SNAPTOLEFT, kp_tinybumper[1], colormap);
X & balloons on ranking no i still haven't fixed the numbers yet, but the order should still be ok :V
2017-11-30 00:35:37 +00:00
}
}
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
}
X & balloons on ranking no i still haven't fixed the numbers yet, but the order should still be ok :V
2017-11-30 00:35:37 +00:00
Ranking face highlights
2018-11-10 05:01:44 +00:00
if (i == strank)
V_DrawScaledPatch(FACE_X, Y, V_HUDTRANS|V_SNAPTOLEFT, kp_facehighlight[(leveltime / 4) % 8]);
*A biggie: two-tier intermission screen! * Have the entire thing slide the fuck away a short while into the intermission. * The tab screen is modified to work off similar behaviour and presentation. * To go with it, a revamp of how Battle's scoring is handled. * It's now considered "hits", and is stored in a reuse in one of the vanilla NiGHTS variables, allowing it to use exactly the same ranking mechanisms as race. * No more resetting of score between battle rounds. * Minor, unrelated general code cleanup in places. * Disable the YEEEAH in splitscreen, otherwise you'll hear it *all the time*.
2018-07-18 19:23:46 +00:00
if (G_BattleGametype() && players[rankplayer[i]].kartstuff[k_bumper] <= 0)
That's it for me. No new features, no major sprite replacements. Maybe bugfixing stuff like this I did while half-asleep just in case it turns out I missed a test case. * Oni's new 1x Bumpers and Out-Of-Bumpers competition-style 'X'! * Modify alignment for `GOTITx` emblem drawing to match new Chaos Coin sprites. * Adjust m_cond.c list to use new Chaos Coin Emblem sprite slots.
2018-11-01 00:10:34 +00:00
V_DrawScaledPatch(FACE_X-4, Y-3, V_HUDTRANS|V_SNAPTOLEFT, kp_ranknobumpers);
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
else
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
{
INT32 pos = players[rankplayer[i]].kartstuff[k_position];
if (pos < 0 || pos > MAXPLAYERS)
pos = 0;
// Draws the little number over the face
V_DrawScaledPatch(FACE_X-5, Y+10, V_HUDTRANS|V_SNAPTOLEFT, kp_facenum[pos]);
}
X & balloons on ranking no i still haven't fixed the numbers yet, but the order should still be ok :V
2017-11-30 00:35:37 +00:00
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
Y += 18;
}
* FREE PLAY! The necessary corollary to HERE COMES A NEW CHALLENGER... * Activates when there are less than two non-spectators in a netgame. * Shows flashing text at the bottom of the screen. * Prevents drawing several UI elements that only make sense with multiple players. * Prevents matchesplayed being increased. * Improve the mapreset timer's behaviour. * Now you get to see the HERE COMES A NEW CHALLENGER screen as the starting frame of the relevant map transition, since it happens on mapreset being 1 rather than 0. * Make a bunch of normal gameplay stuff that might've activated unnecessarily during mapreset now not able to. * Hide some other stuff that might've been visible for no good reason. * Improve Mirror mode. * First person now works with it! * Tweaked the minimap player heads. Although the main section of the automap is mirrored, it feels... wrong to mirror the player head? IDK, you may wish to revert this, but given that everything else is the right way around except for the level itself...* Disable the titlescreen demos, at least until we actually gear up for release and make real ones. * Disable the titlescreen demos, at least until we actually gear up for release and make real ones.
2018-07-22 15:16:03 +00:00
return false;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
}
That's it for me. No new features, no major sprite replacements. Maybe bugfixing stuff like this I did while half-asleep just in case it turns out I missed a test case. * Oni's new 1x Bumpers and Out-Of-Bumpers competition-style 'X'! * Modify alignment for `GOTITx` emblem drawing to match new Chaos Coin sprites. * Adjust m_cond.c list to use new Chaos Coin Emblem sprite slots.
2018-11-01 00:10:34 +00:00
//
// HU_DrawTabRankings -- moved here to take advantage of kart stuff!
//
void HU_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, INT32 whiteplayer, INT32 hilicol)
{
INT32 i, rightoffset = 240;
const UINT8 *colormap;
INT32 dupadjust = (vid.width/vid.dupx), duptweak = (dupadjust - BASEVIDWIDTH)/2;
//this function is designed for 9 or less score lines only
//I_Assert(scorelines <= 9); -- not today bitch, kart fixed it up
V_DrawFill(1-duptweak, 26, dupadjust-2, 1, 0); // Draw a horizontal line because it looks nice!
if (scorelines > 8)
{
V_DrawFill(160, 26, 1, 147, 0); // Draw a vertical line to separate the two sides.
V_DrawFill(1-duptweak, 173, dupadjust-2, 1, 0); // And a horizontal line near the bottom.
rightoffset = (BASEVIDWIDTH/2) - 4 - x;
}
for (i = 0; i < scorelines; i++)
{
char strtime[MAXPLAYERNAME+1];
if (players[tab[i].num].spectator || !players[tab[i].num].mo)
continue; //ignore them.
if (netgame // don't draw it offline
&& tab[i].num != serverplayer)
HU_drawPing(x + ((i < 8) ? -19 : rightoffset + 13), y+2, playerpingtable[tab[i].num], false);
if (scorelines > 8)
strlcpy(strtime, tab[i].name, 6);
else
STRBUFCPY(strtime, tab[i].name);
V_DrawString(x + 20, y,
((tab[i].num == whiteplayer)
? hilicol|V_ALLOWLOWERCASE
: V_ALLOWLOWERCASE),
strtime);
if (players[tab[i].num].mo->color)
{
colormap = R_GetTranslationColormap(players[tab[i].num].skin, players[tab[i].num].mo->color, GTC_CACHE);
if (players[tab[i].num].mo->colorized)
colormap = R_GetTranslationColormap(TC_RAINBOW, players[tab[i].num].mo->color, GTC_CACHE);
else
colormap = R_GetTranslationColormap(players[tab[i].num].skin, players[tab[i].num].mo->color, GTC_CACHE);
V_DrawMappedPatch(x, y-4, 0, facerankprefix[players[tab[i].num].skin], colormap);
/*if (G_BattleGametype() && players[tab[i].num].kartstuff[k_bumper] > 0) -- not enough space for this
{
INT32 bumperx = x+19;
Ranking face highlights
2018-11-10 05:01:44 +00:00
V_DrawMappedPatch(bumperx-2, y-4, 0, kp_tinybumper[0], colormap);
That's it for me. No new features, no major sprite replacements. Maybe bugfixing stuff like this I did while half-asleep just in case it turns out I missed a test case. * Oni's new 1x Bumpers and Out-Of-Bumpers competition-style 'X'! * Modify alignment for `GOTITx` emblem drawing to match new Chaos Coin sprites. * Adjust m_cond.c list to use new Chaos Coin Emblem sprite slots.
2018-11-01 00:10:34 +00:00
for (j = 1; j < players[tab[i].num].kartstuff[k_bumper]; j++)
{
bumperx += 5;
Ranking face highlights
2018-11-10 05:01:44 +00:00
V_DrawMappedPatch(bumperx, y-4, 0, kp_tinybumper[1], colormap);
That's it for me. No new features, no major sprite replacements. Maybe bugfixing stuff like this I did while half-asleep just in case it turns out I missed a test case. * Oni's new 1x Bumpers and Out-Of-Bumpers competition-style 'X'! * Modify alignment for `GOTITx` emblem drawing to match new Chaos Coin sprites. * Adjust m_cond.c list to use new Chaos Coin Emblem sprite slots.
2018-11-01 00:10:34 +00:00
}
}*/
}
* Fix spectators having the "YOU ARE THIS PERSON" highlight on the minirankings be done on the person in first. * Apply the "YOU ARE THIS PERSON" highlight to all non-splitscreen circumstances that use the tiny player icons. (New locations: Tab rankings, intermission, completed votes.)
2018-11-10 12:31:41 +00:00
if (tab[i].num == whiteplayer)
V_DrawScaledPatch(x, y-4, 0, kp_facehighlight[(leveltime / 4) % 8]);
That's it for me. No new features, no major sprite replacements. Maybe bugfixing stuff like this I did while half-asleep just in case it turns out I missed a test case. * Oni's new 1x Bumpers and Out-Of-Bumpers competition-style 'X'! * Modify alignment for `GOTITx` emblem drawing to match new Chaos Coin sprites. * Adjust m_cond.c list to use new Chaos Coin Emblem sprite slots.
2018-11-01 00:10:34 +00:00
if (G_BattleGametype() && players[tab[i].num].kartstuff[k_bumper] <= 0)
V_DrawScaledPatch(x-4, y-7, 0, kp_ranknobumpers);
else
{
INT32 pos = players[tab[i].num].kartstuff[k_position];
if (pos < 0 || pos > MAXPLAYERS)
pos = 0;
// Draws the little number over the face
V_DrawScaledPatch(x-5, y+6, 0, kp_facenum[pos]);
}
if (G_RaceGametype())
{
#define timestring(time) va("%i'%02i\"%02i", G_TicsToMinutes(time, true), G_TicsToSeconds(time), G_TicsToCentiseconds(time))
if (players[tab[i].num].exiting)
V_DrawRightAlignedString(x+rightoffset, y, hilicol, timestring(players[tab[i].num].realtime));
else if (players[tab[i].num].pflags & PF_TIMEOVER)
V_DrawRightAlignedThinString(x+rightoffset, y-1, 0, "NO CONTEST.");
else if (circuitmap)
V_DrawRightAlignedString(x+rightoffset, y, 0, va("Lap %d", tab[i].count));
#undef timestring
}
else
V_DrawRightAlignedString(x+rightoffset, y, 0, va("%u", tab[i].count));
y += 18;
if (i == 7)
{
y = 33;
x = (BASEVIDWIDTH/2) + 4;
}
}
}
HUD shenanigans In battle because it messes with CHECK, and also I'm too lazy to switch branches
2017-11-06 22:31:52 +00:00
static void K_drawKartLaps(void)
{
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
INT32 splitflags = K_calcSplitFlags(V_SNAPTOBOTTOM|V_SNAPTOLEFT);
HUD shenanigans In battle because it messes with CHECK, and also I'm too lazy to switch branches
2017-11-06 22:31:52 +00:00
Closer to done HUD tweaking? Splitscreen in Battle is left
2017-12-24 00:14:06 +00:00
if (splitscreen > 1)
{
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawScaledPatch(LAPS_X, LAPS_Y, V_HUDTRANS|splitflags, kp_splitlapflag);
HUD shenanigans In battle because it messes with CHECK, and also I'm too lazy to switch branches
2017-11-06 22:31:52 +00:00
Closer to done HUD tweaking? Splitscreen in Battle is left
2017-12-24 00:14:06 +00:00
if (stplyr->exiting)
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawString(LAPS_X+13, LAPS_Y+1, V_HUDTRANS|splitflags, "FIN");
Closer to done HUD tweaking? Splitscreen in Battle is left
2017-12-24 00:14:06 +00:00
else
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawString(LAPS_X+13, LAPS_Y+1, V_HUDTRANS|splitflags, va("%d/%d", stplyr->laps+1, cv_numlaps.value));
Closer to done HUD tweaking? Splitscreen in Battle is left
2017-12-24 00:14:06 +00:00
}
HUD shenanigans In battle because it messes with CHECK, and also I'm too lazy to switch branches
2017-11-06 22:31:52 +00:00
else
Closer to done HUD tweaking? Splitscreen in Battle is left
2017-12-24 00:14:06 +00:00
{
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawScaledPatch(LAPS_X, LAPS_Y, V_HUDTRANS|splitflags, kp_lapsticker);
Closer to done HUD tweaking? Splitscreen in Battle is left
2017-12-24 00:14:06 +00:00
if (stplyr->exiting)
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawKartString(LAPS_X+33, LAPS_Y+3, V_HUDTRANS|splitflags, "FIN");
Closer to done HUD tweaking? Splitscreen in Battle is left
2017-12-24 00:14:06 +00:00
else
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawKartString(LAPS_X+33, LAPS_Y+3, V_HUDTRANS|splitflags, va("%d/%d", stplyr->laps+1, cv_numlaps.value));
Closer to done HUD tweaking? Splitscreen in Battle is left
2017-12-24 00:14:06 +00:00
}
HUD shenanigans In battle because it messes with CHECK, and also I'm too lazy to switch branches
2017-11-06 22:31:52 +00:00
}
Hideous early speedometer
2017-03-08 00:28:31 +00:00
static void K_drawKartSpeedometer(void)
{
mph hud speed option
2017-03-09 20:29:17 +00:00
fixed_t convSpeed;
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
INT32 splitflags = K_calcSplitFlags(V_SNAPTOBOTTOM|V_SNAPTOLEFT);
HUD
2017-12-18 01:42:17 +00:00
Better menus
2018-06-15 00:18:29 +00:00
if (cv_kartspeedometer.value == 1) // Kilometers
mph hud speed option
2017-03-09 20:29:17 +00:00
{
Mobj scale fixes - MAXSTEPMOVE is affected by mobjscale - Minimum bump speeds (both wall & object) are affected by mobjscale - Minimum speed required for drifting is affected by player scale - Speedometer speeds are proportional to mobjscale - Camera no longer scales with player scale, to make the fact that you're either Lightning'd or Mega'd more obvious :V - Sevvvvvv go work on Dimension Heist
2018-01-15 21:14:45 +00:00
convSpeed = FixedDiv(FixedMul(stplyr->speed, 142371), mapheaderinfo[gamemap-1]->mobj_scale)/FRACUNIT; // 2.172409058
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawKartString(SPDM_X, SPDM_Y, V_HUDTRANS|splitflags, va("%3d km/h", convSpeed));
mph hud speed option
2017-03-09 20:29:17 +00:00
}
Better menus
2018-06-15 00:18:29 +00:00
else if (cv_kartspeedometer.value == 2) // Miles
mph hud speed option
2017-03-09 20:29:17 +00:00
{
Mobj scale fixes - MAXSTEPMOVE is affected by mobjscale - Minimum bump speeds (both wall & object) are affected by mobjscale - Minimum speed required for drifting is affected by player scale - Speedometer speeds are proportional to mobjscale - Camera no longer scales with player scale, to make the fact that you're either Lightning'd or Mega'd more obvious :V - Sevvvvvv go work on Dimension Heist
2018-01-15 21:14:45 +00:00
convSpeed = FixedDiv(FixedMul(stplyr->speed, 88465), mapheaderinfo[gamemap-1]->mobj_scale)/FRACUNIT; // 1.349868774
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawKartString(SPDM_X, SPDM_Y, V_HUDTRANS|splitflags, va("%3d mph", convSpeed));
mph hud speed option
2017-03-09 20:29:17 +00:00
}
Better menus
2018-06-15 00:18:29 +00:00
else if (cv_kartspeedometer.value == 3) // Fracunits
renamed mphspeed console var to speedometer has 4 options, off, Kilometers, miles, and fracunits
2017-03-13 02:44:31 +00:00
{
Mobj scale fixes - MAXSTEPMOVE is affected by mobjscale - Minimum bump speeds (both wall & object) are affected by mobjscale - Minimum speed required for drifting is affected by player scale - Speedometer speeds are proportional to mobjscale - Camera no longer scales with player scale, to make the fact that you're either Lightning'd or Mega'd more obvious :V - Sevvvvvv go work on Dimension Heist
2018-01-15 21:14:45 +00:00
convSpeed = FixedDiv(stplyr->speed, mapheaderinfo[gamemap-1]->mobj_scale)/FRACUNIT;
fut
2018-01-16 23:02:16 +00:00
V_DrawKartString(SPDM_X, SPDM_Y, V_HUDTRANS|splitflags, va("%3d fu/t", convSpeed));
renamed mphspeed console var to speedometer has 4 options, off, Kilometers, miles, and fracunits
2017-03-13 02:44:31 +00:00
}
Hideous early speedometer
2017-03-08 00:28:31 +00:00
}
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
static void K_drawKartBumpersOrKarma(void)
Battle HUD stuff
2017-11-14 01:45:57 +00:00
{
Spectating is properly implemented now - Spectate button works - Spectating & objectplace controls are usable now - New spectator HUD
2018-01-23 03:18:57 +00:00
UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, stplyr->skincolor, 0);
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
INT32 splitflags = K_calcSplitFlags(V_SNAPTOBOTTOM|V_SNAPTOLEFT);
Battle HUD stuff
2017-11-14 01:45:57 +00:00
Battle hud stuff?!
2017-12-24 01:55:23 +00:00
if (splitscreen > 1)
Battle HUD stuff
2017-11-14 01:45:57 +00:00
{
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
if (stplyr->kartstuff[k_bumper] <= 0)
Battle hud stuff?!
2017-12-24 01:55:23 +00:00
{
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawMappedPatch(LAPS_X, LAPS_Y-1, V_HUDTRANS|splitflags, kp_splitkarmabomb, colormap);
Karma point changes - Number of points needed to come back is now 2. - Bombs no longer give extra points.
2018-10-24 21:29:13 +00:00
V_DrawString(LAPS_X+13, LAPS_Y+1, V_HUDTRANS|splitflags, va("%d/2", stplyr->kartstuff[k_comebackpoints]));
Battle hud stuff?!
2017-12-24 01:55:23 +00:00
}
else
{
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
V_DrawMappedPatch(LAPS_X, LAPS_Y-1, V_HUDTRANS|splitflags, kp_rankbumper, colormap);
V_DrawString(LAPS_X+13, LAPS_Y+1, V_HUDTRANS|splitflags, va("%d/%d", stplyr->kartstuff[k_bumper], cv_kartbumpers.value));
Battle hud stuff?!
2017-12-24 01:55:23 +00:00
}
Battle HUD stuff
2017-11-14 01:45:57 +00:00
}
else
{
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
if (stplyr->kartstuff[k_bumper] <= 0)
Battle HUD stuff
2017-11-14 01:45:57 +00:00
{
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawMappedPatch(LAPS_X, LAPS_Y, V_HUDTRANS|splitflags, kp_karmasticker, colormap);
Shorter Karma sticker
2018-11-10 06:03:34 +00:00
V_DrawKartString(LAPS_X+47, LAPS_Y+3, V_HUDTRANS|splitflags, va("%d/2", stplyr->kartstuff[k_comebackpoints]));
Battle HUD stuff
2017-11-14 01:45:57 +00:00
}
else
{
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
if (stplyr->kartstuff[k_bumper] > 9 && cv_kartbumpers.value > 9)
V_DrawMappedPatch(LAPS_X, LAPS_Y, V_HUDTRANS|splitflags, kp_bumperstickerwide, colormap);
Battle hud stuff?!
2017-12-24 01:55:23 +00:00
else
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
V_DrawMappedPatch(LAPS_X, LAPS_Y, V_HUDTRANS|splitflags, kp_bumpersticker, colormap);
V_DrawKartString(LAPS_X+47, LAPS_Y+3, V_HUDTRANS|splitflags, va("%d/%d", stplyr->kartstuff[k_bumper], cv_kartbumpers.value));
Battle HUD stuff
2017-11-14 01:45:57 +00:00
}
}
}
Add missing K_ functions
2018-11-07 23:23:28 +00:00
static fixed_t K_FindCheckX(fixed_t px, fixed_t py, angle_t ang, fixed_t mx, fixed_t my)
CHECK indicator Turn it off with the kartcheck console var
2017-11-02 04:35:10 +00:00
{
Everything. - Player arrows now show if a player is in the item roulette - Boo has been improved, and added back to Battle's item roulette - The CHECK HUD item is now more accurate, and should appear more often - Early comeback mechanic. Functional, but really unpolished - Attempted (again) to make the first player to join in a netgame spawn with balloons - No longer shows respawn text on death
2017-11-05 06:43:47 +00:00
fixed_t dist, x;
Lots of small tweaks & fixes, that should make Battle a LOT more bearable - Comeback timer is now always 10 seconds instead of scaling - Takes 10 seconds before exiting - Flashing tics is doubled in Battle Mode - Removed a bunch of bomb nerfs - Bombs are back to making only 1 point per hit - Exposed K_GetKartAccel & K_GetKartFlashing to Lua - Item boxes should no longer drop while going up slopes - Trading item boxes with a bomb should turn you back into a bomb - Balloons should no longer all respawn when dying in pits in 2-player games - Flashing players are able to kill *thrown* shells again (shields and trap items are still unkillable). Prevents red shells from being able to stick to a flashing player and hurt them again as soon as they're done flashing - CHECK appears at a farther distance
2017-11-17 05:48:36 +00:00
fixed_t range = RING_DIST/3;
Everything. - Player arrows now show if a player is in the item roulette - Boo has been improved, and added back to Battle's item roulette - The CHECK HUD item is now more accurate, and should appear more often - Early comeback mechanic. Functional, but really unpolished - Attempted (again) to make the first player to join in a netgame spawn with balloons - No longer shows respawn text on death
2017-11-05 06:43:47 +00:00
angle_t diff;
CHECK indicator Turn it off with the kartcheck console var
2017-11-02 04:35:10 +00:00
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
range *= gamespeed+1;
More adjustments - Comeback timer gets higher the more you get hit - Your ghost appears over the bomb - Speed & accel is set to worst while a bomb - CHECK range scales with kartcc
2017-11-06 04:18:58 +00:00
Everything. - Player arrows now show if a player is in the item roulette - Boo has been improved, and added back to Battle's item roulette - The CHECK HUD item is now more accurate, and should appear more often - Early comeback mechanic. Functional, but really unpolished - Attempted (again) to make the first player to join in a netgame spawn with balloons - No longer shows respawn text on death
2017-11-05 06:43:47 +00:00
dist = abs(R_PointToDist2(px, py, mx, my));
More adjustments - Comeback timer gets higher the more you get hit - Your ghost appears over the bomb - Speed & accel is set to worst while a bomb - CHECK range scales with kartcc
2017-11-06 04:18:58 +00:00
if (dist > range)
CHECK indicator Turn it off with the kartcheck console var
2017-11-02 04:35:10 +00:00
return -320;
Everything. - Player arrows now show if a player is in the item roulette - Boo has been improved, and added back to Battle's item roulette - The CHECK HUD item is now more accurate, and should appear more often - Early comeback mechanic. Functional, but really unpolished - Attempted (again) to make the first player to join in a netgame spawn with balloons - No longer shows respawn text on death
2017-11-05 06:43:47 +00:00
diff = R_PointToAngle2(px, py, mx, my) - ang;
CHECK indicator Turn it off with the kartcheck console var
2017-11-02 04:35:10 +00:00
Everything. - Player arrows now show if a player is in the item roulette - Boo has been improved, and added back to Battle's item roulette - The CHECK HUD item is now more accurate, and should appear more often - Early comeback mechanic. Functional, but really unpolished - Attempted (again) to make the first player to join in a netgame spawn with balloons - No longer shows respawn text on death
2017-11-05 06:43:47 +00:00
if (diff < ANGLE_90 || diff > ANGLE_270)
CHECK indicator Turn it off with the kartcheck console var
2017-11-02 04:35:10 +00:00
return -320;
else
Some HUD tweaks - CHECK now works in Mirror Mode - Lakitu flips in Mirror Mode - CHECK now shows up in splitscreen, because why not - Fixed a compiling error as a result of me attempting to revert wipeout
2017-12-13 23:01:26 +00:00
x = (FixedMul(FINETANGENT(((diff+ANGLE_90)>>ANGLETOFINESHIFT) & 4095), 160<<FRACBITS) + (160<<FRACBITS))>>FRACBITS;
CHECK indicator Turn it off with the kartcheck console var
2017-11-02 04:35:10 +00:00
Encore mode - a fresh take on mirror mode! * Palette remaps. * Branding. TODO: * Doesn't work in GL. (Mostly.) I have SOME ideas on how to tackle this, but... * Transmaps are broken in Encore for some reason. * I tried to make in-level colormaps shimmy over, but it didn't quite work, so I commented it out and only semi-fixed it.
2018-07-23 22:50:41 +00:00
if (encoremode)
Some HUD tweaks - CHECK now works in Mirror Mode - Lakitu flips in Mirror Mode - CHECK now shows up in splitscreen, because why not - Fixed a compiling error as a result of me attempting to revert wipeout
2017-12-13 23:01:26 +00:00
x = 320-x;
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
if (splitscreen > 1)
Merge remote-tracking branch 'refs/remotes/origin/battle' into quads # Conflicts: # src/g_game.c # src/k_kart.c
2017-12-18 06:02:53 +00:00
x /= 2;
CHECK indicator Turn it off with the kartcheck console var
2017-11-02 04:35:10 +00:00
Some HUD tweaks - CHECK now works in Mirror Mode - Lakitu flips in Mirror Mode - CHECK now shows up in splitscreen, because why not - Fixed a compiling error as a result of me attempting to revert wipeout
2017-12-13 23:01:26 +00:00
return x;
CHECK indicator Turn it off with the kartcheck console var
2017-11-02 04:35:10 +00:00
}
WANTED
2018-07-01 08:36:09 +00:00
static void K_drawKartWanted(void)
{
UINT8 i, numwanted = 0;
WANTED 2
2018-07-01 18:11:48 +00:00
UINT8 *colormap = NULL;
WANTED
2018-07-01 08:36:09 +00:00
WANTED 2
2018-07-01 18:11:48 +00:00
if (splitscreen) // Can't fit the poster on screen, sadly
WANTED
2018-07-01 08:36:09 +00:00
{
WANTED 2
2018-07-01 18:11:48 +00:00
if (K_IsPlayerWanted(stplyr) && leveltime % 10 > 3)
Use V_ORANGEMAP for blinking WANTED text in Battle splitscreen
2018-10-28 05:50:27 +00:00
V_DrawRightAlignedString(WANT_X, WANT_Y, K_calcSplitFlags(V_SNAPTOBOTTOM|V_SNAPTORIGHT|V_HUDTRANS|V_ORANGEMAP), "WANTED");
WANTED
2018-07-01 08:36:09 +00:00
return;
WANTED 2
2018-07-01 18:11:48 +00:00
}
WANTED
2018-07-01 08:36:09 +00:00
for (i = 0; i < 4; i++)
{
if (battlewanted[i] == -1)
break;
numwanted++;
}
if (numwanted <= 0)
return;
WANTED 2
2018-07-01 18:11:48 +00:00
if (battlewanted[0] != -1)
colormap = R_GetTranslationColormap(0, players[battlewanted[0]].skincolor, GTC_CACHE);
V_DrawFixedPatch(WANT_X<<FRACBITS, WANT_Y<<FRACBITS, FRACUNIT, V_HUDTRANS|V_SNAPTORIGHT|V_SNAPTOBOTTOM, kp_wanted, colormap);
WANTED
2018-07-01 08:36:09 +00:00
for (i = 0; i < numwanted; i++)
{
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
INT32 x = WANT_X+8, y = WANT_Y+21;
WANTED
2018-07-01 08:36:09 +00:00
fixed_t scale = FRACUNIT/2;
player_t *p = &players[battlewanted[i]];
if (battlewanted[i] == -1)
break;
if (numwanted == 1)
scale = FRACUNIT;
WANTED 2
2018-07-01 18:11:48 +00:00
else
{
if (i & 1)
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
x += 16;
WANTED 2
2018-07-01 18:11:48 +00:00
if (i > 1)
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
y += 16;
WANTED 2
2018-07-01 18:11:48 +00:00
}
WANTED
2018-07-01 08:36:09 +00:00
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
if (players[battlewanted[i]].skincolor)
WANTED
2018-07-01 08:36:09 +00:00
{
WANTED 2
2018-07-01 18:11:48 +00:00
colormap = R_GetTranslationColormap(TC_RAINBOW, p->skincolor, GTC_CACHE);
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
V_DrawFixedPatch(x<<FRACBITS, y<<FRACBITS, FRACUNIT, V_HUDTRANS|V_SNAPTORIGHT|V_SNAPTOBOTTOM, (scale == FRACUNIT ? facewantprefix[p->skin] : facerankprefix[p->skin]), colormap);
WANTED
2018-07-01 08:36:09 +00:00
}
}
}
CHECK indicator Turn it off with the kartcheck console var
2017-11-02 04:35:10 +00:00
static void K_drawKartPlayerCheck(void)
{
INT32 i;
UINT8 *colormap;
HUD shenanigans In battle because it messes with CHECK, and also I'm too lazy to switch branches
2017-11-06 22:31:52 +00:00
INT32 x;
CHECK indicator Turn it off with the kartcheck console var
2017-11-02 04:35:10 +00:00
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
INT32 splitflags = K_calcSplitFlags(V_SNAPTOBOTTOM);
HUD
2017-12-18 01:42:17 +00:00
New invincibility effect, grow/shrink stuff Whenever grow/shrink effects get made, I'll remove the Mario-style stuttered growth and whatever else needs doing beyond that
2018-02-10 06:19:33 +00:00
if (!stplyr->mo || stplyr->spectator)
CHECK indicator Turn it off with the kartcheck console var
2017-11-02 04:35:10 +00:00
return;
HUD shenanigans In battle because it messes with CHECK, and also I'm too lazy to switch branches
2017-11-06 22:31:52 +00:00
if (stplyr->awayviewtics)
CHECK indicator Turn it off with the kartcheck console var
2017-11-02 04:35:10 +00:00
return;
Spectating is properly implemented now - Spectate button works - Spectating & objectplace controls are usable now - New spectator HUD
2018-01-23 03:18:57 +00:00
if (camspin)
return;
CHECK indicator Turn it off with the kartcheck console var
2017-11-02 04:35:10 +00:00
for (i = 0; i < MAXPLAYERS; i++)
{
More frequent SPB, and fixed CHECK The new distance setting on SPB is directly inbetween the previous "way too rare" setting and the "way too frequent" setting before that. Hopefully they should come up in reasonable intervals now.
2018-06-12 21:14:32 +00:00
UINT8 pnum = 0;
* FREE PLAY! The necessary corollary to HERE COMES A NEW CHALLENGER... * Activates when there are less than two non-spectators in a netgame. * Shows flashing text at the bottom of the screen. * Prevents drawing several UI elements that only make sense with multiple players. * Prevents matchesplayed being increased. * Improve the mapreset timer's behaviour. * Now you get to see the HERE COMES A NEW CHALLENGER screen as the starting frame of the relevant map transition, since it happens on mapreset being 1 rather than 0. * Make a bunch of normal gameplay stuff that might've activated unnecessarily during mapreset now not able to. * Hide some other stuff that might've been visible for no good reason. * Improve Mirror mode. * First person now works with it! * Tweaked the minimap player heads. Although the main section of the automap is mirrored, it feels... wrong to mirror the player head? IDK, you may wish to revert this, but given that everything else is the right way around except for the level itself...* Disable the titlescreen demos, at least until we actually gear up for release and make real ones. * Disable the titlescreen demos, at least until we actually gear up for release and make real ones.
2018-07-22 15:16:03 +00:00
if (&players[i] == stplyr)
continue;
New invincibility effect, grow/shrink stuff Whenever grow/shrink effects get made, I'll remove the Mario-style stuttered growth and whatever else needs doing beyond that
2018-02-10 06:19:33 +00:00
if (!playeringame[i] || players[i].spectator)
continue;
if (!players[i].mo)
CHECK indicator Turn it off with the kartcheck console var
2017-11-02 04:35:10 +00:00
continue;
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
if ((players[i].kartstuff[k_invincibilitytimer] <= 0) && (leveltime & 2))
New invincibility effect, grow/shrink stuff Whenever grow/shrink effects get made, I'll remove the Mario-style stuttered growth and whatever else needs doing beyond that
2018-02-10 06:19:33 +00:00
pnum++; // white frames
if (players[i].kartstuff[k_itemtype] == KITEM_GROW || players[i].kartstuff[k_growshrinktimer] > 0)
pnum += 4;
else if (players[i].kartstuff[k_itemtype] == KITEM_INVINCIBILITY || players[i].kartstuff[k_invincibilitytimer])
pnum += 2;
Everything. - Player arrows now show if a player is in the item roulette - Boo has been improved, and added back to Battle's item roulette - The CHECK HUD item is now more accurate, and should appear more often - Early comeback mechanic. Functional, but really unpolished - Attempted (again) to make the first player to join in a netgame spawn with balloons - No longer shows respawn text on death
2017-11-05 06:43:47 +00:00
HUD shenanigans In battle because it messes with CHECK, and also I'm too lazy to switch branches
2017-11-06 22:31:52 +00:00
x = K_FindCheckX(stplyr->mo->x, stplyr->mo->y, stplyr->mo->angle, players[i].mo->x, players[i].mo->y);
CHECK indicator Turn it off with the kartcheck console var
2017-11-02 04:35:10 +00:00
if (x <= 320 && x >= 0)
{
if (x < 14)
x = 14;
else if (x > 306)
x = 306;
HUD shenanigans In battle because it messes with CHECK, and also I'm too lazy to switch branches
2017-11-06 22:31:52 +00:00
Spectating is properly implemented now - Spectate button works - Spectating & objectplace controls are usable now - New spectator HUD
2018-01-23 03:18:57 +00:00
colormap = R_GetTranslationColormap(TC_DEFAULT, players[i].mo->color, 0);
New invincibility effect, grow/shrink stuff Whenever grow/shrink effects get made, I'll remove the Mario-style stuttered growth and whatever else needs doing beyond that
2018-02-10 06:19:33 +00:00
V_DrawMappedPatch(x, CHEK_Y, V_HUDTRANS|splitflags, kp_check[pnum], colormap);
CHECK indicator Turn it off with the kartcheck console var
2017-11-02 04:35:10 +00:00
}
}
}
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
static void K_drawKartMinimapHead(mobj_t *mo, INT32 x, INT32 y, INT32 flags, patch_t *AutomapPic)
More post processor support, HUD tweaks, SP new game fix Mirror Mode minimap, growing position nums, and general reorganization. Some stuff needs more work but I'm exhausted rn
2017-12-19 06:55:33 +00:00
{
Belp - Minimap heads that aren't yours are transparent - Minimap has a visibility slider - Bomb stuff renamed to Mine
2018-02-08 03:33:27 +00:00
// amnum xpos & ypos are the icon's speed around the HUD.
// The number being divided by is for how fast it moves.
// The higher the number, the slower it moves.
// am xpos & ypos are the icon's starting position. Withouht
// it, they wouldn't 'spawn' on the top-right side of the HUD.
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
UINT8 skin = 0;
Squash a few more errors Updated my compile setup to GCC 6.3, makes it as far as m_misc.c now with ERRORMODE and DEBUGMODE, stops at some gettext related stuff I don't know how to fix now
2018-07-07 01:53:37 +00:00
fixed_t amnumxpos, amnumypos;
INT32 amxpos, amypos;
Belp - Minimap heads that aren't yours are transparent - Minimap has a visibility slider - Bomb stuff renamed to Mine
2018-02-08 03:33:27 +00:00
node_t *bsp = &nodes[numnodes-1];
fixed_t maxx, minx, maxy, miny;
Squash a few more errors Updated my compile setup to GCC 6.3, makes it as far as m_misc.c now with ERRORMODE and DEBUGMODE, stops at some gettext related stuff I don't know how to fix now
2018-07-07 01:53:37 +00:00
fixed_t mapwidth, mapheight;
fixed_t xoffset, yoffset;
fixed_t xscale, yscale, zoom;
Merge branch 'master' into sonicitems
2018-07-08 21:51:44 +00:00
if (mo->skin)
skin = ((skin_t*)mo->skin)-skins;
Belp - Minimap heads that aren't yours are transparent - Minimap has a visibility slider - Bomb stuff renamed to Mine
2018-02-08 03:33:27 +00:00
maxx = maxy = INT32_MAX;
minx = miny = INT32_MIN;
minx = bsp->bbox[0][BOXLEFT];
maxx = bsp->bbox[0][BOXRIGHT];
miny = bsp->bbox[0][BOXBOTTOM];
maxy = bsp->bbox[0][BOXTOP];
if (bsp->bbox[1][BOXLEFT] < minx)
minx = bsp->bbox[1][BOXLEFT];
if (bsp->bbox[1][BOXRIGHT] > maxx)
maxx = bsp->bbox[1][BOXRIGHT];
if (bsp->bbox[1][BOXBOTTOM] < miny)
miny = bsp->bbox[1][BOXBOTTOM];
if (bsp->bbox[1][BOXTOP] > maxy)
maxy = bsp->bbox[1][BOXTOP];
// You might be wondering why these are being bitshift here
// it's because mapwidth and height would otherwise overflow for maps larger than half the size possible...
// map boundaries and sizes will ALWAYS be whole numbers thankfully
// later calculations take into consideration that these are actually not in terms of FRACUNIT though
minx >>= FRACBITS;
maxx >>= FRACBITS;
miny >>= FRACBITS;
maxy >>= FRACBITS;
Squash a few more errors Updated my compile setup to GCC 6.3, makes it as far as m_misc.c now with ERRORMODE and DEBUGMODE, stops at some gettext related stuff I don't know how to fix now
2018-07-07 01:53:37 +00:00
mapwidth = maxx - minx;
mapheight = maxy - miny;
Belp - Minimap heads that aren't yours are transparent - Minimap has a visibility slider - Bomb stuff renamed to Mine
2018-02-08 03:33:27 +00:00
// These should always be small enough to be bitshift back right now
Squash a few more errors Updated my compile setup to GCC 6.3, makes it as far as m_misc.c now with ERRORMODE and DEBUGMODE, stops at some gettext related stuff I don't know how to fix now
2018-07-07 01:53:37 +00:00
xoffset = (minx + mapwidth/2)<<FRACBITS;
yoffset = (miny + mapheight/2)<<FRACBITS;
Belp - Minimap heads that aren't yours are transparent - Minimap has a visibility slider - Bomb stuff renamed to Mine
2018-02-08 03:33:27 +00:00
Squash a few more errors Updated my compile setup to GCC 6.3, makes it as far as m_misc.c now with ERRORMODE and DEBUGMODE, stops at some gettext related stuff I don't know how to fix now
2018-07-07 01:53:37 +00:00
xscale = FixedDiv(AutomapPic->width, mapwidth);
yscale = FixedDiv(AutomapPic->height, mapheight);
zoom = FixedMul(min(xscale, yscale), FRACUNIT-FRACUNIT/20);
Belp - Minimap heads that aren't yours are transparent - Minimap has a visibility slider - Bomb stuff renamed to Mine
2018-02-08 03:33:27 +00:00
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
amnumxpos = (FixedMul(mo->x, zoom) - FixedMul(xoffset, zoom));
amnumypos = -(FixedMul(mo->y, zoom) - FixedMul(yoffset, zoom));
Belp - Minimap heads that aren't yours are transparent - Minimap has a visibility slider - Bomb stuff renamed to Mine
2018-02-08 03:33:27 +00:00
Encore mode - a fresh take on mirror mode! * Palette remaps. * Branding. TODO: * Doesn't work in GL. (Mostly.) I have SOME ideas on how to tackle this, but... * Transmaps are broken in Encore for some reason. * I tried to make in-level colormaps shimmy over, but it didn't quite work, so I commented it out and only semi-fixed it.
2018-07-23 22:50:41 +00:00
if (encoremode)
* FREE PLAY! The necessary corollary to HERE COMES A NEW CHALLENGER... * Activates when there are less than two non-spectators in a netgame. * Shows flashing text at the bottom of the screen. * Prevents drawing several UI elements that only make sense with multiple players. * Prevents matchesplayed being increased. * Improve the mapreset timer's behaviour. * Now you get to see the HERE COMES A NEW CHALLENGER screen as the starting frame of the relevant map transition, since it happens on mapreset being 1 rather than 0. * Make a bunch of normal gameplay stuff that might've activated unnecessarily during mapreset now not able to. * Hide some other stuff that might've been visible for no good reason. * Improve Mirror mode. * First person now works with it! * Tweaked the minimap player heads. Although the main section of the automap is mirrored, it feels... wrong to mirror the player head? IDK, you may wish to revert this, but given that everything else is the right way around except for the level itself...* Disable the titlescreen demos, at least until we actually gear up for release and make real ones. * Disable the titlescreen demos, at least until we actually gear up for release and make real ones.
2018-07-22 15:16:03 +00:00
amnumxpos = -amnumxpos;
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
amxpos = amnumxpos + ((x + AutomapPic->width/2 - (facemmapprefix[skin]->width/2))<<FRACBITS);
amypos = amnumypos + ((y + AutomapPic->height/2 - (facemmapprefix[skin]->height/2))<<FRACBITS);
Belp - Minimap heads that aren't yours are transparent - Minimap has a visibility slider - Bomb stuff renamed to Mine
2018-02-08 03:33:27 +00:00
* FREE PLAY! The necessary corollary to HERE COMES A NEW CHALLENGER... * Activates when there are less than two non-spectators in a netgame. * Shows flashing text at the bottom of the screen. * Prevents drawing several UI elements that only make sense with multiple players. * Prevents matchesplayed being increased. * Improve the mapreset timer's behaviour. * Now you get to see the HERE COMES A NEW CHALLENGER screen as the starting frame of the relevant map transition, since it happens on mapreset being 1 rather than 0. * Make a bunch of normal gameplay stuff that might've activated unnecessarily during mapreset now not able to. * Hide some other stuff that might've been visible for no good reason. * Improve Mirror mode. * First person now works with it! * Tweaked the minimap player heads. Although the main section of the automap is mirrored, it feels... wrong to mirror the player head? IDK, you may wish to revert this, but given that everything else is the right way around except for the level itself...* Disable the titlescreen demos, at least until we actually gear up for release and make real ones. * Disable the titlescreen demos, at least until we actually gear up for release and make real ones.
2018-07-22 15:16:03 +00:00
// do we want this? it feels unnecessary. easier to just modify the amnumxpos?
Encore mode - a fresh take on mirror mode! * Palette remaps. * Branding. TODO: * Doesn't work in GL. (Mostly.) I have SOME ideas on how to tackle this, but... * Transmaps are broken in Encore for some reason. * I tried to make in-level colormaps shimmy over, but it didn't quite work, so I commented it out and only semi-fixed it.
2018-07-23 22:50:41 +00:00
/*if (encoremode)
Belp - Minimap heads that aren't yours are transparent - Minimap has a visibility slider - Bomb stuff renamed to Mine
2018-02-08 03:33:27 +00:00
{
flags |= V_FLIP;
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
amxpos = -amnumxpos + ((x + AutomapPic->width/2 + (facemmapprefix[skin]->width/2))<<FRACBITS);
* FREE PLAY! The necessary corollary to HERE COMES A NEW CHALLENGER... * Activates when there are less than two non-spectators in a netgame. * Shows flashing text at the bottom of the screen. * Prevents drawing several UI elements that only make sense with multiple players. * Prevents matchesplayed being increased. * Improve the mapreset timer's behaviour. * Now you get to see the HERE COMES A NEW CHALLENGER screen as the starting frame of the relevant map transition, since it happens on mapreset being 1 rather than 0. * Make a bunch of normal gameplay stuff that might've activated unnecessarily during mapreset now not able to. * Hide some other stuff that might've been visible for no good reason. * Improve Mirror mode. * First person now works with it! * Tweaked the minimap player heads. Although the main section of the automap is mirrored, it feels... wrong to mirror the player head? IDK, you may wish to revert this, but given that everything else is the right way around except for the level itself...* Disable the titlescreen demos, at least until we actually gear up for release and make real ones. * Disable the titlescreen demos, at least until we actually gear up for release and make real ones.
2018-07-22 15:16:03 +00:00
}*/
Belp - Minimap heads that aren't yours are transparent - Minimap has a visibility slider - Bomb stuff renamed to Mine
2018-02-08 03:33:27 +00:00
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
if (!mo->color) // 'default' color
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
V_DrawSciencePatch(amxpos, amypos, flags, facemmapprefix[skin], FRACUNIT);
Belp - Minimap heads that aren't yours are transparent - Minimap has a visibility slider - Bomb stuff renamed to Mine
2018-02-08 03:33:27 +00:00
else
{
UINT8 *colormap;
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
if (mo->colorized)
colormap = R_GetTranslationColormap(TC_RAINBOW, mo->color, 0);
Belp - Minimap heads that aren't yours are transparent - Minimap has a visibility slider - Bomb stuff renamed to Mine
2018-02-08 03:33:27 +00:00
else
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
colormap = R_GetTranslationColormap(skin, mo->color, 0);
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. * Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps. * Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix). * Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything. * Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers. * Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
V_DrawFixedPatch(amxpos, amypos, FRACUNIT, flags, facemmapprefix[skin], colormap);
Belp - Minimap heads that aren't yours are transparent - Minimap has a visibility slider - Bomb stuff renamed to Mine
2018-02-08 03:33:27 +00:00
}
}
static void K_drawKartMinimap(void)
{
More post processor support, HUD tweaks, SP new game fix Mirror Mode minimap, growing position nums, and general reorganization. Some stuff needs more work but I'm exhausted rn
2017-12-19 06:55:33 +00:00
INT32 lumpnum;
patch_t *AutomapPic;
INT32 i = 0;
thing
2017-12-22 21:24:20 +00:00
INT32 x, y;
* Modified, maybe-improved title. May need to be selectively reverted, but... * To go with this, have the HUD fade in as the title goes away. * After complaints, only do dogear gametype indicators on the voting screen for levels which don't match the prevailing gametype, and use thin font to intrude on the level pic less. * Make the voting screen background a different graphic in battle. * Improve behaviour of DrawDiag in GL.
2018-06-28 18:07:04 +00:00
INT32 minimaptrans, splitflags = (splitscreen ? 0 : V_SNAPTORIGHT);
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
boolean dop1later = false;
More post processor support, HUD tweaks, SP new game fix Mirror Mode minimap, growing position nums, and general reorganization. Some stuff needs more work but I'm exhausted rn
2017-12-19 06:55:33 +00:00
// Draw the HUD only when playing in a level.
// hu_stuff needs this, unlike st_stuff.
You're right, this works fine
2018-09-23 21:34:59 +00:00
if (gamestate != GS_LEVEL)
thing
2017-12-22 21:24:20 +00:00
return;
More post processor support, HUD tweaks, SP new game fix Mirror Mode minimap, growing position nums, and general reorganization. Some stuff needs more work but I'm exhausted rn
2017-12-19 06:55:33 +00:00
Closer to done HUD tweaking? Splitscreen in Battle is left
2017-12-24 00:14:06 +00:00
if (stplyr != &players[displayplayer])
return;
thing
2017-12-22 21:24:20 +00:00
lumpnum = W_CheckNumForName(va("%sR", G_BuildMapName(gamemap)));
More post processor support, HUD tweaks, SP new game fix Mirror Mode minimap, growing position nums, and general reorganization. Some stuff needs more work but I'm exhausted rn
2017-12-19 06:55:33 +00:00
thing
2017-12-22 21:24:20 +00:00
if (lumpnum != -1)
Closer to done HUD tweaking? Splitscreen in Battle is left
2017-12-24 00:14:06 +00:00
AutomapPic = W_CachePatchName(va("%sR", G_BuildMapName(gamemap)), PU_HUDGFX);
thing
2017-12-22 21:24:20 +00:00
else
return; // no pic, just get outta here
More post processor support, HUD tweaks, SP new game fix Mirror Mode minimap, growing position nums, and general reorganization. Some stuff needs more work but I'm exhausted rn
2017-12-19 06:55:33 +00:00
Draw Minimap at regular size Also positioned the minimap completely at the side of the screen as they're 5% scaled anyway
2018-02-05 03:59:36 +00:00
x = MINI_X - (AutomapPic->width/2);
y = MINI_Y - (AutomapPic->height/2);
More post processor support, HUD tweaks, SP new game fix Mirror Mode minimap, growing position nums, and general reorganization. Some stuff needs more work but I'm exhausted rn
2017-12-19 06:55:33 +00:00
* Modified, maybe-improved title. May need to be selectively reverted, but... * To go with this, have the HUD fade in as the title goes away. * After complaints, only do dogear gametype indicators on the voting screen for levels which don't match the prevailing gametype, and use thin font to intrude on the level pic less. * Make the voting screen background a different graphic in battle. * Improve behaviour of DrawDiag in GL.
2018-06-28 18:07:04 +00:00
if (timeinmap > 105)
{
minimaptrans = (splitscreen ? 10 : cv_kartminimap.value);
if (timeinmap <= 113)
minimaptrans = ((((INT32)timeinmap) - 105)*minimaptrans)/(113-105);
if (!minimaptrans)
return;
}
else
return;
minimaptrans = ((10-minimaptrans)<<FF_TRANSSHIFT);
splitflags |= minimaptrans;
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
Encore mode - a fresh take on mirror mode! * Palette remaps. * Branding. TODO: * Doesn't work in GL. (Mostly.) I have SOME ideas on how to tackle this, but... * Transmaps are broken in Encore for some reason. * I tried to make in-level colormaps shimmy over, but it didn't quite work, so I commented it out and only semi-fixed it.
2018-07-23 22:50:41 +00:00
if (encoremode)
Draw Minimap at regular size Also positioned the minimap completely at the side of the screen as they're 5% scaled anyway
2018-02-05 03:59:36 +00:00
V_DrawScaledPatch(x+(AutomapPic->width), y, splitflags|V_FLIP, AutomapPic);
thing
2017-12-22 21:24:20 +00:00
else
Draw Minimap at regular size Also positioned the minimap completely at the side of the screen as they're 5% scaled anyway
2018-02-05 03:59:36 +00:00
V_DrawScaledPatch(x, y, splitflags, AutomapPic);
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
HUD improvements Most notably, Karma & Boo no longer appear on the minimap
2018-03-27 22:22:33 +00:00
if (!splitscreen)
Belp - Minimap heads that aren't yours are transparent - Minimap has a visibility slider - Bomb stuff renamed to Mine
2018-02-08 03:33:27 +00:00
{
splitflags &= ~minimaptrans;
splitflags |= V_HUDTRANSHALF;
}
More post processor support, HUD tweaks, SP new game fix Mirror Mode minimap, growing position nums, and general reorganization. Some stuff needs more work but I'm exhausted rn
2017-12-19 06:55:33 +00:00
Minimap offset support
2018-06-04 20:19:36 +00:00
// let offsets transfer to the heads, too!
Encore mode - a fresh take on mirror mode! * Palette remaps. * Branding. TODO: * Doesn't work in GL. (Mostly.) I have SOME ideas on how to tackle this, but... * Transmaps are broken in Encore for some reason. * I tried to make in-level colormaps shimmy over, but it didn't quite work, so I commented it out and only semi-fixed it.
2018-07-23 22:50:41 +00:00
if (encoremode)
Minimap offset support
2018-06-04 20:19:36 +00:00
x += SHORT(AutomapPic->leftoffset);
else
x -= SHORT(AutomapPic->leftoffset);
y -= SHORT(AutomapPic->topoffset);
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
// Player's tiny icons on the Automap. (drawn opposite direction so player 1 is drawn last in splitscreen)
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
if (ghosts)
thing
2017-12-22 21:24:20 +00:00
{
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
demoghost *g = ghosts;
while (g)
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
{
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
K_drawKartMinimapHead(g->mo, x, y, splitflags, AutomapPic);
g = g->next;
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
}
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
if (!stplyr->mo || stplyr->spectator) // do we need the latter..?
return;
dop1later = true;
}
else
{
for (i = MAXPLAYERS-1; i >= 0; i--)
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
{
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
if (!playeringame[i])
continue;
if (!players[i].mo || players[i].spectator)
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
continue;
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
if (!splitscreen && i == displayplayer)
{
dop1later = true; // Do displayplayer later
continue;
}
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
if (G_BattleGametype() && players[i].kartstuff[k_bumper] <= 0)
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
continue;
if (players[i].kartstuff[k_hyudorotimer] > 0)
{
if (!((players[i].kartstuff[k_hyudorotimer] < 1*TICRATE/2
|| players[i].kartstuff[k_hyudorotimer] > hyudorotime-(1*TICRATE/2))
&& !(leveltime & 1)))
continue;
}
K_drawKartMinimapHead(players[i].mo, x, y, splitflags, AutomapPic);
}
More post processor support, HUD tweaks, SP new game fix Mirror Mode minimap, growing position nums, and general reorganization. Some stuff needs more work but I'm exhausted rn
2017-12-19 06:55:33 +00:00
}
Belp - Minimap heads that aren't yours are transparent - Minimap has a visibility slider - Bomb stuff renamed to Mine
2018-02-08 03:33:27 +00:00
* Completely revamp a bunch of menu stuff! * Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff. * Port over the improved MP main menu from internal, including flattening the IP connect onto its level. * Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices. * Improve the layout of all of the level/gametype select menus slightly. * (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area. * (unrelated) Tweak minimap ordering slightly.
2018-06-30 15:01:03 +00:00
if (!dop1later)
return; // Don't need this
Belp - Minimap heads that aren't yours are transparent - Minimap has a visibility slider - Bomb stuff renamed to Mine
2018-02-08 03:33:27 +00:00
splitflags &= ~V_HUDTRANSHALF;
splitflags |= V_HUDTRANS;
Menu stuff! * Bar of levels. * Colourisation! * New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid! * New single page statistics screen! * V_DrawFixedPatch now works at the edge of the screen! Ghost fixes! * On minimaps! * Free memory after use! * Don't spawn in midair on slopes!
2018-07-01 18:29:13 +00:00
K_drawKartMinimapHead(stplyr->mo, x, y, splitflags, AutomapPic);
More post processor support, HUD tweaks, SP new game fix Mirror Mode minimap, growing position nums, and general reorganization. Some stuff needs more work but I'm exhausted rn
2017-12-19 06:55:33 +00:00
}
More FINISH stuff! * Make it two seconds exactly, instead of two and change. * Draw it in battle too! * While testing the above, I discovered 3p's karma comeback timer drawing was slightly broken. Fixed that too.
2018-07-19 14:58:07 +00:00
static void K_drawKartStartCountdown(void)
{
INT32 pnum = 0, splitflags = K_calcSplitFlags(0); // 3
if (leveltime >= starttime-(2*TICRATE)) // 2
pnum++;
if (leveltime >= starttime-TICRATE) // 1
pnum++;
if (leveltime >= starttime) // GO!
pnum++;
if ((leveltime % (2*5)) / 5) // blink
pnum += 4;
No more rescaling gfx for countdown/finish
2018-10-28 03:14:11 +00:00
if (splitscreen) // splitscreen
pnum += 8;
More FINISH stuff! * Make it two seconds exactly, instead of two and change. * Draw it in battle too! * While testing the above, I discovered 3p's karma comeback timer drawing was slightly broken. Fixed that too.
2018-07-19 14:58:07 +00:00
No more rescaling gfx for countdown/finish
2018-10-28 03:14:11 +00:00
V_DrawScaledPatch(STCD_X - (SHORT(kp_startcountdown[pnum]->width)/2), STCD_Y - (SHORT(kp_startcountdown[pnum]->height)/2), splitflags, kp_startcountdown[pnum]);
More FINISH stuff! * Make it two seconds exactly, instead of two and change. * Draw it in battle too! * While testing the above, I discovered 3p's karma comeback timer drawing was slightly broken. Fixed that too.
2018-07-19 14:58:07 +00:00
}
static void K_drawKartFinish(void)
{
INT32 pnum = 0, splitflags = K_calcSplitFlags(0);
if (!stplyr->kartstuff[k_cardanimation] || stplyr->kartstuff[k_cardanimation] >= 2*TICRATE)
return;
if ((stplyr->kartstuff[k_cardanimation] % (2*5)) / 5) // blink
pnum = 1;
Fix 2p ("wide") splitscreen having an incorrect FINISH arrangement (drawn at wrong scale, moved across screen at wrong speed...)
2018-11-03 13:20:02 +00:00
if (splitscreen > 1) // 3/4p, stationary FIN
{
No more rescaling gfx for countdown/finish
2018-10-28 03:14:11 +00:00
pnum += 2;
V_DrawScaledPatch(STCD_X - (SHORT(kp_racefinish[pnum]->width)/2), STCD_Y - (SHORT(kp_racefinish[pnum]->height)/2), splitflags, kp_racefinish[pnum]);
Fix 2p ("wide") splitscreen having an incorrect FINISH arrangement (drawn at wrong scale, moved across screen at wrong speed...)
2018-11-03 13:20:02 +00:00
return;
}
//else -- 1/2p, scrolling FINISH
More FINISH stuff! * Make it two seconds exactly, instead of two and change. * Draw it in battle too! * While testing the above, I discovered 3p's karma comeback timer drawing was slightly broken. Fixed that too.
2018-07-19 14:58:07 +00:00
{
Fix 2p ("wide") splitscreen having an incorrect FINISH arrangement (drawn at wrong scale, moved across screen at wrong speed...)
2018-11-03 13:20:02 +00:00
INT32 x, xval;
if (splitscreen) // wide splitscreen
pnum += 4;
x = ((vid.width<<FRACBITS)/vid.dupx);
xval = (SHORT(kp_racefinish[pnum]->width)<<FRACBITS);
More FINISH stuff! * Make it two seconds exactly, instead of two and change. * Draw it in battle too! * While testing the above, I discovered 3p's karma comeback timer drawing was slightly broken. Fixed that too.
2018-07-19 14:58:07 +00:00
x = ((TICRATE - stplyr->kartstuff[k_cardanimation])*(xval > x ? xval : x))/TICRATE;
De-ghetto 2P splitscreen FINISH. https://cdn.discordapp.com/attachments/270211093761097728/469827997990649856/kart0012.gif
2018-07-20 11:37:09 +00:00
if (splitscreen && stplyr == &players[secondarydisplayplayer])
x = -x;
Fix 2p ("wide") splitscreen having an incorrect FINISH arrangement (drawn at wrong scale, moved across screen at wrong speed...)
2018-11-03 13:20:02 +00:00
V_DrawFixedPatch(x + (STCD_X<<FRACBITS) - (xval>>1),
(STCD_Y<<FRACBITS) - (SHORT(kp_racefinish[pnum]->height)<<(FRACBITS-1)),
FRACUNIT,
De-ghetto 2P splitscreen FINISH. https://cdn.discordapp.com/attachments/270211093761097728/469827997990649856/kart0012.gif
2018-07-20 11:37:09 +00:00
splitflags, kp_racefinish[pnum], NULL);
More FINISH stuff! * Make it two seconds exactly, instead of two and change. * Draw it in battle too! * While testing the above, I discovered 3p's karma comeback timer drawing was slightly broken. Fixed that too.
2018-07-19 14:58:07 +00:00
}
}
Lots of small tweaks & fixes, that should make Battle a LOT more bearable - Comeback timer is now always 10 seconds instead of scaling - Takes 10 seconds before exiting - Flashing tics is doubled in Battle Mode - Removed a bunch of bomb nerfs - Bombs are back to making only 1 point per hit - Exposed K_GetKartAccel & K_GetKartFlashing to Lua - Item boxes should no longer drop while going up slopes - Trading item boxes with a bomb should turn you back into a bomb - Balloons should no longer all respawn when dying in pits in 2-player games - Flashing players are able to kill *thrown* shells again (shields and trap items are still unkillable). Prevents red shells from being able to stick to a flashing player and hurt them again as soon as they're done flashing - CHECK appears at a farther distance
2017-11-17 05:48:36 +00:00
static void K_drawBattleFullscreen(void)
Battle HUD stuff
2017-11-14 01:45:57 +00:00
{
Closer to done HUD tweaking? Splitscreen in Battle is left
2017-12-24 00:14:06 +00:00
INT32 x = BASEVIDWIDTH/2;
More tweaks to cards
2017-11-29 07:07:22 +00:00
INT32 y = -64+(stplyr->kartstuff[k_cardanimation]); // card animation goes from 0 to 164, 164 is the middle of the screen
HUD improvements Most notably, Karma & Boo no longer appear on the minimap
2018-03-27 22:22:33 +00:00
INT32 splitflags = V_SNAPTOTOP; // I don't feel like properly supporting non-green resolutions, so you can have a misuse of SNAPTO instead
Last few finishing touches for the HUD Battle Mode cards & Race countdown timers display properly
2017-12-25 15:05:36 +00:00
fixed_t scale = FRACUNIT;
Battle card animations Was hoping not to waste another variable on this, but oh well
2017-11-29 06:09:46 +00:00
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
if (splitscreen)
More tweaks to cards
2017-11-29 07:07:22 +00:00
{
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
if ((splitscreen == 1 && stplyr == &players[secondarydisplayplayer])
HUD improvements Most notably, Karma & Boo no longer appear on the minimap
2018-03-27 22:22:33 +00:00
|| (splitscreen > 1 && (stplyr == &players[thirddisplayplayer]
|| (stplyr == &players[fourthdisplayplayer] && splitscreen > 2))))
{
More tweaks to cards
2017-11-29 07:07:22 +00:00
y = 232-(stplyr->kartstuff[k_cardanimation]/2);
HUD improvements Most notably, Karma & Boo no longer appear on the minimap
2018-03-27 22:22:33 +00:00
splitflags = V_SNAPTOBOTTOM;
}
More tweaks to cards
2017-11-29 07:07:22 +00:00
else
y = -32+(stplyr->kartstuff[k_cardanimation]/2);
Battle HUD stuff
2017-11-14 01:45:57 +00:00
Closer to done HUD tweaking? Splitscreen in Battle is left
2017-12-24 00:14:06 +00:00
if (splitscreen > 1)
Lots of small tweaks & fixes, that should make Battle a LOT more bearable - Comeback timer is now always 10 seconds instead of scaling - Takes 10 seconds before exiting - Flashing tics is doubled in Battle Mode - Removed a bunch of bomb nerfs - Bombs are back to making only 1 point per hit - Exposed K_GetKartAccel & K_GetKartFlashing to Lua - Item boxes should no longer drop while going up slopes - Trading item boxes with a bomb should turn you back into a bomb - Balloons should no longer all respawn when dying in pits in 2-player games - Flashing players are able to kill *thrown* shells again (shields and trap items are still unkillable). Prevents red shells from being able to stick to a flashing player and hurt them again as soon as they're done flashing - CHECK appears at a farther distance
2017-11-17 05:48:36 +00:00
{
Tweeeeeaks - MT_FALLINGROCK bumps you instead of spinning you out! RIP annoying af apples - Made some Battle-related messages only happen in netgames - Messed with the timing on the intro
2017-12-28 23:37:25 +00:00
scale /= 2;
HUD improvements Most notably, Karma & Boo no longer appear on the minimap
2018-03-27 22:22:33 +00:00
if (stplyr == &players[secondarydisplayplayer]
|| (stplyr == &players[fourthdisplayplayer] && splitscreen > 2))
Closer to done HUD tweaking? Splitscreen in Battle is left
2017-12-24 00:14:06 +00:00
x = 3*BASEVIDWIDTH/4;
Lots of small tweaks & fixes, that should make Battle a LOT more bearable - Comeback timer is now always 10 seconds instead of scaling - Takes 10 seconds before exiting - Flashing tics is doubled in Battle Mode - Removed a bunch of bomb nerfs - Bombs are back to making only 1 point per hit - Exposed K_GetKartAccel & K_GetKartFlashing to Lua - Item boxes should no longer drop while going up slopes - Trading item boxes with a bomb should turn you back into a bomb - Balloons should no longer all respawn when dying in pits in 2-player games - Flashing players are able to kill *thrown* shells again (shields and trap items are still unkillable). Prevents red shells from being able to stick to a flashing player and hurt them again as soon as they're done flashing - CHECK appears at a farther distance
2017-11-17 05:48:36 +00:00
else
Closer to done HUD tweaking? Splitscreen in Battle is left
2017-12-24 00:14:06 +00:00
x = BASEVIDWIDTH/4;
Lots of small tweaks & fixes, that should make Battle a LOT more bearable - Comeback timer is now always 10 seconds instead of scaling - Takes 10 seconds before exiting - Flashing tics is doubled in Battle Mode - Removed a bunch of bomb nerfs - Bombs are back to making only 1 point per hit - Exposed K_GetKartAccel & K_GetKartFlashing to Lua - Item boxes should no longer drop while going up slopes - Trading item boxes with a bomb should turn you back into a bomb - Balloons should no longer all respawn when dying in pits in 2-player games - Flashing players are able to kill *thrown* shells again (shields and trap items are still unkillable). Prevents red shells from being able to stick to a flashing player and hurt them again as soon as they're done flashing - CHECK appears at a farther distance
2017-11-17 05:48:36 +00:00
}
Battle HUD stuff
2017-11-14 01:45:57 +00:00
else
Lots of small tweaks & fixes, that should make Battle a LOT more bearable - Comeback timer is now always 10 seconds instead of scaling - Takes 10 seconds before exiting - Flashing tics is doubled in Battle Mode - Removed a bunch of bomb nerfs - Bombs are back to making only 1 point per hit - Exposed K_GetKartAccel & K_GetKartFlashing to Lua - Item boxes should no longer drop while going up slopes - Trading item boxes with a bomb should turn you back into a bomb - Balloons should no longer all respawn when dying in pits in 2-player games - Flashing players are able to kill *thrown* shells again (shields and trap items are still unkillable). Prevents red shells from being able to stick to a flashing player and hurt them again as soon as they're done flashing - CHECK appears at a farther distance
2017-11-17 05:48:36 +00:00
{
Quick fix for attack/protect being too big
2018-10-17 01:39:39 +00:00
if (stplyr->exiting)
{
if (stplyr == &players[secondarydisplayplayer])
x = BASEVIDWIDTH-96;
else
x = 96;
}
Lots of small tweaks & fixes, that should make Battle a LOT more bearable - Comeback timer is now always 10 seconds instead of scaling - Takes 10 seconds before exiting - Flashing tics is doubled in Battle Mode - Removed a bunch of bomb nerfs - Bombs are back to making only 1 point per hit - Exposed K_GetKartAccel & K_GetKartFlashing to Lua - Item boxes should no longer drop while going up slopes - Trading item boxes with a bomb should turn you back into a bomb - Balloons should no longer all respawn when dying in pits in 2-player games - Flashing players are able to kill *thrown* shells again (shields and trap items are still unkillable). Prevents red shells from being able to stick to a flashing player and hurt them again as soon as they're done flashing - CHECK appears at a farther distance
2017-11-17 05:48:36 +00:00
else
Quick fix for attack/protect being too big
2018-10-17 01:39:39 +00:00
scale /= 2;
Lots of small tweaks & fixes, that should make Battle a LOT more bearable - Comeback timer is now always 10 seconds instead of scaling - Takes 10 seconds before exiting - Flashing tics is doubled in Battle Mode - Removed a bunch of bomb nerfs - Bombs are back to making only 1 point per hit - Exposed K_GetKartAccel & K_GetKartFlashing to Lua - Item boxes should no longer drop while going up slopes - Trading item boxes with a bomb should turn you back into a bomb - Balloons should no longer all respawn when dying in pits in 2-player games - Flashing players are able to kill *thrown* shells again (shields and trap items are still unkillable). Prevents red shells from being able to stick to a flashing player and hurt them again as soon as they're done flashing - CHECK appears at a farther distance
2017-11-17 05:48:36 +00:00
}
Battle HUD stuff
2017-11-14 01:45:57 +00:00
}
Closer to done HUD tweaking? Splitscreen in Battle is left
2017-12-24 00:14:06 +00:00
if (stplyr->exiting)
{
Last few finishing touches for the HUD Battle Mode cards & Race countdown timers display properly
2017-12-25 15:05:36 +00:00
if (stplyr == &players[displayplayer])
Fade-in intro Also made flashing not-local, again.
2018-06-26 14:14:59 +00:00
V_DrawFadeScreen(0xFF00, 16);
More FINISH stuff! * Make it two seconds exactly, instead of two and change. * Draw it in battle too! * While testing the above, I discovered 3p's karma comeback timer drawing was slightly broken. Fixed that too.
2018-07-19 14:58:07 +00:00
if (stplyr->exiting < 6*TICRATE)
{
if (stplyr->kartstuff[k_position] == 1)
V_DrawFixedPatch(x<<FRACBITS, y<<FRACBITS, scale, splitflags, kp_battlewin, NULL);
Show LOSE/COOL in splitscreen again Looked goofy offline, with 1 WIN and 3 LOSEs, but now that there's COOL and online splitscreen I thought it should come back
2018-10-28 02:43:57 +00:00
else
More FINISH stuff! * Make it two seconds exactly, instead of two and change. * Draw it in battle too! * While testing the above, I discovered 3p's karma comeback timer drawing was slightly broken. Fixed that too.
2018-07-19 14:58:07 +00:00
V_DrawFixedPatch(x<<FRACBITS, y<<FRACBITS, scale, splitflags, (K_IsPlayerLosing(stplyr) ? kp_battlelose : kp_battlecool), NULL);
}
else
K_drawKartFinish();
Closer to done HUD tweaking? Splitscreen in Battle is left
2017-12-24 00:14:06 +00:00
}
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
else if (stplyr->kartstuff[k_bumper] <= 0 && stplyr->kartstuff[k_comebacktimer] && comeback)
Battle HUD stuff
2017-11-14 01:45:57 +00:00
{
Some UI stuff. * Place FREE PLAY in a less contentous location. * Fix comeback timer being incorrectly offset from the center of the screen. * Prevent vote drawer from nuking itself (visual-wise) at the start of the level fade following it.
2018-07-30 20:53:54 +00:00
UINT16 t = stplyr->kartstuff[k_comebacktimer]/(10*TICRATE);
INT32 txoff, adjust = (splitscreen > 1) ? 4 : 6; // normal string is 8, kart string is 12, half of that for ease
Last few finishing touches for the HUD Battle Mode cards & Race countdown timers display properly
2017-12-25 15:05:36 +00:00
INT32 ty = (BASEVIDHEIGHT/2)+66;
Lots of small tweaks & fixes, that should make Battle a LOT more bearable - Comeback timer is now always 10 seconds instead of scaling - Takes 10 seconds before exiting - Flashing tics is doubled in Battle Mode - Removed a bunch of bomb nerfs - Bombs are back to making only 1 point per hit - Exposed K_GetKartAccel & K_GetKartFlashing to Lua - Item boxes should no longer drop while going up slopes - Trading item boxes with a bomb should turn you back into a bomb - Balloons should no longer all respawn when dying in pits in 2-player games - Flashing players are able to kill *thrown* shells again (shields and trap items are still unkillable). Prevents red shells from being able to stick to a flashing player and hurt them again as soon as they're done flashing - CHECK appears at a farther distance
2017-11-17 05:48:36 +00:00
Some UI stuff. * Place FREE PLAY in a less contentous location. * Fix comeback timer being incorrectly offset from the center of the screen. * Prevent vote drawer from nuking itself (visual-wise) at the start of the level fade following it.
2018-07-30 20:53:54 +00:00
txoff = adjust;
while (t)
Lots of small tweaks & fixes, that should make Battle a LOT more bearable - Comeback timer is now always 10 seconds instead of scaling - Takes 10 seconds before exiting - Flashing tics is doubled in Battle Mode - Removed a bunch of bomb nerfs - Bombs are back to making only 1 point per hit - Exposed K_GetKartAccel & K_GetKartFlashing to Lua - Item boxes should no longer drop while going up slopes - Trading item boxes with a bomb should turn you back into a bomb - Balloons should no longer all respawn when dying in pits in 2-player games - Flashing players are able to kill *thrown* shells again (shields and trap items are still unkillable). Prevents red shells from being able to stick to a flashing player and hurt them again as soon as they're done flashing - CHECK appears at a farther distance
2017-11-17 05:48:36 +00:00
{
Some UI stuff. * Place FREE PLAY in a less contentous location. * Fix comeback timer being incorrectly offset from the center of the screen. * Prevent vote drawer from nuking itself (visual-wise) at the start of the level fade following it.
2018-07-30 20:53:54 +00:00
txoff += adjust;
t /= 10;
Lots of small tweaks & fixes, that should make Battle a LOT more bearable - Comeback timer is now always 10 seconds instead of scaling - Takes 10 seconds before exiting - Flashing tics is doubled in Battle Mode - Removed a bunch of bomb nerfs - Bombs are back to making only 1 point per hit - Exposed K_GetKartAccel & K_GetKartFlashing to Lua - Item boxes should no longer drop while going up slopes - Trading item boxes with a bomb should turn you back into a bomb - Balloons should no longer all respawn when dying in pits in 2-player games - Flashing players are able to kill *thrown* shells again (shields and trap items are still unkillable). Prevents red shells from being able to stick to a flashing player and hurt them again as soon as they're done flashing - CHECK appears at a farther distance
2017-11-17 05:48:36 +00:00
}
Last few finishing touches for the HUD Battle Mode cards & Race countdown timers display properly
2017-12-25 15:05:36 +00:00
if (splitscreen)
{
More FINISH stuff! * Make it two seconds exactly, instead of two and change. * Draw it in battle too! * While testing the above, I discovered 3p's karma comeback timer drawing was slightly broken. Fixed that too.
2018-07-19 14:58:07 +00:00
if (splitscreen > 1)
Last few finishing touches for the HUD Battle Mode cards & Race countdown timers display properly
2017-12-25 15:05:36 +00:00
ty = (BASEVIDHEIGHT/4)+33;
if ((splitscreen == 1 && stplyr == &players[secondarydisplayplayer])
HUD improvements Most notably, Karma & Boo no longer appear on the minimap
2018-03-27 22:22:33 +00:00
|| (stplyr == &players[thirddisplayplayer] && splitscreen > 1)
|| (stplyr == &players[fourthdisplayplayer] && splitscreen > 2))
Last few finishing touches for the HUD Battle Mode cards & Race countdown timers display properly
2017-12-25 15:05:36 +00:00
ty += (BASEVIDHEIGHT/2);
}
Restore battle wait fade
2018-02-28 03:07:20 +00:00
else
Fade-in intro Also made flashing not-local, again.
2018-06-26 14:14:59 +00:00
V_DrawFadeScreen(0xFF00, 16);
Last few finishing touches for the HUD Battle Mode cards & Race countdown timers display properly
2017-12-25 15:05:36 +00:00
Minor adjustments in hopes that I fixed the resynch bomb on gametype switch?
2018-02-08 22:13:06 +00:00
if (!comebackshowninfo)
HUD improvements Most notably, Karma & Boo no longer appear on the minimap
2018-03-27 22:22:33 +00:00
V_DrawFixedPatch(x<<FRACBITS, y<<FRACBITS, scale, splitflags, kp_battleinfo, NULL);
Battle HUD stuff
2017-11-14 01:45:57 +00:00
else
HUD improvements Most notably, Karma & Boo no longer appear on the minimap
2018-03-27 22:22:33 +00:00
V_DrawFixedPatch(x<<FRACBITS, y<<FRACBITS, scale, splitflags, kp_battlewait, NULL);
More tweaks to cards
2017-11-29 07:07:22 +00:00
Battle hud stuff?!
2017-12-24 01:55:23 +00:00
if (splitscreen > 1)
Some UI stuff. * Place FREE PLAY in a less contentous location. * Fix comeback timer being incorrectly offset from the center of the screen. * Prevent vote drawer from nuking itself (visual-wise) at the start of the level fade following it.
2018-07-30 20:53:54 +00:00
V_DrawString(x-txoff, ty, 0, va("%d", stplyr->kartstuff[k_comebacktimer]/TICRATE));
Last few finishing touches for the HUD Battle Mode cards & Race countdown timers display properly
2017-12-25 15:05:36 +00:00
else
{
A quick credits draft Please give me corrections and people to add. I've not been here as long as some people, so there is 100% probably people I missed
2018-03-28 20:17:04 +00:00
V_DrawFixedPatch(x<<FRACBITS, ty<<FRACBITS, scale, 0, kp_timeoutsticker, NULL);
Last few finishing touches for the HUD Battle Mode cards & Race countdown timers display properly
2017-12-25 15:05:36 +00:00
V_DrawKartString(x-txoff, ty, 0, va("%d", stplyr->kartstuff[k_comebacktimer]/TICRATE));
}
Battle HUD stuff
2017-11-14 01:45:57 +00:00
}
* FREE PLAY! The necessary corollary to HERE COMES A NEW CHALLENGER... * Activates when there are less than two non-spectators in a netgame. * Shows flashing text at the bottom of the screen. * Prevents drawing several UI elements that only make sense with multiple players. * Prevents matchesplayed being increased. * Improve the mapreset timer's behaviour. * Now you get to see the HERE COMES A NEW CHALLENGER screen as the starting frame of the relevant map transition, since it happens on mapreset being 1 rather than 0. * Make a bunch of normal gameplay stuff that might've activated unnecessarily during mapreset now not able to. * Hide some other stuff that might've been visible for no good reason. * Improve Mirror mode. * First person now works with it! * Tweaked the minimap player heads. Although the main section of the automap is mirrored, it feels... wrong to mirror the player head? IDK, you may wish to revert this, but given that everything else is the right way around except for the level itself...* Disable the titlescreen demos, at least until we actually gear up for release and make real ones. * Disable the titlescreen demos, at least until we actually gear up for release and make real ones.
2018-07-22 15:16:03 +00:00
if (netgame && !stplyr->spectator && timeinmap > 113) // FREE PLAY?
{
UINT8 i;
// check to see if there's anyone else at all
for (i = 0; i < MAXPLAYERS; i++)
{
if (i == displayplayer)
continue;
if (playeringame[i] && !stplyr->spectator)
return;
}
K_drawKartFreePlay(leveltime);
}
Battle HUD stuff
2017-11-14 01:45:57 +00:00
}
First person fun
2018-06-26 20:12:42 +00:00
static void K_drawKartFirstPerson(void)
{
Better first person turning and drifting is now taken into account in the x offsetting
2018-07-18 00:23:22 +00:00
static INT32 pnum[4], turn[4], drift[4];
INT32 pn = 0, tn = 0, dr = 0;
INT32 target = 0, splitflags = K_calcSplitFlags(V_SNAPTOBOTTOM);
First person fun
2018-06-26 20:12:42 +00:00
INT32 x = BASEVIDWIDTH/2, y = BASEVIDHEIGHT;
Mammoth commit! * Deaths in record attack no longer put you into a glitchy singleplayer game-over state that we somehow both kept around and also broke since we branched Kart off of Vanilla.. * Fix non-standard mapscales making the Death Egg respawn octagons dissasemble themselves. * Allow for MULTIPLE TIME EMBLEMS PER MAP, at least in the emblem UI on the timer. It shows all completed emblems plus the uncompleted emblem up to a total of three. * Major tweaks to the First Person HUD. * I know this was your baby, Sal, and some of the changes may prove controversial - so I've put the ones that are likely to cause the most fuss inside an ifndef block, so that you can toggle it as you please with minimal code changes. * Dontdraw-ness, transparency, and colorization match the player's object! * Moves around on the screen with respect to the direction of the player object's motion, to make drifting look nicer! * Flashes the colour of your drift sparks. * Did a WHOLE bunch of things with respect to music. I'm not sure how to describe this, so I'll go through step-by-step. * Countdowns now play the drowning music again. * Removed/disabled extraenous P_RestoreMusics. * Made map-ending music called by its own function, P_EndingMusic(player_t *player). * Made the ending music play on the LAST player crossing the finishing line in splitscreen, rather than first. * Make dead players spinout and clip through the floor, at least until we add the new death anims. * Fix prior pogo spring usage making dead players fall faster. * Make the time over countdown use the kart font when not splitscreen with 3 or 4 players. * Removed a weird bonus HWR_DrawCroppedPatch function signature in the hardware header.
2018-07-16 19:19:30 +00:00
fixed_t scale;
UINT8 *colmap = NULL;
First person fun
2018-06-26 20:12:42 +00:00
ticcmd_t *cmd = &stplyr->cmd;
A bunch of little things. * Fix both cv_timelimit and cv_pointlimit as "hidden options" for people to play with if they know about them via the console. * Show GAME SPEED on the tab screen. * Fix Invincibility and Grow's music changes being broken. (I didn't test them properly when making them P_RestoreMusic calls, sorry.) * Stop showing the First Person Kart view in spectator mode, per Sal's request.
2018-07-18 20:40:04 +00:00
if (stplyr->spectator || !stplyr->mo || (stplyr->mo->flags2 & MF2_DONTDRAW))
Mammoth commit! * Deaths in record attack no longer put you into a glitchy singleplayer game-over state that we somehow both kept around and also broke since we branched Kart off of Vanilla.. * Fix non-standard mapscales making the Death Egg respawn octagons dissasemble themselves. * Allow for MULTIPLE TIME EMBLEMS PER MAP, at least in the emblem UI on the timer. It shows all completed emblems plus the uncompleted emblem up to a total of three. * Major tweaks to the First Person HUD. * I know this was your baby, Sal, and some of the changes may prove controversial - so I've put the ones that are likely to cause the most fuss inside an ifndef block, so that you can toggle it as you please with minimal code changes. * Dontdraw-ness, transparency, and colorization match the player's object! * Moves around on the screen with respect to the direction of the player object's motion, to make drifting look nicer! * Flashes the colour of your drift sparks. * Did a WHOLE bunch of things with respect to music. I'm not sure how to describe this, so I'll go through step-by-step. * Countdowns now play the drowning music again. * Removed/disabled extraenous P_RestoreMusics. * Made map-ending music called by its own function, P_EndingMusic(player_t *player). * Made the ending music play on the LAST player crossing the finishing line in splitscreen, rather than first. * Make dead players spinout and clip through the floor, at least until we add the new death anims. * Fix prior pogo spring usage making dead players fall faster. * Make the time over countdown use the kart font when not splitscreen with 3 or 4 players. * Removed a weird bonus HWR_DrawCroppedPatch function signature in the hardware header.
2018-07-16 19:19:30 +00:00
return;
First person fun
2018-06-26 20:12:42 +00:00
if (stplyr == &players[secondarydisplayplayer] && splitscreen)
Better first person turning and drifting is now taken into account in the x offsetting
2018-07-18 00:23:22 +00:00
{ pn = pnum[1]; tn = turn[1]; dr = drift[1]; }
First person fun
2018-06-26 20:12:42 +00:00
else if (stplyr == &players[thirddisplayplayer] && splitscreen > 1)
Better first person turning and drifting is now taken into account in the x offsetting
2018-07-18 00:23:22 +00:00
{ pn = pnum[2]; tn = turn[2]; dr = drift[2]; }
First person fun
2018-06-26 20:12:42 +00:00
else if (stplyr == &players[fourthdisplayplayer] && splitscreen > 2)
Better first person turning and drifting is now taken into account in the x offsetting
2018-07-18 00:23:22 +00:00
{ pn = pnum[3]; tn = turn[3]; dr = drift[3]; }
First person fun
2018-06-26 20:12:42 +00:00
else
Better first person turning and drifting is now taken into account in the x offsetting
2018-07-18 00:23:22 +00:00
{ pn = pnum[0]; tn = turn[0]; dr = drift[0]; }
First person fun
2018-06-26 20:12:42 +00:00
if (splitscreen)
{
Mammoth commit! * Deaths in record attack no longer put you into a glitchy singleplayer game-over state that we somehow both kept around and also broke since we branched Kart off of Vanilla.. * Fix non-standard mapscales making the Death Egg respawn octagons dissasemble themselves. * Allow for MULTIPLE TIME EMBLEMS PER MAP, at least in the emblem UI on the timer. It shows all completed emblems plus the uncompleted emblem up to a total of three. * Major tweaks to the First Person HUD. * I know this was your baby, Sal, and some of the changes may prove controversial - so I've put the ones that are likely to cause the most fuss inside an ifndef block, so that you can toggle it as you please with minimal code changes. * Dontdraw-ness, transparency, and colorization match the player's object! * Moves around on the screen with respect to the direction of the player object's motion, to make drifting look nicer! * Flashes the colour of your drift sparks. * Did a WHOLE bunch of things with respect to music. I'm not sure how to describe this, so I'll go through step-by-step. * Countdowns now play the drowning music again. * Removed/disabled extraenous P_RestoreMusics. * Made map-ending music called by its own function, P_EndingMusic(player_t *player). * Made the ending music play on the LAST player crossing the finishing line in splitscreen, rather than first. * Make dead players spinout and clip through the floor, at least until we add the new death anims. * Fix prior pogo spring usage making dead players fall faster. * Make the time over countdown use the kart font when not splitscreen with 3 or 4 players. * Removed a weird bonus HWR_DrawCroppedPatch function signature in the hardware header.
2018-07-16 19:19:30 +00:00
y >>= 1;
First person fun
2018-06-26 20:12:42 +00:00
if (splitscreen > 1)
Mammoth commit! * Deaths in record attack no longer put you into a glitchy singleplayer game-over state that we somehow both kept around and also broke since we branched Kart off of Vanilla.. * Fix non-standard mapscales making the Death Egg respawn octagons dissasemble themselves. * Allow for MULTIPLE TIME EMBLEMS PER MAP, at least in the emblem UI on the timer. It shows all completed emblems plus the uncompleted emblem up to a total of three. * Major tweaks to the First Person HUD. * I know this was your baby, Sal, and some of the changes may prove controversial - so I've put the ones that are likely to cause the most fuss inside an ifndef block, so that you can toggle it as you please with minimal code changes. * Dontdraw-ness, transparency, and colorization match the player's object! * Moves around on the screen with respect to the direction of the player object's motion, to make drifting look nicer! * Flashes the colour of your drift sparks. * Did a WHOLE bunch of things with respect to music. I'm not sure how to describe this, so I'll go through step-by-step. * Countdowns now play the drowning music again. * Removed/disabled extraenous P_RestoreMusics. * Made map-ending music called by its own function, P_EndingMusic(player_t *player). * Made the ending music play on the LAST player crossing the finishing line in splitscreen, rather than first. * Make dead players spinout and clip through the floor, at least until we add the new death anims. * Fix prior pogo spring usage making dead players fall faster. * Make the time over countdown use the kart font when not splitscreen with 3 or 4 players. * Removed a weird bonus HWR_DrawCroppedPatch function signature in the hardware header.
2018-07-16 19:19:30 +00:00
x >>= 1;
First person fun
2018-06-26 20:12:42 +00:00
}
Mammoth commit! * Deaths in record attack no longer put you into a glitchy singleplayer game-over state that we somehow both kept around and also broke since we branched Kart off of Vanilla.. * Fix non-standard mapscales making the Death Egg respawn octagons dissasemble themselves. * Allow for MULTIPLE TIME EMBLEMS PER MAP, at least in the emblem UI on the timer. It shows all completed emblems plus the uncompleted emblem up to a total of three. * Major tweaks to the First Person HUD. * I know this was your baby, Sal, and some of the changes may prove controversial - so I've put the ones that are likely to cause the most fuss inside an ifndef block, so that you can toggle it as you please with minimal code changes. * Dontdraw-ness, transparency, and colorization match the player's object! * Moves around on the screen with respect to the direction of the player object's motion, to make drifting look nicer! * Flashes the colour of your drift sparks. * Did a WHOLE bunch of things with respect to music. I'm not sure how to describe this, so I'll go through step-by-step. * Countdowns now play the drowning music again. * Removed/disabled extraenous P_RestoreMusics. * Made map-ending music called by its own function, P_EndingMusic(player_t *player). * Made the ending music play on the LAST player crossing the finishing line in splitscreen, rather than first. * Make dead players spinout and clip through the floor, at least until we add the new death anims. * Fix prior pogo spring usage making dead players fall faster. * Make the time over countdown use the kart font when not splitscreen with 3 or 4 players. * Removed a weird bonus HWR_DrawCroppedPatch function signature in the hardware header.
2018-07-16 19:19:30 +00:00
{
if (stplyr->speed < FixedMul(stplyr->runspeed, stplyr->mo->scale) && (leveltime & 1) && !splitscreen)
y++;
Acommodate MF2_SHADOW in first person view
2018-07-19 15:07:14 +00:00
// the following isn't EXPLICITLY right, it just gets the result we want, but i'm too lazy to look up the right way to do it
if (stplyr->mo->flags2 & MF2_SHADOW)
splitflags |= FF_TRANS80;
else if (stplyr->mo->frame & FF_TRANSMASK)
splitflags |= (stplyr->mo->frame & FF_TRANSMASK);
Mammoth commit! * Deaths in record attack no longer put you into a glitchy singleplayer game-over state that we somehow both kept around and also broke since we branched Kart off of Vanilla.. * Fix non-standard mapscales making the Death Egg respawn octagons dissasemble themselves. * Allow for MULTIPLE TIME EMBLEMS PER MAP, at least in the emblem UI on the timer. It shows all completed emblems plus the uncompleted emblem up to a total of three. * Major tweaks to the First Person HUD. * I know this was your baby, Sal, and some of the changes may prove controversial - so I've put the ones that are likely to cause the most fuss inside an ifndef block, so that you can toggle it as you please with minimal code changes. * Dontdraw-ness, transparency, and colorization match the player's object! * Moves around on the screen with respect to the direction of the player object's motion, to make drifting look nicer! * Flashes the colour of your drift sparks. * Did a WHOLE bunch of things with respect to music. I'm not sure how to describe this, so I'll go through step-by-step. * Countdowns now play the drowning music again. * Removed/disabled extraenous P_RestoreMusics. * Made map-ending music called by its own function, P_EndingMusic(player_t *player). * Made the ending music play on the LAST player crossing the finishing line in splitscreen, rather than first. * Make dead players spinout and clip through the floor, at least until we add the new death anims. * Fix prior pogo spring usage making dead players fall faster. * Make the time over countdown use the kart font when not splitscreen with 3 or 4 players. * Removed a weird bonus HWR_DrawCroppedPatch function signature in the hardware header.
2018-07-16 19:19:30 +00:00
}
First person fun
2018-06-26 20:12:42 +00:00
if (cmd->driftturn > 400) // strong left turn
target = 2;
else if (cmd->driftturn < -400) // strong right turn
target = -2;
else if (cmd->driftturn > 0) // weak left turn
target = 1;
else if (cmd->driftturn < 0) // weak right turn
target = -1;
else // forward
target = 0;
Encore mode - a fresh take on mirror mode! * Palette remaps. * Branding. TODO: * Doesn't work in GL. (Mostly.) I have SOME ideas on how to tackle this, but... * Transmaps are broken in Encore for some reason. * I tried to make in-level colormaps shimmy over, but it didn't quite work, so I commented it out and only semi-fixed it.
2018-07-23 22:50:41 +00:00
if (encoremode)
* FREE PLAY! The necessary corollary to HERE COMES A NEW CHALLENGER... * Activates when there are less than two non-spectators in a netgame. * Shows flashing text at the bottom of the screen. * Prevents drawing several UI elements that only make sense with multiple players. * Prevents matchesplayed being increased. * Improve the mapreset timer's behaviour. * Now you get to see the HERE COMES A NEW CHALLENGER screen as the starting frame of the relevant map transition, since it happens on mapreset being 1 rather than 0. * Make a bunch of normal gameplay stuff that might've activated unnecessarily during mapreset now not able to. * Hide some other stuff that might've been visible for no good reason. * Improve Mirror mode. * First person now works with it! * Tweaked the minimap player heads. Although the main section of the automap is mirrored, it feels... wrong to mirror the player head? IDK, you may wish to revert this, but given that everything else is the right way around except for the level itself...* Disable the titlescreen demos, at least until we actually gear up for release and make real ones. * Disable the titlescreen demos, at least until we actually gear up for release and make real ones.
2018-07-22 15:16:03 +00:00
target = -target;
First person fun
2018-06-26 20:12:42 +00:00
if (pn < target)
pn++;
else if (pn > target)
pn--;
if (pn < 0)
splitflags |= V_FLIP; // right turn
* Lots of Record Attack love! * Record Attack Input display! * Show Record Attack emblem and emblem time on the HUD! Changes colours with the player, just like vanilla internal's. * Remove the ugly dark blue box on the singleplayer (including pause screen) whose only purpose in Kart was to contain the Record Attack emblem info! * Unrelated shit! * Improve loading Kart HUD graphics. * Fix mirrored HUD graphics being one screen pixel (not basevid pixel) offset.
2018-07-15 22:13:36 +00:00
target = abs(pn);
if (target > 2)
target = 2;
Mammoth commit! * Deaths in record attack no longer put you into a glitchy singleplayer game-over state that we somehow both kept around and also broke since we branched Kart off of Vanilla.. * Fix non-standard mapscales making the Death Egg respawn octagons dissasemble themselves. * Allow for MULTIPLE TIME EMBLEMS PER MAP, at least in the emblem UI on the timer. It shows all completed emblems plus the uncompleted emblem up to a total of three. * Major tweaks to the First Person HUD. * I know this was your baby, Sal, and some of the changes may prove controversial - so I've put the ones that are likely to cause the most fuss inside an ifndef block, so that you can toggle it as you please with minimal code changes. * Dontdraw-ness, transparency, and colorization match the player's object! * Moves around on the screen with respect to the direction of the player object's motion, to make drifting look nicer! * Flashes the colour of your drift sparks. * Did a WHOLE bunch of things with respect to music. I'm not sure how to describe this, so I'll go through step-by-step. * Countdowns now play the drowning music again. * Removed/disabled extraenous P_RestoreMusics. * Made map-ending music called by its own function, P_EndingMusic(player_t *player). * Made the ending music play on the LAST player crossing the finishing line in splitscreen, rather than first. * Make dead players spinout and clip through the floor, at least until we add the new death anims. * Fix prior pogo spring usage making dead players fall faster. * Make the time over countdown use the kart font when not splitscreen with 3 or 4 players. * Removed a weird bonus HWR_DrawCroppedPatch function signature in the hardware header.
2018-07-16 19:19:30 +00:00
x <<= FRACBITS;
y <<= FRACBITS;
Better first person turning and drifting is now taken into account in the x offsetting
2018-07-18 00:23:22 +00:00
if (tn != cmd->driftturn/50)
tn -= (tn - (cmd->driftturn/50))/8;
if (dr != stplyr->kartstuff[k_drift]*16)
dr -= (dr - (stplyr->kartstuff[k_drift]*16))/8;
Mammoth commit! * Deaths in record attack no longer put you into a glitchy singleplayer game-over state that we somehow both kept around and also broke since we branched Kart off of Vanilla.. * Fix non-standard mapscales making the Death Egg respawn octagons dissasemble themselves. * Allow for MULTIPLE TIME EMBLEMS PER MAP, at least in the emblem UI on the timer. It shows all completed emblems plus the uncompleted emblem up to a total of three. * Major tweaks to the First Person HUD. * I know this was your baby, Sal, and some of the changes may prove controversial - so I've put the ones that are likely to cause the most fuss inside an ifndef block, so that you can toggle it as you please with minimal code changes. * Dontdraw-ness, transparency, and colorization match the player's object! * Moves around on the screen with respect to the direction of the player object's motion, to make drifting look nicer! * Flashes the colour of your drift sparks. * Did a WHOLE bunch of things with respect to music. I'm not sure how to describe this, so I'll go through step-by-step. * Countdowns now play the drowning music again. * Removed/disabled extraenous P_RestoreMusics. * Made map-ending music called by its own function, P_EndingMusic(player_t *player). * Made the ending music play on the LAST player crossing the finishing line in splitscreen, rather than first. * Make dead players spinout and clip through the floor, at least until we add the new death anims. * Fix prior pogo spring usage making dead players fall faster. * Make the time over countdown use the kart font when not splitscreen with 3 or 4 players. * Removed a weird bonus HWR_DrawCroppedPatch function signature in the hardware header.
2018-07-16 19:19:30 +00:00
if (splitscreen == 1)
{
scale = (2*FRACUNIT)/3;
y += FRACUNIT/(vid.dupx < vid.dupy ? vid.dupx : vid.dupy); // correct a one-pixel gap on the screen view (not the basevid view)
}
else if (splitscreen)
scale = FRACUNIT/2;
First person fun
2018-06-26 20:12:42 +00:00
else
Mammoth commit! * Deaths in record attack no longer put you into a glitchy singleplayer game-over state that we somehow both kept around and also broke since we branched Kart off of Vanilla.. * Fix non-standard mapscales making the Death Egg respawn octagons dissasemble themselves. * Allow for MULTIPLE TIME EMBLEMS PER MAP, at least in the emblem UI on the timer. It shows all completed emblems plus the uncompleted emblem up to a total of three. * Major tweaks to the First Person HUD. * I know this was your baby, Sal, and some of the changes may prove controversial - so I've put the ones that are likely to cause the most fuss inside an ifndef block, so that you can toggle it as you please with minimal code changes. * Dontdraw-ness, transparency, and colorization match the player's object! * Moves around on the screen with respect to the direction of the player object's motion, to make drifting look nicer! * Flashes the colour of your drift sparks. * Did a WHOLE bunch of things with respect to music. I'm not sure how to describe this, so I'll go through step-by-step. * Countdowns now play the drowning music again. * Removed/disabled extraenous P_RestoreMusics. * Made map-ending music called by its own function, P_EndingMusic(player_t *player). * Made the ending music play on the LAST player crossing the finishing line in splitscreen, rather than first. * Make dead players spinout and clip through the floor, at least until we add the new death anims. * Fix prior pogo spring usage making dead players fall faster. * Make the time over countdown use the kart font when not splitscreen with 3 or 4 players. * Removed a weird bonus HWR_DrawCroppedPatch function signature in the hardware header.
2018-07-16 19:19:30 +00:00
scale = FRACUNIT;
if (stplyr->mo)
{
Serious deep-cleaning to most of the kartstuff More optional fields, more careful eye placed on return values and other checks
2018-11-08 02:04:57 +00:00
INT32 dsone = K_GetKartDriftSparkValue(stplyr);
INT32 dstwo = dsone*2;
INT32 dsthree = dstwo*2;
Mammoth commit! * Deaths in record attack no longer put you into a glitchy singleplayer game-over state that we somehow both kept around and also broke since we branched Kart off of Vanilla.. * Fix non-standard mapscales making the Death Egg respawn octagons dissasemble themselves. * Allow for MULTIPLE TIME EMBLEMS PER MAP, at least in the emblem UI on the timer. It shows all completed emblems plus the uncompleted emblem up to a total of three. * Major tweaks to the First Person HUD. * I know this was your baby, Sal, and some of the changes may prove controversial - so I've put the ones that are likely to cause the most fuss inside an ifndef block, so that you can toggle it as you please with minimal code changes. * Dontdraw-ness, transparency, and colorization match the player's object! * Moves around on the screen with respect to the direction of the player object's motion, to make drifting look nicer! * Flashes the colour of your drift sparks. * Did a WHOLE bunch of things with respect to music. I'm not sure how to describe this, so I'll go through step-by-step. * Countdowns now play the drowning music again. * Removed/disabled extraenous P_RestoreMusics. * Made map-ending music called by its own function, P_EndingMusic(player_t *player). * Made the ending music play on the LAST player crossing the finishing line in splitscreen, rather than first. * Make dead players spinout and clip through the floor, at least until we add the new death anims. * Fix prior pogo spring usage making dead players fall faster. * Make the time over countdown use the kart font when not splitscreen with 3 or 4 players. * Removed a weird bonus HWR_DrawCroppedPatch function signature in the hardware header.
2018-07-16 19:19:30 +00:00
#ifndef DONTLIKETOASTERSFPTWEAKS
{
Better first person turning and drifting is now taken into account in the x offsetting
2018-07-18 00:23:22 +00:00
const angle_t ang = R_PointToAngle2(0, 0, stplyr->rmomx, stplyr->rmomy) - stplyr->frameangle;
// yes, the following is correct. no, you do not need to swap the x and y.
fixed_t xoffs = -P_ReturnThrustY(stplyr->mo, ang, (BASEVIDWIDTH<<(FRACBITS-2))/2);
fixed_t yoffs = -(P_ReturnThrustX(stplyr->mo, ang, 4*FRACUNIT) - 4*FRACUNIT);
Mammoth commit! * Deaths in record attack no longer put you into a glitchy singleplayer game-over state that we somehow both kept around and also broke since we branched Kart off of Vanilla.. * Fix non-standard mapscales making the Death Egg respawn octagons dissasemble themselves. * Allow for MULTIPLE TIME EMBLEMS PER MAP, at least in the emblem UI on the timer. It shows all completed emblems plus the uncompleted emblem up to a total of three. * Major tweaks to the First Person HUD. * I know this was your baby, Sal, and some of the changes may prove controversial - so I've put the ones that are likely to cause the most fuss inside an ifndef block, so that you can toggle it as you please with minimal code changes. * Dontdraw-ness, transparency, and colorization match the player's object! * Moves around on the screen with respect to the direction of the player object's motion, to make drifting look nicer! * Flashes the colour of your drift sparks. * Did a WHOLE bunch of things with respect to music. I'm not sure how to describe this, so I'll go through step-by-step. * Countdowns now play the drowning music again. * Removed/disabled extraenous P_RestoreMusics. * Made map-ending music called by its own function, P_EndingMusic(player_t *player). * Made the ending music play on the LAST player crossing the finishing line in splitscreen, rather than first. * Make dead players spinout and clip through the floor, at least until we add the new death anims. * Fix prior pogo spring usage making dead players fall faster. * Make the time over countdown use the kart font when not splitscreen with 3 or 4 players. * Removed a weird bonus HWR_DrawCroppedPatch function signature in the hardware header.
2018-07-16 19:19:30 +00:00
if (splitscreen)
xoffs = FixedMul(xoffs, scale);
Better first person turning and drifting is now taken into account in the x offsetting
2018-07-18 00:23:22 +00:00
xoffs -= (tn)*scale;
xoffs -= (dr)*scale;
Mammoth commit! * Deaths in record attack no longer put you into a glitchy singleplayer game-over state that we somehow both kept around and also broke since we branched Kart off of Vanilla.. * Fix non-standard mapscales making the Death Egg respawn octagons dissasemble themselves. * Allow for MULTIPLE TIME EMBLEMS PER MAP, at least in the emblem UI on the timer. It shows all completed emblems plus the uncompleted emblem up to a total of three. * Major tweaks to the First Person HUD. * I know this was your baby, Sal, and some of the changes may prove controversial - so I've put the ones that are likely to cause the most fuss inside an ifndef block, so that you can toggle it as you please with minimal code changes. * Dontdraw-ness, transparency, and colorization match the player's object! * Moves around on the screen with respect to the direction of the player object's motion, to make drifting look nicer! * Flashes the colour of your drift sparks. * Did a WHOLE bunch of things with respect to music. I'm not sure how to describe this, so I'll go through step-by-step. * Countdowns now play the drowning music again. * Removed/disabled extraenous P_RestoreMusics. * Made map-ending music called by its own function, P_EndingMusic(player_t *player). * Made the ending music play on the LAST player crossing the finishing line in splitscreen, rather than first. * Make dead players spinout and clip through the floor, at least until we add the new death anims. * Fix prior pogo spring usage making dead players fall faster. * Make the time over countdown use the kart font when not splitscreen with 3 or 4 players. * Removed a weird bonus HWR_DrawCroppedPatch function signature in the hardware header.
2018-07-16 19:19:30 +00:00
if (stplyr->frameangle == stplyr->mo->angle)
{
const fixed_t mag = FixedDiv(stplyr->speed, 10*stplyr->mo->scale);
if (mag < FRACUNIT)
{
xoffs = FixedMul(xoffs, mag);
if (!splitscreen)
yoffs = FixedMul(yoffs, mag);
}
}
Better first person turning and drifting is now taken into account in the x offsetting
2018-07-18 00:23:22 +00:00
if (stplyr->mo->momz > 0) // TO-DO: Draw more of the kart so we can remove this if!
yoffs += stplyr->mo->momz/3;
Encore mode - a fresh take on mirror mode! * Palette remaps. * Branding. TODO: * Doesn't work in GL. (Mostly.) I have SOME ideas on how to tackle this, but... * Transmaps are broken in Encore for some reason. * I tried to make in-level colormaps shimmy over, but it didn't quite work, so I commented it out and only semi-fixed it.
2018-07-23 22:50:41 +00:00
if (encoremode)
* FREE PLAY! The necessary corollary to HERE COMES A NEW CHALLENGER... * Activates when there are less than two non-spectators in a netgame. * Shows flashing text at the bottom of the screen. * Prevents drawing several UI elements that only make sense with multiple players. * Prevents matchesplayed being increased. * Improve the mapreset timer's behaviour. * Now you get to see the HERE COMES A NEW CHALLENGER screen as the starting frame of the relevant map transition, since it happens on mapreset being 1 rather than 0. * Make a bunch of normal gameplay stuff that might've activated unnecessarily during mapreset now not able to. * Hide some other stuff that might've been visible for no good reason. * Improve Mirror mode. * First person now works with it! * Tweaked the minimap player heads. Although the main section of the automap is mirrored, it feels... wrong to mirror the player head? IDK, you may wish to revert this, but given that everything else is the right way around except for the level itself...* Disable the titlescreen demos, at least until we actually gear up for release and make real ones. * Disable the titlescreen demos, at least until we actually gear up for release and make real ones.
2018-07-22 15:16:03 +00:00
x -= xoffs;
else
x += xoffs;
Mammoth commit! * Deaths in record attack no longer put you into a glitchy singleplayer game-over state that we somehow both kept around and also broke since we branched Kart off of Vanilla.. * Fix non-standard mapscales making the Death Egg respawn octagons dissasemble themselves. * Allow for MULTIPLE TIME EMBLEMS PER MAP, at least in the emblem UI on the timer. It shows all completed emblems plus the uncompleted emblem up to a total of three. * Major tweaks to the First Person HUD. * I know this was your baby, Sal, and some of the changes may prove controversial - so I've put the ones that are likely to cause the most fuss inside an ifndef block, so that you can toggle it as you please with minimal code changes. * Dontdraw-ness, transparency, and colorization match the player's object! * Moves around on the screen with respect to the direction of the player object's motion, to make drifting look nicer! * Flashes the colour of your drift sparks. * Did a WHOLE bunch of things with respect to music. I'm not sure how to describe this, so I'll go through step-by-step. * Countdowns now play the drowning music again. * Removed/disabled extraenous P_RestoreMusics. * Made map-ending music called by its own function, P_EndingMusic(player_t *player). * Made the ending music play on the LAST player crossing the finishing line in splitscreen, rather than first. * Make dead players spinout and clip through the floor, at least until we add the new death anims. * Fix prior pogo spring usage making dead players fall faster. * Make the time over countdown use the kart font when not splitscreen with 3 or 4 players. * Removed a weird bonus HWR_DrawCroppedPatch function signature in the hardware header.
2018-07-16 19:19:30 +00:00
if (!splitscreen)
y += yoffs;
}
// drift sparks!
Rainbow sparks
2018-09-14 03:39:41 +00:00
if ((leveltime & 1) && (stplyr->kartstuff[k_driftcharge] >= dsthree))
colmap = R_GetTranslationColormap(TC_RAINBOW, (UINT8)(1 + (leveltime % (MAXSKINCOLORS-1))), 0);
else if ((leveltime & 1) && (stplyr->kartstuff[k_driftcharge] >= dstwo))
colmap = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_KETCHUP, 0);
Mammoth commit! * Deaths in record attack no longer put you into a glitchy singleplayer game-over state that we somehow both kept around and also broke since we branched Kart off of Vanilla.. * Fix non-standard mapscales making the Death Egg respawn octagons dissasemble themselves. * Allow for MULTIPLE TIME EMBLEMS PER MAP, at least in the emblem UI on the timer. It shows all completed emblems plus the uncompleted emblem up to a total of three. * Major tweaks to the First Person HUD. * I know this was your baby, Sal, and some of the changes may prove controversial - so I've put the ones that are likely to cause the most fuss inside an ifndef block, so that you can toggle it as you please with minimal code changes. * Dontdraw-ness, transparency, and colorization match the player's object! * Moves around on the screen with respect to the direction of the player object's motion, to make drifting look nicer! * Flashes the colour of your drift sparks. * Did a WHOLE bunch of things with respect to music. I'm not sure how to describe this, so I'll go through step-by-step. * Countdowns now play the drowning music again. * Removed/disabled extraenous P_RestoreMusics. * Made map-ending music called by its own function, P_EndingMusic(player_t *player). * Made the ending music play on the LAST player crossing the finishing line in splitscreen, rather than first. * Make dead players spinout and clip through the floor, at least until we add the new death anims. * Fix prior pogo spring usage making dead players fall faster. * Make the time over countdown use the kart font when not splitscreen with 3 or 4 players. * Removed a weird bonus HWR_DrawCroppedPatch function signature in the hardware header.
2018-07-16 19:19:30 +00:00
else if ((leveltime & 1) && (stplyr->kartstuff[k_driftcharge] >= dsone))
colmap = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_SAPPHIRE, 0);
else
#endif
// invincibility/grow/shrink!
if (stplyr->mo->colorized && stplyr->mo->color)
colmap = R_GetTranslationColormap(TC_RAINBOW, stplyr->mo->color, 0);
}
V_DrawFixedPatch(x, y, scale, splitflags, kp_fpview[target], colmap);
First person fun
2018-06-26 20:12:42 +00:00
if (stplyr == &players[secondarydisplayplayer] && splitscreen)
Better first person turning and drifting is now taken into account in the x offsetting
2018-07-18 00:23:22 +00:00
{ pnum[1] = pn; turn[1] = tn; drift[1] = dr; }
First person fun
2018-06-26 20:12:42 +00:00
else if (stplyr == &players[thirddisplayplayer] && splitscreen > 1)
Better first person turning and drifting is now taken into account in the x offsetting
2018-07-18 00:23:22 +00:00
{ pnum[2] = pn; turn[2] = tn; drift[2] = dr; }
First person fun
2018-06-26 20:12:42 +00:00
else if (stplyr == &players[fourthdisplayplayer] && splitscreen > 2)
Better first person turning and drifting is now taken into account in the x offsetting
2018-07-18 00:23:22 +00:00
{ pnum[3] = pn; turn[3] = tn; drift[3] = dr; }
First person fun
2018-06-26 20:12:42 +00:00
else
Better first person turning and drifting is now taken into account in the x offsetting
2018-07-18 00:23:22 +00:00
{ pnum[0] = pn; turn[0] = tn; drift[0] = dr; }
First person fun
2018-06-26 20:12:42 +00:00
}
* Lots of Record Attack love! * Record Attack Input display! * Show Record Attack emblem and emblem time on the HUD! Changes colours with the player, just like vanilla internal's. * Remove the ugly dark blue box on the singleplayer (including pause screen) whose only purpose in Kart was to contain the Record Attack emblem info! * Unrelated shit! * Improve loading Kart HUD graphics. * Fix mirrored HUD graphics being one screen pixel (not basevid pixel) offset.
2018-07-15 22:13:36 +00:00
// doesn't need to ever support 4p
static void K_drawInput(void)
{
static INT32 pn = 0;
INT32 target = 0, splitflags = (V_SNAPTOBOTTOM|V_SNAPTORIGHT);
INT32 x = BASEVIDWIDTH - 32, y = BASEVIDHEIGHT-24, offs, col;
const INT32 accent1 = splitflags|colortranslations[stplyr->skincolor][5];
const INT32 accent2 = splitflags|colortranslations[stplyr->skincolor][9];
ticcmd_t *cmd = &stplyr->cmd;
if (timeinmap <= 105)
return;
if (timeinmap < 113)
{
INT32 count = ((INT32)(timeinmap) - 105);
offs = 64;
while (count-- > 0)
offs >>= 1;
x += offs;
}
#define BUTTW 8
#define BUTTH 11
#define drawbutt(xoffs, butt, symb)\
if (stplyr->cmd.buttons & butt)\
{\
offs = 2;\
col = accent1;\
}\
else\
{\
offs = 0;\
col = accent2;\
V_DrawFill(x+(xoffs), y+BUTTH, BUTTW-1, 2, splitflags|31);\
}\
V_DrawFill(x+(xoffs), y+offs, BUTTW-1, BUTTH, col);\
V_DrawFixedPatch((x+1+(xoffs))<<FRACBITS, (y+offs+1)<<FRACBITS, FRACUNIT, splitflags, tny_font[symb-HU_FONTSTART], NULL)
drawbutt(-2*BUTTW, BT_ACCELERATE, 'A');
drawbutt( -BUTTW, BT_BRAKE, 'B');
drawbutt( 0, BT_DRIFT, 'D');
drawbutt( BUTTW, BT_ATTACK, 'I');
#undef drawbutt
Fix all actionable comments in my review of sonicitems.
2018-08-09 21:59:52 +00:00
#undef BUTTW
#undef BUTTH
* Lots of Record Attack love! * Record Attack Input display! * Show Record Attack emblem and emblem time on the HUD! Changes colours with the player, just like vanilla internal's. * Remove the ugly dark blue box on the singleplayer (including pause screen) whose only purpose in Kart was to contain the Record Attack emblem info! * Unrelated shit! * Improve loading Kart HUD graphics. * Fix mirrored HUD graphics being one screen pixel (not basevid pixel) offset.
2018-07-15 22:13:36 +00:00
y -= 1;
if (!cmd->driftturn) // no turn
target = 0;
else // turning of multiple strengths!
{
Mammoth commit! * Deaths in record attack no longer put you into a glitchy singleplayer game-over state that we somehow both kept around and also broke since we branched Kart off of Vanilla.. * Fix non-standard mapscales making the Death Egg respawn octagons dissasemble themselves. * Allow for MULTIPLE TIME EMBLEMS PER MAP, at least in the emblem UI on the timer. It shows all completed emblems plus the uncompleted emblem up to a total of three. * Major tweaks to the First Person HUD. * I know this was your baby, Sal, and some of the changes may prove controversial - so I've put the ones that are likely to cause the most fuss inside an ifndef block, so that you can toggle it as you please with minimal code changes. * Dontdraw-ness, transparency, and colorization match the player's object! * Moves around on the screen with respect to the direction of the player object's motion, to make drifting look nicer! * Flashes the colour of your drift sparks. * Did a WHOLE bunch of things with respect to music. I'm not sure how to describe this, so I'll go through step-by-step. * Countdowns now play the drowning music again. * Removed/disabled extraenous P_RestoreMusics. * Made map-ending music called by its own function, P_EndingMusic(player_t *player). * Made the ending music play on the LAST player crossing the finishing line in splitscreen, rather than first. * Make dead players spinout and clip through the floor, at least until we add the new death anims. * Fix prior pogo spring usage making dead players fall faster. * Make the time over countdown use the kart font when not splitscreen with 3 or 4 players. * Removed a weird bonus HWR_DrawCroppedPatch function signature in the hardware header.
2018-07-16 19:19:30 +00:00
target = ((abs(cmd->driftturn) - 1)/125)+1;
* Lots of Record Attack love! * Record Attack Input display! * Show Record Attack emblem and emblem time on the HUD! Changes colours with the player, just like vanilla internal's. * Remove the ugly dark blue box on the singleplayer (including pause screen) whose only purpose in Kart was to contain the Record Attack emblem info! * Unrelated shit! * Improve loading Kart HUD graphics. * Fix mirrored HUD graphics being one screen pixel (not basevid pixel) offset.
2018-07-15 22:13:36 +00:00
if (target > 4)
target = 4;
if (cmd->driftturn < 0)
target = -target;
}
if (pn != target)
{
if (abs(pn - target) == 1)
pn = target;
else if (pn < target)
pn += 2;
else //if (pn > target)
pn -= 2;
}
if (pn < 0)
{
splitflags |= V_FLIP; // right turn
x--;
}
target = abs(pn);
if (target > 4)
target = 4;
if (!stplyr->skincolor)
V_DrawFixedPatch(x<<FRACBITS, y<<FRACBITS, FRACUNIT, splitflags, kp_inputwheel[target], NULL);
else
{
UINT8 *colormap;
colormap = R_GetTranslationColormap(0, stplyr->skincolor, 0);
V_DrawFixedPatch(x<<FRACBITS, y<<FRACBITS, FRACUNIT, splitflags, kp_inputwheel[target], colormap);
}
}
HERE COMES A NEW CHALLENGER
2018-07-22 04:31:02 +00:00
static void K_drawChallengerScreen(void)
{
// This is an insanely complicated animation.
static UINT8 anim[52] = {
0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13, // frame 1-14, 2 tics: HERE COMES A NEW slides in
14,14,14,14,14,14, // frame 15, 6 tics: pause on the W
15,16,17,18, // frame 16-19, 1 tic: CHALLENGER approaches screen
19,20,19,20,19,20,19,20,19,20, // frame 20-21, 1 tic, 5 alternating: all text vibrates from impact
21,22,23,24 // frame 22-25, 1 tic: CHALLENGER turns gold
};
const UINT8 offset = min(52-1, (3*TICRATE)-mapreset);
V_DrawFadeScreen(0xFF00, 16); // Fade out
V_DrawScaledPatch(0, 0, 0, kp_challenger[anim[offset]]);
}
Lap start animation
2018-08-10 01:52:02 +00:00
static void K_drawLapStartAnim(void)
Debug checkpoint, and prevent spinout/booster timers while in the air
2018-06-17 22:10:42 +00:00
{
Lap start animation
2018-08-10 01:52:02 +00:00
// This is an EVEN MORE insanely complicated animation.
const UINT8 progress = 80-stplyr->kartstuff[k_lapanimation];
Fix offsets, add colormapping
2018-11-01 02:38:43 +00:00
UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, stplyr->skincolor, 0);
Lap start animation
2018-08-10 01:52:02 +00:00
Fix offsets, add colormapping
2018-11-01 02:38:43 +00:00
V_DrawFixedPatch((BASEVIDWIDTH/2 + (32*max(0, stplyr->kartstuff[k_lapanimation]-76)))*FRACUNIT,
(48 - (32*max(0, progress-76)))*FRACUNIT,
FRACUNIT, V_HUDTRANS,
Lap emblem gets replaced with a stopwatch in Record Attack
2018-11-09 00:36:05 +00:00
(modeattacking ? kp_lapanim_emblem[1] : kp_lapanim_emblem[0]), colormap);
Lap start animation
2018-08-10 01:52:02 +00:00
Lap hands touch-up
2018-11-01 20:15:25 +00:00
if (stplyr->kartstuff[k_laphand] >= 1 && stplyr->kartstuff[k_laphand] <= 3)
{
V_DrawFixedPatch((BASEVIDWIDTH/2 + (32*max(0, stplyr->kartstuff[k_lapanimation]-76)))*FRACUNIT,
(48 - (32*max(0, progress-76))
+ 4 - abs((leveltime % 8) - 4))*FRACUNIT,
FRACUNIT, V_HUDTRANS,
kp_lapanim_hand[stplyr->kartstuff[k_laphand]-1], NULL);
}
Lap start animation
2018-08-10 01:52:02 +00:00
if (stplyr->laps == (UINT8)(cv_numlaps.value - 1))
{
Fix offsets, add colormapping
2018-11-01 02:38:43 +00:00
V_DrawFixedPatch((62 - (32*max(0, progress-76)))*FRACUNIT, // 27
Lap emblem gets replaced with a stopwatch in Record Attack
2018-11-09 00:36:05 +00:00
30*FRACUNIT, // 24
Fix offsets, add colormapping
2018-11-01 02:38:43 +00:00
FRACUNIT, V_HUDTRANS,
kp_lapanim_final[min(progress/2, 10)], NULL);
Lap start animation
2018-08-10 01:52:02 +00:00
if (progress/2-12 >= 0)
{
Fix offsets, add colormapping
2018-11-01 02:38:43 +00:00
V_DrawFixedPatch((188 + (32*max(0, progress-76)))*FRACUNIT, // 194
Lap emblem gets replaced with a stopwatch in Record Attack
2018-11-09 00:36:05 +00:00
30*FRACUNIT, // 24
Fix offsets, add colormapping
2018-11-01 02:38:43 +00:00
FRACUNIT, V_HUDTRANS,
kp_lapanim_lap[min(progress/2-12, 6)], NULL);
Lap start animation
2018-08-10 01:52:02 +00:00
}
}
Debug checkpoint, and prevent spinout/booster timers while in the air
2018-06-17 22:10:42 +00:00
else
Lap start animation
2018-08-10 01:52:02 +00:00
{
Fix offsets, add colormapping
2018-11-01 02:38:43 +00:00
V_DrawFixedPatch((82 - (32*max(0, progress-76)))*FRACUNIT, // 61
Lap emblem gets replaced with a stopwatch in Record Attack
2018-11-09 00:36:05 +00:00
30*FRACUNIT, // 24
Fix offsets, add colormapping
2018-11-01 02:38:43 +00:00
FRACUNIT, V_HUDTRANS,
kp_lapanim_lap[min(progress/2, 6)], NULL);
Lap start animation
2018-08-10 01:52:02 +00:00
if (progress/2-8 >= 0)
{
Fix offsets, add colormapping
2018-11-01 02:38:43 +00:00
V_DrawFixedPatch((188 + (32*max(0, progress-76)))*FRACUNIT, // 194
Lap emblem gets replaced with a stopwatch in Record Attack
2018-11-09 00:36:05 +00:00
30*FRACUNIT, // 24
Fix offsets, add colormapping
2018-11-01 02:38:43 +00:00
FRACUNIT, V_HUDTRANS,
kp_lapanim_number[(((UINT32)stplyr->laps+1) / 10)][min(progress/2-8, 2)], NULL);
Lap start animation
2018-08-10 01:52:02 +00:00
if (progress/2-10 >= 0)
{
Fix offsets, add colormapping
2018-11-01 02:38:43 +00:00
V_DrawFixedPatch((208 + (32*max(0, progress-76)))*FRACUNIT, // 221
Lap emblem gets replaced with a stopwatch in Record Attack
2018-11-09 00:36:05 +00:00
30*FRACUNIT, // 24
Fix offsets, add colormapping
2018-11-01 02:38:43 +00:00
FRACUNIT, V_HUDTRANS,
kp_lapanim_number[(((UINT32)stplyr->laps+1) % 10)][min(progress/2-10, 2)], NULL);
Lap start animation
2018-08-10 01:52:02 +00:00
}
}
}
Debug checkpoint, and prevent spinout/booster timers while in the air
2018-06-17 22:10:42 +00:00
}
* FREE PLAY! The necessary corollary to HERE COMES A NEW CHALLENGER... * Activates when there are less than two non-spectators in a netgame. * Shows flashing text at the bottom of the screen. * Prevents drawing several UI elements that only make sense with multiple players. * Prevents matchesplayed being increased. * Improve the mapreset timer's behaviour. * Now you get to see the HERE COMES A NEW CHALLENGER screen as the starting frame of the relevant map transition, since it happens on mapreset being 1 rather than 0. * Make a bunch of normal gameplay stuff that might've activated unnecessarily during mapreset now not able to. * Hide some other stuff that might've been visible for no good reason. * Improve Mirror mode. * First person now works with it! * Tweaked the minimap player heads. Although the main section of the automap is mirrored, it feels... wrong to mirror the player head? IDK, you may wish to revert this, but given that everything else is the right way around except for the level itself...* Disable the titlescreen demos, at least until we actually gear up for release and make real ones. * Disable the titlescreen demos, at least until we actually gear up for release and make real ones.
2018-07-22 15:16:03 +00:00
void K_drawKartFreePlay(UINT32 flashtime)
{
Some UI stuff. * Place FREE PLAY in a less contentous location. * Fix comeback timer being incorrectly offset from the center of the screen. * Prevent vote drawer from nuking itself (visual-wise) at the start of the level fade following it.
2018-07-30 20:53:54 +00:00
// no splitscreen support because it's not FREE PLAY if you have more than one player in-game
* FREE PLAY! The necessary corollary to HERE COMES A NEW CHALLENGER... * Activates when there are less than two non-spectators in a netgame. * Shows flashing text at the bottom of the screen. * Prevents drawing several UI elements that only make sense with multiple players. * Prevents matchesplayed being increased. * Improve the mapreset timer's behaviour. * Now you get to see the HERE COMES A NEW CHALLENGER screen as the starting frame of the relevant map transition, since it happens on mapreset being 1 rather than 0. * Make a bunch of normal gameplay stuff that might've activated unnecessarily during mapreset now not able to. * Hide some other stuff that might've been visible for no good reason. * Improve Mirror mode. * First person now works with it! * Tweaked the minimap player heads. Although the main section of the automap is mirrored, it feels... wrong to mirror the player head? IDK, you may wish to revert this, but given that everything else is the right way around except for the level itself...* Disable the titlescreen demos, at least until we actually gear up for release and make real ones. * Disable the titlescreen demos, at least until we actually gear up for release and make real ones.
2018-07-22 15:16:03 +00:00
if ((flashtime % TICRATE) < TICRATE/2)
return;
Some UI stuff. * Place FREE PLAY in a less contentous location. * Fix comeback timer being incorrectly offset from the center of the screen. * Prevent vote drawer from nuking itself (visual-wise) at the start of the level fade following it.
2018-07-30 20:53:54 +00:00
V_DrawKartString((BASEVIDWIDTH - (LAPS_X+1)) - (12*9), // mirror the laps thingy
LAPS_Y+3, V_SNAPTOBOTTOM|V_SNAPTORIGHT, "FREE PLAY");
* FREE PLAY! The necessary corollary to HERE COMES A NEW CHALLENGER... * Activates when there are less than two non-spectators in a netgame. * Shows flashing text at the bottom of the screen. * Prevents drawing several UI elements that only make sense with multiple players. * Prevents matchesplayed being increased. * Improve the mapreset timer's behaviour. * Now you get to see the HERE COMES A NEW CHALLENGER screen as the starting frame of the relevant map transition, since it happens on mapreset being 1 rather than 0. * Make a bunch of normal gameplay stuff that might've activated unnecessarily during mapreset now not able to. * Hide some other stuff that might've been visible for no good reason. * Improve Mirror mode. * First person now works with it! * Tweaked the minimap player heads. Although the main section of the automap is mirrored, it feels... wrong to mirror the player head? IDK, you may wish to revert this, but given that everything else is the right way around except for the level itself...* Disable the titlescreen demos, at least until we actually gear up for release and make real ones. * Disable the titlescreen demos, at least until we actually gear up for release and make real ones.
2018-07-22 15:16:03 +00:00
}
Item distribution debugger, and oversight pointed out by this Item distribution debugger is a netvar that enables cheats, so no exploiting!
2018-08-29 18:28:28 +00:00
static void K_drawDistributionDebugger(void)
{
patch_t *items[NUMKARTRESULTS] = {
kp_sadface[1],
kp_sneaker[1],
kp_rocketsneaker[1],
kp_invincibility[7],
kp_banana[1],
kp_eggman[1],
kp_orbinaut[4],
kp_jawz[1],
kp_mine[1],
kp_ballhog[1],
kp_selfpropelledbomb[1],
kp_grow[1],
kp_shrink[1],
kp_thundershield[1],
kp_hyudoro[1],
kp_pogospring[1],
kp_kitchensink[1],
kp_sneaker[1],
kp_banana[1],
kp_banana[1],
kp_orbinaut[4],
kp_orbinaut[4],
kp_jawz[1]
};
INT32 useodds = 0;
INT32 pingame = 0, bestbumper = 0;
INT32 i;
INT32 x = -9, y = -9;
if (stplyr != &players[displayplayer]) // only for p1
return;
Fix the mixed declaration and code warnings that only don't appear currently because of a tiny Makefile issue.
2018-10-07 14:35:54 +00:00
// The only code duplication from the Kart, just to avoid the actual item function from calculating pingame twice
Item distribution debugger, and oversight pointed out by this Item distribution debugger is a netvar that enables cheats, so no exploiting!
2018-08-29 18:28:28 +00:00
for (i = 0; i < MAXPLAYERS; i++)
{
if (!playeringame[i] || players[i].spectator)
continue;
pingame++;
if (players[i].kartstuff[k_bumper] > bestbumper)
bestbumper = players[i].kartstuff[k_bumper];
}
useodds = K_FindUseodds(stplyr, 0, pingame, bestbumper);
for (i = 1; i < NUMKARTRESULTS; i++)
{
const INT32 itemodds = K_KartGetItemOdds(useodds, i, 0);
if (itemodds <= 0)
continue;
V_DrawScaledPatch(x, y, V_HUDTRANS|V_SNAPTOTOP, items[i]);
V_DrawThinString(x+11, y+31, V_HUDTRANS|V_SNAPTOTOP, va("%d", itemodds));
// Display amount for multi-items
if (i >= NUMKARTITEMS)
{
INT32 amount;
switch (i)
{
case KRITEM_TENFOLDBANANA:
amount = 10;
break;
case KRITEM_QUADORBINAUT:
amount = 4;
break;
case KRITEM_DUALJAWZ:
amount = 2;
break;
default:
amount = 3;
break;
}
V_DrawString(x+24, y+31, V_ALLOWLOWERCASE|V_HUDTRANS|V_SNAPTOTOP, va("x%d", amount));
}
x += 32;
if (x >= 297)
{
x = -9;
y += 32;
}
}
V_DrawString(0, 0, V_HUDTRANS|V_SNAPTOTOP, va("USEODDS %d", useodds));
}
Lap start animation
2018-08-10 01:52:02 +00:00
static void K_drawCheckpointDebugger(void)
{
Item distribution debugger, and oversight pointed out by this Item distribution debugger is a netvar that enables cheats, so no exploiting!
2018-08-29 18:28:28 +00:00
if (stplyr != &players[displayplayer]) // only for p1
return;
Lap start animation
2018-08-10 01:52:02 +00:00
if ((numstarposts/2 + stplyr->starpostnum) >= numstarposts)
V_DrawString(8, 184, 0, va("Checkpoint: %d / %d (Can finish)", stplyr->starpostnum, numstarposts));
else
V_DrawString(8, 184, 0, va("Checkpoint: %d / %d (Skip: %d)", stplyr->starpostnum, numstarposts, (numstarposts/2 + stplyr->starpostnum)));
V_DrawString(8, 192, 0, va("Waypoint dist: Prev %d, Next %d", stplyr->kartstuff[k_prevcheck], stplyr->kartstuff[k_nextcheck]));
}
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
void K_drawKartHUD(void)
{
* FREE PLAY! The necessary corollary to HERE COMES A NEW CHALLENGER... * Activates when there are less than two non-spectators in a netgame. * Shows flashing text at the bottom of the screen. * Prevents drawing several UI elements that only make sense with multiple players. * Prevents matchesplayed being increased. * Improve the mapreset timer's behaviour. * Now you get to see the HERE COMES A NEW CHALLENGER screen as the starting frame of the relevant map transition, since it happens on mapreset being 1 rather than 0. * Make a bunch of normal gameplay stuff that might've activated unnecessarily during mapreset now not able to. * Hide some other stuff that might've been visible for no good reason. * Improve Mirror mode. * First person now works with it! * Tweaked the minimap player heads. Although the main section of the automap is mirrored, it feels... wrong to mirror the player head? IDK, you may wish to revert this, but given that everything else is the right way around except for the level itself...* Disable the titlescreen demos, at least until we actually gear up for release and make real ones. * Disable the titlescreen demos, at least until we actually gear up for release and make real ones.
2018-07-22 15:16:03 +00:00
boolean isfreeplay = false;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
// Define the X and Y for each drawn object
// This is handled by console/menu values
K_initKartHUD();
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
Reverted scoring back to what it was before, change order-of-operations to allow switcheroos from bombs.
2018-07-01 03:35:38 +00:00
// Draw that fun first person HUD! Drawn ASAP so it looks more "real".
First person fun
2018-06-26 20:12:42 +00:00
if ((stplyr == &players[displayplayer] && !camera.chase)
|| ((splitscreen && stplyr == &players[secondarydisplayplayer]) && !camera2.chase)
|| ((splitscreen > 1 && stplyr == &players[thirddisplayplayer]) && !camera3.chase)
|| ((splitscreen > 2 && stplyr == &players[fourthdisplayplayer]) && !camera4.chase))
K_drawKartFirstPerson();
Disable viewheight cvar and vanilla's irrelevant first person HUD stuff, move Viewpoint HUD to a nicer spot
2018-06-26 15:33:54 +00:00
if (splitscreen == 2) // Player 4 in 3P is the minimap :p
A few additions to the hud library
2018-10-30 17:24:03 +00:00
{
Remove indents on #ifdefs and take K_drawInput in the hud_position check
2018-11-03 21:24:45 +00:00
#ifdef HAVE_BLUA
A few additions to the hud library
2018-10-30 17:24:03 +00:00
if (LUA_HudEnabled(hud_minimap))
Remove indents on #ifdefs and take K_drawInput in the hud_position check
2018-11-03 21:24:45 +00:00
#endif
Actually, this makes more sense :U
2018-03-28 19:28:50 +00:00
K_drawKartMinimap();
A few additions to the hud library
2018-10-30 17:24:03 +00:00
}
Actually, this makes more sense :U
2018-03-28 19:28:50 +00:00
Battle HUD stuff
2017-11-14 01:45:57 +00:00
// Draw full screen stuff that turns off the rest of the HUD
Don't draw the challenger screen multiple times Another minor bug that could only crop up in online splitscreen
2018-10-02 05:26:13 +00:00
if (mapreset && stplyr == &players[displayplayer])
HERE COMES A NEW CHALLENGER
2018-07-22 04:31:02 +00:00
{
K_drawChallengerScreen();
return;
}
Made a lot of gametype checks use either G_RaceGametype or G_BattleGametype Should make it a lot easier to add more gametypes later. Also some minor fixes: - Changed up how shell speed scales in mobjscale juuuust slightly, so it's less messy - Fixed CHECK showing spectators
2018-03-04 20:27:52 +00:00
if ((G_BattleGametype())
HUD
2017-12-18 01:42:17 +00:00
&& (stplyr->exiting
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
|| (stplyr->kartstuff[k_bumper] <= 0
HUD
2017-12-18 01:42:17 +00:00
&& stplyr->kartstuff[k_comebacktimer]
Lots of changes - Menus now have all of the Kart cvars - Removed any cvars that aren't useful for Kart from the menu (they still exist in the console, though) - Removed SP and NiGHTS Mode options from the main menu - "kartcc" is renamed "kartspeed", uses values 0-2 instead of multiples of 50, or the terms "Relaxed", "Standard", and "Turbo" - Many gametype options (game speed, frantic, mirror, & karma comeback) are now changed on map load instead of instantly - New cvar, "kartminimap", for disabling the minimap - The maxplayers cvar now actually matches up with our 16 player limit - Game now keeps track of matches played. Has a condition type associated with it, as well. - Game checks for unlocks and saves gamedata when finishing a match, even in MP - Removed most of the normal emblems, added a single emblem for Green Hills. Didn't know what to do with extra emblems and such so I just left them (FOR NOW c:<)
2018-01-16 03:31:14 +00:00
&& comeback
HUD
2017-12-18 01:42:17 +00:00
&& stplyr->playerstate == PST_LIVE)))
Battle HUD stuff
2017-11-14 01:45:57 +00:00
{
Lots of small tweaks & fixes, that should make Battle a LOT more bearable - Comeback timer is now always 10 seconds instead of scaling - Takes 10 seconds before exiting - Flashing tics is doubled in Battle Mode - Removed a bunch of bomb nerfs - Bombs are back to making only 1 point per hit - Exposed K_GetKartAccel & K_GetKartFlashing to Lua - Item boxes should no longer drop while going up slopes - Trading item boxes with a bomb should turn you back into a bomb - Balloons should no longer all respawn when dying in pits in 2-player games - Flashing players are able to kill *thrown* shells again (shields and trap items are still unkillable). Prevents red shells from being able to stick to a flashing player and hurt them again as soon as they're done flashing - CHECK appears at a farther distance
2017-11-17 05:48:36 +00:00
K_drawBattleFullscreen();
return;
Battle HUD stuff
2017-11-14 01:45:57 +00:00
}
Lakitu murder & countdown improvements (I'm not SevenethSentienel! I just don't feel like logging out!)
2018-06-25 02:15:22 +00:00
// Draw the CHECK indicator before the other items, so it's overlapped by everything else
More menu stuff! * Center level selection. * Re-work Record Attack screen. * Re-order MP Main menu, hide in NONET. * Combined yeeeah on vote screen. * Colour gametype on tab and tally. * (unrelated) Don't show "CHECK" if exiting.
2018-07-02 00:55:01 +00:00
if (cv_kartcheck.value && !splitscreen && !players[displayplayer].exiting)
Lakitu murder & countdown improvements (I'm not SevenethSentienel! I just don't feel like logging out!)
2018-06-25 02:15:22 +00:00
K_drawKartPlayerCheck();
thing
2017-12-22 21:24:20 +00:00
HUD improvements Most notably, Karma & Boo no longer appear on the minimap
2018-03-27 22:22:33 +00:00
if (splitscreen == 0 && cv_kartminimap.value)
A few additions to the hud library
2018-10-30 17:24:03 +00:00
{
Remove indents on #ifdefs and take K_drawInput in the hud_position check
2018-11-03 21:24:45 +00:00
#ifdef HAVE_BLUA
A few additions to the hud library
2018-10-30 17:24:03 +00:00
if (LUA_HudEnabled(hud_minimap))
Remove indents on #ifdefs and take K_drawInput in the hud_position check
2018-11-03 21:24:45 +00:00
#endif
A few additions to the hud library
2018-10-30 17:24:03 +00:00
K_drawKartMinimap(); // 3P splitscreen is handled above
}
HUD
2017-12-18 01:42:17 +00:00
So much - Renamed fucking everything - Threw out all of the item code because it looks at me funny
2018-02-05 23:55:52 +00:00
// Draw the item window
Remove indents on #ifdefs and take K_drawInput in the hud_position check
2018-11-03 21:24:45 +00:00
#ifdef HAVE_BLUA
A few additions to the hud library
2018-10-30 17:24:03 +00:00
if (LUA_HudEnabled(hud_item))
Remove indents on #ifdefs and take K_drawInput in the hud_position check
2018-11-03 21:24:45 +00:00
#endif
A few additions to the hud library
2018-10-30 17:24:03 +00:00
K_drawKartItem();
BATLLE MODE AAAAAA
2017-10-22 07:06:35 +00:00
WANTED
2018-07-01 08:36:09 +00:00
// Draw WANTED status
if (G_BattleGametype())
A few additions to the hud library
2018-10-30 17:24:03 +00:00
{
Remove indents on #ifdefs and take K_drawInput in the hud_position check
2018-11-03 21:24:45 +00:00
#ifdef HAVE_BLUA
A few additions to the hud library
2018-10-30 17:24:03 +00:00
if (LUA_HudEnabled(hud_wanted))
Remove indents on #ifdefs and take K_drawInput in the hud_position check
2018-11-03 21:24:45 +00:00
#endif
A few additions to the hud library
2018-10-30 17:24:03 +00:00
K_drawKartWanted();
}
WANTED
2018-07-01 08:36:09 +00:00
HUD
2017-12-18 01:42:17 +00:00
// If not splitscreen, draw...
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
if (!splitscreen)
HUD
2017-12-18 01:42:17 +00:00
{
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
// Draw the timestamp
Remove indents on #ifdefs and take K_drawInput in the hud_position check
2018-11-03 21:24:45 +00:00
#ifdef HAVE_BLUA
A few additions to the hud library
2018-10-30 17:24:03 +00:00
if (LUA_HudEnabled(hud_time))
Remove indents on #ifdefs and take K_drawInput in the hud_position check
2018-11-03 21:24:45 +00:00
#endif
Merge branch 'master' into staff_names
2018-11-08 19:47:38 +00:00
K_drawKartTimestamp(stplyr->realtime, TIME_X, TIME_Y, gamemap, 0);
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
Unfinished V_HORZSCREEN revamp
2017-12-22 15:16:41 +00:00
if (!modeattacking)
{
// The top-four faces on the left
Remove indents on #ifdefs and take K_drawInput in the hud_position check
2018-11-03 21:24:45 +00:00
/*#ifdef HAVE_BLUA
Resolved merge conflict and renamed gamerankings to minirankings
2018-10-31 14:18:05 +00:00
if (LUA_HudEnabled(hud_minirankings))
Remove indents on #ifdefs and take K_drawInput in the hud_position check
2018-11-03 21:24:45 +00:00
#endif*/
A few additions to the hud library
2018-10-30 17:24:03 +00:00
isfreeplay = K_drawKartPositionFaces();
Unfinished V_HORZSCREEN revamp
2017-12-22 15:16:41 +00:00
}
}
Spectating is properly implemented now - Spectate button works - Spectating & objectplace controls are usable now - New spectator HUD
2018-01-23 03:18:57 +00:00
if (!stplyr->spectator) // Bottom of the screen elements, don't need in spectate mode
Many things! - Position faces are now drawn in Battle, categorized first by balloons, then by points - Balloon-based items, gives people who are worse off better items, and people who are better off worse items. - You can strafe while using feather or while using a bounce pad - Reduced the strength of bounce pad thrust on items - Increased bounce pad's minimum forward push on players - Made Frantic Mode just a teeeeensy bit more frantic - Fixed being able to use Feathers mid-air - Fixed being unable to steal Feathers - Drift sparks use frameangle instead of angle
2017-11-23 02:40:17 +00:00
{
Made a lot of gametype checks use either G_RaceGametype or G_BattleGametype Should make it a lot easier to add more gametypes later. Also some minor fixes: - Changed up how shell speed scales in mobjscale juuuust slightly, so it's less messy - Fixed CHECK showing spectators
2018-03-04 20:27:52 +00:00
if (G_RaceGametype()) // Race-only elements
Tweeeeeaks - MT_FALLINGROCK bumps you instead of spinning you out! RIP annoying af apples - Made some Battle-related messages only happen in netgames - Messed with the timing on the intro
2017-12-28 23:37:25 +00:00
{
Spectating is properly implemented now - Spectate button works - Spectating & objectplace controls are usable now - New spectator HUD
2018-01-23 03:18:57 +00:00
// Draw the lap counter
Remove indents on #ifdefs and take K_drawInput in the hud_position check
2018-11-03 21:24:45 +00:00
#ifdef HAVE_BLUA
A few additions to the hud library
2018-10-30 17:24:03 +00:00
if (LUA_HudEnabled(hud_gametypeinfo))
Remove indents on #ifdefs and take K_drawInput in the hud_position check
2018-11-03 21:24:45 +00:00
#endif
A few additions to the hud library
2018-10-30 17:24:03 +00:00
K_drawKartLaps();
Tweeeeeaks - MT_FALLINGROCK bumps you instead of spinning you out! RIP annoying af apples - Made some Battle-related messages only happen in netgames - Messed with the timing on the intro
2017-12-28 23:37:25 +00:00
Spectating is properly implemented now - Spectate button works - Spectating & objectplace controls are usable now - New spectator HUD
2018-01-23 03:18:57 +00:00
if (!splitscreen)
{
// Draw the speedometer
// TODO: Make a better speedometer.
Remove indents on #ifdefs and take K_drawInput in the hud_position check
2018-11-03 21:24:45 +00:00
#ifdef HAVE_BLUA
A few additions to the hud library
2018-10-30 17:24:03 +00:00
if (LUA_HudEnabled(hud_speedometer))
Remove indents on #ifdefs and take K_drawInput in the hud_position check
2018-11-03 21:24:45 +00:00
#endif
Spectating is properly implemented now - Spectate button works - Spectating & objectplace controls are usable now - New spectator HUD
2018-01-23 03:18:57 +00:00
K_drawKartSpeedometer();
}
* FREE PLAY! The necessary corollary to HERE COMES A NEW CHALLENGER... * Activates when there are less than two non-spectators in a netgame. * Shows flashing text at the bottom of the screen. * Prevents drawing several UI elements that only make sense with multiple players. * Prevents matchesplayed being increased. * Improve the mapreset timer's behaviour. * Now you get to see the HERE COMES A NEW CHALLENGER screen as the starting frame of the relevant map transition, since it happens on mapreset being 1 rather than 0. * Make a bunch of normal gameplay stuff that might've activated unnecessarily during mapreset now not able to. * Hide some other stuff that might've been visible for no good reason. * Improve Mirror mode. * First person now works with it! * Tweaked the minimap player heads. Although the main section of the automap is mirrored, it feels... wrong to mirror the player head? IDK, you may wish to revert this, but given that everything else is the right way around except for the level itself...* Disable the titlescreen demos, at least until we actually gear up for release and make real ones. * Disable the titlescreen demos, at least until we actually gear up for release and make real ones.
2018-07-22 15:16:03 +00:00
if (isfreeplay)
;
else if (!modeattacking)
Spectating is properly implemented now - Spectate button works - Spectating & objectplace controls are usable now - New spectator HUD
2018-01-23 03:18:57 +00:00
{
// Draw the numerical position
Remove indents on #ifdefs and take K_drawInput in the hud_position check
2018-11-03 21:24:45 +00:00
#ifdef HAVE_BLUA
A few additions to the hud library
2018-10-30 17:24:03 +00:00
if (LUA_HudEnabled(hud_position))
Remove indents on #ifdefs and take K_drawInput in the hud_position check
2018-11-03 21:24:45 +00:00
#endif
A few additions to the hud library
2018-10-30 17:24:03 +00:00
K_DrawKartPositionNum(stplyr->kartstuff[k_position]);
Spectating is properly implemented now - Spectate button works - Spectating & objectplace controls are usable now - New spectator HUD
2018-01-23 03:18:57 +00:00
}
* FREE PLAY! The necessary corollary to HERE COMES A NEW CHALLENGER... * Activates when there are less than two non-spectators in a netgame. * Shows flashing text at the bottom of the screen. * Prevents drawing several UI elements that only make sense with multiple players. * Prevents matchesplayed being increased. * Improve the mapreset timer's behaviour. * Now you get to see the HERE COMES A NEW CHALLENGER screen as the starting frame of the relevant map transition, since it happens on mapreset being 1 rather than 0. * Make a bunch of normal gameplay stuff that might've activated unnecessarily during mapreset now not able to. * Hide some other stuff that might've been visible for no good reason. * Improve Mirror mode. * First person now works with it! * Tweaked the minimap player heads. Although the main section of the automap is mirrored, it feels... wrong to mirror the player head? IDK, you may wish to revert this, but given that everything else is the right way around except for the level itself...* Disable the titlescreen demos, at least until we actually gear up for release and make real ones. * Disable the titlescreen demos, at least until we actually gear up for release and make real ones.
2018-07-22 15:16:03 +00:00
else //if (!(demoplayback && hu_showscores))
{
// Draw the input UI
Remove indents on #ifdefs and take K_drawInput in the hud_position check
2018-11-03 21:24:45 +00:00
#ifdef HAVE_BLUA
if (LUA_HudEnabled(hud_position))
#endif
K_drawInput();
* FREE PLAY! The necessary corollary to HERE COMES A NEW CHALLENGER... * Activates when there are less than two non-spectators in a netgame. * Shows flashing text at the bottom of the screen. * Prevents drawing several UI elements that only make sense with multiple players. * Prevents matchesplayed being increased. * Improve the mapreset timer's behaviour. * Now you get to see the HERE COMES A NEW CHALLENGER screen as the starting frame of the relevant map transition, since it happens on mapreset being 1 rather than 0. * Make a bunch of normal gameplay stuff that might've activated unnecessarily during mapreset now not able to. * Hide some other stuff that might've been visible for no good reason. * Improve Mirror mode. * First person now works with it! * Tweaked the minimap player heads. Although the main section of the automap is mirrored, it feels... wrong to mirror the player head? IDK, you may wish to revert this, but given that everything else is the right way around except for the level itself...* Disable the titlescreen demos, at least until we actually gear up for release and make real ones. * Disable the titlescreen demos, at least until we actually gear up for release and make real ones.
2018-07-22 15:16:03 +00:00
}
Spectating is properly implemented now - Spectate button works - Spectating & objectplace controls are usable now - New spectator HUD
2018-01-23 03:18:57 +00:00
}
Made a lot of gametype checks use either G_RaceGametype or G_BattleGametype Should make it a lot easier to add more gametypes later. Also some minor fixes: - Changed up how shell speed scales in mobjscale juuuust slightly, so it's less messy - Fixed CHECK showing spectators
2018-03-04 20:27:52 +00:00
else if (G_BattleGametype()) // Battle-only
Closer to done HUD tweaking? Splitscreen in Battle is left
2017-12-24 00:14:06 +00:00
{
Spectating is properly implemented now - Spectate button works - Spectating & objectplace controls are usable now - New spectator HUD
2018-01-23 03:18:57 +00:00
// Draw the hits left!
Remove indents on #ifdefs and take K_drawInput in the hud_position check
2018-11-03 21:24:45 +00:00
#ifdef HAVE_BLUA
A few additions to the hud library
2018-10-30 17:24:03 +00:00
if (LUA_HudEnabled(hud_gametypeinfo))
Remove indents on #ifdefs and take K_drawInput in the hud_position check
2018-11-03 21:24:45 +00:00
#endif
A few additions to the hud library
2018-10-30 17:24:03 +00:00
K_drawKartBumpersOrKarma();
Closer to done HUD tweaking? Splitscreen in Battle is left
2017-12-24 00:14:06 +00:00
}
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
}
Debug checkpoint, and prevent spinout/booster timers while in the air
2018-06-17 22:10:42 +00:00
Mammoth commit! * Deaths in record attack no longer put you into a glitchy singleplayer game-over state that we somehow both kept around and also broke since we branched Kart off of Vanilla.. * Fix non-standard mapscales making the Death Egg respawn octagons dissasemble themselves. * Allow for MULTIPLE TIME EMBLEMS PER MAP, at least in the emblem UI on the timer. It shows all completed emblems plus the uncompleted emblem up to a total of three. * Major tweaks to the First Person HUD. * I know this was your baby, Sal, and some of the changes may prove controversial - so I've put the ones that are likely to cause the most fuss inside an ifndef block, so that you can toggle it as you please with minimal code changes. * Dontdraw-ness, transparency, and colorization match the player's object! * Moves around on the screen with respect to the direction of the player object's motion, to make drifting look nicer! * Flashes the colour of your drift sparks. * Did a WHOLE bunch of things with respect to music. I'm not sure how to describe this, so I'll go through step-by-step. * Countdowns now play the drowning music again. * Removed/disabled extraenous P_RestoreMusics. * Made map-ending music called by its own function, P_EndingMusic(player_t *player). * Made the ending music play on the LAST player crossing the finishing line in splitscreen, rather than first. * Make dead players spinout and clip through the floor, at least until we add the new death anims. * Fix prior pogo spring usage making dead players fall faster. * Make the time over countdown use the kart font when not splitscreen with 3 or 4 players. * Removed a weird bonus HWR_DrawCroppedPatch function signature in the hardware header.
2018-07-16 19:19:30 +00:00
// Draw the countdowns after everything else.
Lakitu murder & countdown improvements (I'm not SevenethSentienel! I just don't feel like logging out!)
2018-06-25 02:15:22 +00:00
if (leveltime >= starttime-(3*TICRATE)
&& leveltime < starttime+TICRATE)
More FINISH stuff! * Make it two seconds exactly, instead of two and change. * Draw it in battle too! * While testing the above, I discovered 3p's karma comeback timer drawing was slightly broken. Fixed that too.
2018-07-19 14:58:07 +00:00
K_drawKartStartCountdown();
* A bunch of intermission related stuff! * Time overs now supported, see below. * Ties now supported! * Code cleaned up. * Play more sonicy tally sounds when counting your points. * A bunch of time over related stuff! * Exitlevel time overs everyone, which means no points for you. * F-Zero-sorta-maybe style death if you're the last person on the course (and not the ONLY one) when someone crosses the finish line! (Or switches to spectator.) * A bunch of music related stuff! * Functionally reverted many of my changes to splitscreen and ending music, although the major changes to simplify music code are still kept. * P_EndingMusic is genericised across gametypes, and only switches a single letter (and looping-ness) now! * Fix exitlevel in race causing whatever you're listening to to keep playing. * Make powerups call P_RestoreMusic. * Put a call to P_EndingMusic into P_RestoreMusic. * Unrelated crap. * Make all palette swaps happen at the black point of fades, so they don't stick around awkwardly. * Huh, I thought I did more than that. Oh well!
2018-07-18 00:21:36 +00:00
else if (countdown && (!splitscreen || !stplyr->exiting))
Mammoth commit! * Deaths in record attack no longer put you into a glitchy singleplayer game-over state that we somehow both kept around and also broke since we branched Kart off of Vanilla.. * Fix non-standard mapscales making the Death Egg respawn octagons dissasemble themselves. * Allow for MULTIPLE TIME EMBLEMS PER MAP, at least in the emblem UI on the timer. It shows all completed emblems plus the uncompleted emblem up to a total of three. * Major tweaks to the First Person HUD. * I know this was your baby, Sal, and some of the changes may prove controversial - so I've put the ones that are likely to cause the most fuss inside an ifndef block, so that you can toggle it as you please with minimal code changes. * Dontdraw-ness, transparency, and colorization match the player's object! * Moves around on the screen with respect to the direction of the player object's motion, to make drifting look nicer! * Flashes the colour of your drift sparks. * Did a WHOLE bunch of things with respect to music. I'm not sure how to describe this, so I'll go through step-by-step. * Countdowns now play the drowning music again. * Removed/disabled extraenous P_RestoreMusics. * Made map-ending music called by its own function, P_EndingMusic(player_t *player). * Made the ending music play on the LAST player crossing the finishing line in splitscreen, rather than first. * Make dead players spinout and clip through the floor, at least until we add the new death anims. * Fix prior pogo spring usage making dead players fall faster. * Make the time over countdown use the kart font when not splitscreen with 3 or 4 players. * Removed a weird bonus HWR_DrawCroppedPatch function signature in the hardware header.
2018-07-16 19:19:30 +00:00
{
char *countstr = va("%d", countdown/TICRATE);
if (splitscreen > 1)
V_DrawCenteredString(BASEVIDWIDTH/4, LAPS_Y+1, K_calcSplitFlags(0), countstr);
else
{
INT32 karlen = strlen(countstr)*6; // half of 12
V_DrawKartString((BASEVIDWIDTH/2)-karlen, LAPS_Y+3, K_calcSplitFlags(0), countstr);
}
}
Lakitu murder & countdown improvements (I'm not SevenethSentienel! I just don't feel like logging out!)
2018-06-25 02:15:22 +00:00
Lap start animation
2018-08-10 01:52:02 +00:00
// Race overlays
if (G_RaceGametype())
{
if (stplyr->exiting)
K_drawKartFinish();
else if (stplyr->kartstuff[k_lapanimation] && !splitscreen)
K_drawLapStartAnim();
}
* FREE PLAY! The necessary corollary to HERE COMES A NEW CHALLENGER... * Activates when there are less than two non-spectators in a netgame. * Shows flashing text at the bottom of the screen. * Prevents drawing several UI elements that only make sense with multiple players. * Prevents matchesplayed being increased. * Improve the mapreset timer's behaviour. * Now you get to see the HERE COMES A NEW CHALLENGER screen as the starting frame of the relevant map transition, since it happens on mapreset being 1 rather than 0. * Make a bunch of normal gameplay stuff that might've activated unnecessarily during mapreset now not able to. * Hide some other stuff that might've been visible for no good reason. * Improve Mirror mode. * First person now works with it! * Tweaked the minimap player heads. Although the main section of the automap is mirrored, it feels... wrong to mirror the player head? IDK, you may wish to revert this, but given that everything else is the right way around except for the level itself...* Disable the titlescreen demos, at least until we actually gear up for release and make real ones. * Disable the titlescreen demos, at least until we actually gear up for release and make real ones.
2018-07-22 15:16:03 +00:00
Prevent using kartdebug cvars in Time Attack. (None of this should invalidate any of YOUR existing ghosts, because none of them use these obvious cheats like, say, setting kartdebugitem 2.)
2018-11-09 20:16:12 +00:00
if (modeattacking) // everything after here is MP and debug only
return;
YOU GOT EM Flashes on screen whenever you get more than 1 karma point at a time, getting you back into the game.
2018-11-01 03:34:13 +00:00
if (G_BattleGametype() && !splitscreen && (stplyr->kartstuff[k_yougotem] % 2)) // * YOU GOT EM *
Properly center this
2018-11-01 21:06:10 +00:00
V_DrawScaledPatch(BASEVIDWIDTH/2 - (SHORT(kp_yougotem->width)/2), 32, V_HUDTRANS, kp_yougotem);
YOU GOT EM Flashes on screen whenever you get more than 1 karma point at a time, getting you back into the game.
2018-11-01 03:34:13 +00:00
* FREE PLAY! The necessary corollary to HERE COMES A NEW CHALLENGER... * Activates when there are less than two non-spectators in a netgame. * Shows flashing text at the bottom of the screen. * Prevents drawing several UI elements that only make sense with multiple players. * Prevents matchesplayed being increased. * Improve the mapreset timer's behaviour. * Now you get to see the HERE COMES A NEW CHALLENGER screen as the starting frame of the relevant map transition, since it happens on mapreset being 1 rather than 0. * Make a bunch of normal gameplay stuff that might've activated unnecessarily during mapreset now not able to. * Hide some other stuff that might've been visible for no good reason. * Improve Mirror mode. * First person now works with it! * Tweaked the minimap player heads. Although the main section of the automap is mirrored, it feels... wrong to mirror the player head? IDK, you may wish to revert this, but given that everything else is the right way around except for the level itself...* Disable the titlescreen demos, at least until we actually gear up for release and make real ones. * Disable the titlescreen demos, at least until we actually gear up for release and make real ones.
2018-07-22 15:16:03 +00:00
// Draw FREE PLAY.
if (isfreeplay && !stplyr->spectator && timeinmap > 113)
K_drawKartFreePlay(leveltime);
Lap start animation
2018-08-10 01:52:02 +00:00
Item distribution debugger, and oversight pointed out by this Item distribution debugger is a netvar that enables cheats, so no exploiting!
2018-08-29 18:28:28 +00:00
if (cv_kartdebugdistribution.value)
K_drawDistributionDebugger();
Lap start animation
2018-08-10 01:52:02 +00:00
if (cv_kartdebugcheckpoint.value)
K_drawCheckpointDebugger();
HUD debugger (no cvar yet)
2018-09-30 15:21:41 +00:00
kartdebugnodes
2018-09-30 21:47:56 +00:00
if (cv_kartdebugnodes.value)
HUD debugger (no cvar yet)
2018-09-30 15:21:41 +00:00
{
UINT8 p;
for (p = 0; p < MAXPLAYERS; p++)
V_DrawString(8, 64+(8*p), V_YELLOWMAP, va("%d - %d", p, playernode[p]));
}
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
}
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
//}
Reference in a new issue Copy permalink