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

ammo rework seems to mostly be in order

Browse Source
This commit is contained in:
derek
2025-01-15 15:33:57 -06:00
parent 0a4e4eefb3
commit 93366827fc
22 changed files with 1740 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
assets/blockout_2.tscn
View File

@@ -1,10 +1,9 @@
[gd_scene load_steps=117 format=4 uid="uid://6agmt1hqlhww"]
[gd_scene load_steps=116 format=4 uid="uid://6agmt1hqlhww"]
[ext_resource type="Script" path="res://scripts/LevelManager.gd" id="1_sbpvn"]
[ext_resource type="PackedScene" uid="uid://brl0bsqjl5dg3" path="res://assets/mac_10.tscn" id="2_fn4vb"]
[ext_resource type="Texture2D" uid="uid://ckjcv72jcojjh" path="res://assets/materials/91_laurel hedge PBR texture-seamless_hr/91_laurel hedge_DIFF (Custom).jpg" id="3_3ov8a"]
[ext_resource type="LightmapGIData" uid="uid://bwpvltmeo4cfl" path="res://assets/LevelBlockouts/blockout_2.lmbake" id="3_d2pxn"]
[ext_resource type="PackedScene" uid="uid://dslxb3psx30vp" path="res://assets/pistol1.tscn" id="3_s3a37"]
[ext_resource type="Texture2D" uid="uid://d210plbmb7a2o" path="res://assets/materials/91_laurel hedge PBR texture-seamless_hr/91_laurel hedge_NORM (Custom).jpg" id="4_5u2rd"]
[ext_resource type="PackedScene" uid="uid://20csd6dmwj4y" path="res://assets/jump_platform.tscn" id="4_j47q8"]
[ext_resource type="Texture2D" uid="uid://b43o7m3ykjvqg" path="res://assets/materials/71_clean plaster PBR texture-seamless_hr/71_clean plaster_DIFF.jpg" id="5_bm4ps"]
@@ -927,7 +926,6 @@ player = NodePath("Player")
money = 50
start_health = 5
gun_1 = ExtResource("2_fn4vb")
gun_2 = ExtResource("3_s3a37")
health_drop_enabled = false
[node name="Player" parent="." instance=ExtResource("9_3usor")]

233
assets/mac10_pickup.tscn
View File

File diff suppressed because one or more lines are too long

18
assets/mac_10.tscn
View File

File diff suppressed because one or more lines are too long

1
assets/revolver_1.tscn
View File

@@ -1100,6 +1100,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0718293, 0)
script = ExtResource("2_7rsti")
gun_name = ".44 Galore"
gun_icon = ExtResource("3_nl201")
ammo_type = 1
fire_mode = 1
fov_zoom_amt = 15
recoil_amount = Vector3(0.125, 0.1, 0.1)

1
assets/rocket_launcher.tscn
View File

@@ -481,6 +481,7 @@ _data = {
script = ExtResource("1_ra4f1")
gun_name = "Badooka"
gun_icon = ExtResource("2_41bg8")
ammo_type = 4
fire_mode = 1
max_ammo = 1
bullet_speed = 60.0

23
assets/weaponresources/mac10_resource.tres Normal file
View File

@@ -0,0 +1,23 @@
[gd_resource type="Resource" script_class="gun_stats" load_steps=3 format=3 uid="uid://i3y4quaxs5mb"]
[ext_resource type="Texture2D" uid="uid://gx3iw54iemho" path="res://assets/Textures/ObjectTextures/mac10.png" id="1_a3w77"]
[ext_resource type="Script" path="res://scripts/gun_stats_resource.gd" id="2_tl7g6"]
[resource]
script = ExtResource("2_tl7g6")
gun_name = "Mac 10"
gun_icon = ExtResource("1_a3w77")
ammo_type = 0
fov_zoom_amt = 0.98
use_ads = false
recoil_amount = Vector3(0.2, 0.05, 0.05)
kick_amount = 0.1
max_ammo = 15
start_mags = 3
bullet_damage = 1
smoke_enabled = false
bullet_force_mod = 5.0
bullet_speed = 150
bullet_drop = 0.3
random_spread_amt = 1.0
fire_pitch_scale_amt = 0.2