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

5100 lines
174 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
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
"Dark Grey", // 06 // SKINCOLOR_DARKGREY
"Black", // 07 // SKINCOLOR_BLACK
"Salmon", // 08 // SKINCOLOR_SALMON
"Pink", // 09 // SKINCOLOR_PINK
"Light Red", // 10 // SKINCOLOR_LIGHTRED
"Shiny Red", // 11 // SKINCOLOR_SHINYRED
"Red", // 12 // SKINCOLOR_RED
"Dark Pink", // 13 // SKINCOLOR_DARKPINK
"Dark Red", // 14 // SKINCOLOR_DARKRED
"Dawn", // 15 // SKINCOLOR_DAWN
"Orange", // 16 // SKINCOLOR_ORANGE
"Shiny Orange", // 17 // SKINCOLOR_SHINYORANGE
"Dark Orange", // 18 // SKINCOLOR_DARKORANGE
"Golden Brown", // 19 // SKINCOLOR_GOLDENBROWN
"Rosewood", // 20 // SKINCOLOR_ROSEWOOD
"Dark Rosewood", // 21 // SKINCOLOR_DARKROSEWOOD
"Sepia", // 22 // SKINCOLOR_SEPIA
"Beige", // 23 // SKINCOLOR_BEIGE
"Brown", // 24 // SKINCOLOR_BROWN
"Leather", // 25 // SKINCOLOR_LEATHER
"Yellow", // 26 // SKINCOLOR_YELLOW
"Peach", // 27 // SKINCOLOR_PEACH
"Light Orange", // 28 // SKINCOLOR_LIGHTORANGE
"Caramel", // 29 // SKINCOLOR_CARAMEL
"Gold", // 30 // SKINCOLOR_GOLD
"Shiny Caramel", // 31 // SKINCOLOR_SHINYCARAMEL
"Vomit", // 32 // SKINCOLOR_VOMIT
"Garden", // 33 // SKINCOLOR_GARDEN
"Light Army", // 34 // SKINCOLOR_LIGHTARMY
"Army", // 35 // SKINCOLOR_ARMY
"Pistachio", // 36 // SKINCOLOR_PISTACHIO
"Robo-Hood", // 37 // SKINCOLOR_ROBOHOOD
"Olive", // 38 // SKINCOLOR_OLIVE
"Dark Army", // 39 // SKINCOLOR_DARKARMY
"Light Green", // 40 // SKINCOLOR_LIGHTGREEN
"Ugly Green", // 41 // SKINCOLOR_UGLYGREEN
"Neon Green", // 42 // SKINCOLOR_NEONGREEN
"Green", // 43 // SKINCOLOR_GREEN
"Dark Green", // 44 // SKINCOLOR_DARKGREEN
"Swamp", // 45 // SKINCOLOR_SWAMP
"Frost", // 46 // SKINCOLOR_FROST
"Slate", // 47 // SKINCOLOR_SLATEBLUE
"Light Blue", // 48 // SKINCOLOR_LIGHTBLUE
"Cyan", // 49 // SKINCOLOR_CYAN
"Cerulean", // 50 // SKINCOLOR_CERULEAN
"Turquoise", // 51 // SKINCOLOR_TURQUOISE
"Teal", // 52 // SKINCOLOR_TEAL
"Steel Blue", // 53 // SKINCOLOR_STEELBLUE
"Blue", // 54 // SKINCOLOR_BLUE
"Shiny Blue", // 55 // SKINCOLOR_SHINYBLUE
"Navy", // 56 // SKINCOLOR_NAVY
"Dark Blue", // 57 // SKINCOLOR_DARKBLUE
"Jet Black", // 58 // SKINCOLOR_JETBLACK
"Lilac", // 59 // SKINCOLOR_LILAC
"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
};
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
{120, 120, 120, 120, 0, 0, 0, 0, 1, 1, 2, 2, 4, 6, 8, 10}, // SKINCOLOR_IVORY
{ 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7}, // SKINCOLOR_WHITE
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}, // SKINCOLOR_SILVER
{ 1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31}, // SKINCOLOR_CLOUDY
{ 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23}, // SKINCOLOR_GREY
{ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}, // SKINCOLOR_DARKGREY
{ 24, 24, 25, 25, 26, 26, 27, 27, 28, 28, 29, 29, 30, 30, 31, 31}, // SKINCOLOR_BLACK
{120, 120, 121, 121, 122, 122, 123, 123, 124, 124, 125, 125, 126, 126, 127, 127}, // SKINCOLOR_SALMON
{144, 144, 145, 145, 146, 146, 147, 147, 148, 148, 149, 149, 150, 150, 151, 151}, // SKINCOLOR_PINK
{120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135}, // SKINCOLOR_LIGHTRED
{120, 121, 123, 124, 126, 127, 129, 130, 132, 133, 135, 136, 138, 139, 141, 143}, // SKINCOLOR_SHINYRED
{125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140}, // SKINCOLOR_RED
{144, 145, 146, 147, 148, 149, 150, 151, 134, 135, 136, 137, 138, 139, 140, 141}, // SKINCOLOR_DARKPINK
{136, 136, 137, 137, 138, 138, 139, 139, 140, 140, 141, 141, 142, 142, 143, 143}, // SKINCOLOR_DARKRED
{120, 121, 122, 123, 124, 147, 88, 89, 149, 91, 92, 151, 94, 95, 152, 153}, // SKINCOLOR_DAWN
{ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95}, // SKINCOLOR_ORANGE
{ 80, 81, 83, 85, 86, 88, 90, 91, 93, 95, 152, 153, 154, 156, 157, 159}, // SKINCOLOR_SHINYORANGE
{ 88, 89, 90, 91, 92, 93, 94, 95, 152, 153, 154, 155, 156, 157, 158, 159}, // SKINCOLOR_DARKORANGE
{112, 113, 114, 115, 116, 117, 118, 119, 156, 156, 157, 157, 158, 158, 159, 159}, // SKINCOLOR_GOLDENBROWN
{152, 152, 153, 153, 154, 154, 155, 155, 156, 156, 157, 157, 158, 158, 159, 159}, // SKINCOLOR_ROSEWOOD
{152, 153, 154, 155, 156, 157, 158, 159, 139, 140, 141, 142, 143, 31, 31, 31}, // SKINCOLOR_DARKROSEWOOD
{ 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
{ 57, 58, 59, 59, 60, 60, 61, 61, 62, 62, 63, 63, 28, 29, 30, 31}, // SKINCOLOR_LEATHER
{ 97, 98, 99, 100, 101, 102, 103, 104, 113, 113, 114, 115, 115, 115, 116, 117}, // SKINCOLOR_YELLOW
{ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79}, // SKINCOLOR_PEACH
{ 80, 80, 81, 81, 82, 82, 83, 83, 84, 84, 85, 85, 86, 86, 87, 87}, // SKINCOLOR_LIGHTORANGE
{ 72, 73, 74, 75, 76, 77, 78, 79, 48, 49, 50, 51, 52, 53, 54, 55}, // SKINCOLOR_CARAMEL
{112, 112, 113, 113, 114, 114, 115, 115, 116, 116, 117, 117, 118, 118, 119, 119}, // SKINCOLOR_GOLD
{ 64, 66, 68, 70, 72, 74, 76, 78, 48, 50, 52, 54, 56, 58, 60, 62}, // SKINCOLOR_SHINYCARAMEL
{121, 144, 145, 72, 73, 84, 114, 115, 107, 108, 109, 183, 223, 207, 30, 246}, // SKINCOLOR_VOMIT
{ 98, 99, 112, 101, 113, 114, 106, 179, 180, 181, 182, 172, 183, 173, 174, 175}, // SKINCOLOR_GARDEN
{176, 176, 176, 176, 177, 177, 177, 177, 178, 178, 178, 178, 179, 179, 179, 179}, // SKINCOLOR_LIGHTARMY
{176, 176, 177, 177, 178, 178, 179, 179, 180, 180, 181, 181, 182, 182, 183, 183}, // SKINCOLOR_ARMY
{176, 176, 177, 177, 178, 178, 179, 179, 166, 167, 168, 169, 170, 171, 172, 173}, // SKINCOLOR_PISTACHIO
{177, 177, 178, 178, 165, 165, 167, 167, 182, 182, 171, 171, 183, 183, 173, 173}, // SKINCOLOR_ROBOHOOD
{105, 105, 106, 106, 107, 107, 108, 108, 109, 109, 110, 110, 111, 111, 31, 31}, // SKINCOLOR_OLIVE
{176, 177, 178, 179, 170, 181, 182, 183, 173, 173, 174, 174, 175, 175, 31, 31}, // SKINCOLOR_DARKARMY
{160, 160, 161, 161, 162, 162, 163, 163, 164, 164, 165, 165, 166, 166, 167, 167}, // SKINCOLOR_LIGHTGREEN
{184, 184, 184, 184, 185, 185, 185, 185, 186, 186, 186, 186, 187, 187, 187, 187}, // SKINCOLOR_UGLYGREEN
{184, 184, 185, 185, 186, 186, 187, 187, 188, 188, 189, 189, 190, 190, 191, 191}, // SKINCOLOR_NEONGREEN
{160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175}, // SKINCOLOR_GREEN
{168, 168, 169, 169, 170, 170, 171, 171, 172, 172, 173, 173, 174, 174, 175, 175}, // SKINCOLOR_DARKGREEN
{187, 187, 188, 188, 189, 189, 190, 190, 191, 191, 175, 175, 30, 30, 31, 31}, // SKINCOLOR_SWAMP
{224, 225, 226, 212, 213, 213, 214, 215, 220, 221, 172, 222, 173, 223, 174, 175}, // SKINCOLOR_FROST
{200, 200, 200, 200, 201, 201, 201, 201, 202, 202, 202, 202, 203, 203, 203, 203}, // SKINCOLOR_SLATE
{224, 224, 225, 225, 226, 226, 227, 227, 228, 228, 229, 229, 230, 230, 231, 231}, // SKINCOLOR_LIGHTBLUE
{208, 208, 209, 210, 210, 211, 212, 213, 213, 214, 215, 216, 216, 217, 218, 219}, // SKINCOLOR_CYAN
{216, 216, 216, 216, 217, 217, 217, 217, 218, 218, 218, 218, 219, 219, 219, 219}, // SKINCOLOR_CERULEAN
{208, 208, 209, 210, 210, 211, 212, 213, 213, 214, 215, 220, 220, 221, 222, 223}, // SKINCOLOR_TURQOISE
{220, 220, 220, 220, 221, 221, 221, 221, 222, 222, 222, 222, 223, 223, 223, 223}, // SKINCOLOR_TEAL
{200, 200, 201, 201, 202, 202, 203, 203, 204, 204, 205, 205, 206, 206, 207, 207}, // SKINCOLOR_STEELBLUE
{224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239}, // SKINCOLOR_BLUE
{224, 225, 226, 228, 229, 231, 232, 234, 235, 237, 238, 240, 241, 243, 244, 246}, // SKINCOLOR_SHINYBLUE
{200, 201, 202, 203, 204, 205, 206, 238, 239, 240, 241, 242, 243, 244, 245, 246}, // SKINCOLOR_NAVY
{231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246}, // SKINCOLOR_DARKBLUE
{200, 201, 202, 203, 204, 205, 206, 207, 28, 28, 29, 29, 30, 30, 31, 31}, // SKINCOLOR_JETBLACK
{120, 120, 121, 121, 122, 122, 123, 123, 192, 192, 248, 248, 249, 249, 250, 250}, // SKINCOLOR_LILAC
{192, 192, 193, 193, 194, 194, 195, 195, 196, 196, 197, 197, 198, 198, 199, 199}, // SKINCOLOR_PURPLE
{248, 248, 249, 249, 250, 250, 251, 251, 252, 252, 253, 253, 254, 254, 255, 255}, // SKINCOLOR_LAVENDER
{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
{192, 192, 248, 249, 250, 251, 229, 204, 230, 205, 206, 239, 240, 241, 242, 243}, // SKINCOLOR_DUSK
{ 1, 145, 125, 73, 83, 114, 106, 180, 187, 168, 219, 205, 236, 206, 199, 255}, // SKINCOLOR_RAINBOW
*/
};
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
/** \brief Generates the starman 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
*/
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
void K_StarmanColormap(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;
}
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
else if (skinnum == TC_STARMAN)
{
K_StarmanColormap(dest_colormap, color);
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)
{
CV_RegisterVar(&cv_magnet);
CV_RegisterVar(&cv_boo);
CV_RegisterVar(&cv_mushroom);
CV_RegisterVar(&cv_triplemushroom);
CV_RegisterVar(&cv_megashroom);
CV_RegisterVar(&cv_goldshroom);
CV_RegisterVar(&cv_star);
CV_RegisterVar(&cv_triplebanana);
CV_RegisterVar(&cv_fakeitem);
CV_RegisterVar(&cv_banana);
CV_RegisterVar(&cv_greenshell);
CV_RegisterVar(&cv_redshell);
CV_RegisterVar(&cv_laserwisp);
CV_RegisterVar(&cv_triplegreenshell);
CV_RegisterVar(&cv_bobomb);
CV_RegisterVar(&cv_blueshell);
CV_RegisterVar(&cv_jaws);
CV_RegisterVar(&cv_fireflower);
CV_RegisterVar(&cv_tripleredshell);
CV_RegisterVar(&cv_lightning);
Added feather
2017-11-07 05:57:42 +00:00
CV_RegisterVar(&cv_feather);
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);
Lots of misc stuff - Bomb overlay is invisible during comeback timer, and flickers back in when it's almost up - Show comeback timer on HUD - Feather is stronger & has more gravity - Option to use SMK star alarm instead of overlapping music - Using P_MobjDamage normally on players now defaults to normal spinout instead of shell's instant stop - Some general gametype case fixes (most notably, being able to spin people out in Race using a mushroom)
2017-11-11 02:10:01 +00:00
CV_RegisterVar(&cv_kartstarsfx);
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);
BATLLE MODE AAAAAA
2017-10-22 07:06:35 +00:00
CV_RegisterVar(&cv_kartballoons);
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);
renamed mphspeed console var to speedometer has 4 options, off, Kilometers, miles, and fracunits
2017-03-13 02:44:31 +00:00
CV_RegisterVar(&cv_speedometer);
Functional, ready for netgame!
2018-01-28 04:52:01 +00:00
CV_RegisterVar(&cv_votetime);
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);
}
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
Added feather
2017-11-07 05:57:42 +00:00
#define NUMKARTITEMS 19
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
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
static INT32 K_KartItemOddsDistance_Retro[NUMKARTITEMS][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
/*Magnet*/ { 0, 1, 2, 0, 0, 0, 0, 0, 0 }, // Magnet
/*Boo*/ { 0, 0, 2, 2, 1, 0, 0, 0, 0 }, // Boo
/*Mushroom*/ { 1, 0, 0, 3, 7, 5, 0, 0, 0 }, // Mushroom
Messing with item distributions a tad
2018-06-01 06:19:40 +00:00
/*Triple Mushroom*/ { 0, 0, 0, 0, 3, 8, 6, 4, 0 }, // Triple Mushroom
/*Mega Mushroom*/ { 0, 0, 0, 0, 0, 1, 1, 1, 2 }, // Mega Mushroom
/*Gold Mushroom*/ { 0, 0, 0, 0, 0, 2, 4, 3, 0 }, // Gold Mushroom
/*Star*/ { 0, 0, 0, 0, 0, 1, 6, 8,18 }, // Star
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
/*Triple Banana*/ { 0, 0, 1, 1, 0, 0, 0, 0, 0 }, // Triple Banana
/*Fake Item*/ { 0, 4, 2, 1, 0, 0, 0, 0, 0 }, // Fake Item
/*Banana*/ { 0, 9, 4, 2, 1, 0, 0, 0, 0 }, // Banana
/*Green Shell*/ { 0, 6, 4, 3, 2, 0, 0, 0, 0 }, // Green Shell
/*Red Shell*/ { 0, 0, 3, 2, 2, 1, 0, 0, 0 }, // Red Shell
/*Triple Green Shell*/ { 0, 0, 0, 1, 1, 1, 0, 0, 0 }, // Triple Green Shell
/*Bob-omb*/ { 0, 0, 1, 2, 1, 0, 0, 0, 0 }, // Bob-omb
/*Blue Shell*/ { 0, 0, 0, 0, 0, 1, 2, 0, 0 }, // Blue Shell
/*Fire Flower*/ { 0, 0, 1, 2, 1, 0, 0, 0, 0 }, // Fire Flower
/*Triple Red Shell*/ { 0, 0, 0, 1, 1, 0, 0, 0, 0 }, // Triple Red Shell
/*Lightning*/ { 0, 0, 0, 0, 0, 0, 1, 2, 0 }, // Lightning
/*Feather*/ { 0, 0, 0, 0, 0, 0, 0, 0, 0 } // Feather
};
Tweaking balloon-based items further The last change was a step in the right direction and there was more item variety going on, but the differences need to be just sliiightly more extreme
2017-11-29 03:26:35 +00:00
static INT32 K_KartItemOddsBalloons[NUMKARTITEMS][5] =
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
/*Magnet*/ { 0, 0, 0, 0, 0 }, // Magnet
Messing with item distributions a tad
2018-06-01 06:19:40 +00:00
/*Boo*/ { 0, 0, 1, 1, 0 }, // Boo
Changed time requirements to accomedate lap changes
2018-06-02 14:29:43 +00:00
/*Mushroom*/ { 0, 1, 2, 1, 0 }, // Mushroom
Fix up balloon-based items
2017-11-24 03:34:36 +00:00
/*Triple Mushroom*/ { 0, 0, 0, 0, 0 }, // Triple Mushroom
Messing with item distributions a tad
2018-06-01 06:19:40 +00:00
/*Mega Mushroom*/ { 1, 2, 0, 0, 0 }, // Mega Mushroom
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
/*Gold Mushroom*/ { 0, 0, 0, 0, 0 }, // Gold Mushroom
Messing with item distributions a tad
2018-06-01 06:19:40 +00:00
/*Star*/ { 1, 2, 0, 0, 0 }, // Star
And I changed my mind again! Even *more* extreme
2017-11-29 03:42:09 +00:00
Messing with item distributions a tad
2018-06-01 06:19:40 +00:00
/*Triple Banana*/ { 0, 1, 1, 0, 0 }, // Triple Banana
/*Fake Item*/ { 0, 0, 2, 1, 1 }, // Fake Item
And I changed my mind again! Even *more* extreme
2017-11-29 03:42:09 +00:00
/*Banana*/ { 0, 0, 3, 1, 1 }, // Banana
Messing with item distributions a tad
2018-06-01 06:19:40 +00:00
/*Green Shell*/ { 0, 0, 5, 3, 2 }, // Green Shell
/*Red Shell*/ { 0, 3, 3, 0, 0 }, // Red Shell
/*Triple Green Shell*/ { 0, 1, 1, 0, 0 }, // Triple Green Shell
And I changed my mind again! Even *more* extreme
2017-11-29 03:42:09 +00:00
/*Bob-omb*/ { 0, 3, 3, 0, 0 }, // Bob-omb
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
/*Blue Shell*/ { 0, 0, 0, 0, 0 }, // Blue Shell
And I changed my mind again! Even *more* extreme
2017-11-29 03:42:09 +00:00
/*Fire Flower*/ { 0, 3, 3, 0, 0 }, // Fire Flower
Messing with item distributions a tad
2018-06-01 06:19:40 +00:00
/*Triple Red Shell*/ { 1, 2, 0, 0, 0 }, // Triple Red Shell
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
/*Lightning*/ { 0, 0, 0, 0, 0 }, // Lightning
Messing with item distributions a tad
2018-06-01 06:19:40 +00:00
/*Feather*/ { 0, 0, 1, 1, 0 } // Feather
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
\param retrokart whether or not we're getting old or new item odds
\return void
*/
static void K_KartGetItemResult(player_t *player, fixed_t getitem, boolean retrokart)
{
switch (getitem)
{
case 1: // Magnet
Reverting friction, but left a note for iceman's magic number. Intermission timer is back down to 20 seconds unless something breaks with auto-transmissions again. Also I remembered to enable Magnets this time. Super low odds on it though.
2017-02-27 23:15:48 +00:00
player->kartstuff[k_magnet] = 1;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
break;
case 2: // Boo
player->kartstuff[k_boo] = 1;
break;
case 4: // Triple Mushroom
player->kartstuff[k_mushroom] = 4;
break;
case 5: // Mega Mushroom
player->kartstuff[k_megashroom] = 1;
break;
case 6: // Gold Mushroom
player->kartstuff[k_goldshroom] = 1;
break;
case 7: // Star
player->kartstuff[k_star] = 1;
break;
case 8: // Triple Banana
player->kartstuff[k_triplebanana] |= 8;
break;
case 9: // Fake Item
player->kartstuff[k_fakeitem] |= 2;
break;
case 10: // Banana
player->kartstuff[k_banana] |= 2;
break;
case 11: // Green Shell
player->kartstuff[k_greenshell] |= 2;
break;
case 12: // Red Shell
player->kartstuff[k_redshell] |= 2;
break;
case 13: // Triple Green Shell - or - Laser Wisp
if (retrokart)
player->kartstuff[k_triplegreenshell] |= 8;
else
player->kartstuff[k_laserwisp] = 1;
break;
case 14: // Bob-omb - or - 3x Orbinaut (Triple Green Shell)
if (retrokart)
player->kartstuff[k_bobomb] |= 2;
else
player->kartstuff[k_triplegreenshell] |= 8;
break;
case 15: // Blue Shell - or - Specialstage Mines (Bob-omb)
if (retrokart)
player->kartstuff[k_blueshell] = 1;
else
player->kartstuff[k_bobomb] |= 2;
break;
case 16: // Fire Flower - or - Deton (Blue Shell)
if (retrokart)
player->kartstuff[k_fireflower] = 1;
else
player->kartstuff[k_blueshell] |= 4;
break;
case 17: // Triple Red Shell - or - 2x Jaws
if (retrokart)
player->kartstuff[k_tripleredshell] |= 8;
else
player->kartstuff[k_jaws] = 1;
break;
case 18: // Lightning
player->kartstuff[k_lightning] = 1;
break;
Added feather
2017-11-07 05:57:42 +00:00
case 19: // Feather
player->kartstuff[k_feather] |= 1;
break;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
default: // Mushroom - Doing it here as a fail-safe
if (getitem != 3)
CONS_Printf("ERROR: P_KartGetItemResult - Item roulette gave bad item (%d), giving Mushroom instead.\n", getitem);
player->kartstuff[k_mushroom] = 1;
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
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 INT32 K_KartGetItemOdds(INT32 pos, INT32 itemnum)
Made Frantic Mode work in Battle Mode & provide more silly results Also fixed flashing
2017-11-07 20:04:21 +00:00
{
Fix up balloon-based items
2017-11-24 03:34:36 +00:00
INT32 newodds;
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())
And I changed my mind again! Even *more* extreme
2017-11-29 03:42:09 +00:00
newodds = K_KartItemOddsBalloons[itemnum-1][pos];
Fix up balloon-based items
2017-11-24 03:34:36 +00:00
else
newodds = K_KartItemOddsDistance_Retro[itemnum-1][pos];
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 (franticitems && (itemnum == 1 || itemnum == 4 || itemnum == 5 || itemnum == 6
Made Frantic Mode work in Battle Mode & provide more silly results Also fixed flashing
2017-11-07 20:04:21 +00:00
|| itemnum == 7 || itemnum == 8 || itemnum == 12 || itemnum == 13 || itemnum == 14 || itemnum == 15
|| itemnum == 16 || itemnum == 17 || itemnum == 18))
newodds *= 2;
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
static void K_KartItemRouletteByDistance(player_t *player, ticcmd_t *cmd)
{
INT32 i;
INT32 pingame = 0, pexiting = 0;
INT32 roulettestop;
INT32 prandom;
INT32 pdis = 0, useodds = 0;
INT32 spawnchance[NUMKARTITEMS * NUMKARTODDS];
INT32 chance = 0, numchoices = 0;
Fixed thrown items (99% sure) Thrown items are thrown farther now; distance based on CC.
2017-10-11 14:48:32 +00:00
INT32 distvar = (64*14);
Fix up balloon-based items
2017-11-24 03:34:36 +00:00
INT32 avgballoon = 0;
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;
// This makes the roulette produce the random noises.
if ((player->kartstuff[k_itemroulette] % 3) == 1 && P_IsLocalPlayer(player))
S_StartSound(NULL,sfx_mkitm1 + ((player->kartstuff[k_itemroulette] / 3) % 8));
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.
if (!(player->kartstuff[k_itemroulette] >= (TICRATE*3)
|| ((cmd->buttons & BT_ATTACK) && player->kartstuff[k_itemroulette] >= roulettestop)))
return;
if (cmd->buttons & BT_ATTACK)
player->pflags |= PF_ATTACKDOWN;
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
for (i = 0; i < (NUMKARTITEMS * NUMKARTODDS); i++)
spawnchance[i] = 0;
// Gotta check how many players are active at this moment.
for (i = 0; i < MAXPLAYERS; i++)
{
if (playeringame[i] && !players[i].spectator)
pingame++;
if (players[i].exiting)
pexiting++;
Fix up balloon-based items
2017-11-24 03:34:36 +00:00
if (players[i].kartstuff[k_balloon] > 0)
avgballoon += players[i].kartstuff[k_balloon];
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
Fix up balloon-based items
2017-11-24 03:34:36 +00:00
if (pingame)
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
avgballoon /= pingame;
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
{
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
&& players[i].kartstuff[k_position] < player->kartstuff[k_position])
Fix up balloon-based items
2017-11-24 03:34:36 +00:00
pdis += P_AproxDistance(P_AproxDistance(players[i].mo->x - player->mo->x,
players[i].mo->y - player->mo->y),
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
players[i].mo->z - player->mo->z) / mapheaderinfo[gamemap-1]->mobj_scale
Fix up balloon-based items
2017-11-24 03:34:36 +00:00
* (pingame - players[i].kartstuff[k_position])
/ ((pingame - 1) * (pingame + 1) / 3);
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_itemclose] = 0; // Reset the item window closer.
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
{
Fix up balloon-based items
2017-11-24 03:34:36 +00:00
useodds = (player->kartstuff[k_balloon]-avgballoon)+2; // 0 is two balloons below average, 2 is average, 4 is two balloons above average
if (useodds > 4)
useodds = 4;
if (useodds < 0)
useodds = 0;
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 spectating for real, messages for changing some kart cvars, Mirror Mode disallowed in Battle
2018-01-30 00:15:25 +00:00
if (franticitems) // Frantic items make the distances between everyone artifically higher :P
pdis = (15*pdis/14);
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 (pingame == 1) useodds = 0; // Record Attack, or just alone
else if (pdis <= distvar * 0) useodds = 1; // (64*14) * 0 = 0
else if (pdis <= distvar * 1) useodds = 2; // (64*14) * 1 = 896
else if (pdis <= distvar * 2) useodds = 3; // (64*14) * 2 = 1792
else if (pdis <= distvar * 4) useodds = 4; // (64*14) * 4 = 3584
else if (pdis <= distvar * 6) useodds = 5; // (64*14) * 6 = 5376
else if (pdis <= distvar * 9) useodds = 6; // (64*14) * 9 = 8064
else if (pdis <= distvar * 12) useodds = 7; // (64*14) * 12 = 10752
else useodds = 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
#define SETITEMRESULT(pos, itemnum) \
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 (chance = 0; chance < K_KartGetItemOdds(pos, itemnum); 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
// Check the game type to differentiate odds.
//if (gametype == GT_RETRO)
//{
Dang it.
2017-11-01 20:24:40 +00:00
if (cv_magnet.value) SETITEMRESULT(useodds, 1); // Magnet
if (cv_boo.value) SETITEMRESULT(useodds, 2); // Boo
Quick fix :V
2018-01-30 00:43:22 +00:00
if (cv_mushroom.value || modeattacking) SETITEMRESULT(useodds, 3); // Mushroom
Fixed spectating for real, messages for changing some kart cvars, Mirror Mode disallowed in Battle
2018-01-30 00:15:25 +00:00
if (cv_triplemushroom.value) SETITEMRESULT(useodds, 4); // Triple Mushroom
Dang it.
2017-11-01 20:24:40 +00:00
if (cv_megashroom.value && !player->kartstuff[k_poweritemtimer]) SETITEMRESULT(useodds, 5); // Mega Mushroom
if (cv_goldshroom.value) SETITEMRESULT(useodds, 6); // Gold Mushroom
if (cv_star.value && !player->kartstuff[k_poweritemtimer]) SETITEMRESULT(useodds, 7); // Star
if (cv_triplebanana.value) SETITEMRESULT(useodds, 8); // Triple Banana
if (cv_fakeitem.value) SETITEMRESULT(useodds, 9); // Fake Item
if (cv_banana.value) SETITEMRESULT(useodds, 10); // Banana
if (cv_greenshell.value) SETITEMRESULT(useodds, 11); // Green Shell
if (cv_redshell.value) SETITEMRESULT(useodds, 12); // Red Shell
if (cv_triplegreenshell.value) SETITEMRESULT(useodds, 13); // Triple Green Shell
if (cv_bobomb.value) SETITEMRESULT(useodds, 14); // Bob-omb
if (cv_blueshell.value && pexiting == 0) SETITEMRESULT(useodds, 15); // Blue Shell
if (cv_fireflower.value) SETITEMRESULT(useodds, 16); // Fire Flower
Fixed spectating for real, messages for changing some kart cvars, Mirror Mode disallowed in Battle
2018-01-30 00:15:25 +00:00
if (cv_tripleredshell.value && pingame > 2) SETITEMRESULT(useodds, 17); // Triple Red Shell
Dang it.
2017-11-01 20:24:40 +00:00
if (cv_lightning.value && pingame > pexiting) SETITEMRESULT(useodds, 18); // Lightning
Made Frantic Mode work in Battle Mode & provide more silly results Also fixed flashing
2017-11-07 20:04:21 +00:00
if (cv_feather.value) SETITEMRESULT(useodds, 19); // Feather
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
prandom = P_RandomKey(numchoices);
// Award the player whatever power is rolled
if (numchoices > 0)
K_KartGetItemResult(player, spawnchance[prandom], true);
else
CONS_Printf("ERROR: P_KartItemRoulette - There were no choices given by the roulette (useodds = %d).\n", useodds);
//}
/*else if (gametype == GT_NEO)
{
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
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
}
else
CONS_Printf("ERROR: P_KartItemRoulette - There's no applicable game type!\n");
*/
#undef SETITEMRESULT
player->kartstuff[k_itemroulette] = 0; // Since we're done, clear the roulette number
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;
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
= 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->kartstuff[k_growshrinktimer] > 1) // megashroom slows down half as fast
// 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;
}
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
/** \brief Calculates the lakitu timer and drop-boosting
\param player player object passed from K_KartPlayerThink
\return void
*/
void K_LakituChecker(player_t *player)
{
ticcmd_t *cmd = &player->cmd;
= 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->kartstuff[k_lakitu] == 44)
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
{
mobj_t *mo;
angle_t newangle;
fixed_t newx;
fixed_t newy;
fixed_t newz;
newangle = player->mo->angle;
newx = player->mo->x + P_ReturnThrustX(player->mo, newangle, 0);
newy = player->mo->y + P_ReturnThrustY(player->mo, newangle, 0);
if (player->mo->eflags & MFE_VERTICALFLIP)
Porting over some things from sonicitems
2018-02-13 21:48:09 +00:00
newz = player->mo->z - 128*(mapheaderinfo[gamemap-1]->mobj_scale);
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
Porting over some things from sonicitems
2018-02-13 21:48:09 +00:00
newz = player->mo->z + 64*(mapheaderinfo[gamemap-1]->mobj_scale);
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
mo = P_SpawnMobj(newx, newy, newz, MT_LAKITU);
if (mo)
{
if (player->mo->eflags & MFE_VERTICALFLIP)
mo->eflags |= MFE_VERTICALFLIP;
mo->angle = newangle+ANGLE_180;
P_SetTarget(&mo->target, player->mo);
}
}
if (player->kartstuff[k_lakitu] > 3)
{
player->kartstuff[k_lakitu]--;
player->mo->momz = 0;
player->powers[pw_flashing] = 2;
player->powers[pw_nocontrol] = 2;
if (leveltime % 15 == 0)
S_StartSound(player->mo, sfx_lkt3);
}
// That's enough pointless fishing for now.
if (player->kartstuff[k_lakitu] > 0 && player->kartstuff[k_lakitu] <= 3)
{
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;
player->kartstuff[k_lakitu] = 0;
}
}
else
{
player->kartstuff[k_lakitu]--;
// Quick! You only have three tics to boost!
if (cmd->buttons & BT_ACCELERATE)
Unsuck start boosts
2018-03-30 01:43:02 +00:00
K_DoMushroom(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
{
if (cmd->buttons & BT_DRIFTRIGHT && !(player->mo->state >= &states[S_KART_STND1_R] && player->mo->state <= &states[S_KART_STND2_R]))
P_SetPlayerMobjState(player->mo, S_KART_STND1_R);
else if (cmd->buttons & BT_DRIFTLEFT && !(player->mo->state >= &states[S_KART_STND1_L] && player->mo->state <= &states[S_KART_STND2_L]))
P_SetPlayerMobjState(player->mo, S_KART_STND1_L);
else if (!(cmd->buttons & BT_DRIFTRIGHT || cmd->buttons & BT_DRIFTLEFT) && !(player->mo->state >= &states[S_KART_STND1] && player->mo->state <= &states[S_KART_STND2]))
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))
{
if (cmd->buttons & BT_DRIFTRIGHT && !(player->mo->state >= &states[S_KART_RUN1_R] && player->mo->state <= &states[S_KART_RUN2_R]))
P_SetPlayerMobjState(player->mo, S_KART_RUN1_R);
else if (cmd->buttons & BT_DRIFTLEFT && !(player->mo->state >= &states[S_KART_RUN1_L] && player->mo->state <= &states[S_KART_RUN2_L]))
P_SetPlayerMobjState(player->mo, S_KART_RUN1_L);
else if (!(cmd->buttons & BT_DRIFTRIGHT || cmd->buttons & BT_DRIFTLEFT) && !(player->mo->state >= &states[S_KART_RUN1] && player->mo->state <= &states[S_KART_RUN2]))
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))
{
if (cmd->buttons & BT_DRIFTRIGHT && !(player->mo->state >= &states[S_KART_WALK1_R] && player->mo->state <= &states[S_KART_WALK2_R]))
P_SetPlayerMobjState(player->mo, S_KART_WALK1_R);
else if (cmd->buttons & BT_DRIFTLEFT && !(player->mo->state >= &states[S_KART_WALK1_L] && player->mo->state <= &states[S_KART_WALK2_L]))
P_SetPlayerMobjState(player->mo, S_KART_WALK1_L);
else if (!(cmd->buttons & BT_DRIFTRIGHT || cmd->buttons & BT_DRIFTLEFT) && !(player->mo->state >= &states[S_KART_WALK1] && player->mo->state <= &states[S_KART_WALK2]))
P_SetPlayerMobjState(player->mo, S_KART_WALK1);
}
}
Some Color code, Kart powers
2016-08-12 01:42:11 +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
*/
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
Some Color code, Kart powers
2016-08-12 01:42:11 +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
K_UpdateOffroad(player);
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
// setting players to use the star colormap and spawning afterimages
if (player->kartstuff[k_startimer])
{
mobj_t *ghost;
player->mo->colorized = true;
ghost = P_SpawnGhostMobj(player->mo);
ghost->fuse = 4;
ghost->frame |= FF_FULLBRIGHT;
}
else
{
player->mo->colorized = false;
}
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
if (player->kartstuff[k_itemclose])
player->kartstuff[k_itemclose]--;
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
if (player->kartstuff[k_spinout])
player->kartstuff[k_spinout]--;
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
if (player->kartstuff[k_spinouttimer])
player->kartstuff[k_spinouttimer]--;
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 (!comeback)
Battle HUD stuff
2017-11-14 01:45:57 +00:00
player->kartstuff[k_comebacktimer] = comebacktime;
Lots of misc stuff - Bomb overlay is invisible during comeback timer, and flickers back in when it's almost up - Show comeback timer on HUD - Feather is stronger & has more gravity - Option to use SMK star alarm instead of overlapping music - Using P_MobjDamage normally on players now defaults to normal spinout instead of shell's instant stop - Some general gametype case fixes (most notably, being able to spin people out in Race using a mushroom)
2017-11-11 02:10:01 +00:00
else if (player->kartstuff[k_comebacktimer])
Battle HUD stuff
2017-11-14 01:45:57 +00:00
{
Lots of misc stuff - Bomb overlay is invisible during comeback timer, and flickers back in when it's almost up - Show comeback timer on HUD - Feather is stronger & has more gravity - Option to use SMK star alarm instead of overlapping music - Using P_MobjDamage normally on players now defaults to normal spinout instead of shell's instant stop - Some general gametype case fixes (most notably, being able to spin people out in Race using a mushroom)
2017-11-11 02:10:01 +00:00
player->kartstuff[k_comebacktimer]--;
Minor adjustments in hopes that I fixed the resynch bomb on gametype switch?
2018-02-08 22:13:06 +00:00
if (player == &players[consoleplayer] && player->kartstuff[k_balloon] <= 0 && player->kartstuff[k_comebacktimer] <= 0)
comebackshowninfo = true; // client has already seen the message
Battle HUD stuff
2017-11-14 01:45:57 +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
Merge in battle, unfuck the code
2017-11-21 07:23:06 +00:00
if (player->kartstuff[k_spinout] == 0 && player->kartstuff[k_spinouttimer] == 0 && player->powers[pw_flashing] == K_GetKartFlashing())
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
player->powers[pw_flashing]--;
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
if (player->kartstuff[k_magnettimer])
player->kartstuff[k_magnettimer]--;
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
if (player->kartstuff[k_mushroomtimer])
player->kartstuff[k_mushroomtimer]--;
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
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
if (player->kartstuff[k_floorboost])
player->kartstuff[k_floorboost]--;
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
Added fancypants mega shroom, fixed drift boosting
2017-02-19 17:18:43 +00:00
if (player->kartstuff[k_driftboost])
player->kartstuff[k_driftboost]--;
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
if (player->kartstuff[k_startimer])
player->kartstuff[k_startimer]--;
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
if (player->kartstuff[k_growshrinktimer] > 0)
player->kartstuff[k_growshrinktimer]--;
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
if (player->kartstuff[k_growshrinktimer] < 0)
player->kartstuff[k_growshrinktimer]++;
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
if (player->kartstuff[k_growshrinktimer] == 1 || player->kartstuff[k_growshrinktimer] == -1)
{
MobjScale setting for map headers Replacement for Oldbrak mode, lets you set any scale instead of only 1/2, also modified some of Kart's scale shenanigans to be compatible. Requested by Sev for Dimension Heist
2017-12-16 20:38:15 +00:00
player->mo->destscale = mapheaderinfo[gamemap-1]->mobj_scale;
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
P_RestoreMusic(player);
Some Color code, Kart powers
2016-08-12 01:42:11 +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
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
if (player->kartstuff[k_bootaketimer] == 0 && player->kartstuff[k_boostolentimer] == 0
&& player->kartstuff[k_goldshroomtimer])
player->kartstuff[k_goldshroomtimer]--;
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
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 (player->kartstuff[k_bootimer])
player->kartstuff[k_bootimer]--;
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
if (player->kartstuff[k_bootaketimer])
player->kartstuff[k_bootaketimer]--;
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
if (player->kartstuff[k_boostolentimer])
player->kartstuff[k_boostolentimer]--;
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
if (player->kartstuff[k_squishedtimer])
player->kartstuff[k_squishedtimer]--;
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
if (player->kartstuff[k_laserwisptimer])
player->kartstuff[k_laserwisptimer]--;
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
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 (player->kartstuff[k_justbumped])
player->kartstuff[k_justbumped]--;
Dang it.
2017-11-01 20:24:40 +00:00
if (player->kartstuff[k_poweritemtimer])
player->kartstuff[k_poweritemtimer]--;
Swoopy Start & Lap Lakitu
2017-06-03 22:19:06 +00:00
if (player->kartstuff[k_lapanimation])
player->kartstuff[k_lapanimation]--;
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() && (player->exiting || player->kartstuff[k_comebacktimer]))
Battle card animations Was hoping not to waste another variable on this, but oh well
2017-11-29 06:09:46 +00:00
{
Wipeout & minor tweaks - SMK-style wipeout - Using goldshroom removes some of its timer again - Karma item boxes follow the player more closely - "ATTACK OR PROTECT" no longer appears when you die if you've already seen it - Lua support for our SOC actions - Fixed KARTSTUFF_LIST for Lua/SOC - "Battle" is now an accepted word in level headers for setting TOL_MATCH - Default map numlaps is now 3 instead of 4 - Reverted making LF2_RECORDATTACK and LF2_NOVISITNEEDED default menu flags, needs to be set manually now
2017-12-11 01:57:46 +00:00
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;
}
Battle card animations Was hoping not to waste another variable on this, but oh well
2017-11-29 06:09:46 +00:00
if (player->kartstuff[k_cardanimation] > 164)
player->kartstuff[k_cardanimation] = 164;
if (player->kartstuff[k_cardanimation] < 0)
player->kartstuff[k_cardanimation] = 0;
}
More tweaks to cards
2017-11-29 07:07:22 +00:00
else
player->kartstuff[k_cardanimation] = 0;
Battle card animations Was hoping not to waste another variable on this, but oh well
2017-11-29 06:09:46 +00:00
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
if (player->kartstuff[k_sounds])
player->kartstuff[k_sounds]--;
Merge branch 'upstream/next' into zarrotsu_vanillamerge # Conflicts: # src/Makefile # src/doomdef.h # src/hardware/hw_main.c # src/p_mobj.c # src/p_user.c # src/r_segs.c # src/sdl/i_video.c # src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
Some Color code, Kart powers
2016-08-12 01:42:11 +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;
}
Added feather
2017-11-07 05:57:42 +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
if (player->kartstuff[k_comebacktimer])
player->kartstuff[k_comebackmode] = 0;
Added feather
2017-11-07 05:57:42 +00:00
if (P_IsObjectOnGround(player->mo) && !(player->mo->momz)
&& player->kartstuff[k_feather] & 2)
player->kartstuff[k_feather] &= ~2;
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
Restructured some ticcmd stuff, temporary keyboard defaults, commented out mouse options menu No more weapon number buttons, button constants reordered, and BT_JUMP renamed to BT_DRIFT, and removed a lot of commented out stuff or stuff we didn't need. Spectator-only support for looking up/down soon. Keyboard defaults are just what I use, plan on adjusting it further after more feedback
2018-01-24 07:45:06 +00:00
if (cmd->buttons & BT_DRIFT)
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
player->kartstuff[k_jmp] = 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
else
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
player->kartstuff[k_jmp] = 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
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 Checker
if (player->kartstuff[k_lakitu])
K_LakituChecker(player);
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
// Roulette Code
//K_KartItemRouletteByPosition(player, cmd); // Old, position-based
K_KartItemRouletteByDistance(player, cmd); // New, distance-based
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
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
// Stopping of the horrible star SFX
Fix warnings Possibly fix some whitespace problems
2017-03-04 22:13:19 +00:00
if (player->mo->health <= 0 || player->mo->player->kartstuff[k_startimer] <= 0
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
|| player->mo->player->kartstuff[k_growshrinktimer] > 0) // If you don't have invincibility (or mega is active too)
Some Color code, Kart powers
2016-08-12 01:42:11 +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
if (S_SoundPlaying(player->mo, sfx_star)) // But the sound is playing
S_StopSoundByID(player->mo, sfx_star); // Stop it
Some Color code, Kart powers
2016-08-12 01:42:11 +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
// And the same for the mega mushroom SFX
if (!(player->mo->health > 0 && player->mo->player->kartstuff[k_growshrinktimer] > 0)) // If you aren't big
Some Color code, Kart powers
2016-08-12 01:42:11 +00:00
{
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
if (S_SoundPlaying(player->mo, sfx_mega)) // But the sound is playing
S_StopSoundByID(player->mo, sfx_mega); // Stop it
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
}
Fix music not updating correctly
2017-03-11 00:09:10 +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
// AAAAAAND handle the SMK star alarm
Lots of misc stuff - Bomb overlay is invisible during comeback timer, and flickers back in when it's almost up - Show comeback timer on HUD - Feather is stronger & has more gravity - Option to use SMK star alarm instead of overlapping music - Using P_MobjDamage normally on players now defaults to normal spinout instead of shell's instant stop - Some general gametype case fixes (most notably, being able to spin people out in Race using a mushroom)
2017-11-11 02:10:01 +00:00
if (player->mo->health > 0 && (player->mo->player->kartstuff[k_startimer] > 0
|| player->mo->player->kartstuff[k_growshrinktimer] > 0))
{
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 (leveltime % 13 == 0 && cv_kartstarsfx.value && !P_IsLocalPlayer(player))
Lots of misc stuff - Bomb overlay is invisible during comeback timer, and flickers back in when it's almost up - Show comeback timer on HUD - Feather is stronger & has more gravity - Option to use SMK star alarm instead of overlapping music - Using P_MobjDamage normally on players now defaults to normal spinout instead of shell's instant stop - Some general gametype case fixes (most notably, being able to spin people out in Race using a mushroom)
2017-11-11 02:10:01 +00:00
S_StartSound(player->mo, sfx_smkinv);
}
else if (S_SoundPlaying(player->mo, sfx_smkinv))
S_StopSoundByID(player->mo, sfx_smkinv);
Fix music not updating correctly
2017-03-11 00:09:10 +00:00
// Plays the music after the starting countdown.
if (P_IsLocalPlayer(player) && leveltime == 158)
Fix Star/Mega music persisting after death for splitscreen players
2018-05-30 22:38:30 +00:00
S_ChangeMusic(mapmusname, mapmusflags, true);
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
}
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
void K_KartPlayerAfterThink(player_t *player)
{
if (player->kartstuff[k_startimer])
{
player->mo->frame |= FF_FULLBRIGHT;
}
else
{
if (!(player->mo->state->frame & FF_FULLBRIGHT))
player->mo->frame &= ~FF_FULLBRIGHT;
}
}
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
{
Taunt sound simplification
2018-02-28 02:18:42 +00:00
S_StartSound(source, sfx_taunt1+P_RandomKey(4));
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.
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 (!(player->kartstuff[k_startimer] || player->kartstuff[k_bootimer] || player->kartstuff[k_mushroomtimer])
Make sure it actually compiles
2017-04-16 18:55:21 +00:00
&& player->kartstuff[k_offroad] >= 0 && speed)
boostpower = FixedDiv(boostpower, player->kartstuff[k_offroad] + FRACUNIT);
Adjusted bonustime, Goldshrooms work, added intermediate boostspeed for between Megashroom size
2017-02-19 20:53:32 +00:00
if (player->kartstuff[k_growshrinktimer] > 1
v1.3.18 ------- Fixed really poorly done netcode stuff. This should fix the kartstuff desyncing, maybe collision stuff too? Fixed Megashroom's growth animation lasting too long.
2017-08-09 22:14:14 +00:00
&& (player->kartstuff[k_growshrinktimer] > ((itemtime + TICRATE*2) - 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
|| player->kartstuff[k_growshrinktimer] <= 26))
Adjusted bonustime, Goldshrooms work, added intermediate boostspeed for between Megashroom size
2017-02-19 20:53:32 +00:00
{ // Mega Mushroom - Mid-size
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, FRACUNIT/8); // + 12.5%
}
Adjusted bonustime, Goldshrooms work, added intermediate boostspeed for between Megashroom size
2017-02-19 20:53:32 +00:00
}
v1.3.18 ------- Fixed really poorly done netcode stuff. This should fix the kartstuff desyncing, maybe collision stuff too? Fixed Megashroom's growth animation lasting too long.
2017-08-09 22:14:14 +00:00
if (player->kartstuff[k_growshrinktimer] < ((itemtime + TICRATE*2) - 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
&& player->kartstuff[k_growshrinktimer] > 26)
Adjusted bonustime, Goldshrooms work, added intermediate boostspeed for between Megashroom size
2017-02-19 20:53:32 +00:00
{ // Mega Mushroom
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
}
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
if (player->kartstuff[k_startimer])
Adjusted bonustime, Goldshrooms work, added intermediate boostspeed for between Megashroom size
2017-02-19 20:53:32 +00:00
{ // Star
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
}
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_mushroomtimer])
Adjusted bonustime, Goldshrooms work, added intermediate boostspeed for between Megashroom size
2017-02-19 20:53:32 +00:00
{ // Mushroom
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
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() && player->kartstuff[k_balloon] <= 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;
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() && player->kartstuff[k_balloon] <= 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;
}
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
void K_SpinPlayer(player_t *player, mobj_t *source)
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
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
if (player->powers[pw_flashing] > 0 || player->kartstuff[k_squishedtimer] > 0 || (player->kartstuff[k_spinouttimer] > 0 && player->kartstuff[k_spinout] > 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_startimer] > 0 || player->kartstuff[k_growshrinktimer] > 0 || player->kartstuff[k_bootimer] > 0
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
|| (G_BattleGametype() && ((player->kartstuff[k_balloon] <= 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
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
if (source && source != player->mo && source->player && !source->player->kartstuff[k_sounds])
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
{
S_StartSound(source, sfx_hitem);
source->player->kartstuff[k_sounds] = 50;
}
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
player->kartstuff[k_mushroomtimer] = 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)
P_AddPlayerScore(source->player, 1);
okay THIS time i actually made sure it compiled
2017-11-30 23:25:59 +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 (player->kartstuff[k_balloon] > 0)
{
if (player->kartstuff[k_balloon] == 1)
CONS_Printf(M_GetText("%s lost all of their balloons!\n"), player_names[player-players]);
player->kartstuff[k_balloon]--;
}
BATLLE MODE AAAAAA
2017-10-22 07:06:35 +00:00
K_CheckBalloons();
}
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
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
{
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
if (player->kartstuff[k_spinouttype] == 0)
= 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
player->kartstuff[k_spinouttimer] = 3*TICRATE/2; // Explosion/Banana Wipeout
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
else
= 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
player->kartstuff[k_spinouttimer] = 3*TICRATE/2; // Oil Slick Wipeout
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
= 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
// At Wipeout, playerspeed is increased to 1/4 their regular speed, moving them forward
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
= 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
player->kartstuff[k_spinouttimer] = 1*TICRATE; // ? Whipeout
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->kartstuff[k_spinout] = player->kartstuff[k_spinouttimer];
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
player->kartstuff[k_spinouttype] = 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
}
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
{
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
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 (player->powers[pw_flashing] > 0 || player->kartstuff[k_squishedtimer] > 0 || player->kartstuff[k_startimer] > 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->kartstuff[k_growshrinktimer] > 0 || player->kartstuff[k_bootimer] > 0
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
|| (G_BattleGametype() && ((player->kartstuff[k_balloon] <= 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
player->kartstuff[k_mushroomtimer] = 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)
P_AddPlayerScore(source->player, 1);
okay THIS time i actually made sure it compiled
2017-11-30 23:25:59 +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 (player->kartstuff[k_balloon] > 0)
{
if (player->kartstuff[k_balloon] == 1)
CONS_Printf(M_GetText("%s lost all of their balloons!\n"), player_names[player-players]);
player->kartstuff[k_balloon]--;
}
BATLLE MODE AAAAAA
2017-10-22 07:06:35 +00:00
K_CheckBalloons();
}
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
= 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
player->kartstuff[k_squishedtimer] = 1*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
{
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
if (player->powers[pw_flashing] > 0 || player->kartstuff[k_squishedtimer] > 0 || (player->kartstuff[k_spinouttimer] > 0 && player->kartstuff[k_spinout] > 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_startimer] > 0 || player->kartstuff[k_growshrinktimer] > 0 || player->kartstuff[k_bootimer] > 0
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
|| (G_BattleGametype() && ((player->kartstuff[k_balloon] <= 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;
player->kartstuff[k_mushroomtimer] = 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)
3 minor tweaks - Enemies can no longer award points - You should no longer get karma for "bombing" someone during their invincibility frames - Red shells have slightly more friction in Battle
2017-11-29 23:31:17 +00:00
{
if (source->player->kartstuff[k_balloon] <= 0)
{
source->player->kartstuff[k_comebackpoints] += 2;
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 (netgame && cv_hazardlog.value)
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 bombed %s!\n"), player_names[source->player-players], player_names[player-players]);
okay THIS time i actually made sure it compiled
2017-11-30 23:25:59 +00:00
if (source->player->kartstuff[k_comebackpoints] >= 3)
K_StealBalloon(source->player, player, true);
3 minor tweaks - Enemies can no longer award points - You should no longer get karma for "bombing" someone during their invincibility frames - Red shells have slightly more friction in Battle
2017-11-29 23:31:17 +00:00
}
Fix Battle scoring, hopefully
2018-06-02 14:57:43 +00:00
P_AddPlayerScore(source->player, 1);
3 minor tweaks - Enemies can no longer award points - You should no longer get karma for "bombing" someone during their invincibility frames - Red shells have slightly more friction in Battle
2017-11-29 23:31:17 +00:00
}
BATLLE MODE AAAAAA
2017-10-22 07:06:35 +00:00
okay THIS time i actually made sure it compiled
2017-11-30 23:25:59 +00:00
if (player->kartstuff[k_balloon] > 0)
{
if (player->kartstuff[k_balloon] == 1)
CONS_Printf(M_GetText("%s lost all of their balloons!\n"), player_names[player-players]);
player->kartstuff[k_balloon]--;
}
BATLLE MODE AAAAAA
2017-10-22 07:06:35 +00:00
K_CheckBalloons();
}
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);
player->kartstuff[k_spinout] = player->kartstuff[k_spinouttimer];
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
player->kartstuff[k_spinouttype] = 0;
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
}
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
void K_StealBalloon(player_t *player, player_t *victim, boolean force)
Balloon revamp Supports arbitrary balloon counts now
2017-11-01 22:46:35 +00:00
{
Balloon stealing! Mushroom is back!
2017-11-03 00:43:03 +00:00
INT32 newballoon;
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;
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
if (force)
;
else
{
if (victim->kartstuff[k_balloon] <= 0) // || player->kartstuff[k_balloon] >= cv_kartballoons.value+2
return;
Balloon revamp Supports arbitrary balloon counts now
2017-11-01 22:46:35 +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
if ((player->powers[pw_flashing] > 0 || player->kartstuff[k_squishedtimer] > 0 || (player->kartstuff[k_spinouttimer] > 0 && player->kartstuff[k_spinout] > 0)
|| player->kartstuff[k_startimer] > 0 || player->kartstuff[k_growshrinktimer] > 0 || player->kartstuff[k_bootimer] > 0
|| (player->kartstuff[k_balloon] <= 0 && player->kartstuff[k_comebacktimer]))
|| (victim->powers[pw_flashing] > 0 || victim->kartstuff[k_squishedtimer] > 0 || (victim->kartstuff[k_spinouttimer] > 0 && victim->kartstuff[k_spinout] > 0)
|| victim->kartstuff[k_startimer] > 0 || victim->kartstuff[k_growshrinktimer] > 0 || victim->kartstuff[k_bootimer] > 0))
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)
{
if (player->kartstuff[k_balloon] <= 0)
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)
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 stole a balloon from %s!\n"), player_names[player-players], player_names[victim-players]);
}
Balloon revamp Supports arbitrary balloon counts now
2017-11-01 22:46:35 +00:00
Balloon stealing! Mushroom is back!
2017-11-03 00:43:03 +00:00
newballoon = player->kartstuff[k_balloon];
if (newballoon <= 1)
diff = 0;
else
diff = FixedAngle(360*FRACUNIT/newballoon);
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);
newmo = P_SpawnMobj(newx, newy, player->mo->z, MT_BATTLEBALLOON);
newmo->threshold = newballoon;
P_SetTarget(&newmo->tracer, victim->mo);
P_SetTarget(&newmo->target, player->mo);
newmo->angle = (diff * (newballoon-1));
newmo->color = victim->skincolor;
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 (newballoon+1 < 2)
Balloon stealing! Mushroom is back!
2017-11-03 00:43:03 +00:00
P_SetMobjState(newmo, S_BATTLEBALLOON3);
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
else if (newballoon+1 < 3)
Balloon stealing! Mushroom is back!
2017-11-03 00:43:03 +00:00
P_SetMobjState(newmo, S_BATTLEBALLOON2);
else
P_SetMobjState(newmo, S_BATTLEBALLOON1);
Balloon revamp Supports arbitrary balloon counts now
2017-11-01 22:46:35 +00:00
Balloon stealing! Mushroom is back!
2017-11-03 00:43:03 +00:00
player->kartstuff[k_balloon]++;
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
Colored boom Not tested *yet*
2018-02-06 01:10:20 +00:00
void K_SpawnBobombExplosion(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;
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;
x = source->x + source->momx;
y = source->y + source->momy;
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;
th->momx = FixedMul(speed, FINECOSINE(an>>ANGLETOFINESHIFT));
th->momy = FixedMul(speed, FINESINE(an>>ANGLETOFINESHIFT));
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);
x = 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;
}
Updates done a while ago... Not 100% sure what they were. :x
2016-11-21 04:23:00 +00:00
void K_SpawnDriftTrail(player_t *player)
{
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)
|| player->kartstuff[k_bootimer] != 0
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
|| (G_BattleGametype() && player->kartstuff[k_balloon] <= 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)
ground = player->mo->ceilingz - FixedMul(mobjinfo[MT_MUSHROOMTRAIL].height, player->mo->scale);
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)
ground -= FixedMul(mobjinfo[MT_MUSHROOMTRAIL].height, player->mo->scale);
}
#endif
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 && player->kartstuff[k_mushroomtimer] == 0)
Updates done a while ago... Not 100% sure what they were. :x
2016-11-21 04:23:00 +00:00
flame = P_SpawnMobj(newx, newy, ground, MT_DRIFTSMOKE);
else
flame = P_SpawnMobj(newx, newy, ground, MT_MUSHROOMTRAIL);
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);
}
}
Fireballs work, added to roulette. Removed [k_fireballtimer] since it is not going to be used.
2017-05-13 15:14:26 +00:00
static mobj_t *K_ThrowKartItem(player_t *player, boolean missile, mobjtype_t mapthing, INT32 defaultDir, boolean bobombthrow)
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;
Porting over some things from sonicitems
2018-02-13 21:48: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:
Porting over some things from sonicitems
2018-02-13 21:48: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:
Porting over some things from sonicitems
2018-02-13 21:48: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:
Porting over some things from sonicitems
2018-02-13 21:48: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;
}
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
if (bobombthrow)
{
if (player->kartstuff[k_throwdir] == 1)
dir = 2;
else if (player->kartstuff[k_throwdir] == -1)
dir = -1;
else
dir = 1;
}
else
{
if (player->kartstuff[k_throwdir] != 0)
dir = player->kartstuff[k_throwdir];
else
dir = defaultDir;
}
if (missile)
{
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 (mapthing == MT_FIREBALL) // 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
}
}
= 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
else // Shells
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
= 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
mo = K_SpawnKartMissile(player->mo, mapthing, player->mo->angle, 0, PROJSPEED + player->speed);
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
{
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
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
// Drop it directly behind you.
newangle = player->mo->angle;
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
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
}
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
static void K_DoMagnet(player_t *player)
Fixed thwomp sectors, Added Magnet Item.
2017-02-18 18:39:25 +00:00
{
S_StartSound(player->mo, sfx_s3k45);
player->kartstuff[k_magnettimer] = 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
}
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
static void K_DoBooSteal(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
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
&& ((G_RaceGametype() && players[i].kartstuff[k_position] < player->kartstuff[k_position])
|| (G_BattleGametype() && players[i].kartstuff[k_balloon] > 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
&& (players[i].kartstuff[k_magnet]
|| players[i].kartstuff[k_mushroom]
|| players[i].kartstuff[k_megashroom]
|| players[i].kartstuff[k_goldshroom]
|| players[i].kartstuff[k_star]
|| players[i].kartstuff[k_banana] & 2
|| players[i].kartstuff[k_triplebanana] & 8
|| players[i].kartstuff[k_fakeitem] & 2
|| players[i].kartstuff[k_greenshell] & 2
|| players[i].kartstuff[k_triplegreenshell] & 8
|| players[i].kartstuff[k_redshell] & 2
|| players[i].kartstuff[k_tripleredshell] & 8
|| players[i].kartstuff[k_bobomb] & 2
|| players[i].kartstuff[k_lightning]
|| players[i].kartstuff[k_blueshell]
|| players[i].kartstuff[k_fireflower]
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
|| players[i].kartstuff[k_feather] & 1
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
|| players[i].kartstuff[k_boo])) // Stealing boos with boos? sounds like fun
{
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();
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +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() && player->kartstuff[k_position] == 1) || numplayers == 0) // No-one can be stolen from? Get longer invisibility for nothing
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
player->kartstuff[k_bootimer] = bootime;
player->kartstuff[k_bootaketimer] = boostealtime;
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
player->kartstuff[k_boo] = 0;
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
{
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_bootimer] = bootime;
player->kartstuff[k_bootaketimer] = boostealtime;
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
player->kartstuff[k_boo] = 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
players[stealplayer].kartstuff[k_boostolentimer] = boostealtime;
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 (players[stealplayer].kartstuff[k_star])
{
player->kartstuff[k_star] = players[stealplayer].kartstuff[k_star];
players[stealplayer].kartstuff[k_star] = 0;
}
else if (players[stealplayer].kartstuff[k_mushroom])
{
player->kartstuff[k_mushroom] = players[stealplayer].kartstuff[k_mushroom];
players[stealplayer].kartstuff[k_mushroom] = 0;
}
else if (players[stealplayer].kartstuff[k_goldshroom])
{
player->kartstuff[k_goldshroom] = players[stealplayer].kartstuff[k_goldshroom];
players[stealplayer].kartstuff[k_goldshroom] = 0;
}
else if (players[stealplayer].kartstuff[k_megashroom])
{
player->kartstuff[k_megashroom] = players[stealplayer].kartstuff[k_megashroom];
players[stealplayer].kartstuff[k_megashroom] = 0;
}
else if (players[stealplayer].kartstuff[k_lightning])
{
player->kartstuff[k_lightning] = players[stealplayer].kartstuff[k_lightning];
players[stealplayer].kartstuff[k_lightning] = 0;
}
else if (players[stealplayer].kartstuff[k_blueshell])
{
player->kartstuff[k_blueshell] = players[stealplayer].kartstuff[k_blueshell];
players[stealplayer].kartstuff[k_blueshell] = 0;
}
else if (players[stealplayer].kartstuff[k_greenshell] & 2)
{
player->kartstuff[k_greenshell] |= 2;
players[stealplayer].kartstuff[k_greenshell] &= ~2;
}
else if (players[stealplayer].kartstuff[k_triplegreenshell] & 8)
{
player->kartstuff[k_triplegreenshell] |= 8;
players[stealplayer].kartstuff[k_triplegreenshell] &= ~8;
}
else if (players[stealplayer].kartstuff[k_redshell] & 2)
{
player->kartstuff[k_redshell] |= 2;
players[stealplayer].kartstuff[k_redshell] &= ~2;
}
else if (players[stealplayer].kartstuff[k_tripleredshell] & 8)
{
player->kartstuff[k_tripleredshell] |= 8;
players[stealplayer].kartstuff[k_tripleredshell] &= ~8;
}
else if (players[stealplayer].kartstuff[k_banana] & 2)
{
player->kartstuff[k_banana] |= 2;
players[stealplayer].kartstuff[k_banana] &= ~2;
}
else if (players[stealplayer].kartstuff[k_triplebanana] & 8)
{
player->kartstuff[k_triplebanana] |= 8;
players[stealplayer].kartstuff[k_triplebanana] &= ~8;
}
else if (players[stealplayer].kartstuff[k_fakeitem] & 2)
{
player->kartstuff[k_fakeitem] |= 2;
players[stealplayer].kartstuff[k_fakeitem] &= ~2;
}
else if (players[stealplayer].kartstuff[k_bobomb] & 2)
{
player->kartstuff[k_bobomb] |= 2;
players[stealplayer].kartstuff[k_bobomb] &= ~2;
}
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 (players[stealplayer].kartstuff[k_magnet])
{
player->kartstuff[k_magnet] = players[stealplayer].kartstuff[k_magnet];
players[stealplayer].kartstuff[k_magnet] = 0;
}
else if (players[stealplayer].kartstuff[k_fireflower])
{
player->kartstuff[k_fireflower] = players[stealplayer].kartstuff[k_fireflower];
players[stealplayer].kartstuff[k_fireflower] = 0;
}
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 (players[stealplayer].kartstuff[k_feather] & 1)
{
player->kartstuff[k_feather] |= 1;
players[stealplayer].kartstuff[k_feather] &= ~1;
}
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 (players[stealplayer].kartstuff[k_boo])
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
{
player->kartstuff[k_boo] = players[stealplayer].kartstuff[k_boo];
players[stealplayer].kartstuff[k_boo] = 0;
}
}
}
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
Unsuck start boosts
2018-03-30 01:43:02 +00:00
void K_DoMushroom(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)
Unsuck start boosts
2018-03-30 01:43:02 +00:00
S_StartSound(player->mo, sfx_mush);
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_mushroomtimer] = mushroomtime;
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
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
if (player->kartstuff[k_sounds]) // Prevents taunt sounds from playing every time the button is pressed
return;
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);
Added fancypants mega shroom, fixed drift boosting
2017-02-19 17:18:43 +00:00
player->kartstuff[k_sounds] = 50;
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
}
Fix warnings Possibly fix some whitespace problems
2017-03-04 22:13:19 +00:00
static void K_DoLightning(player_t *player, boolean bluelightning)
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
{
Most items work (netgame needs testing), will do fireballs later.
2017-02-26 22:37:52 +00:00
mobj_t *mo;
thinker_t *think;
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
INT32 i;
S_StartSound(player->mo, sfx_bkpoof); // Sound the BANG!
player->pflags |= PF_ATTACKDOWN;
for (i = 0; i < MAXPLAYERS; i++)
{
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
}
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
Most items work (netgame needs testing), will do fireballs later.
2017-02-26 22:37:52 +00:00
for (think = thinkercap.next; think != &thinkercap; think = think->next)
{
if (think->function.acp1 != (actionf_p1)P_MobjThinker)
continue; // not a mobj thinker
mo = (mobj_t *)think;
Porting over some things from sonicitems
2018-02-13 21:48:09 +00:00
if (mo->player && !mo->player->spectator
&& mo->player->kartstuff[k_position] < player->kartstuff[k_position])
Most items work (netgame needs testing), will do fireballs later.
2017-02-26 22:37:52 +00:00
P_DamageMobj(mo, player->mo, player->mo, bluelightning ? 65 : 64);
else
continue;
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_sounds]) // Prevents taunt sounds from playing every time the button is pressed
return;
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);
Added fancypants mega shroom, fixed drift boosting
2017-02-19 17:18:43 +00:00
player->kartstuff[k_sounds] = 50;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +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
void K_DoBouncePad(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;
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 (mo->player->kartstuff[k_mushroomtimer])
thrust = FixedMul(thrust, 5*FRACUNIT/4);
else if (mo->player->kartstuff[k_startimer])
thrust = FixedMul(thrust, 9*FRACUNIT/8);
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
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
{
thrust = P_AproxDistance(mo->momx,mo->momy);
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 (thrust < 8<<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
thrust = 8<<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
if (thrust > 16<<FRACBITS)
thrust = 16<<FRACBITS;
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);
S_StartSound(mo, sfx_boing);
Bounce pad sector type Uses Ice/Sludge sector effect (new friction doesn't need it)
2017-11-07 07:36:27 +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
if (player->kartstuff[k_startimer] || player->kartstuff[k_mushroomtimer] || player->kartstuff[k_growshrinktimer] > 0)
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;
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() && player->kartstuff[k_balloon] <= 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:"
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
dsone = 26*4 + kartspeed*2 + (9 - player->kartweight);
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;
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
S_StartSound(player->mo, sfx_mush);
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;
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
S_StartSound(player->mo, sfx_mush);
player->kartstuff[k_driftcharge] = 0;
}
// Drifting: left or right?
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 ((player->cmd.buttons & BT_DRIFTLEFT) && 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;
}
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
else if ((player->cmd.buttons & BT_DRIFTRIGHT) && 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
if (player->kartstuff[k_spinouttimer] == 0 && player->kartstuff[k_jmp] == 1 && onground
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)
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +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 driftadditive = 3;
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
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
if (player->cmd.buttons & BT_DRIFTLEFT) // Inward
driftadditive++;
if (player->cmd.buttons & BT_DRIFTRIGHT) // Outward
driftadditive--;
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
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
if (player->cmd.buttons & BT_DRIFTRIGHT) // Inward
driftadditive++;
if (player->cmd.buttons & BT_DRIFTLEFT) // Outward
driftadditive--;
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
{
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
if (player->exiting)
return;
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
if (players[i].kartstuff[k_balloon] == player->kartstuff[k_balloon] && players[i].score > player->score)
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
position++;
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
else if (players[i].kartstuff[k_balloon] > player->kartstuff[k_balloon])
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
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
Unfinished V_HORZSCREEN revamp
2017-12-22 15:16:41 +00:00
if (leveltime < 4*TICRATE || oldposition == 0)
oldposition = position;
if (oldposition != position) // Changed places?
player->kartstuff[k_positiondelay] = 10; // and set up the timer.
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
}
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_CheckForHoldItem
//
Fix warnings Possibly fix some whitespace problems
2017-03-04 22:13:19 +00:00
static boolean K_CheckForHoldItem(player_t *player)
Adjusted bonustime, Goldshrooms work, added intermediate boostspeed for between Megashroom size
2017-02-19 20:53:32 +00:00
{
Fix warnings Possibly fix some whitespace problems
2017-03-04 22:13:19 +00:00
if ( player->kartstuff[k_greenshell] == 1
Adjusted bonustime, Goldshrooms work, added intermediate boostspeed for between Megashroom size
2017-02-19 20:53:32 +00:00
|| player->kartstuff[k_redshell] == 1
Fix warnings Possibly fix some whitespace problems
2017-03-04 22:13:19 +00:00
|| player->kartstuff[k_banana] == 1
|| player->kartstuff[k_fakeitem] == 1
Adjusted bonustime, Goldshrooms work, added intermediate boostspeed for between Megashroom size
2017-02-19 20:53:32 +00:00
|| player->kartstuff[k_bobomb] == 1
Fix warnings Possibly fix some whitespace problems
2017-03-04 22:13:19 +00:00
|| player->kartstuff[k_triplegreenshell] & 1
|| player->kartstuff[k_triplegreenshell] & 2
Adjusted bonustime, Goldshrooms work, added intermediate boostspeed for between Megashroom size
2017-02-19 20:53:32 +00:00
|| player->kartstuff[k_triplegreenshell] & 4
Fix warnings Possibly fix some whitespace problems
2017-03-04 22:13:19 +00:00
|| player->kartstuff[k_tripleredshell] & 1
|| player->kartstuff[k_tripleredshell] & 2
Adjusted bonustime, Goldshrooms work, added intermediate boostspeed for between Megashroom size
2017-02-19 20:53:32 +00:00
|| player->kartstuff[k_tripleredshell] & 4
Fix warnings Possibly fix some whitespace problems
2017-03-04 22:13:19 +00:00
|| player->kartstuff[k_triplebanana] & 1
|| player->kartstuff[k_triplebanana] & 2
Adjusted bonustime, Goldshrooms work, added intermediate boostspeed for between Megashroom size
2017-02-19 20:53:32 +00:00
|| player->kartstuff[k_triplebanana] & 4
) return true;
return 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
//
// K_StripItems
//
Dang it.
2017-11-01 20:24:40 +00:00
static void K_StripItems(player_t *player)
{
if ( player->kartstuff[k_kitchensink]
Added feather
2017-11-07 05:57:42 +00:00
|| player->kartstuff[k_feather] & 1
Dang it.
2017-11-01 20:24:40 +00:00
|| player->kartstuff[k_lightning]
|| player->kartstuff[k_tripleredshell]
|| player->kartstuff[k_fireflower]
|| player->kartstuff[k_blueshell]
|| player->kartstuff[k_bobomb]
|| player->kartstuff[k_triplegreenshell]
|| player->kartstuff[k_redshell]
|| player->kartstuff[k_greenshell]
|| player->kartstuff[k_banana]
|| player->kartstuff[k_fakeitem] & 2
|| player->kartstuff[k_triplebanana]
|| player->kartstuff[k_star]
|| player->kartstuff[k_goldshroom]
|| player->kartstuff[k_megashroom]
|| player->kartstuff[k_mushroom]
|| player->kartstuff[k_boo]
|| player->kartstuff[k_magnet]
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_bootimer]
|| player->kartstuff[k_bootaketimer]
Dang it.
2017-11-01 20:24:40 +00:00
|| player->kartstuff[k_boostolentimer]
|| player->kartstuff[k_goldshroomtimer]
|| player->kartstuff[k_growshrinktimer]
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]
Dang it.
2017-11-01 20:24:40 +00:00
) player->kartstuff[k_itemclose] = 10;
player->kartstuff[k_kitchensink] = 0;
Added feather
2017-11-07 05:57:42 +00:00
player->kartstuff[k_feather] = 0;
Dang it.
2017-11-01 20:24:40 +00:00
player->kartstuff[k_lightning] = 0;
player->kartstuff[k_tripleredshell] = 0;
player->kartstuff[k_fireflower] = 0;
player->kartstuff[k_blueshell] = 0;
player->kartstuff[k_bobomb] = 0;
player->kartstuff[k_triplegreenshell] = 0;
player->kartstuff[k_redshell] = 0;
player->kartstuff[k_greenshell] = 0;
player->kartstuff[k_banana] = 0;
player->kartstuff[k_fakeitem] = 0;
player->kartstuff[k_triplebanana] = 0;
player->kartstuff[k_star] = 0;
player->kartstuff[k_goldshroom] = 0;
player->kartstuff[k_megashroom] = 0;
player->kartstuff[k_mushroom] = 0;
player->kartstuff[k_boo] = 0;
player->kartstuff[k_magnet] = 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;
player->kartstuff[k_bootimer] = 0;
player->kartstuff[k_bootaketimer] = 0;
Dang it.
2017-11-01 20:24:40 +00:00
player->kartstuff[k_boostolentimer] = 0;
player->kartstuff[k_goldshroomtimer] = 0;
player->kartstuff[k_growshrinktimer] = 0;
player->kartstuff[k_magnettimer] = 0;
player->kartstuff[k_startimer] = 0;
}
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));
Adjusted bonustime, Goldshrooms work, added intermediate boostspeed for between Megashroom size
2017-02-19 20:53:32 +00:00
boolean HOLDING_ITEM = K_CheckForHoldItem(player);
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
boolean NO_BOO = (player->kartstuff[k_boostolentimer] == 0 && player->kartstuff[k_bootaketimer] == 0);
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
Unfinished V_HORZSCREEN revamp
2017-12-22 15:16:41 +00:00
/*if (!player->kartstuff[k_positiondelay] && !player->exiting)
Some position code
2017-02-13 04:24:49 +00:00
{
if (player->kartstuff[k_oldposition] <= player->kartstuff[k_position]) // But first, if you lost a place,
player->kartstuff[k_oldposition] = player->kartstuff[k_position]; // then the other player taunts.
else if (player->kartstuff[k_oldposition] > player->kartstuff[k_position]) // Otherwise,
{
//S_StartSound(player->mo, sfx_slow); // Say "YOU'RE TOO SLOW!"
player->kartstuff[k_oldposition] = player->kartstuff[k_position]; // Restore the old position,
Unfinished V_HORZSCREEN revamp
2017-12-22 15:16:41 +00:00
player->kartstuff[k_positiondelay] = 5*TICRATE; // and set up a timer.
Some position code
2017-02-13 04:24:49 +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]--;
// Race Spectator
if (netgame && player->jointime < 1
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
&& G_RaceGametype() && countdown)
Some position code
2017-02-13 04:24:49 +00:00
{
player->spectator = true;
player->powers[pw_nocontrol] = 5;
}
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
{
Fixed thwomp sectors, Added Magnet Item.
2017-02-18 18:39:25 +00:00
// Magnet
// Boo
// Mushroom
// Triple Mushroom
// Mega Mushroom
// Gold Mushroom
// Star
// Triple Banana
// Fake Item
// Banana
// Green Shell
// Red Shell
// Triple Green Shell
// Bob-omb
// Blue Shell
// Fire Flower
// Triple Red Shell
// Lightning
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
// Feather
Fixed thwomp sectors, Added Magnet Item.
2017-02-18 18:39:25 +00:00
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
// GoldenMushroom power
Fix warnings Possibly fix some whitespace problems
2017-03-04 22:13:19 +00:00
if (ATTACK_IS_DOWN && !HOLDING_ITEM && onground && player->kartstuff[k_goldshroom] == 1
Adjusted bonustime, Goldshrooms work, added intermediate boostspeed for between Megashroom size
2017-02-19 20:53:32 +00:00
&& player->kartstuff[k_goldshroomtimer] == 0 && NO_BOO)
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
{
Unsuck start boosts
2018-03-30 01:43:02 +00:00
K_DoMushroom(player, true);
Fix warnings Possibly fix some whitespace problems
2017-03-04 22:13:19 +00:00
player->kartstuff[k_goldshroomtimer] = itemtime;
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
player->kartstuff[k_goldshroom] = 0;
}
// GoldenMushroom power
else if (ATTACK_IS_DOWN && player->kartstuff[k_goldshroomtimer] > 1 && onground && NO_BOO)
{
Unsuck start boosts
2018-03-30 01:43:02 +00:00
K_DoMushroom(player, true);
Less timer reduce on gold shroom
2018-06-03 22:25:28 +00:00
player->kartstuff[k_goldshroomtimer] -= 5;
Wipeout & minor tweaks - SMK-style wipeout - Using goldshroom removes some of its timer again - Karma item boxes follow the player more closely - "ATTACK OR PROTECT" no longer appears when you die if you've already seen it - Lua support for our SOC actions - Fixed KARTSTUFF_LIST for Lua/SOC - "Battle" is now an accepted word in level headers for setting TOL_MATCH - Default map numlaps is now 3 instead of 4 - Reverted making LF2_RECORDATTACK and LF2_NOVISITNEEDED default menu flags, needs to be set manually now
2017-12-11 01:57:46 +00:00
if (player->kartstuff[k_goldshroomtimer] < 1)
player->kartstuff[k_goldshroomtimer] = 1;
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
}
// TripleMushroom power
else if (ATTACK_IS_DOWN && !HOLDING_ITEM && player->kartstuff[k_mushroom] == 4 && onground && NO_BOO)
{
Unsuck start boosts
2018-03-30 01:43:02 +00:00
K_DoMushroom(player, true);
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
player->kartstuff[k_mushroom] = 2;
}
// DoubleMushroom power
else if (ATTACK_IS_DOWN && !HOLDING_ITEM && player->kartstuff[k_mushroom] == 2 && onground && NO_BOO)
{
Unsuck start boosts
2018-03-30 01:43:02 +00:00
K_DoMushroom(player, true);
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
player->kartstuff[k_mushroom] = 1;
}
// Mushroom power
else if (ATTACK_IS_DOWN && !HOLDING_ITEM && player->kartstuff[k_mushroom] == 1 && onground && NO_BOO)
{
Unsuck start boosts
2018-03-30 01:43:02 +00:00
K_DoMushroom(player, true);
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
player->kartstuff[k_mushroom] = 0;
}
// Star power
else if (ATTACK_IS_DOWN && !HOLDING_ITEM && player->kartstuff[k_star] == 1 && NO_BOO)
{
if (P_IsLocalPlayer(player) && !player->exiting)
S_ChangeMusicInternal("minvnc", true);
Lots of misc stuff - Bomb overlay is invisible during comeback timer, and flickers back in when it's almost up - Show comeback timer on HUD - Feather is stronger & has more gravity - Option to use SMK star alarm instead of overlapping music - Using P_MobjDamage normally on players now defaults to normal spinout instead of shell's instant stop - Some general gametype case fixes (most notably, being able to spin people out in Race using a mushroom)
2017-11-11 02:10:01 +00:00
if (!cv_kartstarsfx.value && !P_IsLocalPlayer(player))
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
S_StartSound(player->mo, sfx_star);
Fix warnings Possibly fix some whitespace problems
2017-03-04 22:13:19 +00:00
player->kartstuff[k_startimer] = itemtime; // Activate it
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
player->kartstuff[k_star] = 0;
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())
Dang it.
2017-11-01 20:24:40 +00:00
player->kartstuff[k_poweritemtimer] = 10*TICRATE;
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
player->kartstuff[k_itemclose] = 10;
player->pflags |= PF_ATTACKDOWN;
}
// Green Shell
else if (ATTACK_IS_DOWN && !HOLDING_ITEM && player->kartstuff[k_greenshell] & 2 && NO_BOO)
{
angle_t newangle;
fixed_t newx;
fixed_t newy;
mobj_t *mo;
player->kartstuff[k_greenshell] &= ~2;
player->kartstuff[k_greenshell] |= 1;
player->pflags |= PF_ATTACKDOWN;
newangle = player->mo->angle;
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);
mo = P_SpawnMobj(newx, newy, player->mo->z, MT_GREENSHIELD);
mo->threshold = 10;
if (mo)
P_SetTarget(&mo->target, player->mo);
player->kartstuff[k_itemclose] = 10;
}
else if (!(cmd->buttons & BT_ATTACK) && player->kartstuff[k_greenshell] & 1)
{
player->kartstuff[k_greenshell] &= ~1;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +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
K_ThrowKartItem(player, true, MT_GREENITEM, 1, false);
K_PlayTauntSound(player->mo);
}
else if (ATTACK_IS_DOWN && !HOLDING_ITEM && player->kartstuff[k_fireflower] && NO_BOO)
{
player->kartstuff[k_fireflower] = 0;
K_ThrowKartItem(player, true, MT_FIREBALL, 1, false);
S_StartSound(player->mo, sfx_mario7);
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
K_PlayTauntSound(player->mo);
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +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
player->kartstuff[k_itemclose] = 10;
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
}
// Triple Green Shell
else if (ATTACK_IS_DOWN && !HOLDING_ITEM && player->kartstuff[k_triplegreenshell] & 8 && NO_BOO)
{
angle_t newangle;
fixed_t newx;
fixed_t newy;
mobj_t *mo, *mo2, *mo3;
player->kartstuff[k_triplegreenshell] &= ~8;
player->kartstuff[k_triplegreenshell] |= 7;
player->pflags |= PF_ATTACKDOWN;
newangle = player->mo->angle;
K_PlayTauntSound(player->mo);
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);
mo = P_SpawnMobj(newx, newy, player->mo->z, MT_TRIPLEGREENSHIELD1);
mo->threshold = 10;
P_SetTarget(&mo->target, player->mo);
mo->angle = 0;
mo2 = P_SpawnMobj(newx, newy, player->mo->z, MT_TRIPLEGREENSHIELD2);
mo2->threshold = 10;
P_SetTarget(&mo2->target, player->mo);
mo2->angle = ANGLE_120;
mo3 = P_SpawnMobj(newx, newy, player->mo->z, MT_TRIPLEGREENSHIELD3);
mo3->threshold = 10;
P_SetTarget(&mo3->target, player->mo);
mo3->angle = ANGLE_240;
player->kartstuff[k_itemclose] = 10;
}
else if (ATTACK_IS_DOWN && (player->kartstuff[k_triplegreenshell] & 1 || player->kartstuff[k_triplegreenshell] & 2 || player->kartstuff[k_triplegreenshell] & 4))
{
Fireballs work, added to roulette. Removed [k_fireballtimer] since it is not going to be used.
2017-05-13 15:14:26 +00:00
K_ThrowKartItem(player, true, MT_GREENITEM, 1, false);
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
K_PlayTauntSound(player->mo);
player->pflags |= PF_ATTACKDOWN;
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_triplegreenshell] & 4)
player->kartstuff[k_triplegreenshell] &= ~4;
else if (player->kartstuff[k_triplegreenshell] & 2)
player->kartstuff[k_triplegreenshell] &= ~2;
else if (player->kartstuff[k_triplegreenshell] & 1)
player->kartstuff[k_triplegreenshell] &= ~1;
}
// Red Shell
else if (ATTACK_IS_DOWN && !HOLDING_ITEM && player->kartstuff[k_redshell] & 2 && NO_BOO)
{
angle_t newangle;
fixed_t newx;
fixed_t newy;
mobj_t *mo;
player->kartstuff[k_redshell] &= ~2;
player->kartstuff[k_redshell] |= 1;
player->pflags |= PF_ATTACKDOWN;
newangle = player->mo->angle;
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);
mo = P_SpawnMobj(newx, newy, player->mo->z, MT_REDSHIELD);
mo->threshold = 10;
if (mo)
P_SetTarget(&mo->target, player->mo);
player->kartstuff[k_itemclose] = 10;
}
else if (!(cmd->buttons & BT_ATTACK) && player->kartstuff[k_redshell] & 1 && (player->kartstuff[k_throwdir] == 1 || player->kartstuff[k_throwdir] == 0))
{
player->kartstuff[k_redshell] &= ~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
K_ThrowKartItem(player, true, MT_REDITEM, 1, false);
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
K_PlayTauntSound(player->mo);
}
// Red Shell Dud
else if (!(cmd->buttons & BT_ATTACK) && player->kartstuff[k_redshell] & 1 && player->kartstuff[k_throwdir] == -1)
{
player->kartstuff[k_redshell] &= ~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
K_ThrowKartItem(player, true, MT_REDITEMDUD, -1, false);
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
K_PlayTauntSound(player->mo);
}
// Triple Red Shell
else if (ATTACK_IS_DOWN && !HOLDING_ITEM && player->kartstuff[k_tripleredshell] & 8 && NO_BOO)
{
angle_t newangle;
fixed_t newx;
fixed_t newy;
mobj_t *mo, *mo2, *mo3;
player->kartstuff[k_tripleredshell] &= ~8;
player->kartstuff[k_tripleredshell] |= 7;
player->pflags |= PF_ATTACKDOWN;
newangle = player->mo->angle;
K_PlayTauntSound(player->mo);
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);
mo = P_SpawnMobj(newx, newy, player->mo->z, MT_TRIPLEREDSHIELD1);
mo->threshold = 10;
P_SetTarget(&mo->target, player->mo);
mo->angle = 0;
mo2 = P_SpawnMobj(newx, newy, player->mo->z, MT_TRIPLEREDSHIELD2);
mo2->threshold = 10;
P_SetTarget(&mo2->target, player->mo);
mo2->angle = ANGLE_120;
mo3 = P_SpawnMobj(newx, newy, player->mo->z, MT_TRIPLEREDSHIELD3);
mo3->threshold = 10;
P_SetTarget(&mo3->target, player->mo);
mo3->angle = ANGLE_240;
player->kartstuff[k_itemclose] = 10;
}
else if (ATTACK_IS_DOWN && (player->kartstuff[k_tripleredshell] & 1 || player->kartstuff[k_tripleredshell] & 2 || player->kartstuff[k_tripleredshell] & 4)
&& (player->kartstuff[k_throwdir] == 1 || player->kartstuff[k_throwdir] == 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
K_ThrowKartItem(player, true, MT_REDITEM, 1, false);
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
K_PlayTauntSound(player->mo);
player->pflags |= PF_ATTACKDOWN;
if (player->kartstuff[k_tripleredshell] & 4)
player->kartstuff[k_tripleredshell] &= ~4;
else if (player->kartstuff[k_tripleredshell] & 2)
player->kartstuff[k_tripleredshell] &= ~2;
else if (player->kartstuff[k_tripleredshell] & 1)
player->kartstuff[k_tripleredshell] &= ~1;
}
else if (ATTACK_IS_DOWN && (player->kartstuff[k_tripleredshell] & 1 || player->kartstuff[k_tripleredshell] & 2 || player->kartstuff[k_tripleredshell] & 4)
&& player->kartstuff[k_throwdir] == -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
K_ThrowKartItem(player, true, MT_REDITEMDUD, -1, false);
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
K_PlayTauntSound(player->mo);
player->pflags |= PF_ATTACKDOWN;
if (player->kartstuff[k_tripleredshell] & 4)
player->kartstuff[k_tripleredshell] &= ~4;
else if (player->kartstuff[k_tripleredshell] & 2)
player->kartstuff[k_tripleredshell] &= ~2;
else if (player->kartstuff[k_tripleredshell] & 1)
player->kartstuff[k_tripleredshell] &= ~1;
}
// Banana Peel
else if (ATTACK_IS_DOWN && !HOLDING_ITEM && player->kartstuff[k_banana] & 2 && NO_BOO)
{
angle_t newangle;
fixed_t newx;
fixed_t newy;
mobj_t *mo;
player->kartstuff[k_banana] &= ~2;
player->kartstuff[k_banana] |= 1;
player->pflags |= PF_ATTACKDOWN;
newangle = player->mo->angle;
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);
mo = P_SpawnMobj(newx, newy, player->mo->z, MT_BANANASHIELD);
mo->threshold = 10;
if (mo)
P_SetTarget(&mo->target, player->mo);
player->kartstuff[k_itemclose] = 10;
}
else if (!(cmd->buttons & BT_ATTACK) && player->kartstuff[k_banana] & 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
K_ThrowKartItem(player, false, MT_BANANAITEM, -1, false);
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
K_PlayTauntSound(player->mo);
player->kartstuff[k_banana] &= ~1;
}
// Triple Banana Peel
else if (ATTACK_IS_DOWN && !HOLDING_ITEM && player->kartstuff[k_triplebanana] & 8 && NO_BOO)
{
angle_t newangle;
fixed_t newx;
fixed_t newy;
mobj_t *mo, *mo2, *mo3;
K_PlayTauntSound(player->mo);
player->kartstuff[k_triplebanana] &= ~8;
player->kartstuff[k_triplebanana] |= 7;
player->pflags |= PF_ATTACKDOWN;
newangle = player->mo->angle;
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);
mo = P_SpawnMobj(newx, newy, player->mo->z, MT_TRIPLEBANANASHIELD1);
mo->threshold = 10;
if (mo) {
P_SetTarget(&mo->target, player->mo);
mo->angle = 0; }
mo2 = P_SpawnMobj(newx, newy, player->mo->z, MT_TRIPLEBANANASHIELD2);
mo2->threshold = 10;
if (mo2) {
P_SetTarget(&mo2->target, player->mo);
mo2->angle = ANGLE_135; }
mo3 = P_SpawnMobj(newx, newy, player->mo->z, MT_TRIPLEBANANASHIELD3);
mo3->threshold = 10;
if (mo3) {
P_SetTarget(&mo3->target, player->mo);
mo3->angle = ANGLE_225; }
player->kartstuff[k_itemclose] = 10;
}
else if (ATTACK_IS_DOWN && (player->kartstuff[k_triplebanana] & 1 || player->kartstuff[k_triplebanana] & 2 || player->kartstuff[k_triplebanana] & 4))
{
Fireballs work, added to roulette. Removed [k_fireballtimer] since it is not going to be used.
2017-05-13 15:14:26 +00:00
K_ThrowKartItem(player, false, MT_BANANAITEM, -1,false );
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
K_PlayTauntSound(player->mo);
player->pflags |= PF_ATTACKDOWN;
if (player->kartstuff[k_triplebanana] & 4)
player->kartstuff[k_triplebanana] &= ~4;
else if (player->kartstuff[k_triplebanana] & 2)
player->kartstuff[k_triplebanana] &= ~2;
else if (player->kartstuff[k_triplebanana] & 1)
player->kartstuff[k_triplebanana] &= ~1;
}
// Fake Itembox
else if (ATTACK_IS_DOWN && !HOLDING_ITEM && player->kartstuff[k_fakeitem] & 2 && NO_BOO)
{
angle_t newangle;
fixed_t newx;
fixed_t newy;
mobj_t *mo;
player->kartstuff[k_fakeitem] &= ~2;
player->kartstuff[k_fakeitem] |= 1;
player->pflags |= PF_ATTACKDOWN;
newangle = player->mo->angle;
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);
mo = P_SpawnMobj(newx, newy, player->mo->z, MT_FAKESHIELD);
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
mo->scale = FRACUNIT/2;
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
mo->threshold = 10;
if (mo)
P_SetTarget(&mo->target, player->mo);
player->kartstuff[k_itemclose] = 10;
}
else if (!(cmd->buttons & BT_ATTACK) && player->kartstuff[k_fakeitem] & 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
K_ThrowKartItem(player, false, MT_FAKEITEM, -1, false);
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
K_PlayTauntSound(player->mo);
player->kartstuff[k_fakeitem] &= ~1;
}
// Bomb
else if (ATTACK_IS_DOWN && !HOLDING_ITEM && player->kartstuff[k_bobomb] & 2 && NO_BOO)
{
angle_t newangle;
fixed_t newx;
fixed_t newy;
mobj_t *mo;
player->kartstuff[k_bobomb] &= ~2;
player->kartstuff[k_bobomb] |= 1;
player->pflags |= PF_ATTACKDOWN;
newangle = player->mo->angle;
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);
mo = P_SpawnMobj(newx, newy, player->mo->z, MT_BOMBSHIELD);
mo->threshold = 10;
if (mo)
P_SetTarget(&mo->target, player->mo);
player->kartstuff[k_itemclose] = 10;
}
if (!(cmd->buttons & BT_ATTACK) && player->kartstuff[k_bobomb] & 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
K_ThrowKartItem(player, false, MT_BOMBITEM, 1, true);
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
K_PlayTauntSound(player->mo);
player->kartstuff[k_bobomb] &= ~1;
}
// Thunder
else if (ATTACK_IS_DOWN && !HOLDING_ITEM && player->kartstuff[k_lightning] == 1 && NO_BOO)
{
K_DoLightning(player, false);
player->kartstuff[k_lightning] = 0;
player->kartstuff[k_itemclose] = 10;
}
// Blue Shell
else if (ATTACK_IS_DOWN && !HOLDING_ITEM && player->kartstuff[k_blueshell] == 1 && NO_BOO)
{
K_DoLightning(player, true);
player->kartstuff[k_blueshell] = 0;
player->kartstuff[k_itemclose] = 10;
}
// Mega Mushroom
else if (ATTACK_IS_DOWN && !HOLDING_ITEM && player->kartstuff[k_megashroom] == 1 && NO_BOO)
{
if (P_IsLocalPlayer(player) && !player->exiting)
S_ChangeMusicInternal("mega", true);
Lots of misc stuff - Bomb overlay is invisible during comeback timer, and flickers back in when it's almost up - Show comeback timer on HUD - Feather is stronger & has more gravity - Option to use SMK star alarm instead of overlapping music - Using P_MobjDamage normally on players now defaults to normal spinout instead of shell's instant stop - Some general gametype case fixes (most notably, being able to spin people out in Race using a mushroom)
2017-11-11 02:10:01 +00:00
if (!cv_kartstarsfx.value && !P_IsLocalPlayer(player))
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
S_StartSound(player->mo, sfx_mega);
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);
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
player->kartstuff[k_growshrinktimer] = itemtime + TICRATE*2;
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
S_StartSound(player->mo, sfx_mario3);
player->pflags |= PF_ATTACKDOWN;
player->kartstuff[k_megashroom] = 0;
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())
Dang it.
2017-11-01 20:24:40 +00:00
player->kartstuff[k_poweritemtimer] = 10*TICRATE;
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
player->kartstuff[k_itemclose] = 10;
}
// Boo
else if (ATTACK_IS_DOWN && !HOLDING_ITEM && player->kartstuff[k_boo] == 1 && NO_BOO)
{
K_DoBooSteal(player);
player->pflags |= PF_ATTACKDOWN;
player->kartstuff[k_boo] = 0;
}
Fixed thwomp sectors, Added Magnet Item.
2017-02-18 18:39:25 +00:00
// Magnet
else if (ATTACK_IS_DOWN && !HOLDING_ITEM && player->kartstuff[k_magnet] == 1 && NO_BOO)
{
K_DoMagnet(player);
player->pflags |= PF_ATTACKDOWN;
player->kartstuff[k_magnet] = 0;
}
Added feather
2017-11-07 05:57:42 +00:00
// Feather
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 (ATTACK_IS_DOWN && !HOLDING_ITEM && player->kartstuff[k_feather] & 1 && onground && NO_BOO)
Added feather
2017-11-07 05:57:42 +00:00
{
K_PlayTauntSound(player->mo);
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
K_DoBouncePad(player->mo, 32<<FRACBITS);
Added feather
2017-11-07 05:57:42 +00:00
player->pflags |= PF_ATTACKDOWN;
player->kartstuff[k_feather] |= 2;
player->kartstuff[k_feather] &= ~1;
player->kartstuff[k_itemclose] = 10;
}
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
Added fancypants mega shroom, fixed drift boosting
2017-02-19 17:18:43 +00:00
// Mushroom Boost
Adjusted bonustime, Goldshrooms work, added intermediate boostspeed for between Megashroom size
2017-02-19 20:53:32 +00:00
if (((player->kartstuff[k_mushroomtimer] > 0 && player->kartstuff[k_boosting] == 0)
Roulette timer stops manually again - as more players join the game, the player in first will have to wait longer to stop the roulette manually. Players further back will also wait slightly longer, while the person in last will always only take 1 second to stop the roulette. Fixed drifting so it stops when you're too slow.
2017-02-28 04:54:02 +00:00
|| (player->kartstuff[k_mushroomtimer] > 0 && ATTACK_IS_DOWN && NO_BOO)) && onground)
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
{
player->kartstuff[k_boosting] = 1;
}
else if (player->kartstuff[k_mushroomtimer] == 0 && player->kartstuff[k_boosting] == 1)
player->kartstuff[k_boosting] = 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
Added fancypants mega shroom, fixed drift boosting
2017-02-19 17:18:43 +00:00
// Megashroom - Make the player grow!
v1.3.18 ------- Fixed really poorly done netcode stuff. This should fix the kartstuff desyncing, maybe collision stuff too? Fixed Megashroom's growth animation lasting too long.
2017-08-09 22:14:14 +00:00
if (player->kartstuff[k_growshrinktimer] > ((itemtime + TICRATE*2) - 25))
Added fancypants mega shroom, fixed drift boosting
2017-02-19 17:18:43 +00:00
{
if (leveltime & 2)
MobjScale setting for map headers Replacement for Oldbrak mode, lets you set any scale instead of only 1/2, also modified some of Kart's scale shenanigans to be compatible. Requested by Sev for Dimension Heist
2017-12-16 20:38:15 +00:00
player->mo->destscale = (mapheaderinfo[gamemap-1]->mobj_scale)*3/2;
Added fancypants mega shroom, fixed drift boosting
2017-02-19 17:18:43 +00:00
else
MobjScale setting for map headers Replacement for Oldbrak mode, lets you set any scale instead of only 1/2, also modified some of Kart's scale shenanigans to be compatible. Requested by Sev for Dimension Heist
2017-12-16 20:38:15 +00:00
player->mo->destscale = (mapheaderinfo[gamemap-1]->mobj_scale);
Added fancypants mega shroom, fixed drift boosting
2017-02-19 17:18:43 +00:00
}
else if (player->kartstuff[k_growshrinktimer] > 26
v1.3.18 ------- Fixed really poorly done netcode stuff. This should fix the kartstuff desyncing, maybe collision stuff too? Fixed Megashroom's growth animation lasting too long.
2017-08-09 22:14:14 +00:00
&& player->kartstuff[k_growshrinktimer] <= ((itemtime + TICRATE*2) - 25))
MobjScale setting for map headers Replacement for Oldbrak mode, lets you set any scale instead of only 1/2, also modified some of Kart's scale shenanigans to be compatible. Requested by Sev for Dimension Heist
2017-12-16 20:38:15 +00:00
player->mo->destscale = (mapheaderinfo[gamemap-1]->mobj_scale)*3/2;
Added fancypants mega shroom, fixed drift boosting
2017-02-19 17:18:43 +00:00
// Megashroom - Back to normal...
else if (player->kartstuff[k_growshrinktimer] > 1
&& player->kartstuff[k_growshrinktimer] <= 26)
{
if (leveltime & 2)
MobjScale setting for map headers Replacement for Oldbrak mode, lets you set any scale instead of only 1/2, also modified some of Kart's scale shenanigans to be compatible. Requested by Sev for Dimension Heist
2017-12-16 20:38:15 +00:00
player->mo->destscale = (mapheaderinfo[gamemap-1]->mobj_scale);
Added fancypants mega shroom, fixed drift boosting
2017-02-19 17:18:43 +00:00
else
MobjScale setting for map headers Replacement for Oldbrak mode, lets you set any scale instead of only 1/2, also modified some of Kart's scale shenanigans to be compatible. Requested by Sev for Dimension Heist
2017-12-16 20:38:15 +00:00
player->mo->destscale = (mapheaderinfo[gamemap-1]->mobj_scale)*3/2;
Added fancypants mega shroom, fixed drift boosting
2017-02-19 17:18:43 +00:00
}
if (player->kartstuff[k_growshrinktimer] == 26)
S_StartSound(player->mo, sfx_mario8);
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())
Dang it.
2017-11-01 20:24:40 +00:00
&& (player->kartstuff[k_star] || player->kartstuff[k_megashroom]
|| player->kartstuff[k_startimer] || player->kartstuff[k_growshrinktimer] > 0))
player->kartstuff[k_poweritemtimer] = 10*TICRATE;
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 (player->kartstuff[k_bootimer] > 0)
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
{
Idea: Make Boo make you invisible instead of flash in splitscreen There's no way atm to make you flash on your screen but not on everyone else's, so I think just making you invisible on all of them keeps the original SMK intent of "you have to pay extra close attention to their screen to know where they are at all" better
2018-03-27 22:30:02 +00:00
if ((player == &players[displayplayer] && !splitscreen)
|| (!(player == &players[displayplayer] && !splitscreen)
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_bootimer] < 1*TICRATE/2 || player->kartstuff[k_bootimer] > bootime-(1*TICRATE/2))))
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;
}
else
player->mo->flags2 |= MF2_DONTDRAW;
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->powers[pw_flashing] = player->kartstuff[k_bootimer]; // 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
}
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
else if (player->kartstuff[k_bootimer] == 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;
}
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
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() && player->kartstuff[k_balloon] <= 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;
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
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->mo->tracer))
Wipeout & minor tweaks - SMK-style wipeout - Using goldshroom removes some of its timer again - Karma item boxes follow the player more closely - "ATTACK OR PROTECT" no longer appears when you die if you've already seen it - Lua support for our SOC actions - Fixed KARTSTUFF_LIST for Lua/SOC - "Battle" is now an accepted word in level headers for setting TOL_MATCH - Default map numlaps is now 3 instead of 4 - Reverted making LF2_RECORDATTACK and LF2_NOVISITNEEDED default menu flags, needs to be set manually now
2017-12-11 01:57:46 +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->tracer = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_OVERLAY);
Wipeout & minor tweaks - SMK-style wipeout - Using goldshroom removes some of its timer again - Karma item boxes follow the player more closely - "ATTACK OR PROTECT" no longer appears when you die if you've already seen it - Lua support for our SOC actions - Fixed KARTSTUFF_LIST for Lua/SOC - "Battle" is now an accepted word in level headers for setting TOL_MATCH - Default map numlaps is now 3 instead of 4 - Reverted making LF2_RECORDATTACK and LF2_NOVISITNEEDED default menu flags, needs to be set manually now
2017-12-11 01:57:46 +00:00
P_SetMobjState(player->mo->tracer, S_PLAYERBOMB);
}
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
P_SetTarget(&player->mo->tracer->target, player->mo);
player->mo->tracer->color = player->mo->color;
if (player->kartstuff[k_comebacktimer] > 0)
{
WIP karma item stuff
2018-03-27 00:36:16 +00:00
if (player->mo->tracer->state != &states[S_PLAYERBOMB])
P_SetMobjState(player->mo->tracer, S_PLAYERBOMB);
Lots of misc stuff - Bomb overlay is invisible during comeback timer, and flickers back in when it's almost up - Show comeback timer on HUD - Feather is stronger & has more gravity - Option to use SMK star alarm instead of overlapping music - Using P_MobjDamage normally on players now defaults to normal spinout instead of shell's instant stop - Some general gametype case fixes (most notably, being able to spin people out in Race using a mushroom)
2017-11-11 02:10:01 +00:00
if (player->kartstuff[k_comebacktimer] < TICRATE && (leveltime & 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
player->mo->tracer->flags2 &= ~MF2_DONTDRAW;
Lots of misc stuff - Bomb overlay is invisible during comeback timer, and flickers back in when it's almost up - Show comeback timer on HUD - Feather is stronger & has more gravity - Option to use SMK star alarm instead of overlapping music - Using P_MobjDamage normally on players now defaults to normal spinout instead of shell's instant stop - Some general gametype case fixes (most notably, being able to spin people out in Race using a mushroom)
2017-11-11 02:10:01 +00:00
else
player->mo->tracer->flags2 |= MF2_DONTDRAW;
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->powers[pw_flashing] = player->kartstuff[k_comebacktimer];
Fix this garbage
2017-11-05 21:34:12 +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
else
WIP karma item stuff
2018-03-27 00:36:16 +00:00
{
if (player->kartstuff[k_comebackmode] == 0
&& player->mo->tracer->state != &states[S_PLAYERBOMB])
P_SetMobjState(player->mo->tracer, S_PLAYERBOMB);
else if (player->kartstuff[k_comebackmode] == 1
&& player->mo->tracer->state != &states[S_PLAYERITEM])
P_SetMobjState(player->mo->tracer, S_PLAYERITEM);
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->tracer->flags2 &= ~MF2_DONTDRAW;
WIP karma item stuff
2018-03-27 00:36:16 +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
}
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_RaceGametype() || player->kartstuff[k_balloon] > 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;
WIP karma item stuff
2018-03-27 00:36:16 +00:00
if (player->mo->tracer
&& (player->mo->tracer->state == &states[S_PLAYERBOMB]
|| player->mo->tracer->state == &states[S_PLAYERITEM]))
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
P_RemoveMobj(player->mo->tracer);
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;
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() && player->kartstuff[k_balloon] <= 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
Restored bounce pad strafe
2018-03-06 06:31:49 +00:00
// Feather strafing
if (player->kartstuff[k_feather] & 2)
{
fixed_t strafe = 0;
fixed_t strength = FRACUNIT/32;
if (cmd->buttons & BT_DRIFTLEFT)
strafe--;
if (cmd->buttons & BT_DRIFTRIGHT)
strafe++;
strength += FixedDiv(player->speed, K_GetKartSpeed(player, true));
P_Thrust(player->mo, player->mo->angle-ANGLE_90, strafe*strength);
}
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!
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->speed < 2 && leveltime > 140 && cmd->buttons & BT_ACCELERATE && cmd->buttons & BT_BRAKE
&& ((cmd->buttons & BT_DRIFTLEFT) || (cmd->buttons & BT_DRIFTRIGHT)))
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
// If a Mega Mushroom or a Thwomp 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;
}
// Play the stop light's sounds
if ((leveltime == (TICRATE-4)*2) || (leveltime == (TICRATE-2)*3))
S_StartSound(NULL, sfx_lkt1);
if (leveltime == (TICRATE)*4)
S_StartSound(NULL, sfx_lkt2);
// Start charging once you're given the opportunity.
Unsuck start boosts
2018-03-30 01:43:02 +00:00
if (leveltime >= 70 && leveltime <= 140 && cmd->buttons & BT_ACCELERATE)
Redid control names, some item code, start of drift shenanigans
2016-08-21 02:15:06 +00:00
player->kartstuff[k_boostcharge]++;
if (leveltime >= 70 && leveltime <= 140 && !(cmd->buttons & BT_ACCELERATE))
player->kartstuff[k_boostcharge] = 0;
// Increase your size while charging your engine.
if (leveltime < 150)
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.
if (leveltime > 140 && player->kartstuff[k_boostcharge])
{
// 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
{
Unsuck start boosts
2018-03-30 01:43:02 +00:00
if (!player->kartstuff[k_floorboost] || player->kartstuff[k_floorboost] == 3)
S_StartSound(player->mo, sfx_sboost);
player->kartstuff[k_mushroomtimer] = -((21*(player->kartstuff[k_boostcharge]*player->kartstuff[k_boostcharge]))/425)+131; // max time is 70, min time is 7; yay parabooolas
if (!player->kartstuff[k_sounds]) // Prevents taunt sounds from playing every time the button is pressed
{
K_PlayTauntSound(player->mo);
player->kartstuff[k_sounds] = 50;
}
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;
S_StartSound(player->mo, sfx_slip);
}
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
}
BATLLE MODE AAAAAA
2017-10-22 07:06:35 +00:00
void K_CheckBalloons(void)
{
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;
BATLLE MODE AAAAAA
2017-10-22 07:06: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 0
return; // set to 1 to test comeback mechanics while alone
#endif
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++;
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 (players[i].kartstuff[k_balloon] <= 0) // if you don't have any balloons, you're probably not a winner
continue;
else if (winnernum > -1) // TWO winners? that's dumb :V
return;
BATLLE MODE AAAAAA
2017-10-22 07:06:35 +00:00
winnernum = 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
if (numingame <= 1)
return;
Maybe message fix
2017-10-26 23:37:13 +00:00
if (playeringame[winnernum])
{
Fix Battle scoring, hopefully
2018-06-02 14:57:43 +00:00
players[winnernum].score += 1;
Race lap linedef executor Set up similar to NiGHTS Mare linedef executors. Give a sector the "Race Lap" sector type, tag it, then set the frontside x-offset on the trigger line to the lap it should activate on minus 1. There are a few flags you can check on the trigger line to modify its behavior. - Normally the executor will only trigger if its exactly on the lap specified. Check Not Climbable to make it execute on laps equal to or greater than, or check Block Enemies to make it execute on laps equal to or less than. - By default, the executor will check current lap with the person in last's lap. Check E4 to instead find the current lap from the player who triggered it. This flag is better for triggering events ahead of the players, while the default effect is better for triggering events behind the players.
2018-03-31 18:48:49 +00:00
CONS_Printf(M_GetText("%s recieved a point for winning!\n"), player_names[winnernum]);
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
Lakitu Start Lights
2017-05-21 22:25:28 +00:00
#define NUMLAKIFRAMES 13
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
#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;
Closer to done HUD tweaking? Splitscreen in Battle is left
2017-12-24 00:14:06 +00:00
static patch_t *kp_itembg;
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;
Battle HUD stuff
2017-11-14 01:45:57 +00:00
static patch_t *kp_balloonsticker;
static patch_t *kp_balloonstickerwide;
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;
Lakitu Start Lights
2017-05-21 22:25:28 +00:00
static patch_t *kp_lakitustart[NUMLAKIFRAMES];
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
static patch_t *kp_lakitulaps[17];
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];
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;
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;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
static patch_t *kp_magnet;
static patch_t *kp_boo;
static patch_t *kp_boosteal;
static patch_t *kp_mushroom;
static patch_t *kp_doublemushroom;
static patch_t *kp_triplemushroom;
static patch_t *kp_megashroom;
static patch_t *kp_goldshroom;
static patch_t *kp_star;
static patch_t *kp_triplebanana;
static patch_t *kp_fakeitem;
static patch_t *kp_banana;
static patch_t *kp_greenshell;
static patch_t *kp_redshell;
static patch_t *kp_triplegreenshell;
static patch_t *kp_bobomb;
static patch_t *kp_blueshell;
static patch_t *kp_fireflower;
static patch_t *kp_tripleredshell;
static patch_t *kp_lightning;
Added feather
2017-11-07 05:57:42 +00:00
static patch_t *kp_feather;
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
static patch_t *kp_kitchensink;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
static patch_t *kp_itemused1;
static patch_t *kp_itemused2;
static patch_t *kp_itemused3;
static patch_t *kp_itemused4;
static patch_t *kp_itemused5;
static patch_t *kp_singlebananaicon;
static patch_t *kp_doublebananaicon;
static patch_t *kp_triplebananaicon;
static patch_t *kp_singlegreenshellicon;
static patch_t *kp_doublegreenshellicon;
static patch_t *kp_triplegreenshellicon;
static patch_t *kp_singleredshellicon;
static patch_t *kp_doubleredshellicon;
static patch_t *kp_tripleredshellicon;
CHECK indicator Turn it off with the kartcheck console var
2017-11-02 04:35:10 +00:00
static patch_t *kp_check;
static patch_t *kp_checkw;
static patch_t *kp_checkstar;
static patch_t *kp_checkstarw;
static patch_t *kp_checkmega;
static patch_t *kp_checkmegaw;
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
static patch_t *kp_rankballoon;
static patch_t *kp_ranknoballoons;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
/*
static patch_t *kp_neonoitem;
static patch_t *kp_electroshield;
static patch_t *kp_skghost;
static patch_t *kp_skghoststeal;
static patch_t *kp_speedshoe;
static patch_t *kp_doublespeedshoe;
static patch_t *kp_triplespeedshoe;
static patch_t *kp_sizeupmonitor;
static patch_t *kp_rocketshoe;
static patch_t *kp_invincibility;
static patch_t *kp_neotriplebanana;
static patch_t *kp_eggmanmonitor;
static patch_t *kp_neobanana;
static patch_t *kp_orbinaut;
static patch_t *kp_jaws;
static patch_t *kp_tripleorbinaut;
static patch_t *kp_specialstagemine;
static patch_t *kp_deton;
static patch_t *kp_laserwisp;
static patch_t *kp_doublejaws;
static patch_t *kp_sizedownmonitor;
static patch_t *kp_neoitemused1;
static patch_t *kp_neoitemused2;
static patch_t *kp_neoitemused3;
static patch_t *kp_neoitemused4;
static patch_t *kp_neoitemused5;
*/
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);
Closer to done HUD tweaking? Splitscreen in Battle is left
2017-12-24 00:14:06 +00:00
kp_itembg = W_CachePatchName("K_ITNULL", PU_HUDGFX);
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
//kp_neonoitem = W_CachePatchName("KNITNULL", 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);
Battle HUD stuff
2017-11-14 01:45:57 +00:00
kp_balloonsticker = W_CachePatchName("K_STBALN", PU_HUDGFX);
kp_balloonstickerwide = W_CachePatchName("K_STBALW", PU_HUDGFX);
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 Start Lights
2017-05-21 22:25:28 +00:00
// Lakitu Start-up Frames
kp_lakitustart[0] = W_CachePatchName("K_LAKISA", PU_HUDGFX);
kp_lakitustart[1] = W_CachePatchName("K_LAKISB", PU_HUDGFX);
kp_lakitustart[2] = W_CachePatchName("K_LAKISC", PU_HUDGFX);
kp_lakitustart[3] = W_CachePatchName("K_LAKISD", PU_HUDGFX);
kp_lakitustart[4] = W_CachePatchName("K_LAKISE", PU_HUDGFX);
kp_lakitustart[5] = W_CachePatchName("K_LAKISF", PU_HUDGFX);
kp_lakitustart[6] = W_CachePatchName("K_LAKISG", PU_HUDGFX);
kp_lakitustart[7] = W_CachePatchName("K_LAKISH", PU_HUDGFX);
kp_lakitustart[8] = W_CachePatchName("K_LAKISI", PU_HUDGFX);
kp_lakitustart[9] = W_CachePatchName("K_LAKISJ", PU_HUDGFX);
kp_lakitustart[10] = W_CachePatchName("K_LAKISK", PU_HUDGFX);
kp_lakitustart[11] = W_CachePatchName("K_LAKISL", PU_HUDGFX);
kp_lakitustart[12] = W_CachePatchName("K_LAKISM", PU_HUDGFX);
Swoopy Start & Lap Lakitu
2017-06-03 22:19:06 +00:00
// Lakitu Lap Frames
kp_lakitulaps[0] = W_CachePatchName("K_LAKIL2", PU_HUDGFX);
kp_lakitulaps[1] = W_CachePatchName("K_LAKIL3", PU_HUDGFX);
kp_lakitulaps[2] = W_CachePatchName("K_LAKIL4", PU_HUDGFX);
kp_lakitulaps[3] = W_CachePatchName("K_LAKIL5", PU_HUDGFX);
kp_lakitulaps[4] = W_CachePatchName("K_LAKIL6", PU_HUDGFX);
kp_lakitulaps[5] = W_CachePatchName("K_LAKIL7", PU_HUDGFX);
kp_lakitulaps[6] = W_CachePatchName("K_LAKIL8", PU_HUDGFX);
kp_lakitulaps[7] = W_CachePatchName("K_LAKIL9", PU_HUDGFX);
kp_lakitulaps[8] = W_CachePatchName("K_LAKILF", PU_HUDGFX);
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
kp_lakitulaps[9] = W_CachePatchName("K_LAKIF1", PU_HUDGFX);
kp_lakitulaps[10] = W_CachePatchName("K_LAKIF2", PU_HUDGFX);
kp_lakitulaps[11] = W_CachePatchName("K_LAKIF3", PU_HUDGFX);
kp_lakitulaps[12] = W_CachePatchName("K_LAKIF4", PU_HUDGFX);
kp_lakitulaps[13] = W_CachePatchName("K_LAKIF5", PU_HUDGFX);
kp_lakitulaps[14] = W_CachePatchName("K_LAKIF6", PU_HUDGFX);
kp_lakitulaps[15] = W_CachePatchName("K_LAKIF7", PU_HUDGFX);
kp_lakitulaps[16] = W_CachePatchName("K_LAKIF8", 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++)
{
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 (i > 4 && j < 4 && j != 0) continue; // We don't need blue numbers for ranks past 4th
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
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
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);
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
// Kart Item Windows
kp_magnet = W_CachePatchName("K_ITMAGN", PU_HUDGFX);
kp_boo = W_CachePatchName("K_ITBOO1", PU_HUDGFX);
kp_boosteal = W_CachePatchName("K_ITBOO2", PU_HUDGFX);
kp_mushroom = W_CachePatchName("K_ITMUSH", PU_HUDGFX);
kp_doublemushroom = W_CachePatchName("K_ITDOUB", PU_HUDGFX);
kp_triplemushroom = W_CachePatchName("K_ITTRIP", PU_HUDGFX);
kp_megashroom = W_CachePatchName("K_ITMEGA", PU_HUDGFX);
kp_goldshroom = W_CachePatchName("K_ITGOLD", PU_HUDGFX);
kp_star = W_CachePatchName("K_ITSTAR", PU_HUDGFX);
kp_triplebanana = W_CachePatchName("K_ITTBAN", PU_HUDGFX);
kp_fakeitem = W_CachePatchName("K_ITFAKE", PU_HUDGFX);
kp_banana = W_CachePatchName("K_ITBANA", PU_HUDGFX);
kp_greenshell = W_CachePatchName("K_ITGREE", PU_HUDGFX);
kp_redshell = W_CachePatchName("K_ITREDS", PU_HUDGFX);
kp_triplegreenshell = W_CachePatchName("K_ITTGRE", PU_HUDGFX);
kp_bobomb = W_CachePatchName("K_ITBOBO", PU_HUDGFX);
kp_blueshell = W_CachePatchName("K_ITBLUE", PU_HUDGFX);
kp_fireflower = W_CachePatchName("K_ITFIRE", PU_HUDGFX);
kp_tripleredshell = W_CachePatchName("K_ITTRED", PU_HUDGFX);
kp_lightning = W_CachePatchName("K_ITLIGH", PU_HUDGFX);
Added feather
2017-11-07 05:57:42 +00:00
kp_feather = W_CachePatchName("K_ITFETH", PU_HUDGFX);
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
kp_kitchensink = W_CachePatchName("K_ITSINK", 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
// Item-used - Closing the item window after an item is used
kp_itemused1 = W_CachePatchName("K_ITUSE1", PU_HUDGFX);
kp_itemused2 = W_CachePatchName("K_ITUSE2", PU_HUDGFX);
kp_itemused3 = W_CachePatchName("K_ITUSE3", PU_HUDGFX);
kp_itemused4 = W_CachePatchName("K_ITUSE4", PU_HUDGFX);
kp_itemused5 = W_CachePatchName("K_ITUSE5", 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
// Triple-item HUD icons
kp_singlebananaicon = W_CachePatchName("K_TRBAN1", PU_HUDGFX);
kp_doublebananaicon = W_CachePatchName("K_TRBAN2", PU_HUDGFX);
kp_triplebananaicon = W_CachePatchName("K_TRBAN3", PU_HUDGFX);
kp_singlegreenshellicon = W_CachePatchName("K_TRGRE1", PU_HUDGFX);
kp_doublegreenshellicon = W_CachePatchName("K_TRGRE2", PU_HUDGFX);
kp_triplegreenshellicon = W_CachePatchName("K_TRGRE3", PU_HUDGFX);
kp_singleredshellicon = W_CachePatchName("K_TRRED1", PU_HUDGFX);
kp_doubleredshellicon = W_CachePatchName("K_TRRED2", PU_HUDGFX);
kp_tripleredshellicon = W_CachePatchName("K_TRRED3", PU_HUDGFX);
CHECK indicator Turn it off with the kartcheck console var
2017-11-02 04:35:10 +00:00
// CHECK indicators
kp_check = W_CachePatchName("K_CHECK1", PU_HUDGFX);
kp_checkw = W_CachePatchName("K_CHECK2", PU_HUDGFX);
kp_checkstar = W_CachePatchName("K_CHECK3", PU_HUDGFX);
kp_checkstarw = W_CachePatchName("K_CHECK4", PU_HUDGFX);
kp_checkmega = W_CachePatchName("K_CHECK5", PU_HUDGFX);
kp_checkmegaw = W_CachePatchName("K_CHECK6", PU_HUDGFX);
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
// Extra ranking icons
kp_rankballoon = W_CachePatchName("K_BLNICO", PU_HUDGFX);
kp_ranknoballoons = W_CachePatchName("K_NOBLNS", PU_HUDGFX);
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
/*
// Neo-Kart item windows
kp_electroshield = W_CachePatchName("KNITELEC", PU_HUDGFX);
kp_skghost = W_CachePatchName("KTITSKG1", PU_HUDGFX);
kp_skghoststeal = W_CachePatchName("KTITSKG2", PU_HUDGFX);
kp_speedshoe = W_CachePatchName("KTITSPEE", PU_HUDGFX);
kp_triplespeedshoe = W_CachePatchName("KTITTSPE", PU_HUDGFX);
kp_sizeupmonitor = W_CachePatchName("KTITSUPM", PU_HUDGFX);
kp_rocketshoe = W_CachePatchName("KTITROCK", PU_HUDGFX);
kp_invincibility = W_CachePatchName("KTITINVI", PU_HUDGFX);
kp_neotriplebanana = W_CachePatchName("KTITTBAN", PU_HUDGFX);
kp_eggmanmonitor = W_CachePatchName("KTITEGGM", PU_HUDGFX);
kp_neobanana = W_CachePatchName("KTITBANA", PU_HUDGFX);
kp_orbinaut = W_CachePatchName("KTITORBI", PU_HUDGFX);
kp_jaws = W_CachePatchName("KTITJAWS", PU_HUDGFX);
kp_tripleorbinaut = W_CachePatchName("KTITTORB", PU_HUDGFX);
kp_specialstagemine = W_CachePatchName("KTITSPEC", PU_HUDGFX);
kp_deton = W_CachePatchName("KTITDETO", PU_HUDGFX);
kp_laserwisp = W_CachePatchName("KTITLASE", PU_HUDGFX);
kp_doublejaws = W_CachePatchName("KTITDJAW", PU_HUDGFX);
kp_sizedownmonitor = W_CachePatchName("KTITSDOW", 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
// Item-used - Closing the item window after an item is used (Neo-Kart)
kp_neoitemused1 = W_CachePatchName("KNITUSE1", PU_HUDGFX);
kp_neoitemused2 = W_CachePatchName("KNITUSE2", PU_HUDGFX);
kp_neoitemused3 = W_CachePatchName("KNITUSE3", PU_HUDGFX);
kp_neoitemused4 = W_CachePatchName("KNITUSE4", PU_HUDGFX);
kp_neoitemused5 = W_CachePatchName("KNITUSE5", 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 TRIP_X, TRIP_Y; // Triple Item Icon
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 Start Lights
2017-05-21 22:25:28 +00:00
INT32 LAKI_X, LAKI_Y; // Lakitu
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
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
ITEM_X = BASEVIDWIDTH - 52; // 268
Unfinished V_HORZSCREEN revamp
2017-12-22 15:16:41 +00:00
ITEM_Y = 9; // 9
HUD
2017-12-18 01:42:17 +00:00
// Triple Item Object
TRIP_X = 143; // 143
TRIP_Y = BASEVIDHEIGHT- 34; // 166
// Level Timer
Unfinished V_HORZSCREEN revamp
2017-12-22 15:16:41 +00:00
TIME_X = 9; // 172
HUD
2017-12-18 01:42:17 +00:00
TIME_Y = 9; // 9
// Level Laps
LAPS_X = 9; // 9
LAPS_Y = BASEVIDHEIGHT- 29; // 171
// Speedometer
SPDM_X = 9; // 9
SPDM_Y = BASEVIDHEIGHT- 45; // 155
// Position Number
Porting over some things from sonicitems
2018-02-13 21:48:09 +00:00
POSI_X = BASEVIDWIDTH - 9; // 268
POSI_Y = BASEVIDHEIGHT- 9; // 138
HUD
2017-12-18 01:42:17 +00:00
// Top-Four Faces
FACE_X = 9; // 9
FACE_Y = 92; // 92
// Lakitu
LAKI_X = 136; // 138
LAKI_Y = 58 - 200; // 58
// CHECK graphic
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
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
MINI_X = BASEVIDWIDTH - 50; // 270
Unfinished V_HORZSCREEN revamp
2017-12-22 15:16:41 +00:00
MINI_Y = BASEVIDHEIGHT/2; // 100
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
{
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
ITEM_X = 9;
minor 2p/4p fix
2017-12-24 13:58:04 +00:00
ITEM_Y = 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
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;
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
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
{
minor 2p/4p fix
2017-12-24 13:58:04 +00:00
ITEM_X = 0;
Closer to done HUD tweaking? Splitscreen in Battle is left
2017-12-24 00:14:06 +00:00
ITEM_Y = 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
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
MINI_X = (3*BASEVIDWIDTH/4);
MINI_Y = (3*BASEVIDHEIGHT/4);
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
}
}
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);
}
static void K_drawKartItemClose(void)
{
// ITEM_X = BASEVIDWIDTH-50; // 270
// ITEM_Y = 24; // 24
// Why write V_DrawScaledPatch calls over and over when they're all the same?
// Set to 'no draw' just in case.
patch_t *localpatch = kp_nodraw;
Unfinished V_HORZSCREEN revamp
2017-12-22 15:16:41 +00:00
INT32 splitflags = K_calcSplitFlags(V_SNAPTOTOP|V_SNAPTORIGHT);
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
if (splitscreen)
Okay lets ACTUALLY fix it now :V
2017-12-24 14:19:59 +00:00
splitflags = K_calcSplitFlags(V_SNAPTOTOP|V_SNAPTOLEFT);
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
/*if ()
switch (stplyr->kartstuff[k_itemclose])
{
case 1: localpatch = kp_neoitemused5; break;
case 3: localpatch = kp_neoitemused4; break;
case 5: localpatch = kp_neoitemused3; break;
case 7: localpatch = kp_neoitemused2; break;
case 9: localpatch = kp_neoitemused1; break;
default: break;
}
else*/
switch (stplyr->kartstuff[k_itemclose])
{
case 1: localpatch = kp_itemused5; break;
case 3: localpatch = kp_itemused4; break;
case 5: localpatch = kp_itemused3; break;
case 7: localpatch = kp_itemused2; break;
case 9: localpatch = kp_itemused1; break;
default: break;
}
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 (localpatch != kp_nodraw)
Lots more little adjustin's
2017-12-27 02:36:03 +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_drawKartItemRoulette(void)
{
// 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.
patch_t *localpatch = kp_nodraw;
Closer to done HUD tweaking? Splitscreen in Battle is left
2017-12-24 00:14:06 +00:00
patch_t *localbg = kp_itembg;
Okay lets ACTUALLY fix it now :V
2017-12-24 14:19:59 +00:00
INT32 splitflags = K_calcSplitFlags(V_SNAPTOTOP|V_SNAPTORIGHT);
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
if (splitscreen)
Okay lets ACTUALLY fix it now :V
2017-12-24 14:19:59 +00:00
{
splitflags = K_calcSplitFlags(V_SNAPTOTOP|V_SNAPTOLEFT);
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
if (splitscreen > 1)
localbg = kp_itemused1;
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
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
/*if ()
switch(stplyr->kartstuff[k_itemroulette] % 53)
{
// Each case is handled in threes, to give three frames of in-game time to see the item on the roulette
// I'm also skipping by threes for the power order as to what item shows on the roulette
case 0: case 1: case 2: localpatch = kp_electroshield; break; // Electro-Shield
case 3: case 4: case 5: localpatch = kp_triplespeedshoe; break; // Triple Speed Shoe
case 6: case 7: case 8: localpatch = kp_invincibility; break; // Invincibility
case 9: case 10: case 11: localpatch = kp_neobanana; break; // Banana
case 12: case 13: case 14: localpatch = kp_tripleorbinaut; break; // 3x Orbinaut
case 15: case 16: case 17: localpatch = kp_laserwisp; break; // Laser Wisp
case 18: case 19: case 20: localpatch = kp_skghost; break; // S3K Ghost
case 21: case 22: case 23: localpatch = kp_sizeupmonitor; break; // Size-Up Monitor
case 24: case 25: case 26: localpatch = kp_neotriplebanana; break; // Triple Banana
case 27: case 28: case 29: localpatch = kp_orbinaut; break; // 1x Orbinaut
case 30: case 31: case 32: localpatch = kp_specialstagemine; break; // Specialstage Mines
case 33: case 34: case 35: localpatch = kp_doublejaws; break; // 2x Jaws
case 36: case 37: case 38: localpatch = kp_speedshoe; break; // Speed Shoe
case 39: case 40: case 41: localpatch = kp_rocketshoe; break; // Rocket Shoe
case 42: case 43: case 44: localpatch = kp_eggmanmonitor; break; // Eggman Monitor
case 45: case 46: case 47: localpatch = kp_jaws; break; // 1x Jaws
case 48: case 49: case 50: localpatch = kp_deton; break; // Deton
case 51: case 52: case 53: localpatch = kp_sizedownmonitor; break; // Size-Down Monitor
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
}
else*/
switch(stplyr->kartstuff[k_itemroulette] % 53)
{
// Each case is handled in threes, to give three frames of in-game time to see the item on the roulette
// I'm also skipping by threes for the power order as to what item shows on the roulette
case 0: case 1: case 2: localpatch = kp_magnet; break; // Magnet
case 3: case 4: case 5: localpatch = kp_triplemushroom; break; // Triple Mushroom
case 6: case 7: case 8: localpatch = kp_star; break; // Star
case 9: case 10: case 11: localpatch = kp_banana; break; // Banana
case 12: case 13: case 14: localpatch = kp_triplegreenshell; break; // Triple Green Shell
case 15: case 16: case 17: localpatch = kp_fireflower; break; // Fire Flower
case 18: case 19: case 20: localpatch = kp_boo; break; // Boo
case 21: case 22: case 23: localpatch = kp_megashroom; break; // Mega Mushroom
case 24: case 25: case 26: localpatch = kp_triplebanana; break; // Triple Banana
case 27: case 28: case 29: localpatch = kp_greenshell; break; // Green Shell
case 30: case 31: case 32: localpatch = kp_bobomb; break; // Bob-omb
case 33: case 34: case 35: localpatch = kp_tripleredshell; break; // Triple Red Shell
case 36: case 37: case 38: localpatch = kp_mushroom; break; // Mushroom
case 39: case 40: case 41: localpatch = kp_goldshroom; break; // Gold Mushroom
case 42: case 43: case 44: localpatch = kp_fakeitem; break; // Fake Item
case 45: case 46: case 47: localpatch = kp_redshell; break; // Red Shell
Maybe message fix
2017-10-26 23:37:13 +00:00
case 48: case 49: case 50: localpatch = kp_blueshell; break; // Blue Shell
case 51: case 52: case 53: localpatch = kp_lightning; break; // Lightning
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
}
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
if (localpatch == kp_nodraw)
return;
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawScaledPatch(ITEM_X, ITEM_Y, V_HUDTRANS|splitflags, localbg);
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_drawKartRetroItem(void)
{
// 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.
patch_t *localpatch = kp_nodraw;
Closer to done HUD tweaking? Splitscreen in Battle is left
2017-12-24 00:14:06 +00:00
patch_t *localbg = kp_itembg;
Unfinished V_HORZSCREEN revamp
2017-12-22 15:16:41 +00:00
INT32 X = ITEM_X;
Okay lets ACTUALLY fix it now :V
2017-12-24 14:19:59 +00:00
INT32 splitflags = K_calcSplitFlags(V_SNAPTOTOP|V_SNAPTORIGHT);
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
if (splitscreen)
Okay lets ACTUALLY fix it now :V
2017-12-24 14:19:59 +00:00
{
splitflags = K_calcSplitFlags(V_SNAPTOTOP|V_SNAPTOLEFT);
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
if (splitscreen > 1)
localbg = kp_itemused1;
Okay lets ACTUALLY fix it now :V
2017-12-24 14:19:59 +00:00
}
HUD
2017-12-18 01:42:17 +00:00
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
// I'm doing this a little weird and drawing mostly in reverse order
// The only actual reason is to make triple/double/single mushrooms line up this way in the code below
// This shouldn't have any actual baring over how it functions
// Boo is first, because we're drawing it on top of the player's current item
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 ((stplyr->kartstuff[k_bootaketimer] > 0 || stplyr->kartstuff[k_boostolentimer] > 0)
&& (leveltime & 2)) localpatch = kp_boosteal;
Closer to done HUD tweaking? Splitscreen in Battle is left
2017-12-24 00:14:06 +00:00
else if (stplyr->kartstuff[k_boostolentimer] > 0 && !(leveltime & 2)) localpatch = kp_nodraw;
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 22:19:04 +00:00
else if (stplyr->kartstuff[k_kitchensink] == 1) localpatch = kp_kitchensink;
Added feather
2017-11-07 05:57:42 +00:00
else if (stplyr->kartstuff[k_feather] & 1) localpatch = kp_feather;
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
else if (stplyr->kartstuff[k_lightning] == 1) localpatch = kp_lightning;
else if (stplyr->kartstuff[k_tripleredshell]) localpatch = kp_tripleredshell; // &8
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
else if (stplyr->kartstuff[k_fireflower] == 1) localpatch = kp_fireflower;
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
else if (stplyr->kartstuff[k_blueshell] == 1) localpatch = kp_blueshell;
else if (stplyr->kartstuff[k_bobomb]) localpatch = kp_bobomb; // &2
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
else if (stplyr->kartstuff[k_triplegreenshell]) localpatch = kp_triplegreenshell; // &8
else if (stplyr->kartstuff[k_redshell]) localpatch = kp_redshell; // &2
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
else if (stplyr->kartstuff[k_greenshell]) localpatch = kp_greenshell; // &2
else if (stplyr->kartstuff[k_banana]) localpatch = kp_banana; // &2
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
else if (stplyr->kartstuff[k_fakeitem] & 2) localpatch = kp_fakeitem;
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
else if (stplyr->kartstuff[k_triplebanana]) localpatch = kp_triplebanana; // &8
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
else if (stplyr->kartstuff[k_star] == 1) localpatch = kp_star;
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
else if (stplyr->kartstuff[k_goldshroom] == 1
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
|| (stplyr->kartstuff[k_goldshroomtimer] > 1 && (leveltime & 1))) localpatch = kp_goldshroom;
Closer to done HUD tweaking? Splitscreen in Battle is left
2017-12-24 00:14:06 +00:00
else if (stplyr->kartstuff[k_goldshroomtimer] > 1 && !(leveltime & 1)) localpatch = kp_nodraw;
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
else if (stplyr->kartstuff[k_megashroom] == 1
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
|| (stplyr->kartstuff[k_growshrinktimer] > 1 && (leveltime & 1))) localpatch = kp_megashroom;
Closer to done HUD tweaking? Splitscreen in Battle is left
2017-12-24 00:14:06 +00:00
else if (stplyr->kartstuff[k_growshrinktimer] > 1 && !(leveltime & 1)) localpatch = kp_nodraw;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
else if (stplyr->kartstuff[k_mushroom] & 4) localpatch = kp_triplemushroom;
else if (stplyr->kartstuff[k_mushroom] & 2) localpatch = kp_doublemushroom;
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
else if (stplyr->kartstuff[k_mushroom] == 1) localpatch = kp_mushroom;
Updates done a while ago... Not 100% sure what they were. :x
2016-11-21 04:23:00 +00:00
else if (stplyr->kartstuff[k_boo] == 1) localpatch = kp_boo;
else if (stplyr->kartstuff[k_magnet] == 1) localpatch = kp_magnet;
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
if (localpatch == kp_nodraw)
return;
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawScaledPatch(X, ITEM_Y, V_HUDTRANS|splitflags, localbg);
V_DrawScaledPatch(X, ITEM_Y, V_HUDTRANS|splitflags, localpatch);
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
}
/*
static void K_drawKartNeoItem(void)
{
// 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.
patch_t *localpatch = kp_noitem;
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
// I'm doing this a little weird and drawing mostly in reverse order
// The only actual reason is to make triple/double/single mushrooms line up this way in the code below
// This shouldn't have any actual baring over how it functions
// Boo is first, because we're drawing it on top of the player's current item
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
if ((stplyr->kartstuff[k_bootaketimer] > 0
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
|| stplyr->kartstuff[k_boostolentimer] > 0) && (leveltime & 2)) localpatch = kp_skghoststeal;
else if (stplyr->kartstuff[k_boostolentimer] > 0 && !(leveltime & 2)) localpatch = kp_neonoitem;
else if (stplyr->kartstuff[k_lightning] == 1) localpatch = kp_sizedownmonitor;
else if (stplyr->kartstuff[k_jaws] & 4) localpatch = kp_doublejaws;
else if (stplyr->kartstuff[k_laserwisp] == 1) localpatch = kp_laserwisp;
else if (stplyr->kartstuff[k_blueshell] == 1) localpatch = kp_deton;
else if (stplyr->kartstuff[k_bobomb] & 2) localpatch = kp_specialstagemine;
else if (stplyr->kartstuff[k_triplegreenshell] & 8) localpatch = kp_tripleorbinaut;
else if (stplyr->kartstuff[k_redshell] & 2) localpatch = kp_jaws;
else if (stplyr->kartstuff[k_greenshell] & 2) localpatch = kp_orbinaut;
else if (stplyr->kartstuff[k_banana] & 2) localpatch = kp_neobanana;
else if (stplyr->kartstuff[k_fakeitem] & 2) localpatch = kp_eggmanmonitor;
else if (stplyr->kartstuff[k_triplebanana] & 8) localpatch = kp_neotriplebanana;
else if (stplyr->kartstuff[k_star] == 1) localpatch = kp_invincibility;
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
else if (stplyr->kartstuff[k_goldshroom] == 1
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
|| (stplyr->kartstuff[k_goldshroomtimer] > 1 && (leveltime & 1))) localpatch = kp_rocketshoe;
else if (stplyr->kartstuff[k_goldshroomtimer] > 1 && !(leveltime & 1)) localpatch = kp_neonoitem;
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
else if (stplyr->kartstuff[k_megashroom] == 1
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
|| (stplyr->kartstuff[k_growshrinktimer] > 1 && (leveltime & 1))) localpatch = kp_sizeupmonitor;
else if (stplyr->kartstuff[k_growshrinktimer] > 1 && !(leveltime & 1)) localpatch = kp_neonoitem;
else if (stplyr->kartstuff[k_mushroom] & 4) localpatch = kp_triplespeedshoe;
else if (stplyr->kartstuff[k_mushroom] & 2) localpatch = kp_doublespeedshoe;
else if (stplyr->kartstuff[k_mushroom] == 1) localpatch = kp_speedshoe;
else if (stplyr->kartstuff[k_boo] & 8) localpatch = kp_skghost;
else if (stplyr->kartstuff[k_magnet] & 8) localpatch = kp_electroshield;
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_DrawScaledPatch(ITEM_X, ITEM_Y, V_SNAPTORIGHT|V_HUDTRANSHALF, localpatch);
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
/*
Some position code
2017-02-13 04:24:49 +00:00
static void K_DrawKartTripleItem(void)
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
{
// TRIP_X = 143; // 143
// TRIP_Y = BASEVIDHEIGHT-34; // 166
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 draw' just in case.
patch_t *localpatch = kp_nodraw;
INT32 thisitem;
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
Swoopy Start & Lap Lakitu
2017-06-03 22:19:06 +00:00
if ()
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
{
thisitem = stplyr->kartstuff[k_triplebanana];
if (thisitem & 1) localpatch = kp_singleneobananaicon;
else if (thisitem & 2) localpatch = kp_doubleneobananaicon;
else if (thisitem & 4) localpatch = kp_tripleneobananaicon;
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
thisitem = stplyr->kartstuff[k_triplegreenshell];
if (thisitem & 1) localpatch = kp_singleorbitauricon;
else if (thisitem & 2) localpatch = kp_doubleorbitauricon;
else if (thisitem & 4) localpatch = kp_tripleorbitauricon;
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
thisitem = stplyr->kartstuff[k_jaws];
if (thisitem & 1) localpatch = kp_singlejawsicon;
else if (thisitem & 2) localpatch = kp_doublejawsicon;
}
Swoopy Start & Lap Lakitu
2017-06-03 22:19:06 +00:00
else
{
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
thisitem = stplyr->kartstuff[k_triplebanana];
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
if (thisitem & 4) localpatch = kp_triplebananaicon;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
else if (thisitem & 2) localpatch = kp_doublebananaicon;
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
else if (thisitem & 1) localpatch = kp_singlebananaicon;
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
thisitem = stplyr->kartstuff[k_triplegreenshell];
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
if (thisitem & 4) localpatch = kp_triplegreenshellicon;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
else if (thisitem & 2) localpatch = kp_doublegreenshellicon;
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
else if (thisitem & 1) localpatch = kp_singlegreenshellicon;
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
thisitem = stplyr->kartstuff[k_tripleredshell];
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
if (thisitem & 4) localpatch = kp_tripleredshellicon;
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
else if (thisitem & 2) localpatch = kp_doubleredshellicon;
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
else if (thisitem & 1) localpatch = kp_singleredshellicon;
if (stplyr->kartstuff[k_banana] & 1) localpatch = kp_singlebananaicon;
if (stplyr->kartstuff[k_greenshell] & 1) localpatch = kp_singlegreenshellicon;
if (stplyr->kartstuff[k_redshell] & 1) localpatch = kp_singleredshellicon;
Swoopy Start & Lap Lakitu
2017-06-03 22:19:06 +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
if (localpatch != kp_nodraw)
HUD
2017-12-18 01:42:17 +00:00
V_DrawScaledPatch(TRIP_X, TRIP_Y, V_SNAPTOBOTTOM, localpatch);
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
*/
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;
Closer to done HUD tweaking? Splitscreen in Battle is left
2017-12-24 00:14:06 +00:00
INT32 splitflags = K_calcSplitFlags(V_SNAPTOTOP|V_SNAPTOLEFT);
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;
}
}
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;
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
INT32 balloonx;
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
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
balloonx = FACE_X+18;
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]);
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() && players[rankplayer[i]].kartstuff[k_balloon] > 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
{
for (j = 0; j < players[rankplayer[i]].kartstuff[k_balloon]; j++)
{
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawSmallTranslucentPatch(balloonx, Y+10, V_HUDTRANS|V_SNAPTOLEFT, kp_rankballoon);
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
balloonx += 3;
}
}
}
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]);
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() && players[rankplayer[i]].kartstuff[k_balloon] > 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
{
for (j = 0; j < players[rankplayer[i]].kartstuff[k_balloon]; j++)
{
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawSmallScaledPatch(balloonx, Y+10, V_HUDTRANS|V_SNAPTOLEFT, kp_rankballoon);
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
balloonx += 3;
}
}
}
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)
{
colormap = R_GetTranslationColormap(TC_STARMAN, players[rankplayer[i]].mo->color, GTC_CACHE);
}
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);
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() && players[rankplayer[i]].kartstuff[k_balloon] > 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
{
for (j = 0; j < players[rankplayer[i]].kartstuff[k_balloon]; j++)
{
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawSmallTranslucentMappedPatch(balloonx, Y+10, V_HUDTRANS|V_SNAPTOLEFT, kp_rankballoon, colormap);
X & balloons on ranking no i still haven't fixed the numbers yet, but the order should still be ok :V
2017-11-30 00:35:37 +00:00
balloonx += 3;
}
}
}
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);
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() && players[rankplayer[i]].kartstuff[k_balloon] > 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
{
for (j = 0; j < players[rankplayer[i]].kartstuff[k_balloon]; j++)
{
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawSmallMappedPatch(balloonx, Y+10, V_HUDTRANS|V_SNAPTOLEFT, kp_rankballoon, colormap);
X & balloons on ranking no i still haven't fixed the numbers yet, but the order should still be ok :V
2017-11-30 00:35:37 +00:00
balloonx += 3;
}
}
}
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
{
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() && players[rankplayer[i]].kartstuff[k_balloon] <= 0)
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawSmallTranslucentPatch(FACE_X-2, Y, V_HUDTRANS|V_SNAPTOLEFT, kp_ranknoballoons);
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
{
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() && players[rankplayer[i]].kartstuff[k_balloon] <= 0)
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawSmallScaledPatch(FACE_X-2, Y, V_HUDTRANS|V_SNAPTOLEFT, kp_ranknoballoons);
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
renamed mphspeed console var to speedometer has 4 options, off, Kilometers, miles, and fracunits
2017-03-13 02:44:31 +00:00
if (cv_speedometer.value == 1)
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
}
renamed mphspeed console var to speedometer has 4 options, off, Kilometers, miles, and fracunits
2017-03-13 02:44:31 +00:00
else if (cv_speedometer.value == 2)
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
}
renamed mphspeed console var to speedometer has 4 options, off, Kilometers, miles, and fracunits
2017-03-13 02:44:31 +00:00
else if (cv_speedometer.value == 3)
{
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
}
Battle HUD stuff
2017-11-14 01:45:57 +00:00
static void K_drawKartBalloonsOrKarma(void)
{
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
{
Battle hud stuff?!
2017-12-24 01:55:23 +00:00
if (stplyr->kartstuff[k_balloon] <= 0)
{
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
{
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawMappedPatch(LAPS_X, LAPS_Y-1, V_HUDTRANS|splitflags, kp_rankballoon, colormap);
V_DrawString(LAPS_X+13, LAPS_Y+1, V_HUDTRANS|splitflags, va("%d/%d", stplyr->kartstuff[k_balloon], cv_kartballoons.value));
Battle hud stuff?!
2017-12-24 01:55:23 +00:00
}
Battle HUD stuff
2017-11-14 01:45:57 +00:00
}
else
{
Battle hud stuff?!
2017-12-24 01:55:23 +00:00
if (stplyr->kartstuff[k_balloon] <= 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
{
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 (stplyr->kartstuff[k_balloon] > 9 && cv_kartballoons.value > 9)
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawMappedPatch(LAPS_X, LAPS_Y, V_HUDTRANS|splitflags, kp_balloonstickerwide, colormap);
Battle hud stuff?!
2017-12-24 01:55:23 +00:00
else
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawMappedPatch(LAPS_X, LAPS_Y, V_HUDTRANS|splitflags, kp_balloonsticker, 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+47, LAPS_Y+3, V_HUDTRANS|splitflags, va("%d/%d", stplyr->kartstuff[k_balloon], cv_kartballoons.value));
Battle HUD stuff
2017-11-14 01:45:57 +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
}
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
patch_t *localpatch;
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
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->mo))
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++)
{
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 (!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;
if ((players[i].kartstuff[k_startimer] <= 0) && (leveltime & 2))
{
if (players[i].kartstuff[k_megashroom] || players[i].kartstuff[k_growshrinktimer] > 0)
localpatch = kp_checkmegaw;
else if (players[i].kartstuff[k_star] || players[i].kartstuff[k_startimer])
localpatch = kp_checkstarw;
else
localpatch = kp_checkw;
}
else
{
if (players[i].kartstuff[k_megashroom] || players[i].kartstuff[k_growshrinktimer] > 0)
localpatch = kp_checkmega;
else if (players[i].kartstuff[k_star] || players[i].kartstuff[k_startimer])
localpatch = kp_checkstar;
else
localpatch = kp_check;
}
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);
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
V_DrawMappedPatch(x, CHEK_Y, V_HUDTRANS|splitflags, localpatch, 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);
}
Porting over some things from sonicitems
2018-02-13 21:48:09 +00:00
static void K_drawKartMinimapHead(player_t *player, 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
{
Porting over some things from sonicitems
2018-02-13 21:48:09 +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.
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;
Porting over some things from sonicitems
2018-02-13 21:48:09 +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);
amnumxpos = (FixedMul(player->mo->x, zoom) - FixedMul(xoffset, zoom));
amnumypos = -(FixedMul(player->mo->y, zoom) - FixedMul(yoffset, zoom));
amxpos = amnumxpos + ((x + AutomapPic->width/2 - (iconprefix[player->skin]->width/2))<<FRACBITS);
amypos = amnumypos + ((y + AutomapPic->height/2 - (iconprefix[player->skin]->height/2))<<FRACBITS);
if (mirrormode)
{
flags |= V_FLIP;
amxpos = -amnumxpos + ((x + AutomapPic->width/2 + (iconprefix[player->skin]->width/2))<<FRACBITS);
}
if (!player->skincolor) // 'default' color
V_DrawSciencePatch(amxpos, amypos, flags, iconprefix[player->skin], FRACUNIT);
else
{
UINT8 *colormap;
if (player->mo->colorized)
{
colormap = R_GetTranslationColormap(TC_STARMAN, player->mo->color, 0);
}
else
{
colormap = R_GetTranslationColormap(player->skin, player->mo->color, 0);
}
V_DrawFixedPatch(amxpos, amypos, FRACUNIT, flags, iconprefix[player->skin], colormap);
}
}
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;
Porting over some things from sonicitems
2018-02-13 21:48:09 +00:00
const INT32 minimaptrans = ((10-cv_kartminimap.value)<<FF_TRANSSHIFT);
INT32 splitflags = V_SNAPTORIGHT|minimaptrans;
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
HUD improvements Most notably, Karma & Boo no longer appear on the minimap
2018-03-27 22:22:33 +00:00
if (splitscreen)
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
splitflags = 0;
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)
Porting over some things from sonicitems
2018-02-13 21:48:09 +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
thing
2017-12-22 21:24:20 +00:00
// Player's tiny icons on the Automap.
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
for (i = 0; i < MAXPLAYERS; i++)
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 (i == displayplayer && !splitscreen)
Porting over some things from sonicitems
2018-02-13 21:48:09 +00:00
continue; // Do displayplayer later
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
if (players[i].mo && !players[i].spectator)
HUD improvements Most notably, Karma & Boo no longer appear on the minimap
2018-03-27 22:22:33 +00:00
{
if (G_BattleGametype() && players[i].kartstuff[k_balloon] <= 0)
continue;
if (players[i].kartstuff[k_bootimer] > 0)
{
if ((players[i].kartstuff[k_bootimer] < 1*TICRATE/2
|| players[i].kartstuff[k_bootimer] > bootime-(1*TICRATE/2))
&& !(leveltime & 1))
;
else
continue;
}
Porting over some things from sonicitems
2018-02-13 21:48:09 +00:00
K_drawKartMinimapHead(&players[i], x, y, splitflags, AutomapPic);
HUD improvements Most notably, Karma & Boo no longer appear on the minimap
2018-03-27 22:22:33 +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
}
Porting over some things from sonicitems
2018-02-13 21:48:09 +00:00
HUD improvements Most notably, Karma & Boo no longer appear on the minimap
2018-03-27 22:22:33 +00:00
if (splitscreen)
Porting over some things from sonicitems
2018-02-13 21:48:09 +00:00
return; // Don't need this for splits
splitflags &= ~V_HUDTRANSHALF;
splitflags |= V_HUDTRANS;
Minor but important fixes
2018-02-17 06:53:44 +00:00
if (stplyr->mo && !stplyr->spectator)
K_drawKartMinimapHead(stplyr, 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])
V_DrawFadeScreen();
Closer to done HUD tweaking? Splitscreen in Battle is left
2017-12-24 00:14:06 +00:00
if (stplyr->kartstuff[k_balloon])
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
}
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 (stplyr->kartstuff[k_balloon] <= 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
V_DrawFadeScreen();
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)
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_DrawString(x-(txoff/2), ty, 0, va("%d", stplyr->kartstuff[k_comebacktimer]/TICRATE));
Last few finishing touches for the HUD Battle Mode cards & Race countdown timers display properly
2017-12-25 15:05:36 +00:00
else
{
A quick credits draft Please give me corrections and people to add. I've not been here as long as some people, so there is 100% probably people I missed
2018-03-28 20:17:04 +00:00
V_DrawFixedPatch(x<<FRACBITS, ty<<FRACBITS, scale, 0, kp_timeoutsticker, NULL);
V_DrawKartString(x-txoff, ty, 0, va("%d", stplyr->kartstuff[k_comebacktimer]/TICRATE));
Last few finishing touches for the HUD Battle Mode cards & Race countdown timers display properly
2017-12-25 15:05:36 +00:00
}
Battle HUD stuff
2017-11-14 01:45:57 +00:00
}
}
Lakitu Start Lights
2017-05-21 22:25:28 +00:00
static void K_drawStartLakitu(void)
{
patch_t *localpatch = kp_nodraw;
Swoopy Start & Lap Lakitu
2017-06-03 22:19:06 +00:00
fixed_t adjustY;
Merge in battle, unfuck the code
2017-11-21 07:23:06 +00:00
tic_t numFrames = 32; // Number of frames for the animation
Swoopy Start & Lap Lakitu
2017-06-03 22:19:06 +00:00
fixed_t finalOffset = 206; // Number of pixels to offset the patch (This is actually 200, the 6 is a buffer for the parabola)
Lakitu Start Lights
2017-05-21 22:25:28 +00:00
Merge in battle, unfuck the code
2017-11-21 07:23:06 +00:00
if (leveltime < 52) localpatch = kp_lakitustart[0];
Lakitu Start Lights
2017-05-21 22:25:28 +00:00
if (leveltime >= 52 && leveltime < 56) localpatch = kp_lakitustart[1];
if (leveltime >= 56 && leveltime < 60) localpatch = kp_lakitustart[2];
if (leveltime >= 60 && leveltime < 64) localpatch = kp_lakitustart[3];
if (leveltime >= 64 && leveltime < 91) localpatch = kp_lakitustart[4];
if (leveltime >= 91 && leveltime < 95) localpatch = kp_lakitustart[5];
if (leveltime >= 95 && leveltime < 99) localpatch = kp_lakitustart[6];
if (leveltime >= 99 && leveltime < 103) localpatch = kp_lakitustart[7];
if (leveltime >= 103 && leveltime < 130) localpatch = kp_lakitustart[8];
if (leveltime >= 130 && leveltime < 134) localpatch = kp_lakitustart[9];
if (leveltime >= 134 && leveltime < 138) localpatch = kp_lakitustart[10];
if (leveltime >= 138 && leveltime < 142) localpatch = kp_lakitustart[11];
Swoopy Start & Lap Lakitu
2017-06-03 22:19:06 +00:00
if (leveltime >= 142 && leveltime < 178) localpatch = kp_lakitustart[12];
if (leveltime <= numFrames)
adjustY = (finalOffset - 1) - FixedMul((finalOffset), FRACUNIT / (leveltime + 3));
else if (leveltime >= 146)
{
fixed_t templeveltime = leveltime - 145;
adjustY = (finalOffset - 1) - FixedMul((finalOffset), FRACUNIT / (numFrames + 3 - templeveltime));
}
else
adjustY = 200;
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)
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
V_DrawSmallScaledPatch(320-LAKI_X, LAKI_Y + adjustY, V_SNAPTOTOP|V_FLIP, localpatch);
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
else
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
V_DrawSmallScaledPatch(LAKI_X, LAKI_Y + adjustY, V_SNAPTOTOP, localpatch);
Swoopy Start & Lap Lakitu
2017-06-03 22:19:06 +00:00
}
static void K_drawLapLakitu(void)
{
patch_t *localpatch = kp_nodraw;
fixed_t swoopTimer = 80 - stplyr->kartstuff[k_lapanimation]; // Starts at 80, goes down by 1 per frame
fixed_t adjustY;
fixed_t numFrames = 32; // Number of frames for the animation
fixed_t finalOffset = 206; // Number of pixels to offset the patch (This is actually 200, the 6 is a buffer for the parabola)
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
boolean finishLine = false;
Lakitu Start Lights
2017-05-21 22:25:28 +00:00
Swoopy Start & Lap Lakitu
2017-06-03 22:19:06 +00:00
if (stplyr->laps < (UINT8)(cv_numlaps.value - 1))
Lakitu Start Lights
2017-05-21 22:25:28 +00:00
{
Swoopy Start & Lap Lakitu
2017-06-03 22:19:06 +00:00
switch (stplyr->laps)
Lakitu Start Lights
2017-05-21 22:25:28 +00:00
{
Swoopy Start & Lap Lakitu
2017-06-03 22:19:06 +00:00
case 1: localpatch = kp_lakitulaps[0]; break;
case 2: localpatch = kp_lakitulaps[1]; break;
case 3: localpatch = kp_lakitulaps[2]; break;
case 4: localpatch = kp_lakitulaps[3]; break;
case 5: localpatch = kp_lakitulaps[4]; break;
case 6: localpatch = kp_lakitulaps[5]; break;
case 7: localpatch = kp_lakitulaps[6]; break;
case 8: localpatch = kp_lakitulaps[7]; break;
Lakitu Start Lights
2017-05-21 22:25:28 +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
else if (stplyr->laps == (UINT8)(cv_numlaps.value - 1))
Swoopy Start & Lap Lakitu
2017-06-03 22:19:06 +00:00
localpatch = kp_lakitulaps[8];
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
{
// Change flag frame every 4 frames
switch (leveltime % 32)
{
case 0: case 1: case 2: case 3:
localpatch = kp_lakitulaps[9]; break;
case 4: case 5: case 6: case 7:
localpatch = kp_lakitulaps[10]; break;
case 8: case 9: case 10: case 11:
localpatch = kp_lakitulaps[11]; break;
case 12: case 13: case 14: case 15:
localpatch = kp_lakitulaps[12]; break;
case 16: case 17: case 18: case 19:
localpatch = kp_lakitulaps[13]; break;
case 20: case 21: case 22: case 23:
localpatch = kp_lakitulaps[14]; break;
case 24: case 25: case 26: case 27:
localpatch = kp_lakitulaps[15]; break;
case 28: case 29: case 30: case 31:
localpatch = kp_lakitulaps[16]; break;
}
finishLine = true;
finalOffset = 226;
}
Lakitu Start Lights
2017-05-21 22:25:28 +00:00
Swoopy Start & Lap Lakitu
2017-06-03 22:19:06 +00:00
if (swoopTimer <= numFrames)
adjustY = (finalOffset - 1) - FixedMul((finalOffset), FRACUNIT / (swoopTimer + 3));
else if (swoopTimer >= 48)
{
fixed_t templeveltime = swoopTimer - 47;
adjustY = (finalOffset - 1) - FixedMul((finalOffset), FRACUNIT / (numFrames + 3 - templeveltime));
}
else
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 (finishLine)
adjustY = 220;
else
adjustY = 200;
}
Swoopy Start & Lap Lakitu
2017-06-03 22:19:06 +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)
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
V_DrawSmallScaledPatch(320-(LAKI_X+14+(swoopTimer/4)), LAKI_Y + adjustY, V_SNAPTOTOP|V_FLIP, localpatch);
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
else
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
V_DrawSmallScaledPatch(LAKI_X+14+(swoopTimer/4), LAKI_Y + adjustY, V_SNAPTOTOP, localpatch);
Lakitu Start Lights
2017-05-21 22:25:28 +00:00
}
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
Actually, this makes more sense :U
2018-03-28 19:28:50 +00:00
if (splitscreen == 2) // Player 4 in 3P is basically the minimap :p
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
|| (stplyr->kartstuff[k_balloon] <= 0
&& 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
}
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
// Draw Lakitu
// This is done first so that regardless of HUD layers,
// he'll appear to be in the 'real world'
Change splitscreen into UINT8, fix HUD slightly more
2017-12-19 01:59:04 +00:00
if (!splitscreen)
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 (leveltime < 178)
K_drawStartLakitu();
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
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 (stplyr->kartstuff[k_lapanimation])
K_drawLapLakitu();
Change draw order Lakitu is a bottom
2017-11-02 04:41:04 +00:00
Unfinished V_HORZSCREEN revamp
2017-12-22 15:16:41 +00:00
// Draw the CHECK indicator before the other items too, so it's overlapped by everything else
if (cv_kartcheck.value)
K_drawKartPlayerCheck();
Lots more little adjustin's
2017-12-27 02:36:03 +00:00
}
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
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
// If the item window is closing, draw it closing!
if (stplyr->kartstuff[k_itemclose])
K_drawKartItemClose();
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
// If the item-roulette is going, draw that
S_PLAY states, HUD stuff
2016-08-15 03:51:08 +00:00
// Otherwise, draw the item window normally (separated for retro/neo, to prevent this block from becoming a mess
if (stplyr->kartstuff[k_itemroulette])
K_drawKartItemRoulette();
// else if ()
// K_drawKartNeoItem();
else
K_drawKartRetroItem();
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
BATLLE MODE AAAAAA
2017-10-22 07:06:35 +00:00
//K_DrawKartTripleItem();
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]);
}
}
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!
K_drawKartBalloonsOrKarma();
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
}
}
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