Extracted 'mood' out of the controller and put it in it's own little class. Trying to make things a little less monolithic.

Data/Objects/Player.tscn

@@ -1,8 +1,9 @@
-[gd_scene load_steps=10 format=2]
+[gd_scene load_steps=11 format=2]
 
 [ext_resource path="res://Data/Scripts/Controller.gd" type="Script" id=1]
 [ext_resource path="res://Data/Graphics/placeholder.png" type="Texture" id=2]
 [ext_resource path="res://Data/Objects/ScreenShake.tscn" type="PackedScene" id=3]
+[ext_resource path="res://Data/Scripts/Mood.gd" type="Script" id=4]
 [ext_resource path="res://Data/Shaders/WaveFish.shader" type="Shader" id=5]
 
 [sub_resource type="CircleShape2D" id=1]
@@ -50,6 +51,9 @@ contacts_reported = 1
 contact_monitor = true
 script = ExtResource( 1 )
 
+[node name="Mood" type="Node2D" parent="."]
+script = ExtResource( 4 )
+
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 visible = false
 shape = SubResource( 1 )

Data/Scripts/Controller.gd

@@ -4,16 +4,9 @@ const COLLISION_MINOR_SPEED_THRESHOLD = 150
 const COLLISION_MAJOR_SPEED_THRESHOLD = 400
 const COLLISION_TIMEDT_THRESHOLD = 0.1
 
-const ANIM_RATE_DEFAULT = 3.5
-const ANIM_RATE_AGGRESSIVE = 6.0
-const ANIM_RATE_CONTENT = 1.0
-
 # The maximum distance from the player in which the mouse will adjust the push force.
 # at max_mouse_distance the full base_push_force <+ modifiers> will be applied.
-var max_mouse_distance = 256
-
-# The maximum the mouse can be from the player before player becomes "uncomfortable"
-var max_comfort_distance = 10
+var max_mouse_distance = 128
 
 # The base tangential acceleration that will be applied to the particles to give the
 # player the illusion it's trying to move on it's own. This is just effects things visually (ATM)
@@ -23,12 +16,6 @@ export var base_tangential_accel = 32 setget _set_base_tangential_accel
 export var base_push_force = 64 setget _set_base_push_force
 
 
-# Mood = r: <aggression>, g: <neediness>, b: <contentment>
-# <aggression> Affects how strong a players push is and how strong the player's collision with the world will be.
-# <neediness> Affects how quickly and strongly the player will follow the mouse
-# <contentment> Affects how slowly mood color is shifted back to neutral and widens comfort distance
-var mood = Color.black
-
 var neutral_rim = Color(0.9, 0.9, 0.9, 1.0)
 
 var mouse_position = Vector2.ZERO
@@ -53,14 +40,7 @@ func set_colors(prime, alt):
 		# This should reset all of the collision masks to ON!
 		_set_color_collision_mask(0)
 	
-	if prime.r != prime.g or prime.r != prime.b: # Only adjust mood if not all values are the same.
-		# Even if not all the same, there must be a single dominant color for mood to be adjusted.
-		if prime.r > prime.g and prime.r > prime.b:
-			adjust_mood(0.25, 0.0, 0.0)
-		if prime.g > prime.r and prime.g > prime.b:
-			adjust_mood(0.0, 0.25, 0.0)
-		if prime.b > prime.r and prime.b > prime.g:
-			adjust_mood(0.0, 0.0, 0.25)
+	$Mood.adjust_mood_from_color(prime)
 
 func get_colors():
 	return {
@@ -68,30 +48,8 @@ func get_colors():
 		"alt": $Sprite.material.get_shader_param("rim_color")
 	};
 
-func adjust_mood(r, g, b):
-	mood.r = clamp(mood.r + r, 0.0, 1.0)
-	mood.g = clamp(mood.g + g, 0.0, 1.0)
-	mood.b = clamp(mood.b + b, 0.0, 1.0)
-	$Sprite.material.set_shader_param("cell_color", mood);
-	
-	if is_aggressive():
-		$Sprite.material.set_shader_param("cell_energy", ANIM_RATE_AGGRESSIVE)
-	elif is_content():
-		$Sprite.material.set_shader_param("cell_energy", ANIM_RATE_CONTENT)
-	else:
-		$Sprite.material.set_shader_param("cell_energy", ANIM_RATE_DEFAULT)
-
-func is_aggressive():
-	return mood.r > mood.g and mood.r > mood.b
-
-func is_needie():
-	return mood.g > mood.r and mood.g > mood.b
-
-func is_content():
-	return mood.b > mood.r and mood.b > mood.g
-
 func get_tangential_acceleration():
-	return get_discomfort_adjustment(base_tangential_accel)
+	return base_tangential_accel * $Mood.get_need()
 
 func get_push_force():
 	var dist = (position - mouse_position).length() - get_body_radius()
@@ -99,22 +57,22 @@ func get_push_force():
 		return 0.0
 		
 	var push = base_push_force * (dist / (max_mouse_distance))
-	if mood.r > mood.b:
-		if mood.r > 0.1 and mood.r < 0.5:
+	var agg = $Mood.get_aggression()
+	var con = $Mood.get_contentment()
+	if agg > con:
+		if agg > 0.1 and agg < 0.5:
 			push *= 1.25
-		elif mood.r >= 0.5:
+		elif agg >= 0.5:
 			push *= 1.5
-		elif is_aggressive():
+		elif $Mood.is_aggressive():
 			push *= 2
-	elif mood.b > mood.r:
-		if mood.b > 0.1 and mood.b < 0.5:
+	elif con > agg:
+		if con > 0.1 and con < 0.5:
 			push *= 0.75
-		elif mood.b >= 0.5:
+		elif con >= 0.5:
 			push *= 0.5
 	return push
 
-func get_discomfort_adjustment(v):
-	return v * mood.g
 
 func get_body_radius():
 	return $CollisionShape2D.shape.radius
@@ -139,7 +97,6 @@ func _ready():
 	set_process(true)
 	set_physics_process(true)
 	set_process_input(true)
-	max_comfort_distance = $CollisionShape2D.shape.radius
 	$Sprite.material.set_shader_param("rim_color", neutral_rim);
 	$Particles.process_material.color = neutral_rim
 
@@ -152,78 +109,6 @@ func _input(event):
 		push = true
 
 
-func _shift_mood(delta):
-	var nr = 0.0
-	var ng = 0.0
-	var nb = 0.0
-	
-	if in_air:
-		if last_speed >= COLLISION_MINOR_SPEED_THRESHOLD:
-			if last_speed >= COLLISION_MAJOR_SPEED_THRESHOLD:
-				nr += 0.1
-			else:
-				nr += 0.05
-		else:
-			nr -= 0.1
-			nb += 0.05
-	
-	# first handle red (aggression)
-	if mood.r > 0:
-		if mood.b > 0.0:
-			if mood.b >= mood.r * 0.5:
-				nr += -0.1
-			if mood.b < mood.r * 0.5:
-				nr += -0.05
-			if mood.r > mood.b:
-				nr += 0.05
-	nr *= delta
-	
-	
-	# Then handle green <neediness>
-	# green <neediness> is based on how far the mouse is from the player. The greater the distance
-	# the more <neediness> grows. This can be affected by <contentment> and <aggression> as well.
-	var mdist = (position - mouse_position).length()
-	if not in_air:
-		if is_content():
-			if mdist <= max_comfort_distance:
-				ng += -0.1
-			elif mdist < (max_mouse_distance * 0.5):
-				ng += -0.05
-		elif is_needie():
-			if mdist <= max_comfort_distance:
-				ng += -0.05
-			elif mdist >= (max_mouse_distance * 0.5):
-				ng += 0.1
-			else:
-				ng += 0.05
-		elif is_aggressive():
-			# If player is <aggressive>, then neediness is kinda forgotten about.
-			if mood.r > 0.25 and mood.r < 0.5:
-				ng += -0.05
-			elif mood.r >= 0.5:
-				ng += -0.15
-		else:
-			if mdist > max_comfort_distance:
-				ng += 0.05
-	ng *= delta
-	
-	
-	# Finally handle blue <contentment>
-	# If red <aggression> is half as high or more than blue <contentment>, then contentment goes down.
-	if mood.r >= mood.b * 0.5:
-		nb += -0.1
-	elif mood.g > 0.0:
-		nb += -0.025
-	if mdist < max_comfort_distance:
-		nb += 0.015
-	else:
-		nb += -0.1
-	nb *= delta
-	
-	# Finalize changes!
-	adjust_mood(nr, ng, nb)
-
-
 func _physics_process(delta):
 	mouse_position = get_global_mouse_position()
 	if mouse_down:
@@ -232,19 +117,19 @@ func _physics_process(delta):
 	if push:
 		push = false
 		var v_direction = (position - mouse_position).normalized()
-		apply_central_impulse(v_direction * abs(v_direction.length()) * get_push_force())
+		apply_central_impulse(v_direction * v_direction.length() * get_push_force())
 	elif in_air:
 		air_time += delta
 	else:
 		var distance = clamp(mouse_position.x - position.x, -max_mouse_distance, max_mouse_distance)
 		var dpercent = distance / max_mouse_distance
-		if !is_content() and abs(distance) > get_body_radius():
+		if !$Mood.is_content() and abs(distance) > get_body_radius():
 			var v_horizontal = Physics2DServer.area_get_param(get_world_2d().get_space(), Physics2DServer.AREA_PARAM_GRAVITY_VECTOR).rotated(deg2rad(-90))
 			$Particles.process_material.tangential_accel = dpercent * get_tangential_acceleration();
-			apply_central_impulse(v_horizontal * get_discomfort_adjustment(distance) * delta)
+			apply_central_impulse(v_horizontal * distance * $Mood.get_need() * delta)
 		else:
 			$Particles.process_material.tangential_accel = 0
-	_shift_mood(delta)
+	$Mood.shift_mood(delta, in_air, last_speed, (position - mouse_position).length())
 	last_speed = linear_velocity.length()
 	
 
@@ -274,10 +159,10 @@ func _on_Player_body_entered(body):
 		#var lvlen = linear_velocity.length()
 		#print("Last Speed: ", last_speed)
 		if last_speed >= COLLISION_MINOR_SPEED_THRESHOLD and last_speed < COLLISION_MAJOR_SPEED_THRESHOLD:
-			adjust_mood(0.1, 0.0, -0.1)
+			$Mood.adjust_mood(0.1, 0.0, -0.1)
 			$Camera/ScreenShake.start()
 		elif last_speed >= COLLISION_MAJOR_SPEED_THRESHOLD:
-			adjust_mood(0.25, 0.0, -0.25)
+			$Mood.adjust_mood(0.25, 0.0, -0.25)
 			$Camera/ScreenShake.start(0.4, 15, 24)
 	air_time = 0
 

Data/Scripts/Mood.gd

@@ -0,0 +1,135 @@
+extends Node2D
+
+const ANIM_RATE_DEFAULT = 3.5
+const ANIM_RATE_AGGRESSIVE = 6.0
+const ANIM_RATE_CONTENT = 1.0
+
+const EXCITEMENT_MIN_SPEED = 150
+const EXCITEMENT_MAX_SPEED = 350
+
+# Mood = r: <aggression>, g: <neediness>, b: <contentment>
+# <aggression> Affects how strong a players push is and how strong the player's collision with the world will be.
+# <neediness> Affects how quickly and strongly the player will follow the mouse
+# <contentment> Affects how slowly mood color is shifted back to neutral and widens comfort distance
+var _mood = Color.black
+
+onready var _spr = get_parent().get_node("Sprite")
+onready var _body_radius = get_parent().get_node("CollisionShape2D").shape.radius
+
+func adjust_mood(r, g, b):
+	_mood.r = clamp(_mood.r + r, 0.0, 1.0)
+	_mood.g = clamp(_mood.g + g, 0.0, 1.0)
+	_mood.b = clamp(_mood.b + b, 0.0, 1.0)
+	_spr.material.set_shader_param("cell_color", _mood);
+	
+	if is_aggressive():
+		_spr.material.set_shader_param("cell_energy", ANIM_RATE_AGGRESSIVE)
+	elif is_content():
+		_spr.material.set_shader_param("cell_energy", ANIM_RATE_CONTENT)
+	else:
+		_spr.material.set_shader_param("cell_energy", ANIM_RATE_DEFAULT)
+
+func adjust_mood_from_color(c):
+	if c.r != c.g or c.r != c.b: # Only adjust mood if not all values are the same.
+		# Even if not all the same, there must be a single dominant color for mood to be adjusted.
+		if c.r > c.g and c.r > c.b:
+			adjust_mood(0.25, 0.0, 0.0)
+		if c.g > c.r and c.g > c.b:
+			adjust_mood(0.0, 0.25, 0.0)
+		if c.b > c.r and c.b > c.g:
+			adjust_mood(0.0, 0.0, 0.25)
+
+func is_aggressive():
+	return _mood.r > _mood.g and _mood.r > _mood.b
+
+func is_needie():
+	return _mood.g > _mood.r and _mood.g > _mood.b
+
+func is_content():
+	return _mood.b > _mood.r and _mood.b > _mood.g
+
+func get_aggression():
+	return _mood.r
+
+func get_need():
+	return _mood.g
+
+func get_contentment():
+	return _mood.b
+
+func get_comfort_distance():
+	return get_parent().get_node("CollisionShape2D").shape.radius * 1.1
+
+func get_mood_color():
+	return _mood
+
+func shift_mood(delta, in_air, speed, distance):
+	var nr = 0.0
+	var ng = 0.0
+	var nb = 0.0
+	
+	if in_air:
+		if speed >= EXCITEMENT_MIN_SPEED:
+			if speed >= EXCITEMENT_MAX_SPEED:
+				nr += 0.1
+			else:
+				nr += 0.05
+		else:
+			nr -= 0.1
+			nb += 0.05
+	
+	# first handle red (aggression)
+	if _mood.r > 0:
+		if _mood.b > 0.0:
+			if _mood.b >= _mood.r * 0.5:
+				nr += -0.1
+			if _mood.b < _mood.r * 0.5:
+				nr += -0.05
+			if _mood.r > _mood.b:
+				nr += 0.05
+	nr *= delta
+	
+	
+	# Then handle green <neediness>
+	# green <neediness> is based on how far the mouse is from the player. The greater the distance
+	# the more <neediness> grows. This can be affected by <contentment> and <aggression> as well.
+	var cdist = get_comfort_distance()
+	if not in_air:
+		if is_content():
+			if distance <= cdist:
+				ng += -0.1
+			elif distance < (cdist * 0.5):
+				ng += -0.05
+		elif is_needie():
+			if distance <= cdist:
+				ng += -0.05
+			elif distance >= (cdist * 0.5):
+				ng += 0.1
+			else:
+				ng += 0.05
+		elif is_aggressive():
+			# If player is <aggressive>, then neediness is kinda forgotten about.
+			if _mood.r > 0.25 and _mood.r < 0.5:
+				ng += -0.05
+			elif _mood.r >= 0.5:
+				ng += -0.15
+		else:
+			if distance > cdist:
+				ng += 0.05
+	ng *= delta
+	
+	
+	# Finally handle blue <contentment>
+	# If red <aggression> is half as high or more than blue <contentment>, then contentment goes down.
+	if _mood.r >= _mood.b * 0.5:
+		nb += -0.1
+	elif _mood.g > 0.0:
+		nb += -0.025
+	if distance < cdist:
+		nb += 0.015
+	else:
+		nb += -0.1
+	nb *= delta
+	
+	# Finalize changes!
+	adjust_mood(nr, ng, nb)