Commit graph

22880 commits

Author SHA1 Message Date
toaster
a333b265b4 Clean up material that is no longer necessary to keep around 2023-05-10 14:42:56 +01:00
toaster
0d9f8076f8 Re-add Auto gamespeed scramble text (temporary height) 2023-05-10 14:42:56 +01:00
toaster
f4f52ede32 New consistent between-round countdowns using SmallNums
- Intermission
    - Unlike before, shows in all contexts, not just netgame/netreplay
- Voting
    - Replaces currently extant counter
2023-05-10 14:42:56 +01:00
toaster
84a2a94b28 Reimplement bottom progression bar
- Actually accomodates variable-length cups/roundqueues
- Uses player skin and color for position indicator instead of iterating through results
TODO: Make the Sealed Star entry a special case
2023-05-10 14:42:56 +01:00
toaster
208f7d3b81 Improve header text handling
- Text on the header
    - If they won, show [skin realname] GOT THROUGH ROUND
        - This branch was showing this previously but inexplicably only had the skin realname when in GP
    - If they retired, show NO CONTEST...
    - Else, show spectator non-participation text
        - if GT_VERSUS, show Boss name
        - if battleprisons, "PRISON BREAK"
        - else, "[gametype name] STAGE"
            - Matches S1/S2 "SPECIAL STAGE" non-completion text
- Scrolls with the page
    - Second page text always reads "TOTAL RANKINGS"
2023-05-10 14:42:55 +01:00
toaster
4ffb5f2e10 Improvements to background handling
- Don't draw Lua HUD hook behind the background
- Flip background in Encore mode
- Only animate scrolling elements when not paused or P_AutoPause
- Don't clobber the (TC_DEFAULT, SKINCOLOR_YELLOW) cache, instead use (TC_RAINBOW, SKINCOLOR_INTERMISSION) directly
- Clearer variable name for background colormap (color to bgcolor)
2023-05-10 14:42:55 +01:00
toaster
2ca9f1aee5 Rename and rearrange the difficult-to-interpret patch variable names for the GP bottom progression visual
`rrmrk1` is now `level_dot[BPP_DONE]`, for example.
BPP is short for "Bottom Progression Patch"

This is a necessary prerequisite to making the roundqueue visuals dynamic, but that is not yet the case
2023-05-10 14:42:55 +01:00
toaster
aa925be7c5 Reimplement player result data
- A series of bars with stuff on them.
    - Player position num
    - Player character + color (via minimap icon)
        - Uses MINIDEAD if a bot NO CONTESTs
    - Player name (Aqua text instead of white if you're the main player)
    - Player TIME/SCORE/RANK/PWR depending on context
        - NO CONTEST now reads "RETIRED."
            - More economical use of more limited space
            - Gives failure a slightly different flavor to the previous entry in the series
- Re-implements the slide when switching from TIME/SCORE to RANK/PWR
- These are automatically spaced in varying degrees to try and use as much or as little space as possible, given the bars are fixed width.
    - 1 to 3 players: Center-aligned column of result bars
    - 4 to 6 players: Two columns of result bars, 1 extra pixel of vertical spacing
    - 7 to 10 players: Two columns of result bars
    - 11 to 16 players: Two columns of result bars, 1 less pixel of vertical spacing

TODO:
- "LAGLESS" host name-and-shame, which the revamped screen was not designed around
- Adjusting position of other entries on the screen to accomodate higher quantities of players
- Adjust spacing of other graphics on the screen to prevent overlap
2023-05-10 14:42:55 +01:00
toaster
06c4a898e2 First steps at reimplementing functionality
- Re-add demo save HUD
- Re-add skip for drawing 3D scene required since Twodee
- Re-add Lua-controlled HUD disabling
- Cleanup for 0 instead of NULL in pointer field of patch drawer macros
- Cleanup for more extra tabs than the browser session of someone with ADHD
2023-05-10 14:42:55 +01:00
toaster
ae7830b9ab Compilation fixes
- grandprixinfo.roundnum --> roundqueue.roundnum
- comment out unused patch
2023-05-10 14:42:54 +01:00
wolfy852
7712074b29 Make line colors reflect progress 2023-05-10 14:42:54 +01:00
wolfy852
465369f383 Logic for progress display markers 2023-05-10 14:42:54 +01:00
wolfy852
b20c16f3fd Draw remaining assets, GP restriction 2023-05-10 14:42:54 +01:00
James R
582b76f168 Intermission: fix marquee scroll 2023-05-10 14:42:54 +01:00
wolfy852
aa94bdb7cc Fix scroll directions 2023-05-10 14:42:54 +01:00
wolfy852
f8c1a0f758 WIP: Marquee & Checker scrolling
Bad numbers. Scroll is happening, just not the way we want it to.
2023-05-10 14:42:53 +01:00
wolfy852
ddd8f84648 Use a more descriptive var name 2023-05-10 14:42:53 +01:00
wolfy852
b1524a8c7f intermission skincolor + demolition of sanity 2023-05-10 14:42:53 +01:00
wolfy852
e7d46c3c0a V_MODULATE -> V_SUBTRACT 2023-05-10 14:42:53 +01:00
wolfy852
2496502b31 Draw marquee, checker, and player icon 2023-05-10 14:42:53 +01:00
wolfy852
1167105ba2 V_DrawFixedPatch -> V_DrawMappedPatch 2023-05-10 14:42:53 +01:00
wolfy852
f53e0398d5 lines 2023-05-10 14:42:52 +01:00
wolfy852
3070c2037b New intermission base
Very incomplete. Currently draws the background and most of the necessary patches. Ignore some of the stupid shit I did here, it'll be cleaned up later.
2023-05-10 14:42:52 +01:00
wolfy852
1e2c3b8657 Dummy out old intermission code, draw level icon as background 2023-05-10 14:42:52 +01:00
Oni
5c5157bce5 Merge branch 'finish-jingles-tidy' into 'master'
Finish Jingles Tidy

See merge request KartKrew/Kart!1217
2023-05-10 06:42:54 +00:00
Sal
920f58fd18 Merge branch 'fix-block-players' into 'master'
Fix Block Players for waypoint detection

Closes #546

See merge request KartKrew/Kart!1228
2023-05-07 18:54:45 +00:00
Sally Coolatta
0ec5c4346b Fix Block Players for waypoint detection 2023-05-07 14:34:03 -04:00
toaster
965dc114aa Merge branch 'round-queue-automate' into 'master'
Round Queue Automate

See merge request KartKrew/Kart!1222
2023-05-07 14:14:34 +00:00
Sal
83a637bc11 Merge branch 'slow-duel-bomb' into 'master'
Slow down duel bombs

See merge request KartKrew/Kart!1227
2023-05-07 01:41:08 +00:00
Sal
b907880295 Merge branch 'centered-skies' into 'master'
Line up the center of skies with horizon line

See merge request KartKrew/Kart!1225
2023-05-07 01:39:24 +00:00
Sally Coolatta
865347544c Slow down duel bombs
They are a bit too fast.
2023-05-06 17:34:03 -04:00
Sally Coolatta
f017f4626f Line up the center of skies with horizon line 2023-05-06 02:19:26 -04:00
VelocitOni
64e091414b Default cam_height increase
75 --> 95  |  Tyron, Sal, and Oni want to test higher cam_height for readability (may drastically help flat maps).
2023-05-06 02:07:20 -04:00
Oni
348549a1cb Merge branch 'quake-crash' into 'master'
P_StartQuake: Use PushQuake (resolves #543)

Closes #543

See merge request KartKrew/Kart!1223
2023-05-05 13:14:23 +00:00
toaster
ca416a3b7f P_StartQuake: Use PushQuake
- Consistency
- Prevents memory corruption when the quakes list is empty
2023-05-05 13:23:27 +01:00
Sal
69b9805d5b Merge branch 'acs-fix-fof-trigger' into 'master'
ACS: Fix "on enter" triggers on intangible FOFs

See merge request KartKrew/Kart!1221
2023-05-04 15:57:43 +00:00
Sally Coolatta
a7d22f8468 ACS: Fix floor & ceiling FOF triggers 2023-05-03 19:11:08 -04:00
toaster
9aeebe44e9 queuemap: Add "-clear" parameter
- Can be used to clear all entries in the round queue
- Stores the special state in the gametype field
- Returns a message if the queue is already empty
2023-05-03 23:46:09 +01:00
Sally Coolatta
ce712ae68d ACS: Fix enter triggers on intangible FOFs 2023-05-03 18:40:23 -04:00
toaster
80ed8b81b9 Command_Map_f, Command_QueueMap_f: Prevent memory leak on cheat-limited early-return 2023-05-03 23:23:45 +01:00
toaster
b72bc73d28 Two new command automation events
- "QueueStart"
    - Activates just before RoundStart, but only if a roundqueue is being started
- "QueueEnd"
    - Activates just before IntermissionStart, but only if the roundqueue has just finished its final map
I chose before in both instances because Automate_Run runs off COM_BufAddText, and I don't completely trust that the buffer won't overflow for particularly complicated server commands, so prioritising the rarer event. However, this is open for discussion
2023-05-03 22:08:13 +01:00
toaster
99a1e47487 Merge branch 'freeplay-align' into 'master'
K_drawKartFreePlay: Fix alignment for good

See merge request KartKrew/Kart!1220
2023-05-03 20:26:47 +00:00
toaster
d6c86b97b6 K_drawKartFreePlay: Fix alignment for good
Uses V_StringScaledWidth instead of manually inserted spacing
2023-05-03 18:05:51 +01:00
Sal
41770be966 Merge branch 'acs-sector-no-spectator' into 'master'
ACS: Prevent spectators from using sector actions

See merge request KartKrew/Kart!1219
2023-05-03 14:49:40 +00:00
Sally Coolatta
f56504e0d4 ACS: Prevent spectators from using sector actions 2023-05-03 09:37:48 -04:00
Sal
2cba1b7820 Merge branch 'acs-get-set' into 'master'
ACS: Property get/set functions

See merge request KartKrew/Kart!1203
2023-05-03 13:30:15 +00:00
Sally Coolatta
31f0df6103 ACS: Fix tag iterations not working 2023-05-02 19:30:09 -04:00
Sally Coolatta
8588881f4d ACS: Add SIDE_BOTH support for SetSideProperty 2023-05-02 18:44:30 -04:00
Sally Coolatta
4f2c47fde0 ACS: Try to fix sprnames garbage 2023-05-02 18:44:30 -04:00
Sally Coolatta
d953049c78 ACS: User properties can tell bool from string 2023-05-02 18:44:30 -04:00