Commit graph

841 commits

Author SHA1 Message Date
toaster
6036b67f3d 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-30 15:37:33 +01:00
toaster
dbec3c7e54 Metal Sonic fixes!
* Add more context clues to his fight, including an indicator for which laser attack is being used after chargeup.
* Make missiles able to vectorise him.
* Add another laser orb attack - vertical slice - and change the laser orb sequence to accurately reflect that horizontal is the hardest of the ones in 2.1.
* Optimise TC_BLINK, and fix an issue with TC_ALLWHITE that somehow avoided coming up in testing.
* Fix colorized bosses losing their colorization when flashing, by forcing TC_ALLWHITE.
2019-06-28 20:48:14 +01:00
toaster
e5918d629b Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into toast_cleanup
# Conflicts:
#	src/p_mobj.c
2019-06-26 20:43:37 +01:00
toaster
6bcad784a9 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 23:20:24 +01:00
MascaraSnake
faa43ea92d Merge branch 'master' into new-acz-minecarts 2019-06-17 20:43:21 +02:00
MascaraSnake
3dc4e1d950 Snapper head/legs and minecart segments flash when they're destroyed 2019-06-16 15:35:32 +02:00
MascaraSnake
720d84f87f More incomplete minecart hardcoding 2019-06-13 21:45:30 +02:00
MascaraSnake
01adbfc495 Hardcoded the saloon door 2019-06-12 21:20:14 +02:00
Latapostrophe
a35cea9243 chaos conflict 2019-06-11 17:02:47 +02:00
Jaime Passos
157b510f2b Merge remote-tracking branch 'upstream/master' into gl_shaders 2019-06-10 16:21:46 -03:00
MascaraSnake
67c3d87190 Hardcoded the new Snapper behavior 2019-06-10 20:32:50 +02:00
MascaraSnake
db6b94e7a7 Hardcoded the new Minus behavior 2019-06-10 17:42:37 +02:00
MascaraSnake
a2c61983e5 Hardcoded the new BASH behavior (there's still a bug lurking somewhere) 2019-06-10 16:09:15 +02:00
MascaraSnake
b8aac236f2 Hardcoded the Canarivore 2019-06-10 13:58:16 +02:00
Monster Iestyn
67392baae0 Merge branch 'public_next'
# Conflicts:
#	src/doomdef.h
#	src/hardware/hw_draw.c
#	src/m_misc.c
#	src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
2019-06-09 20:04:08 +01:00
MascaraSnake
91ecf9c380 Hardcoded train dust and steam spawner 2019-06-09 17:16:07 +02:00
MascaraSnake
6f7b77f650 Hardcoded train cameo 2019-06-09 13:48:07 +02:00
MascaraSnake
4910c213b2 Hardcoded wood debris 2019-06-09 12:27:09 +02:00
MascaraSnake
3653d5b46e Hardcoded the TNT barrels and proximity shell (using mazmazz's A_TNTExplode implementation from the minecart branch) 2019-06-09 10:51:33 +02:00
MascaraSnake
65d804e77d Hardcoded oil lamp 2019-06-08 15:50:01 +02:00
MascaraSnake
80f09c35bb Hardcoded dust devil 2019-06-08 09:51:46 +02:00
Steel Titanium
8f19878781 Upped freeslots limit 2019-06-03 15:23:48 -04:00
Monster Iestyn
36415b0050 Hardcode the bomb's explosion states, the dust object type and states, and the sprite prefixes for both 2019-05-23 21:51:58 +01:00
Monster Iestyn
3cb336bdbc Merge branch 'master' into acz-boss-hardcode 2019-05-23 20:38:25 +01:00
Monster Iestyn
10430628e6 Hardcoded ACZ3.wad's version of A_TNTExplode under the name of A_Boss5BombExplode. After a lot of confusion and silly misunderstandings on my part (as well as a lot of mess cleaning), I've finally got there!
The states for the actual bomb explosion effect itself are yet to be hardcoded, but that I'll do tomorrow afternoon probably.
2019-05-21 21:51:19 +01:00
TehRealSalt
02bd05ff2b Bubble Shield waves 2019-05-21 15:46:42 -04:00
TehRealSalt
99ed66ac46 Bubble Shield, Flame Shield changes 2019-05-21 01:01:29 -04:00
Steel Titanium
ed6bd64014 Hardcode some ACZ things 2019-05-11 22:56:23 -04:00
TehRealSalt
c2a07b486b Add Flame Shield 2019-05-11 15:20:06 -04:00
TehRealSalt
b5ba4f959d More drafting tweaks
- Drafting dust now only shows up when you reach maximum draft power. This should illustrate how the mechanic works more clearly.
- Drafting power increase per tic has been rebalanced. Tails now takes around 2 seconds to reach maximum power (nerfed from 0.5 seconds), and Metal now takes around 6 seconds to reach maximum power (buffed from 12 seconds)
- Drafting leniency period is now dependent on weight -- characters who can't control their line as much have a bit more leniency to get back into the drafting area.
- Drafting dust now shows up during drifts.
- Added a sound cue when reaching maximum draft power.
- Removed the draft ambient sound.
2019-05-06 20:50:52 -04:00
TehRealSalt
10b9cd9115 Add (unfinished) drafting effect 2019-05-05 01:24:05 -04:00
Monster Iestyn
ccf78f3660 S_FANG_SLIDE wasn't defined in the Lua script, despite being declared :|
Also Fang seems to turn invisible after his first jump for some reason, and I can't figure out why???
2019-05-04 21:31:46 +01:00
Monster Iestyn
faf353b546 Hardcoded A_Boss5FindWaypoint
...that took a while x_x
2019-05-03 22:58:54 +01:00
Monster Iestyn
59c345d68f Hardcoded A_Boss5MakeItRain 2019-05-03 20:52:56 +01:00
Monster Iestyn
fd2c5a31a6 Hardcode A_DoNPCSkid 2019-05-03 20:00:31 +01:00
Monster Iestyn
1c8ec85019 Hardcoded A_Boss5PinchShot 2019-05-03 19:46:41 +01:00
Monster Iestyn
e1482e1f6b Hardcoded A_LookForBetter 2019-05-03 19:14:17 +01:00
Monster Iestyn
2dd9c81259 Hardcoded A_PrepareRepeat and A_Boss5Calm, added missing prototype for A_Boss5ExtraRepeat (and also fixed its description) 2019-05-03 18:51:17 +01:00
Monster Iestyn
d10a524d9a Hardcoded A_Boss5CheckFalling 2019-05-02 21:32:28 +01:00
Monster Iestyn
2b7614b3db Hardcoded A_Boss5ExtraRepeat 2019-05-02 21:21:15 +01:00
Monster Iestyn
6083771dd2 Hardcoded A_Boss5CheckOnGround 2019-05-02 19:09:40 +01:00
Monster Iestyn
2feca194f7 hardcoded A_DoNPCPain 2019-05-02 18:32:43 +01:00
Monster Iestyn
5979fc8540 Hardcode Fang waypoint object type (turns out no state is needed) 2019-05-02 18:11:44 +01:00
Monster Iestyn
61693e3f2e Hardcoded all the main Fang-specific object types, states and sprites.
This cannot be compiled as-is right now for the following reasons:
* Numerous actions still need to be hardcoded.
* MT_FBOMB uses the TNT barrel explosion (and by extention A_TNTExplode) for its death state. This is a pickle, I'll deal with it when I get to it.

Also missing:
* Fang waypoint object type+states.
* Fang's good looks (to be put in the resource files obviously).
* Fang's brain.
2019-05-02 18:01:18 +01:00
TehRealSalt
6733a485cf wip ring sparkles 2019-04-12 23:29:32 -04:00
TehRealSalt
68ac9080f3 New ring debt indicator & SPB ring lock animations 2019-04-10 23:33:01 -04:00
TehRealSalt
f67e2b5ce1 Add a ring debt indicator for other players 2019-04-09 14:13:34 -04:00
TehRealSalt
3dd89eb7c8 Extra touches
- Re-enable ring respawn
- Make Attraction Shield chasing rings faster
- Combi-band is invisible to non-affected players
- Used rings animate faster
- Sync ring animation to a global timer
2019-04-07 14:49:51 -04:00
Jaime Passos
fd5fb73671 gl4 2019-03-17 22:27:50 -03:00
TehRealSalt
b0ae2f1cfa Finishing touches 2019-03-15 00:29:12 -04:00