This commit is contained in:
mathias committed 2020-02-02 14:27:38 +01:00
commit 2d08ddc8c1
30 files changed
+157 -31

No files matched your search

+2 -1
View File
@@ -2,6 +2,7 @@ extends Spatial
export(int) var key
export(int) var id
onready var limb = get_node("Limb")
@@ -15,7 +16,7 @@ func _unhandled_input(event):
if event is InputEventKey:
if event.pressed and event.scancode == key:
if limb.get_child_count() > 0:
limb.get_child(0).action()
limb.get_child(0).action_wrapper()
# Called every frame. 'delta' is the elapsed time since the previous frame.
+8
View File
@@ -25,6 +25,7 @@ shape = SubResource( 1 )
[node name="DownFrontLeft" parent="." instance=ExtResource( 2 )]
transform = Transform( 0.965926, -1.45851e-07, -0.258819, -1.50996e-07, -1, -1.77636e-15, -0.258819, 3.90806e-08, -0.965926, 1.3, 1, 4.2 )
key = 68
id = 1
[node name="Mesh" parent="DownFrontLeft" index="0"]
transform = Transform( 0.2, 0, 3.72529e-09, 0, 0.2, 0, -3.72529e-09, 0, 0.2, 0, 0, 0 )
@@ -32,6 +33,7 @@ transform = Transform( 0.2, 0, 3.72529e-09, 0, 0.2, 0, -3.72529e-09, 0, 0.2, 0,
[node name="DownFrontRight" parent="." instance=ExtResource( 2 )]
transform = Transform( 0.965926, -1.45851e-07, 0.258819, -1.50996e-07, -1, 1.77636e-15, 0.258819, -3.90806e-08, -0.965926, -1.3, 1, 4.2 )
key = 70
id = 2
[node name="OmniLight" parent="DownFrontRight" index="1"]
transform = Transform( 1, 3.13083e-13, 0, -3.09641e-13, 1, -5.59552e-14, 0, 5.59552e-14, 1, -0.680858, -1.19209e-07, -1.38872 )
@@ -42,26 +44,32 @@ transform = Transform( 0.5, 1.4988e-15, 0, 1.4988e-15, 0.5, 0, 0, 0, 0.5, 0, 0,
[node name="DownBackRight" parent="." instance=ExtResource( 2 )]
transform = Transform( 0.982402, -3.24601e-07, 0.0859489, -3.2133e-07, -1, 0, 0.0859489, -2.83989e-08, -0.982402, -1.9, -1, 3.6 )
key = 83
id = 3
[node name="DownBackLeft" parent="." instance=ExtResource( 2 )]
transform = Transform( 0.982402, 3.24601e-07, -0.0859489, 3.2133e-07, -1, 0, -0.0859489, -2.83989e-08, -0.982402, 1.9, -1, 3.6 )
key = 65
id = 4
[node name="UpFrontLeft" parent="." instance=ExtResource( 2 )]
transform = Transform( 0.103081, -3.40598e-08, -0.980752, -3.2133e-07, -1, 0, -0.980752, 3.24056e-07, -0.103081, 2.9, 0, -2 )
key = 69
id = 5
[node name="UpFrontRight" parent="." instance=ExtResource( 2 )]
transform = Transform( 0.103081, 3.40598e-08, 0.980752, 3.2133e-07, -1, 0, 0.980752, 3.24056e-07, -0.103081, -2.9, 0, -2 )
key = 82
id = 6
[node name="UpBackRight" parent="." instance=ExtResource( 2 )]
transform = Transform( -0.870723, 0.384569, 0.26555, -1.84307e-07, -0.573576, 0.807811, 0.462972, 0.723268, 0.499426, -1, -1.9, -2.5 )
key = 81
id = 7
[node name="UpBackLeft" parent="." instance=ExtResource( 2 )]
transform = Transform( -0.870723, -0.384569, -0.26555, 1.84307e-07, -0.573576, 0.807811, -0.462972, 0.723268, 0.499426, 1, -1.9, -2.5 )
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 )
+11
View File
@@ -6,6 +6,7 @@ class_name BodyPart
onready var base = get_parent().get_parent().get_parent()
onready var physics_shape = get_node("PartCollider")
onready var action_sound = get_node("ActionSound")
var setup_done = false
@@ -23,7 +24,10 @@ func _process(delta: float) -> void:
var translation = physics_shape.global_transform
print(translation)
var attach_id = get_parent().get_parent().id
remove_child(physics_shape)
physics_shape.name = "LimbCollider" + str(attach_id)
base.add_child(physics_shape)
physics_shape.global_transform = translation
@@ -31,6 +35,13 @@ func _process(delta: float) -> void:
setup_done = true
func action_wrapper():
if not action_sound.playing:
action_sound.play()
action()
# Do something with the base
func action():
pass
+3
View File
@@ -6,3 +6,6 @@
script = ExtResource( 1 )
[node name="PartCollider" type="CollisionShape" parent="."]
[node name="ActionSound" type="AudioStreamPlayer3D" parent="."]
attenuation_model = 3
+12 -11
View File
@@ -1,17 +1,18 @@
[gd_scene load_steps=8 format=2]
[gd_scene load_steps=9 format=2]
[ext_resource path="res://BodyParts/PushingBodyPart.tscn" type="PackedScene" id=1]
[ext_resource path="res://BodyParts/GorillaArm.gd" type="Script" id=2]
[ext_resource path="res://3D Input/Fertige GLBs/Arm_Gorilla.glb" type="PackedScene" id=3]
[ext_resource path="res://3D Input/gorillaarmtexture.png" type="Texture" id=4]
[ext_resource path="res://Audio/punch_sound.wav" type="AudioStream" id=5]
[sub_resource type="BoxShape" id=2]
[sub_resource type="BoxShape" id=1]
extents = Vector3( 1.21214, 1, 2.81197 )
[sub_resource type="SphereShape" id=3]
[sub_resource type="SphereShape" id=2]
radius = 0.175235
[sub_resource type="SpatialMaterial" id=1]
[sub_resource type="SpatialMaterial" id=3]
albedo_texture = ExtResource( 4 )
[node name="GorillaArm" instance=ExtResource( 1 )]
@@ -22,22 +23,19 @@ 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 )
shape = SubResource( 2 )
shape = SubResource( 1 )
[node name="TouchArea" parent="." index="1"]
transform = Transform( 0.00565114, -1.25635, 4.34486, 2.47947, -3.63292, -1.05371, 3.78264, 2.38321, 0.684203, -0.142621, -4.9139, -2.02559 )
transform = Transform( 0.00565114, -1.25635, 4.34486, 2.47947, -3.63292, -1.05371, 3.78264, 2.38321, 0.684204, -0.142622, -4.9139, -2.02559 )
[node name="CollisionShape" type="CollisionShape" parent="TouchArea" index="0"]
shape = SubResource( 3 )
shape = SubResource( 2 )
[node name="Mesh" parent="." index="2" instance=ExtResource( 3 )]
transform = Transform( -1.74846e-08, 0.4, 0, -0.4, -1.74846e-08, 0, 0, -2.66454e-15, 0.4, -9.43966, -0.0575844, 0.086014 )
[node name="Skeleton" parent="Mesh/Armature" index="0"]
bones/14/bound_children = [ NodePath("BoneAttachment") ]
[node name="Cube" parent="Mesh/Armature/Skeleton" index="0"]
material/0 = SubResource( 1 )
material/0 = SubResource( 3 )
[node name="BoneAttachment" type="BoneAttachment" parent="Mesh/Armature/Skeleton" index="1"]
transform = Transform( 0.000982332, 0.274505, -0.961585, -0.54821, 0.80436, 0.229062, 0.83634, 0.526926, 0.151277, -0.00334232, 1.11071, -0.466874 )
@@ -46,4 +44,7 @@ bone_name = "bone_6"
[node name="RemoteTransform" type="RemoteTransform" parent="Mesh/Armature/Skeleton/BoneAttachment" index="0"]
remote_path = NodePath("../../../../../TouchArea")
[node name="PushSound" parent="." index="4"]
stream = ExtResource( 5 )
[editable path="Mesh"]
+8 -4
View File
@@ -1,7 +1,8 @@
[gd_scene load_steps=6 format=2]
[gd_scene load_steps=7 format=2]
[ext_resource path="res://BodyParts/PushingBodyPart.tscn" type="PackedScene" id=1]
[ext_resource path="res://BodyParts/HumanArm.gd" type="Script" id=2]
[ext_resource path="res://Audio/punch_sound.wav" type="AudioStream" id=3]
[ext_resource path="res://3D Input/Fertige GLBs/Arm_Mensch.glb" type="PackedScene" id=4]
[sub_resource type="BoxShape" id=1]
@@ -29,9 +30,6 @@ 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"
@@ -42,4 +40,10 @@ 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 )
[editable path="Mesh"]
+8 -1
View File
@@ -1,9 +1,10 @@
[gd_scene load_steps=8 format=2]
[gd_scene load_steps=9 format=2]
[ext_resource path="res://BodyParts/PushingBodyPart.tscn" type="PackedScene" id=1]
[ext_resource path="res://BodyParts/HumanLeg.gd" type="Script" id=2]
[ext_resource path="res://3D Input/Fertige GLBs/Bein_Mensch.glb" type="PackedScene" id=3]
[ext_resource path="res://3D Input/beinimage.png" type="Texture" id=4]
[ext_resource path="res://Audio/punch_sound.wav" type="AudioStream" id=5]
[sub_resource type="BoxShape" id=1]
extents = Vector3( 0.666, 2.5097, 1.57924 )
@@ -47,4 +48,10 @@ bone_name = "bone_2"
[node name="RemoteTransform" type="RemoteTransform" parent="Mesh/Armature/Skeleton/BoneAttachment" index="0"]
remote_path = NodePath("../../../../../TouchArea")
[node name="ActionSound" parent="." index="3"]
unit_db = 0.0
[node name="PushSound" parent="." index="4"]
stream = ExtResource( 5 )
[editable path="Mesh"]
+8 -1
View File
@@ -2,6 +2,7 @@ extends BodyPart
class_name PushingBodyPart
onready var touch_area = get_node("TouchArea")
onready var push_sound = get_node("PushSound")
export(float) var damage = 10.0
@@ -19,10 +20,16 @@ func _is_animation_playing():
func _on_touch_area_entered(body):
if body.name != base.name and _is_animation_playing():
if body.is_in_group("Terrain"):
push(body)
push_wrapper(body)
elif body.is_in_group("Player"):
InGameState.subtract_player_health(body.player_id, damage)
func push_wrapper(body):
push_sound.play(0.0)
push(body)
func push(body):
pass
+4 -2
View File
@@ -3,8 +3,10 @@
[ext_resource path="res://BodyParts/BodyPart.tscn" type="PackedScene" id=1]
[ext_resource path="res://BodyParts/PushingBodyPart.gd" type="Script" id=2]
[node name="PushingBodyPart" index="0" instance=ExtResource( 1 )]
[node name="PushingBodyPart" instance=ExtResource( 1 )]
script = ExtResource( 2 )
[node name="TouchArea" type="Area" parent="." index="1"]
[node name="PushSound" type="AudioStreamPlayer3D" parent="." index="3"]
attenuation_model = 3