Mehr riot kram, i guess

4 files changed, 34 insertions, 19 deletions

diff --git a/riot/angrydev.gd b/riot/angrydev.gd
index 5e79141..580de32 100644
--- a/riot/angrydev.gd
+++ b/riot/angrydev.gd
@@ -1,4 +1,4 @@
-extends Node2D
+extends Ticked
 class_name AngryDev
 
 var min_pitchfork_rotation : float = -15.0
@@ -8,12 +8,22 @@ var target: Manager = null
 var total_tick = 0.0
 export var speed : float = 100.0
 onready var pitchfork : Sprite = $pitchfork
+onready var body : Sprite = $body
+export (Texture) var laser_pitchfork_texture: Texture = null
+var laser = false
 
+func _ready():
+	if SaveState.has_upgrade("sunglasses"):
+		laser = true
+		pitchfork.texture = laser_pitchfork_texture
 
 func interpolate(a, b, progress):
 	return a + (b-a) * progress
 
 func _process(delta : float) -> void:
+	if laser:
+		pitchfork.rotation = get_angle_to(target.position) + PI / 2
+		return
 	total_tick += delta
 	var normalized_progress = (sin(total_tick * rotation_speed) + 1.0) / 2.0
 	var rot = interpolate(min_pitchfork_rotation, max_pitchfork_rotation, normalized_progress)
@@ -21,7 +31,9 @@ func _process(delta : float) -> void:
 
 
 func _physics_process(delta: float) -> void:
-	var normalized_move = (target.position - position).normalized()
+	if laser:
+		return
+	var normalized_move = (target.position - body.position).normalized()
 	
 	position += normalized_move * delta * speed
 
diff --git a/riot/laser_blast.tscn b/riot/laser_blast.tscn
new file mode 100644
index 0000000..6a588fd
--- /dev/null
+++ b/riot/laser_blast.tscn
@@ -0,0 +1,14 @@
+[gd_scene load_steps=3 format=2]
+
+[ext_resource path="res://assets/laser_blast.png" type="Texture" id=1]
+
+[sub_resource type="RectangleShape2D" id=1]
+extents = Vector2( 32, 32 )
+
+[node name="Node2D" type="Sprite"]
+texture = ExtResource( 1 )
+
+[node name="Area2D" type="Area2D" parent="."]
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"]
+shape = SubResource( 1 )
diff --git a/riot/manager.gd b/riot/manager.gd
index bca0559..56d507a 100644
--- a/riot/manager.gd
+++ b/riot/manager.gd
@@ -15,7 +15,6 @@ func _physics_process(delta : float) -> void:
 	var collision = move_and_collide(move_vector)
 
 	if collision: 
-		SaveState.lose_bitcoin(int(ceil(SaveState.bitcoin / 2.0)))
 		SaveState.buildings["dev"] = int(ceil(SaveState.buildings["dev"] * 8.0 / 10.0))
 		for child in get_parent().get_parent().get_children():
 			if child is CanvasItem:
diff --git a/riot/riot.tscn b/riot/riot.tscn
index e091837..77b6441 100644
--- a/riot/riot.tscn
+++ b/riot/riot.tscn
@@ -1,22 +1,11 @@
-[gd_scene load_steps=8 format=2]
+[gd_scene load_steps=5 format=2]
 
 [ext_resource path="res://riot/riot.gd" type="Script" id=1]
-[ext_resource path="res://assets/manager2.png" type="Texture" id=2]
+[ext_resource path="res://assets/manager.tres" type="Texture" id=2]
 [ext_resource path="res://riot/manager.gd" type="Script" id=3]
-[ext_resource path="res://assets/manager1.png" type="Texture" id=4]
 
 [sub_resource type="RectangleShape2D" id=1]
-extents = Vector2( 33.1266, 67.3226 )
-
-[sub_resource type="AnimatedTexture" id=2]
-flags = 4
-frames = 2
-fps = 3.0
-frame_0/texture = ExtResource( 4 )
-frame_1/texture = ExtResource( 2 )
-frame_1/delay_sec = 0.0
-
-[sub_resource type="AnimatedTexture" id=3]
+extents = Vector2( 33.1266, 62.8009 )
 
 [node name="Node2D" type="Node2D"]
 script = ExtResource( 1 )
@@ -24,10 +13,11 @@ script = ExtResource( 1 )
 [node name="manager" type="KinematicBody2D" parent="."]
 position = Vector2( 600.978, 319.858 )
 script = ExtResource( 3 )
+speed = 200.0
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="manager"]
+position = Vector2( -13.566, -1.50735 )
 shape = SubResource( 1 )
 
 [node name="Sprite" type="Sprite" parent="manager"]
-texture = SubResource( 2 )
-normal_map = SubResource( 3 )
+texture = ExtResource( 2 )