Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter

3D Input/textures_painter/gravestone1_Material_AlbedoTransparency.png.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path.s3tc="res://.import/gravestone1_Material_AlbedoTransparency.png-e7e47eb9e8b84be712d657ebda1db81f.s3tc.stex"
+path.etc2="res://.import/gravestone1_Material_AlbedoTransparency.png-e7e47eb9e8b84be712d657ebda1db81f.etc2.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://3D Input/textures_painter/gravestone1_Material_AlbedoTransparency.png"
+dest_files=[ "res://.import/gravestone1_Material_AlbedoTransparency.png-e7e47eb9e8b84be712d657ebda1db81f.s3tc.stex", "res://.import/gravestone1_Material_AlbedoTransparency.png-e7e47eb9e8b84be712d657ebda1db81f.etc2.stex" ]
+
+[params]
+
+compress/mode=2
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=true
+flags/filter=true
+flags/mipmaps=true
+flags/anisotropic=false
+flags/srgb=1
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0

3D Input/textures_painter/gravestone1_Material_MetallicSmoothness.png.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path.s3tc="res://.import/gravestone1_Material_MetallicSmoothness.png-a3e4ac80d82747df2b7f6964c493d179.s3tc.stex"
+path.etc2="res://.import/gravestone1_Material_MetallicSmoothness.png-a3e4ac80d82747df2b7f6964c493d179.etc2.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://3D Input/textures_painter/gravestone1_Material_MetallicSmoothness.png"
+dest_files=[ "res://.import/gravestone1_Material_MetallicSmoothness.png-a3e4ac80d82747df2b7f6964c493d179.s3tc.stex", "res://.import/gravestone1_Material_MetallicSmoothness.png-a3e4ac80d82747df2b7f6964c493d179.etc2.stex" ]
+
+[params]
+
+compress/mode=2
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=true
+flags/filter=true
+flags/mipmaps=true
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0

3D Input/textures_painter/gravestone1_Material_Normal.png.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path.s3tc="res://.import/gravestone1_Material_Normal.png-1ae979772a6858364649499beb22014a.s3tc.stex"
+path.etc2="res://.import/gravestone1_Material_Normal.png-1ae979772a6858364649499beb22014a.etc2.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://3D Input/textures_painter/gravestone1_Material_Normal.png"
+dest_files=[ "res://.import/gravestone1_Material_Normal.png-1ae979772a6858364649499beb22014a.s3tc.stex", "res://.import/gravestone1_Material_Normal.png-1ae979772a6858364649499beb22014a.etc2.stex" ]
+
+[params]
+
+compress/mode=2
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=1
+flags/repeat=true
+flags/filter=true
+flags/mipmaps=true
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0

BodyParts/BodyBase/BodyBase.gd

@@ -22,9 +22,14 @@ func _physics_process(delta):
 		
 		for body in get_colliding_bodies():
 			if body.name == "StaticBody":
-				if current_angle > 0.3: 
+				if current_angle > 0.3:
 					apply_torque_impulse(rot_vector * current_angle * 7)
+					apply_impulse(transform.basis.xform(Vector3.ZERO), -(transform.basis.y) * 0.05)
 				elif current_angle > 0.05:
-					apply_torque_impulse(-(rot_vector * current_angle * 20))
+					apply_torque_impulse(-(rot_vector * current_angle * 5))
 				else:
 					angular_velocity = Vector3.ZERO
+				
+		for axis in angular_velocity:
+			if axis > 10:
+				axis -= axis * 0.75

BodyParts/FrogLeg.tscn

@@ -1,13 +1,12 @@
-[gd_scene load_steps=9 format=2]
+[gd_scene load_steps=8 format=2]
 
 [ext_resource path="res://BodyParts/PushingBodyPart.tscn" type="PackedScene" id=1]
 [ext_resource path="res://BodyParts/FrogLeg.gd" type="Script" id=2]
 [ext_resource path="res://3D Input/Fertige GLBs/Bein_Frosch.glb" type="PackedScene" id=3]
 [ext_resource path="res://3D Input/froschtexture.png" type="Texture" id=4]
-[ext_resource path="res://Audio/frog_sound.wav" type="AudioStream" id=5]
 
 [sub_resource type="BoxShape" id=1]
-extents = Vector3( 0.649825, 2.07811, 1.64282 )
+extents = Vector3( 0.666, 2.41488, 1.57924 )
 
 [sub_resource type="SphereShape" id=2]
 radius = 0.115004
@@ -17,16 +16,16 @@ albedo_texture = ExtResource( 4 )
 roughness = 0.3
 
 [node name="FrogLeg" instance=ExtResource( 1 )]
-transform = Transform( -1, 8.74228e-08, 0, -8.74228e-08, -1, 0, 0, 0, 1, 0, 0, 0 )
+transform = Transform( -1, 8.74228e-08, 0, -8.48803e-08, -0.970917, 0.239415, 2.09303e-08, 0.239415, 0.970917, 0, 0, 0 )
 script = ExtResource( 2 )
 cost = 30.0
 
 [node name="PartCollider" parent="." index="0"]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.21377, -0.911304, -3.94992 )
+transform = Transform( 1, -6.77822e-08, -8.51879e-08, -6.77823e-08, 0.224662, -0.974437, 8.5188e-08, 0.974437, 0.224662, 1.61495e-07, -1.52524, -2.85154 )
 shape = SubResource( 1 )
 
 [node name="TouchArea" parent="." index="1"]
-transform = Transform( 2.20191, -0.624093, -2.57245, 1.26297, 3.18837, 0.307522, 2.32635, -1.14024, 2.26789, 0.307056, -2.38919, -4.91366 )
+transform = Transform( 2.20191, -0.624093, -2.57245, 1.26297, 3.18838, 0.307522, 2.32635, -1.14024, 2.26789, 0.307056, -2.38919, -4.91366 )
 
 [node name="CollisionShape" type="CollisionShape" parent="TouchArea" index="0"]
 shape = SubResource( 2 )
@@ -34,8 +33,11 @@ shape = SubResource( 2 )
 [node name="Mesh" parent="." index="2" instance=ExtResource( 3 )]
 transform = Transform( -1.13133e-08, 4.2222e-08, 1, 0.965926, 0.258819, 0, -0.258819, 0.965926, -4.37114e-08, 0.734499, -2.94707, -2.68774 )
 
+[node name="Skeleton" parent="Mesh/Armature" index="0"]
+bones/3/bound_children = [ NodePath("BoneAttachment") ]
+
 [node name="froschbein" parent="Mesh/Armature/Skeleton" index="0"]
-transform = Transform( 1, -1.49012e-08, 0, 0, 1, -5.96046e-08, 0, 2.98023e-08, 1, 0, 0, 0 )
+transform = Transform( 1, -1.11759e-08, 0, 1.86265e-09, 1, -5.96046e-08, 1.86265e-09, 0, 1, 0, 0, 0 )
 material/0 = SubResource( 3 )
 
 [node name="BoneAttachment" type="BoneAttachment" parent="Mesh/Armature/Skeleton" index="1"]
@@ -48,8 +50,9 @@ remote_path = NodePath("../../../../../TouchArea")
 [node name="AnimationPlayer" parent="Mesh" index="2"]
 playback_speed = 2.0
 
-[node name="ActionSound" parent="." index="3"]
+[node name="CollisionPolygon" type="CollisionPolygon" parent="." index="3"]
-stream = ExtResource( 5 )
+__meta__ = {
-unit_db = 0.0
+"_edit_group_": true
+}
 
 [editable path="Mesh"]

BodyParts/HumanLeg.tscn

@@ -7,7 +7,7 @@
 [ext_resource path="res://Audio/punch_sound.wav" type="AudioStream" id=5]
 
 [sub_resource type="BoxShape" id=1]
-extents = Vector3( 0.666, 2.41488, 1.555 )
+extents = Vector3( 0.666, 2.5097, 1.57924 )
 
 [sub_resource type="SphereShape" id=2]
 radius = 0.108468

Ingame/Arena.tscn

@@ -1,10 +1,11 @@
-[gd_scene load_steps=7 format=2]
+[gd_scene load_steps=8 format=2]
 
 [ext_resource path="res://Ingame/Level/Torch.tscn" type="PackedScene" id=1]
 [ext_resource path="res://Ingame/Level/Ground.tscn" type="PackedScene" id=2]
 [ext_resource path="res://default_env.tres" type="Environment" id=3]
 [ext_resource path="res://3D Input/Fertige GLBs/Kopf_Mensch.glb" type="PackedScene" id=4]
 [ext_resource path="res://Ingame/Level/Fence.tscn" type="PackedScene" id=5]
+[ext_resource path="res://Ingame/Level/Gravestone.tscn" type="PackedScene" id=6]
 
 [sub_resource type="Curve3D" id=1]
 _data = {
@@ -15,25 +16,25 @@ _data = {
 [node name="Arena" type="Spatial"]
 
 [node name="Torch" parent="." instance=ExtResource( 1 )]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 46.6609, 0, -46.1498 )
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 57.6609, 0, -63.1498 )
 
 [node name="Torch3" parent="." instance=ExtResource( 1 )]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -40.7873, 0, -66.7423 )
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -29.7873, 0, -83.7423 )
 
 [node name="Torch2" parent="." instance=ExtResource( 1 )]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -80.7649, 0, 4.33311 )
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -69.7649, 0, -12.6669 )
 
 [node name="Torch4" parent="." instance=ExtResource( 1 )]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -55.8087, 0, 76.6803 )
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -44.8087, 0, 59.6803 )
 
 [node name="Torch5" parent="." instance=ExtResource( 1 )]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 52.7943, 0, 76.6803 )
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 63.7943, 0, 59.6803 )
 
 [node name="Torch6" parent="." instance=ExtResource( 1 )]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 27.8085, 0, 49.812 )
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 38.8085, 0, 32.812 )
 
 [node name="Torch7" parent="." instance=ExtResource( 1 )]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -35.1849, 0, -15.9355 )
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -24.1849, 0, -32.9355 )
 
 [node name="WorldEnvironment" type="WorldEnvironment" parent="."]
 environment = ExtResource( 3 )
@@ -41,9 +42,10 @@ environment = ExtResource( 3 )
 [node name="ground" parent="." instance=ExtResource( 2 )]
 
 [node name="Kopf_Mensch" parent="." instance=ExtResource( 4 )]
-transform = Transform( 3.58646, 0.324361, 1.74129, -1.09151, 3.50169, 1.59586, -1.39495, -1.90603, 3.22817, -62.8568, 12.0891, -17.4997 )
+transform = Transform( 3.58646, 0.324361, 1.74129, -1.09151, 3.50169, 1.59586, -1.39495, -1.90603, 3.22817, -51.8568, 12.0891, -34.4997 )
 
 [node name="Path" type="Path" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 11, 0, -17 )
 curve = SubResource( 1 )
 
 [node name="PathFollow" type="PathFollow" parent="Path"]
@@ -181,3 +183,51 @@ rotation_mode = 4
 
 [node name="Fence" parent="Path/PathFollow17" instance=ExtResource( 5 )]
 transform = Transform( -1, 0, -3.25841e-07, 0, 1, 0, 3.25841e-07, 0, -1, 0, 0, 0 )
+
+[node name="Gravestone" parent="." instance=ExtResource( 6 )]
+transform = Transform( 2.89778, 0, 0.776457, 0, 3, 0, -0.776457, 0, 2.89778, -74.388, 0, -0.0179996 )
+
+[node name="Gravestone2" parent="." instance=ExtResource( 6 )]
+transform = Transform( 2.89778, 0, 0.776457, 0, 3, 0, -0.776457, 0, 2.89778, -69.2116, 0, 19.3005 )
+
+[node name="Gravestone3" parent="." instance=ExtResource( 6 )]
+transform = Transform( 2.89778, 0, 0.776457, 0, 3, 0, -0.776457, 0, 2.89778, -64.0352, 0, 38.619 )
+
+[node name="Gravestone4" parent="." instance=ExtResource( 6 )]
+transform = Transform( 2.89778, 0, 0.776457, 0, 3, 0, -0.776457, 0, 2.89778, -58.8589, 0, 57.9375 )
+
+[node name="Gravestone8" parent="." instance=ExtResource( 6 )]
+transform = Transform( 2.89778, 0, 0.776457, 0, 3, 0, -0.776457, 0, 2.89778, -104.332, 0, 8.00538 )
+
+[node name="Gravestone7" parent="." instance=ExtResource( 6 )]
+transform = Transform( 2.89778, 0, 0.776457, 0, 3, 0, -0.776457, 0, 2.89778, -99.1553, 0, 27.3239 )
+
+[node name="Gravestone6" parent="." instance=ExtResource( 6 )]
+transform = Transform( 2.89778, 0, 0.776457, 0, 3, 0, -0.776457, 0, 2.89778, -93.9789, 0, 46.6424 )
+
+[node name="Gravestone5" parent="." instance=ExtResource( 6 )]
+transform = Transform( 2.89778, 0, 0.776457, 0, 3, 0, -0.776457, 0, 2.89778, -88.8026, 0, 65.9609 )
+
+[node name="Gravestone16" parent="." instance=ExtResource( 6 )]
+transform = Transform( -7.7486e-07, 0, -3, 0, 3, 0, 3, 0, -7.7486e-07, 46.2977, 0, -90.3632 )
+
+[node name="Gravestone15" parent="." instance=ExtResource( 6 )]
+transform = Transform( -7.7486e-07, 0, -3, 0, 3, 0, 3, 0, -7.7486e-07, 26.2977, 0, -90.3632 )
+
+[node name="Gravestone14" parent="." instance=ExtResource( 6 )]
+transform = Transform( -7.7486e-07, 0, -3, 0, 3, 0, 3, 0, -7.7486e-07, 6.2977, 0, -90.3631 )
+
+[node name="Gravestone13" parent="." instance=ExtResource( 6 )]
+transform = Transform( -7.7486e-07, 0, -3, 0, 3, 0, 3, 0, -7.7486e-07, -13.7023, 0, -90.3632 )
+
+[node name="Gravestone12" parent="." instance=ExtResource( 6 )]
+transform = Transform( -7.7486e-07, 0, -3, 0, 3, 0, 3, 0, -7.7486e-07, 46.2977, 0, -121.363 )
+
+[node name="Gravestone11" parent="." instance=ExtResource( 6 )]
+transform = Transform( -7.7486e-07, 0, -3, 0, 3, 0, 3, 0, -7.7486e-07, 26.2977, 0, -121.363 )
+
+[node name="Gravestone10" parent="." instance=ExtResource( 6 )]
+transform = Transform( -7.7486e-07, 0, -3, 0, 3, 0, 3, 0, -7.7486e-07, 6.29771, 0, -121.363 )
+
+[node name="Gravestone9" parent="." instance=ExtResource( 6 )]
+transform = Transform( -7.7486e-07, 0, -3, 0, 3, 0, 3, 0, -7.7486e-07, -13.7022, 0, -121.363 )

Ingame/Level/Gravestone.tscn

@@ -0,0 +1,19 @@
+[gd_scene load_steps=6 format=2]
+
+[ext_resource path="res://3D Input/textures_painter/gravestone1_Material_AlbedoTransparency.png" type="Texture" id=1]
+[ext_resource path="res://3D Input/textures_painter/gravestone1_Material_Normal.png" type="Texture" id=2]
+[ext_resource path="res://3D Input/textures_painter/gravestone1_Material_MetallicSmoothness.png" type="Texture" id=3]
+[ext_resource path="res://3D Input/Fertige GLBs/gravestone1.glb" type="PackedScene" id=4]
+
+[sub_resource type="SpatialMaterial" id=1]
+albedo_texture = ExtResource( 1 )
+metallic_texture = ExtResource( 3 )
+normal_enabled = true
+normal_scale = 1.0
+normal_texture = ExtResource( 2 )
+
+[node name="Gravestone" instance=ExtResource( 4 )]
+transform = Transform( 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0 )
+
+[node name="Cube" parent="." index="0"]
+material/0 = SubResource( 1 )