From 906b566e7ba8be43dbe95d8ef93348af1c31685a Mon Sep 17 00:00:00 2001
From: derek <derek@scfilmvideo.com>
Date: Wed, 11 Dec 2024 16:29:53 -0600
Subject: [PATCH] more weapon select tweaks, still need to fix the 0 index
 highlighting issue

---
 assets/blockout_2.tscn    |  1 -
 assets/weapon_select.tscn |  2 --
 scripts/player.gd         |  4 ++--
 scripts/weapon_select.gd  | 11 +++++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/assets/blockout_2.tscn b/assets/blockout_2.tscn
index 1eed322..0903a9f 100644
--- a/assets/blockout_2.tscn
+++ b/assets/blockout_2.tscn
@@ -897,7 +897,6 @@ _data = {
 [node name="BLOCKOUT2Test" type="Node3D" node_paths=PackedStringArray("player")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.016016, 0.0225029, -0.0192337)
 script = ExtResource("1_sbpvn")
-load_save = false
 player = NodePath("Player")
 money = 50
 start_health = 5
diff --git a/assets/weapon_select.tscn b/assets/weapon_select.tscn
index e260627..232ae05 100644
--- a/assets/weapon_select.tscn
+++ b/assets/weapon_select.tscn
@@ -16,6 +16,4 @@ grow_vertical = 2
 size_flags_horizontal = 4
 size_flags_vertical = 4
 script = ExtResource("1_qygnb")
-outer_radius = 500
-inner_radius = 25
 line_width = 2
diff --git a/scripts/player.gd b/scripts/player.gd
index 1a2cf19..30d1fce 100644
--- a/scripts/player.gd
+++ b/scripts/player.gd
@@ -390,14 +390,14 @@ func _physics_process(delta):
 							weapon_select((i - 1))
 		
 		if Input.is_action_just_pressed("weapon_select"):
-			weapon_select_menu.show()
+			weapon_select_menu.open()
 			Input.set_mouse_mode(Input.MOUSE_MODE_CONFINED_HIDDEN)
 			controlled_elsewhere = true
 			gamespeed_controlled = true
 			Engine.time_scale = .01
 		elif Input.is_action_just_released("weapon_select"):
 			var selection = weapon_select_menu.close()
-			if selection != null:
+			if selection != null and selection != level_control.current_gun_index :
 				weapon_select(selection)
 			Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
 			controlled_elsewhere = false
diff --git a/scripts/weapon_select.gd b/scripts/weapon_select.gd
index 42ff4d3..b8d238a 100644
--- a/scripts/weapon_select.gd
+++ b/scripts/weapon_select.gd
@@ -1,14 +1,13 @@
 #@tool
 extends Control
 
-@export var outer_radius : int = 256
-@export var inner_radius : int = 256
 @export var line_width : int = 4
 
+@onready var level_control = get_tree().current_scene
 var options = []
 
-@onready var level_control = get_tree().current_scene
-
+const outer_radius : int = 500
+const inner_radius : int = 100
 const bkg_color : Color = Color(1, 1, 1, .5)
 const line_color : Color = Color(1,1,1)
 const select_color = Color(1, 1, 1, .5)
@@ -17,6 +16,10 @@ const IMAGE_SIZE = Vector2(512,512)
 
 var selection
 
+func open():
+	show()
+	update_weapon_list()
+
 func close():
 	hide()
 	return selection