feat: add hud display for base mode

deathsave · Dec 8, 2024 · 3f770a7 · 3f770a7
1 parent c1bc453
commit 3f770a7
Show file tree

Hide file tree

Showing 21 changed files with 68 additions and 11 deletions.
diff --git a/config/common/keyboard.yaml b/config/common/keyboard.yaml
@@ -25,3 +25,9 @@ keyboard:
     switch: s_qualifier2
   t:
     switch: s_qualifier3
+  # the next two switches (spinner, grooveline)
+  # in sequence trigger a "lap"
+  ",":
+    switch: s_spinner
+  ".":
+    switch: s_grooveline
diff --git a/config/common/players.yaml b/config/common/players.yaml
@@ -17,6 +17,3 @@ sound_player:
     rad_racer:
       track: music
       action: stop
-
-slide_player:
-  mode_green_flag_started: green_flag_slide
diff --git a/config/common/slides.yaml b/config/common/slides.yaml
@@ -1,9 +1,9 @@
 #config_version=6
 
 slides:
-  green_flag_slide:
-    widgets:
-      - type: image
-        image: rear-view
-  fuel_slide:
+  rear_view_hud_slide:
+  - widget: pit_background
+  - widget: rear_view
   - widget: fuel_(current_player.level_fuel)
+  - widget: oil_(current_player.level_oil)
+  - widget: tires_(current_player.level_tires)
diff --git a/config/common/widgets.yaml b/config/common/widgets.yaml
@@ -1,12 +1,65 @@
 #config_version=6
 
 widgets:
+  pit_background:
+    - type: image
+      image: pit-background
+      z: 0
+  rear_view:
+    - type: image
+      image: rear-view
+      z: 1
   fuel_2:
   - type: image
     image: fuel-2
+    z: 4
+    x: 10%
+    y: 15%
   fuel_1:
   - type: image
     image: fuel-1
+    z: 4
+    x: 10%
+    y: 15%
   fuel_0:
   - type: image
-    image: fuel-1
+    image: fuel-0
+    z: 4
+    x: 10%
+    y: 15%
+  oil_2:
+  - type: image
+    image: oil-2
+    z: 2
+    x: 9%
+    y: 83%
+  oil_1:
+  - type: image
+    image: oil-1
+    z: 2
+    x: 9%
+    y: 83%
+  oil_0:
+  - type: image
+    image: oil-0
+    z: 2
+    x: 9%
+    y: 83%
+  tires_2:
+  - type: image
+    image: tires-2
+    z: 3
+    x: 32%
+    y: 50%
+  tires_1:
+  - type: image
+    image: tires-1
+    z: 3
+    x: 32%
+    y: 50%
+  tires_0:
+  - type: image
+    image: tires-0
+    z: 3
+    x: 32%
+    y: 50%
diff --git a/config/development/virtual_platform.yaml b/config/development/virtual_platform.yaml
@@ -33,6 +33,7 @@ slides:
         width: 300
         height: 75
         y: 100
+        z: 100
 
 slide_player:
   init_done: virtual_segment1
diff --git a/images/preload/fuel-0.png b/images/preload/fuel-0.png
diff --git a/images/preload/fuel-1.png b/images/preload/fuel-1.png
diff --git a/images/preload/fuel-2.png b/images/preload/fuel-2.png
diff --git a/images/preload/oil-0.png b/images/preload/oil-0.png
diff --git a/images/preload/oil-1.png b/images/preload/oil-1.png
diff --git a/images/preload/oil-2.png b/images/preload/oil-2.png
diff --git a/images/preload/pit-background.jpg b/images/preload/pit-background.jpg
diff --git a/images/preload/rear-view.png b/images/preload/rear-view.png
diff --git a/images/preload/tires-0.png b/images/preload/tires-0.png
diff --git a/images/preload/tires-1.png b/images/preload/tires-1.png
diff --git a/images/preload/tires-2.png b/images/preload/tires-2.png
diff --git a/misc/theme/fuel-gauge.pxm b/misc/theme/fuel-gauge.pxm
diff --git a/misc/theme/oil-gauge.pxm b/misc/theme/oil-gauge.pxm
diff --git a/misc/theme/rear-view.pxm b/misc/theme/rear-view.pxm
diff --git a/misc/theme/tire-gauge.pxm b/misc/theme/tire-gauge.pxm
diff --git a/modes/base/config/base.yaml b/modes/base/config/base.yaml
@@ -15,9 +15,9 @@ ball_saves:
 
 slide_player:
   mode_base_started:
-    fuel_slide:
+    rear_view_hud_slide:
       action: play
-  player_level_fuel: fuel_slide
+  player_level_fuel: rear_view_hud_slide
 
 variable_player:
   ###########