Skip to content

Commit

Permalink
NUGHUD additions (#92)
Browse files Browse the repository at this point in the history
* Reformatting

* Implement NUGHUD Status-Bar chunks

* Fix chunks of wide Status Bars without offsets

Looks like I had missed this code somehow...

* Update copyright year in `m_nughud.c/h`

* Implement NUGHUD text-line stacks

* Fix stacks in example NUGHUD

* Support Messages in stacks

Also improved the standalone Chat's Y-position.

Additionally, some reformatting.

* Draw Status Bar before HUD

* Fix wrong NUGHUD view offset behavior

Additionally, some reformatting.

* Clarify that view-offset fix may affect NUGHUDs

* Fix crosshair jumping due to view offset

* Draw chunks behind patches
  • Loading branch information
MrAlaux authored May 16, 2024
1 parent 4e2a689 commit 2edca0c
Show file tree
Hide file tree
Showing 13 changed files with 713 additions and 278 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@
- **_Level Stats Format_** settings
- Removed _Kills % in Stats display_ setting in favor of them
- **Minimap zooming** (keyboard only)
- **NUGHUD:**
- Text-line stacks
- Replaced `x == -1` _Messages_ hack with dedicated `nughud_message_defx` toggle [1]
- Removed `nughud_time_sts` in favor of stacks [1]
- Status-Bar chunks
- User-chosen `hud_widget_layout` support
- **Automap color for trigger lines**
- **Key-binding for Computer Area Map cheat**
- Toggle to **disable the Killough-face easter egg**
Expand All @@ -15,6 +21,10 @@
- **Merged changes from [Woof! 14.5.0](https://github.com/fabiangreffrath/woof/releases/tag/woof_14.5.0)**, note:
- Removed Nugget's `all` autoload folder in favor of Woof's `all-all`
- Changed `nughud_secret_y` default to match default Boom HUD
- **NUGHUD:**
- **Changed defaults** to make use of stacks and further match the default WOOFHUD [1]
- **Improved Y-position of standalone Chat**
- **Made Status Bar elements be drawn before HUD elements**, as was before 3.0.0 [1]
- **Rewind improvements:**
- Only delete key frames when rewinding within less than 0.6 seconds since the last rewind
- "Aligned" key-framing time
Expand All @@ -26,4 +36,8 @@

- **Sky being distorted by zoom effect**
- **_Show Stats/Time_ toggle affecting Automap instead of HUD when on Minimap**
- **NUGHUD view offset behaving incorrectly** (should now match pre-3.0.0 behavior) [1]
- **_Cycle Chasecam_ and _Toggle Crosshair_ inputs eating inputs**
- **Crosshair jumping vertically when changing screen size to Status Bar from NUGHUD with view offset**

**[1].** This may affect existing NUGHUDs.
113 changes: 88 additions & 25 deletions docs/nughud.lmp
Original file line number Diff line number Diff line change
Expand Up @@ -154,71 +154,134 @@ nughud_maxammo3_wide 1
nughud_maxammo3_align 1

; Time display
nughud_time_x 2
nughud_time_y 151
nughud_time_x -1
nughud_time_y -1
nughud_time_wide -1
nughud_time_align -1
nughud_time_sts 1
nughud_time_stack 3
nughud_time_order 2

; Stats display
nughud_sts_x 2
nughud_sts_y 159
nughud_sts_x -1
nughud_sts_y -1
nughud_sts_wide -1
nughud_sts_align -1
nughud_sts_ml 0
nughud_sts_stack 3
nughud_sts_order 1
nughud_sts_ml -1

; Level Name display
nughud_title_x 318
nughud_title_y 159
nughud_title_wide 1
nughud_title_align 1
nughud_title_x -1
nughud_title_y -1
nughud_title_wide -1
nughud_title_align -1
nughud_title_stack 3
nughud_title_order 0

; Powerup Timers display
nughud_powers_x 318
nughud_powers_y 8
nughud_powers_wide 1
nughud_powers_align 1
nughud_powers_x -1
nughud_powers_y -1
nughud_powers_wide -1
nughud_powers_align -1
nughud_powers_stack 2
nughud_powers_order 0

; Coordinates display
nughud_coord_x 318
nughud_coord_y 16
nughud_coord_wide 1
nughud_coord_align 1
nughud_coord_ml 0
nughud_coord_x -1
nughud_coord_y -1
nughud_coord_wide -1
nughud_coord_align -1
nughud_coord_stack 2
nughud_coord_order 1
nughud_coord_ml -1

; FPS display
nughud_fps_x 318
nughud_fps_y 24
nughud_fps_wide 1
nughud_fps_align 1
nughud_fps_x -1
nughud_fps_y -1
nughud_fps_wide -1
nughud_fps_align -1
nughud_fps_stack 2
nughud_fps_order 2

; Rendering-statistics display
nughud_rate_x 2
nughud_rate_y 192
nughud_rate_wide -1
nughud_rate_align -1
nughud_rate_stack 1
nughud_rate_order 0

; Message display
nughud_message_x -1
nughud_message_y 0
nughud_message_y -1
nughud_message_wide -1
nughud_message_align -1
nughud_message_stack 1
nughud_message_defx 1

; Secret Message/Milestone Completion display
nughud_secret_x 160
nughud_secret_y 42
nughud_secret_wide 0
nughud_secret_align 0
nughud_secret_stack 1
nughud_secret_order 0

; Stack 1 (top-left corner)
nughud_stack1_x 2
nughud_stack1_y 0
nughud_stack1_wide -1
nughud_stack1_align -1
nughud_stack1_vlign 1

; Stack 2 (top-right corner)
nughud_stack2_x 318
nughud_stack2_y 0
nughud_stack2_wide 1
nughud_stack2_align 1
nughud_stack2_vlign 1

; Stack 3 (bottom-left corner)
nughud_stack3_x 2
nughud_stack3_y 168
nughud_stack3_wide -1
nughud_stack3_align -1
nughud_stack3_vlign -1

; Stack 4 (bottom-right corner)
nughud_stack4_x 318
nughud_stack4_y 168
nughud_stack4_wide 1
nughud_stack4_align 1
nughud_stack4_vlign -1

; Stack 5
; (All remaining Stacks have the same properties)
nughud_stack5_x 0
nughud_stack5_y 0
nughud_stack5_wide 0
nughud_stack5_align -1
nughud_stack5_vlign 1

; Example Patch
; (All other Patches up to and including patch8 have the same properties)
; (All other Patches have the same properties)
nughud_patch1_x 0
nughud_patch1_y 0
nughud_patch1_wide 0
nughud_patch1_align -1
nughud_patch1_vlign 1
nughud_patch1_name ""

; Example Status-Bar Chunk
; (All other Chunks have the same properties)
nughud_sbchunk1_x -1
nughud_sbchunk1_y 0
nughud_sbchunk1_wide 0
nughud_sbchunk1_sx 0
nughud_sbchunk1_sy 0
nughud_sbchunk1_sw 1
nughud_sbchunk1_sh 32

; Draw percentage signs
nughud_percents 1

Expand Down
Loading

0 comments on commit 2edca0c

Please sign in to comment.