diff --git a/Game/Classes/Player/Player.gd b/Game/Classes/Player/Player.gd index 1fe40c7..cf4e8a5 100644 --- a/Game/Classes/Player/Player.gd +++ b/Game/Classes/Player/Player.gd @@ -324,13 +324,12 @@ func spawn(): rotation = Vector3.ZERO func shoot(): - #var weapon = find_node("Weapon") - + # The underscore indicates an unused variable. + # Because it is declared in this scope, it will disappear as soon as the + # function returns. As is, it exists solely to catch the return value of shoot(). var _remaining_ammo = active_weapon.shoot($Camera) func reload(): - #var weapon = find_node("Weapon") - active_weapon.reload() func _input(event): diff --git a/Game/Classes/Player/Player.tscn b/Game/Classes/Player/Player.tscn index 3ae6e49..474b154 100644 --- a/Game/Classes/Player/Player.tscn +++ b/Game/Classes/Player/Player.tscn @@ -138,7 +138,7 @@ script = ExtResource( 8 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.53592, -0.0651628 ) [node name="Hand" type="Spatial" parent="Camera"] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0.335, -0.393079, -0.559 ) +transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0.335, -0.39118, -0.559 ) [node name="WeaponBobAnimationTree" type="AnimationTree" parent="Camera/Hand"] tree_root = SubResource( 12 ) diff --git a/Game/project.godot b/Game/project.godot index 72a1b45..5fb876b 100644 --- a/Game/project.godot +++ b/Game/project.godot @@ -13,9 +13,15 @@ _global_script_classes=[ { "class": "Player", "language": "GDScript", "path": "res://Classes/Player/Player.gd" +}, { +"base": "Spatial", +"class": "Weapon", +"language": "GDScript", +"path": "res://Assets/Weapons/Weapon.gd" } ] _global_script_class_icons={ -"Player": "" +"Player": "", +"Weapon": "" } [application] @@ -90,6 +96,16 @@ MoveJetpack={ "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777237,"unicode":0,"echo":false,"script":null) ] } +NextWeapon={ +"deadzone": 0.5, +"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":4,"pressed":false,"doubleclick":false,"script":null) + ] +} +PrevWeapon={ +"deadzone": 0.5, +"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":5,"pressed":false,"doubleclick":false,"script":null) + ] +} [rendering]