derekdz/fps_project_1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

quick tweaks

Browse Source
This commit is contained in:
derek
2024-07-22 17:04:04 -05:00
parent a7b8613329
commit 356455ba29
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scenes/test_level_2v2.tscn
View File

@@ -1,9 +1,10 @@
[gd_scene load_steps=52 format=3 uid="uid://dyop6vk3rgkkb"] [gd_scene load_steps=53 format=3 uid="uid://dyop6vk3rgkkb"]
[ext_resource type="Script" path="res://scripts/LevelManager.gd" id="1_orhgl"] [ext_resource type="Script" path="res://scripts/LevelManager.gd" id="1_orhgl"]
[ext_resource type="Texture2D" uid="uid://dqs06ic3vjtwk" path="res://assets/Models/asphalt1.albedo.jpg" id="1_w4rag"] [ext_resource type="Texture2D" uid="uid://dqs06ic3vjtwk" path="res://assets/Models/asphalt1.albedo.jpg" id="1_w4rag"]
[ext_resource type="PackedScene" uid="uid://brl0bsqjl5dg3" path="res://assets/mac_10.tscn" id="2_6rjit"] [ext_resource type="PackedScene" uid="uid://brl0bsqjl5dg3" path="res://assets/mac_10.tscn" id="2_6rjit"]
[ext_resource type="PackedScene" uid="uid://drwae3loscbw7" path="res://assets/player.tscn" id="2_f87c2"] [ext_resource type="PackedScene" uid="uid://drwae3loscbw7" path="res://assets/player.tscn" id="2_f87c2"]
[ext_resource type="PackedScene" uid="uid://b5eclfg0cmmal" path="res://assets/revolver_1.tscn" id="3_sxsd3"]
[ext_resource type="PackedScene" uid="uid://20csd6dmwj4y" path="res://assets/jump_platform.tscn" id="4_8nxyr"] [ext_resource type="PackedScene" uid="uid://20csd6dmwj4y" path="res://assets/jump_platform.tscn" id="4_8nxyr"]
[ext_resource type="PackedScene" uid="uid://dws2vwfxubqvb" path="res://assets/cannon.tscn" id="5_28rul"] [ext_resource type="PackedScene" uid="uid://dws2vwfxubqvb" path="res://assets/cannon.tscn" id="5_28rul"]
[ext_resource type="PackedScene" uid="uid://bpkmyd3wvqi5p" path="res://assets/boombox.tscn" id="6_xrg7k"] [ext_resource type="PackedScene" uid="uid://bpkmyd3wvqi5p" path="res://assets/boombox.tscn" id="6_xrg7k"]
@@ -422,10 +423,10 @@ player = NodePath("Player")
money = 10 money = 10
health = 10 health = 10
gun_1 = ExtResource("2_6rjit") gun_1 = ExtResource("2_6rjit")
gun_2 = ExtResource("3_sxsd3")
[node name="Player" parent="." instance=ExtResource("2_f87c2")] [node name="Player" parent="." instance=ExtResource("2_f87c2")]
transform = Transform3D(-0.866025, 0, -0.5, 0, 1, 0, 0.5, 0, -0.866025, -16.0295, 1.4435, 12.1166) transform = Transform3D(-0.866025, 0, -0.5, 0, 1, 0, 0.5, 0, -0.866025, -16.0295, 1.4435, 12.1166)
AUDIO = false
weapon_sway_amount = 0.07 weapon_sway_amount = 0.07
weapon_rotation_amount = 0.07 weapon_rotation_amount = 0.07

2
scripts/bullet.gd
View File

@@ -8,6 +8,7 @@ var instance_bullethole
var bullet_force_mod = 1.0 var bullet_force_mod = 1.0
var distance_from_player var distance_from_player
var player_position var player_position
var player_velocity
@onready var mesh = $gunbullet1 @onready var mesh = $gunbullet1
@onready var ray = $RayCast3D @onready var ray = $RayCast3D
@@ -40,6 +41,7 @@ func _ready():
# Called every frame. 'delta' is the elapsed time since the previous frame. # Called every frame. 'delta' is the elapsed time since the previous frame.
func _process(delta): func _process(delta):
position += transform.basis * Vector3(0, 0, -bullet_speed) * delta position += transform.basis * Vector3(0, 0, -bullet_speed) * delta
print(player_velocity)
rotation.x = clamp(rotation.x - delta * bullet_drop,deg_to_rad(-90),deg_to_rad(90)) rotation.x = clamp(rotation.x - delta * bullet_drop,deg_to_rad(-90),deg_to_rad(90))
distance_from_player = abs(self.global_position - player_position) distance_from_player = abs(self.global_position - player_position)

1
scripts/gun.gd
View File

@@ -100,6 +100,7 @@ func shoot(delta):
else: else:
instance_bullet.transform.basis = barrel_raycast.global_transform.basis instance_bullet.transform.basis = barrel_raycast.global_transform.basis
instance_bullet.bullet_speed = bullet_speed instance_bullet.bullet_speed = bullet_speed
instance_bullet.player_velocity = player.velocity.length()
instance_bullet.bullet_drop = bullet_drop instance_bullet.bullet_drop = bullet_drop
instance_bullet.random_spread_amt = random_spread_amt instance_bullet.random_spread_amt = random_spread_amt
instance_bullet.bullet_damage = bullet_damage instance_bullet.bullet_damage = bullet_damage