diff --git a/assets/rover_level/Asteroid Rock.material b/assets/rover_level/Asteroid Rock.material new file mode 100644 index 0000000..fb65659 --- /dev/null +++ b/assets/rover_level/Asteroid Rock.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f87abdc928ec3bf753e390844305200ade924bea211e6922bde786093e6233a +size 37751367 diff --git a/assets/rover_level/Asteroid Rock_MAT.material b/assets/rover_level/Asteroid Rock_MAT.material new file mode 100644 index 0000000..7c2c3da --- /dev/null +++ b/assets/rover_level/Asteroid Rock_MAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bcbaacb97191b0b2866a08ee6cc1c878298b0bb4b5e094d0ce499678e3dc6f4a +size 37751375 diff --git a/assets/rover_level/Bulkhead_Fat_MAT.material b/assets/rover_level/Bulkhead_Fat_MAT.material new file mode 100644 index 0000000..5b4c0f7 --- /dev/null +++ b/assets/rover_level/Bulkhead_Fat_MAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:60c1f4179ab2e3b2e34c1db3f19895fa6e0f091b4f29d2e9817e8c1aa8e15324 +size 3148762 diff --git a/assets/rover_level/Bulkhead_Short_MAT.material b/assets/rover_level/Bulkhead_Short_MAT.material new file mode 100644 index 0000000..4c0e2c3 --- /dev/null +++ b/assets/rover_level/Bulkhead_Short_MAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0fbfb2d9d8439edf690f817fddbef7a445183a65750640d2bc05409c836f2adc +size 3148766 diff --git a/assets/rover_level/Bulkhead_Tall_MAT.material b/assets/rover_level/Bulkhead_Tall_MAT.material new file mode 100644 index 0000000..18062d3 --- /dev/null +++ b/assets/rover_level/Bulkhead_Tall_MAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:997b6c3f8db7ba46d1e2fb102359feaffe8dd73a2e0e5100aebbb906543c2651 +size 3148764 diff --git a/assets/rover_level/CubeS01_MAT.material b/assets/rover_level/CubeS01_MAT.material new file mode 100644 index 0000000..f237a70 --- /dev/null +++ b/assets/rover_level/CubeS01_MAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f90b48862168b8d61a3dfdb01ef1ee7611d0d1a6141e3e8153e158c1d9082a83 +size 3148752 diff --git a/assets/rover_level/Hallway_MAT.material b/assets/rover_level/Hallway_MAT.material new file mode 100644 index 0000000..59bb65d --- /dev/null +++ b/assets/rover_level/Hallway_MAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:96d4db50c4d9faa96021bdb90479a9db84417746f3ac4a220e0ce55647b0db82 +size 2361895 diff --git a/assets/rover_level/Material_001.material b/assets/rover_level/Material_001.material new file mode 100644 index 0000000..3755e23 --- /dev/null +++ b/assets/rover_level/Material_001.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5a33a9e37afaa90fade714942617d649d8466849ca62130d64e98d6b524e558 +size 1686 diff --git a/assets/rover_level/Moulding_SlightlyShorter_MAT_001.material b/assets/rover_level/Moulding_SlightlyShorter_MAT_001.material new file mode 100644 index 0000000..f725ed1 --- /dev/null +++ b/assets/rover_level/Moulding_SlightlyShorter_MAT_001.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3fc619905560e57e09fc381ef742bd23b9b2bf7211e8d87a224e5daea2435eb5 +size 2361937 diff --git a/assets/rover_level/RoverGame.glb b/assets/rover_level/RoverGame.glb index 846deab..8c0390a 100644 --- a/assets/rover_level/RoverGame.glb +++ b/assets/rover_level/RoverGame.glb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2411175fd66610c96fb4382d5a4350661233bc7ac2f72868490d3bc086ec97e3 -size 1272464 +oid sha256:80693e73d7a980c949427a0be13b62a9c1e59bd7025dd4d7e7a97a467bf5fe7b +size 14840016 diff --git a/assets/rover_level/WallBox_MAT.material b/assets/rover_level/WallBox_MAT.material new file mode 100644 index 0000000..d06bc76 --- /dev/null +++ b/assets/rover_level/WallBox_MAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f87a7b8bef38f251cc6a033f7748496dbb4c1caaf5290c163fd90c65166d4858 +size 3148752 diff --git a/assets/rover_level/WallCables_MAT.material b/assets/rover_level/WallCables_MAT.material new file mode 100644 index 0000000..257c2ed --- /dev/null +++ b/assets/rover_level/WallCables_MAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d1c3c522caff4c761d4a7d3cec3968a11f1965f1c14deacc19d818a7eeaac634 +size 2361901 diff --git a/assets/rover_level/Wall_ShorterStraighter_MAT.material b/assets/rover_level/Wall_ShorterStraighter_MAT.material new file mode 100644 index 0000000..a83f0f5 --- /dev/null +++ b/assets/rover_level/Wall_ShorterStraighter_MAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f88fa28d9d6d5038eef90d0fb1205122cdaf45246fe015f6b022a333bbf2683 +size 2361925 diff --git a/assets/rover_level/Wall_SlightlyShorter_MAT_001.material b/assets/rover_level/Wall_SlightlyShorter_MAT_001.material new file mode 100644 index 0000000..e96c994 --- /dev/null +++ b/assets/rover_level/Wall_SlightlyShorter_MAT_001.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:58614c230c2ee1c09e22947bd4cebe2f02874ab79c63ac0ef5dfd563ce9b2c61 +size 2361929 diff --git a/scenes/rover_game.tscn b/scenes/rover_game.tscn index c63d4e5..4de2131 100644 --- a/scenes/rover_game.tscn +++ b/scenes/rover_game.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=13 format=2] +[gd_scene load_steps=14 format=2] [ext_resource path="res://scenes/rover.tscn" type="PackedScene" id=1] +[ext_resource path="res://assets/UI/Timers.png" type="Texture" id=2] [ext_resource path="res://assets/rover_level/RoverGame.glb" type="PackedScene" id=4] [ext_resource path="res://scripts/rover_camera.gd" type="Script" id=5] [ext_resource path="res://scripts/rover_game.gd" type="Script" id=6] @@ -8,7 +9,7 @@ [ext_resource path="res://assets/rover_level/Arrow_MAT.tres" type="Material" id=9] [sub_resource type="BoxShape" id=7] -extents = Vector3( 2.00704, 1, 1 ) +extents = Vector3( 3.5, 2, 1 ) [sub_resource type="Environment" id=5] background_mode = 2 @@ -46,7 +47,7 @@ surfaces/0 = { [node name="rover_game" type="Spatial"] script = ExtResource( 6 ) -play_time = 45.0 +play_time = 25.0 arrow_viz_distance = 15.0 geode_loot_count_per_chance = { 1: 40, @@ -58,7 +59,7 @@ __meta__ = { "_edit_group_": true } -[node name="Arrow" parent="RoverGame" index="7"] +[node name="Arrow001" parent="RoverGame" index="56"] visible = false [node name="rover" parent="." instance=ExtResource( 1 )] @@ -76,7 +77,7 @@ current = true script = ExtResource( 5 ) [node name="collection_area" type="Area" parent="."] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -2.988 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.95935, -2.988 ) collision_layer = 0 collision_mask = 32 @@ -99,6 +100,7 @@ one_shot = true autostart = true [node name="UI" type="CanvasLayer" parent="."] +layer = 10 [node name="Control" type="Control" parent="UI"] anchor_right = 1.0 @@ -106,13 +108,29 @@ anchor_bottom = 1.0 [node name="progress_bar" type="ProgressBar" parent="UI/Control"] unique_name_in_owner = true -anchor_left = 0.295312 -anchor_right = 0.704687 -anchor_bottom = 0.0398148 +anchor_left = 1.0 +anchor_top = 1.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = -49.0 +margin_top = 4.0 +margin_right = 681.0 +margin_bottom = 47.0 +rect_rotation = -90.0 +rect_pivot_offset = Vector2( 1.0874, -4 ) custom_colors/font_color = Color( 0, 0, 0, 0 ) custom_styles/fg = SubResource( 12 ) custom_styles/bg = SubResource( 13 ) value = 75.0 + +[node name="HUD" type="TextureRect" parent="UI/Control"] +visible = false +anchor_left = 0.610937 +anchor_top = -0.00740741 +anchor_right = 1.0 +anchor_bottom = 0.126852 +texture = ExtResource( 2 ) +expand = true __meta__ = { "_edit_use_anchors_": true } @@ -120,137 +138,35 @@ __meta__ = { [node name="spawn locations" type="Spatial" parent="."] [node name="spawn_location" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 72.8999 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -13.8043, 0, 40.6835 ) [node name="spawn_location2" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -14.1474, 0, 86.0569 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -27.9517, 0, 53.8405 ) [node name="spawn_location3" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 18.2501, 0, 95.3941 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 4.44575, 0, 63.1777 ) [node name="spawn_location4" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.749908, 0, 103.394 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -14.5543, 0, 71.1776 ) [node name="spawn_location5" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 15.2501, 0, 78.3941 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 1.44575, 0, 46.1777 ) [node name="spawn_location6" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 17.7966, 0, 55.7584 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 3.99225, 0, 23.542 ) [node name="spawn_location7" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -23.0892, 0, 38.7815 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -22.1687, 0, 17.8606 ) [node name="spawn_location8" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -23.0892, 0, 38.7815 ) -[node name="spawn_location9" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 9.46336, 0, 135.092 ) - -[node name="spawn_location10" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.483337, 0, 158.441 ) - -[node name="spawn_location11" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 19.4833, 0, 182.441 ) - -[node name="spawn_location12" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -22.4983, 0, 220.83 ) - -[node name="spawn_location13" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 5.50166, 0, 220.83 ) - -[node name="spawn_location14" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -18.9689, 0, 237.892 ) - -[node name="spawn_location15" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -7.7439, 0, 291.772 ) - -[node name="spawn_location16" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 22.1147, 0, 283.915 ) - -[node name="spawn_location17" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 27.9517, 0, 325.897 ) - -[node name="spawn_location18" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 13.1347, 0, 352.388 ) - -[node name="spawn_location19" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -17.1729, 0, 361.368 ) - -[node name="spawn_location20" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -4.60088, 0, 378.654 ) - -[node name="spawn_location21" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 17.6247, 0, 374.164 ) - -[node name="spawn_location22" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 17.6247, 0, 374.164 ) - -[node name="spawn_location23" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -9.0909, 0, 404.921 ) - -[node name="spawn_location24" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -22.7855, 0, 420.86 ) - -[node name="spawn_location25" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -14.4789, 0, 436.351 ) - -[node name="spawn_location26" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.00888, 0, 453.862 ) - -[node name="spawn_location27" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 6.17516, 0, 438.147 ) - -[node name="spawn_location28" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 21.2167, 0, 457.005 ) - -[node name="spawn_location29" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 15.6042, 0, 469.802 ) - -[node name="spawn_location30" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 25.0332, 0, 496.517 ) - -[node name="spawn_location31" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 9.99167, 0, 513.355 ) - -[node name="spawn_location32" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -18.0709, 0, 527.049 ) - -[node name="spawn_location33" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -20.0709, 0, 545.049 ) - -[node name="spawn_location34" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -20.0709, 0, 545.049 ) - -[node name="spawn_location35" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 30.2172, 0, 526.865 ) - -[node name="spawn_location36" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 13.2172, 0, 528.865 ) - -[node name="spawn_location37" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -17.0904, 0, 605.195 ) - -[node name="spawn_location38" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.701813, 0, 602.725 ) - -[node name="spawn_location39" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 15.0132, 0, 626.747 ) - -[node name="spawn_location40" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 24.8913, 0, 643.585 ) - -[node name="spawn_location41" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 15.0132, 0, 664.688 ) - -[node name="spawn_location42" type="Position3D" parent="spawn locations" groups=["rock_spawn_location"]] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 17.4828, 0, 603.399 ) - [node name="DirectionalLight" type="DirectionalLight" parent="."] transform = Transform( 0.866025, 2.18557e-08, -0.5, 0.5, -3.78552e-08, 0.866025, 0, -1, -4.37114e-08, 0, 87.952, 53 ) shadow_enabled = true [node name="exit_trigger" type="Area" parent="."] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1.25529, 0, 0.225982, -7.17776 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1.25529, 0, 0.225982, -4.96855 ) collision_layer = 64 collision_mask = 2 diff --git a/scripts/rover_game.gd b/scripts/rover_game.gd index 64b8625..286df2a 100644 --- a/scripts/rover_game.gd +++ b/scripts/rover_game.gd @@ -21,7 +21,7 @@ var loot_table : SimpleLootTable = null func _ready(): loot_table = LootTable.new(geode_loot_count_per_chance) timer.start(play_time) - spawn_rocks(10) + spawn_rocks(4) func spawn_rocks(count: int): var locations: Array = get_tree().get_nodes_in_group("rock_spawn_location")