incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Port v1 objects pt 3

Browse source
This commit is contained in:
NepDisk 2025-04-07 17:20:26 -04:00
parent 46d8a7c2b1
commit 32b9b82dc2
8 changed files with 11 additions and 1342 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/info/actions.h
View file

@ -191,35 +191,17 @@ _(A_FlickyHeightCheck, FLICKYHEIGHTCHECK)
_(A_FlickyFlutter, FLICKYFLUTTER)
_(A_FlameParticle, FLAMEPARTICLE)
_(A_FadeOverlay, FADEOVERLAY)
_(A_Boss5Jump, BOSS5JUMP)
_(A_LightBeamReset, LIGHTBEAMRESET)
_(A_MineExplode, MINEEXPLODE)
_(A_MineRange, MINERANGE)
_(A_ConnectToGround, CONNECTTOGROUND)
_(A_SpawnParticleRelative, SPAWNPARTICLERELATIVE)
_(A_ParticleSpawn, PARTICLESPAWN)
_(A_MultiShotDist, MULTISHOTDIST)
_(A_WhoCaresIfYourSonIsABee,WHOCARESIFYOURSONISABEE)
_(A_ParentTriesToSleep, PARENTTRIESTOSLEEP)
_(A_CryingToMomma, CRYINGTOMOMMA)
_(A_CheckFlags2, CHECKFLAGS2)
_(A_Boss5FindWaypoint, BOSS5FINDWAYPOINT)
_(A_DoNPCSkid, DONPCSKID)
_(A_DoNPCPain, DONPCPAIN)
_(A_PrepareRepeat, PREPAREREPEAT)
_(A_Boss5ExtraRepeat, BOSS5EXTRAREPEAT)
_(A_Boss5Calm, BOSS5CALM)
_(A_Boss5CheckOnGround, BOSS5CHECKONGROUND)
_(A_Boss5CheckFalling, BOSS5CHECKFALLING)
_(A_Boss5PinchShot, BOSS5PINCHSHOT)
_(A_Boss5MakeItRain, BOSS5MAKEITRAIN)
_(A_Boss5MakeJunk, BOSS5MAKEJUNK)
_(A_LookForBetter, LOOKFORBETTER)
_(A_Boss5BombExplode, BOSS5BOMBEXPLODE)
_(A_CanarivoreGas, CANARIVOREGAS)
_(A_KillSegments, KILLSEGMENTS)
_(A_SnapperSpawn, SNAPPERSPAWN)
_(A_SnapperThinker, SNAPPERTHINKER)
_(A_ModuloToState, MODULOTOSTATE)
_(A_ChangeHeight, CHANGEHEIGHT)

21
src/info/mobjs.h
View file

@ -21,12 +21,7 @@ _(DETON) // Deton
_(SKIM) // Skim mine dropper
_(TURRET) // Industrial Turret
_(POPUPTURRET) // Pop-Up Turret
_(SPINCUSHION) // Spincushion
_(CRUSHSTACEAN) // Crushstacean
_(CRUSHCLAW) // Big meaty claw
_(CRUSHCHAIN) // Chain
_(BANPYURA) // Banpyura
_(BANPSPRING) // Banpyura spring
_(SHARP) // SHARP
_(JETJAW) // Jet Jaw
_(SNAILER) // Snailer
_(VULTURE) // BASH
@ -37,8 +32,6 @@ _(FACESTABBER) // Castlebot Facestabber
_(EGGGUARD) // Egg Guard
_(EGGSHIELD) // Egg Guard's shield
_(GSNAPPER) // Green Snapper
_(SNAPPER_LEG) // Green Snapper leg
_(SNAPPER_HEAD) // Green Snapper head
_(MINUS) // Minus
_(MINUSDIRT) // Minus dirt
_(SPRINGSHELL) // Spring Shell
@ -80,18 +73,6 @@ _(JETFLAME)
_(EGGROBO1)
_(EGGROBO1JET)
// Boss 5
_(FANG)
_(BROKENROBOT)
_(VWREF)
_(VWREB)
_(PROJECTORLIGHT)
_(FBOMB)
_(TNTDUST) // also used by barrel
_(FSGNA)
_(FSGNB)
_(FANGWAYPOINT)
// Black Eggman (Boss 7)
_(BLACKEGGMAN)
_(BLACKEGGMAN_HELPER)

13
src/info/sprites.h
View file

@ -24,30 +24,19 @@ _(SKIM) // Skim mine dropper
_(TRET) // Industrial Turret
_(TURR) // Pop-Up Turret
_(SHRP) // Sharp
//_(CRAB) // Crushstacean
_(CR2B) // Banpyura
_(CSPR) // Banpyura spring
_(JJAW) // Jet Jaw
_(SNLR) // Snailer
_(VLTR) // BASH
_(PNTY) // Pointy
_(ARCH) // Robo-Hood
_(CBFS) // Castlebot Facestabber
_(STAB) // Castlebot Facestabber spear aura
_(SPSH) // Egg Guard
_(ESHI) // Egg Guard's shield
_(GSNP) // Green Snapper
_(GSNL) // Green Snapper leg
_(GSNH) // Green Snapper head
_(MNUS) // Minus
_(MNUD) // Minus dirt
_(SSHL) // Spring Shell
_(UNID) // Unidus
_(CANA) // Canarivore
_(CANG) // Canarivore gas
_(PYRE) // Pyre Fly
_(PTER) // Pterabyte
_(DRAB) // Dragonbomber
// Generic Boss Items
_(JETF) // Boss jet fumes
@ -588,7 +577,7 @@ _(CDMO)
_(CDBU)
// Daytona Speedway
_(DPIN)
_(PINE)
// Egg Zeppelin
_(PPLR)

197
src/info/states.h
View file

@ -164,55 +164,14 @@ _(TURRETPOPDOWN6)
_(TURRETPOPDOWN7)
_(TURRETPOPDOWN8)
// Spincushion
_(SPINCUSHION_LOOK)
_(SPINCUSHION_CHASE1)
_(SPINCUSHION_CHASE2)
_(SPINCUSHION_CHASE3)
_(SPINCUSHION_CHASE4)
_(SPINCUSHION_AIM1)
_(SPINCUSHION_AIM2)
_(SPINCUSHION_AIM3)
_(SPINCUSHION_AIM4)
_(SPINCUSHION_AIM5)
_(SPINCUSHION_SPIN1)
_(SPINCUSHION_SPIN2)
_(SPINCUSHION_SPIN3)
_(SPINCUSHION_SPIN4)
_(SPINCUSHION_STOP1)
_(SPINCUSHION_STOP2)
_(SPINCUSHION_STOP3)
_(SPINCUSHION_STOP4)
// Crushstacean
_(CRUSHSTACEAN_ROAM1)
_(CRUSHSTACEAN_ROAM2)
_(CRUSHSTACEAN_ROAM3)
_(CRUSHSTACEAN_ROAM4)
_(CRUSHSTACEAN_ROAMPAUSE)
_(CRUSHSTACEAN_PUNCH1)
_(CRUSHSTACEAN_PUNCH2)
_(CRUSHCLAW_AIM)
_(CRUSHCLAW_OUT)
_(CRUSHCLAW_STAY)
_(CRUSHCLAW_IN)
_(CRUSHCLAW_WAIT)
_(CRUSHCHAIN)
// Banpyura
_(BANPYURA_ROAM1)
_(BANPYURA_ROAM2)
_(BANPYURA_ROAM3)
_(BANPYURA_ROAM4)
_(BANPYURA_ROAMPAUSE)
_(CDIAG1)
_(CDIAG2)
_(CDIAG3)
_(CDIAG4)
_(CDIAG5)
_(CDIAG6)
_(CDIAG7)
_(CDIAG8)
// Sharp
_(SHARP_ROAM1)
_(SHARP_ROAM2)
_(SHARP_AIM1)
_(SHARP_AIM2)
_(SHARP_AIM3)
_(SHARP_AIM4)
_(SHARP_SPIN)
// Jet Jaw
_(JETJAW_ROAM1)
@ -294,17 +253,11 @@ _(EGGGUARD_RUN4)
_(EGGSHIELD)
// Green Snapper
_(SNAPPER_SPAWN)
_(SNAPPER_SPAWN2)
_(GSNAPPER_STND)
_(GSNAPPER1)
_(GSNAPPER2)
_(GSNAPPER3)
_(GSNAPPER4)
_(SNAPPER_XPLD)
_(SNAPPER_LEG)
_(SNAPPER_LEGRAISE)
_(SNAPPER_HEAD)
// Minus
_(MINUS_INIT)
@ -533,140 +486,6 @@ _(EGGROBO1_PISSED)
// Boss 4 Spectator Eggrobo jet flame
_(EGGROBOJET)
// Boss 5
_(FANG_SETUP)
_(FANG_INTRO0)
_(FANG_INTRO1)
_(FANG_INTRO2)
_(FANG_INTRO3)
_(FANG_INTRO4)
_(FANG_INTRO5)
_(FANG_INTRO6)
_(FANG_INTRO7)
_(FANG_INTRO8)
_(FANG_INTRO9)
_(FANG_INTRO10)
_(FANG_INTRO11)
_(FANG_INTRO12)
_(FANG_CLONE1)
_(FANG_CLONE2)
_(FANG_CLONE3)
_(FANG_CLONE4)
_(FANG_IDLE0)
_(FANG_IDLE1)
_(FANG_IDLE2)
_(FANG_IDLE3)
_(FANG_IDLE4)
_(FANG_IDLE5)
_(FANG_IDLE6)
_(FANG_IDLE7)
_(FANG_IDLE8)
_(FANG_PAIN1)
_(FANG_PAIN2)
_(FANG_PATHINGSTART1)
_(FANG_PATHINGSTART2)
_(FANG_PATHING)
_(FANG_BOUNCE1)
_(FANG_BOUNCE2)
_(FANG_BOUNCE3)
_(FANG_BOUNCE4)
_(FANG_FALL1)
_(FANG_FALL2)
_(FANG_CHECKPATH1)
_(FANG_CHECKPATH2)
_(FANG_PATHINGCONT1)
_(FANG_PATHINGCONT2)
_(FANG_PATHINGCONT3)
_(FANG_SKID1)
_(FANG_SKID2)
_(FANG_SKID3)
_(FANG_CHOOSEATTACK)
_(FANG_FIRESTART1)
_(FANG_FIRESTART2)
_(FANG_FIRE1)
_(FANG_FIRE2)
_(FANG_FIRE3)
_(FANG_FIRE4)
_(FANG_FIREREPEAT)
_(FANG_LOBSHOT0)
_(FANG_LOBSHOT1)
_(FANG_LOBSHOT2)
_(FANG_WAIT1)
_(FANG_WAIT2)
_(FANG_WALLHIT)
_(FANG_PINCHPATHINGSTART1)
_(FANG_PINCHPATHINGSTART2)
_(FANG_PINCHPATHING)
_(FANG_PINCHBOUNCE0)
_(FANG_PINCHBOUNCE1)
_(FANG_PINCHBOUNCE2)
_(FANG_PINCHBOUNCE3)
_(FANG_PINCHBOUNCE4)
_(FANG_PINCHFALL0)
_(FANG_PINCHFALL1)
_(FANG_PINCHFALL2)
_(FANG_PINCHSKID1)
_(FANG_PINCHSKID2)
_(FANG_PINCHLOBSHOT0)
_(FANG_PINCHLOBSHOT1)
_(FANG_PINCHLOBSHOT2)
_(FANG_PINCHLOBSHOT3)
_(FANG_PINCHLOBSHOT4)
_(FANG_DIE1)
_(FANG_DIE2)
_(FANG_DIE3)
_(FANG_DIE4)
_(FANG_DIE5)
_(FANG_DIE6)
_(FANG_DIE7)
_(FANG_DIE8)
_(FANG_FLEEPATHING1)
_(FANG_FLEEPATHING2)
_(FANG_FLEEBOUNCE1)
_(FANG_FLEEBOUNCE2)
_(FANG_KO)
_(BROKENROBOTRANDOM)
_(BROKENROBOTA)
_(BROKENROBOTB)
_(BROKENROBOTC)
_(BROKENROBOTD)
_(BROKENROBOTE)
_(BROKENROBOTF)
_(ALART1)
_(ALART2)
_(VWREF)
_(VWREB)
_(PROJECTORLIGHT1)
_(PROJECTORLIGHT2)
_(PROJECTORLIGHT3)
_(PROJECTORLIGHT4)
_(PROJECTORLIGHT5)
_(FBOMB1)
_(FBOMB2)
_(FBOMB_EXPL1)
_(FBOMB_EXPL2)
_(FBOMB_EXPL3)
_(FBOMB_EXPL4)
_(FBOMB_EXPL5)
_(FBOMB_EXPL6)
_(TNTDUST_1)
_(TNTDUST_2)
_(TNTDUST_3)
_(TNTDUST_4)
_(TNTDUST_5)
_(TNTDUST_6)
_(TNTDUST_7)
_(TNTDUST_8)
_(FSGNA)
_(FSGNB)
_(FSGNC)
_(FSGND)
// Black Eggman (Boss 7)
_(BLACKEGG_STND)
_(BLACKEGG_STND2)

1027
src/p_enemy.c
View file

File diff suppressed because it is too large Load diff

23
src/p_inter.c
View file

@ -1464,29 +1464,6 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damaget
target->momx = target->momy = target->momz = 0;
break;
case MT_CRUSHSTACEAN:
if (target->tracer)
{
mobj_t *chain = target->tracer->target, *chainnext;
while (chain)
{
chainnext = chain->target;
P_RemoveMobj(chain);
chain = chainnext;
}
S_StopSound(target->tracer);
P_KillMobj(target->tracer, inflictor, source, damagetype);
}
break;
case MT_BANPYURA:
if (target->tracer)
{
S_StopSound(target->tracer);
P_KillMobj(target->tracer, inflictor, source, damagetype);
}
break;
case MT_EGGSHIELD:
P_SetObjectMomZ(target, 4*target->scale, false);
P_InstaThrust(target, target->angle, 3*target->scale);

44
src/p_mobj.c
View file

@ -5657,9 +5657,8 @@ static void P_MobjSceneryThink(mobj_t *mobj)
case MT_ROCKCRUMBLE16:
case MT_WOODDEBRIS:
case MT_BRICKDEBRIS:
case MT_BROKENROBOT:
if (mobj->z <= P_FloorzAtPos(mobj->x, mobj->y, mobj->z, mobj->height)
&& mobj->state != &states[mobj->info->deathstate])
&& mobj->state != &states[mobj->info->deathstate])
{
P_SetMobjState(mobj, mobj->info->deathstate);
return;
@ -5669,10 +5668,6 @@ static void P_MobjSceneryThink(mobj_t *mobj)
if (!P_ParticleGenSceneryThink(mobj))
return;
break;
case MT_FSGNA:
if (mobj->movedir)
mobj->angle += mobj->movedir;
break;
case MT_ORBINAUT_SHIELD: // Kart orbit/trail items
case MT_JAWZ_SHIELD:
case MT_BANANA_SHIELD:
@ -6231,16 +6226,6 @@ static void P_MobjSceneryThink(mobj_t *mobj)
break;
}
case MT_VWREF:
case MT_VWREB:
{
INT32 strength;
++mobj->movedir;
mobj->frame &= ~FF_TRANSMASK;
strength = min(mobj->fuse, (INT32)mobj->movedir)*3;
if (strength < 10)
mobj->frame |= ((10 - strength) << (FF_TRANSSHIFT));
}
/* FALLTHRU */
default:
if (mobj->fuse)
@ -8450,9 +8435,6 @@ for (i = ((mobj->flags2 & MF2_STRONGBOX) ? strongboxamt : weakboxamt); i; --i) s
static boolean P_FuseThink(mobj_t *mobj)
{
if (mobj->type == MT_SNAPPER_HEAD || mobj->type == MT_SNAPPER_LEG)
mobj->renderflags ^= RF_DONTDRAW;
if (mobj->fuse <= TICRATE && (mobj->type == MT_RANDOMITEM || mobj->type == MT_EGGMANITEM || mobj->type == MT_FALLINGROCK))
mobj->renderflags ^= RF_DONTDRAW;
@ -9302,24 +9284,6 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
}
}
break;
case MT_CRUSHSTACEAN:
{
mobj_t *bigmeatyclaw = P_SpawnMobjFromMobj(mobj, 0, 0, 0, MT_CRUSHCLAW);
bigmeatyclaw->angle = mobj->angle + ((mobj->flags2 & MF2_AMBUSH) ? ANGLE_90 : ANGLE_270);
P_SetTarget(&mobj->tracer, bigmeatyclaw);
P_SetTarget(&bigmeatyclaw->tracer, mobj);
mobj->reactiontime >>= 1;
}
break;
case MT_BANPYURA:
{
mobj_t *bigmeatyclaw = P_SpawnMobjFromMobj(mobj, 0, 0, 0, MT_BANPSPRING);
bigmeatyclaw->angle = mobj->angle + ((mobj->flags2 & MF2_AMBUSH) ? ANGLE_90 : ANGLE_270);
P_SetTarget(&mobj->tracer, bigmeatyclaw);
P_SetTarget(&bigmeatyclaw->tracer, mobj);
mobj->reactiontime >>= 1;
}
break;
case MT_BIGMINE:
mobj->extravalue1 = FixedHypot(mobj->x, mobj->y)>>FRACBITS;
break;
@ -9391,15 +9355,9 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
mobj->color = skins[5].prefcolor;
sc = 5;
break;
case MT_FANG:
sc = 4;
break;
case MT_CORK:
mobj->flags2 |= MF2_SUPERFIRE;
break;
case MT_FBOMB:
mobj->flags2 |= MF2_EXPLOSION;
break;
// SRB2Kart
case MT_ITEMCAPSULE:
{

10
src/p_setup.c
View file

@ -7022,13 +7022,6 @@ static void P_ConvertBinaryThingTypes(void)
case 203: //Egg Colosseum
mapthings[i].args[5] = LE_BOSS4DROP + mapthings[i].extrainfo * LE_PARAMWIDTH;
break;
case 204: //Fang
mapthings[i].args[4] = LE_BOSS4DROP + mapthings[i].extrainfo*LE_PARAMWIDTH;
if (mapthings[i].options & MTF_EXTRA)
mapthings[i].args[5] |= TMF_GRAYSCALE;
if (mapthings[i].options & MTF_AMBUSH)
mapthings[i].args[5] |= TMF_SKIPINTRO;
break;
case 206: //Brak Eggman (Old)
mapthings[i].args[5] = LE_BRAKPLATFORM + mapthings[i].extrainfo*LE_PARAMWIDTH;
break;
@ -7050,9 +7043,6 @@ static void P_ConvertBinaryThingTypes(void)
mapthings[i].args[0] = mapthings[i].angle;
mapthings[i].args[1] = mapthings[i].options & 7;
break;
case 294: //Fang waypoint
mapthings[i].args[0] = !!(mapthings[i].options & MTF_AMBUSH);
break;
case 300: //Ring
case 301: //Bounce ring
case 302: //Rail ring