diff --git a/Assets/Models/BowCursor.blend b/Assets/Models/BowCursor.blend index 8befc2e..404208d 100644 Binary files a/Assets/Models/BowCursor.blend and b/Assets/Models/BowCursor.blend differ diff --git a/Assets/Models/BowCursor.blend.import b/Assets/Models/BowCursor.blend.import index f55be2d..49a5559 100644 --- a/Assets/Models/BowCursor.blend.import +++ b/Assets/Models/BowCursor.blend.import @@ -32,7 +32,18 @@ animation/trimming=false animation/remove_immutable_tracks=true animation/import_rest_as_RESET=false import_script/path="" -_subresources={} +_subresources={ +"materials": { +"Bow": { +"use_external/enabled": true, +"use_external/path": "uid://c1evlkhnj37ky" +}, +"arrow": { +"use_external/enabled": true, +"use_external/path": "uid://c1evlkhnj37ky" +} +} +} blender/nodes/visible=0 blender/nodes/active_collection_only=false blender/nodes/punctual_lights=true diff --git a/Assets/Models/BowCursor.blend1 b/Assets/Models/BowCursor.blend1 index b36c3e0..1593565 100644 Binary files a/Assets/Models/BowCursor.blend1 and b/Assets/Models/BowCursor.blend1 differ diff --git a/Scripts/mouseDebug.gd b/Scripts/mouseDebug.gd index f24612b..0573a40 100644 --- a/Scripts/mouseDebug.gd +++ b/Scripts/mouseDebug.gd @@ -2,8 +2,23 @@ extends Node3D @export var player : Player +@onready var sword_cursor: Node3D = $SwordCursor +@onready var bow_cursor: Node3D = $BowCursor + func _process(delta: float) -> void: + follow_mouse() + swap_models() + look_at(player.global_position, Vector3.UP) + +func follow_mouse(): var mouse_pos = MousePos.get_mouse_world_position(00001000) if mouse_pos != null: global_position = Vector3(mouse_pos.x,.1,mouse_pos.z) - look_at(player.global_position, Vector3.UP) + +func swap_models(): + if Input.is_action_pressed("ranged_attack"): + sword_cursor.visible = false + bow_cursor.visible = true + else: + sword_cursor.visible = true + bow_cursor.visible = false diff --git a/mousedebug.tscn b/mousedebug.tscn index df0d01f..1451070 100644 --- a/mousedebug.tscn +++ b/mousedebug.tscn @@ -1,10 +1,15 @@ -[gd_scene load_steps=3 format=3 uid="uid://jkl8odkxg2s2"] +[gd_scene load_steps=4 format=3 uid="uid://jkl8odkxg2s2"] [ext_resource type="Script" uid="uid://cne68wmdyr4ld" path="res://Scripts/mouseDebug.gd" id="1_ehadm"] [ext_resource type="PackedScene" uid="uid://b4c4cu400yrgt" path="res://Assets/Models/SwordCursor.blend" id="2_1bvqy"] +[ext_resource type="PackedScene" uid="uid://cbvijkdp1lqqw" path="res://Assets/Models/BowCursor.blend" id="3_onpyn"] [node name="MouseCursor" type="Node3D"] script = ExtResource("1_ehadm") [node name="SwordCursor" parent="." instance=ExtResource("2_1bvqy")] transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 0) + +[node name="BowCursor" parent="." instance=ExtResource("3_onpyn")] +transform = Transform3D(-4.37114e-08, -1, 4.37114e-08, 0, -4.37114e-08, -1, 1, -4.37114e-08, 1.91069e-15, 0, 0, 0.525167) +visible = false diff --git a/project.godot b/project.godot index c87e263..e060260 100644 --- a/project.godot +++ b/project.godot @@ -70,6 +70,11 @@ attack={ , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":10,"pressure":0.0,"pressed":true,"script":null) ] } +ranged_attack={ +"deadzone": 0.2, +"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":2,"canceled":false,"pressed":false,"double_click":false,"script":null) +] +} [layer_names]