From 0855689ae6b5ab6c7ad4832cd95409344db70154 Mon Sep 17 00:00:00 2001
From: Luna <judahiii@gmail.com>
Date: Sat, 28 Apr 2018 17:15:06 -0400
Subject: [PATCH] Add currently bound button to ability_icon

---
 scenes/ability_icon.tscn | 31 +++++++++++++++++++++++++++----
 scenes/heroes/0.tscn     |  1 +
 scenes/heroes/4.tscn     |  1 +
 scenes/heroes/5.tscn     |  1 +
 scripts/ability_icon.gd  | 16 ++++++++++++++++
 5 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/scenes/ability_icon.tscn b/scenes/ability_icon.tscn
index f1e4a25..3f2b208 100644
--- a/scenes/ability_icon.tscn
+++ b/scenes/ability_icon.tscn
@@ -77,6 +77,7 @@ script = ExtResource( 1 )
 cost = 1
 ability_name = "Ability"
 display_progress = true
+action = ""
 
 [node name="Bar" type="ProgressBar" parent="." index="0"]
 
@@ -127,10 +128,10 @@ anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_left = -65.0
-margin_top = 36.0
-margin_right = 77.0
-margin_bottom = 50.0
+margin_left = -68.0
+margin_top = -49.0
+margin_right = 74.0
+margin_bottom = -35.0
 rect_pivot_offset = Vector2( 0, 0 )
 mouse_filter = 2
 mouse_default_cursor_shape = 0
@@ -143,4 +144,26 @@ percent_visible = 1.0
 lines_skipped = 0
 max_lines_visible = -1
 
+[node name="Button" type="Label" parent="." index="3"]
+
+anchor_left = 0.0
+anchor_top = 0.0
+anchor_right = 0.0
+anchor_bottom = 0.0
+margin_left = -68.0
+margin_top = 38.0
+margin_right = 74.0
+margin_bottom = 52.0
+rect_pivot_offset = Vector2( 0, 0 )
+mouse_filter = 2
+mouse_default_cursor_shape = 0
+size_flags_horizontal = 1
+size_flags_vertical = 4
+custom_colors/font_color = Color( 0.00357056, 0.0703125, 0.04372, 1 )
+text = "<Button>"
+align = 1
+percent_visible = 1.0
+lines_skipped = 0
+max_lines_visible = -1
+
 
diff --git a/scenes/heroes/0.tscn b/scenes/heroes/0.tscn
index e43947c..ef679a0 100644
--- a/scenes/heroes/0.tscn
+++ b/scenes/heroes/0.tscn
@@ -37,5 +37,6 @@ margin_bottom = -109.0
 cost = 2
 ability_name = "Speed Boost"
 display_progress = false
+action = "hero_0_boost"
 
 
diff --git a/scenes/heroes/4.tscn b/scenes/heroes/4.tscn
index 02afe69..12e1db9 100644
--- a/scenes/heroes/4.tscn
+++ b/scenes/heroes/4.tscn
@@ -47,5 +47,6 @@ margin_right = -98.0
 margin_bottom = -91.0
 cost = 0
 ability_name = "Destroy"
+action = "primary_ability"
 
 
diff --git a/scenes/heroes/5.tscn b/scenes/heroes/5.tscn
index 6dfbdbc..1b5507c 100644
--- a/scenes/heroes/5.tscn
+++ b/scenes/heroes/5.tscn
@@ -32,6 +32,7 @@ margin_right = -149.0
 margin_bottom = -103.0
 cost = 20
 ability_name = "Build Portal"
+action = "hero_5_place_portal"
 
 [node name="Teleport" parent="MasterOnly" index="3" instance=ExtResource( 5 )]
 
diff --git a/scripts/ability_icon.gd b/scripts/ability_icon.gd
index 2ff1bc4..f83f230 100644
--- a/scripts/ability_icon.gd
+++ b/scripts/ability_icon.gd
@@ -6,11 +6,27 @@ onready var available = get_node("Available")
 export var cost = 1
 export var ability_name = "Ability"
 export var display_progress = true
+export var action = ""
 # This is intended to be public
 var disabled = false
 
 func _ready():
 	get_node("Name").text = ability_name
+	var description
+	if action:
+		var primary = InputMap.get_action_list(action)[0]
+		if primary is InputEventMouseButton:
+			if primary.button_index == BUTTON_LEFT:
+				description = "Click"
+			elif primary.button_index == BUTTON_RIGHT:
+				description = "Right Click"
+			else:
+				description = "Scroll Click"
+		else:
+			description = primary.as_text()
+	else:
+		description = ""
+	get_node("Button").text = description
 
 func _process(delta):
 	if disabled: