stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-27 22:52:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'state-changes' into 'next'

Browse source 
Update Nightopians & other state changes

See merge request STJr/SRB2!1744
This commit is contained in:
sphere 2022-03-06 15:45:59 +00:00
commit 7e26377264
5 changed files with 35 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
extras/conf/SRB2-22.cfg
View file

@ -6298,10 +6298,10 @@ thingtypes
} }
1602 1602
{ {
title = "Pian"; title = "Nightopian";
sprite = "NTPNALAR"; sprite = "NTPNA1";
width = 16; width = 16;
height = 32; height = 40;
} }
} }

6
extras/conf/udb/Includes/SRB222_things.cfg
View file

@ -2528,10 +2528,10 @@ dreamhill
} }
1602 1602
{ {
title = "Pian"; title = "Nightopian";
sprite = "NTPNALAR"; sprite = "NTPNA1";
width = 16; width = 16;
height = 32; height = 40;
} }
} }

15
src/deh_tables.c
View file

@ -3345,14 +3345,13 @@ const char *const STATE_LIST[] = { // array length left dynamic for sanity testi
"S_NIGHTOPIANHELPER9", "S_NIGHTOPIANHELPER9",
// Nightopian // Nightopian
"S_PIAN0", "S_PIAN_LOOK1",
"S_PIAN1", "S_PIAN_LOOK2",
"S_PIAN2", "S_PIAN_LOOK3",
"S_PIAN3", "S_PIAN_FLY1",
"S_PIAN4", "S_PIAN_FLY2",
"S_PIAN5", "S_PIAN_FLY3",
"S_PIAN6", "S_PIAN_SING",
"S_PIANSING",
// Shleep // Shleep
"S_SHLEEP1", "S_SHLEEP1",

31
src/info.c
View file

@ -2222,7 +2222,7 @@ state_t states[NUMSTATES] =
{SPR_GARG, 1, -1, {NULL}, 0, 0, S_NULL}, // S_BIGGARGOYLE {SPR_GARG, 1, -1, {NULL}, 0, 0, S_NULL}, // S_BIGGARGOYLE
// DSZ Seaweed // DSZ Seaweed
{SPR_SEWE, 0, -1, {NULL}, 0, 0, S_SEAWEED2}, // S_SEAWEED1 {SPR_SEWE, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 26, 3, S_SEAWEED1}, // S_SEAWEED1
{SPR_SEWE, 1, 5, {NULL}, 0, 0, S_SEAWEED3}, // S_SEAWEED2 {SPR_SEWE, 1, 5, {NULL}, 0, 0, S_SEAWEED3}, // S_SEAWEED2
{SPR_SEWE, 2, 5, {NULL}, 0, 0, S_SEAWEED4}, // S_SEAWEED3 {SPR_SEWE, 2, 5, {NULL}, 0, 0, S_SEAWEED4}, // S_SEAWEED3
{SPR_SEWE, 3, 5, {NULL}, 0, 0, S_SEAWEED5}, // S_SEAWEED4 {SPR_SEWE, 3, 5, {NULL}, 0, 0, S_SEAWEED5}, // S_SEAWEED4
@ -3790,14 +3790,13 @@ state_t states[NUMSTATES] =
{SPR_FL01, 3, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER1}, // S_NIGHTOPIANHELPER9 {SPR_FL01, 3, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER1}, // S_NIGHTOPIANHELPER9
// Nightopian // Nightopian
{SPR_NTPN, 0, 4, {A_Look}, 0, 0, S_PIAN0}, // S_PIAN0 {SPR_NTPN, 0, 2, {A_Look}, 1, 1, S_PIAN_LOOK2}, // S_PIAN_LOOK1
{SPR_NTPN, 0, 4, {A_JetgThink}, 0, 0, S_PIAN2}, // S_PIAN1 {SPR_NTPN, 1, 2, {A_Look}, 1, 1, S_PIAN_LOOK3}, // S_PIAN_LOOK2
{SPR_NTPN, 1, 4, {NULL}, 0, 0, S_PIAN3}, // S_PIAN2 {SPR_NTPN, 2, 2, {A_Look}, 1, 1, S_PIAN_LOOK1}, // S_PIAN_LOOK3
{SPR_NTPN, 2, 4, {NULL}, 0, 0, S_PIAN4}, // S_PIAN3 {SPR_NTPN, 0, 2, {A_JetgThink}, 0, 0, S_PIAN_FLY2}, // S_PIAN_FLY1
{SPR_NTPN, 3, 4, {NULL}, 0, 0, S_PIAN5}, // S_PIAN4 {SPR_NTPN, 1, 2, {NULL}, 0, 0, S_PIAN_FLY3}, // S_PIAN_FLY2
{SPR_NTPN, 2, 4, {NULL}, 0, 0, S_PIAN6}, // S_PIAN5 {SPR_NTPN, 2, 2, {NULL}, 0, 0, S_PIAN_FLY1}, // S_PIAN_FLY3
{SPR_NTPN, 1, 4, {NULL}, 0, 0, S_PIAN1}, // S_PIAN6 {SPR_NTPN, 3|FF_ANIMATE, 24, {NULL}, 2, 2, S_PIAN_FLY1}, // S_PIAN_SING
{SPR_NTPN, 4|FF_ANIMATE, 24, {NULL}, 1, 4, S_PIAN1}, // S_PIANSING
// Shleep // Shleep
{SPR_SHLP, 0, 15, {NULL}, 0, 0, S_SHLEEP2}, // S_SHLEEP1 {SPR_SHLP, 0, 15, {NULL}, 0, 0, S_SHLEEP2}, // S_SHLEEP1
@ -9830,8 +9829,8 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_None, // painsound sfx_None, // painsound
S_NULL, // meleestate S_NULL, // meleestate
S_NULL, // missilestate S_NULL, // missilestate
S_MINE_BOOM1, // deathstate S_XPLD1, // deathstate
S_MINE_BOOM1, // xdeathstate S_XPLD1, // xdeathstate
sfx_cybdth, // deathsound sfx_cybdth, // deathsound
0, // speed 0, // speed
8*FRACUNIT, // radius 8*FRACUNIT, // radius
@ -20281,9 +20280,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
{ // MT_PIAN { // MT_PIAN
1602, // doomednum 1602, // doomednum
S_PIAN0, // spawnstate S_PIAN_LOOK1, // spawnstate
1000, // spawnhealth 1000, // spawnhealth
S_PIAN1, // seestate S_PIAN_FLY1, // seestate
sfx_None, // seesound sfx_None, // seesound
0, // reactiontime 0, // reactiontime
sfx_None, // attacksound sfx_None, // attacksound
@ -20291,18 +20290,18 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
200, // painchance 200, // painchance
sfx_None, // painsound sfx_None, // painsound
S_NULL, // meleestate S_NULL, // meleestate
S_PIANSING, // missilestate S_PIAN_SING, // missilestate
S_NULL, // deathstate S_NULL, // deathstate
S_NULL, // xdeathstate S_NULL, // xdeathstate
sfx_None, // deathsound sfx_None, // deathsound
FRACUNIT, // speed FRACUNIT, // speed
16*FRACUNIT, // radius 16*FRACUNIT, // radius
32*FRACUNIT, // height 40*FRACUNIT, // height
0, // display offset 0, // display offset
16, // mass 16, // mass
0, // damage 0, // damage
sfx_None, // activesound sfx_None, // activesound
MF_SLIDEME|MF_SPECIAL|MF_NOGRAVITY, // flags MF_SLIDEME|MF_NOGRAVITY, // flags
S_NULL // raisestate S_NULL // raisestate
}, },

15
src/info.h
View file

@ -4151,14 +4151,13 @@ typedef enum state
S_NIGHTOPIANHELPER9, S_NIGHTOPIANHELPER9,
// Nightopian // Nightopian
S_PIAN0, S_PIAN_LOOK1,
S_PIAN1, S_PIAN_LOOK2,
S_PIAN2, S_PIAN_LOOK3,
S_PIAN3, S_PIAN_FLY1,
S_PIAN4, S_PIAN_FLY2,
S_PIAN5, S_PIAN_FLY3,
S_PIAN6, S_PIAN_SING,
S_PIANSING,
// Shleep // Shleep
S_SHLEEP1, S_SHLEEP1,