stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-25 13:51:43 +00:00
Code Issues Projects Releases Packages Wiki Activity
SRB2/src/p_inter.c

4363 lines
126 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.
2022
2022-03-03 19:24:46 +00:00
// Copyright (C) 1999-2022 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 p_inter.c
/// \brief Handling interactions (i.e., collisions)
#include "doomdef.h"
#include "i_system.h"
#include "am_map.h"
#include "g_game.h"
#include "m_random.h"
#include "p_local.h"
#include "s_sound.h"
#include "r_main.h"
#include "st_stuff.h"
#include "hu_stuff.h"
#include "lua_hook.h"
#include "m_cond.h" // unlockables, emblems, etc
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
#include "p_setup.h"
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#include "m_cheat.h" // objectplace
#include "m_misc.h"
#include "v_video.h" // video flags for CEchos
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
#include "f_finale.h"
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Better CTF in splitscreen, no death message for spectators
2016-04-07 02:55:58 +00:00
// CTF player names
#define CTFTEAMCODE(pl) pl->ctfteam ? (pl->ctfteam == 1 ? "\x85" : "\x84") : ""
#define CTFTEAMENDCODE(pl) pl->ctfteam ? "\x80" : ""
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
void P_ForceFeed(const player_t *player, INT32 attack, INT32 fade, tic_t duration, INT32 period)
{
BasicFF_t Basicfeed;
if (!player)
return;
Basicfeed.Duration = (UINT32)(duration * (100L/TICRATE));
Basicfeed.ForceX = Basicfeed.ForceY = 1;
Basicfeed.Gain = 25000;
Basicfeed.Magnitude = period*10;
Basicfeed.player = player;
/// \todo test FFB
P_RampConstant(&Basicfeed, attack, fade);
}
void P_ForceConstant(const BasicFF_t *FFInfo)
{
JoyFF_t ConstantQuake;
if (!FFInfo || !FFInfo->player)
return;
ConstantQuake.ForceX = FFInfo->ForceX;
ConstantQuake.ForceY = FFInfo->ForceY;
ConstantQuake.Duration = FFInfo->Duration;
ConstantQuake.Gain = FFInfo->Gain;
ConstantQuake.Magnitude = FFInfo->Magnitude;
if (FFInfo->player == &players[consoleplayer])
I_Tactile(ConstantForce, &ConstantQuake);
else if (splitscreen && FFInfo->player == &players[secondarydisplayplayer])
I_Tactile2(ConstantForce, &ConstantQuake);
}
void P_RampConstant(const BasicFF_t *FFInfo, INT32 Start, INT32 End)
{
JoyFF_t RampQuake;
if (!FFInfo || !FFInfo->player)
return;
RampQuake.ForceX = FFInfo->ForceX;
RampQuake.ForceY = FFInfo->ForceY;
RampQuake.Duration = FFInfo->Duration;
RampQuake.Gain = FFInfo->Gain;
RampQuake.Magnitude = FFInfo->Magnitude;
RampQuake.Start = Start;
RampQuake.End = End;
if (FFInfo->player == &players[consoleplayer])
I_Tactile(ConstantForce, &RampQuake);
else if (splitscreen && FFInfo->player == &players[secondarydisplayplayer])
I_Tactile2(ConstantForce, &RampQuake);
}
//
// GET STUFF
//
/** Makes sure all previous starposts are cleared.
* For instance, hitting starpost 5 will clear starposts 1 through 4, even if
* you didn't touch them. This is how the classic games work, although it can
* lead to bizarre situations on levels that allow you to make a circuit.
*
* \param postnum The number of the starpost just touched.
*/
void P_ClearStarPost(INT32 postnum)
{
thinker_t *th;
mobj_t *mo2;
// scan the thinkers
Fix mobj list iteration oversights. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 10:58:22 +00:00
for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list. Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
2019-07-12 23:42:03 +00:00
if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
continue;
mo2 = (mobj_t *)th;
* Almost everything except players and badniks get removed on deathpit collision, as requested by Nev (very useful for the Bridge). May need serious checking for mobjtypes this is safe to do for. * Flames fall with flameholders. * New modification to teleport cheat: -sp <val> <val> allows instantaneous jump to any starpost in the map, including spawnpoints as starpost index 0! * Also, -ang <val> and -aim <val>, which can be combined with -nop to pivot on the spot.
2018-06-05 19:47:30 +00:00
if (mo2->type != MT_STARPOST)
Fix the starposts not being cleared properly.
2018-06-12 01:26:42 +00:00
continue;
* Almost everything except players and badniks get removed on deathpit collision, as requested by Nev (very useful for the Bridge). May need serious checking for mobjtypes this is safe to do for. * Flames fall with flameholders. * New modification to teleport cheat: -sp <val> <val> allows instantaneous jump to any starpost in the map, including spawnpoints as starpost index 0! * Also, -ang <val> and -aim <val>, which can be combined with -nop to pivot on the spot.
2018-06-05 19:47:30 +00:00
if (mo2->health > postnum)
Fix the starposts not being cleared properly.
2018-06-12 01:26:42 +00:00
continue;
* Almost everything except players and badniks get removed on deathpit collision, as requested by Nev (very useful for the Bridge). May need serious checking for mobjtypes this is safe to do for. * Flames fall with flameholders. * New modification to teleport cheat: -sp <val> <val> allows instantaneous jump to any starpost in the map, including spawnpoints as starpost index 0! * Also, -ang <val> and -aim <val>, which can be combined with -nop to pivot on the spot.
2018-06-05 19:47:30 +00:00
P_SetMobjState(mo2, mo2->info->seestate);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
return;
}
//
// P_ResetStarposts
//
// Resets all starposts back to their spawn state, used on A_Mixup and some other things.
//
void P_ResetStarposts(void)
{
// Search through all the thinkers.
thinker_t *th;
mobj_t *post;
Fix mobj list iteration oversights. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 10:58:22 +00:00
for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list. Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
2019-07-12 23:42:03 +00:00
if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
continue;
post = (mobj_t *)th;
Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list. Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
2019-07-12 23:42:03 +00:00
if (post->type != MT_STARPOST)
continue;
P_SetMobjState(post, post->info->spawnstate);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
//
// P_CanPickupItem
//
// Returns true if the player is in a state where they can pick up items.
//
boolean P_CanPickupItem(player_t *player, boolean weapon)
{
Make P_CanPickupItem check whether Sonic is in a state to recieve it when Tailsbot tries to get it. Specfically, this fixes the case where Sonic runs into something hazardous and spills his rings, but Tailsbot is immediately behind and ends up picking them all up the tic before they also get hurt.
2019-11-26 11:55:31 +00:00
if (!player->mo || player->mo->health <= 0)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return false;
All remaining player->bot checks modified to rely on BOT_ constants
2021-07-15 20:03:26 +00:00
if (player->bot && player->bot != BOT_MPAI)
Make P_CanPickupItem check whether Sonic is in a state to recieve it when Tailsbot tries to get it. Specfically, this fixes the case where Sonic runs into something hazardous and spills his rings, but Tailsbot is immediately behind and ends up picking them all up the tic before they also get hurt.
2019-11-26 11:55:31 +00:00
{
MascaraSnake is a bully and will make a pariah out of me in front of his doctoral student colleagues if I don't change this
2019-11-26 22:10:59 +00:00
if (weapon)
Make P_CanPickupItem check whether Sonic is in a state to recieve it when Tailsbot tries to get it. Specfically, this fixes the case where Sonic runs into something hazardous and spills his rings, but Tailsbot is immediately behind and ends up picking them all up the tic before they also get hurt.
2019-11-26 11:55:31 +00:00
return false;
MascaraSnake is a bully and will make a pariah out of me in front of his doctoral student colleagues if I don't change this
2019-11-26 22:10:59 +00:00
return P_CanPickupItem(&players[consoleplayer], true); // weapon is true to prevent infinite recursion if p1 is bot - doesn't occur in vanilla, but may be relevant for mods
Make P_CanPickupItem check whether Sonic is in a state to recieve it when Tailsbot tries to get it. Specfically, this fixes the case where Sonic runs into something hazardous and spills his rings, but Tailsbot is immediately behind and ends up picking them all up the tic before they also get hurt.
2019-11-26 11:55:31 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Make P_CanPickupItem check whether Sonic is in a state to recieve it when Tailsbot tries to get it. Specfically, this fixes the case where Sonic runs into something hazardous and spills his rings, but Tailsbot is immediately behind and ends up picking them all up the tic before they also get hurt.
2019-11-26 11:55:31 +00:00
if (player->powers[pw_flashing] > (flashingtics/4)*3 && player->powers[pw_flashing] < UINT16_MAX)
Coins are no defense now! (This lecture is boring.)
2016-10-13 14:13:33 +00:00
return false;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true;
}
//
// P_DoNightsScore
//
// When you pick up some items in nights, it displays
// a score sign, and awards you some drill time.
//
void P_DoNightsScore(player_t *player)
{
mobj_t *dummymo;
if (player->exiting)
return; // Don't do any fancy shit for failures.
dummymo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z+player->mo->height/2, MT_NIGHTSCORE);
All remaining player->bot checks modified to rely on BOT_ constants
2021-07-15 20:03:26 +00:00
if (player->bot && player->bot != BOT_MPAI)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
player = &players[consoleplayer];
if (G_IsSpecialStage(gamemap)) // Global link count? Maybe not a good idea...
{
INT32 i;
for (i = 0; i < MAXPLAYERS; i++)
if (playeringame[i])
{
if (++players[i].linkcount > players[i].maxlink)
players[i].maxlink = players[i].linkcount;
Standardize NiGHTS link timer w/ NightsLinkTics MAINCFG option
2018-08-10 03:14:14 +00:00
players[i].linktimer = nightslinktics;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
else // Individual link counts
{
if (++player->linkcount > player->maxlink)
player->maxlink = player->linkcount;
Standardize NiGHTS link timer w/ NightsLinkTics MAINCFG option
2018-08-10 03:14:14 +00:00
player->linktimer = nightslinktics;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
if (player->linkcount < 10)
{
if (player->bonustime)
{
P_AddPlayerScore(player, player->linkcount*20);
P_SetMobjState(dummymo, dummymo->info->xdeathstate+player->linkcount-1);
}
else
{
P_AddPlayerScore(player, player->linkcount*10);
P_SetMobjState(dummymo, dummymo->info->spawnstate+player->linkcount-1);
}
}
else
{
if (player->bonustime)
{
P_AddPlayerScore(player, 200);
P_SetMobjState(dummymo, dummymo->info->xdeathstate+9);
}
else
{
P_AddPlayerScore(player, 100);
P_SetMobjState(dummymo, dummymo->info->spawnstate+9);
}
}
// Hoops are the only things that should add to your drill meter
//player->drillmeter += TICRATE;
dummymo->momz = FRACUNIT;
dummymo->fuse = 3*TICRATE;
// What?! NO, don't use the camera! Scale up instead!
//P_InstaThrust(dummymo, R_PointToAngle2(dummymo->x, dummymo->y, camera.x, camera.y), 3*FRACUNIT);
dummymo->scalespeed = FRACUNIT/25;
dummymo->destscale = 2*FRACUNIT;
}
New emerald behavior in Match. No longer turns you super, instead emeralds steal points from enemy players and give you (and relevant teammates) an invincibility + super sneakers monitor.
2015-05-27 06:08:18 +00:00
//
// P_DoMatchSuper
//
// Checks if you have all 7 pw_emeralds, then turns you "super". =P
//
void P_DoMatchSuper(player_t *player)
{
UINT16 match_emeralds = player->powers[pw_emeralds];
boolean doteams = false;
int i;
// If this gametype has teams, check every player on your team for emeralds.
if (G_GametypeHasTeams())
{
doteams = true;
for (i = 0; i < MAXPLAYERS; i++)
if (players[i].ctfteam == player->ctfteam)
match_emeralds |= players[i].powers[pw_emeralds];
}
if (!ALL7EMERALDS(match_emeralds))
return;
// Got 'em all? Turn "super"!
Add emeraldspawndelay for Match "super" Emeralds will not spawn while players are still enjoying their victory dance now.
2015-05-27 08:01:58 +00:00
emeraldspawndelay = invulntics + 1;
New emerald behavior in Match. No longer turns you super, instead emeralds steal points from enemy players and give you (and relevant teammates) an invincibility + super sneakers monitor.
2015-05-27 06:08:18 +00:00
player->powers[pw_emeralds] = 0;
Add emeraldspawndelay for Match "super" Emeralds will not spawn while players are still enjoying their victory dance now.
2015-05-27 08:01:58 +00:00
player->powers[pw_invulnerability] = emeraldspawndelay;
player->powers[pw_sneakers] = emeraldspawndelay;
New emerald behavior in Match. No longer turns you super, instead emeralds steal points from enemy players and give you (and relevant teammates) an invincibility + super sneakers monitor.
2015-05-27 06:08:18 +00:00
if (P_IsLocalPlayer(player) && !player->powers[pw_super])
{
S_StopMusic();
if (mariomode)
G_GhostAddColor(GHC_INVINCIBLE);
There are now captions for specific types of music! (Currently signified with an M, but I'll change that in a bit...) A whole lotta things needed to be modified for this, though. * Serious refactor of - and internal exposure of - what has become S_StartCaption(). * Renaming of a few existing captions. * The prevention of access to - or writing over - sfx_None's stuff in SOC or Lua. * The new Lua wrapper function S_StartMusicCaption(string, tics, optional player), which essentially allows custom music captions to be created. (This is best used for stuff like final lap music in SRB2 Kart or bonus time in a thokker-like game, not a comprehensive Now Playing expy. That'd be a different kettle of fish.) Also, updated all the lock-on stuff to use P_IsLocalPlayer instead of rolling my own.
2017-04-29 15:27:52 +00:00
strlcpy(S_sfx[sfx_None].caption, "Invincibility", 14);
S_StartCaption(sfx_None, -1, player->powers[pw_invulnerability]);
Update new music cues to use correct names
2016-11-13 21:55:32 +00:00
S_ChangeMusicInternal((mariomode) ? "_minv" : "_inv", false);
New emerald behavior in Match. No longer turns you super, instead emeralds steal points from enemy players and give you (and relevant teammates) an invincibility + super sneakers monitor.
2015-05-27 06:08:18 +00:00
}
// Also steal 50 points from every enemy, sealing your victory.
P_StealPlayerScore(player, 50);
// In a team game?
// Check everyone else on your team for emeralds, and turn those helpful assisting players invincible too.
if (doteams)
for (i = 0; i < MAXPLAYERS; i++)
if (playeringame[i] && players[i].ctfteam == player->ctfteam
&& players[i].powers[pw_emeralds] != 0)
{
players[i].powers[pw_emeralds] = 0;
player->powers[pw_invulnerability] = invulntics + 1;
player->powers[pw_sneakers] = player->powers[pw_invulnerability];
if (P_IsLocalPlayer(player) && !player->powers[pw_super])
{
S_StopMusic();
if (mariomode)
G_GhostAddColor(GHC_INVINCIBLE);
There are now captions for specific types of music! (Currently signified with an M, but I'll change that in a bit...) A whole lotta things needed to be modified for this, though. * Serious refactor of - and internal exposure of - what has become S_StartCaption(). * Renaming of a few existing captions. * The prevention of access to - or writing over - sfx_None's stuff in SOC or Lua. * The new Lua wrapper function S_StartMusicCaption(string, tics, optional player), which essentially allows custom music captions to be created. (This is best used for stuff like final lap music in SRB2 Kart or bonus time in a thokker-like game, not a comprehensive Now Playing expy. That'd be a different kettle of fish.) Also, updated all the lock-on stuff to use P_IsLocalPlayer instead of rolling my own.
2017-04-29 15:27:52 +00:00
strlcpy(S_sfx[sfx_None].caption, "Invincibility", 14);
S_StartCaption(sfx_None, -1, player->powers[pw_invulnerability]);
Update new music cues to use correct names
2016-11-13 21:55:32 +00:00
S_ChangeMusicInternal((mariomode) ? "_minv" : "_inv", false);
New emerald behavior in Match. No longer turns you super, instead emeralds steal points from enemy players and give you (and relevant teammates) an invincibility + super sneakers monitor.
2015-05-27 06:08:18 +00:00
}
}
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
/** Takes action based on a ::MF_SPECIAL thing touched by a player.
* Actually, this just checks a few things (heights, toucher->player, no
* objectplace, no dead or disappearing things)
*
* The special thing may be collected and disappear, or a sound may play, or
* both.
*
* \param special The special thing.
* \param toucher The player's mobj.
* \param heightcheck Whether or not to make sure the player and the object
* are actually touching.
*/
void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
{
player_t *player;
INT32 i;
Bubblewrap shield now bounces on enemies and monitors instead of piercing through them.
2016-10-24 12:33:10 +00:00
UINT8 elementalpierce;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (objectplacing)
return;
I_Assert(special != NULL);
I_Assert(toucher != NULL);
// Dead thing touching.
// Can happen with a sliding player corpse.
if (toucher->health <= 0)
return;
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
if (special->health <= 0)
return;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (heightcheck)
{
if (special->type == MT_FLINGEMERALD) // little hack here...
{ // flingemerald sprites are low to the ground, so extend collision radius down some.
if (toucher->z > (special->z + special->height))
return;
if (special->z - special->height > (toucher->z + toucher->height))
return;
}
else
{
if (toucher->momz < 0) {
if (toucher->z + toucher->momz > special->z + special->height)
return;
} else if (toucher->z > special->z + special->height)
return;
if (toucher->momz > 0) {
if (toucher->z + toucher->height + toucher->momz < special->z)
return;
} else if (toucher->z + toucher->height < special->z)
return;
}
}
player = toucher->player;
I_Assert(player != NULL); // Only players can touch stuff!
if (player->spectator)
return;
* Add native support for multi-hit badiks to MF_ENEMY. * MF2_FRET application and removal. * Flashing when flag present. * Bounce player back on successful damaging. * Add their spawnhealth to the chain. * Reduce code duplication in P_TouchSpecialThing. * Play with Crawla Commander a little bit as a test of its power.
2018-05-02 22:48:50 +00:00
// Ignore multihits in "ouchie" mode
if (special->flags & (MF_ENEMY|MF_BOSS) && special->flags2 & MF2_FRET)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
Big Large Lua Hooklib Refactor * Hooks are no longer a mess of lua boiler plate. Helper functions reduce hooks to, at the most basic level, only two calls. * Lua tables (the array part) are used to index hooks. Such tables contain only hooks of the same type. * Hook types are defined in one place so you no longer need to sync up the enum and name array.
2020-11-17 12:14:45 +00:00
if (LUA_HookTouchSpecial(special, toucher) || P_MobjWasRemoved(special))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
Bubblewrap shield now bounces on enemies and monitors instead of piercing through them.
2016-10-24 12:33:10 +00:00
// 0 = none, 1 = elemental pierce, 2 = bubble bounce
elementalpierce = (((player->powers[pw_shield] & SH_NOSTACK) == SH_ELEMENTAL || (player->powers[pw_shield] & SH_NOSTACK) == SH_BUBBLEWRAP) && (player->pflags & PF_SHIELDABILITY)
? (((player->powers[pw_shield] & SH_NOSTACK) == SH_ELEMENTAL) ? 1 : 2)
: 0);
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
* Add native support for multi-hit badiks to MF_ENEMY. * MF2_FRET application and removal. * Flashing when flag present. * Bounce player back on successful damaging. * Add their spawnhealth to the chain. * Reduce code duplication in P_TouchSpecialThing. * Play with Crawla Commander a little bit as a test of its power.
2018-05-02 22:48:50 +00:00
if ((special->flags & (MF_ENEMY|MF_BOSS)) && !(special->flags & MF_MISSILE))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
* Add native support for multi-hit badiks to MF_ENEMY. * MF2_FRET application and removal. * Flashing when flag present. * Bounce player back on successful damaging. * Add their spawnhealth to the chain. * Reduce code duplication in P_TouchSpecialThing. * Play with Crawla Commander a little bit as a test of its power.
2018-05-02 22:48:50 +00:00
////////////////////////////////////////////////////////
/////ENEMIES & BOSSES!!/////////////////////////////////
////////////////////////////////////////////////////////
Hardcoded the boss's TouchSpecial hook. Also cleaned up this part of P_TouchSpecialThing a bit while I'm here
2019-05-05 17:22:19 +00:00
switch (special->type)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Hardcoded the boss's TouchSpecial hook. Also cleaned up this part of P_TouchSpecialThing a bit while I'm here
2019-05-05 17:22:19 +00:00
case MT_BLACKEGGMAN:
* CA_BOUNCE users now play animation/sound when bouncing on enemies, monitors. * CA_BOUNCE users harmlessly bounce off Sharps.
2016-12-24 00:11:54 +00:00
{
Hardcoded the boss's TouchSpecial hook. Also cleaned up this part of P_TouchSpecialThing a bit while I'm here
2019-05-05 17:22:19 +00:00
P_DamageMobj(toucher, special, special, 1, 0); // ouch
* Add native support for multi-hit badiks to MF_ENEMY. * MF2_FRET application and removal. * Flashing when flag present. * Bounce player back on successful damaging. * Add their spawnhealth to the chain. * Reduce code duplication in P_TouchSpecialThing. * Play with Crawla Commander a little bit as a test of its power.
2018-05-02 22:48:50 +00:00
return;
* CA_BOUNCE users now play animation/sound when bouncing on enemies, monitors. * CA_BOUNCE users harmlessly bounce off Sharps.
2016-12-24 00:11:54 +00:00
}
Hardcoded the boss's TouchSpecial hook. Also cleaned up this part of P_TouchSpecialThing a bit while I'm here
2019-05-05 17:22:19 +00:00
case MT_BIGMINE:
{
special->momx = toucher->momx/3;
special->momy = toucher->momy/3;
special->momz = toucher->momz/3;
toucher->momx /= -8;
toucher->momy /= -8;
toucher->momz /= -8;
special->flags &= ~MF_SPECIAL;
if (special->info->activesound)
S_StartSound(special, special->info->activesound);
P_SetTarget(&special->tracer, toucher);
player->homing = 0;
return;
}
case MT_GSNAPPER:
if (!elementalpierce
&& toucher->z < special->z + special->height
&& toucher->z + toucher->height > special->z
&& P_DamageMobj(toucher, special, special, 1, DMG_SPIKE))
return; // Can only hit snapper from above
break;
case MT_SPINCUSHION:
if (P_MobjFlip(toucher)*(toucher->z - (special->z + special->height/2)) > 0)
{
if (player->pflags & PF_BOUNCING)
{
toucher->momz = -toucher->momz;
P_DoAbilityBounce(player, false);
return;
}
else if (P_DamageMobj(toucher, special, special, 1, DMG_SPIKE))
return; // Cannot hit sharp from above
}
break;
case MT_FANG:
if (!player->powers[pw_flashing]
&& !(player->charability == CA_TWINSPIN && player->panim == PA_ABILITY)
&& !(player->charability2 == CA2_MELEE && player->panim == PA_ABILITY2))
{
if ((special->state == &states[S_FANG_BOUNCE3]
|| special->state == &states[S_FANG_BOUNCE4]
|| special->state == &states[S_FANG_PINCHBOUNCE3]
|| special->state == &states[S_FANG_PINCHBOUNCE4])
Make Fangboss' player pogo a little less bullshit by having an actually sensible calculation instead of trying to be smart. The old behaviour was trying way too hard to be smart and as a consequence made the hitbox way too huge.
2020-01-11 17:08:08 +00:00
&& P_MobjFlip(special)*((special->z + special->height/2) - (toucher->z + toucher->height/2)) > (toucher->height/2))
Hardcoded the boss's TouchSpecial hook. Also cleaned up this part of P_TouchSpecialThing a bit while I'm here
2019-05-05 17:22:19 +00:00
{
P_DamageMobj(toucher, special, special, 1, 0);
P_SetTarget(&special->tracer, toucher);
if (special->state == &states[S_FANG_PINCHBOUNCE3]
|| special->state == &states[S_FANG_PINCHBOUNCE4])
P_SetMobjState(special, S_FANG_PINCHPATHINGSTART2);
else
{
var1 = var2 = 4;
A_Boss5ExtraRepeat(special);
P_SetMobjState(special, S_FANG_PATHINGCONT2); //S_FANG_PATHINGCONT1 if you want him to drop a bomb on the player
}
if (special->eflags & MFE_VERTICALFLIP)
special->z = toucher->z - special->height;
else
special->z = toucher->z + toucher->height;
return;
}
}
break;
Make the Pyrefly glowing and damaging in its fire-spawning state
2019-10-07 20:23:52 +00:00
case MT_PYREFLY:
if (special->extravalue2 == 2 && P_DamageMobj(player->mo, special, special, 1, DMG_FIRE))
return;
Hardcoded the boss's TouchSpecial hook. Also cleaned up this part of P_TouchSpecialThing a bit while I'm here
2019-05-05 17:22:19 +00:00
default:
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
* Add native support for multi-hit badiks to MF_ENEMY. * MF2_FRET application and removal. * Flashing when flag present. * Bounce player back on successful damaging. * Add their spawnhealth to the chain. * Reduce code duplication in P_TouchSpecialThing. * Play with Crawla Commander a little bit as a test of its power.
2018-05-02 22:48:50 +00:00
In order to make P_PlayerCanDamage more flexible, I ended up bundling the invincibility/super checks into there. Also, the start of my improvements to CA2_MELEE. Users of that abiliy can only damage enemies/monitors if they touch the front of the player object, but to make up for it, the player is no longer forced away from the direction of the screen at bigger movement speeds.
2019-06-19 12:20:34 +00:00
if (P_PlayerCanDamage(player, special)) // Do you possess the ability to subdue the object?
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Implemented the Pterabyte grabbing mechanic
2019-09-29 16:42:17 +00:00
if (special->type == MT_PTERABYTE && special->target == player->mo && special->extravalue1 == 1)
return; // Can't hurt a Pterabyte if it's trying to pick you up
Bubblewrap shield now bounces on enemies and monitors instead of piercing through them.
2016-10-24 12:33:10 +00:00
if ((P_MobjFlip(toucher)*toucher->momz < 0) && (elementalpierce != 1))
{
Changed Bubble Shield functionality
2020-07-10 04:59:10 +00:00
if (!(player->charability2 == CA2_MELEE && player->panim == PA_ABILITY2))
{
fixed_t setmomz = -toucher->momz; // Store this, momz get changed by P_DoJump within P_DoBubbleBounce
2022
2022-03-03 19:24:46 +00:00
Changed Bubble Shield functionality
2020-07-10 04:59:10 +00:00
if (elementalpierce == 2) // Reset bubblewrap, part 1
P_DoBubbleBounce(player);
toucher->momz = setmomz;
if (elementalpierce == 2) // Reset bubblewrap, part 2
{
boolean underwater = toucher->eflags & MFE_UNDERWATER;
2022
2022-03-03 19:24:46 +00:00
Changed Bubble Shield functionality
2020-07-10 04:59:10 +00:00
if (underwater)
toucher->momz /= 2;
toucher->momz -= (toucher->momz/(underwater ? 8 : 4)); // Cap the height!
}
}
Bubblewrap shield now bounces on enemies and monitors instead of piercing through them.
2016-10-24 12:33:10 +00:00
}
* CA_BOUNCE users now play animation/sound when bouncing on enemies, monitors. * CA_BOUNCE users harmlessly bounce off Sharps.
2016-12-24 00:11:54 +00:00
if (player->pflags & PF_BOUNCING)
P_DoAbilityBounce(player, false);
* Add native support for multi-hit badiks to MF_ENEMY. * MF2_FRET application and removal. * Flashing when flag present. * Bounce player back on successful damaging. * Add their spawnhealth to the chain. * Reduce code duplication in P_TouchSpecialThing. * Play with Crawla Commander a little bit as a test of its power.
2018-05-02 22:48:50 +00:00
if (special->info->spawnhealth > 1) // Multi-hit? Bounce back!
{
toucher->momx = -toucher->momx;
toucher->momy = -toucher->momy;
Now it's CA_TWINSPIN's turn to get the improvements! * Remove PF_THOKKED every time a successful damage bounce occours. * When this happens, spawn a number of particles based on thokitem at half scale! (Optimised, again, for MT_LHRT.) * Also spawn these particles when a successful spring boost occours, as well as playing a twisted spring sound. Also, some other related tweaks: * Optimisations to A_VultureBlast, which was used as a base for the particle creation. * Make the Metal Sonic boss use P_PlayerCanDamage instead of a custom, somewhat broken player damage detection mechanism. * P_SpawnGhostMobj takes colorized into account. * Fold Tails propeller damage into P_PlayerCanDamage. * When performing an Attraction Blast, place the player in roll frames. * Update all conditions preventing SH_PINK to incorporate thokitem and spinitem as well. * Buff MT_LHRT travel distance at slow speeds.
2019-06-26 22:26:05 +00:00
if (player->charability == CA_FLY && player->panim == PA_ABILITY)
toucher->momz = -toucher->momz/2;
Improve glide bounces
2019-09-30 08:35:05 +00:00
else if (player->pflags & PF_GLIDING && !P_IsObjectOnGround(toucher))
Added bounce-off behavior for multi-hit enemies/bosses
2019-09-23 19:54:04 +00:00
{
player->pflags &= ~(PF_GLIDING|PF_JUMPED|PF_NOJUMPDAMAGE);
Improve glide bounces
2019-09-30 08:35:05 +00:00
P_SetPlayerMobjState(toucher, S_PLAY_FALL);
toucher->momz += P_MobjFlip(toucher) * (player->speed >> 3);
toucher->momx = 7*toucher->momx>>3;
toucher->momy = 7*toucher->momy>>3;
Added bounce-off behavior for multi-hit enemies/bosses
2019-09-23 19:54:04 +00:00
}
Merge branch 'master' into metalstuff
2019-10-26 08:07:59 +00:00
else if (player->dashmode >= DASHMODE_THRESHOLD && (player->charflags & (SF_DASHMODE|SF_MACHINE)) == (SF_DASHMODE|SF_MACHINE)
Put dashmode players in pain state when damaging enemy with >1HP
2019-10-23 05:54:15 +00:00
&& player->panim == PA_DASH)
P_DoPlayerPain(player, special, special);
* Add native support for multi-hit badiks to MF_ENEMY. * MF2_FRET application and removal. * Flashing when flag present. * Bounce player back on successful damaging. * Add their spawnhealth to the chain. * Reduce code duplication in P_TouchSpecialThing. * Play with Crawla Commander a little bit as a test of its power.
2018-05-02 22:48:50 +00:00
}
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
P_DamageMobj(special, toucher, toucher, 1, 0);
Now it's CA_TWINSPIN's turn to get the improvements! * Remove PF_THOKKED every time a successful damage bounce occours. * When this happens, spawn a number of particles based on thokitem at half scale! (Optimised, again, for MT_LHRT.) * Also spawn these particles when a successful spring boost occours, as well as playing a twisted spring sound. Also, some other related tweaks: * Optimisations to A_VultureBlast, which was used as a base for the particle creation. * Make the Metal Sonic boss use P_PlayerCanDamage instead of a custom, somewhat broken player damage detection mechanism. * P_SpawnGhostMobj takes colorized into account. * Fold Tails propeller damage into P_PlayerCanDamage. * When performing an Attraction Blast, place the player in roll frames. * Update all conditions preventing SH_PINK to incorporate thokitem and spinitem as well. * Buff MT_LHRT travel distance at slow speeds.
2019-06-26 22:26:05 +00:00
if (player->charability == CA_TWINSPIN && player->panim == PA_ABILITY)
P_TwinSpinRejuvenate(player, player->thokitem);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
else
Implemented the Pterabyte grabbing mechanic
2019-09-29 16:42:17 +00:00
{
if (special->type == MT_PTERABYTE && special->target == player->mo)
return; // Don't hurt the player you're trying to grab
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
P_DamageMobj(toucher, special, special, 1, 0);
Implemented the Pterabyte grabbing mechanic
2019-09-29 16:42:17 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
}
else if (special->flags & MF_FIRE)
{
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
P_DamageMobj(toucher, special, special, 1, DMG_FIRE);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
}
else
{
// We now identify by object type, not sprite! Tails 04-11-2001
switch (special->type)
{
// ***************************************** //
// Rings, coins, spheres, weapon panels, etc //
// ***************************************** //
case MT_REDTEAMRING:
if (player->ctfteam != 1)
return;
Build: kill GCC 7's implicit-fallthrough warning
2017-09-28 13:39:47 +00:00
/* FALLTHRU */
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
case MT_BLUETEAMRING: // Yes, I'm lazy. Oh well, deal with it.
if (special->type == MT_BLUETEAMRING && player->ctfteam != 2)
return;
Build: kill GCC 7's implicit-fallthrough warning
2017-09-28 13:39:47 +00:00
/* FALLTHRU */
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
case MT_RING:
case MT_FLINGRING:
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
case MT_COIN:
case MT_FLINGCOIN:
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
case MT_NIGHTSSTAR:
if (!(P_CanPickupItem(player, false)) && !(special->flags2 & MF2_NIGHTSPULL))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
special->momx = special->momy = special->momz = 0;
P_GivePlayerRings(player, 1);
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
if ((maptol & TOL_NIGHTS) && special->type != MT_FLINGRING && special->type != MT_FLINGCOIN)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
P_DoNightsScore(player);
break;
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
case MT_BLUESPHERE:
MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP implementation
2018-08-10 04:20:30 +00:00
case MT_FLINGBLUESPHERE:
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
case MT_NIGHTSCHIP:
MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP implementation
2018-08-10 04:20:30 +00:00
case MT_FLINGNIGHTSCHIP:
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
if (!(P_CanPickupItem(player, false)) && !(special->flags2 & MF2_NIGHTSPULL))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
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
special->momx = special->momy = special->momz = 0;
P_GivePlayerSpheres(player, 1);
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
if (special->type == MT_BLUESPHERE)
{
special->destscale = ((player->powers[pw_carry] == CR_NIGHTSMODE) ? 4 : 2)*special->scale;
if (states[special->info->deathstate].tics > 0)
special->scalespeed = FixedDiv(FixedDiv(special->destscale, special->scale), states[special->info->deathstate].tics<<FRACBITS);
else
special->scalespeed = 4*FRACUNIT/5;
}
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
if (maptol & TOL_NIGHTS)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
P_DoNightsScore(player);
break;
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
case MT_BOMBSPHERE:
if (!(P_CanPickupItem(player, false)) && !(special->flags2 & MF2_NIGHTSPULL))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
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
special->momx = special->momy = special->momz = 0;
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
P_DamageMobj(toucher, special, special, 1, 0);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
break;
case MT_AUTOPICKUP:
case MT_BOUNCEPICKUP:
case MT_SCATTERPICKUP:
case MT_GRENADEPICKUP:
case MT_EXPLODEPICKUP:
case MT_RAILPICKUP:
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
if (!(P_CanPickupItem(player, true)))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
// Give the power and ringweapon
if (special->info->mass >= pw_infinityring && special->info->mass <= pw_railring)
{
INT32 pindex = special->info->mass - (INT32)pw_infinityring;
New Match weapon/ammo dropping method. P_PlayerWeaponPanelOrAmmoBurst will go through all of the player's weapon rings and either drop the weapon panel itself (with no ammo attached, and no ammo taken away!) OR if the player has ammo but no weapon, it drops the ammo instead (and you lose it).
2015-05-27 04:45:34 +00:00
player->powers[special->info->mass] += (UINT16)special->reactiontime;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
player->ringweapons |= 1 << (pindex-1);
if (player->powers[special->info->mass] > rw_maximums[pindex])
player->powers[special->info->mass] = rw_maximums[pindex];
}
break;
// Ammo pickups
case MT_INFINITYRING:
case MT_AUTOMATICRING:
case MT_BOUNCERING:
case MT_SCATTERRING:
case MT_GRENADERING:
case MT_EXPLOSIONRING:
case MT_RAILRING:
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
if (!(P_CanPickupItem(player, true)))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
if (special->info->mass >= pw_infinityring && special->info->mass <= pw_railring)
{
INT32 pindex = special->info->mass - (INT32)pw_infinityring;
player->powers[special->info->mass] += (UINT16)special->health;
if (player->powers[special->info->mass] > rw_maximums[pindex])
player->powers[special->info->mass] = rw_maximums[pindex];
}
break;
// ***************************** //
// Gameplay related collectibles //
// ***************************** //
// Special Stage Token
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
case MT_TOKEN:
All remaining player->bot checks modified to rely on BOT_ constants
2021-07-15 20:03:26 +00:00
if (player->bot && player->bot != BOT_MPAI)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
Add score on Emerald Token pickup (and make the all-emerald bonus a continue in SP) as requested.
2017-04-18 16:45:23 +00:00
P_AddPlayerScore(player, 1000);
Special Stages/token stuff
2019-12-19 01:46:17 +00:00
if (!(gametyperules & GTR_SPECIALSTAGES) || modeattacking) // score only?
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_StartSound(toucher, sfx_chchng);
* 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
break;
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
}
* 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
tokenlist += special->health;
if (ALL7EMERALDS(emeralds)) // Got all 7
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Disable continues outside of no-save/Ultimate by default, but allow SOC to re-enable them globally. Please look at the merge request description for a full explanation, since I know the vanilla team has been hashing this out and I don't want to add fuel to the fire without at least presenting a solid case.
2020-03-26 20:16:44 +00:00
if (continuesInSession)
Add score on Emerald Token pickup (and make the all-emerald bonus a continue in SP) as requested.
2017-04-18 16:45:23 +00:00
{
* 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
player->continues += 1;
Fix silly typo :P
2019-11-09 14:46:34 +00:00
player->gotcontinue = true;
* 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
if (P_IsLocalPlayer(player))
S_StartSound(NULL, sfx_s3kac);
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
else
S_StartSound(toucher, sfx_chchng);
Add score on Emerald Token pickup (and make the all-emerald bonus a continue in SP) as requested.
2017-04-18 16:45:23 +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
else
Disable continues outside of no-save/Ultimate by default, but allow SOC to re-enable them globally. Please look at the merge request description for a full explanation, since I know the vanilla team has been hashing this out and I don't want to add fuel to the fire without at least presenting a solid case.
2020-03-26 20:16:44 +00:00
{
P_GiveCoopLives(player, 1, true); // if continues are disabled, a life is a reasonable substitute
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_StartSound(toucher, sfx_chchng);
Disable continues outside of no-save/Ultimate by default, but allow SOC to re-enable them globally. Please look at the merge request description for a full explanation, since I know the vanilla team has been hashing this out and I don't want to add fuel to the fire without at least presenting a solid case.
2020-03-26 20:16:44 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
* 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
else
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
{
* 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
token++;
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_StartSound(toucher, sfx_token);
}
* 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
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
break;
// Emerald Hunt
case MT_EMERHUNT:
All remaining player->bot checks modified to rely on BOT_ constants
2021-07-15 20:03:26 +00:00
if (player->bot && player->bot != BOT_MPAI)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
if (hunt1 == special)
hunt1 = NULL;
else if (hunt2 == special)
hunt2 = NULL;
else if (hunt3 == special)
hunt3 = NULL;
if (!hunt1 && !hunt2 && !hunt3)
{
for (i = 0; i < MAXPLAYERS; i++)
{
if (!playeringame[i] || players[i].spectator)
continue;
players[i].exiting = (14*TICRATE)/5 + 1;
}
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_StartSound(NULL, sfx_lvpass);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
break;
// Collectible emeralds
case MT_EMERALD1:
case MT_EMERALD2:
case MT_EMERALD3:
case MT_EMERALD4:
case MT_EMERALD5:
case MT_EMERALD6:
case MT_EMERALD7:
All remaining player->bot checks modified to rely on BOT_ constants
2021-07-15 20:03:26 +00:00
if (player->bot && player->bot != BOT_MPAI)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
if (special->threshold)
New emerald behavior in Match. No longer turns you super, instead emeralds steal points from enemy players and give you (and relevant teammates) an invincibility + super sneakers monitor.
2015-05-27 06:08:18 +00:00
{
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
player->powers[pw_emeralds] |= special->info->speed;
New emerald behavior in Match. No longer turns you super, instead emeralds steal points from enemy players and give you (and relevant teammates) an invincibility + super sneakers monitor.
2015-05-27 06:08:18 +00:00
P_DoMatchSuper(player);
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
* Fix "exitlevel" being counted as a special stage success despite not giving you an emerald by inverting stagefailed's default value, since there's only a limited number of ways you can WIN at a special stage. * Correct a potential source of desync in P_GiveEmerald.
2019-07-30 15:44:40 +00:00
{
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
emeralds |= special->info->speed;
* Fix "exitlevel" being counted as a special stage success despite not giving you an emerald by inverting stagefailed's default value, since there's only a limited number of ways you can WIN at a special stage. * Correct a potential source of desync in P_GiveEmerald.
2019-07-30 15:44:40 +00:00
stagefailed = false;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (special->target && special->target->type == MT_EMERALDSPAWN)
{
if (special->target->target)
P_SetTarget(&special->target->target, NULL);
special->target->threshold = 0;
P_SetTarget(&special->target, NULL);
}
break;
// Power stones / Match emeralds
case MT_FLINGEMERALD:
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
if (!(P_CanPickupItem(player, true)) || player->tossdelay)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
player->powers[pw_emeralds] |= special->threshold;
New emerald behavior in Match. No longer turns you super, instead emeralds steal points from enemy players and give you (and relevant teammates) an invincibility + super sneakers monitor.
2015-05-27 06:08:18 +00:00
P_DoMatchSuper(player);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
break;
// Secret emblem thingy
case MT_EMBLEM:
{
:dramahog:
2022-03-06 21:52:43 +00:00
if (demoplayback || (player->bot && player->bot != BOT_MPAI) || special->health <= 0 || special->health > MAXEMBLEMS)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
emblemlocations[special->health-1].collected = true;
M_UpdateUnlockablesAndExtraEmblems();
G_SaveGameData();
break;
}
// CTF Flags
case MT_REDFLAG:
case MT_BLUEFLAG:
All remaining player->bot checks modified to rely on BOT_ constants
2021-07-15 20:03:26 +00:00
if (player->bot && player->bot != BOT_MPAI)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
if (player->powers[pw_flashing] || player->tossdelay)
return;
if (!special->spawnpoint)
return;
if (special->fuse == 1)
return;
// if (special->momz > 0)
// return;
{
UINT8 flagteam = (special->type == MT_REDFLAG) ? 1 : 2;
Replace most sector specials with sector special flags
2021-12-30 23:03:24 +00:00
sectorspecialflags_t specialflag = (special->type == MT_REDFLAG) ? SSF_REDTEAMBASE : SSF_BLUETEAMBASE;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
const char *flagtext;
Better CTF in splitscreen, no death message for spectators
2016-04-07 02:55:58 +00:00
char flagcolor;
char plname[MAXPLAYERNAME+4];
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (special->type == MT_REDFLAG)
Better CTF in splitscreen, no death message for spectators
2016-04-07 02:55:58 +00:00
{
flagtext = M_GetText("Red flag");
flagcolor = '\x85';
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
Better CTF in splitscreen, no death message for spectators
2016-04-07 02:55:58 +00:00
{
flagtext = M_GetText("Blue flag");
flagcolor = '\x84';
}
snprintf(plname, sizeof(plname), "%s%s%s",
CTFTEAMCODE(player),
player_names[player - players],
CTFTEAMENDCODE(player));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (player->ctfteam == flagteam) // Player is on the same team as the flag
{
// Ignore height, only check x/y for now
// avoids stupid problems with some flags constantly returning
if (special->x>>FRACBITS != special->spawnpoint->x
|| special->y>>FRACBITS != special->spawnpoint->y)
{
special->fuse = 1;
special->flags2 |= MF2_JUSTATTACKED;
Replace most sector specials with sector special flags
2021-12-30 23:03:24 +00:00
if (!P_PlayerTouchingSectorSpecialFlag(player, specialflag))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Better CTF in splitscreen, no death message for spectators
2016-04-07 02:55:58 +00:00
CONS_Printf(M_GetText("%s returned the %c%s%c to base.\n"), plname, flagcolor, flagtext, 0x80);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Better CTF in splitscreen, no death message for spectators
2016-04-07 02:55:58 +00:00
// The fuse code plays this sound effect
//if (players[consoleplayer].ctfteam == player->ctfteam)
// S_StartSound(NULL, sfx_hoop1);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
}
else if (player->ctfteam) // Player is on the other team (and not a spectator)
{
UINT16 flagflag = (special->type == MT_REDFLAG) ? GF_REDFLAG : GF_BLUEFLAG;
mobj_t **flagmobj = (special->type == MT_REDFLAG) ? &redflag : &blueflag;
if (player->powers[pw_super])
return;
player->gotflag |= flagflag;
Better CTF in splitscreen, no death message for spectators
2016-04-07 02:55:58 +00:00
CONS_Printf(M_GetText("%s picked up the %c%s%c!\n"), plname, flagcolor, flagtext, 0x80);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
(*flagmobj) = NULL;
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
// code for dealing with abilities is handled elsewhere now
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
break;
}
}
return;
// ********************************** //
// NiGHTS gameplay items and powerups //
// ********************************** //
case MT_NIGHTSDRONE:
{
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
boolean spec = G_IsSpecialStage(gamemap);
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
boolean cangiveemmy = false;
All remaining player->bot checks modified to rely on BOT_ constants
2021-07-15 20:03:26 +00:00
if (player->bot && player->bot != BOT_MPAI)
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
return;
if (player->exiting)
return;
if (player->bonustime)
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
if (spec) //After-mare bonus time/emerald reward in special stages.
SRB2 2.1.9 release
2014-08-04 03:49:33 +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
// only allow the player with the emerald in-hand to leave.
if (toucher->tracer
&& toucher->tracer->type == MT_GOTEMERALD)
{}
else // Make sure that SOMEONE has the emerald, at least!
{
for (i = 0; i < MAXPLAYERS; i++)
if (playeringame[i] && players[i].playerstate == PST_LIVE
&& players[i].mo->tracer
&& players[i].mo->tracer->type == MT_GOTEMERALD)
return;
// Well no one has an emerald, so exit anyway!
}
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
cangiveemmy = true;
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
// Don't play Ideya sound in special stage mode
SRB2 2.1.9 release
2014-08-04 03:49:33 +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
else
S_StartSound(toucher, special->info->activesound);
}
else //Initial transformation. Don't allow second chances in special stages!
{
if (player->powers[pw_carry] == CR_NIGHTSMODE)
return;
S_StartSound(toucher, sfx_supert);
}
P_SwitchSpheresBonusMode(false);
if (!(netgame || multiplayer) && !(player->powers[pw_carry] == CR_NIGHTSMODE))
P_SetTarget(&special->tracer, toucher);
Basic implementation for player position correction to Drone center * player->drone mobj variable * P_MoveNiGHTSToDrone, will change later
2018-08-10 23:25:49 +00:00
P_SetTarget(&player->drone, special); // Mark the player as 'center into the drone'
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
P_NightserizePlayer(player, special->health); // Transform!
if (!spec)
{
Look for two anchorpoints if player has two Ideyas * Undid "optimization" of checking player->exiting first because the last Ideya's orbit won't be adjusted
2018-08-14 21:48:14 +00:00
if (toucher->tracer) // Move the Ideya to an anchor!
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
{
Fix orbiting Ideya bug, now player gets them back again on exit
2018-08-12 02:13:33 +00:00
mobj_t *orbittarget = special->target ? special->target : special;
Look for two anchorpoints if player has two Ideyas * Undid "optimization" of checking player->exiting first because the last Ideya's orbit won't be adjusted
2018-08-14 21:48:14 +00:00
mobj_t *hnext = orbittarget->hnext, *anchorpoint = NULL, *anchorpoint2 = NULL;
Make anchoring non-specific to Ideya states (now anchor anything!) # Conflicts: # src/p_inter.c
2018-08-13 06:19:53 +00:00
mobj_t *mo2;
thinker_t *th;
Anchor Ideya logic # Conflicts: # src/p_enemy.c # src/p_inter.c
2018-08-13 06:17:07 +00:00
Look for two anchorpoints if player has two Ideyas * Undid "optimization" of checking player->exiting first because the last Ideya's orbit won't be adjusted
2018-08-14 21:48:14 +00:00
// The player might have two Ideyas: toucher->tracer and toucher->tracer->hnext
// so handle their anchorpoints accordingly.
Make anchoring non-specific to Ideya states (now anchor anything!) # Conflicts: # src/p_inter.c
2018-08-13 06:19:53 +00:00
// scan the thinkers to find the corresponding anchorpoint
Fix mobj list iteration oversights. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 10:58:22 +00:00
for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
Anchor Ideya logic # Conflicts: # src/p_enemy.c # src/p_inter.c
2018-08-13 06:17:07 +00:00
{
Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list. Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
2019-07-12 23:42:03 +00:00
if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
Make anchoring non-specific to Ideya states (now anchor anything!) # Conflicts: # src/p_inter.c
2018-08-13 06:19:53 +00:00
continue;
Anchor Ideya logic # Conflicts: # src/p_enemy.c # src/p_inter.c
2018-08-13 06:17:07 +00:00
Make anchoring non-specific to Ideya states (now anchor anything!) # Conflicts: # src/p_inter.c
2018-08-13 06:19:53 +00:00
mo2 = (mobj_t *)th;
Anchor Ideya logic # Conflicts: # src/p_enemy.c # src/p_inter.c
2018-08-13 06:17:07 +00:00
Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list. Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
2019-07-12 23:42:03 +00:00
if (mo2->type != MT_IDEYAANCHOR)
continue;
Look for two anchorpoints if player has two Ideyas * Undid "optimization" of checking player->exiting first because the last Ideya's orbit won't be adjusted
2018-08-14 21:48:14 +00:00
Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list. Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
2019-07-12 23:42:03 +00:00
if (mo2->health == toucher->tracer->health) // do ideya numberes match?
anchorpoint = mo2;
else if (toucher->tracer->hnext && mo2->health == toucher->tracer->hnext->health)
anchorpoint2 = mo2;
if ((!toucher->tracer->hnext && anchorpoint)
|| (toucher->tracer->hnext && anchorpoint && anchorpoint2))
break;
Make anchoring non-specific to Ideya states (now anchor anything!) # Conflicts: # src/p_inter.c
2018-08-13 06:19:53 +00:00
}
Anchor Ideya logic # Conflicts: # src/p_enemy.c # src/p_inter.c
2018-08-13 06:17:07 +00:00
Make anchoring non-specific to Ideya states (now anchor anything!) # Conflicts: # src/p_inter.c
2018-08-13 06:19:53 +00:00
if (anchorpoint)
{
toucher->tracer->flags |= MF_GRENADEBOUNCE; // custom radius factors
toucher->tracer->threshold = 8 << 20; // X factor 0, Y factor 0, Z factor 8
Anchor Ideya logic # Conflicts: # src/p_enemy.c # src/p_inter.c
2018-08-13 06:17:07 +00:00
}
Scale Ideyas when moving to/from NIGHTSDRONE and scaling changes to NIGHTSDRONE
2018-08-12 03:53:07 +00:00
Look for two anchorpoints if player has two Ideyas * Undid "optimization" of checking player->exiting first because the last Ideya's orbit won't be adjusted
2018-08-14 21:48:14 +00:00
if (anchorpoint2)
{
toucher->tracer->hnext->flags |= MF_GRENADEBOUNCE; // custom radius factors
toucher->tracer->hnext->threshold = 8 << 20; // X factor 0, Y factor 0, Z factor 8
}
Scale Ideyas when moving to/from NIGHTSDRONE and scaling changes to NIGHTSDRONE
2018-08-12 03:53:07 +00:00
Fix orbiting Ideya bug, now player gets them back again on exit
2018-08-12 02:13:33 +00:00
P_SetTarget(&orbittarget->hnext, toucher->tracer);
Ideya fixes when a player has more than one Ideya # Conflicts: # src/p_inter.c
2018-08-14 21:21:49 +00:00
if (!orbittarget->hnext->hnext)
P_SetTarget(&orbittarget->hnext->hnext, hnext); // Buffalo buffalo Buffalo buffalo buffalo buffalo Buffalo buffalo.
else
Look for two anchorpoints if player has two Ideyas * Undid "optimization" of checking player->exiting first because the last Ideya's orbit won't be adjusted
2018-08-14 21:48:14 +00:00
P_SetTarget(&orbittarget->hnext->hnext->target, anchorpoint2 ? anchorpoint2 : orbittarget);
Ideya fixes when a player has more than one Ideya # Conflicts: # src/p_inter.c # Conflicts: # src/p_inter.c
2018-08-14 21:28:51 +00:00
P_SetTarget(&orbittarget->hnext->target, anchorpoint ? anchorpoint : orbittarget);
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
P_SetTarget(&toucher->tracer, NULL);
Remove A_OrbitNights additional input offset on current target Z, don't need it
2018-08-11 16:06:50 +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
if (hnext)
{
Fix orbiting Ideya bug, now player gets them back again on exit
2018-08-12 02:13:33 +00:00
orbittarget->hnext->extravalue1 = (angle_t)(hnext->extravalue1 - 72*ANG1);
if (orbittarget->hnext->extravalue1 > hnext->extravalue1)
orbittarget->hnext->extravalue1 -= (72*ANG1)/orbittarget->hnext->extravalue1;
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
}
}
if (player->exiting) // ...then move it back?
{
Remove A_OrbitNights additional input offset on current target Z, don't need it
2018-08-11 16:06:50 +00:00
mobj_t *hnext = special->target ? special->target : special; // goalpost
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
while ((hnext = hnext->hnext))
Look for two anchorpoints if player has two Ideyas * Undid "optimization" of checking player->exiting first because the last Ideya's orbit won't be adjusted
2018-08-14 21:48:14 +00:00
{
hnext->flags &= ~MF_GRENADEBOUNCE;
hnext->threshold = 0;
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
P_SetTarget(&hnext->target, toucher);
Look for two anchorpoints if player has two Ideyas * Undid "optimization" of checking player->exiting first because the last Ideya's orbit won't be adjusted
2018-08-14 21:48:14 +00:00
}
SRB2 2.1.9 release
2014-08-04 03:49:33 +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
return;
}
if (!cangiveemmy)
return;
if (player->exiting)
P_GiveEmerald(false);
else if (player->mo->tracer && player->mare)
{
P_KillMobj(toucher->tracer, NULL, NULL, 0); // No emerald for you just yet!
S_StartSound(NULL, sfx_ghosty);
special->flags2 |= MF2_DONTDRAW;
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
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
return;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
case MT_NIGHTSLOOPHELPER:
// One second delay
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
if (special->fuse < toucher->fuse - TICRATE)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
thinker_t *th;
mobj_t *mo2;
INT32 count;
fixed_t x,y,z, gatherradius;
angle_t d;
statenum_t sparklestate = S_NULL;
if (special->target != toucher) // These ain't your helpers, pal!
return;
x = special->x>>FRACBITS;
y = special->y>>FRACBITS;
z = special->z>>FRACBITS;
count = 1;
// scan the remaining thinkers
Fix mobj list iteration oversights. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 10:58:22 +00:00
for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list. Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
2019-07-12 23:42:03 +00:00
if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
continue;
mo2 = (mobj_t *)th;
if (mo2 == special)
continue;
// Not our stuff!
if (mo2->target != toucher)
continue;
if (mo2->type == MT_NIGHTSPARKLE)
mo2->tics = 1;
else if (mo2->type == MT_NIGHTSLOOPHELPER)
{
if (mo2->fuse >= special->fuse)
{
count++;
x += mo2->x>>FRACBITS;
y += mo2->y>>FRACBITS;
z += mo2->z>>FRACBITS;
}
P_RemoveMobj(mo2);
}
}
x = (x/count)<<FRACBITS;
y = (y/count)<<FRACBITS;
z = (z/count)<<FRACBITS;
gatherradius = P_AproxDistance(P_AproxDistance(special->x - x, special->y - y), special->z - z);
P_RemoveMobj(special);
if (player->powers[pw_nights_superloop])
{
gatherradius *= 2;
sparklestate = mobjinfo[MT_NIGHTSPARKLE].seestate;
}
if (gatherradius < 30*FRACUNIT) // Player is probably just sitting there.
return;
for (d = 0; d < 16; d++)
P_SpawnParaloop(x, y, z, gatherradius, 16, MT_NIGHTSPARKLE, sparklestate, d*ANGLE_22h, false);
S_StartSound(toucher, sfx_prloop);
// Now we RE-scan all the thinkers to find close objects to pull
// in from the paraloop. Isn't this just so efficient?
Fix mobj list iteration oversights. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 10:58:22 +00:00
for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list. Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
2019-07-12 23:42:03 +00:00
if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
continue;
mo2 = (mobj_t *)th;
if (P_AproxDistance(P_AproxDistance(mo2->x - x, mo2->y - y), mo2->z - z) > gatherradius)
continue;
if (mo2->flags & MF_SHOOTABLE)
{
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
P_DamageMobj(mo2, toucher, toucher, 1, 0);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
continue;
}
// Make these APPEAR!
// Tails 12-15-2003
if (mo2->flags & MF_NIGHTSITEM)
{
// Requires Bonus Time
if ((mo2->flags2 & MF2_STRONGBOX) && !player->bonustime)
continue;
if (!(mo2->flags & MF_SPECIAL) && mo2->health)
{
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
mo2->flags2 &= ~MF2_DONTDRAW;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
mo2->flags |= MF_SPECIAL;
mo2->flags &= ~MF_NIGHTSITEM;
S_StartSound(toucher, sfx_hidden);
continue;
}
}
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
if (!(mo2->type == MT_RING || mo2->type == MT_COIN
|| mo2->type == MT_BLUESPHERE || mo2->type == MT_BOMBSPHERE
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
|| mo2->type == MT_NIGHTSCHIP || mo2->type == MT_NIGHTSSTAR
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
|| ((mo2->type == MT_EMBLEM) && (mo2->reactiontime & GE_NIGHTSPULL))))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
continue;
// Yay! The thing's in reach! Pull it in!
mo2->flags |= MF_NOCLIP|MF_NOCLIPHEIGHT;
mo2->flags2 |= MF2_NIGHTSPULL;
Dummy out NiGHTS item faster attract
2018-08-30 14:50:03 +00:00
// New NiGHTS attract speed dummied out because the older behavior
// is exploited as a mechanic. Uncomment to enable.
mo2->movefactor = 0; // 32*FRACUNIT; // initialize the NightsItemChase timer
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
P_SetTarget(&mo2->tracer, toucher);
}
}
return;
case MT_EGGCAPSULE:
All remaining player->bot checks modified to rely on BOT_ constants
2021-07-15 20:03:26 +00:00
if (player->bot && player->bot != BOT_MPAI)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
// make sure everything is as it should be, THEN take rings from players in special stages
Increased space in pflags (because we were getting VERY close to full capacity), which I will re-organise when this branch is closer to completion. * PF_NIGHTSMODE is now CR_NIGHTSMODE as part of player->powers[pw_carry]. This is because it's mutually exclusive to every other "carry" type. * PF_SUPERREADY is dead because it literally just checked for all 7 emeralds and 50 rings. That's it. You couldn't even appreciably alter its presence with Lua. That logic has been placed back in P_SuperReady.
2017-03-14 18:11:17 +00:00
if (player->powers[pw_carry] == CR_NIGHTSMODE && !toucher->target)
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
return;
Ideya fixes when a player has more than one Ideya # Conflicts: # src/p_inter.c
2018-08-14 21:21:49 +00:00
if (toucher->tracer && toucher->tracer->health > 0)
return; // Don't have multiple ideya, unless it's the first one given (health = 0)
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
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
if (player->mare != special->threshold) // wrong mare
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
if (special->reactiontime > 0) // capsule already has a player attacking it, ignore
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
if (G_IsSpecialStage(gamemap) && !player->exiting)
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
{ // In special stages, share spheres. Everyone gives up theirs to the player who touched the capsule
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
for (i = 0; i < MAXPLAYERS; i++)
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
if (playeringame[i] && (&players[i] != player) && players[i].spheres > 0)
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
player->spheres += players[i].spheres;
players[i].spheres = 0;
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
if (player->spheres <= 0 || player->exiting)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
// Mark the player as 'pull into the capsule'
P_SetTarget(&player->capsule, special);
special->reactiontime = (player-players)+1;
P_SetTarget(&special->target, NULL);
// Clear text
player->texttimer = 0;
return;
case MT_NIGHTSBUMPER:
// Don't trigger if the stage is ended/failed
if (player->exiting)
return;
Change the time NiGHTS bumpers aren't responded to to 5 tics rather than 9.
2019-10-07 12:08:49 +00:00
if (player->bumpertime <= (TICRATE/2)-5)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
S_StartSound(toucher, special->info->seesound);
Increased space in pflags (because we were getting VERY close to full capacity), which I will re-organise when this branch is closer to completion. * PF_NIGHTSMODE is now CR_NIGHTSMODE as part of player->powers[pw_carry]. This is because it's mutually exclusive to every other "carry" type. * PF_SUPERREADY is dead because it literally just checked for all 7 emeralds and 50 rings. That's it. You couldn't even appreciably alter its presence with Lua. That logic has been placed back in P_SuperReady.
2017-03-14 18:11:17 +00:00
if (player->powers[pw_carry] == CR_NIGHTSMODE)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
player->bumpertime = TICRATE/2;
if (special->threshold > 0)
player->flyangle = (special->threshold*30)-1;
else
player->flyangle = special->threshold;
player->speed = FixedMul(special->info->speed, special->scale);
Fix NiGHTS Bumper player positioning
2018-08-15 22:42:20 +00:00
P_SetTarget(&player->mo->hnext, special); // Reference bumper for position correction on next tic
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
else // More like a spring
{
angle_t fa;
fixed_t xspeed, yspeed;
const fixed_t speed = FixedMul(FixedDiv(special->info->speed*FRACUNIT,75*FRACUNIT), FixedSqrt(FixedMul(toucher->scale,special->scale)));
player->bumpertime = TICRATE/2;
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
P_UnsetThingPosition(toucher);
toucher->x = special->x;
toucher->y = special->y;
P_SetThingPosition(toucher);
toucher->z = special->z+(special->height/4);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (special->threshold > 0)
fa = (FixedAngle(((special->threshold*30)-1)*FRACUNIT)>>ANGLETOFINESHIFT) & FINEMASK;
else
fa = 0;
xspeed = FixedMul(FINECOSINE(fa),speed);
yspeed = FixedMul(FINESINE(fa),speed);
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
P_InstaThrust(toucher, special->angle, xspeed/10);
toucher->momz = yspeed/11;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
toucher->angle = special->angle;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Fix potential desynch when a player spawns
2020-05-28 09:03:35 +00:00
P_SetPlayerAngle(player, toucher->angle);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
P_ResetPlayer(player);
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
P_SetPlayerMobjState(toucher, S_PLAY_FALL);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
return;
case MT_NIGHTSSUPERLOOP:
All remaining player->bot checks modified to rely on BOT_ constants
2021-07-15 20:03:26 +00:00
if ((player->bot && player->bot != BOT_MPAI) || !(player->powers[pw_carry] == CR_NIGHTSMODE))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
if (!G_IsSpecialStage(gamemap))
player->powers[pw_nights_superloop] = (UINT16)special->info->speed;
else
{
for (i = 0; i < MAXPLAYERS; i++)
Increased space in pflags (because we were getting VERY close to full capacity), which I will re-organise when this branch is closer to completion. * PF_NIGHTSMODE is now CR_NIGHTSMODE as part of player->powers[pw_carry]. This is because it's mutually exclusive to every other "carry" type. * PF_SUPERREADY is dead because it literally just checked for all 7 emeralds and 50 rings. That's it. You couldn't even appreciably alter its presence with Lua. That logic has been placed back in P_SuperReady.
2017-03-14 18:11:17 +00:00
if (playeringame[i] && players[i].powers[pw_carry] == CR_NIGHTSMODE)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
players[i].powers[pw_nights_superloop] = (UINT16)special->info->speed;
if (special->info->deathsound != sfx_None)
S_StartSound(NULL, special->info->deathsound);
}
// CECHO showing you what this item is
if (player == &players[displayplayer] || G_IsSpecialStage(gamemap))
{
HU_SetCEchoFlags(V_AUTOFADEOUT);
HU_SetCEchoDuration(4);
HU_DoCEcho(M_GetText("\\\\\\\\\\\\\\\\Super Paraloop"));
}
break;
case MT_NIGHTSDRILLREFILL:
All remaining player->bot checks modified to rely on BOT_ constants
2021-07-15 20:03:26 +00:00
if ((player->bot && player->bot != BOT_MPAI) || !(player->powers[pw_carry] == CR_NIGHTSMODE))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
if (!G_IsSpecialStage(gamemap))
player->drillmeter = special->info->speed;
else
{
for (i = 0; i < MAXPLAYERS; i++)
Increased space in pflags (because we were getting VERY close to full capacity), which I will re-organise when this branch is closer to completion. * PF_NIGHTSMODE is now CR_NIGHTSMODE as part of player->powers[pw_carry]. This is because it's mutually exclusive to every other "carry" type. * PF_SUPERREADY is dead because it literally just checked for all 7 emeralds and 50 rings. That's it. You couldn't even appreciably alter its presence with Lua. That logic has been placed back in P_SuperReady.
2017-03-14 18:11:17 +00:00
if (playeringame[i] && players[i].powers[pw_carry] == CR_NIGHTSMODE)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
players[i].drillmeter = special->info->speed;
if (special->info->deathsound != sfx_None)
S_StartSound(NULL, special->info->deathsound);
}
// CECHO showing you what this item is
if (player == &players[displayplayer] || G_IsSpecialStage(gamemap))
{
HU_SetCEchoFlags(V_AUTOFADEOUT);
HU_SetCEchoDuration(4);
HU_DoCEcho(M_GetText("\\\\\\\\\\\\\\\\Drill Refill"));
}
break;
case MT_NIGHTSHELPER:
All remaining player->bot checks modified to rely on BOT_ constants
2021-07-15 20:03:26 +00:00
if ((player->bot && player->bot != BOT_MPAI) || !(player->powers[pw_carry] == CR_NIGHTSMODE))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
if (!G_IsSpecialStage(gamemap))
{
// A flicky orbits us now
mobj_t *flickyobj = P_SpawnMobj(toucher->x, toucher->y, toucher->z + toucher->info->height, MT_NIGHTOPIANHELPER);
P_SetTarget(&flickyobj->target, toucher);
player->powers[pw_nights_helper] = (UINT16)special->info->speed;
}
else
{
mobj_t *flickyobj;
for (i = 0; i < MAXPLAYERS; i++)
Increased space in pflags (because we were getting VERY close to full capacity), which I will re-organise when this branch is closer to completion. * PF_NIGHTSMODE is now CR_NIGHTSMODE as part of player->powers[pw_carry]. This is because it's mutually exclusive to every other "carry" type. * PF_SUPERREADY is dead because it literally just checked for all 7 emeralds and 50 rings. That's it. You couldn't even appreciably alter its presence with Lua. That logic has been placed back in P_SuperReady.
2017-03-14 18:11:17 +00:00
if (playeringame[i] && players[i].mo && players[i].powers[pw_carry] == CR_NIGHTSMODE) {
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
players[i].powers[pw_nights_helper] = (UINT16)special->info->speed;
flickyobj = P_SpawnMobj(players[i].mo->x, players[i].mo->y, players[i].mo->z + players[i].mo->info->height, MT_NIGHTOPIANHELPER);
P_SetTarget(&flickyobj->target, players[i].mo);
}
if (special->info->deathsound != sfx_None)
S_StartSound(NULL, special->info->deathsound);
}
// CECHO showing you what this item is
if (player == &players[displayplayer] || G_IsSpecialStage(gamemap))
{
HU_SetCEchoFlags(V_AUTOFADEOUT);
HU_SetCEchoDuration(4);
HU_DoCEcho(M_GetText("\\\\\\\\\\\\\\\\Nightopian Helper"));
}
break;
case MT_NIGHTSEXTRATIME:
All remaining player->bot checks modified to rely on BOT_ constants
2021-07-15 20:03:26 +00:00
if ((player->bot && player->bot != BOT_MPAI) || !(player->powers[pw_carry] == CR_NIGHTSMODE))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
if (!G_IsSpecialStage(gamemap))
{
player->nightstime += special->info->speed;
player->startedtime += special->info->speed;
Add lapbegunat and lapstartedtime player variables There is no lapfinishedtime because [mare]finishedtime refers to when Egg Capsule is destroyed. That concept does not apply to laps.
2018-08-10 21:12:26 +00:00
player->lapstartedtime += special->info->speed;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
P_RestoreMusic(player);
}
else
{
for (i = 0; i < MAXPLAYERS; i++)
Increased space in pflags (because we were getting VERY close to full capacity), which I will re-organise when this branch is closer to completion. * PF_NIGHTSMODE is now CR_NIGHTSMODE as part of player->powers[pw_carry]. This is because it's mutually exclusive to every other "carry" type. * PF_SUPERREADY is dead because it literally just checked for all 7 emeralds and 50 rings. That's it. You couldn't even appreciably alter its presence with Lua. That logic has been placed back in P_SuperReady.
2017-03-14 18:11:17 +00:00
if (playeringame[i] && players[i].powers[pw_carry] == CR_NIGHTSMODE)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
players[i].nightstime += special->info->speed;
players[i].startedtime += special->info->speed;
Add lapbegunat and lapstartedtime player variables There is no lapfinishedtime because [mare]finishedtime refers to when Egg Capsule is destroyed. That concept does not apply to laps.
2018-08-10 21:12:26 +00:00
players[i].lapstartedtime += special->info->speed;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
P_RestoreMusic(&players[i]);
}
if (special->info->deathsound != sfx_None)
S_StartSound(NULL, special->info->deathsound);
}
// CECHO showing you what this item is
if (player == &players[displayplayer] || G_IsSpecialStage(gamemap))
{
HU_SetCEchoFlags(V_AUTOFADEOUT);
HU_SetCEchoDuration(4);
HU_DoCEcho(M_GetText("\\\\\\\\\\\\\\\\Extra Time"));
}
break;
case MT_NIGHTSLINKFREEZE:
All remaining player->bot checks modified to rely on BOT_ constants
2021-07-15 20:03:26 +00:00
if ((player->bot && player->bot != BOT_MPAI) || !(player->powers[pw_carry] == CR_NIGHTSMODE))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
if (!G_IsSpecialStage(gamemap))
{
player->powers[pw_nights_linkfreeze] = (UINT16)special->info->speed;
Standardize NiGHTS link timer w/ NightsLinkTics MAINCFG option
2018-08-10 03:14:14 +00:00
player->linktimer = nightslinktics;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
else
{
for (i = 0; i < MAXPLAYERS; i++)
Increased space in pflags (because we were getting VERY close to full capacity), which I will re-organise when this branch is closer to completion. * PF_NIGHTSMODE is now CR_NIGHTSMODE as part of player->powers[pw_carry]. This is because it's mutually exclusive to every other "carry" type. * PF_SUPERREADY is dead because it literally just checked for all 7 emeralds and 50 rings. That's it. You couldn't even appreciably alter its presence with Lua. That logic has been placed back in P_SuperReady.
2017-03-14 18:11:17 +00:00
if (playeringame[i] && players[i].powers[pw_carry] == CR_NIGHTSMODE)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
players[i].powers[pw_nights_linkfreeze] += (UINT16)special->info->speed;
Standardize NiGHTS link timer w/ NightsLinkTics MAINCFG option
2018-08-10 03:14:14 +00:00
players[i].linktimer = nightslinktics;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
if (special->info->deathsound != sfx_None)
S_StartSound(NULL, special->info->deathsound);
}
// CECHO showing you what this item is
if (player == &players[displayplayer] || G_IsSpecialStage(gamemap))
{
HU_SetCEchoFlags(V_AUTOFADEOUT);
HU_SetCEchoDuration(4);
HU_DoCEcho(M_GetText("\\\\\\\\\\\\\\\\Link Freeze"));
}
break;
case MT_HOOPCOLLIDE:
// This produces a kind of 'domino effect' with the hoop's pieces.
for (; special->hprev != NULL; special = special->hprev); // Move to the first sprite in the hoop
i = 0;
for (; special->type == MT_HOOP; special = special->hnext)
{
special->fuse = 11;
special->movedir = i;
special->extravalue1 = special->target->extravalue1;
special->extravalue2 = special->target->extravalue2;
special->target->threshold = 4242;
i++;
}
// Make the collision detectors disappear.
{
mobj_t *hnext;
for (; special != NULL; special = hnext)
{
hnext = special->hnext;
P_RemoveMobj(special);
}
}
P_DoNightsScore(player);
// Hoops are the only things that should add to the drill meter
// Also, one tic's worth of drill is too much.
if (G_IsSpecialStage(gamemap))
{
for (i = 0; i < MAXPLAYERS; i++)
Increased space in pflags (because we were getting VERY close to full capacity), which I will re-organise when this branch is closer to completion. * PF_NIGHTSMODE is now CR_NIGHTSMODE as part of player->powers[pw_carry]. This is because it's mutually exclusive to every other "carry" type. * PF_SUPERREADY is dead because it literally just checked for all 7 emeralds and 50 rings. That's it. You couldn't even appreciably alter its presence with Lua. That logic has been placed back in P_SuperReady.
2017-03-14 18:11:17 +00:00
if (playeringame[i] && players[i].powers[pw_carry] == CR_NIGHTSMODE)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
players[i].drillmeter += TICRATE/2;
}
All remaining player->bot checks modified to rely on BOT_ constants
2021-07-15 20:03:26 +00:00
else if (player->bot && player->bot != BOT_MPAI)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
players[consoleplayer].drillmeter += TICRATE/2;
else
player->drillmeter += TICRATE/2;
// Play hoop sound -- pick one depending on the current link.
if (player->linkcount <= 5)
S_StartSound(toucher, sfx_hoop1);
else if (player->linkcount <= 10)
S_StartSound(toucher, sfx_hoop2);
else
S_StartSound(toucher, sfx_hoop3);
return;
// ***** //
// Mario //
// ***** //
case MT_SHELL:
{
Added modified Mario shells. They now hurt everyone if you touch them from the side, and can be stopped by anyone if they stomp on their tops.
2017-01-25 14:52:36 +00:00
boolean bounceon = ((P_MobjFlip(toucher)*(toucher->z - (special->z + special->height/2)) > 0) && (P_MobjFlip(toucher)*toucher->momz < 0));
if (special->threshold == TICRATE) // it's moving
{
if (bounceon)
{
// Stop it!
special->momx = special->momy = 0;
S_StartSound(toucher, sfx_mario2);
P_SetTarget(&special->target, NULL);
special->threshold = TICRATE - 1;
toucher->momz = -toucher->momz;
}
After IRC discussion, made the shells only cause pain to enemy players.
2017-01-25 14:52:36 +00:00
else // can't handle in PIT_CheckThing because of landing-on causing it to stop
P_DamageMobj(toucher, special, special->target, 1, 0);
Added modified Mario shells. They now hurt everyone if you touch them from the side, and can be stopped by anyone if they stomp on their tops.
2017-01-25 14:52:36 +00:00
}
else if (special->threshold == 0)
{
// Kick that sucker around!
special->movedir = ((special->movedir == 1) ? -1 : 1);
P_InstaThrust(special, toucher->angle, (special->info->speed*special->scale));
S_StartSound(toucher, sfx_mario2);
P_SetTarget(&special->target, toucher);
special->threshold = (3*TICRATE)/2;
if (bounceon)
toucher->momz = -toucher->momz;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
return;
case MT_AXE:
{
thinker_t *th;
mobj_t *mo2;
All remaining player->bot checks modified to rely on BOT_ constants
2021-07-15 20:03:26 +00:00
if (player->bot && player->bot != BOT_MPAI)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
Adapt some reserved tags to UDMF
2021-12-20 22:28:18 +00:00
if (special->spawnpoint)
EV_DoElevator(special->spawnpoint->args[0], NULL, bridgeFall);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// scan the remaining thinkers to find koopa
Fix mobj list iteration oversights. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 10:58:22 +00:00
for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list. Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
2019-07-12 23:42:03 +00:00
if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
continue;
mo2 = (mobj_t *)th;
Some preliminary work to make multiple bosses in the same map work nicely together, by allowing parameter to alter the linedef executor tag to call in increments of 100. Also: Making sure every single reserved tag is recorded as an LE_ constant.
2019-06-19 23:24:13 +00:00
if (mo2->type != MT_KOOPA)
continue;
mo2->momz = 5*FRACUNIT;
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
break;
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
case MT_LETTER:
{
if (special->health && !player->bot)
{
F_StartTextPrompt(199, 0, toucher, 0, true, false);
special->health = 0;
Forgot to stage this.
2019-11-01 16:33:46 +00:00
if (ultimatemode && player->continues < 99)
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
player->continues++;
}
return;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
case MT_FIREFLOWER:
All remaining player->bot checks modified to rely on BOT_ constants
2021-07-15 20:03:26 +00:00
if (player->bot && player->bot != BOT_MPAI)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
In Mario mode... * shields give you 1000 points * redundant shields don't make you puase * checkpoints give you 2000 points * falling down a deathpit is just falling, not bouncing
2016-10-12 22:47:18 +00:00
Mario mode is boring again. (I'm going to revert this commit as soon as possible, but shield_actions needs to be clean of Mario stuff for now.)
2016-10-24 11:35:40 +00:00
S_StartSound(toucher, sfx_mario3);
In Mario mode... * shields give you 1000 points * redundant shields don't make you puase * checkpoints give you 2000 points * falling down a deathpit is just falling, not bouncing
2016-10-12 22:47:18 +00:00
Mario mode is boring again. (I'm going to revert this commit as soon as possible, but shield_actions needs to be clean of Mario stuff for now.)
2016-10-24 11:35:40 +00:00
player->powers[pw_shield] = (player->powers[pw_shield] & SH_NOSTACK)|SH_FIREFLOWER;
if (!(player->powers[pw_super] || (mariomode && player->powers[pw_invulnerability])))
A Heckloada Mario Stuff https://gfycat.com/MasculineSatisfiedAfricanwilddog and https://gfycat.com/PastCompetentGypsymoth describe this all in varying states of completion
2016-10-12 16:55:07 +00:00
{
Mario mode is boring again. (I'm going to revert this commit as soon as possible, but shield_actions needs to be clean of Mario stuff for now.)
2016-10-24 11:35:40 +00:00
player->mo->color = SKINCOLOR_WHITE;
G_GhostAddColor(GHC_FIREFLOWER);
A Heckloada Mario Stuff https://gfycat.com/MasculineSatisfiedAfricanwilddog and https://gfycat.com/PastCompetentGypsymoth describe this all in varying states of completion
2016-10-12 16:55:07 +00:00
}
In Mario mode... * shields give you 1000 points * redundant shields don't make you puase * checkpoints give you 2000 points * falling down a deathpit is just falling, not bouncing
2016-10-12 22:47:18 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
break;
// *************** //
// Misc touchables //
// *************** //
case MT_STARPOST:
Adapt various thing types for UDMF
2021-12-28 15:38:52 +00:00
P_TouchStarPost(special, player, special->spawnpoint && special->spawnpoint->args[1]);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
case MT_FAKEMOBILE:
{
fixed_t touchx, touchy, touchspeed;
angle_t angle;
if (P_AproxDistance(toucher->x-special->x, toucher->y-special->y) >
P_AproxDistance((toucher->x-toucher->momx)-special->x, (toucher->y-toucher->momy)-special->y))
{
touchx = toucher->x + toucher->momx;
touchy = toucher->y + toucher->momy;
}
else
{
touchx = toucher->x;
touchy = toucher->y;
}
angle = R_PointToAngle2(special->x, special->y, touchx, touchy);
touchspeed = P_AproxDistance(toucher->momx, toucher->momy);
toucher->momx = P_ReturnThrustX(special, angle, touchspeed);
toucher->momy = P_ReturnThrustY(special, angle, touchspeed);
toucher->momz = -toucher->momz;
Improve glide bounces
2019-09-30 08:35:05 +00:00
if (player->pflags & PF_GLIDING && !P_IsObjectOnGround(toucher))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Made jump damage flag application less hacky.
2017-03-18 21:06:06 +00:00
player->pflags &= ~(PF_GLIDING|PF_JUMPED|PF_NOJUMPDAMAGE);
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
P_SetPlayerMobjState(toucher, S_PLAY_FALL);
Improve glide bounces
2019-09-30 08:35:05 +00:00
toucher->momz += P_MobjFlip(toucher) * (player->speed >> 3);
toucher->momx = 7*toucher->momx>>3;
toucher->momy = 7*toucher->momy>>3;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
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
player->homing = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Play a bounce sound?
S_StartSound(toucher, special->info->painsound);
}
return;
case MT_BLACKEGGMAN_GOOPFIRE:
brak missile fix, pw_ignorelatch, small Recycler fix
2020-06-18 21:09:29 +00:00
if (!player->powers[pw_flashing] && !(player->powers[pw_ignorelatch] & (1<<15)))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
toucher->momx = 0;
toucher->momy = 0;
if (toucher->momz != 0)
special->momz = toucher->momz;
pw_ingoop is now CR_BRAKGOOP because i can't stop refactoring CAN'T STOP WON'T STOP
2017-03-15 21:51:35 +00:00
player->powers[pw_carry] = CR_BRAKGOOP;
P_SetTarget(&toucher->tracer, special);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
P_ResetPlayer(player);
if (special->target && special->target->state == &states[S_BLACKEGG_SHOOT1])
{
*_Random is now *_RandomByte. P_RandomChance is now a macro for something that should happen a certain percentage of time. P_SignedRandom was moved to a macro. Nobody cared. # Conflicts: # src/p_inter.c
2016-03-27 14:33:15 +00:00
if (special->target->health <= 2 && P_RandomChance(FRACUNIT/2))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
P_SetMobjState(special->target, special->target->info->missilestate);
else
P_SetMobjState(special->target, special->target->info->raisestate);
}
}
return;
case MT_EGGSHIELD:
{
* New Egg Guard behaviour! * Fix the thing I mistakenly messed up with all of the things I moved out of P_SpawnMapThing without good reason to.
2018-05-22 22:02:54 +00:00
angle_t angle = R_PointToAngle2(special->x, special->y, toucher->x, toucher->y) - special->angle;
fixed_t touchspeed = P_AproxDistance(toucher->momx, toucher->momy);
if (touchspeed < special->scale)
touchspeed = special->scale;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Blocked by the shield?
if (!(angle > ANGLE_90 && angle < ANGLE_270))
{
toucher->momx = P_ReturnThrustX(special, special->angle, touchspeed);
toucher->momy = P_ReturnThrustY(special, special->angle, touchspeed);
toucher->momz = -toucher->momz;
Improve glide bounces
2019-09-30 08:35:05 +00:00
if (player->pflags & PF_GLIDING && !P_IsObjectOnGround(toucher))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Made jump damage flag application less hacky.
2017-03-18 21:06:06 +00:00
player->pflags &= ~(PF_GLIDING|PF_JUMPED|PF_NOJUMPDAMAGE);
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
P_SetPlayerMobjState(toucher, S_PLAY_FALL);
Improve glide bounces
2019-09-30 08:35:05 +00:00
toucher->momz += P_MobjFlip(toucher) * (player->speed >> 3);
toucher->momx = 7*toucher->momx>>3;
toucher->momy = 7*toucher->momy>>3;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
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
player->homing = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Play a bounce sound?
S_StartSound(toucher, special->info->painsound);
* New Egg Guard behaviour! * Fix the thing I mistakenly messed up with all of the things I moved out of P_SpawnMapThing without good reason to.
2018-05-22 22:02:54 +00:00
// experimental bounce
if (special->target)
special->target->extravalue1 = -special->target->info->speed;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
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
else
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
// Shatter the shield!
toucher->momx = -toucher->momx/2;
toucher->momy = -toucher->momy/2;
toucher->momz = -toucher->momz;
break;
}
}
return;
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
case MT_EGGROBO1:
if (special->state == &states[special->info->deathstate])
return;
if (P_PlayerInPain(player))
return;
P_SetMobjState(special, special->info->meleestate);
special->angle = special->movedir;
special->momx = special->momy = 0;
// Buenos Dias Mandy
P_SetPlayerMobjState(toucher, S_PLAY_STUN);
player->pflags &= ~PF_APPLYAUTOBRAKE;
Clean up an ungodly amount of shit relating to abilities. * Put everything in P_DoJumpStuff, instead of half in that function and half spread across the player thinker. * Have a proper if else cascade that first tries shield abilities, then super transformation, then random abilities like CA_TELEKINESIS. * Use this new arrangement to allow CA_TWINSPIN users to use their ability on spin if their secondary ability is CA2_MELEE (resolves #195). * Random bugfixing. Didn't keep track of what I'd caused while working on this and what was already there, but there was a lot of it. The only two abilities which have spin-button properties outside of the else block is CA_AIRDRILL and CA_FLY/CA_SWIM (which now also prevents you from swimming down in goowater).
2019-09-06 18:01:46 +00:00
P_ResetPlayer(player);
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
player->drawangle = special->angle + ANGLE_180;
P_InstaThrust(toucher, special->angle, FixedMul(3*special->info->speed, special->scale/2));
toucher->z += P_MobjFlip(toucher);
if (toucher->eflags & MFE_UNDERWATER) // unlikely.
P_SetObjectMomZ(toucher, FixedDiv(10511*FRACUNIT,2600*FRACUNIT), false);
else
P_SetObjectMomZ(toucher, FixedDiv(69*FRACUNIT,10*FRACUNIT), false);
if (P_IsLocalPlayer(player))
{
quake.intensity = 9*FRACUNIT;
quake.time = TICRATE/2;
quake.epicenter = NULL;
}
#if 0 // camera redirection - deemed unnecessary
toucher->angle = special->angle;
Fix potential desynch when a player spawns
2020-05-28 09:03:35 +00:00
P_SetPlayerAngle(player, toucher->angle);
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
#endif
S_StartSound(toucher, special->info->attacksound); // home run
return;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
case MT_BIGTUMBLEWEED:
case MT_LITTLETUMBLEWEED:
if (toucher->momx || toucher->momy)
{
special->momx = toucher->momx;
special->momy = toucher->momy;
special->momz = P_AproxDistance(toucher->momx, toucher->momy)/4;
if (toucher->momz > 0)
special->momz += toucher->momz/8;
P_SetMobjState(special, special->info->seestate);
}
return;
* 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
case MT_SMALLGRABCHAIN:
case MT_BIGGRABCHAIN:
brak missile fix, pw_ignorelatch, small Recycler fix
2020-06-18 21:09:29 +00:00
{
boolean macespin = false;
if (P_MobjFlip(toucher)*toucher->momz > 0
|| (player->powers[pw_carry]))
return;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
brak missile fix, pw_ignorelatch, small Recycler fix
2020-06-18 21:09:29 +00:00
if (toucher->z > special->z + special->height/2)
return;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
brak missile fix, pw_ignorelatch, small Recycler fix
2020-06-18 21:09:29 +00:00
if (toucher->z + toucher->height/2 < special->z)
return;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
brak missile fix, pw_ignorelatch, small Recycler fix
2020-06-18 21:09:29 +00:00
if (player->powers[pw_flashing])
return;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
brak missile fix, pw_ignorelatch, small Recycler fix
2020-06-18 21:09:29 +00:00
if (special->tracer && !(special->tracer->flags2 & MF2_STRONGBOX))
macespin = true;
2022
2022-03-03 19:24:46 +00:00
brak missile fix, pw_ignorelatch, small Recycler fix
2020-06-18 21:09:29 +00:00
if (macespin ? (player->powers[pw_ignorelatch] & (1<<15)) : (player->powers[pw_ignorelatch]))
return;
Add a "bias" to collision with chain ferris wheels to make it more likely that you'll grab one nearer to the center if you could potentially hit two in the next frame (previously was blockmap order dependent, which was never consistent)
2017-07-12 13:01:16 +00:00
brak missile fix, pw_ignorelatch, small Recycler fix
2020-06-18 21:09:29 +00:00
if (special->movefactor && special->tracer && special->tracer->angle != ANGLE_90 && special->tracer->angle != ANGLE_270)
{ // I don't expect you to understand this, Mr Bond...
angle_t ang = R_PointToAngle2(special->x, special->y, toucher->x, toucher->y) - special->tracer->angle;
if ((special->movefactor > 0) == (special->tracer->angle > ANGLE_90 && special->tracer->angle < ANGLE_270))
ang += ANGLE_180;
if (ang < ANGLE_180)
return; // I expect you to die.
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
brak missile fix, pw_ignorelatch, small Recycler fix
2020-06-18 21:09:29 +00:00
P_ResetPlayer(player);
P_SetTarget(&toucher->tracer, special);
if (macespin)
{
player->powers[pw_carry] = CR_MACESPIN;
S_StartSound(toucher, sfx_spin);
P_SetPlayerMobjState(toucher, S_PLAY_ROLL);
}
else
player->powers[pw_carry] = CR_GENERIC;
Fixed chain launching In the process, the stasis flags work like you'd expect them to. You can now set them in Lua or code and they'll actually do something.
2016-02-14 20:28:03 +00:00
brak missile fix, pw_ignorelatch, small Recycler fix
2020-06-18 21:09:29 +00:00
// Can't jump first frame
player->pflags |= PF_JUMPSTASIS;
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
brak missile fix, pw_ignorelatch, small Recycler fix
2020-06-18 21:09:29 +00:00
return;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
case MT_EGGMOBILE2_POGO:
// sanity checks
if (!special->target || !special->target->health)
return;
// Goomba Stomp'd!
if (special->target->momz < 0)
{
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
P_DamageMobj(toucher, special, special->target, 1, 0);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
//special->target->momz = -special->target->momz;
special->target->momx = special->target->momy = 0;
special->target->momz = 0;
special->target->flags |= MF_NOGRAVITY;
P_SetMobjState(special->target, special->info->raisestate);
S_StartSound(special->target, special->info->activesound);
P_RemoveMobj(special);
}
return;
case MT_EXTRALARGEBUBBLE:
Turning some shield attributes into flags means that environmental protection and ring-pulling can be more elegantly handled. As a consequence, the S3 shields now have all their passives, and are just waiting on me to give them actives (two of which don't have the necessary sprites for...)
2016-10-13 14:13:33 +00:00
if (player->powers[pw_shield] & SH_PROTECTWATER)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
if (maptol & TOL_NIGHTS)
return;
if (mariomode)
return;
Tweak bubble grabbing behavior.
2019-09-22 02:05:22 +00:00
if (special->state-states != S_EXTRALARGEBUBBLE)
return; // Don't grab the bubble during its spawn animation
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
else if (toucher->eflags & MFE_VERTICALFLIP)
{
Tweak bubble grabbing behavior.
2019-09-22 02:05:22 +00:00
if (special->z+special->height < toucher->z
|| special->z+special->height > toucher->z + (toucher->height*2/3))
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
return; // Only go in the mouth
}
Tweak bubble grabbing behavior.
2019-09-22 02:05:22 +00:00
else if (special->z < toucher->z
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
|| special->z > toucher->z + (toucher->height*2/3))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return; // Only go in the mouth
// Eaten by player!
All remaining player->bot checks modified to rely on BOT_ constants
2021-07-15 20:03:26 +00:00
if ((!player->bot || player->bot == BOT_MPAI) && (player->powers[pw_underwater] && player->powers[pw_underwater] <= 12*TICRATE + 1))
Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'"" This reverts commit 603d5805f7ed73efe9073a81c4516c02587064ea.
2019-08-04 11:03:57 +00:00
{
player->powers[pw_underwater] = underwatertics + 1;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
P_RestoreMusic(player);
Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'"" This reverts commit 603d5805f7ed73efe9073a81c4516c02587064ea.
2019-08-04 11:03:57 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (player->powers[pw_underwater] < underwatertics + 1)
player->powers[pw_underwater] = underwatertics + 1;
if (!player->climbing)
{
All remaining player->bot checks modified to rely on BOT_ constants
2021-07-15 20:03:26 +00:00
if (player->bot && player->bot != BOT_MPAI && toucher->state-states != S_PLAY_GASP)
Play bubble breathe sound for bots
2017-09-24 17:43:36 +00:00
S_StartSound(toucher, special->info->deathsound); // Force it to play a sound for bots
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
P_SetPlayerMobjState(toucher, S_PLAY_GASP);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
P_ResetPlayer(player);
}
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
toucher->momx = toucher->momy = toucher->momz = 0;
Prevent bots from killing bubbles Self-explanatory. They can still breathe them in, they just no longer get popped
2017-09-18 01:37:36 +00:00
All remaining player->bot checks modified to rely on BOT_ constants
2021-07-15 20:03:26 +00:00
if (player->bot && player->bot != BOT_MPAI)
Prevent bots from killing bubbles Self-explanatory. They can still breathe them in, they just no longer get popped
2017-09-18 01:37:36 +00:00
return;
else
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
case MT_WATERDROP:
if (special->state == &states[special->info->spawnstate])
{
special->z = toucher->z+toucher->height-FixedMul(8*FRACUNIT, special->scale);
special->momz = 0;
special->flags |= MF_NOGRAVITY;
P_SetMobjState (special, special->info->deathstate);
S_StartSound (special, special->info->deathsound+(P_RandomKey(special->info->mass)));
}
return;
Hardcoded the Canarivore
2019-06-10 11:58:16 +00:00
case MT_CANARIVORE_GAS:
// if player and gas touch, attach gas to player (overriding any gas that already attached) and apply slowdown effect
Fixed Canarivore gas going through the floor
2019-06-28 22:19:46 +00:00
special->flags |= MF_NOGRAVITY|MF_NOCLIPHEIGHT;
Fixed the Canarivore gas slowdown being much too weak
2019-06-18 17:29:53 +00:00
P_UnsetThingPosition(special);
special->x = toucher->x - toucher->momx/2;
special->y = toucher->y - toucher->momy/2;
special->z = toucher->z - toucher->momz/2;
P_SetThingPosition(special);
toucher->momx = FixedMul(toucher->momx, 50*FRACUNIT/51);
toucher->momy = FixedMul(toucher->momy, 50*FRACUNIT/51);
Hardcoded the Canarivore
2019-06-10 11:58:16 +00:00
special->momx = toucher->momx;
special->momy = toucher->momy;
special->momz = toucher->momz;
return;
More incomplete minecart hardcoding
2019-06-13 19:45:30 +00:00
case MT_MINECARTSPAWNER:
All remaining player->bot checks modified to rely on BOT_ constants
2021-07-15 20:03:26 +00:00
if (!player->bot && player->bot != BOT_MPAI && special->fuse <= TICRATE && player->powers[pw_carry] != CR_MINECART && !(player->powers[pw_ignorelatch] & (1<<15)))
More incomplete minecart hardcoding
2019-06-13 19:45:30 +00:00
{
mobj_t *mcart = P_SpawnMobj(special->x, special->y, special->z, MT_MINECART);
P_SetTarget(&mcart->target, toucher);
mcart->angle = toucher->angle = player->drawangle = special->angle;
mcart->friction = FRACUNIT;
P_ResetPlayer(player);
Don't jump repeatedly when holding jump
2019-06-15 19:58:58 +00:00
player->pflags |= PF_JUMPDOWN;
More incomplete minecart hardcoding
2019-06-13 19:45:30 +00:00
player->powers[pw_carry] = CR_MINECART;
Resolve #208. * Tailsbots can't get into Minecarts. * Tailsbots will stop trying to move around when the player gets pw_carry, which usually means some sort of big gimmick is happening and trying to move along with it would make the tailsbot look stupid.
2019-10-06 11:13:13 +00:00
player->pflags &= ~PF_APPLYAUTOBRAKE;
More incomplete minecart hardcoding
2019-06-13 19:45:30 +00:00
P_SetTarget(&toucher->tracer, mcart);
toucher->momx = toucher->momy = toucher->momz = 0;
special->fuse = 3*TICRATE;
special->flags2 |= MF2_DONTDRAW;
}
return;
case MT_MINECARTEND:
if (player->powers[pw_carry] == CR_MINECART && toucher->tracer && !P_MobjWasRemoved(toucher->tracer) && toucher->tracer->health)
{
fixed_t maxz = max(toucher->z, special->z + 35*special->scale);
toucher->momx = toucher->tracer->momx/2;
toucher->momy = toucher->tracer->momy/2;
toucher->momz = toucher->tracer->momz + P_AproxDistance(toucher->tracer->momx, toucher->tracer->momy)/2;
P_ResetPlayer(player);
player->pflags &= ~PF_APPLYAUTOBRAKE;
Some more minecart fixes
2019-06-18 22:10:28 +00:00
P_SetPlayerMobjState(toucher, S_PLAY_FALL);
More incomplete minecart hardcoding
2019-06-13 19:45:30 +00:00
P_SetTarget(&toucher->tracer->target, NULL);
P_KillMobj(toucher->tracer, toucher, special, 0);
P_SetTarget(&toucher->tracer, NULL);
player->powers[pw_carry] = CR_NONE;
Some more minecart fixes
2019-06-18 22:10:28 +00:00
P_UnsetThingPosition(toucher);
toucher->x = special->x;
toucher->y = special->y;
toucher->z = maxz;
P_SetThingPosition(toucher);
More incomplete minecart hardcoding
2019-06-13 19:45:30 +00:00
}
return;
case MT_MINECARTSWITCHPOINT:
if (player->powers[pw_carry] == CR_MINECART && toucher->tracer && !P_MobjWasRemoved(toucher->tracer) && toucher->tracer->health)
{
A bunch of bugfixes
2019-06-14 22:04:50 +00:00
mobjflag2_t destambush = special->flags2 & MF2_AMBUSH;
angle_t angdiff = toucher->tracer->angle - special->angle;
if (angdiff > ANGLE_90 && angdiff < ANGLE_270)
More incomplete minecart hardcoding
2019-06-13 19:45:30 +00:00
destambush ^= MF2_AMBUSH;
toucher->tracer->flags2 = (toucher->tracer->flags2 & ~MF2_AMBUSH) | destambush;
}
return;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
default: // SOC or script pickup
All remaining player->bot checks modified to rely on BOT_ constants
2021-07-15 20:03:26 +00:00
if (player->bot && player->bot != BOT_MPAI)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
P_SetTarget(&special->target, toucher);
break;
}
}
S_StartSound(toucher, special->info->deathsound); // was NULL, but changed to player so you could hear others pick up rings
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
P_KillMobj(special, NULL, toucher, 0);
Add mobj shadowscale property
2020-01-12 00:24:08 +00:00
special->shadowscale = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Move spawnsnap to Special/ignore on sector trigger Also includes splitting the starpost logic into its own function.
2020-01-25 05:54:54 +00:00
/** Saves a player's level progress at a star post
*
* \param post The star post to trigger
* \param player The player that should receive the checkpoint
* \param snaptopost If true, the respawn point will use the star post's position, otherwise player x/y and star post z
*/
void P_TouchStarPost(mobj_t *post, player_t *player, boolean snaptopost)
{
size_t i;
mobj_t *toucher = player->mo;
mobj_t *checkbase = snaptopost ? post : toucher;
All remaining player->bot checks modified to rely on BOT_ constants
2021-07-15 20:03:26 +00:00
if (player->bot && player->bot != BOT_MPAI)
Move spawnsnap to Special/ignore on sector trigger Also includes splitting the starpost logic into its own function.
2020-01-25 05:54:54 +00:00
return;
// In circuit, player must have touched all previous starposts
if (circuitmap
&& post->health - player->starpostnum > 1)
{
// blatant reuse of a variable that's normally unused in circuit
if (!player->tossdelay)
S_StartSound(toucher, sfx_lose);
player->tossdelay = 3;
return;
}
// With the parameter + angle setup, we can go up to 1365 star posts. Who needs that many?
if (post->health > 1365)
{
CONS_Debug(DBG_GAMELOGIC, "Bad Starpost Number!\n");
return;
}
if (player->starpostnum >= post->health)
return; // Already hit this post
if (cv_coopstarposts.value && G_GametypeUsesCoopStarposts() && (netgame || multiplayer))
{
for (i = 0; i < MAXPLAYERS; i++)
{
if (playeringame[i])
{
if (players[i].bot) // ignore dumb, stupid tails
continue;
players[i].starposttime = leveltime;
players[i].starpostx = checkbase->x>>FRACBITS;
players[i].starposty = checkbase->y>>FRACBITS;
players[i].starpostz = post->z>>FRACBITS;
players[i].starpostangle = post->angle;
players[i].starpostscale = player->mo->destscale;
if (post->flags2 & MF2_OBJECTFLIP)
{
players[i].starpostscale *= -1;
players[i].starpostz += post->height>>FRACBITS;
}
players[i].starpostnum = post->health;
if (cv_coopstarposts.value == 2 && (players[i].playerstate == PST_DEAD || players[i].spectator) && P_GetLives(&players[i]))
P_SpectatorJoinGame(&players[i]); //players[i].playerstate = PST_REBORN;
}
}
S_StartSound(NULL, post->info->painsound);
}
else
{
// Save the player's time and position.
player->starposttime = leveltime;
player->starpostx = checkbase->x>>FRACBITS;
player->starposty = checkbase->y>>FRACBITS;
player->starpostz = post->z>>FRACBITS;
player->starpostangle = post->angle;
player->starpostscale = player->mo->destscale;
if (post->flags2 & MF2_OBJECTFLIP)
{
player->starpostscale *= -1;
player->starpostz += post->height>>FRACBITS;
}
player->starpostnum = post->health;
S_StartSound(toucher, post->info->painsound);
}
P_ClearStarPost(post->health);
// Find all starposts in the level with this value - INCLUDING this one!
if (!(netgame && circuitmap && player != &players[consoleplayer]))
{
thinker_t *th;
mobj_t *mo2;
for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
{
if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
continue;
mo2 = (mobj_t *)th;
if (mo2->type != MT_STARPOST)
continue;
if (mo2->health != post->health)
continue;
P_SetMobjState(mo2, mo2->info->painstate);
}
}
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
/** Prints death messages relating to a dying or hit player.
*
* \param player Affected player.
* \param inflictor The attack weapon used, can be NULL.
* \param source The attacker, can be NULL.
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
* \param damagetype The type of damage dealt to the player. If bit 7 (0x80) is set, this was an instant-kill.
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
*/
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
static void P_HitDeathMessages(player_t *player, mobj_t *inflictor, mobj_t *source, UINT8 damagetype)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
const char *str = NULL;
boolean deathonly = false;
boolean deadsource = false;
boolean deadtarget = false;
// player names complete with control codes
char targetname[MAXPLAYERNAME+4];
char sourcename[MAXPLAYERNAME+4];
GTR_HURTMESSAGES
2019-12-24 19:09:00 +00:00
if (!(gametyperules & (GTR_RINGSLINGER|GTR_HURTMESSAGES)))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return; // Not in coop, etc.
if (!player)
return; // Impossible!
Okay, major overhaul time! *player->health (formerly the "HUD" health) is now to be known as player->rings, and now acts as the player's actual ring count *player->mo->health (formerly rings + 1) is now always 1 when alive, regardless of ring count; if player with rings is damaged, this is untouched Damage in normal SP/Coop gameplay has been tested and still works fine; still a lot of mess to clear up though Tag damaging probably is broken now, I'll fix this later
2015-08-15 20:07:16 +00:00
if (!player->mo)
return; // Also impossible!
Better CTF in splitscreen, no death message for spectators
2016-04-07 02:55:58 +00:00
if (player->spectator)
return; // No messages for dying (crushed) spectators.
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (!netgame)
return; // Presumably it's obvious what's happening in splitscreen.
Big Large Lua Hooklib Refactor * Hooks are no longer a mess of lua boiler plate. Helper functions reduce hooks to, at the most basic level, only two calls. * Lua tables (the array part) are used to index hooks. Such tables contain only hooks of the same type. * Hook types are defined in one place so you no longer need to sync up the enum and name array.
2020-11-17 12:14:45 +00:00
if (LUA_HookHurtMsg(player, inflictor, source, damagetype))
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
return;
Okay, major overhaul time! *player->health (formerly the "HUD" health) is now to be known as player->rings, and now acts as the player's actual ring count *player->mo->health (formerly rings + 1) is now always 1 when alive, regardless of ring count; if player with rings is damaged, this is untouched Damage in normal SP/Coop gameplay has been tested and still works fine; still a lot of mess to clear up though Tag damaging probably is broken now, I'll fix this later
2015-08-15 20:07:16 +00:00
deadtarget = (player->mo->health <= 0);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
P_PlayerCanDamage(player_t*, mobj_t*), ported from the abandoned project_birthday because GOD the code looks awful with those huge monolith conditions in it. Available to Lua. (Also, minor fixes to lib_pSpawnLockOn, and removing the SH_OP fuckery.)
2019-06-19 11:09:02 +00:00
// Don't log every hazard hit if they don't want us to.
if (!deadtarget && !cv_hazardlog.value)
return;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Target's name
snprintf(targetname, sizeof(targetname), "%s%s%s",
CTFTEAMCODE(player),
player_names[player - players],
CTFTEAMENDCODE(player));
if (source)
{
// inflictor shouldn't be NULL if source isn't
I_Assert(inflictor != NULL);
if (source->player)
{
// Source's name (now that we know there is one)
snprintf(sourcename, sizeof(sourcename), "%s%s%s",
CTFTEAMCODE(source->player),
player_names[source->player - players],
CTFTEAMENDCODE(source->player));
// We don't care if it's us.
// "Player 1's [redacted] killed Player 1."
if (source->player->playerstate == PST_DEAD && source->player != player &&
(inflictor->flags2 & MF2_BEYONDTHEGRAVE))
deadsource = true;
if (inflictor->flags & MF_PUSHABLE)
{
str = M_GetText("%s%s's playtime with heavy objects %s %s.\n");
}
else switch (inflictor->type)
{
case MT_PLAYER:
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions # Conflicts: # src/p_inter.c # src/p_user.c # src/st_stuff.c
2016-11-20 16:44:38 +00:00
if (damagetype == DMG_NUKE) // SH_ARMAGEDDON, armageddon shield
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
str = M_GetText("%s%s's armageddon blast %s %s.\n");
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions # Conflicts: # src/p_inter.c # src/p_user.c # src/st_stuff.c
2016-11-20 16:44:38 +00:00
else if ((inflictor->player->powers[pw_shield] & SH_NOSTACK) == SH_ELEMENTAL && (inflictor->player->pflags & PF_SHIELDABILITY))
* 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
str = M_GetText("%s%s's elemental stomp %s %s.\n");
SRB2 2.1.2 release
2014-03-17 12:13:16 +00:00
else if (inflictor->player->powers[pw_invulnerability])
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
str = M_GetText("%s%s's invincibility aura %s %s.\n");
SRB2 2.1.3 release
2014-03-18 17:56:54 +00:00
else if (inflictor->player->powers[pw_super])
str = M_GetText("%s%s's super aura %s %s.\n");
SRB2 2.1.2 release
2014-03-17 12:13:16 +00:00
else
str = M_GetText("%s%s's tagging hand %s %s.\n");
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
break;
case MT_SPINFIRE:
str = M_GetText("%s%s's elemental fire trail %s %s.\n");
break;
case MT_THROWNBOUNCE:
str = M_GetText("%s%s's bounce ring %s %s.\n");
break;
case MT_THROWNINFINITY:
str = M_GetText("%s%s's infinity ring %s %s.\n");
break;
case MT_THROWNAUTOMATIC:
str = M_GetText("%s%s's automatic ring %s %s.\n");
break;
case MT_THROWNSCATTER:
str = M_GetText("%s%s's scatter ring %s %s.\n");
break;
// TODO: For next two, figure out how to determine if it was a direct hit or splash damage. -SH
case MT_THROWNEXPLOSION:
str = M_GetText("%s%s's explosion ring %s %s.\n");
break;
case MT_THROWNGRENADE:
str = M_GetText("%s%s's grenade ring %s %s.\n");
break;
case MT_REDRING:
if (inflictor->flags2 & MF2_RAILRING)
str = M_GetText("%s%s's rail ring %s %s.\n");
else
SRB2 2.1.2 release
2014-03-17 12:13:16 +00:00
str = M_GetText("%s%s's thrown ring %s %s.\n");
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
break;
default:
str = M_GetText("%s%s %s %s.\n");
break;
}
CONS_Printf(str,
deadsource ? M_GetText("The late ") : "",
sourcename,
deadtarget ? M_GetText("killed") : M_GetText("hit"),
targetname);
return;
}
else switch (source->type)
{
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
case MT_EGGMAN_ICON:
SRB2 2.1.3 release
2014-03-18 17:56:54 +00:00
str = M_GetText("%s was %s by Eggman's nefarious TV magic.\n");
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
case MT_SPIKE:
* 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
case MT_WALLSPIKE:
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
str = M_GetText("%s was %s by spikes.\n");
break;
default:
str = M_GetText("%s was %s by an environmental hazard.\n");
break;
}
}
else
{
// null source, environment kills
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
switch (damagetype)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
case DMG_WATER:
P_PlayerCanDamage(player_t*, mobj_t*), ported from the abandoned project_birthday because GOD the code looks awful with those huge monolith conditions in it. Available to Lua. (Also, minor fixes to lib_pSpawnLockOn, and removing the SH_OP fuckery.)
2019-06-19 11:09:02 +00:00
str = M_GetText("%s was %s by dangerous water.\n");
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
break;
case DMG_FIRE:
str = M_GetText("%s was %s by molten lava.\n");
break;
case DMG_ELECTRIC:
str = M_GetText("%s was %s by electricity.\n");
break;
case DMG_SPIKE:
str = M_GetText("%s was %s by spikes.\n");
break;
case DMG_DROWNED:
deathonly = true;
str = M_GetText("%s drowned.\n");
break;
case DMG_CRUSHED:
deathonly = true;
str = M_GetText("%s was crushed.\n");
break;
case DMG_DEATHPIT:
if (deadtarget)
{
deathonly = true;
str = M_GetText("%s fell into a bottomless pit.\n");
}
break;
case DMG_SPACEDROWN:
if (deadtarget)
{
deathonly = true;
str = M_GetText("%s asphyxiated in space.\n");
}
break;
default:
if (deadtarget)
{
deathonly = true;
str = M_GetText("%s died.\n");
}
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
if (!str)
str = M_GetText("%s was %s by an environmental hazard.\n");
}
if (!str) // Should not happen! Unless we missed catching something above.
return;
if (deathonly)
{
if (!deadtarget)
return;
CONS_Printf(str, targetname);
}
else
CONS_Printf(str, targetname, deadtarget ? M_GetText("killed") : M_GetText("hit"));
}
Since cv_pointlimit is handled in P_CheckPointLimit, I've just created P_CheckTimeLimit for cv_timelimit. It helps make P_UpdateSpecials less messy-looking anyway.
2015-10-11 20:01:04 +00:00
/** Checks if the level timer is over the timelimit and the round should end,
* unless you are in overtime. In which case leveltime may stretch out beyond
* timelimitintics and overtime's status will be checked here each tick.
* Verify that the value of ::cv_timelimit is greater than zero before
* calling this function.
*
* \sa cv_timelimit, P_CheckPointLimit, P_UpdateSpecials
*/
void P_CheckTimeLimit(void)
{
INT32 i, k;
if (!cv_timelimit.value)
return;
if (!(multiplayer || netgame))
return;
Ringslinger tweaks
2019-12-18 22:26:45 +00:00
if (!(gametyperules & GTR_TIMELIMIT))
Since cv_pointlimit is handled in P_CheckPointLimit, I've just created P_CheckTimeLimit for cv_timelimit. It helps make P_UpdateSpecials less messy-looking anyway.
2015-10-11 20:01:04 +00:00
return;
if (leveltime < timelimitintics)
return;
if (gameaction == ga_completed)
return;
//Tagmode round end but only on the tic before the
-Added a timeout for game state downloading to prevent definitive join freezes in some cases. The timeout has a minimum value of "jointimeout" and gets higher as the game state grows in size -If the server tries to kick a joiner who is downloading the game state, they will get a timeout instead, because a regular kick would only happen once the game state has been downloaded -Added a timeout for player ticcmd packets, again to prevent freezes to happen in some cases -File/game state downloading is now faster, the speed is controlled by the "downloadspeed" cvar, in packets per tic -The reason is now properly shown when the server refuses connection -Changed the default values of "nettimeout" to 10 seconds (previously 15) and "maxsend" to 4 MB (previously 1) -Added a "noticedownload" cvar that displays a message in the server console when someone is downloading a file
2017-01-13 19:53:52 +00:00
//XD_EXITLEVEL packet is received by all players.
Since cv_pointlimit is handled in P_CheckPointLimit, I've just created P_CheckTimeLimit for cv_timelimit. It helps make P_UpdateSpecials less messy-looking anyway.
2015-10-11 20:01:04 +00:00
if (G_TagGametype())
{
if (leveltime == (timelimitintics + 1))
{
for (i = 0; i < MAXPLAYERS; i++)
{
if (!playeringame[i] || players[i].spectator
* cv_directionchar and cv_autobrake, and their secondplayer versions (both on by default) now exist. * cv_useranalog is now hidden from the menu. * Directionchar now attempts to face the camera direction when you're standing still, and handles a few other states with more decorum. * Tailsbot is now slightly more capable of keeping up with Sonic. * pflags rearranged/adjusted, combining a few non-simulstaneous ones and turning PF_NIGHTSFALL into CR_NIGHTSFALL. * [unrelated to branch] all ground-impact based abilities now happen more consistently with quicksand.
2017-09-15 19:34:46 +00:00
|| (players[i].pflags & PF_GAMETYPEOVER) || (players[i].pflags & PF_TAGIT))
Since cv_pointlimit is handled in P_CheckPointLimit, I've just created P_CheckTimeLimit for cv_timelimit. It helps make P_UpdateSpecials less messy-looking anyway.
2015-10-11 20:01:04 +00:00
continue;
-Added a timeout for game state downloading to prevent definitive join freezes in some cases. The timeout has a minimum value of "jointimeout" and gets higher as the game state grows in size -If the server tries to kick a joiner who is downloading the game state, they will get a timeout instead, because a regular kick would only happen once the game state has been downloaded -Added a timeout for player ticcmd packets, again to prevent freezes to happen in some cases -File/game state downloading is now faster, the speed is controlled by the "downloadspeed" cvar, in packets per tic -The reason is now properly shown when the server refuses connection -Changed the default values of "nettimeout" to 10 seconds (previously 15) and "maxsend" to 4 MB (previously 1) -Added a "noticedownload" cvar that displays a message in the server console when someone is downloading a file
2017-01-13 19:53:52 +00:00
CONS_Printf(M_GetText("%s received double points for surviving the round.\n"), player_names[i]);
Since cv_pointlimit is handled in P_CheckPointLimit, I've just created P_CheckTimeLimit for cv_timelimit. It helps make P_UpdateSpecials less messy-looking anyway.
2015-10-11 20:01:04 +00:00
P_AddPlayerScore(&players[i], players[i].score);
}
}
if (server)
SendNetXCmd(XD_EXITLEVEL, NULL, 0);
}
//Optional tie-breaker for Match/CTF
Ringslinger tweaks
2019-12-18 22:26:45 +00:00
else if ((cv_overtime.value) && (gametyperules & GTR_OVERTIME))
Since cv_pointlimit is handled in P_CheckPointLimit, I've just created P_CheckTimeLimit for cv_timelimit. It helps make P_UpdateSpecials less messy-looking anyway.
2015-10-11 20:01:04 +00:00
{
INT32 playerarray[MAXPLAYERS];
INT32 tempplayer = 0;
INT32 spectators = 0;
INT32 playercount = 0;
//Figure out if we have enough participating players to care.
for (i = 0; i < MAXPLAYERS; i++)
{
if (playeringame[i] && players[i].spectator)
spectators++;
}
if ((D_NumPlayers() - spectators) > 1)
{
// Play the starpost sfx after the first second of overtime.
if (gamestate == GS_LEVEL && (leveltime == (timelimitintics + TICRATE)))
S_StartSound(NULL, sfx_strpst);
// Normal Match
if (!G_GametypeHasTeams())
{
//Store the nodes of participating players in an array.
for (i = 0; i < MAXPLAYERS; i++)
{
if (playeringame[i] && !players[i].spectator)
{
playerarray[playercount] = i;
playercount++;
}
}
//Sort 'em.
for (i = 1; i < playercount; i++)
{
for (k = i; k < playercount; k++)
{
if (players[playerarray[i-1]].score < players[playerarray[k]].score)
{
tempplayer = playerarray[i-1];
playerarray[i-1] = playerarray[k];
playerarray[k] = tempplayer;
}
}
}
//End the round if the top players aren't tied.
if (players[playerarray[0]].score == players[playerarray[1]].score)
return;
}
else
{
//In team match and CTF, determining a tie is much simpler. =P
if (redscore == bluescore)
return;
}
}
if (server)
SendNetXCmd(XD_EXITLEVEL, NULL, 0);
}
if (server)
SendNetXCmd(XD_EXITLEVEL, NULL, 0);
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
/** Checks if a player's score is over the pointlimit and the round should end.
* Verify that the value of ::cv_pointlimit is greater than zero before
* calling this function.
*
Since cv_pointlimit is handled in P_CheckPointLimit, I've just created P_CheckTimeLimit for cv_timelimit. It helps make P_UpdateSpecials less messy-looking anyway.
2015-10-11 20:01:04 +00:00
* \sa cv_pointlimit, P_CheckTimeLimit, P_UpdateSpecials
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
*/
void P_CheckPointLimit(void)
{
INT32 i;
if (!cv_pointlimit.value)
return;
if (!(multiplayer || netgame))
return;
Ringslinger tweaks
2019-12-18 22:26:45 +00:00
if (!(gametyperules & GTR_POINTLIMIT))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
// pointlimit is nonzero, check if it's been reached by this player
if (G_GametypeHasTeams())
{
// Just check both teams
if ((UINT32)cv_pointlimit.value <= redscore || (UINT32)cv_pointlimit.value <= bluescore)
{
if (server)
SendNetXCmd(XD_EXITLEVEL, NULL, 0);
}
}
else
{
for (i = 0; i < MAXPLAYERS; i++)
{
if (!playeringame[i] || players[i].spectator)
continue;
if ((UINT32)cv_pointlimit.value <= players[i].score)
{
if (server)
SendNetXCmd(XD_EXITLEVEL, NULL, 0);
return;
}
}
}
}
/*Checks for untagged remaining players in both tag derivitave modes.
*If no untagged players remain, end the round.
*Also serves as error checking if the only IT player leaves.*/
void P_CheckSurvivors(void)
{
INT32 i;
INT32 survivors = 0;
INT32 taggers = 0;
INT32 spectators = 0;
INT32 survivorarray[MAXPLAYERS];
if (!D_NumPlayers()) //no players in the game, no check performed.
return;
for (i=0; i < MAXPLAYERS; i++) //figure out counts of taggers, survivors and spectators.
{
if (playeringame[i])
{
if (players[i].spectator)
spectators++;
Ignore disconnected players in tag gametypes Disconnected players do not become IT at round start. If all non-ITs are disconnected, the round ends. If all ITs are disconnected, one of the non-ITs becomes IT, or the round ends if in Hide & Seek.
2020-01-23 18:58:13 +00:00
else if ((players[i].pflags & PF_TAGIT) && players[i].quittime < 30 * TICRATE)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
taggers++;
Ignore disconnected players in tag gametypes Disconnected players do not become IT at round start. If all non-ITs are disconnected, the round ends. If all ITs are disconnected, one of the non-ITs becomes IT, or the round ends if in Hide & Seek.
2020-01-23 18:58:13 +00:00
else if (!(players[i].pflags & PF_GAMETYPEOVER) && players[i].quittime < 30 * TICRATE)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
survivorarray[survivors] = i;
survivors++;
}
}
}
if (!taggers) //If there are no taggers, pick a survivor at random to be it.
{
// Exception for hide and seek. If a round has started and the IT player leaves, end the round.
Turn players IT if they join the game after the hide time in tag gametypes Except in gametypes with hide time stasis, because they can't change team.
2020-02-23 20:02:50 +00:00
if ((gametyperules & GTR_HIDEFROZEN) && (leveltime >= (hidetime * TICRATE)))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
CONS_Printf(M_GetText("The IT player has left the game.\n"));
if (server)
SendNetXCmd(XD_EXITLEVEL, NULL, 0);
return;
}
if (survivors)
{
INT32 newtagger = survivorarray[P_RandomKey(survivors)];
CONS_Printf(M_GetText("%s is now IT!\n"), player_names[newtagger]); // Tell everyone who is it!
players[newtagger].pflags |= PF_TAGIT;
survivors--; //Get rid of the guy we just made IT.
//Yeah, we have an eligible tagger, but we may not have anybody for him to tag!
//If there is only one guy waiting on the game to fill or spectators to enter game, don't bother.
if (!survivors && (D_NumPlayers() - spectators) > 1)
{
CONS_Printf(M_GetText("All players have been tagged!\n"));
if (server)
SendNetXCmd(XD_EXITLEVEL, NULL, 0);
}
return;
}
//If we reach this point, no player can replace the one that was IT.
//Unless it is one player waiting on a game, end the round.
if ((D_NumPlayers() - spectators) > 1)
{
CONS_Printf(M_GetText("There are no players able to become IT.\n"));
if (server)
SendNetXCmd(XD_EXITLEVEL, NULL, 0);
}
return;
}
//If there are taggers, but no survivors, end the round.
//Except when the tagger is by himself and the rest of the game are spectators.
if (!survivors && (D_NumPlayers() - spectators) > 1)
{
CONS_Printf(M_GetText("All players have been tagged!\n"));
if (server)
SendNetXCmd(XD_EXITLEVEL, NULL, 0);
}
}
// Checks whether or not to end a race netgame.
boolean P_CheckRacers(void)
{
INT32 i;
// Check if all the players in the race have finished. If so, end the level.
for (i = 0; i < MAXPLAYERS; i++)
{
if (playeringame[i] && !players[i].exiting && players[i].lives > 0)
break;
}
if (i == MAXPLAYERS) // finished
{
countdown = 0;
countdown2 = 0;
return true;
}
return false;
}
/** Kills an object.
*
* \param target The victim.
* \param inflictor The attack weapon. May be NULL (environmental damage).
* \param source The attacker. May be NULL.
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
* \param damagetype The type of damage dealt that killed the target. If bit 7 (0x80) was set, this was an instant-death.
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
* \todo Cleanup, refactor, split up.
* \sa P_DamageMobj
*/
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damagetype)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
mobj_t *mo;
if (inflictor && (inflictor->type == MT_SHELL || inflictor->type == MT_FIREBALL))
Fix #214 (Crushstacean + Fireball Player Removal)
2021-11-26 14:11:09 +00:00
S_StartScreamSound(target, sfx_mario2);
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
if (!(maptol & TOL_NIGHTS) && G_IsSpecialStage(gamemap) && target->player && target->player->nightstime > 6)
target->player->nightstime = 6; // Just let P_Ticker take care of the rest.
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (target->flags & (MF_ENEMY|MF_BOSS))
target->momx = target->momy = target->momz = 0;
if (target->type != MT_PLAYER && !(target->flags & MF_MONITOR))
target->flags |= MF_NOGRAVITY|MF_NOCLIP|MF_NOCLIPHEIGHT; // Don't drop Tails 03-08-2000
if (target->flags2 & MF2_NIGHTSPULL)
Snappier NiGHTS pickup attraction * Old attraction is still used for non-NiGHTS players due to a momentum bug. The old way is good enough to sidestep the bug. * Thanks Inuyasha (KS) for original code :dog:
2018-08-10 01:00:05 +00:00
{
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
P_SetTarget(&target->tracer, NULL);
Fix attraction bug on non-NiGHTS and Nightopian Helper * Switch from mo->movecount to mo->movefactor for type compat * Adjust timings for regular and paraloop attraction
2018-08-13 03:03:12 +00:00
target->movefactor = 0; // reset NightsItemChase timer
Snappier NiGHTS pickup attraction * Old attraction is still used for non-NiGHTS players due to a momentum bug. The old way is good enough to sidestep the bug. * Thanks Inuyasha (KS) for original code :dog:
2018-08-10 01:00:05 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// dead target is no more shootable
target->flags &= ~(MF_SHOOTABLE|MF_FLOAT|MF_SPECIAL);
target->flags2 &= ~(MF2_SKULLFLY|MF2_NIGHTSPULL);
target->health = 0; // This makes it easy to check if something's dead elsewhere.
Big Large Lua Hooklib Refactor * Hooks are no longer a mess of lua boiler plate. Helper functions reduce hooks to, at the most basic level, only two calls. * Lua tables (the array part) are used to index hooks. Such tables contain only hooks of the same type. * Hook types are defined in one place so you no longer need to sync up the enum and name array.
2020-11-17 12:14:45 +00:00
if (LUA_HookMobjDeath(target, inflictor, source, damagetype) || P_MobjWasRemoved(target))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return;
// Let EVERYONE know what happened to a player! 01-29-2002 Tails
if (target->player && !target->player->spectator)
{
if (metalrecording) // Ack! Metal Sonic shouldn't die! Cut the tape, end recording!
* Add a death animation for killing the Metal object, in case somebody wants to Lua up a Sonic CD style race finish for the Metal object, or in case of the following... * Add an alternate DEMOMARKER for ending the Metal Recording on death, which kills the Metal object as well. * Add some more relevant exceptions to the "most objects are removed when touching a deathpit" thing, primarily for the sake of ghosts and Metal playback.
2019-10-29 17:38:14 +00:00
G_StopMetalRecording(true);
GTR_DEATHPENALTY
2019-12-18 15:13:24 +00:00
if ((gametyperules & GTR_DEATHPENALTY) // note, no team match suicide penalty
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
&& ((target == source) || (source == NULL && inflictor == NULL) || (source && !source->player)))
{ // Suicide penalty
if (target->player->score >= 50)
target->player->score -= 50;
else
target->player->score = 0;
}
target->flags2 &= ~MF2_DONTDRAW;
}
// if killed by a player
if (source && source->player)
{
if (target->flags & MF_MONITOR)
{
P_SetTarget(&target->target, source);
source->player->numboxes++;
Disable monitor respawning in co-op
2019-11-14 21:27:02 +00:00
if (cv_itemrespawn.value && gametype != GT_COOP && (modifiedgame || netgame || multiplayer))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
target->fuse = cv_itemrespawntime.value*TICRATE + 2; // Random box generation
}
// Award Score Tails
{
INT32 score = 0;
if (maptol & TOL_NIGHTS) // Enemies always worth 200, bosses don't do anything.
{
if ((target->flags & MF_ENEMY) && !(target->flags & (MF_MISSILE|MF_BOSS)))
{
score = 200;
if (source->player->bonustime)
score *= 2;
// Also, add to the link.
// I don't know if NiGHTS did this, but
// Sonic Time Attacked did and it seems like a good enough incentive
// to make people want to actually dash towards/paraloop enemies
if (++source->player->linkcount > source->player->maxlink)
source->player->maxlink = source->player->linkcount;
Standardize NiGHTS link timer w/ NightsLinkTics MAINCFG option
2018-08-10 03:14:14 +00:00
source->player->linktimer = nightslinktics;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
else
{
if (target->flags & MF_BOSS)
score = 1000;
* Add native support for multi-hit badiks to MF_ENEMY. * MF2_FRET application and removal. * Flashing when flag present. * Bounce player back on successful damaging. * Add their spawnhealth to the chain. * Reduce code duplication in P_TouchSpecialThing. * Play with Crawla Commander a little bit as a test of its power.
2018-05-02 22:48:50 +00:00
else if ((target->flags & MF_ENEMY) && !(target->flags & MF_MISSILE) && target->info->spawnhealth)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
* Add native support for multi-hit badiks to MF_ENEMY. * MF2_FRET application and removal. * Flashing when flag present. * Bounce player back on successful damaging. * Add their spawnhealth to the chain. * Reduce code duplication in P_TouchSpecialThing. * Play with Crawla Commander a little bit as a test of its power.
2018-05-02 22:48:50 +00:00
UINT8 locscoreadd = source->player->scoreadd + target->info->spawnhealth;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
mobj_t *scoremobj;
UINT32 scorestate = mobjinfo[MT_SCORE].spawnstate;
scoremobj = P_SpawnMobj(target->x, target->y, target->z + (target->height / 2), MT_SCORE);
* Add native support for multi-hit badiks to MF_ENEMY. * MF2_FRET application and removal. * Flashing when flag present. * Bounce player back on successful damaging. * Add their spawnhealth to the chain. * Reduce code duplication in P_TouchSpecialThing. * Play with Crawla Commander a little bit as a test of its power.
2018-05-02 22:48:50 +00:00
// More Sonic-like point system
if (!mariomode) switch (locscoreadd)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
* Add native support for multi-hit badiks to MF_ENEMY. * MF2_FRET application and removal. * Flashing when flag present. * Bounce player back on successful damaging. * Add their spawnhealth to the chain. * Reduce code duplication in P_TouchSpecialThing. * Play with Crawla Commander a little bit as a test of its power.
2018-05-02 22:48:50 +00:00
case 1: score = 100; break;
case 2: score = 200; scorestate += 1; break;
case 3: score = 500; scorestate += 2; break;
case 4: case 5: case 6: case 7: case 8: case 9:
case 10: case 11: case 12: case 13: case 14:
score = 1000; scorestate += 3; break;
default: score = 10000; scorestate += 4; break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
// Mario Mode has Mario-like chain point values
* Add native support for multi-hit badiks to MF_ENEMY. * MF2_FRET application and removal. * Flashing when flag present. * Bounce player back on successful damaging. * Add their spawnhealth to the chain. * Reduce code duplication in P_TouchSpecialThing. * Play with Crawla Commander a little bit as a test of its power.
2018-05-02 22:48:50 +00:00
else switch (locscoreadd)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
case 1: score = 100; break;
case 2: score = 200; scorestate += 1; break;
case 3: score = 400; scorestate += 5; break;
case 4: score = 800; scorestate += 6; break;
case 5: score = 1000; scorestate += 3; break;
case 6: score = 2000; scorestate += 7; break;
case 7: score = 4000; scorestate += 8; break;
case 8: score = 8000; scorestate += 9; break;
default: // 1up for a chain this long
if (modeattacking) // but 1ups don't exist in record attack!
{ // So we just go back to 10k points.
score = 10000; scorestate += 4; break;
}
P_GivePlayerLives(source->player, 1);
P_PlayLivesJingle(source->player);
scorestate += 10;
break;
}
P_SetMobjState(scoremobj, scorestate);
* Add native support for multi-hit badiks to MF_ENEMY. * MF2_FRET application and removal. * Flashing when flag present. * Bounce player back on successful damaging. * Add their spawnhealth to the chain. * Reduce code duplication in P_TouchSpecialThing. * Play with Crawla Commander a little bit as a test of its power.
2018-05-02 22:48:50 +00:00
Fix scoreadd not doing anything when modified by Lua This does not change any vanilla behavior, as scoreadd is reset constantly on the ground anyway -- this simply makes the behavior modifiable for Lua scripts.
2019-12-26 19:02:02 +00:00
source->player->scoreadd = locscoreadd;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
P_AddPlayerScore(source->player, score);
}
}
// if a player avatar dies...
if (target->player)
{
target->flags &= ~(MF_SOLID|MF_SHOOTABLE); // does not block
P_UnsetThingPosition(target);
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
target->flags |= MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
P_SetThingPosition(target);
Fix players being launched by slopes and pmomz when dying.
2019-11-08 19:40:40 +00:00
target->standingslope = NULL;
target->pmomz = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
* Fix Super players who die being eternally super. * Fix music stack corruption in multiplayer where a super player dies and it's not you. * Fix players in minecarts having their state eternally set to S_PLAY_STND (bug discovered/evident while super, so goes in this branch). Resolves #259.
2019-10-24 17:51:12 +00:00
if (target->player->powers[pw_super])
{
target->player->powers[pw_super] = 0;
if (P_IsLocalPlayer(target->player))
{
music_stack_noposition = true; // HACK: Do not reposition next music
music_stack_fadeout = MUSICRATE/2; // HACK: Fade out current music
}
P_RestoreMusic(target->player);
G_CoopGametype, for all the GT_COOP cases
2020-02-29 03:57:22 +00:00
if (!G_CoopGametype())
* Fix Super players who die being eternally super. * Fix music stack corruption in multiplayer where a super player dies and it's not you. * Fix players in minecarts having their state eternally set to S_PLAY_STND (bug discovered/evident while super, so goes in this branch). Resolves #259.
2019-10-24 17:51:12 +00:00
{
HU_SetCEchoFlags(0);
HU_SetCEchoDuration(5);
HU_DoCEcho(va("%s\\is no longer super.\\\\\\\\", player_names[target->player-players]));
}
}
target->color = target->player->skincolor;
target->colorized = false;
G_GhostAddColor(GHC_NORMAL);
Preparing for the inevitable gametype rule that will handle cooplives...
2019-12-27 20:08:20 +00:00
if ((target->player->lives <= 1) && (netgame || multiplayer) && G_GametypeUsesCoopLives() && (cv_cooplives.value == 0))
Whoops, I did some menu stuff in here. Oh well. NEW COOP BASED: * Add "Infinite" option to cv_cooplives, inspired by SUBARASHII. Lives still exist, but are hidden from the player's view, and are prevented from falling below 1 at any cost. As a result, made the variable CV_CHEAT. OTHER MULTIPLAYER BASED (semi-related): * Made cv_autobalance an on/off switch which determines the allowed difference based on the number of people in the server, instead of a weird and opaque number from 0-4. MENU BASED (not related): * Add horizontal arrows to menu options which respond to the arrow keys. * Make the menu arrows bob. * Switch out the seperate arrows for combination arrows on the joystick menus. * Minor cvar description tweaks.
2017-07-04 12:17:29 +00:00
;
All remaining player->bot checks modified to rely on BOT_ constants
2021-07-15 20:03:26 +00:00
else if ((!target->player->bot || target->player->bot == BOT_MPAI) && !target->player->spectator && (target->player->lives != INFLIVES)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
&& G_GametypeUsesLives())
{
No more losing lives when finished
2020-01-19 17:30:05 +00:00
if (!(target->player->pflags & PF_FINISHED))
target->player->lives -= 1; // Lose a life Tails 03-11-2000
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (target->player->lives <= 0) // Tails 03-14-2000
{
* Renamed "steallives" to "lifedistribution". * Gave lifedistribution a "Sharing" option to go along with its previous individual and stealing options. * Made the game over graphic and music only happen if everyone's out of lives if you're sharing or stealing lives. * Fixed a bug where game over wouldn't come to fruition because it kept on happening each tic of the countdown2. * Made spectator stuff display in Co-op splitscreen.
2017-06-03 11:26:42 +00:00
boolean gameovermus = false;
Preparing for the inevitable gametype rule that will handle cooplives...
2019-12-27 20:08:20 +00:00
if ((netgame || multiplayer) && G_GametypeUsesCoopLives() && (cv_cooplives.value != 1))
* Renamed "steallives" to "lifedistribution". * Gave lifedistribution a "Sharing" option to go along with its previous individual and stealing options. * Made the game over graphic and music only happen if everyone's out of lives if you're sharing or stealing lives. * Fixed a bug where game over wouldn't come to fruition because it kept on happening each tic of the countdown2. * Made spectator stuff display in Co-op splitscreen.
2017-06-03 11:26:42 +00:00
{
INT32 i;
for (i = 0; i < MAXPLAYERS; i++)
{
if (!playeringame[i])
continue;
if (players[i].lives > 0)
break;
}
if (i == MAXPLAYERS)
gameovermus = true;
}
else if (P_IsLocalPlayer(target->player))
gameovermus = true;
Fade time before Game Over track. Notably, can no longer use P_PlayJingle because of pre-fade.
2019-09-06 13:57:13 +00:00
if (gameovermus) // Yousa dead now, Okieday? Tails 03-14-2000
S_ChangeMusicEx("_gover", 0, 0, 0, (2*MUSICRATE) - (MUSICRATE/25), 0); // 1.96 seconds
//P_PlayJingle(target->player, JT_GOVER); // can't be used because incompatible with track fadeout
Starting lives revamp, per the 2.2 priorities topic list! * Each time you die, the number of game overs you've had is counted. * Your save file updates to record this. * The number of startinglives is determined by the number of times you'ved game-overed, with the maximum being infinity lives (thereby providing a cap on the number of game overs you can go through in a typical game). Requires a new patch.dta, but I'm not uploading that yet because not happy with the icon we've got going for infinity lives on the save select menu.
2017-08-17 23:58:16 +00:00
if (!(netgame || multiplayer || demoplayback || demorecording || metalrecording || modeattacking) && numgameovers < maxgameovers)
{
numgameovers++;
* New, pretty save select! Requires patch.dta to really appreciate. * Changed the save format a little more, since I had free reign over it. * Modified the string drawing functions to not awkwardly clip at the very edges of the screen, considering the relevant patch drawing functions avoid out-of-range memory writes.
2017-08-20 22:18:47 +00:00
if ((!modifiedgame || savemoddata) && cursaveslot > 0)
* Per Mystic's request, only set the number of lives in the save file if you actually use a continue, or completely wipe out your lives and continues. * Fix a bug where I got emeralds and mapnumbers mixed up when checking for the "there's a tailsbot" flag. * Consider a save with an invalid skin an invalid save, rather than allowing its continued presence.
2017-08-20 12:14:17 +00:00
G_SaveGameOver((UINT32)cursaveslot, (target->player->continues <= 0));
Starting lives revamp, per the 2.2 priorities topic list! * Each time you die, the number of game overs you've had is counted. * Your save file updates to record this. * The number of startinglives is determined by the number of times you'ved game-overed, with the maximum being infinity lives (thereby providing a cap on the number of game overs you can go through in a typical game). Requires a new patch.dta, but I'm not uploading that yet because not happy with the icon we've got going for infinity lives on the save select menu.
2017-08-17 23:58:16 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
target->player->playerstate = PST_DEAD;
if (target->player == &players[consoleplayer])
{
// don't die in auto map,
// switch view prior to dying
if (automapactive)
AM_Stop();
//added : 22-02-98: recenter view for next life...
localaiming = 0;
}
if (target->player == &players[secondarydisplayplayer])
{
// added : 22-02-98: recenter view for next life...
localaiming2 = 0;
}
//tag deaths handled differently in suicide cases. Don't count spectators!
if (G_TagGametype()
&& !(target->player->pflags & PF_TAGIT) && (!source || !source->player) && !(target->player->spectator))
{
// if you accidentally die before you run out of time to hide, ignore it.
// allow them to try again, rather than sitting the whole thing out.
if (leveltime >= hidetime * TICRATE)
{
Let spectators decide where they spawn Also fixes some issues with tag gametypes
2020-02-23 22:23:00 +00:00
if (!(gametyperules & GTR_HIDEFROZEN))//suiciding in survivor makes you IT.
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
target->player->pflags |= PF_TAGIT;
CONS_Printf(M_GetText("%s is now IT!\n"), player_names[target->player-players]); // Tell everyone who is it!
P_CheckSurvivors();
}
else
{
* cv_directionchar and cv_autobrake, and their secondplayer versions (both on by default) now exist. * cv_useranalog is now hidden from the menu. * Directionchar now attempts to face the camera direction when you're standing still, and handles a few other states with more decorum. * Tailsbot is now slightly more capable of keeping up with Sonic. * pflags rearranged/adjusted, combining a few non-simulstaneous ones and turning PF_NIGHTSFALL into CR_NIGHTSFALL. * [unrelated to branch] all ground-impact based abilities now happen more consistently with quicksand.
2017-09-15 19:34:46 +00:00
if (!(target->player->pflags & PF_GAMETYPEOVER))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
//otherwise, increment the tagger's score.
//in hide and seek, suiciding players are counted as found.
INT32 w;
for (w=0; w < MAXPLAYERS; w++)
{
if (players[w].pflags & PF_TAGIT)
P_AddPlayerScore(&players[w], 100);
}
* cv_directionchar and cv_autobrake, and their secondplayer versions (both on by default) now exist. * cv_useranalog is now hidden from the menu. * Directionchar now attempts to face the camera direction when you're standing still, and handles a few other states with more decorum. * Tailsbot is now slightly more capable of keeping up with Sonic. * pflags rearranged/adjusted, combining a few non-simulstaneous ones and turning PF_NIGHTSFALL into CR_NIGHTSFALL. * [unrelated to branch] all ground-impact based abilities now happen more consistently with quicksand.
2017-09-15 19:34:46 +00:00
target->player->pflags |= PF_GAMETYPEOVER;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
CONS_Printf(M_GetText("%s was found!\n"), player_names[target->player-players]);
P_CheckSurvivors();
}
}
}
}
}
if (source && target && target->player && source->player)
P_PlayVictorySound(source); // Killer laughs at you. LAUGHS! BWAHAHAHA!
// Other death animation effects
* 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
switch(target->type)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
case MT_BOUNCEPICKUP:
case MT_RAILPICKUP:
case MT_AUTOPICKUP:
case MT_EXPLODEPICKUP:
case MT_SCATTERPICKUP:
case MT_GRENADEPICKUP:
P_SetObjectMomZ(target, FRACUNIT, false);
target->fuse = target->info->damage;
break;
Implement new states for Buggle, the new Aquabuzz
2019-10-29 07:32:03 +00:00
case MT_BUGGLE:
* 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
if (inflictor && inflictor->player // did a player kill you? Spawn relative to the player so they're bound to get it
&& P_AproxDistance(inflictor->x - target->x, inflictor->y - target->y) <= inflictor->radius + target->radius + FixedMul(8*FRACUNIT, inflictor->scale) // close enough?
&& inflictor->z <= target->z + target->height + FixedMul(8*FRACUNIT, inflictor->scale)
&& inflictor->z + inflictor->height >= target->z - FixedMul(8*FRACUNIT, inflictor->scale))
mo = P_SpawnMobj(inflictor->x + inflictor->momx, inflictor->y + inflictor->momy, inflictor->z + (inflictor->height / 2) + inflictor->momz, MT_EXTRALARGEBUBBLE);
else
mo = P_SpawnMobj(target->x, target->y, target->z, MT_EXTRALARGEBUBBLE);
mo->destscale = target->scale;
P_SetScale(mo, mo->destscale);
Make Buggles spawn immediately breathable bubbles
2019-12-06 08:29:52 +00:00
P_SetMobjState(mo, mo->info->raisestate);
* 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
break;
case MT_YELLOWSHELL:
P_SpawnMobjFromMobj(target, 0, 0, 0, MT_YELLOWSPRING);
break;
* Add native support for multi-hit badiks to MF_ENEMY. * MF2_FRET application and removal. * Flashing when flag present. * Bounce player back on successful damaging. * Add their spawnhealth to the chain. * Reduce code duplication in P_TouchSpecialThing. * Play with Crawla Commander a little bit as a test of its power.
2018-05-02 22:48:50 +00:00
case MT_CRAWLACOMMANDER:
target->momx = target->momy = target->momz = 0;
break;
* 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
case MT_CRUSHSTACEAN:
if (target->tracer)
{
mobj_t *chain = target->tracer->target, *chainnext;
while (chain)
{
chainnext = chain->target;
P_RemoveMobj(chain);
chain = chainnext;
}
CORRECTION OF MINOR ANNOYANCES * On request of Nev3r and Sphere (combined with my own annoyances), make SOC-loading in .pk3 files use the /SOC folder rather than the /SOCS folder. * Make the Crushstacean's claw launch sounds stop when killed.
2018-06-06 16:11:12 +00:00
S_StopSound(target->tracer);
* 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
P_KillMobj(target->tracer, inflictor, source, damagetype);
* 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
}
break;
case MT_BANPYURA:
if (target->tracer)
{
S_StopSound(target->tracer);
P_KillMobj(target->tracer, inflictor, source, damagetype);
* 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
}
break;
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
case MT_EGGSHIELD:
P_SetObjectMomZ(target, 4*target->scale, false);
P_InstaThrust(target, target->angle, 3*target->scale);
target->flags = (target->flags|MF_NOCLIPHEIGHT) & ~MF_NOGRAVITY;
break;
Add Dragonbomber enemy
2019-11-17 21:23:59 +00:00
case MT_DRAGONBOMBER:
{
mobj_t *segment = target;
while (segment->tracer != NULL)
{
P_KillMobj(segment->tracer, NULL, NULL, 0);
segment = segment->tracer;
}
break;
}
* 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
case MT_EGGMOBILE3:
{
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
mobj_t *mo2;
* 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
thinker_t *th;
UINT32 i = 0; // to check how many clones we've removed
// scan the thinkers to make sure all the old pinch dummies are gone on death
Fix mobj list iteration oversights. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 10:58:22 +00:00
for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
* 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
{
Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list. Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
2019-07-12 23:42:03 +00:00
if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
* 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
continue;
mo = (mobj_t *)th;
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
if (mo->type != (mobjtype_t)target->info->mass)
continue;
if (mo->tracer != target)
continue;
P_KillMobj(mo, inflictor, source, damagetype);
mo->destscale = mo->scale/8;
mo->scalespeed = (mo->scale - mo->destscale)/(2*TICRATE);
mo->momz = mo->info->speed;
mo->angle = FixedAngle((P_RandomKey(36)*10)<<FRACBITS);
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
mo2 = P_SpawnMobjFromMobj(mo, 0, 0, 0, MT_BOSSJUNK);
mo2->angle = mo->angle;
P_SetMobjState(mo2, S_BOSSSEBH2);
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
if (++i == 2) // we've already removed 2 of these, let's stop now
* 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
break;
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
else
S_StartSound(mo, mo->info->deathsound); // done once to prevent sound stacking
* 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
}
}
break;
case MT_BIGMINE:
if (inflictor)
{
fixed_t dx = target->x - inflictor->x, dy = target->y - inflictor->y, dz = target->z - inflictor->z;
fixed_t dm = FixedHypot(dz, FixedHypot(dy, dx));
target->momx = FixedDiv(FixedDiv(dx, dm), dm)*512;
target->momy = FixedDiv(FixedDiv(dy, dm), dm)*512;
target->momz = FixedDiv(FixedDiv(dz, dm), dm)*512;
}
if (source)
P_SetTarget(&target->tracer, source);
break;
case MT_BLASTEXECUTOR:
if (target->spawnpoint)
Adapt blast linedef executor to UDMF
2021-12-28 07:33:57 +00:00
P_LinedefExecute(target->spawnpoint->args[0], (source ? source : inflictor), target->subsector->sector);
* 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
break;
* 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
case MT_SPINBOBERT:
if (target->hnext)
P_KillMobj(target->hnext, inflictor, source, damagetype);
if (target->hprev)
P_KillMobj(target->hprev, inflictor, source, damagetype);
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
case MT_EGGTRAP:
// Time for birdies! Yaaaaaaaay!
* Make the Egg Capsule only explode for one second, but have the number of explosions (and flickies) multiplied 1.5 times. * If the player is spindashing when the level is exited, they will un-spindash. (Currently you get stuck in charging)
2019-11-15 15:20:36 +00:00
target->fuse = TICRATE;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
break;
Simplified the setup for the Snapper/minecart death animations
2019-06-15 15:33:07 +00:00
case MT_MINECART:
A_Scream(target);
target->momx = target->momy = target->momz = 0;
Streamlined the minecart death handling
2019-06-15 19:43:36 +00:00
if (target->target && target->target->health)
P_KillMobj(target->target, target, source, 0);
Simplified the setup for the Snapper/minecart death animations
2019-06-15 15:33:07 +00:00
break;
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
case MT_PLAYER:
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
{
In Mario mode... * shields give you 1000 points * redundant shields don't make you puase * checkpoints give you 2000 points * falling down a deathpit is just falling, not bouncing
2016-10-12 22:47:18 +00:00
target->fuse = TICRATE*3; // timer before mobj disappears from view (even if not an actual player)
Mario mode is boring again. (I'm going to revert this commit as soon as possible, but shield_actions needs to be clean of Mario stuff for now.)
2016-10-24 11:35:40 +00:00
target->momx = target->momy = target->momz = 0;
In Mario mode... * shields give you 1000 points * redundant shields don't make you puase * checkpoints give you 2000 points * falling down a deathpit is just falling, not bouncing
2016-10-12 22:47:18 +00:00
if (damagetype == DMG_DROWNED) // drowned
{
target->movedir = damagetype; // we're MOVING the Damage Into anotheR function... Okay, this is a bit of a hack.
if (target->player->charflags & SF_MACHINE)
S_StartSound(target, sfx_fizzle);
else
S_StartSound(target, sfx_drown);
// Don't jump up when drowning
}
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
else
In Mario mode... * shields give you 1000 points * redundant shields don't make you puase * checkpoints give you 2000 points * falling down a deathpit is just falling, not bouncing
2016-10-12 22:47:18 +00:00
{
Mario mode is boring again. (I'm going to revert this commit as soon as possible, but shield_actions needs to be clean of Mario stuff for now.)
2016-10-24 11:35:40 +00:00
P_SetObjectMomZ(target, 14*FRACUNIT, false);
* 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
if (damagetype == DMG_SPIKE) // Spikes
In Mario mode... * shields give you 1000 points * redundant shields don't make you puase * checkpoints give you 2000 points * falling down a deathpit is just falling, not bouncing
2016-10-12 22:47:18 +00:00
S_StartSound(target, sfx_spkdth);
else
P_PlayDeathSound(target);
}
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
}
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
break;
* Add a death animation for killing the Metal object, in case somebody wants to Lua up a Sonic CD style race finish for the Metal object, or in case of the following... * Add an alternate DEMOMARKER for ending the Metal Recording on death, which kills the Metal object as well. * Add some more relevant exceptions to the "most objects are removed when touching a deathpit" thing, primarily for the sake of ghosts and Metal playback.
2019-10-29 17:38:14 +00:00
case MT_METALSONIC_RACE:
target->fuse = TICRATE*3;
target->momx = target->momy = target->momz = 0;
P_SetObjectMomZ(target, 14*FRACUNIT, false);
target->flags = (target->flags & ~MF_NOGRAVITY)|(MF_NOCLIP|MF_NOCLIPTHING);
break;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
default:
break;
}
* 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
// Final state setting - do something instead of P_SetMobjState;
Simplified the setup for the Snapper/minecart death animations
2019-06-15 15:33:07 +00:00
if (target->type == MT_SPIKE && target->info->deathstate != S_NULL)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
* 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
const angle_t ang = ((inflictor) ? inflictor->angle : 0) + ANGLE_90;
const fixed_t scale = target->scale;
const fixed_t xoffs = P_ReturnThrustX(target, ang, 8*scale), yoffs = P_ReturnThrustY(target, ang, 8*scale);
const UINT16 flip = (target->eflags & MFE_VERTICALFLIP);
mobj_t *chunk;
fixed_t momz;
S_StartSound(target, target->info->deathsound);
if (target->info->xdeathstate != S_NULL)
{
momz = 6*scale;
if (flip)
momz *= -1;
#define makechunk(angtweak, xmov, ymov) \
A bunch of spike tweaks. * Make it possible to break them in reverse gravity (resolves #348) by making the spikes break in a circle around the spike touched, rather than in a circle around the player. * Fix the spike chunks spawned not being flipped in reverse gravity by using P_SpawnMobjFromMobj. * Make their breaking sound singular (prevents eardrum destruction).
2019-11-24 22:38:26 +00:00
chunk = P_SpawnMobjFromMobj(target, 0, 0, 0, MT_SPIKE);\
* 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
P_SetMobjState(chunk, target->info->xdeathstate);\
chunk->health = 0;\
chunk->angle = angtweak;\
P_UnsetThingPosition(chunk);\
chunk->flags = MF_NOCLIP;\
chunk->x += xmov;\
chunk->y += ymov;\
P_SetThingPosition(chunk);\
P_InstaThrust(chunk,chunk->angle, 4*scale);\
chunk->momz = momz
makechunk(ang + ANGLE_180, -xoffs, -yoffs);
makechunk(ang, xoffs, yoffs);
#undef makechunk
}
momz = 7*scale;
if (flip)
momz *= -1;
A bunch of spike tweaks. * Make it possible to break them in reverse gravity (resolves #348) by making the spikes break in a circle around the spike touched, rather than in a circle around the player. * Fix the spike chunks spawned not being flipped in reverse gravity by using P_SpawnMobjFromMobj. * Make their breaking sound singular (prevents eardrum destruction).
2019-11-24 22:38:26 +00:00
chunk = P_SpawnMobjFromMobj(target, 0, 0, 0, MT_SPIKE);
* 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
P_SetMobjState(chunk, target->info->deathstate);
chunk->health = 0;
chunk->angle = ang + ANGLE_180;
P_UnsetThingPosition(chunk);
chunk->flags = MF_NOCLIP;
chunk->x -= xoffs;
chunk->y -= yoffs;
if (flip)
chunk->z -= 12*scale;
else
chunk->z += 12*scale;
P_SetThingPosition(chunk);
P_InstaThrust(chunk, chunk->angle, 2*scale);
chunk->momz = momz;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
P_SetMobjState(target, target->info->deathstate);
target->health = 0;
* 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
target->angle = ang;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
P_UnsetThingPosition(target);
target->flags = MF_NOCLIP;
* 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
target->x += xoffs;
target->y += yoffs;
target->z = chunk->z;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
P_SetThingPosition(target);
* 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
P_InstaThrust(target, target->angle, 2*scale);
target->momz = momz;
}
else if (target->type == MT_WALLSPIKE && target->info->deathstate != S_NULL)
{
const angle_t ang = (/*(inflictor) ? inflictor->angle : */target->angle) + ANGLE_90;
const fixed_t scale = target->scale;
const fixed_t xoffs = P_ReturnThrustX(target, ang, 8*scale), yoffs = P_ReturnThrustY(target, ang, 8*scale), forwardxoffs = P_ReturnThrustX(target, target->angle, 7*scale), forwardyoffs = P_ReturnThrustY(target, target->angle, 7*scale);
const UINT16 flip = (target->eflags & MFE_VERTICALFLIP);
mobj_t *chunk;
boolean sprflip;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
* 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_StartSound(target, target->info->deathsound);
if (!P_MobjWasRemoved(target->tracer))
P_RemoveMobj(target->tracer);
if (target->info->xdeathstate != S_NULL)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
* 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
sprflip = P_RandomChance(FRACUNIT/2);
#define makechunk(angtweak, xmov, ymov) \
A bunch of spike tweaks. * Make it possible to break them in reverse gravity (resolves #348) by making the spikes break in a circle around the spike touched, rather than in a circle around the player. * Fix the spike chunks spawned not being flipped in reverse gravity by using P_SpawnMobjFromMobj. * Make their breaking sound singular (prevents eardrum destruction).
2019-11-24 22:38:26 +00:00
chunk = P_SpawnMobjFromMobj(target, 0, 0, 0, MT_WALLSPIKE);\
* 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
P_SetMobjState(chunk, target->info->xdeathstate);\
chunk->health = 0;\
chunk->angle = target->angle;\
P_UnsetThingPosition(chunk);\
chunk->flags = MF_NOCLIP;\
chunk->x += xmov - forwardxoffs;\
chunk->y += ymov - forwardyoffs;\
P_SetThingPosition(chunk);\
P_InstaThrust(chunk, angtweak, 4*scale);\
chunk->momz = P_RandomRange(5, 7)*scale;\
if (flip)\
chunk->momz *= -1;\
if (sprflip)\
chunk->frame |= FF_VERTICALFLIP
makechunk(ang + ANGLE_180, -xoffs, -yoffs);
sprflip = !sprflip;
makechunk(ang, xoffs, yoffs);
#undef makechunk
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
* 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
sprflip = P_RandomChance(FRACUNIT/2);
A bunch of spike tweaks. * Make it possible to break them in reverse gravity (resolves #348) by making the spikes break in a circle around the spike touched, rather than in a circle around the player. * Fix the spike chunks spawned not being flipped in reverse gravity by using P_SpawnMobjFromMobj. * Make their breaking sound singular (prevents eardrum destruction).
2019-11-24 22:38:26 +00:00
chunk = P_SpawnMobjFromMobj(target, 0, 0, 0, MT_WALLSPIKE);
* 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
P_SetMobjState(chunk, target->info->deathstate);
chunk->health = 0;
chunk->angle = target->angle;
P_UnsetThingPosition(chunk);
chunk->flags = MF_NOCLIP;
chunk->x += forwardxoffs - xoffs;
chunk->y += forwardyoffs - yoffs;
P_SetThingPosition(chunk);
P_InstaThrust(chunk, ang + ANGLE_180, 2*scale);
chunk->momz = P_RandomRange(5, 7)*scale;
if (flip)
chunk->momz *= -1;
if (sprflip)
chunk->frame |= FF_VERTICALFLIP;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
P_SetMobjState(target, target->info->deathstate);
target->health = 0;
P_UnsetThingPosition(target);
target->flags = MF_NOCLIP;
* 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
target->x += forwardxoffs + xoffs;
target->y += forwardyoffs + yoffs;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
P_SetThingPosition(target);
* 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
P_InstaThrust(target, ang, 2*scale);
target->momz = P_RandomRange(5, 7)*scale;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (flip)
* 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
target->momz *= -1;
if (!sprflip)
target->frame |= FF_VERTICALFLIP;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
else if (target->player)
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
{
if (damagetype == DMG_DROWNED || damagetype == DMG_SPACEDROWN)
P_SetPlayerMobjState(target, target->info->xdeathstate);
else
P_SetPlayerMobjState(target, target->info->deathstate);
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
#ifdef DEBUG_NULL_DEATHSTATE
P_SetMobjState(target, S_NULL);
#else
P_SetMobjState(target, target->info->deathstate);
#endif
/** \note For player, the above is redundant because of P_SetMobjState (target, S_PLAY_DIE1)
in P_DamageMobj()
Graue 12-22-2003 */
}
P_PlayerHitsPlayer is too big for inline, and these other functions are getting there
2019-12-26 22:59:31 +00:00
static void P_NiGHTSDamage(mobj_t *target, mobj_t *source)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
player_t *player = target->player;
tic_t oldnightstime = player->nightstime;
fix compiler errors (shadowed vars, comparisons between unsigned + signed, an unused function arg, and a non-static function with no prototype)
2018-07-02 20:03:04 +00:00
(void)source; // unused
Check if God mode is one before even going to NiGHTS or player vs player damaging code or whatever.
2015-10-05 16:13:34 +00:00
if (!player->powers[pw_flashing])
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
angle_t fa;
player->angle_pos = player->old_angle_pos;
player->speed /= 5;
player->flyangle += 180; // Shuffle's BETTERNIGHTSMOVEMENT?
player->flyangle %= 360;
More gametype rules yay!!
2019-12-18 04:54:45 +00:00
if (gametyperules & GTR_RACE)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
player->drillmeter -= 5*20;
else
{
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
if (player->nightstime > 5*TICRATE)
player->nightstime -= 5*TICRATE;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
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
player->nightstime = 1;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
if (player->pflags & PF_TRANSFERTOCLOSEST)
{
target->momx = -target->momx;
target->momy = -target->momy;
}
else
{
fa = player->old_angle_pos>>ANGLETOFINESHIFT;
target->momx = FixedMul(FINECOSINE(fa),target->target->radius);
target->momy = FixedMul(FINESINE(fa),target->target->radius);
}
player->powers[pw_flashing] = flashingtics;
* 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
P_SetPlayerMobjState(target, S_PLAY_NIGHTS_STUN);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_StartSound(target, sfx_nghurt);
Yeah, yeah...
2019-11-15 01:14:40 +00:00
player->mo->rollangle = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (oldnightstime > 10*TICRATE
&& player->nightstime < 10*TICRATE)
{
Implement MIXNIGHTSCOUNTDOWN An alternate mode to NiGHTS countdown jingle: play it as an SFX while fading down the music.
2019-03-15 03:10:14 +00:00
if ((mapheaderinfo[gamemap-1]->levelflags & LF_MIXNIGHTSCOUNTDOWN)
#ifdef _WIN32
// win32 MIDI volume hack means we cannot fade down the music
&& S_MusicType() != MU_MID
#endif
)
{
S_FadeMusic(0, 10*MUSICRATE);
S_StartSound(NULL, sfx_timeup); // that creepy "out of time" music from NiGHTS.
}
else
Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'"" This reverts commit 603d5805f7ed73efe9073a81c4516c02587064ea.
2019-08-04 11:03:57 +00:00
P_PlayJingle(player, ((maptol & TOL_NIGHTS) && !G_IsSpecialStage(gamemap)) ? JT_NIGHTSTIMEOUT : JT_SSTIMEOUT);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
}
P_PlayerHitsPlayer is too big for inline, and these other functions are getting there
2019-12-26 22:59:31 +00:00
static boolean P_TagDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage, UINT8 damagetype)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
player_t *player = target->player;
(void)damage; //unused parm
// If flashing or invulnerable, ignore the tag,
if (player->powers[pw_flashing] || player->powers[pw_invulnerability])
return false;
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
// Don't allow any damage before the round starts.
if (leveltime <= hidetime * TICRATE)
return false;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Ignore IT players shooting each other, unless friendlyfire is on.
GTR_FRIENDLYFIRE, renamed GTR_HIDETIMEFROZEN, fixed other mistakes
2019-12-18 23:12:52 +00:00
if ((player->pflags & PF_TAGIT && !((cv_friendlyfire.value || (gametyperules & GTR_FRIENDLYFIRE) || (damagetype & DMG_CANHURTSELF)) &&
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
source && source->player && source->player->pflags & PF_TAGIT)))
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
{
if (inflictor->type == MT_LHRT && !(player->powers[pw_shield] & SH_NOSTACK))
{
Now it's CA_TWINSPIN's turn to get the improvements! * Remove PF_THOKKED every time a successful damage bounce occours. * When this happens, spawn a number of particles based on thokitem at half scale! (Optimised, again, for MT_LHRT.) * Also spawn these particles when a successful spring boost occours, as well as playing a twisted spring sound. Also, some other related tweaks: * Optimisations to A_VultureBlast, which was used as a base for the particle creation. * Make the Metal Sonic boss use P_PlayerCanDamage instead of a custom, somewhat broken player damage detection mechanism. * P_SpawnGhostMobj takes colorized into account. * Fold Tails propeller damage into P_PlayerCanDamage. * When performing an Attraction Blast, place the player in roll frames. * Update all conditions preventing SH_PINK to incorporate thokitem and spinitem as well. * Buff MT_LHRT travel distance at slow speeds.
2019-06-26 22:26:05 +00:00
if (player->revitem != MT_LHRT && player->spinitem != MT_LHRT && player->thokitem != MT_LHRT) // Healers do not get to heal other healers.
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
{
P_SwitchShield(player, SH_PINK);
S_StartSound(target, mobjinfo[MT_PITY_ICON].seesound);
}
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return false;
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
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Don't allow players on the same team to hurt one another,
// unless cv_friendlyfire is on.
GTR_FRIENDLYFIRE, renamed GTR_HIDETIMEFROZEN, fixed other mistakes
2019-12-18 23:12:52 +00:00
if (!(cv_friendlyfire.value || (gametyperules & GTR_FRIENDLYFIRE) || (damagetype & DMG_CANHURTSELF)) && (player->pflags & PF_TAGIT) == (source->player->pflags & PF_TAGIT))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
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
if (inflictor->type == MT_LHRT && !(player->powers[pw_shield] & SH_NOSTACK))
{
Now it's CA_TWINSPIN's turn to get the improvements! * Remove PF_THOKKED every time a successful damage bounce occours. * When this happens, spawn a number of particles based on thokitem at half scale! (Optimised, again, for MT_LHRT.) * Also spawn these particles when a successful spring boost occours, as well as playing a twisted spring sound. Also, some other related tweaks: * Optimisations to A_VultureBlast, which was used as a base for the particle creation. * Make the Metal Sonic boss use P_PlayerCanDamage instead of a custom, somewhat broken player damage detection mechanism. * P_SpawnGhostMobj takes colorized into account. * Fold Tails propeller damage into P_PlayerCanDamage. * When performing an Attraction Blast, place the player in roll frames. * Update all conditions preventing SH_PINK to incorporate thokitem and spinitem as well. * Buff MT_LHRT travel distance at slow speeds.
2019-06-26 22:26:05 +00:00
if (player->revitem != MT_LHRT && player->spinitem != MT_LHRT && player->thokitem != MT_LHRT) // Healers do not get to heal other healers.
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
{
P_SwitchShield(player, SH_PINK);
S_StartSound(target, mobjinfo[MT_PITY_ICON].seesound);
}
}
else if (!(inflictor->flags & MF_FIRE))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
P_GivePlayerRings(player, 1);
SRB2 2.1.7 release
2014-04-14 05:14:58 +00:00
if (inflictor->flags2 & MF2_BOUNCERING)
fix infinite bounce rings
2016-05-12 20:52:41 +00:00
inflictor->fuse = 0; // bounce ring disappears at -1 not 0
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return false;
}
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
if (inflictor->type == MT_LHRT)
return false;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// The tag occurs so long as you aren't shooting another tagger with friendlyfire on.
if (source->player->pflags & PF_TAGIT && !(player->pflags & PF_TAGIT))
{
P_AddPlayerScore(source->player, 100); //award points to tagger.
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
P_HitDeathMessages(player, inflictor, source, 0);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Let spectators decide where they spawn Also fixes some issues with tag gametypes
2020-02-23 22:23:00 +00:00
if (!(gametyperules & GTR_HIDEFROZEN)) //survivor
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
player->pflags |= PF_TAGIT; //in survivor, the player becomes IT and helps hunt down the survivors.
CONS_Printf(M_GetText("%s is now IT!\n"), player_names[player-players]); // Tell everyone who is it!
}
else
{
* cv_directionchar and cv_autobrake, and their secondplayer versions (both on by default) now exist. * cv_useranalog is now hidden from the menu. * Directionchar now attempts to face the camera direction when you're standing still, and handles a few other states with more decorum. * Tailsbot is now slightly more capable of keeping up with Sonic. * pflags rearranged/adjusted, combining a few non-simulstaneous ones and turning PF_NIGHTSFALL into CR_NIGHTSFALL. * [unrelated to branch] all ground-impact based abilities now happen more consistently with quicksand.
2017-09-15 19:34:46 +00:00
player->pflags |= PF_GAMETYPEOVER; //in hide and seek, the player is tagged and stays stationary.
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
CONS_Printf(M_GetText("%s was found!\n"), player_names[player-players]); // Tell everyone who is it!
}
//checks if tagger has tagged all players, if so, end round early.
P_CheckSurvivors();
}
P_DoPlayerPain(player, source, inflictor);
// Check for a shield
if (player->powers[pw_shield])
{
P_RemoveShield(player);
S_StartSound(target, sfx_shldls);
return true;
}
Correct player->spheres deduction upon losing spheres player->rings appears to be used for ring/star pickups. Player never loses stars, so it seems player->rings should not be deducted in-level. Therefore, just deduct player->spheres.
2018-08-10 04:51:20 +00:00
if (player->powers[pw_carry] == CR_NIGHTSFALL)
{
if (player->spheres > 0)
{
P_PlayRinglossSound(target);
P_PlayerRingBurst(player, player->spheres);
player->spheres = 0;
}
}
else if (player->rings > 0) // Ring loss
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
P_PlayRinglossSound(target);
Tag damage fix error
2018-08-10 06:34:21 +00:00
P_PlayerRingBurst(player, player->rings);
Correct player->spheres deduction upon losing spheres player->rings appears to be used for ring/star pickups. Player never loses stars, so it seems player->rings should not be deducted in-level. Therefore, just deduct player->spheres.
2018-08-10 04:51:20 +00:00
player->rings = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Okay, major overhaul time! *player->health (formerly the "HUD" health) is now to be known as player->rings, and now acts as the player's actual ring count *player->mo->health (formerly rings + 1) is now always 1 when alive, regardless of ring count; if player with rings is damaged, this is untouched Damage in normal SP/Coop gameplay has been tested and still works fine; still a lot of mess to clear up though Tag damaging probably is broken now, I'll fix this later
2015-08-15 20:07:16 +00:00
else // Death
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Okay, major overhaul time! *player->health (formerly the "HUD" health) is now to be known as player->rings, and now acts as the player's actual ring count *player->mo->health (formerly rings + 1) is now always 1 when alive, regardless of ring count; if player with rings is damaged, this is untouched Damage in normal SP/Coop gameplay has been tested and still works fine; still a lot of mess to clear up though Tag damaging probably is broken now, I'll fix this later
2015-08-15 20:07:16 +00:00
P_PlayDeathSound(target);
P_PlayVictorySound(source); // Killer laughs at you! LAUGHS! BWAHAHAHHAHAA!!
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
return true;
}
P_PlayerHitsPlayer is too big for inline, and these other functions are getting there
2019-12-26 22:59:31 +00:00
static boolean P_PlayerHitsPlayer(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage, UINT8 damagetype)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
player_t *player = target->player;
* Add new damagetype flag (DMG_CANHURTSELF) that allows a player to hurt themselves indirectly. * Add damagetype to P_RadiusAttack (optinteger in lua, A_Explode var1). * Removed the prevention of MF_BOSS objects from getting P_RadiusAttacked. This was a holdover from DooM (I checked) - a way to prevent the Cyberdemon from gibbing itself when firing point blank into a wall, and also a way to make it and the Spider Mastermind harder. * Enemies are solid to other enemies movement-wise now. * (Fun little aside - if you remove MF_SOLID from a monitor, it now behaves like they did in Sonic Adventure (poppable by colliding with, not just attacking). * Fixed Metal Sonic battle conflict in MF_PAIN/mass not picked up earlier. * Miscellaneous tiny code tweaks.
2018-05-08 22:26:36 +00:00
if (!(damagetype & DMG_CANHURTSELF))
{
// You can't kill yourself, idiot...
if (source == target)
return false;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
* Add new damagetype flag (DMG_CANHURTSELF) that allows a player to hurt themselves indirectly. * Add damagetype to P_RadiusAttack (optinteger in lua, A_Explode var1). * Removed the prevention of MF_BOSS objects from getting P_RadiusAttacked. This was a holdover from DooM (I checked) - a way to prevent the Cyberdemon from gibbing itself when firing point blank into a wall, and also a way to make it and the Spider Mastermind harder. * Enemies are solid to other enemies movement-wise now. * (Fun little aside - if you remove MF_SOLID from a monitor, it now behaves like they did in Sonic Adventure (poppable by colliding with, not just attacking). * Fixed Metal Sonic battle conflict in MF_PAIN/mass not picked up earlier. * Miscellaneous tiny code tweaks.
2018-05-08 22:26:36 +00:00
// In COOP/RACE, you can't hurt other players unless cv_friendlyfire is on
Separate PvP damage from non-friendly gametypes
2020-03-02 00:31:44 +00:00
if (!(cv_friendlyfire.value || (gametyperules & GTR_FRIENDLYFIRE)) && (gametyperules & GTR_FRIENDLY))
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
{
Award pink shields in friendly gametypes
2020-02-23 19:38:32 +00:00
if ((gametyperules & GTR_FRIENDLY) && inflictor->type == MT_LHRT && !(player->powers[pw_shield] & SH_NOSTACK)) // co-op only
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
{
Now it's CA_TWINSPIN's turn to get the improvements! * Remove PF_THOKKED every time a successful damage bounce occours. * When this happens, spawn a number of particles based on thokitem at half scale! (Optimised, again, for MT_LHRT.) * Also spawn these particles when a successful spring boost occours, as well as playing a twisted spring sound. Also, some other related tweaks: * Optimisations to A_VultureBlast, which was used as a base for the particle creation. * Make the Metal Sonic boss use P_PlayerCanDamage instead of a custom, somewhat broken player damage detection mechanism. * P_SpawnGhostMobj takes colorized into account. * Fold Tails propeller damage into P_PlayerCanDamage. * When performing an Attraction Blast, place the player in roll frames. * Update all conditions preventing SH_PINK to incorporate thokitem and spinitem as well. * Buff MT_LHRT travel distance at slow speeds.
2019-06-26 22:26:05 +00:00
if (player->revitem != MT_LHRT && player->spinitem != MT_LHRT && player->thokitem != MT_LHRT) // Healers do not get to heal other healers.
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
{
P_SwitchShield(player, SH_PINK);
S_StartSound(target, mobjinfo[MT_PITY_ICON].seesound);
}
}
* Add new damagetype flag (DMG_CANHURTSELF) that allows a player to hurt themselves indirectly. * Add damagetype to P_RadiusAttack (optinteger in lua, A_Explode var1). * Removed the prevention of MF_BOSS objects from getting P_RadiusAttacked. This was a holdover from DooM (I checked) - a way to prevent the Cyberdemon from gibbing itself when firing point blank into a wall, and also a way to make it and the Spider Mastermind harder. * Enemies are solid to other enemies movement-wise now. * (Fun little aside - if you remove MF_SOLID from a monitor, it now behaves like they did in Sonic Adventure (poppable by colliding with, not just attacking). * Fixed Metal Sonic battle conflict in MF_PAIN/mass not picked up earlier. * Miscellaneous tiny code tweaks.
2018-05-08 22:26:36 +00:00
return false;
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
}
* Add new damagetype flag (DMG_CANHURTSELF) that allows a player to hurt themselves indirectly. * Add damagetype to P_RadiusAttack (optinteger in lua, A_Explode var1). * Removed the prevention of MF_BOSS objects from getting P_RadiusAttacked. This was a holdover from DooM (I checked) - a way to prevent the Cyberdemon from gibbing itself when firing point blank into a wall, and also a way to make it and the Spider Mastermind harder. * Enemies are solid to other enemies movement-wise now. * (Fun little aside - if you remove MF_SOLID from a monitor, it now behaves like they did in Sonic Adventure (poppable by colliding with, not just attacking). * Fixed Metal Sonic battle conflict in MF_PAIN/mass not picked up earlier. * Miscellaneous tiny code tweaks.
2018-05-08 22:26:36 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Tag handling
if (G_TagGametype())
* Add new damagetype flag (DMG_CANHURTSELF) that allows a player to hurt themselves indirectly. * Add damagetype to P_RadiusAttack (optinteger in lua, A_Explode var1). * Removed the prevention of MF_BOSS objects from getting P_RadiusAttacked. This was a holdover from DooM (I checked) - a way to prevent the Cyberdemon from gibbing itself when firing point blank into a wall, and also a way to make it and the Spider Mastermind harder. * Enemies are solid to other enemies movement-wise now. * (Fun little aside - if you remove MF_SOLID from a monitor, it now behaves like they did in Sonic Adventure (poppable by colliding with, not just attacking). * Fixed Metal Sonic battle conflict in MF_PAIN/mass not picked up earlier. * Miscellaneous tiny code tweaks.
2018-05-08 22:26:36 +00:00
return P_TagDamage(target, inflictor, source, damage, damagetype);
else if (damagetype & DMG_CANHURTSELF)
return true;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else if (G_GametypeHasTeams()) // CTF + Team Match
{
// Don't allow players on the same team to hurt one another,
// unless cv_friendlyfire is on.
GTR_FRIENDLYFIRE, renamed GTR_HIDETIMEFROZEN, fixed other mistakes
2019-12-18 23:12:52 +00:00
if (!(cv_friendlyfire.value || (gametyperules & GTR_FRIENDLYFIRE)) && target->player->ctfteam == source->player->ctfteam)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
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
if (inflictor->type == MT_LHRT && !(player->powers[pw_shield] & SH_NOSTACK))
{
Now it's CA_TWINSPIN's turn to get the improvements! * Remove PF_THOKKED every time a successful damage bounce occours. * When this happens, spawn a number of particles based on thokitem at half scale! (Optimised, again, for MT_LHRT.) * Also spawn these particles when a successful spring boost occours, as well as playing a twisted spring sound. Also, some other related tweaks: * Optimisations to A_VultureBlast, which was used as a base for the particle creation. * Make the Metal Sonic boss use P_PlayerCanDamage instead of a custom, somewhat broken player damage detection mechanism. * P_SpawnGhostMobj takes colorized into account. * Fold Tails propeller damage into P_PlayerCanDamage. * When performing an Attraction Blast, place the player in roll frames. * Update all conditions preventing SH_PINK to incorporate thokitem and spinitem as well. * Buff MT_LHRT travel distance at slow speeds.
2019-06-26 22:26:05 +00:00
if (player->revitem != MT_LHRT && player->spinitem != MT_LHRT && player->thokitem != MT_LHRT) // Healers do not get to heal other healers.
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
{
P_SwitchShield(player, SH_PINK);
S_StartSound(target, mobjinfo[MT_PITY_ICON].seesound);
}
}
else if (!(inflictor->flags & MF_FIRE))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
P_GivePlayerRings(target->player, 1);
SRB2 2.1.7 release
2014-04-14 05:14:58 +00:00
if (inflictor->flags2 & MF2_BOUNCERING)
fix infinite bounce rings
2016-05-12 20:52:41 +00:00
inflictor->fuse = 0; // bounce ring disappears at -1 not 0
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return false;
}
}
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
if (inflictor->type == MT_LHRT)
return false;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Add pity.
if (!player->powers[pw_flashing] && !player->powers[pw_invulnerability] && !player->powers[pw_super]
&& source->player->score > player->score)
player->pity++;
return true;
}
static void P_KillPlayer(player_t *player, mobj_t *source, INT32 damage)
{
Increased space in pflags (because we were getting VERY close to full capacity), which I will re-organise when this branch is closer to completion. * PF_NIGHTSMODE is now CR_NIGHTSMODE as part of player->powers[pw_carry]. This is because it's mutually exclusive to every other "carry" type. * PF_SUPERREADY is dead because it literally just checked for all 7 emeralds and 50 rings. That's it. You couldn't even appreciably alter its presence with Lua. That logic has been placed back in P_SuperReady.
2017-03-14 18:11:17 +00:00
player->pflags &= ~PF_SLIDING;
Introducing player->powers[pw_carry]! Also, I made rope hangs a lot smoother. * PF_ITEMHANG -> CR_GENERIC * PF_CARRIED -> CR_PLAYER * (mo->tracer == MT_TUBEWAYPOINT) -> CR_ZOOMTUBE * PF_ROPEHANG -> CR_ROPEHANG * PF_MACESPIN -> CR_MACESPIN
2016-09-23 22:48:48 +00:00
player->powers[pw_carry] = CR_NONE;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Burst weapons and emeralds in Match/CTF only
burst emeralds with GTR_MATCHEMERALDS
2019-12-27 15:34:35 +00:00
if (source)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
In P_KillPlayer, check for the gametype's rules, instead of the gametype itself, before bursting rings.
2019-12-27 20:22:55 +00:00
if ((gametyperules & GTR_RINGSLINGER) && !(gametyperules & GTR_TAG))
burst emeralds with GTR_MATCHEMERALDS
2019-12-27 15:34:35 +00:00
P_PlayerRingBurst(player, player->rings);
Rename GTR_MATCHEMERALDS to GTR_POWERSTONES.
2019-12-28 22:49:34 +00:00
if (gametyperules & GTR_POWERSTONES)
burst emeralds with GTR_MATCHEMERALDS
2019-12-27 15:34:35 +00:00
P_PlayerEmeraldBurst(player, false);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
// Get rid of shield
Mario mode is boring again. (I'm going to revert this commit as soon as possible, but shield_actions needs to be clean of Mario stuff for now.)
2016-10-24 11:35:40 +00:00
player->powers[pw_shield] = SH_NONE;
player->mo->color = player->skincolor;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Get rid of emeralds
player->powers[pw_emeralds] = 0;
P_ForceFeed(player, 40, 10, TICRATE, 40 + min(damage, 100)*2);
P_ResetPlayer(player);
Do death animation even when MF2_DONTDRAW is set
2019-06-15 20:29:30 +00:00
if (!player->spectator)
player->mo->flags2 &= ~MF2_DONTDRAW;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
P_SetPlayerMobjState(player->mo, player->mo->info->deathstate);
GTR_TEAMFLAGS
2019-12-18 14:43:50 +00:00
if ((gametyperules & GTR_TEAMFLAGS) && (player->gotflag & (GF_REDFLAG|GF_BLUEFLAG)))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
P_PlayerFlagBurst(player, false);
if (source && source->player)
{
// Award no points when players shoot each other when cv_friendlyfire is on.
if (!G_GametypeHasTeams() || !(source->player->ctfteam == player->ctfteam && source != player->mo))
P_AddPlayerScore(source->player, 25);
}
}
if (source && source->player && !player->powers[pw_super]) //don't score points against super players
{
// Award no points when players shoot each other when cv_friendlyfire is on.
if (!G_GametypeHasTeams() || !(source->player->ctfteam == player->ctfteam && source != player->mo))
P_AddPlayerScore(source->player, 100);
}
// If the player was super, tell them he/she ain't so super nomore.
G_CoopGametype, for all the GT_COOP cases
2020-02-29 03:57:22 +00:00
if (!G_CoopGametype() && player->powers[pw_super])
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
S_StartSound(NULL, sfx_s3k66); //let all players hear it.
HU_SetCEchoFlags(0);
HU_SetCEchoDuration(5);
HU_DoCEcho(va("%s\\is no longer super.\\\\\\\\", player_names[player-players]));
}
}
P_SuperDamage() is too big for inlining
2019-03-25 19:30:25 +00:00
static void P_SuperDamage(player_t *player, mobj_t *inflictor, mobj_t *source, INT32 damage)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
fixed_t fallbackspeed;
angle_t ang;
P_ForceFeed(player, 40, 10, TICRATE, 40 + min(damage, 100)*2);
if (player->mo->eflags & MFE_VERTICALFLIP)
player->mo->z--;
else
player->mo->z++;
if (player->mo->eflags & MFE_UNDERWATER)
P_SetObjectMomZ(player->mo, FixedDiv(10511*FRACUNIT,2600*FRACUNIT), false);
else
P_SetObjectMomZ(player->mo, FixedDiv(69*FRACUNIT,10*FRACUNIT), false);
ang = R_PointToAngle2(inflictor->x, inflictor->y, player->mo->x, player->mo->y);
// explosion and rail rings send you farther back, making it more difficult
// to recover
if (inflictor->flags2 & MF2_SCATTER && source)
{
fixed_t dist = P_AproxDistance(P_AproxDistance(source->x-player->mo->x, source->y-player->mo->y), source->z-player->mo->z);
dist = FixedMul(128*FRACUNIT, inflictor->scale) - dist/4;
if (dist < FixedMul(4*FRACUNIT, inflictor->scale))
dist = FixedMul(4*FRACUNIT, inflictor->scale);
fallbackspeed = dist;
}
else if (inflictor->flags2 & MF2_EXPLOSION)
{
if (inflictor->flags2 & MF2_RAILRING)
fallbackspeed = FixedMul(28*FRACUNIT, inflictor->scale); // 7x
else
fallbackspeed = FixedMul(20*FRACUNIT, inflictor->scale); // 5x
}
else if (inflictor->flags2 & MF2_RAILRING)
fallbackspeed = FixedMul(16*FRACUNIT, inflictor->scale); // 4x
else
fallbackspeed = FixedMul(4*FRACUNIT, inflictor->scale); // the usual amount of force
P_InstaThrust(player->mo, ang, fallbackspeed);
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
P_SetPlayerMobjState(player->mo, S_PLAY_STUN);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
P_ResetPlayer(player);
if (player->timeshit != UINT8_MAX)
++player->timeshit;
}
void P_RemoveShield(player_t *player)
{
if (player->powers[pw_shield] & SH_FORCE)
{ // Multi-hit
Mario mode is boring again. (I'm going to revert this commit as soon as possible, but shield_actions needs to be clean of Mario stuff for now.)
2016-10-24 11:35:40 +00:00
if (player->powers[pw_shield] & SH_FORCEHP)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
player->powers[pw_shield]--;
Mario mode is boring again. (I'm going to revert this commit as soon as possible, but shield_actions needs to be clean of Mario stuff for now.)
2016-10-24 11:35:40 +00:00
else
player->powers[pw_shield] &= SH_STACK;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Re-order P_RemoveShield's first/second layer shield code
2017-08-06 17:57:02 +00:00
else if (player->powers[pw_shield] & SH_NOSTACK)
{ // First layer shields
if ((player->powers[pw_shield] & SH_NOSTACK) == SH_ARMAGEDDON) // Give them what's coming to them!
{
P_BlackOw(player); // BAM!
player->pflags |= PF_JUMPDOWN;
}
else
player->powers[pw_shield] &= SH_STACK;
}
else
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{ // Second layer shields
Mario mode is boring again. (I'm going to revert this commit as soon as possible, but shield_actions needs to be clean of Mario stuff for now.)
2016-10-24 11:35:40 +00:00
if (((player->powers[pw_shield] & SH_STACK) == SH_FIREFLOWER) && !(player->powers[pw_super] || (mariomode && player->powers[pw_invulnerability])))
{
player->mo->color = player->skincolor;
G_GhostAddColor(GHC_NORMAL);
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
player->powers[pw_shield] = SH_NONE;
}
}
Added a "damagetype" argument to P_ShieldDamage. We don't use MT_NULL to hack in damage for sector specials anymore, after all. Must have forgotten to do this back when I originally implemented damage types, oh well.
2015-10-05 19:18:45 +00:00
static void P_ShieldDamage(player_t *player, mobj_t *inflictor, mobj_t *source, INT32 damage, UINT8 damagetype)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
SRB2 2.1.6 release
2014-03-25 02:17:59 +00:00
// Must do pain first to set flashing -- P_RemoveShield can cause damage
P_DoPlayerPain(player, source, inflictor);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
P_RemoveShield(player);
P_ForceFeed(player, 40, 10, TICRATE, 40 + min(damage, 100)*2);
* 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
if (damagetype == DMG_SPIKE) // spikes
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
S_StartSound(player->mo, sfx_spkdth);
else
S_StartSound (player->mo, sfx_shldls); // Ba-Dum! Shield loss.
GTR_TEAMFLAGS
2019-12-18 14:43:50 +00:00
if ((gametyperules & GTR_TEAMFLAGS) && (player->gotflag & (GF_REDFLAG|GF_BLUEFLAG)))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
P_PlayerFlagBurst(player, false);
if (source && source->player)
{
// Award no points when players shoot each other when cv_friendlyfire is on.
if (!G_GametypeHasTeams() || !(source->player->ctfteam == player->ctfteam && source != player->mo))
P_AddPlayerScore(source->player, 25);
}
}
if (source && source->player && !player->powers[pw_super]) //don't score points against super players
{
// Award no points when players shoot each other when cv_friendlyfire is on.
if (!G_GametypeHasTeams() || !(source->player->ctfteam == player->ctfteam && source != player->mo))
End to old match scoring toggle.
2017-04-14 19:51:25 +00:00
P_AddPlayerScore(source->player, 50);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
Correct player->spheres deduction upon losing spheres player->rings appears to be used for ring/star pickups. Player never loses stars, so it seems player->rings should not be deducted in-level. Therefore, just deduct player->spheres.
2018-08-10 04:51:20 +00:00
static void P_RingDamage(player_t *player, mobj_t *inflictor, mobj_t *source, INT32 damage, UINT8 damagetype, boolean dospheres)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Fix broken P_RingDamage bug from c6c4ab7c Accidentally snipped too much out of P_DamageMobj's subfunctions...
2015-05-27 10:43:24 +00:00
P_DoPlayerPain(player, source, inflictor);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Fix broken P_RingDamage bug from c6c4ab7c Accidentally snipped too much out of P_DamageMobj's subfunctions...
2015-05-27 10:43:24 +00:00
P_ForceFeed(player, 40, 10, TICRATE, 40 + min(damage, 100)*2);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
* 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
if (damagetype == DMG_SPIKE) // spikes
Fix broken P_RingDamage bug from c6c4ab7c Accidentally snipped too much out of P_DamageMobj's subfunctions...
2015-05-27 10:43:24 +00:00
S_StartSound(player->mo, sfx_spkdth);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (source && source->player && !player->powers[pw_super]) //don't score points against super players
{
// Award no points when players shoot each other when cv_friendlyfire is on.
if (!G_GametypeHasTeams() || !(source->player->ctfteam == player->ctfteam && source != player->mo))
P_AddPlayerScore(source->player, 50);
}
GTR_TEAMFLAGS
2019-12-18 14:43:50 +00:00
if ((gametyperules & GTR_TEAMFLAGS) && (player->gotflag & (GF_REDFLAG|GF_BLUEFLAG)))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
P_PlayerFlagBurst(player, false);
if (source && source->player)
{
// Award no points when players shoot each other when cv_friendlyfire is on.
if (!G_GametypeHasTeams() || !(source->player->ctfteam == player->ctfteam && source != player->mo))
P_AddPlayerScore(source->player, 25);
}
}
// Ring loss sound plays despite hitting spikes
P_PlayRinglossSound(player->mo); // Ringledingle!
More cleanup, most notably dumping ring spilling code in P_RingDamage ...one wonders why P_RingDamage didn't already do that in the first place
2015-10-06 21:05:32 +00:00
P_PlayerRingBurst(player, damage);
Correct player->spheres deduction upon losing spheres player->rings appears to be used for ring/star pickups. Player never loses stars, so it seems player->rings should not be deducted in-level. Therefore, just deduct player->spheres.
2018-08-10 04:51:20 +00:00
if (dospheres)
{
player->spheres -= damage;
if (player->spheres < 0)
player->spheres = 0;
}
else
{
player->rings -= damage;
if (player->rings < 0)
player->rings = 0;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Made P_SpecialStageDamage for the lose 10 rings damaging code shared by spikeballs and SS damage sector special
2017-08-06 21:10:29 +00:00
//
// P_SpecialStageDamage
//
// Do old special stage-style damaging
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
// Removes 5 seconds from the player, or knocks off their shield if they have one.
Made P_SpecialStageDamage for the lose 10 rings damaging code shared by spikeballs and SS damage sector special
2017-08-06 21:10:29 +00:00
// If they don't have anything, just knock the player back anyway (this doesn't kill them).
//
void P_SpecialStageDamage(player_t *player, mobj_t *inflictor, mobj_t *source)
{
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
tic_t oldnightstime = player->nightstime;
Made P_SpecialStageDamage for the lose 10 rings damaging code shared by spikeballs and SS damage sector special
2017-08-06 21:10:29 +00:00
if (player->powers[pw_invulnerability] || player->powers[pw_flashing] || player->powers[pw_super])
return;
Update p_inter.c
2020-03-05 23:30:27 +00:00
if (!cv_friendlyfire.value && source && source->player)
Fix Amy and Fang being able to attack other players in MP Special Stages
2019-12-21 04:22:45 +00:00
{
Spawn Amy's shields for other players
2019-12-23 05:28:06 +00:00
if (inflictor->type == MT_LHRT && !(player->powers[pw_shield] & SH_NOSTACK))
{
if (player->revitem != MT_LHRT && player->spinitem != MT_LHRT && player->thokitem != MT_LHRT) // Healers do not get to heal other healers.
{
P_SwitchShield(player, SH_PINK);
S_StartSound(player->mo, mobjinfo[MT_PITY_ICON].seesound);
}
}
Fix Amy and Fang being able to attack other players in MP Special Stages
2019-12-21 04:22:45 +00:00
if (source->player->ctfteam == player->ctfteam)
return;
}
Update p_inter.c
2020-03-05 23:48:20 +00:00
if (inflictor && inflictor->type == MT_LHRT)
Change this condition a bit
2019-12-24 22:44:06 +00:00
return;
All remaining player->bot checks modified to rely on BOT_ constants
2021-07-15 20:03:26 +00:00
if (player->powers[pw_shield] || (player->bot && player->bot != BOT_MPAI)) //If One-Hit Shield
Made P_SpecialStageDamage for the lose 10 rings damaging code shared by spikeballs and SS damage sector special
2017-08-06 21:10:29 +00:00
{
P_RemoveShield(player);
S_StartSound(player->mo, sfx_shldls); // Ba-Dum! Shield loss.
}
else
{
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_StartSound(player->mo, sfx_nghurt);
if (player->nightstime > 5*TICRATE)
player->nightstime -= 5*TICRATE;
Made P_SpecialStageDamage for the lose 10 rings damaging code shared by spikeballs and SS damage sector special
2017-08-06 21:10:29 +00:00
else
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
player->nightstime = 0;
Made P_SpecialStageDamage for the lose 10 rings damaging code shared by spikeballs and SS damage sector special
2017-08-06 21:10:29 +00:00
}
P_DoPlayerPain(player, inflictor, source);
GTR_TEAMFLAGS
2019-12-18 14:43:50 +00:00
if ((gametyperules & GTR_TEAMFLAGS) && player->gotflag & (GF_REDFLAG|GF_BLUEFLAG))
Made P_SpecialStageDamage for the lose 10 rings damaging code shared by spikeballs and SS damage sector special
2017-08-06 21:10:29 +00:00
P_PlayerFlagBurst(player, false);
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
if (oldnightstime > 10*TICRATE
&& player->nightstime < 10*TICRATE)
{
Implement MIXNIGHTSCOUNTDOWN An alternate mode to NiGHTS countdown jingle: play it as an SFX while fading down the music.
2019-03-15 03:10:14 +00:00
if (mapheaderinfo[gamemap-1]->levelflags & LF_MIXNIGHTSCOUNTDOWN)
{
S_FadeMusic(0, 10*MUSICRATE);
S_StartSound(NULL, sfx_timeup); // that creepy "out of time" music from NiGHTS.
}
else
S_ChangeMusicInternal((((maptol & TOL_NIGHTS) && !G_IsSpecialStage(gamemap)) ? "_ntime" : "_drown"), false);
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
}
Made P_SpecialStageDamage for the lose 10 rings damaging code shared by spikeballs and SS damage sector special
2017-08-06 21:10:29 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
/** Damages an object, which may or may not be a player.
* For melee attacks, source and inflictor are the same.
*
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
* \param target The object being damaged.
* \param inflictor The thing that caused the damage: creature, missile,
* gargoyle, and so forth. Can be NULL in the case of
* environmental damage, such as slime or crushing.
* \param source The creature or person responsible. For example, if a
* player is hit by a ring, the player who shot it. In some
* cases, the target will go after this object after
* receiving damage. This can be NULL.
* \param damage Amount of damage to be dealt.
* \param damagetype Type of damage to be dealt. If bit 7 (0x80) is set, this is an instant-kill.
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
* \return True if the target sustained damage, otherwise false.
* \todo Clean up this mess, split into multiple functions.
* \sa P_KillMobj
*/
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage, UINT8 damagetype)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
player_t *player;
boolean force = false;
if (objectplacing)
return false;
if (target->health <= 0)
return false;
// Spectator handling
Fixed spectators taking unwarranted damage in splitscreen
2019-09-25 09:13:03 +00:00
if (multiplayer)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
if (damagetype != DMG_SPECTATOR && target->player && target->player->spectator)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return false;
if (source && source->player && source->player->spectator)
return false;
}
// Everything above here can't be forced.
if (!metalrecording)
{
Big Large Lua Hooklib Refactor * Hooks are no longer a mess of lua boiler plate. Helper functions reduce hooks to, at the most basic level, only two calls. * Lua tables (the array part) are used to index hooks. Such tables contain only hooks of the same type. * Hook types are defined in one place so you no longer need to sync up the enum and name array.
2020-11-17 12:14:45 +00:00
UINT8 shouldForce = LUA_HookShouldDamage(target, inflictor, source, damage, damagetype);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (P_MobjWasRemoved(target))
return (shouldForce == 1); // mobj was removed
if (shouldForce == 1)
force = true;
else if (shouldForce == 2)
return false;
}
if (!force)
{
Revert "Nev3r wants to make barrels which are both shootable and die when you break them like you break monitors." This reverts commit 286a8b0289c8c0c40190f66f2473b287788806f1.
2016-11-12 15:39:47 +00:00
if (!(target->flags & MF_SHOOTABLE))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return false; // shouldn't happen...
if (target->type == MT_BLACKEGGMAN)
return false;
// Make sure that boxes cannot be popped by enemies, red rings, etc.
All remaining player->bot checks modified to rely on BOT_ constants
2021-07-15 20:03:26 +00:00
if (target->flags & MF_MONITOR && ((!source || !source->player || (source->player->bot && source->player->bot != BOT_MPAI))
fix object type restrictions for popping monitors (MT_BOUNCERING to MT_GRENADERING are actually the ammo pickups, MT_THROWNBOUNCE to MT_THROWNGRENADE are what actually want here)
2019-11-19 17:31:20 +00:00
|| (inflictor && (inflictor->type == MT_REDRING || (inflictor->type >= MT_THROWNBOUNCE && inflictor->type <= MT_THROWNGRENADE)))))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return false;
}
if (target->flags2 & MF2_SKULLFLY)
target->momx = target->momy = target->momz = 0;
if (!force)
{
// Special case for team ring 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
if (target->type == MT_RING_REDBOX && !(source->player->ctfteam == 1))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return false;
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
if (target->type == MT_RING_BLUEBOX && !(source->player->ctfteam == 2))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return false;
}
* Add native support for multi-hit badiks to MF_ENEMY. * MF2_FRET application and removal. * Flashing when flag present. * Bounce player back on successful damaging. * Add their spawnhealth to the chain. * Reduce code duplication in P_TouchSpecialThing. * Play with Crawla Commander a little bit as a test of its power.
2018-05-02 22:48:50 +00:00
if (target->flags & (MF_ENEMY|MF_BOSS))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
if (!force && target->flags2 & MF2_FRET) // Currently flashing from being hit
return false;
Big Large Lua Hooklib Refactor * Hooks are no longer a mess of lua boiler plate. Helper functions reduce hooks to, at the most basic level, only two calls. * Lua tables (the array part) are used to index hooks. Such tables contain only hooks of the same type. * Hook types are defined in one place so you no longer need to sync up the enum and name array.
2020-11-17 12:14:45 +00:00
if (LUA_HookMobjDamage(target, inflictor, source, damage, damagetype) || P_MobjWasRemoved(target))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true;
if (target->health > 1)
target->flags2 |= MF2_FRET;
}
player = target->player;
if (player) // Player is the target
{
if (!force)
{
if (player->exiting)
return false;
Check if God mode is one before even going to NiGHTS or player vs player damaging code or whatever.
2015-10-05 16:13:34 +00:00
if (player->pflags & PF_GODMODE)
return false;
* cv_directionchar and cv_autobrake, and their secondplayer versions (both on by default) now exist. * cv_useranalog is now hidden from the menu. * Directionchar now attempts to face the camera direction when you're standing still, and handles a few other states with more decorum. * Tailsbot is now slightly more capable of keeping up with Sonic. * pflags rearranged/adjusted, combining a few non-simulstaneous ones and turning PF_NIGHTSFALL into CR_NIGHTSFALL. * [unrelated to branch] all ground-impact based abilities now happen more consistently with quicksand.
2017-09-15 19:34:46 +00:00
if ((maptol & TOL_NIGHTS) && target->player->powers[pw_carry] != CR_NIGHTSMODE && target->player->powers[pw_carry] != CR_NIGHTSFALL)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return false;
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
switch (damagetype)
{
* Add SH_PROTECTSPIKE as a shield flag, because I kinda wanted to when I originally made shields, and SUBARASHII's cactus shield vindicated my desires. * Tweaked the values of the shield constants slightly so that no base-game shield is made up of flags and only flags.
2017-08-09 19:56:31 +00:00
#define DAMAGECASE(type)\
case DMG_##type:\
if (player->powers[pw_shield] & SH_PROTECT##type)\
return false;\
break
DAMAGECASE(WATER);
DAMAGECASE(FIRE);
DAMAGECASE(ELECTRIC);
DAMAGECASE(SPIKE);
#undef DAMAGECASE
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
default:
break;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Increased space in pflags (because we were getting VERY close to full capacity), which I will re-organise when this branch is closer to completion. * PF_NIGHTSMODE is now CR_NIGHTSMODE as part of player->powers[pw_carry]. This is because it's mutually exclusive to every other "carry" type. * PF_SUPERREADY is dead because it literally just checked for all 7 emeralds and 50 rings. That's it. You couldn't even appreciably alter its presence with Lua. That logic has been placed back in P_SuperReady.
2017-03-14 18:11:17 +00:00
if (player->powers[pw_carry] == CR_NIGHTSMODE) // NiGHTS damage handling
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
if (!force)
{
if (source == target)
return false; // Don't hit yourself with your own paraloop, baka
GTR_FRIENDLYFIRE, renamed GTR_HIDETIMEFROZEN, fixed other mistakes
2019-12-18 23:12:52 +00:00
if (source && source->player && !(cv_friendlyfire.value || (gametyperules & GTR_FRIENDLYFIRE))
G_CoopGametype, for all the GT_COOP cases
2020-02-29 03:57:22 +00:00
&& ((gametyperules & GTR_FRIENDLY)
Some cleanup and reordering
2015-10-06 20:14:11 +00:00
|| (G_GametypeHasTeams() && player->ctfteam == source->player->ctfteam)))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return false; // Don't run eachother over in special stages and team games and such
}
Big Large Lua Hooklib Refactor * Hooks are no longer a mess of lua boiler plate. Helper functions reduce hooks to, at the most basic level, only two calls. * Lua tables (the array part) are used to index hooks. Such tables contain only hooks of the same type. * Hook types are defined in one place so you no longer need to sync up the enum and name array.
2020-11-17 12:14:45 +00:00
if (LUA_HookMobjDamage(target, inflictor, source, damage, damagetype))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true;
P_NiGHTSDamage(target, source); // -5s :(
return true;
}
Lots of death stuff. * Genesis-style love and attention to the death event. * Only visibly decrement lives/rings when you're respawning (or game over, see below). * Faster no-button-press respawn. * Game Over specific love. * Animation of Level Title font coming in from the sides. * https://cdn.discordapp.com/attachments/428262628893261828/617692325438554132/srb20067.gif * Change gameovertics to 10 seconds instead of 15. * Make the minimum time before you can force going to the Continue screen longer. * Accomodate death in MP special stages as a form of exit. * Don't have your rings or spheres reset when you die in a special stage, so that the stage isn't softlocked with the new harder limits. * Fix a bug with CoopLives_OnChange where changing to infinite lives didn't force a game-overed player to respawn. Also, two not-quite death things which nonetheless were relevant to change: * Fix quitting a special stage having some of the shared spheres/rings disappear into the aether. * Fix a warning during compilation for the Ring Penalty print.
2019-09-01 14:55:23 +00:00
if (G_IsSpecialStage(gamemap) && !(damagetype & DMG_DEATHMASK))
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
{
P_SpecialStageDamage(player, inflictor, source);
return true;
}
Make Brak's electric barrier damage Elemental and Flame Shields.
2021-11-27 13:23:02 +00:00
if (!force && inflictor && inflictor->flags & MF_FIRE && !(damagetype && damagetype != DMG_FIRE))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Turning some shield attributes into flags means that environmental protection and ring-pulling can be more elegantly handled. As a consequence, the S3 shields now have all their passives, and are just waiting on me to give them actives (two of which don't have the necessary sprites for...)
2016-10-13 14:13:33 +00:00
if (player->powers[pw_shield] & SH_PROTECTFIRE)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return false; // Invincible to fire objects
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
if (G_PlatformGametype() && inflictor && source && source->player)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return false; // Don't get hurt by fire generated from friends.
}
// Player hits another player
if (!force && source && source->player)
{
* Add new damagetype flag (DMG_CANHURTSELF) that allows a player to hurt themselves indirectly. * Add damagetype to P_RadiusAttack (optinteger in lua, A_Explode var1). * Removed the prevention of MF_BOSS objects from getting P_RadiusAttacked. This was a holdover from DooM (I checked) - a way to prevent the Cyberdemon from gibbing itself when firing point blank into a wall, and also a way to make it and the Spider Mastermind harder. * Enemies are solid to other enemies movement-wise now. * (Fun little aside - if you remove MF_SOLID from a monitor, it now behaves like they did in Sonic Adventure (poppable by colliding with, not just attacking). * Fixed Metal Sonic battle conflict in MF_PAIN/mass not picked up earlier. * Miscellaneous tiny code tweaks.
2018-05-08 22:26:36 +00:00
if (!P_PlayerHitsPlayer(target, inflictor, source, damage, damagetype))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return false;
}
// Instant-Death
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
if (damagetype & DMG_DEATHMASK)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
P_KillPlayer(player, source, damage);
else if (metalrecording)
{
if (!inflictor)
inflictor = source;
if (inflictor && inflictor->flags & MF_ENEMY)
{ // Metal Sonic destroy enemy !!
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
P_KillMobj(inflictor, NULL, target, damagetype);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return false;
}
else if (inflictor && inflictor->flags & MF_MISSILE)
return false; // Metal Sonic walk through flame !!
* 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
else if (!player->powers[pw_flashing])
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{ // Oh no! Metal Sonic is hit !!
Added a "damagetype" argument to P_ShieldDamage. We don't use MT_NULL to hack in damage for sector specials anymore, after all. Must have forgotten to do this back when I originally implemented damage types, oh well.
2015-10-05 19:18:45 +00:00
P_ShieldDamage(player, inflictor, source, damage, damagetype);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true;
}
* 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
return false;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
As I wanted MI to do but he was too exhausted at the time from hardcoding, make the Fang bullet knockback less hardcoded and instead give it MF2_SUPERFIRE. # Conflicts: # src/p_mobj.c
2019-06-22 16:03:10 +00:00
else if (player->powers[pw_invulnerability] || player->powers[pw_flashing] || player->powers[pw_super]) // ignore bouncing & such in invulnerability
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Hardcoded the cork's stun-you-even-while-flashing behaviour
2019-05-05 18:16:30 +00:00
if (force
As I wanted MI to do but he was too exhausted at the time from hardcoding, make the Fang bullet knockback less hardcoded and instead give it MF2_SUPERFIRE. # Conflicts: # src/p_mobj.c
2019-06-22 16:03:10 +00:00
|| (inflictor && inflictor->flags & MF_MISSILE && inflictor->flags2 & MF2_SUPERFIRE)) // Super Sonic is stunned!
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Big Large Lua Hooklib Refactor * Hooks are no longer a mess of lua boiler plate. Helper functions reduce hooks to, at the most basic level, only two calls. * Lua tables (the array part) are used to index hooks. Such tables contain only hooks of the same type. * Hook types are defined in one place so you no longer need to sync up the enum and name array.
2020-11-17 12:14:45 +00:00
if (!LUA_HookMobjDamage(target, inflictor, source, damage, damagetype))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
P_SuperDamage(player, inflictor, source, damage);
return true;
}
Hardcoded the cork's stun-you-even-while-flashing behaviour
2019-05-05 18:16:30 +00:00
return false;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Big Large Lua Hooklib Refactor * Hooks are no longer a mess of lua boiler plate. Helper functions reduce hooks to, at the most basic level, only two calls. * Lua tables (the array part) are used to index hooks. Such tables contain only hooks of the same type. * Hook types are defined in one place so you no longer need to sync up the enum and name array.
2020-11-17 12:14:45 +00:00
else if (LUA_HookMobjDamage(target, inflictor, source, damage, damagetype))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true;
All remaining player->bot checks modified to rely on BOT_ constants
2021-07-15 20:03:26 +00:00
else if (player->powers[pw_shield] || (player->bot && player->bot != BOT_MPAI && !ultimatemode)) //If One-Hit Shield
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Added a "damagetype" argument to P_ShieldDamage. We don't use MT_NULL to hack in damage for sector specials anymore, after all. Must have forgotten to do this back when I originally implemented damage types, oh well.
2015-10-05 19:18:45 +00:00
P_ShieldDamage(player, inflictor, source, damage, damagetype);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
damage = 0;
}
Correct player->spheres deduction upon losing spheres player->rings appears to be used for ring/star pickups. Player never loses stars, so it seems player->rings should not be deducted in-level. Therefore, just deduct player->spheres.
2018-08-10 04:51:20 +00:00
else if (player->powers[pw_carry] == CR_NIGHTSFALL)
{
Deduct marescore when player hits ground * ~~For speedrunning~~: Land on the Drone, keep your points!
2018-08-13 15:12:53 +00:00
// always damage so we can recoil upon losing points
damage = player->spheres;
P_RingDamage(player, inflictor, source, damage, damagetype, true);
damage = 0;
Correct player->spheres deduction upon losing spheres player->rings appears to be used for ring/star pickups. Player never loses stars, so it seems player->rings should not be deducted in-level. Therefore, just deduct player->spheres.
2018-08-10 04:51:20 +00:00
}
Okay, major overhaul time! *player->health (formerly the "HUD" health) is now to be known as player->rings, and now acts as the player's actual ring count *player->mo->health (formerly rings + 1) is now always 1 when alive, regardless of ring count; if player with rings is damaged, this is untouched Damage in normal SP/Coop gameplay has been tested and still works fine; still a lot of mess to clear up though Tag damaging probably is broken now, I'll fix this later
2015-08-15 20:07:16 +00:00
else if (player->rings > 0) // No shield but have rings.
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Okay, major overhaul time! *player->health (formerly the "HUD" health) is now to be known as player->rings, and now acts as the player's actual ring count *player->mo->health (formerly rings + 1) is now always 1 when alive, regardless of ring count; if player with rings is damaged, this is untouched Damage in normal SP/Coop gameplay has been tested and still works fine; still a lot of mess to clear up though Tag damaging probably is broken now, I'll fix this later
2015-08-15 20:07:16 +00:00
damage = player->rings;
Correct player->spheres deduction upon losing spheres player->rings appears to be used for ring/star pickups. Player never loses stars, so it seems player->rings should not be deducted in-level. Therefore, just deduct player->spheres.
2018-08-10 04:51:20 +00:00
P_RingDamage(player, inflictor, source, damage, damagetype, false);
More cleanup, most notably dumping ring spilling code in P_RingDamage ...one wonders why P_RingDamage didn't already do that in the first place
2015-10-06 21:05:32 +00:00
damage = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Some cleanup and reordering
2015-10-06 20:14:11 +00:00
// To reduce griefing potential, don't allow players to be killed
// by friendly fire. Spilling their rings and other items is enough.
else if (!force && G_GametypeHasTeams()
&& source && source->player && (source->player->ctfteam == player->ctfteam)
GTR_FRIENDLYFIRE, renamed GTR_HIDETIMEFROZEN, fixed other mistakes
2019-12-18 23:12:52 +00:00
&& (cv_friendlyfire.value || (gametyperules & GTR_FRIENDLYFIRE)))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Some cleanup and reordering
2015-10-06 20:14:11 +00:00
damage = 0;
P_ShieldDamage(player, inflictor, source, damage, damagetype);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
else // No shield, no rings, no invincibility.
{
Some cleanup and reordering
2015-10-06 20:14:11 +00:00
damage = 1;
P_KillPlayer(player, source, damage);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
P_ForceFeed(player, 40, 10, TICRATE, 40 + min(damage, 100)*2);
}
// Killing dead. Just for kicks.
SRB2 2.1.8 release
2014-04-19 17:41:29 +00:00
// Require source and inflictor be player. Don't hurt for firing rings.
*_Random is now *_RandomByte. P_RandomChance is now a macro for something that should happen a certain percentage of time. P_SignedRandom was moved to a macro. Nobody cared. # Conflicts: # src/p_inter.c
2016-03-27 14:33:15 +00:00
if (cv_killingdead.value && (source && source->player) && (inflictor && inflictor->player) && P_RandomChance(5*FRACUNIT/16))
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
P_DamageMobj(source, target, target, 1, 0);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// do the damage
Okay, major overhaul time! *player->health (formerly the "HUD" health) is now to be known as player->rings, and now acts as the player's actual ring count *player->mo->health (formerly rings + 1) is now always 1 when alive, regardless of ring count; if player with rings is damaged, this is untouched Damage in normal SP/Coop gameplay has been tested and still works fine; still a lot of mess to clear up though Tag damaging probably is broken now, I'll fix this later
2015-08-15 20:07:16 +00:00
if (damagetype & DMG_DEATHMASK)
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
target->health = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
target->health -= damage;
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
if (player)
P_HitDeathMessages(player, inflictor, source, damagetype);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (source && source->player && target)
G_GhostAddHit(target);
if (target->health <= 0)
{
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
P_KillMobj(target, inflictor, source, damagetype);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true;
}
if (player)
New emerald behavior in Match. No longer turns you super, instead emeralds steal points from enemy players and give you (and relevant teammates) an invincibility + super sneakers monitor.
2015-05-27 06:08:18 +00:00
P_ResetPlayer(target->player);
* 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
else if ((target->type == MT_EGGMOBILE2) // egg slimer
&& (target->health < target->info->damage)) // in pinch phase
P_SetMobjState(target, target->info->meleestate); // go to pinch pain state
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
* 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
P_SetMobjState(target, target->info->painstate);
if (target->type == MT_HIVEELEMENTAL)
target->extravalue1 += 3;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
target->reactiontime = 0; // we're awake now...
if (source && source != target)
{
// if not intent on another player,
// chase after this one
P_SetTarget(&target->target, source);
}
return true;
}
/** Spills an injured player's rings.
*
* \param player The player who is losing rings.
* \param num_rings Number of rings lost. A maximum of 32 rings will be
* spawned.
* \sa P_PlayerFlagBurst
*/
void P_PlayerRingBurst(player_t *player, INT32 num_rings)
{
INT32 i;
mobj_t *mo;
Two one liners related to angles, so doin' em in a single branch. * If a spring has vertical speed AND horizontal speed, always set the player's angle when touching it. * If you have less than 32 rings and spill them, they now get launched away from the player's motion, rather than in the direction of the camera.
2019-07-29 19:29:02 +00:00
angle_t fa, va;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
fixed_t ns;
fixed_t z;
MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP implementation
2018-08-10 04:20:30 +00:00
boolean nightsreplace = ((maptol & TOL_NIGHTS) && !G_IsSpecialStage(gamemap));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Better safe than sorry.
if (!player)
return;
// If no health, don't spawn ring!
SETSPHERES console command for debugging/cheating Fixed sphere spill bug where no spheres spill if player->rings is 0
2018-08-10 16:47:44 +00:00
if (((maptol & TOL_NIGHTS) && player->spheres <= 0) || (!(maptol & TOL_NIGHTS) && player->rings <= 0))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
num_rings = 0;
* cv_directionchar and cv_autobrake, and their secondplayer versions (both on by default) now exist. * cv_useranalog is now hidden from the menu. * Directionchar now attempts to face the camera direction when you're standing still, and handles a few other states with more decorum. * Tailsbot is now slightly more capable of keeping up with Sonic. * pflags rearranged/adjusted, combining a few non-simulstaneous ones and turning PF_NIGHTSFALL into CR_NIGHTSFALL. * [unrelated to branch] all ground-impact based abilities now happen more consistently with quicksand.
2017-09-15 19:34:46 +00:00
if (num_rings > 32 && player->powers[pw_carry] != CR_NIGHTSFALL)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
num_rings = 32;
if (player->powers[pw_emeralds])
P_PlayerEmeraldBurst(player, false);
// Spill weapons first
New Match weapon/ammo dropping method. P_PlayerWeaponPanelOrAmmoBurst will go through all of the player's weapon rings and either drop the weapon panel itself (with no ammo attached, and no ammo taken away!) OR if the player has ammo but no weapon, it drops the ammo instead (and you lose it).
2015-05-27 04:45:34 +00:00
P_PlayerWeaponPanelOrAmmoBurst(player);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Two one liners related to angles, so doin' em in a single branch. * If a spring has vertical speed AND horizontal speed, always set the player's angle when touching it. * If you have less than 32 rings and spill them, they now get launched away from the player's motion, rather than in the direction of the camera.
2019-07-29 19:29:02 +00:00
if (abs(player->mo->momx) > player->mo->scale || abs(player->mo->momy) > player->mo->scale)
va = R_PointToAngle2(player->mo->momx, player->mo->momy, 0, 0)>>ANGLETOFINESHIFT;
else
va = player->mo->angle>>ANGLETOFINESHIFT;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
for (i = 0; i < num_rings; i++)
{
INT32 objType = mobjinfo[MT_RING].reactiontime;
Mario mode is boring again. (I'm going to revert this commit as soon as possible, but shield_actions needs to be clean of Mario stuff for now.)
2016-10-24 11:35:40 +00:00
if (mariomode)
objType = mobjinfo[MT_COIN].reactiontime;
MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP implementation
2018-08-10 04:20:30 +00:00
else if (player->powers[pw_carry] == CR_NIGHTSFALL)
objType = mobjinfo[(nightsreplace ? MT_NIGHTSCHIP : MT_BLUESPHERE)].reactiontime;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
z = player->mo->z;
if (player->mo->eflags & MFE_VERTICALFLIP)
z += player->mo->height - mobjinfo[objType].height;
mo = P_SpawnMobj(player->mo->x, player->mo->y, z, objType);
mo->fuse = 8*TICRATE;
P_SetTarget(&mo->target, player->mo);
mo->destscale = player->mo->scale;
P_SetScale(mo, player->mo->scale);
// Angle offset by player angle, then slightly offset by amount of rings
Two one liners related to angles, so doin' em in a single branch. * If a spring has vertical speed AND horizontal speed, always set the player's angle when touching it. * If you have less than 32 rings and spill them, they now get launched away from the player's motion, rather than in the direction of the camera.
2019-07-29 19:29:02 +00:00
fa = ((i*FINEANGLES/16) + va - ((num_rings-1)*FINEANGLES/32)) & FINEMASK;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Make rings spill out around the player in 16 directions like SA, but spill like Sonic 2.
// Technically a non-SA way of spilling rings. They just so happen to be a little similar.
* cv_directionchar and cv_autobrake, and their secondplayer versions (both on by default) now exist. * cv_useranalog is now hidden from the menu. * Directionchar now attempts to face the camera direction when you're standing still, and handles a few other states with more decorum. * Tailsbot is now slightly more capable of keeping up with Sonic. * pflags rearranged/adjusted, combining a few non-simulstaneous ones and turning PF_NIGHTSFALL into CR_NIGHTSFALL. * [unrelated to branch] all ground-impact based abilities now happen more consistently with quicksand.
2017-09-15 19:34:46 +00:00
if (player->powers[pw_carry] == CR_NIGHTSFALL)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
ns = FixedMul(((i*FRACUNIT)/16)+2*FRACUNIT, mo->scale);
mo->momx = FixedMul(FINECOSINE(fa),ns);
if (!(twodlevel || (player->mo->flags2 & MF2_TWOD)))
mo->momy = FixedMul(FINESINE(fa),ns);
P_SetObjectMomZ(mo, 8*FRACUNIT, false);
mo->fuse = 20*TICRATE; // Adjust fuse for NiGHTS
MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP implementation
2018-08-10 04:20:30 +00:00
Correct player->spheres deduction upon losing spheres player->rings appears to be used for ring/star pickups. Player never loses stars, so it seems player->rings should not be deducted in-level. Therefore, just deduct player->spheres.
2018-08-10 04:51:20 +00:00
// Toggle bonus time colors
MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP implementation
2018-08-10 04:20:30 +00:00
P_SetMobjState(mo, (player->bonustime ? mo->info->raisestate : mo->info->spawnstate));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
else
{
fixed_t momxy, momz; // base horizonal/vertical thrusts
if (i > 15)
{
momxy = 3*FRACUNIT;
momz = 4*FRACUNIT;
}
else
{
momxy = 2*FRACUNIT;
momz = 3*FRACUNIT;
}
ns = FixedMul(FixedMul(momxy, FRACUNIT + FixedDiv(player->losstime<<FRACBITS, 10*TICRATE<<FRACBITS)), mo->scale);
mo->momx = FixedMul(FINECOSINE(fa),ns);
if (!(twodlevel || (player->mo->flags2 & MF2_TWOD)))
mo->momy = FixedMul(FINESINE(fa),ns);
ns = FixedMul(momz, FRACUNIT + FixedDiv(player->losstime<<FRACBITS, 10*TICRATE<<FRACBITS));
P_SetObjectMomZ(mo, ns, false);
if (i & 1)
P_SetObjectMomZ(mo, ns, true);
}
if (player->mo->eflags & MFE_VERTICALFLIP)
mo->momz *= -1;
}
player->losstime += 10*TICRATE;
return;
}
void P_PlayerWeaponPanelBurst(player_t *player)
{
mobj_t *mo;
angle_t fa;
fixed_t ns;
INT32 i;
fixed_t z;
INT32 num_weapons = M_CountBits((UINT32)player->ringweapons, NUM_WEAPONS-1);
UINT16 ammoamt = 0;
for (i = 0; i < num_weapons; i++)
{
mobjtype_t weptype = 0;
powertype_t power = 0;
if (player->ringweapons & RW_BOUNCE) // Bounce
{
weptype = MT_BOUNCEPICKUP;
player->ringweapons &= ~RW_BOUNCE;
power = pw_bouncering;
}
else if (player->ringweapons & RW_RAIL) // Rail
{
weptype = MT_RAILPICKUP;
player->ringweapons &= ~RW_RAIL;
power = pw_railring;
}
else if (player->ringweapons & RW_AUTO) // Auto
{
weptype = MT_AUTOPICKUP;
player->ringweapons &= ~RW_AUTO;
power = pw_automaticring;
}
else if (player->ringweapons & RW_EXPLODE) // Explode
{
weptype = MT_EXPLODEPICKUP;
player->ringweapons &= ~RW_EXPLODE;
power = pw_explosionring;
}
else if (player->ringweapons & RW_SCATTER) // Scatter
{
weptype = MT_SCATTERPICKUP;
player->ringweapons &= ~RW_SCATTER;
power = pw_scatterring;
}
else if (player->ringweapons & RW_GRENADE) // Grenade
{
weptype = MT_GRENADEPICKUP;
player->ringweapons &= ~RW_GRENADE;
power = pw_grenadering;
}
if (!weptype) // ???
continue;
if (player->powers[power] >= mobjinfo[weptype].reactiontime)
ammoamt = (UINT16)mobjinfo[weptype].reactiontime;
else
ammoamt = player->powers[power];
player->powers[power] -= ammoamt;
z = player->mo->z;
if (player->mo->eflags & MFE_VERTICALFLIP)
z += player->mo->height - mobjinfo[weptype].height;
mo = P_SpawnMobj(player->mo->x, player->mo->y, z, weptype);
mo->reactiontime = ammoamt;
mo->flags2 |= MF2_DONTRESPAWN;
mo->flags &= ~(MF_NOGRAVITY|MF_NOCLIPHEIGHT);
P_SetTarget(&mo->target, player->mo);
mo->fuse = 12*TICRATE;
mo->destscale = player->mo->scale;
P_SetScale(mo, player->mo->scale);
// Angle offset by player angle
fa = ((i*FINEANGLES/16) + (player->mo->angle>>ANGLETOFINESHIFT)) & FINEMASK;
// Make rings spill out around the player in 16 directions like SA, but spill like Sonic 2.
// Technically a non-SA way of spilling rings. They just so happen to be a little similar.
// >16 ring type spillout
ns = FixedMul(3*FRACUNIT, mo->scale);
mo->momx = FixedMul(FINECOSINE(fa),ns);
if (!(twodlevel || (player->mo->flags2 & MF2_TWOD)))
mo->momy = FixedMul(FINESINE(fa),ns);
P_SetObjectMomZ(mo, 4*FRACUNIT, false);
if (i & 1)
P_SetObjectMomZ(mo, 4*FRACUNIT, true);
}
}
void P_PlayerWeaponAmmoBurst(player_t *player)
{
mobj_t *mo;
angle_t fa;
fixed_t ns;
INT32 i = 0;
fixed_t z;
mobjtype_t weptype = 0;
powertype_t power = 0;
while (true)
{
if (player->powers[pw_bouncering])
{
weptype = MT_BOUNCERING;
power = pw_bouncering;
}
else if (player->powers[pw_railring])
{
weptype = MT_RAILRING;
power = pw_railring;
}
else if (player->powers[pw_infinityring])
{
weptype = MT_INFINITYRING;
power = pw_infinityring;
}
else if (player->powers[pw_automaticring])
{
weptype = MT_AUTOMATICRING;
power = pw_automaticring;
}
else if (player->powers[pw_explosionring])
{
weptype = MT_EXPLOSIONRING;
power = pw_explosionring;
}
else if (player->powers[pw_scatterring])
{
weptype = MT_SCATTERRING;
power = pw_scatterring;
}
else if (player->powers[pw_grenadering])
{
weptype = MT_GRENADERING;
power = pw_grenadering;
}
else
break; // All done!
z = player->mo->z;
if (player->mo->eflags & MFE_VERTICALFLIP)
z += player->mo->height - mobjinfo[weptype].height;
mo = P_SpawnMobj(player->mo->x, player->mo->y, z, weptype);
mo->health = player->powers[power];
mo->flags2 |= MF2_DONTRESPAWN;
mo->flags &= ~(MF_NOGRAVITY|MF_NOCLIPHEIGHT);
P_SetTarget(&mo->target, player->mo);
player->powers[power] = 0;
mo->fuse = 12*TICRATE;
mo->destscale = player->mo->scale;
P_SetScale(mo, player->mo->scale);
// Angle offset by player angle
fa = ((i*FINEANGLES/16) + (player->mo->angle>>ANGLETOFINESHIFT)) & FINEMASK;
// Spill them!
ns = FixedMul(2*FRACUNIT, mo->scale);
mo->momx = FixedMul(FINECOSINE(fa), ns);
if (!(twodlevel || (player->mo->flags2 & MF2_TWOD)))
mo->momy = FixedMul(FINESINE(fa),ns);
P_SetObjectMomZ(mo, 3*FRACUNIT, false);
if (i & 1)
P_SetObjectMomZ(mo, 3*FRACUNIT, true);
i++;
}
}
New Match weapon/ammo dropping method. P_PlayerWeaponPanelOrAmmoBurst will go through all of the player's weapon rings and either drop the weapon panel itself (with no ammo attached, and no ammo taken away!) OR if the player has ammo but no weapon, it drops the ammo instead (and you lose it).
2015-05-27 04:45:34 +00:00
void P_PlayerWeaponPanelOrAmmoBurst(player_t *player)
{
mobj_t *mo;
angle_t fa;
fixed_t ns;
INT32 i = 0;
fixed_t z;
#define SETUP_DROP(thingtype) \
z = player->mo->z; \
if (player->mo->eflags & MFE_VERTICALFLIP) \
z += player->mo->height - mobjinfo[thingtype].height; \
fa = ((i*FINEANGLES/16) + (player->mo->angle>>ANGLETOFINESHIFT)) & FINEMASK; \
ns = FixedMul(3*FRACUNIT, player->mo->scale); \
#define DROP_WEAPON(rwflag, pickup, ammo, power) \
if (player->ringweapons & rwflag) \
{ \
player->ringweapons &= ~rwflag; \
SETUP_DROP(pickup) \
mo = P_SpawnMobj(player->mo->x, player->mo->y, z, pickup); \
mo->reactiontime = 0; \
mo->flags2 |= MF2_DONTRESPAWN; \
mo->flags &= ~(MF_NOGRAVITY|MF_NOCLIPHEIGHT); \
P_SetTarget(&mo->target, player->mo); \
mo->fuse = 12*TICRATE; \
mo->destscale = player->mo->scale; \
P_SetScale(mo, player->mo->scale); \
mo->momx = FixedMul(FINECOSINE(fa),ns); \
if (!(twodlevel || (player->mo->flags2 & MF2_TWOD))) \
mo->momy = FixedMul(FINESINE(fa),ns); \
P_SetObjectMomZ(mo, 4*FRACUNIT, false); \
if (i & 1) \
P_SetObjectMomZ(mo, 4*FRACUNIT, true); \
++i; \
} \
else if (player->powers[power] > 0) \
{ \
SETUP_DROP(ammo) \
mo = P_SpawnMobj(player->mo->x, player->mo->y, z, ammo); \
mo->health = player->powers[power]; \
mo->flags2 |= MF2_DONTRESPAWN; \
mo->flags &= ~(MF_NOGRAVITY|MF_NOCLIPHEIGHT); \
P_SetTarget(&mo->target, player->mo); \
mo->fuse = 12*TICRATE; \
mo->destscale = player->mo->scale; \
P_SetScale(mo, player->mo->scale); \
mo->momx = FixedMul(FINECOSINE(fa),ns); \
if (!(twodlevel || (player->mo->flags2 & MF2_TWOD))) \
mo->momy = FixedMul(FINESINE(fa),ns); \
P_SetObjectMomZ(mo, 3*FRACUNIT, false); \
if (i & 1) \
P_SetObjectMomZ(mo, 3*FRACUNIT, true); \
player->powers[power] = 0; \
++i; \
}
DROP_WEAPON(RW_BOUNCE, MT_BOUNCEPICKUP, MT_BOUNCERING, pw_bouncering);
DROP_WEAPON(RW_RAIL, MT_RAILPICKUP, MT_RAILRING, pw_railring);
DROP_WEAPON(RW_AUTO, MT_AUTOPICKUP, MT_AUTOMATICRING, pw_automaticring);
DROP_WEAPON(RW_EXPLODE, MT_EXPLODEPICKUP, MT_EXPLOSIONRING, pw_explosionring);
DROP_WEAPON(RW_SCATTER, MT_SCATTERPICKUP, MT_SCATTERRING, pw_scatterring);
DROP_WEAPON(RW_GRENADE, MT_GRENADEPICKUP, MT_GRENADERING, pw_grenadering);
DROP_WEAPON(0, 0, MT_INFINITYRING, pw_infinityring);
#undef DROP_WEAPON
#undef SETUP_DROP
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
//
// P_PlayerEmeraldBurst
//
// Spills ONLY emeralds.
//
void P_PlayerEmeraldBurst(player_t *player, boolean toss)
{
INT32 i;
angle_t fa;
fixed_t ns;
fixed_t z = 0, momx = 0, momy = 0;
// Better safe than sorry.
if (!player)
return;
// Spill power stones
if (player->powers[pw_emeralds])
{
INT32 num_stones = 0;
if (player->powers[pw_emeralds] & EMERALD1)
num_stones++;
if (player->powers[pw_emeralds] & EMERALD2)
num_stones++;
if (player->powers[pw_emeralds] & EMERALD3)
num_stones++;
if (player->powers[pw_emeralds] & EMERALD4)
num_stones++;
if (player->powers[pw_emeralds] & EMERALD5)
num_stones++;
if (player->powers[pw_emeralds] & EMERALD6)
num_stones++;
if (player->powers[pw_emeralds] & EMERALD7)
num_stones++;
for (i = 0; i < num_stones; i++)
{
INT32 stoneflag = 0;
statenum_t statenum = S_CEMG1;
mobj_t *mo;
if (player->powers[pw_emeralds] & EMERALD1)
{
stoneflag = EMERALD1;
statenum = S_CEMG1;
}
else if (player->powers[pw_emeralds] & EMERALD2)
{
stoneflag = EMERALD2;
statenum = S_CEMG2;
}
else if (player->powers[pw_emeralds] & EMERALD3)
{
stoneflag = EMERALD3;
statenum = S_CEMG3;
}
else if (player->powers[pw_emeralds] & EMERALD4)
{
stoneflag = EMERALD4;
statenum = S_CEMG4;
}
else if (player->powers[pw_emeralds] & EMERALD5)
{
stoneflag = EMERALD5;
statenum = S_CEMG5;
}
else if (player->powers[pw_emeralds] & EMERALD6)
{
stoneflag = EMERALD6;
statenum = S_CEMG6;
}
else if (player->powers[pw_emeralds] & EMERALD7)
{
stoneflag = EMERALD7;
statenum = S_CEMG7;
}
if (!stoneflag) // ???
continue;
player->powers[pw_emeralds] &= ~stoneflag;
if (toss)
{
fa = player->mo->angle>>ANGLETOFINESHIFT;
z = player->mo->z + player->mo->height;
if (player->mo->eflags & MFE_VERTICALFLIP)
z -= mobjinfo[MT_FLINGEMERALD].height + player->mo->height;
ns = FixedMul(8*FRACUNIT, player->mo->scale);
}
else
{
fa = ((255 / num_stones) * i) * FINEANGLES/256;
z = player->mo->z + (player->mo->height / 2);
if (player->mo->eflags & MFE_VERTICALFLIP)
z -= mobjinfo[MT_FLINGEMERALD].height;
ns = FixedMul(4*FRACUNIT, player->mo->scale);
}
momx = FixedMul(FINECOSINE(fa), ns);
if (!(twodlevel || (player->mo->flags2 & MF2_TWOD)))
momy = FixedMul(FINESINE(fa),ns);
else
momy = 0;
mo = P_SpawnMobj(player->mo->x, player->mo->y, z, MT_FLINGEMERALD);
mo->health = 1;
mo->threshold = stoneflag;
mo->flags2 |= (MF2_DONTRESPAWN|MF2_SLIDEPUSH);
mo->flags &= ~(MF_NOGRAVITY|MF_NOCLIPHEIGHT);
P_SetTarget(&mo->target, player->mo);
mo->fuse = 12*TICRATE;
P_SetMobjState(mo, statenum);
mo->momx = momx;
mo->momy = momy;
P_SetObjectMomZ(mo, 3*FRACUNIT, false);
if (player->mo->eflags & MFE_VERTICALFLIP)
mo->momz = -mo->momz;
if (toss)
player->tossdelay = 2*TICRATE;
}
}
}
/** Makes an injured or dead player lose possession of the flag.
*
* \param player The player with the flag, about to lose it.
* \sa P_PlayerRingBurst
*/
void P_PlayerFlagBurst(player_t *player, boolean toss)
{
mobj_t *flag;
mobjtype_t type;
if (!(player->gotflag & (GF_REDFLAG|GF_BLUEFLAG)))
return;
if (player->gotflag & GF_REDFLAG)
type = MT_REDFLAG;
else
type = MT_BLUEFLAG;
flag = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, type);
if (player->mo->eflags & MFE_VERTICALFLIP)
flag->z += player->mo->height - flag->height;
if (toss)
P_InstaThrust(flag, player->mo->angle, FixedMul(6*FRACUNIT, player->mo->scale));
else
{
*_Random is now *_RandomByte. P_RandomChance is now a macro for something that should happen a certain percentage of time. P_SignedRandom was moved to a macro. Nobody cared. # Conflicts: # src/p_inter.c
2016-03-27 14:33:15 +00:00
angle_t fa = P_RandomByte()*FINEANGLES/256;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
flag->momx = FixedMul(FINECOSINE(fa), FixedMul(6*FRACUNIT, player->mo->scale));
if (!(twodlevel || (player->mo->flags2 & MF2_TWOD)))
flag->momy = FixedMul(FINESINE(fa), FixedMul(6*FRACUNIT, player->mo->scale));
}
flag->momz = FixedMul(8*FRACUNIT, player->mo->scale);
if (player->mo->eflags & MFE_VERTICALFLIP)
flag->momz = -flag->momz;
if (type == MT_REDFLAG)
flag->spawnpoint = rflagpoint;
else
flag->spawnpoint = bflagpoint;
flag->fuse = cv_flagtime.value * TICRATE;
P_SetTarget(&flag->target, player->mo);
Better CTF in splitscreen, no death message for spectators
2016-04-07 02:55:58 +00:00
// Flag text
{
char plname[MAXPLAYERNAME+4];
strings return by M_GetText() can not be changed
2016-06-13 15:11:02 +00:00
const char *flagtext;
Better CTF in splitscreen, no death message for spectators
2016-04-07 02:55:58 +00:00
char flagcolor;
snprintf(plname, sizeof(plname), "%s%s%s",
CTFTEAMCODE(player),
player_names[player - players],
CTFTEAMENDCODE(player));
if (type == MT_REDFLAG)
{
flagtext = M_GetText("Red flag");
flagcolor = '\x85';
}
else
{
flagtext = M_GetText("Blue flag");
flagcolor = '\x84';
}
if (toss)
CONS_Printf(M_GetText("%s tossed the %c%s%c.\n"), plname, flagcolor, flagtext, 0x80);
else
CONS_Printf(M_GetText("%s dropped the %c%s%c.\n"), plname, flagcolor, flagtext, 0x80);
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
player->gotflag = 0;
// Pointers set for displaying time value and for consistency restoration.
if (type == MT_REDFLAG)
redflag = flag;
else
blueflag = flag;
if (toss)
player->tossdelay = 2*TICRATE;
return;
}
Reference in a new issue Copy permalink