Commit graph

957 commits

Author SHA1 Message Date
toasterbabe
838d9b8a72 * DrT's Spincushion hardcoded.
* Make the MF_PAIN stuff ONLY depend on mass, using the bottom 8 bits for the type and the custom sound in the upper ones.
* A bunch of cleanup of random other stuff, including an unused Deton state and an unused Jetty type's sprite.
2018-05-13 14:09:20 +01:00
toasterbabe
e158a405f3 * 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 23:26:36 +01:00
toasterbabe
a5b3f3b975 * 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 21:30:15 +01:00
toasterbabe
6099ae4bcb * 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 23:48:50 +01:00
toasterbabe
4046439230 * Springs no longer need MF_SOLID to function. (I tried to add a special Sonic 1-3 style "springs are solid from the side" thing with native support, but it turns out that requires too many hacks for an optional extra feature not used in the campaign, so No.)
* Springs no longer send you flying relative to the slope whilst you're on a slope. (I tried fixing this before, but this is a much more solid fix.)
2018-05-02 20:03:18 +01:00
toasterbabe
187642ec48 * 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 15:13:44 +01:00
toasterbabe
4a2701477b * 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 20:18:51 +01:00
toasterbabe
7a73f8b65b Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into hardcoding-time-again 2018-04-08 16:23:19 +01:00
toasterbabe
504f162b59 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into delag_maces
# Conflicts:
#	src/p_mobj.c
2018-04-07 01:54:43 +01:00
toasterbabe
1c51872033 * Fix multispoke mace/chainbars having problems.
* Completely rework how mace/chainbars are spawned to reduce the number of matrix multiplications required EVEN FURTHER!
* Reimplement the maceretry solidity stuff (effect 4).
* Flip the mminlength stuff so that existing dev maps don't break badly.
* Fix hacky chainbar grabbing.
* Tweak height of tinychain a smidge.
2018-04-02 01:08:31 +01:00
toasterbabe
1ac48b08d0 Mace optimisation!
* Handle all chain objects as a hnext/hprev chain.
* When removing mobjs with hnext/hprev, "repair the chain" (make the h links meet).
* Fix hidden slings, which I accidentially broke when I revamped maces the first time.
* Kill MF2_MACEROTATE. Not needed for anything anymore.
* P_MaceRotate now available to Lua to make up for it.
* Related: Made modifying hnext/hprev using Lua safer, so it keeps the reference counts in play.
2018-04-01 20:54:19 +01:00
TehRealSalt
9ba13c8ea4 Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
# Conflicts:
#	src/k_kart.c
#	src/k_kart.h
#	src/lua_baselib.c
#	src/p_inter.c
#	src/p_spec.c
2018-03-31 00:44:03 -04:00
toasterbabe
3004b143a6 * 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 21:49:15 +01:00
TehRealSalt
7264c284cf WIP karma item stuff 2018-03-26 20:36:16 -04:00
toasterbabe
117017b0a0 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 23:53:09 +01:00
TehRealSalt
dfaa7aaad4 missed something 2018-03-14 16:37:42 -04:00
TehRealSalt
eb1b84ce5c Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
# Conflicts:
#	src/info.c
#	src/k_kart.c
#	src/p_enemy.c
#	src/p_inter.c
#	src/p_mobj.c
2018-03-14 16:12:15 -04:00
Sryder
80230e4429 Fix Bombs
Use reactiontime instead of health so chain reactions can occur when multiple bombs are layered.
Make the check for nearby players happen BEFORE the spawning of explosion objects.
Remove MF_NOCLIPTHING and MF_MISSILE from bombs so they don't try and die when they hit the floor sometimes.
2018-03-13 11:07:08 +00:00
Sryder
201392d34b Fix the item box related crashes
Removed Magnet item box pulling code. It's a mess, hacky, doesn't really help in races, and breaks things. We will implement something new for it soon.
2018-03-13 05:20:47 +00:00
TehRealSalt
79ba08ac7d Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
# Conflicts:
#	src/d_netcmd.c
#	src/g_game.c
#	src/k_kart.c
#	src/p_enemy.c
#	src/p_inter.c
#	src/p_map.c
#	src/p_user.c
#	src/sounds.c
#	src/sounds.h
#	src/y_inter.c
2018-03-12 00:58:13 -04:00
Sryder
2b048bf77e Merge branch 'flair' of git@git.magicalgirl.moe:KartKrew/Kart.git 2018-02-24 22:38:28 +00:00
TehRealSalt
9c5a09d770 sonicitems porting, Part 2
BUT with more tweaks on top of that:
- matchesplayed can go up & unlock stuff regardless of modifiedgame
- votetime added to menu
- flame jets are fullbright (been meaning to do this for a while)
- screenshots are prefixed with kart instead of srb2 (ditto)
2018-02-13 18:13:27 -05:00
TehRealSalt
3be938d04a Updated player arrows 2018-02-11 21:47:19 -05:00
TehRealSalt
495ee25f18 Chaotix sound effects, new music names 2018-02-10 16:01:09 -05:00
TehRealSalt
eab1120950 New invincibility effect, grow/shrink stuff
Whenever grow/shrink effects get made, I'll remove the Mario-style
stuttered growth and whatever else needs doing beyond that
2018-02-10 01:19:33 -05:00
Sryder13
2a8d91c79f The main explosion particles bounce off the floor too 2018-02-08 15:46:07 +00:00
TehRealSalt
acc4b0bb76 Belp
- Minimap heads that aren't yours are transparent
- Minimap has a visibility slider
- Bomb stuff renamed to Mine
2018-02-07 22:33:27 -05:00
TehRealSalt
d6d0a38a23 Merge remote-tracking branch 'refs/remotes/origin/flair' into sonicitems
# Conflicts:
#	src/k_kart.c
#	src/k_kart.h
#	src/p_enemy.c
2018-02-05 21:08:01 -05:00
TehRealSalt
48f7a894c1 Fix more conflicts that I forgot 2018-02-05 19:40:26 -05:00
TehRealSalt
bfe58a819a Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
# Conflicts:
#	src/dehacked.c
#	src/hardware/hw_main.c
#	src/info.c
#	src/info.h
#	src/k_kart.c
#	src/p_enemy.c
#	src/p_user.c
#	src/r_things.c
2018-02-05 19:08:49 -05:00
TehRealSalt
806dba97ae So much
- Renamed fucking everything
- Threw out all of the item code because it looks at me funny
2018-02-05 18:55:52 -05:00
Sryder13
b1b3cf52cc New bomb explosion effect 2018-02-05 22:53:31 +00:00
Sryder13
fb87601d52 Some explosion stuff
Sphere spawns at centre and quickly grows before stopping
While sphere grows players get flung up
Fix some issues with battle mode stuff stopping bobombs from working
2018-02-05 19:24:54 +00:00
Monster Iestyn
844cee9e54 Hardcoded LUA_THZT from THZ1.wad, giving us the funny-looking steam whistle tree
This concludes hardcoding of scenery items for THZ
2018-01-22 18:41:14 +00:00
Monster Iestyn
9ff4c51736 Hardcoded SOC_FWR6 from THZ1.wad, also tweaked MT_THZFLOWERB's hitbox 2018-01-19 17:56:18 +00:00
Matthew Marsalko
cd4a0c7c41 Remove unncessary extra boss frames 2018-01-02 11:33:13 -08:00
TehRealSalt
4458cfdb9f Tweeeeeaks
- MT_FALLINGROCK bumps you instead of spinning you out! RIP annoying af apples
- Made some Battle-related messages only happen in netgames
- Messed with the timing on the intro
2017-12-28 18:37:25 -05:00
TehRealSalt
f5650eba09 Wipeout & minor tweaks
- SMK-style wipeout
- Using goldshroom removes some of its timer again
- Karma item boxes follow the player more closely
- "ATTACK OR PROTECT" no longer appears when you die if you've already
seen it
- Lua support for our SOC actions
- Fixed KARTSTUFF_LIST for Lua/SOC
- "Battle" is now an accepted word in level headers for setting
TOL_MATCH
- Default map numlaps is now 3 instead of 4
- Reverted making LF2_RECORDATTACK and LF2_NOVISITNEEDED default menu
flags, needs to be set manually now
2017-12-10 20:58:34 -05:00
Monster Iestyn
a79d064d15 The contents of DSZ-f16.wad's LUA_A000 Lua script are in now
Thing type numbers may be changed later
2017-12-08 18:26:32 +00:00
Sryder13
3ae8623ebb Waypoint Spawning
Uses object MT_WAYPOINT, mapthing type 2001
Placing one by itself will always place it on the floor or ceiling (depending on object flip)
Placing one alongside another that uses Object Special will make the original use the z height of the 2nd
Angle will be used to determine the waypoint's ID
Z Height (threshold on mobjs) will be used to determine the ID of the previous waypoint
Waypoints with the Ambush Flag will be unable to be respawned at (reactiontime on mobjs internally)
2017-11-12 01:10:02 +00:00
TehRealSalt
7eb4a958f7 More adjustments
- Comeback timer gets higher the more you get hit
- Your ghost appears over the bomb
- Speed & accel is set to worst while a bomb
- CHECK range scales with kartcc
2017-11-05 23:18:58 -05:00
TehRealSalt
d3e888cc44 Merge remote-tracking branch 'refs/remotes/origin/master' into battle
# Conflicts:
#	src/d_player.h
#	src/k_kart.c
#	src/k_kart.h
#	src/lua_playerlib.c
2017-11-05 02:16:39 -05:00
TehRealSalt
a9c1b3e747 Everything.
- Player arrows now show if a player is in the item roulette
- Boo has been improved, and added back to Battle's item roulette
- The CHECK HUD item is now more accurate, and should appear more often
- Early comeback mechanic. Functional, but really unpolished
- Attempted (again) to make the first player to join in a netgame spawn
with balloons
- No longer shows respawn text on death
2017-11-05 01:43:47 -05:00
Sryder13
bb35f222c9 1 tid duration on drifting too 2017-11-04 21:58:21 +00:00
Sryder13
33beff0d5f Slow and Fast states use 1 tic duration animation
Disable adjusting of frame speed (can be re-enabled through MAINCFG if people want it for whatever reason)
2017-11-04 17:49:14 +00:00
Sryder13
c9ddb7a4b5 Re-add lost player vibration frames
Separate sprites for fast moving frames
Rename some frames for a more sensible naming convention
2017-11-04 17:32:47 +00:00
Sryder13
81a077b9af New player frameangle used instead of mobj angle for players
Set to mobj angle except when spinning where it's set to spin
Only 1 spin frame needed now
2017-11-04 14:07:53 +00:00
Sryder13
28ec48c02c Make the bump and item throw graphics fullbright. 2017-11-04 13:33:38 +00:00
TehRealSalt
9a822fae80 Balloon stealing! Mushroom is back! 2017-11-02 20:43:03 -04:00
TehRealSalt
cc01d2c3f0 Balloon revamp
Supports arbitrary balloon counts now
2017-11-01 18:46:35 -04:00