Revert "ok kill this again ig"

This reverts commit 98c27fe8ef.
This commit is contained in:
Alug committed 2024-05-25 15:07:07 +02:00
1 parent a35fbdd1b5
commit 8fa99c34be
4 files changed
+85 -2

No files matched your search

+8
View File
@@ -6508,6 +6508,12 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_WATERTRAILUNDERLAY3",
"S_WATERTRAILUNDERLAY4",
"S_WATERTRAILUNDERLAY5",
// Star Smoke
"S_DRIFTSTAR1",
"S_DRIFTSTAR2",
"S_DRIFTSTAR3",
"S_DRIFTSTAR4",
};
// RegEx to generate this from info.h: ^\tMT_([^,]+), --> \t"MT_\1",
@@ -7305,6 +7311,8 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s
"MT_WATERTRAIL",
"MT_WATERTRAILUNDERLAY",
"MT_STARDUST",
};
static const char *const MOBJFLAG_LIST[] = {
+33 -1
View File
@@ -66,7 +66,7 @@ char sprnames[NUMSPRITES + 1][5] =
"CNDL","DOCH","DUCK","GTRE","CHES","CHIM","DRGN","LZMN","PGSS","ZTCH",
"MKMA","MKMP","RTCH","BOWL","BOWH","BRRL","BRRR","HRSE","TOAH","BFRT",
"OFRT","RFRT","PFRT","ASPK","HBST","HBSO","HBSF","WBLZ","WBLN","OPUL",
"TGEM","TCOI","FWRK","XMS4","XMS5","VIEW","WTRL"
"TGEM","TCOI","FWRK","XMS4","XMS5","VIEW","WTRL","DSTR"
};
// Doesn't work with g++, needs actionf_p1 (don't modify this comment)
@@ -3422,6 +3422,11 @@ state_t states[NUMSTATES] =
{SPR_WTRL, FF_TRANS50|FF_PAPERSPRITE|7, 2, {NULL}, 0, 0, S_INVISIBLE}, // S_WATERTRAILUNDERLAY3
{SPR_WTRL, FF_TRANS50|FF_PAPERSPRITE|8, 2, {NULL}, 0, 0, S_INVISIBLE}, // S_WATERTRAILUNDERLAY4
{SPR_WTRL, FF_TRANS50|FF_PAPERSPRITE|9, 2, {NULL}, 0, 0, S_INVISIBLE}, // S_WATERTRAILUNDERLAY5
{SPR_DSTR, 0, 3, {NULL}, 0, 0, S_DRIFTSTAR2}, // S_DRIFTSTAR1
{SPR_DSTR, 1, 3, {NULL}, 0, 0, S_DRIFTSTAR3}, // S_DRIFTSTAR2
{SPR_DSTR, FF_TRANS20|2, 3, {NULL}, 0, 0, S_DRIFTSTAR4}, // S_DRIFTSTAR3
{SPR_DSTR, FF_TRANS20|3, 3, {NULL}, 0, 0, S_NULL}, // S_DRIFTSTAR4
};
mobjinfo_t mobjinfo[NUMMOBJTYPES] =
@@ -20269,6 +20274,33 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
MF_NOBLOCKMAP|MF_NOCLIP|MF_NOGRAVITY|MF_SCENERY|MF_DONTENCOREMAP, // flags
S_NULL // raisestate
},
{ // MT_STARDUST
-1, // doomednum
S_DRIFTSTAR1, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
8, // reactiontime
sfx_None, // attacksound
S_NULL, // painstate
12, // painchance
sfx_None, // painsound
S_NULL, // meleestate
S_NULL, // missilestate
S_NULL, // deathstate
S_NULL, // xdeathstate
sfx_None, // deathsound
8, // speed
8*FRACUNIT, // radius
15*FRACUNIT, // height
0, // display offset
100, // mass
0, // damage
sfx_None, // activesound
MF_NOBLOCKMAP|MF_NOCLIPHEIGHT|MF_NOGRAVITY|MF_FLOAT|MF_SCENERY|MF_DONTENCOREMAP, // flags
S_NULL // raisestate
},
};
+10
View File
@@ -1018,6 +1018,8 @@ typedef enum sprite
SPR_WTRL, // Water Trail
SPR_DSTR, // Star Dust
SPR_FIRSTFREESLOT,
SPR_LASTFREESLOT = SPR_FIRSTFREESLOT + NUMSPRITEFREESLOTS - 1,
NUMSPRITES
@@ -4317,6 +4319,12 @@ typedef enum state
S_WATERTRAILUNDERLAY4,
S_WATERTRAILUNDERLAY5,
// Star Smoke
S_DRIFTSTAR1,
S_DRIFTSTAR2,
S_DRIFTSTAR3,
S_DRIFTSTAR4,
S_FIRSTFREESLOT,
S_LASTFREESLOT = S_FIRSTFREESLOT + NUMSTATEFREESLOTS - 1,
NUMSTATES
@@ -5131,6 +5139,8 @@ typedef enum mobj_type
MT_WATERTRAIL,
MT_WATERTRAILUNDERLAY,
MT_STARDUST,
MT_FIRSTFREESLOT,
MT_LASTFREESLOT = MT_FIRSTFREESLOT + NUMMOBJFREESLOTS - 1,
NUMMOBJTYPES
+34 -1
View File
@@ -3464,7 +3464,7 @@ void K_DriftDustHandling(mobj_t *spawner)
if (anglediff > ANGLE_180)
anglediff = InvAngle(anglediff);
if (anglediff > ANG10*4) // Trying to turn further than 40 degrees
/*if (anglediff > ANG10*4) // Trying to turn further than 40 degrees
{
fixed_t spawnx = P_RandomRange(-spawnrange, spawnrange)<<FRACBITS;
fixed_t spawny = P_RandomRange(-spawnrange, spawnrange)<<FRACBITS;
@@ -3481,6 +3481,39 @@ void K_DriftDustHandling(mobj_t *spawner)
S_StartSound(spawner, sfx_screec);
K_MatchGenericExtraFlags(dust, spawner);
}*/
if (anglediff > ANG10*4) // Trying to turn further than 40 degrees
{
fixed_t spawnx = P_RandomRange(-spawnrange, spawnrange)<<FRACBITS;
fixed_t spawny = P_RandomRange(-spawnrange, spawnrange)<<FRACBITS;
INT32 speedrange = 2;
mobj_t *dust = P_SpawnMobj(spawner->x + spawnx, spawner->y + spawny, spawner->z, MT_STARDUST);
dust->momx = FixedMul(spawner->momx + (P_RandomRange(-speedrange, speedrange)<<FRACBITS), 3*(spawner->scale)/4);
dust->momy = FixedMul(spawner->momy + (P_RandomRange(-speedrange, speedrange)<<FRACBITS), 3*(spawner->scale)/4);
dust->momz = P_MobjFlip(spawner) * (P_RandomRange(1, 4) * (spawner->scale));
P_SetScale(dust, spawner->scale/2);
dust->destscale = spawner->scale * 3;
dust->scalespeed = spawner->scale/12;
if (leveltime % 6 == 0)
S_StartSound(spawner, sfx_screec);
K_MatchGenericExtraFlags(dust, spawner);
if (spawner->player->kartstuff[k_driftcharge] >= K_GetKartDriftSparkValue(spawner->player)*4)
dust->color = 1 + (leveltime % (MAXSKINCOLORS-1));
else if (spawner->player->kartstuff[k_driftcharge] >= K_GetKartDriftSparkValue(spawner->player)*2)
{
if (spawner->player->kartstuff[k_driftcharge] <= (K_GetKartDriftSparkValue(spawner->player)*2)+(24*3))
dust->color = SKINCOLOR_RASPBERRY; // transition
else
dust->color = SKINCOLOR_KETCHUP;
}
else if (spawner->player->kartstuff[k_driftcharge] >= K_GetKartDriftSparkValue(spawner->player))
dust->color = SKINCOLOR_SAPPHIRE;
else
dust->color = spawner->player->skincolor;
}
}