Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
This commit is contained in:
commit
674fea7203
16 files changed
+51
-39
No files matched your search
@@ -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 )
|
||||
|
||||
@@ -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 )
|
||||
|
||||
+1
-1
@@ -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)
|
||||
|
||||
|
||||
@@ -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"]
|
||||
Reference in new issue
Block a user