Merge branch 'main' of http://192.168.1.120:3000/derekdz/fps_project_1

2025-03-06 08:33:06 -06:00
parent 7ab4813d2a 9a7013a0a5
commit 326351a595
589 changed files with 1500 additions and 959 deletions
--- a/scripts/AmmoCounter.gd.uid
+++ b/scripts/AmmoCounter.gd.uid
@@ -0,0 +1 @@
+uid://cu0qffa82cnel
--- a/scripts/DamageNumber.gd.uid
+++ b/scripts/DamageNumber.gd.uid
@@ -0,0 +1 @@
+uid://dr1gj2yd1nwbm
--- a/scripts/EnemyTarget.gd.uid
+++ b/scripts/EnemyTarget.gd.uid
@@ -0,0 +1 @@
+uid://dxkkrhlk2crqm
--- a/scripts/HelperFuncs.gd.uid
+++ b/scripts/HelperFuncs.gd.uid
@@ -0,0 +1 @@
+uid://dubgisfjogkge
--- a/scripts/JumpPlatform.gd.uid
+++ b/scripts/JumpPlatform.gd.uid
@@ -0,0 +1 @@
+uid://de6ivnxx0xbbk
--- a/scripts/Label3D.gd.uid
+++ b/scripts/Label3D.gd.uid
@@ -0,0 +1 @@
+uid://cqocmg7spcjue
--- a/scripts/LevelManager.gd.uid
+++ b/scripts/LevelManager.gd.uid
@@ -0,0 +1 @@
+uid://bkii8jwf0k7tq
--- a/scripts/Mag.gd.uid
+++ b/scripts/Mag.gd.uid
@@ -0,0 +1 @@
+uid://0avakns8yyso
--- a/scripts/PickupAnnounce.gd.uid
+++ b/scripts/PickupAnnounce.gd.uid
@@ -0,0 +1 @@
+uid://c54lnb620gsf0
--- a/scripts/Rat_Control.gd.uid
+++ b/scripts/Rat_Control.gd.uid
@@ -0,0 +1 @@
+uid://17ejs4cam07p
--- a/scripts/StaminaCounter.gd.uid
+++ b/scripts/StaminaCounter.gd.uid
@@ -0,0 +1 @@
+uid://b8un1wcrcv8jp
--- a/scripts/UIScreenAdjust.gd.uid
+++ b/scripts/UIScreenAdjust.gd.uid
@@ -0,0 +1 @@
+uid://ijgurlyaijfc
--- a/scripts/barrel_explosion.gd.uid
+++ b/scripts/barrel_explosion.gd.uid
@@ -0,0 +1 @@
+uid://bvg3y3ejnbkfe
--- a/scripts/blunderbus.gd.uid
+++ b/scripts/blunderbus.gd.uid
@@ -0,0 +1 @@
+uid://ca3jopjyjcvqh
--- a/scripts/boombox.gd.uid
+++ b/scripts/boombox.gd.uid
@@ -0,0 +1 @@
+uid://c8ov7scj5wywy
--- a/scripts/breakable.gd.uid
+++ b/scripts/breakable.gd.uid
@@ -0,0 +1 @@
+uid://5y3nvrva4riv
--- a/scripts/broken_object_spawn.gd.uid
+++ b/scripts/broken_object_spawn.gd.uid
@@ -0,0 +1 @@
+uid://iwivfhkidlj7
--- a/scripts/bullet.gd.uid
+++ b/scripts/bullet.gd.uid
@@ -0,0 +1 @@
+uid://btbe1gyu0llcc
--- a/scripts/bullet_cam.gd.uid
+++ b/scripts/bullet_cam.gd.uid
@@ -0,0 +1 @@
+uid://buj2h2tro756m
--- a/scripts/bullet_enemy.gd.uid
+++ b/scripts/bullet_enemy.gd.uid
@@ -0,0 +1 @@
+uid://bkdye0ffitlia
--- a/scripts/bullet_fake.gd.uid
+++ b/scripts/bullet_fake.gd.uid
@@ -0,0 +1 @@
+uid://tfj4uhrg8eut
--- a/scripts/bullet_hole.gd.uid
+++ b/scripts/bullet_hole.gd.uid
@@ -0,0 +1 @@
+uid://dk2l3w8yirh71
--- a/scripts/bullet_ray.gd.uid
+++ b/scripts/bullet_ray.gd.uid
@@ -0,0 +1 @@
+uid://dpit1b135da1r
--- a/scripts/bullet_resource.gd.uid
+++ b/scripts/bullet_resource.gd.uid
@@ -0,0 +1 @@
+uid://6s14vpfr5pio
--- a/scripts/bullet_tracking.gd.uid
+++ b/scripts/bullet_tracking.gd.uid
@@ -0,0 +1 @@
+uid://drtq4sjncjow4
--- a/scripts/cannon.gd.uid
+++ b/scripts/cannon.gd.uid
@@ -0,0 +1 @@
+uid://dnjmkec58q6rl
--- a/scripts/chest_1.gd.uid
+++ b/scripts/chest_1.gd.uid
@@ -0,0 +1 @@
+uid://qkjm6oifawst
--- a/scripts/clear_user_data.gd.uid
+++ b/scripts/clear_user_data.gd.uid
@@ -0,0 +1 @@
+uid://dl58l5psvv4sd
--- a/scripts/crown.gd.uid
+++ b/scripts/crown.gd.uid
@@ -0,0 +1 @@
+uid://bj5iqkuac3fj3
--- a/scripts/dead_announce.gd.uid
+++ b/scripts/dead_announce.gd.uid
@@ -0,0 +1 @@
+uid://cafueqvlijrke
--- a/scripts/dead_cam.gd.uid
+++ b/scripts/dead_cam.gd.uid
@@ -0,0 +1 @@
+uid://uocspgd6nkex
--- a/scripts/deposit_money.gd.uid
+++ b/scripts/deposit_money.gd.uid
@@ -0,0 +1 @@
+uid://ctncit8k137i4
--- a/scripts/die_particles.gd.uid
+++ b/scripts/die_particles.gd.uid
@@ -0,0 +1 @@
+uid://bdecyikiye08i
--- a/scripts/enemy_cannon.gd.uid
+++ b/scripts/enemy_cannon.gd.uid
@@ -0,0 +1 @@
+uid://cg8ayedd3vths
--- a/scripts/enemy_taunt.gd.uid
+++ b/scripts/enemy_taunt.gd.uid
@@ -0,0 +1 @@
+uid://d3b7dlkw26pyl
--- a/scripts/game_globals.gd.uid
+++ b/scripts/game_globals.gd.uid
@@ -0,0 +1 @@
+uid://do0eqrin6cluk
--- a/scripts/gun.gd.uid
+++ b/scripts/gun.gd.uid
@@ -0,0 +1 @@
+uid://bcwr60o7186fu
--- a/scripts/gun_stats_resource.gd.uid
+++ b/scripts/gun_stats_resource.gd.uid
@@ -0,0 +1 @@
+uid://bq730yru3g8na
--- a/scripts/hitmarker.gd.uid
+++ b/scripts/hitmarker.gd.uid
@@ -0,0 +1 @@
+uid://doiuui3fejbfr
--- a/scripts/hud.gd.uid
+++ b/scripts/hud.gd.uid
@@ -0,0 +1 @@
+uid://dfv2m81iew3ia
--- a/scripts/item_pickup_v2.gd.uid
+++ b/scripts/item_pickup_v2.gd.uid
@@ -0,0 +1 @@
+uid://jc750hmq3nbn
--- a/scripts/key_door.gd.uid
+++ b/scripts/key_door.gd.uid
@@ -0,0 +1 @@
+uid://o2phb1cveuyi
--- a/scripts/key_pickup.gd.uid
+++ b/scripts/key_pickup.gd.uid
@@ -0,0 +1 @@
+uid://eqi5rq7toouc
--- a/scripts/key_resource.gd.uid
+++ b/scripts/key_resource.gd.uid
@@ -0,0 +1 @@
+uid://cxmpo7j0tqwp2
--- a/scripts/ladder.gd.uid
+++ b/scripts/ladder.gd.uid
@@ -0,0 +1 @@
+uid://dgouvqodei3qu
--- a/scripts/level_bounds.gd.uid
+++ b/scripts/level_bounds.gd.uid
@@ -0,0 +1 @@
+uid://bdxonkxnmxe6n
--- a/scripts/level_sign.gd.uid
+++ b/scripts/level_sign.gd.uid
@@ -0,0 +1 @@
+uid://dy2ctypb7rpvu
--- a/scripts/mag1.gd.uid
+++ b/scripts/mag1.gd.uid
@@ -0,0 +1 @@
+uid://dmjbwegy1pugp
--- a/scripts/main_menu.gd.uid
+++ b/scripts/main_menu.gd.uid
@@ -0,0 +1 @@
+uid://civx1w876wd7n
--- a/scripts/melee_collision.gd.uid
+++ b/scripts/melee_collision.gd.uid
@@ -0,0 +1 @@
+uid://dij338ar58dw1
--- a/scripts/melee_weapon.gd.uid
+++ b/scripts/melee_weapon.gd.uid
@@ -0,0 +1 @@
+uid://58gd34xqvluh
--- a/scripts/muzzle_smoke.gd.uid
+++ b/scripts/muzzle_smoke.gd.uid
@@ -0,0 +1 @@
+uid://c415bnu5xlty1
--- a/scripts/oildrum.gd.uid
+++ b/scripts/oildrum.gd.uid
@@ -0,0 +1 @@
+uid://xh2w8slo0x1a
--- a/scripts/pause_menu.gd.uid
+++ b/scripts/pause_menu.gd.uid
@@ -0,0 +1 @@
+uid://cif6rhpfvs142
--- a/scripts/pickup_item_indicator.gd.uid
+++ b/scripts/pickup_item_indicator.gd.uid
@@ -0,0 +1 @@
+uid://klwxhd8ojg5e
--- a/scripts/player.gd.uid
+++ b/scripts/player.gd.uid
@@ -0,0 +1 @@
+uid://bieeh1iro4ji1
--- a/scripts/playlist_generator.gd.uid
+++ b/scripts/playlist_generator.gd.uid
@@ -0,0 +1 @@
+uid://bxo70raytpm81
--- a/scripts/playlist_loader.gd.uid
+++ b/scripts/playlist_loader.gd.uid
@@ -0,0 +1 @@
+uid://clph3byphno03
--- a/scripts/pressure_plate.gd.uid
+++ b/scripts/pressure_plate.gd.uid
@@ -0,0 +1 @@
+uid://c3eofio84xbsv
--- a/scripts/projectile.gd.uid
+++ b/scripts/projectile.gd.uid
@@ -0,0 +1 @@
+uid://ds5mhgyjqkffa
--- a/scripts/rat.gd.uid
+++ b/scripts/rat.gd.uid
@@ -0,0 +1 @@
+uid://b5rs1lkgq027t
--- a/scripts/rat_dead.gd.uid
+++ b/scripts/rat_dead.gd.uid
@@ -0,0 +1 @@
+uid://da74ixexgmijf
--- a/scripts/rat_hole.gd.uid
+++ b/scripts/rat_hole.gd.uid
@@ -0,0 +1 @@
+uid://cxlgj4v2lngyd
--- a/scripts/recoil.gd.uid
+++ b/scripts/recoil.gd.uid
@@ -0,0 +1 @@
+uid://s2nes6cthron
--- a/scripts/revolver_1.gd.uid
+++ b/scripts/revolver_1.gd.uid
@@ -0,0 +1 @@
+uid://baxetcltydtav
--- a/scripts/rigidbody_generic.gd.uid
+++ b/scripts/rigidbody_generic.gd.uid
@@ -0,0 +1 @@
+uid://c6tlj2ipk3s0x
--- a/scripts/rocket.gd.uid
+++ b/scripts/rocket.gd.uid
@@ -0,0 +1 @@
+uid://35c425vv1ksb
--- a/scripts/rocket_launcher.gd.uid
+++ b/scripts/rocket_launcher.gd.uid
@@ -0,0 +1 @@
+uid://glusp56g2wt2
--- a/scripts/room_check.gd.uid
+++ b/scripts/room_check.gd.uid
@@ -0,0 +1 @@
+uid://dv1oc7x3gwtes
--- a/scripts/room_manager.gd.uid
+++ b/scripts/room_manager.gd.uid
@@ -0,0 +1 @@
+uid://12l74jckdnpl
--- a/scripts/save_load.gd.uid
+++ b/scripts/save_load.gd.uid
@@ -0,0 +1 @@
+uid://c117xqhhksuo
--- a/scripts/scene_changer.gd.uid
+++ b/scripts/scene_changer.gd.uid
@@ -0,0 +1 @@
+uid://euykrpkb4h0m
--- a/scripts/shotgun_pellet.gd.uid
+++ b/scripts/shotgun_pellet.gd.uid
@@ -0,0 +1 @@
+uid://bcbbd3xsm85cu
--- a/scripts/signal_bus.gd.uid
+++ b/scripts/signal_bus.gd.uid
@@ -0,0 +1 @@
+uid://ctp1nwt7nj1hy
--- a/scripts/spider.gd.uid
+++ b/scripts/spider.gd.uid
@@ -0,0 +1 @@
+uid://cdofgtwevbray
--- a/scripts/spikes_1.gd.uid
+++ b/scripts/spikes_1.gd.uid
@@ -0,0 +1 @@
+uid://dxflw8x4h20mw
--- a/scripts/stat_display.gd.uid
+++ b/scripts/stat_display.gd.uid
@@ -0,0 +1 @@
+uid://bb1aahs3qtvnt
--- a/scripts/switch_basic.gd.uid
+++ b/scripts/switch_basic.gd.uid
@@ -0,0 +1 @@
+uid://cq35hyk0gcc22
--- a/scripts/switch_door.gd.uid
+++ b/scripts/switch_door.gd.uid
@@ -0,0 +1 @@
+uid://bw1uh8yc13tjy
--- a/scripts/switch_interactandshoot.gd.uid
+++ b/scripts/switch_interactandshoot.gd.uid
@@ -0,0 +1 @@
+uid://3dribcjjimj8
--- a/scripts/switch_override.gd.uid
+++ b/scripts/switch_override.gd.uid
@@ -0,0 +1 @@
+uid://5wctinjhv4d7
--- a/scripts/target_collision.gd.uid
+++ b/scripts/target_collision.gd.uid
@@ -0,0 +1 @@
+uid://bvy7tmoqifi0o
--- a/scripts/texture_catcher.gd.uid
+++ b/scripts/texture_catcher.gd.uid
@@ -0,0 +1 @@
+uid://cdn5lcvtn15ng
--- a/scripts/trackerGun.gd.uid
+++ b/scripts/trackerGun.gd.uid
@@ -0,0 +1 @@
+uid://c6npw0lul1llg
--- a/scripts/tracker_marker.gd.uid
+++ b/scripts/tracker_marker.gd.uid
@@ -0,0 +1 @@
+uid://7be7yg3rcluj
--- a/scripts/vendingmahcine.gd.uid
+++ b/scripts/vendingmahcine.gd.uid
@@ -0,0 +1 @@
+uid://ckc18ra50gw6u
--- a/scripts/vent_1.gd.uid
+++ b/scripts/vent_1.gd.uid
@@ -0,0 +1 @@
+uid://bphakne262e6j
--- a/scripts/weapon_pickup.gd.uid
+++ b/scripts/weapon_pickup.gd.uid
@@ -0,0 +1 @@
+uid://c1l3nukmdvv7e
--- a/scripts/weapon_recoil.gd.uid
+++ b/scripts/weapon_recoil.gd.uid
@@ -0,0 +1 @@
+uid://buh1r5pb7y75a
--- a/scripts/weapon_resource.gd.uid
+++ b/scripts/weapon_resource.gd.uid
@@ -0,0 +1 @@
+uid://d0cf6xsxkf0h
--- a/scripts/weapon_select.gd.uid
+++ b/scripts/weapon_select.gd.uid
@@ -0,0 +1 @@
+uid://bfuaakskupn12
--- a/scripts/weapon_uberscript.gd
+++ b/scripts/weapon_uberscript.gd
@@ -254,9 +254,9 @@ func projectile_initialize():

 func bullet_fire():
 	audio_fire.play()
-	
 	get_tree().current_scene.add_child(projectile_initialize())
-	
+	if casing_ejector != null:
+		spawn_casing()
 	vibration()
 	if chamber != null:
 		revolver_chamber_rot_amt += 60
--- a/scripts/weapon_uberscript.gd.uid
+++ b/scripts/weapon_uberscript.gd.uid
@@ -0,0 +1 @@
+uid://dhr2xfj3qow4c