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

Merge branch 'fix-gachatarget-hitbox' into 'master'

Browse source 
Fix gachatarget hitbox size

See merge request KartKrew/Kart!1839
This commit is contained in:
James R. 2024-01-16 03:52:05 +00:00
commit 6259c30a2e
2 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/info.c
View file

@ -965,10 +965,10 @@ char sprnames[NUMSPRITES + 1][5] =
"PUYC", "PUYC",
"PUYD", "PUYD",
"PUYE", "PUYE",
// Aerial Highlands // Aerial Highlands
"BCLD", "BCLD",
// Avant Garden // Avant Garden
"AGTU", "AGTU",
"AGTL", "AGTL",
@ -977,7 +977,7 @@ char sprnames[NUMSPRITES + 1][5] =
"AGFL", "AGFL",
"AGFF", "AGFF",
"AGCL", "AGCL",
// Sky Sanctuary // Sky Sanctuary
"SSCL", "SSCL",
@ -5703,10 +5703,10 @@ state_t states[NUMSTATES] =
{SPR_PUYA, 3, -1, {A_BlendEyePuyoHack}, 0, 0, S_NULL}, // S_BLENDEYE_PUYO_SHOCK, {SPR_PUYA, 3, -1, {A_BlendEyePuyoHack}, 0, 0, S_NULL}, // S_BLENDEYE_PUYO_SHOCK,
{SPR_PUYA, 4|FF_ANIMATE, 5, {A_BlendEyePuyoHack}, 2, 2, S_NULL}, // S_BLENDEYE_PUYO_DIE, {SPR_PUYA, 4|FF_ANIMATE, 5, {A_BlendEyePuyoHack}, 2, 2, S_NULL}, // S_BLENDEYE_PUYO_DIE,
{SPR_PUYA, 5, 2, {A_BlendEyePuyoHack}, 0, 0, S_BLENDEYE_PUYO_DIE}, // S_BLENDEYE_PUYO_DUST, {SPR_PUYA, 5, 2, {A_BlendEyePuyoHack}, 0, 0, S_BLENDEYE_PUYO_DIE}, // S_BLENDEYE_PUYO_DUST,
// Aerial Highlands // Aerial Highlands
{SPR_BCLD, FF_ANIMATE, -1, {NULL}, 3, 6, S_AHZCLOUD}, // S_AHZCLOUD {SPR_BCLD, FF_ANIMATE, -1, {NULL}, 3, 6, S_AHZCLOUD}, // S_AHZCLOUD
// Avant Garden // Avant Garden
{SPR_AGTL, FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_AGZBULB_BASE}, // S_AGZBULB_BASE {SPR_AGTL, FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_AGZBULB_BASE}, // S_AGZBULB_BASE
{SPR_AGTU, 0, -1, {NULL}, 0, 0, S_AGZBULB_NEUTRAL}, // S_AGZBULB_NEUTRAL {SPR_AGTU, 0, -1, {NULL}, 0, 0, S_AGZBULB_NEUTRAL}, // S_AGZBULB_NEUTRAL
@ -5717,7 +5717,7 @@ state_t states[NUMSTATES] =
{SPR_AGFL, 0, -1, {NULL}, 0, 0, S_AGFL}, // S_AGFL {SPR_AGFL, 0, -1, {NULL}, 0, 0, S_AGFL}, // S_AGFL
{SPR_AGFF, 0, -1, {NULL}, 0, 0, S_AGFF}, // S_AGFF {SPR_AGFF, 0, -1, {NULL}, 0, 0, S_AGFF}, // S_AGFF
{SPR_AGCL, FF_ANIMATE, -1, {NULL}, 3, 6, S_AGZCLOUD}, // S_AGZCLOUD {SPR_AGCL, FF_ANIMATE, -1, {NULL}, 3, 6, S_AGZCLOUD}, // S_AGZCLOUD
// Sky Sanctuary // Sky Sanctuary
{SPR_SSCL, FF_ANIMATE, -1, {NULL}, 3, 6, S_SSZCLOUD}, // S_SSZCLOUD {SPR_SSCL, FF_ANIMATE, -1, {NULL}, 3, 6, S_SSZCLOUD}, // S_SSZCLOUD
@ -31974,7 +31974,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
MF_SCENERY|MF_NOCLIPTHING|MF_NOCLIPHEIGHT|MF_NOGRAVITY, // flags MF_SCENERY|MF_NOCLIPTHING|MF_NOCLIPHEIGHT|MF_NOGRAVITY, // flags
S_NULL // raisestate S_NULL // raisestate
}, },
{ // MT_AHZ_CLOUD { // MT_AHZ_CLOUD
-1, // doomednum -1, // doomednum
S_AHZCLOUD, // spawnstate S_AHZCLOUD, // spawnstate
@ -32001,7 +32001,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
MF_NOGRAVITY|MF_SPECIAL, // flags MF_NOGRAVITY|MF_SPECIAL, // flags
S_NULL // raisestate S_NULL // raisestate
}, },
{ // MT_AHZ_CLOUDCLUSTER { // MT_AHZ_CLOUDCLUSTER
3486, // doomednum 3486, // doomednum
S_INVISIBLE, // spawnstate S_INVISIBLE, // spawnstate
@ -32028,7 +32028,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
MF_NOGRAVITY, // flags MF_NOGRAVITY, // flags
S_NULL // raisestate S_NULL // raisestate
}, },
{ // MT_AGZ_BULB { // MT_AGZ_BULB
3445, // doomednum 3445, // doomednum
S_INVISIBLE, // spawnstate S_INVISIBLE, // spawnstate
@ -32055,7 +32055,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
MF_SPECIAL, // flags MF_SPECIAL, // flags
S_NULL // raisestate S_NULL // raisestate
}, },
{ // MT_AGZ_BULB_PART { // MT_AGZ_BULB_PART
-1, // doomednum -1, // doomednum
S_INVISIBLE, // spawnstate S_INVISIBLE, // spawnstate
@ -32082,7 +32082,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
MF_NOGRAVITY, // flags MF_NOGRAVITY, // flags
S_NULL // raisestate S_NULL // raisestate
}, },
{ // MT_AGZ_TREE { // MT_AGZ_TREE
3447, // doomednum 3447, // doomednum
S_AGTR, // spawnstate S_AGTR, // spawnstate
@ -32109,7 +32109,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
0, // flags 0, // flags
S_NULL // raisestate S_NULL // raisestate
}, },
{ // MT_AGZ_AGFL { // MT_AGZ_AGFL
3448, // doomednum 3448, // doomednum
S_AGFL, // spawnstate S_AGFL, // spawnstate
@ -32136,7 +32136,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
0, // flags 0, // flags
S_NULL // raisestate S_NULL // raisestate
}, },
{ // MT_AGZ_AGFF { // MT_AGZ_AGFF
3449, // doomednum 3449, // doomednum
S_AGFF, // spawnstate S_AGFF, // spawnstate
@ -32163,7 +32163,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
0, // flags 0, // flags
S_NULL // raisestate S_NULL // raisestate
}, },
{ // MT_AGZ_CLOUD { // MT_AGZ_CLOUD
-1, // doomednum -1, // doomednum
S_AGZCLOUD, // spawnstate S_AGZCLOUD, // spawnstate
@ -32190,7 +32190,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
MF_NOGRAVITY|MF_SPECIAL, // flags MF_NOGRAVITY|MF_SPECIAL, // flags
S_NULL // raisestate S_NULL // raisestate
}, },
{ // MT_AGZ_CLOUDCLUSTER { // MT_AGZ_CLOUDCLUSTER
3446, // doomednum 3446, // doomednum
S_INVISIBLE, // spawnstate S_INVISIBLE, // spawnstate
@ -32217,7 +32217,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
MF_NOGRAVITY, // flags MF_NOGRAVITY, // flags
S_NULL // raisestate S_NULL // raisestate
}, },
{ // MT_SSZ_CLOUD { // MT_SSZ_CLOUD
-1, // doomednum -1, // doomednum
S_SSZCLOUD, // spawnstate S_SSZCLOUD, // spawnstate
@ -32244,7 +32244,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
MF_NOGRAVITY|MF_SPECIAL, // flags MF_NOGRAVITY|MF_SPECIAL, // flags
S_NULL // raisestate S_NULL // raisestate
}, },
{ // MT_SSZ_CLOUDCLUSTER { // MT_SSZ_CLOUDCLUSTER
3456, // doomednum 3456, // doomednum
S_INVISIBLE, // spawnstate S_INVISIBLE, // spawnstate
@ -34120,8 +34120,8 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // xdeathstate S_NULL, // xdeathstate
sfx_None, // deathsound sfx_None, // deathsound
0, // speed 0, // speed
32*4*FRACUNIT,// radius 32*FRACUNIT,// radius
64*4*FRACUNIT,// height 64*FRACUNIT,// height
0, // dispoffset 0, // dispoffset
0, // mass 0, // mass
0, // damage 0, // damage

3
src/objects/sealed-star.c
View file

@ -613,8 +613,7 @@ void Obj_SSChainMobjThink(mobj_t* mo)
void Obj_SSGachaTargetMobjSpawn(mobj_t* mo) void Obj_SSGachaTargetMobjSpawn(mobj_t* mo)
{ {
mo->scale *= 4; P_InstaScale(mo, 4*mo->scale);
mo->destscale = mo->scale;
} }
void Obj_SSCabotronMobjSpawn(mobj_t* mo) void Obj_SSCabotronMobjSpawn(mobj_t* mo)