Merge branch 'damage-control' into 'master'
Damage control + Match rebalancing This is two branches in one since while I was working on damage-control's changes months back, I felt it was best Match rebalancing was merged in here too (thanks JTE for helping me do so). Changes from damage-control: * `player->health` (formerly the "HUD copy" of `player->mo->health`) is now `player->rings`, and is also now 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. * P_RingDamage now includes ring spilling code. * P_ShieldDamage now has a damagetype argument, allowing me to remove the last MT_NULL hack left in from the pre-damagetype days that I forgot about. * The old "switch-to-seestate" enemy damaging behavior in P_DamageMobj has been removed. This was a Doom left-over and doesn't really affect SRB2's enemies anyway - see, Doom enemies had a random chance of using seestate or painstate, SRB2 enemies always use painstate. * Other minor efforts to reorganise damaging code and have it make more sense, but otherwise nothing that should affect gameplay in general. Changes from match-rebalancing: * New weapon/ammo dropping behavior: if you have the weapon panel + ammo, you drop the panel (but not the ammo); if you don't, you just drop the ammo. * New Match ammo consumption: Weapon rings can now be fired with no rings at double the ammo cost. * New emerald behaviour: collecting all 7 emeralds no longer turns you super (read: Match super is dead now) but instead steal points from enemies and gives you and teammates invincibility + sneakers * Tails ringslinger buff: Any character with CA_FLY will now throw rings 1.5x as fast. See merge request !28
Showing
- src/d_clisrv.c 3 additions, 4 deletionssrc/d_clisrv.c
- src/d_clisrv.h 2 additions, 1 deletionsrc/d_clisrv.h
- src/d_netcmd.c 1 addition, 1 deletionsrc/d_netcmd.c
- src/d_player.h 2 additions, 4 deletionssrc/d_player.h
- src/dehacked.c 16 additions, 0 deletionssrc/dehacked.c
- src/g_game.c 2 additions, 1 deletionsrc/g_game.c
- src/hu_stuff.c 18 additions, 18 deletionssrc/hu_stuff.c
- src/lua_baselib.c 35 additions, 1 deletionsrc/lua_baselib.c
- src/lua_hook.h 4 additions, 4 deletionssrc/lua_hook.h
- src/lua_hooklib.c 30 additions, 22 deletionssrc/lua_hooklib.c
- src/lua_playerlib.c 4 additions, 4 deletionssrc/lua_playerlib.c
- src/m_cheat.c 3 additions, 3 deletionssrc/m_cheat.c
- src/m_menu.c 2 additions, 2 deletionssrc/m_menu.c
- src/p_enemy.c 9 additions, 9 deletionssrc/p_enemy.c
- src/p_inter.c 209 additions, 130 deletionssrc/p_inter.c
- src/p_local.h 5 additions, 1 deletionsrc/p_local.h
- src/p_mobj.c 20 additions, 17 deletionssrc/p_mobj.c
- src/p_mobj.h 1 addition, 0 deletionssrc/p_mobj.h
- src/p_saveg.c 2 additions, 2 deletionssrc/p_saveg.c
- src/p_setup.c 2 additions, 1 deletionsrc/p_setup.c
Loading
Please register or sign in to comment