Add radial command menu for minions
All checks were successful
Deploy Promiscuity Auth API / deploy (push) Successful in 51s
Deploy Promiscuity Character API / deploy (push) Successful in 49s
Deploy Promiscuity Crafting API / deploy (push) Successful in 47s
Deploy Promiscuity Inventory API / deploy (push) Successful in 48s
Deploy Promiscuity Locations API / deploy (push) Successful in 47s
Deploy Promiscuity Mail API / deploy (push) Successful in 49s
Deploy Promiscuity World API / deploy (push) Successful in 48s
k8s smoke test / test (push) Successful in 9s

This commit is contained in:
Lucas 2026-05-01 12:24:54 -05:00
parent 42750356b5
commit 98220921bd
12 changed files with 449 additions and 294 deletions

View File

@ -115,6 +115,11 @@ interact={
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":69,"key_label":0,"unicode":101,"location":0,"echo":false,"script":null)
]
}
OpenRadialCommandMenu={
"deadzone": 0.2,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":81,"key_label":0,"unicode":113,"location":0,"echo":false,"script":null)
]
}
[shader_globals]

View File

@ -0,0 +1,56 @@
extends Control
@export var radius: float = 150.0
@export var transition_speed: float = 0.2
func _ready():
hide() # Start hidden
_arrange_buttons()
func _input(event):
if event.is_action_pressed("OpenRadialCommandMenu"): # Map 'Q' to "open_menu" in Input Map
_toggle_menu()
func _toggle_menu():
visible = !visible
if visible:
# Center the menu on the mouse or screen
global_position = get_viewport().get_mouse_position()
_animate_menu(true)
else:
_animate_menu(false)
func _arrange_buttons():
var buttons = get_children()
var count = buttons.size()
for i in range(count):
# Calculate the angle for each button in radians
var angle = i * (2 * PI / count)
# Standard circle math: x = cos(a) * r, y = sin(a) * r
var target_pos = Vector2(cos(angle), sin(angle)) * radius
# Offset by button size to keep them centered
buttons[i].position = target_pos - (buttons[i].size / 2)
func _animate_menu(opening: bool):
var tween = create_tween().set_parallel(true)
for button in get_children():
var final_scale = Vector2.ONE if opening else Vector2.ZERO
tween.tween_property(button, "scale", final_scale, transition_speed).from(Vector2.ZERO if opening else Vector2.ONE)
func _on_btn_follow_pressed() -> void:
print("Follow command pressed")
_toggle_menu() # Closes the menu after clicking
func _on_btn_go_to_pressed() -> void:
print("Go to command pressed")
_toggle_menu() # Closes the menu after clicking
func _on_btn_attack_pressed() -> void:
print("Attack command pressed")
_toggle_menu() # Closes the menu after clicking

View File

@ -0,0 +1 @@
uid://cjfhlslc5vp7b

View File

@ -0,0 +1,42 @@
[gd_scene format=3 uid="uid://bnwpu7p8sbsfa"]
[ext_resource type="Script" uid="uid://cjfhlslc5vp7b" path="res://scenes/Interaction/RadialCommandMenu.gd" id="1_j0xof"]
[node name="RadialCommandCanvas" type="CanvasLayer" unique_id=1002896311]
[node name="PivotControl" type="Control" parent="." unique_id=374070149]
layout_mode = 3
anchors_preset = 8
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = -20.0
offset_top = -20.0
offset_right = 20.0
offset_bottom = 20.0
grow_horizontal = 2
grow_vertical = 2
script = ExtResource("1_j0xof")
[node name="BtnFollow" type="Button" parent="PivotControl" unique_id=1839549428]
layout_mode = 0
offset_right = 8.0
offset_bottom = 8.0
text = "Follow"
[node name="BtnGoTo" type="Button" parent="PivotControl" unique_id=818273339]
layout_mode = 0
offset_right = 8.0
offset_bottom = 8.0
text = "Go To"
[node name="BtnAttack" type="Button" parent="PivotControl" unique_id=744805255]
layout_mode = 0
offset_right = 8.0
offset_bottom = 8.0
text = "Attack"
[connection signal="pressed" from="PivotControl/BtnFollow" to="PivotControl" method="_on_btn_follow_pressed"]
[connection signal="pressed" from="PivotControl/BtnGoTo" to="PivotControl" method="_on_btn_go_to_pressed"]
[connection signal="pressed" from="PivotControl/BtnAttack" to="PivotControl" method="_on_btn_attack_pressed"]

View File

@ -0,0 +1,41 @@
extends Control
@export var radius: float = 150.0
@export var transition_speed: float = 0.2
func _ready():
hide() # Start hidden
_arrange_buttons()
func _input(event):
if event.is_action_pressed("OpenRadialCommandMenu"): # Map 'Q' to "open_menu" in Input Map
_toggle_menu()
func _toggle_menu():
visible = !visible
if visible:
# Center the menu on the mouse or screen
global_position = get_viewport().get_mouse_position()
_animate_menu(true)
else:
_animate_menu(false)
func _arrange_buttons():
var buttons = get_children()
var count = buttons.size()
for i in range(count):
# Calculate the angle for each button in radians
var angle = i * (2 * PI / count)
# Standard circle math: x = cos(a) * r, y = sin(a) * r
var target_pos = Vector2(cos(angle), sin(angle)) * radius
# Offset by button size to keep them centered
buttons[i].position = target_pos - (buttons[i].size / 2)
func _animate_menu(opening: bool):
var tween = create_tween().set_parallel(true)
for button in get_children():
var final_scale = Vector2.ONE if opening else Vector2.ZERO
tween.tween_property(button, "scale", final_scale, transition_speed).from(Vector2.ZERO if opening else Vector2.ONE)

View File

@ -0,0 +1 @@
uid://bv2ei5rg0dn3d

View File

@ -15,7 +15,9 @@
[ext_resource type="Material" path="res://assets/materials/kenney_prototype_ground_green.tres" id="9_ground_mat"]
[ext_resource type="Texture2D" uid="uid://c4ggdp0kg5wjk" path="res://addons/simplegrasstextured/textures/grassbushcc008.png" id="10_loupo"]
[ext_resource type="Script" uid="uid://2juaclm8gc1n" path="res://addons/simplegrasstextured/grass.gd" id="11_1meta"]
[ext_resource type="Script" uid="uid://bv2ei5rg0dn3d" path="res://scenes/Levels/RadialCommandMenu.gd" id="15_18iqp"]
[ext_resource type="Texture2D" uid="uid://b2dmnrm3ubjon" path="res://assets/textures/stolenFire.png" id="16_i35yb"]
[ext_resource type="PackedScene" uid="uid://bnwpu7p8sbsfa" path="res://scenes/Interaction/RadialCommandMenu.tscn" id="16_px5jg"]
[sub_resource type="PhysicsMaterial" id="PhysicsMaterial_2q6dc"]
bounce = 0.5
@ -428,7 +430,7 @@ phone_path = NodePath("../PhoneUI")
[node name="TestCharAnimated" parent="Player" unique_id=77323368 instance=ExtResource("5_fi66n")]
transform = Transform3D(-0.9998549, 0, 0.01703362, 0, 1, 0, -0.01703362, 0, -0.9998549, 0, 0, 0)
[node name="AnimationPlayer" parent="Player/TestCharAnimated" index="1" unique_id=351712567]
[node name="AnimationPlayer" parent="Player/TestCharAnimated" index="1"]
root_motion_track = NodePath("Armature/Skeleton3D:mixamorig_Hips")
[node name="CollisionShape3D" type="CollisionShape3D" parent="Player" unique_id=804053331]
@ -533,7 +535,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.298158, -7.0724635)
[node name="Block2" parent="Starter Blocks" unique_id=620097644 instance=ExtResource("2_tc7dm")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.63255787, 2.596316, -6.980046)
[node name="PauseMenu" parent="." instance=ExtResource("3_pause_menu")]
[node name="PauseMenu" parent="." unique_id=657058638 instance=ExtResource("3_pause_menu")]
[node name="PhoneUI" type="CanvasLayer" parent="." unique_id=1455569026]
layer = 5
@ -546,6 +548,7 @@ anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
script = ExtResource("15_18iqp")
[node name="PhoneFrame" type="ColorRect" parent="PhoneUI/Control" unique_id=1204675817]
layout_mode = 1
@ -580,6 +583,9 @@ bbcode_enabled = true
text = "No active quest."
scroll_active = false
[node name="RadialCommandMenu" parent="PhoneUI/Control" unique_id=1630028573 instance=ExtResource("16_px5jg")]
layout_mode = 1
[node name="WorldEnvironment" type="WorldEnvironment" parent="." unique_id=1808155101]
environment = SubResource("Environment_a4mo8")

View File

@ -1,12 +1,11 @@
[gd_scene load_steps=8 format=3]
[gd_scene format=3 uid="uid://87wtvoj8u22y"]
[ext_resource type="Script" path="res://scenes/Levels/starting_area_level.gd" id="1_start"]
[ext_resource type="Script" path="res://scenes/player.gd" id="2_player"]
[ext_resource type="PackedScene" path="res://assets/models/TestCharAnimated.glb" id="3_model"]
[ext_resource type="Script" uid="uid://r1oe7fu5n765" path="res://scenes/Levels/starting_area_level.gd" id="1_start"]
[ext_resource type="Script" uid="uid://bpxggc8nr6tf6" path="res://scenes/player.gd" id="2_player"]
[ext_resource type="PackedScene" uid="uid://bnqaqbgynoyys" path="res://assets/models/TestCharAnimated.glb" id="3_model"]
[ext_resource type="Material" path="res://assets/materials/kenney_prototype_ground_green.tres" id="4_ground"]
[ext_resource type="PackedScene" uid="uid://dp6jk0k3o4v1u" path="res://scenes/UI/pause_menu.tscn" id="5_pause_menu"]
[sub_resource type="SphereShape3D" id="SphereShape3D_player"]
[ext_resource type="PackedScene" uid="uid://bnwpu7p8sbsfa" path="res://scenes/Interaction/RadialCommandMenu.tscn" id="6_th1jj"]
[sub_resource type="BoxShape3D" id="BoxShape3D_ground"]
size = Vector3(160, 2, 160)
@ -15,43 +14,47 @@ size = Vector3(160, 2, 160)
material = ExtResource("4_ground")
size = Vector3(160, 2, 160)
[node name="StartingAreaLevel" type="Node3D"]
[sub_resource type="SphereShape3D" id="SphereShape3D_player"]
[node name="StartingAreaLevel" type="Node3D" unique_id=987742792]
script = ExtResource("1_start")
[node name="Ground" type="StaticBody3D" parent="."]
[node name="Ground" type="StaticBody3D" parent="." unique_id=1889441587]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1, 0)
[node name="CollisionShape3D" type="CollisionShape3D" parent="Ground"]
[node name="CollisionShape3D" type="CollisionShape3D" parent="Ground" unique_id=1350300878]
shape = SubResource("BoxShape3D_ground")
[node name="MeshInstance3D" type="MeshInstance3D" parent="Ground"]
[node name="MeshInstance3D" type="MeshInstance3D" parent="Ground" unique_id=1303841260]
mesh = SubResource("BoxMesh_ground")
[node name="Player" type="RigidBody3D" parent="."]
[node name="Player" type="RigidBody3D" parent="." unique_id=614825452]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0)
script = ExtResource("2_player")
camera_path = NodePath("Camera3D")
[node name="CollisionShape3D" type="CollisionShape3D" parent="Player"]
[node name="CollisionShape3D" type="CollisionShape3D" parent="Player" unique_id=268018771]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0)
shape = SubResource("SphereShape3D_player")
[node name="TestCharAnimated" parent="Player" instance=ExtResource("3_model")]
[node name="TestCharAnimated" parent="Player" unique_id=1368073591 instance=ExtResource("3_model")]
transform = Transform3D(-0.9998549, 0, 0.01703362, 0, 1, 0, -0.01703362, 0, -0.9998549, 0, 0, 0)
[node name="Camera3D" type="Camera3D" parent="Player"]
[node name="Camera3D" type="Camera3D" parent="Player" unique_id=1401723174]
transform = Transform3D(0.9989785, -4.651856e-10, -0.045188628, 0.006969331, 0.9880354, 0.15407, 0.044647958, -0.15422754, 0.9870261, 0.22036135, 1.8988357, 0.64972365)
current = true
fov = 49.0
[node name="SpotLight3D" type="SpotLight3D" parent="Player"]
[node name="SpotLight3D" type="SpotLight3D" parent="Player" unique_id=1199474715]
transform = Transform3D(1, 0, 0, 0, 0.906308, -0.422618, 0, 0.422618, 0.906308, 0, 1.7, -0.35)
visible = false
spot_range = 30.0
spot_angle = 25.0
[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
[node name="DirectionalLight3D" type="DirectionalLight3D" parent="." unique_id=1949850408]
transform = Transform3D(1, 0, 0, 0, 0.819152, 0.573576, 0, -0.573576, 0.819152, 0, 6, 0)
shadow_enabled = true
[node name="PauseMenu" parent="." instance=ExtResource("5_pause_menu")]
[node name="PauseMenu" parent="." unique_id=1537852793 instance=ExtResource("5_pause_menu")]
[node name="RadialCommandCanvas" parent="." unique_id=1002896311 instance=ExtResource("6_th1jj")]

View File

@ -1,57 +1,16 @@
[gd_resource type="Theme" load_steps=11 format=3 uid="uid://wpxmub0n2dr3"]
[gd_resource type="Theme" format=3 uid="uid://wpxmub0n2dr3"]
[ext_resource type="FontFile" path="res://assets/ui/kenney_ui_pack/Font/Kenney Future.ttf" id="1_font"]
[ext_resource type="Texture2D" path="res://assets/ui/kenney_ui_pack/PNG/Green/Default/button_rectangle_depth_flat.png" id="2_normal"]
[ext_resource type="Texture2D" path="res://assets/ui/kenney_ui_pack/PNG/Green/Default/button_rectangle_depth_gloss.png" id="3_hover"]
[ext_resource type="Texture2D" path="res://assets/ui/kenney_ui_pack/PNG/Green/Double/button_rectangle_depth_flat.png" id="4_pressed"]
[ext_resource type="Texture2D" path="res://assets/ui/kenney_ui_pack/PNG/Grey/Default/button_rectangle_depth_flat.png" id="5_disabled"]
[sub_resource type="StyleBoxTexture" id="1_style_normal"]
texture = ExtResource("2_normal")
texture_margin_left = 16.0
texture_margin_top = 16.0
texture_margin_right = 16.0
texture_margin_bottom = 16.0
expand_margin_left = 4.0
expand_margin_top = 4.0
expand_margin_right = 4.0
expand_margin_bottom = 4.0
content_margin_left = 24.0
content_margin_top = 14.0
content_margin_right = 24.0
content_margin_bottom = 14.0
[sub_resource type="StyleBoxTexture" id="2_style_hover"]
texture = ExtResource("3_hover")
texture_margin_left = 16.0
texture_margin_top = 16.0
texture_margin_right = 16.0
texture_margin_bottom = 16.0
expand_margin_left = 4.0
expand_margin_top = 4.0
expand_margin_right = 4.0
expand_margin_bottom = 4.0
content_margin_left = 24.0
content_margin_top = 14.0
content_margin_right = 24.0
content_margin_bottom = 14.0
[sub_resource type="StyleBoxTexture" id="3_style_pressed"]
texture = ExtResource("4_pressed")
texture_margin_left = 16.0
texture_margin_top = 16.0
texture_margin_right = 16.0
texture_margin_bottom = 16.0
expand_margin_left = 4.0
expand_margin_top = 4.0
expand_margin_right = 4.0
expand_margin_bottom = 4.0
content_margin_left = 24.0
content_margin_top = 16.0
content_margin_right = 24.0
content_margin_bottom = 12.0
[ext_resource type="FontFile" uid="uid://bcyh4kjfid1q8" path="res://assets/ui/kenney_ui_pack/Font/Kenney Future.ttf" id="1_font"]
[ext_resource type="Texture2D" uid="uid://k8kqflfhia0n" path="res://assets/ui/kenney_ui_pack/PNG/Green/Default/button_rectangle_depth_flat.png" id="2_normal"]
[ext_resource type="Texture2D" uid="uid://dwox0g5c5q6wv" path="res://assets/ui/kenney_ui_pack/PNG/Green/Default/button_rectangle_depth_gloss.png" id="3_hover"]
[ext_resource type="Texture2D" uid="uid://i35jl23ui8og" path="res://assets/ui/kenney_ui_pack/PNG/Green/Double/button_rectangle_depth_flat.png" id="4_pressed"]
[ext_resource type="Texture2D" uid="uid://do3y2npj7u427" path="res://assets/ui/kenney_ui_pack/PNG/Grey/Default/button_rectangle_depth_flat.png" id="5_disabled"]
[sub_resource type="StyleBoxTexture" id="4_style_disabled"]
content_margin_left = 24.0
content_margin_top = 14.0
content_margin_right = 24.0
content_margin_bottom = 14.0
texture = ExtResource("5_disabled")
texture_margin_left = 16.0
texture_margin_top = 16.0
@ -61,12 +20,12 @@ expand_margin_left = 4.0
expand_margin_top = 4.0
expand_margin_right = 4.0
expand_margin_bottom = 4.0
[sub_resource type="StyleBoxTexture" id="5_style_focus"]
content_margin_left = 24.0
content_margin_top = 14.0
content_margin_right = 24.0
content_margin_bottom = 14.0
[sub_resource type="StyleBoxTexture" id="5_style_focus"]
texture = ExtResource("3_hover")
texture_margin_left = 16.0
texture_margin_top = 16.0
@ -76,10 +35,51 @@ expand_margin_left = 6.0
expand_margin_top = 6.0
expand_margin_right = 6.0
expand_margin_bottom = 6.0
[sub_resource type="StyleBoxTexture" id="2_style_hover"]
content_margin_left = 24.0
content_margin_top = 14.0
content_margin_right = 24.0
content_margin_bottom = 14.0
texture = ExtResource("3_hover")
texture_margin_left = 16.0
texture_margin_top = 16.0
texture_margin_right = 16.0
texture_margin_bottom = 16.0
expand_margin_left = 4.0
expand_margin_top = 4.0
expand_margin_right = 4.0
expand_margin_bottom = 4.0
[sub_resource type="StyleBoxTexture" id="1_style_normal"]
content_margin_left = 24.0
content_margin_top = 14.0
content_margin_right = 24.0
content_margin_bottom = 14.0
texture = ExtResource("2_normal")
texture_margin_left = 16.0
texture_margin_top = 16.0
texture_margin_right = 16.0
texture_margin_bottom = 16.0
expand_margin_left = 4.0
expand_margin_top = 4.0
expand_margin_right = 4.0
expand_margin_bottom = 4.0
[sub_resource type="StyleBoxTexture" id="3_style_pressed"]
content_margin_left = 24.0
content_margin_top = 16.0
content_margin_right = 24.0
content_margin_bottom = 12.0
texture = ExtResource("4_pressed")
texture_margin_left = 16.0
texture_margin_top = 16.0
texture_margin_right = 16.0
texture_margin_bottom = 16.0
expand_margin_left = 4.0
expand_margin_top = 4.0
expand_margin_right = 4.0
expand_margin_bottom = 4.0
[resource]
Button/colors/font_color = Color(0.098, 0.161, 0.047, 1)