From 85a331ed37366ce9c3ce6939284e0c9201f7d69d Mon Sep 17 00:00:00 2001
From: Haze Weathers <hazel.lsnider@gmail.com>
Date: Fri, 15 Mar 2024 19:00:59 -0400
Subject: [PATCH] gamepad buttons

---
 graphics/hud/gamepad_buttons.png        | Bin 0 -> 1406 bytes
 graphics/hud/gamepad_buttons.png.import |  35 ++++++++++++++++++++++++
 objects/hud/gamepad_buttons.atlastex    | Bin 0 -> 238 bytes
 objects/hud/options_screen_scholar.tscn |   9 +++---
 objects/hud/set_gamepad_button.gd       |  13 +++++++--
 5 files changed, 51 insertions(+), 6 deletions(-)
 create mode 100644 graphics/hud/gamepad_buttons.png
 create mode 100644 graphics/hud/gamepad_buttons.png.import
 create mode 100644 objects/hud/gamepad_buttons.atlastex

diff --git a/graphics/hud/gamepad_buttons.png b/graphics/hud/gamepad_buttons.png
new file mode 100644
index 0000000000000000000000000000000000000000..703f78cac86b7bddcd6b9380b3fbad7162044fa3
GIT binary patch
literal 1406
zcmV-^1%djBP)<h;3K|Lk000e1NJLTq003YB0015c1^@s6)36(f0004lX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ$>+V2Q!E`WT<tqi;6hbDionYs1;guFuC*#nzSS-
zE{=k0!NHHks)LKOt`4q(Aou~|?BJy6A|?JWDYS_3;J6>}?mh0_0YbCFbgL&0=!R{k
zlL;xCTb24=5kwdwq8L}0RhyIL6nw|mJpz2ai}5V~bAOIOEpIU(AQ8t|&9sR(h-WtK
z8s~jtk(CsU_?&pcqze*1a$WWKjdRgufoF<lCOuCq5=+G{R=b#$Or3a|IHKtW<qKJl
zHO^a{^-7(!@5x^n${Q=oT&FpTBo?s*84^^~QAPzeVze5hSV+@;!pA@2`ekyd<SK)a
zV*yp@P+ULwAN=mtDojm!NudPL`{FnsV?f_7&}ul&_p#%&PJrMuaAkD-)h00eNqVEB
zMUH^*HgIv>(bPTQat9cGswt-8N<o@Jp#Z#}(KqFQp<7^J&FihbkJASrLtUkAfP+II
zTBPiCpLh3n_xA6Zc7H#-;Bv$Z&+Zlg000JJOGiWiH~=^RIBIA_jsO4v32;bRa{vG?
zBLDy{BLR4&KXw2B00(qQO+^Rj0}mD`28ET4lmGw#8FWQhbVF}#ZDnqB07G(RVRU6=
zAa`kWXdp*PO;A^X4i^9b16N5zK~!ko?OHLCqc9L0QT_$@gZ+Sc%Vryx<Tf~Gc6wF5
z%opq>5IEbnzz6&R*YS?I0EDGM(u@GJK9{G8S`aN+>OrGvX%!3&$+Lp6-5dUvhMsaY
z7EdeU27g!urTQKG0sOwPTmDl9@tcF)r*f~t?f)h1e=Elfn2uM9v)W#-*G_O<*G?`a
zcoia_al)1SkD~qio`;+;AfIu<fPBUY-T{+=gAh0D4<ck)1^@t6RbBg|lot;GkY$+{
zpSZ{`;0OgA`{(W*ddYv!+pBX#_YPg;7rSerzVF_lll-)}mUj2uJEY{BgVZF^GT%G%
zxpPo(mS{)lzad;zRbG5TD->{q9JY|d)^bA7K8mX&7|VaP#235vp0y^ooe&WkOmaiy
zxUdo@NX#VPWr?eh&H&cP3<#MfUOPf$+6he_O+aYylpOAB=4O@D$)>HGUny*RM~G*D
zu?Bpl>A{+@+D9x658T&E-$}v`7p~@6glVJ8F2ZaGid}>Qi?Q>!VzMBLeUvm*8mrYv
ze2`eF16(-u6k@XoGBp;b9+aT}#?;8^H5PwM2V-O?an+0I_t^eh^#%(}(=-+;P19hE
zi@;kBYnq0`TECH|Dd*sr1=3k32CFkBNgbM9nROC6(97ilX`1#|(=;woV&Tm?9{hlO
zZ2`e!4OrKa2qa;iK5&>+e3|V_`|s=1YK}NY^XZ_bA~Pn&%$dNEBk7Nely0A9s&mDv
zIGIcQNXXYAYOG1gmy#7LtfZKjy2%o9TYp?y2$@6%VrY*y>x5!%mSuxWN=gi|zIYz$
zzpwqJ7vWo{xuX|VL7kgtK})5fONyj1Y2~8*e+scX6Jk^3I6NIO{|xYNlI_Dgit12L
z+5EaU{IXjSjLKulCr*GHZx_RY+tIUI;v!$CqO3A}-Prf98#YgOoyAJ=TzWhQeyZ4-
z;(#b2qYgEwmp981>gBC1Kh&ZeS~5_2WXNd_*Ab%>zcl#+2S|?4>{x^Yvh}}WNYtwI
z3^qn}Q+&*JgjBrEX{)jO9e6$g0Km^(*_Y{iJf8qQ%UPtnYsPTryc8dE&imC_kVHwg
zi!c-K;j?@$!V~g)WKuQ6{TlInLOh>(yne?0n$}0*b+7oR5PMYn2au%N$7rCj@c;k-
M07*qoM6N<$f(zq|F8}}l

literal 0
HcmV?d00001

diff --git a/graphics/hud/gamepad_buttons.png.import b/graphics/hud/gamepad_buttons.png.import
new file mode 100644
index 0000000..3ca0780
--- /dev/null
+++ b/graphics/hud/gamepad_buttons.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/gamepad_buttons.png-2be301e9c2e67e54b73d3d64156de301.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://graphics/hud/gamepad_buttons.png"
+dest_files=[ "res://.import/gamepad_buttons.png-2be301e9c2e67e54b73d3d64156de301.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/objects/hud/gamepad_buttons.atlastex b/objects/hud/gamepad_buttons.atlastex
new file mode 100644
index 0000000000000000000000000000000000000000..328c5d18266ca7d3097309658bda27d39fb99c49
GIT binary patch
literal 238
zcmV<K01^LEQ$s@n000005C8z50RRBj0000ewJ-f(p8#bB0OATGAwW-?F#wuaUD_)|
zCrJJ-_8QOtKhs*O_fd@_>dK1sNC6Rx#G)*`0`b8wu=oIE`H{OQD;TXIG3TJH?KX_l
zK$i@rq|rDMMatpur6hS!27uS8ht#Qs&dXg2VW!eUhBcK6MoqXVeu9%hrf{-EdfJ|a
zsI8OeHBIyVi{IdU%|3EMajo(v4E)Fk832F_XJI98#=?f%fO|npK@O%LBZR0_NmZ9#
o?}=!qv={u~xKBY%1$Q};v=L$!+ajp^<lf@sTFH6<SW;6%L(i#dGynhq

literal 0
HcmV?d00001

diff --git a/objects/hud/options_screen_scholar.tscn b/objects/hud/options_screen_scholar.tscn
index 57e05ca..5e23e13 100644
--- a/objects/hud/options_screen_scholar.tscn
+++ b/objects/hud/options_screen_scholar.tscn
@@ -83,11 +83,12 @@ margin_bottom = 32.0
 unique_name_in_owner = true
 margin_top = 36.0
 margin_right = 218.0
-margin_bottom = 64.0
+margin_bottom = 146.0
 focus_mode = 2
 tabs_visible = false
 
 [node name="Game" type="VBoxContainer" parent="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs"]
+visible = false
 anchor_right = 1.0
 anchor_bottom = 1.0
 focus_next = NodePath("Rumble/SelectRumble")
@@ -446,7 +447,6 @@ script = ExtResource( 3 )
 options = [ "off", "on" ]
 
 [node name="Input" type="VBoxContainer" parent="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs"]
-visible = false
 anchor_right = 1.0
 anchor_bottom = 1.0
 focus_next = NodePath("Left/Keyboard")
@@ -509,6 +509,7 @@ margin_right = 218.0
 margin_bottom = 10.0
 size_flags_horizontal = 3
 text = "-"
+icon_align = 1
 script = ExtResource( 9 )
 action = "move_left"
 options_screen = NodePath("../../../../../../../..")
@@ -675,9 +676,9 @@ options_screen = NodePath("../../../../../../../..")
 
 [node name="DefaultControls" type="Button" parent="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs/Input"]
 margin_left = 81.0
-margin_top = 32.0
+margin_top = 100.0
 margin_right = 137.0
-margin_bottom = 42.0
+margin_bottom = 110.0
 size_flags_horizontal = 4
 text = "defaults"
 
diff --git a/objects/hud/set_gamepad_button.gd b/objects/hud/set_gamepad_button.gd
index 9421faf..b1f51fb 100644
--- a/objects/hud/set_gamepad_button.gd
+++ b/objects/hud/set_gamepad_button.gd
@@ -2,16 +2,18 @@ extends Button
 
 
 const BLINK_SPEED: int = 150
-
+const GAMEPAD_BUTTONS: AtlasTexture = preload("res://objects/hud/gamepad_buttons.atlastex")
 
 export var action: String
 export var options_screen: NodePath
 
 
 var listen := false
+var gamepad_buttons := GAMEPAD_BUTTONS.duplicate()
 
 
 func _init() -> void:
+	icon_align = Button.ALIGN_CENTER
 	connect("pressed", self, "_on_pressed")
 
 
@@ -28,7 +30,14 @@ func _process(delta: float) -> void:
 
 
 func _update_text() -> void:
-	text = str(Controls.get_button(action))
+	var button = Controls.get_button(action)
+	if button >= 0:
+		gamepad_buttons.region.position.x = float(button % 8) * 12.0
+		gamepad_buttons.region.position.y = float(button / 8) * 10.0
+		icon = gamepad_buttons
+		text = ""
+	else:
+		text = "-"
 	modulate.a = 1.0