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

3D Input/huhntextur.png.import

@@ -2,33 +2,35 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/huhntextur.png-a31af8e4947b19bec12f70e34f5f09d2.stex"
+path.s3tc="res://.import/huhntextur.png-a31af8e4947b19bec12f70e34f5f09d2.s3tc.stex"
+path.etc2="res://.import/huhntextur.png-a31af8e4947b19bec12f70e34f5f09d2.etc2.stex"
 metadata={
-"vram_texture": false
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
 }
 
 [deps]
 
 source_file="res://3D Input/huhntextur.png"
-dest_files=[ "res://.import/huhntextur.png-a31af8e4947b19bec12f70e34f5f09d2.stex" ]
+dest_files=[ "res://.import/huhntextur.png-a31af8e4947b19bec12f70e34f5f09d2.s3tc.stex", "res://.import/huhntextur.png-a31af8e4947b19bec12f70e34f5f09d2.etc2.stex" ]
 
 [params]
 
-compress/mode=0
+compress/mode=2
 compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
-flags/repeat=0
+flags/repeat=true
 flags/filter=true
-flags/mipmaps=false
+flags/mipmaps=true
 flags/anisotropic=false
-flags/srgb=2
+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=true
+detect_3d=false
 svg/scale=1.0

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

BodyConfig/bodyBuildingScript.gd

@@ -48,6 +48,8 @@ func _ready():
 	_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():
 	if done_player_count == null:
@@ -67,6 +69,8 @@ func change_count_ui():
 		_torso.get_node("UpBackLeft").key = KEY_I
 		_torso.get_node("UpBackRight").key = KEY_O
 		
+		_torso.get_node("Head").key = KEY_M
+
 
 func _process(delta):
 	# TODO: Would be nicer to just disable gravity, but then it can't be re-enabled...
@@ -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 event.button_index == BUTTON_WHEEL_UP and _attachment_point != null:
-					if _attachment_point.get_node("Limb") != null:
+#					if _attachment_point.get_node("Limb") != null:
-						_attachment_point.get_node("Limb").rotate_z(0.1)
+#						_attachment_point.get_node("Limb").rotate_z(0.1)
-				elif event.button_index == BUTTON_WHEEL_DOWN and _attachment_point != null:
+#				elif event.button_index == BUTTON_WHEEL_DOWN and _attachment_point != null:
-					if _attachment_point.get_node("Limb") != null:
+#					if _attachment_point.get_node("Limb") != null:
-						_attachment_point.get_node("Limb").rotate_z(-0.1)
+#						_attachment_point.get_node("Limb").rotate_z(-0.1)
-				else:
+#				else:
-					_prev_mouse_pos = event.position
+				_prev_mouse_pos = event.position
-					_viewRot = true
+				_viewRot = true
 		else: 
 			_viewRot = false
 

BodyParts/BodyBase/BodyBase.gd

@@ -20,16 +20,17 @@ func _physics_process(delta):
 		
 		var rot_vector = (-transform.basis.z).cross(ground.transform.basis.y)
 		
+		var _should_fix_torque = false
+		
 		for body in get_colliding_bodies():
 			if body.name == "StaticBody":
-				if current_angle > 0.3:
+				_should_fix_torque = true
-					apply_torque_impulse(rot_vector * current_angle * 7)
+		
-					apply_impulse(transform.basis.xform(Vector3.ZERO), -(transform.basis.y) * 0.05)
+		if _should_fix_torque:
-				elif current_angle > 0.05:
+			if current_angle > 0.3:
-					apply_torque_impulse(-(rot_vector * current_angle * 5))
+				apply_torque_impulse(rot_vector * current_angle * 7)
-				else:
+				apply_impulse(transform.basis.xform(Vector3.ZERO), -(transform.basis.y) * 0.05)
-					angular_velocity = Vector3.ZERO
+		
+#		if current_angle < 0.1:
+#			angular_velocity.x = 0
 		
-		for axis in angular_velocity:
-			if axis > 10:
-				axis -= axis * 0.75

BodyParts/BodyBase/BodyBase.tscn

@@ -16,6 +16,7 @@ mass = 1.73469
 gravity_scale = 1.5
 contacts_reported = 5
 contact_monitor = true
+angular_damp = 0.5
 script = ExtResource( 1 )
 
 [node name="TorsoCollider" type="CollisionShape" parent="."]

BodyParts/BullHead.tscn

@@ -14,6 +14,8 @@ albedo_texture = ExtResource( 4 )
 [node name="Bullhead" instance=ExtResource( 1 )]
 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 = 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 )

BodyParts/ChickenHead.gd

@@ -0,0 +1,31 @@
+extends PushingBodyPart
+
+
+onready var anim = get_node("Mesh/AnimationPlayer")
+
+
+# Called when the node enters the scene tree for the first time.
+func _ready() -> void:
+	pass # Replace with function body.
+
+
+func _is_animation_playing():
+	return anim.is_playing()
+
+
+func action():
+	anim.play("ArmatureAction")
+	
+	# Apply a slight counter force
+	var offset = transform.basis.xform(Vector3.ZERO) #transform.basis.xform(touch_area.global_transform.origin - base.global_transform.origin) * 0.5
+	var direction = -(base.transform.basis.y - base.transform.basis.z).normalized() * 0.5
+	
+	base.apply_impulse(offset, direction)
+
+
+func push(body):
+	# We multiply by 0.1 because we only want it to spin slightly, it should mostly go up
+	var offset = transform.basis.xform(Vector3.ZERO) #transform.basis.xform(touch_area.global_transform.origin - base.global_transform.origin) * 0.5
+	var direction = (base.transform.basis.y - base.transform.basis.z).normalized() * 19.0
+	
+	base.apply_impulse(offset, direction)

BodyParts/ChickenHead.tscn

@@ -0,0 +1,51 @@
+[gd_scene load_steps=8 format=2]
+
+[ext_resource path="res://3D Input/Fertige GLBs/Kopf_Huhn.glb" type="PackedScene" id=1]
+[ext_resource path="res://BodyParts/PushingBodyPart.tscn" type="PackedScene" id=2]
+[ext_resource path="res://3D Input/huhntextur.png" type="Texture" id=3]
+[ext_resource path="res://BodyParts/ChickenHead.gd" type="Script" id=4]
+
+[sub_resource type="CapsuleShape" id=1]
+radius = 2.24173
+height = 1.97047
+
+[sub_resource type="SphereShape" id=2]
+radius = 1.42519
+
+[sub_resource type="SpatialMaterial" id=3]
+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.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 )
+shape = SubResource( 2 )
+
+[node name="Mesh" parent="." index="4" instance=ExtResource( 1 )]
+
+[node name="Skeleton" parent="Mesh/Armature" index="0"]
+bones/2/bound_children = [ NodePath("BoneAttachment") ]
+
+[node name="Sphere" parent="Mesh/Armature/Skeleton" index="0"]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.38419e-07, 0 )
+material/0 = SubResource( 3 )
+
+[node name="BoneAttachment" type="BoneAttachment" parent="Mesh/Armature/Skeleton" index="1"]
+transform = Transform( 0.850008, -0.52677, 6.77809e-09, 0.52677, 0.850008, -6.12466e-09, -2.53514e-09, 8.7765e-09, 1, -1.2109, 4.72113, 5.44753e-07 )
+bone_name = "end"
+
+[node name="RemoteTransform" type="RemoteTransform" parent="Mesh/Armature/Skeleton/BoneAttachment" index="0"]
+remote_path = NodePath("../../../../../TouchArea")
+
+[editable path="Mesh"]

BodyParts/FrogLeg.gd

@@ -19,7 +19,7 @@ func _is_animation_playing():
 
 func push(body):
 	# We multiply by 0.1 because we only want it to spin slightly, it should mostly go up
-	var offset = transform.basis.xform(Vector3.ZERO) #transform.basis.xform(touch_area.global_transform.origin - base.global_transform.origin) * 0.5
+	var offset = transform.basis.xform(-touch_area.global_transform.origin + base.global_transform.origin) * 0.1
 	var direction = (base.transform.basis.y - base.transform.basis.z).normalized() * 20.0
 	
 	base.apply_impulse(offset, direction)

BodyParts/HumanArm.tscn

@@ -12,7 +12,7 @@ extents = Vector3( 0.533899, 0.405119, 2.17243 )
 radius = 0.101154
 
 [node name="HumanArm" instance=ExtResource( 1 )]
-transform = Transform( -4.37114e-08, 1, 4.37114e-08, 0, -4.37114e-08, 1, 1, 4.37114e-08, 1.91069e-15, 0, 0, 0 )
+transform = Transform( -9.33901e-08, 1, 6.32685e-08, 0.419008, -1.83154e-08, 0.907982, 0.907982, 1.11307e-07, -0.419008, 0, 0, 0 )
 script = ExtResource( 2 )
 cost = 10.0
 damage = 5.0
@@ -22,7 +22,7 @@ transform = Transform( 0.796097, 0.0325159, -0.604295, 0, 0.998555, 0.0537302, 0
 shape = SubResource( 1 )
 
 [node name="TouchArea" parent="." index="1"]
-transform = Transform( -0.118289, 2.18551, 2.52493, -3.31556, -0.378316, 0.172131, 0.398447, -2.49922, 2.18193, -0.0255739, -0.127111, -3.79535 )
+transform = Transform( -0.118288, 2.18551, 2.52493, -3.31556, -0.378316, 0.172131, 0.398447, -2.49922, 2.18193, -0.025574, -0.127111, -3.79535 )
 
 [node name="CollisionShape" type="CollisionShape" parent="TouchArea" index="0"]
 shape = SubResource( 2 )
@@ -40,9 +40,6 @@ remote_path = NodePath("../../../../../TouchArea")
 [node name="AnimationPlayer" parent="Mesh" index="2"]
 playback_speed = 3.0
 
-[node name="ActionSound" parent="." index="3"]
-unit_db = 0.0
-
 [node name="PushSound" parent="." index="4"]
 stream = ExtResource( 3 )
 

BodyParts/HumanLeg.gd

@@ -16,20 +16,16 @@ func _is_animation_playing():
 func action():
 	anim.play("ArmatureAction")
 
-	# Apply a slight counter force
-	var offset = transform.basis.xform(Vector3.ZERO) #transform.basis.xform(touch_area.global_transform.origin - base.global_transform.origin) * 0.5
-	var direction = -(base.transform.basis.y - base.transform.basis.z).normalized() * 0.5
-	
-	base.apply_impulse(offset, direction)
-
 
 func push(body):
 	# We multiply by 0.1 because we only want it to spin slightly, it should mostly go up
-	var offset = transform.basis.xform(Vector3.ZERO) #transform.basis.xform(touch_area.global_transform.origin - base.global_transform.origin) * 0.5
+	var offset = transform.basis.xform(touch_area.global_transform.origin - base.global_transform.origin) * 0.3
 	var direction = (base.transform.basis.y - base.transform.basis.z).normalized() * 10.0
 	
 	base.apply_impulse(offset, direction)
 	
+	#base.apply_torque_impulse(base.transform.basis.y * 20.0)
+	
 # Called every frame. 'delta' is the elapsed time since the previous frame.
 #func _process(delta: float) -> void:
 #	pass

BodyParts/Wings.gd

@@ -0,0 +1,22 @@
+extends BodyPart
+
+
+onready var anim = get_node("Mesh/AnimationPlayer")
+onready var timer = get_node("Timer")
+
+
+# Called when the node enters the scene tree for the first time.
+func _ready() -> void:
+	pass # Replace with function body.
+
+
+func action():
+	if timer.time_left == 0:
+		anim.play("ArmatureAction")
+		
+		var offset = transform.basis.xform(Vector3.ZERO)
+		var direction = (-base.transform.basis.z).normalized() * 30.0
+		
+		base.apply_impulse(offset, direction)
+		
+		timer.start()

BodyParts/Wings.tscn

@@ -0,0 +1,26 @@
+[gd_scene load_steps=5 format=2]
+
+[ext_resource path="res://3D Input/Fertige GLBs/vogel_flügel.glb" type="PackedScene" id=1]
+[ext_resource path="res://BodyParts/BodyPart.tscn" type="PackedScene" id=2]
+[ext_resource path="res://BodyParts/Wings.gd" type="Script" id=3]
+
+[sub_resource type="BoxShape" id=1]
+extents = Vector3( 2.75562, 0.605394, 2.0419 )
+
+[node name="Wings" instance=ExtResource( 2 )]
+transform = Transform( 0.193412, -0.981118, 0, 0.981118, 0.193412, 0, 0, 0, 1, 0, 0, 0 )
+script = ExtResource( 3 )
+cost = 25.0
+
+[node name="PartCollider" parent="." index="0"]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -2.80638 )
+shape = SubResource( 1 )
+
+[node name="Mesh" parent="." index="2" instance=ExtResource( 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
+one_shot = true
+
+[editable path="Mesh"]

Global/BodyPartLoader.gd

@@ -9,5 +9,6 @@ func _ready():
 	bodyparts["Frog Leg"] = load("res://BodyParts/FrogLeg.tscn")
 	bodyparts["Gorilla Arm"] = load("res://BodyParts/GorillaArm.tscn")
 	bodyparts["Horse Leg"] = load("res://BodyParts/HorseLeg.tscn")
-	
+	bodyparts["Chicken Head"] = load("res://BodyParts/ChickenHead.tscn")
+	bodyparts["Wings"] = load("res://BodyParts/Wings.tscn")
 	bodyparts["Bull Head"] = load("res://BodyParts/BullHead.tscn")

Ingame/CameraFocus.gd

@@ -16,8 +16,8 @@ func _ready():
 
 
 func _process(delta: float) -> void:
-	var player1 = get_parent().get_child(3)
+	var player1 = get_parent().get_child(4)
-	var player2 = get_parent().get_child(4)
+	var player2 = get_parent().get_child(5)
 	
 	if not player1 and player2: return
 	

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,38 +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"]