diff --git a/GameModes/hubworld.tres b/GameModes/hubworld.tres index 7c4ea9f..f87e066 100644 --- a/GameModes/hubworld.tres +++ b/GameModes/hubworld.tres @@ -7,9 +7,9 @@ script = ExtResource("1_bpthy") gamemode_name = "HUB" win_conditions = null survival_time = 160.0 -money_lost_multiplier = 0.5 -weapon_penalty = 0 -weapon_drop_percentage = 0.5 +money_lost_multiplier = 1.0 +weapon_penalty = 2 +weapon_drop_percentage = 0.0 walk_speed = 12.0 jump_velocity = 5 dash_speed = 40 @@ -20,7 +20,7 @@ max_stamina = 100.0 stamina_drain = 20.0 air_dash_max = 1 load_save = false -money_drop_multiplier = 1.0 +money_multiplier = 1.0 start_health = 10 drop_chance_minimum = 0.1 random_drops = false diff --git a/GameModes/standard.tres b/GameModes/standard.tres index c208ac4..b045b2b 100644 --- a/GameModes/standard.tres +++ b/GameModes/standard.tres @@ -20,7 +20,7 @@ max_stamina = 100.0 stamina_drain = 20.0 air_dash_max = 1 load_save = false -money_drop_multiplier = 1.0 +money_multiplier = 1.0 start_health = 10 drop_chance_minimum = 0.1 random_drops = false diff --git a/addons/godot-jolt/windows/~godot-jolt_windows-x64_editor.dll~RF19670c4.TMP b/addons/godot-jolt/windows/~godot-jolt_windows-x64_editor.dll~RF19670c4.TMP new file mode 100644 index 0000000..13ab204 Binary files /dev/null and b/addons/godot-jolt/windows/~godot-jolt_windows-x64_editor.dll~RF19670c4.TMP differ diff --git a/addons/terrain_3d/bin/~libterrain.windows.debug.x86_64.dll~RF1967151.TMP b/addons/terrain_3d/bin/~libterrain.windows.debug.x86_64.dll~RF1967151.TMP new file mode 100644 index 0000000..81d9653 Binary files /dev/null and b/addons/terrain_3d/bin/~libterrain.windows.debug.x86_64.dll~RF1967151.TMP differ diff --git a/assets/deposit_money.tscn b/assets/deposit_money.tscn new file mode 100644 index 0000000..3e54cf1 --- /dev/null +++ b/assets/deposit_money.tscn @@ -0,0 +1,31 @@ +[gd_scene load_steps=5 format=3 uid="uid://bvjrsc86n2ak0"] + +[ext_resource type="Script" path="res://scripts/deposit_money.gd" id="1_b77vt"] +[ext_resource type="FontFile" uid="uid://d2h2tjhxiv5wo" path="res://assets/fonts/White On Black.ttf" id="1_bjyml"] + +[sub_resource type="BoxShape3D" id="BoxShape3D_8clsv"] + +[sub_resource type="BoxMesh" id="BoxMesh_6sj7f"] + +[node name="DEPOSIT MONEY" type="StaticBody3D"] +collision_layer = 3 +collision_mask = 3 +script = ExtResource("1_b77vt") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="."] +shape = SubResource("BoxShape3D_8clsv") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="."] +mesh = SubResource("BoxMesh_6sj7f") + +[node name="Deposit Money" type="Label3D" parent="."] +transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, 0.143, 1.207, 0) +text = "Deposit Money" +font = ExtResource("1_bjyml") +font_size = 100 + +[node name="Amount" type="Label3D" parent="."] +transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, 0.142793, 0.747273, 0) +text = "Test" +font = ExtResource("1_bjyml") +font_size = 100 diff --git a/godot-git-plugin-v3.1.1/addons/godot-git-plugin/win64/~libgit_plugin.windows.editor.x86_64.dll~RF196717f.TMP b/godot-git-plugin-v3.1.1/addons/godot-git-plugin/win64/~libgit_plugin.windows.editor.x86_64.dll~RF196717f.TMP new file mode 100644 index 0000000..47bbb1d Binary files /dev/null and b/godot-git-plugin-v3.1.1/addons/godot-git-plugin/win64/~libgit_plugin.windows.editor.x86_64.dll~RF196717f.TMP differ diff --git a/scenes/HUBWORLD.tscn b/scenes/HUBWORLD.tscn index 61b42d8..6916813 100644 --- a/scenes/HUBWORLD.tscn +++ b/scenes/HUBWORLD.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=11 format=3 uid="uid://jdwpc622vmok"] +[gd_scene load_steps=12 format=3 uid="uid://jdwpc622vmok"] [ext_resource type="Script" path="res://scripts/LevelManager.gd" id="1_1bnbi"] [ext_resource type="Resource" uid="uid://bxcxqt7rmfvdw" path="res://GameModes/hubworld.tres" id="2_62iy8"] @@ -7,6 +7,7 @@ [ext_resource type="PackedScene" uid="uid://dgapcuvg0gtmm" path="res://assets/scene_changer.tscn" id="5_alya6"] [ext_resource type="PackedScene" uid="uid://bessq6hl7qsh8" path="res://assets/stats.tscn" id="6_mkn70"] [ext_resource type="PackedScene" uid="uid://bj1y0fbjtul4a" path="res://post_processing.tscn" id="7_2h1ea"] +[ext_resource type="PackedScene" uid="uid://bvjrsc86n2ak0" path="res://assets/deposit_money.tscn" id="8_n0nhe"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_s7e4t"] sky_top_color = Color(0.623488, 0.812575, 0.900791, 1) @@ -23,7 +24,7 @@ sky = SubResource("Sky_kdw67") tonemap_mode = 2 glow_enabled = true fog_enabled = true -fog_density = 0.0015 +fog_density = 0.0001 [node name="HUB_1" type="Node3D" groups=["hub_level"]] script = ExtResource("1_1bnbi") @@ -83,3 +84,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.212402, 1.9891, -6.02898) [node name="PostProcessing" parent="." instance=ExtResource("7_2h1ea")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.84741, 0.0564995, -2.31308) + +[node name="DEPOSIT MONEY" parent="." instance=ExtResource("8_n0nhe")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.24039, 0.888024, -4.81185) diff --git a/scenes/enemy_working_scene.tscn b/scenes/enemy_working_scene.tscn index fb7d278..bbdfff7 100644 --- a/scenes/enemy_working_scene.tscn +++ b/scenes/enemy_working_scene.tscn @@ -1,11 +1,13 @@ -[gd_scene load_steps=28 format=3 uid="uid://dsnddbrlqkav2"] +[gd_scene load_steps=35 format=3 uid="uid://dsnddbrlqkav2"] [ext_resource type="Script" 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="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="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="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://dws4iro7820fc" path="res://assets/pistol1_pickup.tscn" id="8_qwtxj"] @@ -37,7 +39,47 @@ sky = SubResource("Sky_6g0ku") tonemap_mode = 2 glow_enabled = true fog_enabled = true -fog_density = 0.001 +fog_density = 0.0005 + +[sub_resource type="Animation" id="Animation_3e03q"] +length = 0.001 +tracks/0/type = "position_3d" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Door") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = PackedFloat32Array(0, 1, 26.3852, 31.9616, -34.5929) + +[sub_resource type="Animation" id="Animation_haspb"] +resource_name = "close" +tracks/0/type = "position_3d" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Door") +tracks/0/interp = 2 +tracks/0/loop_wrap = true +tracks/0/keys = PackedFloat32Array(0, 1, 26.3852, 31.9616, -40.6238, 1, 1, 26.3852, 31.9616, -34.5929) + +[sub_resource type="Animation" id="Animation_pkxro"] +resource_name = "open" +tracks/0/type = "position_3d" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Door") +tracks/0/interp = 2 +tracks/0/loop_wrap = true +tracks/0/keys = PackedFloat32Array(0, 1, 26.3852, 31.9616, -34.5929, 1, 1, 26.3852, 31.9616, -40.6238) + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_s1qpx"] +_data = { +"RESET": SubResource("Animation_3e03q"), +"close": SubResource("Animation_haspb"), +"open": SubResource("Animation_pkxro") +} + +[sub_resource type="BoxShape3D" id="BoxShape3D_oood3"] +size = Vector3(19.709, 15.8262, 9.0301) [sub_resource type="NavigationMesh" id="NavigationMesh_8aw3d"] vertices = PackedVector3Array(-24.6969, -4.637, -268.188, -24.6969, -4.637, -219.188, 24.5531, -4.637, -219.188, 24.5531, -4.637, -268.188, -24.6969, -30.137, -227.688, -24.6969, -30.137, -178.438, 24.5531, -30.137, -178.438, 24.5531, -30.137, -227.688, -24.6969, -71.387, -164.688, -24.6969, -71.387, -115.438, 24.5531, -71.387, -115.438, 24.5531, -71.387, -164.688, -24.6969, -71.387, -96.188, -24.6969, -71.387, -46.938, 24.5531, -71.387, -46.938, 24.5531, -71.387, -96.188, -13.1969, 0.112999, -35.938, -12.1969, 0.112999, -36.438, -12.1969, 0.112999, -41.688, -13.4469, 0.112999, -34.688, -19.4469, 0.112999, -28.188, -18.4469, 0.112999, -28.438, -37.1969, 0.112999, -41.688, -37.1969, 0.112999, -28.188, -10.9469, 0.112999, -35.938, 7.05309, 0.112999, -32.688, 8.30309, 0.112999, -33.688, 8.30309, 0.112999, -41.688, -3.19691, 0.112999, -29.438, 7.80309, 0.112999, -30.938, 7.05309, 0.112999, -31.688, 36.3031, 0.112999, -25.188, 36.5531, 0.112999, -24.188, 37.0531, 0.112999, -24.188, 37.0531, 0.112999, -41.688, 19.3031, 0.112999, -25.188, -10.9469, 0.112999, -23.188, -6.69691, 0.112999, -28.688, -6.69691, 0.112999, -29.438, -11.6969, 0.112999, -22.938, -7.44691, 4.863, -28.188, -6.69691, 4.863, -28.688, -6.94691, 4.863, -29.688, -10.1969, 4.863, -24.438, -8.69691, 4.863, -23.938, -7.69691, 4.863, -25.188, -6.94691, 4.863, -26.188, -17.4469, 4.863, -27.438, -11.1969, 4.863, -22.938, -12.9469, 4.863, -34.188, -17.6969, 4.863, -28.188, -11.4469, 9.863, -23.188, -6.94691, 9.863, -28.938, -6.94691, 9.863, -29.688, -12.9469, 9.863, -34.188, -17.6969, 9.863, -28.188, -17.4469, 9.863, -27.438, -3.19691, 0.112999, -28.688, -4.94691, 0.112999, -27.438, -9.94691, 0.112999, -20.688, -8.19691, 0.112999, -17.438, 2.30309, 0.112999, -17.438, 2.55309, 0.112999, -16.938, 12.5531, 0.112999, -27.438, -6.69691, 11.113, -27.938, -6.69691, 11.113, -27.438, -5.94691, 11.113, -27.438, -5.94691, 11.113, -27.938, -4.44691, 11.363, -29.438, -6.19691, 11.363, -30.438, -5.69691, 11.113, -28.938, -4.44691, 11.363, -28.938, -28.9469, 0.112999, -14.188, -28.4469, 0.112999, -10.188, -28.4469, 0.112999, -16.188, -37.1969, 0.112999, -14.188, -26.1969, 0.112999, -16.188, -18.9469, 0.112999, -25.688, -19.9469, 0.112999, -26.438, -19.9469, 0.112999, -27.688, 28.3031, 0.112999, -22.938, 22.0531, 0.112999, -22.938, 22.0531, 0.112999, -22.188, 26.8031, 0.112999, -16.438, 28.5531, 0.112999, -16.688, 21.3031, 0.112999, -21.438, 20.0531, 0.112999, -21.438, 26.8031, 0.112999, -8.68799, 2.55309, 0.112999, -8.93799, -7.69691, 11.113, -26.688, -7.69691, 11.113, -26.188, -7.19691, 11.113, -26.438, -7.19691, 11.113, -26.938, -8.44691, 11.113, -25.688, -8.44691, 11.113, -25.188, -7.94691, 11.113, -25.438, -7.94691, 11.113, -25.938, -10.4469, 0.112999, -19.938, -8.69691, 0.112999, -17.188, -8.69691, 0.112999, -8.68799, -11.6969, 0.112999, -19.938, -26.4469, 0.112999, -8.43799, -9.44691, 11.113, -24.438, -9.44691, 11.113, -23.938, -8.94691, 11.113, -24.188, -8.94691, 11.113, -24.688, 18.8031, 5.613, -24.188, 20.5531, 5.613, -22.438, 20.8031, 5.613, -23.938, 35.5531, 5.613, -23.938, 36.3031, 0.112999, -22.938, 37.0531, 0.112999, -16.688, -11.1969, 11.363, -21.938, -12.1969, 11.363, -21.938, -10.9469, 11.363, -20.938, -10.4469, 11.113, -22.188, -9.44691, 11.113, -22.938, -9.69691, 11.113, -23.938, -43.1969, 50.863, -17.188, -43.1969, 50.863, -8.68799, -33.9469, 50.863, -8.68799, -33.9469, 50.863, -17.188, -7.69691, 20.613, -16.438, -7.69691, 20.613, -7.93799, 1.55309, 20.613, -7.93799, 1.55309, 20.613, -16.438, -7.44691, 0.112999, -16.188, -7.44691, 0.112999, -8.18799, 1.30309, 0.112999, -8.18799, 1.30309, 0.112999, -16.188, 27.8031, 20.613, -15.688, 27.8031, 20.613, -7.43799, 37.0531, 20.613, -7.43799, 37.0531, 20.613, -15.688, 28.0531, 0.112999, -15.438, 28.0531, 0.112999, -7.68799, 36.8031, 0.112999, -7.68799, 36.8031, 0.112999, -15.438, -38.9469, 20.613, -13.188, -38.9469, 20.613, -8.93799, -34.1969, 20.613, -8.93799, -34.1969, 20.613, -13.188, -33.1969, 20.613, -7.68799, -38.9469, 20.613, -7.68799, -38.9469, 20.613, -4.68799, -29.6969, 20.613, -4.68799, -29.6969, 20.613, -13.188, -32.9469, 20.613, -13.188, -37.1969, 0.112999, -12.938, -37.1969, 0.112999, -4.93799, -29.9469, 0.112999, -4.93799, -29.9469, 0.112999, -12.938, -30.6969, 16.613, -11.188, -30.6969, 16.613, -10.188, -29.9469, 16.613, -10.188, -29.9469, 16.613, -11.188, -28.6969, 16.613, -11.188, -28.6969, 16.613, -10.188, -8.69691, 16.613, -10.188, -8.69691, 16.613, -11.188, -7.44691, 16.613, -11.188, -7.44691, 16.613, -10.188, 1.30309, 16.613, -10.188, 1.30309, 16.613, -11.188, 2.55309, 16.613, -11.188, 2.55309, 16.613, -10.188, 26.8031, 16.613, -10.188, 26.8031, 16.613, -11.188, 28.0531, 16.613, -11.188, 28.0531, 16.613, -10.188, 29.5531, 16.613, -10.188, 29.5531, 16.613, -11.188, -35.9469, 48.363, -9.68799, -35.9469, 48.363, -8.93799, -34.1969, 48.363, -8.93799, -34.1969, 48.363, -9.68799, -21.9469, 48.363, -9.68799, -32.9469, 48.363, -9.68799, -33.1969, 48.363, -7.68799, -23.9469, 48.363, 34.062, -21.9469, 48.363, 34.062, -35.9469, 48.363, 35.562, -24.1969, 48.363, 35.812, -35.9469, 48.363, -7.68799, -37.6969, 37.613, -9.43799, -37.6969, 37.613, -8.93799, -36.9469, 37.613, -8.93799, -36.9469, 37.613, -9.43799, 2.55309, 0.112999, -7.18799, 2.05309, 0.112999, -6.93799, 2.80309, 0.112999, -5.68799, 27.0531, 0.112999, -6.43799, 28.0531, 0.112999, -0.937988, 30.0531, 0.112999, -0.937988, 30.0531, 0.112999, -6.43799, 27.8031, 0.112999, -0.437988, -29.6969, 0.112999, 26.062, -18.6969, 0.112999, 26.062, -18.4469, 0.112999, 25.312, -29.6969, 0.112999, 17.062, -27.1969, 0.112999, 4.81201, -28.6969, 0.112999, 4.56201, -26.6969, 0.112999, 3.56201, -8.19691, 0.112999, 25.312, -7.94691, 0.112999, -6.93799, -8.69691, 0.112999, -7.18799, -37.6969, 37.613, -7.68799, -37.6969, 37.613, 19.562, -36.9469, 37.613, 19.562, -36.9469, 37.613, -7.68799, -7.44691, 0.112999, 30.562, 0.0530853, 0.112999, 30.562, 0.303085, 0.112999, 28.312, -7.44691, 0.112999, 25.562, 2.80309, 0.112999, 28.312, 37.0531, 0.112999, -0.937988, 37.0531, 0.112999, -6.43799, 27.8031, 0.112999, 9.06201, 10.8031, 0.112999, 28.312, -29.1969, 0.112999, 4.06201, -28.9469, 0.112999, -3.68799, -37.1969, 0.112999, -3.68799, -37.1969, 0.112999, 4.06201, 28.8031, 20.613, 0.0620117, 28.8031, 20.613, 8.56201, 38.0531, 20.613, 8.56201, 38.0531, 20.613, 0.0620117, 29.0531, 0.112999, 0.312012, 29.0531, 0.112999, 8.31201, 37.0531, 0.112999, 8.31201, 37.0531, 0.112999, 0.312012, -37.1969, 0.112999, 16.562, -29.9469, 0.112999, 16.562, 28.0531, 0.112999, 9.56201, 11.3031, 0.112999, 28.562, 11.3031, 0.112999, 37.062, 37.0531, 0.112999, 37.062, 37.0531, 0.112999, 9.56201, -41.1969, 12.363, 16.812, -39.4469, 12.363, 16.562, -43.4469, 12.363, 14.562, -43.9469, 12.363, 15.312, -33.1969, 20.613, 19.562, -32.9469, 20.613, 26.062, -30.6969, 20.613, 26.062, -30.6969, 20.613, 17.562, -39.9469, 20.613, 17.562, -39.9469, 20.613, 19.562, -32.6969, 12.363, 20.562, -30.9469, 12.363, 21.062, -30.9469, 12.363, 20.062, -33.1969, 12.363, 19.562, -36.1969, 12.363, 17.812, -38.1969, 12.363, 17.812, -34.9469, 12.363, 19.562, -37.1969, 0.112999, 17.812, -37.1969, 0.112999, 19.562, -32.9469, 0.112999, 19.812, -30.9469, 0.112999, 17.812, -32.9469, 0.112999, 25.812, -30.9469, 0.112999, 25.812, -43.1969, 43.613, 20.562, -43.1969, 43.613, 29.062, -33.9469, 43.613, 29.062, -33.9469, 43.613, 20.562, -39.9469, 20.613, 20.812, -39.9469, 20.613, 26.062, -34.1969, 20.613, 26.062, -34.1969, 20.613, 20.812, -37.6969, 37.613, 20.812, -37.6969, 37.613, 28.812, -36.9469, 37.613, 28.812, -36.9469, 37.613, 20.812, -37.1969, 0.112999, 20.812, -37.1969, 0.112999, 25.812, -34.1969, 0.112999, 25.812, -34.1969, 0.112999, 20.812, -29.6969, 12.363, 21.812, -18.6969, 12.363, 26.562, -18.6969, 12.363, 25.562, -29.6969, 12.363, 20.812, -16.4469, 0.112999, 37.062, -16.4469, 0.112999, 35.562, -18.6969, 0.112999, 35.312, -29.9469, 0.112999, 27.062, -32.9469, 0.112999, 27.062, -33.1969, 0.112999, 30.062, -37.1969, 0.112999, 30.062, -37.1969, 0.112999, 37.062, -17.6969, 20.613, 34.562, -16.1969, 20.613, 34.562, -15.9469, 20.613, 27.812, -17.6969, 20.613, 26.312, -8.44691, 20.613, 27.812, -8.44691, 20.613, 26.312, -17.4469, 0.112999, 26.562, -17.4469, 0.112999, 34.312, -8.69691, 0.112999, 34.312, -8.69691, 0.112999, 26.562, -16.1969, 12.363, 27.812, -14.1969, 12.363, 27.812, -15.6969, 12.363, 26.812, -17.4469, 12.363, 26.562, -17.4469, 12.363, 27.312, -37.1969, 0.112999, 27.062, -37.1969, 0.112999, 28.812, -34.1969, 0.112999, 28.812, -34.1969, 0.112999, 27.062, -15.1969, 50.863, 37.312, -13.1969, 50.863, 37.312, -12.9469, 50.863, 31.312, -15.1969, 50.863, 28.812, -5.94691, 50.863, 31.312, -5.94691, 50.863, 28.812, -14.9469, 20.613, 34.562, -13.1969, 20.613, 34.562, -12.9469, 20.613, 31.312, -14.9469, 20.613, 29.062, -8.44691, 20.613, 31.312, -8.44691, 20.613, 29.062, -8.69691, 12.363, 31.062, -8.69691, 12.363, 30.062, -9.44691, 12.363, 29.562, -12.9469, 12.363, 29.062, 1.05309, 20.613, 29.312, 1.05309, 20.613, 31.312, 10.3031, 20.613, 31.312, 10.3031, 20.613, 29.312, 1.30309, 0.112999, 29.562, 1.30309, 0.112999, 37.062, 10.0531, 0.112999, 37.062, 10.0531, 0.112999, 29.562, -7.69691, 0.112999, 35.562, 0.0530853, 0.112999, 37.062, -7.44691, 12.363, 30.562, -7.44691, 12.363, 31.312, -6.19691, 12.363, 31.312, -12.1969, 72.613, 32.312, -12.1969, 72.613, 40.812, 16.8031, 72.613, 40.812, 16.8031, 72.613, 32.312, -11.9469, 20.613, 32.562, -11.9469, 20.613, 34.562, -8.44691, 20.613, 34.562, -8.44691, 20.613, 32.562, -11.9469, 50.863, 32.562, -11.9469, 50.863, 37.312, -5.94691, 50.863, 37.312, -5.94691, 50.863, 32.562, 0.0530853, 12.363, 34.812, 0.0530853, 12.363, 33.812, -0.446915, 12.363, 33.562, -2.69691, 12.363, 32.562, -4.94691, 12.363, 32.562, 1.05309, 20.613, 32.562, 1.05309, 20.613, 37.812, 10.3031, 20.613, 37.812, 10.3031, 20.613, 32.562, 1.30309, 12.363, 34.562, 1.30309, 12.363, 35.562, 2.30309, 12.363, 36.062, 5.80309, 12.363, 37.562, 8.05309, 12.363, 37.562, -10.9469, 49.613, 43.312, -10.9469, 49.613, 41.812, -13.1969, 49.613, 41.562, -23.1969, 49.613, 43.312, -13.1969, 49.613, 38.312, -16.1969, 49.613, 38.062, -16.1969, 49.613, 35.062, -23.1969, 49.613, 35.062, -5.19691, 49.613, 38.312, -11.9469, 49.613, 38.312, -11.9469, 49.613, 40.562, 16.5531, 49.613, 40.562, 16.5531, 49.613, 35.062, -4.94691, 49.613, 35.062, 20.0531, 49.613, 35.062, 17.8031, 49.613, 35.062, 17.5531, 49.613, 41.812, 20.0531, 49.613, 43.312, -35.9469, 48.363, 43.312, -24.1969, 48.363, 43.312, 9.05309, 12.363, 38.812, 11.3031, 12.363, 39.812, 11.3031, 12.363, 38.812) @@ -73,94 +115,112 @@ environment = SubResource("Environment_klp4b") transform = Transform3D(-0.78152, -0.330606, 0.52908, 0, 0.848048, 0.529919, -0.62388, 0.414143, -0.662767, 0, 0, 0) shadow_enabled = true -[node name="EnemyHivemind1" type="Node3D" parent="." groups=["enemy_hivemind"]] +[node name="Level" type="Node3D" parent="." groups=["enemy_hivemind"]] script = ExtResource("5_ngmqi") -health_drop_enabled = false +room_lockdown = true +number_of_drops = 30 -[node name="spider" parent="EnemyHivemind1" instance=ExtResource("6_qmuhr")] +[node name="spider" parent="Level" instance=ExtResource("6_qmuhr")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.87933, 0, 1.40028) -[node name="spider2" parent="EnemyHivemind1" instance=ExtResource("6_qmuhr")] +[node name="spider2" parent="Level" instance=ExtResource("6_qmuhr")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.69998, 9.53674e-07, 3.9282) -[node name="spider3" parent="EnemyHivemind1" instance=ExtResource("6_qmuhr")] +[node name="spider3" parent="Level" instance=ExtResource("6_qmuhr")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.14727, -1.90735e-06, -3.3705) -[node name="spider4" parent="EnemyHivemind1" instance=ExtResource("6_qmuhr")] +[node name="spider4" parent="Level" instance=ExtResource("6_qmuhr")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -11.485, 0, 1.40028) -[node name="spider5" parent="EnemyHivemind1" instance=ExtResource("6_qmuhr")] +[node name="spider5" parent="Level" instance=ExtResource("6_qmuhr")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.66438, 9.53674e-07, 3.9282) -[node name="spider19" parent="EnemyHivemind1" instance=ExtResource("6_qmuhr")] +[node name="spider19" parent="Level" instance=ExtResource("6_qmuhr")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.555158, 20.1288, -13.5454) -[node name="spider24" parent="EnemyHivemind1" instance=ExtResource("6_qmuhr")] +[node name="spider24" parent="Level" instance=ExtResource("6_qmuhr")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.26685, 20.1288, -11.0161) -[node name="spider25" parent="EnemyHivemind1" instance=ExtResource("6_qmuhr")] +[node name="spider25" parent="Level" instance=ExtResource("6_qmuhr")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.8267, 20.1288, -12.2057) -[node name="spider26" parent="EnemyHivemind1" instance=ExtResource("6_qmuhr")] +[node name="spider26" parent="Level" instance=ExtResource("6_qmuhr")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -12.0956, 9.76406, -28.6448) -[node name="spider20" parent="EnemyHivemind1" instance=ExtResource("6_qmuhr")] +[node name="spider20" parent="Level" instance=ExtResource("6_qmuhr")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 31.9941, 20.1288, -12.0341) -[node name="spider21" parent="EnemyHivemind1" instance=ExtResource("6_qmuhr")] +[node name="spider21" parent="Level" instance=ExtResource("6_qmuhr")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 32.9991, 20.1288, 3.22339) -[node name="spider22" parent="EnemyHivemind1" instance=ExtResource("6_qmuhr")] +[node name="spider22" parent="Level" instance=ExtResource("6_qmuhr")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -31.757, 20.1288, -7.44882) -[node name="spider23" parent="EnemyHivemind1" instance=ExtResource("6_qmuhr")] +[node name="spider23" parent="Level" instance=ExtResource("6_qmuhr")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7.11419, 20.1288, 30.3185) -[node name="spider6" parent="EnemyHivemind1" instance=ExtResource("6_qmuhr")] +[node name="spider6" parent="Level" instance=ExtResource("6_qmuhr")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.21709, -1.90735e-06, -3.3705) -[node name="spider7" parent="EnemyHivemind1" instance=ExtResource("6_qmuhr")] +[node name="spider7" parent="Level" instance=ExtResource("6_qmuhr")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.91809, 0, 23.7467) -[node name="spider8" parent="EnemyHivemind1" instance=ExtResource("6_qmuhr")] +[node name="spider8" parent="Level" instance=ExtResource("6_qmuhr")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.58085, 2.86102e-06, 21.6052) -[node name="spider9" parent="EnemyHivemind1" instance=ExtResource("6_qmuhr")] +[node name="spider9" parent="Level" instance=ExtResource("6_qmuhr")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.02814, -1.36424e-12, 14.3065) -[node name="spider10" parent="EnemyHivemind1" instance=ExtResource("6_qmuhr")] +[node name="spider10" parent="Level" instance=ExtResource("6_qmuhr")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -12.6041, 1.90735e-06, 19.0773) -[node name="spider11" parent="EnemyHivemind1" instance=ExtResource("6_qmuhr")] +[node name="spider11" parent="Level" instance=ExtResource("6_qmuhr")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.78351, 2.86102e-06, 21.6052) -[node name="spider12" parent="EnemyHivemind1" instance=ExtResource("6_qmuhr")] +[node name="spider12" parent="Level" instance=ExtResource("6_qmuhr")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.33622, -1.36424e-12, 14.3065) -[node name="spider13" parent="EnemyHivemind1" instance=ExtResource("6_qmuhr")] +[node name="spider13" parent="Level" instance=ExtResource("6_qmuhr")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -30.0234, 48.4515, 1.40028) -[node name="spider14" parent="EnemyHivemind1" instance=ExtResource("6_qmuhr")] +[node name="spider14" parent="Level" instance=ExtResource("6_qmuhr")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -27.2028, 48.4515, 3.9282) -[node name="spider15" parent="EnemyHivemind1" instance=ExtResource("6_qmuhr")] +[node name="spider15" parent="Level" instance=ExtResource("6_qmuhr")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -26.7555, 48.4515, -3.3705) -[node name="spider16" parent="EnemyHivemind1" instance=ExtResource("6_qmuhr")] +[node name="spider16" parent="Level" instance=ExtResource("6_qmuhr")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -31.1425, 48.4515, 19.0773) -[node name="spider17" parent="EnemyHivemind1" instance=ExtResource("6_qmuhr")] +[node name="spider17" parent="Level" instance=ExtResource("6_qmuhr")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -28.322, 48.4515, 21.6052) -[node name="spider18" parent="EnemyHivemind1" instance=ExtResource("6_qmuhr")] +[node name="spider18" parent="Level" instance=ExtResource("6_qmuhr")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -27.8747, 48.4515, 14.3065) -[node name="EnemyHivemind2" type="Node3D" parent="." groups=["enemy_hivemind"]] -script = ExtResource("5_ngmqi") -health_drop_enabled = false +[node name="Door" type="CSGBox3D" parent="Level" node_paths=PackedStringArray("anim_player")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 26.3852, 31.9616, -34.5929) +use_collision = true +size = Vector3(16.8439, 1, 8.61108) +script = ExtResource("6_sbaq1") +anim_player = NodePath("AnimationPlayer") +door_open_start = true -[node name="spider13" parent="EnemyHivemind2" instance=ExtResource("6_qmuhr")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.42818, -4.34754, -244.334) +[node name="AnimationPlayer" type="AnimationPlayer" parent="Level/Door"] +root_node = NodePath("../..") +libraries = { +"": SubResource("AnimationLibrary_s1qpx") +} + +[node name="RoomCheck" type="Area3D" parent="Level"] +collision_layer = 2 +collision_mask = 2 +script = ExtResource("7_8ewhx") +one_way = true + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Level/RoomCheck"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 26.9144, 29.7998, -34.0515) +shape = SubResource("BoxShape3D_oood3") [node name="NavigationRegion3D" type="NavigationRegion3D" parent="."] navigation_mesh = SubResource("NavigationMesh_8aw3d") diff --git a/scripts/LevelManager.gd b/scripts/LevelManager.gd index 3272030..37b6004 100644 --- a/scripts/LevelManager.gd +++ b/scripts/LevelManager.gd @@ -138,6 +138,7 @@ func cleared(): pass func die(): + SignalBus.emit_signal("player_exiting_tree") #record stats GameGlobals.money_penalty() GameGlobals.weapon_penalty() @@ -193,7 +194,7 @@ func pickup_spawn(randomized): stamina_weight = 0 var money_weight if money_drop_enabled: - money_weight = (1.0 - clamp(float(GameGlobals.money) / float(500),0,1)) + drop_chance_minimum #fix this logic later once the economy makes sense + money_weight = 1 + drop_chance_minimum #fix this logic later once the economy makes sense else: money_weight = 0 var ammo_weight diff --git a/scripts/deposit_money.gd b/scripts/deposit_money.gd new file mode 100644 index 0000000..bdc58d7 --- /dev/null +++ b/scripts/deposit_money.gd @@ -0,0 +1,15 @@ +extends StaticBody3D + +@onready var amount: Label3D = $Amount + +# Called when the node enters the scene tree for the first time. +func _ready() -> void: + pass # Replace with function body. + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +func _process(delta: float) -> void: + pass + +func interact(): + SignalBus.emit_signal("money_deposited") diff --git a/scripts/game_globals.gd b/scripts/game_globals.gd index d2c7701..14e83ea 100644 --- a/scripts/game_globals.gd +++ b/scripts/game_globals.gd @@ -1,8 +1,8 @@ extends Node var game_loaded = false -var high_score = 0 -var money = 0 +var high_score : int = 0 +var money : int = 0 var health var held_guns = [] var current_gun_index @@ -10,9 +10,9 @@ var gun_ammo = {} var ammo_reserve = {} func _ready() -> void: - SignalBus.money_changed.connect(money_update) + SignalBus.money_deposited.connect(deposit_money) -func money_update(): +func deposit_money(): if money > high_score: high_score = money diff --git a/scripts/room_check.gd b/scripts/room_check.gd index 3d9bd90..8448da5 100644 --- a/scripts/room_check.gd +++ b/scripts/room_check.gd @@ -3,6 +3,8 @@ extends Node signal room_entered() signal room_exited() +@export var one_way = false + # Called when the node enters the scene tree for the first time. func _ready() -> void: add_to_group("room_check") @@ -13,8 +15,9 @@ func _process(delta: float) -> void: func _on_body_entered(body: Node3D) -> void: if body.is_in_group("player"): - emit_signal("room_entered") + get_parent().room_entered() func _on_body_exited(body: Node3D) -> void: - if body.is_in_group("player"): - emit_signal("room_exited") + if !one_way: + if body.is_in_group("player"): + get_parent().room_exited() diff --git a/scripts/room_manager.gd b/scripts/room_manager.gd index e44c0c8..19a0e46 100644 --- a/scripts/room_manager.gd +++ b/scripts/room_manager.gd @@ -8,10 +8,6 @@ extends Node @export var special_key_name : String @export_group("Item Drops") @export var number_of_drops = 5 -@export var ammo_drop_enabled = true -@export var stamina_drop_enabled = true -@export var health_drop_enabled = true -@export var money_drop_enabled = true var enemies = [] var doors = [] diff --git a/scripts/signal_bus.gd b/scripts/signal_bus.gd index b212cb9..90c5dbd 100644 --- a/scripts/signal_bus.gd +++ b/scripts/signal_bus.gd @@ -6,7 +6,7 @@ signal enemy_count_changed() signal game_loaded() ##PLAYER -signal money_changed() +signal money_deposited() signal player_exiting_tree() signal player_hit() signal shot_fired() diff --git a/scripts/stat_display.gd b/scripts/stat_display.gd index f73bd3d..a713f77 100644 --- a/scripts/stat_display.gd +++ b/scripts/stat_display.gd @@ -16,7 +16,7 @@ func _ready() -> void: # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta: float) -> void: gamemode.text = str(level_control.gamemode.gamemode_name) - high_score.text = str("HIGH SCORE : ",GameGlobals.high_score) + high_score.text = str("HIGH SCORE : $",GameGlobals.high_score) kills.text = "Kills : " + str(SaveLoad.enemies_killed) deaths.text = "Deaths : " + str(SaveLoad.player_deaths) shots_fired.text = "Shots Fired : " + str(SaveLoad.shots_fired) diff --git a/scripts/trackerGun.gd b/scripts/trackerGun.gd index d655722..494bd95 100644 --- a/scripts/trackerGun.gd +++ b/scripts/trackerGun.gd @@ -93,12 +93,12 @@ func _process(_delta): func reload_finished(): - if player.ammo_reserve[str(ammo_type)] >= max_ammo: - player.gun_ammo[gun_name] += max_ammo - player.ammo_reserve[str(ammo_type)] -= max_ammo + if GameGlobals.ammo_reserve[str(ammo_type)] >= max_ammo: + GameGlobals.gun_ammo[gun_name] += max_ammo + GameGlobals.ammo_reserve[str(ammo_type)] -= max_ammo else: - player.gun_ammo[gun_name] += player.ammo_reserve[str(ammo_type)] - player.ammo_reserve[str(ammo_type)] -= player.ammo_reserve[str(ammo_type)] + GameGlobals.gun_ammo[gun_name] += GameGlobals.ammo_reserve[str(ammo_type)] + GameGlobals.ammo_reserve[str(ammo_type)] -= GameGlobals.ammo_reserve[str(ammo_type)] func shoot(delta): if !anim_player.is_playing(): @@ -111,9 +111,9 @@ func shoot(delta): func fire(): - if player.gun_ammo[gun_name] > 0 and cycle_count > 0: + if GameGlobals.gun_ammo[gun_name] > 0 and cycle_count > 0: if !anim_player.is_playing(): - player.gun_ammo[gun_name] -= 1 + GameGlobals.gun_ammo[gun_name] -= 1 #audio and anims audio_fire.pitch_scale = 1 + rng.randf_range(-fire_pitch_scale_amt,fire_pitch_scale_amt) audio_fire.play() @@ -161,7 +161,7 @@ func remove_tracker(): tracker = null func check_ammo(): - if player.gun_ammo[gun_name] == 0 and player.ammo_reserve[str(ammo_type)] > 0: + if GameGlobals.gun_ammo[gun_name] == 0 and GameGlobals.ammo_reserve[str(ammo_type)] > 0: anim_player.play("reload") audio_reload.play() @@ -169,15 +169,15 @@ func reload(): if tracker != null: anim_player.play("remove_tracker") else: - if player.gun_ammo[gun_name] < max_ammo and player.gun.anim_player.get_current_animation() != "reload" and player.ammo_reserve[str(ammo_type)] > 0: + if GameGlobals.gun_ammo[gun_name] < max_ammo and player.gun.anim_player.get_current_animation() != "reload" and GameGlobals.ammo_reserve[str(ammo_type)] > 0: anim_player.play("reload") audio_reload.play() remove_tracker() if anim_player.is_playing() and anim_player.current_animation == "reload": - if player.gun_ammo[gun_name] == 0: - player.gun_ammo[gun_name] = 0 + if GameGlobals.gun_ammo[gun_name] == 0: + GameGlobals.gun_ammo[gun_name] = 0 else: - player.gun_ammo[gun_name] = 1 + GameGlobals.gun_ammo[gun_name] = 1 func spawn_mag(): var instance_mag = mag.instantiate()