From cc7ec9f185544f06a6eb0afcc0cf7476a2ab5ce1 Mon Sep 17 00:00:00 2001
From: Hurlu <mr.hurlu@gmail.com>
Date: Sun, 5 Apr 2020 10:48:29 +0200
Subject: [PATCH] Fixed confuseDirections

---
 Assets/zétoile.png                        | Bin 0 -> 835 bytes
 Assets/zétoile.png.import                 |  34 +++++++++++++++++++
 Scene/HealthBar.tscn                      |   1 +
 Scene/Player.tscn                         |  38 +++++++++++++++++++++-
 Scripts/GameManager.gd                    |   3 +-
 Scripts/HealthBar.gd                      |   5 +--
 Scripts/PaintEffects/ConfuseDirections.gd |   6 ++--
 Scripts/Player.gd                         |   9 +++++
 8 files changed, 87 insertions(+), 9 deletions(-)
 create mode 100644 Assets/zétoile.png
 create mode 100644 Assets/zétoile.png.import

diff --git a/Assets/zétoile.png b/Assets/zétoile.png
new file mode 100644
index 0000000000000000000000000000000000000000..56c3da730a58cd4b30e7337b7e8cfa7ecf2d7a20
GIT binary patch
literal 835
zcmV-J1HAl+P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$i)0P&kIM_kNAwzYtASxnGQpF-zC~bvS9ZW9$f+h_~
zi;JV+T5#}VvFhOBtgC~oAP9bdI5|2gx=4xtOA0MwJUH&hyL*qjcYx5WFxB*p1FBXt
zQt_CW&8>=oSNPyZ5WSd{n5ieyiy63%uX}j-dKcwc?&tm-eM;VBfJY>rW4ciz-XNad
ztm&NhiNmZUDa7Z*V+LK2_>t?f!*866HVZs6Y-CdN#9?Bw*u`=evy!0_PZ38HRik_%
z>#)Lki?dp(v-Umt3qyHrCCzo3!-!)E2_zvxMjd5TP(zefjT93p+K;*Thire6Tr#=J
zVB}ap6)Gg#5B>+gyEO}w6HZbn2KZkr>th56>;kQZWqlu8R_g@tJ_A=;$6sv%GoPe4
zI$Goi=-&n|t~;8%2VCv|gHO6-NVepqDHIC8`x$*x4j8xvde)rY+WR<t05a6o@(pls
z2#gjfd)?*T!S3GvJ=5;*2VkOdpd;LAkpKVy24YJ`L;(K){{a7>y{D4^000SaNLh0L
z04^f{04^f|c%?sf00007bV*G`2jm0=2n`uri6Zj=000?uMObu0Z*6U5Zgc=ca%Ew3
zWn>_CX>@2HM@dakSAh-}0003RNkl<ZSi{v<K@P+q2xLgl{r@}r0eaXqp%hyL-DF96
z(a4O0gB2n|l>l%_AR-u9&ojW~_<Wft5oq9*;91hYjrU?J)%&1wa1>bAy9eIJMpVF?
z3oLLb=^l4Pmw?_yM(QXDmq2FMSrWVoJbETB3d{tLs=>1x%cvULQv+$NN66VV*1C2c
zB65-b1}Xvo5>>`Z?YRlNnkS;$&TXAW2v~rwwZHRhfj#h9cZEwT(g{~KA|_gU>X-iy
zEWHgQ^~dg8FPejAbhk<wICBlRU2E68kr^V;1J`ov(_JC4MZk69o~>HPED^Ba5n#6q
z9*Gjz`#?(_1<#a%tyMC>6%y<v$N*=bXQ;jnBMs<@&@uu)dmH{effHrW+zCy^;n4s9
N002ovPDHLkV1it~V!;3a

literal 0
HcmV?d00001

diff --git a/Assets/zétoile.png.import b/Assets/zétoile.png.import
new file mode 100644
index 0000000..76cc008
--- /dev/null
+++ b/Assets/zétoile.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/zétoile.png-95e033ce52b6e389eaf579da15f7aac5.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/zétoile.png"
+dest_files=[ "res://.import/zétoile.png-95e033ce52b6e389eaf579da15f7aac5.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0
diff --git a/Scene/HealthBar.tscn b/Scene/HealthBar.tscn
index cdefd1e..c436587 100644
--- a/Scene/HealthBar.tscn
+++ b/Scene/HealthBar.tscn
@@ -20,6 +20,7 @@ margin_top = 39.6669
 margin_right = 332.0
 margin_bottom = 79.6669
 rect_scale = Vector2( 1.75, 1.75 )
+step = 0.1
 value = 99.0
 texture_under = ExtResource( 3 )
 texture_over = ExtResource( 2 )
diff --git a/Scene/Player.tscn b/Scene/Player.tscn
index 5700ede..3113a0b 100644
--- a/Scene/Player.tscn
+++ b/Scene/Player.tscn
@@ -1,7 +1,8 @@
-[gd_scene load_steps=26 format=2]
+[gd_scene load_steps=28 format=2]
 
 [ext_resource path="res://Assets/spriteset test.png" type="Texture" id=1]
 [ext_resource path="res://Scripts/Player.gd" type="Script" id=2]
+[ext_resource path="res://Assets/zétoile.png" type="Texture" id=3]
 
 [sub_resource type="RectangleShape2D" id=1]
 extents = Vector2( 15.5015, 46.849 )
@@ -202,6 +203,11 @@ start_node = "Idle"
 
 [sub_resource type="AnimationNodeStateMachinePlayback" id=23]
 
+[sub_resource type="Curve2D" id=24]
+_data = {
+"points": PoolVector2Array( -15.7724, -10.548, 15.7724, 10.548, 79.9353, -88.996, 8.91483, -9.7366, -8.91483, 9.7366, 75.135, -62.2204, 10.2863, 13.7935, -10.2863, -13.7935, -33.2145, -63.0318, -10.2863, 9.7366, 10.2863, -9.7366, -16.7564, -88.1847, -14.4009, 13.7935, 14.4009, -13.7935, -16.7564, -88.996, -6.85756, -19.4732, 6.85756, 19.4732, 79.9353, -88.996 )
+}
+
 [node name="KinematicBody2D" type="KinematicBody2D"]
 script = ExtResource( 2 )
 
@@ -231,3 +237,33 @@ active = true
 parameters/playback = SubResource( 23 )
 parameters/Idle/blend_position = Vector2( -1.1, 0.0314158 )
 parameters/Run/blend_position = Vector2( -0.0925897, 0.517895 )
+
+[node name="ConfusionStars" type="Node2D" parent="."]
+
+[node name="Path2D" type="Path2D" parent="ConfusionStars"]
+position = Vector2( -19.4617, -21.2425 )
+scale = Vector2( 0.731191, 0.591658 )
+curve = SubResource( 24 )
+
+[node name="PathFollow2D" type="PathFollow2D" parent="ConfusionStars/Path2D"]
+position = Vector2( 79.9353, -88.996 )
+rotation = 0.639347
+rotate = false
+
+[node name="Sprite" type="Sprite" parent="ConfusionStars/Path2D/PathFollow2D"]
+position = Vector2( 0.823479, -2.89215 )
+rotation = -0.639347
+scale = Vector2( 1.1136, 1.2906 )
+texture = ExtResource( 3 )
+
+[node name="PathFollow2D2" type="PathFollow2D" parent="ConfusionStars/Path2D"]
+position = Vector2( -18.8506, -56.7147 )
+rotation = 0.639347
+offset = 129.76
+rotate = false
+
+[node name="Sprite" type="Sprite" parent="ConfusionStars/Path2D/PathFollow2D2"]
+position = Vector2( 0.823479, -2.89215 )
+rotation = -0.639347
+scale = Vector2( 1.1136, 1.2906 )
+texture = ExtResource( 3 )
diff --git a/Scripts/GameManager.gd b/Scripts/GameManager.gd
index a631a8e..0390fa1 100644
--- a/Scripts/GameManager.gd
+++ b/Scripts/GameManager.gd
@@ -11,8 +11,7 @@ var scripts = ["res://Scripts/PaintEffects/ConfuseDirections.gd",
 "res://Scripts/PaintEffects/Upscale.gd"]
 
 func spawnBucket():
-	var newBucket = bucket.instance()
-	newBucket.scriptName = scripts[randi() % scripts.size()]
+	var newBucket = bucket.instance()	
 	self.get_parent().add_child(newBucket)
 	newBucket.add_to_group("bucket")
 	newBucket.set_position(spawnPoints[randi() % spawnPoints.size()].get_position())
diff --git a/Scripts/HealthBar.gd b/Scripts/HealthBar.gd
index f353540..b5248c7 100644
--- a/Scripts/HealthBar.gd
+++ b/Scripts/HealthBar.gd
@@ -1,12 +1,9 @@
 extends Control
 
 onready var healthBar = $HealthBar
-onready var updateTween = $UpdateTween
 
 func healthUpdated(health):
-	healthBar.value = health
-	updateTween.interpolate_property(healthBar, "value", health, 0.2, Tween.TRANS_SINE, Tween.EASE_IN_OUT)
-	updateTween.start()
+	healthBar.value = health	
 
 func maxHealthUpdated(maxHealth):
 	healthBar.max_value = maxHealth
diff --git a/Scripts/PaintEffects/ConfuseDirections.gd b/Scripts/PaintEffects/ConfuseDirections.gd
index 69327d9..9aa9cc9 100644
--- a/Scripts/PaintEffects/ConfuseDirections.gd
+++ b/Scripts/PaintEffects/ConfuseDirections.gd
@@ -3,13 +3,15 @@ extends Node
 export var Duration = 7.5
 
 func ConfusionRoutine(player, delta):
-	var elapsed = 0
-	var inputs = player.baseInputs
+	player.get_node("ConfusionStars").visible = true
+	var elapsed = delta
+	var inputs = player.baseInputs + []
 	inputs.shuffle()
 	player.inputs = inputs
 	while elapsed < Duration:
 		elapsed += yield()
 	player.inputs = player.baseInputs
+	player.get_node("ConfusionStars").visible = false
 
 func StartEffect(player):
 	var rout = ConfusionRoutine(player, 0)
diff --git a/Scripts/Player.gd b/Scripts/Player.gd
index 012570f..da27209 100644
--- a/Scripts/Player.gd
+++ b/Scripts/Player.gd
@@ -5,6 +5,10 @@ var ACCELERATION = 1800
 var FRICTION = 2000
 var MAX_LIFE = 30
 const PICKUP_BONUS = 5
+export var rota_speed = 100
+
+var follow1;
+var follow2;
 
 var vel = Vector2.ZERO
 var curLife = MAX_LIFE
@@ -27,6 +31,9 @@ onready var animationState = animationTree.get("parameters/playback")
 var healthBar = null
 
 func _ready():
+	get_node("ConfusionStars").visible = false
+	follow1 = get_node("ConfusionStars/Path2D/PathFollow2D")
+	follow2 = get_node("ConfusionStars/Path2D/PathFollow2D2")	
 	if self.name == "Player1":
 		healthBar = get_tree().get_nodes_in_group("healthbar")[0]
 	elif self.name == "Player2":
@@ -34,6 +41,8 @@ func _ready():
 	healthBar.maxHealthUpdated(MAX_LIFE)
 
 func _process(delta):
+	follow1.set_offset(follow1.get_offset() + delta * rota_speed)
+	follow2.set_offset(follow2.get_offset() + delta * rota_speed)
 	updatePaintEffects(delta)
 	curLife -= delta
 	if curLife <= 0: