vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename fake item to eggman monitor

This commit is contained in:
TehRealSalt 2018-03-13 21:07:08 -04:00
parent f25b2f0256
commit e5798f7490
9 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/d_netcmd.c
View File

@ -334,7 +334,7 @@ consvar_t cv_sneaker = {"sneaker", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NU
consvar_t cv_rocketsneaker = {"rocketsneaker", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_invincibility = {"invincibility", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_banana = {"banana", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_fakeitem = {"fakeitem", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_eggmanmonitor = {"eggmanmonitor", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_orbinaut = {"orbinaut", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_jawz = {"jawz", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_mine = {"mine", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};

2
src/d_netcmd.h
View File

@ -110,7 +110,7 @@ extern consvar_t cv_recycler;*/
// SRB2kart items
extern consvar_t cv_sneaker, cv_rocketsneaker, cv_invincibility, cv_banana;
extern consvar_t cv_fakeitem, cv_orbinaut, cv_jawz, cv_mine;
extern consvar_t cv_eggmanmonitor, cv_orbinaut, cv_jawz, cv_mine;
extern consvar_t cv_ballhog, cv_selfpropelledbomb, cv_grow, cv_shrink;
extern consvar_t cv_lightningshield, cv_hyudoro, cv_pogospring;

4
src/d_player.h
View File

@ -238,7 +238,7 @@ typedef enum
KITEM_ROCKETSNEAKER,
KITEM_INVINCIBILITY,
KITEM_BANANA,
KITEM_FAKE,
KITEM_EGGMAN,
KITEM_ORBINAUT,
KITEM_JAWZ,
KITEM_MINE,
@ -306,7 +306,7 @@ typedef enum
k_squishedtimer, // Squished frame timer
k_rocketsneakertimer, // Rocket Sneaker duration timer
k_invincibilitytimer, // Invincibility timer
k_fakeitem, // Fake item held, separate from itemtype so it doesn't stop you from getting items
k_eggmanheld, // Eggman monitor held, separate from itemtype so it doesn't stop you from getting items
k_spinouttimer, // Spin-out from a banana peel or oil slick (was "pw_bananacam")
k_justbumped, // Prevent players from endlessly bumping into each other
k_poweritemtimer, // Battle mode, how long before you're allowed another power item (Invincibility, Grow)

2
src/dehacked.c
View File

@ -6277,7 +6277,7 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_INVULNFLASH3",
"S_INVULNFLASH4",
//{ Fake Item
//{ Eggman Monitor
"S_FAKEITEM1",
"S_FAKEITEM2",
"S_FAKEITEM3",

4
src/info.h
View File

@ -586,7 +586,7 @@ typedef enum sprite
SPR_DSMO, // Drift Smoke
// Kart Items
SPR_FITM, // Fake Item
SPR_FITM, // Eggman Monitor
SPR_BANA, // Banana Peel
SPR_GSHE, // Orbinaut
SPR_RSHE, // Jawz
@ -3115,7 +3115,7 @@ typedef enum state
S_INVULNFLASH3,
S_INVULNFLASH4,
//{ Fake Item
//{ Eggman Monitor
S_FAKEITEM1,
S_FAKEITEM2,
S_FAKEITEM3,

36
src/k_kart.c
View File

@ -297,7 +297,7 @@ void K_RegisterKartStuff(void)
CV_RegisterVar(&cv_rocketsneaker);
CV_RegisterVar(&cv_invincibility);
CV_RegisterVar(&cv_banana);
CV_RegisterVar(&cv_fakeitem);
CV_RegisterVar(&cv_eggmanmonitor);
CV_RegisterVar(&cv_orbinaut);
CV_RegisterVar(&cv_jawz);
CV_RegisterVar(&cv_mine);
@ -371,7 +371,7 @@ static INT32 K_KartItemOddsDistance_Retro[NUMKARTRESULTS][9] =
/*Rocket Sneaker*/ { 0, 0, 0, 0, 0, 0, 4, 6, 8 }, // Rocket Sneaker
/*Invincibility*/ { 0, 0, 0, 0, 0, 1, 6, 8,12 }, // Invincibility
/*Banana*/ { 0, 9, 4, 2, 1, 0, 0, 0, 0 }, // Banana
/*Fake Item*/ { 0, 4, 2, 1, 0, 0, 0, 0, 0 }, // Fake Item
/*Eggman Monitor*/ { 0, 4, 2, 1, 0, 0, 0, 0, 0 }, // Eggman Monitor
/*Orbinaut*/ { 0, 6, 4, 3, 2, 0, 0, 0, 0 }, // Orbinaut
/*Jawz*/ { 0, 0, 3, 2, 2, 1, 0, 0, 0 }, // Jawz
/*Mine*/ { 0, 0, 1, 2, 1, 0, 0, 0, 0 }, // Mine
@ -397,7 +397,7 @@ static INT32 K_KartItemOddsBalloons[NUMKARTRESULTS][5] =
/*Rocket Sneaker*/ { 0, 0, 0, 0, 0 }, // Rocket Sneaker
/*Invincibility*/ { 1, 1, 0, 0, 0 }, // Invincibility
/*Banana*/ { 0, 0, 3, 1, 1 }, // Banana
/*Fake Item*/ { 0, 0, 2, 2, 1 }, // Fake Item
/*Eggman Monitor*/ { 0, 0, 2, 2, 1 }, // Eggman Monitor
/*Orbinaut*/ { 0, 0, 5, 3, 1 }, // Orbinaut
/*Jawz*/ { 0, 3, 3, 1, 0 }, // Jawz
/*Mine*/ { 0, 3, 3, 0, 0 }, // Mine
@ -493,8 +493,8 @@ static INT32 K_KartGetItemOdds(UINT8 pos, INT8 item, player_t *player)
case KITEM_BANANA:
if (!cv_banana.value) newodds = 0;
break;
case KITEM_FAKE:
if (!cv_fakeitem.value) newodds = 0;
case KITEM_EGGMAN:
if (!cv_eggmanmonitor.value) newodds = 0;
break;
case KITEM_ORBINAUT:
if (!cv_orbinaut.value) newodds = 0;
@ -604,7 +604,7 @@ static void K_KartItemRouletteByDistance(player_t *player, ticcmd_t *cmd)
// 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_fakeitem] || player->kartstuff[k_itemheld])
|| ((cmd->buttons & BT_ATTACK) && !(player->kartstuff[k_eggmanheld] || player->kartstuff[k_itemheld])
&& player->kartstuff[k_itemroulette] >= roulettestop)))
return;
@ -715,7 +715,7 @@ static void K_KartItemRouletteByDistance(player_t *player, ticcmd_t *cmd)
SETITEMRESULT(useodds, KITEM_ROCKETSNEAKER); // Rocket Sneaker
SETITEMRESULT(useodds, KITEM_INVINCIBILITY); // Invincibility
SETITEMRESULT(useodds, KITEM_BANANA); // Banana
SETITEMRESULT(useodds, KITEM_FAKE); // Fake Item
SETITEMRESULT(useodds, KITEM_EGGMAN); // Eggman Monitor
SETITEMRESULT(useodds, KITEM_ORBINAUT); // Orbinaut
SETITEMRESULT(useodds, KITEM_JAWZ); // Jawz
SETITEMRESULT(useodds, KITEM_MINE); // Mine
@ -2667,7 +2667,7 @@ static void K_StripItems(player_t *player)
player->kartstuff[k_growshrinktimer] = 0;
player->kartstuff[k_attractiontimer] = 0;
player->kartstuff[k_invincibilitytimer] = 0;
player->kartstuff[k_fakeitem] = 0;
player->kartstuff[k_eggmanheld] = 0;
player->kartstuff[k_sadtimer] = 0;
}
//
@ -2677,7 +2677,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
{
ticcmd_t *cmd = &player->cmd;
boolean ATTACK_IS_DOWN = ((cmd->buttons & BT_ATTACK) && !(player->pflags & PF_ATTACKDOWN));
boolean HOLDING_ITEM = (player->kartstuff[k_itemheld] || player->kartstuff[k_fakeitem]);
boolean HOLDING_ITEM = (player->kartstuff[k_itemheld] || player->kartstuff[k_eggmanheld]);
boolean NO_HYUDORO = (player->kartstuff[k_stolentimer] == 0 && player->kartstuff[k_stealingtimer] == 0);
K_KartUpdatePosition(player);
@ -2712,12 +2712,12 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
if (player && player->mo && player->mo->health > 0 && !player->spectator && !player->exiting && player->kartstuff[k_spinouttimer] == 0)
{
// Fake Item dropping
if (!(cmd->buttons & BT_ATTACK) && player->kartstuff[k_fakeitem])
// Eggman Monitor dropping
if (!(cmd->buttons & BT_ATTACK) && player->kartstuff[k_eggmanheld])
{
K_ThrowKartItem(player, false, MT_FAKEITEM, -1, false);
K_PlayTauntSound(player->mo);
player->kartstuff[k_fakeitem] = 0;
player->kartstuff[k_eggmanheld] = 0;
}
// Rocket Sneaker power
else if (ATTACK_IS_DOWN && !HOLDING_ITEM && onground && NO_HYUDORO
@ -2837,7 +2837,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
player->kartstuff[k_itemheld] = 0;
}
break;
case KITEM_FAKE:
case KITEM_EGGMAN:
if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO)
{
angle_t newangle;
@ -2845,7 +2845,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
fixed_t newy;
mobj_t *mo;
player->kartstuff[k_itemamount]--;
player->kartstuff[k_fakeitem] = 1;
player->kartstuff[k_eggmanheld] = 1;
player->pflags |= PF_ATTACKDOWN;
newangle = player->mo->angle;
newx = player->mo->x + P_ReturnThrustX(player->mo, newangle + ANGLE_180, 64*FRACUNIT);
@ -3392,7 +3392,7 @@ static patch_t *kp_sneaker;
static patch_t *kp_rocketsneaker;
static patch_t *kp_invincibility[7];
static patch_t *kp_banana;
static patch_t *kp_fakeitem;
static patch_t *kp_eggman;
static patch_t *kp_orbinaut;
static patch_t *kp_jawz;
static patch_t *kp_mine;
@ -3509,7 +3509,7 @@ void K_LoadKartHUDGraphics(void)
kp_invincibility[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
}
kp_banana = W_CachePatchName("K_ITBANA", PU_HUDGFX);
kp_fakeitem = W_CachePatchName("K_ITFAKE", PU_HUDGFX);
kp_eggman = W_CachePatchName("K_ITEGGM", PU_HUDGFX);
kp_orbinaut = W_CachePatchName("K_ITORBN", PU_HUDGFX);
kp_jawz = W_CachePatchName("K_ITJAWZ", PU_HUDGFX);
kp_mine = W_CachePatchName("K_ITMINE", PU_HUDGFX);
@ -3707,7 +3707,7 @@ static void K_drawKartItem(void)
case 8: localpatch = kp_selfpropelledbomb; break; // Self-Propelled Bomb
case 9: localpatch = kp_shrink; break; // Shrink
case 10: localpatch = localinv; break; // Invincibility
case 11: localpatch = kp_fakeitem; break; // Fake Item
case 11: localpatch = kp_eggman; break; // Eggman Monitor
case 12: localpatch = kp_ballhog; break; // Ballhog
case 13: localpatch = kp_lightningshield; break; // Lightning Shield
//case 14: localpatch = kp_pogospring; break; // Pogo Spring
@ -3760,7 +3760,7 @@ static void K_drawKartItem(void)
case KITEM_ROCKETSNEAKER: localpatch = kp_rocketsneaker; break;
case KITEM_INVINCIBILITY: localpatch = localinv; localbg = kp_itembgdark; break;
case KITEM_BANANA: localpatch = kp_banana; break;
case KITEM_FAKE: localpatch = kp_fakeitem; break;
case KITEM_EGGMAN: localpatch = kp_eggman; break;
case KITEM_ORBINAUT: localpatch = kp_orbinaut; break;
case KITEM_JAWZ: localpatch = kp_jawz; break;
case KITEM_MINE: localpatch = kp_mine; break;

2
src/m_menu.c
View File

@ -1512,7 +1512,7 @@ static menuitem_t OP_MonitorToggleMenu[] =
{IT_STRING | IT_CVAR, NULL, "Invinciblity", &cv_invincibility, 34},
{IT_STRING | IT_CVAR, NULL, "Bananas", &cv_banana, 42},
{IT_STRING | IT_CVAR, NULL, "Triple Bananas", &cv_triplebanana, 50},
{IT_STRING | IT_CVAR, NULL, "Fake Items", &cv_fakeitem, 58},
{IT_STRING | IT_CVAR, NULL, "Eggman Monitors", &cv_eggmanmonitor, 58},
{IT_STRING | IT_CVAR, NULL, "Orbinauts", &cv_orbinaut, 66},
{IT_STRING | IT_CVAR, NULL, "Triple Orbinauts", &cv_tripleorbinaut, 74},
{IT_STRING | IT_CVAR, NULL, "Jawz", &cv_jawz, 82},

4
src/p_inter.c
View File

@ -2031,8 +2031,8 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source)
// I wish I knew a better way to do this
if (target->target && target->target->player && target->target->player->mo)
{
if (target->target->player->kartstuff[k_fakeitem] && target->type == MT_FAKESHIELD)
target->target->player->kartstuff[k_fakeitem] = 0;
if (target->target->player->kartstuff[k_eggmanheld] && target->type == MT_FAKESHIELD)
target->target->player->kartstuff[k_eggmanheld] = 0;
if ((target->target->player->kartstuff[k_itemheld])
&& ((target->type == MT_GREENSHIELD && target->target->player->kartstuff[k_itemtype] == KITEM_ORBINAUT)

2
src/p_mobj.c
View File

@ -6686,7 +6686,7 @@ void P_MobjThinker(mobj_t *mobj)
|| (mobj->type == MT_REDSHIELD && mobj->target->player->kartstuff[k_itemtype] != KITEM_JAWZ)
|| (mobj->type == MT_BANANASHIELD && mobj->target->player->kartstuff[k_itemtype] != KITEM_BANANA)
|| (mobj->type == MT_MINESHIELD && mobj->target->player->kartstuff[k_itemtype] != KITEM_MINE)
|| (mobj->type == MT_FAKESHIELD && !mobj->target->player->kartstuff[k_fakeitem])
|| (mobj->type == MT_FAKESHIELD && !mobj->target->player->kartstuff[k_eggmanheld])
|| (mobj->type != MT_FAKESHIELD && !mobj->target->player->kartstuff[k_itemheld])
|| (mobj->lastlook > 0 && mobj->target->player->kartstuff[k_itemamount] < mobj->lastlook))
{