Quaternius weapons, input fixes, sound & path fixes
- Added 6 Quaternius weapon models (Pistol, Revolver, Rifle, Shotgun, P90, SniperRifle) - Created weapon resource files with balanced stats - Wired Pistol + Rifle into player.tscn replacing Kenney blasters - Fixed WASD input (matched input map action names) - Fixed Escape key toggles mouse capture - Added Audio autoload singleton - Fixed broken sound asset paths across all scripts - Fixed all scene ext_resource text paths (nested under assets/kenney-fps/) - Fixed all .import source_file paths - Deleted stale .import files (will be regenerated by editor on open)
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
[gd_scene load_steps=3 format=3 uid="uid://oqfhfp1a80qd"]
|
||||
|
||||
[ext_resource type="PackedScene" uid="uid://g2w2608bc2dy" path="res://models/cloud.glb" id="1_2mo3p"]
|
||||
[ext_resource type="Script" uid="uid://bfgpo8fvf136p" path="res://objects/cloud.gd" id="2_rmotl"]
|
||||
[ext_resource type="PackedScene" uid="uid://g2w2608bc2dy" path="res://assets/kenney-fps/models/cloud.glb" id="1_2mo3p"]
|
||||
[ext_resource type="Script" uid="uid://bfgpo8fvf136p" path="res://assets/kenney-fps/objects/cloud.gd" id="2_rmotl"]
|
||||
|
||||
[node name="cube2" instance=ExtResource("1_2mo3p")]
|
||||
script = ExtResource("2_rmotl")
|
||||
|
||||
@@ -28,7 +28,7 @@ func _process(delta):
|
||||
# Take damage from player
|
||||
|
||||
func damage(amount):
|
||||
Audio.play("sounds/enemy_hurt.ogg")
|
||||
Audio.play("assets/kenney-fps/sounds/enemy_hurt.ogg")
|
||||
|
||||
health -= amount
|
||||
|
||||
@@ -38,7 +38,7 @@ func damage(amount):
|
||||
# Destroy the enemy when out of health
|
||||
|
||||
func destroy():
|
||||
Audio.play("sounds/enemy_destroy.ogg")
|
||||
Audio.play("assets/kenney-fps/sounds/enemy_destroy.ogg")
|
||||
|
||||
destroyed = true
|
||||
queue_free()
|
||||
@@ -63,6 +63,6 @@ func _on_timer_timeout():
|
||||
muzzle_b.play("default")
|
||||
muzzle_b.rotation_degrees.z = randf_range(-45, 45)
|
||||
|
||||
Audio.play("sounds/enemy_attack.ogg")
|
||||
Audio.play("assets/kenney-fps/sounds/enemy_attack.ogg")
|
||||
|
||||
collider.damage(5) # Apply damage to player
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
[gd_scene load_steps=5 format=3 uid="uid://d2g78tpqbyf5g"]
|
||||
|
||||
[ext_resource type="PackedScene" uid="uid://lde2xq3vq635" path="res://models/enemy-flying.glb" id="1_3v8nl"]
|
||||
[ext_resource type="Script" uid="uid://b6udw8uhlp4ei" path="res://objects/enemy.gd" id="1_jg24b"]
|
||||
[ext_resource type="SpriteFrames" uid="uid://dbv3sy5qjatnl" path="res://sprites/burst_animation.tres" id="3_iblw5"]
|
||||
[ext_resource type="PackedScene" uid="uid://lde2xq3vq635" path="res://assets/kenney-fps/models/enemy-flying.glb" id="1_3v8nl"]
|
||||
[ext_resource type="Script" uid="uid://b6udw8uhlp4ei" path="res://assets/kenney-fps/objects/enemy.gd" id="1_jg24b"]
|
||||
[ext_resource type="SpriteFrames" uid="uid://dbv3sy5qjatnl" path="res://assets/kenney-fps/sprites/burst_animation.tres" id="3_iblw5"]
|
||||
|
||||
[sub_resource type="SphereShape3D" id="SphereShape3D_iix87"]
|
||||
radius = 0.75
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
[gd_scene load_steps=8 format=3 uid="uid://b7070gfoko4mo"]
|
||||
|
||||
[ext_resource type="Texture2D" uid="uid://dh0t42ubhuv0" path="res://sprites/hit.png" id="1_mdfft"]
|
||||
[ext_resource type="Script" uid="uid://bwkexrmt718dx" path="res://objects/impact.gd" id="2_k826h"]
|
||||
[ext_resource type="Texture2D" uid="uid://dh0t42ubhuv0" path="res://assets/kenney-fps/sprites/hit.png" id="1_mdfft"]
|
||||
[ext_resource type="Script" uid="uid://bwkexrmt718dx" path="res://assets/kenney-fps/objects/impact.gd" id="2_k826h"]
|
||||
|
||||
[sub_resource type="AtlasTexture" id="AtlasTexture_8c04i"]
|
||||
atlas = ExtResource("1_mdfft")
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -84,7 +84,7 @@ func _process(delta):
|
||||
camera.position.y = lerp(camera.position.y, 0.0, delta * 5)
|
||||
|
||||
if is_on_floor() and gravity > 1 and !previously_floored: # Landed
|
||||
Audio.play("sounds/land.ogg")
|
||||
Audio.play("assets/kenney-fps/sounds/land.ogg")
|
||||
camera.position.y = -0.1
|
||||
|
||||
previously_floored = is_on_floor()
|
||||
@@ -102,19 +102,18 @@ func _input(event):
|
||||
handle_rotation(event.relative.x, event.relative.y, false)
|
||||
|
||||
func handle_controls(delta):
|
||||
# Mouse capture
|
||||
if Input.is_action_just_pressed("mouse_capture"):
|
||||
Input.mouse_mode = Input.MOUSE_MODE_CAPTURED
|
||||
mouse_captured = true
|
||||
|
||||
if Input.is_action_just_pressed("mouse_capture_exit"):
|
||||
Input.mouse_mode = Input.MOUSE_MODE_VISIBLE
|
||||
mouse_captured = false
|
||||
|
||||
input_mouse = Vector2.ZERO
|
||||
# Mouse capture — Escape toggles
|
||||
if Input.is_action_just_pressed("escape"):
|
||||
if mouse_captured:
|
||||
Input.mouse_mode = Input.MOUSE_MODE_VISIBLE
|
||||
mouse_captured = false
|
||||
input_mouse = Vector2.ZERO
|
||||
else:
|
||||
Input.mouse_mode = Input.MOUSE_MODE_CAPTURED
|
||||
mouse_captured = true
|
||||
|
||||
# Movement
|
||||
var input := Input.get_vector("move_left", "move_right", "move_forward", "move_back")
|
||||
var input := Input.get_vector("move_west", "move_east", "move_north", "move_south")
|
||||
movement_velocity = Vector3(input.x, 0, input.y).normalized() * movement_speed
|
||||
|
||||
# Handle Controller Rotation
|
||||
@@ -165,7 +164,7 @@ func handle_gravity(delta):
|
||||
# Jumping
|
||||
|
||||
func action_jump():
|
||||
Audio.play("sounds/jump_a.ogg, sounds/jump_b.ogg, sounds/jump_c.ogg")
|
||||
Audio.play("assets/kenney-fps/sounds/jump_a.ogg, assets/kenney-fps/sounds/jump_b.ogg, assets/kenney-fps/sounds/jump_c.ogg")
|
||||
gravity = - jump_strength
|
||||
jumps_remaining -= 1
|
||||
|
||||
@@ -206,7 +205,7 @@ func action_shoot():
|
||||
|
||||
# Creating an impact animation
|
||||
|
||||
var impact = preload("res://objects/impact.tscn")
|
||||
var impact = preload("res://assets/kenney-fps/objects/impact.tscn")
|
||||
var impact_instance = impact.instantiate()
|
||||
|
||||
impact_instance.play("shot")
|
||||
@@ -232,7 +231,7 @@ func action_weapon_toggle():
|
||||
weapon_index = wrap(weapon_index + 1, 0, weapons.size())
|
||||
initiate_change_weapon(weapon_index)
|
||||
|
||||
Audio.play("sounds/weapon_change.ogg")
|
||||
Audio.play("assets/kenney-fps/sounds/weapon_change.ogg")
|
||||
|
||||
# Initiates the weapon changing animation (tween)
|
||||
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
[gd_scene load_steps=9 format=3 uid="uid://dl2ed4gkybggf"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://cu47grjp072jk" path="res://objects/player.gd" id="1_ffboj"]
|
||||
[ext_resource type="Resource" uid="uid://cu2gtxlcmbb34" path="res://weapons/blaster-repeater.tres" id="2_6epbw"]
|
||||
[ext_resource type="Texture2D" uid="uid://8ggihh27mlrr" path="res://sprites/blob_shadow.png" id="2_b0fo8"]
|
||||
[ext_resource type="Script" uid="uid://dg01pkkc1c5vd" path="res://scripts/weapon.gd" id="2_i825w"]
|
||||
[ext_resource type="Resource" uid="uid://c56y8pqoyk15f" path="res://weapons/blaster.tres" id="3_kr4p8"]
|
||||
[ext_resource type="SpriteFrames" uid="uid://dbv3sy5qjatnl" path="res://sprites/burst_animation.tres" id="4_m6ukc"]
|
||||
[ext_resource type="AudioStream" uid="uid://cydjn1ct3hps2" path="res://sounds/walking.ogg" id="5_ics1s"]
|
||||
[ext_resource type="Script" uid="uid://cu47grjp072jk" path="res://assets/kenney-fps/objects/player.gd" id="1_ffboj"]
|
||||
[ext_resource type="Resource" uid="uid://quaternius_pistol_auto" path="res://assets/quaternius/weapons/pistol.tres" id="2_6epbw"]
|
||||
[ext_resource type="Texture2D" uid="uid://8ggihh27mlrr" path="res://assets/kenney-fps/sprites/blob_shadow.png" id="2_b0fo8"]
|
||||
[ext_resource type="Script" uid="uid://dg01pkkc1c5vd" path="res://assets/kenney-fps/scripts/weapon.gd" id="2_i825w"]
|
||||
[ext_resource type="Resource" uid="uid://quaternius_rifle_auto" path="res://assets/quaternius/weapons/rifle.tres" id="3_kr4p8"]
|
||||
[ext_resource type="SpriteFrames" uid="uid://dbv3sy5qjatnl" path="res://assets/kenney-fps/sprites/burst_animation.tres" id="4_m6ukc"]
|
||||
[ext_resource type="AudioStream" uid="uid://cydjn1ct3hps2" path="res://assets/kenney-fps/sounds/walking.ogg" id="5_ics1s"]
|
||||
|
||||
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_gdq8c"]
|
||||
radius = 0.3
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user