Use old itembox item definiton and behaviour
This commit is contained in:
NepDisk
parent
5a31a68ddf
commit
4af21646c2
6 changed files with 148 additions and 107 deletions
|
|
@ -3274,6 +3274,18 @@ const char *const STATE_LIST[] = { // array length left dynamic for sanity testi
|
|||
"S_RANDOMITEM10",
|
||||
"S_RANDOMITEM11",
|
||||
"S_RANDOMITEM12",
|
||||
"S_RANDOMITEM13",
|
||||
"S_RANDOMITEM14",
|
||||
"S_RANDOMITEM15",
|
||||
"S_RANDOMITEM16",
|
||||
"S_RANDOMITEM17",
|
||||
"S_RANDOMITEM18",
|
||||
"S_RANDOMITEM19",
|
||||
"S_RANDOMITEM20",
|
||||
"S_RANDOMITEM21",
|
||||
"S_RANDOMITEM22",
|
||||
"S_RANDOMITEM23",
|
||||
"S_RANDOMITEM24",
|
||||
"S_DEADRANDOMITEM",
|
||||
|
||||
// Sphere Box (for Battle)
|
||||
|
|
@ -3289,6 +3301,18 @@ const char *const STATE_LIST[] = { // array length left dynamic for sanity testi
|
|||
"S_SPHEREBOX10",
|
||||
"S_SPHEREBOX11",
|
||||
"S_SPHEREBOX12",
|
||||
"S_SPHEREBOX13",
|
||||
"S_SPHEREBOX14",
|
||||
"S_SPHEREBOX15",
|
||||
"S_SPHEREBOX16",
|
||||
"S_SPHEREBOX17",
|
||||
"S_SPHEREBOX18",
|
||||
"S_SPHEREBOX19",
|
||||
"S_SPHEREBOX20",
|
||||
"S_SPHEREBOX21",
|
||||
"S_SPHEREBOX22",
|
||||
"S_SPHEREBOX23",
|
||||
"S_SPHEREBOX24",
|
||||
"S_DEADSPHEREBOX",
|
||||
|
||||
// Random Item Pop
|
||||
|
|
@ -3441,6 +3465,18 @@ const char *const STATE_LIST[] = { // array length left dynamic for sanity testi
|
|||
"S_EGGMANITEM10",
|
||||
"S_EGGMANITEM11",
|
||||
"S_EGGMANITEM12",
|
||||
"S_EGGMANITEM13",
|
||||
"S_EGGMANITEM14",
|
||||
"S_EGGMANITEM15",
|
||||
"S_EGGMANITEM16",
|
||||
"S_EGGMANITEM17",
|
||||
"S_EGGMANITEM18",
|
||||
"S_EGGMANITEM19",
|
||||
"S_EGGMANITEM20",
|
||||
"S_EGGMANITEM21",
|
||||
"S_EGGMANITEM22",
|
||||
"S_EGGMANITEM23",
|
||||
"S_EGGMANITEM24",
|
||||
"S_EGGMANITEM_DEAD",
|
||||
//}
|
||||
|
||||
|
|
|
|||
116
src/info.c
116
src/info.c
|
|
@ -3830,34 +3830,58 @@ state_t states[NUMSTATES] =
|
|||
{SPR_BRIB, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 31, 1, S_NULL}, // S_BLUEBRICKDEBRIS
|
||||
{SPR_BRIY, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 31, 1, S_NULL}, // S_YELLOWBRICKDEBRIS
|
||||
|
||||
// SRB2kart
|
||||
{SPR_RNDM, FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_RANDOMITEM2}, // S_RANDOMITEM1
|
||||
{SPR_RNDM, 2|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_RANDOMITEM3}, // S_RANDOMITEM2
|
||||
{SPR_RNDM, 4|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_RANDOMITEM4}, // S_RANDOMITEM3
|
||||
{SPR_RNDM, 6|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_RANDOMITEM5}, // S_RANDOMITEM4
|
||||
{SPR_RNDM, 8|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_RANDOMITEM6}, // S_RANDOMITEM5
|
||||
{SPR_RNDM, 10|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_RANDOMITEM7}, // S_RANDOMITEM6
|
||||
{SPR_RNDM, 12|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_RANDOMITEM8}, // S_RANDOMITEM7
|
||||
{SPR_RNDM, 14|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_RANDOMITEM9}, // S_RANDOMITEM8
|
||||
{SPR_RNDM, 16|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_RANDOMITEM10}, // S_RANDOMITEM9
|
||||
{SPR_RNDM, 18|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_RANDOMITEM11}, // S_RANDOMITEM10
|
||||
{SPR_RNDM, 20|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_RANDOMITEM12}, // S_RANDOMITEM11
|
||||
{SPR_RNDM, 22|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_RANDOMITEM1}, // S_RANDOMITEM12
|
||||
{SPR_NULL, 0, 0, {A_ItemPop}, 0, 0, S_RANDOMITEM1}, // S_DEADRANDOMITEM
|
||||
{SPR_RNDM, 0|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM2}, // S_RANDOMITEM1
|
||||
{SPR_RNDM, 1|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM3}, // S_RANDOMITEM2
|
||||
{SPR_RNDM, 2|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM4}, // S_RANDOMITEM3
|
||||
{SPR_RNDM, 3|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM5}, // S_RANDOMITEM4
|
||||
{SPR_RNDM, 4|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM6}, // S_RANDOMITEM5
|
||||
{SPR_RNDM, 5|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM7}, // S_RANDOMITEM6
|
||||
{SPR_RNDM, 6|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM8}, // S_RANDOMITEM7
|
||||
{SPR_RNDM, 7|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM9}, // S_RANDOMITEM8
|
||||
{SPR_RNDM, 8|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM10}, // S_RANDOMITEM9
|
||||
{SPR_RNDM, 9|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM11}, // S_RANDOMITEM10
|
||||
{SPR_RNDM, 10|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM12}, // S_RANDOMITEM11
|
||||
{SPR_RNDM, 11|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM13}, // S_RANDOMITEM12
|
||||
{SPR_RNDM, 12|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM14}, // S_RANDOMITEM13
|
||||
{SPR_RNDM, 13|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM15}, // S_RANDOMITEM14
|
||||
{SPR_RNDM, 14|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM16}, // S_RANDOMITEM15
|
||||
{SPR_RNDM, 15|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM17}, // S_RANDOMITEM16
|
||||
{SPR_RNDM, 16|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM18}, // S_RANDOMITEM17
|
||||
{SPR_RNDM, 17|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM19}, // S_RANDOMITEM18
|
||||
{SPR_RNDM, 18|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM20}, // S_RANDOMITEM19
|
||||
{SPR_RNDM, 19|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM21}, // S_RANDOMITEM20
|
||||
{SPR_RNDM, 20|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM22}, // S_RANDOMITEM21
|
||||
{SPR_RNDM, 21|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM23}, // S_RANDOMITEM22
|
||||
{SPR_RNDM, 22|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM24}, // S_RANDOMITEM23
|
||||
{SPR_RNDM, 23|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM1}, // S_RANDOMITEM24
|
||||
{SPR_RNDM, 0|FF_FULLBRIGHT, 1, {A_ItemPop}, 0, 0, S_NULL}, // S_DEADRANDOMITEM
|
||||
|
||||
{SPR_SBOX, 0|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX2}, // S_SPHEREBOX1
|
||||
{SPR_SBOX, 1|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX3}, // S_SPHEREBOX2
|
||||
{SPR_SBOX, 2|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX4}, // S_SPHEREBOX3
|
||||
{SPR_SBOX, 3|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX5}, // S_SPHEREBOX4
|
||||
{SPR_SBOX, 4|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX6}, // S_SPHEREBOX5
|
||||
{SPR_SBOX, 5|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX7}, // S_SPHEREBOX6
|
||||
{SPR_SBOX, 6|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX8}, // S_SPHEREBOX7
|
||||
{SPR_SBOX, 7|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX9}, // S_SPHEREBOX8
|
||||
{SPR_SBOX, 8|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX10}, // S_SPHEREBOX9
|
||||
{SPR_SBOX, 9|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX11}, // S_SPHEREBOX10
|
||||
{SPR_SBOX, 10|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX12}, // S_SPHEREBOX11
|
||||
{SPR_SBOX, 11|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX13}, // S_SPHEREBOX12
|
||||
{SPR_SBOX, 12|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX14}, // S_SPHEREBOX13
|
||||
{SPR_SBOX, 13|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX15}, // S_SPHEREBOX14
|
||||
{SPR_SBOX, 14|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX16}, // S_SPHEREBOX15
|
||||
{SPR_SBOX, 15|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX17}, // S_SPHEREBOX16
|
||||
{SPR_SBOX, 16|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX18}, // S_SPHEREBOX17
|
||||
{SPR_SBOX, 17|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX19}, // S_SPHEREBOX18
|
||||
{SPR_SBOX, 18|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX20}, // S_SPHEREBOX19
|
||||
{SPR_SBOX, 19|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX21}, // S_SPHEREBOX20
|
||||
{SPR_SBOX, 20|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX22}, // S_SPHEREBOX21
|
||||
{SPR_SBOX, 21|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX23}, // S_SPHEREBOX22
|
||||
{SPR_SBOX, 22|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX24}, // S_SPHEREBOX23
|
||||
{SPR_SBOX, 23|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_SPHEREBOX1}, // S_SPHEREBOX24
|
||||
{SPR_SBOX, 0|FF_FULLBRIGHT, 1, {A_ItemPop}, 0, 0, S_NULL}, // S_DEADSPHEREBOX
|
||||
|
||||
{SPR_SBOX, FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_SPHEREBOX2}, // S_SPHEREBOX1
|
||||
{SPR_SBOX, 2|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_SPHEREBOX3}, // S_SPHEREBOX2
|
||||
{SPR_SBOX, 4|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_SPHEREBOX4}, // S_SPHEREBOX3
|
||||
{SPR_SBOX, 6|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_SPHEREBOX5}, // S_SPHEREBOX4
|
||||
{SPR_SBOX, 8|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_SPHEREBOX6}, // S_SPHEREBOX5
|
||||
{SPR_SBOX, 10|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_SPHEREBOX7}, // S_SPHEREBOX6
|
||||
{SPR_SBOX, 12|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_SPHEREBOX8}, // S_SPHEREBOX7
|
||||
{SPR_SBOX, 14|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_SPHEREBOX9}, // S_SPHEREBOX8
|
||||
{SPR_SBOX, 16|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_SPHEREBOX10}, // S_SPHEREBOX9
|
||||
{SPR_SBOX, 18|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_SPHEREBOX11}, // S_SPHEREBOX10
|
||||
{SPR_SBOX, 20|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_SPHEREBOX12}, // S_SPHEREBOX11
|
||||
{SPR_SBOX, 22|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_SPHEREBOX1}, // S_SPHEREBOX12
|
||||
{SPR_NULL, 0, 0, {A_ItemPop}, 1, 0, S_NULL}, // S_DEADSPHEREBOX
|
||||
|
||||
{SPR_RPOP, FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_RANDOMITEMPOP2}, // S_RANDOMITEMPOP1
|
||||
{SPR_RPOP, FF_FULLBRIGHT|1, 5, {NULL}, 0, 0, S_RANDOMITEMPOP3}, // S_RANDOMITEMPOP2
|
||||
|
|
@ -3984,19 +4008,31 @@ state_t states[NUMSTATES] =
|
|||
{SPR_RSHE, 2, -1, {NULL}, 0, 0, S_NULL}, // S_ROCKETSNEAKER_LVIBRATE
|
||||
{SPR_RSHE, 3, -1, {NULL}, 0, 0, S_NULL}, // S_ROCKETSNEAKER_RVIBRATE
|
||||
|
||||
{SPR_FITM, FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_EGGMANITEM2}, // S_EGGMANITEM1
|
||||
{SPR_FITM, 2|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_EGGMANITEM3}, // S_EGGMANITEM2
|
||||
{SPR_FITM, 4|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_EGGMANITEM4}, // S_EGGMANITEM3
|
||||
{SPR_FITM, 6|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_EGGMANITEM5}, // S_EGGMANITEM4
|
||||
{SPR_FITM, 8|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_EGGMANITEM6}, // S_EGGMANITEM5
|
||||
{SPR_FITM, 10|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_EGGMANITEM7}, // S_EGGMANITEM6
|
||||
{SPR_FITM, 12|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_EGGMANITEM8}, // S_EGGMANITEM7
|
||||
{SPR_FITM, 14|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_EGGMANITEM9}, // S_EGGMANITEM8
|
||||
{SPR_FITM, 16|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_EGGMANITEM10}, // S_EGGMANITEM9
|
||||
{SPR_FITM, 18|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_EGGMANITEM11}, // S_EGGMANITEM10
|
||||
{SPR_FITM, 20|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_EGGMANITEM12}, // S_EGGMANITEM11
|
||||
{SPR_FITM, 22|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_EGGMANITEM1}, // S_EGGMANITEM12
|
||||
{SPR_FITM, 24|FF_FULLBRIGHT, 175, {NULL}, 0, 0, S_NULL}, // S_EGGMANITEM_DEAD
|
||||
{SPR_FITM, FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_EGGMANITEM2}, // S_EGGMANITEM1
|
||||
{SPR_FITM, 1|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_EGGMANITEM3}, // S_EGGMANITEM2
|
||||
{SPR_FITM, 2|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_EGGMANITEM4}, // S_EGGMANITEM3
|
||||
{SPR_FITM, 3|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_EGGMANITEM5}, // S_EGGMANITEM4
|
||||
{SPR_FITM, 4|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_EGGMANITEM6}, // S_EGGMANITEM5
|
||||
{SPR_FITM, 5|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_EGGMANITEM7}, // S_EGGMANITEM6
|
||||
{SPR_FITM, 6|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_EGGMANITEM8}, // S_EGGMANITEM7
|
||||
{SPR_FITM, 7|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_EGGMANITEM9}, // S_EGGMANITEM8
|
||||
{SPR_FITM, 8|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_EGGMANITEM10}, // S_EGGMANITEM9
|
||||
{SPR_FITM, 9|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_EGGMANITEM11}, // S_EGGMANITEM10
|
||||
{SPR_FITM, 10|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_EGGMANITEM12}, // S_EGGMANITEM11
|
||||
{SPR_FITM, 11|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_EGGMANITEM13}, // S_EGGMANITEM12
|
||||
{SPR_FITM, 12|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_EGGMANITEM14}, // S_EGGMANITEM13
|
||||
{SPR_FITM, 13|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_EGGMANITEM15}, // S_EGGMANITEM14
|
||||
{SPR_FITM, 14|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_EGGMANITEM16}, // S_EGGMANITEM15
|
||||
{SPR_FITM, 15|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_EGGMANITEM17}, // S_EGGMANITEM16
|
||||
{SPR_FITM, 16|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_EGGMANITEM18}, // S_EGGMANITEM17
|
||||
{SPR_FITM, 17|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_EGGMANITEM19}, // S_EGGMANITEM18
|
||||
{SPR_FITM, 18|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_EGGMANITEM20}, // S_EGGMANITEM19
|
||||
{SPR_FITM, 19|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_EGGMANITEM21}, // S_EGGMANITEM20
|
||||
{SPR_FITM, 20|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_EGGMANITEM22}, // S_EGGMANITEM21
|
||||
{SPR_FITM, 21|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_EGGMANITEM23}, // S_EGGMANITEM22 // *****
|
||||
{SPR_FITM, 22|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_EGGMANITEM24}, // S_EGGMANITEM23 // *****
|
||||
{SPR_FITM, 23|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_EGGMANITEM1}, // S_EGGMANITEM24 // *****
|
||||
{SPR_FITM, FF_FULLBRIGHT, 175, {NULL}, 0, 0, S_EGGMANITEM1}, // S_EGGMANITEM_DEAD
|
||||
|
||||
{SPR_BANA, 0, -1, {NULL}, 0, 0, S_NULL}, // S_BANANA
|
||||
{SPR_BANA, 0, 175, {NULL}, 0, 0, S_NULL}, // S_BANANA_DEAD
|
||||
|
|
|
|||
36
src/info.h
36
src/info.h
|
|
@ -4251,6 +4251,18 @@ typedef enum state
|
|||
S_RANDOMITEM10,
|
||||
S_RANDOMITEM11,
|
||||
S_RANDOMITEM12,
|
||||
S_RANDOMITEM13,
|
||||
S_RANDOMITEM14,
|
||||
S_RANDOMITEM15,
|
||||
S_RANDOMITEM16,
|
||||
S_RANDOMITEM17,
|
||||
S_RANDOMITEM18,
|
||||
S_RANDOMITEM19,
|
||||
S_RANDOMITEM20,
|
||||
S_RANDOMITEM21,
|
||||
S_RANDOMITEM22,
|
||||
S_RANDOMITEM23,
|
||||
S_RANDOMITEM24,
|
||||
S_DEADRANDOMITEM,
|
||||
|
||||
// Sphere Box (for Battle)
|
||||
|
|
@ -4266,6 +4278,18 @@ typedef enum state
|
|||
S_SPHEREBOX10,
|
||||
S_SPHEREBOX11,
|
||||
S_SPHEREBOX12,
|
||||
S_SPHEREBOX13,
|
||||
S_SPHEREBOX14,
|
||||
S_SPHEREBOX15,
|
||||
S_SPHEREBOX16,
|
||||
S_SPHEREBOX17,
|
||||
S_SPHEREBOX18,
|
||||
S_SPHEREBOX19,
|
||||
S_SPHEREBOX20,
|
||||
S_SPHEREBOX21,
|
||||
S_SPHEREBOX22,
|
||||
S_SPHEREBOX23,
|
||||
S_SPHEREBOX24,
|
||||
S_DEADSPHEREBOX,
|
||||
|
||||
// Random Item Pop
|
||||
|
|
@ -4418,6 +4442,18 @@ typedef enum state
|
|||
S_EGGMANITEM10,
|
||||
S_EGGMANITEM11,
|
||||
S_EGGMANITEM12,
|
||||
S_EGGMANITEM13,
|
||||
S_EGGMANITEM14,
|
||||
S_EGGMANITEM15,
|
||||
S_EGGMANITEM16,
|
||||
S_EGGMANITEM17,
|
||||
S_EGGMANITEM18,
|
||||
S_EGGMANITEM19,
|
||||
S_EGGMANITEM20,
|
||||
S_EGGMANITEM21,
|
||||
S_EGGMANITEM22,
|
||||
S_EGGMANITEM23,
|
||||
S_EGGMANITEM24,
|
||||
S_EGGMANITEM_DEAD,
|
||||
//}
|
||||
|
||||
|
|
|
|||
38
src/k_kart.c
38
src/k_kart.c
|
|
@ -129,44 +129,6 @@ UINT32 K_GetPlayerDontDrawFlag(player_t *player)
|
|||
return flag;
|
||||
}
|
||||
|
||||
player_t *K_GetItemBoxPlayer(mobj_t *mobj)
|
||||
{
|
||||
fixed_t closest = INT32_MAX;
|
||||
player_t *player = NULL;
|
||||
UINT8 i;
|
||||
|
||||
for (i = 0; i < MAXPLAYERS; i++)
|
||||
{
|
||||
if (!(playeringame[i] && players[i].mo && !P_MobjWasRemoved(players[i].mo) && !players[i].spectator))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
// Always use normal item box rules -- could pass in "2" for fakes but they blend in better like this
|
||||
if (P_CanPickupItem(&players[i], 1))
|
||||
{
|
||||
fixed_t dist = P_AproxDistance(P_AproxDistance(
|
||||
players[i].mo->x - mobj->x,
|
||||
players[i].mo->y - mobj->y),
|
||||
players[i].mo->z - mobj->z
|
||||
);
|
||||
|
||||
if (dist > 8192*mobj->scale)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if (dist < closest)
|
||||
{
|
||||
player = &players[i];
|
||||
closest = dist;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return player;
|
||||
}
|
||||
|
||||
// Angle reflection used by springs & speed pads
|
||||
angle_t K_ReflectAngle(angle_t yourangle, angle_t theirangle, fixed_t yourspeed, fixed_t theirspeed)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ Make sure this matches the actual number of states
|
|||
#define GROW_SCALE ((3*FRACUNIT)/2)
|
||||
#define SHRINK_SCALE ((6*FRACUNIT)/8)
|
||||
|
||||
player_t *K_GetItemBoxPlayer(mobj_t *mobj);
|
||||
angle_t K_ReflectAngle(angle_t angle, angle_t against, fixed_t maxspeed, fixed_t yourspeed);
|
||||
|
||||
void K_RegisterKartStuff(void);
|
||||
|
|
|
|||
28
src/p_mobj.c
28
src/p_mobj.c
|
|
@ -7006,18 +7006,6 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
|
|||
break;
|
||||
}
|
||||
case MT_EGGMANITEM:
|
||||
{
|
||||
player_t *player = K_GetItemBoxPlayer(mobj);
|
||||
UINT8 color = SKINCOLOR_BLACK;
|
||||
|
||||
if (player != NULL)
|
||||
{
|
||||
color = player->skincolor;
|
||||
}
|
||||
|
||||
mobj->color = color;
|
||||
mobj->colorized = false;
|
||||
}
|
||||
/* FALLTHRU */
|
||||
case MT_BANANA:
|
||||
mobj->friction = ORIG_FRICTION/4;
|
||||
|
|
@ -8741,9 +8729,6 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
|
|||
case MT_SPHEREBOX:
|
||||
if (gametype == GT_BATTLE && mobj->threshold == 70)
|
||||
{
|
||||
mobj->color = K_RainbowColor(leveltime);
|
||||
mobj->colorized = true;
|
||||
|
||||
if (battleovertime.enabled)
|
||||
{
|
||||
angle_t ang = FixedAngle((leveltime % 360) << FRACBITS);
|
||||
|
|
@ -8766,19 +8751,6 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
|
|||
ghost->frame |= FF_FULLBRIGHT;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
player_t *player = K_GetItemBoxPlayer(mobj);
|
||||
UINT8 color = SKINCOLOR_BLACK;
|
||||
|
||||
if (player != NULL)
|
||||
{
|
||||
color = player->skincolor;
|
||||
}
|
||||
|
||||
mobj->color = color;
|
||||
mobj->colorized = false;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
// check mobj against possible water content, before movement code
|
||||
|
|
|
|||
Loading…
Reference in a new issue