From a1da691f99b21db2d0c9219f389a9cc23ae3cc96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robin=20H=C3=BCbner?= <profan@prfn.se>
Date: Sun, 30 Jul 2017 23:47:29 +0200
Subject: [PATCH] hmm

---
 Bullet.gd              |  4 ++--
 ParticlePassThrough.gd | 11 +++++++++++
 Player.gd              |  2 +-
 RightThruster.gd       |  9 +++++++++
 ThrusterScript.gd      | 15 +++++++++++++++
 5 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 ParticlePassThrough.gd
 create mode 100644 RightThruster.gd
 create mode 100644 ThrusterScript.gd

diff --git a/Bullet.gd b/Bullet.gd
index 2299888..4e9902b 100644
--- a/Bullet.gd
+++ b/Bullet.gd
@@ -9,9 +9,9 @@ func _ready():
 	set_fixed_process(true)
 	
 func fire(delta, vel, dir, speed):
-	velocity = (dir * (speed * delta)) + (dir * vel.length())
+	velocity = (vel.length() * dir + (dir * speed * delta))
 	sprite.rotate(dir.angle())
-	
+
 func _fixed_process(delta):
 	move(velocity)
 	lifetime -= delta
diff --git a/ParticlePassThrough.gd b/ParticlePassThrough.gd
new file mode 100644
index 0000000..914a6a0
--- /dev/null
+++ b/ParticlePassThrough.gd
@@ -0,0 +1,11 @@
+extends Node2D
+
+export(Array) var thrusters
+
+func set_param(i, v):
+	for t in thrusters:
+		t.set_param(i, v)
+
+func set_emitting(b):
+	for t in thrusters:
+		t.set_emitting(b)
\ No newline at end of file
diff --git a/Player.gd b/Player.gd
index a891df8..ea7bc20 100644
--- a/Player.gd
+++ b/Player.gd
@@ -12,7 +12,7 @@ var mov_speed = 64 # pixels per second
 var ship_vel = Vector2(0, 0)
 var ship_max_vel = 100 # pixels per second
 var ship_accel = 25 # pixels per second.. per second?
-var ship_turn_speed = deg2rad(360) # degrees per second.. i guess?
+var ship_turn_speed = deg2rad(180) # degrees per second.. i guess?
 var ship_dir = Vector2(1, 0)
 var ship_mass = 61
 
diff --git a/RightThruster.gd b/RightThruster.gd
new file mode 100644
index 0000000..c4d1a7c
--- /dev/null
+++ b/RightThruster.gd
@@ -0,0 +1,9 @@
+extends Node2D
+
+onready var right_one = get_node("RightThruster 1")
+onready var right_two = get_node("RightThruster 1")
+
+func _ready():
+	# Called every time the node is added to the scene.
+	# Initialization here
+	pass
diff --git a/ThrusterScript.gd b/ThrusterScript.gd
new file mode 100644
index 0000000..ae496cc
--- /dev/null
+++ b/ThrusterScript.gd
@@ -0,0 +1,15 @@
+extends Node2D
+
+onready var t_one = get_node("thruster_one")
+onready var t_two = get_node("thruster_two")
+
+func _ready():
+	pass
+
+func set_param(p, v):
+	t_one.set_param(p, v)
+	t_two.set_param(p, v)
+	
+func set_emitting(b):
+	t_one.set_emitting(b)
+	t_two.set_emitting(b)
\ No newline at end of file