Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2Internal
This commit is contained in:
commit
8d9ef84970
|
@ -7500,6 +7500,9 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
|
||||||
"S_POPHAT_SHOOT1",
|
"S_POPHAT_SHOOT1",
|
||||||
"S_POPHAT_SHOOT2",
|
"S_POPHAT_SHOOT2",
|
||||||
"S_POPHAT_SHOOT3",
|
"S_POPHAT_SHOOT3",
|
||||||
|
"S_POPHAT_SHOOT4",
|
||||||
|
"S_POPSHOT",
|
||||||
|
"S_POPSHOT_TRAIL",
|
||||||
|
|
||||||
"S_HIVEELEMENTAL_LOOK",
|
"S_HIVEELEMENTAL_LOOK",
|
||||||
"S_HIVEELEMENTAL_PREPARE1",
|
"S_HIVEELEMENTAL_PREPARE1",
|
||||||
|
@ -8364,6 +8367,7 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s
|
||||||
"MT_PENGUINATOR",
|
"MT_PENGUINATOR",
|
||||||
"MT_POPHAT",
|
"MT_POPHAT",
|
||||||
"MT_POPSHOT",
|
"MT_POPSHOT",
|
||||||
|
"MT_POPSHOT_TRAIL",
|
||||||
|
|
||||||
"MT_HIVEELEMENTAL",
|
"MT_HIVEELEMENTAL",
|
||||||
"MT_BUMBLEBORE",
|
"MT_BUMBLEBORE",
|
||||||
|
|
44
src/info.c
44
src/info.c
|
@ -3723,9 +3723,12 @@ state_t states[NUMSTATES] =
|
||||||
{SPR_PENG, 0, 5, {A_FaceTarget}, 0, 0, S_PENGUINATOR_LOOK}, // S_PENGUINATOR_SLIDE5
|
{SPR_PENG, 0, 5, {A_FaceTarget}, 0, 0, S_PENGUINATOR_LOOK}, // S_PENGUINATOR_SLIDE5
|
||||||
|
|
||||||
{SPR_POPH, 0, 2, {A_Look}, (2048<<16)|1, 0, S_POPHAT_LOOK}, // S_POPHAT_LOOK
|
{SPR_POPH, 0, 2, {A_Look}, (2048<<16)|1, 0, S_POPHAT_LOOK}, // S_POPHAT_LOOK
|
||||||
{SPR_POPH, 1, 2, {A_LobShot}, MT_POPSHOT, (70<<16)|60, S_POPHAT_SHOOT2}, // S_POPHAT_SHOOT1
|
{SPR_POPH, 1, 0, {A_MultiShotDist}, (MT_SPINDUST<<16)|4, 24, S_POPHAT_SHOOT2}, // S_POPHAT_SHOOT1
|
||||||
{SPR_POPH, 2, 1, {NULL}, 0, 0, S_POPHAT_SHOOT3}, // S_POPHAT_SHOOT2
|
{SPR_POPH, 1, 2, {A_LobShot}, MT_POPSHOT, (70<<16)|60, S_POPHAT_SHOOT3}, // S_POPHAT_SHOOT2
|
||||||
{SPR_POPH, 0, 57, {NULL}, 0, 0, S_POPHAT_LOOK}, // S_POPHAT_SHOOT3
|
{SPR_POPH, 2, 1, {NULL}, 0, 0, S_POPHAT_SHOOT4}, // S_POPHAT_SHOOT3
|
||||||
|
{SPR_POPH, 0, 57, {NULL}, 0, 0, S_POPHAT_LOOK}, // S_POPHAT_SHOOT4
|
||||||
|
{SPR_POPH, 3, 3, {A_SpawnObjectRelative}, 0, MT_POPSHOT_TRAIL, S_POPSHOT}, // S_POPSHOT
|
||||||
|
{SPR_NULL, 0, 2, {NULL}, 0, 0, S_SPINDUST1}, // S_POPSHOT_TRAIL
|
||||||
|
|
||||||
{SPR_HIVE, 0, 5, {A_Look}, 1, 1, S_HIVEELEMENTAL_LOOK}, // S_HIVEELEMENTAL_LOOK
|
{SPR_HIVE, 0, 5, {A_Look}, 1, 1, S_HIVEELEMENTAL_LOOK}, // S_HIVEELEMENTAL_LOOK
|
||||||
{SPR_HIVE, 0, 14, {A_PlaySound}, sfx_s3k76, 1, S_HIVEELEMENTAL_PREPARE2}, // S_HIVEELEMENTAL_PREPARE1
|
{SPR_HIVE, 0, 14, {A_PlaySound}, sfx_s3k76, 1, S_HIVEELEMENTAL_PREPARE2}, // S_HIVEELEMENTAL_PREPARE1
|
||||||
|
@ -19990,10 +19993,10 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
|
||||||
|
|
||||||
{ // MT_POPSHOT
|
{ // MT_POPSHOT
|
||||||
-1, // doomednum
|
-1, // doomednum
|
||||||
S_ROCKCRUMBLEI, // spawnstate
|
S_POPSHOT, // spawnstate
|
||||||
1, // spawnhealth
|
1, // spawnhealth
|
||||||
S_NULL, // seestate
|
S_NULL, // seestate
|
||||||
sfx_cannon, // seesound
|
sfx_kc4c, // seesound
|
||||||
0, // reactiontime
|
0, // reactiontime
|
||||||
sfx_None, // attacksound
|
sfx_None, // attacksound
|
||||||
S_NULL, // painstate
|
S_NULL, // painstate
|
||||||
|
@ -20001,9 +20004,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
|
||||||
sfx_None, // painsound
|
sfx_None, // painsound
|
||||||
S_NULL, // meleestate
|
S_NULL, // meleestate
|
||||||
S_NULL, // missilestate
|
S_NULL, // missilestate
|
||||||
S_XPLD1, // deathstate
|
S_SONIC3KBOSSEXPLOSION1, // deathstate
|
||||||
S_NULL, // xdeathstate
|
S_NULL, // xdeathstate
|
||||||
sfx_pop, // deathsound
|
sfx_cybdth, // deathsound
|
||||||
0, // speed
|
0, // speed
|
||||||
16*FRACUNIT, // radius
|
16*FRACUNIT, // radius
|
||||||
32*FRACUNIT, // height
|
32*FRACUNIT, // height
|
||||||
|
@ -20015,6 +20018,33 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
|
||||||
S_NULL // raisestate
|
S_NULL // raisestate
|
||||||
},
|
},
|
||||||
|
|
||||||
|
{ // MT_POPSHOT_TRAIL
|
||||||
|
-1, // doomednum
|
||||||
|
S_POPSHOT_TRAIL,// spawnstate
|
||||||
|
1000, // spawnhealth
|
||||||
|
S_NULL, // seestate
|
||||||
|
sfx_None, // seesound
|
||||||
|
8, // reactiontime
|
||||||
|
sfx_None, // attacksound
|
||||||
|
S_NULL, // painstate
|
||||||
|
0, // painchance
|
||||||
|
sfx_None, // painsound
|
||||||
|
S_NULL, // meleestate
|
||||||
|
S_NULL, // missilestate
|
||||||
|
S_NULL, // deathstate
|
||||||
|
S_NULL, // xdeathstate
|
||||||
|
sfx_None, // deathsound
|
||||||
|
4*FRACUNIT, // speed
|
||||||
|
4*FRACUNIT, // radius
|
||||||
|
4*FRACUNIT, // height
|
||||||
|
0, // display offset
|
||||||
|
4, // mass
|
||||||
|
0, // damage
|
||||||
|
sfx_None, // activesound
|
||||||
|
MF_NOBLOCKMAP|MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_NOCLIP, // flags
|
||||||
|
S_NULL // raisestate
|
||||||
|
},
|
||||||
|
|
||||||
{ // MT_HIVEELEMENTAL
|
{ // MT_HIVEELEMENTAL
|
||||||
127, // doomednum
|
127, // doomednum
|
||||||
S_HIVEELEMENTAL_LOOK, // spawnstate
|
S_HIVEELEMENTAL_LOOK, // spawnstate
|
||||||
|
|
|
@ -3813,6 +3813,9 @@ typedef enum state
|
||||||
S_POPHAT_SHOOT1,
|
S_POPHAT_SHOOT1,
|
||||||
S_POPHAT_SHOOT2,
|
S_POPHAT_SHOOT2,
|
||||||
S_POPHAT_SHOOT3,
|
S_POPHAT_SHOOT3,
|
||||||
|
S_POPHAT_SHOOT4,
|
||||||
|
S_POPSHOT,
|
||||||
|
S_POPSHOT_TRAIL,
|
||||||
|
|
||||||
S_HIVEELEMENTAL_LOOK,
|
S_HIVEELEMENTAL_LOOK,
|
||||||
S_HIVEELEMENTAL_PREPARE1,
|
S_HIVEELEMENTAL_PREPARE1,
|
||||||
|
@ -4699,6 +4702,7 @@ typedef enum mobj_type
|
||||||
MT_PENGUINATOR,
|
MT_PENGUINATOR,
|
||||||
MT_POPHAT,
|
MT_POPHAT,
|
||||||
MT_POPSHOT,
|
MT_POPSHOT,
|
||||||
|
MT_POPSHOT_TRAIL,
|
||||||
|
|
||||||
MT_HIVEELEMENTAL,
|
MT_HIVEELEMENTAL,
|
||||||
MT_BUMBLEBORE,
|
MT_BUMBLEBORE,
|
||||||
|
|
|
@ -2741,7 +2741,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damaget
|
||||||
|
|
||||||
case MT_EGGTRAP:
|
case MT_EGGTRAP:
|
||||||
// Time for birdies! Yaaaaaaaay!
|
// Time for birdies! Yaaaaaaaay!
|
||||||
target->fuse = TICRATE*2;
|
target->fuse = TICRATE;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case MT_MINECART:
|
case MT_MINECART:
|
||||||
|
|
|
@ -246,6 +246,7 @@ boolean P_SetPlayerMobjState(mobj_t *mobj, statenum_t state)
|
||||||
{
|
{
|
||||||
case S_PLAY_STND:
|
case S_PLAY_STND:
|
||||||
case S_PLAY_WAIT:
|
case S_PLAY_WAIT:
|
||||||
|
case S_PLAY_NIGHTS_STAND:
|
||||||
player->panim = PA_IDLE;
|
player->panim = PA_IDLE;
|
||||||
break;
|
break;
|
||||||
case S_PLAY_EDGE:
|
case S_PLAY_EDGE:
|
||||||
|
@ -254,6 +255,7 @@ boolean P_SetPlayerMobjState(mobj_t *mobj, statenum_t state)
|
||||||
case S_PLAY_WALK:
|
case S_PLAY_WALK:
|
||||||
case S_PLAY_SKID:
|
case S_PLAY_SKID:
|
||||||
case S_PLAY_FLOAT:
|
case S_PLAY_FLOAT:
|
||||||
|
case S_PLAY_NIGHTS_FLOAT:
|
||||||
player->panim = PA_WALK;
|
player->panim = PA_WALK;
|
||||||
break;
|
break;
|
||||||
case S_PLAY_RUN:
|
case S_PLAY_RUN:
|
||||||
|
@ -269,6 +271,7 @@ boolean P_SetPlayerMobjState(mobj_t *mobj, statenum_t state)
|
||||||
break;
|
break;
|
||||||
case S_PLAY_ROLL:
|
case S_PLAY_ROLL:
|
||||||
//case S_PLAY_SPINDASH: -- everyone can ROLL thanks to zoom tubes...
|
//case S_PLAY_SPINDASH: -- everyone can ROLL thanks to zoom tubes...
|
||||||
|
case S_PLAY_NIGHTS_ATTACK:
|
||||||
player->panim = PA_ROLL;
|
player->panim = PA_ROLL;
|
||||||
break;
|
break;
|
||||||
case S_PLAY_JUMP:
|
case S_PLAY_JUMP:
|
||||||
|
@ -8227,7 +8230,7 @@ void P_MobjThinker(mobj_t *mobj)
|
||||||
mobj->flags2 ^= MF2_DONTDRAW;
|
mobj->flags2 ^= MF2_DONTDRAW;
|
||||||
break;
|
break;
|
||||||
case MT_EGGTRAP: // Egg Capsule animal release
|
case MT_EGGTRAP: // Egg Capsule animal release
|
||||||
if (mobj->fuse > 0 && mobj->fuse < 2*TICRATE-(TICRATE/7))
|
if (mobj->fuse > 0)// && mobj->fuse < TICRATE-(TICRATE/7))
|
||||||
{
|
{
|
||||||
INT32 i;
|
INT32 i;
|
||||||
fixed_t x,y,z;
|
fixed_t x,y,z;
|
||||||
|
@ -8236,9 +8239,9 @@ void P_MobjThinker(mobj_t *mobj)
|
||||||
mobj_t *flicky;
|
mobj_t *flicky;
|
||||||
|
|
||||||
z = mobj->subsector->sector->floorheight + FRACUNIT + (P_RandomKey(64)<<FRACBITS);
|
z = mobj->subsector->sector->floorheight + FRACUNIT + (P_RandomKey(64)<<FRACBITS);
|
||||||
for (i = 0; i < 2; i++)
|
for (i = 0; i < 3; i++)
|
||||||
{
|
{
|
||||||
const angle_t fa = (P_RandomByte()*FINEANGLES/16) & FINEMASK;
|
const angle_t fa = P_RandomKey(FINEANGLES) & FINEMASK;
|
||||||
ns = 64 * FRACUNIT;
|
ns = 64 * FRACUNIT;
|
||||||
x = mobj->x + FixedMul(FINESINE(fa),ns);
|
x = mobj->x + FixedMul(FINESINE(fa),ns);
|
||||||
y = mobj->y + FixedMul(FINECOSINE(fa),ns);
|
y = mobj->y + FixedMul(FINECOSINE(fa),ns);
|
||||||
|
|
|
@ -2189,6 +2189,11 @@ void P_DoPlayerExit(player_t *player)
|
||||||
player->pflags |= P_GetJumpFlags(player);
|
player->pflags |= P_GetJumpFlags(player);
|
||||||
P_SetPlayerMobjState(player->mo, S_PLAY_JUMP);
|
P_SetPlayerMobjState(player->mo, S_PLAY_JUMP);
|
||||||
}
|
}
|
||||||
|
else if (player->pflags & PF_STARTDASH)
|
||||||
|
{
|
||||||
|
player->pflags &= ~PF_STARTDASH;
|
||||||
|
P_SetPlayerMobjState(player->mo, S_PLAY_STND);
|
||||||
|
}
|
||||||
player->powers[pw_underwater] = 0;
|
player->powers[pw_underwater] = 0;
|
||||||
player->powers[pw_spacetime] = 0;
|
player->powers[pw_spacetime] = 0;
|
||||||
P_RestoreMusic(player);
|
P_RestoreMusic(player);
|
||||||
|
|
|
@ -779,7 +779,7 @@ sfxinfo_t S_sfx[NUMSFX] =
|
||||||
{"kc49", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
{"kc49", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
||||||
{"kc4a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
{"kc4a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
||||||
{"kc4b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
{"kc4b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
||||||
{"kc4c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
{"kc4c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Pop-shot"},
|
||||||
{"kc4d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Power up"},
|
{"kc4d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Power up"},
|
||||||
{"kc4e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
{"kc4e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
||||||
{"kc4f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
{"kc4f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
|
||||||
|
|
Loading…
Reference in New Issue