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

5563 lines
178 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"
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"
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
// mirrormode is Mirror Mode (duh), bool
// 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
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
// spbincoming is the timer before k_deathsentence is cast on the player in 1st
SPB fixes Shrink also plays its sound, and Shrink/Grow have slower scaling speeds
2018-06-11 05:51:50 +00:00
// spbplayer is the last player who fired a SPB
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
"Ivory", // 01 // SKINCOLOR_IVORY
"White", // 02 // SKINCOLOR_WHITE
"Silver", // 03 // SKINCOLOR_SILVER
"Cloudy", // 04 // SKINCOLOR_CLOUDY
"Grey", // 05 // SKINCOLOR_GREY
On a hunch, looked it up. Turns out it's a common typo, and that a nickle is actually a type of green woodpecker!! :V
2018-07-02 18:05:09 +00:00
"Nickel", // 06 // SKINCOLOR_NICKEL
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
"Black", // 07 // SKINCOLOR_BLACK
"Salmon", // 08 // SKINCOLOR_SALMON
"Pink", // 09 // SKINCOLOR_PINK
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
"Raspberry", // 10 // SKINCOLOR_RASPBERRY
"Ruby", // 11 // SKINCOLOR_RUBY
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
"Red", // 12 // 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
"Rose", // 13 // SKINCOLOR_ROSE
"Crimson", // 14 // SKINCOLOR_CRIMSON
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
"Dawn", // 15 // SKINCOLOR_DAWN
"Orange", // 16 // SKINCOLOR_ORANGE
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
"Pumpkin", // 18 // SKINCOLOR_PUMPKIN
"Bronze", // 19 // SKINCOLOR_BRONZE
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
"Rosewood", // 20 // SKINCOLOR_ROSEWOOD
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
"Burgundy", // 21 // SKINCOLOR_BURGUNDY
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
"Sepia", // 22 // SKINCOLOR_SEPIA
"Beige", // 23 // SKINCOLOR_BEIGE
"Brown", // 24 // SKINCOLOR_BROWN
"Leather", // 25 // SKINCOLOR_LEATHER
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
"Tangerine", // 26 // SKINCOLOR_TANGERINE
"Yellow", // 27 // SKINCOLOR_YELLOW
Removed Amber & Jade, added Canary & Lime, changed Blueberry & Mint
2018-07-02 17:54:01 +00:00
"Canary", // 28 // SKINCOLOR_CANARY
"Peach", // 29 // SKINCOLOR_PEACH
"Creamsicle", // 30 // SKINCOLOR_CREAMSICLE
"Gold", // 31 // SKINCOLOR_GOLD
"Caramel", // 32 // SKINCOLOR_CARAMEL
"Vomit", // 33 // SKINCOLOR_VOMIT
"Lime", // 33 // SKINCOLOR_LIME
"Garden", // 34 // SKINCOLOR_GARDEN
"Tea", // 35 // SKINCOLOR_TEA
"Army", // 36 // SKINCOLOR_ARMY
"Pistachio", // 37 // SKINCOLOR_PISTACHIO
"Robo-Hood", // 38 // SKINCOLOR_ROBOHOOD
"Olive", // 39 // SKINCOLOR_OLIVE
"Moss", // 40 // SKINCOLOR_MOSS
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
"Mint", // 40 // SKINCOLOR_MINT
"Emerald", // 42 // SKINCOLOR_EMERALD
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
"Green", // 43 // 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
"Pinetree", // 44 // SKINCOLOR_PINETREE
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
"Swamp", // 45 // SKINCOLOR_SWAMP
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
"Slate", // 46 // SKINCOLOR_SLATE
"Periwinkle", // 47 // SKINCOLOR_PERIWINKLE
"Cyan", // 48 // SKINCOLOR_CYAN
"Cerulean", // 49 // SKINCOLOR_CERULEAN
"Aqua", // 50 // SKINCOLOR_AQUA
"Teal", // 51 // SKINCOLOR_TEAL
"Steel", // 52 // SKINCOLOR_STEEL
"Blue", // 53 // SKINCOLOR_BLUE
"Sapphire", // 54 // SKINCOLOR_SAPPHIRE
"Navy", // 55 // SKINCOLOR_NAVY
"Blueberry", // 56 // SKINCOLOR_BLUEBERRY
"Jet", // 57 // SKINCOLOR_JET
"Lilac", // 58 // SKINCOLOR_LILAC
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
"Dusk", // 59 // SKINCOLOR_DUSK
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
"Purple", // 60 // SKINCOLOR_PURPLE
"Lavender", // 61 // SKINCOLOR_LAVENDER
"Byzantium", // 62 // SKINCOLOR_BYZANTIUM
"Indigo" // 63 // SKINCOLOR_INDIGO
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] =
{
SKINCOLOR_NONE,8, // 00 // SKINCOLOR_NONE
SKINCOLOR_BLACK,8, // 01 // SKINCOLOR_IVORY
SKINCOLOR_BLACK,8, // 02 // SKINCOLOR_WHITE
On a hunch, looked it up. Turns out it's a common typo, and that a nickle is actually a type of green woodpecker!! :V
2018-07-02 18:05:09 +00:00
SKINCOLOR_NICKEL,8, // 03 // SKINCOLOR_SILVER
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
SKINCOLOR_CLOUDY,8, // 04 // SKINCOLOR_CLOUDY
SKINCOLOR_GREY,8, // 05 // SKINCOLOR_GREY
On a hunch, looked it up. Turns out it's a common typo, and that a nickle is actually a type of green woodpecker!! :V
2018-07-02 18:05:09 +00:00
SKINCOLOR_SILVER,8, // 06 // SKINCOLOR_NICKEL
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
SKINCOLOR_WHITE,8, // 07 // SKINCOLOR_BLACK
SKINCOLOR_SWAMP,8, // 08 // SKINCOLOR_SALMON
SKINCOLOR_ARMY,8, // 09 // SKINCOLOR_PINK
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
SKINCOLOR_PINETREE,8, // 10 // SKINCOLOR_RASPBERRY
Removed Amber & Jade, added Canary & Lime, changed Blueberry & Mint
2018-07-02 17:54:01 +00:00
SKINCOLOR_EMERALD,8, // 11 // SKINCOLOR_RUBY
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
SKINCOLOR_GREEN,8, // 12 // 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
SKINCOLOR_MOSS,8, // 13 // SKINCOLOR_ROSE
SKINCOLOR_MINT,8, // 14 // SKINCOLOR_CRIMSON
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
SKINCOLOR_NAVY,8, // 15 // SKINCOLOR_DAWN
SKINCOLOR_BLUE,8, // 16 // SKINCOLOR_ORANGE
Removed Amber & Jade, added Canary & Lime, changed Blueberry & Mint
2018-07-02 17:54:01 +00:00
SKINCOLOR_PERIWINKLE,8, // 17 // SKINCOLOR_PUMPKIN
SKINCOLOR_STEEL,8, // 18 // SKINCOLOR_BRONZE
SKINCOLOR_STEEL,8, // 19 // SKINCOLOR_ROSEWOOD
SKINCOLOR_SLATE,8, // 20 // SKINCOLOR_BURGUNDY
SKINCOLOR_LEATHER,8, // 21 // SKINCOLOR_SEPIA
SKINCOLOR_BROWN,8, // 22 // SKINCOLOR_BEIGE
SKINCOLOR_BEIGE,8, // 23 // SKINCOLOR_BROWN
SKINCOLOR_SEPIA,8, // 24 // SKINCOLOR_LEATHER
SKINCOLOR_INDIGO,8, // 25 // SKINCOLOR_TANGERINE
SKINCOLOR_INDIGO,8, // 26 // SKINCOLOR_YELLOW
SKINCOLOR_INDIGO,8, // 27 // SKINCOLOR_CANARY
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
SKINCOLOR_BROWN,8, // 28 // SKINCOLOR_PEACH
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
SKINCOLOR_BLUEBERRY,8, // 29 // SKINCOLOR_CREAMSICLE
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
SKINCOLOR_LAVENDER,8, // 30 // SKINCOLOR_GOLD
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
SKINCOLOR_BEIGE,8, // 31 // SKINCOLOR_CARAMEL
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
SKINCOLOR_PURPLE,8, // 32 // SKINCOLOR_VOMIT
Removed Amber & Jade, added Canary & Lime, changed Blueberry & Mint
2018-07-02 17:54:01 +00:00
SKINCOLOR_PURPLE,8, // 33 // SKINCOLOR_LIME
SKINCOLOR_BYZANTIUM,8, // 34 // SKINCOLOR_GARDEN
SKINCOLOR_LAVENDER,8, // 35 // SKINCOLOR_TEA
SKINCOLOR_LAVENDER,8, // 36 // SKINCOLOR_ARMY
SKINCOLOR_PURPLE,8, // 37 // SKINCOLOR_PISTACHIO
SKINCOLOR_LILAC,8, // 38 // SKINCOLOR_ROBOHOOD
SKINCOLOR_LILAC,8, // 39 // SKINCOLOR_OLIVE
SKINCOLOR_LAVENDER,8, // 40 // SKINCOLOR_MOSS
SKINCOLOR_CRIMSON,8, // 41 // SKINCOLOR_MINT
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
SKINCOLOR_RUBY,8, // 42 // SKINCOLOR_EMERALD
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
SKINCOLOR_RED,8, // 43 // 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
SKINCOLOR_RASPBERRY,8, // 44 // SKINCOLOR_PINETREE
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
SKINCOLOR_SALMON,8, // 45 // SKINCOLOR_SWAMP
Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems
2018-07-02 07:36:43 +00:00
SKINCOLOR_PINK,8, // 46 // SKINCOLOR_SLATE
SKINCOLOR_CREAMSICLE,8, // 47 // SKINCOLOR_PERIWINKLE
SKINCOLOR_CARAMEL,8, // 48 // SKINCOLOR_CYAN
SKINCOLOR_GOLD,8, // 49 // SKINCOLOR_CERULEAN
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
SKINCOLOR_CRIMSON,8, // 50 // SKINCOLOR_AQUA
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
SKINCOLOR_RED,8, // 51 // SKINCOLOR_TEAL
SKINCOLOR_PEACH,8, // 52 // SKINCOLOR_STEEL
SKINCOLOR_ORANGE,8, // 53 // SKINCOLOR_BLUE
Removed Amber & Jade, added Canary & Lime, changed Blueberry & Mint
2018-07-02 17:54:01 +00:00
SKINCOLOR_ORANGE,8, // 54 // SKINCOLOR_SAPPHIRE
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
SKINCOLOR_DAWN,8, // 55 // SKINCOLOR_NAVY
SKINCOLOR_CREAMSICLE,8, // 56 // SKINCOLOR_BLUEBERRY
SKINCOLOR_SLATE,8, // 57 // SKINCOLOR_JET
SKINCOLOR_YELLOW,8, // 58 // SKINCOLOR_LILAC
SKINCOLOR_YELLOW,8, // 59 // SKINCOLOR_DUSK
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
SKINCOLOR_YELLOW,8, // 60 // SKINCOLOR_PURPLE
SKINCOLOR_GOLD,8, // 61 // SKINCOLOR_LAVENDER
SKINCOLOR_GARDEN,8, // 62 // SKINCOLOR_BYZANTIUM
SKINCOLOR_YELLOW,8 // 63 // SKINCOLOR_INDIGO
};
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
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, 120, 0, 3, 6, 7, 8, 11, 14, 17, 21, 23, 25, 28}, // SKINCOLOR_IVORY
{120, 0, 1, 2, 3, 5, 8, 9, 10, 12, 15, 17, 20, 21, 23, 25}, // SKINCOLOR_WHITE
{ 0, 1, 3, 4, 6, 7, 9, 10, 12, 13, 15, 16, 18, 19, 21, 23}, // SKINCOLOR_SILVER
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
{ 1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31}, // SKINCOLOR_CLOUDY
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
{ 8, 9, 11, 12, 14, 15, 17, 18, 20, 21, 23, 24, 26, 27, 29, 30}, // SKINCOLOR_GREY
On a hunch, looked it up. Turns out it's a common typo, and that a nickle is actually a type of green woodpecker!! :V
2018-07-02 18:05:09 +00:00
{ 16, 17, 18, 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
{120, 120, 120, 121, 121, 122, 122, 123, 124, 125, 126, 128, 129, 131, 133, 135}, // SKINCOLOR_SALMON
{121, 121, 121, 121, 121, 122, 144, 145, 146, 147, 148, 149, 150, 150, 150, 151}, // SKINCOLOR_PINK
{120, 121, 122, 123, 124, 125, 126, 127, 128, 130, 131, 133, 134, 136, 137, 139}, // SKINCOLOR_RASPBERRY
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, 0, 144, 146, 149, 131, 132, 133, 134, 135, 197, 197, 198, 198, 199, 241}, // SKINCOLOR_RUBY
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
{144, 145, 146, 147, 148, 149, 150, 151, 134, 135, 136, 137, 138, 139, 140, 141}, // SKINCOLOR_ROSE
{130, 131, 132, 133, 134, 136, 137, 138, 139, 139, 140, 140, 141, 141, 142, 143}, // SKINCOLOR_CRIMSON
{120, 121, 122, 123, 124, 147, 147, 148, 90, 91, 92, 93, 94, 95, 152, 154}, // SKINCOLOR_DAWN
{ 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
{112, 113, 114, 115, 116, 117, 118, 119, 156, 157, 158, 159, 141, 141, 142, 143}, // SKINCOLOR_BRONZE
{ 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
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
{ 3, 5, 7, 32, 9, 34, 36, 37, 39, 42, 45, 59, 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
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
{ 51, 52, 53, 55, 56, 57, 58, 60, 61, 63, 28, 28, 29, 29, 30, 31}, // SKINCOLOR_LEATHER
{ 98, 98, 112, 112, 113, 113, 84, 85, 87, 89, 91, 93, 95, 153, 156, 159}, // SKINCOLOR_TANGERINE
{ 96, 97, 98, 100, 101, 102, 104, 113, 114, 115, 116, 117, 118, 119, 156, 159}, // SKINCOLOR_YELLOW
Removed Amber & Jade, added Canary & Lime, changed Blueberry & Mint
2018-07-02 17:54:01 +00:00
{ 96, 97, 99, 100, 102, 104, 105, 105, 106, 107, 107, 108, 109, 109, 110, 111}, // SKINCOLOR_CANARY
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
{120, 120, 80, 80, 81, 82, 83, 83, 84, 85, 86, 88, 89, 91, 93, 95}, // SKINCOLOR_CREAMSICLE
{112, 112, 112, 113, 113, 114, 114, 115, 115, 116, 116, 117, 117, 118, 118, 119}, // SKINCOLOR_GOLD
{ 64, 66, 68, 70, 72, 74, 76, 78, 48, 50, 52, 54, 56, 58, 60, 62}, // SKINCOLOR_CARAMEL
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
{121, 144, 145, 72, 73, 84, 114, 115, 107, 108, 109, 183, 223, 207, 30, 246}, // SKINCOLOR_VOMIT
Removed Amber & Jade, added Canary & Lime, changed Blueberry & Mint
2018-07-02 17:54:01 +00:00
{ 96, 97, 99, 100, 102, 104, 160, 162, 164, 166, 168, 171, 223, 223, 207, 31}, // SKINCOLOR_LIME
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
{120, 120, 176, 176, 176, 177, 177, 178, 178, 179, 180, 180, 181, 181, 182, 183}, // SKINCOLOR_TEA
{176, 176, 176, 177, 177, 178, 178, 179, 179, 180, 180, 181, 181, 182, 182, 183}, // SKINCOLOR_ARMY
{120, 120, 176, 176, 177, 177, 178, 179, 165, 166, 167, 168, 169, 170, 171, 172}, // SKINCOLOR_PISTACHIO
{176, 176, 177, 178, 165, 166, 167, 167, 168, 169, 182, 182, 182, 183, 183, 183}, // SKINCOLOR_ROBOHOOD
{105, 105, 105, 106, 106, 107, 107, 108, 108, 109, 109, 110, 110, 111, 111, 31}, // SKINCOLOR_OLIVE
{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
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, 184, 184, 185, 185, 186, 186, 187, 187, 188, 188, 189, 189, 190, 191, 175}, // SKINCOLOR_EMERALD
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
{186, 187, 188, 188, 188, 189, 189, 190, 190, 191, 175, 175, 30, 30, 31, 31}, // SKINCOLOR_SWAMP
{120, 120, 200, 200, 200, 201, 201, 201, 202, 202, 202, 203, 204, 205, 206, 207}, // SKINCOLOR_SLATE
{120, 224, 225, 226, 226, 227, 228, 228, 229, 230, 231, 234, 235, 237, 239, 241}, // SKINCOLOR_PERIWINKLE
{120, 208, 209, 210, 211, 212, 213, 215, 216, 216, 216, 217, 217, 218, 218, 219}, // SKINCOLOR_CYAN
{208, 209, 211, 213, 215, 216, 216, 217, 217, 218, 218, 219, 205, 206, 207, 207}, // SKINCOLOR_CERULEAN
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
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
{210, 213, 220, 220, 220, 221, 221, 221, 221, 222, 222, 222, 223, 223, 191, 31}, // SKINCOLOR_TEAL
{120, 200, 200, 201, 201, 202, 202, 203, 203, 204, 204, 205, 205, 206, 207, 31}, // SKINCOLOR_STEEL
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
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
{208, 210, 212, 214, 216, 229, 231, 232, 233, 235, 236, 237, 238, 239, 241, 244}, // SKINCOLOR_SAPPHIRE
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
{200, 201, 202, 203, 204, 205, 206, 238, 239, 240, 241, 242, 243, 244, 245, 246}, // SKINCOLOR_NAVY
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
{200, 201, 202, 203, 204, 205, 206, 207, 28, 28, 29, 29, 30, 30, 31, 31}, // SKINCOLOR_JET
{120, 120, 120, 121, 121, 122, 122, 123, 192, 248, 249, 250, 251, 252, 253, 254}, // SKINCOLOR_LILAC
{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
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
{192, 248, 249, 250, 251, 252, 253, 254, 255, 255, 29, 29, 30, 30, 31, 31}, // SKINCOLOR_BYZANTIUM
{192, 193, 194, 195, 196, 197, 198, 199, 255, 255, 29, 29, 30, 30, 31, 31}, // SKINCOLOR_INDIGO
/* Removed Colours
Removed Amber & Jade, added Canary & Lime, changed Blueberry & Mint
2018-07-02 17:54:01 +00:00
{120, 121, 123, 124, 126, 127, 129, 130, 132, 133, 135, 136, 138, 139, 141, 143}, // SKINCOLOR_RUBY, removed for other colors
{ 80, 81, 83, 85, 86, 88, 90, 91, 93, 95, 152, 153, 154, 156, 157, 159}, // SKINCOLOR_AMBER, removed for other colors
{224, 225, 226, 228, 229, 231, 232, 234, 235, 237, 238, 240, 241, 243, 244, 246}, // SKINCOLOR_SAPPHIRE, removed for other colors
{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
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
{ 72, 73, 74, 75, 76, 77, 78, 79, 48, 49, 50, 51, 52, 53, 54, 55}, // SKINCOLOR_CARAMEL, new Caramel was previously Shiny Caramel
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
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
{
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
INT32 i, j;
RGBA_t color;
UINT8 colorbrightnesses[16];
UINT8 brightness;
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]);
colorbrightnesses[i] = (UINT8)(((UINT16)color.s.red + (UINT16)color.s.green + (UINT16)color.s.blue)/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
}
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);
brightness = (UINT8)(((UINT16)color.s.red + (UINT16)color.s.green + (UINT16)color.s.blue)/3);
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
}
/** \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);
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_lightningshield);
CV_RegisterVar(&cv_hyudoro);
CV_RegisterVar(&cv_pogospring);
CV_RegisterVar(&cv_triplesneaker);
CV_RegisterVar(&cv_triplebanana);
CV_RegisterVar(&cv_tripleorbinaut);
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);
Mirror Mode - Added kartmirror cvar, flips the screen & player controls. The post-processing effect is currently Software only; will need an OpenGL implementation but I don't know enough to make that happen - Moved adminplayer = -1 setting to SV_ResetServer instead of SV_StartServer
2017-12-12 05:07:14 +00:00
CV_RegisterVar(&cv_kartmirror);
Better menus
2018-06-15 00:18:29 +00:00
CV_RegisterVar(&cv_kartspeedometer);
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);
Debug checkpoint, and prevent spinout/booster timers while in the air
2018-06-17 22:10:42 +00:00
CV_RegisterVar(&cv_kartdebugcheckpoint);
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++)
{
if (playeringame[i] && !players[i].spectator)
pcount++;
}
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
#define NUMKARTODDS 40
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
Finished Jawz, item odds changes, sound effect distance increases
2018-06-19 01:52:26 +00:00
/*Sneaker*/ {20, 0, 0, 3, 6, 5, 0, 0, 0 }, // Sneaker
Item odds, SPB fix
2018-07-05 04:38:23 +00:00
/*Rocket Sneaker*/ { 0, 0, 0, 0, 0, 3, 6, 5, 0 }, // Rocket Sneaker
/*Invincibility*/ { 0, 0, 0, 0, 0, 1, 6, 8,16 }, // Invincibility
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
/*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
/*Orbinaut*/ { 0, 6, 5, 4, 2, 0, 0, 0, 0 }, // Orbinaut
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
/*Jawz*/ { 0, 0, 3, 2, 2, 1, 0, 0, 0 }, // Jawz
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
/*Mine*/ { 0, 0, 1, 2, 1, 0, 0, 0, 0 }, // Mine
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
/*Ballhog*/ { 0, 0, 1, 2, 1, 0, 0, 0, 0 }, // Ballhog
Item odds, SPB fix
2018-07-05 04:38:23 +00:00
/*Self-Propelled Bomb*/ { 0, 0, 1, 1, 1, 2, 2, 3, 2 }, // Self-Propelled Bomb
/*Grow*/ { 0, 0, 0, 0, 0, 0, 1, 2, 4 }, // Grow
/*Shrink*/ { 0, 0, 0, 0, 0, 0, 0, 1, 0 }, // 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
/*Lightning Shield*/ { 0, 1, 2, 0, 0, 0, 0, 0, 0 }, // Lightning 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
Tiiiiny adjustment
2018-06-19 01:53:57 +00:00
/*Sneaker x3*/ { 0, 0, 0, 0, 3, 7, 6, 4, 0 }, // Sneaker x3
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
/*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
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
/*Orbinaut x3*/ { 0, 0, 0, 1, 1, 1, 0, 0, 0 }, // Orbinaut x3
/*Jawz x2*/ { 0, 0, 0, 1, 1, 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
{
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
//P-Odds 0 1 2 3
/*Sneaker*/ { 3, 2, 2, 2 }, // Sneaker
/*Rocket Sneaker*/ { 0, 0, 0, 0 }, // Rocket Sneaker
/*Invincibility*/ { 4, 2, 1, 2 }, // Invincibility
/*Banana*/ { 0, 0, 2, 0 }, // Banana
/*Eggman Monitor*/ { 0, 0, 1, 0 }, // Eggman Monitor
/*Orbinaut*/ { 0, 1, 3, 0 }, // Orbinaut
/*Jawz*/ { 1, 3, 2, 2 }, // Jawz
/*Mine*/ { 1, 3, 2, 2 }, // Mine
/*Ballhog*/ { 1, 2, 2, 2 }, // Ballhog
/*Self-Propelled Bomb*/ { 0, 0, 0, 0 }, // Self-Propelled Bomb
/*Grow*/ { 4, 2, 1, 2 }, // Grow
/*Shrink*/ { 0, 0, 0, 0 }, // Shrink
/*Lightning Shield*/ { 0, 0, 0, 0 }, // Lightning Shield
/*Hyudoro*/ { 0, 0, 1, 0 }, // Hyudoro
/*Pogo Spring*/ { 0, 0, 1, 0 }, // Pogo Spring
/*Kitchen Sink*/ { 0, 0, 0, 0 }, // Kitchen Sink
/*Sneaker x3*/ { 2, 0, 0, 2 }, // Sneaker x3
/*Banana x3*/ { 0, 1, 1, 1 }, // Banana x3
/*Banana x10*/ { 1, 0, 0, 1 }, // Banana x10
/*Orbinaut x3*/ { 0, 2, 1, 2 }, // Orbinaut x3
/*Jawz x2*/ { 3, 2, 0, 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;
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
Intro camera can noclip, fix several compile errors
2018-06-25 13:18:30 +00:00
static INT32 K_KartGetItemOdds(UINT8 pos, SINT8 item, boolean 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;
Fixes
2018-06-08 04:02:28 +00:00
SINT8 first = -1;
SINT8 second = -1;
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);
}
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:
if (franticitems) newodds *= 2;
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
if (mashed) newodds /= 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
if (!cv_rocketsneaker.value) newodds = 0;
break;
case KITEM_INVINCIBILITY:
if (franticitems) newodds *= 2;
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
if (mashed) newodds /= 2;
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 ((!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:
if (franticitems) newodds *= 2;
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
if (mashed) newodds /= 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
if (!cv_jawz.value) newodds = 0;
break;
case KITEM_MINE:
if (franticitems) newodds *= 2;
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
if (mashed) newodds /= 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
if (!cv_mine.value) newodds = 0;
break;
case KITEM_BALLHOG:
if (franticitems) newodds *= 2;
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
if (mashed) newodds /= 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
if (!cv_ballhog.value) newodds = 0;
break;
case KITEM_SPB:
if (franticitems) newodds *= 2;
SPB chances no longer lower if you mash
2018-07-02 22:25:15 +00:00
//if (mashed) newodds /= 2;
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)
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
|| (secondist/distvar < 4))
newodds = 0;
newodds *= min((secondist/distvar)-3, 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:
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 (franticitems) newodds *= 2;
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
if (mashed) newodds /= 2;
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 ((!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:
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 (franticitems) newodds *= 2;
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
if (mashed) newodds /= 2;
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;
case KITEM_LIGHTNINGSHIELD:
if (franticitems) newodds *= 2;
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
if (mashed) newodds /= 2;
if (!cv_lightningshield.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:
if (franticitems) newodds *= 2;
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
if (mashed) newodds /= 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
if (!cv_triplesneaker.value) newodds = 0;
break;
case KRITEM_TRIPLEBANANA:
if (franticitems) newodds *= 2;
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
if (mashed) newodds /= 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
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:
if (franticitems) newodds *= 2;
if (mashed) newodds /= 2;
if (!cv_triplebanana.value) newodds = 0;
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:
if (franticitems) newodds *= 2;
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
if (mashed) newodds /= 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
if (!cv_tripleorbinaut.value) newodds = 0;
break;
case KRITEM_DUALJAWZ:
if (franticitems) newodds *= 2;
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
if (mashed) newodds /= 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
if (!cv_dualjawz.value) newodds = 0;
break;
default:
break;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
}
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
Fixes
2018-06-08 04:02:28 +00:00
static void K_KartItemRoulette(player_t *player, ticcmd_t *cmd)
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;
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 pingame = 0;
UINT8 roulettestop;
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 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
INT32 spawnchance[NUMKARTRESULTS * NUMKARTODDS];
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 chance = 0, numchoices = 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
INT32 avgbumper = 0;
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 oddsvalid[9];
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;
Adjustin' BL based off the netgame, and mashing is back Now it just cripples your chances for good items, mwaha
2018-06-06 03:46:25 +00:00
boolean mashed = 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
// 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;
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
// Gotta check how many players are active at this moment.
for (i = 0; i < MAXPLAYERS; i++)
{
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
if (!playeringame[i] || players[i].spectator)
continue;
pingame++;
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)
avgbumper += players[i].kartstuff[k_bumper];
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)
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
avgbumper /= pingame;
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
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
// This makes the roulette produce the random noises.
if ((player->kartstuff[k_itemroulette] % 3) == 1 && P_IsLocalPlayer(player))
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(NULL, sfx_mkitm1 + ((player->kartstuff[k_itemroulette] / 3) % 8));
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
Fix up balloon-based items
2017-11-24 03:34:36 +00:00
roulettestop = (TICRATE*1) + (3*(pingame - player->kartstuff[k_position]));
// 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.
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
if ((cmd->buttons & BT_ATTACK) && !(player->kartstuff[k_eggmanheld] || player->kartstuff[k_itemheld]) && player->kartstuff[k_itemroulette] >= roulettestop)
Adjustin' BL based off the netgame, and mashing is back Now it just cripples your chances for good items, mwaha
2018-06-06 03:46:25 +00:00
mashed = true; // Mashing halves your chances for the good items
else if (!(player->kartstuff[k_itemroulette] >= (TICRATE*3)))
Fix up balloon-based items
2017-11-24 03:34:36 +00:00
return;
if (cmd->buttons & BT_ATTACK)
player->pflags |= PF_ATTACKDOWN;
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_kartdebugitem.value != 0)
{
K_KartGetItemResult(player, cv_kartdebugitem.value);
player->kartstuff[k_itemamount] = cv_kartdebugamount.value;
player->kartstuff[k_itemroulette] = 0;
return;
}
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
// Initializes existing spawnchance values
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 < (NUMKARTRESULTS * NUMKARTODDS); 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
spawnchance[i] = 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
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);
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
if (player->kartstuff[k_roulettetype] == 1 && oddsvalid[3]) // Player-controlled "Karma" items
useodds = 3;
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
{
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 wantedpos = (player->kartstuff[k_bumper]-avgbumper)+2; // 0 is two bumpers below average, 2 is average
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
if (wantedpos > 2)
wantedpos = 2;
if (wantedpos < 0)
wantedpos = 0;
useodds = disttable[(wantedpos * distlen) / 3];
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);
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
{
for (i = 1; i < 12; 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
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
#define SETITEMRESULT(pos, itemnum) \
Intro camera can noclip, fix several compile errors
2018-06-25 13:18:30 +00:00
for (chance = 0; chance < K_KartGetItemOdds(pos, 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
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
SETITEMRESULT(useodds, KITEM_SNEAKER); // Sneaker
SETITEMRESULT(useodds, KITEM_ROCKETSNEAKER); // Rocket Sneaker
SETITEMRESULT(useodds, KITEM_INVINCIBILITY); // Invincibility
SETITEMRESULT(useodds, KITEM_BANANA); // Banana
Rename fake item to eggman monitor
2018-03-14 01:07:08 +00:00
SETITEMRESULT(useodds, KITEM_EGGMAN); // Eggman Monitor
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
SETITEMRESULT(useodds, KITEM_ORBINAUT); // Orbinaut
SETITEMRESULT(useodds, KITEM_JAWZ); // Jawz
SETITEMRESULT(useodds, KITEM_MINE); // Mine
SETITEMRESULT(useodds, KITEM_BALLHOG); // Ballhog
SETITEMRESULT(useodds, KITEM_SPB); // Self-Propelled Bomb
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
SETITEMRESULT(useodds, KITEM_GROW); // Grow
SETITEMRESULT(useodds, KITEM_SHRINK); // 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
SETITEMRESULT(useodds, KITEM_LIGHTNINGSHIELD); // Lightning Shield
SETITEMRESULT(useodds, KITEM_HYUDORO); // Hyudoro
SETITEMRESULT(useodds, KITEM_POGOSPRING); // Pogo Spring
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
//SETITEMRESULT(useodds, KITEM_KITCHENSINK); // Kitchen Sink
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
SETITEMRESULT(useodds, KRITEM_TRIPLESNEAKER); // Sneaker x3
SETITEMRESULT(useodds, KRITEM_TRIPLEBANANA); // Banana x3
Add tenfold banana, moved back SPB reach Reuses triple banana's cvar for now
2018-06-17 00:01:25 +00:00
SETITEMRESULT(useodds, KRITEM_TENFOLDBANANA); // Banana x10
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
SETITEMRESULT(useodds, KRITEM_TRIPLEORBINAUT); // Orbinaut x3
SETITEMRESULT(useodds, KRITEM_DUALJAWZ); // 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
#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
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
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
if ((mobj1->player && mobj1->player->kartstuff[k_justbumped])
|| (mobj2->player && mobj1->player->kartstuff[k_justbumped]))
{
if (mobj1->player)
mobj1->player->kartstuff[k_justbumped] = bumptime;
if (mobj2->player)
mobj2->player->kartstuff[k_justbumped] = bumptime;
return;
}
Remove collide debug stuff
2018-06-03 22:58:50 +00:00
S_StartSound(mobj1, sfx_s3k49);
Bumpy
2017-10-24 04:42:06 +00:00
Move Player collision check into the regular collision checking
2017-11-01 18:40:32 +00:00
fx = P_SpawnMobj(mobj1->x/2 + mobj2->x/2, mobj1->y/2 + mobj2->y/2, mobj1->z/2 + mobj2->z/2, MT_BUMP);
Bumpy
2017-10-24 04:42:06 +00:00
if (mobj1->eflags & MFE_VERTICALFLIP)
fx->eflags |= MFE_VERTICALFLIP;
else
fx->eflags &= ~MFE_VERTICALFLIP;
fx->scale = mobj1->scale;
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
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 (bounce == true) // Perform a Goomba Bounce.
mobj1->momz = -mobj1->momz;
else
{
fixed_t newz = mobj1->momz;
mobj1->momz = mobj2->momz;
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 (solid == false)
mobj2->momz = newz;
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
}
Expose some functions to Lua
2017-11-07 23:35:05 +00:00
mass1 = mass2 = 5*FRACUNIT;
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
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->player)
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
mass1 = (mobj1->player->kartweight)*FRACUNIT;
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
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 (mobj2->player)
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
mass2 = (mobj2->player->kartweight)*FRACUNIT;
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
else if (solid == true)
mass2 = mass1;
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
}
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
distx = mobj1->x - mobj2->x;
disty = mobj1->y - mobj2->y;
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));
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);
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 (solid == false)
{
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
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;
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;
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;
}
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;
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->kartstuff[k_respawn] > 3)
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;
Lakitu murder & countdown improvements (I'm not SevenethSentienel! I just don't feel like logging out!)
2018-06-25 02:15:22 +00:00
S_StartSound(player->mo, sfx_s3kcas);
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);
newx = player->mo->x + P_ReturnThrustX(player->mo, newangle, 31*FRACUNIT);
newy = player->mo->y + P_ReturnThrustY(player->mo, newangle, 31*FRACUNIT);
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
}
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->kartstuff[k_respawn] > 0 && player->kartstuff[k_respawn] <= 3)
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 (!P_IsObjectOnGround(player->mo))
{
player->powers[pw_flashing] = 2;
// If you tried to boost while in the air,
// you lose your chance of boosting at all.
if (cmd->buttons & BT_ACCELERATE)
{
player->powers[pw_flashing] = 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
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
}
}
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
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
// Quick! You only have three tics to boost!
if (cmd->buttons & BT_ACCELERATE)
Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems # Conflicts: # src/k_kart.c # src/k_kart.h # src/lua_baselib.c # src/p_inter.c # src/p_spec.c
2018-03-31 04:44:03 +00:00
K_DoSneaker(player, true);
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;
}
Fix warnings Possibly fix some whitespace problems
2017-03-04 22:13:19 +00:00
static void K_PlayTauntSound(mobj_t *source)
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +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 (source->player && source->player->kartstuff[k_tauntvoices]) // Prevents taunt sounds from playing every time the button is pressed
return;
Battle card animations Was hoping not to waste another variable on this, but oh well
2017-11-29 06:09:46 +00:00
Taunt sound simplification
2018-02-28 02:18:42 +00:00
S_StartSound(source, sfx_taunt1+P_RandomKey(4));
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);
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
{
if (source->player && source->player->kartstuff[k_voices]) // Prevents taunt sounds from playing every time the button is pressed
return;
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
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
S_StartSound(source, sfx_slow);
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);
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +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
static void K_PlayHitEmSound(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
{
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
S_StartSound(source, sfx_hitem);
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
if (!P_IsObjectOnGround(player->mo) || dangle > ANGLE_90)
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
// if speed is true it gets the speed boost power, otherwise it gets the acceleration
static fixed_t K_GetKartBoostPower(player_t *player, boolean speed)
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;
Added fancypants mega shroom, fixed drift boosting
2017-02-19 17:18:43 +00:00
fixed_t boostvalue = 0;
Some position code
2017-02-13 04:24:49 +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])
Make sure it actually compiles
2017-04-16 18:55:21 +00:00
&& player->kartstuff[k_offroad] >= 0 && speed)
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
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
if (player->kartstuff[k_bananadrag] > TICRATE) // Avoid making x10 banana a hassle to use
boostpower = 4*boostpower/5;
Chaotix sound effects, new music names
2018-02-10 21:01:09 +00:00
if (player->kartstuff[k_growshrinktimer] > 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
{ // Grow
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
if (speed)
{
= 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
boostvalue = max(boostvalue, FRACUNIT/5); // + 20%
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
}
Added fancypants mega shroom, fixed drift boosting
2017-02-19 17:18:43 +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->kartstuff[k_invincibilitytimer])
{ // Invincibility
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
if (speed)
boostvalue = max(boostvalue, 3*(FRACUNIT/8)); // + 37.5%
else
Buff star acceleration
2017-03-10 21:27:53 +00:00
boostvalue = max(boostvalue, 3*FRACUNIT); // + 600%
Added fancypants mega shroom, fixed drift boosting
2017-02-19 17:18:43 +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
if (player->kartstuff[k_driftboost])
Adjusted bonustime, Goldshrooms work, added intermediate boostspeed for between Megashroom size
2017-02-19 20:53:32 +00:00
{ // Drift Boost
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
if (speed)
Nerf top speed of drift boost
2017-03-10 02:38:54 +00:00
boostvalue = max(boostvalue, FRACUNIT/4); // + 25%
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
else
boostvalue = max(boostvalue, 4*FRACUNIT); // + 400%
Added fancypants mega shroom, fixed drift boosting
2017-02-19 17:18:43 +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->kartstuff[k_sneakertimer])
{ // Sneaker
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
if (speed)
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
{
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)
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
{
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:
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
boostvalue = max(boostvalue, 53740+768);
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:
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
boostvalue = max(boostvalue, 17294+768);
break;
default:
boostvalue = max(boostvalue, 32768);
break;
}
}
Thwomps now squish the player - might need to reduce player height to 1 or something temporarily Mushrooms rewritten to not use Instathrust, instead they jack up your accel to 10x. Feels nicer. Floor mushroom panels no longer activate while above them Mushrooms force player to accelerate (and cannot brake) K_PlayTauntSound works now. (YES YES YES HUP HUP YES HUP HERE WE GO) Star and Mega sfx might stop correctly now in netgames (need to test) Item box radius and height increased from 32 to 36.
2017-03-02 22:59:35 +00:00
else
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
boostvalue = max(boostvalue, 8*FRACUNIT); // + 800%
Added fancypants mega shroom, fixed drift boosting
2017-02-19 17:18:43 +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
// 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
Make sure it actually compiles
2017-04-16 18:55:21 +00:00
return boostpower + boostvalue;
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
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)
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 FixedMul(finalspeed, K_GetKartBoostPower(player, true));
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
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
return FixedMul(k_accel, K_GetKartBoostPower(player, false));
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
Merge in battle, unfuck the code
2017-11-21 07:23:06 +00:00
UINT16 K_GetKartFlashing(void)
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
{
UINT16 tics = flashingtics;
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())
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
{
tics *= 2;
//tics += (3*TICRATE/8) * (player->kartspeed-1);
}
return tics;
}
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);
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;
}
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
{
WANTED
2018-07-01 08:36:09 +00:00
const UINT8 scoremultiply = ((K_IsPlayerWanted(player) && !trapitem) ? 2 : 1);
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)))
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
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);
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
}
WANTED recalculates on hit, tons of spectator changes
2018-07-04 01:12:25 +00:00
if (K_IsPlayerWanted(player))
K_CalculateBattleWanted();
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]--;
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
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
}
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
player->kartstuff[k_comebacktimer] = comebacktime;
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
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;
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
if (player->kartstuff[k_spinouttype] <= 0)
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
player->kartstuff[k_spinouttimer] = 3*TICRATE/2; // Banana Spinout
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
// 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);
}
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
player->kartstuff[k_spinouttimer] = 1*TICRATE; // Wipeout
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
Merge in battle, unfuck the code
2017-11-21 07:23:06 +00:00
player->powers[pw_flashing] = K_GetKartFlashing();
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
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
{
WANTED
2018-07-01 08:36:09 +00:00
const UINT8 scoremultiply = (K_IsPlayerWanted(player) ? 2 : 1);
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)))
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
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);
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
}
WANTED recalculates on hit, tons of spectator changes
2018-07-04 01:12:25 +00:00
if (K_IsPlayerWanted(player))
K_CalculateBattleWanted();
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]--;
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
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
}
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
player->kartstuff[k_comebacktimer] = comebacktime;
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
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_squishedtimer] = 2*TICRATE;
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
Merge in battle, unfuck the code
2017-11-21 07:23:06 +00:00
player->powers[pw_flashing] = K_GetKartFlashing();
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);
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_ExplodePlayer(player_t *player, mobj_t *source) // 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
{
WANTED
2018-07-01 08:36:09 +00:00
const UINT8 scoremultiply = (K_IsPlayerWanted(player) ? 2 : 1);
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)))
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
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
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
{
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);
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
}
WANTED recalculates on hit, tons of spectator changes
2018-07-04 01:12:25 +00:00
if (K_IsPlayerWanted(player))
K_CalculateBattleWanted();
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]--;
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
K_CheckBumpers();
BATLLE MODE AAAAAA
2017-10-22 07:06:35 +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
player->kartstuff[k_comebacktimer] = comebacktime;
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
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);
Merge in battle, unfuck the code
2017-11-21 07:23:06 +00:00
player->powers[pw_flashing] = K_GetKartFlashing();
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
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;
}
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
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
|| (player->kartstuff[k_bumper] <= 0 && player->kartstuff[k_comebacktimer]))
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
|| (victim->powers[pw_flashing] > 0 || victim->kartstuff[k_squishedtimer] > 0 || victim->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
|| victim->kartstuff[k_invincibilitytimer] > 0 || victim->kartstuff[k_growshrinktimer] > 0 || victim->kartstuff[k_hyudorotimer] > 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
return;
}
Balloon revamp Supports arbitrary balloon counts now
2017-11-01 22:46:35 +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
if (netgame)
{
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)
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
CONS_Printf(M_GetText("%s is back in the game!\n"), player_names[player-players]);
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
else if (cv_hazardlog.value)
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 stole a bumper from %s!\n"), player_names[player-players], player_names[victim-players]);
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
}
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;
Merge in battle, unfuck the code
2017-11-21 07:23:06 +00:00
player->powers[pw_flashing] = K_GetKartFlashing();
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;
Battle hud stuff?!
2017-12-24 01:55:23 +00:00
/*victim->powers[pw_flashing] = K_GetKartFlashing();
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
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));
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
mobj->flags |= MF_NOCLIPTHING;
mobj->flags &= ~MF_SPECIAL;
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
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;
smoldering->tics = TICRATE*3;
INT32 speed, speed2;
radius = source->radius>>FRACBITS;
height = source->height>>FRACBITS;
Colored boom Not tested *yet*
2018-02-06 01:10:20 +00:00
if (!color)
color = SKINCOLOR_RED;
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;
New bomb explosion effect
2018-02-05 22:53:31 +00:00
dust->scale = source->scale;
dust->destscale = source->scale*10;
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);
New bomb explosion effect
2018-02-05 22:53:31 +00:00
truc->scale = source->scale*2;
truc->destscale = source->scale*6;
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);
dust->scale = source->scale;
dust->destscale = source->scale*10;
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);
truc->scale = source->scale;
truc->destscale = source->scale*5;
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
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 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);
flame->eflags = (flame->eflags & ~MFE_VERTICALFLIP)|(player->mo->eflags & MFE_VERTICALFLIP);
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);
if (i == 0)
P_SetMobjState(sparkle, S_KARTINVULN_LARGE1);
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);
sparkle->eflags = (sparkle->eflags & ~MFE_VERTICALFLIP)|(mo->eflags & MFE_VERTICALFLIP);
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
}
}
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);
dust->momx = FixedMul(spawner->momx + (P_RandomRange(-speedrange, speedrange)<<FRACBITS), 3*FRACUNIT/4);
dust->momy = FixedMul(spawner->momy + (P_RandomRange(-speedrange, speedrange)<<FRACBITS), 3*FRACUNIT/4);
dust->momz = P_MobjFlip(spawner) * P_RandomRange(1, 4)<<FRACBITS;
dust->scale = spawner->scale/2;
dust->destscale = spawner->scale * 3;
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
// Now time for a bunch of flag shit, groooooaann...
if (spawner->flags2 & MF2_DONTDRAW)
dust->flags2 |= MF2_DONTDRAW;
else
dust->flags2 &= ~MF2_DONTDRAW;
if (spawner->eflags & MFE_DRAWONLYFORP1)
dust->eflags |= MFE_DRAWONLYFORP1;
else
dust->eflags &= ~MFE_DRAWONLYFORP1;
if (spawner->eflags & MFE_DRAWONLYFORP2)
dust->eflags |= MFE_DRAWONLYFORP2;
else
dust->eflags &= ~MFE_DRAWONLYFORP2;
if (spawner->eflags & MFE_DRAWONLYFORP3)
dust->eflags |= MFE_DRAWONLYFORP3;
else
dust->eflags &= ~MFE_DRAWONLYFORP3;
if (spawner->eflags & MFE_DRAWONLYFORP4)
dust->eflags |= MFE_DRAWONLYFORP4;
else
dust->eflags &= ~MFE_DRAWONLYFORP4;
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;
}
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 mobj_t *K_ThrowKartItem(player_t *player, boolean missile, mobjtype_t mapthing, INT32 defaultDir, boolean minethrow)
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;
fixed_t newx;
fixed_t newy;
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;
}
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 (minethrow)
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
{
if (player->kartstuff[k_throwdir] == 1)
dir = 2;
Fix up the sink some
2018-06-25 11:28:27 +00:00
else if (player->kartstuff[k_throwdir] == -1 && mapthing != MT_SINK)
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
dir = -1;
else
dir = 1;
}
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
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 + ANGLE_180 - 0x06000000, 0, PROJSPEED/2);
K_SpawnKartMissile(player->mo, mapthing, player->mo->angle + ANGLE_180 - 0x03000000, 0, PROJSPEED/2);
K_SpawnKartMissile(player->mo, mapthing, player->mo->angle + ANGLE_180, 0, PROJSPEED/2);
K_SpawnKartMissile(player->mo, mapthing, player->mo->angle + ANGLE_180 + 0x03000000, 0, PROJSPEED/2);
K_SpawnKartMissile(player->mo, mapthing, player->mo->angle + ANGLE_180 + 0x06000000, 0, PROJSPEED/2);
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
{
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)
{
// Shoot backward
Fixed thrown items (99% sure) Thrown items are thrown farther now; distance based on CC.
2017-10-11 14:48:32 +00:00
mo = K_SpawnKartMissile(player->mo, mapthing, player->mo->angle + ANGLE_180, 0, PROJSPEED/2);
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
{
if (dir == 1 || dir == 2)
{
// 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;
Fix warnings Possibly fix some whitespace problems
2017-03-04 22:13:19 +00:00
INT32 HEIGHT;
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
if (dir == 2)
Hopefully this fixes item throwing & distribution in mobjscale maps
2018-03-01 22:20:13 +00:00
HEIGHT = 40*(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
else
Hopefully this fixes item throwing & distribution in mobjscale maps
2018-03-01 22:20:13 +00:00
HEIGHT = 30*(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
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->momx = player->mo->momx + FixedMul(FINECOSINE(fa), PROJSPEED);
mo->momy = player->mo->momy + FixedMul(FINESINE(fa), 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;
}
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);
}
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
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 = P_SpawnMobj(newx, newy, player->mo->z, 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
}
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
}
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_DoLightningShield(player_t *player)
Fixed thwomp sectors, Added Magnet Item.
2017-02-18 18:39:25 +00:00
{
S_StartSound(player->mo, sfx_s3k45);
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_attractiontimer] = 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);
Fixed thwomp sectors, Added Magnet Item.
2017-02-18 18:39:25 +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
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;
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
Kitchen sink is back Haven't tested yet
2018-06-25 05:36:21 +00:00
if (P_RandomChance(FRACUNIT/256)) // BEHOLD THE KITCHEN SINK
{
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
Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems # Conflicts: # src/k_kart.c # src/k_kart.h # src/lua_baselib.c # src/p_inter.c # src/p_spec.c
2018-03-31 04:44:03 +00:00
void K_DoSneaker(player_t *player, boolean doPFlag)
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
if (!player->kartstuff[k_floorboost] || player->kartstuff[k_floorboost] == 3)
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);
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +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
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
if (doPFlag)
player->pflags |= PF_ATTACKDOWN;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
Fake Items working - Still a weird bug where the item won't throw if you're turning.
2017-02-26 15:19:12 +00:00
K_PlayTauntSound(player->mo);
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
}
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
Thwomps now squish the player - might need to reduce player height to 1 or something temporarily Mushrooms rewritten to not use Instathrust, instead they jack up your accel to 10x. Feels nicer. Floor mushroom panels no longer activate while above them Mushrooms force player to accelerate (and cannot brake) K_PlayTauntSound works now. (YES YES YES HUP HUP YES HUP HERE WE GO) Star and Mega sfx might stop correctly now in netgames (need to test) Item box radius and height increased from 32 to 36.
2017-03-02 22:59:35 +00:00
K_PlayTauntSound(player->mo);
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
}
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
static void K_DoSPB(player_t *victim, player_t *source)
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
{
Fixes
2018-06-08 04:02:28 +00:00
//INT32 i;
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
S_StartSound(victim->mo, sfx_bkpoof); // Sound the BANG!
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
/*for (i = 0; i < MAXPLAYERS; i++)
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 (playeringame[i])
P_FlashPal(&players[i], PAL_NUKE, 10);
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +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 (victim->mo && !victim->spectator)
P_DamageMobj(victim->mo, source->mo, source->mo, 65);
}
Chaotix sound effects, new music names
2018-02-10 21:01:09 +00:00
void K_DoPogoSpring(mobj_t *mo, fixed_t vertispeed)
Bounce pad sector type Uses Ice/Sludge sector effect (new friction doesn't need it)
2017-11-07 07:36:27 +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;
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->player->kartstuff[k_sneakertimer])
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
thrust = FixedMul(thrust, 5*FRACUNIT/4);
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 (mo->player->kartstuff[k_invincibilitytimer])
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
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
mo->momz = FixedMul(FINESINE(ANGLE_22h>>ANGLETOFINESHIFT), FixedMul(thrust, mo->scale));
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
mo->momz = FixedMul(vertispeed, mo->scale);
Chaotix sound effects, new music names
2018-02-10 21:01:09 +00:00
S_StartSound(mo, sfx_kc2f);
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)
{
if (banana->hnext)
Intro camera can noclip, fix several compile errors
2018-06-25 13:18:30 +00:00
{
Linked list bananas, hnext/hprev fixes
2018-06-16 23:57:08 +00:00
K_KillBananaChain(banana->hnext, inflictor, source);
Intro camera can noclip, fix several compile errors
2018-06-25 13:18:30 +00:00
}
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);
}
}
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;
}
}
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;
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
switch (player->mo->hnext->type)
{
case MT_GREENSHIELD: // Kart orbit items
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;
}
Held item changes
2018-06-27 19:58:43 +00:00
cur->angle -= ANGLE_90;
cur->angle += FixedAngle(cur->info->speed);
// 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.
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_SetScale(cur, (cur->destscale = 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);
cur->momx = FixedMul(FINECOSINE(cur->angle>>ANGLETOFINESHIFT), radius);
cur->momy = FixedMul(FINESINE(cur->angle>>ANGLETOFINESHIFT), radius);
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;
}
}
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:
case MT_FAKESHIELD:
{
mobj_t *cur = player->mo->hnext;
mobj_t *targ = player->mo;
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]++;
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;
fixed_t targx;
fixed_t targy;
fixed_t targz;
fixed_t speed;
WANTED
2018-07-01 08:36:09 +00:00
fixed_t dist = radius/2;
if (!cur->health)
{
cur = cur->hnext;
continue;
}
Held item changes
2018-06-27 19:58:43 +00:00
if (cur != player->mo->hnext)
{
targ = cur->hprev;
WANTED
2018-07-01 08:36:09 +00:00
dist = radius/4;
Held item changes
2018-06-27 19:58:43 +00:00
}
if (!targ || P_MobjWasRemoved(targ))
continue;
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);
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;
default:
break;
}
}
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);
// setting players to use the star colormap and spawning afterimages
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
if (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
{
mobj_t *ghost;
player->mo->colorized = true;
ghost = P_SpawnGhostMobj(player->mo);
ghost->fuse = 4;
ghost->frame |= FF_FULLBRIGHT;
}
else
{
player->mo->colorized = false;
}
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])
{
if (P_IsObjectOnGround(player->mo) || player->kartstuff[k_spinouttype] == 1)
player->kartstuff[k_spinouttimer]--;
if (player->kartstuff[k_spinouttimer] == 0)
player->kartstuff[k_spinouttype] = 0; // Reset type
}
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 (!comeback)
player->kartstuff[k_comebacktimer] = comebacktime;
else if (player->kartstuff[k_comebacktimer])
{
player->kartstuff[k_comebacktimer]--;
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 (P_IsLocalPlayer(player) && player->kartstuff[k_bumper] <= 0 && player->kartstuff[k_comebacktimer] <= 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
comebackshowninfo = true; // client has already seen the message
}
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->powers[pw_flashing] == K_GetKartFlashing())
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->powers[pw_flashing]--;
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
if (player->kartstuff[k_attractiontimer])
player->kartstuff[k_attractiontimer]--;
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])
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
player->kartstuff[k_sneakertimer]--;
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]--;
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
if (player->kartstuff[k_growshrinktimer] > 0)
player->kartstuff[k_growshrinktimer]--;
if (player->kartstuff[k_growshrinktimer] < 0)
player->kartstuff[k_growshrinktimer]++;
if (player->kartstuff[k_growshrinktimer] == 1 || player->kartstuff[k_growshrinktimer] == -1)
{
player->mo->destscale = mapheaderinfo[gamemap-1]->mobj_scale;
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]--;
if (player->kartstuff[k_deathsentence])
{
if (player->kartstuff[k_deathsentence] == 1)
Fixes
2018-06-08 04:02:28 +00:00
K_DoSPB(player, &players[spbplayer]);
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->kartstuff[k_deathsentence]--;
}
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->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
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;
}
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;
}
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]++;
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
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
// Stopping of the horrible invincibility SFX
if (player->mo->health <= 0 || player->mo->player->kartstuff[k_invincibilitytimer] <= 0
|| player->mo->player->kartstuff[k_growshrinktimer] > 0) // If you don't have invincibility (or grow is active too)
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 (S_SoundPlaying(player->mo, sfx_kinvnc)) // But the sound is playing
S_StopSoundByID(player->mo, sfx_kinvnc); // Stop it
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
// And the same for the grow SFX
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->mo->health > 0 && player->mo->player->kartstuff[k_growshrinktimer] > 0)) // If you aren't big
{
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
if (S_SoundPlaying(player->mo, sfx_kgrow)) // But the sound is playing
S_StopSoundByID(player->mo, sfx_kgrow); // Stop it
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
}
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
// AAAAAAND handle the invincibility alarm
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
if (player->mo->health > 0 && (player->mo->player->kartstuff[k_invincibilitytimer] > 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
|| player->mo->player->kartstuff[k_growshrinktimer] > 0))
{
Better menus
2018-06-15 00:18:29 +00:00
if (leveltime % 13 == 0 && cv_kartinvinsfx.value && !P_IsLocalPlayer(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
S_StartSound(player->mo, sfx_smkinv);
}
else if (S_SoundPlaying(player->mo, sfx_smkinv))
S_StopSoundByID(player->mo, sfx_smkinv);
// 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)
{
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
if (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
{
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);
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;
}
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
static void K_KartDrift(player_t *player, boolean onground)
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +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
UINT8 kartspeed = player->kartspeed;
fixed_t dsone, dstwo;
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;
v1.3.05 -------- Fixed Drift Sparks. Added a "IF YOU CHANGE THIS" memo comment.
2017-04-17 17:46:34 +00:00
// IF YOU CHANGE THESE: MAKE SURE YOU UPDATE THE SAME VALUES IN p_mobjc, "case MT_DRIFT:"
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
dsone = (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
dstwo = dsone*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)
{
Added fancypants mega shroom, fixed drift boosting
2017-02-19 17:18:43 +00:00
player->kartstuff[k_driftboost] = 20;
Spindash go sound for boosters
2018-06-19 02:29:52 +00:00
S_StartSound(player->mo, sfx_s23c);
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))
Steering fixes, drifting changed, weight has effect now
2017-02-24 01:36:43 +00:00
&& player->kartstuff[k_driftcharge] >= dstwo
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
&& onground)
{
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
player->kartstuff[k_driftboost] = 50;
Spindash go sound for boosters
2018-06-19 02:29:52 +00:00
S_StartSound(player->mo, sfx_s23c);
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
player->kartstuff[k_driftcharge] = 0;
}
// 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;
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_driftend] = 0;
player->kartstuff[k_driftcharge] = 0;
}
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;
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_driftend] = 0;
player->kartstuff[k_driftcharge] = 0;
}
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
driftadditive += (player->cmd.driftturn/800)/8;
if (player->cmd.driftturn < 0) // Outward
driftadditive -= (player->cmd.driftturn/800)/8;
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
driftadditive += (player->cmd.driftturn/800)/4;
if (player->cmd.driftturn > 0) // Outward
driftadditive -= (player->cmd.driftturn/800)/4;
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
if (player->kartstuff[k_driftcharge] < dsone && player->kartstuff[k_driftcharge] + driftadditive >= dsone)
P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_DRIFT)->target = player->mo;
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
{
player->kartstuff[k_drift] = 0;
player->kartstuff[k_driftcharge] = 0;
}
}
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;
thinker_t *th;
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)
for (th = thinkercap.next; th != &thinkercap; th = th->next)
{
if (th->function.acp1 != (actionf_p1)P_MobjThinker) // Not a mobj at all, shoo
continue;
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
mo = (mobj_t *)th;
Fixed position code, added some item numbers
2017-02-17 02:33:00 +00:00
Make sure it's a waypoint before doing distance calculations
2018-03-13 05:25:04 +00:00
if (mo->type != MT_BOSS3WAYPOINT) // TODO: Change to 'MT_WAYPOINT'?
continue;
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
{
if (players[i].score > player->score) // Only score matters
position++;
}
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 (players[i].kartstuff[k_bumper] == player->kartstuff[k_bumper] && players[i].score > player->score)
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
{
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] = 0;
player->kartstuff[k_itemamount] = 0;
player->kartstuff[k_itemheld] = 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
player->kartstuff[k_itemroulette] = 0;
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
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_rocketsneakertimer] = 0;
player->kartstuff[k_invincibilitytimer] = 0;
player->kartstuff[k_growshrinktimer] = 0;
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
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_attractiontimer] = 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;
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]--;
WANTED recalculates on hit, tons of spectator changes
2018-07-04 01:12:25 +00:00
// Race force spectate
if (player->spectator && netgame && G_RaceGametype() && P_FindHighestLap() > 0)
player->powers[pw_flashing] = 5;
Some position code
2017-02-13 04:24:49 +00:00
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
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 && player->mo && player->mo->health > 0 && !player->spectator && !player->exiting && player->kartstuff[k_spinouttimer] == 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.
// Eggman Monitor throwing
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
{
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_ThrowKartItem(player, false, MT_FAKEITEM, -1, false);
Fireballs work, added to roulette. Removed [k_fireballtimer] since it is not going to be used.
2017-05-13 15:14:26 +00:00
K_PlayTauntSound(player->mo);
Rename fake item to eggman monitor
2018-03-14 01:07:08 +00:00
player->kartstuff[k_eggmanheld] = 0;
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
{
Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems # Conflicts: # src/k_kart.c # src/k_kart.h # src/lua_baselib.c # src/p_inter.c # src/p_spec.c
2018-03-31 04:44:03 +00:00
K_DoSneaker(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
player->kartstuff[k_rocketsneakertimer] -= 5;
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
}
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)
{
Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems # Conflicts: # src/k_kart.c # src/k_kart.h # src/lua_baselib.c # src/p_inter.c # src/p_spec.c
2018-03-31 04:44:03 +00:00
K_DoSneaker(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
player->kartstuff[k_itemamount]--;
}
break;
case KITEM_ROCKETSNEAKER:
if (ATTACK_IS_DOWN && !HOLDING_ITEM && onground && NO_HYUDORO
&& player->kartstuff[k_rocketsneakertimer] == 0)
{
Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems # Conflicts: # src/k_kart.c # src/k_kart.h # src/lua_baselib.c # src/p_inter.c # src/p_spec.c
2018-03-31 04:44:03 +00:00
K_DoSneaker(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
player->kartstuff[k_rocketsneakertimer] = itemtime;
player->kartstuff[k_itemamount]--;
}
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
{
if (P_IsLocalPlayer(player) && !player->exiting)
Chaotix sound effects, new music names
2018-02-10 21:01:09 +00:00
S_ChangeMusicInternal("kinvnc", true);
Better menus
2018-06-15 00:18:29 +00:00
if (!cv_kartinvinsfx.value && !P_IsLocalPlayer(player))
Chaotix sound effects, new music names
2018-02-10 21:01:09 +00:00
S_StartSound(player->mo, sfx_kinvnc);
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
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_PlayTauntSound(player->mo);
player->kartstuff[k_itemamount]--;
player->pflags |= PF_ATTACKDOWN;
}
break;
case KITEM_BANANA:
if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO)
{
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
angle_t newangle;
fixed_t newx;
fixed_t newy;
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
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
//K_PlayTauntSound(player->mo);
player->kartstuff[k_itemheld] = 1;
Linked list bananas, hnext/hprev fixes
2018-06-16 23:57:08 +00:00
player->pflags |= PF_ATTACKDOWN;
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++)
{
newangle = player->mo->angle;
newx = player->mo->x + P_ReturnThrustX(player->mo, newangle + ANGLE_180, mobjinfo[MT_BANANA_SHIELD].radius);
newy = player->mo->y + P_ReturnThrustY(player->mo, newangle + ANGLE_180, mobjinfo[MT_BANANA_SHIELD].radius);
mo = P_SpawnMobj(newx, newy, player->mo->z, MT_BANANA_SHIELD);
mo->threshold = 10;
mo->movecount = player->kartstuff[k_itemamount];
mo->lastlook = moloop+1;
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
{
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
K_ThrowKartItem(player, false, MT_BANANA, -1, 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
K_PlayTauntSound(player->mo);
player->pflags |= PF_ATTACKDOWN;
player->kartstuff[k_itemamount]--;
if (!player->kartstuff[k_itemamount])
player->kartstuff[k_itemheld] = 0;
}
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)
{
angle_t newangle;
fixed_t newx;
fixed_t newy;
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;
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->pflags |= PF_ATTACKDOWN;
newangle = player->mo->angle;
Fix up fake and mine to use the trail code correctly
2018-06-17 00:42:47 +00:00
newx = player->mo->x + P_ReturnThrustX(player->mo, newangle + ANGLE_180, mobjinfo[MT_FAKESHIELD].radius);
newy = player->mo->y + P_ReturnThrustY(player->mo, newangle + ANGLE_180, mobjinfo[MT_FAKESHIELD].radius);
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
mo = P_SpawnMobj(newx, newy, player->mo->z, MT_FAKESHIELD);
mo->threshold = 10;
Fix up fake and mine to use the trail code correctly
2018-06-17 00:42:47 +00:00
mo->movecount = 1;
mo->lastlook = 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 (mo)
{
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;
fixed_t newx;
fixed_t newy;
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
Held item changes
2018-06-27 19:58:43 +00:00
//K_PlayTauntSound(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;
player->pflags |= PF_ATTACKDOWN;
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;
newx = player->mo->x + P_ReturnThrustX(player->mo, newangle, 64*FRACUNIT);
newy = player->mo->y + P_ReturnThrustY(player->mo, newangle, 64*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
mo = P_SpawnMobj(newx, newy, player->mo->z, MT_GREENSHIELD);
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 && 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
{
K_ThrowKartItem(player, true, MT_GREENITEM, 1, false);
K_PlayTauntSound(player->mo);
player->pflags |= PF_ATTACKDOWN;
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_itemamount]--;
if (!player->kartstuff[k_itemamount])
player->kartstuff[k_itemheld] = 0;
}
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;
fixed_t newx;
fixed_t newy;
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
Held item changes
2018-06-27 19:58:43 +00:00
//K_PlayTauntSound(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;
player->pflags |= PF_ATTACKDOWN;
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;
newx = player->mo->x + P_ReturnThrustX(player->mo, newangle, 64*FRACUNIT);
newy = player->mo->y + P_ReturnThrustY(player->mo, newangle, 64*FRACUNIT);
Incredibly rudimentary Jawz stuff
2018-06-01 00:51:05 +00:00
mo = P_SpawnMobj(newx, newy, player->mo->z, MT_JAWZ_SHIELD);
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)
Incredibly rudimentary Jawz stuff
2018-06-01 00:51:05 +00:00
K_ThrowKartItem(player, true, MT_JAWZ, 1, 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
else if (player->kartstuff[k_throwdir] == -1) // Throwing backward gives you a dud that doesn't home in
Incredibly rudimentary Jawz stuff
2018-06-01 00:51:05 +00:00
K_ThrowKartItem(player, true, MT_JAWZ_DUD, -1, 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
K_PlayTauntSound(player->mo);
player->pflags |= PF_ATTACKDOWN;
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
player->kartstuff[k_itemamount]--;
if (!player->kartstuff[k_itemamount])
player->kartstuff[k_itemheld] = 0;
}
break;
case KITEM_MINE:
if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO)
{
angle_t newangle;
fixed_t newx;
fixed_t newy;
mobj_t *mo;
player->kartstuff[k_itemheld] = 1;
player->pflags |= PF_ATTACKDOWN;
newangle = player->mo->angle;
Fix up fake and mine to use the trail code correctly
2018-06-17 00:42:47 +00:00
newx = player->mo->x + P_ReturnThrustX(player->mo, newangle + ANGLE_180, mobjinfo[MT_SSMINE_SHIELD].radius);
newy = player->mo->y + P_ReturnThrustY(player->mo, newangle + ANGLE_180, mobjinfo[MT_SSMINE_SHIELD].radius);
Incredibly rudimentary Jawz stuff
2018-06-01 00:51:05 +00:00
mo = P_SpawnMobj(newx, newy, 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
mo->threshold = 10;
Fix up fake and mine to use the trail code correctly
2018-06-17 00:42:47 +00:00
mo->movecount = 1;
mo->lastlook = 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 (mo)
Linked list bananas, hnext/hprev fixes
2018-06-16 23:57: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
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
{
Incredibly rudimentary Jawz stuff
2018-06-01 00:51:05 +00:00
K_ThrowKartItem(player, false, MT_SSMINE, 1, 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
K_PlayTauntSound(player->mo);
player->kartstuff[k_itemamount]--;
player->kartstuff[k_itemheld] = 0;
}
break;
case KITEM_BALLHOG:
if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO)
{
player->kartstuff[k_itemamount]--;
Revert MT_FIREBALL to vanilla, remove MT_FIRETRAIL, MT_BALLHOG added, bigger Jawz explosions
2018-06-25 21:12:01 +00:00
K_ThrowKartItem(player, true, MT_BALLHOG, 1, 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
S_StartSound(player->mo, sfx_mario7);
K_PlayTauntSound(player->mo);
}
break;
case KITEM_SPB:
if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO)
{
Fixes
2018-06-08 04:02:28 +00:00
UINT8 ploop;
UINT8 bestrank = 0;
fixed_t dist = 0;
for (ploop = 0; ploop < MAXPLAYERS; ploop++)
{
fixed_t thisdist;
if (!playeringame[ploop] || players[ploop].spectator)
continue;
if (&players[ploop] == player)
continue;
if (!players[ploop].mo)
continue;
if (players[ploop].exiting)
continue;
thisdist = R_PointToDist2(player->mo->x, player->mo->y, players[ploop].mo->x, players[ploop].mo->y);
if (bestrank == 0 || players[ploop].kartstuff[k_position] < bestrank)
{
bestrank = players[ploop].kartstuff[k_position];
dist = thisdist;
}
}
if (dist == 0)
spbincoming = 6*TICRATE; // If you couldn't find anyone, just set an abritary timer
else
spbincoming = (tic_t)max(1, FixedDiv(dist, 64*FRACUNIT)/FRACUNIT);
spbplayer = player-players;
player->pflags |= PF_ATTACKDOWN;
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]--;
Fixes
2018-06-08 04:02:28 +00:00
K_PlayTauntSound(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
{
if (P_IsLocalPlayer(player) && !player->exiting)
Chaotix sound effects, new music names
2018-02-10 21:01:09 +00:00
S_ChangeMusicInternal("kgrow", true);
Better menus
2018-06-15 00:18:29 +00:00
if (!cv_kartinvinsfx.value && !P_IsLocalPlayer(player))
Chaotix sound effects, new music names
2018-02-10 21:01:09 +00:00
S_StartSound(player->mo, sfx_kgrow);
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_PlayTauntSound(player->mo);
SPB fixes Shrink also plays its sound, and Shrink/Grow have slower scaling speeds
2018-06-11 05:51:50 +00:00
player->mo->scalespeed = FRACUNIT/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;
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
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->pflags |= PF_ATTACKDOWN;
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]--;
}
break;
case KITEM_LIGHTNINGSHIELD:
if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO)
{
K_DoLightningShield(player);
player->pflags |= PF_ATTACKDOWN;
player->kartstuff[k_itemamount]--;
}
break;
case KITEM_HYUDORO:
if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO)
{
player->kartstuff[k_itemamount]--;
player->pflags |= PF_ATTACKDOWN;
K_DoHyudoroSteal(player);
}
break;
case KITEM_POGOSPRING:
if (ATTACK_IS_DOWN && !HOLDING_ITEM && onground && NO_HYUDORO
&& !player->kartstuff[k_pogospring])
{
K_PlayTauntSound(player->mo);
Chaotix sound effects, new music names
2018-02-10 21:01:09 +00:00
K_DoPogoSpring(player->mo, 32<<FRACBITS);
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->pflags |= PF_ATTACKDOWN;
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)
{
K_ThrowKartItem(player, false, MT_SINK, 1, true);
K_PlayTauntSound(player->mo);
player->kartstuff[k_itemamount]--;
player->kartstuff[k_itemheld] = 0;
}
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!
if (!player->kartstuff[k_itemamount] && !player->kartstuff[k_itemheld])
player->kartstuff[k_itemtype] = KITEM_NONE;
Added feather
2017-11-07 05:57:42 +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
// Grow - Make the player grow!
Chaotix sound effects, new music names
2018-02-10 21:01:09 +00:00
/*if (player->kartstuff[k_growshrinktimer] > 1)
player->mo->destscale = (mapheaderinfo[gamemap-1]->mobj_scale)*3/2;*/
Dang it.
2017-11-01 20:24:40 +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
if (player->kartstuff[k_itemtype] == KITEM_SPB
|| player->kartstuff[k_itemtype] == KITEM_SHRINK
WANTED
2018-07-01 08:36:09 +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
|| spbincoming)
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;
else
player->mo->eflags |= MFE_DRAWONLYFORP1;
}
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
{
K_StripItems(player);
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
if (player->kartstuff[k_growshrinktimer] > 1)
player->powers[pw_flashing] = 2;
// 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;
}
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)
Unsuck start boosts
2018-03-30 01:43:02 +00:00
player->mo->destscale = (mapheaderinfo[gamemap-1]->mobj_scale) + (player->kartstuff[k_boostcharge]*131);
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
{
// Get an instant boost!
Unsuck start boosts
2018-03-30 01:43:02 +00:00
if (player->kartstuff[k_boostcharge] >= 35 && player->kartstuff[k_boostcharge] <= 50)
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
{
Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems # Conflicts: # src/k_kart.c # src/k_kart.h # src/lua_baselib.c # src/p_inter.c # src/p_spec.c
2018-03-31 04:44:03 +00:00
player->kartstuff[k_sneakertimer] = -((21*(player->kartstuff[k_boostcharge]*player->kartstuff[k_boostcharge]))/425)+131; // max time is 70, min time is 7; yay parabooolas
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
if (!player->kartstuff[k_floorboost] || player->kartstuff[k_floorboost] == 3)
{
if (player->kartstuff[k_sneakertimer] >= 70)
S_StartSound(player->mo, sfx_s25f); // Special sound for the perfect start boost!
else if (player->kartstuff[k_sneakertimer] >= sneakertime)
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_StartSound(player->mo, sfx_cdfm01); // Sneaker boost sound for big boost
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
else
S_StartSound(player->mo, sfx_s23c); // Drift boost sound for small boost
}
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)
{
UINT8 numingame = 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;
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;
if (players[j].kartstuff[k_wanted] == players[i].kartstuff[k_wanted] && players[j].score > players[i].score)
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 (numingame <= 2)
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++;
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
winnerscoreadd += players[i].score;
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;
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
winnerscoreadd -= players[i].score;
BATLLE MODE AAAAAA
2017-10-22 07:06:35 +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 (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
{
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
players[winnernum].score += winnerscoreadd;
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
Battle HUD stuff
2017-11-14 01:45:57 +00:00
for (i = 0; i < MAXPLAYERS; i++)
P_DoPlayerExit(&players[i]);
BATLLE MODE AAAAAA
2017-10-22 07:06:35 +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
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;
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
Lakitu murder & countdown improvements (I'm not SevenethSentienel! I just don't feel like logging out!)
2018-06-25 02:15:22 +00:00
static patch_t *kp_startcountdown[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
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
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
static patch_t *kp_facenull;
static patch_t *kp_facefirst;
static patch_t *kp_facesecond;
static patch_t *kp_facethird;
static patch_t *kp_facefourth;
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;
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;
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];
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];
static patch_t *kp_orbinaut[2];
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];
static patch_t *kp_lightningshield[2];
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
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
static patch_t *kp_spbwarning[2];
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];
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);
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);
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_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);
Swoopy Start & Lap Lakitu
2017-06-03 22:19:06 +00:00
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
// Position numbers
for (i = 0; i < NUMPOSNUMS; i++)
{
for (j = 0; j < NUMPOSFRAMES; j++)
{
sprintf(buffer, "K_POSN%d%d", i, j);
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
for (i = 0; i < NUMPOSFRAMES; i++)
{
sprintf(buffer, "K_POSNW%d", i);
kp_winnernum[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
}
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
kp_facenull = W_CachePatchName("K_PFACE0", PU_HUDGFX);
kp_facefirst = W_CachePatchName("K_PFACE1", PU_HUDGFX);
kp_facesecond = W_CachePatchName("K_PFACE2", PU_HUDGFX);
kp_facethird = W_CachePatchName("K_PFACE3", PU_HUDGFX);
kp_facefourth = W_CachePatchName("K_PFACE4", 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
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
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_rankbumper = W_CachePatchName("K_BLNICO", PU_HUDGFX);
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);
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);
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);
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++)
{
sprintf(buffer, "K_ITINV%d", i+1);
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);
kp_orbinaut[0] = W_CachePatchName("K_ITORBN", PU_HUDGFX);
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);
kp_lightningshield[0] = W_CachePatchName("K_ITLITS", PU_HUDGFX);
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);
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);
for (i = 0; i < 6; i++)
{
sprintf(buffer, "K_ISINV%d", i+1);
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);
kp_orbinaut[1] = W_CachePatchName("K_ISORBN", PU_HUDGFX);
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);
kp_lightningshield[1] = W_CachePatchName("K_ISLITS", PU_HUDGFX);
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
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++)
{
sprintf(buffer, "K_CHECK%d", i+1);
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
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
// SPB warning
kp_spbwarning[0] = W_CachePatchName("K_SPBW1", PU_HUDGFX);
kp_spbwarning[1] = W_CachePatchName("K_SPBW2", 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);
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
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
INT32 SPBW_X, SPBW_Y; // SPB warning
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
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
// Blue Shell warning
WANTED
2018-07-01 08:36:09 +00:00
SPBW_X = BASEVIDWIDTH/2; // 270
SPBW_Y = BASEVIDHEIGHT- 24; // 176
// 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
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
SPBW_Y = (BASEVIDHEIGHT/2)-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
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);
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
SPBW_X = BASEVIDWIDTH/4;
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
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;
Splitscreen items (also fixed Big Ring flags)
2018-06-29 00:54:06 +00:00
patch_t *localbg = ((splitscreen > 1) ? kp_itembg[2] : kp_itembg[0]);
patch_t *localinv = ((splitscreen > 1) ? 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);
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
Splitscreen items (also fixed Big Ring flags)
2018-06-29 00:54:06 +00:00
case 0: localpatch = kp_sneaker[offset]; break; // Sneaker
case 1: localpatch = kp_banana[offset]; break; // Banana
case 2: localpatch = kp_orbinaut[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_lightningshield[offset]; break; // Lightning 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];
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 (!(leveltime & 2))
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
}
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)
{
if (leveltime & 1)
Splitscreen items (also fixed Big Ring flags)
2018-06-29 00:54:06 +00:00
localpatch = kp_rocketsneaker[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
else if (!(leveltime & 1))
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];
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 (!(leveltime & 1))
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];
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 (!(leveltime & 2))
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
{
if (!(stplyr->kartstuff[k_itemamount] || stplyr->kartstuff[k_itemheld]))
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;
case KITEM_ORBINAUT: localpatch = kp_orbinaut[offset]; break;
case KITEM_JAWZ: localpatch = kp_jawz[offset]; break;
case KITEM_MINE: localpatch = kp_mine[offset]; break;
case KITEM_BALLHOG: localpatch = kp_ballhog[offset]; break;
case KITEM_SPB: localpatch = kp_selfpropelledbomb[offset]; break;
case KITEM_GROW: localpatch = kp_grow[offset]; break;
case KITEM_SHRINK: localpatch = kp_shrink[offset]; break;
case KITEM_LIGHTNINGSHIELD: localpatch = kp_lightningshield[offset]; break;
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;
}
}
}
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:
if (stplyr->kartstuff[k_itemamount] > 1 && !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);
Splitscreen items (also fixed Big Ring flags)
2018-06-29 00:54:06 +00:00
if (splitscreen > 1)
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);
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
}
static void K_drawKartTimestamp(void)
{
// TIME_X = BASEVIDWIDTH-124; // 196
// TIME_Y = 6; // 6
INT32 TIME_XB;
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 splitflags = K_calcSplitFlags(V_SNAPTOTOP|V_SNAPTORIGHT);
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawScaledPatch(TIME_X, TIME_Y, V_HUDTRANS|splitflags, kp_timestickerwide);
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
TIME_XB = TIME_X+33;
if (stplyr->realtime/(60*TICRATE) < 100) // 99:99:99 only
{
// zero minute
if (stplyr->realtime/(60*TICRATE) < 10)
{
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawKartString(TIME_XB, TIME_Y+3, V_HUDTRANS|splitflags, va("0"));
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
// minutes time 0 __ __
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawKartString(TIME_XB+12, TIME_Y+3, V_HUDTRANS|splitflags, va("%d", stplyr->realtime/(60*TICRATE)));
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
}
// minutes time 0 __ __
else
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawKartString(TIME_XB, TIME_Y+3, V_HUDTRANS|splitflags, va("%d", stplyr->realtime/(60*TICRATE)));
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
// apostrophe location _'__ __
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawKartString(TIME_XB+24, TIME_Y+3, V_HUDTRANS|splitflags, va("'"));
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
// zero second _ 0_ __
if ((stplyr->realtime/TICRATE % 60) < 10)
{
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawKartString(TIME_XB+36, TIME_Y+3, V_HUDTRANS|splitflags, va("0"));
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
// seconds time _ _0 __
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawKartString(TIME_XB+48, TIME_Y+3, V_HUDTRANS|splitflags, va("%d", stplyr->realtime/TICRATE % 60));
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
}
// zero second _ 00 __
else
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawKartString(TIME_XB+36, TIME_Y+3, V_HUDTRANS|splitflags, va("%d", stplyr->realtime/TICRATE % 60));
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
// quotation mark location _ __"__
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawKartString(TIME_XB+60, TIME_Y+3, V_HUDTRANS|splitflags, va("\""));
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
// zero tick _ __ 0_
if (G_TicsToCentiseconds(stplyr->realtime) < 10)
{
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawKartString(TIME_XB+72, TIME_Y+3, V_HUDTRANS|splitflags, va("0"));
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
// tics _ __ _0
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawKartString(TIME_XB+84, TIME_Y+3, V_HUDTRANS|splitflags, va("%d", G_TicsToCentiseconds(stplyr->realtime)));
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
}
// zero tick _ __ 00
if (G_TicsToCentiseconds(stplyr->realtime) >= 10)
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawKartString(TIME_XB+72, TIME_Y+3, V_HUDTRANS|splitflags, va("%d", G_TicsToCentiseconds(stplyr->realtime)));
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
}
else
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawKartString(TIME_XB, TIME_Y+3, V_HUDTRANS|splitflags, va("99'59\"99"));
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)
scale = FixedMul(scale, 3*FRACUNIT/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!!
{
// Alternate frame every three frames
switch (leveltime % 21)
{
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
case 1: case 2: case 3:
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
localpatch = kp_winnernum[0];
break;
case 4: case 5: case 6:
localpatch = kp_winnernum[1];
break;
case 7: case 8: case 9:
localpatch = kp_winnernum[2];
break;
case 10: case 11: case 12:
localpatch = kp_winnernum[3];
break;
case 13: case 14: case 15:
localpatch = kp_winnernum[4];
break;
case 16: case 17: case 18:
localpatch = kp_winnernum[5];
break;
case 19: case 20: case 21:
localpatch = kp_winnernum[6];
break;
default:
localpatch = kp_positionnum[1][0];
break;
}
}
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;
}
}
Lakitu Start Lights
2017-05-21 22:25:28 +00:00
static void 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
INT32 i, j, ranklines;
boolean completed[MAXPLAYERS];
INT32 rankplayer[MAXPLAYERS];
INT32 rankcolor[MAXPLAYERS];
Fix warnings Possibly fix some whitespace problems
2017-03-04 22:13:19 +00:00
INT32 myplayer;
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 bumperx;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
UINT8 *colormap;
patch_t *localpatch = kp_facenull;
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));
memset(rankcolor, 0, sizeof (rankcolor));
myplayer = demoplayback ? displayplayer : consoleplayer;
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++)
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
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
for (j = 0; j < MAXPLAYERS; j++)
{
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[j] || players[j].spectator || !players[j].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;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
for (i = 0; i < MAXPLAYERS; i++)
{
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 (playeringame[i] && completed[i] == false && players[i].mo && !players[i].spectator
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
&& (rankplayer[ranklines] < 0 || players[i].kartstuff[k_position] < players[rankplayer[ranklines]].kartstuff[k_position]))
{
rankplayer[ranklines] = i;
rankcolor[ranklines] = players[i].skincolor;
}
}
completed[rankplayer[ranklines]] = true;
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
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
if (ranklines > 4) ranklines = 4; // Only draw the top 4 players
Y -= (9*ranklines);
for (i = 0; i < ranklines; i++)
{
if (players[rankplayer[i]].spectator) continue; // Spectators are ignored
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
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
bumperx = FACE_X+18;
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
if (rankcolor[i] == 0)
{
colormap = colormaps;
if (rankplayer[i] != myplayer)
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
{
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawSmallTranslucentPatch(FACE_X, Y, V_HUDTRANS|V_SNAPTOLEFT, faceprefix[players[rankplayer[i]].skin]);
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[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
{
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
for (j = 0; 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
{
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_DrawSmallTranslucentPatch(bumperx, Y+10, V_HUDTRANS|V_SNAPTOLEFT, kp_rankbumper);
bumperx += 3;
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
else
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
{
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawSmallScaledPatch(FACE_X, Y, V_HUDTRANS|V_SNAPTOLEFT, faceprefix[players[rankplayer[i]].skin]);
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[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
{
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
for (j = 0; 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
{
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_DrawSmallScaledPatch(bumperx, Y+10, V_HUDTRANS|V_SNAPTOLEFT, kp_rankbumper);
bumperx += 3;
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
}
else
{
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);
}
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
if (rankplayer[i] != myplayer)
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
{
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawSmallTranslucentMappedPatch(FACE_X, Y, V_HUDTRANS|V_SNAPTOLEFT, faceprefix[players[rankplayer[i]].skin], colormap);
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[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
{
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
for (j = 0; 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
{
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_DrawSmallTranslucentMappedPatch(bumperx, Y+10, V_HUDTRANS|V_SNAPTOLEFT, kp_rankbumper, colormap);
bumperx += 3;
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
else
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
{
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawSmallMappedPatch(FACE_X, Y, V_HUDTRANS|V_SNAPTOLEFT, faceprefix[players[rankplayer[i]].skin], colormap);
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[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
{
Changed all instances of "balloon" to "bumper" Also changed "It's you!" to "Select character & color..."
2018-07-03 19:14:47 +00:00
for (j = 0; 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
{
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_DrawSmallMappedPatch(bumperx, Y+10, V_HUDTRANS|V_SNAPTOLEFT, kp_rankbumper, colormap);
bumperx += 3;
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
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
// Draws the little number over the face
Some position code
2017-02-13 04:24:49 +00:00
switch (players[rankplayer[i]].kartstuff[k_position])
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
{
case 1: localpatch = kp_facefirst; break;
case 2: localpatch = kp_facesecond; break;
case 3: localpatch = kp_facethird; break;
case 4: localpatch = kp_facefourth; break;
default: break;
}
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
if (rankplayer[i] != myplayer)
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
{
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[rankplayer[i]].kartstuff[k_bumper] <= 0)
V_DrawSmallTranslucentPatch(FACE_X-2, Y, V_HUDTRANS|V_SNAPTOLEFT, kp_ranknobumpers);
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
else
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawSmallTranslucentPatch(FACE_X, Y, V_HUDTRANS|V_SNAPTOLEFT, localpatch);
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
else
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
{
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[rankplayer[i]].kartstuff[k_bumper] <= 0)
V_DrawSmallScaledPatch(FACE_X-2, Y, V_HUDTRANS|V_SNAPTOLEFT, kp_ranknobumpers);
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
else
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawSmallScaledPatch(FACE_X, Y, V_HUDTRANS|V_SNAPTOLEFT, localpatch);
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;
}
}
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);
V_DrawString(LAPS_X+13, LAPS_Y+1, V_HUDTRANS|splitflags, va("%d/3", 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);
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
V_DrawKartString(LAPS_X+59, LAPS_Y+3, V_HUDTRANS|splitflags, va("%d/3", 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
}
}
}
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
static void K_drawSPBWarning(void)
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
{
patch_t *localpatch = kp_nodraw;
INT32 splitflags = K_calcSplitFlags(V_SNAPTOBOTTOM);
if (!(stplyr->kartstuff[k_deathsentence] > 0
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
|| (spbincoming > 0 && spbincoming < 2*TICRATE && stplyr->kartstuff[k_position] == 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
return;
if (leveltime % 8 > 3)
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
localpatch = kp_spbwarning[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
else
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
localpatch = kp_spbwarning[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
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
V_DrawScaledPatch(SPBW_X, SPBW_Y, splitflags, localpatch);
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
}
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 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
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
if (mirrormode)
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)
WANTED
2018-07-01 08:36:09 +00:00
V_DrawRightAlignedString(WANT_X, WANT_Y, K_calcSplitFlags(V_SNAPTOBOTTOM|V_SNAPTORIGHT|V_HUDTRANS|V_REDMAP), "WANTED");
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++)
{
WANTED 2
2018-07-01 18:11:48 +00:00
INT32 x = WANT_X+7, y = WANT_Y+20;
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)
{
WANTED 2
2018-07-01 18:11:48 +00:00
x++; //y++;
WANTED
2018-07-01 08:36:09 +00:00
scale = FRACUNIT;
}
WANTED 2
2018-07-01 18:11:48 +00:00
else
{
if (i & 1)
x += 18;
if (i > 1)
y += 17;
}
WANTED
2018-07-01 08:36:09 +00:00
if (players[battlewanted[i]].skincolor == 0)
Quick fix
2018-07-01 19:15:45 +00:00
V_DrawFixedPatch(x<<FRACBITS, y<<FRACBITS, scale, V_HUDTRANS|V_SNAPTORIGHT|V_SNAPTOBOTTOM, faceprefix[p->skin], NULL);
WANTED
2018-07-01 08:36:09 +00:00
else
{
WANTED 2
2018-07-01 18:11:48 +00:00
colormap = R_GetTranslationColormap(TC_RAINBOW, p->skincolor, GTC_CACHE);
Quick fix
2018-07-01 19:15:45 +00:00
V_DrawFixedPatch(x<<FRACBITS, y<<FRACBITS, scale, V_HUDTRANS|V_SNAPTORIGHT|V_SNAPTOBOTTOM, faceprefix[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;
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;
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 (&players[i] == stplyr)
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
}
}
}
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
void K_LoadIconGraphics(char *facestr, INT32 skinnum)
{
char namelump[9];
// hack: make sure base face name is no more than 8 chars
if (strlen(facestr) > 8)
facestr[8] = '\0';
strcpy(namelump, facestr); // copy base name
iconprefix[skinnum] = W_CachePatchName(namelump, PU_HUDGFX);
iconfreed[skinnum] = false;
}
#if 0 //unused
static void K_UnLoadIconGraphics(INT32 skinnum)
{
Z_Free(iconprefix[skinnum]);
iconfreed[skinnum] = true;
}
#endif
Closer to done HUD tweaking? Splitscreen in Battle is left
2017-12-24 00:14:06 +00:00
void K_ReloadSkinIconGraphics(void)
{
INT32 i;
for (i = 0; i < numskins; i++)
K_LoadIconGraphics(skins[i].iconprefix, i);
}
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;
if (mo->skin)
skin = ((skin_t*)mo->skin)-skins;
thing
2017-12-22 21:24:20 +00:00
fixed_t amnumxpos;
fixed_t amnumypos;
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 amxpos;
INT32 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;
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;
fixed_t mapwidth = maxx - minx;
fixed_t mapheight = maxy - miny;
// These should always be small enough to be bitshift back right now
fixed_t xoffset = (minx + mapwidth/2)<<FRACBITS;
fixed_t yoffset = (miny + mapheight/2)<<FRACBITS;
fixed_t xscale = FixedDiv(AutomapPic->width, mapwidth);
fixed_t yscale = FixedDiv(AutomapPic->height, mapheight);
fixed_t zoom = FixedMul(min(xscale, yscale), FRACUNIT-FRACUNIT/20);
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
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
amxpos = amnumxpos + ((x + AutomapPic->width/2 - (iconprefix[skin]->width/2))<<FRACBITS);
amypos = amnumypos + ((y + AutomapPic->height/2 - (iconprefix[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
if (mirrormode)
{
flags |= V_FLIP;
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
amxpos = -amnumxpos + ((x + AutomapPic->width/2 + (iconprefix[skin]->width/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
}
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
V_DrawSciencePatch(amxpos, amypos, flags, iconprefix[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);
V_DrawFixedPatch(amxpos, amypos, FRACUNIT, flags, iconprefix[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.
thing
2017-12-22 21:24:20 +00:00
if (!(Playing() && gamestate == GS_LEVEL))
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
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
if (mirrormode)
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!
if (mirrormode)
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
}
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
{
Closer to done HUD tweaking? Splitscreen in Battle is left
2017-12-24 00:14:06 +00:00
if (stplyr == &players[secondarydisplayplayer])
x = BASEVIDWIDTH-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
Closer to done HUD tweaking? Splitscreen in Battle is left
2017-12-24 00:14:06 +00:00
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
}
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);
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])
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_battlewin, NULL);
Battle hud stuff?!
2017-12-24 01:55:23 +00:00
else if (splitscreen < 2)
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_battlelose, NULL);
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
{
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
INT32 t = 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
INT32 txoff = 0;
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
Battle hud stuff?!
2017-12-24 01:55:23 +00:00
if (t == 0)
Last few finishing touches for the HUD Battle Mode cards & Race countdown timers display properly
2017-12-25 15:05:36 +00:00
txoff = 8;
Battle hud stuff?!
2017-12-24 01:55:23 +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
{
Battle hud stuff?!
2017-12-24 01:55:23 +00:00
while (t)
{
Last few finishing touches for the HUD Battle Mode cards & Race countdown timers display properly
2017-12-25 15:05:36 +00:00
txoff += 8;
Battle hud stuff?!
2017-12-24 01:55:23 +00:00
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)
{
if (splitscreen > 2)
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)
Last few finishing touches for the HUD Battle Mode cards & Race countdown timers display properly
2017-12-25 15:05:36 +00:00
V_DrawString(x-(txoff/2), ty, 0, va("%d", stplyr->kartstuff[k_comebacktimer]/TICRATE));
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
}
}
Lakitu murder & countdown improvements (I'm not SevenethSentienel! I just don't feel like logging out!)
2018-06-25 02:15:22 +00:00
static void K_drawStartCountdown(void)
Swoopy Start & Lap Lakitu
2017-06-03 22:19:06 +00:00
{
Fix countdown in splits
2018-06-27 01:19:36 +00:00
INT32 pnum = 0, splitflags = K_calcSplitFlags(0); // 3
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-(2*TICRATE)) // 2
pnum++;
if (leveltime >= starttime-TICRATE) // 1
pnum++;
if (leveltime >= starttime) // GO!
pnum++;
if ((leveltime % (2*5)) / 5) // blink
pnum += 4;
Fix countdown in splits
2018-06-27 01:19:36 +00:00
if (splitscreen)
V_DrawSmallScaledPatch(STCD_X - (SHORT(kp_startcountdown[pnum]->width)/4), STCD_Y - (SHORT(kp_startcountdown[pnum]->height)/4), splitflags, kp_startcountdown[pnum]);
else
V_DrawScaledPatch(STCD_X - (SHORT(kp_startcountdown[pnum]->width)/2), STCD_Y - (SHORT(kp_startcountdown[pnum]->height)/2), splitflags, kp_startcountdown[pnum]);
Lakitu Start Lights
2017-05-21 22:25:28 +00:00
}
First person fun
2018-06-26 20:12:42 +00:00
static void K_drawKartFirstPerson(void)
{
static INT32 pnum1 = 0, pnum2 = 0, pnum3 = 0, pnum4 = 0;
INT32 pn = 0, target = 0, splitflags = K_calcSplitFlags(V_SNAPTOBOTTOM);
INT32 x = BASEVIDWIDTH/2, y = BASEVIDHEIGHT;
ticcmd_t *cmd = &stplyr->cmd;
if (stplyr == &players[secondarydisplayplayer] && splitscreen)
pn = pnum2;
else if (stplyr == &players[thirddisplayplayer] && splitscreen > 1)
pn = pnum3;
else if (stplyr == &players[fourthdisplayplayer] && splitscreen > 2)
pn = pnum4;
else
pn = pnum1;
if (splitscreen)
{
y /= 2;
if (splitscreen > 1)
x /= 2;
}
* Repair dehacked lists for compiling with DEBUGMODE=1. * Fix that rat-ass nasty crash with respawning from spectator mode! * Flying ghost kart for spectator mode! It's silly and fun... * Allow for .bat files to be .gitignored in the Debug compilation folder too!
2018-06-28 22:58:26 +00:00
if (stplyr->spectator || !stplyr->mo)
splitflags |= FF_TRANS50;
else if (stplyr->speed < FixedMul(stplyr->runspeed, stplyr->mo->scale) && (leveltime & 1))
First person fun
2018-06-26 20:12:42 +00:00
y++;
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;
if (pn < target)
pn++;
else if (pn > target)
pn--;
if (pn > 2)
pn = 2;
if (pn < -2)
pn = -2;
if (pn < 0)
splitflags |= V_FLIP; // right turn
if (splitscreen)
V_DrawSmallScaledPatch(x, y, splitflags, kp_fpview[abs(pn)]);
else
V_DrawScaledPatch(x, y, splitflags, kp_fpview[abs(pn)]);
if (stplyr == &players[secondarydisplayplayer] && splitscreen)
pnum2 = pn;
else if (stplyr == &players[thirddisplayplayer] && splitscreen > 1)
pnum3 = pn;
else if (stplyr == &players[fourthdisplayplayer] && splitscreen > 2)
pnum4 = pn;
else
pnum1 = pn;
}
Debug checkpoint, and prevent spinout/booster timers while in the air
2018-06-17 22:10:42 +00:00
static void K_drawCheckpointDebugger(void)
{
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)
{
// 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
// Draw a white fade on level opening
if (leveltime < 15 && stplyr == &players[displayplayer])
Fade-in intro Also made flashing not-local, again.
2018-06-26 14:14:59 +00:00
{
* AN OPPORTUNITY FOR GAMETYPE CHANGES ON THE VOTE SCREEN! * Super important to allow dedicated servers to continue forever without needing to add Terminal. * To facilitate understanding, add gametype dog-ears to the vote screen! * To do the above, add V_DrawDiag! Works in GL, too!! * Unrelated shit! * Fix a buffer overrun in the randmapbuffer! * Disable spectating in splitscreen... Not 100% sure, but in 2p battle, if you spectate, you just lose one balloon and respawn... * Improve all the string drawing functions' behaviour - both with being SLIGHTLY clipped by the edge of the screen, and when confronted with drawing off the base 320*200 internal area
2018-06-28 14:47:56 +00:00
if (leveltime <= 5)
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
V_DrawFill(0,0,BASEVIDWIDTH,BASEVIDHEIGHT,120); // Pure white on first few frames, to hide SRB2's awful level load artifacts
Fade-in intro Also made flashing not-local, again.
2018-06-26 14:14:59 +00:00
else
V_DrawFadeScreen(120, 15-leveltime); // Then gradually fade out from there
}
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
Actually, this makes more sense :U
2018-03-28 19:28:50 +00:00
K_drawKartMinimap();
Battle HUD stuff
2017-11-14 01:45:57 +00:00
// Draw full screen stuff that turns off the rest of the HUD
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)
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
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())
K_drawKartWanted();
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
K_drawKartTimestamp();
Unfinished V_HORZSCREEN revamp
2017-12-22 15:16:41 +00:00
if (!modeattacking)
{
// The little triple-item icons at the bottom
// The top-four faces on the left
K_drawKartPositionFaces();
}
}
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
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.
K_drawKartSpeedometer();
}
if (!modeattacking)
{
// Draw the numerical position
K_DrawKartPositionNum(stplyr->kartstuff[k_position]);
}
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're about to DIEEEEE
Merge branch 'master' into sonicitems
2018-06-07 23:39:45 +00:00
K_drawSPBWarning();
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!
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_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
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 starting countdown after everything else.
if (leveltime >= starttime-(3*TICRATE)
&& leveltime < starttime+TICRATE)
K_drawStartCountdown();
Debug checkpoint, and prevent spinout/booster timers while in the air
2018-06-17 22:10:42 +00:00
if (cv_kartdebugcheckpoint.value)
K_drawCheckpointDebugger();
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