Fix weapon switching, scale, add Q key bind
- Fixed weapon switching: player.gd now uses weapon_next/weapon_prev/slot actions (was checking for nonexistent 'weapon_toggle') - Added Q key to weapon_next input action - Reduced weapon scale from 0.3 to 0.07-0.08 (was still 3x too large)
This commit is contained in:
@@ -227,10 +227,21 @@ func action_shoot():
|
||||
# Toggle between available weapons (listed in 'weapons')
|
||||
|
||||
func action_weapon_toggle():
|
||||
if Input.is_action_just_pressed("weapon_toggle"):
|
||||
if Input.is_action_just_pressed("weapon_next"):
|
||||
weapon_index = wrap(weapon_index + 1, 0, weapons.size())
|
||||
initiate_change_weapon(weapon_index)
|
||||
Audio.play("assets/kenney-fps/sounds/weapon_change.ogg")
|
||||
|
||||
if Input.is_action_just_pressed("weapon_prev"):
|
||||
weapon_index = wrap(weapon_index - 1, 0, weapons.size())
|
||||
initiate_change_weapon(weapon_index)
|
||||
Audio.play("assets/kenney-fps/sounds/weapon_change.ogg")
|
||||
|
||||
for i in range(4):
|
||||
if Input.is_action_just_pressed("weapon_slot_" + str(i + 1)):
|
||||
if i < weapons.size():
|
||||
weapon_index = i
|
||||
initiate_change_weapon(weapon_index)
|
||||
Audio.play("assets/kenney-fps/sounds/weapon_change.ogg")
|
||||
|
||||
# Initiates the weapon changing animation (tween)
|
||||
|
||||
@@ -3,6 +3,6 @@
|
||||
[ext_resource type="PackedScene" path="res://assets/quaternius/models/P90.glb" id="1"]
|
||||
|
||||
[node name="P90" type="Node3D"]
|
||||
scale = Vector3(0.3, 0.3, 0.3)
|
||||
scale = Vector3(0.07, 0.07, 0.07)
|
||||
|
||||
[node name="Model" parent="." instance=ExtResource("1")]
|
||||
|
||||
@@ -3,6 +3,6 @@
|
||||
[ext_resource type="PackedScene" path="res://assets/quaternius/models/Pistol.glb" id="1"]
|
||||
|
||||
[node name="Pistol" type="Node3D"]
|
||||
scale = Vector3(0.3, 0.3, 0.3)
|
||||
scale = Vector3(0.08, 0.08, 0.08)
|
||||
|
||||
[node name="Model" parent="." instance=ExtResource("1")]
|
||||
|
||||
@@ -3,6 +3,6 @@
|
||||
[ext_resource type="PackedScene" path="res://assets/quaternius/models/Revolver.glb" id="1"]
|
||||
|
||||
[node name="Revolver" type="Node3D"]
|
||||
scale = Vector3(0.3, 0.3, 0.3)
|
||||
scale = Vector3(0.08, 0.08, 0.08)
|
||||
|
||||
[node name="Model" parent="." instance=ExtResource("1")]
|
||||
|
||||
@@ -3,6 +3,6 @@
|
||||
[ext_resource type="PackedScene" path="res://assets/quaternius/models/Rifle.glb" id="1"]
|
||||
|
||||
[node name="Rifle" type="Node3D"]
|
||||
scale = Vector3(0.3, 0.3, 0.3)
|
||||
scale = Vector3(0.07, 0.07, 0.07)
|
||||
|
||||
[node name="Model" parent="." instance=ExtResource("1")]
|
||||
|
||||
@@ -3,6 +3,6 @@
|
||||
[ext_resource type="PackedScene" path="res://assets/quaternius/models/Shotgun.glb" id="1"]
|
||||
|
||||
[node name="Shotgun" type="Node3D"]
|
||||
scale = Vector3(0.3, 0.3, 0.3)
|
||||
scale = Vector3(0.08, 0.08, 0.08)
|
||||
|
||||
[node name="Model" parent="." instance=ExtResource("1")]
|
||||
|
||||
@@ -3,6 +3,6 @@
|
||||
[ext_resource type="PackedScene" path="res://assets/quaternius/models/SniperRifle.glb" id="1"]
|
||||
|
||||
[node name="SniperRifle" type="Node3D"]
|
||||
scale = Vector3(0.3, 0.3, 0.3)
|
||||
scale = Vector3(0.07, 0.07, 0.07)
|
||||
|
||||
[node name="Model" parent="." instance=ExtResource("1")]
|
||||
|
||||
@@ -145,6 +145,7 @@ weapon_reload={
|
||||
weapon_next={
|
||||
"deadzone": 0.5,
|
||||
"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":4,"canceled":false,"pressed":false,"double_click":false,"script":null)
|
||||
, 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)
|
||||
]
|
||||
}
|
||||
weapon_prev={
|
||||
|
||||
Reference in New Issue
Block a user