feat: Compound penalties, slot consolidation, edit, and hotkey dialogs (#8)

Co-authored-by: Claude <noreply@anthropic.com>

Author: JRemitz

CHANGELOG.md

@@ -4,6 +4,31 @@ All notable changes to Streamn Scoreboard will be documented in this file.
 
 ## [Unreleased]
 
+## [0.6.0] - 2026-04-08
+
+### Added
+- Compound penalty support (2+2, 2+5, 2+10) — two-phase penalties where phase 2 auto-starts when phase 1 expires, matching hockey rules for double-minor and major infractions
+- Phase 2 toggle buttons (+2, +5, +10) in the add-penalty dialog — select one for compound, deselect all for regular; only shown for sports with major penalties (hockey, lacrosse, rugby)
+- Compound indicator `(+M:SS)` shown in the dock UI for penalties still in phase 1
+- Edit button (✏) on each active penalty row — click to change remaining time
+- 4 new OBS hotkeys: Home/Away Penalty Edit 1/2 — opens edit dialog for the first or second running penalty
+- 4 new OBS hotkeys: Home/Away 2+2 Penalty Add, Home/Away 2+5 Penalty Add — open add-penalty dialog with compound phase pre-selected
+- `scoreboard_penalty_compact()` API — consolidates penalties to lowest slots after any clear or expiry
+- `scoreboard_home_penalty_set_time()` / `scoreboard_away_penalty_set_time()` API for programmatic time edits
+- JSON state persistence for `phase2_tenths` field (backwards compatible — old state files load with phase2 defaulting to 0)
+
+### Fixed
+- Clock adjust at 0:00 no longer reduces penalty time — pressing -1 min or -1 sec when the period clock is already at 0:00 was incorrectly subtracting time from active penalties
+- File watcher re-read no longer wipes compound penalty phase 2 data — `parse_penalty_files` now preserves `phase2_tenths` across text file round-trips
+
+### Changed
+- Penalty hotkeys now open a dialog for player number entry instead of silently adding penalties with no player number — ensures every penalty is tracked to a player
+- Clearing a compound penalty in phase 1 (via X button or Clear hotkey) transitions to phase 2 instead of removing the penalty entirely; clearing in phase 2 removes it as normal
+- Editing a compound penalty's time to 0 transitions to phase 2 instead of clearing
+- After clearing or expiring a penalty, remaining penalties consolidate to the lowest slots — "Clear 1" always targets the first remaining penalty regardless of which slot originally held it
+- Hotkey penalty-add callbacks now dispatch to the Qt main thread via `QMetaObject::invokeMethod` for thread-safe dialog display
+- Total OBS hotkeys increased from 37 to 45
+
 ## [0.5.1] - 2026-03-27
 
 ### Fixed

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.21)
 
-project(streamn_obs_scoreboard VERSION 0.5.1 LANGUAGES C CXX)
+project(streamn_obs_scoreboard VERSION 0.6.0 LANGUAGES C CXX)
 
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_C_STANDARD_REQUIRED ON)

README.md

@@ -15,8 +15,8 @@ OBS Studio plugin that tracks live game scoreboard state and writes it to indivi
 - **7 sport presets** — hockey, basketball, soccer, football, lacrosse, rugby, and generic
 - **17 text files** updated in real-time: clock, period, scores, shots, team names, penalties, fouls, and sport
 - **Dock UI** with full scoreboard controls in an OBS dock panel
-- **31 OBS hotkeys** for hands-free operation during broadcasts
-- **Penalty tracking** with automatic countdown timers (hockey, lacrosse, rugby)
+- **45 OBS hotkeys** for hands-free operation during broadcasts
+- **Penalty tracking** with automatic countdown timers, compound penalties (2+2, 2+5, 2+10), edit/clear per slot (hockey, lacrosse, rugby)
 - **Foul/card counters** for basketball, soccer, and football
 - **reeln-cli integration** for automated highlight generation
 - **Game event timestamps** — YouTube chapter markers copied to clipboard for livestream descriptions
@@ -138,7 +138,7 @@ Not all files are relevant for every sport — shots are only tracked for hockey
 
 ## Hotkeys
 
-All 31 hotkeys are prefixed with "Streamn:" in OBS Settings > Hotkeys:
+All 45 hotkeys are prefixed with "Streamn:" in OBS Settings > Hotkeys:
 
 | Hotkey | Action |
 |--------|--------|
@@ -149,8 +149,13 @@ All 31 hotkeys are prefixed with "Streamn:" in OBS Settings > Hotkeys:
 | Home/Away Goal +/- | Adjust score (4 hotkeys) |
 | Home/Away Shot +/- | Adjust shots (4 hotkeys) |
 | Period Advance / Rewind | Change period |
-| Home/Away Penalty Add | Add penalty with default duration |
-| Home/Away Penalty Clear 1/2 | Clear penalty slot (4 hotkeys) |
+| Home/Away Penalty Add | Open add-penalty dialog (minor) |
+| Home/Away Major Penalty Add | Open add-penalty dialog (major) |
+| Home/Away 2+2 Penalty Add | Open add-penalty dialog (compound 2+2) |
+| Home/Away 2+5 Penalty Add | Open add-penalty dialog (compound 2+5) |
+| Home/Away Penalty Clear 1/2 | Clear or transition penalty slot (4 hotkeys) |
+| Home/Away Penalty Edit 1/2 | Open edit dialog for penalty slot (4 hotkeys) |
+| Home/Away Faceoff +/- | Adjust faceoff counter (4 hotkeys) |
 | Generate Highlights | Trigger reeln-cli highlight generation |
 | Home/Away Foul +/- | Adjust foul counter (4 hotkeys) |
 | Home/Away Foul2 +/- | Adjust second foul counter (4 hotkeys) |

include/scoreboard-core.h

@@ -56,6 +56,7 @@ struct scoreboard_penalty {
 	int player_number;
 	int remaining_tenths;
 	bool active;
+	int phase2_tenths; /* 0 = no second phase (compound penalties) */
 };
 
 /* Lifecycle */
@@ -166,15 +167,22 @@ void scoreboard_decrement_away_fouls2(void);
 
 /* Penalties (up to SCOREBOARD_MAX_PENALTIES per team) */
 int scoreboard_home_penalty_add(int player_number, int duration_secs);
+int scoreboard_home_penalty_add_compound(int player_number, int phase1_secs,
+					 int phase2_secs);
 void scoreboard_home_penalty_clear(int slot);
+void scoreboard_home_penalty_set_time(int slot, int duration_secs);
 const struct scoreboard_penalty *scoreboard_get_home_penalty(int slot);
 int scoreboard_get_home_penalty_count(void);
 int scoreboard_away_penalty_add(int player_number, int duration_secs);
+int scoreboard_away_penalty_add_compound(int player_number, int phase1_secs,
+					 int phase2_secs);
 void scoreboard_away_penalty_clear(int slot);
+void scoreboard_away_penalty_set_time(int slot, int duration_secs);
 const struct scoreboard_penalty *scoreboard_get_away_penalty(int slot);
 int scoreboard_get_away_penalty_count(void);
 void scoreboard_penalty_tick(int elapsed_tenths);
 void scoreboard_penalty_adjust(int delta_tenths);
+void scoreboard_penalty_compact(void);
 void scoreboard_format_penalty_number(int slot, bool home, char *buf,
 				      size_t size);
 void scoreboard_format_penalty_time(int slot, bool home, char *buf,