stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-22 18:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity
SRB2/src/info.h

4830 lines
87 KiB
C
Raw Normal View History

SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
Update copyright date on source files
2019-12-06 18:49:42 +00:00
// Copyright (C) 1999-2019 by Sonic Team Junior.
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
// See the 'LICENSE' file for more details.
//-----------------------------------------------------------------------------
/// \file info.h
/// \brief Thing frame/state LUT
#ifndef __INFO__
#define __INFO__
// Needed for action function pointer handling.
#include "d_think.h"
#include "sounds.h"
#include "m_fixed.h"
// dehacked.c now has lists for the more named enums! PLEASE keep them up to date!
// For great modding!!
// IMPORTANT NOTE: If you add/remove from this list of action
// functions, don't forget to update them in dehacked.c!
void A_Explode();
void A_Pain();
void A_Fall();
void A_MonitorPop();
Big monitors are "Gold Monitors" now. The useless ones have been removed, too, and they should always spawn as what they should regardless of settings. By the way, graphics are at https://dl.dropboxusercontent.com/u/3518218/22/monitorgfx.wad
2015-12-31 23:29:08 +00:00
void A_GoldMonitorPop();
void A_GoldMonitorRestore();
void A_GoldMonitorSparkle();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
void A_Look();
void A_Chase();
void A_FaceStabChase();
* Castlebot Facestabbers. * Facestabber statues, of both the suspicious and non-suspicious kind. * New object type for the end of grabbable chains. * I moved my compilation .bat file to my Releases folder, so it should .gitignore .bat's. * Random extra stuff.
2018-05-24 00:40:57 +00:00
void A_FaceStabRev();
void A_FaceStabHurl();
void A_FaceStabMiss();
void A_StatueBurst();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
void A_FaceTarget();
void A_FaceTracer();
void A_Scream();
void A_BossDeath();
void A_CustomPower(); // Use this for a custom power
void A_GiveWeapon(); // Gives the player weapon(s)
void A_RingBox(); // Obtained Ring Box Tails
void A_Invincibility(); // Obtained Invincibility Box
void A_SuperSneakers(); // Obtained Super Sneakers Box
void A_BunnyHop(); // have bunny hop tails
void A_BubbleSpawn(); // Randomly spawn bubbles
void A_FanBubbleSpawn();
void A_BubbleRise(); // Bubbles float to surface
void A_BubbleCheck(); // Don't draw if not underwater
void A_AwardScore();
void A_ExtraLife(); // Extra Life
* Combine all shield-giving functions into a single one, since they were practically identical anyways. * Expose P_SwitchShield(player, shieldnum) to Lua.
2017-08-10 12:57:09 +00:00
void A_GiveShield(); // Obtained Shield
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
void A_GravityBox();
void A_ScoreRise(); // Rise the score logo
void A_AttractChase(); // Ring Chase
void A_DropMine(); // Drop Mine from Skim or Jetty-Syn Bomber
void A_FishJump(); // Fish Jump
void A_ThrownRing(); // Sparkle trail for red ring
void A_SetSolidSteam();
void A_UnsetSolidSteam();
New end-of-level signpost logic
2019-11-04 08:28:44 +00:00
void A_SignSpin();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
void A_SignPlayer();
void A_OverlayThink();
void A_JetChase();
void A_JetbThink(); // Jetty-Syn Bomber Thinker
void A_JetgThink(); // Jetty-Syn Gunner Thinker
void A_JetgShoot(); // Jetty-Syn Shoot Function
void A_ShootBullet(); // JetgShoot without reactiontime setting
void A_MinusDigging();
void A_MinusPopup();
void A_MinusCheck();
void A_ChickenCheck();
void A_MouseThink(); // Mouse Thinker
void A_DetonChase(); // Deton Chaser
void A_CapeChase(); // Fake little Super Sonic cape
void A_RotateSpikeBall(); // Spike ball rotation
void A_SlingAppear();
void A_UnidusBall();
void A_RockSpawn();
void A_SetFuse();
void A_CrawlaCommanderThink(); // Crawla Commander
void A_SmokeTrailer();
void A_RingExplode();
void A_OldRingExplode();
void A_MixUp();
void A_RecyclePowers();
void A_BossScream();
void A_Boss2TakeDamage();
void A_GoopSplat();
void A_Boss2PogoSFX();
void A_Boss2PogoTarget();
void A_EggmanBox();
void A_TurretFire();
void A_SuperTurretFire();
void A_TurretStop();
void A_JetJawRoam();
void A_JetJawChomp();
void A_PointyThink();
void A_CheckBuddy();
First commit on new tablet-laptop! * Robo Hood. * Hi MI, I know you're looking at this just because it features Robo hood. :V
2018-05-30 22:16:57 +00:00
void A_HoodFire();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
void A_HoodThink();
First commit on new tablet-laptop! * Robo Hood. * Hi MI, I know you're looking at this just because it features Robo hood. :V
2018-05-30 22:16:57 +00:00
void A_HoodFall();
New CEZ hardcoding done!! * Better Robo Hood arrows. * Shield break animation for Egg Guard. (Temporary state slot so I don't have to compile from scratch until I do something more complicated later.) * Suspicious Facestabber Statue animates a little before bursting open. * Fix Facestabber radius. * Fix some stuff in Flicky functions that could be overwritten in Lua call actions by mistake.
2018-05-31 20:00:12 +00:00
void A_ArrowBonks();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
void A_SnailerThink();
void A_SharpChase();
void A_SharpSpin();
* DrT's Spincushion hardcoded. * Make the MF_PAIN stuff ONLY depend on mass, using the bottom 8 bits for the type and the custom sound in the upper ones. * A bunch of cleanup of random other stuff, including an unused Deton state and an unused Jetty type's sprite.
2018-05-13 13:09:20 +00:00
void A_SharpDecel();
* Crushtacean! * Behaves a bit differently to the one in DSZres.pk3. * Can now punch DSZ mines! * Also has mapthingnum 126 instead of 610. * Some other mapthingnum changes. * DSZ2 stalagmite is now 1009, formerly 999. * Big DSZ gargoyle is now 1011, formerly 1009.
2018-05-14 00:19:24 +00:00
void A_CrushstaceanWalk();
void A_CrushstaceanPunch();
void A_CrushclawAim();
void A_CrushclawLaunch();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
void A_VultureVtol();
void A_VultureCheck();
Hardcoded the new BASH behavior (there's still a bug lurking somewhere)
2019-06-10 14:09:15 +00:00
void A_VultureHover();
void A_VultureBlast();
void A_VultureFly();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
void A_SkimChase();
void A_SkullAttack();
void A_LobShot();
void A_FireShot();
void A_SuperFireShot();
void A_BossFireShot();
void A_Boss7FireMissiles();
void A_Boss1Laser();
void A_FocusTarget();
void A_Boss4Reverse();
void A_Boss4SpeedUp();
void A_Boss4Raise();
void A_SparkFollow();
void A_BuzzFly();
void A_GuardChase();
void A_EggShield();
void A_SetReactionTime();
void A_Boss1Spikeballs();
void A_Boss3TakeDamage();
void A_Boss3Path();
Hardcoded DSZ3 shockwave
2019-09-25 21:27:51 +00:00
void A_Boss3ShockThink();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
void A_LinedefExecute();
void A_PlaySeeSound();
void A_PlayAttackSound();
void A_PlayActiveSound();
void A_1upThinker();
void A_BossZoom(); //Unused
void A_Boss1Chase();
void A_Boss2Chase();
void A_Boss2Pogo();
void A_Boss7Chase();
void A_BossJetFume();
void A_SpawnObjectAbsolute();
void A_SpawnObjectRelative();
void A_ChangeAngleRelative();
void A_ChangeAngleAbsolute();
I
2019-08-18 17:16:48 +00:00
#ifdef ROTSPRITE
void A_RollAngle();
void A_ChangeRollAngleRelative();
void A_ChangeRollAngleAbsolute();
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
void A_PlaySound();
void A_FindTarget();
void A_FindTracer();
void A_SetTics();
void A_SetRandomTics();
void A_ChangeColorRelative();
void A_ChangeColorAbsolute();
void A_MoveRelative();
void A_MoveAbsolute();
void A_Thrust();
void A_ZThrust();
void A_SetTargetsTarget();
void A_SetObjectFlags();
void A_SetObjectFlags2();
void A_RandomState();
void A_RandomStateRange();
void A_DualAction();
void A_RemoteAction();
void A_ToggleFlameJet();
void A_OrbitNights();
void A_GhostMe();
void A_SetObjectState();
void A_SetObjectTypeState();
void A_KnockBack();
void A_PushAway();
void A_RingDrain();
void A_SplitShot();
void A_MissileSplit();
void A_MultiShot();
void A_InstaLoop();
void A_Custom3DRotate();
void A_SearchForPlayers();
void A_CheckRandom();
void A_CheckTargetRings();
void A_CheckRings();
void A_CheckTotalRings();
void A_CheckHealth();
void A_CheckRange();
void A_CheckHeight();
void A_CheckTrueRange();
void A_CheckThingCount();
void A_CheckAmbush();
void A_CheckCustomValue();
void A_CheckCusValMemo();
void A_SetCustomValue();
void A_UseCusValMemo();
void A_RelayCustomValue();
void A_CusValAction();
void A_ForceStop();
void A_ForceWin();
void A_SpikeRetract();
void A_InfoState();
void A_Repeat();
void A_SetScale();
void A_RemoteDamage();
void A_HomingChase();
void A_TrapShot();
void A_VileTarget();
void A_VileAttack();
void A_VileFire();
void A_BrakChase();
void A_BrakFireShot();
void A_BrakLobShot();
void A_NapalmScatter();
void A_SpawnFreshCopy();
Starting work on adding new system for spawning animals; added A_FlickySpawn and level header "animallist"/"flickylist" parameter No idea if this compiles yet (let alone if what is there works at all), just getting this out the way so I can work on certain other things *cough plane displacement cough*
2016-12-27 21:01:20 +00:00
void A_FlickySpawn();
A_FlickyCenter implementation - now Flickies can be attracted to players! * Changed default movement to attraction, vs. aimless * Flickies spawned from this will always have the FLICKY_CENTER mobj as its target * Use P_IsFlickyCenter to identify FLICKY_CENTER mobjs versus players * FLICKY_CENTER mobj tracer points to the spawned Flicky * Thanks toaster for the original code~~
2018-08-09 17:35:36 +00:00
void A_FlickyCenter();
* All Flicky A_ functions ported. * Corrected MT_EGGSHIELD spawning a flicky. * New compared to the Lua implementation: Flickies turn around when they hit walls!
2016-12-30 19:16:20 +00:00
void A_FlickyAim();
void A_FlickyFly();
void A_FlickySoar();
void A_FlickyCoast();
void A_FlickyHop();
void A_FlickyFlounder();
void A_FlickyCheck();
void A_FlickyHeightCheck();
void A_FlickyFlutter();
CEZ1 flames now implemented. Please note Brak flames use a FF_ANIMATE state instead of the normal flame ones because they are spammed a lot, and the normal ones make particles.
2017-01-21 12:39:41 +00:00
void A_FlameParticle();
Fancy super transformation changes! About to go out for dinner, so no major writeup,but let's just say all this changed code means that the transformation animation is smoother in colour change.
2017-10-04 16:45:03 +00:00
void A_FadeOverlay();
First hardcoded work for our good old friend Boss number 5. (Look, I know I shouldn't be hardcoding things at this stage... but things broke terribly when I tried to convert A_BrakLobShot to Lua, so.)
2016-07-05 19:39:45 +00:00
void A_Boss5Jump();
The contents of DSZ-f16.wad's LUA_A000 Lua script are in now Thing type numbers may be changed later
2017-12-08 18:26:32 +00:00
void A_LightBeamReset();
* Billiards mines! With support for both above and below water, replacing both the below-and-above-water old mines at once. * Explosion executors. * Minor refactor of P_KillMobj.
2018-04-26 19:18:51 +00:00
void A_MineExplode();
void A_MineRange();
* Haunted Heights! Smashing spikeball, Cacolantern, Spinbobert and Hangster, along with the Spider and Bat flickies and general decoration/ambience stuff. * MF_PAIN and MF_MISSILE now support setting damagetype via their Mass parameter. The two existing conflicts - the fuse setting for the grenade weapon ring and the Cybrakdemon napalm bomb - had these moved to other free parameters. * A_ConnectToGround is EXTREMELY useful for palmtrees and stuff. * Some other, relatively hacky A_ functions. * (Unrelated) Remove the need for a "Mario block mode" for the token by making it natively compatible. * Spikes and their time-offsetting via that Lua script sphere made. Also allow for wallspikes to do it via their angle/360.
2018-04-28 14:13:44 +00:00
void A_ConnectToGround();
void A_SpawnParticleRelative();
void A_MultiShotDist();
* Hive Elementals and Bumblebores, plus associated useful action functions. * Made Facestabbers take two hits and have associated pain/death animations. No other changes, just wanted to make sure THIS was done. * Move Bubblebuzz-related stuff to go alongside the secret badniks and etc. * MF2_INVERTAIMABLE. Inverts whether P_LookForEnemies can get at; replaces a hardcoded thingy.
2018-05-04 20:30:15 +00:00
void A_WhoCaresIfYourSonIsABee();
void A_ParentTriesToSleep();
void A_CryingToMomma();
* Bumpers and Balloons in a more final state. * Blue diagonal springs, because that gap is very, very odd. * Improved A_SpawnFreshCopy. * Tweaked P_LookForEnemies for consistency's sake. (Previously, it was impossible to make a spring that could neither be homing-attacked or attraction-shotted.)
2018-05-19 23:04:39 +00:00
void A_CheckFlags2();
Hardcoded A_Boss5FindWaypoint ...that took a while x_x
2019-05-03 21:58:54 +00:00
void A_Boss5FindWaypoint();
Hardcode A_DoNPCSkid
2019-05-03 19:00:31 +00:00
void A_DoNPCSkid();
hardcoded A_DoNPCPain
2019-05-02 17:32:43 +00:00
void A_DoNPCPain();
Hardcoded A_PrepareRepeat and A_Boss5Calm, added missing prototype for A_Boss5ExtraRepeat (and also fixed its description)
2019-05-03 17:51:17 +00:00
void A_PrepareRepeat();
Hardcoded A_Boss5ExtraRepeat
2019-05-02 20:21:15 +00:00
void A_Boss5ExtraRepeat();
Hardcoded A_PrepareRepeat and A_Boss5Calm, added missing prototype for A_Boss5ExtraRepeat (and also fixed its description)
2019-05-03 17:51:17 +00:00
void A_Boss5Calm();
Hardcoded A_Boss5CheckOnGround
2019-05-02 18:09:40 +00:00
void A_Boss5CheckOnGround();
Hardcoded A_Boss5CheckFalling
2019-05-02 20:32:28 +00:00
void A_Boss5CheckFalling();
Hardcoded A_Boss5PinchShot
2019-05-03 18:46:41 +00:00
void A_Boss5PinchShot();
Hardcoded A_Boss5MakeItRain
2019-05-03 19:52:56 +00:00
void A_Boss5MakeItRain();
Remember when Lach recorded their live reaction to 2.2 so far? Do you recall what the reaction to ACZ3 was? If you don't, the reaction was "WHAT?? Why is he here? This is GREAT but, what??" And while the reaction is on the positive end of things, it's stll clearly not advisable for our defining Big Reveal of the already huge update. To this end: Here is a mini cutscene! https://cdn.discordapp.com/attachments/428262628893261828/626207624043429898/srb20005.gif * He's digging through Eggman's trash. * Clearly doesn't expect to see you! * Ready for a fight all the same. * You can attack him during the mini cutscene if you're impatient. * Skipped if you give him MTF_AMBUSH. * Requires new assets (including map) to test, but I'm not ready to make a MR yet because I have other thoughts first. Also, since I was poking around in p_enemy.c, I fixed A_Boss1Laser's issues (not working with direct 2.1 port states and having the weird secondary attack).
2019-09-25 13:36:20 +00:00
void A_Boss5MakeJunk();
Hardcoded A_LookForBetter
2019-05-03 18:14:17 +00:00
void A_LookForBetter();
Hardcoded ACZ3.wad's version of A_TNTExplode under the name of A_Boss5BombExplode. After a lot of confusion and silly misunderstandings on my part (as well as a lot of mess cleaning), I've finally got there! The states for the actual bomb explosion effect itself are yet to be hardcoded, but that I'll do tomorrow afternoon probably.
2019-05-21 20:51:19 +00:00
void A_Boss5BombExplode();
Hardcoded dust devil
2019-06-08 07:51:46 +00:00
void A_DustDevilThink();
Hardcoded the TNT barrels and proximity shell (using mazmazz's A_TNTExplode implementation from the minecart branch)
2019-06-09 08:51:33 +00:00
void A_TNTExplode();
Hardcoded wood debris
2019-06-09 10:27:09 +00:00
void A_DebrisRandom();
Hardcoded train cameo
2019-06-09 11:48:07 +00:00
void A_TrainCameo();
void A_TrainCameo2();
Hardcoded the Canarivore
2019-06-10 11:58:16 +00:00
void A_CanarivoreGas();
Hardcoded the new Snapper behavior
2019-06-10 18:32:50 +00:00
void A_KillSegments();
void A_SnapperSpawn();
void A_SnapperThinker();
Hardcoded the saloon door
2019-06-12 19:20:14 +00:00
void A_SaloonDoorSpawn();
More incomplete minecart hardcoding
2019-06-13 19:45:30 +00:00
void A_MinecartSparkThink();
Ring sparkle mirroring
2019-08-03 22:28:53 +00:00
void A_ModuloToState();
Hardcoded the lavafall
2019-08-25 21:05:38 +00:00
void A_LavafallRocks();
void A_LavafallLava();
void A_FallingLavaCheck();
Hardcoded the Pyre Fly
2019-08-30 06:17:25 +00:00
void A_FireShrink();
Hardcoded the Pterabyte (without the grabbing mechanic)
2019-09-29 08:39:09 +00:00
void A_SpawnPterabytes();
void A_PterabyteHover();
Hardcode pumice ball Current known issues: players detached from the ball via any means other than jumping or pain do not have their ball reset properly
2019-09-29 12:18:40 +00:00
void A_RolloutSpawn();
void A_RolloutRock();
Add Dragonbomber enemy
2019-11-17 21:23:59 +00:00
void A_DragonbomberSpawn();
void A_DragonWing();
void A_DragonSegment();
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// ratio of states to sprites to mobj types is roughly 6 : 1 : 1
Upped freeslots limit
2019-06-03 19:23:48 +00:00
#define NUMMOBJFREESLOTS 512
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#define NUMSPRITEFREESLOTS NUMMOBJFREESLOTS
#define NUMSTATEFREESLOTS (NUMMOBJFREESLOTS*8)
// Hey, moron! If you change this table, don't forget about sprnames in info.c and the sprite lights in hw_light.c!
typedef enum sprite
{
SPR_NULL, // invisible object
SPR_UNKN,
SPR_THOK, // Thok! mobj
SPR_PLAY,
// Enemies
* DrT's Spincushion hardcoded. * Make the MF_PAIN stuff ONLY depend on mass, using the bottom 8 bits for the type and the custom sound in the upper ones. * A bunch of cleanup of random other stuff, including an unused Deton state and an unused Jetty type's sprite.
2018-05-13 13:09:20 +00:00
SPR_POSS, // Crawla (Blue)
SPR_SPOS, // Crawla (Red)
SPR_FISH, // SDURF
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SPR_BUZZ, // Buzz (Gold)
SPR_RBUZ, // Buzz (Red)
SPR_JETB, // Jetty-Syn Bomber
SPR_JETG, // Jetty-Syn Gunner
SPR_CCOM, // Crawla Commander
SPR_DETN, // Deton
SPR_SKIM, // Skim mine dropper
* DrT's Spincushion hardcoded. * Make the MF_PAIN stuff ONLY depend on mass, using the bottom 8 bits for the type and the custom sound in the upper ones. * A bunch of cleanup of random other stuff, including an unused Deton state and an unused Jetty type's sprite.
2018-05-13 13:09:20 +00:00
SPR_TRET, // Industrial Turret
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SPR_TURR, // Pop-Up Turret
SPR_SHRP, // Sharp
* Crushtacean! * Behaves a bit differently to the one in DSZres.pk3. * Can now punch DSZ mines! * Also has mapthingnum 126 instead of 610. * Some other mapthingnum changes. * DSZ2 stalagmite is now 1009, formerly 999. * Big DSZ gargoyle is now 1011, formerly 1009.
2018-05-14 00:19:24 +00:00
SPR_CRAB, // Crushstacean
* New object types! * Red and yellow Boost panels! * Added because SUBARASHII and KIMOKAWAIII had several levels using them, and I wanted to make them look better. * https://cdn.discordapp.com/attachments/359091121789468672/634486669202161674/srb20015.gif * Uses the mapthingnums of Glaber's SOC resource boosters, but absolutely nothing else - not even the magnitudes. * Apply MF_AMBUSH to force the player into a spin - even if they don't have a spin ability! * Banpyura! * A Crushstacean with a spring instead of a crushclaw. * https://cdn.discordapp.com/attachments/428262628893261828/634432099306176512/srb20019.gif * Wanted this for a while, finally added it. * Improved springs. * Add pw_noautobrake to disable autobrake for half a second when touching yellow horizontal springs, and a second when touching red ones, even on the ground. * Add pw_justsprung to disable directionchar for a few tics while touching any springs with a horizontal component to their velocity. * Add the diagonal spring flag options Red and Yellow Diagonal Springs have to the Blue Diagonal Spring as well. * Started but decided against a tip of the hat to the CD spring spin, hidden behind #define SPRINGSPIN. * Make directionchar "lag behind" a little bit in waterslides. * Improved flame jets. * They now use new sprites for having their flames move upwards and sideways, instead of having them always face downwards like in 2.1! * Fixed a mixed declaration and code error in A_RolloutRock. (Sorry Lach!) * Make the Amy Cameo only spawn in SP, Record Attack, or Co-op unless it's the Clone Mode. * Improved ZB config. * Add above new types. * Add Blue Diagonal Spring, which existed in the source but not the config. * Re-order enemies in ZB config by zone (but keep them in the Enemies section only).
2019-10-17 20:50:26 +00:00
SPR_CR2B, // Banpyura
SPR_CSPR, // Banpyura spring
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SPR_JJAW, // Jet Jaw
SPR_SNLR, // Snailer
* Crushtacean! * Behaves a bit differently to the one in DSZres.pk3. * Can now punch DSZ mines! * Also has mapthingnum 126 instead of 610. * Some other mapthingnum changes. * DSZ2 stalagmite is now 1009, formerly 999. * Big DSZ gargoyle is now 1011, formerly 1009.
2018-05-14 00:19:24 +00:00
SPR_VLTR, // BASH
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SPR_PNTY, // Pointy
SPR_ARCH, // Robo-Hood
* DrT's Spincushion hardcoded. * Make the MF_PAIN stuff ONLY depend on mass, using the bottom 8 bits for the type and the custom sound in the upper ones. * A bunch of cleanup of random other stuff, including an unused Deton state and an unused Jetty type's sprite.
2018-05-13 13:09:20 +00:00
SPR_CBFS, // Castlebot Facestabber
* Castlebot Facestabbers. * Facestabber statues, of both the suspicious and non-suspicious kind. * New object type for the end of grabbable chains. * I moved my compilation .bat file to my Releases folder, so it should .gitignore .bat's. * Random extra stuff.
2018-05-24 00:40:57 +00:00
SPR_STAB, // Castlebot Facestabber spear aura
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SPR_SPSH, // Egg Guard
* Crushtacean! * Behaves a bit differently to the one in DSZres.pk3. * Can now punch DSZ mines! * Also has mapthingnum 126 instead of 610. * Some other mapthingnum changes. * DSZ2 stalagmite is now 1009, formerly 999. * Big DSZ gargoyle is now 1011, formerly 1009.
2018-05-14 00:19:24 +00:00
SPR_ESHI, // Egg Guard's shield
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SPR_GSNP, // Green Snapper
Hardcoded the new Snapper behavior
2019-06-10 18:32:50 +00:00
SPR_GSNL, // Green Snapper leg
SPR_GSNH, // Green Snapper head
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SPR_MNUS, // Minus
Hardcoded the new Minus behavior
2019-06-10 15:42:37 +00:00
SPR_MNUD, // Minus dirt
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SPR_SSHL, // Spring Shell
SPR_UNID, // Unidus
Hardcoded the Canarivore
2019-06-10 11:58:16 +00:00
SPR_CANA, // Canarivore
SPR_CANG, // Canarivore gas
Hardcoded the Pyre Fly
2019-08-30 06:17:25 +00:00
SPR_PYRE, // Pyre Fly
Hardcoded the Pterabyte (without the grabbing mechanic)
2019-09-29 08:39:09 +00:00
SPR_PTER, // Pterabyte
Add Dragonbomber enemy
2019-11-17 21:23:59 +00:00
SPR_DRAB, // Dragonbomber
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Generic Boss Items
SPR_JETF, // Boss jet fumes
// Boss 1 (Greenflower)
Motor's new Eggman sprites, along with some other sweet bits of boss polish. What else can I say? Just play it.
2019-08-30 18:19:54 +00:00
SPR_EGGM, // Boss 1
SPR_EGLZ, // Boss 1 Junk
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Boss 2 (Techno Hill)
SPR_EGGN, // Boss 2
Motor's new Eggman sprites, along with some other sweet bits of boss polish. What else can I say? Just play it.
2019-08-30 18:19:54 +00:00
SPR_TANK, // Boss 2 Junk
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SPR_GOOP, // Boss 2 Goop
// Boss 3 (Deep Sea)
SPR_EGGO, // Boss 3
Motor's new Eggman sprites, along with some other sweet bits of boss polish. What else can I say? Just play it.
2019-08-30 18:19:54 +00:00
SPR_SEBH, // Boss 3 Junk
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SPR_FAKE, // Boss 3 Fakemobile
Hardcoded DSZ3 shockwave
2019-09-25 21:27:51 +00:00
SPR_SHCK, // Boss 3 Shockwave
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Boss 4 (Castle Eggman)
SPR_EGGP,
SPR_EFIR, // Boss 4 jet flame
ha ha ha how can i possibly describe this commit Just wait for the MR, it won't be far behind.
2019-07-08 12:26:40 +00:00
SPR_EGR1, // Boss 4 Spectator Eggrobo
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Boss 5 (Arid Canyon)
Hardcoded all the main Fang-specific object types, states and sprites. This cannot be compiled as-is right now for the following reasons: * Numerous actions still need to be hardcoded. * MT_FBOMB uses the TNT barrel explosion (and by extention A_TNTExplode) for its death state. This is a pickle, I'll deal with it when I get to it. Also missing: * Fang waypoint object type+states. * Fang's good looks (to be put in the resource files obviously). * Fang's brain.
2019-05-02 17:01:18 +00:00
SPR_FANG, // replaces EGGQ
Remember when Lach recorded their live reaction to 2.2 so far? Do you recall what the reaction to ACZ3 was? If you don't, the reaction was "WHAT?? Why is he here? This is GREAT but, what??" And while the reaction is on the positive end of things, it's stll clearly not advisable for our defining Big Reveal of the already huge update. To this end: Here is a mini cutscene! https://cdn.discordapp.com/attachments/428262628893261828/626207624043429898/srb20005.gif * He's digging through Eggman's trash. * Clearly doesn't expect to see you! * Ready for a fight all the same. * You can attack him during the mini cutscene if you're impatient. * Skipped if you give him MTF_AMBUSH. * Requires new assets (including map) to test, but I'm not ready to make a MR yet because I have other thoughts first. Also, since I was poking around in p_enemy.c, I fixed A_Boss1Laser's issues (not working with direct 2.1 port states and having the weird secondary attack).
2019-09-25 13:36:20 +00:00
SPR_BRKN,
SPR_WHAT,
* Add vwre vwre intro for Fang Clone Fighter battle. (Still skipped with presence of MTF_AMBUSH) * https://cdn.discordapp.com/attachments/428262628893261828/626792815451701259/srb20006.gif * Add fadeout instead of slapstick for Fang Clone Fighter death. * Allow placed Fang and Metal Sonic objects to be marked as Clone Fighters always through presence of MTF_EXTRA.
2019-09-26 16:06:29 +00:00
SPR_VWRE,
SPR_PROJ, // projector light
Hardcoded all the main Fang-specific object types, states and sprites. This cannot be compiled as-is right now for the following reasons: * Numerous actions still need to be hardcoded. * MT_FBOMB uses the TNT barrel explosion (and by extention A_TNTExplode) for its death state. This is a pickle, I'll deal with it when I get to it. Also missing: * Fang waypoint object type+states. * Fang's good looks (to be put in the resource files obviously). * Fang's brain.
2019-05-02 17:01:18 +00:00
SPR_FBOM,
SPR_FSGN,
Hardcode the bomb's explosion states, the dust object type and states, and the sprite prefixes for both
2019-05-23 20:51:58 +00:00
SPR_BARX, // bomb explosion (also used by barrel)
SPR_BARD, // bomb dust (also used by barrel)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Boss 6 (Red Volcano)
SPR_EGGR,
// Boss 7 (Dark City)
SPR_BRAK,
SPR_BGOO, // Goop
SPR_BMSL,
// Boss 8 (Egg Rock)
SPR_EGGT,
// Cy-Brak-Demon; uses SPR_BRAK as well, but has some extras
SPR_RCKT, // Rockets!
SPR_ELEC, // Electricity!
SPR_TARG, // Targeting reticules!
SPR_NPLM, // Big napalm bombs!
SPR_MNPL, // Mini napalm bombs!
// Metal Sonic
SPR_METL,
SPR_MSCF,
SPR_MSCB,
// Collectible Items
SPR_RING,
SPR_TRNG, // Team Rings
SPR_TOKE, // Special Stage Token
SPR_RFLG, // Red CTF Flag
SPR_BFLG, // Blue CTF Flag
MONSTER COMMIT. OLD SPECIAL STAGES: * Spheres in old special stages instead of rings! * Individual timers in old special stages instead of a global one! * Old special stages use a variant of the NiGHTS HUD now! * Special stage damage in old special stages loses 5 seconds of time instead of 10 rings/spheres! * All damage gained through old special stages is converted to special stage damage! As a consequence, the special spikeball has no need to be special anymore. * Made emerald gaining function be based on special stage number rather than gained emeralds! * Consistency with... NiGHTS SPECIAL STAGES: * Spheres now flash in bonus time. https://cdn.discordapp.com/attachments/400761370800422922/452590553100713984/srb20032.gif * Sphere and ring mapthingnums are now less fucked up in 'em. (Rings are 300, same as usual, while Spheres are now 1706 replacing NiGHTS Wings.) SPECIAL STAGES IN GENERAL: * useNightsSS is now dead. Each individual special stage is now assessed for NiGHTS-mode behaviour based on maptol & TOL_NIGHTS. * CRAWLA HONCHO\n CAN NOW BE\n SUPER CRAWLA HONCHO end tally modification now also includes a mini-tutorial on turning super. https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif * SONIC GOT A CHAOS EMERALD? https://cdn.discordapp.com/attachments/400761370800422922/452623869497573386/srb20034.gif NiGHTS NON-SPECIAL STAGES: * Colour Chips and Star Chips! Replaces Spheres and Rings of NiGHTS Special Stages. * Colour Chips turn yellow in bonus time. * Ideya! * Its own "drowning" music! * All of the object types for Dream Hill. * GIF: https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif RANDOM BS: * Turn super with the spin button instead of the jump button! * Followmobj now correctly set with P_SetTarget instead of pointer assignment. * Emerald hunt uses new sprites! * Made unlock noise different from emblem gain noise! (It's the CRAWLA HONCHO CAN NOW TURN yadda yadda sound from S3K now.)
2018-06-03 21:41:54 +00:00
SPR_SPHR, // Sphere
SPR_NCHP, // NiGHTS chip
SPR_NSTR, // NiGHTS star
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SPR_EMBM, // Emblem
SPR_CEMG, // Chaos Emeralds
MONSTER COMMIT. OLD SPECIAL STAGES: * Spheres in old special stages instead of rings! * Individual timers in old special stages instead of a global one! * Old special stages use a variant of the NiGHTS HUD now! * Special stage damage in old special stages loses 5 seconds of time instead of 10 rings/spheres! * All damage gained through old special stages is converted to special stage damage! As a consequence, the special spikeball has no need to be special anymore. * Made emerald gaining function be based on special stage number rather than gained emeralds! * Consistency with... NiGHTS SPECIAL STAGES: * Spheres now flash in bonus time. https://cdn.discordapp.com/attachments/400761370800422922/452590553100713984/srb20032.gif * Sphere and ring mapthingnums are now less fucked up in 'em. (Rings are 300, same as usual, while Spheres are now 1706 replacing NiGHTS Wings.) SPECIAL STAGES IN GENERAL: * useNightsSS is now dead. Each individual special stage is now assessed for NiGHTS-mode behaviour based on maptol & TOL_NIGHTS. * CRAWLA HONCHO\n CAN NOW BE\n SUPER CRAWLA HONCHO end tally modification now also includes a mini-tutorial on turning super. https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif * SONIC GOT A CHAOS EMERALD? https://cdn.discordapp.com/attachments/400761370800422922/452623869497573386/srb20034.gif NiGHTS NON-SPECIAL STAGES: * Colour Chips and Star Chips! Replaces Spheres and Rings of NiGHTS Special Stages. * Colour Chips turn yellow in bonus time. * Ideya! * Its own "drowning" music! * All of the object types for Dream Hill. * GIF: https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif RANDOM BS: * Turn super with the spin button instead of the jump button! * Followmobj now correctly set with P_SetTarget instead of pointer assignment. * Emerald hunt uses new sprites! * Made unlock noise different from emblem gain noise! (It's the CRAWLA HONCHO CAN NOW TURN yadda yadda sound from S3K now.)
2018-06-03 21:41:54 +00:00
SPR_SHRD, // Emerald Hunt
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Interactive Objects
Changes to bubbles for new DSZ + bubble sprites (needs new patch.dta).
2016-09-24 16:15:42 +00:00
SPR_BBLS, // water bubble source
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SPR_SIGN, // Level end sign
SPR_SPIK, // Spike Ball
SPR_SFLM, // Spin fire
SPR_USPK, // Floor spike
Starting work for hardcoding wall spikes
2017-07-13 21:42:08 +00:00
SPR_WSPK, // Wall spike
SPR_WSPB, // Wall spike base
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SPR_STPT, // Starpost
SPR_BMNE, // Big floating mine
Hardcode pumice ball Current known issues: players detached from the ball via any means other than jumping or pain do not have their ball reset properly
2019-09-29 12:18:40 +00:00
SPR_PUMI, // Rollout Rock
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Monitor Boxes
rewrite of monitors to accomodate repeat use monitors. It's a lot nicer in general, honestly. I think a couple bugs with custom monitors respawning got fixed in the process. Note that a monitorgfx.wad is needed if you want to see things besides <!>s for monitors, due to graphic changes.
2015-12-31 16:38:23 +00:00
SPR_MSTV, // MiSc TV sprites
SPR_XLTV, // eXtra Large TV sprites
SPR_TRRI, // Red team: 10 RIngs
SPR_TBRI, // Blue team: 10 RIngs
SPR_TVRI, // 10 RIng
SPR_TVPI, // PIty shield
SPR_TVAT, // ATtraction shield
SPR_TVFO, // FOrce shield
SPR_TVAR, // ARmageddon shield
SPR_TVWW, // WhirlWind shield
SPR_TVEL, // ELemental shield
SPR_TVSS, // Super Sneakers
SPR_TVIV, // InVincibility
SPR_TV1U, // 1Up
SPR_TV1P, // 1uP (textless)
SPR_TVEG, // EGgman
SPR_TVMX, // MiXup
SPR_TVMY, // MYstery
SPR_TVGV, // GraVity boots
SPR_TVRC, // ReCycler
SPR_TV1K, // 1,000 points (1 K)
SPR_TVTK, // 10,000 points (Ten K)
Sonic 3 shields implemented at a basic visual/functional level - no abilities yet.
2016-10-13 14:13:33 +00:00
SPR_TVFL, // FLame shield
SPR_TVBB, // BuBble shield
SPR_TVZP, // Thunder shield (ZaP)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Projectiles
SPR_MISL,
SPR_TORP, // Torpedo
SPR_ENRG, // Energy ball
SPR_MINE, // Skim mine
SPR_JBUL, // Jetty-Syn Bullet
SPR_TRLS,
SPR_CBLL, // Cannonball
SPR_AROW, // Arrow
SRB2 2.1.14 release
2015-01-01 19:50:31 +00:00
SPR_CFIR, // Colored fire of various sorts
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Secret stuff. (I intend to keep candid discussion of this outside of any commits; you'll see me write up a comment describing what's going on here soon.)
2019-11-01 15:48:50 +00:00
// The letter
SPR_LETR,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Greenflower Scenery
SPR_FWR1,
SPR_FWR2, // GFZ Sunflower
SPR_FWR3, // GFZ budding flower
SPR_FWR4,
SPR_BUS1, // GFZ Bush w/ berries
SPR_BUS2, // GFZ Bush w/o berries
Bit of a random one today, but the branch approaches completion... * Bomb sphere! Paraloopable hazard. Replaces MT_SPECIALSPIKEBALL. * Blueberry bushes, both normal and Xmas, from patch.dta. * BSZ tulips, also from patch.dta! * Frozen Hillside badniks - Penguinator and Pophat. * Frozen Hillside ice decoration! * Fixed some big bugs with the DSZ light beams. * Made multi-mare special stages work, in a troll way - the Chaos Emerald disappears in a puff of smoke, and the Spinbobert laughter sound plays... >:3c * Reverted the mobjtype number changes from the source SOC/Lua, which we can do later when doing a final pass of the levels. * State optimisation. * Serious cruft-removal of the NiGHTS drone thinker. * Fix the issues where the player wouldn't curl into jump in waterslides or dropping off rope-hangs. * Tweak NiGHTS player flashing. * Add text colour support to the titlecard font. * Use that to make the PRESS SPIN\nMID-JUMP thing when you get all Chaos Emeralds use the titlecard font for readability. * Fix the GOT ALL EMERALDS page not lasting the correct, extended amount of time. * Fix that thing where flying mid-spin didn't enact autobrake. * Modify graymap a little on Sryder's suggestion. * [COMPLETELY UNRELATED] fix that thing where the addons menu will fail on files/paths with spaces in [/COMPLETELY UNRELATED]
2018-06-05 16:22:28 +00:00
SPR_BUS3, // GFZ Bush w/ BLUE berries
Hardcoded SOC_TREE from patch.dta Also made sure the GFZ trees have MF2_STANDONME
2017-07-13 16:29:15 +00:00
// Trees (both GFZ and misc)
SPR_TRE1, // GFZ
SPR_TRE2, // Checker
SPR_TRE3, // Frozen Hillside
SPR_TRE4, // Polygon
SPR_TRE5, // Bush tree
MONSTER COMMIT. OLD SPECIAL STAGES: * Spheres in old special stages instead of rings! * Individual timers in old special stages instead of a global one! * Old special stages use a variant of the NiGHTS HUD now! * Special stage damage in old special stages loses 5 seconds of time instead of 10 rings/spheres! * All damage gained through old special stages is converted to special stage damage! As a consequence, the special spikeball has no need to be special anymore. * Made emerald gaining function be based on special stage number rather than gained emeralds! * Consistency with... NiGHTS SPECIAL STAGES: * Spheres now flash in bonus time. https://cdn.discordapp.com/attachments/400761370800422922/452590553100713984/srb20032.gif * Sphere and ring mapthingnums are now less fucked up in 'em. (Rings are 300, same as usual, while Spheres are now 1706 replacing NiGHTS Wings.) SPECIAL STAGES IN GENERAL: * useNightsSS is now dead. Each individual special stage is now assessed for NiGHTS-mode behaviour based on maptol & TOL_NIGHTS. * CRAWLA HONCHO\n CAN NOW BE\n SUPER CRAWLA HONCHO end tally modification now also includes a mini-tutorial on turning super. https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif * SONIC GOT A CHAOS EMERALD? https://cdn.discordapp.com/attachments/400761370800422922/452623869497573386/srb20034.gif NiGHTS NON-SPECIAL STAGES: * Colour Chips and Star Chips! Replaces Spheres and Rings of NiGHTS Special Stages. * Colour Chips turn yellow in bonus time. * Ideya! * Its own "drowning" music! * All of the object types for Dream Hill. * GIF: https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif RANDOM BS: * Turn super with the spin button instead of the jump button! * Followmobj now correctly set with P_SetTarget instead of pointer assignment. * Emerald hunt uses new sprites! * Made unlock noise different from emblem gain noise! (It's the CRAWLA HONCHO CAN NOW TURN yadda yadda sound from S3K now.)
2018-06-03 21:41:54 +00:00
SPR_TRE6, // Spring tree
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Techno Hill Scenery
Hardcoded SOC_FWR6 from THZ1.wad, also tweaked MT_THZFLOWERB's hitbox
2018-01-19 17:56:18 +00:00
SPR_THZP, // THZ1 Steam Flower
SPR_FWR5, // THZ1 Spin flower (red)
SPR_FWR6, // THZ1 Spin flower (yellow)
Hardcoded LUA_THZT from THZ1.wad, giving us the funny-looking steam whistle tree This concludes hardcoding of scenery items for THZ
2018-01-22 18:41:14 +00:00
SPR_THZT, // Steam Whistle tree/bush
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SPR_ALRM, // THZ2 Alarm
// Deep Sea Scenery
SPR_GARG, // Deep Sea Gargoyle
SPR_SEWE, // Deep Sea Seaweed
SPR_DRIP, // Dripping water
Small DSZ coral tweaks.
2019-09-19 22:51:44 +00:00
SPR_CORL, // Coral
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SPR_BCRY, // Blue Crystal
The contents of DSZ-f16.wad's LUA_A000 Lua script are in now Thing type numbers may be changed later
2017-12-08 18:26:32 +00:00
SPR_KELP, // Kelp
New animated DSZ kelp.
2019-09-18 00:05:19 +00:00
SPR_ALGA, // Animated algae top
SPR_ALGB, // Animated algae segment
The contents of DSZ-f16.wad's LUA_A000 Lua script are in now Thing type numbers may be changed later
2017-12-08 18:26:32 +00:00
SPR_DSTG, // DSZ Stalagmites
SPR_LIBE, // DSZ Light beam
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Castle Eggman Scenery
SPR_CHAN, // CEZ Chain
SPR_FLAM, // Flame
SPR_ESTA, // Eggman esta una estatua!
SPR_SMCH, // Small Mace Chain
SPR_BMCH, // Big Mace Chain
SPR_SMCE, // Small Mace
SPR_BMCE, // Big Mace
Hooh boy. **** * MF2_MACEROTATE. Apply to any object. Replaces the indiscriminate spamming of A_MaceRotate each tic. **** * Mace point mapthings have been slightly modified. - MTF_AMBUSH: bigger luke theory (has no effect on custom mace, different effect on spring mace) - MTF_OBJECTFLIP: flips the objects, but nothing else - just so it doesn't look out of place in gravflip sections - MTF_OBJECTSPECIAL: keeps it from attempting to play swinging sounds - angle: tag of controlling linedef - parameter: number of "spokes" minus one - for example, a parameter of 2 results in 3 equidistant maces rotating around the same point. **** * Mace linedefs have been significantly revamped. - line dx: number of chain links - line dy: speed (in FU) - frontside floor height: Pitch (in degrees; how much it "tilts" over - Yaw influences the axis it's tilting on) - frontside ceiling height: Yaw (in degrees; rotation of entire thing on xy plane) - frontside x offset: Phase (in degrees; how far it is through the rotation cycle) - frontside y offset: Max speed (in FU; if less than speed, set to speed*2) - backside floor height: Pinch (in degrees; 0 if no backside; essentially makes rotation conical instead of wheel-like) - backside ceiling height: Roll (in degrees; 0 if no backside; rotates on the axis of the spinning - identical to Phase for spinning maces, but useful for rotating swinging maces as opposed to just offsetting them) - backside x offset: Number of "antispokes" (0 if no backside; makes that many spokes not exist so you can put another mace/chain type in there instead; for combo mace/chain instead turns them into chains directly) - backside y offset: Width (in number of extra chains per side; 0 if no backside; creates a "skiprope" arrangement) ---- - ML_NOCLIMB: for chains and chain-mace combos, allow for player control of yaw through strafe keys - ML_EFFECT1: replacing the seperate mapthings, this makes a mace type swing instead of spin. - ML_EFFECT2: for all spokes of the mace wheel ending in maces, make the chains out of the mace type (inverted for firebars) - ML_EFFECT3: spawn a bonus mace type at the center(s) of rotation - ML_EFFECT4: don't clip inside ground **** * Mapthing 1104 represents both spinning and swinging maces from prior versions of SRB2. * Mapthing 1105 has gone from being a swinging mace variant to a combination of chains and maces in a single unit, provided the number of "spokes" is greater than one. * Mapthing 1105 has gone from being a swinging chain variant to a vertical spring-on-a-ball-on-a-chain. Yellow by default, apply MTF_AMBUSH to turn into a red spring. * Mapthing 1107 represents both spinning and swinging chains from prior versions of SRB2. * Mapthing 1108 is completely untouched except to port over 2.1's functionality to the new backend. * Mapthing 1109 is a Mario castle-level style firebar. This inverts the functionality of ML_EFFECT2 on the tagged linedef. * Mapthing 1110 is a free slot should we want to implement another type of base-game mace. * Mapthing 1111 is a custom mace. Use the linedef's frontside texture slots to identify a macetype mobjtype, then use the backside texture slots to identify a linktype mobjtype (defaults to MT_NULL if no backside). **** Whooh. Requires new patch.dta for sprites.
2017-07-02 14:11:09 +00:00
SPR_YSPB, // Yellow spring on a ball
SPR_RSPB, // Red spring on a ball
SPR_SFBR, // Small Firebar
SPR_BFBR, // Big Firebar
* CEZ decorations! * Moved a bunch of stuff that had no business being in mapthing spawns into mobj spawns.
2018-05-22 10:04:28 +00:00
SPR_BANR, // Banner/pole
SPR_PINE, // Pine Tree
SPR_CEZB, // Bush
SPR_CNDL, // Candle/pricket
SPR_FLMH, // Flame holder
SPR_CTRC, // Fire torch
SPR_CFLG, // Waving flag/segment
SPR_CSTA, // Crawla statue
* Castlebot Facestabbers. * Facestabber statues, of both the suspicious and non-suspicious kind. * New object type for the end of grabbable chains. * I moved my compilation .bat file to my Releases folder, so it should .gitignore .bat's. * Random extra stuff.
2018-05-24 00:40:57 +00:00
SPR_CBBS, // Facestabber statue
Hardcoded Brambles.lua from CEZRes.pk3, changed thing type to 1125
2018-08-22 16:16:11 +00:00
SPR_CABR, // Brambles
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Arid Canyon Scenery
SPR_BTBL, // Big tumbleweed
SPR_STBL, // Small tumbleweed
Small DSZ coral tweaks.
2019-09-19 22:51:44 +00:00
SPR_CACT, // Cacti
Hardcode some ACZ things
2019-05-12 02:56:23 +00:00
SPR_WWSG, // Caution Sign
SPR_WWS2, // Cacti Sign
SPR_WWS3, // Sharp Turn Sign
Hardcoded oil lamp
2019-06-08 13:50:01 +00:00
SPR_OILL, // Oil lamp
SPR_OILF, // Oil lamp flare
Hardcoded the TNT barrels and proximity shell (using mazmazz's A_TNTExplode implementation from the minecart branch)
2019-06-09 08:51:33 +00:00
SPR_BARR, // TNT barrel
SPR_REMT, // TNT proximity shell
Hardcoded dust devil
2019-06-08 07:51:46 +00:00
SPR_TAZD, // Dust devil
SPR_ADST, // Arid dust
More incomplete minecart hardcoding
2019-06-13 19:45:30 +00:00
SPR_MCRT, // Minecart
SPR_MCSP, // Minecart spark
Hardcoded the saloon door
2019-06-12 19:20:14 +00:00
SPR_SALD, // Saloon door
Hardcoded train cameo
2019-06-09 11:48:07 +00:00
SPR_TRAE, // Train cameo locomotive
SPR_TRAI, // Train cameo wagon
Hardcoded train dust and steam spawner
2019-06-09 15:16:07 +00:00
SPR_STEA, // Train steam
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Red Volcano Scenery
SPR_FLME, // Flame jet
SPR_DFLM, // Blade's flame
Hardcoded the lavafall
2019-08-25 21:05:38 +00:00
SPR_LFAL, // Lavafall
Hardcoded the RVZ scenery
2019-08-25 10:40:32 +00:00
SPR_JPLA, // Jungle palm
SPR_TFLO, // Torch flower
SPR_WVIN, // Wall vines
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Dark City Scenery
// Egg Rock Scenery
// Christmas Scenery
Hardcode new/updated xmas scenery object type/state info
2017-04-18 17:32:52 +00:00
SPR_XMS1, // Christmas Pole
SPR_XMS2, // Candy Cane
SPR_XMS3, // Snowman
SPR_XMS4, // Lamppost
SPR_XMS5, // Hanging Star
Amy cameo for Frozen Hillside. Wait for the MR, I'll make a fuller pitch there...
2019-10-01 17:19:37 +00:00
SPR_XMS6, // Mistletoe
Bit of a random one today, but the branch approaches completion... * Bomb sphere! Paraloopable hazard. Replaces MT_SPECIALSPIKEBALL. * Blueberry bushes, both normal and Xmas, from patch.dta. * BSZ tulips, also from patch.dta! * Frozen Hillside badniks - Penguinator and Pophat. * Frozen Hillside ice decoration! * Fixed some big bugs with the DSZ light beams. * Made multi-mare special stages work, in a troll way - the Chaos Emerald disappears in a puff of smoke, and the Spinbobert laughter sound plays... >:3c * Reverted the mobjtype number changes from the source SOC/Lua, which we can do later when doing a final pass of the levels. * State optimisation. * Serious cruft-removal of the NiGHTS drone thinker. * Fix the issues where the player wouldn't curl into jump in waterslides or dropping off rope-hangs. * Tweak NiGHTS player flashing. * Add text colour support to the titlecard font. * Use that to make the PRESS SPIN\nMID-JUMP thing when you get all Chaos Emeralds use the titlecard font for readability. * Fix the GOT ALL EMERALDS page not lasting the correct, extended amount of time. * Fix that thing where flying mid-spin didn't enact autobrake. * Modify graymap a little on Sryder's suggestion. * [COMPLETELY UNRELATED] fix that thing where the addons menu will fail on files/paths with spaces in [/COMPLETELY UNRELATED]
2018-06-05 16:22:28 +00:00
SPR_FHZI, // FHZ Ice
Amy cameo for Frozen Hillside. Wait for the MR, I'll make a fuller pitch there...
2019-10-01 17:19:37 +00:00
SPR_ROSY,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
* Haunted Heights! Smashing spikeball, Cacolantern, Spinbobert and Hangster, along with the Spider and Bat flickies and general decoration/ambience stuff. * MF_PAIN and MF_MISSILE now support setting damagetype via their Mass parameter. The two existing conflicts - the fuse setting for the grenade weapon ring and the Cybrakdemon napalm bomb - had these moved to other free parameters. * A_ConnectToGround is EXTREMELY useful for palmtrees and stuff. * Some other, relatively hacky A_ functions. * (Unrelated) Remove the need for a "Mario block mode" for the token by making it natively compatible. * Spikes and their time-offsetting via that Lua script sphere made. Also allow for wallspikes to do it via their angle/360.
2018-04-28 14:13:44 +00:00
// Halloween Scenery
SPR_PUMK, // Pumpkins
SPR_HHPL, // Dr Seuss Trees
SPR_SHRM, // Mushroom
SPR_HHZM, // Misc
There's some whitespace...
2019-11-07 22:56:42 +00:00
Add new ATZ gargoyle sprites
2019-10-21 05:43:02 +00:00
// Azure Temple Scenery
SPR_BGAR, // ATZ Gargoyles
SPR_RCRY, // ATZ Red Crystal (Target)
Add green flame sprites, state, and object
2019-10-21 08:22:20 +00:00
SPR_CFLM, // Green torch flame
* Haunted Heights! Smashing spikeball, Cacolantern, Spinbobert and Hangster, along with the Spider and Bat flickies and general decoration/ambience stuff. * MF_PAIN and MF_MISSILE now support setting damagetype via their Mass parameter. The two existing conflicts - the fuse setting for the grenade weapon ring and the Cybrakdemon napalm bomb - had these moved to other free parameters. * A_ConnectToGround is EXTREMELY useful for palmtrees and stuff. * Some other, relatively hacky A_ functions. * (Unrelated) Remove the need for a "Mario block mode" for the token by making it natively compatible. * Spikes and their time-offsetting via that Lua script sphere made. Also allow for wallspikes to do it via their angle/360.
2018-04-28 14:13:44 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Botanic Serenity Scenery
SPR_BSZ1, // Tall flowers
SPR_BSZ2, // Medium flowers
SPR_BSZ3, // Small flowers
Bit of a random one today, but the branch approaches completion... * Bomb sphere! Paraloopable hazard. Replaces MT_SPECIALSPIKEBALL. * Blueberry bushes, both normal and Xmas, from patch.dta. * BSZ tulips, also from patch.dta! * Frozen Hillside badniks - Penguinator and Pophat. * Frozen Hillside ice decoration! * Fixed some big bugs with the DSZ light beams. * Made multi-mare special stages work, in a troll way - the Chaos Emerald disappears in a puff of smoke, and the Spinbobert laughter sound plays... >:3c * Reverted the mobjtype number changes from the source SOC/Lua, which we can do later when doing a final pass of the levels. * State optimisation. * Serious cruft-removal of the NiGHTS drone thinker. * Fix the issues where the player wouldn't curl into jump in waterslides or dropping off rope-hangs. * Tweak NiGHTS player flashing. * Add text colour support to the titlecard font. * Use that to make the PRESS SPIN\nMID-JUMP thing when you get all Chaos Emeralds use the titlecard font for readability. * Fix the GOT ALL EMERALDS page not lasting the correct, extended amount of time. * Fix that thing where flying mid-spin didn't enact autobrake. * Modify graymap a little on Sryder's suggestion. * [COMPLETELY UNRELATED] fix that thing where the addons menu will fail on files/paths with spaces in [/COMPLETELY UNRELATED]
2018-06-05 16:22:28 +00:00
//SPR_BSZ4, -- Tulips
SPR_BST1, // Red tulip
SPR_BST2, // Purple tulip
SPR_BST3, // Blue tulip
SPR_BST4, // Cyan tulip
SPR_BST5, // Yellow tulip
SPR_BST6, // Orange tulip
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SPR_BSZ5, // Cluster of Tulips
SPR_BSZ6, // Bush
SPR_BSZ7, // Vine
SPR_BSZ8, // Misc things
// Misc Scenery
SPR_STLG, // Stalagmites
SPR_DBAL, // Disco
// Powerup Indicators
SPR_ARMA, // Armageddon Shield Orb
SPR_ARMF, // Armageddon Shield Ring, Front
SPR_ARMB, // Armageddon Shield Ring, Back
SPR_WIND, // Whirlwind Shield Orb
SPR_MAGN, // Attract Shield Orb
Big commit, sorry. I broke several things trying to get other things to work and it's only now that all the code that worked yesterday works today! *P_LookForEnemies is now side-effect-less and only provides a pointer to the found mobj *player-jumping is dead, long live PF_STARTJUMP *per Mystic's request, CA2_GUNSLINGER has a targeting icon. It also has a more restricted vertical aiming range. *mobj for this is in the game as requested *fast teetering animation flag *general code cleanup
2017-03-22 18:51:30 +00:00
SPR_ELEM, // Elemental Shield Orb
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SPR_FORC, // Force Shield Orb
SPR_PITY, // Pity Shield Orb
Sonic 3 shields implemented at a basic visual/functional level - no abilities yet.
2016-10-13 14:13:33 +00:00
SPR_FIRS, // Flame Shield Orb
SPR_BUBS, // Bubble Shield Orb
SPR_ZAPS, // Thunder Shield Orb
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SPR_IVSP, // invincibility sparkles
SPR_SSPK, // Super Sonic Spark
SPR_GOAL, // Special Stage goal (here because lol NiGHTS)
* Ported in all of the Flickies from flickiesreduced8.wad except for the Flicker and seed. * Fixed a crash bug in the Flicky fly function I introduced sleepily last night.
2016-12-31 16:55:06 +00:00
// Flickies
SPR_FBUB, // Flicky-sized bubble
SPR_FL01, // Bluebird
SPR_FL02, // Rabbit
SPR_FL03, // Chicken
SPR_FL04, // Seal
SPR_FL05, // Pig
SPR_FL06, // Chipmunk
SPR_FL07, // Penguin
SPR_FL08, // Fish
SPR_FL09, // Ram
SPR_FL10, // Puffin
SPR_FL11, // Cow
SPR_FL12, // Rat
SPR_FL13, // Bear
SPR_FL14, // Dove
SPR_FL15, // Cat
SPR_FL16, // Canary
* Haunted Heights! Smashing spikeball, Cacolantern, Spinbobert and Hangster, along with the Spider and Bat flickies and general decoration/ambience stuff. * MF_PAIN and MF_MISSILE now support setting damagetype via their Mass parameter. The two existing conflicts - the fuse setting for the grenade weapon ring and the Cybrakdemon napalm bomb - had these moved to other free parameters. * A_ConnectToGround is EXTREMELY useful for palmtrees and stuff. * Some other, relatively hacky A_ functions. * (Unrelated) Remove the need for a "Mario block mode" for the token by making it natively compatible. * Spikes and their time-offsetting via that Lua script sphere made. Also allow for wallspikes to do it via their angle/360.
2018-04-28 14:13:44 +00:00
SPR_FS01, // Spider
SPR_FS02, // Bat
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Springs
* Bumpers and Balloons in a more final state. * Blue diagonal springs, because that gap is very, very odd. * Improved A_SpawnFreshCopy. * Tweaked P_LookForEnemies for consistency's sake. (Previously, it was impossible to make a spring that could neither be homing-attacked or attraction-shotted.)
2018-05-19 23:04:39 +00:00
SPR_FANS, // Fan
SPR_STEM, // Steam riser
SPR_BUMP, // Bumpers
SPR_BLON, // Balloons
SPR_SPRY, // Yellow spring
SPR_SPRR, // Red spring
SPR_SPRB, // Blue spring
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SPR_YSPR, // Yellow Diagonal Spring
SPR_RSPR, // Red Diagonal Spring
* Bumpers and Balloons in a more final state. * Blue diagonal springs, because that gap is very, very odd. * Improved A_SpawnFreshCopy. * Tweaked P_LookForEnemies for consistency's sake. (Previously, it was impossible to make a spring that could neither be homing-attacked or attraction-shotted.)
2018-05-19 23:04:39 +00:00
SPR_BSPR, // Blue Diagonal Spring
Sideways springs, horizontal hog-launchers, perpendicular plungers... Call them what you like, they're in the game now
2016-03-03 22:38:06 +00:00
SPR_SSWY, // Yellow Side Spring
SPR_SSWR, // Red Side Spring
SPR_SSWB, // Blue Side Spring
* New object types! * Red and yellow Boost panels! * Added because SUBARASHII and KIMOKAWAIII had several levels using them, and I wanted to make them look better. * https://cdn.discordapp.com/attachments/359091121789468672/634486669202161674/srb20015.gif * Uses the mapthingnums of Glaber's SOC resource boosters, but absolutely nothing else - not even the magnitudes. * Apply MF_AMBUSH to force the player into a spin - even if they don't have a spin ability! * Banpyura! * A Crushstacean with a spring instead of a crushclaw. * https://cdn.discordapp.com/attachments/428262628893261828/634432099306176512/srb20019.gif * Wanted this for a while, finally added it. * Improved springs. * Add pw_noautobrake to disable autobrake for half a second when touching yellow horizontal springs, and a second when touching red ones, even on the ground. * Add pw_justsprung to disable directionchar for a few tics while touching any springs with a horizontal component to their velocity. * Add the diagonal spring flag options Red and Yellow Diagonal Springs have to the Blue Diagonal Spring as well. * Started but decided against a tip of the hat to the CD spring spin, hidden behind #define SPRINGSPIN. * Make directionchar "lag behind" a little bit in waterslides. * Improved flame jets. * They now use new sprites for having their flames move upwards and sideways, instead of having them always face downwards like in 2.1! * Fixed a mixed declaration and code error in A_RolloutRock. (Sorry Lach!) * Make the Amy Cameo only spawn in SP, Record Attack, or Co-op unless it's the Clone Mode. * Improved ZB config. * Add above new types. * Add Blue Diagonal Spring, which existed in the source but not the config. * Re-order enemies in ZB config by zone (but keep them in the Enemies section only).
2019-10-17 20:50:26 +00:00
SPR_BSTY, // Yellow Booster
SPR_BSTR, // Red Booster
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Environmental Effects
SPR_RAIN, // Rain
SPR_SNO1, // Snowflake
SPR_SPLH, // Water Splish
Implemented lava splish. Feel free to suggest a different "splish" sound.
2019-10-05 08:00:59 +00:00
SPR_LSPL, // Lava Splish
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SPR_SPLA, // Water Splash
SPR_SMOK,
Changes to bubbles for new DSZ + bubble sprites (needs new patch.dta).
2016-09-24 16:15:42 +00:00
SPR_BUBL, // Bubble
SF_MACHINE. Currently only changes drowning, but could do more. * Electric sparks coming off entire body instead of bubbles coming out mouth * Different sounds. * Different icons. These sprites are currently local only, but I'll be doing a lot of asset updating this evening since Rob asked me to so it won't be long until you can get them.
2016-07-16 21:43:49 +00:00
SPR_WZAP,
Added basic spindash dust Also cleaned up some of the code in P_DoSpinAbility while I was at it
2016-11-10 17:51:10 +00:00
SPR_DUST, // Spindash dust
Added flame version
2016-11-13 22:02:29 +00:00
SPR_FPRT, // Spindash dust (flame)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SPR_TFOG, // Teleport Fog
SPR_SEED, // Sonic CD flower seed
SPR_PRTL, // Particle (for fans, etc.)
// Game Indicators
SPR_SCOR, // Score logo
SPR_DRWN, // Drowning Timer
Add flight indicator
2019-11-18 07:17:27 +00:00
SPR_FLII, // AI flight indicator
Big commit, sorry. I broke several things trying to get other things to work and it's only now that all the code that worked yesterday works today! *P_LookForEnemies is now side-effect-less and only provides a pointer to the found mobj *player-jumping is dead, long live PF_STARTJUMP *per Mystic's request, CA2_GUNSLINGER has a targeting icon. It also has a more restricted vertical aiming range. *mobj for this is in the game as requested *fast teetering animation flag *general code cleanup
2017-03-22 18:51:30 +00:00
SPR_LCKN, // Target
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SPR_TTAG, // Tag Sign
SPR_GFLG, // Got Flag sign
Big commit, sorry. I broke several things trying to get other things to work and it's only now that all the code that worked yesterday works today! *P_LookForEnemies is now side-effect-less and only provides a pointer to the found mobj *player-jumping is dead, long live PF_STARTJUMP *per Mystic's request, CA2_GUNSLINGER has a targeting icon. It also has a more restricted vertical aiming range. *mobj for this is in the game as requested *fast teetering animation flag *general code cleanup
2017-03-22 18:51:30 +00:00
SPR_CORK,
PITY IN PINK! * Smoothen Pity Shield animation to go with sphere's updates to Nev3r's sprites. * Added LHRT object, designed to be summoned with CA2_MELEE. * Gives a pink Pity Shield (SH_PINK) on same-team player contact. * Deals damage to non-player enemies. * Harmlessly fades into nothing when touching an enemy player, players with SH_PINK already, and players capable of applying SH_PINK to others (through non-Lua methods). * Basically, you-know-who is the Healer of the party whenever they're around. Fun consequences for the Co-op and CTF metas.
2019-06-19 22:20:24 +00:00
SPR_LHRT,
Big commit, sorry. I broke several things trying to get other things to work and it's only now that all the code that worked yesterday works today! *P_LookForEnemies is now side-effect-less and only provides a pointer to the found mobj *player-jumping is dead, long live PF_STARTJUMP *per Mystic's request, CA2_GUNSLINGER has a targeting icon. It also has a more restricted vertical aiming range. *mobj for this is in the game as requested *fast teetering animation flag *general code cleanup
2017-03-22 18:51:30 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Ring Weapons
SPR_RRNG, // Red Ring
SPR_RNGB, // Bounce Ring
SPR_RNGR, // Rail Ring
SPR_RNGI, // Infinity Ring
SPR_RNGA, // Automatic Ring
SPR_RNGE, // Explosion Ring
SPR_RNGS, // Scatter Ring
SPR_RNGG, // Grenade Ring
SPR_PIKB, // Bounce Ring Pickup
SPR_PIKR, // Rail Ring Pickup
SPR_PIKA, // Automatic Ring Pickup
SPR_PIKE, // Explosion Ring Pickup
SPR_PIKS, // Scatter Ring Pickup
SPR_PIKG, // Grenade Ring Pickup
SPR_TAUT, // Thrown Automatic Ring
SPR_TGRE, // Thrown Grenade Ring
SPR_TSCR, // Thrown Scatter Ring
// Mario-specific stuff
SPR_COIN,
SPR_CPRK,
SPR_GOOM,
SPR_BGOM,
SPR_FFWR,
SPR_FBLL,
SPR_SHLL,
SPR_PUMA,
SPR_HAMM,
SPR_KOOP,
SPR_BFLM,
SPR_MAXE,
SPR_MUS1,
SPR_MUS2,
SPR_TOAD,
// NiGHTS Stuff
SPR_NDRN, // NiGHTS drone
SPR_NSPK, // NiGHTS sparkle
SPR_NBMP, // NiGHTS Bumper
SPR_HOOP, // NiGHTS hoop sprite
SPR_NSCR, // NiGHTS score sprite
SPR_NPRU, // Nights Powerups
SPR_CAPS, // Capsule thingy for NiGHTS
MONSTER COMMIT. OLD SPECIAL STAGES: * Spheres in old special stages instead of rings! * Individual timers in old special stages instead of a global one! * Old special stages use a variant of the NiGHTS HUD now! * Special stage damage in old special stages loses 5 seconds of time instead of 10 rings/spheres! * All damage gained through old special stages is converted to special stage damage! As a consequence, the special spikeball has no need to be special anymore. * Made emerald gaining function be based on special stage number rather than gained emeralds! * Consistency with... NiGHTS SPECIAL STAGES: * Spheres now flash in bonus time. https://cdn.discordapp.com/attachments/400761370800422922/452590553100713984/srb20032.gif * Sphere and ring mapthingnums are now less fucked up in 'em. (Rings are 300, same as usual, while Spheres are now 1706 replacing NiGHTS Wings.) SPECIAL STAGES IN GENERAL: * useNightsSS is now dead. Each individual special stage is now assessed for NiGHTS-mode behaviour based on maptol & TOL_NIGHTS. * CRAWLA HONCHO\n CAN NOW BE\n SUPER CRAWLA HONCHO end tally modification now also includes a mini-tutorial on turning super. https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif * SONIC GOT A CHAOS EMERALD? https://cdn.discordapp.com/attachments/400761370800422922/452623869497573386/srb20034.gif NiGHTS NON-SPECIAL STAGES: * Colour Chips and Star Chips! Replaces Spheres and Rings of NiGHTS Special Stages. * Colour Chips turn yellow in bonus time. * Ideya! * Its own "drowning" music! * All of the object types for Dream Hill. * GIF: https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif RANDOM BS: * Turn super with the spin button instead of the jump button! * Followmobj now correctly set with P_SetTarget instead of pointer assignment. * Emerald hunt uses new sprites! * Made unlock noise different from emblem gain noise! (It's the CRAWLA HONCHO CAN NOW TURN yadda yadda sound from S3K now.)
2018-06-03 21:41:54 +00:00
SPR_IDYA, // Ideya
SPR_NTPN, // Nightopian
SPR_SHLP, // Shleep
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
* Haunted Heights! Smashing spikeball, Cacolantern, Spinbobert and Hangster, along with the Spider and Bat flickies and general decoration/ambience stuff. * MF_PAIN and MF_MISSILE now support setting damagetype via their Mass parameter. The two existing conflicts - the fuse setting for the grenade weapon ring and the Cybrakdemon napalm bomb - had these moved to other free parameters. * A_ConnectToGround is EXTREMELY useful for palmtrees and stuff. * Some other, relatively hacky A_ functions. * (Unrelated) Remove the need for a "Mario block mode" for the token by making it natively compatible. * Spikes and their time-offsetting via that Lua script sphere made. Also allow for wallspikes to do it via their angle/360.
2018-04-28 14:13:44 +00:00
// Secret badniks and hazards, shhhh
Bit of a random one today, but the branch approaches completion... * Bomb sphere! Paraloopable hazard. Replaces MT_SPECIALSPIKEBALL. * Blueberry bushes, both normal and Xmas, from patch.dta. * BSZ tulips, also from patch.dta! * Frozen Hillside badniks - Penguinator and Pophat. * Frozen Hillside ice decoration! * Fixed some big bugs with the DSZ light beams. * Made multi-mare special stages work, in a troll way - the Chaos Emerald disappears in a puff of smoke, and the Spinbobert laughter sound plays... >:3c * Reverted the mobjtype number changes from the source SOC/Lua, which we can do later when doing a final pass of the levels. * State optimisation. * Serious cruft-removal of the NiGHTS drone thinker. * Fix the issues where the player wouldn't curl into jump in waterslides or dropping off rope-hangs. * Tweak NiGHTS player flashing. * Add text colour support to the titlecard font. * Use that to make the PRESS SPIN\nMID-JUMP thing when you get all Chaos Emeralds use the titlecard font for readability. * Fix the GOT ALL EMERALDS page not lasting the correct, extended amount of time. * Fix that thing where flying mid-spin didn't enact autobrake. * Modify graymap a little on Sryder's suggestion. * [COMPLETELY UNRELATED] fix that thing where the addons menu will fail on files/paths with spaces in [/COMPLETELY UNRELATED]
2018-06-05 16:22:28 +00:00
SPR_PENG,
SPR_POPH,
* Hive Elementals and Bumblebores, plus associated useful action functions. * Made Facestabbers take two hits and have associated pain/death animations. No other changes, just wanted to make sure THIS was done. * Move Bubblebuzz-related stuff to go alongside the secret badniks and etc. * MF2_INVERTAIMABLE. Inverts whether P_LookForEnemies can get at; replaces a hardcoded thingy.
2018-05-04 20:30:15 +00:00
SPR_HIVE,
SPR_BUMB,
SPR_BBUZ,
* Haunted Heights! Smashing spikeball, Cacolantern, Spinbobert and Hangster, along with the Spider and Bat flickies and general decoration/ambience stuff. * MF_PAIN and MF_MISSILE now support setting damagetype via their Mass parameter. The two existing conflicts - the fuse setting for the grenade weapon ring and the Cybrakdemon napalm bomb - had these moved to other free parameters. * A_ConnectToGround is EXTREMELY useful for palmtrees and stuff. * Some other, relatively hacky A_ functions. * (Unrelated) Remove the need for a "Mario block mode" for the token by making it natively compatible. * Spikes and their time-offsetting via that Lua script sphere made. Also allow for wallspikes to do it via their angle/360.
2018-04-28 14:13:44 +00:00
SPR_FMCE,
SPR_HMCE,
SPR_CACO,
SPR_BAL2,
SPR_SBOB,
SPR_SBFL,
SPR_SBSK,
SPR_HBAT,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Debris
* Bumpers and Balloons in a more final state. * Blue diagonal springs, because that gap is very, very odd. * Improved A_SpawnFreshCopy. * Tweaked P_LookForEnemies for consistency's sake. (Previously, it was impossible to make a spring that could neither be homing-attacked or attraction-shotted.)
2018-05-19 23:04:39 +00:00
SPR_SPRK, // Sparkle
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SPR_BOM1, // Robot Explosion
SPR_BOM2, // Boss Explosion 1
SPR_BOM3, // Boss Explosion 2
SPR_BOM4, // Underwater Explosion
* Bumpers and Balloons in a more final state. * Blue diagonal springs, because that gap is very, very odd. * Improved A_SpawnFreshCopy. * Tweaked P_LookForEnemies for consistency's sake. (Previously, it was impossible to make a spring that could neither be homing-attacked or attraction-shotted.)
2018-05-19 23:04:39 +00:00
SPR_BMNB, // Mine Explosion
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Crumbly rocks
SPR_ROIA,
SPR_ROIB,
SPR_ROIC,
SPR_ROID,
SPR_ROIE,
SPR_ROIF,
SPR_ROIG,
SPR_ROIH,
SPR_ROII,
SPR_ROIJ,
SPR_ROIK,
SPR_ROIL,
SPR_ROIM,
SPR_ROIN,
SPR_ROIO,
SPR_ROIP,
Add missing GFZD spriteset
2019-11-20 17:14:24 +00:00
// Level debris
SPR_GFZD, // GFZ debris
SPR_BRIC, // Bricks
SPR_WDDB, // Wood Debris
Hardcode brick debris
2019-07-06 04:31:02 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Gravity Well Objects
SPR_GWLG,
SPR_GWLR,
SPR_FIRSTFREESLOT,
SPR_LASTFREESLOT = SPR_FIRSTFREESLOT + NUMSPRITEFREESLOTS - 1,
NUMSPRITES
} spritenum_t;
It's 2am, I'll upload the exe and player.dta to the ftp later. * Super sprites are now deliniated via an additional S_SUPER lump between S_START and S_END. Above are normal sprites, below are super sprites. Handled internally via FF_SPR2SUPER. * Sprite2 numbers are now appropriately limited for the data type that stores them. * SPR2_SPIN is now SPR2_ROLL, SPR2_DASH is now SPR2_SPIN and SPR2_PEEL is now SPR2_DASH. Makes more sense, right?
2017-03-11 02:09:01 +00:00
// Make sure to be conscious of FF_FRAMEMASK and the fact sprite2 is stored as a UINT8 whenever you change this table.
* SPR2_DRL0-C are gone. They're now (FF_SPR2SUPER|SPR2_NGT0-C). This frees up a bunch of badly-used freeslots, considering that you can't be super AND NiGHTS at the same time. * Speaking of, actively enforced not being able to be Super and NiGHTS at the same time. * Also on that note - SPR2_TRNS is now the NiGHTS transformation. The Super transformation is (FF_SPR2SUPER|SPR2_TRNS). * SPR2_NPAN is now SPR2_NSTN, since it matches Super Sonic's stun animation rather than the pain animation. * Fixed a bunch of things where Super float was handled badly with 2AM brain. * Fixed the R_ProjectSprite error going out of spr2names' bounds. * Fixed order of FF's in dehackéd. * Fixed that thing where Super Sonic was blue for 1 tic after transformation, and the life icon was a blue Super Sonic.
2017-03-11 17:14:39 +00:00
// Currently, FF_FRAMEMASK is 0xff, or 255 - but the second half is used by FF_SPR2SUPER, so the limitation is 0x7f.
// Since this is zero-based, there can be at most 128 different SPR2_'s without changing that.
Add spr2defaults[] array to make sprite2 defaulting system much, much simpler to manage. This is in preparation for a seperate project which still involves sprite2s.
2017-08-25 17:00:20 +00:00
typedef enum playersprite
Merge branch 'player-animations' SPR_PLAY now calls up a secondary spritedef for all animations for all players. Old character wads (including player.dta) are no longer compatible. git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8993 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-01-22 15:23:45 +00:00
{
SPR2_STND = 0,
SPR2_WAIT,
SPR2_WALK,
* Add Skid SPR2/state in preperation for directionchar. * Clean up spr2 md2 code. * Experimented but then commented out some stuff for homing attack.
2017-09-09 21:12:23 +00:00
SPR2_SKID,
Merge branch 'player-animations' SPR_PLAY now calls up a secondary spritedef for all animations for all players. Old character wads (including player.dta) are no longer compatible. git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8993 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-01-22 15:23:45 +00:00
SPR2_RUN ,
It's 2am, I'll upload the exe and player.dta to the ftp later. * Super sprites are now deliniated via an additional S_SUPER lump between S_START and S_END. Above are normal sprites, below are super sprites. Handled internally via FF_SPR2SUPER. * Sprite2 numbers are now appropriately limited for the data type that stores them. * SPR2_SPIN is now SPR2_ROLL, SPR2_DASH is now SPR2_SPIN and SPR2_PEEL is now SPR2_DASH. Makes more sense, right?
2017-03-11 02:09:01 +00:00
SPR2_DASH,
Merge branch 'player-animations' SPR_PLAY now calls up a secondary spritedef for all animations for all players. Old character wads (including player.dta) are no longer compatible. git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8993 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-01-22 15:23:45 +00:00
SPR2_PAIN,
It's 2am, I'll upload the exe and player.dta to the ftp later. * Super sprites are now deliniated via an additional S_SUPER lump between S_START and S_END. Above are normal sprites, below are super sprites. Handled internally via FF_SPR2SUPER. * Sprite2 numbers are now appropriately limited for the data type that stores them. * SPR2_SPIN is now SPR2_ROLL, SPR2_DASH is now SPR2_SPIN and SPR2_PEEL is now SPR2_DASH. Makes more sense, right?
2017-03-11 02:09:01 +00:00
SPR2_STUN,
Merge branch 'player-animations' SPR_PLAY now calls up a secondary spritedef for all animations for all players. Old character wads (including player.dta) are no longer compatible. git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8993 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-01-22 15:23:45 +00:00
SPR2_DEAD,
NiGHTS is now spr2-ised. i'll upload the relevant files and etc to the ftp * if you can turn SF_SUPER, flash your skin's supercolor, otherwise be your normal color * if your skin doesn't have a SPR2_NGT0 (horizontal fly), use Sonic's (this will hopefully be replaced by 2.2 with sprites of NiGHTS themselves) * MT_NIGHTSCHAR made irrelevant, everything follows actor->target instead of actor->target->tracer now * emerald is now player->mo->tracer instead of player->mo->tracer->target * nightopian helpers flash for the 35 tics before they disappear * nights capsule makes boss explosions/noises now (i can change it back i just like it better) * drill off into the sky instead of fly up in floating pose (but no noise yet) ALSO: * default maxdash is now 70 * forgot to add supercolor to lua, it is there now * SPR2_SMSL renamed to SPR2_SSTN (stun) * any player with a skincolor that's in the super range is set to FF_FULLBRIGHT at state-set time, so no need to keep super players non-fullbright just because they use spin stuff
2016-08-12 01:57:37 +00:00
SPR2_DRWN, // drown
It's 2am, I'll upload the exe and player.dta to the ftp later. * Super sprites are now deliniated via an additional S_SUPER lump between S_START and S_END. Above are normal sprites, below are super sprites. Handled internally via FF_SPR2SUPER. * Sprite2 numbers are now appropriately limited for the data type that stores them. * SPR2_SPIN is now SPR2_ROLL, SPR2_DASH is now SPR2_SPIN and SPR2_PEEL is now SPR2_DASH. Makes more sense, right?
2017-03-11 02:09:01 +00:00
SPR2_ROLL,
Merge branch 'player-animations' SPR_PLAY now calls up a secondary spritedef for all animations for all players. Old character wads (including player.dta) are no longer compatible. git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8993 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-01-22 15:23:45 +00:00
SPR2_GASP,
SPR2_JUMP,
Revert the revert because it turns out Rob is a doofus player.dta was in a sort of mishmashed half designed for one SPR2 layout and half the other. This reverts commit cc0fbf1c1b3feec271e1be08b1ca5c343f701e0e.
2016-01-14 14:35:10 +00:00
SPR2_SPNG, // spring
Merge branch 'player-animations' SPR_PLAY now calls up a secondary spritedef for all animations for all players. Old character wads (including player.dta) are no longer compatible. git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8993 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-01-22 15:23:45 +00:00
SPR2_FALL,
SPR2_EDGE,
SPR2_RIDE,
Introducing CA2_GUNSLINGER. * Mildly hacky proof of concept! Will de-hack later. * Charge up your ability! * You can only damage others if it's at full power. * Fires directly at enemies/bosses when at full power. Does NOT aim at players.
2017-03-21 00:54:47 +00:00
SPR2_SPIN, // spindash
Merge branch 'player-animations' SPR_PLAY now calls up a secondary spritedef for all animations for all players. Old character wads (including player.dta) are no longer compatible. git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8993 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-01-22 15:23:45 +00:00
SPR2_FLY ,
Swimming animation! Since I know we want it for Smiles eventually. Also, I guess CA_SWIM isn't forced into running on water anymore.
2016-07-13 17:18:18 +00:00
SPR2_SWIM,
NiGHTS is now spr2-ised. i'll upload the relevant files and etc to the ftp * if you can turn SF_SUPER, flash your skin's supercolor, otherwise be your normal color * if your skin doesn't have a SPR2_NGT0 (horizontal fly), use Sonic's (this will hopefully be replaced by 2.2 with sprites of NiGHTS themselves) * MT_NIGHTSCHAR made irrelevant, everything follows actor->target instead of actor->target->tracer now * emerald is now player->mo->tracer instead of player->mo->tracer->target * nightopian helpers flash for the 35 tics before they disappear * nights capsule makes boss explosions/noises now (i can change it back i just like it better) * drill off into the sky instead of fly up in floating pose (but no noise yet) ALSO: * default maxdash is now 70 * forgot to add supercolor to lua, it is there now * SPR2_SMSL renamed to SPR2_SSTN (stun) * any player with a skincolor that's in the super range is set to FF_FULLBRIGHT at state-set time, so no need to keep super players non-fullbright just because they use spin stuff
2016-08-12 01:57:37 +00:00
SPR2_TIRE, // tired
SPR2_GLID, // glide
Lots of CA_GLIDEANDCLIMB changes: Glide speed now starts at whatever speed you were traveling at prior. If glide speed is below actionspd, the glide accelerates towards it. When landing from a glide, player now enters a landing animation (SPR2_LAND); they cannot move in this state, but they can jump or start a spindash. Ground-sliding after a glide can now be cancelled into the landing animation by releasing jump, where the same rules apply. Climb speed increased x1.33.
2019-09-23 18:17:20 +00:00
SPR2_LAND, // landing after glide/bounce
NiGHTS is now spr2-ised. i'll upload the relevant files and etc to the ftp * if you can turn SF_SUPER, flash your skin's supercolor, otherwise be your normal color * if your skin doesn't have a SPR2_NGT0 (horizontal fly), use Sonic's (this will hopefully be replaced by 2.2 with sprites of NiGHTS themselves) * MT_NIGHTSCHAR made irrelevant, everything follows actor->target instead of actor->target->tracer now * emerald is now player->mo->tracer instead of player->mo->tracer->target * nightopian helpers flash for the 35 tics before they disappear * nights capsule makes boss explosions/noises now (i can change it back i just like it better) * drill off into the sky instead of fly up in floating pose (but no noise yet) ALSO: * default maxdash is now 70 * forgot to add supercolor to lua, it is there now * SPR2_SMSL renamed to SPR2_SSTN (stun) * any player with a skincolor that's in the super range is set to FF_FULLBRIGHT at state-set time, so no need to keep super players non-fullbright just because they use spin stuff
2016-08-12 01:57:37 +00:00
SPR2_CLNG, // cling
SPR2_CLMB, // climb
* Turned CA_DASHMODE into SF_DASHMODE. * SF_DASHMODE users can now dash on water. * Gave CA_HOVER its own states/sprite2s. * Gave Super Sonic's hover his own hover-run state/sprite2.
2016-12-24 00:11:54 +00:00
SPR2_FLT , // float
SPR2_FRUN, // float run
First commit, CA_BOUNCE almost completed.
2016-12-23 17:31:07 +00:00
SPR2_BNCE, // bounce
Introducing CA2_GUNSLINGER. * Mildly hacky proof of concept! Will de-hack later. * Charge up your ability! * You can only damage others if it's at full power. * Fires directly at enemies/bosses when at full power. Does NOT aim at players.
2017-03-21 00:54:47 +00:00
SPR2_FIRE, // fire
NiGHTS is now spr2-ised. i'll upload the relevant files and etc to the ftp * if you can turn SF_SUPER, flash your skin's supercolor, otherwise be your normal color * if your skin doesn't have a SPR2_NGT0 (horizontal fly), use Sonic's (this will hopefully be replaced by 2.2 with sprites of NiGHTS themselves) * MT_NIGHTSCHAR made irrelevant, everything follows actor->target instead of actor->target->tracer now * emerald is now player->mo->tracer instead of player->mo->tracer->target * nightopian helpers flash for the 35 tics before they disappear * nights capsule makes boss explosions/noises now (i can change it back i just like it better) * drill off into the sky instead of fly up in floating pose (but no noise yet) ALSO: * default maxdash is now 70 * forgot to add supercolor to lua, it is there now * SPR2_SMSL renamed to SPR2_SSTN (stun) * any player with a skincolor that's in the super range is set to FF_FULLBRIGHT at state-set time, so no need to keep super players non-fullbright just because they use spin stuff
2016-08-12 01:57:37 +00:00
SPR2_TWIN, // twinspin
SPR2_MLEE, // melee
She's a lot more complete. * Melee now has a proper weightiness to it with a landing frame. * If you have twinspin too, do a somersalt when running and hitting the melee button. * If you have melee, go into the melee landing frame when twinspinning into the ground.
2017-03-19 16:48:35 +00:00
SPR2_MLEL, // melee land
NiGHTS is now spr2-ised. i'll upload the relevant files and etc to the ftp * if you can turn SF_SUPER, flash your skin's supercolor, otherwise be your normal color * if your skin doesn't have a SPR2_NGT0 (horizontal fly), use Sonic's (this will hopefully be replaced by 2.2 with sprites of NiGHTS themselves) * MT_NIGHTSCHAR made irrelevant, everything follows actor->target instead of actor->target->tracer now * emerald is now player->mo->tracer instead of player->mo->tracer->target * nightopian helpers flash for the 35 tics before they disappear * nights capsule makes boss explosions/noises now (i can change it back i just like it better) * drill off into the sky instead of fly up in floating pose (but no noise yet) ALSO: * default maxdash is now 70 * forgot to add supercolor to lua, it is there now * SPR2_SMSL renamed to SPR2_SSTN (stun) * any player with a skincolor that's in the super range is set to FF_FULLBRIGHT at state-set time, so no need to keep super players non-fullbright just because they use spin stuff
2016-08-12 01:57:37 +00:00
* SPR2_DRL0-C are gone. They're now (FF_SPR2SUPER|SPR2_NGT0-C). This frees up a bunch of badly-used freeslots, considering that you can't be super AND NiGHTS at the same time. * Speaking of, actively enforced not being able to be Super and NiGHTS at the same time. * Also on that note - SPR2_TRNS is now the NiGHTS transformation. The Super transformation is (FF_SPR2SUPER|SPR2_TRNS). * SPR2_NPAN is now SPR2_NSTN, since it matches Super Sonic's stun animation rather than the pain animation. * Fixed a bunch of things where Super float was handled badly with 2AM brain. * Fixed the R_ProjectSprite error going out of spr2names' bounds. * Fixed order of FF's in dehackéd. * Fixed that thing where Super Sonic was blue for 1 tic after transformation, and the life icon was a blue Super Sonic.
2017-03-11 17:14:39 +00:00
SPR2_TRNS, // transformation
NiGHTS is now spr2-ised. i'll upload the relevant files and etc to the ftp * if you can turn SF_SUPER, flash your skin's supercolor, otherwise be your normal color * if your skin doesn't have a SPR2_NGT0 (horizontal fly), use Sonic's (this will hopefully be replaced by 2.2 with sprites of NiGHTS themselves) * MT_NIGHTSCHAR made irrelevant, everything follows actor->target instead of actor->target->tracer now * emerald is now player->mo->tracer instead of player->mo->tracer->target * nightopian helpers flash for the 35 tics before they disappear * nights capsule makes boss explosions/noises now (i can change it back i just like it better) * drill off into the sky instead of fly up in floating pose (but no noise yet) ALSO: * default maxdash is now 70 * forgot to add supercolor to lua, it is there now * SPR2_SMSL renamed to SPR2_SSTN (stun) * any player with a skincolor that's in the super range is set to FF_FULLBRIGHT at state-set time, so no need to keep super players non-fullbright just because they use spin stuff
2016-08-12 01:57:37 +00:00
SPR2_NSTD, // NiGHTS stand
SPR2_NFLT, // NiGHTS float
* Remove the 22(!!) NiGHTS sprite2s that no longer get used in ROTSPRITE builds (which should be our main builds going forward). * Rename `SPR2_NGT0` to `SPR2_NFLY`, and `SPR2_DRL0` to `SPR2_NDRL` to account for this. (requires modifying player.dta)
2019-11-14 16:37:03 +00:00
SPR2_NFLY, // NiGHTS fly
SPR2_NDRL, // NiGHTS drill
* SPR2_DRL0-C are gone. They're now (FF_SPR2SUPER|SPR2_NGT0-C). This frees up a bunch of badly-used freeslots, considering that you can't be super AND NiGHTS at the same time. * Speaking of, actively enforced not being able to be Super and NiGHTS at the same time. * Also on that note - SPR2_TRNS is now the NiGHTS transformation. The Super transformation is (FF_SPR2SUPER|SPR2_TRNS). * SPR2_NPAN is now SPR2_NSTN, since it matches Super Sonic's stun animation rather than the pain animation. * Fixed a bunch of things where Super float was handled badly with 2AM brain. * Fixed the R_ProjectSprite error going out of spr2names' bounds. * Fixed order of FF's in dehackéd. * Fixed that thing where Super Sonic was blue for 1 tic after transformation, and the life icon was a blue Super Sonic.
2017-03-11 17:14:39 +00:00
SPR2_NSTN, // NiGHTS stun
NiGHTS is now spr2-ised. i'll upload the relevant files and etc to the ftp * if you can turn SF_SUPER, flash your skin's supercolor, otherwise be your normal color * if your skin doesn't have a SPR2_NGT0 (horizontal fly), use Sonic's (this will hopefully be replaced by 2.2 with sprites of NiGHTS themselves) * MT_NIGHTSCHAR made irrelevant, everything follows actor->target instead of actor->target->tracer now * emerald is now player->mo->tracer instead of player->mo->tracer->target * nightopian helpers flash for the 35 tics before they disappear * nights capsule makes boss explosions/noises now (i can change it back i just like it better) * drill off into the sky instead of fly up in floating pose (but no noise yet) ALSO: * default maxdash is now 70 * forgot to add supercolor to lua, it is there now * SPR2_SMSL renamed to SPR2_SSTN (stun) * any player with a skincolor that's in the super range is set to FF_FULLBRIGHT at state-set time, so no need to keep super players non-fullbright just because they use spin stuff
2016-08-12 01:57:37 +00:00
SPR2_NPUL, // NiGHTS pull
SPR2_NATK, // NiGHTS attack
* Smiles hardcode! * Add a default behaviour to followmobj (just basic A_CapeChase). * Allow for modifying which character starting a new SP game should start you on, relative to the first valid character. (SOC's "startchar" variable) * Make MF2_SHADOW transferrable via linkdraw. * Modify P_GetSkinSprite2's recursion limiter to have zero chance of ever infinitely looping.
2017-10-03 17:18:18 +00:00
// c:
SPR2_TAL0,
SPR2_TAL1,
SPR2_TAL2,
SPR2_TAL3,
SPR2_TAL4,
SPR2_TAL5,
SPR2_TAL6,
SPR2_TAL7,
SPR2_TAL8,
SPR2_TAL9,
SPR2_TALA,
SPR2_TALB,
DON'T PUSH ALONE - first dregs of continue screen
2019-09-08 20:07:16 +00:00
SPR2_CNT1, // continue disappointment
SPR2_CNT2, // continue lift
SPR2_CNT3, // continue spin
SPR2_CNT4, // continue "soooooooniiic!" tugging
It's 2am, I'll upload the exe and player.dta to the ftp later. * Super sprites are now deliniated via an additional S_SUPER lump between S_START and S_END. Above are normal sprites, below are super sprites. Handled internally via FF_SPR2SUPER. * Sprite2 numbers are now appropriately limited for the data type that stores them. * SPR2_SPIN is now SPR2_ROLL, SPR2_DASH is now SPR2_SPIN and SPR2_PEEL is now SPR2_DASH. Makes more sense, right?
2017-03-11 02:09:01 +00:00
SPR2_SIGN, // end sign head
SPR2_LIFE, // life monitor icon
DON'T PUSH ALONE - first dregs of continue screen
2019-09-08 20:07:16 +00:00
SPR2_XTRA, // stuff that isn't in-map - "would this ever need an md2 or variable length animation?"
It's 2am, I'll upload the exe and player.dta to the ftp later. * Super sprites are now deliniated via an additional S_SUPER lump between S_START and S_END. Above are normal sprites, below are super sprites. Handled internally via FF_SPR2SUPER. * Sprite2 numbers are now appropriately limited for the data type that stores them. * SPR2_SPIN is now SPR2_ROLL, SPR2_DASH is now SPR2_SPIN and SPR2_PEEL is now SPR2_DASH. Makes more sense, right?
2017-03-11 02:09:01 +00:00
Added freeslots for SPR2. Make sure your MAINCFG / LUA lump comes _before_ the S_SKIN section.
2015-10-31 18:45:42 +00:00
SPR2_FIRSTFREESLOT,
It's 2am, I'll upload the exe and player.dta to the ftp later. * Super sprites are now deliniated via an additional S_SUPER lump between S_START and S_END. Above are normal sprites, below are super sprites. Handled internally via FF_SPR2SUPER. * Sprite2 numbers are now appropriately limited for the data type that stores them. * SPR2_SPIN is now SPR2_ROLL, SPR2_DASH is now SPR2_SPIN and SPR2_PEEL is now SPR2_DASH. Makes more sense, right?
2017-03-11 02:09:01 +00:00
SPR2_LASTFREESLOT = 0x7f,
Merge branch 'player-animations' SPR_PLAY now calls up a secondary spritedef for all animations for all players. Old character wads (including player.dta) are no longer compatible. git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8993 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-01-22 15:23:45 +00:00
NUMPLAYERSPRITES
Add spr2defaults[] array to make sprite2 defaulting system much, much simpler to manage. This is in preparation for a seperate project which still involves sprite2s.
2017-08-25 17:00:20 +00:00
} playersprite_t;
Merge branch 'player-animations' SPR_PLAY now calls up a secondary spritedef for all animations for all players. Old character wads (including player.dta) are no longer compatible. git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8993 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-01-22 15:23:45 +00:00
did The Thing
2019-08-19 17:23:03 +00:00
// SPR2_XTRA
Make nametags compatible with current player.dta
2019-09-08 02:40:00 +00:00
#define XTRA_LIFEPIC 0 // Life icon patch
#define XTRA_CHARSEL 1 // Character select picture
Lots of changes * Show emblem requirement on record attack menu * Use bigger emblems on the menu. * Display your best number of collected rings in yellow if reached perfect bonus. * Adjusted XTRA frames (again)
2019-10-16 02:54:21 +00:00
#define XTRA_CONTINUE 2 // Continue icon
#define XTRA_ENDING 3 // Ending finale patches
did The Thing
2019-08-19 17:23:03 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
typedef enum state
{
S_NULL,
S_UNKNOWN,
S_INVISIBLE, // state for invisible sprite
S_SPAWNSTATE,
S_SEESTATE,
S_MELEESTATE,
S_MISSILESTATE,
S_DEATHSTATE,
S_XDEATHSTATE,
S_RAISESTATE,
// Thok
S_THOK,
Merge branch 'player-animations' SPR_PLAY now calls up a secondary spritedef for all animations for all players. Old character wads (including player.dta) are no longer compatible. git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8993 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-01-22 15:23:45 +00:00
// Player
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_PLAY_STND,
Merge branch 'player-animations' SPR_PLAY now calls up a secondary spritedef for all animations for all players. Old character wads (including player.dta) are no longer compatible. git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8993 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-01-22 15:23:45 +00:00
S_PLAY_WAIT,
S_PLAY_WALK,
* Add Skid SPR2/state in preperation for directionchar. * Clean up spr2 md2 code. * Experimented but then commented out some stuff for homing attack.
2017-09-09 21:12:23 +00:00
S_PLAY_SKID,
Merge branch 'player-animations' SPR_PLAY now calls up a secondary spritedef for all animations for all players. Old character wads (including player.dta) are no longer compatible. git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8993 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-01-22 15:23:45 +00:00
S_PLAY_RUN,
It's 2am, I'll upload the exe and player.dta to the ftp later. * Super sprites are now deliniated via an additional S_SUPER lump between S_START and S_END. Above are normal sprites, below are super sprites. Handled internally via FF_SPR2SUPER. * Sprite2 numbers are now appropriately limited for the data type that stores them. * SPR2_SPIN is now SPR2_ROLL, SPR2_DASH is now SPR2_SPIN and SPR2_PEEL is now SPR2_DASH. Makes more sense, right?
2017-03-11 02:09:01 +00:00
S_PLAY_DASH,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_PLAY_PAIN,
It's 2am, I'll upload the exe and player.dta to the ftp later. * Super sprites are now deliniated via an additional S_SUPER lump between S_START and S_END. Above are normal sprites, below are super sprites. Handled internally via FF_SPR2SUPER. * Sprite2 numbers are now appropriately limited for the data type that stores them. * SPR2_SPIN is now SPR2_ROLL, SPR2_DASH is now SPR2_SPIN and SPR2_PEEL is now SPR2_DASH. Makes more sense, right?
2017-03-11 02:09:01 +00:00
S_PLAY_STUN,
Merge branch 'player-animations' SPR_PLAY now calls up a secondary spritedef for all animations for all players. Old character wads (including player.dta) are no longer compatible. git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8993 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-01-22 15:23:45 +00:00
S_PLAY_DEAD,
Add new player animations. Added drowning to all players, and several new Super animations for Sonic. Removed A_Fall from S_PLAY_DEAD and moved its effect into P_KillMobj for player avatars.
2015-05-29 04:56:02 +00:00
S_PLAY_DRWN,
It's 2am, I'll upload the exe and player.dta to the ftp later. * Super sprites are now deliniated via an additional S_SUPER lump between S_START and S_END. Above are normal sprites, below are super sprites. Handled internally via FF_SPR2SUPER. * Sprite2 numbers are now appropriately limited for the data type that stores them. * SPR2_SPIN is now SPR2_ROLL, SPR2_DASH is now SPR2_SPIN and SPR2_PEEL is now SPR2_DASH. Makes more sense, right?
2017-03-11 02:09:01 +00:00
S_PLAY_ROLL,
Merge branch 'player-animations' SPR_PLAY now calls up a secondary spritedef for all animations for all players. Old character wads (including player.dta) are no longer compatible. git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8993 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-01-22 15:23:45 +00:00
S_PLAY_GASP,
* Turned CA_DASHMODE into SF_DASHMODE. * SF_DASHMODE users can now dash on water. * Gave CA_HOVER its own states/sprite2s. * Gave Super Sonic's hover his own hover-run state/sprite2.
2016-12-24 00:11:54 +00:00
S_PLAY_JUMP,
Revert the revert because it turns out Rob is a doofus player.dta was in a sort of mishmashed half designed for one SPR2 layout and half the other. This reverts commit cc0fbf1c1b3feec271e1be08b1ca5c343f701e0e.
2016-01-14 14:35:10 +00:00
S_PLAY_SPRING,
Merge branch 'player-animations' SPR_PLAY now calls up a secondary spritedef for all animations for all players. Old character wads (including player.dta) are no longer compatible. git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8993 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-01-22 15:23:45 +00:00
S_PLAY_FALL,
S_PLAY_EDGE,
S_PLAY_RIDE,
Introducing CA2_GUNSLINGER. * Mildly hacky proof of concept! Will de-hack later. * Charge up your ability! * You can only damage others if it's at full power. * Fires directly at enemies/bosses when at full power. Does NOT aim at players.
2017-03-21 00:54:47 +00:00
// CA2_SPINDASH
S_PLAY_SPINDASH,
Ported CA_HAMMER from new-character-actions in a way that takes advantage of all of the non-hardcodey things I've added in this branch. Also, it's called CA_TWINSPIN because that's more inoccouous.
2016-07-16 12:55:12 +00:00
// CA_FLY/SWIM
Merge branch 'player-animations' SPR_PLAY now calls up a secondary spritedef for all animations for all players. Old character wads (including player.dta) are no longer compatible. git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8993 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-01-22 15:23:45 +00:00
S_PLAY_FLY,
Swimming animation! Since I know we want it for Smiles eventually. Also, I guess CA_SWIM isn't forced into running on water anymore.
2016-07-13 17:18:18 +00:00
S_PLAY_SWIM,
Merge branch 'player-animations' SPR_PLAY now calls up a secondary spritedef for all animations for all players. Old character wads (including player.dta) are no longer compatible. git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8993 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-01-22 15:23:45 +00:00
S_PLAY_FLY_TIRED,
// CA_GLIDEANDCLIMB
S_PLAY_GLIDE,
Lots of CA_GLIDEANDCLIMB changes: Glide speed now starts at whatever speed you were traveling at prior. If glide speed is below actionspd, the glide accelerates towards it. When landing from a glide, player now enters a landing animation (SPR2_LAND); they cannot move in this state, but they can jump or start a spindash. Ground-sliding after a glide can now be cancelled into the landing animation by releasing jump, where the same rules apply. Climb speed increased x1.33.
2019-09-23 18:17:20 +00:00
S_PLAY_GLIDE_LANDING,
Merge branch 'player-animations' SPR_PLAY now calls up a secondary spritedef for all animations for all players. Old character wads (including player.dta) are no longer compatible. git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8993 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-01-22 15:23:45 +00:00
S_PLAY_CLING,
S_PLAY_CLIMB,
* Turned CA_DASHMODE into SF_DASHMODE. * SF_DASHMODE users can now dash on water. * Gave CA_HOVER its own states/sprite2s. * Gave Super Sonic's hover his own hover-run state/sprite2.
2016-12-24 00:11:54 +00:00
// CA_FLOAT/CA_SLOWFALL
S_PLAY_FLOAT,
S_PLAY_FLOAT_RUN,
First commit, CA_BOUNCE almost completed.
2016-12-23 17:31:07 +00:00
// CA_BOUNCE
S_PLAY_BOUNCE,
S_PLAY_BOUNCE_LANDING,
Introducing CA2_GUNSLINGER. * Mildly hacky proof of concept! Will de-hack later. * Charge up your ability! * You can only damage others if it's at full power. * Fires directly at enemies/bosses when at full power. Does NOT aim at players.
2017-03-21 00:54:47 +00:00
// CA2_GUNSLINGER
S_PLAY_FIRE,
After usability complaints: * CA2_MELEE/CA_TWINSPIN combination abilities (ground hit, somersalt) disabled. * Enabled movement controls whilst using CA2_MELEE in the air. * CA2_GUNSLINGER no longer requires charging. In exchange, it involves a cooldown in which you can't move. * CA2_GUNSLINGER lock-on distance improved, and aiming allowance reduced to compensate. * Lots of cleanup/gravflip allowances for homing/targeting code. * Unrelated: Flickies now properly face the direction they're supposed to when getting knocked out of the egg capsule. * Unrelated: Thok trail fades like spindash trail now. * Unrelated: Using CA_HOMINGATTACK when nowhere near an enemy uncurls you.
2017-03-21 16:04:49 +00:00
S_PLAY_FIRE_FINISH,
Introducing CA2_GUNSLINGER. * Mildly hacky proof of concept! Will de-hack later. * Charge up your ability! * You can only damage others if it's at full power. * Fires directly at enemies/bosses when at full power. Does NOT aim at players.
2017-03-21 00:54:47 +00:00
Ported CA_HAMMER from new-character-actions in a way that takes advantage of all of the non-hardcodey things I've added in this branch. Also, it's called CA_TWINSPIN because that's more inoccouous.
2016-07-16 12:55:12 +00:00
// CA_TWINSPIN
S_PLAY_TWINSPIN,
CA_MELEE. Mostly complete. * When moving slowly, P_InstaThrust at S_SKIN's maxdash forward, and set momz to S_SKIN's mindash upwards. Plays a tok noise (not thok). Hurts enemies/bosses, busts spikes/monitors/all types of bustable blocks. * When moving quickly... doesn't do anything yet, but WILL do a slide. Also, P_DoSpinDash is now renamed to P_DoSpinAbility, and CA_TWINSPIN users can bust all bustable blocks on collision too.
2016-07-17 20:31:15 +00:00
// CA2_MELEE
S_PLAY_MELEE,
S_PLAY_MELEE_FINISH,
She's a lot more complete. * Melee now has a proper weightiness to it with a landing frame. * If you have twinspin too, do a somersalt when running and hitting the melee button. * If you have melee, go into the melee landing frame when twinspinning into the ground.
2017-03-19 16:48:35 +00:00
S_PLAY_MELEE_LANDING,
Merge branch 'player-animations' SPR_PLAY now calls up a secondary spritedef for all animations for all players. Old character wads (including player.dta) are no longer compatible. git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8993 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-01-22 15:23:45 +00:00
// SF_SUPER
Fancy super transformation changes! About to go out for dinner, so no major writeup,but let's just say all this changed code means that the transformation animation is smoother in colour change.
2017-10-04 16:45:03 +00:00
S_PLAY_SUPER_TRANS1,
Merge branch 'player-animations' SPR_PLAY now calls up a secondary spritedef for all animations for all players. Old character wads (including player.dta) are no longer compatible. git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8993 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-01-22 15:23:45 +00:00
S_PLAY_SUPER_TRANS2,
S_PLAY_SUPER_TRANS3,
S_PLAY_SUPER_TRANS4,
S_PLAY_SUPER_TRANS5,
S_PLAY_SUPER_TRANS6,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// technically the player goes here but it's an infinite tic state
S_OBJPLACE_DUMMY,
// 1-Up Box Sprites overlay (uses player sprite)
S_PLAY_BOX1,
S_PLAY_BOX2,
S_PLAY_ICON1,
S_PLAY_ICON2,
S_PLAY_ICON3,
// Level end sign overlay (uses player sprite)
S_PLAY_SIGN,
NiGHTS is now spr2-ised. i'll upload the relevant files and etc to the ftp * if you can turn SF_SUPER, flash your skin's supercolor, otherwise be your normal color * if your skin doesn't have a SPR2_NGT0 (horizontal fly), use Sonic's (this will hopefully be replaced by 2.2 with sprites of NiGHTS themselves) * MT_NIGHTSCHAR made irrelevant, everything follows actor->target instead of actor->target->tracer now * emerald is now player->mo->tracer instead of player->mo->tracer->target * nightopian helpers flash for the 35 tics before they disappear * nights capsule makes boss explosions/noises now (i can change it back i just like it better) * drill off into the sky instead of fly up in floating pose (but no noise yet) ALSO: * default maxdash is now 70 * forgot to add supercolor to lua, it is there now * SPR2_SMSL renamed to SPR2_SSTN (stun) * any player with a skincolor that's in the super range is set to FF_FULLBRIGHT at state-set time, so no need to keep super players non-fullbright just because they use spin stuff
2016-08-12 01:57:37 +00:00
// NiGHTS character (uses player sprite)
Fancy super transformation changes! About to go out for dinner, so no major writeup,but let's just say all this changed code means that the transformation animation is smoother in colour change.
2017-10-04 16:45:03 +00:00
S_PLAY_NIGHTS_TRANS1,
NiGHTS is now spr2-ised. i'll upload the relevant files and etc to the ftp * if you can turn SF_SUPER, flash your skin's supercolor, otherwise be your normal color * if your skin doesn't have a SPR2_NGT0 (horizontal fly), use Sonic's (this will hopefully be replaced by 2.2 with sprites of NiGHTS themselves) * MT_NIGHTSCHAR made irrelevant, everything follows actor->target instead of actor->target->tracer now * emerald is now player->mo->tracer instead of player->mo->tracer->target * nightopian helpers flash for the 35 tics before they disappear * nights capsule makes boss explosions/noises now (i can change it back i just like it better) * drill off into the sky instead of fly up in floating pose (but no noise yet) ALSO: * default maxdash is now 70 * forgot to add supercolor to lua, it is there now * SPR2_SMSL renamed to SPR2_SSTN (stun) * any player with a skincolor that's in the super range is set to FF_FULLBRIGHT at state-set time, so no need to keep super players non-fullbright just because they use spin stuff
2016-08-12 01:57:37 +00:00
S_PLAY_NIGHTS_TRANS2,
S_PLAY_NIGHTS_TRANS3,
S_PLAY_NIGHTS_TRANS4,
S_PLAY_NIGHTS_TRANS5,
S_PLAY_NIGHTS_TRANS6,
S_PLAY_NIGHTS_STAND,
S_PLAY_NIGHTS_FLOAT,
* Remove the 22(!!) NiGHTS sprite2s that no longer get used in ROTSPRITE builds (which should be our main builds going forward). * Rename `SPR2_NGT0` to `SPR2_NFLY`, and `SPR2_DRL0` to `SPR2_NDRL` to account for this. (requires modifying player.dta)
2019-11-14 16:37:03 +00:00
S_PLAY_NIGHTS_FLY,
S_PLAY_NIGHTS_DRILL,
* SPR2_DRL0-C are gone. They're now (FF_SPR2SUPER|SPR2_NGT0-C). This frees up a bunch of badly-used freeslots, considering that you can't be super AND NiGHTS at the same time. * Speaking of, actively enforced not being able to be Super and NiGHTS at the same time. * Also on that note - SPR2_TRNS is now the NiGHTS transformation. The Super transformation is (FF_SPR2SUPER|SPR2_TRNS). * SPR2_NPAN is now SPR2_NSTN, since it matches Super Sonic's stun animation rather than the pain animation. * Fixed a bunch of things where Super float was handled badly with 2AM brain. * Fixed the R_ProjectSprite error going out of spr2names' bounds. * Fixed order of FF's in dehackéd. * Fixed that thing where Super Sonic was blue for 1 tic after transformation, and the life icon was a blue Super Sonic.
2017-03-11 17:14:39 +00:00
S_PLAY_NIGHTS_STUN,
NiGHTS is now spr2-ised. i'll upload the relevant files and etc to the ftp * if you can turn SF_SUPER, flash your skin's supercolor, otherwise be your normal color * if your skin doesn't have a SPR2_NGT0 (horizontal fly), use Sonic's (this will hopefully be replaced by 2.2 with sprites of NiGHTS themselves) * MT_NIGHTSCHAR made irrelevant, everything follows actor->target instead of actor->target->tracer now * emerald is now player->mo->tracer instead of player->mo->tracer->target * nightopian helpers flash for the 35 tics before they disappear * nights capsule makes boss explosions/noises now (i can change it back i just like it better) * drill off into the sky instead of fly up in floating pose (but no noise yet) ALSO: * default maxdash is now 70 * forgot to add supercolor to lua, it is there now * SPR2_SMSL renamed to SPR2_SSTN (stun) * any player with a skincolor that's in the super range is set to FF_FULLBRIGHT at state-set time, so no need to keep super players non-fullbright just because they use spin stuff
2016-08-12 01:57:37 +00:00
S_PLAY_NIGHTS_PULL,
S_PLAY_NIGHTS_ATTACK,
* Smiles hardcode! * Add a default behaviour to followmobj (just basic A_CapeChase). * Allow for modifying which character starting a new SP game should start you on, relative to the first valid character. (SOC's "startchar" variable) * Make MF2_SHADOW transferrable via linkdraw. * Modify P_GetSkinSprite2's recursion limiter to have zero chance of ever infinitely looping.
2017-10-03 17:18:18 +00:00
// c:
S_TAILSOVERLAY_STAND,
S_TAILSOVERLAY_0DEGREES,
S_TAILSOVERLAY_PLUS30DEGREES,
S_TAILSOVERLAY_PLUS60DEGREES,
S_TAILSOVERLAY_MINUS30DEGREES,
S_TAILSOVERLAY_MINUS60DEGREES,
S_TAILSOVERLAY_RUN,
S_TAILSOVERLAY_FLY,
S_TAILSOVERLAY_TIRE,
S_TAILSOVERLAY_PAIN,
S_TAILSOVERLAY_GASP,
S_TAILSOVERLAY_EDGE,
Add Metal's jet fume
2019-10-23 04:35:17 +00:00
// [:
S_JETFUMEFLASH,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Blue Crawla
S_POSS_STND,
S_POSS_RUN1,
S_POSS_RUN2,
S_POSS_RUN3,
S_POSS_RUN4,
S_POSS_RUN5,
S_POSS_RUN6,
// Red Crawla
S_SPOS_STND,
S_SPOS_RUN1,
S_SPOS_RUN2,
S_SPOS_RUN3,
S_SPOS_RUN4,
S_SPOS_RUN5,
S_SPOS_RUN6,
// Greenflower Fish
S_FISH1,
S_FISH2,
S_FISH3,
S_FISH4,
// Buzz (Gold)
S_BUZZLOOK1,
S_BUZZLOOK2,
S_BUZZFLY1,
S_BUZZFLY2,
// Buzz (Red)
S_RBUZZLOOK1,
S_RBUZZLOOK2,
S_RBUZZFLY1,
S_RBUZZFLY2,
// Jetty-Syn Bomber
S_JETBLOOK1,
S_JETBLOOK2,
S_JETBZOOM1,
S_JETBZOOM2,
// Jetty-Syn Gunner
S_JETGLOOK1,
S_JETGLOOK2,
S_JETGZOOM1,
S_JETGZOOM2,
S_JETGSHOOT1,
S_JETGSHOOT2,
// Crawla Commander
S_CCOMMAND1,
S_CCOMMAND2,
S_CCOMMAND3,
S_CCOMMAND4,
// Deton
S_DETON1,
S_DETON2,
S_DETON3,
S_DETON4,
S_DETON5,
S_DETON6,
S_DETON7,
S_DETON8,
S_DETON9,
S_DETON10,
S_DETON11,
S_DETON12,
S_DETON13,
S_DETON14,
S_DETON15,
// Skim Mine Dropper
S_SKIM1,
S_SKIM2,
S_SKIM3,
S_SKIM4,
// THZ Turret
S_TURRET,
S_TURRETFIRE,
S_TURRETSHOCK1,
S_TURRETSHOCK2,
S_TURRETSHOCK3,
S_TURRETSHOCK4,
S_TURRETSHOCK5,
S_TURRETSHOCK6,
S_TURRETSHOCK7,
S_TURRETSHOCK8,
S_TURRETSHOCK9,
// Popup Turret
S_TURRETLOOK,
S_TURRETSEE,
S_TURRETPOPUP1,
S_TURRETPOPUP2,
S_TURRETPOPUP3,
S_TURRETPOPUP4,
S_TURRETPOPUP5,
S_TURRETPOPUP6,
S_TURRETPOPUP7,
S_TURRETPOPUP8,
S_TURRETSHOOT,
S_TURRETPOPDOWN1,
S_TURRETPOPDOWN2,
S_TURRETPOPDOWN3,
S_TURRETPOPDOWN4,
S_TURRETPOPDOWN5,
S_TURRETPOPDOWN6,
S_TURRETPOPDOWN7,
S_TURRETPOPDOWN8,
* DrT's Spincushion hardcoded. * Make the MF_PAIN stuff ONLY depend on mass, using the bottom 8 bits for the type and the custom sound in the upper ones. * A bunch of cleanup of random other stuff, including an unused Deton state and an unused Jetty type's sprite.
2018-05-13 13:09:20 +00:00
// Spincushion
S_SPINCUSHION_LOOK,
S_SPINCUSHION_CHASE1,
S_SPINCUSHION_CHASE2,
S_SPINCUSHION_CHASE3,
S_SPINCUSHION_CHASE4,
S_SPINCUSHION_AIM1,
S_SPINCUSHION_AIM2,
S_SPINCUSHION_AIM3,
S_SPINCUSHION_AIM4,
S_SPINCUSHION_AIM5,
S_SPINCUSHION_SPIN1,
S_SPINCUSHION_SPIN2,
S_SPINCUSHION_SPIN3,
S_SPINCUSHION_SPIN4,
S_SPINCUSHION_STOP1,
S_SPINCUSHION_STOP2,
S_SPINCUSHION_STOP3,
S_SPINCUSHION_STOP4,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
* Crushtacean! * Behaves a bit differently to the one in DSZres.pk3. * Can now punch DSZ mines! * Also has mapthingnum 126 instead of 610. * Some other mapthingnum changes. * DSZ2 stalagmite is now 1009, formerly 999. * Big DSZ gargoyle is now 1011, formerly 1009.
2018-05-14 00:19:24 +00:00
// Crushstacean
S_CRUSHSTACEAN_ROAM1,
S_CRUSHSTACEAN_ROAM2,
S_CRUSHSTACEAN_ROAM3,
S_CRUSHSTACEAN_ROAM4,
S_CRUSHSTACEAN_ROAMPAUSE,
S_CRUSHSTACEAN_PUNCH1,
S_CRUSHSTACEAN_PUNCH2,
S_CRUSHCLAW_AIM,
S_CRUSHCLAW_OUT,
S_CRUSHCLAW_STAY,
S_CRUSHCLAW_IN,
S_CRUSHCLAW_WAIT,
S_CRUSHCHAIN,
* New object types! * Red and yellow Boost panels! * Added because SUBARASHII and KIMOKAWAIII had several levels using them, and I wanted to make them look better. * https://cdn.discordapp.com/attachments/359091121789468672/634486669202161674/srb20015.gif * Uses the mapthingnums of Glaber's SOC resource boosters, but absolutely nothing else - not even the magnitudes. * Apply MF_AMBUSH to force the player into a spin - even if they don't have a spin ability! * Banpyura! * A Crushstacean with a spring instead of a crushclaw. * https://cdn.discordapp.com/attachments/428262628893261828/634432099306176512/srb20019.gif * Wanted this for a while, finally added it. * Improved springs. * Add pw_noautobrake to disable autobrake for half a second when touching yellow horizontal springs, and a second when touching red ones, even on the ground. * Add pw_justsprung to disable directionchar for a few tics while touching any springs with a horizontal component to their velocity. * Add the diagonal spring flag options Red and Yellow Diagonal Springs have to the Blue Diagonal Spring as well. * Started but decided against a tip of the hat to the CD spring spin, hidden behind #define SPRINGSPIN. * Make directionchar "lag behind" a little bit in waterslides. * Improved flame jets. * They now use new sprites for having their flames move upwards and sideways, instead of having them always face downwards like in 2.1! * Fixed a mixed declaration and code error in A_RolloutRock. (Sorry Lach!) * Make the Amy Cameo only spawn in SP, Record Attack, or Co-op unless it's the Clone Mode. * Improved ZB config. * Add above new types. * Add Blue Diagonal Spring, which existed in the source but not the config. * Re-order enemies in ZB config by zone (but keep them in the Enemies section only).
2019-10-17 20:50:26 +00:00
// Banpyura
S_BANPYURA_ROAM1,
S_BANPYURA_ROAM2,
S_BANPYURA_ROAM3,
S_BANPYURA_ROAM4,
S_BANPYURA_ROAMPAUSE,
S_CDIAG1,
S_CDIAG2,
S_CDIAG3,
S_CDIAG4,
S_CDIAG5,
S_CDIAG6,
S_CDIAG7,
S_CDIAG8,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Jet Jaw
S_JETJAW_ROAM1,
S_JETJAW_ROAM2,
S_JETJAW_ROAM3,
S_JETJAW_ROAM4,
S_JETJAW_ROAM5,
S_JETJAW_ROAM6,
S_JETJAW_ROAM7,
S_JETJAW_ROAM8,
S_JETJAW_CHOMP1,
S_JETJAW_CHOMP2,
S_JETJAW_CHOMP3,
S_JETJAW_CHOMP4,
S_JETJAW_CHOMP5,
S_JETJAW_CHOMP6,
S_JETJAW_CHOMP7,
S_JETJAW_CHOMP8,
S_JETJAW_CHOMP9,
S_JETJAW_CHOMP10,
S_JETJAW_CHOMP11,
S_JETJAW_CHOMP12,
S_JETJAW_CHOMP13,
S_JETJAW_CHOMP14,
S_JETJAW_CHOMP15,
S_JETJAW_CHOMP16,
// Snailer
S_SNAILER1,
* Add a "moveforward" param to P_InternalFlickySpawn, which controls whether to spawn the flicky a little in front or behind of the object making it. * Expose this via additional upper-16-bits flags of A_FlickySpawn. * Use this to make Snailers not spawn their flicky inside the wall they're attached to. * Make the behaviour of Egg Capsules more consistent mechanically regarding the flicky spawning, using the above as one relevant element.
2019-11-13 20:14:08 +00:00
S_SNAILER_FLICKY,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Vulture
S_VULTURE_STND,
Hardcoded the new BASH behavior (there's still a bug lurking somewhere)
2019-06-10 14:09:15 +00:00
S_VULTURE_DRIFT,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_VULTURE_ZOOM1,
S_VULTURE_ZOOM2,
Hardcoded the new BASH behavior (there's still a bug lurking somewhere)
2019-06-10 14:09:15 +00:00
S_VULTURE_STUNNED,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Pointy
S_POINTY1,
S_POINTYBALL1,
// Robo-Hood
S_ROBOHOOD_LOOK,
First commit on new tablet-laptop! * Robo Hood. * Hi MI, I know you're looking at this just because it features Robo hood. :V
2018-05-30 22:16:57 +00:00
S_ROBOHOOD_STAND,
S_ROBOHOOD_FIRE1,
S_ROBOHOOD_FIRE2,
S_ROBOHOOD_JUMP1,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_ROBOHOOD_JUMP2,
First commit on new tablet-laptop! * Robo Hood. * Hi MI, I know you're looking at this just because it features Robo hood. :V
2018-05-30 22:16:57 +00:00
S_ROBOHOOD_JUMP3,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
* Castlebot Facestabbers. * Facestabber statues, of both the suspicious and non-suspicious kind. * New object type for the end of grabbable chains. * I moved my compilation .bat file to my Releases folder, so it should .gitignore .bat's. * Random extra stuff.
2018-05-24 00:40:57 +00:00
// Castlebot Facestabber
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_FACESTABBER_STND1,
S_FACESTABBER_STND2,
S_FACESTABBER_STND3,
S_FACESTABBER_STND4,
S_FACESTABBER_STND5,
S_FACESTABBER_STND6,
S_FACESTABBER_CHARGE1,
S_FACESTABBER_CHARGE2,
S_FACESTABBER_CHARGE3,
S_FACESTABBER_CHARGE4,
* Hive Elementals and Bumblebores, plus associated useful action functions. * Made Facestabbers take two hits and have associated pain/death animations. No other changes, just wanted to make sure THIS was done. * Move Bubblebuzz-related stuff to go alongside the secret badniks and etc. * MF2_INVERTAIMABLE. Inverts whether P_LookForEnemies can get at; replaces a hardcoded thingy.
2018-05-04 20:30:15 +00:00
S_FACESTABBER_PAIN,
S_FACESTABBER_DIE1,
S_FACESTABBER_DIE2,
S_FACESTABBER_DIE3,
* Castlebot Facestabbers. * Facestabber statues, of both the suspicious and non-suspicious kind. * New object type for the end of grabbable chains. * I moved my compilation .bat file to my Releases folder, so it should .gitignore .bat's. * Random extra stuff.
2018-05-24 00:40:57 +00:00
S_FACESTABBERSPEAR,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Egg Guard
S_EGGGUARD_STND,
S_EGGGUARD_WALK1,
S_EGGGUARD_WALK2,
S_EGGGUARD_WALK3,
S_EGGGUARD_WALK4,
S_EGGGUARD_MAD1,
S_EGGGUARD_MAD2,
S_EGGGUARD_MAD3,
S_EGGGUARD_RUN1,
S_EGGGUARD_RUN2,
S_EGGGUARD_RUN3,
S_EGGGUARD_RUN4,
// Egg Shield for Egg Guard
S_EGGSHIELD,
MONSTER COMMIT. OLD SPECIAL STAGES: * Spheres in old special stages instead of rings! * Individual timers in old special stages instead of a global one! * Old special stages use a variant of the NiGHTS HUD now! * Special stage damage in old special stages loses 5 seconds of time instead of 10 rings/spheres! * All damage gained through old special stages is converted to special stage damage! As a consequence, the special spikeball has no need to be special anymore. * Made emerald gaining function be based on special stage number rather than gained emeralds! * Consistency with... NiGHTS SPECIAL STAGES: * Spheres now flash in bonus time. https://cdn.discordapp.com/attachments/400761370800422922/452590553100713984/srb20032.gif * Sphere and ring mapthingnums are now less fucked up in 'em. (Rings are 300, same as usual, while Spheres are now 1706 replacing NiGHTS Wings.) SPECIAL STAGES IN GENERAL: * useNightsSS is now dead. Each individual special stage is now assessed for NiGHTS-mode behaviour based on maptol & TOL_NIGHTS. * CRAWLA HONCHO\n CAN NOW BE\n SUPER CRAWLA HONCHO end tally modification now also includes a mini-tutorial on turning super. https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif * SONIC GOT A CHAOS EMERALD? https://cdn.discordapp.com/attachments/400761370800422922/452623869497573386/srb20034.gif NiGHTS NON-SPECIAL STAGES: * Colour Chips and Star Chips! Replaces Spheres and Rings of NiGHTS Special Stages. * Colour Chips turn yellow in bonus time. * Ideya! * Its own "drowning" music! * All of the object types for Dream Hill. * GIF: https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif RANDOM BS: * Turn super with the spin button instead of the jump button! * Followmobj now correctly set with P_SetTarget instead of pointer assignment. * Emerald hunt uses new sprites! * Made unlock noise different from emblem gain noise! (It's the CRAWLA HONCHO CAN NOW TURN yadda yadda sound from S3K now.)
2018-06-03 21:41:54 +00:00
S_EGGSHIELDBREAK,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Green Snapper
Hardcoded the new Snapper behavior
2019-06-10 18:32:50 +00:00
S_SNAPPER_SPAWN,
S_SNAPPER_SPAWN2,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_GSNAPPER_STND,
S_GSNAPPER1,
S_GSNAPPER2,
S_GSNAPPER3,
S_GSNAPPER4,
Hardcoded the new Snapper behavior
2019-06-10 18:32:50 +00:00
S_SNAPPER_XPLD,
S_SNAPPER_LEG,
S_SNAPPER_LEGRAISE,
S_SNAPPER_HEAD,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Minus
Hardcoded the new Minus behavior
2019-06-10 15:42:37 +00:00
S_MINUS_INIT,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_MINUS_STND,
Hardcoded the new Minus behavior
2019-06-10 15:42:37 +00:00
S_MINUS_DIGGING1,
S_MINUS_DIGGING2,
S_MINUS_DIGGING3,
S_MINUS_DIGGING4,
S_MINUS_BURST0,
S_MINUS_BURST1,
S_MINUS_BURST2,
S_MINUS_BURST3,
S_MINUS_BURST4,
S_MINUS_BURST5,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_MINUS_POPUP,
Have Minus rotate in mid-air
2019-11-24 14:29:26 +00:00
S_MINUS_AERIAL1,
S_MINUS_AERIAL2,
S_MINUS_AERIAL3,
S_MINUS_AERIAL4,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Hardcoded the new Minus behavior
2019-06-10 15:42:37 +00:00
// Minus dirt
S_MINUSDIRT1,
S_MINUSDIRT2,
S_MINUSDIRT3,
S_MINUSDIRT4,
S_MINUSDIRT5,
S_MINUSDIRT6,
S_MINUSDIRT7,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Spring Shell
S_SSHELL_STND,
S_SSHELL_RUN1,
S_SSHELL_RUN2,
S_SSHELL_RUN3,
S_SSHELL_RUN4,
S_SSHELL_SPRING1,
S_SSHELL_SPRING2,
S_SSHELL_SPRING3,
S_SSHELL_SPRING4,
// Spring Shell (yellow)
S_YSHELL_STND,
S_YSHELL_RUN1,
S_YSHELL_RUN2,
S_YSHELL_RUN3,
S_YSHELL_RUN4,
S_YSHELL_SPRING1,
S_YSHELL_SPRING2,
S_YSHELL_SPRING3,
S_YSHELL_SPRING4,
// Unidus
S_UNIDUS_STND,
S_UNIDUS_RUN,
S_UNIDUS_BALL,
Hardcoded the Canarivore
2019-06-10 11:58:16 +00:00
// Canarivore
S_CANARIVORE_LOOK,
S_CANARIVORE_AWAKEN1,
S_CANARIVORE_AWAKEN2,
S_CANARIVORE_AWAKEN3,
S_CANARIVORE_GAS1,
S_CANARIVORE_GAS2,
S_CANARIVORE_GAS3,
S_CANARIVORE_GAS4,
S_CANARIVORE_GAS5,
S_CANARIVORE_GASREPEAT,
S_CANARIVORE_CLOSE1,
S_CANARIVORE_CLOSE2,
S_CANARIVOREGAS_1,
S_CANARIVOREGAS_2,
S_CANARIVOREGAS_3,
S_CANARIVOREGAS_4,
S_CANARIVOREGAS_5,
S_CANARIVOREGAS_6,
S_CANARIVOREGAS_7,
S_CANARIVOREGAS_8,
Hardcoded the Pyre Fly
2019-08-30 06:17:25 +00:00
// Pyre Fly
S_PYREFLY_FLY,
Make the Pyrefly glowing and damaging in its fire-spawning state
2019-10-07 20:23:52 +00:00
S_PYREFLY_BURN,
Hardcoded the Pyre Fly
2019-08-30 06:17:25 +00:00
S_PYREFIRE1,
S_PYREFIRE2,
Hardcoded the Pterabyte (without the grabbing mechanic)
2019-09-29 08:39:09 +00:00
// Pterabyte
S_PTERABYTESPAWNER,
S_PTERABYTEWAYPOINT,
S_PTERABYTE_FLY1,
S_PTERABYTE_FLY2,
S_PTERABYTE_FLY3,
S_PTERABYTE_FLY4,
S_PTERABYTE_SWOOPDOWN,
S_PTERABYTE_SWOOPUP,
Add Dragonbomber enemy
2019-11-17 21:23:59 +00:00
// Dragonbomber
S_DRAGONBOMBER,
S_DRAGONWING1,
S_DRAGONWING2,
S_DRAGONWING3,
S_DRAGONWING4,
S_DRAGONTAIL_LOADED,
S_DRAGONTAIL_EMPTY,
S_DRAGONTAIL_EMPTYLOOP,
S_DRAGONTAIL_RELOAD,
S_DRAGONMINE,
Prevent mines from sliding upon touching the ground
2019-11-18 02:35:56 +00:00
S_DRAGONMINE_LAND1,
S_DRAGONMINE_LAND2,
S_DRAGONMINE_SLOWFLASH1,
S_DRAGONMINE_SLOWFLASH2,
S_DRAGONMINE_SLOWLOOP,
S_DRAGONMINE_FASTFLASH1,
S_DRAGONMINE_FASTFLASH2,
S_DRAGONMINE_FASTLOOP,
Add Dragonbomber enemy
2019-11-17 21:23:59 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Boss Explosion
Bit of a random one today, but the branch approaches completion... * Bomb sphere! Paraloopable hazard. Replaces MT_SPECIALSPIKEBALL. * Blueberry bushes, both normal and Xmas, from patch.dta. * BSZ tulips, also from patch.dta! * Frozen Hillside badniks - Penguinator and Pophat. * Frozen Hillside ice decoration! * Fixed some big bugs with the DSZ light beams. * Made multi-mare special stages work, in a troll way - the Chaos Emerald disappears in a puff of smoke, and the Spinbobert laughter sound plays... >:3c * Reverted the mobjtype number changes from the source SOC/Lua, which we can do later when doing a final pass of the levels. * State optimisation. * Serious cruft-removal of the NiGHTS drone thinker. * Fix the issues where the player wouldn't curl into jump in waterslides or dropping off rope-hangs. * Tweak NiGHTS player flashing. * Add text colour support to the titlecard font. * Use that to make the PRESS SPIN\nMID-JUMP thing when you get all Chaos Emeralds use the titlecard font for readability. * Fix the GOT ALL EMERALDS page not lasting the correct, extended amount of time. * Fix that thing where flying mid-spin didn't enact autobrake. * Modify graymap a little on Sryder's suggestion. * [COMPLETELY UNRELATED] fix that thing where the addons menu will fail on files/paths with spaces in [/COMPLETELY UNRELATED]
2018-06-05 16:22:28 +00:00
S_BOSSEXPLODE,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// S3&K Boss Explosion
S_SONIC3KBOSSEXPLOSION1,
S_SONIC3KBOSSEXPLOSION2,
S_SONIC3KBOSSEXPLOSION3,
S_SONIC3KBOSSEXPLOSION4,
S_SONIC3KBOSSEXPLOSION5,
S_SONIC3KBOSSEXPLOSION6,
S_JETFUME1,
// Boss 1
S_EGGMOBILE_STND,
Motor's new Eggman sprites, along with some other sweet bits of boss polish. What else can I say? Just play it.
2019-08-30 18:19:54 +00:00
S_EGGMOBILE_ROFL,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_EGGMOBILE_LATK1,
S_EGGMOBILE_LATK2,
S_EGGMOBILE_LATK3,
S_EGGMOBILE_LATK4,
S_EGGMOBILE_LATK5,
S_EGGMOBILE_LATK6,
S_EGGMOBILE_LATK7,
S_EGGMOBILE_LATK8,
S_EGGMOBILE_LATK9,
S_EGGMOBILE_RATK1,
S_EGGMOBILE_RATK2,
S_EGGMOBILE_RATK3,
S_EGGMOBILE_RATK4,
S_EGGMOBILE_RATK5,
S_EGGMOBILE_RATK6,
S_EGGMOBILE_RATK7,
S_EGGMOBILE_RATK8,
S_EGGMOBILE_RATK9,
S_EGGMOBILE_PANIC1,
S_EGGMOBILE_PANIC2,
S_EGGMOBILE_PANIC3,
S_EGGMOBILE_PANIC4,
S_EGGMOBILE_PANIC5,
S_EGGMOBILE_PANIC6,
S_EGGMOBILE_PANIC7,
Motor's new Eggman sprites, along with some other sweet bits of boss polish. What else can I say? Just play it.
2019-08-30 18:19:54 +00:00
S_EGGMOBILE_PANIC8,
S_EGGMOBILE_PANIC9,
S_EGGMOBILE_PANIC10,
S_EGGMOBILE_PANIC11,
S_EGGMOBILE_PANIC12,
S_EGGMOBILE_PANIC13,
S_EGGMOBILE_PANIC14,
S_EGGMOBILE_PANIC15,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_EGGMOBILE_PAIN,
S_EGGMOBILE_PAIN2,
S_EGGMOBILE_DIE1,
S_EGGMOBILE_DIE2,
S_EGGMOBILE_DIE3,
S_EGGMOBILE_DIE4,
S_EGGMOBILE_FLEE1,
S_EGGMOBILE_FLEE2,
S_EGGMOBILE_BALL,
S_EGGMOBILE_TARGET,
Motor's new Eggman sprites, along with some other sweet bits of boss polish. What else can I say? Just play it.
2019-08-30 18:19:54 +00:00
S_BOSSEGLZ1,
S_BOSSEGLZ2,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Boss 2
S_EGGMOBILE2_STND,
S_EGGMOBILE2_POGO1,
S_EGGMOBILE2_POGO2,
S_EGGMOBILE2_POGO3,
S_EGGMOBILE2_POGO4,
S_EGGMOBILE2_POGO5,
S_EGGMOBILE2_POGO6,
S_EGGMOBILE2_POGO7,
S_EGGMOBILE2_PAIN,
S_EGGMOBILE2_PAIN2,
S_EGGMOBILE2_DIE1,
S_EGGMOBILE2_DIE2,
S_EGGMOBILE2_DIE3,
S_EGGMOBILE2_DIE4,
S_EGGMOBILE2_FLEE1,
S_EGGMOBILE2_FLEE2,
S_BOSSTANK1,
S_BOSSTANK2,
S_BOSSSPIGOT,
// Boss 2 Goop
S_GOOP1,
S_GOOP2,
S_GOOP3,
* ALMOST SORTA IMPLEMENTED A NON-HACKY SPINNING FLAMEJET. For some reason, they wanna step down onto the platform - and I've been figuring this out for too long to see what's causing that tonight. * Hardcoded a bunch of stuff from patch.dta. All works fine, but still more to do.
2017-01-21 01:09:39 +00:00
S_GOOPTRAIL,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Boss 3
S_EGGMOBILE3_STND,
Motor's new Eggman sprites, along with some other sweet bits of boss polish. What else can I say? Just play it.
2019-08-30 18:19:54 +00:00
S_EGGMOBILE3_SHOCK,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_EGGMOBILE3_ATK1,
S_EGGMOBILE3_ATK2,
S_EGGMOBILE3_ATK3A,
S_EGGMOBILE3_ATK3B,
S_EGGMOBILE3_ATK3C,
S_EGGMOBILE3_ATK3D,
S_EGGMOBILE3_ATK4,
S_EGGMOBILE3_ATK5,
Motor's new Eggman sprites, along with some other sweet bits of boss polish. What else can I say? Just play it.
2019-08-30 18:19:54 +00:00
S_EGGMOBILE3_ROFL,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_EGGMOBILE3_PAIN,
S_EGGMOBILE3_PAIN2,
S_EGGMOBILE3_DIE1,
S_EGGMOBILE3_DIE2,
S_EGGMOBILE3_DIE3,
S_EGGMOBILE3_DIE4,
S_EGGMOBILE3_FLEE1,
S_EGGMOBILE3_FLEE2,
// Boss 3 Pinch
S_FAKEMOBILE_INIT,
S_FAKEMOBILE,
S_FAKEMOBILE_ATK1,
S_FAKEMOBILE_ATK2,
S_FAKEMOBILE_ATK3A,
S_FAKEMOBILE_ATK3B,
S_FAKEMOBILE_ATK3C,
S_FAKEMOBILE_ATK3D,
ha ha ha ha ha ha ha ha Sea Egg is majorly changed according to Mystic's ancient instructions (excepting the flying FOF rock, I cared not for fucking around with FOFs). Specifically: * Faster paced fight. * Instantly travels horizontal distance. * Fakes no longer hurt papa, and spin out like a deflating balloon when he dies. * New attack: When surfacing, produces an electric shockwave. Replaces underwater shock. Designed for new, shallow arena. * Support for multiple bosses in the same map distinguished by parameter. Will upload map to fight the new battle in on the MR.
2019-06-29 13:10:32 +00:00
S_FAKEMOBILE_DIE1,
S_FAKEMOBILE_DIE2,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Motor's new Eggman sprites, along with some other sweet bits of boss polish. What else can I say? Just play it.
2019-08-30 18:19:54 +00:00
S_BOSSSEBH1,
S_BOSSSEBH2,
Hardcoded DSZ3 shockwave
2019-09-25 21:27:51 +00:00
// Boss 3 Shockwave
S_SHOCKWAVE1,
S_SHOCKWAVE2,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Boss 4
S_EGGMOBILE4_STND,
S_EGGMOBILE4_LATK1,
S_EGGMOBILE4_LATK2,
S_EGGMOBILE4_LATK3,
S_EGGMOBILE4_LATK4,
S_EGGMOBILE4_LATK5,
S_EGGMOBILE4_LATK6,
S_EGGMOBILE4_RATK1,
S_EGGMOBILE4_RATK2,
S_EGGMOBILE4_RATK3,
S_EGGMOBILE4_RATK4,
S_EGGMOBILE4_RATK5,
S_EGGMOBILE4_RATK6,
S_EGGMOBILE4_RAISE1,
S_EGGMOBILE4_RAISE2,
ha ha ha how can i possibly describe this commit Just wait for the MR, it won't be far behind.
2019-07-08 12:26:40 +00:00
S_EGGMOBILE4_PAIN1,
S_EGGMOBILE4_PAIN2,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_EGGMOBILE4_DIE1,
S_EGGMOBILE4_DIE2,
S_EGGMOBILE4_DIE3,
S_EGGMOBILE4_DIE4,
S_EGGMOBILE4_FLEE1,
S_EGGMOBILE4_FLEE2,
S_EGGMOBILE4_MACE,
ha ha ha how can i possibly describe this commit Just wait for the MR, it won't be far behind.
2019-07-08 12:26:40 +00:00
S_EGGMOBILE4_MACE_DIE1,
S_EGGMOBILE4_MACE_DIE2,
S_EGGMOBILE4_MACE_DIE3,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Boss 4 jet flame
ha ha ha how can i possibly describe this commit Just wait for the MR, it won't be far behind.
2019-07-08 12:26:40 +00:00
S_JETFLAME,
// Boss 4 Spectator Eggrobo
S_EGGROBO1_STND,
S_EGGROBO1_BSLAP1,
S_EGGROBO1_BSLAP2,
S_EGGROBO1_PISSED,
// Boss 4 Spectator Eggrobo jet flame
S_EGGROBOJET,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Hardcoded all the main Fang-specific object types, states and sprites. This cannot be compiled as-is right now for the following reasons: * Numerous actions still need to be hardcoded. * MT_FBOMB uses the TNT barrel explosion (and by extention A_TNTExplode) for its death state. This is a pickle, I'll deal with it when I get to it. Also missing: * Fang waypoint object type+states. * Fang's good looks (to be put in the resource files obviously). * Fang's brain.
2019-05-02 17:01:18 +00:00
// Boss 5
Remember when Lach recorded their live reaction to 2.2 so far? Do you recall what the reaction to ACZ3 was? If you don't, the reaction was "WHAT?? Why is he here? This is GREAT but, what??" And while the reaction is on the positive end of things, it's stll clearly not advisable for our defining Big Reveal of the already huge update. To this end: Here is a mini cutscene! https://cdn.discordapp.com/attachments/428262628893261828/626207624043429898/srb20005.gif * He's digging through Eggman's trash. * Clearly doesn't expect to see you! * Ready for a fight all the same. * You can attack him during the mini cutscene if you're impatient. * Skipped if you give him MTF_AMBUSH. * Requires new assets (including map) to test, but I'm not ready to make a MR yet because I have other thoughts first. Also, since I was poking around in p_enemy.c, I fixed A_Boss1Laser's issues (not working with direct 2.1 port states and having the weird secondary attack).
2019-09-25 13:36:20 +00:00
S_FANG_SETUP,
* Add vwre vwre intro for Fang Clone Fighter battle. (Still skipped with presence of MTF_AMBUSH) * https://cdn.discordapp.com/attachments/428262628893261828/626792815451701259/srb20006.gif * Add fadeout instead of slapstick for Fang Clone Fighter death. * Allow placed Fang and Metal Sonic objects to be marked as Clone Fighters always through presence of MTF_EXTRA.
2019-09-26 16:06:29 +00:00
S_FANG_INTRO0,
Remember when Lach recorded their live reaction to 2.2 so far? Do you recall what the reaction to ACZ3 was? If you don't, the reaction was "WHAT?? Why is he here? This is GREAT but, what??" And while the reaction is on the positive end of things, it's stll clearly not advisable for our defining Big Reveal of the already huge update. To this end: Here is a mini cutscene! https://cdn.discordapp.com/attachments/428262628893261828/626207624043429898/srb20005.gif * He's digging through Eggman's trash. * Clearly doesn't expect to see you! * Ready for a fight all the same. * You can attack him during the mini cutscene if you're impatient. * Skipped if you give him MTF_AMBUSH. * Requires new assets (including map) to test, but I'm not ready to make a MR yet because I have other thoughts first. Also, since I was poking around in p_enemy.c, I fixed A_Boss1Laser's issues (not working with direct 2.1 port states and having the weird secondary attack).
2019-09-25 13:36:20 +00:00
S_FANG_INTRO1,
S_FANG_INTRO2,
S_FANG_INTRO3,
S_FANG_INTRO4,
S_FANG_INTRO5,
S_FANG_INTRO6,
S_FANG_INTRO7,
S_FANG_INTRO8,
S_FANG_INTRO9,
S_FANG_INTRO10,
S_FANG_INTRO11,
S_FANG_INTRO12,
* Add vwre vwre intro for Fang Clone Fighter battle. (Still skipped with presence of MTF_AMBUSH) * https://cdn.discordapp.com/attachments/428262628893261828/626792815451701259/srb20006.gif * Add fadeout instead of slapstick for Fang Clone Fighter death. * Allow placed Fang and Metal Sonic objects to be marked as Clone Fighters always through presence of MTF_EXTRA.
2019-09-26 16:06:29 +00:00
S_FANG_CLONE1,
S_FANG_CLONE2,
S_FANG_CLONE3,
S_FANG_CLONE4,
Remember when Lach recorded their live reaction to 2.2 so far? Do you recall what the reaction to ACZ3 was? If you don't, the reaction was "WHAT?? Why is he here? This is GREAT but, what??" And while the reaction is on the positive end of things, it's stll clearly not advisable for our defining Big Reveal of the already huge update. To this end: Here is a mini cutscene! https://cdn.discordapp.com/attachments/428262628893261828/626207624043429898/srb20005.gif * He's digging through Eggman's trash. * Clearly doesn't expect to see you! * Ready for a fight all the same. * You can attack him during the mini cutscene if you're impatient. * Skipped if you give him MTF_AMBUSH. * Requires new assets (including map) to test, but I'm not ready to make a MR yet because I have other thoughts first. Also, since I was poking around in p_enemy.c, I fixed A_Boss1Laser's issues (not working with direct 2.1 port states and having the weird secondary attack).
2019-09-25 13:36:20 +00:00
S_FANG_IDLE0,
Hardcoded all the main Fang-specific object types, states and sprites. This cannot be compiled as-is right now for the following reasons: * Numerous actions still need to be hardcoded. * MT_FBOMB uses the TNT barrel explosion (and by extention A_TNTExplode) for its death state. This is a pickle, I'll deal with it when I get to it. Also missing: * Fang waypoint object type+states. * Fang's good looks (to be put in the resource files obviously). * Fang's brain.
2019-05-02 17:01:18 +00:00
S_FANG_IDLE1,
S_FANG_IDLE2,
S_FANG_IDLE3,
S_FANG_IDLE4,
S_FANG_IDLE5,
S_FANG_IDLE6,
S_FANG_IDLE7,
S_FANG_IDLE8,
S_FANG_PAIN1,
S_FANG_PAIN2,
S_FANG_PATHINGSTART1,
S_FANG_PATHINGSTART2,
S_FANG_PATHING,
S_FANG_BOUNCE1,
S_FANG_BOUNCE2,
S_FANG_BOUNCE3,
S_FANG_BOUNCE4,
S_FANG_FALL1,
S_FANG_FALL2,
S_FANG_CHECKPATH1,
S_FANG_CHECKPATH2,
S_FANG_PATHINGCONT1,
S_FANG_PATHINGCONT2,
S_FANG_PATHINGCONT3,
S_FANG_SKID1,
S_FANG_SKID2,
S_FANG_SKID3,
S_FANG_CHOOSEATTACK,
S_FANG_FIRESTART1,
S_FANG_FIRESTART2,
S_FANG_FIRE1,
S_FANG_FIRE2,
S_FANG_FIRE3,
S_FANG_FIRE4,
S_FANG_FIREREPEAT,
Tweak the ACZ3 fight a little, animationwise, since every other non-Brak boss got an upgrade to its death anim in this branch. Also make its bomb throw anim use all the new sprites.
2019-08-13 18:41:04 +00:00
S_FANG_LOBSHOT0,
Hardcoded all the main Fang-specific object types, states and sprites. This cannot be compiled as-is right now for the following reasons: * Numerous actions still need to be hardcoded. * MT_FBOMB uses the TNT barrel explosion (and by extention A_TNTExplode) for its death state. This is a pickle, I'll deal with it when I get to it. Also missing: * Fang waypoint object type+states. * Fang's good looks (to be put in the resource files obviously). * Fang's brain.
2019-05-02 17:01:18 +00:00
S_FANG_LOBSHOT1,
S_FANG_LOBSHOT2,
S_FANG_WAIT1,
S_FANG_WAIT2,
S_FANG_WALLHIT,
S_FANG_PINCHPATHINGSTART1,
S_FANG_PINCHPATHINGSTART2,
S_FANG_PINCHPATHING,
S_FANG_PINCHBOUNCE1,
S_FANG_PINCHBOUNCE2,
S_FANG_PINCHBOUNCE3,
S_FANG_PINCHBOUNCE4,
S_FANG_PINCHFALL1,
S_FANG_PINCHFALL2,
S_FANG_PINCHSKID1,
S_FANG_PINCHSKID2,
Tweak the ACZ3 fight a little, animationwise, since every other non-Brak boss got an upgrade to its death anim in this branch. Also make its bomb throw anim use all the new sprites.
2019-08-13 18:41:04 +00:00
S_FANG_PINCHLOBSHOT0,
Hardcoded all the main Fang-specific object types, states and sprites. This cannot be compiled as-is right now for the following reasons: * Numerous actions still need to be hardcoded. * MT_FBOMB uses the TNT barrel explosion (and by extention A_TNTExplode) for its death state. This is a pickle, I'll deal with it when I get to it. Also missing: * Fang waypoint object type+states. * Fang's good looks (to be put in the resource files obviously). * Fang's brain.
2019-05-02 17:01:18 +00:00
S_FANG_PINCHLOBSHOT1,
S_FANG_PINCHLOBSHOT2,
S_FANG_PINCHLOBSHOT3,
S_FANG_PINCHLOBSHOT4,
S_FANG_DIE1,
S_FANG_DIE2,
S_FANG_DIE3,
S_FANG_DIE4,
S_FANG_DIE5,
S_FANG_DIE6,
S_FANG_DIE7,
S_FANG_DIE8,
S_FANG_FLEEPATHING1,
S_FANG_FLEEPATHING2,
S_FANG_FLEEBOUNCE1,
S_FANG_FLEEBOUNCE2,
S_FANG_KO,
Remember when Lach recorded their live reaction to 2.2 so far? Do you recall what the reaction to ACZ3 was? If you don't, the reaction was "WHAT?? Why is he here? This is GREAT but, what??" And while the reaction is on the positive end of things, it's stll clearly not advisable for our defining Big Reveal of the already huge update. To this end: Here is a mini cutscene! https://cdn.discordapp.com/attachments/428262628893261828/626207624043429898/srb20005.gif * He's digging through Eggman's trash. * Clearly doesn't expect to see you! * Ready for a fight all the same. * You can attack him during the mini cutscene if you're impatient. * Skipped if you give him MTF_AMBUSH. * Requires new assets (including map) to test, but I'm not ready to make a MR yet because I have other thoughts first. Also, since I was poking around in p_enemy.c, I fixed A_Boss1Laser's issues (not working with direct 2.1 port states and having the weird secondary attack).
2019-09-25 13:36:20 +00:00
S_BROKENROBOTRANDOM,
S_BROKENROBOTA,
S_BROKENROBOTB,
S_BROKENROBOTC,
S_BROKENROBOTD,
S_BROKENROBOTE,
S_BROKENROBOTF,
S_ALART1,
S_ALART2,
* Add vwre vwre intro for Fang Clone Fighter battle. (Still skipped with presence of MTF_AMBUSH) * https://cdn.discordapp.com/attachments/428262628893261828/626792815451701259/srb20006.gif * Add fadeout instead of slapstick for Fang Clone Fighter death. * Allow placed Fang and Metal Sonic objects to be marked as Clone Fighters always through presence of MTF_EXTRA.
2019-09-26 16:06:29 +00:00
S_VWREF,
S_VWREB,
S_PROJECTORLIGHT1,
S_PROJECTORLIGHT2,
S_PROJECTORLIGHT3,
S_PROJECTORLIGHT4,
S_PROJECTORLIGHT5,
Hardcoded all the main Fang-specific object types, states and sprites. This cannot be compiled as-is right now for the following reasons: * Numerous actions still need to be hardcoded. * MT_FBOMB uses the TNT barrel explosion (and by extention A_TNTExplode) for its death state. This is a pickle, I'll deal with it when I get to it. Also missing: * Fang waypoint object type+states. * Fang's good looks (to be put in the resource files obviously). * Fang's brain.
2019-05-02 17:01:18 +00:00
S_FBOMB1,
S_FBOMB2,
Hardcode the bomb's explosion states, the dust object type and states, and the sprite prefixes for both
2019-05-23 20:51:58 +00:00
S_FBOMB_EXPL1,
S_FBOMB_EXPL2,
S_FBOMB_EXPL3,
S_FBOMB_EXPL4,
S_FBOMB_EXPL5,
S_FBOMB_EXPL6,
S_TNTDUST_1,
S_TNTDUST_2,
S_TNTDUST_3,
S_TNTDUST_4,
S_TNTDUST_5,
S_TNTDUST_6,
S_TNTDUST_7,
S_TNTDUST_8,
Hardcoded all the main Fang-specific object types, states and sprites. This cannot be compiled as-is right now for the following reasons: * Numerous actions still need to be hardcoded. * MT_FBOMB uses the TNT barrel explosion (and by extention A_TNTExplode) for its death state. This is a pickle, I'll deal with it when I get to it. Also missing: * Fang waypoint object type+states. * Fang's good looks (to be put in the resource files obviously). * Fang's brain.
2019-05-02 17:01:18 +00:00
S_FSGNA,
S_FSGNB,
S_FSGNC,
Make ACZ3's slapstick signpost taller (resolves #267).
2019-11-15 14:52:34 +00:00
S_FSGND,
Hardcoded all the main Fang-specific object types, states and sprites. This cannot be compiled as-is right now for the following reasons: * Numerous actions still need to be hardcoded. * MT_FBOMB uses the TNT barrel explosion (and by extention A_TNTExplode) for its death state. This is a pickle, I'll deal with it when I get to it. Also missing: * Fang waypoint object type+states. * Fang's good looks (to be put in the resource files obviously). * Fang's brain.
2019-05-02 17:01:18 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Black Eggman (Boss 7)
S_BLACKEGG_STND,
S_BLACKEGG_STND2,
S_BLACKEGG_WALK1,
S_BLACKEGG_WALK2,
S_BLACKEGG_WALK3,
S_BLACKEGG_WALK4,
S_BLACKEGG_WALK5,
S_BLACKEGG_WALK6,
S_BLACKEGG_SHOOT1,
S_BLACKEGG_SHOOT2,
S_BLACKEGG_PAIN1,
S_BLACKEGG_PAIN2,
S_BLACKEGG_PAIN3,
S_BLACKEGG_PAIN4,
S_BLACKEGG_PAIN5,
S_BLACKEGG_PAIN6,
S_BLACKEGG_PAIN7,
S_BLACKEGG_PAIN8,
S_BLACKEGG_PAIN9,
S_BLACKEGG_PAIN10,
S_BLACKEGG_PAIN11,
S_BLACKEGG_PAIN12,
S_BLACKEGG_PAIN13,
S_BLACKEGG_PAIN14,
S_BLACKEGG_PAIN15,
S_BLACKEGG_PAIN16,
S_BLACKEGG_PAIN17,
S_BLACKEGG_PAIN18,
S_BLACKEGG_PAIN19,
S_BLACKEGG_PAIN20,
S_BLACKEGG_PAIN21,
S_BLACKEGG_PAIN22,
S_BLACKEGG_PAIN23,
S_BLACKEGG_PAIN24,
S_BLACKEGG_PAIN25,
S_BLACKEGG_PAIN26,
S_BLACKEGG_PAIN27,
S_BLACKEGG_PAIN28,
S_BLACKEGG_PAIN29,
S_BLACKEGG_PAIN30,
S_BLACKEGG_PAIN31,
S_BLACKEGG_PAIN32,
S_BLACKEGG_PAIN33,
S_BLACKEGG_PAIN34,
S_BLACKEGG_PAIN35,
S_BLACKEGG_HITFACE1,
S_BLACKEGG_HITFACE2,
S_BLACKEGG_HITFACE3,
S_BLACKEGG_HITFACE4,
S_BLACKEGG_DIE1,
S_BLACKEGG_DIE2,
S_BLACKEGG_DIE3,
S_BLACKEGG_DIE4,
S_BLACKEGG_DIE5,
S_BLACKEGG_MISSILE1,
S_BLACKEGG_MISSILE2,
S_BLACKEGG_MISSILE3,
S_BLACKEGG_GOOP,
S_BLACKEGG_JUMP1,
S_BLACKEGG_JUMP2,
S_BLACKEGG_DESTROYPLAT1,
S_BLACKEGG_DESTROYPLAT2,
S_BLACKEGG_DESTROYPLAT3,
S_BLACKEGG_HELPER, // Collision helper
S_BLACKEGG_GOOP1,
S_BLACKEGG_GOOP2,
S_BLACKEGG_GOOP3,
S_BLACKEGG_GOOP4,
S_BLACKEGG_GOOP5,
S_BLACKEGG_GOOP6,
S_BLACKEGG_GOOP7,
S_BLACKEGG_MISSILE,
// New Very-Last-Minute 2.1 Brak Eggman (Cy-Brak-demon)
S_CYBRAKDEMON_IDLE,
S_CYBRAKDEMON_WALK1,
S_CYBRAKDEMON_WALK2,
S_CYBRAKDEMON_WALK3,
S_CYBRAKDEMON_WALK4,
S_CYBRAKDEMON_WALK5,
S_CYBRAKDEMON_WALK6,
S_CYBRAKDEMON_CHOOSE_ATTACK1,
S_CYBRAKDEMON_MISSILE_ATTACK1, // Aim
S_CYBRAKDEMON_MISSILE_ATTACK2, // Fire
S_CYBRAKDEMON_MISSILE_ATTACK3, // Aim
S_CYBRAKDEMON_MISSILE_ATTACK4, // Fire
S_CYBRAKDEMON_MISSILE_ATTACK5, // Aim
S_CYBRAKDEMON_MISSILE_ATTACK6, // Fire
S_CYBRAKDEMON_FLAME_ATTACK1, // Reset
S_CYBRAKDEMON_FLAME_ATTACK2, // Aim
S_CYBRAKDEMON_FLAME_ATTACK3, // Fire
S_CYBRAKDEMON_FLAME_ATTACK4, // Loop
S_CYBRAKDEMON_CHOOSE_ATTACK2,
S_CYBRAKDEMON_VILE_ATTACK1,
S_CYBRAKDEMON_VILE_ATTACK2,
S_CYBRAKDEMON_VILE_ATTACK3,
S_CYBRAKDEMON_VILE_ATTACK4,
S_CYBRAKDEMON_VILE_ATTACK5,
S_CYBRAKDEMON_VILE_ATTACK6,
S_CYBRAKDEMON_NAPALM_ATTACK1,
S_CYBRAKDEMON_NAPALM_ATTACK2,
S_CYBRAKDEMON_NAPALM_ATTACK3,
S_CYBRAKDEMON_FINISH_ATTACK1, // If just attacked, remove MF2_FRET w/out going back to spawnstate
S_CYBRAKDEMON_FINISH_ATTACK2, // Force a delay between attacks so you don't get bombarded with them back-to-back
S_CYBRAKDEMON_PAIN1,
S_CYBRAKDEMON_PAIN2,
S_CYBRAKDEMON_PAIN3,
S_CYBRAKDEMON_DIE1,
S_CYBRAKDEMON_DIE2,
S_CYBRAKDEMON_DIE3,
S_CYBRAKDEMON_DIE4,
S_CYBRAKDEMON_DIE5,
S_CYBRAKDEMON_DIE6,
S_CYBRAKDEMON_DIE7,
S_CYBRAKDEMON_DIE8,
S_CYBRAKDEMON_DEINVINCIBLERIZE,
S_CYBRAKDEMON_INVINCIBLERIZE,
S_CYBRAKDEMONMISSILE,
S_CYBRAKDEMONMISSILE_EXPLODE1,
S_CYBRAKDEMONMISSILE_EXPLODE2,
S_CYBRAKDEMONMISSILE_EXPLODE3,
S_CYBRAKDEMONFLAMESHOT_FLY1,
S_CYBRAKDEMONFLAMESHOT_FLY2,
S_CYBRAKDEMONFLAMESHOT_FLY3,
S_CYBRAKDEMONFLAMESHOT_DIE,
S_CYBRAKDEMONFLAMEREST,
S_CYBRAKDEMONELECTRICBARRIER_INIT1,
S_CYBRAKDEMONELECTRICBARRIER_INIT2,
S_CYBRAKDEMONELECTRICBARRIER_PLAYSOUND,
S_CYBRAKDEMONELECTRICBARRIER1,
S_CYBRAKDEMONELECTRICBARRIER2,
S_CYBRAKDEMONELECTRICBARRIER3,
S_CYBRAKDEMONELECTRICBARRIER4,
S_CYBRAKDEMONELECTRICBARRIER5,
S_CYBRAKDEMONELECTRICBARRIER6,
S_CYBRAKDEMONELECTRICBARRIER7,
S_CYBRAKDEMONELECTRICBARRIER8,
S_CYBRAKDEMONELECTRICBARRIER9,
S_CYBRAKDEMONELECTRICBARRIER10,
S_CYBRAKDEMONELECTRICBARRIER11,
S_CYBRAKDEMONELECTRICBARRIER12,
S_CYBRAKDEMONELECTRICBARRIER13,
S_CYBRAKDEMONELECTRICBARRIER14,
S_CYBRAKDEMONELECTRICBARRIER15,
S_CYBRAKDEMONELECTRICBARRIER16,
S_CYBRAKDEMONELECTRICBARRIER17,
S_CYBRAKDEMONELECTRICBARRIER18,
S_CYBRAKDEMONELECTRICBARRIER19,
S_CYBRAKDEMONELECTRICBARRIER20,
S_CYBRAKDEMONELECTRICBARRIER21,
S_CYBRAKDEMONELECTRICBARRIER22,
S_CYBRAKDEMONELECTRICBARRIER23,
S_CYBRAKDEMONELECTRICBARRIER24,
S_CYBRAKDEMONELECTRICBARRIER_DIE1,
S_CYBRAKDEMONELECTRICBARRIER_DIE2,
S_CYBRAKDEMONELECTRICBARRIER_DIE3,
S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMCHECK,
S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMSUCCESS,
S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMCHOOSE,
S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM1,
S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM2,
S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM3,
S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM4,
S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM5,
S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM6,
S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM7,
S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM8,
S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM9,
S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM10,
S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM11,
S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM12,
S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMFAIL,
S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP,
S_CYBRAKDEMONELECTRICBARRIER_REVIVE1,
S_CYBRAKDEMONELECTRICBARRIER_REVIVE2,
S_CYBRAKDEMONELECTRICBARRIER_REVIVE3,
S_CYBRAKDEMONTARGETRETICULE1,
S_CYBRAKDEMONTARGETRETICULE2,
S_CYBRAKDEMONTARGETRETICULE3,
S_CYBRAKDEMONTARGETRETICULE4,
S_CYBRAKDEMONTARGETRETICULE5,
S_CYBRAKDEMONTARGETRETICULE6,
S_CYBRAKDEMONTARGETRETICULE7,
S_CYBRAKDEMONTARGETRETICULE8,
S_CYBRAKDEMONTARGETRETICULE9,
S_CYBRAKDEMONTARGETRETICULE10,
S_CYBRAKDEMONTARGETRETICULE11,
S_CYBRAKDEMONTARGETRETICULE12,
S_CYBRAKDEMONTARGETRETICULE13,
S_CYBRAKDEMONTARGETRETICULE14,
SRB2 2.1.7 release
2014-04-14 05:14:58 +00:00
S_CYBRAKDEMONTARGETDOT,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_CYBRAKDEMONNAPALMBOMBLARGE_FLY1,
S_CYBRAKDEMONNAPALMBOMBLARGE_FLY2,
S_CYBRAKDEMONNAPALMBOMBLARGE_FLY3,
S_CYBRAKDEMONNAPALMBOMBLARGE_FLY4,
S_CYBRAKDEMONNAPALMBOMBLARGE_DIE1, // Explode
S_CYBRAKDEMONNAPALMBOMBLARGE_DIE2, // Outer ring
S_CYBRAKDEMONNAPALMBOMBLARGE_DIE3, // Center
S_CYBRAKDEMONNAPALMBOMBLARGE_DIE4, // Sound
S_CYBRAKDEMONNAPALMBOMBSMALL,
S_CYBRAKDEMONNAPALMBOMBSMALL_DIE1, // Explode
S_CYBRAKDEMONNAPALMBOMBSMALL_DIE2, // Outer ring
S_CYBRAKDEMONNAPALMBOMBSMALL_DIE3, // Inner ring
S_CYBRAKDEMONNAPALMBOMBSMALL_DIE4, // Center
S_CYBRAKDEMONNAPALMBOMBSMALL_DIE5, // Sound
S_CYBRAKDEMONNAPALMFLAME_FLY1,
S_CYBRAKDEMONNAPALMFLAME_FLY2,
S_CYBRAKDEMONNAPALMFLAME_FLY3,
S_CYBRAKDEMONNAPALMFLAME_FLY4,
S_CYBRAKDEMONNAPALMFLAME_FLY5,
S_CYBRAKDEMONNAPALMFLAME_FLY6,
S_CYBRAKDEMONNAPALMFLAME_DIE,
S_CYBRAKDEMONVILEEXPLOSION1,
S_CYBRAKDEMONVILEEXPLOSION2,
S_CYBRAKDEMONVILEEXPLOSION3,
// Metal Sonic (Race)
* Improve the Metal Sonic recording/playback system. * Make the skin to record with Metal rather than Flesh Sonic. (Allowed even if not unlocked!) * Make the object that plays back the recording actually use the Metal skin, rather than just a seperate spriteset. (The boss will still need the spriteset, though.) * Actively record the player's sprite2, frame, and followmobj, just like regular ghosts do. * Disable dashmode while recording, for a fairer race. * Fix a probably long-standing bug where, while recording, being "hurt" would get Metal stuck in pain frames until they physically left the area of hurt. * Always start Metal recording in wait frames for bonus taunting. Other relevant changes: * Increment DEMOVERSION *again*. * Improve the Record Attack ghost followmobj recording to accomodate Metal's jet. * Increase the datatype width of spritenum_t read/write for Record Attack ghosts because SUGOI 4: Back With A Revengance will probably also use more than 255 sprites alone. * Return to standing frames (or prolong them if you're in them, rather than going to wait frames) if the player rotates on the spot with enough force. * This was specifically done *for* Metal recording, but I decided it looked good enough to enable all the time.
2019-10-28 22:12:47 +00:00
S_METALSONIC_RACE,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Metal Sonic (Battle)
S_METALSONIC_FLOAT,
S_METALSONIC_VECTOR,
S_METALSONIC_STUN,
S_METALSONIC_RAISE,
S_METALSONIC_GATHER,
S_METALSONIC_DASH,
S_METALSONIC_BOUNCE,
bad bounce https://gfycat.com/DeliciousReliableGentoopenguin
2017-02-13 18:04:08 +00:00
S_METALSONIC_BADBOUNCE,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_METALSONIC_SHOOT,
S_METALSONIC_PAIN,
Revert "Revert "Merge branch 'metalfixes' into 'toast_cleanup'"" This reverts commit c04b560e9260ae1f57834cd2e68e3f3bfca19c18.
2019-07-02 23:58:02 +00:00
S_METALSONIC_DEATH1,
S_METALSONIC_DEATH2,
S_METALSONIC_DEATH3,
S_METALSONIC_DEATH4,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_METALSONIC_FLEE1,
S_METALSONIC_FLEE2,
S_MSSHIELD_F1,
S_MSSHIELD_F2,
// Ring
backport state-animations from internal master to public next most other code in the branch did not come along for the ride.
2016-02-09 10:39:16 +00:00
S_RING,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Blue Sphere for special stages
MONSTER COMMIT. OLD SPECIAL STAGES: * Spheres in old special stages instead of rings! * Individual timers in old special stages instead of a global one! * Old special stages use a variant of the NiGHTS HUD now! * Special stage damage in old special stages loses 5 seconds of time instead of 10 rings/spheres! * All damage gained through old special stages is converted to special stage damage! As a consequence, the special spikeball has no need to be special anymore. * Made emerald gaining function be based on special stage number rather than gained emeralds! * Consistency with... NiGHTS SPECIAL STAGES: * Spheres now flash in bonus time. https://cdn.discordapp.com/attachments/400761370800422922/452590553100713984/srb20032.gif * Sphere and ring mapthingnums are now less fucked up in 'em. (Rings are 300, same as usual, while Spheres are now 1706 replacing NiGHTS Wings.) SPECIAL STAGES IN GENERAL: * useNightsSS is now dead. Each individual special stage is now assessed for NiGHTS-mode behaviour based on maptol & TOL_NIGHTS. * CRAWLA HONCHO\n CAN NOW BE\n SUPER CRAWLA HONCHO end tally modification now also includes a mini-tutorial on turning super. https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif * SONIC GOT A CHAOS EMERALD? https://cdn.discordapp.com/attachments/400761370800422922/452623869497573386/srb20034.gif NiGHTS NON-SPECIAL STAGES: * Colour Chips and Star Chips! Replaces Spheres and Rings of NiGHTS Special Stages. * Colour Chips turn yellow in bonus time. * Ideya! * Its own "drowning" music! * All of the object types for Dream Hill. * GIF: https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif RANDOM BS: * Turn super with the spin button instead of the jump button! * Followmobj now correctly set with P_SetTarget instead of pointer assignment. * Emerald hunt uses new sprites! * Made unlock noise different from emblem gain noise! (It's the CRAWLA HONCHO CAN NOW TURN yadda yadda sound from S3K now.)
2018-06-03 21:41:54 +00:00
S_BLUESPHERE,
S_BLUESPHEREBONUS,
S_BLUESPHERESPARK,
Bit of a random one today, but the branch approaches completion... * Bomb sphere! Paraloopable hazard. Replaces MT_SPECIALSPIKEBALL. * Blueberry bushes, both normal and Xmas, from patch.dta. * BSZ tulips, also from patch.dta! * Frozen Hillside badniks - Penguinator and Pophat. * Frozen Hillside ice decoration! * Fixed some big bugs with the DSZ light beams. * Made multi-mare special stages work, in a troll way - the Chaos Emerald disappears in a puff of smoke, and the Spinbobert laughter sound plays... >:3c * Reverted the mobjtype number changes from the source SOC/Lua, which we can do later when doing a final pass of the levels. * State optimisation. * Serious cruft-removal of the NiGHTS drone thinker. * Fix the issues where the player wouldn't curl into jump in waterslides or dropping off rope-hangs. * Tweak NiGHTS player flashing. * Add text colour support to the titlecard font. * Use that to make the PRESS SPIN\nMID-JUMP thing when you get all Chaos Emeralds use the titlecard font for readability. * Fix the GOT ALL EMERALDS page not lasting the correct, extended amount of time. * Fix that thing where flying mid-spin didn't enact autobrake. * Modify graymap a little on Sryder's suggestion. * [COMPLETELY UNRELATED] fix that thing where the addons menu will fail on files/paths with spaces in [/COMPLETELY UNRELATED]
2018-06-05 16:22:28 +00:00
// Bomb Sphere
S_BOMBSPHERE1,
S_BOMBSPHERE2,
S_BOMBSPHERE3,
S_BOMBSPHERE4,
MONSTER COMMIT. OLD SPECIAL STAGES: * Spheres in old special stages instead of rings! * Individual timers in old special stages instead of a global one! * Old special stages use a variant of the NiGHTS HUD now! * Special stage damage in old special stages loses 5 seconds of time instead of 10 rings/spheres! * All damage gained through old special stages is converted to special stage damage! As a consequence, the special spikeball has no need to be special anymore. * Made emerald gaining function be based on special stage number rather than gained emeralds! * Consistency with... NiGHTS SPECIAL STAGES: * Spheres now flash in bonus time. https://cdn.discordapp.com/attachments/400761370800422922/452590553100713984/srb20032.gif * Sphere and ring mapthingnums are now less fucked up in 'em. (Rings are 300, same as usual, while Spheres are now 1706 replacing NiGHTS Wings.) SPECIAL STAGES IN GENERAL: * useNightsSS is now dead. Each individual special stage is now assessed for NiGHTS-mode behaviour based on maptol & TOL_NIGHTS. * CRAWLA HONCHO\n CAN NOW BE\n SUPER CRAWLA HONCHO end tally modification now also includes a mini-tutorial on turning super. https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif * SONIC GOT A CHAOS EMERALD? https://cdn.discordapp.com/attachments/400761370800422922/452623869497573386/srb20034.gif NiGHTS NON-SPECIAL STAGES: * Colour Chips and Star Chips! Replaces Spheres and Rings of NiGHTS Special Stages. * Colour Chips turn yellow in bonus time. * Ideya! * Its own "drowning" music! * All of the object types for Dream Hill. * GIF: https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif RANDOM BS: * Turn super with the spin button instead of the jump button! * Followmobj now correctly set with P_SetTarget instead of pointer assignment. * Emerald hunt uses new sprites! * Made unlock noise different from emblem gain noise! (It's the CRAWLA HONCHO CAN NOW TURN yadda yadda sound from S3K now.)
2018-06-03 21:41:54 +00:00
// NiGHTS Chip
S_NIGHTSCHIP,
S_NIGHTSCHIPBONUS,
// NiGHTS Star
S_NIGHTSSTAR,
S_NIGHTSSTARXMAS,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Gravity Wells for special stages
S_GRAVWELLGREEN,
S_GRAVWELLRED,
// Individual Team Rings
backport state-animations from internal master to public next most other code in the branch did not come along for the ride.
2016-02-09 10:39:16 +00:00
S_TEAMRING,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Special Stage Token
S_TOKEN,
// CTF Flags
S_REDFLAG,
S_BLUEFLAG,
// Emblem
S_EMBLEM1,
S_EMBLEM2,
S_EMBLEM3,
S_EMBLEM4,
S_EMBLEM5,
S_EMBLEM6,
S_EMBLEM7,
S_EMBLEM8,
S_EMBLEM9,
S_EMBLEM10,
S_EMBLEM11,
S_EMBLEM12,
S_EMBLEM13,
S_EMBLEM14,
S_EMBLEM15,
S_EMBLEM16,
S_EMBLEM17,
S_EMBLEM18,
S_EMBLEM19,
S_EMBLEM20,
S_EMBLEM21,
S_EMBLEM22,
S_EMBLEM23,
S_EMBLEM24,
S_EMBLEM25,
S_EMBLEM26,
// Chaos Emeralds
S_CEMG1,
S_CEMG2,
S_CEMG3,
S_CEMG4,
S_CEMG5,
S_CEMG6,
S_CEMG7,
MONSTER COMMIT. OLD SPECIAL STAGES: * Spheres in old special stages instead of rings! * Individual timers in old special stages instead of a global one! * Old special stages use a variant of the NiGHTS HUD now! * Special stage damage in old special stages loses 5 seconds of time instead of 10 rings/spheres! * All damage gained through old special stages is converted to special stage damage! As a consequence, the special spikeball has no need to be special anymore. * Made emerald gaining function be based on special stage number rather than gained emeralds! * Consistency with... NiGHTS SPECIAL STAGES: * Spheres now flash in bonus time. https://cdn.discordapp.com/attachments/400761370800422922/452590553100713984/srb20032.gif * Sphere and ring mapthingnums are now less fucked up in 'em. (Rings are 300, same as usual, while Spheres are now 1706 replacing NiGHTS Wings.) SPECIAL STAGES IN GENERAL: * useNightsSS is now dead. Each individual special stage is now assessed for NiGHTS-mode behaviour based on maptol & TOL_NIGHTS. * CRAWLA HONCHO\n CAN NOW BE\n SUPER CRAWLA HONCHO end tally modification now also includes a mini-tutorial on turning super. https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif * SONIC GOT A CHAOS EMERALD? https://cdn.discordapp.com/attachments/400761370800422922/452623869497573386/srb20034.gif NiGHTS NON-SPECIAL STAGES: * Colour Chips and Star Chips! Replaces Spheres and Rings of NiGHTS Special Stages. * Colour Chips turn yellow in bonus time. * Ideya! * Its own "drowning" music! * All of the object types for Dream Hill. * GIF: https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif RANDOM BS: * Turn super with the spin button instead of the jump button! * Followmobj now correctly set with P_SetTarget instead of pointer assignment. * Emerald hunt uses new sprites! * Made unlock noise different from emblem gain noise! (It's the CRAWLA HONCHO CAN NOW TURN yadda yadda sound from S3K now.)
2018-06-03 21:41:54 +00:00
// Emerald hunt shards
S_SHRD1,
S_SHRD2,
S_SHRD3,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Bubble Source
S_BUBBLES1,
S_BUBBLES2,
Changes to bubbles for new DSZ + bubble sprites (needs new patch.dta).
2016-09-24 16:15:42 +00:00
S_BUBBLES3,
S_BUBBLES4,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Level End Sign
New end-of-level signpost logic
2019-11-04 08:28:44 +00:00
S_SIGN,
Display Eggman more frequently during skin roulette
2019-11-04 17:33:09 +00:00
S_SIGNSPIN1,
S_SIGNSPIN2,
S_SIGNSPIN3,
S_SIGNSPIN4,
S_SIGNSPIN5,
S_SIGNSPIN6,
New end-of-level signpost logic
2019-11-04 08:28:44 +00:00
S_SIGNPLAYER,
Improve A_SignSpin
2019-11-04 15:10:13 +00:00
S_SIGNSLOW,
S_SIGNSTOP,
New end-of-level signpost logic
2019-11-04 08:28:44 +00:00
S_SIGNBOARD,
S_EGGMANSIGN,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Spike Ball
S_SPIKEBALL1,
S_SPIKEBALL2,
S_SPIKEBALL3,
S_SPIKEBALL4,
S_SPIKEBALL5,
S_SPIKEBALL6,
S_SPIKEBALL7,
S_SPIKEBALL8,
Elemental shield ability now coded. REQUIRES NEW PATCH.DTA FROM THE FTP. - Press spin in midair to stomp directly downwards (losing horizontal momentum), creating a flickering fireball around you. - No bouncing on enemies, item boxes, etc - just go straight through. - Hurts other players on touch whilst you're stomping. - Spawns a bunch of flames around you when you hit the ground. Also: - Electric shield's ability now uses different sounds, because I'm picky.
2016-07-08 20:55:17 +00:00
// Elemental Shield's Spawn
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_SPINFIRE1,
S_SPINFIRE2,
S_SPINFIRE3,
S_SPINFIRE4,
S_SPINFIRE5,
S_SPINFIRE6,
// Spikes
S_SPIKE1,
S_SPIKE2,
S_SPIKE3,
S_SPIKE4,
S_SPIKE5,
S_SPIKE6,
S_SPIKED1,
S_SPIKED2,
Starting work for hardcoding wall spikes
2017-07-13 21:42:08 +00:00
// Wall spikes
S_WALLSPIKE1,
S_WALLSPIKE2,
S_WALLSPIKE3,
S_WALLSPIKE4,
S_WALLSPIKE5,
S_WALLSPIKE6,
S_WALLSPIKEBASE,
* Bustable wallspikes. * Improve the code for busting vertical spikes. * Improve the frame arrangement for vertical spikes' spriteset. (Requires new patch.dta) * Make all spikes consistently do damage with DMG_SPIKE. * (unrelated) renamed "flame stomp" to "elemental stomp" in P_HitDeathMessages
2017-07-18 13:17:10 +00:00
S_WALLSPIKED1,
S_WALLSPIKED2,
Starting work for hardcoding wall spikes
2017-07-13 21:42:08 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Starpost
backport state-animations from internal master to public next most other code in the branch did not come along for the ride.
2016-02-09 10:39:16 +00:00
S_STARPOST_IDLE,
S_STARPOST_FLASH,
* ALMOST SORTA IMPLEMENTED A NON-HACKY SPINNING FLAMEJET. For some reason, they wanna step down onto the platform - and I've been figuring this out for too long to see what's causing that tonight. * Hardcoded a bunch of stuff from patch.dta. All works fine, but still more to do.
2017-01-21 01:09:39 +00:00
S_STARPOST_STARTSPIN,
backport state-animations from internal master to public next most other code in the branch did not come along for the ride.
2016-02-09 10:39:16 +00:00
S_STARPOST_SPIN,
* ALMOST SORTA IMPLEMENTED A NON-HACKY SPINNING FLAMEJET. For some reason, they wanna step down onto the platform - and I've been figuring this out for too long to see what's causing that tonight. * Hardcoded a bunch of stuff from patch.dta. All works fine, but still more to do.
2017-01-21 01:09:39 +00:00
S_STARPOST_ENDSPIN,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Big floating mine
* Billiards mines! With support for both above and below water, replacing both the below-and-above-water old mines at once. * Explosion executors. * Minor refactor of P_KillMobj.
2018-04-26 19:18:51 +00:00
S_BIGMINE_IDLE,
S_BIGMINE_ALERT1,
S_BIGMINE_ALERT2,
S_BIGMINE_ALERT3,
S_BIGMINE_SET1,
S_BIGMINE_SET2,
S_BIGMINE_SET3,
S_BIGMINE_BLAST1,
S_BIGMINE_BLAST2,
S_BIGMINE_BLAST3,
S_BIGMINE_BLAST4,
S_BIGMINE_BLAST5,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Cannon Launcher
S_CANNONLAUNCHER1,
S_CANNONLAUNCHER2,
S_CANNONLAUNCHER3,
rewrite of monitors to accomodate repeat use monitors. It's a lot nicer in general, honestly. I think a couple bugs with custom monitors respawning got fixed in the process. Note that a monitorgfx.wad is needed if you want to see things besides <!>s for monitors, due to graphic changes.
2015-12-31 16:38:23 +00:00
// Monitor Miscellany
S_BOXSPARKLE1,
S_BOXSPARKLE2,
S_BOXSPARKLE3,
A lot! * cv_powerupdisplay. Never, First-person only (default), Always. * New monitor stuff. * Fixed hitmessages. * Some CTF stuff. * Aaaaugh it's a lot I hate myself I need to work on my coursework. * I'll figure out what I did here in the merge request when that's done.
2018-03-26 22:53:09 +00:00
S_BOXSPARKLE4,
rewrite of monitors to accomodate repeat use monitors. It's a lot nicer in general, honestly. I think a couple bugs with custom monitors respawning got fixed in the process. Note that a monitorgfx.wad is needed if you want to see things besides <!>s for monitors, due to graphic changes.
2015-12-31 16:38:23 +00:00
S_BOX_FLICKER,
S_BOX_POP1,
S_BOX_POP2,
Big monitors are "Gold Monitors" now. The useless ones have been removed, too, and they should always spawn as what they should regardless of settings. By the way, graphics are at https://dl.dropboxusercontent.com/u/3518218/22/monitorgfx.wad
2015-12-31 23:29:08 +00:00
S_GOLDBOX_FLICKER,
S_GOLDBOX_OFF1,
S_GOLDBOX_OFF2,
S_GOLDBOX_OFF3,
S_GOLDBOX_OFF4,
S_GOLDBOX_OFF5,
S_GOLDBOX_OFF6,
S_GOLDBOX_OFF7,
rewrite of monitors to accomodate repeat use monitors. It's a lot nicer in general, honestly. I think a couple bugs with custom monitors respawning got fixed in the process. Note that a monitorgfx.wad is needed if you want to see things besides <!>s for monitors, due to graphic changes.
2015-12-31 16:38:23 +00:00
// Monitor States (one per box)
S_MYSTERY_BOX,
S_RING_BOX,
S_PITY_BOX,
S_ATTRACT_BOX,
S_FORCE_BOX,
S_ARMAGEDDON_BOX,
S_WHIRLWIND_BOX,
S_ELEMENTAL_BOX,
S_SNEAKERS_BOX,
S_INVULN_BOX,
S_1UP_BOX,
S_EGGMAN_BOX,
S_MIXUP_BOX,
S_GRAVITY_BOX,
S_RECYCLER_BOX,
S_SCORE1K_BOX,
S_SCORE10K_BOX,
Sonic 3 shields implemented at a basic visual/functional level - no abilities yet.
2016-10-13 14:13:33 +00:00
S_FLAMEAURA_BOX,
S_BUBBLEWRAP_BOX,
S_THUNDERCOIN_BOX,
rewrite of monitors to accomodate repeat use monitors. It's a lot nicer in general, honestly. I think a couple bugs with custom monitors respawning got fixed in the process. Note that a monitorgfx.wad is needed if you want to see things besides <!>s for monitors, due to graphic changes.
2015-12-31 16:38:23 +00:00
Big monitors are "Gold Monitors" now. The useless ones have been removed, too, and they should always spawn as what they should regardless of settings. By the way, graphics are at https://dl.dropboxusercontent.com/u/3518218/22/monitorgfx.wad
2015-12-31 23:29:08 +00:00
// Gold Repeat Monitor States (one per box)
S_PITY_GOLDBOX,
S_ATTRACT_GOLDBOX,
S_FORCE_GOLDBOX,
S_ARMAGEDDON_GOLDBOX,
S_WHIRLWIND_GOLDBOX,
S_ELEMENTAL_GOLDBOX,
S_SNEAKERS_GOLDBOX,
S_INVULN_GOLDBOX,
Fixed sprite conflict BS Also added the eggman goldbox back
2016-09-30 02:24:05 +00:00
S_EGGMAN_GOLDBOX,
Big monitors are "Gold Monitors" now. The useless ones have been removed, too, and they should always spawn as what they should regardless of settings. By the way, graphics are at https://dl.dropboxusercontent.com/u/3518218/22/monitorgfx.wad
2015-12-31 23:29:08 +00:00
S_GRAVITY_GOLDBOX,
Sonic 3 shields implemented at a basic visual/functional level - no abilities yet.
2016-10-13 14:13:33 +00:00
S_FLAMEAURA_GOLDBOX,
S_BUBBLEWRAP_GOLDBOX,
S_THUNDERCOIN_GOLDBOX,
rewrite of monitors to accomodate repeat use monitors. It's a lot nicer in general, honestly. I think a couple bugs with custom monitors respawning got fixed in the process. Note that a monitorgfx.wad is needed if you want to see things besides <!>s for monitors, due to graphic changes.
2015-12-31 16:38:23 +00:00
// Team Ring Boxes (these are special)
S_RING_REDBOX1,
S_RING_REDBOX2,
S_REDBOX_POP1,
S_REDBOX_POP2,
S_RING_BLUEBOX1,
S_RING_BLUEBOX2,
S_BLUEBOX_POP1,
S_BLUEBOX_POP2,
animate icons using FF_ANIMATE (this also means they last one second again, and the powerup is given after 1/2 a second, things which were lost when the flip was added)
2016-09-26 03:55:08 +00:00
// Box Icons -- 2 states each, animation and action
rewrite of monitors to accomodate repeat use monitors. It's a lot nicer in general, honestly. I think a couple bugs with custom monitors respawning got fixed in the process. Note that a monitorgfx.wad is needed if you want to see things besides <!>s for monitors, due to graphic changes.
2015-12-31 16:38:23 +00:00
S_RING_ICON1,
S_RING_ICON2,
S_PITY_ICON1,
S_PITY_ICON2,
S_ATTRACT_ICON1,
S_ATTRACT_ICON2,
S_FORCE_ICON1,
S_FORCE_ICON2,
S_ARMAGEDDON_ICON1,
S_ARMAGEDDON_ICON2,
S_WHIRLWIND_ICON1,
S_WHIRLWIND_ICON2,
S_ELEMENTAL_ICON1,
S_ELEMENTAL_ICON2,
S_SNEAKERS_ICON1,
S_SNEAKERS_ICON2,
S_INVULN_ICON1,
S_INVULN_ICON2,
S_1UP_ICON1,
S_1UP_ICON2,
S_EGGMAN_ICON1,
S_EGGMAN_ICON2,
S_MIXUP_ICON1,
S_MIXUP_ICON2,
S_GRAVITY_ICON1,
S_GRAVITY_ICON2,
S_RECYCLER_ICON1,
S_RECYCLER_ICON2,
S_SCORE1K_ICON1,
S_SCORE1K_ICON2,
S_SCORE10K_ICON1,
S_SCORE10K_ICON2,
Sonic 3 shields implemented at a basic visual/functional level - no abilities yet.
2016-10-13 14:13:33 +00:00
S_FLAMEAURA_ICON1,
S_FLAMEAURA_ICON2,
S_BUBBLEWRAP_ICON1,
S_BUBBLEWRAP_ICON2,
S_THUNDERCOIN_ICON1,
S_THUNDERCOIN_ICON2,
rewrite of monitors to accomodate repeat use monitors. It's a lot nicer in general, honestly. I think a couple bugs with custom monitors respawning got fixed in the process. Note that a monitorgfx.wad is needed if you want to see things besides <!>s for monitors, due to graphic changes.
2015-12-31 16:38:23 +00:00
// ---
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_ROCKET,
S_LASER,
S_TORPEDO,
S_ENERGYBALL1,
S_ENERGYBALL2,
// Skim Mine, also used by Jetty-Syn bomber
S_MINE1,
S_MINE_BOOM1,
S_MINE_BOOM2,
S_MINE_BOOM3,
S_MINE_BOOM4,
// Jetty-Syn Bullet
S_JETBULLET1,
S_JETBULLET2,
S_TURRETLASER,
S_TURRETLASEREXPLODE1,
S_TURRETLASEREXPLODE2,
// Cannonball
S_CANNONBALL1,
// Arrow
S_ARROW,
New CEZ hardcoding done!! * Better Robo Hood arrows. * Shield break animation for Egg Guard. (Temporary state slot so I don't have to compile from scratch until I do something more complicated later.) * Suspicious Facestabber Statue animates a little before bursting open. * Fix Facestabber radius. * Fix some stuff in Flicky functions that could be overwritten in Lua call actions by mistake.
2018-05-31 20:00:12 +00:00
S_ARROWBONK,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
WIP new states for Glaregoyle
2019-10-30 16:32:19 +00:00
// Glaregoyle Demon fire
Bit of a random one today, but the branch approaches completion... * Bomb sphere! Paraloopable hazard. Replaces MT_SPECIALSPIKEBALL. * Blueberry bushes, both normal and Xmas, from patch.dta. * BSZ tulips, also from patch.dta! * Frozen Hillside badniks - Penguinator and Pophat. * Frozen Hillside ice decoration! * Fixed some big bugs with the DSZ light beams. * Made multi-mare special stages work, in a troll way - the Chaos Emerald disappears in a puff of smoke, and the Spinbobert laughter sound plays... >:3c * Reverted the mobjtype number changes from the source SOC/Lua, which we can do later when doing a final pass of the levels. * State optimisation. * Serious cruft-removal of the NiGHTS drone thinker. * Fix the issues where the player wouldn't curl into jump in waterslides or dropping off rope-hangs. * Tweak NiGHTS player flashing. * Add text colour support to the titlecard font. * Use that to make the PRESS SPIN\nMID-JUMP thing when you get all Chaos Emeralds use the titlecard font for readability. * Fix the GOT ALL EMERALDS page not lasting the correct, extended amount of time. * Fix that thing where flying mid-spin didn't enact autobrake. * Modify graymap a little on Sryder's suggestion. * [COMPLETELY UNRELATED] fix that thing where the addons menu will fail on files/paths with spaces in [/COMPLETELY UNRELATED]
2018-06-05 16:22:28 +00:00
S_DEMONFIRE,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Secret stuff. (I intend to keep candid discussion of this outside of any commits; you'll see me write up a comment describing what's going on here soon.)
2019-11-01 15:48:50 +00:00
// The letter
S_LETTER,
Hardcoded SOC_TREE from patch.dta Also made sure the GFZ trees have MF2_STANDONME
2017-07-13 16:29:15 +00:00
// GFZ flowers
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_GFZFLOWERA,
* ALMOST SORTA IMPLEMENTED A NON-HACKY SPINNING FLAMEJET. For some reason, they wanna step down onto the platform - and I've been figuring this out for too long to see what's causing that tonight. * Hardcoded a bunch of stuff from patch.dta. All works fine, but still more to do.
2017-01-21 01:09:39 +00:00
S_GFZFLOWERB,
S_GFZFLOWERC,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Bit of a random one today, but the branch approaches completion... * Bomb sphere! Paraloopable hazard. Replaces MT_SPECIALSPIKEBALL. * Blueberry bushes, both normal and Xmas, from patch.dta. * BSZ tulips, also from patch.dta! * Frozen Hillside badniks - Penguinator and Pophat. * Frozen Hillside ice decoration! * Fixed some big bugs with the DSZ light beams. * Made multi-mare special stages work, in a troll way - the Chaos Emerald disappears in a puff of smoke, and the Spinbobert laughter sound plays... >:3c * Reverted the mobjtype number changes from the source SOC/Lua, which we can do later when doing a final pass of the levels. * State optimisation. * Serious cruft-removal of the NiGHTS drone thinker. * Fix the issues where the player wouldn't curl into jump in waterslides or dropping off rope-hangs. * Tweak NiGHTS player flashing. * Add text colour support to the titlecard font. * Use that to make the PRESS SPIN\nMID-JUMP thing when you get all Chaos Emeralds use the titlecard font for readability. * Fix the GOT ALL EMERALDS page not lasting the correct, extended amount of time. * Fix that thing where flying mid-spin didn't enact autobrake. * Modify graymap a little on Sryder's suggestion. * [COMPLETELY UNRELATED] fix that thing where the addons menu will fail on files/paths with spaces in [/COMPLETELY UNRELATED]
2018-06-05 16:22:28 +00:00
S_BLUEBERRYBUSH,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_BERRYBUSH,
S_BUSH,
Hardcoded SOC_TREE from patch.dta Also made sure the GFZ trees have MF2_STANDONME
2017-07-13 16:29:15 +00:00
// Trees (both GFZ and misc)
S_GFZTREE,
S_GFZBERRYTREE,
S_GFZCHERRYTREE,
S_CHECKERTREE,
S_CHECKERSUNSETTREE,
S_FHZTREE, // Frozen Hillside
S_FHZPINKTREE,
S_POLYGONTREE,
S_BUSHTREE,
S_BUSHREDTREE,
MONSTER COMMIT. OLD SPECIAL STAGES: * Spheres in old special stages instead of rings! * Individual timers in old special stages instead of a global one! * Old special stages use a variant of the NiGHTS HUD now! * Special stage damage in old special stages loses 5 seconds of time instead of 10 rings/spheres! * All damage gained through old special stages is converted to special stage damage! As a consequence, the special spikeball has no need to be special anymore. * Made emerald gaining function be based on special stage number rather than gained emeralds! * Consistency with... NiGHTS SPECIAL STAGES: * Spheres now flash in bonus time. https://cdn.discordapp.com/attachments/400761370800422922/452590553100713984/srb20032.gif * Sphere and ring mapthingnums are now less fucked up in 'em. (Rings are 300, same as usual, while Spheres are now 1706 replacing NiGHTS Wings.) SPECIAL STAGES IN GENERAL: * useNightsSS is now dead. Each individual special stage is now assessed for NiGHTS-mode behaviour based on maptol & TOL_NIGHTS. * CRAWLA HONCHO\n CAN NOW BE\n SUPER CRAWLA HONCHO end tally modification now also includes a mini-tutorial on turning super. https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif * SONIC GOT A CHAOS EMERALD? https://cdn.discordapp.com/attachments/400761370800422922/452623869497573386/srb20034.gif NiGHTS NON-SPECIAL STAGES: * Colour Chips and Star Chips! Replaces Spheres and Rings of NiGHTS Special Stages. * Colour Chips turn yellow in bonus time. * Ideya! * Its own "drowning" music! * All of the object types for Dream Hill. * GIF: https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif RANDOM BS: * Turn super with the spin button instead of the jump button! * Followmobj now correctly set with P_SetTarget instead of pointer assignment. * Emerald hunt uses new sprites! * Made unlock noise different from emblem gain noise! (It's the CRAWLA HONCHO CAN NOW TURN yadda yadda sound from S3K now.)
2018-06-03 21:41:54 +00:00
S_SPRINGTREE,
Hardcoded SOC_TREE from patch.dta Also made sure the GFZ trees have MF2_STANDONME
2017-07-13 16:29:15 +00:00
Hardcoded SOC_FWR6 from THZ1.wad, also tweaked MT_THZFLOWERB's hitbox
2018-01-19 17:56:18 +00:00
// THZ flowers
S_THZFLOWERA, // THZ1 Steam flower
S_THZFLOWERB, // THZ1 Spin flower (red)
S_THZFLOWERC, // THZ1 Spin flower (yellow)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Hardcoded LUA_THZT from THZ1.wad, giving us the funny-looking steam whistle tree This concludes hardcoding of scenery items for THZ
2018-01-22 18:41:14 +00:00
// THZ Steam Whistle tree/bush
S_THZTREE,
S_THZTREEBRANCH1,
S_THZTREEBRANCH2,
S_THZTREEBRANCH3,
S_THZTREEBRANCH4,
S_THZTREEBRANCH5,
S_THZTREEBRANCH6,
S_THZTREEBRANCH7,
S_THZTREEBRANCH8,
S_THZTREEBRANCH9,
S_THZTREEBRANCH10,
S_THZTREEBRANCH11,
S_THZTREEBRANCH12,
S_THZTREEBRANCH13,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// THZ Alarm
S_ALARM1,
// Deep Sea Gargoyle
S_GARGOYLE,
Hardcoded the big gargoyle
2017-04-18 19:38:13 +00:00
S_BIGGARGOYLE,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// DSZ Seaweed
S_SEAWEED1,
S_SEAWEED2,
S_SEAWEED3,
S_SEAWEED4,
S_SEAWEED5,
S_SEAWEED6,
// Dripping Water
S_DRIPA1,
S_DRIPA2,
S_DRIPA3,
S_DRIPA4,
S_DRIPB1,
S_DRIPC1,
S_DRIPC2,
Small DSZ coral tweaks.
2019-09-19 22:51:44 +00:00
// Coral
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_CORAL1,
S_CORAL2,
S_CORAL3,
Small DSZ coral tweaks.
2019-09-19 22:51:44 +00:00
S_CORAL4,
S_CORAL5,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Blue Crystal
S_BLUECRYSTAL1,
The contents of DSZ-f16.wad's LUA_A000 Lua script are in now Thing type numbers may be changed later
2017-12-08 18:26:32 +00:00
// Kelp,
S_KELP,
New animated DSZ kelp.
2019-09-18 00:05:19 +00:00
// Animated algae
S_ANIMALGAETOP1,
S_ANIMALGAETOP2,
S_ANIMALGAESEG,
The contents of DSZ-f16.wad's LUA_A000 Lua script are in now Thing type numbers may be changed later
2017-12-08 18:26:32 +00:00
// DSZ Stalagmites
S_DSZSTALAGMITE,
S_DSZ2STALAGMITE,
// DSZ Light beam
S_LIGHTBEAM1,
S_LIGHTBEAM2,
S_LIGHTBEAM3,
S_LIGHTBEAM4,
S_LIGHTBEAM5,
S_LIGHTBEAM6,
S_LIGHTBEAM7,
S_LIGHTBEAM8,
S_LIGHTBEAM9,
S_LIGHTBEAM10,
S_LIGHTBEAM11,
S_LIGHTBEAM12,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// CEZ Chain
S_CEZCHAIN,
// Flame
* CEZ decorations! * Moved a bunch of stuff that had no business being in mapthing spawns into mobj spawns.
2018-05-22 10:04:28 +00:00
S_FLAME,
CEZ1 flames now implemented. Please note Brak flames use a FF_ANIMATE state instead of the normal flame ones because they are spammed a lot, and the normal ones make particles.
2017-01-21 12:39:41 +00:00
S_FLAMEPARTICLE,
S_FLAMEREST,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Eggman Statue
S_EGGSTATUE1,
// CEZ hidden sling
S_SLING1,
S_SLING2,
Hooh boy. **** * MF2_MACEROTATE. Apply to any object. Replaces the indiscriminate spamming of A_MaceRotate each tic. **** * Mace point mapthings have been slightly modified. - MTF_AMBUSH: bigger luke theory (has no effect on custom mace, different effect on spring mace) - MTF_OBJECTFLIP: flips the objects, but nothing else - just so it doesn't look out of place in gravflip sections - MTF_OBJECTSPECIAL: keeps it from attempting to play swinging sounds - angle: tag of controlling linedef - parameter: number of "spokes" minus one - for example, a parameter of 2 results in 3 equidistant maces rotating around the same point. **** * Mace linedefs have been significantly revamped. - line dx: number of chain links - line dy: speed (in FU) - frontside floor height: Pitch (in degrees; how much it "tilts" over - Yaw influences the axis it's tilting on) - frontside ceiling height: Yaw (in degrees; rotation of entire thing on xy plane) - frontside x offset: Phase (in degrees; how far it is through the rotation cycle) - frontside y offset: Max speed (in FU; if less than speed, set to speed*2) - backside floor height: Pinch (in degrees; 0 if no backside; essentially makes rotation conical instead of wheel-like) - backside ceiling height: Roll (in degrees; 0 if no backside; rotates on the axis of the spinning - identical to Phase for spinning maces, but useful for rotating swinging maces as opposed to just offsetting them) - backside x offset: Number of "antispokes" (0 if no backside; makes that many spokes not exist so you can put another mace/chain type in there instead; for combo mace/chain instead turns them into chains directly) - backside y offset: Width (in number of extra chains per side; 0 if no backside; creates a "skiprope" arrangement) ---- - ML_NOCLIMB: for chains and chain-mace combos, allow for player control of yaw through strafe keys - ML_EFFECT1: replacing the seperate mapthings, this makes a mace type swing instead of spin. - ML_EFFECT2: for all spokes of the mace wheel ending in maces, make the chains out of the mace type (inverted for firebars) - ML_EFFECT3: spawn a bonus mace type at the center(s) of rotation - ML_EFFECT4: don't clip inside ground **** * Mapthing 1104 represents both spinning and swinging maces from prior versions of SRB2. * Mapthing 1105 has gone from being a swinging mace variant to a combination of chains and maces in a single unit, provided the number of "spokes" is greater than one. * Mapthing 1105 has gone from being a swinging chain variant to a vertical spring-on-a-ball-on-a-chain. Yellow by default, apply MTF_AMBUSH to turn into a red spring. * Mapthing 1107 represents both spinning and swinging chains from prior versions of SRB2. * Mapthing 1108 is completely untouched except to port over 2.1's functionality to the new backend. * Mapthing 1109 is a Mario castle-level style firebar. This inverts the functionality of ML_EFFECT2 on the tagged linedef. * Mapthing 1110 is a free slot should we want to implement another type of base-game mace. * Mapthing 1111 is a custom mace. Use the linedef's frontside texture slots to identify a macetype mobjtype, then use the backside texture slots to identify a linktype mobjtype (defaults to MT_NULL if no backside). **** Whooh. Requires new patch.dta for sprites.
2017-07-02 14:11:09 +00:00
// CEZ maces and chains
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_SMALLMACECHAIN,
S_BIGMACECHAIN,
S_SMALLMACE,
S_BIGMACE,
* Castlebot Facestabbers. * Facestabber statues, of both the suspicious and non-suspicious kind. * New object type for the end of grabbable chains. * I moved my compilation .bat file to my Releases folder, so it should .gitignore .bat's. * Random extra stuff.
2018-05-24 00:40:57 +00:00
S_SMALLGRABCHAIN,
S_BIGGRABCHAIN,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Hooh boy. **** * MF2_MACEROTATE. Apply to any object. Replaces the indiscriminate spamming of A_MaceRotate each tic. **** * Mace point mapthings have been slightly modified. - MTF_AMBUSH: bigger luke theory (has no effect on custom mace, different effect on spring mace) - MTF_OBJECTFLIP: flips the objects, but nothing else - just so it doesn't look out of place in gravflip sections - MTF_OBJECTSPECIAL: keeps it from attempting to play swinging sounds - angle: tag of controlling linedef - parameter: number of "spokes" minus one - for example, a parameter of 2 results in 3 equidistant maces rotating around the same point. **** * Mace linedefs have been significantly revamped. - line dx: number of chain links - line dy: speed (in FU) - frontside floor height: Pitch (in degrees; how much it "tilts" over - Yaw influences the axis it's tilting on) - frontside ceiling height: Yaw (in degrees; rotation of entire thing on xy plane) - frontside x offset: Phase (in degrees; how far it is through the rotation cycle) - frontside y offset: Max speed (in FU; if less than speed, set to speed*2) - backside floor height: Pinch (in degrees; 0 if no backside; essentially makes rotation conical instead of wheel-like) - backside ceiling height: Roll (in degrees; 0 if no backside; rotates on the axis of the spinning - identical to Phase for spinning maces, but useful for rotating swinging maces as opposed to just offsetting them) - backside x offset: Number of "antispokes" (0 if no backside; makes that many spokes not exist so you can put another mace/chain type in there instead; for combo mace/chain instead turns them into chains directly) - backside y offset: Width (in number of extra chains per side; 0 if no backside; creates a "skiprope" arrangement) ---- - ML_NOCLIMB: for chains and chain-mace combos, allow for player control of yaw through strafe keys - ML_EFFECT1: replacing the seperate mapthings, this makes a mace type swing instead of spin. - ML_EFFECT2: for all spokes of the mace wheel ending in maces, make the chains out of the mace type (inverted for firebars) - ML_EFFECT3: spawn a bonus mace type at the center(s) of rotation - ML_EFFECT4: don't clip inside ground **** * Mapthing 1104 represents both spinning and swinging maces from prior versions of SRB2. * Mapthing 1105 has gone from being a swinging mace variant to a combination of chains and maces in a single unit, provided the number of "spokes" is greater than one. * Mapthing 1105 has gone from being a swinging chain variant to a vertical spring-on-a-ball-on-a-chain. Yellow by default, apply MTF_AMBUSH to turn into a red spring. * Mapthing 1107 represents both spinning and swinging chains from prior versions of SRB2. * Mapthing 1108 is completely untouched except to port over 2.1's functionality to the new backend. * Mapthing 1109 is a Mario castle-level style firebar. This inverts the functionality of ML_EFFECT2 on the tagged linedef. * Mapthing 1110 is a free slot should we want to implement another type of base-game mace. * Mapthing 1111 is a custom mace. Use the linedef's frontside texture slots to identify a macetype mobjtype, then use the backside texture slots to identify a linktype mobjtype (defaults to MT_NULL if no backside). **** Whooh. Requires new patch.dta for sprites.
2017-07-02 14:11:09 +00:00
// Yellow spring on a ball
S_YELLOWSPRINGBALL,
S_YELLOWSPRINGBALL2,
S_YELLOWSPRINGBALL3,
S_YELLOWSPRINGBALL4,
S_YELLOWSPRINGBALL5,
// Red spring on a ball
S_REDSPRINGBALL,
S_REDSPRINGBALL2,
S_REDSPRINGBALL3,
S_REDSPRINGBALL4,
S_REDSPRINGBALL5,
// Small Firebar
S_SMALLFIREBAR1,
S_SMALLFIREBAR2,
S_SMALLFIREBAR3,
S_SMALLFIREBAR4,
S_SMALLFIREBAR5,
S_SMALLFIREBAR6,
S_SMALLFIREBAR7,
S_SMALLFIREBAR8,
S_SMALLFIREBAR9,
S_SMALLFIREBAR10,
S_SMALLFIREBAR11,
S_SMALLFIREBAR12,
S_SMALLFIREBAR13,
S_SMALLFIREBAR14,
S_SMALLFIREBAR15,
S_SMALLFIREBAR16,
// Big Firebar
S_BIGFIREBAR1,
S_BIGFIREBAR2,
S_BIGFIREBAR3,
S_BIGFIREBAR4,
S_BIGFIREBAR5,
S_BIGFIREBAR6,
S_BIGFIREBAR7,
S_BIGFIREBAR8,
S_BIGFIREBAR9,
S_BIGFIREBAR10,
S_BIGFIREBAR11,
S_BIGFIREBAR12,
S_BIGFIREBAR13,
S_BIGFIREBAR14,
S_BIGFIREBAR15,
S_BIGFIREBAR16,
* CEZ decorations! * Moved a bunch of stuff that had no business being in mapthing spawns into mobj spawns.
2018-05-22 10:04:28 +00:00
S_CEZFLOWER,
S_CEZPOLE,
Add a blue variant of the pole banner & change some doomednums.
2019-07-14 15:30:33 +00:00
S_CEZBANNER1,
S_CEZBANNER2,
* CEZ decorations! * Moved a bunch of stuff that had no business being in mapthing spawns into mobj spawns.
2018-05-22 10:04:28 +00:00
S_PINETREE,
S_CEZBUSH1,
S_CEZBUSH2,
S_CANDLE,
S_CANDLEPRICKET,
S_FLAMEHOLDER,
S_FIRETORCH,
S_WAVINGFLAG,
Add a blue variant of the waving flags.
2019-07-14 14:50:45 +00:00
S_WAVINGFLAGSEG1,
S_WAVINGFLAGSEG2,
* CEZ decorations! * Moved a bunch of stuff that had no business being in mapthing spawns into mobj spawns.
2018-05-22 10:04:28 +00:00
S_CRAWLASTATUE,
* Castlebot Facestabbers. * Facestabber statues, of both the suspicious and non-suspicious kind. * New object type for the end of grabbable chains. * I moved my compilation .bat file to my Releases folder, so it should .gitignore .bat's. * Random extra stuff.
2018-05-24 00:40:57 +00:00
S_FACESTABBERSTATUE,
S_SUSPICIOUSFACESTABBERSTATUE_WAIT,
S_SUSPICIOUSFACESTABBERSTATUE_BURST1,
S_SUSPICIOUSFACESTABBERSTATUE_BURST2,
Hardcoded Brambles.lua from CEZRes.pk3, changed thing type to 1125
2018-08-22 16:16:11 +00:00
S_BRAMBLES,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Big Tumbleweed
S_BIGTUMBLEWEED,
S_BIGTUMBLEWEED_ROLL1,
S_BIGTUMBLEWEED_ROLL2,
S_BIGTUMBLEWEED_ROLL3,
S_BIGTUMBLEWEED_ROLL4,
S_BIGTUMBLEWEED_ROLL5,
S_BIGTUMBLEWEED_ROLL6,
S_BIGTUMBLEWEED_ROLL7,
S_BIGTUMBLEWEED_ROLL8,
// Little Tumbleweed
S_LITTLETUMBLEWEED,
S_LITTLETUMBLEWEED_ROLL1,
S_LITTLETUMBLEWEED_ROLL2,
S_LITTLETUMBLEWEED_ROLL3,
S_LITTLETUMBLEWEED_ROLL4,
S_LITTLETUMBLEWEED_ROLL5,
S_LITTLETUMBLEWEED_ROLL6,
S_LITTLETUMBLEWEED_ROLL7,
S_LITTLETUMBLEWEED_ROLL8,
Updated ACZ cacti.
2019-09-18 19:40:33 +00:00
// Cacti
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_CACTI1,
S_CACTI2,
S_CACTI3,
S_CACTI4,
Hardcode some ACZ things
2019-05-12 02:56:23 +00:00
S_CACTI5,
S_CACTI6,
S_CACTI7,
S_CACTI8,
S_CACTI9,
More harmful cactus
2019-09-13 01:36:13 +00:00
S_CACTI10,
S_CACTI11,
Updated ACZ cacti.
2019-09-18 19:40:33 +00:00
S_CACTITINYSEG,
S_CACTISMALLSEG,
Hardcode some ACZ things
2019-05-12 02:56:23 +00:00
Updated ACZ cacti.
2019-09-18 19:40:33 +00:00
// Warning signs
Hardcode some ACZ things
2019-05-12 02:56:23 +00:00
S_ARIDSIGN_CAUTION,
S_ARIDSIGN_CACTI,
S_ARIDSIGN_SHARPTURN,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Hardcoded oil lamp
2019-06-08 13:50:01 +00:00
// Oil lamp
S_OILLAMP,
S_OILLAMPFLARE,
Hardcoded the TNT barrels and proximity shell (using mazmazz's A_TNTExplode implementation from the minecart branch)
2019-06-09 08:51:33 +00:00
// TNT barrel
S_TNTBARREL_STND1,
S_TNTBARREL_EXPL1,
S_TNTBARREL_EXPL2,
S_TNTBARREL_EXPL3,
S_TNTBARREL_EXPL4,
S_TNTBARREL_EXPL5,
S_TNTBARREL_EXPL6,
S_TNTBARREL_FLYING,
// TNT proximity shell
S_PROXIMITY_TNT,
S_PROXIMITY_TNT_TRIGGER1,
S_PROXIMITY_TNT_TRIGGER2,
S_PROXIMITY_TNT_TRIGGER3,
S_PROXIMITY_TNT_TRIGGER4,
S_PROXIMITY_TNT_TRIGGER5,
S_PROXIMITY_TNT_TRIGGER6,
S_PROXIMITY_TNT_TRIGGER7,
S_PROXIMITY_TNT_TRIGGER8,
S_PROXIMITY_TNT_TRIGGER9,
S_PROXIMITY_TNT_TRIGGER10,
S_PROXIMITY_TNT_TRIGGER11,
S_PROXIMITY_TNT_TRIGGER12,
S_PROXIMITY_TNT_TRIGGER13,
S_PROXIMITY_TNT_TRIGGER14,
S_PROXIMITY_TNT_TRIGGER15,
S_PROXIMITY_TNT_TRIGGER16,
S_PROXIMITY_TNT_TRIGGER17,
S_PROXIMITY_TNT_TRIGGER18,
S_PROXIMITY_TNT_TRIGGER19,
S_PROXIMITY_TNT_TRIGGER20,
S_PROXIMITY_TNT_TRIGGER21,
S_PROXIMITY_TNT_TRIGGER22,
S_PROXIMITY_TNT_TRIGGER23,
Hardcoded oil lamp
2019-06-08 13:50:01 +00:00
// Dust devil
Hardcoded dust devil
2019-06-08 07:51:46 +00:00
S_DUSTDEVIL,
S_DUSTLAYER1,
S_DUSTLAYER2,
S_DUSTLAYER3,
S_DUSTLAYER4,
S_DUSTLAYER5,
S_ARIDDUST1,
S_ARIDDUST2,
S_ARIDDUST3,
More incomplete minecart hardcoding
2019-06-13 19:45:30 +00:00
// Minecart
S_MINECART_IDLE,
S_MINECART_DTH1,
S_MINECARTEND,
S_MINECARTSEG_FRONT,
S_MINECARTSEG_BACK,
S_MINECARTSEG_LEFT,
S_MINECARTSEG_RIGHT,
S_MINECARTSIDEMARK1,
S_MINECARTSIDEMARK2,
S_MINECARTSPARK,
Hardcoded the saloon door
2019-06-12 19:20:14 +00:00
// Saloon door
S_SALOONDOOR,
Fix Saloon doors. * Make the center be the object stuff collides with, so that if the door is open people can't slip through. * Add an MF_AMBUSH enhancement to allow non-minecart players to travel through. * Make A_SaloonDoorSpawn more customisable. (var1 = object type, var2 = distance sides should be placed apart)
2019-10-05 12:21:35 +00:00
S_SALOONDOORCENTER,
Hardcoded the saloon door
2019-06-12 19:20:14 +00:00
Hardcoded train cameo
2019-06-09 11:48:07 +00:00
// Train cameo
S_TRAINCAMEOSPAWNER_1,
S_TRAINCAMEOSPAWNER_2,
S_TRAINCAMEOSPAWNER_3,
S_TRAINCAMEOSPAWNER_4,
S_TRAINCAMEOSPAWNER_5,
S_TRAINPUFFMAKER,
Hardcoded train dust and steam spawner
2019-06-09 15:16:07 +00:00
// Train
S_TRAINDUST,
S_TRAINSTEAM,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Flame jet
S_FLAMEJETSTND,
S_FLAMEJETSTART,
S_FLAMEJETSTOP,
S_FLAMEJETFLAME1,
S_FLAMEJETFLAME2,
S_FLAMEJETFLAME3,
* New object types! * Red and yellow Boost panels! * Added because SUBARASHII and KIMOKAWAIII had several levels using them, and I wanted to make them look better. * https://cdn.discordapp.com/attachments/359091121789468672/634486669202161674/srb20015.gif * Uses the mapthingnums of Glaber's SOC resource boosters, but absolutely nothing else - not even the magnitudes. * Apply MF_AMBUSH to force the player into a spin - even if they don't have a spin ability! * Banpyura! * A Crushstacean with a spring instead of a crushclaw. * https://cdn.discordapp.com/attachments/428262628893261828/634432099306176512/srb20019.gif * Wanted this for a while, finally added it. * Improved springs. * Add pw_noautobrake to disable autobrake for half a second when touching yellow horizontal springs, and a second when touching red ones, even on the ground. * Add pw_justsprung to disable directionchar for a few tics while touching any springs with a horizontal component to their velocity. * Add the diagonal spring flag options Red and Yellow Diagonal Springs have to the Blue Diagonal Spring as well. * Started but decided against a tip of the hat to the CD spring spin, hidden behind #define SPRINGSPIN. * Make directionchar "lag behind" a little bit in waterslides. * Improved flame jets. * They now use new sprites for having their flames move upwards and sideways, instead of having them always face downwards like in 2.1! * Fixed a mixed declaration and code error in A_RolloutRock. (Sorry Lach!) * Make the Amy Cameo only spawn in SP, Record Attack, or Co-op unless it's the Clone Mode. * Improved ZB config. * Add above new types. * Add Blue Diagonal Spring, which existed in the source but not the config. * Re-order enemies in ZB config by zone (but keep them in the Enemies section only).
2019-10-17 20:50:26 +00:00
S_FLAMEJETFLAME4,
S_FLAMEJETFLAME5,
S_FLAMEJETFLAME6,
S_FLAMEJETFLAME7,
S_FLAMEJETFLAME8,
S_FLAMEJETFLAME9,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Spinning flame jets
S_FJSPINAXISA1, // Counter-clockwise
S_FJSPINAXISA2,
S_FJSPINAXISB1, // Clockwise
S_FJSPINAXISB2,
// Blade's flame
S_FLAMEJETFLAMEB1,
S_FLAMEJETFLAMEB2,
S_FLAMEJETFLAMEB3,
Hardcoded the lavafall
2019-08-25 21:05:38 +00:00
// Lavafall
S_LAVAFALL_DORMANT,
S_LAVAFALL_TELL,
S_LAVAFALL_SHOOT,
S_LAVAFALL_LAVA1,
S_LAVAFALL_LAVA2,
S_LAVAFALL_LAVA3,
Simplified the lavafall rock states with FF_RANDOMANIM, fixed Var1 for the FF_ANIMATE states
2019-08-27 17:33:54 +00:00
S_LAVAFALLROCK,
Hardcoded the lavafall
2019-08-25 21:05:38 +00:00
Hardcode pumice ball Current known issues: players detached from the ball via any means other than jumping or pain do not have their ball reset properly
2019-09-29 12:18:40 +00:00
// Rollout Rock
S_ROLLOUTSPAWN,
S_ROLLOUTROCK,
Hardcoded the RVZ scenery
2019-08-25 10:40:32 +00:00
// RVZ scenery
S_BIGFERNLEAF,
S_BIGFERN1,
S_BIGFERN2,
S_JUNGLEPALM,
S_TORCHFLOWER,
S_WALLVINE_LONG,
S_WALLVINE_SHORT,
WIP new states for Glaregoyle
2019-10-30 16:32:19 +00:00
// Glaregoyles
S_GLAREGOYLE,
Finish Glaregoyle states
2019-10-31 11:18:44 +00:00
S_GLAREGOYLE_CHARGE,
S_GLAREGOYLE_BLINK,
S_GLAREGOYLE_HOLD,
WIP new states for Glaregoyle
2019-10-30 16:32:19 +00:00
S_GLAREGOYLE_FIRE,
S_GLAREGOYLE_LOOP,
S_GLAREGOYLE_COOLDOWN,
S_GLAREGOYLEUP,
Finish Glaregoyle states
2019-10-31 11:18:44 +00:00
S_GLAREGOYLEUP_CHARGE,
S_GLAREGOYLEUP_BLINK,
S_GLAREGOYLEUP_HOLD,
S_GLAREGOYLEUP_FIRE,
S_GLAREGOYLEUP_LOOP,
S_GLAREGOYLEUP_COOLDOWN,
WIP new states for Glaregoyle
2019-10-30 16:32:19 +00:00
S_GLAREGOYLEDOWN,
Finish Glaregoyle states
2019-10-31 11:18:44 +00:00
S_GLAREGOYLEDOWN_CHARGE,
S_GLAREGOYLEDOWN_BLINK,
S_GLAREGOYLEDOWN_HOLD,
S_GLAREGOYLEDOWN_FIRE,
S_GLAREGOYLEDOWN_LOOP,
S_GLAREGOYLEDOWN_COOLDOWN,
WIP new states for Glaregoyle
2019-10-30 16:32:19 +00:00
S_GLAREGOYLELONG,
Finish Glaregoyle states
2019-10-31 11:18:44 +00:00
S_GLAREGOYLELONG_CHARGE,
S_GLAREGOYLELONG_BLINK,
S_GLAREGOYLELONG_HOLD,
S_GLAREGOYLELONG_FIRE,
S_GLAREGOYLELONG_LOOP,
S_GLAREGOYLELONG_COOLDOWN,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// ATZ's Red Crystal/Target
S_TARGET_IDLE,
S_TARGET_HIT1,
S_TARGET_HIT2,
S_TARGET_RESPAWN,
S_TARGET_ALLDONE,
Add green flame sprites, state, and object
2019-10-21 08:22:20 +00:00
// ATZ's green flame
S_GREENFLAME,
Add static ATZ Gargoyles
2019-10-31 11:38:28 +00:00
// ATZ Blue Gargoyle
S_BLUEGARGOYLE,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Stalagmites
S_STG0,
S_STG1,
S_STG2,
S_STG3,
S_STG4,
S_STG5,
S_STG6,
S_STG7,
S_STG8,
S_STG9,
// Xmas-specific stuff
S_XMASPOLE,
S_CANDYCANE,
Hardcode new/updated xmas scenery object type/state info
2017-04-18 17:32:52 +00:00
S_SNOWMAN, // normal
S_SNOWMANHAT, // with hat + scarf
S_LAMPPOST1, // normal
S_LAMPPOST2, // with snow
S_HANGSTAR,
Amy cameo for Frozen Hillside. Wait for the MR, I'll make a fuller pitch there...
2019-10-01 17:19:37 +00:00
S_MISTLETOE,
Hardcode new/updated xmas scenery object type/state info
2017-04-18 17:32:52 +00:00
// Xmas GFZ bushes
Bit of a random one today, but the branch approaches completion... * Bomb sphere! Paraloopable hazard. Replaces MT_SPECIALSPIKEBALL. * Blueberry bushes, both normal and Xmas, from patch.dta. * BSZ tulips, also from patch.dta! * Frozen Hillside badniks - Penguinator and Pophat. * Frozen Hillside ice decoration! * Fixed some big bugs with the DSZ light beams. * Made multi-mare special stages work, in a troll way - the Chaos Emerald disappears in a puff of smoke, and the Spinbobert laughter sound plays... >:3c * Reverted the mobjtype number changes from the source SOC/Lua, which we can do later when doing a final pass of the levels. * State optimisation. * Serious cruft-removal of the NiGHTS drone thinker. * Fix the issues where the player wouldn't curl into jump in waterslides or dropping off rope-hangs. * Tweak NiGHTS player flashing. * Add text colour support to the titlecard font. * Use that to make the PRESS SPIN\nMID-JUMP thing when you get all Chaos Emeralds use the titlecard font for readability. * Fix the GOT ALL EMERALDS page not lasting the correct, extended amount of time. * Fix that thing where flying mid-spin didn't enact autobrake. * Modify graymap a little on Sryder's suggestion. * [COMPLETELY UNRELATED] fix that thing where the addons menu will fail on files/paths with spaces in [/COMPLETELY UNRELATED]
2018-06-05 16:22:28 +00:00
S_XMASBLUEBERRYBUSH,
Hardcode new/updated xmas scenery object type/state info
2017-04-18 17:32:52 +00:00
S_XMASBERRYBUSH,
S_XMASBUSH,
Bit of a random one today, but the branch approaches completion... * Bomb sphere! Paraloopable hazard. Replaces MT_SPECIALSPIKEBALL. * Blueberry bushes, both normal and Xmas, from patch.dta. * BSZ tulips, also from patch.dta! * Frozen Hillside badniks - Penguinator and Pophat. * Frozen Hillside ice decoration! * Fixed some big bugs with the DSZ light beams. * Made multi-mare special stages work, in a troll way - the Chaos Emerald disappears in a puff of smoke, and the Spinbobert laughter sound plays... >:3c * Reverted the mobjtype number changes from the source SOC/Lua, which we can do later when doing a final pass of the levels. * State optimisation. * Serious cruft-removal of the NiGHTS drone thinker. * Fix the issues where the player wouldn't curl into jump in waterslides or dropping off rope-hangs. * Tweak NiGHTS player flashing. * Add text colour support to the titlecard font. * Use that to make the PRESS SPIN\nMID-JUMP thing when you get all Chaos Emeralds use the titlecard font for readability. * Fix the GOT ALL EMERALDS page not lasting the correct, extended amount of time. * Fix that thing where flying mid-spin didn't enact autobrake. * Modify graymap a little on Sryder's suggestion. * [COMPLETELY UNRELATED] fix that thing where the addons menu will fail on files/paths with spaces in [/COMPLETELY UNRELATED]
2018-06-05 16:22:28 +00:00
// FHZ
S_FHZICE1,
S_FHZICE2,
Amy cameo for Frozen Hillside. Wait for the MR, I'll make a fuller pitch there...
2019-10-01 17:19:37 +00:00
S_ROSY_IDLE1,
S_ROSY_IDLE2,
S_ROSY_IDLE3,
S_ROSY_IDLE4,
S_ROSY_JUMP,
S_ROSY_WALK,
S_ROSY_HUG,
S_ROSY_PAIN,
S_ROSY_STND,
S_ROSY_UNHAPPY,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
* Haunted Heights! Smashing spikeball, Cacolantern, Spinbobert and Hangster, along with the Spider and Bat flickies and general decoration/ambience stuff. * MF_PAIN and MF_MISSILE now support setting damagetype via their Mass parameter. The two existing conflicts - the fuse setting for the grenade weapon ring and the Cybrakdemon napalm bomb - had these moved to other free parameters. * A_ConnectToGround is EXTREMELY useful for palmtrees and stuff. * Some other, relatively hacky A_ functions. * (Unrelated) Remove the need for a "Mario block mode" for the token by making it natively compatible. * Spikes and their time-offsetting via that Lua script sphere made. Also allow for wallspikes to do it via their angle/360.
2018-04-28 14:13:44 +00:00
// Halloween Scenery
// Pumpkins
S_JACKO1,
S_JACKO1OVERLAY_1,
S_JACKO1OVERLAY_2,
S_JACKO1OVERLAY_3,
S_JACKO1OVERLAY_4,
S_JACKO2,
S_JACKO2OVERLAY_1,
S_JACKO2OVERLAY_2,
S_JACKO2OVERLAY_3,
S_JACKO2OVERLAY_4,
S_JACKO3,
S_JACKO3OVERLAY_1,
S_JACKO3OVERLAY_2,
S_JACKO3OVERLAY_3,
S_JACKO3OVERLAY_4,
// Dr Seuss Trees
S_HHZTREE_TOP,
S_HHZTREE_TRUNK,
S_HHZTREE_LEAF,
// Mushroom
S_HHZSHROOM_1,
S_HHZSHROOM_2,
S_HHZSHROOM_3,
S_HHZSHROOM_4,
S_HHZSHROOM_5,
S_HHZSHROOM_6,
S_HHZSHROOM_7,
S_HHZSHROOM_8,
S_HHZSHROOM_9,
S_HHZSHROOM_10,
S_HHZSHROOM_11,
S_HHZSHROOM_12,
S_HHZSHROOM_13,
S_HHZSHROOM_14,
S_HHZSHROOM_15,
S_HHZSHROOM_16,
// Misc
S_HHZGRASS,
S_HHZTENT1,
S_HHZTENT2,
S_HHZSTALAGMITE_TALL,
S_HHZSTALAGMITE_SHORT,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Botanic Serenity's loads of scenery states
S_BSZTALLFLOWER_RED,
S_BSZTALLFLOWER_PURPLE,
S_BSZTALLFLOWER_BLUE,
S_BSZTALLFLOWER_CYAN,
S_BSZTALLFLOWER_YELLOW,
S_BSZTALLFLOWER_ORANGE,
S_BSZFLOWER_RED,
S_BSZFLOWER_PURPLE,
S_BSZFLOWER_BLUE,
S_BSZFLOWER_CYAN,
S_BSZFLOWER_YELLOW,
S_BSZFLOWER_ORANGE,
S_BSZSHORTFLOWER_RED,
S_BSZSHORTFLOWER_PURPLE,
S_BSZSHORTFLOWER_BLUE,
S_BSZSHORTFLOWER_CYAN,
S_BSZSHORTFLOWER_YELLOW,
S_BSZSHORTFLOWER_ORANGE,
S_BSZTULIP_RED,
S_BSZTULIP_PURPLE,
S_BSZTULIP_BLUE,
S_BSZTULIP_CYAN,
S_BSZTULIP_YELLOW,
S_BSZTULIP_ORANGE,
S_BSZCLUSTER_RED,
S_BSZCLUSTER_PURPLE,
S_BSZCLUSTER_BLUE,
S_BSZCLUSTER_CYAN,
S_BSZCLUSTER_YELLOW,
S_BSZCLUSTER_ORANGE,
S_BSZBUSH_RED,
S_BSZBUSH_PURPLE,
S_BSZBUSH_BLUE,
S_BSZBUSH_CYAN,
S_BSZBUSH_YELLOW,
S_BSZBUSH_ORANGE,
S_BSZVINE_RED,
S_BSZVINE_PURPLE,
S_BSZVINE_BLUE,
S_BSZVINE_CYAN,
S_BSZVINE_YELLOW,
S_BSZVINE_ORANGE,
S_BSZSHRUB,
S_BSZCLOVER,
De-meming.
2017-01-25 14:52:36 +00:00
S_BIG_PALMTREE_TRUNK,
S_BIG_PALMTREE_TOP,
S_PALMTREE_TRUNK,
S_PALMTREE_TOP,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_DBALL1,
S_DBALL2,
S_DBALL3,
S_DBALL4,
S_DBALL5,
S_DBALL6,
S_EGGSTATUE2,
// Shield Orb
S_ARMA1,
S_ARMA2,
S_ARMA3,
S_ARMA4,
S_ARMA5,
S_ARMA6,
S_ARMA7,
S_ARMA8,
S_ARMA9,
S_ARMA10,
S_ARMA11,
S_ARMA12,
S_ARMA13,
S_ARMA14,
S_ARMA15,
S_ARMA16,
S_ARMF1,
S_ARMF2,
S_ARMF3,
S_ARMF4,
S_ARMF5,
S_ARMF6,
S_ARMF7,
S_ARMF8,
S_ARMF9,
S_ARMF10,
S_ARMF11,
S_ARMF12,
S_ARMF13,
S_ARMF14,
S_ARMF15,
S_ARMF16,
* Make Tokens appear in competition. * Tweak thrown ring colours. * Make Armageddon shield loop properly. * Tweak drowning numbers to be consistent between third and first person.
2018-03-30 20:49:15 +00:00
S_ARMF17,
S_ARMF18,
S_ARMF19,
S_ARMF20,
S_ARMF21,
S_ARMF22,
S_ARMF23,
S_ARMF24,
S_ARMF25,
S_ARMF26,
S_ARMF27,
S_ARMF28,
S_ARMF29,
S_ARMF30,
S_ARMF31,
S_ARMF32,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_ARMB1,
S_ARMB2,
S_ARMB3,
S_ARMB4,
S_ARMB5,
S_ARMB6,
S_ARMB7,
S_ARMB8,
S_ARMB9,
S_ARMB10,
S_ARMB11,
S_ARMB12,
S_ARMB13,
S_ARMB14,
S_ARMB15,
S_ARMB16,
* Make Tokens appear in competition. * Tweak thrown ring colours. * Make Armageddon shield loop properly. * Tweak drowning numbers to be consistent between third and first person.
2018-03-30 20:49:15 +00:00
S_ARMB17,
S_ARMB18,
S_ARMB19,
S_ARMB20,
S_ARMB21,
S_ARMB22,
S_ARMB23,
S_ARMB24,
S_ARMB25,
S_ARMB26,
S_ARMB27,
S_ARMB28,
S_ARMB29,
S_ARMB30,
S_ARMB31,
S_ARMB32,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_WIND1,
S_WIND2,
S_WIND3,
S_WIND4,
S_WIND5,
S_WIND6,
S_WIND7,
S_WIND8,
S_MAGN1,
S_MAGN2,
S_MAGN3,
S_MAGN4,
S_MAGN5,
S_MAGN6,
S_MAGN7,
S_MAGN8,
S_MAGN9,
S_MAGN10,
S_MAGN11,
S_MAGN12,
New attract shield active Homing attack when activating the attract shield while jumping.
2015-05-27 09:24:31 +00:00
S_MAGN13,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_FORC1,
S_FORC2,
S_FORC3,
S_FORC4,
S_FORC5,
S_FORC6,
S_FORC7,
S_FORC8,
S_FORC9,
S_FORC10,
S_FORC11,
S_FORC12,
S_FORC13,
S_FORC14,
S_FORC15,
S_FORC16,
S_FORC17,
S_FORC18,
S_FORC19,
S_FORC20,
Minor refactor of what I did last night - as a modifiable state instead of hardcoded references.
2016-10-20 12:44:03 +00:00
S_FORC21,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_ELEM1,
S_ELEM2,
S_ELEM3,
S_ELEM4,
S_ELEM5,
S_ELEM6,
S_ELEM7,
S_ELEM8,
S_ELEM9,
S_ELEM10,
S_ELEM11,
S_ELEM12,
* Flameaura shield now has boosh sprites. * MF2_SHIELD calls shield thinker (P_AddShield/P_ShieldLook). * Multiple types of force shields now handled.
2016-10-23 19:34:43 +00:00
S_ELEM13,
S_ELEM14,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_ELEMF1,
S_ELEMF2,
S_ELEMF3,
S_ELEMF4,
S_ELEMF5,
S_ELEMF6,
S_ELEMF7,
S_ELEMF8,
Elemental shield ability now coded. REQUIRES NEW PATCH.DTA FROM THE FTP. - Press spin in midair to stomp directly downwards (losing horizontal momentum), creating a flickering fireball around you. - No bouncing on enemies, item boxes, etc - just go straight through. - Hurts other players on touch whilst you're stomping. - Spawns a bunch of flames around you when you hit the ground. Also: - Electric shield's ability now uses different sounds, because I'm picky.
2016-07-08 20:55:17 +00:00
S_ELEMF9,
S_ELEMF10,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_PITY1,
S_PITY2,
S_PITY3,
S_PITY4,
S_PITY5,
S_PITY6,
PITY IN PINK! * Smoothen Pity Shield animation to go with sphere's updates to Nev3r's sprites. * Added LHRT object, designed to be summoned with CA2_MELEE. * Gives a pink Pity Shield (SH_PINK) on same-team player contact. * Deals damage to non-player enemies. * Harmlessly fades into nothing when touching an enemy player, players with SH_PINK already, and players capable of applying SH_PINK to others (through non-Lua methods). * Basically, you-know-who is the Healer of the party whenever they're around. Fun consequences for the Co-op and CTF metas.
2019-06-19 22:20:24 +00:00
S_PITY7,
S_PITY8,
S_PITY9,
S_PITY10,
S_PITY11,
S_PITY12,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Sonic 3 shields implemented at a basic visual/functional level - no abilities yet.
2016-10-13 14:13:33 +00:00
S_FIRS1,
S_FIRS2,
S_FIRS3,
S_FIRS4,
S_FIRS5,
S_FIRS6,
S_FIRS7,
S_FIRS8,
S_FIRS9,
* Flameaura shield now has boosh sprites. * MF2_SHIELD calls shield thinker (P_AddShield/P_ShieldLook). * Multiple types of force shields now handled.
2016-10-23 19:34:43 +00:00
S_FIRS10,
S_FIRS11,
Sonic 3 shields implemented at a basic visual/functional level - no abilities yet.
2016-10-13 14:13:33 +00:00
S_FIRSB1,
S_FIRSB2,
S_FIRSB3,
S_FIRSB4,
S_FIRSB5,
S_FIRSB6,
S_FIRSB7,
S_FIRSB8,
S_FIRSB9,
* Flameaura shield now has boosh sprites. * MF2_SHIELD calls shield thinker (P_AddShield/P_ShieldLook). * Multiple types of force shields now handled.
2016-10-23 19:34:43 +00:00
S_FIRSB10,
Sonic 3 shields implemented at a basic visual/functional level - no abilities yet.
2016-10-13 14:13:33 +00:00
S_BUBS1,
S_BUBS2,
S_BUBS3,
S_BUBS4,
S_BUBS5,
S_BUBS6,
S_BUBS7,
S_BUBS8,
S_BUBS9,
BUBBLE BOUNCE ANIMATION
2016-10-17 19:39:22 +00:00
S_BUBS10,
S_BUBS11,
Sonic 3 shields implemented at a basic visual/functional level - no abilities yet.
2016-10-13 14:13:33 +00:00
S_BUBSB1,
S_BUBSB2,
* Some shield constants renamed. * Some shield sounds swapped (can be reverted later). * Partial implementation of S3K shield abilities. * The ability to elemental-groundpound onto gold monitors without going straight through them. * Force shield ability removed because nobody could agree on it, we'll keep it blank until another idea can get through the disagreement juggernaut.
2016-10-13 14:13:33 +00:00
S_BUBSB3,
S_BUBSB4,
Sonic 3 shields implemented at a basic visual/functional level - no abilities yet.
2016-10-13 14:13:33 +00:00
BUBBLE BOUNCE ANIMATION
2016-10-17 19:39:22 +00:00
S_BUBSB5,
S_BUBSB6,
Sonic 3 shields implemented at a basic visual/functional level - no abilities yet.
2016-10-13 14:13:33 +00:00
S_ZAPS1,
S_ZAPS2,
S_ZAPS3,
S_ZAPS4,
S_ZAPS5,
S_ZAPS6,
S_ZAPS7,
S_ZAPS8,
S_ZAPS9,
S_ZAPS10,
S_ZAPS11,
S_ZAPS12,
S_ZAPS13, // blank frame
S_ZAPS14,
S_ZAPS15,
S_ZAPS16,
S_ZAPSB1, // blank frame
S_ZAPSB2,
S_ZAPSB3,
S_ZAPSB4,
S_ZAPSB5,
S_ZAPSB6,
S_ZAPSB7,
S_ZAPSB8,
S_ZAPSB9,
S_ZAPSB10,
S_ZAPSB11, // blank frame
Thundercoin shield complete.
2016-10-17 22:22:04 +00:00
//Thunder spark
S_THUNDERCOIN_SPARK,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Invincibility Sparkles
backport state-animations from internal master to public next most other code in the branch did not come along for the ride.
2016-02-09 10:39:16 +00:00
S_IVSP,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Super Sonic Spark
S_SSPK1,
S_SSPK2,
S_SSPK3,
S_SSPK4,
S_SSPK5,
* Ported in all of the Flickies from flickiesreduced8.wad except for the Flicker and seed. * Fixed a crash bug in the Flicky fly function I introduced sleepily last night.
2016-12-31 16:55:06 +00:00
// Flicky-sized bubble
S_FLICKY_BUBBLE,
// Bluebird
S_FLICKY_01_OUT,
S_FLICKY_01_FLAP1,
S_FLICKY_01_FLAP2,
S_FLICKY_01_FLAP3,
Flicky stand states
2018-08-09 05:44:08 +00:00
S_FLICKY_01_STAND,
MT_FLICKY_x_CENTER defs
2018-08-09 16:08:06 +00:00
S_FLICKY_01_CENTER,
* Ported in all of the Flickies from flickiesreduced8.wad except for the Flicker and seed. * Fixed a crash bug in the Flicky fly function I introduced sleepily last night.
2016-12-31 16:55:06 +00:00
// Rabbit
S_FLICKY_02_OUT,
S_FLICKY_02_AIM,
S_FLICKY_02_HOP,
S_FLICKY_02_UP,
S_FLICKY_02_DOWN,
Flicky stand states
2018-08-09 05:44:08 +00:00
S_FLICKY_02_STAND,
MT_FLICKY_x_CENTER defs
2018-08-09 16:08:06 +00:00
S_FLICKY_02_CENTER,
* Ported in all of the Flickies from flickiesreduced8.wad except for the Flicker and seed. * Fixed a crash bug in the Flicky fly function I introduced sleepily last night.
2016-12-31 16:55:06 +00:00
// Chicken
S_FLICKY_03_OUT,
S_FLICKY_03_AIM,
S_FLICKY_03_HOP,
S_FLICKY_03_UP,
S_FLICKY_03_FLAP1,
S_FLICKY_03_FLAP2,
Flicky stand states
2018-08-09 05:44:08 +00:00
S_FLICKY_03_STAND,
MT_FLICKY_x_CENTER defs
2018-08-09 16:08:06 +00:00
S_FLICKY_03_CENTER,
* Ported in all of the Flickies from flickiesreduced8.wad except for the Flicker and seed. * Fixed a crash bug in the Flicky fly function I introduced sleepily last night.
2016-12-31 16:55:06 +00:00
// Seal
S_FLICKY_04_OUT,
S_FLICKY_04_AIM,
S_FLICKY_04_HOP,
S_FLICKY_04_UP,
S_FLICKY_04_DOWN,
S_FLICKY_04_SWIM1,
S_FLICKY_04_SWIM2,
S_FLICKY_04_SWIM3,
S_FLICKY_04_SWIM4,
Flicky stand states
2018-08-09 05:44:08 +00:00
S_FLICKY_04_STAND,
MT_FLICKY_x_CENTER defs
2018-08-09 16:08:06 +00:00
S_FLICKY_04_CENTER,
* Ported in all of the Flickies from flickiesreduced8.wad except for the Flicker and seed. * Fixed a crash bug in the Flicky fly function I introduced sleepily last night.
2016-12-31 16:55:06 +00:00
// Pig
S_FLICKY_05_OUT,
S_FLICKY_05_AIM,
S_FLICKY_05_HOP,
S_FLICKY_05_UP,
S_FLICKY_05_DOWN,
Flicky stand states
2018-08-09 05:44:08 +00:00
S_FLICKY_05_STAND,
MT_FLICKY_x_CENTER defs
2018-08-09 16:08:06 +00:00
S_FLICKY_05_CENTER,
* Ported in all of the Flickies from flickiesreduced8.wad except for the Flicker and seed. * Fixed a crash bug in the Flicky fly function I introduced sleepily last night.
2016-12-31 16:55:06 +00:00
// Chipmunk
S_FLICKY_06_OUT,
S_FLICKY_06_AIM,
S_FLICKY_06_HOP,
S_FLICKY_06_UP,
S_FLICKY_06_DOWN,
Flicky stand states
2018-08-09 05:44:08 +00:00
S_FLICKY_06_STAND,
MT_FLICKY_x_CENTER defs
2018-08-09 16:08:06 +00:00
S_FLICKY_06_CENTER,
* Ported in all of the Flickies from flickiesreduced8.wad except for the Flicker and seed. * Fixed a crash bug in the Flicky fly function I introduced sleepily last night.
2016-12-31 16:55:06 +00:00
// Penguin
S_FLICKY_07_OUT,
S_FLICKY_07_AIML,
S_FLICKY_07_HOPL,
S_FLICKY_07_UPL,
S_FLICKY_07_DOWNL,
S_FLICKY_07_AIMR,
S_FLICKY_07_HOPR,
S_FLICKY_07_UPR,
S_FLICKY_07_DOWNR,
S_FLICKY_07_SWIM1,
S_FLICKY_07_SWIM2,
S_FLICKY_07_SWIM3,
Flicky stand states
2018-08-09 05:44:08 +00:00
S_FLICKY_07_STAND,
MT_FLICKY_x_CENTER defs
2018-08-09 16:08:06 +00:00
S_FLICKY_07_CENTER,
* Ported in all of the Flickies from flickiesreduced8.wad except for the Flicker and seed. * Fixed a crash bug in the Flicky fly function I introduced sleepily last night.
2016-12-31 16:55:06 +00:00
// Fish
S_FLICKY_08_OUT,
S_FLICKY_08_AIM,
S_FLICKY_08_HOP,
S_FLICKY_08_FLAP1,
S_FLICKY_08_FLAP2,
S_FLICKY_08_FLAP3,
S_FLICKY_08_FLAP4,
S_FLICKY_08_SWIM1,
S_FLICKY_08_SWIM2,
S_FLICKY_08_SWIM3,
S_FLICKY_08_SWIM4,
Flicky stand states
2018-08-09 05:44:08 +00:00
S_FLICKY_08_STAND,
MT_FLICKY_x_CENTER defs
2018-08-09 16:08:06 +00:00
S_FLICKY_08_CENTER,
* Ported in all of the Flickies from flickiesreduced8.wad except for the Flicker and seed. * Fixed a crash bug in the Flicky fly function I introduced sleepily last night.
2016-12-31 16:55:06 +00:00
// Ram
S_FLICKY_09_OUT,
S_FLICKY_09_AIM,
S_FLICKY_09_HOP,
S_FLICKY_09_UP,
S_FLICKY_09_DOWN,
Flicky stand states
2018-08-09 05:44:08 +00:00
S_FLICKY_09_STAND,
MT_FLICKY_x_CENTER defs
2018-08-09 16:08:06 +00:00
S_FLICKY_09_CENTER,
* Ported in all of the Flickies from flickiesreduced8.wad except for the Flicker and seed. * Fixed a crash bug in the Flicky fly function I introduced sleepily last night.
2016-12-31 16:55:06 +00:00
// Puffin
S_FLICKY_10_OUT,
S_FLICKY_10_FLAP1,
S_FLICKY_10_FLAP2,
Flicky stand states
2018-08-09 05:44:08 +00:00
S_FLICKY_10_STAND,
MT_FLICKY_x_CENTER defs
2018-08-09 16:08:06 +00:00
S_FLICKY_10_CENTER,
* Ported in all of the Flickies from flickiesreduced8.wad except for the Flicker and seed. * Fixed a crash bug in the Flicky fly function I introduced sleepily last night.
2016-12-31 16:55:06 +00:00
// Cow
S_FLICKY_11_OUT,
S_FLICKY_11_AIM,
S_FLICKY_11_RUN1,
S_FLICKY_11_RUN2,
S_FLICKY_11_RUN3,
Flicky stand states
2018-08-09 05:44:08 +00:00
S_FLICKY_11_STAND,
MT_FLICKY_x_CENTER defs
2018-08-09 16:08:06 +00:00
S_FLICKY_11_CENTER,
* Ported in all of the Flickies from flickiesreduced8.wad except for the Flicker and seed. * Fixed a crash bug in the Flicky fly function I introduced sleepily last night.
2016-12-31 16:55:06 +00:00
// Rat
S_FLICKY_12_OUT,
S_FLICKY_12_AIM,
S_FLICKY_12_RUN1,
S_FLICKY_12_RUN2,
S_FLICKY_12_RUN3,
Flicky stand states
2018-08-09 05:44:08 +00:00
S_FLICKY_12_STAND,
MT_FLICKY_x_CENTER defs
2018-08-09 16:08:06 +00:00
S_FLICKY_12_CENTER,
* Ported in all of the Flickies from flickiesreduced8.wad except for the Flicker and seed. * Fixed a crash bug in the Flicky fly function I introduced sleepily last night.
2016-12-31 16:55:06 +00:00
// Bear
S_FLICKY_13_OUT,
S_FLICKY_13_AIM,
S_FLICKY_13_HOP,
S_FLICKY_13_UP,
S_FLICKY_13_DOWN,
Flicky stand states
2018-08-09 05:44:08 +00:00
S_FLICKY_13_STAND,
MT_FLICKY_x_CENTER defs
2018-08-09 16:08:06 +00:00
S_FLICKY_13_CENTER,
* Ported in all of the Flickies from flickiesreduced8.wad except for the Flicker and seed. * Fixed a crash bug in the Flicky fly function I introduced sleepily last night.
2016-12-31 16:55:06 +00:00
// Dove
S_FLICKY_14_OUT,
S_FLICKY_14_FLAP1,
S_FLICKY_14_FLAP2,
S_FLICKY_14_FLAP3,
Flicky stand states
2018-08-09 05:44:08 +00:00
S_FLICKY_14_STAND,
MT_FLICKY_x_CENTER defs
2018-08-09 16:08:06 +00:00
S_FLICKY_14_CENTER,
* Ported in all of the Flickies from flickiesreduced8.wad except for the Flicker and seed. * Fixed a crash bug in the Flicky fly function I introduced sleepily last night.
2016-12-31 16:55:06 +00:00
// Cat
S_FLICKY_15_OUT,
S_FLICKY_15_AIM,
S_FLICKY_15_HOP,
S_FLICKY_15_UP,
S_FLICKY_15_DOWN,
Flicky stand states
2018-08-09 05:44:08 +00:00
S_FLICKY_15_STAND,
MT_FLICKY_x_CENTER defs
2018-08-09 16:08:06 +00:00
S_FLICKY_15_CENTER,
* Ported in all of the Flickies from flickiesreduced8.wad except for the Flicker and seed. * Fixed a crash bug in the Flicky fly function I introduced sleepily last night.
2016-12-31 16:55:06 +00:00
// Canary
S_FLICKY_16_OUT,
S_FLICKY_16_FLAP1,
S_FLICKY_16_FLAP2,
S_FLICKY_16_FLAP3,
Flicky stand states
2018-08-09 05:44:08 +00:00
S_FLICKY_16_STAND,
MT_FLICKY_x_CENTER defs
2018-08-09 16:08:06 +00:00
S_FLICKY_16_CENTER,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
* Haunted Heights! Smashing spikeball, Cacolantern, Spinbobert and Hangster, along with the Spider and Bat flickies and general decoration/ambience stuff. * MF_PAIN and MF_MISSILE now support setting damagetype via their Mass parameter. The two existing conflicts - the fuse setting for the grenade weapon ring and the Cybrakdemon napalm bomb - had these moved to other free parameters. * A_ConnectToGround is EXTREMELY useful for palmtrees and stuff. * Some other, relatively hacky A_ functions. * (Unrelated) Remove the need for a "Mario block mode" for the token by making it natively compatible. * Spikes and their time-offsetting via that Lua script sphere made. Also allow for wallspikes to do it via their angle/360.
2018-04-28 14:13:44 +00:00
// Spider
S_SECRETFLICKY_01_OUT,
S_SECRETFLICKY_01_AIM,
S_SECRETFLICKY_01_HOP,
S_SECRETFLICKY_01_UP,
S_SECRETFLICKY_01_DOWN,
Flicky stand states
2018-08-09 05:44:08 +00:00
S_SECRETFLICKY_01_STAND,
MT_FLICKY_x_CENTER defs
2018-08-09 16:08:06 +00:00
S_SECRETFLICKY_01_CENTER,
* Haunted Heights! Smashing spikeball, Cacolantern, Spinbobert and Hangster, along with the Spider and Bat flickies and general decoration/ambience stuff. * MF_PAIN and MF_MISSILE now support setting damagetype via their Mass parameter. The two existing conflicts - the fuse setting for the grenade weapon ring and the Cybrakdemon napalm bomb - had these moved to other free parameters. * A_ConnectToGround is EXTREMELY useful for palmtrees and stuff. * Some other, relatively hacky A_ functions. * (Unrelated) Remove the need for a "Mario block mode" for the token by making it natively compatible. * Spikes and their time-offsetting via that Lua script sphere made. Also allow for wallspikes to do it via their angle/360.
2018-04-28 14:13:44 +00:00
// Bat
S_SECRETFLICKY_02_OUT,
S_SECRETFLICKY_02_FLAP1,
S_SECRETFLICKY_02_FLAP2,
S_SECRETFLICKY_02_FLAP3,
Flicky stand states
2018-08-09 05:44:08 +00:00
S_SECRETFLICKY_02_STAND,
MT_FLICKY_x_CENTER defs
2018-08-09 16:08:06 +00:00
S_SECRETFLICKY_02_CENTER,
* Haunted Heights! Smashing spikeball, Cacolantern, Spinbobert and Hangster, along with the Spider and Bat flickies and general decoration/ambience stuff. * MF_PAIN and MF_MISSILE now support setting damagetype via their Mass parameter. The two existing conflicts - the fuse setting for the grenade weapon ring and the Cybrakdemon napalm bomb - had these moved to other free parameters. * A_ConnectToGround is EXTREMELY useful for palmtrees and stuff. * Some other, relatively hacky A_ functions. * (Unrelated) Remove the need for a "Mario block mode" for the token by making it natively compatible. * Spikes and their time-offsetting via that Lua script sphere made. Also allow for wallspikes to do it via their angle/360.
2018-04-28 14:13:44 +00:00
* Bumpers and Balloons in a more final state. * Blue diagonal springs, because that gap is very, very odd. * Improved A_SpawnFreshCopy. * Tweaked P_LookForEnemies for consistency's sake. (Previously, it was impossible to make a spring that could neither be homing-attacked or attraction-shotted.)
2018-05-19 23:04:39 +00:00
// Fan
S_FAN,
S_FAN2,
S_FAN3,
S_FAN4,
S_FAN5,
// Steam Riser
S_STEAM1,
S_STEAM2,
S_STEAM3,
S_STEAM4,
S_STEAM5,
S_STEAM6,
S_STEAM7,
S_STEAM8,
// Bumpers
S_BUMPER,
S_BUMPERHIT,
// Balloons
S_BALLOON,
S_BALLOONPOP1,
S_BALLOONPOP2,
S_BALLOONPOP3,
S_BALLOONPOP4,
S_BALLOONPOP5,
S_BALLOONPOP6,
// Yellow Spring
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_YELLOWSPRING,
S_YELLOWSPRING2,
S_YELLOWSPRING3,
S_YELLOWSPRING4,
S_YELLOWSPRING5,
* Bumpers and Balloons in a more final state. * Blue diagonal springs, because that gap is very, very odd. * Improved A_SpawnFreshCopy. * Tweaked P_LookForEnemies for consistency's sake. (Previously, it was impossible to make a spring that could neither be homing-attacked or attraction-shotted.)
2018-05-19 23:04:39 +00:00
// Red Spring
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_REDSPRING,
S_REDSPRING2,
S_REDSPRING3,
S_REDSPRING4,
S_REDSPRING5,
* Bumpers and Balloons in a more final state. * Blue diagonal springs, because that gap is very, very odd. * Improved A_SpawnFreshCopy. * Tweaked P_LookForEnemies for consistency's sake. (Previously, it was impossible to make a spring that could neither be homing-attacked or attraction-shotted.)
2018-05-19 23:04:39 +00:00
// Blue Spring
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_BLUESPRING,
S_BLUESPRING2,
S_BLUESPRING3,
S_BLUESPRING4,
S_BLUESPRING5,
// Yellow Diagonal Spring
S_YDIAG1,
S_YDIAG2,
S_YDIAG3,
S_YDIAG4,
S_YDIAG5,
S_YDIAG6,
S_YDIAG7,
S_YDIAG8,
// Red Diagonal Spring
S_RDIAG1,
S_RDIAG2,
S_RDIAG3,
S_RDIAG4,
S_RDIAG5,
S_RDIAG6,
S_RDIAG7,
S_RDIAG8,
* Bumpers and Balloons in a more final state. * Blue diagonal springs, because that gap is very, very odd. * Improved A_SpawnFreshCopy. * Tweaked P_LookForEnemies for consistency's sake. (Previously, it was impossible to make a spring that could neither be homing-attacked or attraction-shotted.)
2018-05-19 23:04:39 +00:00
// Blue Diagonal Spring
S_BDIAG1,
S_BDIAG2,
S_BDIAG3,
S_BDIAG4,
S_BDIAG5,
S_BDIAG6,
S_BDIAG7,
S_BDIAG8,
Sideways springs, horizontal hog-launchers, perpendicular plungers... Call them what you like, they're in the game now
2016-03-03 22:38:06 +00:00
// Yellow Side Spring
S_YHORIZ1,
S_YHORIZ2,
S_YHORIZ3,
S_YHORIZ4,
S_YHORIZ5,
S_YHORIZ6,
S_YHORIZ7,
S_YHORIZ8,
// Red Side Spring
S_RHORIZ1,
S_RHORIZ2,
S_RHORIZ3,
S_RHORIZ4,
S_RHORIZ5,
S_RHORIZ6,
S_RHORIZ7,
S_RHORIZ8,
// Blue Side Spring
S_BHORIZ1,
S_BHORIZ2,
S_BHORIZ3,
S_BHORIZ4,
S_BHORIZ5,
S_BHORIZ6,
S_BHORIZ7,
S_BHORIZ8,
* New object types! * Red and yellow Boost panels! * Added because SUBARASHII and KIMOKAWAIII had several levels using them, and I wanted to make them look better. * https://cdn.discordapp.com/attachments/359091121789468672/634486669202161674/srb20015.gif * Uses the mapthingnums of Glaber's SOC resource boosters, but absolutely nothing else - not even the magnitudes. * Apply MF_AMBUSH to force the player into a spin - even if they don't have a spin ability! * Banpyura! * A Crushstacean with a spring instead of a crushclaw. * https://cdn.discordapp.com/attachments/428262628893261828/634432099306176512/srb20019.gif * Wanted this for a while, finally added it. * Improved springs. * Add pw_noautobrake to disable autobrake for half a second when touching yellow horizontal springs, and a second when touching red ones, even on the ground. * Add pw_justsprung to disable directionchar for a few tics while touching any springs with a horizontal component to their velocity. * Add the diagonal spring flag options Red and Yellow Diagonal Springs have to the Blue Diagonal Spring as well. * Started but decided against a tip of the hat to the CD spring spin, hidden behind #define SPRINGSPIN. * Make directionchar "lag behind" a little bit in waterslides. * Improved flame jets. * They now use new sprites for having their flames move upwards and sideways, instead of having them always face downwards like in 2.1! * Fixed a mixed declaration and code error in A_RolloutRock. (Sorry Lach!) * Make the Amy Cameo only spawn in SP, Record Attack, or Co-op unless it's the Clone Mode. * Improved ZB config. * Add above new types. * Add Blue Diagonal Spring, which existed in the source but not the config. * Re-order enemies in ZB config by zone (but keep them in the Enemies section only).
2019-10-17 20:50:26 +00:00
// Booster
S_BOOSTERSOUND,
S_YELLOWBOOSTERROLLER,
S_YELLOWBOOSTERSEG_LEFT,
S_YELLOWBOOSTERSEG_RIGHT,
S_YELLOWBOOSTERSEG_FACE,
S_REDBOOSTERROLLER,
S_REDBOOSTERSEG_LEFT,
S_REDBOOSTERSEG_RIGHT,
S_REDBOOSTERSEG_FACE,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Rain
S_RAIN1,
S_RAINRETURN,
// Snowflake
S_SNOW1,
S_SNOW2,
S_SNOW3,
// Water Splish
S_SPLISH1,
S_SPLISH2,
S_SPLISH3,
S_SPLISH4,
S_SPLISH5,
S_SPLISH6,
S_SPLISH7,
S_SPLISH8,
S_SPLISH9,
Implemented lava splish. Feel free to suggest a different "splish" sound.
2019-10-05 08:00:59 +00:00
// Lava Splish
S_LAVASPLISH,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// added water splash
S_SPLASH1,
S_SPLASH2,
S_SPLASH3,
// lava/slime damage burn smoke
S_SMOKE1,
S_SMOKE2,
S_SMOKE3,
S_SMOKE4,
S_SMOKE5,
// Bubbles
S_SMALLBUBBLE,
S_MEDIUMBUBBLE,
Changes to bubbles for new DSZ + bubble sprites (needs new patch.dta).
2016-09-24 16:15:42 +00:00
S_LARGEBUBBLE1,
S_LARGEBUBBLE2,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_EXTRALARGEBUBBLE, // breathable
S_POP1, // Extra Large bubble goes POP!
SF_MACHINE. Currently only changes drowning, but could do more. * Electric sparks coming off entire body instead of bubbles coming out mouth * Different sounds. * Different icons. These sprites are currently local only, but I'll be doing a lot of asset updating this evening since Rob asked me to so it won't be long until you can get them.
2016-07-16 21:43:49 +00:00
S_WATERZAP,
Added basic spindash dust Also cleaned up some of the code in P_DoSpinAbility while I was at it
2016-11-10 17:51:10 +00:00
// Spindash dust
S_SPINDUST1,
S_SPINDUST2,
S_SPINDUST3,
S_SPINDUST4,
Added bubble form of spin dust
2016-11-10 21:09:05 +00:00
S_SPINDUST_BUBBLE1,
S_SPINDUST_BUBBLE2,
S_SPINDUST_BUBBLE3,
S_SPINDUST_BUBBLE4,
Added flame version
2016-11-13 22:02:29 +00:00
S_SPINDUST_FIRE1,
S_SPINDUST_FIRE2,
S_SPINDUST_FIRE3,
S_SPINDUST_FIRE4,
Added basic spindash dust Also cleaned up some of the code in P_DoSpinAbility while I was at it
2016-11-10 17:51:10 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_FOG1,
S_FOG2,
S_FOG3,
S_FOG4,
S_FOG5,
S_FOG6,
S_FOG7,
S_FOG8,
S_FOG9,
S_FOG10,
S_FOG11,
S_FOG12,
S_FOG13,
S_FOG14,
S_SEED,
S_PARTICLE,
// Score Logos
S_SCRA, // 100
S_SCRB, // 200
S_SCRC, // 500
S_SCRD, // 1000
S_SCRE, // 10000
S_SCRF, // 400 (mario)
S_SCRG, // 800 (mario)
S_SCRH, // 2000 (mario)
S_SCRI, // 4000 (mario)
S_SCRJ, // 8000 (mario)
S_SCRK, // 1UP (mario)
* Bumpers and Balloons in a more final state. * Blue diagonal springs, because that gap is very, very odd. * Improved A_SpawnFreshCopy. * Tweaked P_LookForEnemies for consistency's sake. (Previously, it was impossible to make a spring that could neither be homing-attacked or attraction-shotted.)
2018-05-19 23:04:39 +00:00
S_SCRL, // 10
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Drowning Timer Numbers
S_ZERO1,
S_ONE1,
S_TWO1,
S_THREE1,
S_FOUR1,
S_FIVE1,
SF_MACHINE. Currently only changes drowning, but could do more. * Electric sparks coming off entire body instead of bubbles coming out mouth * Different sounds. * Different icons. These sprites are currently local only, but I'll be doing a lot of asset updating this evening since Rob asked me to so it won't be long until you can get them.
2016-07-16 21:43:49 +00:00
S_ZERO2,
S_ONE2,
S_TWO2,
S_THREE2,
S_FOUR2,
S_FIVE2,
Add flight indicator
2019-11-18 07:17:27 +00:00
S_FLIGHTINDICATOR,
A bunch of stuff again. * Lock on targets bob now, and are used for CA_HOMINGTHOK and SH_ATTRACT as well. * Flag stuff is now animated like it was designed to be but which was kinda messed up. * Cork sounds. * P_SpawnLockOn(player_t player, mobj_t lockon, statenum_t state) for Lua. * Added homing/firing CA2_GUNSLINGER stuff at egg guard shields. * Fixed homing stuff wrt egg guard shields and sea egg balloons. * Fixed attract orb goin' gold when doing a CA_HOMINGTHOK homing ability. * Fixed positioning of player during homing attack. * Cleaned up lockon spawn code.
2017-03-23 19:11:22 +00:00
S_LOCKON1,
S_LOCKON2,
Pre-pinch behaviour complete - heavily reliant on a new map, which I won't be sharing until everything is ready. Just making this commit now so I can merge in master...
2019-07-02 23:50:12 +00:00
S_LOCKON3,
S_LOCKON4,
S_LOCKONINF1,
S_LOCKONINF2,
S_LOCKONINF3,
S_LOCKONINF4,
Big commit, sorry. I broke several things trying to get other things to work and it's only now that all the code that worked yesterday works today! *P_LookForEnemies is now side-effect-less and only provides a pointer to the found mobj *player-jumping is dead, long live PF_STARTJUMP *per Mystic's request, CA2_GUNSLINGER has a targeting icon. It also has a more restricted vertical aiming range. *mobj for this is in the game as requested *fast teetering animation flag *general code cleanup
2017-03-22 18:51:30 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Tag Sign
Big commit, sorry. I broke several things trying to get other things to work and it's only now that all the code that worked yesterday works today! *P_LookForEnemies is now side-effect-less and only provides a pointer to the found mobj *player-jumping is dead, long live PF_STARTJUMP *per Mystic's request, CA2_GUNSLINGER has a targeting icon. It also has a more restricted vertical aiming range. *mobj for this is in the game as requested *fast teetering animation flag *general code cleanup
2017-03-22 18:51:30 +00:00
S_TTAG,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Got Flag Sign
A bunch of stuff again. * Lock on targets bob now, and are used for CA_HOMINGTHOK and SH_ATTRACT as well. * Flag stuff is now animated like it was designed to be but which was kinda messed up. * Cork sounds. * P_SpawnLockOn(player_t player, mobj_t lockon, statenum_t state) for Lua. * Added homing/firing CA2_GUNSLINGER stuff at egg guard shields. * Fixed homing stuff wrt egg guard shields and sea egg balloons. * Fixed attract orb goin' gold when doing a CA_HOMINGTHOK homing ability. * Fixed positioning of player during homing attack. * Cleaned up lockon spawn code.
2017-03-23 19:11:22 +00:00
S_GOTFLAG,
Big commit, sorry. I broke several things trying to get other things to work and it's only now that all the code that worked yesterday works today! *P_LookForEnemies is now side-effect-less and only provides a pointer to the found mobj *player-jumping is dead, long live PF_STARTJUMP *per Mystic's request, CA2_GUNSLINGER has a targeting icon. It also has a more restricted vertical aiming range. *mobj for this is in the game as requested *fast teetering animation flag *general code cleanup
2017-03-22 18:51:30 +00:00
S_CORK,
PITY IN PINK! * Smoothen Pity Shield animation to go with sphere's updates to Nev3r's sprites. * Added LHRT object, designed to be summoned with CA2_MELEE. * Gives a pink Pity Shield (SH_PINK) on same-team player contact. * Deals damage to non-player enemies. * Harmlessly fades into nothing when touching an enemy player, players with SH_PINK already, and players capable of applying SH_PINK to others (through non-Lua methods). * Basically, you-know-who is the Healer of the party whenever they're around. Fun consequences for the Co-op and CTF metas.
2019-06-19 22:20:24 +00:00
S_LHRT,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Red Ring
S_RRNG1,
S_RRNG2,
S_RRNG3,
S_RRNG4,
S_RRNG5,
S_RRNG6,
S_RRNG7,
backport state-animations from internal master to public next most other code in the branch did not come along for the ride.
2016-02-09 10:39:16 +00:00
// Weapon Ring Ammo
S_BOUNCERINGAMMO,
S_RAILRINGAMMO,
S_INFINITYRINGAMMO,
S_AUTOMATICRINGAMMO,
S_EXPLOSIONRINGAMMO,
S_SCATTERRINGAMMO,
S_GRENADERINGAMMO,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Weapon pickup
backport state-animations from internal master to public next most other code in the branch did not come along for the ride.
2016-02-09 10:39:16 +00:00
S_BOUNCEPICKUP,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_BOUNCEPICKUPFADE1,
S_BOUNCEPICKUPFADE2,
S_BOUNCEPICKUPFADE3,
S_BOUNCEPICKUPFADE4,
S_BOUNCEPICKUPFADE5,
S_BOUNCEPICKUPFADE6,
S_BOUNCEPICKUPFADE7,
S_BOUNCEPICKUPFADE8,
backport state-animations from internal master to public next most other code in the branch did not come along for the ride.
2016-02-09 10:39:16 +00:00
S_RAILPICKUP,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_RAILPICKUPFADE1,
S_RAILPICKUPFADE2,
S_RAILPICKUPFADE3,
S_RAILPICKUPFADE4,
S_RAILPICKUPFADE5,
S_RAILPICKUPFADE6,
S_RAILPICKUPFADE7,
S_RAILPICKUPFADE8,
backport state-animations from internal master to public next most other code in the branch did not come along for the ride.
2016-02-09 10:39:16 +00:00
S_AUTOPICKUP,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_AUTOPICKUPFADE1,
S_AUTOPICKUPFADE2,
S_AUTOPICKUPFADE3,
S_AUTOPICKUPFADE4,
S_AUTOPICKUPFADE5,
S_AUTOPICKUPFADE6,
S_AUTOPICKUPFADE7,
S_AUTOPICKUPFADE8,
backport state-animations from internal master to public next most other code in the branch did not come along for the ride.
2016-02-09 10:39:16 +00:00
S_EXPLODEPICKUP,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_EXPLODEPICKUPFADE1,
S_EXPLODEPICKUPFADE2,
S_EXPLODEPICKUPFADE3,
S_EXPLODEPICKUPFADE4,
S_EXPLODEPICKUPFADE5,
S_EXPLODEPICKUPFADE6,
S_EXPLODEPICKUPFADE7,
S_EXPLODEPICKUPFADE8,
backport state-animations from internal master to public next most other code in the branch did not come along for the ride.
2016-02-09 10:39:16 +00:00
S_SCATTERPICKUP,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_SCATTERPICKUPFADE1,
S_SCATTERPICKUPFADE2,
S_SCATTERPICKUPFADE3,
S_SCATTERPICKUPFADE4,
S_SCATTERPICKUPFADE5,
S_SCATTERPICKUPFADE6,
S_SCATTERPICKUPFADE7,
S_SCATTERPICKUPFADE8,
backport state-animations from internal master to public next most other code in the branch did not come along for the ride.
2016-02-09 10:39:16 +00:00
S_GRENADEPICKUP,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_GRENADEPICKUPFADE1,
S_GRENADEPICKUPFADE2,
S_GRENADEPICKUPFADE3,
S_GRENADEPICKUPFADE4,
S_GRENADEPICKUPFADE5,
S_GRENADEPICKUPFADE6,
S_GRENADEPICKUPFADE7,
S_GRENADEPICKUPFADE8,
// Thrown Weapon Rings
S_THROWNBOUNCE1,
S_THROWNBOUNCE2,
S_THROWNBOUNCE3,
S_THROWNBOUNCE4,
S_THROWNBOUNCE5,
S_THROWNBOUNCE6,
S_THROWNBOUNCE7,
S_THROWNINFINITY1,
S_THROWNINFINITY2,
S_THROWNINFINITY3,
S_THROWNINFINITY4,
S_THROWNINFINITY5,
S_THROWNINFINITY6,
S_THROWNINFINITY7,
S_THROWNAUTOMATIC1,
S_THROWNAUTOMATIC2,
S_THROWNAUTOMATIC3,
S_THROWNAUTOMATIC4,
S_THROWNAUTOMATIC5,
S_THROWNAUTOMATIC6,
S_THROWNAUTOMATIC7,
S_THROWNEXPLOSION1,
S_THROWNEXPLOSION2,
S_THROWNEXPLOSION3,
S_THROWNEXPLOSION4,
S_THROWNEXPLOSION5,
S_THROWNEXPLOSION6,
S_THROWNEXPLOSION7,
S_THROWNGRENADE1,
S_THROWNGRENADE2,
S_THROWNGRENADE3,
S_THROWNGRENADE4,
S_THROWNGRENADE5,
S_THROWNGRENADE6,
S_THROWNGRENADE7,
S_THROWNGRENADE8,
S_THROWNGRENADE9,
S_THROWNGRENADE10,
S_THROWNGRENADE11,
S_THROWNGRENADE12,
S_THROWNGRENADE13,
S_THROWNGRENADE14,
S_THROWNGRENADE15,
S_THROWNGRENADE16,
S_THROWNGRENADE17,
S_THROWNGRENADE18,
S_THROWNSCATTER,
S_RINGEXPLODE,
S_COIN1,
S_COIN2,
S_COIN3,
S_COINSPARKLE1,
S_COINSPARKLE2,
S_COINSPARKLE3,
S_COINSPARKLE4,
S_GOOMBA1,
S_GOOMBA1B,
S_GOOMBA2,
S_GOOMBA3,
S_GOOMBA4,
S_GOOMBA5,
S_GOOMBA6,
S_GOOMBA7,
S_GOOMBA8,
S_GOOMBA9,
S_GOOMBA_DEAD,
S_BLUEGOOMBA1,
S_BLUEGOOMBA1B,
S_BLUEGOOMBA2,
S_BLUEGOOMBA3,
S_BLUEGOOMBA4,
S_BLUEGOOMBA5,
S_BLUEGOOMBA6,
S_BLUEGOOMBA7,
S_BLUEGOOMBA8,
S_BLUEGOOMBA9,
S_BLUEGOOMBA_DEAD,
// Mario-specific stuff
S_FIREFLOWER1,
S_FIREFLOWER2,
S_FIREFLOWER3,
S_FIREFLOWER4,
Fireball
2019-11-18 00:25:17 +00:00
S_FIREBALL,
S_FIREBALLTRAIL1,
S_FIREBALLTRAIL2,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_SHELL,
Fixed the missing Mario Puma/poodoo sounds.
2017-01-25 14:52:36 +00:00
S_PUMA_START1,
S_PUMA_START2,
* ALMOST SORTA IMPLEMENTED A NON-HACKY SPINNING FLAMEJET. For some reason, they wanna step down onto the platform - and I've been figuring this out for too long to see what's causing that tonight. * Hardcoded a bunch of stuff from patch.dta. All works fine, but still more to do.
2017-01-21 01:09:39 +00:00
S_PUMA_UP1,
S_PUMA_UP2,
S_PUMA_UP3,
S_PUMA_DOWN1,
S_PUMA_DOWN2,
S_PUMA_DOWN3,
S_PUMATRAIL1,
S_PUMATRAIL2,
S_PUMATRAIL3,
S_PUMATRAIL4,
S_HAMMER,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_KOOPA1,
S_KOOPA2,
S_KOOPAFLAME1,
S_KOOPAFLAME2,
S_KOOPAFLAME3,
S_AXE1,
S_AXE2,
S_AXE3,
S_MARIOBUSH1,
S_MARIOBUSH2,
S_TOAD,
// Nights-specific stuff
Nights Drone mobj and state entries * New entries: NIGHTSDRONE_MAN, NIGHTSDRONE_SPARKLING * NIGHTSGOAL renamed to NIGHTSDRONE_GOAL * MT_NIGHTSDRONE repurposed as an invisble, no-gravity hitbox
2018-08-10 22:24:31 +00:00
S_NIGHTSDRONE_MAN1,
S_NIGHTSDRONE_MAN2,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_NIGHTSDRONE_SPARKLING1,
S_NIGHTSDRONE_SPARKLING2,
S_NIGHTSDRONE_SPARKLING3,
S_NIGHTSDRONE_SPARKLING4,
S_NIGHTSDRONE_SPARKLING5,
S_NIGHTSDRONE_SPARKLING6,
S_NIGHTSDRONE_SPARKLING7,
S_NIGHTSDRONE_SPARKLING8,
S_NIGHTSDRONE_SPARKLING9,
S_NIGHTSDRONE_SPARKLING10,
S_NIGHTSDRONE_SPARKLING11,
S_NIGHTSDRONE_SPARKLING12,
S_NIGHTSDRONE_SPARKLING13,
S_NIGHTSDRONE_SPARKLING14,
S_NIGHTSDRONE_SPARKLING15,
S_NIGHTSDRONE_SPARKLING16,
Nights Drone mobj and state entries * New entries: NIGHTSDRONE_MAN, NIGHTSDRONE_SPARKLING * NIGHTSGOAL renamed to NIGHTSDRONE_GOAL * MT_NIGHTSDRONE repurposed as an invisble, no-gravity hitbox
2018-08-10 22:24:31 +00:00
S_NIGHTSDRONE_GOAL1,
S_NIGHTSDRONE_GOAL2,
S_NIGHTSDRONE_GOAL3,
S_NIGHTSDRONE_GOAL4,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_NIGHTSPARKLE1,
S_NIGHTSPARKLE2,
S_NIGHTSPARKLE3,
S_NIGHTSPARKLE4,
S_NIGHTSPARKLESUPER1,
S_NIGHTSPARKLESUPER2,
S_NIGHTSPARKLESUPER3,
S_NIGHTSPARKLESUPER4,
S_NIGHTSLOOPHELPER,
// NiGHTS bumper
S_NIGHTSBUMPER1,
S_NIGHTSBUMPER2,
S_NIGHTSBUMPER3,
S_NIGHTSBUMPER4,
S_NIGHTSBUMPER5,
S_NIGHTSBUMPER6,
S_NIGHTSBUMPER7,
S_NIGHTSBUMPER8,
S_NIGHTSBUMPER9,
S_NIGHTSBUMPER10,
S_NIGHTSBUMPER11,
S_NIGHTSBUMPER12,
S_HOOP,
S_HOOP_XMASA,
S_HOOP_XMASB,
S_NIGHTSCORE10,
S_NIGHTSCORE20,
S_NIGHTSCORE30,
S_NIGHTSCORE40,
S_NIGHTSCORE50,
S_NIGHTSCORE60,
S_NIGHTSCORE70,
S_NIGHTSCORE80,
S_NIGHTSCORE90,
S_NIGHTSCORE100,
S_NIGHTSCORE10_2,
S_NIGHTSCORE20_2,
S_NIGHTSCORE30_2,
S_NIGHTSCORE40_2,
S_NIGHTSCORE50_2,
S_NIGHTSCORE60_2,
S_NIGHTSCORE70_2,
S_NIGHTSCORE80_2,
S_NIGHTSCORE90_2,
S_NIGHTSCORE100_2,
// NiGHTS Paraloop Powerups
Implemented the two NiGHTS Emblem types in the TUDD via var modifications to ET_GLOBAL! * GE_NIGHTSPULL (for it to chase you once paralooped) - Sun emblem * GE_NIGHTSITEM (for hidden until paralooped) - Moon emblem Combined means that you essentially have to loop it twice. Also, revamped NIGHTSITEM to suck a little less (and have more compatibility with MT_EMBLEM).
2017-05-09 15:20:26 +00:00
S_NIGHTSSUPERLOOP,
S_NIGHTSDRILLREFILL,
S_NIGHTSHELPER,
S_NIGHTSEXTRATIME,
S_NIGHTSLINKFREEZE,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_EGGCAPSULE,
// Orbiting Chaos Emeralds
S_ORBITEM1,
S_ORBITEM2,
S_ORBITEM3,
S_ORBITEM4,
S_ORBITEM5,
S_ORBITEM6,
S_ORBITEM7,
SRB2 2.1.2 release
2014-03-17 12:13:16 +00:00
S_ORBITEM8,
MONSTER COMMIT. OLD SPECIAL STAGES: * Spheres in old special stages instead of rings! * Individual timers in old special stages instead of a global one! * Old special stages use a variant of the NiGHTS HUD now! * Special stage damage in old special stages loses 5 seconds of time instead of 10 rings/spheres! * All damage gained through old special stages is converted to special stage damage! As a consequence, the special spikeball has no need to be special anymore. * Made emerald gaining function be based on special stage number rather than gained emeralds! * Consistency with... NiGHTS SPECIAL STAGES: * Spheres now flash in bonus time. https://cdn.discordapp.com/attachments/400761370800422922/452590553100713984/srb20032.gif * Sphere and ring mapthingnums are now less fucked up in 'em. (Rings are 300, same as usual, while Spheres are now 1706 replacing NiGHTS Wings.) SPECIAL STAGES IN GENERAL: * useNightsSS is now dead. Each individual special stage is now assessed for NiGHTS-mode behaviour based on maptol & TOL_NIGHTS. * CRAWLA HONCHO\n CAN NOW BE\n SUPER CRAWLA HONCHO end tally modification now also includes a mini-tutorial on turning super. https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif * SONIC GOT A CHAOS EMERALD? https://cdn.discordapp.com/attachments/400761370800422922/452623869497573386/srb20034.gif NiGHTS NON-SPECIAL STAGES: * Colour Chips and Star Chips! Replaces Spheres and Rings of NiGHTS Special Stages. * Colour Chips turn yellow in bonus time. * Ideya! * Its own "drowning" music! * All of the object types for Dream Hill. * GIF: https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif RANDOM BS: * Turn super with the spin button instead of the jump button! * Followmobj now correctly set with P_SetTarget instead of pointer assignment. * Emerald hunt uses new sprites! * Made unlock noise different from emblem gain noise! (It's the CRAWLA HONCHO CAN NOW TURN yadda yadda sound from S3K now.)
2018-06-03 21:41:54 +00:00
S_ORBIDYA1,
S_ORBIDYA2,
S_ORBIDYA3,
S_ORBIDYA4,
S_ORBIDYA5,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// "Flicky" helper
S_NIGHTOPIANHELPER1,
S_NIGHTOPIANHELPER2,
S_NIGHTOPIANHELPER3,
S_NIGHTOPIANHELPER4,
S_NIGHTOPIANHELPER5,
S_NIGHTOPIANHELPER6,
S_NIGHTOPIANHELPER7,
S_NIGHTOPIANHELPER8,
* Ported in all of the Flickies from flickiesreduced8.wad except for the Flicker and seed. * Fixed a crash bug in the Flicky fly function I introduced sleepily last night.
2016-12-31 16:55:06 +00:00
S_NIGHTOPIANHELPER9,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MONSTER COMMIT. OLD SPECIAL STAGES: * Spheres in old special stages instead of rings! * Individual timers in old special stages instead of a global one! * Old special stages use a variant of the NiGHTS HUD now! * Special stage damage in old special stages loses 5 seconds of time instead of 10 rings/spheres! * All damage gained through old special stages is converted to special stage damage! As a consequence, the special spikeball has no need to be special anymore. * Made emerald gaining function be based on special stage number rather than gained emeralds! * Consistency with... NiGHTS SPECIAL STAGES: * Spheres now flash in bonus time. https://cdn.discordapp.com/attachments/400761370800422922/452590553100713984/srb20032.gif * Sphere and ring mapthingnums are now less fucked up in 'em. (Rings are 300, same as usual, while Spheres are now 1706 replacing NiGHTS Wings.) SPECIAL STAGES IN GENERAL: * useNightsSS is now dead. Each individual special stage is now assessed for NiGHTS-mode behaviour based on maptol & TOL_NIGHTS. * CRAWLA HONCHO\n CAN NOW BE\n SUPER CRAWLA HONCHO end tally modification now also includes a mini-tutorial on turning super. https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif * SONIC GOT A CHAOS EMERALD? https://cdn.discordapp.com/attachments/400761370800422922/452623869497573386/srb20034.gif NiGHTS NON-SPECIAL STAGES: * Colour Chips and Star Chips! Replaces Spheres and Rings of NiGHTS Special Stages. * Colour Chips turn yellow in bonus time. * Ideya! * Its own "drowning" music! * All of the object types for Dream Hill. * GIF: https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif RANDOM BS: * Turn super with the spin button instead of the jump button! * Followmobj now correctly set with P_SetTarget instead of pointer assignment. * Emerald hunt uses new sprites! * Made unlock noise different from emblem gain noise! (It's the CRAWLA HONCHO CAN NOW TURN yadda yadda sound from S3K now.)
2018-06-03 21:41:54 +00:00
// Nightopian
S_PIAN0,
S_PIAN1,
S_PIAN2,
S_PIAN3,
S_PIAN4,
S_PIAN5,
S_PIAN6,
S_PIANSING,
// Shleep
S_SHLEEP1,
S_SHLEEP2,
S_SHLEEP3,
S_SHLEEP4,
S_SHLEEPBOUNCE1,
S_SHLEEPBOUNCE2,
S_SHLEEPBOUNCE3,
* Haunted Heights! Smashing spikeball, Cacolantern, Spinbobert and Hangster, along with the Spider and Bat flickies and general decoration/ambience stuff. * MF_PAIN and MF_MISSILE now support setting damagetype via their Mass parameter. The two existing conflicts - the fuse setting for the grenade weapon ring and the Cybrakdemon napalm bomb - had these moved to other free parameters. * A_ConnectToGround is EXTREMELY useful for palmtrees and stuff. * Some other, relatively hacky A_ functions. * (Unrelated) Remove the need for a "Mario block mode" for the token by making it natively compatible. * Spikes and their time-offsetting via that Lua script sphere made. Also allow for wallspikes to do it via their angle/360.
2018-04-28 14:13:44 +00:00
// Secret badniks and hazards, shhhh
Bit of a random one today, but the branch approaches completion... * Bomb sphere! Paraloopable hazard. Replaces MT_SPECIALSPIKEBALL. * Blueberry bushes, both normal and Xmas, from patch.dta. * BSZ tulips, also from patch.dta! * Frozen Hillside badniks - Penguinator and Pophat. * Frozen Hillside ice decoration! * Fixed some big bugs with the DSZ light beams. * Made multi-mare special stages work, in a troll way - the Chaos Emerald disappears in a puff of smoke, and the Spinbobert laughter sound plays... >:3c * Reverted the mobjtype number changes from the source SOC/Lua, which we can do later when doing a final pass of the levels. * State optimisation. * Serious cruft-removal of the NiGHTS drone thinker. * Fix the issues where the player wouldn't curl into jump in waterslides or dropping off rope-hangs. * Tweak NiGHTS player flashing. * Add text colour support to the titlecard font. * Use that to make the PRESS SPIN\nMID-JUMP thing when you get all Chaos Emeralds use the titlecard font for readability. * Fix the GOT ALL EMERALDS page not lasting the correct, extended amount of time. * Fix that thing where flying mid-spin didn't enact autobrake. * Modify graymap a little on Sryder's suggestion. * [COMPLETELY UNRELATED] fix that thing where the addons menu will fail on files/paths with spaces in [/COMPLETELY UNRELATED]
2018-06-05 16:22:28 +00:00
S_PENGUINATOR_LOOK,
S_PENGUINATOR_WADDLE1,
S_PENGUINATOR_WADDLE2,
S_PENGUINATOR_WADDLE3,
S_PENGUINATOR_WADDLE4,
S_PENGUINATOR_SLIDE1,
S_PENGUINATOR_SLIDE2,
S_PENGUINATOR_SLIDE3,
S_PENGUINATOR_SLIDE4,
S_PENGUINATOR_SLIDE5,
S_POPHAT_LOOK,
S_POPHAT_SHOOT1,
S_POPHAT_SHOOT2,
S_POPHAT_SHOOT3,
Hardcode DrT's FHZ improvements. Puttin' the FREEZE in feature freeze amirite haha
2019-11-17 20:34:25 +00:00
S_POPHAT_SHOOT4,
S_POPSHOT,
S_POPSHOT_TRAIL,
Bit of a random one today, but the branch approaches completion... * Bomb sphere! Paraloopable hazard. Replaces MT_SPECIALSPIKEBALL. * Blueberry bushes, both normal and Xmas, from patch.dta. * BSZ tulips, also from patch.dta! * Frozen Hillside badniks - Penguinator and Pophat. * Frozen Hillside ice decoration! * Fixed some big bugs with the DSZ light beams. * Made multi-mare special stages work, in a troll way - the Chaos Emerald disappears in a puff of smoke, and the Spinbobert laughter sound plays... >:3c * Reverted the mobjtype number changes from the source SOC/Lua, which we can do later when doing a final pass of the levels. * State optimisation. * Serious cruft-removal of the NiGHTS drone thinker. * Fix the issues where the player wouldn't curl into jump in waterslides or dropping off rope-hangs. * Tweak NiGHTS player flashing. * Add text colour support to the titlecard font. * Use that to make the PRESS SPIN\nMID-JUMP thing when you get all Chaos Emeralds use the titlecard font for readability. * Fix the GOT ALL EMERALDS page not lasting the correct, extended amount of time. * Fix that thing where flying mid-spin didn't enact autobrake. * Modify graymap a little on Sryder's suggestion. * [COMPLETELY UNRELATED] fix that thing where the addons menu will fail on files/paths with spaces in [/COMPLETELY UNRELATED]
2018-06-05 16:22:28 +00:00
* Hive Elementals and Bumblebores, plus associated useful action functions. * Made Facestabbers take two hits and have associated pain/death animations. No other changes, just wanted to make sure THIS was done. * Move Bubblebuzz-related stuff to go alongside the secret badniks and etc. * MF2_INVERTAIMABLE. Inverts whether P_LookForEnemies can get at; replaces a hardcoded thingy.
2018-05-04 20:30:15 +00:00
S_HIVEELEMENTAL_LOOK,
S_HIVEELEMENTAL_PREPARE1,
S_HIVEELEMENTAL_PREPARE2,
S_HIVEELEMENTAL_SHOOT1,
S_HIVEELEMENTAL_SHOOT2,
S_HIVEELEMENTAL_DORMANT,
S_HIVEELEMENTAL_PAIN,
S_HIVEELEMENTAL_DIE1,
S_HIVEELEMENTAL_DIE2,
S_HIVEELEMENTAL_DIE3,
S_BUMBLEBORE_SPAWN,
S_BUMBLEBORE_LOOK1,
S_BUMBLEBORE_LOOK2,
S_BUMBLEBORE_FLY1,
S_BUMBLEBORE_FLY2,
S_BUMBLEBORE_RAISE,
S_BUMBLEBORE_FALL1,
S_BUMBLEBORE_FALL2,
S_BUMBLEBORE_STUCK1,
S_BUMBLEBORE_STUCK2,
S_BUMBLEBORE_DIE,
Implement new states for Buggle, the new Aquabuzz
2019-10-29 07:32:03 +00:00
S_BUGGLEIDLE,
S_BUGGLEFLY,
* Hive Elementals and Bumblebores, plus associated useful action functions. * Made Facestabbers take two hits and have associated pain/death animations. No other changes, just wanted to make sure THIS was done. * Move Bubblebuzz-related stuff to go alongside the secret badniks and etc. * MF2_INVERTAIMABLE. Inverts whether P_LookForEnemies can get at; replaces a hardcoded thingy.
2018-05-04 20:30:15 +00:00
* Haunted Heights! Smashing spikeball, Cacolantern, Spinbobert and Hangster, along with the Spider and Bat flickies and general decoration/ambience stuff. * MF_PAIN and MF_MISSILE now support setting damagetype via their Mass parameter. The two existing conflicts - the fuse setting for the grenade weapon ring and the Cybrakdemon napalm bomb - had these moved to other free parameters. * A_ConnectToGround is EXTREMELY useful for palmtrees and stuff. * Some other, relatively hacky A_ functions. * (Unrelated) Remove the need for a "Mario block mode" for the token by making it natively compatible. * Spikes and their time-offsetting via that Lua script sphere made. Also allow for wallspikes to do it via their angle/360.
2018-04-28 14:13:44 +00:00
S_SMASHSPIKE_FLOAT,
S_SMASHSPIKE_EASE1,
S_SMASHSPIKE_EASE2,
S_SMASHSPIKE_FALL,
S_SMASHSPIKE_STOMP1,
S_SMASHSPIKE_STOMP2,
S_SMASHSPIKE_RISE1,
S_SMASHSPIKE_RISE2,
S_CACO_LOOK,
S_CACO_WAKE1,
S_CACO_WAKE2,
S_CACO_WAKE3,
S_CACO_WAKE4,
S_CACO_ROAR,
S_CACO_CHASE,
S_CACO_CHASE_REPEAT,
S_CACO_RANDOM,
S_CACO_PREPARE_SOUND,
S_CACO_PREPARE1,
S_CACO_PREPARE2,
S_CACO_PREPARE3,
S_CACO_SHOOT_SOUND,
S_CACO_SHOOT1,
S_CACO_SHOOT2,
S_CACO_CLOSE,
S_CACO_DIE_FLAGS,
S_CACO_DIE_GIB1,
S_CACO_DIE_GIB2,
S_CACO_DIE_SCREAM,
S_CACO_DIE_SHATTER,
S_CACO_DIE_FALL,
S_CACOSHARD_RANDOMIZE,
S_CACOSHARD1_1,
S_CACOSHARD1_2,
S_CACOSHARD2_1,
S_CACOSHARD2_2,
S_CACOFIRE1,
S_CACOFIRE2,
S_CACOFIRE3,
S_CACOFIRE_EXPLODE1,
S_CACOFIRE_EXPLODE2,
S_CACOFIRE_EXPLODE3,
S_CACOFIRE_EXPLODE4,
S_SPINBOBERT_MOVE_FLIPUP,
S_SPINBOBERT_MOVE_UP,
S_SPINBOBERT_MOVE_FLIPDOWN,
S_SPINBOBERT_MOVE_DOWN,
S_SPINBOBERT_FIRE_MOVE,
S_SPINBOBERT_FIRE_GHOST,
S_SPINBOBERT_FIRE_TRAIL1,
S_SPINBOBERT_FIRE_TRAIL2,
S_SPINBOBERT_FIRE_TRAIL3,
S_HANGSTER_LOOK,
S_HANGSTER_SWOOP1,
S_HANGSTER_SWOOP2,
S_HANGSTER_ARC1,
S_HANGSTER_ARC2,
S_HANGSTER_ARC3,
S_HANGSTER_FLY1,
S_HANGSTER_FLY2,
S_HANGSTER_FLY3,
S_HANGSTER_FLY4,
S_HANGSTER_FLYREPEAT,
S_HANGSTER_ARCUP1,
S_HANGSTER_ARCUP2,
S_HANGSTER_ARCUP3,
S_HANGSTER_RETURN1,
S_HANGSTER_RETURN2,
S_HANGSTER_RETURN3,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_CRUMBLE1,
S_CRUMBLE2,
// Spark
Ring sparkle mirroring
2019-08-03 22:28:53 +00:00
S_SPRK1,
S_SPRK2,
S_SPRK3,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Robot Explosion
* Made what MI had compile. * Added the ability to read in mobjtypes as well as from a short list of flicky constants. * Added a new state, S_XPLD_FLICKY, which is the new deathstate of all badniks. * Put the disabled animal-spawn-on-P_KillMobj behind a #define. * Renamed the branch and associated properties to something not rife with sin.
2016-12-29 17:02:05 +00:00
S_XPLD_FLICKY,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_XPLD1,
S_XPLD2,
A lot! * cv_powerupdisplay. Never, First-person only (default), Always. * New monitor stuff. * Fixed hitmessages. * Some CTF stuff. * Aaaaugh it's a lot I hate myself I need to work on my coursework. * I'll figure out what I did here in the merge request when that's done.
2018-03-26 22:53:09 +00:00
S_XPLD3,
S_XPLD4,
S_XPLD5,
S_XPLD6,
* MT_EGGTRAP (egg capsule center mobj) converted over to flickylist system. * MT_EXPLODE's anims partially FF_ANIMATE'd. * A_FlickySpawn turned into a wrapper for internal function that does what A_FlickySpawn did but returns a pointer to the spawned flicky.
2016-12-30 14:04:04 +00:00
S_XPLD_EGGTRAP,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Underwater Explosion
S_WPLD1,
S_WPLD2,
S_WPLD3,
S_WPLD4,
S_WPLD5,
S_WPLD6,
* Hive Elementals and Bumblebores, plus associated useful action functions. * Made Facestabbers take two hits and have associated pain/death animations. No other changes, just wanted to make sure THIS was done. * Move Bubblebuzz-related stuff to go alongside the secret badniks and etc. * MF2_INVERTAIMABLE. Inverts whether P_LookForEnemies can get at; replaces a hardcoded thingy.
2018-05-04 20:30:15 +00:00
S_DUST1,
S_DUST2,
S_DUST3,
S_DUST4,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_ROCKSPAWN,
backport state-animations from internal master to public next most other code in the branch did not come along for the ride.
2016-02-09 10:39:16 +00:00
S_ROCKCRUMBLEA,
S_ROCKCRUMBLEB,
S_ROCKCRUMBLEC,
S_ROCKCRUMBLED,
S_ROCKCRUMBLEE,
S_ROCKCRUMBLEF,
S_ROCKCRUMBLEG,
S_ROCKCRUMBLEH,
S_ROCKCRUMBLEI,
S_ROCKCRUMBLEJ,
S_ROCKCRUMBLEK,
S_ROCKCRUMBLEL,
S_ROCKCRUMBLEM,
S_ROCKCRUMBLEN,
S_ROCKCRUMBLEO,
S_ROCKCRUMBLEP,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Add GFZ debris; reorganize wood debris index
2019-11-20 17:05:22 +00:00
// Level debris
S_GFZDEBRIS,
Hardcode brick debris
2019-07-06 04:31:02 +00:00
S_BRICKDEBRIS,
Add GFZ debris; reorganize wood debris index
2019-11-20 17:05:22 +00:00
S_WOODDEBRIS,
Hardcode brick debris
2019-07-06 04:31:02 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#ifdef SEENAMES
S_NAMECHECK,
#endif
S_FIRSTFREESLOT,
S_LASTFREESLOT = S_FIRSTFREESLOT + NUMSTATEFREESLOTS - 1,
NUMSTATES
} statenum_t;
typedef struct
{
spritenum_t sprite;
UINT32 frame; // we use the upper 16 bits for translucency and other shade effects
INT32 tics;
actionf_t action;
INT32 var1;
INT32 var2;
statenum_t nextstate;
} state_t;
extern state_t states[NUMSTATES];
extern char sprnames[NUMSPRITES + 1][5];
Added freeslots for SPR2. Make sure your MAINCFG / LUA lump comes _before_ the S_SKIN section.
2015-10-31 18:45:42 +00:00
extern char spr2names[NUMPLAYERSPRITES][5];
Add spr2defaults[] array to make sprite2 defaulting system much, much simpler to manage. This is in preparation for a seperate project which still involves sprite2s.
2017-08-25 17:00:20 +00:00
extern playersprite_t spr2defaults[NUMPLAYERSPRITES];
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
extern state_t *astate;
Add spr2defaults[] array to make sprite2 defaulting system much, much simpler to manage. This is in preparation for a seperate project which still involves sprite2s.
2017-08-25 17:00:20 +00:00
extern playersprite_t free_spr2;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
typedef enum mobj_type
{
MT_NULL,
MT_UNKNOWN,
MT_THOK, // Thok! mobj
MT_PLAYER,
* Smiles hardcode! * Add a default behaviour to followmobj (just basic A_CapeChase). * Allow for modifying which character starting a new SP game should start you on, relative to the first valid character. (SOC's "startchar" variable) * Make MF2_SHADOW transferrable via linkdraw. * Modify P_GetSkinSprite2's recursion limiter to have zero chance of ever infinitely looping.
2017-10-03 17:18:18 +00:00
MT_TAILSOVERLAY, // c:
Add Metal's jet fume
2019-10-23 04:35:17 +00:00
MT_METALJETFUME,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Enemies
* Crushtacean! * Behaves a bit differently to the one in DSZres.pk3. * Can now punch DSZ mines! * Also has mapthingnum 126 instead of 610. * Some other mapthingnum changes. * DSZ2 stalagmite is now 1009, formerly 999. * Big DSZ gargoyle is now 1011, formerly 1009.
2018-05-14 00:19:24 +00:00
MT_BLUECRAWLA, // Crawla (Blue)
MT_REDCRAWLA, // Crawla (Red)
MT_GFZFISH, // SDURF
MT_GOLDBUZZ, // Buzz (Gold)
MT_REDBUZZ, // Buzz (Red)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MT_JETTBOMBER, // Jetty-Syn Bomber
MT_JETTGUNNER, // Jetty-Syn Gunner
MT_CRAWLACOMMANDER, // Crawla Commander
MT_DETON, // Deton
MT_SKIM, // Skim mine dropper
* Crushtacean! * Behaves a bit differently to the one in DSZres.pk3. * Can now punch DSZ mines! * Also has mapthingnum 126 instead of 610. * Some other mapthingnum changes. * DSZ2 stalagmite is now 1009, formerly 999. * Big DSZ gargoyle is now 1011, formerly 1009.
2018-05-14 00:19:24 +00:00
MT_TURRET, // Industrial Turret
MT_POPUPTURRET, // Pop-Up Turret
* DrT's Spincushion hardcoded. * Make the MF_PAIN stuff ONLY depend on mass, using the bottom 8 bits for the type and the custom sound in the upper ones. * A bunch of cleanup of random other stuff, including an unused Deton state and an unused Jetty type's sprite.
2018-05-13 13:09:20 +00:00
MT_SPINCUSHION, // Spincushion
* Crushtacean! * Behaves a bit differently to the one in DSZres.pk3. * Can now punch DSZ mines! * Also has mapthingnum 126 instead of 610. * Some other mapthingnum changes. * DSZ2 stalagmite is now 1009, formerly 999. * Big DSZ gargoyle is now 1011, formerly 1009.
2018-05-14 00:19:24 +00:00
MT_CRUSHSTACEAN, // Crushstacean
MT_CRUSHCLAW, // Big meaty claw
MT_CRUSHCHAIN, // Chain
* New object types! * Red and yellow Boost panels! * Added because SUBARASHII and KIMOKAWAIII had several levels using them, and I wanted to make them look better. * https://cdn.discordapp.com/attachments/359091121789468672/634486669202161674/srb20015.gif * Uses the mapthingnums of Glaber's SOC resource boosters, but absolutely nothing else - not even the magnitudes. * Apply MF_AMBUSH to force the player into a spin - even if they don't have a spin ability! * Banpyura! * A Crushstacean with a spring instead of a crushclaw. * https://cdn.discordapp.com/attachments/428262628893261828/634432099306176512/srb20019.gif * Wanted this for a while, finally added it. * Improved springs. * Add pw_noautobrake to disable autobrake for half a second when touching yellow horizontal springs, and a second when touching red ones, even on the ground. * Add pw_justsprung to disable directionchar for a few tics while touching any springs with a horizontal component to their velocity. * Add the diagonal spring flag options Red and Yellow Diagonal Springs have to the Blue Diagonal Spring as well. * Started but decided against a tip of the hat to the CD spring spin, hidden behind #define SPRINGSPIN. * Make directionchar "lag behind" a little bit in waterslides. * Improved flame jets. * They now use new sprites for having their flames move upwards and sideways, instead of having them always face downwards like in 2.1! * Fixed a mixed declaration and code error in A_RolloutRock. (Sorry Lach!) * Make the Amy Cameo only spawn in SP, Record Attack, or Co-op unless it's the Clone Mode. * Improved ZB config. * Add above new types. * Add Blue Diagonal Spring, which existed in the source but not the config. * Re-order enemies in ZB config by zone (but keep them in the Enemies section only).
2019-10-17 20:50:26 +00:00
MT_BANPYURA, // Banpyura
* Add `MT_BANPYURA` and `MT_BANPSPRING` to `dehacked.c`. * Correct spelling of `MT_BANPSPRING`.
2019-10-18 19:32:35 +00:00
MT_BANPSPRING, // Banpyura spring
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MT_JETJAW, // Jet Jaw
MT_SNAILER, // Snailer
* Crushtacean! * Behaves a bit differently to the one in DSZres.pk3. * Can now punch DSZ mines! * Also has mapthingnum 126 instead of 610. * Some other mapthingnum changes. * DSZ2 stalagmite is now 1009, formerly 999. * Big DSZ gargoyle is now 1011, formerly 1009.
2018-05-14 00:19:24 +00:00
MT_VULTURE, // BASH
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MT_POINTY, // Pointy
MT_POINTYBALL, // Pointy Ball
MT_ROBOHOOD, // Robo-Hood
* Crushtacean! * Behaves a bit differently to the one in DSZres.pk3. * Can now punch DSZ mines! * Also has mapthingnum 126 instead of 610. * Some other mapthingnum changes. * DSZ2 stalagmite is now 1009, formerly 999. * Big DSZ gargoyle is now 1011, formerly 1009.
2018-05-14 00:19:24 +00:00
MT_FACESTABBER, // Castlebot Facestabber
* Castlebot Facestabbers. * Facestabber statues, of both the suspicious and non-suspicious kind. * New object type for the end of grabbable chains. * I moved my compilation .bat file to my Releases folder, so it should .gitignore .bat's. * Random extra stuff.
2018-05-24 00:40:57 +00:00
MT_FACESTABBERSPEAR, // Castlebot Facestabber spear aura
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MT_EGGGUARD, // Egg Guard
* Crushtacean! * Behaves a bit differently to the one in DSZres.pk3. * Can now punch DSZ mines! * Also has mapthingnum 126 instead of 610. * Some other mapthingnum changes. * DSZ2 stalagmite is now 1009, formerly 999. * Big DSZ gargoyle is now 1011, formerly 1009.
2018-05-14 00:19:24 +00:00
MT_EGGSHIELD, // Egg Guard's shield
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MT_GSNAPPER, // Green Snapper
Hardcoded the new Snapper behavior
2019-06-10 18:32:50 +00:00
MT_SNAPPER_LEG, // Green Snapper leg
MT_SNAPPER_HEAD, // Green Snapper head
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MT_MINUS, // Minus
Hardcoded the new Minus behavior
2019-06-10 15:42:37 +00:00
MT_MINUSDIRT, // Minus dirt
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MT_SPRINGSHELL, // Spring Shell
MT_YELLOWSHELL, // Spring Shell (yellow)
MT_UNIDUS, // Unidus
MT_UNIBALL, // Unidus Ball
Hardcoded the Canarivore
2019-06-10 11:58:16 +00:00
MT_CANARIVORE, // Canarivore
MT_CANARIVORE_GAS, // Canarivore gas
Hardcoded the Pyre Fly
2019-08-30 06:17:25 +00:00
MT_PYREFLY, // Pyre Fly
MT_PYREFLY_FIRE, // Pyre Fly fire
Hardcoded the Pterabyte (without the grabbing mechanic)
2019-09-29 08:39:09 +00:00
MT_PTERABYTESPAWNER, // Pterabyte spawner
MT_PTERABYTEWAYPOINT, // Pterabyte waypoint
MT_PTERABYTE, // Pterabyte
Add Dragonbomber enemy
2019-11-17 21:23:59 +00:00
MT_DRAGONBOMBER, // Dragonbomber
MT_DRAGONWING, // Dragonbomber wing
MT_DRAGONTAIL, // Dragonbomber tail segment
MT_DRAGONMINE, // Dragonbomber mine
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Generic Boss Items
MT_BOSSEXPLODE,
MT_SONIC3KBOSSEXPLODE,
MT_BOSSFLYPOINT,
MT_EGGTRAP,
MT_BOSS3WAYPOINT,
MT_BOSS9GATHERPOINT,
Motor's new Eggman sprites, along with some other sweet bits of boss polish. What else can I say? Just play it.
2019-08-30 18:19:54 +00:00
MT_BOSSJUNK,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Boss 1
MT_EGGMOBILE,
MT_JETFUME1,
MT_EGGMOBILE_BALL,
MT_EGGMOBILE_TARGET,
MT_EGGMOBILE_FIRE,
// Boss 2
MT_EGGMOBILE2,
MT_EGGMOBILE2_POGO,
MT_GOOP,
* ALMOST SORTA IMPLEMENTED A NON-HACKY SPINNING FLAMEJET. For some reason, they wanna step down onto the platform - and I've been figuring this out for too long to see what's causing that tonight. * Hardcoded a bunch of stuff from patch.dta. All works fine, but still more to do.
2017-01-21 01:09:39 +00:00
MT_GOOPTRAIL,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Boss 3
MT_EGGMOBILE3,
MT_FAKEMOBILE,
Hardcoded DSZ3 shockwave
2019-09-25 21:27:51 +00:00
MT_SHOCKWAVE,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Boss 4
MT_EGGMOBILE4,
MT_EGGMOBILE4_MACE,
MT_JETFLAME,
ha ha ha how can i possibly describe this commit Just wait for the MR, it won't be far behind.
2019-07-08 12:26:40 +00:00
MT_EGGROBO1,
MT_EGGROBO1JET,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Hardcoded all the main Fang-specific object types, states and sprites. This cannot be compiled as-is right now for the following reasons: * Numerous actions still need to be hardcoded. * MT_FBOMB uses the TNT barrel explosion (and by extention A_TNTExplode) for its death state. This is a pickle, I'll deal with it when I get to it. Also missing: * Fang waypoint object type+states. * Fang's good looks (to be put in the resource files obviously). * Fang's brain.
2019-05-02 17:01:18 +00:00
// Boss 5
MT_FANG,
Remember when Lach recorded their live reaction to 2.2 so far? Do you recall what the reaction to ACZ3 was? If you don't, the reaction was "WHAT?? Why is he here? This is GREAT but, what??" And while the reaction is on the positive end of things, it's stll clearly not advisable for our defining Big Reveal of the already huge update. To this end: Here is a mini cutscene! https://cdn.discordapp.com/attachments/428262628893261828/626207624043429898/srb20005.gif * He's digging through Eggman's trash. * Clearly doesn't expect to see you! * Ready for a fight all the same. * You can attack him during the mini cutscene if you're impatient. * Skipped if you give him MTF_AMBUSH. * Requires new assets (including map) to test, but I'm not ready to make a MR yet because I have other thoughts first. Also, since I was poking around in p_enemy.c, I fixed A_Boss1Laser's issues (not working with direct 2.1 port states and having the weird secondary attack).
2019-09-25 13:36:20 +00:00
MT_BROKENROBOT,
* Add vwre vwre intro for Fang Clone Fighter battle. (Still skipped with presence of MTF_AMBUSH) * https://cdn.discordapp.com/attachments/428262628893261828/626792815451701259/srb20006.gif * Add fadeout instead of slapstick for Fang Clone Fighter death. * Allow placed Fang and Metal Sonic objects to be marked as Clone Fighters always through presence of MTF_EXTRA.
2019-09-26 16:06:29 +00:00
MT_VWREF,
MT_VWREB,
MT_PROJECTORLIGHT,
Hardcoded all the main Fang-specific object types, states and sprites. This cannot be compiled as-is right now for the following reasons: * Numerous actions still need to be hardcoded. * MT_FBOMB uses the TNT barrel explosion (and by extention A_TNTExplode) for its death state. This is a pickle, I'll deal with it when I get to it. Also missing: * Fang waypoint object type+states. * Fang's good looks (to be put in the resource files obviously). * Fang's brain.
2019-05-02 17:01:18 +00:00
MT_FBOMB,
Hardcode the bomb's explosion states, the dust object type and states, and the sprite prefixes for both
2019-05-23 20:51:58 +00:00
MT_TNTDUST, // also used by barrel
Hardcoded all the main Fang-specific object types, states and sprites. This cannot be compiled as-is right now for the following reasons: * Numerous actions still need to be hardcoded. * MT_FBOMB uses the TNT barrel explosion (and by extention A_TNTExplode) for its death state. This is a pickle, I'll deal with it when I get to it. Also missing: * Fang waypoint object type+states. * Fang's good looks (to be put in the resource files obviously). * Fang's brain.
2019-05-02 17:01:18 +00:00
MT_FSGNA,
MT_FSGNB,
Hardcode Fang waypoint object type (turns out no state is needed)
2019-05-02 17:11:44 +00:00
MT_FANGWAYPOINT,
Hardcoded all the main Fang-specific object types, states and sprites. This cannot be compiled as-is right now for the following reasons: * Numerous actions still need to be hardcoded. * MT_FBOMB uses the TNT barrel explosion (and by extention A_TNTExplode) for its death state. This is a pickle, I'll deal with it when I get to it. Also missing: * Fang waypoint object type+states. * Fang's good looks (to be put in the resource files obviously). * Fang's brain.
2019-05-02 17:01:18 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Black Eggman (Boss 7)
MT_BLACKEGGMAN,
MT_BLACKEGGMAN_HELPER,
MT_BLACKEGGMAN_GOOPFIRE,
MT_BLACKEGGMAN_MISSILE,
// New Very-Last-Minute 2.1 Brak Eggman (Cy-Brak-demon)
MT_CYBRAKDEMON,
MT_CYBRAKDEMON_ELECTRIC_BARRIER,
MT_CYBRAKDEMON_MISSILE,
MT_CYBRAKDEMON_FLAMESHOT,
MT_CYBRAKDEMON_FLAMEREST,
MT_CYBRAKDEMON_TARGET_RETICULE,
SRB2 2.1.7 release
2014-04-14 05:14:58 +00:00
MT_CYBRAKDEMON_TARGET_DOT,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MT_CYBRAKDEMON_NAPALM_BOMB_LARGE,
MT_CYBRAKDEMON_NAPALM_BOMB_SMALL,
MT_CYBRAKDEMON_NAPALM_FLAMES,
MT_CYBRAKDEMON_VILE_EXPLOSION,
// Metal Sonic (Boss 9)
MT_METALSONIC_RACE,
MT_METALSONIC_BATTLE,
MT_MSSHIELD_FRONT,
MT_MSGATHER,
// Collectible Items
MT_RING,
MT_FLINGRING, // Lost ring
Bit of a random one today, but the branch approaches completion... * Bomb sphere! Paraloopable hazard. Replaces MT_SPECIALSPIKEBALL. * Blueberry bushes, both normal and Xmas, from patch.dta. * BSZ tulips, also from patch.dta! * Frozen Hillside badniks - Penguinator and Pophat. * Frozen Hillside ice decoration! * Fixed some big bugs with the DSZ light beams. * Made multi-mare special stages work, in a troll way - the Chaos Emerald disappears in a puff of smoke, and the Spinbobert laughter sound plays... >:3c * Reverted the mobjtype number changes from the source SOC/Lua, which we can do later when doing a final pass of the levels. * State optimisation. * Serious cruft-removal of the NiGHTS drone thinker. * Fix the issues where the player wouldn't curl into jump in waterslides or dropping off rope-hangs. * Tweak NiGHTS player flashing. * Add text colour support to the titlecard font. * Use that to make the PRESS SPIN\nMID-JUMP thing when you get all Chaos Emeralds use the titlecard font for readability. * Fix the GOT ALL EMERALDS page not lasting the correct, extended amount of time. * Fix that thing where flying mid-spin didn't enact autobrake. * Modify graymap a little on Sryder's suggestion. * [COMPLETELY UNRELATED] fix that thing where the addons menu will fail on files/paths with spaces in [/COMPLETELY UNRELATED]
2018-06-05 16:22:28 +00:00
MT_BLUESPHERE, // Blue sphere for special stages
MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP entries
2018-08-10 04:19:56 +00:00
MT_FLINGBLUESPHERE, // Lost blue sphere
Bit of a random one today, but the branch approaches completion... * Bomb sphere! Paraloopable hazard. Replaces MT_SPECIALSPIKEBALL. * Blueberry bushes, both normal and Xmas, from patch.dta. * BSZ tulips, also from patch.dta! * Frozen Hillside badniks - Penguinator and Pophat. * Frozen Hillside ice decoration! * Fixed some big bugs with the DSZ light beams. * Made multi-mare special stages work, in a troll way - the Chaos Emerald disappears in a puff of smoke, and the Spinbobert laughter sound plays... >:3c * Reverted the mobjtype number changes from the source SOC/Lua, which we can do later when doing a final pass of the levels. * State optimisation. * Serious cruft-removal of the NiGHTS drone thinker. * Fix the issues where the player wouldn't curl into jump in waterslides or dropping off rope-hangs. * Tweak NiGHTS player flashing. * Add text colour support to the titlecard font. * Use that to make the PRESS SPIN\nMID-JUMP thing when you get all Chaos Emeralds use the titlecard font for readability. * Fix the GOT ALL EMERALDS page not lasting the correct, extended amount of time. * Fix that thing where flying mid-spin didn't enact autobrake. * Modify graymap a little on Sryder's suggestion. * [COMPLETELY UNRELATED] fix that thing where the addons menu will fail on files/paths with spaces in [/COMPLETELY UNRELATED]
2018-06-05 16:22:28 +00:00
MT_BOMBSPHERE,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MT_REDTEAMRING, //Rings collectable by red team.
MT_BLUETEAMRING, //Rings collectable by blue team.
Hardcoded SOC_TOKE from patch.dta Or rather, I killed anything to do with the old background orb, renamed all "EMMY" stuff to "TOKEN", and of course adjusted the new S_TOKEN accordingly
2017-07-15 19:15:34 +00:00
MT_TOKEN, // Special Stage token for special stage
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MT_REDFLAG, // Red CTF Flag
MT_BLUEFLAG, // Blue CTF Flag
MT_EMBLEM,
MT_EMERALD1,
MT_EMERALD2,
MT_EMERALD3,
MT_EMERALD4,
MT_EMERALD5,
MT_EMERALD6,
MT_EMERALD7,
MT_EMERHUNT, // Emerald Hunt
MT_EMERALDSPAWN, // Emerald spawner w/ delay
MT_FLINGEMERALD, // Lost emerald
// Springs and others
MT_FAN,
* Bumpers and Balloons in a more final state. * Blue diagonal springs, because that gap is very, very odd. * Improved A_SpawnFreshCopy. * Tweaked P_LookForEnemies for consistency's sake. (Previously, it was impossible to make a spring that could neither be homing-attacked or attraction-shotted.)
2018-05-19 23:04:39 +00:00
MT_STEAM,
MT_BUMPER,
MT_BALLOON,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MT_YELLOWSPRING,
MT_REDSPRING,
* Bumpers and Balloons in a more final state. * Blue diagonal springs, because that gap is very, very odd. * Improved A_SpawnFreshCopy. * Tweaked P_LookForEnemies for consistency's sake. (Previously, it was impossible to make a spring that could neither be homing-attacked or attraction-shotted.)
2018-05-19 23:04:39 +00:00
MT_BLUESPRING,
MT_YELLOWDIAG,
MT_REDDIAG,
MT_BLUEDIAG,
MT_YELLOWHORIZ,
MT_REDHORIZ,
MT_BLUEHORIZ,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
* New object types! * Red and yellow Boost panels! * Added because SUBARASHII and KIMOKAWAIII had several levels using them, and I wanted to make them look better. * https://cdn.discordapp.com/attachments/359091121789468672/634486669202161674/srb20015.gif * Uses the mapthingnums of Glaber's SOC resource boosters, but absolutely nothing else - not even the magnitudes. * Apply MF_AMBUSH to force the player into a spin - even if they don't have a spin ability! * Banpyura! * A Crushstacean with a spring instead of a crushclaw. * https://cdn.discordapp.com/attachments/428262628893261828/634432099306176512/srb20019.gif * Wanted this for a while, finally added it. * Improved springs. * Add pw_noautobrake to disable autobrake for half a second when touching yellow horizontal springs, and a second when touching red ones, even on the ground. * Add pw_justsprung to disable directionchar for a few tics while touching any springs with a horizontal component to their velocity. * Add the diagonal spring flag options Red and Yellow Diagonal Springs have to the Blue Diagonal Spring as well. * Started but decided against a tip of the hat to the CD spring spin, hidden behind #define SPRINGSPIN. * Make directionchar "lag behind" a little bit in waterslides. * Improved flame jets. * They now use new sprites for having their flames move upwards and sideways, instead of having them always face downwards like in 2.1! * Fixed a mixed declaration and code error in A_RolloutRock. (Sorry Lach!) * Make the Amy Cameo only spawn in SP, Record Attack, or Co-op unless it's the Clone Mode. * Improved ZB config. * Add above new types. * Add Blue Diagonal Spring, which existed in the source but not the config. * Re-order enemies in ZB config by zone (but keep them in the Enemies section only).
2019-10-17 20:50:26 +00:00
MT_BOOSTERSEG,
MT_BOOSTERROLLER,
MT_YELLOWBOOSTER,
MT_REDBOOSTER,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Interactive Objects
MT_BUBBLES, // Bubble source
MT_SIGN, // Level end sign
MT_SPIKEBALL, // Spike Ball
MT_SPINFIRE,
MT_SPIKE,
Starting work for hardcoding wall spikes
2017-07-13 21:42:08 +00:00
MT_WALLSPIKE,
MT_WALLSPIKEBASE,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MT_STARPOST,
MT_BIGMINE,
* Billiards mines! With support for both above and below water, replacing both the below-and-above-water old mines at once. * Explosion executors. * Minor refactor of P_KillMobj.
2018-04-26 19:18:51 +00:00
MT_BLASTEXECUTOR,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MT_CANNONLAUNCHER,
// Monitor miscellany
rewrite of monitors to accomodate repeat use monitors. It's a lot nicer in general, honestly. I think a couple bugs with custom monitors respawning got fixed in the process. Note that a monitorgfx.wad is needed if you want to see things besides <!>s for monitors, due to graphic changes.
2015-12-31 16:38:23 +00:00
MT_BOXSPARKLE,
// Monitor boxes -- regular
MT_RING_BOX,
MT_PITY_BOX,
MT_ATTRACT_BOX,
MT_FORCE_BOX,
MT_ARMAGEDDON_BOX,
MT_WHIRLWIND_BOX,
MT_ELEMENTAL_BOX,
MT_SNEAKERS_BOX,
MT_INVULN_BOX,
MT_1UP_BOX,
MT_EGGMAN_BOX,
MT_MIXUP_BOX,
MT_MYSTERY_BOX,
MT_GRAVITY_BOX,
MT_RECYCLER_BOX,
MT_SCORE1K_BOX,
MT_SCORE10K_BOX,
Sonic 3 shields implemented at a basic visual/functional level - no abilities yet.
2016-10-13 14:13:33 +00:00
MT_FLAMEAURA_BOX,
MT_BUBBLEWRAP_BOX,
MT_THUNDERCOIN_BOX,
rewrite of monitors to accomodate repeat use monitors. It's a lot nicer in general, honestly. I think a couple bugs with custom monitors respawning got fixed in the process. Note that a monitorgfx.wad is needed if you want to see things besides <!>s for monitors, due to graphic changes.
2015-12-31 16:38:23 +00:00
// Monitor boxes -- repeating (big) boxes
Big monitors are "Gold Monitors" now. The useless ones have been removed, too, and they should always spawn as what they should regardless of settings. By the way, graphics are at https://dl.dropboxusercontent.com/u/3518218/22/monitorgfx.wad
2015-12-31 23:29:08 +00:00
MT_PITY_GOLDBOX,
MT_ATTRACT_GOLDBOX,
MT_FORCE_GOLDBOX,
MT_ARMAGEDDON_GOLDBOX,
MT_WHIRLWIND_GOLDBOX,
MT_ELEMENTAL_GOLDBOX,
MT_SNEAKERS_GOLDBOX,
MT_INVULN_GOLDBOX,
Fixed sprite conflict BS Also added the eggman goldbox back
2016-09-30 02:24:05 +00:00
MT_EGGMAN_GOLDBOX,
Big monitors are "Gold Monitors" now. The useless ones have been removed, too, and they should always spawn as what they should regardless of settings. By the way, graphics are at https://dl.dropboxusercontent.com/u/3518218/22/monitorgfx.wad
2015-12-31 23:29:08 +00:00
MT_GRAVITY_GOLDBOX,
Sonic 3 shields implemented at a basic visual/functional level - no abilities yet.
2016-10-13 14:13:33 +00:00
MT_FLAMEAURA_GOLDBOX,
MT_BUBBLEWRAP_GOLDBOX,
MT_THUNDERCOIN_GOLDBOX,
rewrite of monitors to accomodate repeat use monitors. It's a lot nicer in general, honestly. I think a couple bugs with custom monitors respawning got fixed in the process. Note that a monitorgfx.wad is needed if you want to see things besides <!>s for monitors, due to graphic changes.
2015-12-31 16:38:23 +00:00
// Monitor boxes -- special
MT_RING_REDBOX,
MT_RING_BLUEBOX,
// Monitor icons
MT_RING_ICON,
MT_PITY_ICON,
MT_ATTRACT_ICON,
MT_FORCE_ICON,
MT_ARMAGEDDON_ICON,
MT_WHIRLWIND_ICON,
MT_ELEMENTAL_ICON,
MT_SNEAKERS_ICON,
MT_INVULN_ICON,
MT_1UP_ICON,
MT_EGGMAN_ICON,
MT_MIXUP_ICON,
MT_GRAVITY_ICON,
MT_RECYCLER_ICON,
MT_SCORE1K_ICON,
MT_SCORE10K_ICON,
Sonic 3 shields implemented at a basic visual/functional level - no abilities yet.
2016-10-13 14:13:33 +00:00
MT_FLAMEAURA_ICON,
MT_BUBBLEWRAP_ICON,
MT_THUNDERCOIN_ICON,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Projectiles
MT_ROCKET,
MT_LASER,
MT_TORPEDO,
MT_TORPEDO2, // silent
MT_ENERGYBALL,
MT_MINE, // Skim/Jetty-Syn mine
MT_JETTBULLET, // Jetty-Syn Bullet
MT_TURRETLASER,
MT_CANNONBALL, // Cannonball
MT_CANNONBALLDECOR, // Decorative/still cannonball
MT_ARROW, // Arrow
WIP new states for Glaregoyle
2019-10-30 16:32:19 +00:00
MT_DEMONFIRE, // Glaregoyle fire
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Secret stuff. (I intend to keep candid discussion of this outside of any commits; you'll see me write up a comment describing what's going on here soon.)
2019-11-01 15:48:50 +00:00
// The letter
MT_LETTER,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Greenflower Scenery
MT_GFZFLOWER1,
MT_GFZFLOWER2,
MT_GFZFLOWER3,
Bit of a random one today, but the branch approaches completion... * Bomb sphere! Paraloopable hazard. Replaces MT_SPECIALSPIKEBALL. * Blueberry bushes, both normal and Xmas, from patch.dta. * BSZ tulips, also from patch.dta! * Frozen Hillside badniks - Penguinator and Pophat. * Frozen Hillside ice decoration! * Fixed some big bugs with the DSZ light beams. * Made multi-mare special stages work, in a troll way - the Chaos Emerald disappears in a puff of smoke, and the Spinbobert laughter sound plays... >:3c * Reverted the mobjtype number changes from the source SOC/Lua, which we can do later when doing a final pass of the levels. * State optimisation. * Serious cruft-removal of the NiGHTS drone thinker. * Fix the issues where the player wouldn't curl into jump in waterslides or dropping off rope-hangs. * Tweak NiGHTS player flashing. * Add text colour support to the titlecard font. * Use that to make the PRESS SPIN\nMID-JUMP thing when you get all Chaos Emeralds use the titlecard font for readability. * Fix the GOT ALL EMERALDS page not lasting the correct, extended amount of time. * Fix that thing where flying mid-spin didn't enact autobrake. * Modify graymap a little on Sryder's suggestion. * [COMPLETELY UNRELATED] fix that thing where the addons menu will fail on files/paths with spaces in [/COMPLETELY UNRELATED]
2018-06-05 16:22:28 +00:00
MT_BLUEBERRYBUSH,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MT_BERRYBUSH,
MT_BUSH,
Bit of a random one today, but the branch approaches completion... * Bomb sphere! Paraloopable hazard. Replaces MT_SPECIALSPIKEBALL. * Blueberry bushes, both normal and Xmas, from patch.dta. * BSZ tulips, also from patch.dta! * Frozen Hillside badniks - Penguinator and Pophat. * Frozen Hillside ice decoration! * Fixed some big bugs with the DSZ light beams. * Made multi-mare special stages work, in a troll way - the Chaos Emerald disappears in a puff of smoke, and the Spinbobert laughter sound plays... >:3c * Reverted the mobjtype number changes from the source SOC/Lua, which we can do later when doing a final pass of the levels. * State optimisation. * Serious cruft-removal of the NiGHTS drone thinker. * Fix the issues where the player wouldn't curl into jump in waterslides or dropping off rope-hangs. * Tweak NiGHTS player flashing. * Add text colour support to the titlecard font. * Use that to make the PRESS SPIN\nMID-JUMP thing when you get all Chaos Emeralds use the titlecard font for readability. * Fix the GOT ALL EMERALDS page not lasting the correct, extended amount of time. * Fix that thing where flying mid-spin didn't enact autobrake. * Modify graymap a little on Sryder's suggestion. * [COMPLETELY UNRELATED] fix that thing where the addons menu will fail on files/paths with spaces in [/COMPLETELY UNRELATED]
2018-06-05 16:22:28 +00:00
Hardcoded SOC_TREE from patch.dta Also made sure the GFZ trees have MF2_STANDONME
2017-07-13 16:29:15 +00:00
// Trees (both GFZ and misc)
MT_GFZTREE,
MT_GFZBERRYTREE,
MT_GFZCHERRYTREE,
MT_CHECKERTREE,
MT_CHECKERSUNSETTREE,
MT_FHZTREE, // Frozen Hillside
MT_FHZPINKTREE,
MT_POLYGONTREE,
MT_BUSHTREE,
MT_BUSHREDTREE,
MONSTER COMMIT. OLD SPECIAL STAGES: * Spheres in old special stages instead of rings! * Individual timers in old special stages instead of a global one! * Old special stages use a variant of the NiGHTS HUD now! * Special stage damage in old special stages loses 5 seconds of time instead of 10 rings/spheres! * All damage gained through old special stages is converted to special stage damage! As a consequence, the special spikeball has no need to be special anymore. * Made emerald gaining function be based on special stage number rather than gained emeralds! * Consistency with... NiGHTS SPECIAL STAGES: * Spheres now flash in bonus time. https://cdn.discordapp.com/attachments/400761370800422922/452590553100713984/srb20032.gif * Sphere and ring mapthingnums are now less fucked up in 'em. (Rings are 300, same as usual, while Spheres are now 1706 replacing NiGHTS Wings.) SPECIAL STAGES IN GENERAL: * useNightsSS is now dead. Each individual special stage is now assessed for NiGHTS-mode behaviour based on maptol & TOL_NIGHTS. * CRAWLA HONCHO\n CAN NOW BE\n SUPER CRAWLA HONCHO end tally modification now also includes a mini-tutorial on turning super. https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif * SONIC GOT A CHAOS EMERALD? https://cdn.discordapp.com/attachments/400761370800422922/452623869497573386/srb20034.gif NiGHTS NON-SPECIAL STAGES: * Colour Chips and Star Chips! Replaces Spheres and Rings of NiGHTS Special Stages. * Colour Chips turn yellow in bonus time. * Ideya! * Its own "drowning" music! * All of the object types for Dream Hill. * GIF: https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif RANDOM BS: * Turn super with the spin button instead of the jump button! * Followmobj now correctly set with P_SetTarget instead of pointer assignment. * Emerald hunt uses new sprites! * Made unlock noise different from emblem gain noise! (It's the CRAWLA HONCHO CAN NOW TURN yadda yadda sound from S3K now.)
2018-06-03 21:41:54 +00:00
MT_SPRINGTREE,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Techno Hill Scenery
* ALMOST SORTA IMPLEMENTED A NON-HACKY SPINNING FLAMEJET. For some reason, they wanna step down onto the platform - and I've been figuring this out for too long to see what's causing that tonight. * Hardcoded a bunch of stuff from patch.dta. All works fine, but still more to do.
2017-01-21 01:09:39 +00:00
MT_THZFLOWER1,
MT_THZFLOWER2,
Hardcoded SOC_FWR6 from THZ1.wad, also tweaked MT_THZFLOWERB's hitbox
2018-01-19 17:56:18 +00:00
MT_THZFLOWER3,
Hardcoded LUA_THZT from THZ1.wad, giving us the funny-looking steam whistle tree This concludes hardcoding of scenery items for THZ
2018-01-22 18:41:14 +00:00
MT_THZTREE, // Steam whistle tree/bush
MT_THZTREEBRANCH, // branch of said tree
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MT_ALARM,
// Deep Sea Scenery
MT_GARGOYLE, // Deep Sea Gargoyle
Hardcoded the big gargoyle
2017-04-18 19:38:13 +00:00
MT_BIGGARGOYLE, // Deep Sea Gargoyle (Big)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MT_SEAWEED, // DSZ Seaweed
MT_WATERDRIP, // Dripping Water source
MT_WATERDROP, // Water drop from dripping water
Hardcoded DSZ3 shockwave
2019-09-25 21:27:51 +00:00
MT_CORAL1, // Coral
Small DSZ coral tweaks.
2019-09-19 22:51:44 +00:00
MT_CORAL2,
MT_CORAL3,
MT_CORAL4,
MT_CORAL5,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MT_BLUECRYSTAL, // Blue Crystal
The contents of DSZ-f16.wad's LUA_A000 Lua script are in now Thing type numbers may be changed later
2017-12-08 18:26:32 +00:00
MT_KELP, // Kelp
New animated DSZ kelp.
2019-09-18 00:05:19 +00:00
MT_ANIMALGAETOP, // Animated algae top
MT_ANIMALGAESEG, // Animated algae segment
The contents of DSZ-f16.wad's LUA_A000 Lua script are in now Thing type numbers may be changed later
2017-12-08 18:26:32 +00:00
MT_DSZSTALAGMITE, // Deep Sea 1 Stalagmite
MT_DSZ2STALAGMITE, // Deep Sea 2 Stalagmite
MT_LIGHTBEAM, // DSZ Light beam
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Castle Eggman Scenery
MT_CHAIN, // CEZ Chain
MT_FLAME, // Flame (has corona)
CEZ1 flames now implemented. Please note Brak flames use a FF_ANIMATE state instead of the normal flame ones because they are spammed a lot, and the normal ones make particles.
2017-01-21 12:39:41 +00:00
MT_FLAMEPARTICLE,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MT_EGGSTATUE, // Eggman Statue
MT_MACEPOINT, // Mace rotation point
Hooh boy. **** * MF2_MACEROTATE. Apply to any object. Replaces the indiscriminate spamming of A_MaceRotate each tic. **** * Mace point mapthings have been slightly modified. - MTF_AMBUSH: bigger luke theory (has no effect on custom mace, different effect on spring mace) - MTF_OBJECTFLIP: flips the objects, but nothing else - just so it doesn't look out of place in gravflip sections - MTF_OBJECTSPECIAL: keeps it from attempting to play swinging sounds - angle: tag of controlling linedef - parameter: number of "spokes" minus one - for example, a parameter of 2 results in 3 equidistant maces rotating around the same point. **** * Mace linedefs have been significantly revamped. - line dx: number of chain links - line dy: speed (in FU) - frontside floor height: Pitch (in degrees; how much it "tilts" over - Yaw influences the axis it's tilting on) - frontside ceiling height: Yaw (in degrees; rotation of entire thing on xy plane) - frontside x offset: Phase (in degrees; how far it is through the rotation cycle) - frontside y offset: Max speed (in FU; if less than speed, set to speed*2) - backside floor height: Pinch (in degrees; 0 if no backside; essentially makes rotation conical instead of wheel-like) - backside ceiling height: Roll (in degrees; 0 if no backside; rotates on the axis of the spinning - identical to Phase for spinning maces, but useful for rotating swinging maces as opposed to just offsetting them) - backside x offset: Number of "antispokes" (0 if no backside; makes that many spokes not exist so you can put another mace/chain type in there instead; for combo mace/chain instead turns them into chains directly) - backside y offset: Width (in number of extra chains per side; 0 if no backside; creates a "skiprope" arrangement) ---- - ML_NOCLIMB: for chains and chain-mace combos, allow for player control of yaw through strafe keys - ML_EFFECT1: replacing the seperate mapthings, this makes a mace type swing instead of spin. - ML_EFFECT2: for all spokes of the mace wheel ending in maces, make the chains out of the mace type (inverted for firebars) - ML_EFFECT3: spawn a bonus mace type at the center(s) of rotation - ML_EFFECT4: don't clip inside ground **** * Mapthing 1104 represents both spinning and swinging maces from prior versions of SRB2. * Mapthing 1105 has gone from being a swinging mace variant to a combination of chains and maces in a single unit, provided the number of "spokes" is greater than one. * Mapthing 1105 has gone from being a swinging chain variant to a vertical spring-on-a-ball-on-a-chain. Yellow by default, apply MTF_AMBUSH to turn into a red spring. * Mapthing 1107 represents both spinning and swinging chains from prior versions of SRB2. * Mapthing 1108 is completely untouched except to port over 2.1's functionality to the new backend. * Mapthing 1109 is a Mario castle-level style firebar. This inverts the functionality of ML_EFFECT2 on the tagged linedef. * Mapthing 1110 is a free slot should we want to implement another type of base-game mace. * Mapthing 1111 is a custom mace. Use the linedef's frontside texture slots to identify a macetype mobjtype, then use the backside texture slots to identify a linktype mobjtype (defaults to MT_NULL if no backside). **** Whooh. Requires new patch.dta for sprites.
2017-07-02 14:11:09 +00:00
MT_CHAINMACEPOINT, // Combination of chains and maces point
MT_SPRINGBALLPOINT, // Spring ball point
MT_CHAINPOINT, // Mace chain
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MT_HIDDEN_SLING, // Spin mace chain (activatable)
Hooh boy. **** * MF2_MACEROTATE. Apply to any object. Replaces the indiscriminate spamming of A_MaceRotate each tic. **** * Mace point mapthings have been slightly modified. - MTF_AMBUSH: bigger luke theory (has no effect on custom mace, different effect on spring mace) - MTF_OBJECTFLIP: flips the objects, but nothing else - just so it doesn't look out of place in gravflip sections - MTF_OBJECTSPECIAL: keeps it from attempting to play swinging sounds - angle: tag of controlling linedef - parameter: number of "spokes" minus one - for example, a parameter of 2 results in 3 equidistant maces rotating around the same point. **** * Mace linedefs have been significantly revamped. - line dx: number of chain links - line dy: speed (in FU) - frontside floor height: Pitch (in degrees; how much it "tilts" over - Yaw influences the axis it's tilting on) - frontside ceiling height: Yaw (in degrees; rotation of entire thing on xy plane) - frontside x offset: Phase (in degrees; how far it is through the rotation cycle) - frontside y offset: Max speed (in FU; if less than speed, set to speed*2) - backside floor height: Pinch (in degrees; 0 if no backside; essentially makes rotation conical instead of wheel-like) - backside ceiling height: Roll (in degrees; 0 if no backside; rotates on the axis of the spinning - identical to Phase for spinning maces, but useful for rotating swinging maces as opposed to just offsetting them) - backside x offset: Number of "antispokes" (0 if no backside; makes that many spokes not exist so you can put another mace/chain type in there instead; for combo mace/chain instead turns them into chains directly) - backside y offset: Width (in number of extra chains per side; 0 if no backside; creates a "skiprope" arrangement) ---- - ML_NOCLIMB: for chains and chain-mace combos, allow for player control of yaw through strafe keys - ML_EFFECT1: replacing the seperate mapthings, this makes a mace type swing instead of spin. - ML_EFFECT2: for all spokes of the mace wheel ending in maces, make the chains out of the mace type (inverted for firebars) - ML_EFFECT3: spawn a bonus mace type at the center(s) of rotation - ML_EFFECT4: don't clip inside ground **** * Mapthing 1104 represents both spinning and swinging maces from prior versions of SRB2. * Mapthing 1105 has gone from being a swinging mace variant to a combination of chains and maces in a single unit, provided the number of "spokes" is greater than one. * Mapthing 1105 has gone from being a swinging chain variant to a vertical spring-on-a-ball-on-a-chain. Yellow by default, apply MTF_AMBUSH to turn into a red spring. * Mapthing 1107 represents both spinning and swinging chains from prior versions of SRB2. * Mapthing 1108 is completely untouched except to port over 2.1's functionality to the new backend. * Mapthing 1109 is a Mario castle-level style firebar. This inverts the functionality of ML_EFFECT2 on the tagged linedef. * Mapthing 1110 is a free slot should we want to implement another type of base-game mace. * Mapthing 1111 is a custom mace. Use the linedef's frontside texture slots to identify a macetype mobjtype, then use the backside texture slots to identify a linktype mobjtype (defaults to MT_NULL if no backside). **** Whooh. Requires new patch.dta for sprites.
2017-07-02 14:11:09 +00:00
MT_FIREBARPOINT, // Firebar
MT_CUSTOMMACEPOINT, // Custom mace
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MT_SMALLMACECHAIN, // Small Mace Chain
MT_BIGMACECHAIN, // Big Mace Chain
MT_SMALLMACE, // Small Mace
MT_BIGMACE, // Big Mace
* Castlebot Facestabbers. * Facestabber statues, of both the suspicious and non-suspicious kind. * New object type for the end of grabbable chains. * I moved my compilation .bat file to my Releases folder, so it should .gitignore .bat's. * Random extra stuff.
2018-05-24 00:40:57 +00:00
MT_SMALLGRABCHAIN, // Small Grab Chain
MT_BIGGRABCHAIN, // Big Grab Chain
Hooh boy. **** * MF2_MACEROTATE. Apply to any object. Replaces the indiscriminate spamming of A_MaceRotate each tic. **** * Mace point mapthings have been slightly modified. - MTF_AMBUSH: bigger luke theory (has no effect on custom mace, different effect on spring mace) - MTF_OBJECTFLIP: flips the objects, but nothing else - just so it doesn't look out of place in gravflip sections - MTF_OBJECTSPECIAL: keeps it from attempting to play swinging sounds - angle: tag of controlling linedef - parameter: number of "spokes" minus one - for example, a parameter of 2 results in 3 equidistant maces rotating around the same point. **** * Mace linedefs have been significantly revamped. - line dx: number of chain links - line dy: speed (in FU) - frontside floor height: Pitch (in degrees; how much it "tilts" over - Yaw influences the axis it's tilting on) - frontside ceiling height: Yaw (in degrees; rotation of entire thing on xy plane) - frontside x offset: Phase (in degrees; how far it is through the rotation cycle) - frontside y offset: Max speed (in FU; if less than speed, set to speed*2) - backside floor height: Pinch (in degrees; 0 if no backside; essentially makes rotation conical instead of wheel-like) - backside ceiling height: Roll (in degrees; 0 if no backside; rotates on the axis of the spinning - identical to Phase for spinning maces, but useful for rotating swinging maces as opposed to just offsetting them) - backside x offset: Number of "antispokes" (0 if no backside; makes that many spokes not exist so you can put another mace/chain type in there instead; for combo mace/chain instead turns them into chains directly) - backside y offset: Width (in number of extra chains per side; 0 if no backside; creates a "skiprope" arrangement) ---- - ML_NOCLIMB: for chains and chain-mace combos, allow for player control of yaw through strafe keys - ML_EFFECT1: replacing the seperate mapthings, this makes a mace type swing instead of spin. - ML_EFFECT2: for all spokes of the mace wheel ending in maces, make the chains out of the mace type (inverted for firebars) - ML_EFFECT3: spawn a bonus mace type at the center(s) of rotation - ML_EFFECT4: don't clip inside ground **** * Mapthing 1104 represents both spinning and swinging maces from prior versions of SRB2. * Mapthing 1105 has gone from being a swinging mace variant to a combination of chains and maces in a single unit, provided the number of "spokes" is greater than one. * Mapthing 1105 has gone from being a swinging chain variant to a vertical spring-on-a-ball-on-a-chain. Yellow by default, apply MTF_AMBUSH to turn into a red spring. * Mapthing 1107 represents both spinning and swinging chains from prior versions of SRB2. * Mapthing 1108 is completely untouched except to port over 2.1's functionality to the new backend. * Mapthing 1109 is a Mario castle-level style firebar. This inverts the functionality of ML_EFFECT2 on the tagged linedef. * Mapthing 1110 is a free slot should we want to implement another type of base-game mace. * Mapthing 1111 is a custom mace. Use the linedef's frontside texture slots to identify a macetype mobjtype, then use the backside texture slots to identify a linktype mobjtype (defaults to MT_NULL if no backside). **** Whooh. Requires new patch.dta for sprites.
2017-07-02 14:11:09 +00:00
MT_YELLOWSPRINGBALL, // Yellow spring on a ball
MT_REDSPRINGBALL, // Red spring on a ball
MT_SMALLFIREBAR, // Small Firebar
MT_BIGFIREBAR, // Big Firebar
* CEZ decorations! * Moved a bunch of stuff that had no business being in mapthing spawns into mobj spawns.
2018-05-22 10:04:28 +00:00
MT_CEZFLOWER, // Flower
Add a blue variant of the pole banner & change some doomednums.
2019-07-14 15:30:33 +00:00
MT_CEZPOLE1, // Pole (with red banner)
MT_CEZPOLE2, // Pole (with blue banner)
MT_CEZBANNER1, // Banner (red)
MT_CEZBANNER2, // Banner (blue)
* CEZ decorations! * Moved a bunch of stuff that had no business being in mapthing spawns into mobj spawns.
2018-05-22 10:04:28 +00:00
MT_PINETREE, // Pine Tree
MT_CEZBUSH1, // Bush 1
MT_CEZBUSH2, // Bush 2
MT_CANDLE, // Candle
MT_CANDLEPRICKET, // Candle pricket
MT_FLAMEHOLDER, // Flame holder
MT_FIRETORCH, // Fire torch
Add a blue variant of the waving flags.
2019-07-14 14:50:45 +00:00
MT_WAVINGFLAG1, // Waving flag (red)
MT_WAVINGFLAG2, // Waving flag (blue)
MT_WAVINGFLAGSEG1, // Waving flag segment (red)
MT_WAVINGFLAGSEG2, // Waving flag segment (blue)
* CEZ decorations! * Moved a bunch of stuff that had no business being in mapthing spawns into mobj spawns.
2018-05-22 10:04:28 +00:00
MT_CRAWLASTATUE, // Crawla statue
* Castlebot Facestabbers. * Facestabber statues, of both the suspicious and non-suspicious kind. * New object type for the end of grabbable chains. * I moved my compilation .bat file to my Releases folder, so it should .gitignore .bat's. * Random extra stuff.
2018-05-24 00:40:57 +00:00
MT_FACESTABBERSTATUE, // Facestabber statue
MT_SUSPICIOUSFACESTABBERSTATUE, // :eggthinking:
Hardcoded Brambles.lua from CEZRes.pk3, changed thing type to 1125
2018-08-22 16:16:11 +00:00
MT_BRAMBLES, // Brambles
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Arid Canyon Scenery
MT_BIGTUMBLEWEED,
MT_LITTLETUMBLEWEED,
Updated ACZ cacti.
2019-09-18 19:40:33 +00:00
MT_CACTI1, // Tiny Red Flower Cactus
MT_CACTI2, // Small Red Flower Cactus
MT_CACTI3, // Tiny Blue Flower Cactus
MT_CACTI4, // Small Blue Flower Cactus
MT_CACTI5, // Prickly Pear
MT_CACTI6, // Barrel Cactus
MT_CACTI7, // Tall Barrel Cactus
MT_CACTI8, // Armed Cactus
MT_CACTI9, // Ball Cactus
MT_CACTI10, // Tiny Cactus
MT_CACTI11, // Small Cactus
MT_CACTITINYSEG, // Tiny Cactus Segment
MT_CACTISMALLSEG, // Small Cactus Segment
Hardcode some ACZ things
2019-05-12 02:56:23 +00:00
MT_ARIDSIGN_CAUTION, // Caution Sign
MT_ARIDSIGN_CACTI, // Cacti Sign
MT_ARIDSIGN_SHARPTURN, // Sharp Turn Sign
Hardcoded oil lamp
2019-06-08 13:50:01 +00:00
MT_OILLAMP,
Hardcoded the TNT barrels and proximity shell (using mazmazz's A_TNTExplode implementation from the minecart branch)
2019-06-09 08:51:33 +00:00
MT_TNTBARREL,
MT_PROXIMITYTNT,
Hardcoded dust devil
2019-06-08 07:51:46 +00:00
MT_DUSTDEVIL,
MT_DUSTLAYER,
MT_ARIDDUST,
More incomplete minecart hardcoding
2019-06-13 19:45:30 +00:00
MT_MINECART,
Snapper head/legs and minecart segments flash when they're destroyed
2019-06-16 13:35:32 +00:00
MT_MINECARTSEG,
More incomplete minecart hardcoding
2019-06-13 19:45:30 +00:00
MT_MINECARTSPAWNER,
MT_MINECARTEND,
MT_MINECARTENDSOLID,
MT_MINECARTSIDEMARK,
MT_MINECARTSPARK,
Hardcoded the saloon door
2019-06-12 19:20:14 +00:00
MT_SALOONDOOR,
Fix Saloon doors. * Make the center be the object stuff collides with, so that if the door is open people can't slip through. * Add an MF_AMBUSH enhancement to allow non-minecart players to travel through. * Make A_SaloonDoorSpawn more customisable. (var1 = object type, var2 = distance sides should be placed apart)
2019-10-05 12:21:35 +00:00
MT_SALOONDOORCENTER,
Hardcoded train cameo
2019-06-09 11:48:07 +00:00
MT_TRAINCAMEOSPAWNER,
MT_TRAINSEG,
Hardcoded train dust and steam spawner
2019-06-09 15:16:07 +00:00
MT_TRAINDUSTSPAWNER,
MT_TRAINSTEAMSPAWNER,
More incomplete minecart hardcoding
2019-06-13 19:45:30 +00:00
MT_MINECARTSWITCHPOINT,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Red Volcano Scenery
MT_FLAMEJET,
MT_VERTICALFLAMEJET,
MT_FLAMEJETFLAME,
MT_FJSPINAXISA, // Counter-clockwise
MT_FJSPINAXISB, // Clockwise
MT_FLAMEJETFLAMEB, // Blade's flame
Hardcoded the lavafall
2019-08-25 21:05:38 +00:00
MT_LAVAFALL,
MT_LAVAFALL_LAVA,
MT_LAVAFALLROCK,
Hardcode pumice ball Current known issues: players detached from the ball via any means other than jumping or pain do not have their ball reset properly
2019-09-29 12:18:40 +00:00
MT_ROLLOUTSPAWN,
MT_ROLLOUTROCK,
Hardcoded the RVZ scenery
2019-08-25 10:40:32 +00:00
MT_BIGFERNLEAF,
MT_BIGFERN,
MT_JUNGLEPALM,
MT_TORCHFLOWER,
MT_WALLVINE_LONG,
MT_WALLVINE_SHORT,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Dark City Scenery
// Egg Rock Scenery
// Azure Temple Scenery
WIP new states for Glaregoyle
2019-10-30 16:32:19 +00:00
MT_GLAREGOYLE,
MT_GLAREGOYLEUP,
MT_GLAREGOYLEDOWN,
MT_GLAREGOYLELONG,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MT_TARGET, // AKA Red Crystal
Add green flame sprites, state, and object
2019-10-21 08:22:20 +00:00
MT_GREENFLAME,
Add static ATZ Gargoyles
2019-10-31 11:38:28 +00:00
MT_BLUEGARGOYLE,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Stalagmites
MT_STALAGMITE0,
MT_STALAGMITE1,
MT_STALAGMITE2,
MT_STALAGMITE3,
MT_STALAGMITE4,
MT_STALAGMITE5,
MT_STALAGMITE6,
MT_STALAGMITE7,
MT_STALAGMITE8,
MT_STALAGMITE9,
// Christmas Scenery
MT_XMASPOLE,
MT_CANDYCANE,
Hardcode new/updated xmas scenery object type/state info
2017-04-18 17:32:52 +00:00
MT_SNOWMAN, // normal
MT_SNOWMANHAT, // with hat + scarf
MT_LAMPPOST1, // normal
MT_LAMPPOST2, // with snow
MT_HANGSTAR,
Amy cameo for Frozen Hillside. Wait for the MR, I'll make a fuller pitch there...
2019-10-01 17:19:37 +00:00
MT_MISTLETOE,
Hardcode new/updated xmas scenery object type/state info
2017-04-18 17:32:52 +00:00
// Xmas GFZ bushes
Bit of a random one today, but the branch approaches completion... * Bomb sphere! Paraloopable hazard. Replaces MT_SPECIALSPIKEBALL. * Blueberry bushes, both normal and Xmas, from patch.dta. * BSZ tulips, also from patch.dta! * Frozen Hillside badniks - Penguinator and Pophat. * Frozen Hillside ice decoration! * Fixed some big bugs with the DSZ light beams. * Made multi-mare special stages work, in a troll way - the Chaos Emerald disappears in a puff of smoke, and the Spinbobert laughter sound plays... >:3c * Reverted the mobjtype number changes from the source SOC/Lua, which we can do later when doing a final pass of the levels. * State optimisation. * Serious cruft-removal of the NiGHTS drone thinker. * Fix the issues where the player wouldn't curl into jump in waterslides or dropping off rope-hangs. * Tweak NiGHTS player flashing. * Add text colour support to the titlecard font. * Use that to make the PRESS SPIN\nMID-JUMP thing when you get all Chaos Emeralds use the titlecard font for readability. * Fix the GOT ALL EMERALDS page not lasting the correct, extended amount of time. * Fix that thing where flying mid-spin didn't enact autobrake. * Modify graymap a little on Sryder's suggestion. * [COMPLETELY UNRELATED] fix that thing where the addons menu will fail on files/paths with spaces in [/COMPLETELY UNRELATED]
2018-06-05 16:22:28 +00:00
MT_XMASBLUEBERRYBUSH,
Hardcode new/updated xmas scenery object type/state info
2017-04-18 17:32:52 +00:00
MT_XMASBERRYBUSH,
MT_XMASBUSH,
Bit of a random one today, but the branch approaches completion... * Bomb sphere! Paraloopable hazard. Replaces MT_SPECIALSPIKEBALL. * Blueberry bushes, both normal and Xmas, from patch.dta. * BSZ tulips, also from patch.dta! * Frozen Hillside badniks - Penguinator and Pophat. * Frozen Hillside ice decoration! * Fixed some big bugs with the DSZ light beams. * Made multi-mare special stages work, in a troll way - the Chaos Emerald disappears in a puff of smoke, and the Spinbobert laughter sound plays... >:3c * Reverted the mobjtype number changes from the source SOC/Lua, which we can do later when doing a final pass of the levels. * State optimisation. * Serious cruft-removal of the NiGHTS drone thinker. * Fix the issues where the player wouldn't curl into jump in waterslides or dropping off rope-hangs. * Tweak NiGHTS player flashing. * Add text colour support to the titlecard font. * Use that to make the PRESS SPIN\nMID-JUMP thing when you get all Chaos Emeralds use the titlecard font for readability. * Fix the GOT ALL EMERALDS page not lasting the correct, extended amount of time. * Fix that thing where flying mid-spin didn't enact autobrake. * Modify graymap a little on Sryder's suggestion. * [COMPLETELY UNRELATED] fix that thing where the addons menu will fail on files/paths with spaces in [/COMPLETELY UNRELATED]
2018-06-05 16:22:28 +00:00
// FHZ
MT_FHZICE1,
MT_FHZICE2,
Amy cameo for Frozen Hillside. Wait for the MR, I'll make a fuller pitch there...
2019-10-01 17:19:37 +00:00
MT_ROSY,
MT_CDLHRT,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
* Haunted Heights! Smashing spikeball, Cacolantern, Spinbobert and Hangster, along with the Spider and Bat flickies and general decoration/ambience stuff. * MF_PAIN and MF_MISSILE now support setting damagetype via their Mass parameter. The two existing conflicts - the fuse setting for the grenade weapon ring and the Cybrakdemon napalm bomb - had these moved to other free parameters. * A_ConnectToGround is EXTREMELY useful for palmtrees and stuff. * Some other, relatively hacky A_ functions. * (Unrelated) Remove the need for a "Mario block mode" for the token by making it natively compatible. * Spikes and their time-offsetting via that Lua script sphere made. Also allow for wallspikes to do it via their angle/360.
2018-04-28 14:13:44 +00:00
// Halloween Scenery
// Pumpkins
MT_JACKO1,
MT_JACKO2,
MT_JACKO3,
// Dr Seuss Trees
MT_HHZTREE_TOP,
MT_HHZTREE_PART,
// Misc
MT_HHZSHROOM,
MT_HHZGRASS,
MT_HHZTENTACLE1,
MT_HHZTENTACLE2,
MT_HHZSTALAGMITE_TALL,
MT_HHZSTALAGMITE_SHORT,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Botanic Serenity scenery
MT_BSZTALLFLOWER_RED,
MT_BSZTALLFLOWER_PURPLE,
MT_BSZTALLFLOWER_BLUE,
MT_BSZTALLFLOWER_CYAN,
MT_BSZTALLFLOWER_YELLOW,
MT_BSZTALLFLOWER_ORANGE,
MT_BSZFLOWER_RED,
MT_BSZFLOWER_PURPLE,
MT_BSZFLOWER_BLUE,
MT_BSZFLOWER_CYAN,
MT_BSZFLOWER_YELLOW,
MT_BSZFLOWER_ORANGE,
MT_BSZSHORTFLOWER_RED,
MT_BSZSHORTFLOWER_PURPLE,
MT_BSZSHORTFLOWER_BLUE,
MT_BSZSHORTFLOWER_CYAN,
MT_BSZSHORTFLOWER_YELLOW,
MT_BSZSHORTFLOWER_ORANGE,
MT_BSZTULIP_RED,
MT_BSZTULIP_PURPLE,
MT_BSZTULIP_BLUE,
MT_BSZTULIP_CYAN,
MT_BSZTULIP_YELLOW,
MT_BSZTULIP_ORANGE,
MT_BSZCLUSTER_RED,
MT_BSZCLUSTER_PURPLE,
MT_BSZCLUSTER_BLUE,
MT_BSZCLUSTER_CYAN,
MT_BSZCLUSTER_YELLOW,
MT_BSZCLUSTER_ORANGE,
MT_BSZBUSH_RED,
MT_BSZBUSH_PURPLE,
MT_BSZBUSH_BLUE,
MT_BSZBUSH_CYAN,
MT_BSZBUSH_YELLOW,
MT_BSZBUSH_ORANGE,
MT_BSZVINE_RED,
MT_BSZVINE_PURPLE,
MT_BSZVINE_BLUE,
MT_BSZVINE_CYAN,
MT_BSZVINE_YELLOW,
MT_BSZVINE_ORANGE,
MT_BSZSHRUB,
MT_BSZCLOVER,
De-meming.
2017-01-25 14:52:36 +00:00
MT_BIG_PALMTREE_TRUNK,
MT_BIG_PALMTREE_TOP,
MT_PALMTREE_TRUNK,
MT_PALMTREE_TOP,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Misc scenery
MT_DBALL,
MT_EGGSTATUE2,
// Powerup Indicators
Sonic 3 shields implemented at a basic visual/functional level - no abilities yet.
2016-10-13 14:13:33 +00:00
MT_ELEMENTAL_ORB, // Elemental shield mobj
MT_ATTRACT_ORB, // Attract shield mobj
MT_FORCE_ORB, // Force shield mobj
* Some shield constants renamed. * Some shield sounds swapped (can be reverted later). * Partial implementation of S3K shield abilities. * The ability to elemental-groundpound onto gold monitors without going straight through them. * Force shield ability removed because nobody could agree on it, we'll keep it blank until another idea can get through the disagreement juggernaut.
2016-10-13 14:13:33 +00:00
MT_ARMAGEDDON_ORB, // Armageddon shield mobj
MT_WHIRLWIND_ORB, // Whirlwind shield mobj
Sonic 3 shields implemented at a basic visual/functional level - no abilities yet.
2016-10-13 14:13:33 +00:00
MT_PITY_ORB, // Pity shield mobj
MT_FLAMEAURA_ORB, // Flame shield mobj
MT_BUBBLEWRAP_ORB, // Bubble shield mobj
MT_THUNDERCOIN_ORB, // Thunder shield mobj
Thundercoin shield complete.
2016-10-17 22:22:04 +00:00
MT_THUNDERCOIN_SPARK, // Thunder spark
MT_IVSP, // Invincibility sparkles
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MT_SUPERSPARK, // Super Sonic Spark
* Ported in all of the Flickies from flickiesreduced8.wad except for the Flicker and seed. * Fixed a crash bug in the Flicky fly function I introduced sleepily last night.
2016-12-31 16:55:06 +00:00
// Flickies
MT_FLICKY_01, // Bluebird
MT_FLICKY_x_CENTER defs
2018-08-09 16:08:06 +00:00
MT_FLICKY_01_CENTER,
* Ported in all of the Flickies from flickiesreduced8.wad except for the Flicker and seed. * Fixed a crash bug in the Flicky fly function I introduced sleepily last night.
2016-12-31 16:55:06 +00:00
MT_FLICKY_02, // Rabbit
MT_FLICKY_x_CENTER defs
2018-08-09 16:08:06 +00:00
MT_FLICKY_02_CENTER,
* Ported in all of the Flickies from flickiesreduced8.wad except for the Flicker and seed. * Fixed a crash bug in the Flicky fly function I introduced sleepily last night.
2016-12-31 16:55:06 +00:00
MT_FLICKY_03, // Chicken
MT_FLICKY_x_CENTER defs
2018-08-09 16:08:06 +00:00
MT_FLICKY_03_CENTER,
* Ported in all of the Flickies from flickiesreduced8.wad except for the Flicker and seed. * Fixed a crash bug in the Flicky fly function I introduced sleepily last night.
2016-12-31 16:55:06 +00:00
MT_FLICKY_04, // Seal
MT_FLICKY_x_CENTER defs
2018-08-09 16:08:06 +00:00
MT_FLICKY_04_CENTER,
* Ported in all of the Flickies from flickiesreduced8.wad except for the Flicker and seed. * Fixed a crash bug in the Flicky fly function I introduced sleepily last night.
2016-12-31 16:55:06 +00:00
MT_FLICKY_05, // Pig
MT_FLICKY_x_CENTER defs
2018-08-09 16:08:06 +00:00
MT_FLICKY_05_CENTER,
* Ported in all of the Flickies from flickiesreduced8.wad except for the Flicker and seed. * Fixed a crash bug in the Flicky fly function I introduced sleepily last night.
2016-12-31 16:55:06 +00:00
MT_FLICKY_06, // Chipmunk
MT_FLICKY_x_CENTER defs
2018-08-09 16:08:06 +00:00
MT_FLICKY_06_CENTER,
* Ported in all of the Flickies from flickiesreduced8.wad except for the Flicker and seed. * Fixed a crash bug in the Flicky fly function I introduced sleepily last night.
2016-12-31 16:55:06 +00:00
MT_FLICKY_07, // Penguin
MT_FLICKY_x_CENTER defs
2018-08-09 16:08:06 +00:00
MT_FLICKY_07_CENTER,
* Ported in all of the Flickies from flickiesreduced8.wad except for the Flicker and seed. * Fixed a crash bug in the Flicky fly function I introduced sleepily last night.
2016-12-31 16:55:06 +00:00
MT_FLICKY_08, // Fish
MT_FLICKY_x_CENTER defs
2018-08-09 16:08:06 +00:00
MT_FLICKY_08_CENTER,
* Ported in all of the Flickies from flickiesreduced8.wad except for the Flicker and seed. * Fixed a crash bug in the Flicky fly function I introduced sleepily last night.
2016-12-31 16:55:06 +00:00
MT_FLICKY_09, // Ram
MT_FLICKY_x_CENTER defs
2018-08-09 16:08:06 +00:00
MT_FLICKY_09_CENTER,
* Ported in all of the Flickies from flickiesreduced8.wad except for the Flicker and seed. * Fixed a crash bug in the Flicky fly function I introduced sleepily last night.
2016-12-31 16:55:06 +00:00
MT_FLICKY_10, // Puffin
MT_FLICKY_x_CENTER defs
2018-08-09 16:08:06 +00:00
MT_FLICKY_10_CENTER,
* Ported in all of the Flickies from flickiesreduced8.wad except for the Flicker and seed. * Fixed a crash bug in the Flicky fly function I introduced sleepily last night.
2016-12-31 16:55:06 +00:00
MT_FLICKY_11, // Cow
MT_FLICKY_x_CENTER defs
2018-08-09 16:08:06 +00:00
MT_FLICKY_11_CENTER,
* Ported in all of the Flickies from flickiesreduced8.wad except for the Flicker and seed. * Fixed a crash bug in the Flicky fly function I introduced sleepily last night.
2016-12-31 16:55:06 +00:00
MT_FLICKY_12, // Rat
MT_FLICKY_x_CENTER defs
2018-08-09 16:08:06 +00:00
MT_FLICKY_12_CENTER,
* Ported in all of the Flickies from flickiesreduced8.wad except for the Flicker and seed. * Fixed a crash bug in the Flicky fly function I introduced sleepily last night.
2016-12-31 16:55:06 +00:00
MT_FLICKY_13, // Bear
MT_FLICKY_x_CENTER defs
2018-08-09 16:08:06 +00:00
MT_FLICKY_13_CENTER,
* Ported in all of the Flickies from flickiesreduced8.wad except for the Flicker and seed. * Fixed a crash bug in the Flicky fly function I introduced sleepily last night.
2016-12-31 16:55:06 +00:00
MT_FLICKY_14, // Dove
MT_FLICKY_x_CENTER defs
2018-08-09 16:08:06 +00:00
MT_FLICKY_14_CENTER,
* Ported in all of the Flickies from flickiesreduced8.wad except for the Flicker and seed. * Fixed a crash bug in the Flicky fly function I introduced sleepily last night.
2016-12-31 16:55:06 +00:00
MT_FLICKY_15, // Cat
MT_FLICKY_x_CENTER defs
2018-08-09 16:08:06 +00:00
MT_FLICKY_15_CENTER,
* Ported in all of the Flickies from flickiesreduced8.wad except for the Flicker and seed. * Fixed a crash bug in the Flicky fly function I introduced sleepily last night.
2016-12-31 16:55:06 +00:00
MT_FLICKY_16, // Canary
MT_FLICKY_x_CENTER defs
2018-08-09 16:08:06 +00:00
MT_FLICKY_16_CENTER,
* Haunted Heights! Smashing spikeball, Cacolantern, Spinbobert and Hangster, along with the Spider and Bat flickies and general decoration/ambience stuff. * MF_PAIN and MF_MISSILE now support setting damagetype via their Mass parameter. The two existing conflicts - the fuse setting for the grenade weapon ring and the Cybrakdemon napalm bomb - had these moved to other free parameters. * A_ConnectToGround is EXTREMELY useful for palmtrees and stuff. * Some other, relatively hacky A_ functions. * (Unrelated) Remove the need for a "Mario block mode" for the token by making it natively compatible. * Spikes and their time-offsetting via that Lua script sphere made. Also allow for wallspikes to do it via their angle/360.
2018-04-28 14:13:44 +00:00
MT_SECRETFLICKY_01, // Spider
MT_FLICKY_x_CENTER defs
2018-08-09 16:08:06 +00:00
MT_SECRETFLICKY_01_CENTER,
* Haunted Heights! Smashing spikeball, Cacolantern, Spinbobert and Hangster, along with the Spider and Bat flickies and general decoration/ambience stuff. * MF_PAIN and MF_MISSILE now support setting damagetype via their Mass parameter. The two existing conflicts - the fuse setting for the grenade weapon ring and the Cybrakdemon napalm bomb - had these moved to other free parameters. * A_ConnectToGround is EXTREMELY useful for palmtrees and stuff. * Some other, relatively hacky A_ functions. * (Unrelated) Remove the need for a "Mario block mode" for the token by making it natively compatible. * Spikes and their time-offsetting via that Lua script sphere made. Also allow for wallspikes to do it via their angle/360.
2018-04-28 14:13:44 +00:00
MT_SECRETFLICKY_02, // Bat
MT_FLICKY_x_CENTER defs
2018-08-09 16:08:06 +00:00
MT_SECRETFLICKY_02_CENTER,
* Haunted Heights! Smashing spikeball, Cacolantern, Spinbobert and Hangster, along with the Spider and Bat flickies and general decoration/ambience stuff. * MF_PAIN and MF_MISSILE now support setting damagetype via their Mass parameter. The two existing conflicts - the fuse setting for the grenade weapon ring and the Cybrakdemon napalm bomb - had these moved to other free parameters. * A_ConnectToGround is EXTREMELY useful for palmtrees and stuff. * Some other, relatively hacky A_ functions. * (Unrelated) Remove the need for a "Mario block mode" for the token by making it natively compatible. * Spikes and their time-offsetting via that Lua script sphere made. Also allow for wallspikes to do it via their angle/360.
2018-04-28 14:13:44 +00:00
MT_SEED,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Environmental Effects
MT_RAIN, // Rain
MT_SNOWFLAKE, // Snowflake
MT_SPLISH, // Water splish!
Implemented lava splish. Feel free to suggest a different "splish" sound.
2019-10-05 08:00:59 +00:00
MT_LAVASPLISH, // Lava splish!
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MT_SMOKE,
MT_SMALLBUBBLE, // small bubble
MT_MEDIUMBUBBLE, // medium bubble
MT_EXTRALARGEBUBBLE, // extra large bubble
SF_MACHINE. Currently only changes drowning, but could do more. * Electric sparks coming off entire body instead of bubbles coming out mouth * Different sounds. * Different icons. These sprites are currently local only, but I'll be doing a lot of asset updating this evening since Rob asked me to so it won't be long until you can get them.
2016-07-16 21:43:49 +00:00
MT_WATERZAP,
Added basic spindash dust Also cleaned up some of the code in P_DoSpinAbility while I was at it
2016-11-10 17:51:10 +00:00
MT_SPINDUST, // Spindash dust
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MT_TFOG,
MT_PARTICLE,
MT_PARTICLEGEN, // For fans, etc.
// Game Indicators
MT_SCORE, // score logo
MT_DROWNNUMBERS, // Drowning Timer
MT_GOTEMERALD, // Chaos Emerald (intangible)
Big commit, sorry. I broke several things trying to get other things to work and it's only now that all the code that worked yesterday works today! *P_LookForEnemies is now side-effect-less and only provides a pointer to the found mobj *player-jumping is dead, long live PF_STARTJUMP *per Mystic's request, CA2_GUNSLINGER has a targeting icon. It also has a more restricted vertical aiming range. *mobj for this is in the game as requested *fast teetering animation flag *general code cleanup
2017-03-22 18:51:30 +00:00
MT_LOCKON, // Target
Pre-pinch behaviour complete - heavily reliant on a new map, which I won't be sharing until everything is ready. Just making this commit now so I can merge in master...
2019-07-02 23:50:12 +00:00
MT_LOCKONINF, // In-level Target
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MT_TAG, // Tag Sign
MT_GOTFLAG, // Got Flag sign
// Ambient Sounds
MT_AWATERA, // Ambient Water Sound 1
MT_AWATERB, // Ambient Water Sound 2
MT_AWATERC, // Ambient Water Sound 3
MT_AWATERD, // Ambient Water Sound 4
MT_AWATERE, // Ambient Water Sound 5
MT_AWATERF, // Ambient Water Sound 6
MT_AWATERG, // Ambient Water Sound 7
MT_AWATERH, // Ambient Water Sound 8
MT_RANDOMAMBIENT,
MT_RANDOMAMBIENT2,
* Haunted Heights! Smashing spikeball, Cacolantern, Spinbobert and Hangster, along with the Spider and Bat flickies and general decoration/ambience stuff. * MF_PAIN and MF_MISSILE now support setting damagetype via their Mass parameter. The two existing conflicts - the fuse setting for the grenade weapon ring and the Cybrakdemon napalm bomb - had these moved to other free parameters. * A_ConnectToGround is EXTREMELY useful for palmtrees and stuff. * Some other, relatively hacky A_ functions. * (Unrelated) Remove the need for a "Mario block mode" for the token by making it natively compatible. * Spikes and their time-offsetting via that Lua script sphere made. Also allow for wallspikes to do it via their angle/360.
2018-04-28 14:13:44 +00:00
MT_MACHINEAMBIENCE,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Big commit, sorry. I broke several things trying to get other things to work and it's only now that all the code that worked yesterday works today! *P_LookForEnemies is now side-effect-less and only provides a pointer to the found mobj *player-jumping is dead, long live PF_STARTJUMP *per Mystic's request, CA2_GUNSLINGER has a targeting icon. It also has a more restricted vertical aiming range. *mobj for this is in the game as requested *fast teetering animation flag *general code cleanup
2017-03-22 18:51:30 +00:00
MT_CORK,
PITY IN PINK! * Smoothen Pity Shield animation to go with sphere's updates to Nev3r's sprites. * Added LHRT object, designed to be summoned with CA2_MELEE. * Gives a pink Pity Shield (SH_PINK) on same-team player contact. * Deals damage to non-player enemies. * Harmlessly fades into nothing when touching an enemy player, players with SH_PINK already, and players capable of applying SH_PINK to others (through non-Lua methods). * Basically, you-know-who is the Healer of the party whenever they're around. Fun consequences for the Co-op and CTF metas.
2019-06-19 22:20:24 +00:00
MT_LHRT,
Big commit, sorry. I broke several things trying to get other things to work and it's only now that all the code that worked yesterday works today! *P_LookForEnemies is now side-effect-less and only provides a pointer to the found mobj *player-jumping is dead, long live PF_STARTJUMP *per Mystic's request, CA2_GUNSLINGER has a targeting icon. It also has a more restricted vertical aiming range. *mobj for this is in the game as requested *fast teetering animation flag *general code cleanup
2017-03-22 18:51:30 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Ring Weapons
MT_REDRING,
MT_BOUNCERING,
MT_RAILRING,
MT_INFINITYRING,
MT_AUTOMATICRING,
MT_EXPLOSIONRING,
MT_SCATTERRING,
MT_GRENADERING,
MT_BOUNCEPICKUP,
MT_RAILPICKUP,
MT_AUTOPICKUP,
MT_EXPLODEPICKUP,
MT_SCATTERPICKUP,
MT_GRENADEPICKUP,
MT_THROWNBOUNCE,
MT_THROWNINFINITY,
MT_THROWNAUTOMATIC,
MT_THROWNSCATTER,
MT_THROWNEXPLOSION,
MT_THROWNGRENADE,
// Mario-specific stuff
MT_COIN,
MT_FLINGCOIN,
MT_GOOMBA,
MT_BLUEGOOMBA,
MT_FIREFLOWER,
MT_FIREBALL,
Fireball
2019-11-18 00:25:17 +00:00
MT_FIREBALLTRAIL,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MT_SHELL,
MT_PUMA,
* ALMOST SORTA IMPLEMENTED A NON-HACKY SPINNING FLAMEJET. For some reason, they wanna step down onto the platform - and I've been figuring this out for too long to see what's causing that tonight. * Hardcoded a bunch of stuff from patch.dta. All works fine, but still more to do.
2017-01-21 01:09:39 +00:00
MT_PUMATRAIL,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MT_HAMMER,
MT_KOOPA,
MT_KOOPAFLAME,
MT_AXE,
MT_MARIOBUSH1,
MT_MARIOBUSH2,
MT_TOAD,
// NiGHTS Stuff
MT_AXIS,
MT_AXISTRANSFER,
MT_AXISTRANSFERLINE,
MT_NIGHTSDRONE,
Nights Drone mobj and state entries * New entries: NIGHTSDRONE_MAN, NIGHTSDRONE_SPARKLING * NIGHTSGOAL renamed to NIGHTSDRONE_GOAL * MT_NIGHTSDRONE repurposed as an invisble, no-gravity hitbox
2018-08-10 22:24:31 +00:00
MT_NIGHTSDRONE_MAN,
MT_NIGHTSDRONE_SPARKLING,
MT_NIGHTSDRONE_GOAL,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MT_NIGHTSPARKLE,
MT_NIGHTSLOOPHELPER,
MT_NIGHTSBUMPER, // NiGHTS Bumper
MT_HOOP,
MT_HOOPCOLLIDE, // Collision detection for NiGHTS hoops
MT_HOOPCENTER, // Center of a hoop
MT_NIGHTSCORE,
MONSTER COMMIT. OLD SPECIAL STAGES: * Spheres in old special stages instead of rings! * Individual timers in old special stages instead of a global one! * Old special stages use a variant of the NiGHTS HUD now! * Special stage damage in old special stages loses 5 seconds of time instead of 10 rings/spheres! * All damage gained through old special stages is converted to special stage damage! As a consequence, the special spikeball has no need to be special anymore. * Made emerald gaining function be based on special stage number rather than gained emeralds! * Consistency with... NiGHTS SPECIAL STAGES: * Spheres now flash in bonus time. https://cdn.discordapp.com/attachments/400761370800422922/452590553100713984/srb20032.gif * Sphere and ring mapthingnums are now less fucked up in 'em. (Rings are 300, same as usual, while Spheres are now 1706 replacing NiGHTS Wings.) SPECIAL STAGES IN GENERAL: * useNightsSS is now dead. Each individual special stage is now assessed for NiGHTS-mode behaviour based on maptol & TOL_NIGHTS. * CRAWLA HONCHO\n CAN NOW BE\n SUPER CRAWLA HONCHO end tally modification now also includes a mini-tutorial on turning super. https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif * SONIC GOT A CHAOS EMERALD? https://cdn.discordapp.com/attachments/400761370800422922/452623869497573386/srb20034.gif NiGHTS NON-SPECIAL STAGES: * Colour Chips and Star Chips! Replaces Spheres and Rings of NiGHTS Special Stages. * Colour Chips turn yellow in bonus time. * Ideya! * Its own "drowning" music! * All of the object types for Dream Hill. * GIF: https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif RANDOM BS: * Turn super with the spin button instead of the jump button! * Followmobj now correctly set with P_SetTarget instead of pointer assignment. * Emerald hunt uses new sprites! * Made unlock noise different from emblem gain noise! (It's the CRAWLA HONCHO CAN NOW TURN yadda yadda sound from S3K now.)
2018-06-03 21:41:54 +00:00
MT_NIGHTSCHIP, // NiGHTS Chip
MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP entries
2018-08-10 04:19:56 +00:00
MT_FLINGNIGHTSCHIP, // Lost NiGHTS Chip
MONSTER COMMIT. OLD SPECIAL STAGES: * Spheres in old special stages instead of rings! * Individual timers in old special stages instead of a global one! * Old special stages use a variant of the NiGHTS HUD now! * Special stage damage in old special stages loses 5 seconds of time instead of 10 rings/spheres! * All damage gained through old special stages is converted to special stage damage! As a consequence, the special spikeball has no need to be special anymore. * Made emerald gaining function be based on special stage number rather than gained emeralds! * Consistency with... NiGHTS SPECIAL STAGES: * Spheres now flash in bonus time. https://cdn.discordapp.com/attachments/400761370800422922/452590553100713984/srb20032.gif * Sphere and ring mapthingnums are now less fucked up in 'em. (Rings are 300, same as usual, while Spheres are now 1706 replacing NiGHTS Wings.) SPECIAL STAGES IN GENERAL: * useNightsSS is now dead. Each individual special stage is now assessed for NiGHTS-mode behaviour based on maptol & TOL_NIGHTS. * CRAWLA HONCHO\n CAN NOW BE\n SUPER CRAWLA HONCHO end tally modification now also includes a mini-tutorial on turning super. https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif * SONIC GOT A CHAOS EMERALD? https://cdn.discordapp.com/attachments/400761370800422922/452623869497573386/srb20034.gif NiGHTS NON-SPECIAL STAGES: * Colour Chips and Star Chips! Replaces Spheres and Rings of NiGHTS Special Stages. * Colour Chips turn yellow in bonus time. * Ideya! * Its own "drowning" music! * All of the object types for Dream Hill. * GIF: https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif RANDOM BS: * Turn super with the spin button instead of the jump button! * Followmobj now correctly set with P_SetTarget instead of pointer assignment. * Emerald hunt uses new sprites! * Made unlock noise different from emblem gain noise! (It's the CRAWLA HONCHO CAN NOW TURN yadda yadda sound from S3K now.)
2018-06-03 21:41:54 +00:00
MT_NIGHTSSTAR, // NiGHTS Star
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MT_NIGHTSSUPERLOOP,
MT_NIGHTSDRILLREFILL,
MT_NIGHTSHELPER,
MT_NIGHTSEXTRATIME,
MT_NIGHTSLINKFREEZE,
MT_EGGCAPSULE,
MT_IDEYAANCHOR info and spawn logic
2018-08-13 02:11:18 +00:00
MT_IDEYAANCHOR,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MT_NIGHTOPIANHELPER, // the actual helper object that orbits you
MONSTER COMMIT. OLD SPECIAL STAGES: * Spheres in old special stages instead of rings! * Individual timers in old special stages instead of a global one! * Old special stages use a variant of the NiGHTS HUD now! * Special stage damage in old special stages loses 5 seconds of time instead of 10 rings/spheres! * All damage gained through old special stages is converted to special stage damage! As a consequence, the special spikeball has no need to be special anymore. * Made emerald gaining function be based on special stage number rather than gained emeralds! * Consistency with... NiGHTS SPECIAL STAGES: * Spheres now flash in bonus time. https://cdn.discordapp.com/attachments/400761370800422922/452590553100713984/srb20032.gif * Sphere and ring mapthingnums are now less fucked up in 'em. (Rings are 300, same as usual, while Spheres are now 1706 replacing NiGHTS Wings.) SPECIAL STAGES IN GENERAL: * useNightsSS is now dead. Each individual special stage is now assessed for NiGHTS-mode behaviour based on maptol & TOL_NIGHTS. * CRAWLA HONCHO\n CAN NOW BE\n SUPER CRAWLA HONCHO end tally modification now also includes a mini-tutorial on turning super. https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif * SONIC GOT A CHAOS EMERALD? https://cdn.discordapp.com/attachments/400761370800422922/452623869497573386/srb20034.gif NiGHTS NON-SPECIAL STAGES: * Colour Chips and Star Chips! Replaces Spheres and Rings of NiGHTS Special Stages. * Colour Chips turn yellow in bonus time. * Ideya! * Its own "drowning" music! * All of the object types for Dream Hill. * GIF: https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif RANDOM BS: * Turn super with the spin button instead of the jump button! * Followmobj now correctly set with P_SetTarget instead of pointer assignment. * Emerald hunt uses new sprites! * Made unlock noise different from emblem gain noise! (It's the CRAWLA HONCHO CAN NOW TURN yadda yadda sound from S3K now.)
2018-06-03 21:41:54 +00:00
MT_PIAN, // decorative singing friend
MT_SHLEEP, // almost-decorative sleeping enemy
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
* Haunted Heights! Smashing spikeball, Cacolantern, Spinbobert and Hangster, along with the Spider and Bat flickies and general decoration/ambience stuff. * MF_PAIN and MF_MISSILE now support setting damagetype via their Mass parameter. The two existing conflicts - the fuse setting for the grenade weapon ring and the Cybrakdemon napalm bomb - had these moved to other free parameters. * A_ConnectToGround is EXTREMELY useful for palmtrees and stuff. * Some other, relatively hacky A_ functions. * (Unrelated) Remove the need for a "Mario block mode" for the token by making it natively compatible. * Spikes and their time-offsetting via that Lua script sphere made. Also allow for wallspikes to do it via their angle/360.
2018-04-28 14:13:44 +00:00
// Secret badniks and hazards, shhhh
Bit of a random one today, but the branch approaches completion... * Bomb sphere! Paraloopable hazard. Replaces MT_SPECIALSPIKEBALL. * Blueberry bushes, both normal and Xmas, from patch.dta. * BSZ tulips, also from patch.dta! * Frozen Hillside badniks - Penguinator and Pophat. * Frozen Hillside ice decoration! * Fixed some big bugs with the DSZ light beams. * Made multi-mare special stages work, in a troll way - the Chaos Emerald disappears in a puff of smoke, and the Spinbobert laughter sound plays... >:3c * Reverted the mobjtype number changes from the source SOC/Lua, which we can do later when doing a final pass of the levels. * State optimisation. * Serious cruft-removal of the NiGHTS drone thinker. * Fix the issues where the player wouldn't curl into jump in waterslides or dropping off rope-hangs. * Tweak NiGHTS player flashing. * Add text colour support to the titlecard font. * Use that to make the PRESS SPIN\nMID-JUMP thing when you get all Chaos Emeralds use the titlecard font for readability. * Fix the GOT ALL EMERALDS page not lasting the correct, extended amount of time. * Fix that thing where flying mid-spin didn't enact autobrake. * Modify graymap a little on Sryder's suggestion. * [COMPLETELY UNRELATED] fix that thing where the addons menu will fail on files/paths with spaces in [/COMPLETELY UNRELATED]
2018-06-05 16:22:28 +00:00
MT_PENGUINATOR,
MT_POPHAT,
MT_POPSHOT,
Hardcode DrT's FHZ improvements. Puttin' the FREEZE in feature freeze amirite haha
2019-11-17 20:34:25 +00:00
MT_POPSHOT_TRAIL,
Bit of a random one today, but the branch approaches completion... * Bomb sphere! Paraloopable hazard. Replaces MT_SPECIALSPIKEBALL. * Blueberry bushes, both normal and Xmas, from patch.dta. * BSZ tulips, also from patch.dta! * Frozen Hillside badniks - Penguinator and Pophat. * Frozen Hillside ice decoration! * Fixed some big bugs with the DSZ light beams. * Made multi-mare special stages work, in a troll way - the Chaos Emerald disappears in a puff of smoke, and the Spinbobert laughter sound plays... >:3c * Reverted the mobjtype number changes from the source SOC/Lua, which we can do later when doing a final pass of the levels. * State optimisation. * Serious cruft-removal of the NiGHTS drone thinker. * Fix the issues where the player wouldn't curl into jump in waterslides or dropping off rope-hangs. * Tweak NiGHTS player flashing. * Add text colour support to the titlecard font. * Use that to make the PRESS SPIN\nMID-JUMP thing when you get all Chaos Emeralds use the titlecard font for readability. * Fix the GOT ALL EMERALDS page not lasting the correct, extended amount of time. * Fix that thing where flying mid-spin didn't enact autobrake. * Modify graymap a little on Sryder's suggestion. * [COMPLETELY UNRELATED] fix that thing where the addons menu will fail on files/paths with spaces in [/COMPLETELY UNRELATED]
2018-06-05 16:22:28 +00:00
* Hive Elementals and Bumblebores, plus associated useful action functions. * Made Facestabbers take two hits and have associated pain/death animations. No other changes, just wanted to make sure THIS was done. * Move Bubblebuzz-related stuff to go alongside the secret badniks and etc. * MF2_INVERTAIMABLE. Inverts whether P_LookForEnemies can get at; replaces a hardcoded thingy.
2018-05-04 20:30:15 +00:00
MT_HIVEELEMENTAL,
MT_BUMBLEBORE,
Implement new states for Buggle, the new Aquabuzz
2019-10-29 07:32:03 +00:00
MT_BUGGLE,
* Haunted Heights! Smashing spikeball, Cacolantern, Spinbobert and Hangster, along with the Spider and Bat flickies and general decoration/ambience stuff. * MF_PAIN and MF_MISSILE now support setting damagetype via their Mass parameter. The two existing conflicts - the fuse setting for the grenade weapon ring and the Cybrakdemon napalm bomb - had these moved to other free parameters. * A_ConnectToGround is EXTREMELY useful for palmtrees and stuff. * Some other, relatively hacky A_ functions. * (Unrelated) Remove the need for a "Mario block mode" for the token by making it natively compatible. * Spikes and their time-offsetting via that Lua script sphere made. Also allow for wallspikes to do it via their angle/360.
2018-04-28 14:13:44 +00:00
* Hive Elementals and Bumblebores, plus associated useful action functions. * Made Facestabbers take two hits and have associated pain/death animations. No other changes, just wanted to make sure THIS was done. * Move Bubblebuzz-related stuff to go alongside the secret badniks and etc. * MF2_INVERTAIMABLE. Inverts whether P_LookForEnemies can get at; replaces a hardcoded thingy.
2018-05-04 20:30:15 +00:00
MT_SMASHINGSPIKEBALL,
* Haunted Heights! Smashing spikeball, Cacolantern, Spinbobert and Hangster, along with the Spider and Bat flickies and general decoration/ambience stuff. * MF_PAIN and MF_MISSILE now support setting damagetype via their Mass parameter. The two existing conflicts - the fuse setting for the grenade weapon ring and the Cybrakdemon napalm bomb - had these moved to other free parameters. * A_ConnectToGround is EXTREMELY useful for palmtrees and stuff. * Some other, relatively hacky A_ functions. * (Unrelated) Remove the need for a "Mario block mode" for the token by making it natively compatible. * Spikes and their time-offsetting via that Lua script sphere made. Also allow for wallspikes to do it via their angle/360.
2018-04-28 14:13:44 +00:00
MT_CACOLANTERN,
MT_CACOSHARD,
MT_CACOFIRE,
MT_SPINBOBERT,
MT_SPINBOBERT_FIRE1,
MT_SPINBOBERT_FIRE2,
MT_HANGSTER,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Utility Objects
MT_TELEPORTMAN,
MT_ALTVIEWMAN,
MT_CRUMBLEOBJ, // Sound generator for crumbling platform
MT_TUBEWAYPOINT,
MT_PUSH,
MT_PULL,
MT_GHOST,
MT_OVERLAY,
Trigger line exec by whether mobj is facing its tracer * MFE_TRACERANGLE * Thing 758 MT_ANGLEMAN * mobj thinker behavior * Line Exec 457/458 Enable/Disable
2018-11-04 21:28:25 +00:00
MT_ANGLEMAN,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MT_POLYANCHOR,
MT_POLYSPAWN,
MT_POLYSPAWNCRUSH,
// Skybox objects
MT_SKYBOX,
// Debris
MT_SPARK, //spark
MT_EXPLODE, // Robot Explosion
MT_UWEXPLODE, // Underwater Explosion
* Hive Elementals and Bumblebores, plus associated useful action functions. * Made Facestabbers take two hits and have associated pain/death animations. No other changes, just wanted to make sure THIS was done. * Move Bubblebuzz-related stuff to go alongside the secret badniks and etc. * MF2_INVERTAIMABLE. Inverts whether P_LookForEnemies can get at; replaces a hardcoded thingy.
2018-05-04 20:30:15 +00:00
MT_DUST,
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
MT_ROCKSPAWNER,
MT_FALLINGROCK,
MT_ROCKCRUMBLE1,
MT_ROCKCRUMBLE2,
MT_ROCKCRUMBLE3,
MT_ROCKCRUMBLE4,
MT_ROCKCRUMBLE5,
MT_ROCKCRUMBLE6,
MT_ROCKCRUMBLE7,
MT_ROCKCRUMBLE8,
MT_ROCKCRUMBLE9,
MT_ROCKCRUMBLE10,
MT_ROCKCRUMBLE11,
MT_ROCKCRUMBLE12,
MT_ROCKCRUMBLE13,
MT_ROCKCRUMBLE14,
MT_ROCKCRUMBLE15,
MT_ROCKCRUMBLE16,
Add GFZ debris; reorganize wood debris index
2019-11-20 17:05:22 +00:00
// Level debris
MT_GFZDEBRIS,
Update info.h Also add a case for MT_BRICKDEBRIS to P_MobjThinker
2019-07-06 22:11:49 +00:00
MT_BRICKDEBRIS,
Add GFZ debris; reorganize wood debris index
2019-11-20 17:05:22 +00:00
MT_WOODDEBRIS,
Update info.h Also add a case for MT_BRICKDEBRIS to P_MobjThinker
2019-07-06 22:11:49 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#ifdef SEENAMES
MT_NAMECHECK,
#endif
MT_FIRSTFREESLOT,
MT_LASTFREESLOT = MT_FIRSTFREESLOT + NUMMOBJFREESLOTS - 1,
NUMMOBJTYPES
} mobjtype_t;
typedef struct
{
INT32 doomednum;
statenum_t spawnstate;
INT32 spawnhealth;
statenum_t seestate;
sfxenum_t seesound;
INT32 reactiontime;
sfxenum_t attacksound;
statenum_t painstate;
INT32 painchance;
sfxenum_t painsound;
statenum_t meleestate;
statenum_t missilestate;
statenum_t deathstate;
statenum_t xdeathstate;
sfxenum_t deathsound;
fixed_t speed;
fixed_t radius;
fixed_t height;
INT32 dispoffset;
INT32 mass;
INT32 damage;
sfxenum_t activesound;
UINT32 flags;
statenum_t raisestate;
} mobjinfo_t;
extern mobjinfo_t mobjinfo[NUMMOBJTYPES];
void P_PatchInfoTables(void);
void P_BackupTables(void);
void P_ResetData(INT32 flags);
#endif
Reference in a new issue Copy permalink