diff --git a/CREDITS.md b/CREDITS.md index 3360712..a6bcdb7 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -2,5 +2,9 @@ # Materials -https://ambientcg.com/view?id=Concrete042A +- https://ambientcg.com/view?id=Concrete042A +# Sounds + +- https://freesound.org/people/craigsmith/sounds/483320/ +- https://freesound.org/people/Logicogonist/sounds/685293/ \ No newline at end of file diff --git a/blender/explosion/explosion.blend b/blender/explosion/explosion.blend new file mode 100644 index 0000000..fde77a5 Binary files /dev/null and b/blender/explosion/explosion.blend differ diff --git a/blender/explosion/explosion.blend1 b/blender/explosion/explosion.blend1 new file mode 100644 index 0000000..5ae3516 Binary files /dev/null and b/blender/explosion/explosion.blend1 differ diff --git a/blender/explosion/explosion.glb b/blender/explosion/explosion.glb new file mode 100644 index 0000000..7c69274 Binary files /dev/null and b/blender/explosion/explosion.glb differ diff --git a/blender/player/player.blend b/blender/player/player.blend new file mode 100644 index 0000000..6fd9e87 Binary files /dev/null and b/blender/player/player.blend differ diff --git a/blender/player/player.blend1 b/blender/player/player.blend1 new file mode 100644 index 0000000..090aca0 Binary files /dev/null and b/blender/player/player.blend1 differ diff --git a/blender/player/player.glb b/blender/player/player.glb new file mode 100644 index 0000000..5506232 Binary files /dev/null and b/blender/player/player.glb differ diff --git a/blender/player/player_0.glb b/blender/player/player_0.glb new file mode 100644 index 0000000..237ebb5 Binary files /dev/null and b/blender/player/player_0.glb differ diff --git a/blender/player/player_1.glb b/blender/player/player_1.glb new file mode 100644 index 0000000..d3df8a0 Binary files /dev/null and b/blender/player/player_1.glb differ diff --git a/blender/player/player_2.glb b/blender/player/player_2.glb new file mode 100644 index 0000000..cecb71a Binary files /dev/null and b/blender/player/player_2.glb differ diff --git a/blender/player/player_3.glb b/blender/player/player_3.glb new file mode 100644 index 0000000..2c601cd Binary files /dev/null and b/blender/player/player_3.glb differ diff --git a/godot/assets/models/explosion/explosion.glb b/godot/assets/models/explosion/explosion.glb new file mode 100644 index 0000000..7c69274 Binary files /dev/null and b/godot/assets/models/explosion/explosion.glb differ diff --git a/godot/assets/models/explosion/explosion.glb.import b/godot/assets/models/explosion/explosion.glb.import new file mode 100644 index 0000000..f7cd3f8 --- /dev/null +++ b/godot/assets/models/explosion/explosion.glb.import @@ -0,0 +1,37 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://cubknyjl31o2m" +path="res://.godot/imported/explosion.glb-1f501a38e1c1452aeb8de7e1f5a875fe.scn" + +[deps] + +source_file="res://assets/models/explosion/explosion.glb" +dest_files=["res://.godot/imported/explosion.glb-1f501a38e1c1452aeb8de7e1f5a875fe.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +_subresources={} +gltf/naming_version=1 +gltf/embedded_image_handling=1 diff --git a/godot/assets/models/players/player_0.glb b/godot/assets/models/players/player_0.glb new file mode 100644 index 0000000..237ebb5 Binary files /dev/null and b/godot/assets/models/players/player_0.glb differ diff --git a/godot/assets/models/players/player_0.glb.import b/godot/assets/models/players/player_0.glb.import new file mode 100644 index 0000000..737d221 --- /dev/null +++ b/godot/assets/models/players/player_0.glb.import @@ -0,0 +1,37 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://bw8hdj4fbkpbs" +path="res://.godot/imported/player_0.glb-459ffdca05f49eb86f49cd4837385ecc.scn" + +[deps] + +source_file="res://assets/models/players/player_0.glb" +dest_files=["res://.godot/imported/player_0.glb-459ffdca05f49eb86f49cd4837385ecc.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +_subresources={} +gltf/naming_version=1 +gltf/embedded_image_handling=1 diff --git a/godot/assets/models/players/player_1.glb b/godot/assets/models/players/player_1.glb new file mode 100644 index 0000000..d3df8a0 Binary files /dev/null and b/godot/assets/models/players/player_1.glb differ diff --git a/godot/assets/models/players/player_1.glb.import b/godot/assets/models/players/player_1.glb.import new file mode 100644 index 0000000..c373481 --- /dev/null +++ b/godot/assets/models/players/player_1.glb.import @@ -0,0 +1,37 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://b4gm46vd64nt2" +path="res://.godot/imported/player_1.glb-dc138018169699f7b689f37a091a8921.scn" + +[deps] + +source_file="res://assets/models/players/player_1.glb" +dest_files=["res://.godot/imported/player_1.glb-dc138018169699f7b689f37a091a8921.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +_subresources={} +gltf/naming_version=1 +gltf/embedded_image_handling=1 diff --git a/godot/assets/models/players/player_2.glb b/godot/assets/models/players/player_2.glb new file mode 100644 index 0000000..cecb71a Binary files /dev/null and b/godot/assets/models/players/player_2.glb differ diff --git a/godot/assets/models/players/player_2.glb.import b/godot/assets/models/players/player_2.glb.import new file mode 100644 index 0000000..48ae556 --- /dev/null +++ b/godot/assets/models/players/player_2.glb.import @@ -0,0 +1,37 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://cvvi0laaw1yf" +path="res://.godot/imported/player_2.glb-3362a11afd3a12e5a49f791b2f5d1dfc.scn" + +[deps] + +source_file="res://assets/models/players/player_2.glb" +dest_files=["res://.godot/imported/player_2.glb-3362a11afd3a12e5a49f791b2f5d1dfc.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +_subresources={} +gltf/naming_version=1 +gltf/embedded_image_handling=1 diff --git a/godot/assets/models/players/player_3.glb b/godot/assets/models/players/player_3.glb new file mode 100644 index 0000000..2c601cd Binary files /dev/null and b/godot/assets/models/players/player_3.glb differ diff --git a/godot/assets/models/players/player_3.glb.import b/godot/assets/models/players/player_3.glb.import new file mode 100644 index 0000000..f9e3718 --- /dev/null +++ b/godot/assets/models/players/player_3.glb.import @@ -0,0 +1,37 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://giuhccerhqit" +path="res://.godot/imported/player_3.glb-847ac6a3c0eaf5400783be1d6fa890fc.scn" + +[deps] + +source_file="res://assets/models/players/player_3.glb" +dest_files=["res://.godot/imported/player_3.glb-847ac6a3c0eaf5400783be1d6fa890fc.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +_subresources={} +gltf/naming_version=1 +gltf/embedded_image_handling=1 diff --git a/godot/assets/models/room/player_0.glb b/godot/assets/models/room/player_0.glb new file mode 100644 index 0000000..237ebb5 Binary files /dev/null and b/godot/assets/models/room/player_0.glb differ diff --git a/godot/assets/models/room/player_0.glb.import b/godot/assets/models/room/player_0.glb.import new file mode 100644 index 0000000..eb06c45 --- /dev/null +++ b/godot/assets/models/room/player_0.glb.import @@ -0,0 +1,37 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://drc5sqtc36yeh" +path="res://.godot/imported/player_0.glb-d643fda896969869c8e410b3382f73de.scn" + +[deps] + +source_file="res://assets/models/room/player_0.glb" +dest_files=["res://.godot/imported/player_0.glb-d643fda896969869c8e410b3382f73de.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +_subresources={} +gltf/naming_version=1 +gltf/embedded_image_handling=1 diff --git a/godot/assets/models/room/player_1.glb b/godot/assets/models/room/player_1.glb new file mode 100644 index 0000000..d3df8a0 Binary files /dev/null and b/godot/assets/models/room/player_1.glb differ diff --git a/godot/assets/models/room/player_1.glb.import b/godot/assets/models/room/player_1.glb.import new file mode 100644 index 0000000..e899c2b --- /dev/null +++ b/godot/assets/models/room/player_1.glb.import @@ -0,0 +1,37 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://erm6ou6ov4p7" +path="res://.godot/imported/player_1.glb-22c133d518d32fb408e4332fa2fddcec.scn" + +[deps] + +source_file="res://assets/models/room/player_1.glb" +dest_files=["res://.godot/imported/player_1.glb-22c133d518d32fb408e4332fa2fddcec.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +_subresources={} +gltf/naming_version=1 +gltf/embedded_image_handling=1 diff --git a/godot/assets/models/room/player_2.glb b/godot/assets/models/room/player_2.glb new file mode 100644 index 0000000..cecb71a Binary files /dev/null and b/godot/assets/models/room/player_2.glb differ diff --git a/godot/assets/models/room/player_2.glb.import b/godot/assets/models/room/player_2.glb.import new file mode 100644 index 0000000..f45d110 --- /dev/null +++ b/godot/assets/models/room/player_2.glb.import @@ -0,0 +1,37 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://bnjph6ws24pyf" +path="res://.godot/imported/player_2.glb-170da16e3a65903a2209565584a99f23.scn" + +[deps] + +source_file="res://assets/models/room/player_2.glb" +dest_files=["res://.godot/imported/player_2.glb-170da16e3a65903a2209565584a99f23.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +_subresources={} +gltf/naming_version=1 +gltf/embedded_image_handling=1 diff --git a/godot/assets/models/room/player_3.glb b/godot/assets/models/room/player_3.glb new file mode 100644 index 0000000..2c601cd Binary files /dev/null and b/godot/assets/models/room/player_3.glb differ diff --git a/godot/assets/models/room/player_3.glb.import b/godot/assets/models/room/player_3.glb.import new file mode 100644 index 0000000..a8e44f4 --- /dev/null +++ b/godot/assets/models/room/player_3.glb.import @@ -0,0 +1,37 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://cbyoa8vc82pnn" +path="res://.godot/imported/player_3.glb-e0299aa720d760d583e939c20afc3b69.scn" + +[deps] + +source_file="res://assets/models/room/player_3.glb" +dest_files=["res://.godot/imported/player_3.glb-e0299aa720d760d583e939c20afc3b69.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +_subresources={} +gltf/naming_version=1 +gltf/embedded_image_handling=1 diff --git a/godot/assets/sounds/explode.wav b/godot/assets/sounds/explode.wav new file mode 100644 index 0000000..40d3bfb Binary files /dev/null and b/godot/assets/sounds/explode.wav differ diff --git a/godot/assets/sounds/explode.wav.import b/godot/assets/sounds/explode.wav.import new file mode 100644 index 0000000..48a4d8d --- /dev/null +++ b/godot/assets/sounds/explode.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://c3cvjsmsh7dxu" +path="res://.godot/imported/explode.wav-cb0136e47d487cee4af4df7a0f4a65d8.sample" + +[deps] + +source_file="res://assets/sounds/explode.wav" +dest_files=["res://.godot/imported/explode.wav-cb0136e47d487cee4af4df7a0f4a65d8.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/godot/assets/sounds/fuse.ogg b/godot/assets/sounds/fuse.ogg new file mode 100644 index 0000000..6be819f Binary files /dev/null and b/godot/assets/sounds/fuse.ogg differ diff --git a/godot/assets/sounds/fuse.ogg.import b/godot/assets/sounds/fuse.ogg.import new file mode 100644 index 0000000..b8cbd3b --- /dev/null +++ b/godot/assets/sounds/fuse.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://dr7lcpc6737hx" +path="res://.godot/imported/fuse.ogg-7d54465464d7b04057a763fb3998cd58.oggvorbisstr" + +[deps] + +source_file="res://assets/sounds/fuse.ogg" +dest_files=["res://.godot/imported/fuse.ogg-7d54465464d7b04057a763fb3998cd58.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/godot/main_scenes/game.tscn b/godot/main_scenes/game.tscn index 4be171d..157f657 100644 --- a/godot/main_scenes/game.tscn +++ b/godot/main_scenes/game.tscn @@ -1,7 +1,11 @@ -[gd_scene load_steps=4 format=3 uid="uid://bqokbcqplgrgp"] +[gd_scene load_steps=8 format=3 uid="uid://bqokbcqplgrgp"] [ext_resource type="PackedScene" uid="uid://bovc5oog85hic" path="res://assets/models/room/room.glb" id="1_wwb56"] [ext_resource type="Script" uid="uid://doxajvf15fv27" path="res://scripts/camera.gd" id="2_joe7c"] +[ext_resource type="PackedScene" uid="uid://bw8hdj4fbkpbs" path="res://assets/models/players/player_0.glb" id="3_ofkbr"] +[ext_resource type="PackedScene" uid="uid://b4gm46vd64nt2" path="res://assets/models/players/player_1.glb" id="4_is35i"] +[ext_resource type="PackedScene" uid="uid://cvvi0laaw1yf" path="res://assets/models/players/player_2.glb" id="5_8vhnl"] +[ext_resource type="PackedScene" uid="uid://giuhccerhqit" path="res://assets/models/players/player_3.glb" id="6_8vhnl"] [sub_resource type="Environment" id="Environment_wwb56"] background_mode = 1 @@ -31,7 +35,21 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.97658, 0) light_energy = 2.385 omni_range = 11.934 +[node name="players" type="Node3D" parent="."] + +[node name="player_0" parent="players" instance=ExtResource("3_ofkbr")] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 0, -4) + +[node name="player_1" parent="players" instance=ExtResource("4_is35i")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4, 0, 0) + +[node name="player_2" parent="players" instance=ExtResource("5_8vhnl")] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, 4) + +[node name="player_3" parent="players" instance=ExtResource("6_8vhnl")] +transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 4, 0, 0) + [node name="Camera3D" type="Camera3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 0.866025, 0.5, 0, -0.5, 0.866025, 0, 4.06928, 0) +transform = Transform3D(1, 0, 0, 0, 0.910084, 0.414423, 0, -0.414423, 0.910084, 0, 3.4199, 0) fov = 60.0 script = ExtResource("2_joe7c") diff --git a/godot/project.godot b/godot/project.godot index 18f44a3..6af61ce 100644 --- a/godot/project.godot +++ b/godot/project.godot @@ -18,3 +18,8 @@ config/icon="res://icon.svg" [autoload] GLOBALVARS="*res://scripts/globalvars.gd" + +[display] + +window/size/viewport_width=1920 +window/size/viewport_height=1080 diff --git a/godot/scripts/camera.gd b/godot/scripts/camera.gd index 22f9ec1..833f074 100644 --- a/godot/scripts/camera.gd +++ b/godot/scripts/camera.gd @@ -1,11 +1,15 @@ extends Camera3D -var target_angle:int -var current_angle:int +var target_angle:float # the position where the camera needs to be +var current_angle:float # the position where the camera currently is func _physics_process(_delta: float) -> void: - target_angle = GLOBALVARS.selected_player * 90 + ''' + Controls where the camera is pointed based on which player is selected + ''' + + target_angle = abs(GLOBALVARS.selected_player) * 90 if current_angle != target_angle: - current_angle += 0.001*(target_angle-current_angle) + current_angle += 0.1*(target_angle-current_angle) global_rotation_degrees.y = current_angle