Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
This commit is contained in:
commit
d6d2240540
19 files changed
+61
-21
No files matched your search
@@ -17,9 +17,9 @@ material/0 = null
|
||||
[node name="OmniLight" type="OmniLight" parent="."]
|
||||
transform = Transform( 1, 3.12639e-13, -1.77715e-26, -3.12639e-13, 1, -5.68434e-14, 0, 5.68434e-14, 1, 0, 0, -1.5 )
|
||||
visible = false
|
||||
light_color = Color( 0.956863, 0.121569, 0.121569, 1 )
|
||||
light_energy = 3.86
|
||||
omni_range = 1.8
|
||||
light_color = Color( 0, 0.188235, 0.756863, 1 )
|
||||
light_energy = 10.0
|
||||
omni_range = 2.0
|
||||
|
||||
[node name="Area" type="Area" parent="."]
|
||||
|
||||
|
||||
@@ -20,14 +20,11 @@ func _physics_process(delta):
|
||||
|
||||
var rot_vector = (-transform.basis.z).cross(ground.transform.basis.y)
|
||||
|
||||
if current_angle > 0.3:
|
||||
apply_torque_impulse(rot_vector * current_angle * 7)
|
||||
elif current_angle > 0.05:
|
||||
apply_torque_impulse(-(rot_vector * current_angle * 20))
|
||||
else:
|
||||
for body in get_colliding_bodies():
|
||||
if body.name == "StaticBody":
|
||||
for body in get_colliding_bodies():
|
||||
if body.name == "StaticBody":
|
||||
if current_angle > 0.3:
|
||||
apply_torque_impulse(rot_vector * current_angle * 7)
|
||||
elif current_angle > 0.05:
|
||||
apply_torque_impulse(-(rot_vector * current_angle * 20))
|
||||
else:
|
||||
angular_velocity = Vector3.ZERO
|
||||
|
||||
print("deg: %s" % rad2deg(current_angle))
|
||||
print("rad: %s" % current_angle)
|
||||
@@ -71,6 +71,10 @@ transform = Transform( -0.870723, -0.384569, -0.26555, 1.84307e-07, -0.573576, 0
|
||||
key = 87
|
||||
id = 8
|
||||
|
||||
[node name="Head" parent="." instance=ExtResource( 2 )]
|
||||
transform = Transform( -0.986155, 3.25841e-07, 0, -3.2133e-07, -1, 0, 0, 0, 0.986155, 0, 0, -3.63054 )
|
||||
key = 87
|
||||
|
||||
[node name="Torso" parent="." instance=ExtResource( 3 )]
|
||||
transform = Transform( 0.5, 0, 0, 0, -2.18557e-08, 0.5, 0, -0.5, -2.18557e-08, 0, 0, 0 )
|
||||
|
||||
|
||||
@@ -18,6 +18,7 @@ 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 )
|
||||
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 )
|
||||
@@ -32,6 +33,9 @@ shape = SubResource( 3 )
|
||||
[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 )
|
||||
material/0 = SubResource( 1 )
|
||||
|
||||
@@ -17,6 +17,8 @@ albedo_texture = ExtResource( 4 )
|
||||
[node name="GorillaArm" instance=ExtResource( 1 )]
|
||||
transform = Transform( 1, 0, 0, 0, 0.966025, 0.258448, 0, -0.258448, 0.966025, 0, 0, 0 )
|
||||
script = ExtResource( 2 )
|
||||
cost = 25.0
|
||||
damage = 15.0
|
||||
|
||||
[node name="PartCollider" parent="." index="0"]
|
||||
transform = Transform( 1, 0, 0, 0, 0.534515, -0.845159, 0, 0.845159, 0.534515, -0.0701199, -4.33779, -2.5341 )
|
||||
|
||||
@@ -5,18 +5,19 @@
|
||||
[ext_resource path="res://3D Input/Fertige GLBs/Arm_Mensch.glb" type="PackedScene" id=4]
|
||||
|
||||
[sub_resource type="BoxShape" id=1]
|
||||
extents = Vector3( 0.533899, 0.203146, 2.17243 )
|
||||
extents = Vector3( 0.533899, 0.405119, 2.17243 )
|
||||
|
||||
[sub_resource type="SphereShape" id=2]
|
||||
radius = 0.125064
|
||||
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 )
|
||||
script = ExtResource( 2 )
|
||||
cost = 10.0
|
||||
damage = 5.0
|
||||
|
||||
[node name="PartCollider" parent="." index="0"]
|
||||
transform = Transform( 0.796097, 0, -0.605169, 0, 1, -3.55271e-15, 0.605169, 8.35188e-23, 0.796097, -0.894889, 1.42109e-14, -2.6182 )
|
||||
transform = Transform( 0.796097, 0.0325159, -0.604295, 0, 0.998555, 0.0537302, 0.605169, -0.0427745, 0.794947, -0.893398, -0.0369669, -2.62016 )
|
||||
shape = SubResource( 1 )
|
||||
|
||||
[node name="TouchArea" parent="." index="1"]
|
||||
@@ -28,6 +29,9 @@ shape = SubResource( 2 )
|
||||
[node name="Mesh" parent="." index="2" instance=ExtResource( 4 )]
|
||||
transform = Transform( 2, 0, 0, 0, 2, 0, 0, 0, 2, -0.357728, -8.51476, 0 )
|
||||
|
||||
[node name="Skeleton" parent="Mesh/Armature" index="0"]
|
||||
bones/7/bound_children = [ NodePath("BoneAttachment") ]
|
||||
|
||||
[node name="BoneAttachment" type="BoneAttachment" parent="Mesh/Armature/Skeleton" index="1"]
|
||||
transform = Transform( 0.0646207, -0.736312, -0.673549, -0.240426, 0.64359, -0.726627, 0.968514, 0.208894, -0.135439, 0.054756, 1.13784, 0.129916 )
|
||||
bone_name = "bone_6"
|
||||
|
||||
@@ -18,6 +18,7 @@ albedo_texture = ExtResource( 4 )
|
||||
transform = Transform( 1, 8.74228e-08, -3.82137e-15, 0, -4.37114e-08, -1, -8.74228e-08, 1, -4.37114e-08, 0, 0, 0 )
|
||||
script = ExtResource( 2 )
|
||||
cost = 20.0
|
||||
damage = 8.0
|
||||
|
||||
[node name="PartCollider" parent="." index="0"]
|
||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -3.37252, -0.326758 )
|
||||
|
||||
Reference in new issue
Block a user