From e29ab412b599860b0f28c0473ebf3361b9ab65e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robin=20H=C3=BCbner?= <profan@prfn.se>
Date: Sat, 12 Aug 2017 22:29:25 +0200
Subject: [PATCH] position including velocity

---
 Game.tscn    | 25 +++++++++++++++++++++++++
 Kinematic.gd |  4 ++--
 Player.gd    |  3 +++
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/Game.tscn b/Game.tscn
index a0ddb05..498234d 100644
--- a/Game.tscn
+++ b/Game.tscn
@@ -72,6 +72,31 @@ region_rect = Rect2( 0, 0, 8192, 8192 )
 transform/pos = Vector2( 127.878, -20.3627 )
 transform/scale = Vector2( 1.5, 1.5 )
 
+[node name="EnemyGrunt1" parent="." instance=ExtResource( 7 )]
+
+transform/pos = Vector2( -154.501, -21.5904 )
+transform/scale = Vector2( 1.5, 1.5 )
+
+[node name="EnemyGrunt2" parent="." instance=ExtResource( 7 )]
+
+transform/pos = Vector2( 361.148, -21.5904 )
+transform/scale = Vector2( 1.5, 1.5 )
+
+[node name="EnemyGrunt3" parent="." instance=ExtResource( 7 )]
+
+transform/pos = Vector2( 583.368, -24.0459 )
+transform/scale = Vector2( 1.5, 1.5 )
+
+[node name="EnemyGrunt4" parent="." instance=ExtResource( 7 )]
+
+transform/pos = Vector2( 878.024, -24.0459 )
+transform/scale = Vector2( 1.5, 1.5 )
+
+[node name="EnemyGrunt5" parent="." instance=ExtResource( 7 )]
+
+transform/pos = Vector2( -374.266, -24.0459 )
+transform/scale = Vector2( 1.5, 1.5 )
+
 [node name="Missile" parent="." instance=ExtResource( 8 )]
 
 transform/pos = Vector2( -494.716, 83.0652 )
diff --git a/Kinematic.gd b/Kinematic.gd
index 25d30e1..2b70bc1 100644
--- a/Kinematic.gd
+++ b/Kinematic.gd
@@ -15,7 +15,7 @@ class Kinematic:
 		max_speed = m
 	
 	func get_position():
-		return owner.get_global_pos()
+		return owner.get_kinematic_position()
 	
 	func get_orientation():
 		return velocity.normalized()
@@ -50,7 +50,7 @@ class Seek:
 		var tr = target.get_ref()
 		if tr:
 			# update velocity
-			s.velocity = tr.get_global_pos() - owner.get_global_pos()
+			s.velocity = tr.get_kinematic_position() - owner.get_global_pos()
 			# update orientation
 			#if velocity.length() > 0:
 			#	rotation = clamp(velocity.normalized().angle(), -max_rot_speed, max_rot_speed)
diff --git a/Player.gd b/Player.gd
index 60e31e3..6c45090 100644
--- a/Player.gd
+++ b/Player.gd
@@ -28,6 +28,9 @@ func type():
 	
 func do_damage(v):
 	pass
+	
+func get_kinematic_position():
+	return get_global_pos() + ship_vel
 
 func turn_towards(delta, pos):