slapin/kicking-high
1
0
Fork 0
Code Issues Pull Requests Releases 3 Wiki Activity

Ball implemented, started work on game AI

Browse Source
This commit is contained in:
Segey Lapin
2019-07-30 13:23:34 +03:00
parent 0f1655ac81
commit 20b0ce05de
17 changed files with 400 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
proto2/characters/character.gd
View File

@@ -5,6 +5,8 @@ var skel: Skeleton
var anim_tree: AnimationTree
var aplay: AnimationPlayer
const GRAVITY = Vector3(0, -9.8, 0)
var ball_carry: Node
var item_right_hand: Node
# Declare member variables here. Examples:
# var a = 2
# var b = "text"
@@ -33,6 +35,7 @@ func _ready():
anim.loop = true
add_to_group("characters")
add_to_group("activatable")
ball_carry = get_children()[0].get_children()[0].get_node("item_carry/ball_carry")
func get_act():
return "Talk"
@@ -61,7 +64,12 @@ func walkto(target: Vector3, spd: float = 1.4):
set_walk_speed(spd)
walk()
func _process(delta):
func take_object(obj):
if obj.is_in_group("items"):
obj.taken(self)
func _physics_process(delta):
orientation = global_transform
orientation.origin = Vector3()
var sm: AnimationNodeStateMachinePlayback = anim_tree["parameters/base/playback"]
@@ -84,7 +92,7 @@ func _process(delta):
var direction: Vector3 = (next - global_transform.origin).normalized()
var actual_direction: Vector3 = -global_transform.basis[2]
var angle: float = Vector2(actual_direction.x, actual_direction.z).angle_to(Vector2(direction.x, direction.z))
var tf_turn = Transform(Quat(Vector3(0, 1, 0), -angle * delta))
var tf_turn = Transform(Quat(Vector3(0, 1, 0), -angle * min(delta * 2.0, 1.0)))
orientation *= tf_turn
if !_path || _path.size() == 0:
idle()

10
proto2/characters/female_2018.tscn
View File

@@ -78,6 +78,16 @@ script = ExtResource( 1 )
[node name="female_2018" parent="." instance=ExtResource( 2 )]
[node name="female_2018" parent="female_2018" index="0"]
bones/132/bound_children = [ NodePath("item_carry") ]
[node name="item_carry" type="BoneAttachment" parent="female_2018/female_2018" index="13"]
transform = Transform( 0.816538, -0.555132, -0.158408, 0.505615, 0.555284, 0.660309, -0.278598, -0.619263, 0.734095, 0.174373, 0.783361, -0.0350451 )
bone_name = "wrist_R"
[node name="ball_carry" type="Spatial" parent="female_2018/female_2018/item_carry"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.12, 0, 0 )
[node name="AnimationTree" type="AnimationTree" parent="female_2018"]
tree_root = SubResource( 14 )
anim_player = NodePath("../female_2018/AnimationPlayer")

9
proto2/characters/male_2018.tscn
View File

@@ -74,6 +74,15 @@ script = ExtResource( 2 )
[node name="male_2018" parent="." instance=ExtResource( 1 )]
[node name="male_g_2018" parent="male_2018" index="0"]
bones/110/bound_children = [ NodePath("item_carry") ]
[node name="item_carry" type="BoneAttachment" parent="male_2018/male_g_2018" index="9"]
transform = Transform( 0.579234, -0.742538, -0.336341, 0.736249, 0.299448, 0.606851, -0.349893, -0.59914, 0.720144, 0.334017, 1.00794, -0.175007 )
bone_name = "wrist_R"
[node name="ball_carry" type="Spatial" parent="male_2018/male_g_2018/item_carry"]
[node name="AnimationTree" type="AnimationTree" parent="male_2018"]
tree_root = SubResource( 13 )
anim_player = NodePath("../male_g_2018/AnimationPlayer")