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

Godot 4.4 Upgrade

Browse Source
This commit is contained in:
derek
2025-03-05 09:27:42 -06:00
parent 0da561f425
commit 9a7013a0a5
589 changed files with 1500 additions and 959 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scenes/Arena of Money.tscn
View File

@@ -1,12 +1,12 @@
[gd_scene load_steps=30 format=3 uid="uid://bs2iopee5f3bv"]
[ext_resource type="Script" path="res://scripts/LevelManager.gd" id="1_wmpql"]
[ext_resource type="Script" uid="uid://bkii8jwf0k7tq" path="res://scripts/LevelManager.gd" id="1_wmpql"]
[ext_resource type="Resource" uid="uid://llsqx2cby5in" path="res://GameModes/Arena of Money.tres" id="2_8jpxx"]
[ext_resource type="PackedScene" uid="uid://drwae3loscbw7" path="res://assets/player.tscn" id="3_hv632"]
[ext_resource type="Script" path="res://scripts/room_manager.gd" id="4_mkn7b"]
[ext_resource type="Script" uid="uid://12l74jckdnpl" path="res://scripts/room_manager.gd" id="4_mkn7b"]
[ext_resource type="PackedScene" uid="uid://djr7vnr1hcx82" path="res://assets/spider2.tscn" id="5_wn5bn"]
[ext_resource type="Script" path="res://scripts/switch_door.gd" id="6_iut4h"]
[ext_resource type="Script" path="res://scripts/room_check.gd" id="7_yboyj"]
[ext_resource type="Script" uid="uid://bw1uh8yc13tjy" path="res://scripts/switch_door.gd" id="6_iut4h"]
[ext_resource type="Script" uid="uid://dv1oc7x3gwtes" path="res://scripts/room_check.gd" id="7_yboyj"]
[ext_resource type="PackedScene" uid="uid://dws2vwfxubqvb" path="res://assets/cannon.tscn" id="8_68hxt"]
[ext_resource type="Material" uid="uid://br2pyyyl2n3cx" path="res://assets/materials/prototype/prototype1.tres" id="8_i8beu"]
[ext_resource type="PackedScene" uid="uid://dws4iro7820fc" path="res://assets/pistol1_pickup.tscn" id="11_nal6h"]
@@ -69,9 +69,9 @@ tracks/0/keys = PackedFloat32Array(0, 1, 26.3852, 31.9616, -34.5929, 1, 1, 26.38
[sub_resource type="AnimationLibrary" id="AnimationLibrary_s1qpx"]
_data = {
"RESET": SubResource("Animation_3e03q"),
"close": SubResource("Animation_haspb"),
"open": SubResource("Animation_pkxro")
&"RESET": SubResource("Animation_3e03q"),
&"close": SubResource("Animation_haspb"),
&"open": SubResource("Animation_pkxro")
}
[sub_resource type="BoxShape3D" id="BoxShape3D_oood3"]

6
scenes/HUBWORLD.tscn
View File

@@ -1,8 +1,8 @@
[gd_scene load_steps=21 format=3 uid="uid://jdwpc622vmok"]
[ext_resource type="Script" path="res://scripts/LevelManager.gd" id="1_1bnbi"]
[ext_resource type="Script" uid="uid://bkii8jwf0k7tq" path="res://scripts/LevelManager.gd" id="1_1bnbi"]
[ext_resource type="Resource" uid="uid://bxcxqt7rmfvdw" path="res://GameModes/hubworld.tres" id="2_62iy8"]
[ext_resource type="Script" path="res://scripts/playlist_loader.gd" id="3_2u2e7"]
[ext_resource type="Script" uid="uid://clph3byphno03" path="res://scripts/playlist_loader.gd" id="3_2u2e7"]
[ext_resource type="Material" uid="uid://b6hhomp4kcjvb" path="res://assets/materials/prototype/tadaoando.tres" id="3_hlejc"]
[ext_resource type="PackedScene" uid="uid://dpootbr7qgac1" path="res://Tools/playlist_generator.tscn" id="3_udqcb"]
[ext_resource type="PackedScene" uid="uid://drwae3loscbw7" path="res://assets/player.tscn" id="4_04o4y"]
@@ -42,6 +42,8 @@ gamemode = ExtResource("2_62iy8")
[node name="LEVEL UTILS" type="Node" parent="."]
[node name="Playlist Generator" parent="LEVEL UTILS" instance=ExtResource("3_udqcb")]
generate_playlist_now = false
checksum_test = false
[node name="PlaylistLoader" type="Node" parent="LEVEL UTILS"]
script = ExtResource("3_2u2e7")

4
scenes/asset_checker.tscn
View File

@@ -338,8 +338,8 @@ tracks/0/keys = PackedFloat32Array(0, 1, 4.83154, 1.76087, 7.17499)
[sub_resource type="AnimationLibrary" id="AnimationLibrary_ey8td"]
_data = {
"Menu": SubResource("Animation_slj52"),
"RESET": SubResource("Animation_6siip")
&"Menu": SubResource("Animation_slj52"),
&"RESET": SubResource("Animation_6siip")
}
[node name="AssetChecker" type="Node3D" groups=["ui"]]

2
scenes/blockout_4.tscn
View File

@@ -1,6 +1,6 @@
[gd_scene load_steps=26 format=3 uid="uid://breenfpt04iua"]
[ext_resource type="Script" path="res://scripts/LevelManager.gd" id="1_8g3mj"]
[ext_resource type="Script" uid="uid://bkii8jwf0k7tq" path="res://scripts/LevelManager.gd" id="1_8g3mj"]
[ext_resource type="PackedScene" uid="uid://xerc06hjfnbf" path="res://assets/LevelBlockouts/blockout4.blend" id="1_038d8"]
[ext_resource type="PackedScene" uid="uid://drwae3loscbw7" path="res://assets/player.tscn" id="4_ykmsc"]
[ext_resource type="PackedScene" uid="uid://df34olntmk0wl" path="res://assets/vent_1.tscn" id="5_hc1cs"]

6
scenes/bullet_test.tscn
View File

@@ -1,6 +1,6 @@
[gd_scene load_steps=15 format=3 uid="uid://dq3pqbjg7o241"]
[ext_resource type="Script" path="res://scripts/LevelManager.gd" id="1_iqxey"]
[ext_resource type="Script" uid="uid://bkii8jwf0k7tq" path="res://scripts/LevelManager.gd" id="1_iqxey"]
[ext_resource type="PackedScene" uid="uid://brl0bsqjl5dg3" path="res://assets/mac_10.tscn" id="2_bbv4q"]
[ext_resource type="Material" uid="uid://br2pyyyl2n3cx" path="res://assets/materials/prototype/prototype1.tres" id="3_ol40x"]
[ext_resource type="PackedScene" uid="uid://b5eclfg0cmmal" path="res://assets/revolver_1.tscn" id="3_tt31v"]
@@ -60,8 +60,8 @@ tracks/0/keys = {
[sub_resource type="AnimationLibrary" id="AnimationLibrary_dlky4"]
_data = {
"RESET": SubResource("Animation_qlawa"),
"new_animation": SubResource("Animation_l1fwm")
&"RESET": SubResource("Animation_qlawa"),
&"new_animation": SubResource("Animation_l1fwm")
}
[node name="BulletTest" type="Node3D" node_paths=PackedStringArray("player")]

14
scenes/enemy_working_scene.tscn
View File

@@ -1,13 +1,13 @@
[gd_scene load_steps=31 format=3 uid="uid://dsnddbrlqkav2"]
[ext_resource type="Script" path="res://scripts/LevelManager.gd" id="1_laua1"]
[ext_resource type="Script" uid="uid://bkii8jwf0k7tq" path="res://scripts/LevelManager.gd" id="1_laua1"]
[ext_resource type="Resource" uid="uid://dn3t7wcoumlm3" path="res://GameModes/standard.tres" id="2_2umal"]
[ext_resource type="PackedScene" uid="uid://drwae3loscbw7" path="res://assets/player.tscn" id="4_a8lcp"]
[ext_resource type="Script" path="res://scripts/room_manager.gd" id="5_ngmqi"]
[ext_resource type="Script" uid="uid://12l74jckdnpl" path="res://scripts/room_manager.gd" id="5_ngmqi"]
[ext_resource type="PackedScene" uid="uid://djr7vnr1hcx82" path="res://assets/spider2.tscn" id="6_qmuhr"]
[ext_resource type="Script" path="res://scripts/switch_door.gd" id="6_sbaq1"]
[ext_resource type="Script" uid="uid://bw1uh8yc13tjy" path="res://scripts/switch_door.gd" id="6_sbaq1"]
[ext_resource type="Material" uid="uid://bjryln3so1lgw" path="res://assets/materials/prototype/prototype_green.tres" id="7_1bmnm"]
[ext_resource type="Script" path="res://scripts/room_check.gd" id="7_8ewhx"]
[ext_resource type="Script" uid="uid://dv1oc7x3gwtes" path="res://scripts/room_check.gd" id="7_8ewhx"]
[ext_resource type="Material" uid="uid://br2pyyyl2n3cx" path="res://assets/materials/prototype/prototype1.tres" id="7_l3crk"]
[ext_resource type="PackedScene" uid="uid://c6bpysq1tjhy4" path="res://vendingmahcine.tscn" id="7_pr7m0"]
[ext_resource type="PackedScene" uid="uid://by3n26uvps8tb" path="res://assets/water_tower.tscn" id="14_yn32s"]
@@ -70,9 +70,9 @@ tracks/0/keys = PackedFloat32Array(0, 1, 26.3852, 31.9616, -34.5929, 1, 1, 26.38
[sub_resource type="AnimationLibrary" id="AnimationLibrary_s1qpx"]
_data = {
"RESET": SubResource("Animation_3e03q"),
"close": SubResource("Animation_haspb"),
"open": SubResource("Animation_pkxro")
&"RESET": SubResource("Animation_3e03q"),
&"close": SubResource("Animation_haspb"),
&"open": SubResource("Animation_pkxro")
}
[sub_resource type="BoxShape3D" id="BoxShape3D_oood3"]

14
scenes/highwire.tscn
View File

@@ -1,12 +1,12 @@
[gd_scene load_steps=29 format=3 uid="uid://uo43j7bomkf3"]
[ext_resource type="Script" path="res://scripts/LevelManager.gd" id="1_8o3mm"]
[ext_resource type="Script" uid="uid://bkii8jwf0k7tq" path="res://scripts/LevelManager.gd" id="1_8o3mm"]
[ext_resource type="Resource" uid="uid://dn3t7wcoumlm3" path="res://GameModes/standard.tres" id="2_knkyv"]
[ext_resource type="PackedScene" uid="uid://drwae3loscbw7" path="res://assets/player.tscn" id="3_sn6s8"]
[ext_resource type="Script" path="res://scripts/room_manager.gd" id="4_iqtg8"]
[ext_resource type="Script" uid="uid://12l74jckdnpl" path="res://scripts/room_manager.gd" id="4_iqtg8"]
[ext_resource type="PackedScene" uid="uid://djr7vnr1hcx82" path="res://assets/spider2.tscn" id="5_vb31s"]
[ext_resource type="Script" path="res://scripts/switch_door.gd" id="6_xph2x"]
[ext_resource type="Script" path="res://scripts/room_check.gd" id="7_3a6nw"]
[ext_resource type="Script" uid="uid://bw1uh8yc13tjy" path="res://scripts/switch_door.gd" id="6_xph2x"]
[ext_resource type="Script" uid="uid://dv1oc7x3gwtes" path="res://scripts/room_check.gd" id="7_3a6nw"]
[ext_resource type="Material" uid="uid://tvyunfk6vvya" path="res://assets/materials/prototype/prototype_orange.tres" id="9_qcaui"]
[ext_resource type="PackedScene" uid="uid://df34olntmk0wl" path="res://assets/vent_1.tscn" id="11_0hcft"]
[ext_resource type="PackedScene" uid="uid://dlhjacsike5a4" path="res://assets/oildrum1.tscn" id="15_tuvfy"]
@@ -68,9 +68,9 @@ tracks/0/keys = PackedFloat32Array(0, 1, 26.3852, 31.9616, -34.5929, 1, 1, 26.38
[sub_resource type="AnimationLibrary" id="AnimationLibrary_s1qpx"]
_data = {
"RESET": SubResource("Animation_3e03q"),
"close": SubResource("Animation_haspb"),
"open": SubResource("Animation_pkxro")
&"RESET": SubResource("Animation_3e03q"),
&"close": SubResource("Animation_haspb"),
&"open": SubResource("Animation_pkxro")
}
[sub_resource type="BoxShape3D" id="BoxShape3D_oood3"]

17
scenes/test_level_1.tscn
View File

File diff suppressed because one or more lines are too long

10
scenes/test_level_2v2.tscn
View File

@@ -1,6 +1,6 @@
[gd_scene load_steps=123 format=4 uid="uid://dyop6vk3rgkkb"]
[ext_resource type="Script" path="res://scripts/LevelManager.gd" id="1_orhgl"]
[ext_resource type="Script" uid="uid://bkii8jwf0k7tq" 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="PackedScene" uid="uid://drwae3loscbw7" path="res://assets/player.tscn" id="2_f87c2"]
[ext_resource type="Resource" uid="uid://dn3t7wcoumlm3" path="res://GameModes/standard.tres" id="2_ynfvy"]
@@ -10,7 +10,7 @@
[ext_resource type="AudioStream" uid="uid://jo4n05go5hdt" path="res://assets/Audio/train-pass-by-steady-loop-SBA-300156766.wav" id="7_00j8j"]
[ext_resource type="Texture2D" uid="uid://bytxye2f8f05c" path="res://assets/Models/brick1.normal.png" id="7_vj4t5"]
[ext_resource type="PackedScene" uid="uid://cnfc8rtk6l1d8" path="res://assets/crate1.tscn" id="8_b57j8"]
[ext_resource type="Shader" path="res://assets/crtTest.gdshader" id="13_ur1vy"]
[ext_resource type="Shader" uid="uid://skuny045t8dn" path="res://assets/crtTest.gdshader" id="13_ur1vy"]
[ext_resource type="PackedScene" uid="uid://by3n26uvps8tb" path="res://assets/water_tower.tscn" id="14_o37f0"]
[ext_resource type="PackedScene" uid="uid://c0uv33kbndbvy" path="res://assets/trashcan.tscn" id="15_0omc5"]
[ext_resource type="PackedScene" uid="uid://c7vrpfdh603kr" path="res://assets/bottle_1.tscn" id="15_3iv0j"]
@@ -33,10 +33,10 @@
[ext_resource type="PackedScene" uid="uid://cdpxctwwi12j" path="res://assets/ladder_collision_check.tscn" id="32_hbde8"]
[ext_resource type="PackedScene" uid="uid://0xs247hfvkml" path="res://assets/rat.tscn" id="32_og4yo"]
[ext_resource type="PackedScene" uid="uid://cgo4qyul7ix5p" path="res://assets/ladder.tscn" id="33_0m4lq"]
[ext_resource type="Script" path="res://scripts/Rat_Control.gd" id="33_f7t8d"]
[ext_resource type="Script" uid="uid://17ejs4cam07p" path="res://scripts/Rat_Control.gd" id="33_f7t8d"]
[ext_resource type="PackedScene" uid="uid://6rhnl7vbvvr4" path="res://assets/rat_hole.tscn" id="34_uuf6k"]
[ext_resource type="PackedScene" uid="uid://b3t8fra7evqfb" path="res://assets/Models/building_1.tscn" id="38_jjm5k"]
[ext_resource type="Script" path="res://scripts/room_manager.gd" id="39_g18ck"]
[ext_resource type="Script" uid="uid://12l74jckdnpl" path="res://scripts/room_manager.gd" id="39_g18ck"]
[ext_resource type="PackedScene" uid="uid://djr7vnr1hcx82" path="res://assets/spider2.tscn" id="40_a0e3y"]
[ext_resource type="Material" uid="uid://b6hhomp4kcjvb" path="res://assets/materials/prototype/tadaoando.tres" id="42_tln7o"]
[ext_resource type="PackedScene" uid="uid://bj1y0fbjtul4a" path="res://post_processing.tscn" id="43_82hec"]
@@ -1159,7 +1159,7 @@ tracks/0/keys = {
[sub_resource type="AnimationLibrary" id="AnimationLibrary_1w2xf"]
_data = {
"trainmove": SubResource("Animation_6nfej")
&"trainmove": SubResource("Animation_6nfej")
}
[node name="Test Level 2" type="Node3D" node_paths=PackedStringArray("player")]

12
scenes/test_level_2v2NOENEMIES.tscn
View File

@@ -1,12 +1,12 @@
[gd_scene load_steps=121 format=4 uid="uid://bicj5x7nc8tby"]
[ext_resource type="Script" path="res://scripts/LevelManager.gd" id="1_wls0y"]
[ext_resource type="Script" uid="uid://bkii8jwf0k7tq" path="res://scripts/LevelManager.gd" id="1_wls0y"]
[ext_resource type="PackedScene" uid="uid://brl0bsqjl5dg3" path="res://assets/mac_10.tscn" id="2_8r4nh"]
[ext_resource type="PackedScene" uid="uid://2o2wcc5i1al4" path="res://assets/rocket_launcher.tscn" id="3_08b0x"]
[ext_resource type="PackedScene" uid="uid://drwae3loscbw7" path="res://assets/player.tscn" id="4_1cxxb"]
[ext_resource type="Texture2D" uid="uid://dqs06ic3vjtwk" path="res://assets/Models/asphalt1.albedo.jpg" id="5_6x2th"]
[ext_resource type="Texture2D" uid="uid://bu3w5slec6gib" path="res://assets/Models/brick1.png" id="6_ic064"]
[ext_resource type="Texture2D" uid="uid://dtccywxaqkqwk" path="res://assets/Models/brick1.normal.png" id="7_bou4v"]
[ext_resource type="Texture2D" uid="uid://bytxye2f8f05c" path="res://assets/Models/brick1.normal.png" id="7_bou4v"]
[ext_resource type="PackedScene" uid="uid://20csd6dmwj4y" path="res://assets/jump_platform.tscn" id="8_f4nmn"]
[ext_resource type="PackedScene" uid="uid://dws2vwfxubqvb" path="res://assets/cannon.tscn" id="9_5ta35"]
[ext_resource type="PackedScene" uid="uid://bpkmyd3wvqi5p" path="res://assets/boombox.tscn" id="10_mwwc8"]
@@ -14,12 +14,12 @@
[ext_resource type="PackedScene" uid="uid://cnfc8rtk6l1d8" path="res://assets/crate1.tscn" id="12_6tji4"]
[ext_resource type="PackedScene" uid="uid://c7vrpfdh603kr" path="res://assets/bottle_1.tscn" id="13_vqdl4"]
[ext_resource type="PackedScene" uid="uid://c6bpysq1tjhy4" path="res://vendingmahcine.tscn" id="14_lsabb"]
[ext_resource type="Shader" path="res://assets/crtTest.gdshader" id="15_g5ipl"]
[ext_resource type="Shader" uid="uid://skuny045t8dn" path="res://assets/crtTest.gdshader" id="15_g5ipl"]
[ext_resource type="PackedScene" uid="uid://cp7tsicuudd6v" path="res://assets/boxcar_1.tscn" id="16_rag5o"]
[ext_resource type="Texture2D" uid="uid://ciwlwynk4jt2k" path="res://assets/Models/boxcar1.albdeo.png" id="17_1vrnp"]
[ext_resource type="Texture2D" uid="uid://cixlw3pnskjm4" path="res://assets/Models/boxcar1.rough.png" id="18_baih5"]
[ext_resource type="Texture2D" uid="uid://du5psl01pl58u" path="res://assets/Models/boxcar1.normal.png" id="19_0lpkk"]
[ext_resource type="Texture2D" uid="uid://b4g14i0hso7dj" path="res://assets/Models/boxcar1.doors.png" id="20_jwssi"]
[ext_resource type="Texture2D" uid="uid://bdb2yv36ffmk8" path="res://assets/Models/boxcar1.doors.png" id="20_jwssi"]
[ext_resource type="Texture2D" uid="uid://sjohow3p4tvl" path="res://assets/Models/boxcar1.doors.rough.png" id="21_60lvy"]
[ext_resource type="Texture2D" uid="uid://bmxhwygo4dpkf" path="res://assets/Models/boxcar1.doors.normal.png" id="22_i87uc"]
[ext_resource type="Texture2D" uid="uid://dwh7ugcppm4k" path="res://assets/Models/boxcar1.wheel.albedo.png" id="23_pxmjy"]
@@ -34,7 +34,7 @@
[ext_resource type="PackedScene" uid="uid://b204v3il2xrcl" path="res://assets/powerline.tscn" id="32_vqkhf"]
[ext_resource type="PackedScene" uid="uid://cgo4qyul7ix5p" path="res://assets/ladder.tscn" id="33_metle"]
[ext_resource type="PackedScene" uid="uid://cdpxctwwi12j" path="res://assets/ladder_collision_check.tscn" id="34_g2y63"]
[ext_resource type="Script" path="res://scripts/Rat_Control.gd" id="35_fk52n"]
[ext_resource type="Script" uid="uid://17ejs4cam07p" path="res://scripts/Rat_Control.gd" id="35_fk52n"]
[ext_resource type="PackedScene" uid="uid://0xs247hfvkml" path="res://assets/rat.tscn" id="36_clv86"]
[ext_resource type="PackedScene" uid="uid://6rhnl7vbvvr4" path="res://assets/rat_hole.tscn" id="37_kjvv4"]
[ext_resource type="PackedScene" uid="uid://b3t8fra7evqfb" path="res://assets/Models/building_1.tscn" id="38_8r1eg"]
@@ -1155,7 +1155,7 @@ tracks/0/keys = {
[sub_resource type="AnimationLibrary" id="AnimationLibrary_1w2xf"]
_data = {
"trainmove": SubResource("Animation_6nfej")
&"trainmove": SubResource("Animation_6nfej")
}
[node name="Test Level 2" type="Node3D" node_paths=PackedStringArray("player")]

9
scenes/world1.tscn
View File

File diff suppressed because one or more lines are too long