diff --git a/3D Input/gravestone_3_neu.glb b/3D Input/gravestone_3_neu.glb new file mode 100644 index 0000000..89b263a Binary files /dev/null and b/3D Input/gravestone_3_neu.glb differ diff --git a/3D Input/imker unwrapped.blend b/3D Input/imker unwrapped.blend index b661c9b..ba79361 100644 Binary files a/3D Input/imker unwrapped.blend and b/3D Input/imker unwrapped.blend differ diff --git a/3D Input/imker unwrapped.blend1 b/3D Input/imker unwrapped.blend1 new file mode 100644 index 0000000..7d88cea Binary files /dev/null and b/3D Input/imker unwrapped.blend1 differ diff --git a/3D Input/imkertextur.png b/3D Input/imkertextur.png new file mode 100644 index 0000000..b46be5c Binary files /dev/null and b/3D Input/imkertextur.png differ diff --git a/3D Input/textures_painter/gravestone3_None_AlbedoTransparency.png b/3D Input/textures_painter/gravestone3_None_AlbedoTransparency.png new file mode 100644 index 0000000..492cea2 Binary files /dev/null and b/3D Input/textures_painter/gravestone3_None_AlbedoTransparency.png differ diff --git a/3D Input/textures_painter/gravestone3_None_MetallicSmoothness.png b/3D Input/textures_painter/gravestone3_None_MetallicSmoothness.png new file mode 100644 index 0000000..51f6770 Binary files /dev/null and b/3D Input/textures_painter/gravestone3_None_MetallicSmoothness.png differ diff --git a/3D Input/textures_painter/gravestone3_None_Normal.png b/3D Input/textures_painter/gravestone3_None_Normal.png new file mode 100644 index 0000000..56f43e9 Binary files /dev/null and b/3D Input/textures_painter/gravestone3_None_Normal.png differ diff --git a/Audio/graveyard.wav b/Audio/graveyard.wav new file mode 100644 index 0000000..ebcf09a Binary files /dev/null and b/Audio/graveyard.wav differ diff --git a/Audio/graveyard.wav.import b/Audio/graveyard.wav.import new file mode 100644 index 0000000..a3c93b9 --- /dev/null +++ b/Audio/graveyard.wav.import @@ -0,0 +1,21 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/graveyard.wav-a3f29437a61ae18b7dcd198b3bfa6c23.sample" + +[deps] + +source_file="res://Audio/graveyard.wav" +dest_files=[ "res://.import/graveyard.wav-a3f29437a61ae18b7dcd198b3bfa6c23.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=true +compress/mode=0 diff --git a/BodyConfig/bodyBuildingScript.gd b/BodyConfig/bodyBuildingScript.gd index 553f457..2deeb58 100644 --- a/BodyConfig/bodyBuildingScript.gd +++ b/BodyConfig/bodyBuildingScript.gd @@ -47,6 +47,8 @@ func _ready(): _torso.get_node("UpFrontRight").key = KEY_R _torso.get_node("UpBackLeft").key = KEY_W _torso.get_node("UpBackRight").key = KEY_Q + + _torso.get_node("Head").key = KEY_C func change_count_ui(): @@ -66,6 +68,8 @@ func change_count_ui(): _torso.get_node("UpFrontRight").key = KEY_U _torso.get_node("UpBackLeft").key = KEY_I _torso.get_node("UpBackRight").key = KEY_O + + _torso.get_node("Head").key = KEY_M func _process(delta): @@ -119,15 +123,15 @@ func _input(event): if event is InputEventMouseButton: if event.pressed: if _viewport.get_viewport().get_mouse_position().x >= 0: - if event.button_index == BUTTON_WHEEL_UP and _attachment_point != null: - if _attachment_point.get_node("Limb") != null: - _attachment_point.get_node("Limb").rotate_z(0.1) - elif event.button_index == BUTTON_WHEEL_DOWN and _attachment_point != null: - if _attachment_point.get_node("Limb") != null: - _attachment_point.get_node("Limb").rotate_z(-0.1) - else: - _prev_mouse_pos = event.position - _viewRot = true +# if event.button_index == BUTTON_WHEEL_UP and _attachment_point != null: +# if _attachment_point.get_node("Limb") != null: +# _attachment_point.get_node("Limb").rotate_z(0.1) +# elif event.button_index == BUTTON_WHEEL_DOWN and _attachment_point != null: +# if _attachment_point.get_node("Limb") != null: +# _attachment_point.get_node("Limb").rotate_z(-0.1) +# else: + _prev_mouse_pos = event.position + _viewRot = true else: _viewRot = false diff --git a/BodyParts/BullHead.tscn b/BodyParts/BullHead.tscn index d11e24c..ee089b9 100644 --- a/BodyParts/BullHead.tscn +++ b/BodyParts/BullHead.tscn @@ -15,7 +15,7 @@ albedo_texture = ExtResource( 4 ) transform = Transform( -1, 3.25841e-07, 0, 5.30863e-14, 1.62921e-07, -1, -3.25841e-07, -1, -1.62921e-07, 0, -3.28412, 0.289329 ) script = ExtResource( 2 ) cost = 35.0 -damage = 30.0 +damage = 40.0 [node name="TouchArea" parent="." index="1"] transform = Transform( -1.71568, 8.52651e-14, 1.49989e-07, 1.27871e-07, -0.89673, 1.46268, 7.83945e-08, 1.46267, 0.89673, -0.002635, -0.0220304, -0.00495291 ) diff --git a/BodyParts/ChickenHead.tscn b/BodyParts/ChickenHead.tscn index b8220ca..1b2abce 100644 --- a/BodyParts/ChickenHead.tscn +++ b/BodyParts/ChickenHead.tscn @@ -18,13 +18,15 @@ albedo_texture = ExtResource( 3 ) [node name="PushingBodyPart" instance=ExtResource( 2 )] transform = Transform( 1.59259e-14, 9.77524e-08, -0.6, 0.6, -9.77524e-08, 0, -9.77524e-08, -0.6, -9.77524e-08, 0, -1.20668, -0.531835 ) script = ExtResource( 4 ) +cost = 15.0 +damage = 7.0 [node name="PartCollider" parent="." index="0"] transform = Transform( 0.915992, 6.53632e-08, -0.401197, 0.401197, -1.49234e-07, 0.915992, 1.42109e-14, -1, -1.62921e-07, 0, 0, 0 ) shape = SubResource( 1 ) [node name="TouchArea" parent="." index="1"] -transform = Transform( 0.850008, -0.52677, 6.77808e-09, 0.52677, 0.850008, -6.12467e-09, -2.53514e-09, 8.77651e-09, 1, 0.080676, 1.20809, 0.184276 ) +transform = Transform( 0.850008, -0.52677, 6.77808e-09, 0.52677, 0.850008, -6.12467e-09, -2.53513e-09, 8.77651e-09, 1, 0.080676, 1.20809, 0.184276 ) [node name="CollisionShape" type="CollisionShape" parent="TouchArea" index="0"] transform = Transform( 1, -2.22497e-17, 2.22045e-16, -2.22497e-17, 1, 8.88178e-16, -4.44089e-16, -8.88178e-16, 1, 0, 0, 0 ) diff --git a/BodyParts/Wings.gd b/BodyParts/Wings.gd index 959f4e3..f6a3f6b 100644 --- a/BodyParts/Wings.gd +++ b/BodyParts/Wings.gd @@ -15,7 +15,7 @@ func action(): anim.play("ArmatureAction") var offset = transform.basis.xform(Vector3.ZERO) - var direction = (-base.transform.basis.z).normalized() * 30.0 + var direction = (-base.transform.basis.z).normalized() * 20.0 base.apply_impulse(offset, direction) diff --git a/BodyParts/Wings.tscn b/BodyParts/Wings.tscn index 79e9bd0..455138f 100644 --- a/BodyParts/Wings.tscn +++ b/BodyParts/Wings.tscn @@ -8,9 +8,9 @@ extents = Vector3( 2.75562, 0.605394, 2.0419 ) [node name="Wings" instance=ExtResource( 2 )] -transform = Transform( 0.440754, -0.897628, 0, 0.897628, 0.440754, 0, 0, 0, 1, 0, 0, 0 ) +transform = Transform( 0.193412, -0.981118, 0, 0.981118, 0.193412, 0, 0, 0, 1, 0, 0, 0 ) script = ExtResource( 3 ) -cost = 30.0 +cost = 25.0 [node name="PartCollider" parent="." index="0"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -2.80638 ) @@ -20,7 +20,7 @@ shape = SubResource( 1 ) transform = Transform( -0.517952, -0.85541, 1.14363e-07, 4.41231e-09, 1.31023e-07, 1, -0.85541, 0.517952, -6.40892e-08, 1.08802, 0.236862, -3.57712 ) [node name="Timer" type="Timer" parent="." index="3"] -wait_time = 1.5 +wait_time = 2.5 one_shot = true [editable path="Mesh"] diff --git a/Ingame/CameraFocus.gd b/Ingame/CameraFocus.gd index 4b9b26a..07b9006 100644 --- a/Ingame/CameraFocus.gd +++ b/Ingame/CameraFocus.gd @@ -16,8 +16,8 @@ func _ready(): func _process(delta: float) -> void: - var player1 = get_parent().get_child(3) - var player2 = get_parent().get_child(4) + var player1 = get_parent().get_child(4) + var player2 = get_parent().get_child(5) if not player1 and player2: return diff --git a/Ingame/Testing.tscn b/Ingame/Testing.tscn index 37f9764..129bcdd 100644 --- a/Ingame/Testing.tscn +++ b/Ingame/Testing.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=9 format=2] +[gd_scene load_steps=10 format=2] [ext_resource path="res://Resources/Fonts/MenuTextFont.tres" type="DynamicFont" id=1] [ext_resource path="res://UI/UI.tscn" type="PackedScene" id=2] @@ -8,6 +8,7 @@ [ext_resource path="res://Ingame/CameraFocus.gd" type="Script" id=6] [ext_resource path="res://Resources/Styles/ButtonNormalStyle.tres" type="StyleBox" id=7] [ext_resource path="res://Resources/Styles/ButtonPressedStyle.tres" type="StyleBox" id=8] +[ext_resource path="res://Audio/graveyard.wav" type="AudioStream" id=9] [node name="InGame" type="Spatial"] script = ExtResource( 4 ) @@ -36,18 +37,12 @@ __meta__ = { [node name="Arena" parent="." instance=ExtResource( 5 )] -[node name="PathFollow" parent="Arena/Path" index="0"] -transform = Transform( -0.564546, 0, 0.825401, 0, 1, 0, -0.825402, 0, -0.564546, -43.137, 0, -40.2265 ) - [node name="PathFollow2" parent="Arena/Path" index="1"] transform = Transform( -0.389933, 0, 0.920842, 0, 1, 0, -0.920843, 0, -0.389933, -22.4314, 0, -51.2965 ) [node name="PathFollow3" parent="Arena/Path" index="2"] transform = Transform( 0.0525302, 0, 0.998616, 0, 1, 0, -0.998619, 0, 0.05253, 1.77306, 0, -55.9514 ) -[node name="PathFollow4" parent="Arena/Path" index="3"] -transform = Transform( 0.412629, 0, 0.910899, 0, 1, 0, -0.9109, 0, 0.412628, 25.6454, 0, -49.4766 ) - [node name="PathFollow5" parent="Arena/Path" index="4"] transform = Transform( 0.868863, 0, 0.495052, 0, 1, 0, -0.495052, 0, 0.868862, 45.3036, 0, -34.9361 ) @@ -60,39 +55,29 @@ transform = Transform( 0.989853, 0, 0.142099, 0, 1, 0, -0.142099, 0, 0.98985, 60 [node name="PathFollow8" parent="Arena/Path" index="7"] transform = Transform( 0.978626, 1.91684e-07, -0.205647, -1.784e-07, 1, 8.31393e-08, 0.205648, -4.46748e-08, 0.978625, 58.2582, -2.03301e-05, 36.846 ) -[node name="PathFollow9" parent="Arena/Path" index="8"] -transform = Transform( 0.760079, -6.86382e-07, -0.64983, 7.11587e-07, 1, -2.23935e-07, 0.649831, -2.92203e-07, 0.760078, 48.2851, 2.0276e-05, 59.2494 ) - -[node name="PathFollow10" parent="Arena/Path" index="9"] -transform = Transform( 0.425147, -4.37703e-07, -0.905123, 3.06861e-07, 1, -3.39447e-07, 0.905124, -1.33432e-07, 0.425147, 28.181, -7.98279e-07, 73.5253 ) - -[node name="PathFollow11" parent="Arena/Path" index="10"] -transform = Transform( 0.126477, -1.61642e-07, -0.991968, 1.13677e-07, 1, -1.48456e-07, 0.991969, -9.39879e-08, 0.126477, 4.35371, -1.51216e-05, 79.9373 ) - [node name="PathFollow12" parent="Arena/Path" index="11"] transform = Transform( -0.305839, 5.41201e-07, -0.952082, 4.12144e-07, 1, 4.36044e-07, 0.952083, -2.59036e-07, -0.305838, -20.2565, -9.77015e-07, 79.0522 ) [node name="PathFollow13" parent="Arena/Path" index="12"] transform = Transform( -0.625119, 2.66822e-07, -0.780529, 4.26834e-07, 1, 0, 0.780529, -3.33157e-07, -0.625118, -42.0269, 0, 67.1875 ) -[node name="PathFollow14" parent="Arena/Path" index="13"] -transform = Transform( -0.916028, 3.908e-07, -0.401115, 4.26625e-07, 1, 0, 0.401116, -1.71126e-07, -0.916026, -56.2049, 0, 47.1929 ) - [node name="PathFollow15" parent="Arena/Path" index="14"] transform = Transform( -0.986687, 4.21016e-07, -0.162631, 4.26697e-07, 1, 0, 0.162631, -6.93941e-08, -0.986685, -63.4917, 0, 23.5427 ) [node name="PathFollow16" parent="Arena/Path" index="15"] transform = Transform( -0.999998, 4.26235e-07, -0.00197735, 4.26236e-07, 1, 0, 0.00197735, -8.42818e-10, -0.999998, -65.6734, 0, -1.33537 ) -[node name="PathFollow17" parent="Arena/Path" index="16"] -transform = Transform( -0.817611, 3.47972e-07, 0.57577, 4.25597e-07, 1, 0, -0.575771, 2.45046e-07, -0.817609, -57.8267, 0, -24.3573 ) - [node name="CameraFocus" type="Spatial" parent="."] script = ExtResource( 6 ) [node name="Camera" type="Camera" parent="CameraFocus"] transform = Transform( -4.2222e-08, -0.707107, 0.707107, -1.13133e-08, 0.707107, 0.707107, -1, 2.18557e-08, -3.78552e-08, 19, 17, -2 ) far = 500.0 + +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 9 ) +volume_db = -10.0 +autoplay = true [connection signal="pressed" from="UI/ESC Menu" to="." method="_on_ESC_Menu_pressed"] [editable path="Arena"]