thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some of the dehacked tables, change doomednums of haunted heights stuff to not conflict with items/waypoints, use "rings" variable instead of "kartstuff[k_rings]"

Browse source
This commit is contained in:
Sally Coolatta 2020-08-16 01:46:54 -04:00
parent 36885c1343
commit 51aef1ce75
7 changed files with 41 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/dehacked.c
View file

@ -6259,6 +6259,7 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_SIGN_BACK", "S_SIGN_BACK",
"S_SIGN_SIDE", "S_SIGN_SIDE",
"S_SIGN_FACE", "S_SIGN_FACE",
"S_SIGN_DEFAULT",
// Spike Ball // Spike Ball
"S_SPIKEBALL1", "S_SPIKEBALL1",

3
src/g_game.c
View file

@ -2202,7 +2202,7 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
growshrinktimer = 0; growshrinktimer = 0;
bumper = players[player].kartstuff[k_bumper]; bumper = players[player].kartstuff[k_bumper];
rings = players[player].kartstuff[k_rings]; rings = players[player].rings;
comebackpoints = players[player].kartstuff[k_comebackpoints]; comebackpoints = players[player].kartstuff[k_comebackpoints];
wanted = players[player].kartstuff[k_wanted]; wanted = players[player].kartstuff[k_wanted];
} }
@ -2263,7 +2263,6 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
p->kartstuff[k_itemamount] = itemamount; p->kartstuff[k_itemamount] = itemamount;
p->kartstuff[k_growshrinktimer] = growshrinktimer; p->kartstuff[k_growshrinktimer] = growshrinktimer;
p->kartstuff[k_bumper] = bumper; p->kartstuff[k_bumper] = bumper;
p->kartstuff[k_rings] = rings;
p->kartstuff[k_comebackpoints] = comebackpoints; p->kartstuff[k_comebackpoints] = comebackpoints;
p->kartstuff[k_comebacktimer] = comebacktime; p->kartstuff[k_comebacktimer] = comebacktime;
p->kartstuff[k_wanted] = wanted; p->kartstuff[k_wanted] = wanted;

63
src/info.c
View file

@ -47,7 +47,7 @@ char sprnames[NUMSPRITES + 1][5] =
"TRET", // Industrial Turret "TRET", // Industrial Turret
"TURR", // Pop-Up Turret "TURR", // Pop-Up Turret
"SHRP", // Sharp "SHRP", // Sharp
"CRAB", // Crushstacean //"CRAB", // Crushstacean
"CR2B", // Banpyura "CR2B", // Banpyura
"CSPR", // Banpyura spring "CSPR", // Banpyura spring
"JJAW", // Jet Jaw "JJAW", // Jet Jaw
@ -97,8 +97,8 @@ char sprnames[NUMSPRITES + 1][5] =
// Boss 5 (Arid Canyon) // Boss 5 (Arid Canyon)
"FANG", // replaces EGGQ "FANG", // replaces EGGQ
"BRKN", // broken robot chunk "BRKN",
"WHAT", // alart "WHAT",
"VWRE", "VWRE",
"PROJ", // projector light "PROJ", // projector light
"FBOM", "FBOM",
@ -117,7 +117,7 @@ char sprnames[NUMSPRITES + 1][5] =
// Boss 8 (Egg Rock) // Boss 8 (Egg Rock)
"EGGT", "EGGT",
// Cy-Brak-Demon; uses "BRAK" as well, but has some extras // Cy-Brak-Demon; uses "BRAK as well", but has some extras
"RCKT", // Rockets! "RCKT", // Rockets!
"ELEC", // Electricity! "ELEC", // Electricity!
"TARG", // Targeting reticules! "TARG", // Targeting reticules!
@ -135,12 +135,12 @@ char sprnames[NUMSPRITES + 1][5] =
"TOKE", // Special Stage Token "TOKE", // Special Stage Token
"RFLG", // Red CTF Flag "RFLG", // Red CTF Flag
"BFLG", // Blue CTF Flag "BFLG", // Blue CTF Flag
"SPHR", // Sphere //"SPHR", // Sphere
"NCHP", // NiGHTS chip "NCHP", // NiGHTS chip
"NSTR", // NiGHTS star "NSTR", // NiGHTS star
"EMBM", // Emblem "EMBM", // Emblem
"CEMG", // Chaos Emeralds "CEMG", // Chaos Emeralds
"SHRD", // Emerald hunt shards "SHRD", // Emerald Hunt
// Interactive Objects // Interactive Objects
"BBLS", // water bubble source "BBLS", // water bubble source
@ -177,8 +177,8 @@ char sprnames[NUMSPRITES + 1][5] =
"TVMY", // MYstery "TVMY", // MYstery
"TVGV", // GraVity boots "TVGV", // GraVity boots
"TVRC", // ReCycler "TVRC", // ReCycler
"TV1K", // 1,000 points (1 K) "TV1K", // 1",000 points (1 K)
"TVTK", // 10,000 points (Ten K) "TVTK", // 10",000 points (Ten K)
"TVFL", // FLame shield "TVFL", // FLame shield
"TVBB", // BuBble shield "TVBB", // BuBble shield
"TVZP", // Thunder shield (ZaP) "TVZP", // Thunder shield (ZaP)
@ -246,7 +246,7 @@ char sprnames[NUMSPRITES + 1][5] =
"RSPB", // Red spring on a ball "RSPB", // Red spring on a ball
"SFBR", // Small Firebar "SFBR", // Small Firebar
"BFBR", // Big Firebar "BFBR", // Big Firebar
"BANR", // Banner "BANR", // Banner/pole
"PINE", // Pine Tree "PINE", // Pine Tree
"CEZB", // Bush "CEZB", // Bush
"CNDL", // Candle/pricket "CNDL", // Candle/pricket
@ -296,7 +296,7 @@ char sprnames[NUMSPRITES + 1][5] =
"XMS4", // Lamppost "XMS4", // Lamppost
"XMS5", // Hanging Star "XMS5", // Hanging Star
"XMS6", // Mistletoe "XMS6", // Mistletoe
"FHZI", // FHZ ice "FHZI", // FHZ Ice
"ROSY", "ROSY",
// Halloween Scenery // Halloween Scenery
@ -332,15 +332,15 @@ char sprnames[NUMSPRITES + 1][5] =
// Powerup Indicators // Powerup Indicators
"ARMA", // Armageddon Shield Orb "ARMA", // Armageddon Shield Orb
"ARMF", // Armageddon Shield Ring, Front "ARMF", // Armageddon Shield Ring", Front
"ARMB", // Armageddon Shield Ring, Back "ARMB", // Armageddon Shield Ring", Back
"WIND", // Whirlwind Shield Orb "WIND", // Whirlwind Shield Orb
"MAGN", // Attract Shield Orb "MAGN", // Attract Shield Orb
"ELEM", // Elemental Shield Orb and Fire "ELEM", // Elemental Shield Orb
"FORC", // Force Shield Orb "FORC", // Force Shield Orb
"PITY", // Pity Shield Orb "PITY", // Pity Shield Orb
"FIRS", // Flame Shield Orb "FIRS", // Flame Shield Orb
"BUBS", // Bubble Shield Orb //"BUBS", // Bubble Shield Orb
"ZAPS", // Thunder Shield Orb "ZAPS", // Thunder Shield Orb
"IVSP", // invincibility sparkles "IVSP", // invincibility sparkles
"SSPK", // Super Sonic Spark "SSPK", // Super Sonic Spark
@ -371,7 +371,7 @@ char sprnames[NUMSPRITES + 1][5] =
// Springs // Springs
"FANS", // Fan "FANS", // Fan
"STEM", // Steam riser "STEM", // Steam riser
"BUMP", // Bumpers "BMPR", // Bumpers
"BLON", // Balloons "BLON", // Balloons
"SPVY", // Yellow Vertical Spring "SPVY", // Yellow Vertical Spring
"SPVR", // Red Vertical Spring "SPVR", // Red Vertical Spring
@ -391,6 +391,7 @@ char sprnames[NUMSPRITES + 1][5] =
// Environmental Effects // Environmental Effects
"RAIN", // Rain "RAIN", // Rain
"SNO1", // Snowflake "SNO1", // Snowflake
"SNO2", // Blizzard Snowball
"SPLH", // Water Splish "SPLH", // Water Splish
"LSPL", // Lava Splish "LSPL", // Lava Splish
"SPLA", // Water Splash "SPLA", // Water Splash
@ -401,12 +402,12 @@ char sprnames[NUMSPRITES + 1][5] =
"FPRT", // Spindash dust (flame) "FPRT", // Spindash dust (flame)
"TFOG", // Teleport Fog "TFOG", // Teleport Fog
"SEED", // Sonic CD flower seed "SEED", // Sonic CD flower seed
"PRTL", // Particle (for fans, etc.) "PRTL", // Particle (for fans", etc.)
// Game Indicators // Game Indicators
"SCOR", // Score logo "SCOR", // Score logo
"DRWN", // Drowning Timer "DRWN", // Drowning Timer
"FLII", // Flight indicator "FLII", // AI flight indicator
"LCKN", // Target "LCKN", // Target
"TTAG", // Tag Sign "TTAG", // Tag Sign
"GFLG", // Got Flag sign "GFLG", // Got Flag sign
@ -465,7 +466,7 @@ char sprnames[NUMSPRITES + 1][5] =
"NTPN", // Nightopian "NTPN", // Nightopian
"SHLP", // Shleep "SHLP", // Shleep
// Secret badniks and hazards, shhhh // Secret badniks and hazards", shhhh
"PENG", "PENG",
"POPH", "POPH",
"HIVE", "HIVE",
@ -511,8 +512,8 @@ char sprnames[NUMSPRITES + 1][5] =
"BRIC", // Bricks "BRIC", // Bricks
"WDDB", // Wood Debris "WDDB", // Wood Debris
"BRIR", // CEZ3 colored bricks "BRIR", // CEZ3 colored bricks
"BRIB", // CEZ3 colored bricks "BRIB",
"BRIY", // CEZ3 colored bricks "BRIY",
// Gravity Well Objects // Gravity Well Objects
"GWLG", "GWLG",
@ -15664,7 +15665,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
}, },
{ // MT_JACKO1 { // MT_JACKO1
2006, // doomednum 3006, // doomednum
S_JACKO1, // spawnstate S_JACKO1, // spawnstate
1000, // spawnhealth 1000, // spawnhealth
S_NULL, // seestate S_NULL, // seestate
@ -15691,7 +15692,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
}, },
{ // MT_JACKO2 { // MT_JACKO2
2007, // doomednum 3007, // doomednum
S_JACKO2, // spawnstate S_JACKO2, // spawnstate
1000, // spawnhealth 1000, // spawnhealth
S_NULL, // seestate S_NULL, // seestate
@ -15718,7 +15719,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
}, },
{ // MT_JACKO3 { // MT_JACKO3
2008, // doomednum 3008, // doomednum
S_JACKO3, // spawnstate S_JACKO3, // spawnstate
1000, // spawnhealth 1000, // spawnhealth
S_NULL, // seestate S_NULL, // seestate
@ -15745,7 +15746,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
}, },
{ // MT_HHZTREE_TOP { // MT_HHZTREE_TOP
2010, // doomednum 3010, // doomednum
S_HHZTREE_TOP, // spawnstate S_HHZTREE_TOP, // spawnstate
1000, // spawnhealth 1000, // spawnhealth
S_NULL, // seestate S_NULL, // seestate
@ -15799,7 +15800,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
}, },
{ // MT_HHZSHROOM { // MT_HHZSHROOM
2009, // doomednum 3009, // doomednum
S_HHZSHROOM_1, // spawnstate S_HHZSHROOM_1, // spawnstate
1000, // spawnhealth 1000, // spawnhealth
S_NULL, // seestate S_NULL, // seestate
@ -15826,7 +15827,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
}, },
{ // MT_HHZGRASS { // MT_HHZGRASS
2001, // doomednum 3001, // doomednum
S_HHZGRASS, // spawnstate S_HHZGRASS, // spawnstate
1000, // spawnhealth 1000, // spawnhealth
S_NULL, // seestate S_NULL, // seestate
@ -15853,7 +15854,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
}, },
{ // MT_HHZTENTACLE1 { // MT_HHZTENTACLE1
2002, // doomednum 3002, // doomednum
S_HHZTENT1, // spawnstate S_HHZTENT1, // spawnstate
1000, // spawnhealth 1000, // spawnhealth
S_NULL, // seestate S_NULL, // seestate
@ -15880,7 +15881,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
}, },
{ // MT_HHZTENTACLE2 { // MT_HHZTENTACLE2
2003, // doomednum 3003, // doomednum
S_HHZTENT2, // spawnstate S_HHZTENT2, // spawnstate
1000, // spawnhealth 1000, // spawnhealth
S_NULL, // seestate S_NULL, // seestate
@ -15907,7 +15908,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
}, },
{ // MT_HHZSTALAGMITE_TALL { // MT_HHZSTALAGMITE_TALL
2004, // doomednum 3004, // doomednum
S_HHZSTALAGMITE_TALL, // spawnstate S_HHZSTALAGMITE_TALL, // spawnstate
1000, // spawnhealth 1000, // spawnhealth
S_NULL, // seestate S_NULL, // seestate
@ -15934,7 +15935,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
}, },
{ // MT_HHZSTALAGMITE_SHORT { // MT_HHZSTALAGMITE_SHORT
2005, // doomednum 3005, // doomednum
S_HHZSTALAGMITE_SHORT, // spawnstate S_HHZSTALAGMITE_SHORT, // spawnstate
1000, // spawnhealth 1000, // spawnhealth
S_NULL, // seestate S_NULL, // seestate
@ -21536,7 +21537,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
}, },
{ // MT_SMASHINGSPIKEBALL { // MT_SMASHINGSPIKEBALL
2000, // doomednum 3000, // doomednum
S_SMASHSPIKE_FLOAT, // spawnstate S_SMASHSPIKE_FLOAT, // spawnstate
1000, // spawnhealth 1000, // spawnhealth
S_NULL, // seestate S_NULL, // seestate

1
src/info.h
View file

@ -2099,6 +2099,7 @@ typedef enum state
S_SIGN_BACK, S_SIGN_BACK,
S_SIGN_SIDE, S_SIGN_SIDE,
S_SIGN_FACE, S_SIGN_FACE,
S_SIGN_DEFAULT,
// Spike Ball // Spike Ball
S_SPIKEBALL1, S_SPIKEBALL1,

4
src/k_botitem.c
View file

@ -917,7 +917,7 @@ static void K_BotItemRings(player_t *player, ticcmd_t *cmd)
saferingsval -= 5; saferingsval -= 5;
} }
if (player->kartstuff[k_rings] > saferingsval) if (player->rings > saferingsval)
{ {
cmd->buttons |= BT_ATTACK; cmd->buttons |= BT_ATTACK;
} }
@ -944,7 +944,7 @@ static void K_BotItemRouletteMash(player_t *player, ticcmd_t *cmd)
return; return;
} }
if (player->kartstuff[k_rings] < 0 && cv_superring.value) if (player->rings < 0 && cv_superring.value)
{ {
// Uh oh, we need a loan! // Uh oh, we need a loan!
// It'll be better in the long run for bots to lose an item set for 10 free rings. // It'll be better in the long run for bots to lose an item set for 10 free rings.

4
src/k_botsearch.c
View file

@ -694,8 +694,8 @@ static boolean K_BotSteerObjects(mobj_t *thing)
) )
// Ring Sting // Ring Sting
else PlayerAttackSteer( else PlayerAttackSteer(
thing->player->kartstuff[k_rings] <= 0, thing->player->rings <= 0,
globalsmuggle.botmo->player->kartstuff[k_rings] <= 0 globalsmuggle.botmo->player->rings <= 0
) )
else else
{ {

4
src/k_kart.c
View file

@ -902,9 +902,9 @@ static void K_KartItemRoulette(player_t *player, ticcmd_t *cmd)
// SPECIAL CASE No. 4: // SPECIAL CASE No. 4:
// Being in ring debt occasionally forces Super Ring on you if you mashed // Being in ring debt occasionally forces Super Ring on you if you mashed
if ((gametyperules & GTR_RINGS) && mashed && player->kartstuff[k_rings] < 0 && cv_superring.value) if ((gametyperules & GTR_RINGS) && mashed && player->rings < 0 && cv_superring.value)
{ {
INT32 debtamount = min(20, abs(player->kartstuff[k_rings])); INT32 debtamount = min(20, abs(player->rings));
if (P_RandomChance((debtamount*FRACUNIT)/20)) if (P_RandomChance((debtamount*FRACUNIT)/20))
{ {
K_KartGetItemResult(player, KITEM_SUPERRING); K_KartGetItemResult(player, KITEM_SUPERRING);