Commit graph

41 commits

Author SHA1 Message Date
James R
041fd67ab0 Tally: only show GAME OVER in Sealed Stars if a player entered with 0 lives, not if they die in that round
- This is only relevant for splitscreen
2024-04-08 23:24:08 -07:00
James R
0d76746a95 GP: show GAME OVER tally in Sealed Stars 2024-04-06 17:49:22 -07:00
Sally Coolatta
7dfa597c7d SRB2 -> DRRR copyright in src, acs, android folder
Be consistent with toaster's recent changes to copyright
2024-04-05 02:08:23 -04:00
toaster
75b4bdd4ea Catch all other instances of sounds which might have played where R_CanShowSkinInDemo is false
- Tally
- Generic S_StartSound call (where sfx_id is in skinsound region)
2024-03-27 04:01:58 +00:00
James R.
59b335ed09 Merge branch 'silhouette-results' into 'master'
Tally, Intermission: mask not-yet-unlocked characters

Closes #1213

See merge request KartKrew/Kart!2169
2024-03-27 04:01:53 +00:00
toaster
c19f11d75e Use kThinTimer font for Tally GP success/game over 2024-03-26 15:45:24 +00:00
James R
bd22f756dd Tally, Intermission: mask not-yet-unlocked characters
- Name becomes "???"
- Use question mark icon
- Silhouette A2 sprite
2024-03-26 00:15:36 -07:00
AJ Martinez
d2e6b0809b Don't display NEW RECORD text for losing players 2024-03-22 21:54:06 -07:00
AJ Martinez
17cd1550a1 Tally: Fix intermission music being played on rounds without intermissions 2024-03-18 18:38:41 -07:00
James R
0a1f8331fe Attract: no intermission or tally for Attract demos 2024-03-18 01:19:10 -07:00
AJ Martinez
40a95dbc83 TA record/playback fixes 2024-03-16 21:40:42 -07:00
AJ Martinez
1a70892fd7 Tally: disallow skipping tryagain/gameover (but cover for it if we do allow it later) 2024-03-12 06:42:24 -07:00
James R
2af5f32a72 Tally skipping: make sure player is actually local splitscreen before doing button check 2024-03-12 06:42:24 -07:00
James R
6b413e530f Tally skipping: allow in Match Race, disallow in replays 2024-03-12 06:42:24 -07:00
AJ Martinez
551acaf06e Refine tally skip 2024-03-12 06:07:51 -07:00
AJ Martinez
b60df7d486 WIP: Skip Tally 2024-03-12 06:07:51 -07:00
AJ Martinez
279d802959 Faster TA tally, new TA music 2024-03-06 20:19:51 -07:00
James R
418f2a14c4 Battle: delay Tally a little bit to let round end camera finish beforehand 2024-01-22 16:42:29 -08:00
James R
d8e9effbbf Tally: only reset camera if viewpoint was changed 2024-01-15 15:01:04 -08:00
James R
f9e943b118 Set displayplayer to own self when Tally starts 2024-01-13 12:46:45 -08:00
James R
6bf9f994b5 Revert "HUD: draw tally of party member, not whoever may being spectated"
This reverts commit dfd43014c6.
2024-01-13 12:46:45 -08:00
James R
f7970bcd68 Tally: adjust lives icon in splitscreen 2024-01-12 01:32:02 -08:00
James R
dfd43014c6 HUD: draw tally of party member, not whoever may being spectated 2024-01-08 19:01:05 -08:00
Sally Coolatta
5eaf2613c6 Show rank on intermission 2023-12-13 01:28:22 -05:00
Oni
d307bd2c97 Merge branch 'fix-gp-results-reload' into 'master'
Podium Results/Round Queue fixes

Closes #772 and #742

See merge request KartKrew/Kart!1647
2023-11-21 15:43:20 +00:00
toaster
b09a9b40c4 Account for Hidden Palace-like replacement levels in the round queue and ranking systems
- When a nextmapoverride is in play, do not insert the just-played map into the GP Rank
- Put all the behaviour that determines which Round icon to show in exactly one places

Also, fix a bug where it would show the skin realname for a spectating player's tally instead of the ROUND text.
2023-11-19 18:01:02 +00:00
Sally Coolatta
11a719ced6 Nerf per-level rank requirements
- Use ease-out sine curve for lap points. This means that the difference between 0 and 1 lap points is more drastic for your score than the difference between 5 and 6. (If this isn't strong enough, then a different curve can be used.)
- Final position is weighted less heavily.
- You now get 0 points at the best losing position, instead of 0 points at the worst winning position. This means less negative points.
- Fix Battle ranking being wildly skewed when point limit is disabled.
2023-11-19 02:57:57 -05:00
toaster
0762b93ef2 Tutorial skipping challenge - first pass
- Go to a MainCfg-specified map on its guessed gametype
    - `TutorialChallengeMap = RR_ZonedCity`
- Some unique settings
    - K_CanChangeRules() == false
    - If GTR_CIRCUIT, make it Hard Speed
    - If GTR_BUMPERS, die in one hit
    - If GTR_BOTS, make them all difficulty 13 of the default bot skin
    - No Medals or Spray Cans during the Tutorial Challenge
- Complete the stage in 1st place or don't bother at all
- Has the "Give up" menu option available, but no "Try Again"
- Condition for successfully completing the Tutorial Skip
    - `Condition1 = TutorialSkip`

Related bugfixes:
- Correctly wipe skipstats when returning to the Title/menus
- Typing of `ultimatemode` (hey this isn't accessible by anything right now I wonder)
2023-11-16 21:44:52 +00:00
toaster
388b14e956 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into will-it-blend
# Conflicts:
#	src/k_podium.c
2023-10-29 12:36:30 +00:00
Sal
cecd81b4aa Podium rank screen polished 2023-10-29 06:04:22 +00:00
toaster
c5f7f93e20 Spectator intermission: Only use boss name to describe the Round if the cool boss intro occoured at level load. 2023-10-26 20:21:33 +01:00
toaster
e060e9dadc More consistent handling of special event round icons
- Gametypes have "GPpic" and "GPpicMini" parameters
- These are shown in contexts where a Round Number would be shown in GP, but an eventmode is under way.
- Instead of having different rules to show up on the pause menu, titlecard, and tally/intermission...
    - Pause Menu Roundqueue, Tally, and Intermission have all been aligned to the same rules.
    - As long as the titlecard is standard, it will show the GP Pic per those rules. (GTR_SPECIALSTART and GTR_BOSS still have their unique behaviour here)
2023-10-25 20:34:40 +01:00
toaster
9cbaaa2f11 Defer owner->xtralife sound/animation not covered by Ring Total until Bonuses have been evaluated
Makes more sense for Prison Break, accomodates weird combinatorial custom gametypes
2023-10-25 17:27:02 +01:00
toaster
c50edc684c Tally in GP contexts: Recognise earned lives from other sources, not just Ring Total
- If owner->xtralife isn't 0...
    - For every 20 Rings we count up, increment livesAdded.
    - If at the end of the ring count livesAdded is less than owner->xtralife, set livesAdded to that value.
- Every time livesAdded is changed, play the sound and set the blink.
- Caps the number of added lives to the same as P_GivePlayerLives would permit.
2023-10-25 16:11:57 +01:00
toaster
a1f93b4c60 UCRP_FINISHGRADE A
"get grade A or better"
Not for Podium, use PodiumCup instead for that
2023-10-20 13:03:45 +01:00
James R
3977d3225d Tally: fix fade not covering entire screen in non-green resolutions 2023-10-17 19:17:46 -07:00
James R.
7b3010c93d Fix many instances of splitscreen view number if there are duplicate displayplayers
- Avoid iterating displayplayers to find view number and
  prefer R_GetViewNumber.
- Iterate over all matching displayplayers if necessary,
  instead of stopping at the first match.
2023-10-03 21:28:33 -07:00
toaster
a6fc60a5a3 level_tally_t::UseBonuses: Swap order of checks so the less expensive grandprixinfo comparison is done first 2023-09-19 22:40:13 +01:00
toaster
3a0d6fd2fb Minor fixes for K_RaceLapCount
- Fix comment in k_race.c
- Use numlaps for level_tally_t::Init instead, as this is the cache'd form and permits us to remove k_race.h from the dependencies
2023-09-19 22:40:12 +01:00
toaster
0aaf120fdf level_tally_t::Init - Fix K_RaceLapCount map indexing issue
gamemap is one-indexed. This needs to change at some point, but this will do for now
2023-09-11 00:16:48 +01:00
Sal
0675a4e527 Tally screen 2023-09-09 05:27:55 +00:00