Merge remote-tracking branch 'origin/master'

Author: citron0xa9

characters/enemies/angel/angel.gd

@@ -22,6 +22,8 @@ func on_entered_light(player):
 	enemy_state = ENEMY_STATE.blinded
 
 func on_exited_light(player):
+	if enemy_state != ENEMY_STATE.blinded:
+		return
 	followed_player = player
 	enemy_state = ENEMY_STATE.following
 

characters/enemies/hugger/hugger.gd

@@ -30,6 +30,8 @@ func on_entered_light(player):
 	enemy_state = ENEMY_STATE.following_in_light
 
 func on_exited_light(player):
+	if enemy_state != ENEMY_STATE.following_in_light:
+		return
 	followed_player = player
 	enemy_state = ENEMY_STATE.following_out_of_light
 	time_to_follow = MAX_TIME_TO_FOLLOW

characters/enemies/hugger/hugger.tscn

@@ -11,6 +11,7 @@ radius = 4.71644
 [node name="hugger" type="PathFollow2D"]
 
 position = Vector2( 22.5455, 5.84727 )
+rotation = 3.14159
 offset = 0.0
 h_offset = 0.0
 v_offset = 0.0

characters/player/player.gd

@@ -2,12 +2,18 @@ extends KinematicBody2D
 
 export (float, 0, 100, 0.1) var speed = 40
 
+var enemies_in_flashlight_area = []
+var time_till_flashlight_toggleable = 0.2
+
 func _ready():
 	if (config.no_enemy_collision):
 		set_collision_mask_bit(1, false)
 		set_collision_layer_bit(1, false)
+	$flashlight_animation_player.play("flickering")
 
 func _process(delta):
+	time_till_flashlight_toggleable -= delta
+	
 	var direction = Vector2()
 	if(Input.is_action_pressed("move_left")):
 		rotation_degrees = 180
@@ -22,16 +28,42 @@ func _process(delta):
 		rotation_degrees = 270
 		direction = Vector2(0, -1)
 
+	if Input.is_action_just_pressed("toggle_flashlight") and time_till_flashlight_toggleable <= 0:
+		$flashlight.enabled = !$flashlight.enabled
+		$flashlight/area/shape.disabled = !$flashlight/area/shape.disabled
+		
 	var distance = speed * delta * direction
 	move_and_collide(distance)
+	
+func _physics_process(delta):
+	if $flashlight.enabled:
+		for enemy in enemies_in_flashlight_area:
+			if not is_something_in_between(global_position, enemy.global_position):
+				enemy.on_entered_light(self)	
+		
+	
+func is_something_in_between(pos1, pos2):
+	var space_state = get_world_2d().direct_space_state
+	var intersection = space_state.intersect_ray(pos1, pos2, [self, $flashlight/area/CollisionShape2D, $flashlight/area])
+	#Debug code for ray casting, shows ray cast intersection point
+	#var s = Sprite.new()
+	#s.texture = preload("res://characters/player/lightcircle01.png")
+	#s.position = intersection.position
+	#s.scale = Vector2(0.01, 0.01)
+	#get_parent().add_child(s)
+	var distance = intersection.position.distance_to(pos2)
+	# Magic value to take area of collision objects into account
+	distance -= 8
+	return distance > 1
 
 func _on_flashlight_area_body_entered(body):
 	if body.is_in_group("enemy_flashlight_collider"):
-		body.on_entered_light(self)
+		enemies_in_flashlight_area.push_back(body)
 
 
 func _on_flashlight_area_body_exited(body):
 	if body.is_in_group("enemy_flashlight_collider"):
+		enemies_in_flashlight_area.remove(enemies_in_flashlight_area.find(body))
 		body.on_exited_light(self)
 
 
@@ -42,4 +74,4 @@ func _on_neighborhood_area_body_entered(body):
 
 func _on_neighborhood_area_body_exited(body):
 	if body.is_in_group("enemy_neighborhood_collider"):
-		body.on_exited_neighborhood(self)
+		body.on_exited_neighborhood(self)		

characters/player/player.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=8 format=2]
+[gd_scene load_steps=9 format=2]
 
 [ext_resource path="res://characters/player/player.gd" type="Script" id=1]
 [ext_resource path="res://characters/player/lightcone01.png" type="Texture" id=2]
@@ -15,12 +15,30 @@ extents = Vector2( 5.80276, 6.68023 )
 custom_solver_bias = 0.0
 points = PoolVector2Array( 0, -10, 8.66025, 5, -8.66025, 5 )
 
-[sub_resource type="CircleShape2D" id=3]
+[sub_resource type="Animation" id=3]
+
+length = 0.2
+loop = true
+step = 0.05
+tracks/0/type = "value"
+tracks/0/path = NodePath("flashlight:energy")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/keys = {
+"times": PoolRealArray( 0, 0.05, 0.1, 0.15, 0.2 ),
+"transitions": PoolRealArray( 1, 1, 1, 1, 1 ),
+"update": 0,
+"values": [ 0.8, 0.9, 0.85, 1.1, 1.0 ]
+}
+
+[sub_resource type="CircleShape2D" id=4]
 
 custom_solver_bias = 0.0
 radius = 185.937
 
-[node name="player" type="KinematicBody2D" index="0"]
+[node name="player" type="KinematicBody2D"]
 
 input_pickable = false
 collision_layer = 2
@@ -77,20 +95,31 @@ audio_bus_override = false
 audio_bus_name = "Master"
 _sections_unfolded = [ "Transform" ]
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="flashlight/area" index="0"]
+[node name="shape" type="CollisionShape2D" parent="flashlight/area" index="0"]
 
 position = Vector2( -81.8826, 38.7309 )
 rotation = 4.71239
 scale = Vector2( 6.17808, 13.4807 )
 shape = SubResource( 2 )
 _sections_unfolded = [ "Transform" ]
 
-[node name="Sprite" type="Sprite" parent="." index="2"]
+[node name="flashlight_animation_player" type="AnimationPlayer" parent="." index="2"]
+
+root_node = NodePath("..")
+autoplay = ""
+playback_process_mode = 1
+playback_default_blend_time = 0.0
+playback_speed = 1.0
+anims/flickering = SubResource( 3 )
+blend_times = [  ]
+_sections_unfolded = [ "Playback Options" ]
+
+[node name="Sprite" type="Sprite" parent="." index="3"]
 
 texture = ExtResource( 3 )
 _sections_unfolded = [ "Transform" ]
 
-[node name="personalLight" type="Light2D" parent="." index="3"]
+[node name="personalLight" type="Light2D" parent="." index="4"]
 
 scale = Vector2( 0.121984, 0.120942 )
 enabled = true
@@ -116,7 +145,7 @@ shadow_filter_smooth = 0.0
 shadow_item_cull_mask = 1
 _sections_unfolded = [ "Transform" ]
 
-[node name="neighborhood" type="Area2D" parent="." index="4"]
+[node name="neighborhood" type="Area2D" parent="." index="5"]
 
 input_pickable = true
 gravity_vec = Vector2( 0, 1 )
@@ -128,7 +157,7 @@ audio_bus_name = "Master"
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="neighborhood" index="0"]
 
-shape = SubResource( 3 )
+shape = SubResource( 4 )
 
 [connection signal="body_entered" from="flashlight/area" to="." method="_on_flashlight_area_body_entered"]
 

characters/tapir.png.import

@@ -10,7 +10,7 @@ source_file="res://characters/tapir.png"
 source_md5="f3cd3b6fab7cd74e6488f2ba0e10d42c"
 
 dest_files=[ "res://.import/tapir.png-d21c8d954ba0274a61e8cf1093c961c8.stex" ]
-dest_md5="b15e5a743eed8a067559eab71731748f"
+dest_md5="e5268f3fd75d0847e1e2b6525c03197c"
 
 [params]
 
@@ -19,7 +19,7 @@ compress/lossy_quality=0.7
 compress/hdr_mode=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2
@@ -28,5 +28,5 @@ process/premult_alpha=false
 process/HDR_as_SRGB=false
 stream=false
 size_limit=0
-detect_3d=true
+detect_3d=false
 svg/scale=1.0

game.gd

@@ -1,6 +1,4 @@
 extends Node2D
 
 func _ready():
-	if OS.has_feature('JavaScript'):
-		# Maximize game in browsers
-		OS.set_window_maximized(true)
+	pass

intro.gd

@@ -1,6 +1,15 @@
 extends Node
 
 func _ready():
+	if OS.has_feature('JavaScript'):
+		# Maximize game in browsers, because fullscreen
+		# requires extra permissions
+		OS.window_maximized = true
+	elif not OS.is_debug_build():
+		# Go fullscreen on desktop, but not when running
+		# a debug build.
+		OS.window_fullscreen = true
+
 	$start_timer.start()
 
 func _on_intro_player_animation_finished(anim_name):

intro.tscn

@@ -41,7 +41,7 @@ tracks/0/keys = {
 "values": [ 0.0, 1.0 ]
 }
 
-[node name="Node" type="Node" index="0"]
+[node name="Node" type="Node"]
 
 script = ExtResource( 1 )
 

project.godot

@@ -11,7 +11,7 @@ config_version=3
 [application]
 
 config/name="TotallyTerrifyingTurns"
-run/main_scene="res://game.tscn"
+run/main_scene="res://intro.tscn"
 config/icon="res://icon.png"
 
 [autoload]
@@ -32,6 +32,8 @@ move_up=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"
 move_down=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"unicode":0,"echo":false,"script":null)
 , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777234,"unicode":0,"echo":false,"script":null)
  ]
+toggle_flashlight=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777221,"unicode":0,"echo":false,"script":null)
+ ]
 
 [rendering]
 

torch/torch.gd

@@ -0,0 +1,4 @@
+extends StaticBody2D
+
+func _ready():
+	$light_animation_player.play("flickering")

torch/torch.tscn

@@ -1,19 +1,20 @@
-[gd_scene load_steps=12 format=2]
-
-[ext_resource path="res://torch/tiles/tiles-72.png" type="Texture" id=1]
-[ext_resource path="res://torch/tiles/tiles-73.png" type="Texture" id=2]
-[ext_resource path="res://torch/tiles/tiles-74.png" type="Texture" id=3]
-[ext_resource path="res://torch/tiles/tiles-75.png" type="Texture" id=4]
-[ext_resource path="res://torch/tiles/tiles-76.png" type="Texture" id=5]
-[ext_resource path="res://torch/tiles/tiles-77.png" type="Texture" id=6]
-[ext_resource path="res://torch/tiles/tiles-78.png" type="Texture" id=7]
-[ext_resource path="res://torch/tiles/tiles-79.png" type="Texture" id=8]
-[ext_resource path="res://torch/LightSource.png" type="Texture" id=9]
+[gd_scene load_steps=17 format=2]
+
+[ext_resource path="res://torch/torch.gd" type="Script" id=1]
+[ext_resource path="res://torch/tiles/tiles-72.png" type="Texture" id=2]
+[ext_resource path="res://torch/tiles/tiles-73.png" type="Texture" id=3]
+[ext_resource path="res://torch/tiles/tiles-74.png" type="Texture" id=4]
+[ext_resource path="res://torch/tiles/tiles-75.png" type="Texture" id=5]
+[ext_resource path="res://torch/tiles/tiles-76.png" type="Texture" id=6]
+[ext_resource path="res://torch/tiles/tiles-77.png" type="Texture" id=7]
+[ext_resource path="res://torch/tiles/tiles-78.png" type="Texture" id=8]
+[ext_resource path="res://torch/tiles/tiles-79.png" type="Texture" id=9]
+[ext_resource path="res://torch/LightSource.png" type="Texture" id=10]
 
 [sub_resource type="SpriteFrames" id=1]
 
 animations = [ {
-"frames": [ ExtResource( 1 ), ExtResource( 2 ), ExtResource( 3 ), ExtResource( 4 ), ExtResource( 5 ), ExtResource( 6 ), ExtResource( 7 ), ExtResource( 8 ) ],
+"frames": [ ExtResource( 2 ), ExtResource( 3 ), ExtResource( 4 ), ExtResource( 5 ), ExtResource( 6 ), ExtResource( 7 ), ExtResource( 8 ), ExtResource( 9 ) ],
 "loop": true,
 "name": "default",
 "speed": 8.0
@@ -24,21 +25,92 @@ animations = [ {
 custom_solver_bias = 0.0
 extents = Vector2( 10, 11.084 )
 
-[node name="torch" type="StaticBody2D"]
+[sub_resource type="Animation" id=3]
+
+resource_name = "flickering"
+length = 0.2
+loop = true
+step = 0.1
+tracks/0/type = "value"
+tracks/0/path = NodePath("Light2D:energy")
+tracks/0/interp = 0
+tracks/0/loop_wrap = true
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/keys = {
+"times": PoolRealArray( 0, 0.1 ),
+"transitions": PoolRealArray( 1, 1 ),
+"update": 1,
+"values": [ 0.99, 1.02 ]
+}
+
+[sub_resource type="Gradient" id=4]
+
+offsets = PoolRealArray( 0, 0.0102828, 1 )
+colors = PoolColorArray( 0, 0, 0, 1, 0.9375, 0.772753, 0.0206498, 1, 0.914063, 0.354099, 0.0181202, 1 )
+
+[sub_resource type="GradientTexture" id=5]
+
+flags = 4
+gradient = SubResource( 4 )
+width = 2048
+
+[sub_resource type="ParticlesMaterial" id=6]
+
+render_priority = 0
+trail_divisor = 1
+emission_shape = 0
+flag_align_y = false
+flag_rotate_y = false
+flag_disable_z = true
+spread = 90.0
+flatness = 0.0
+gravity = Vector3( -5, -15, 0 )
+initial_velocity = 1.0
+initial_velocity_random = 0.0
+angular_velocity = 1.04537e-42
+angular_velocity_random = 0.0
+orbit_velocity = 0.0
+orbit_velocity_random = 0.0
+linear_accel = 0.0
+linear_accel_random = 0.0
+radial_accel = 12.0
+radial_accel_random = 0.0
+tangential_accel = 0.0
+tangential_accel_random = 0.0
+damping = 0.0
+damping_random = 0.0
+angle = 0.0
+angle_random = 0.0
+scale = 1.0
+scale_random = 0.0
+color_ramp = SubResource( 5 )
+hue_variation = 0.0
+hue_variation_random = 0.0
+anim_speed = 0.0
+anim_speed_random = 0.0
+anim_offset = 0.0
+anim_offset_random = 0.0
+anim_loop = false
+_sections_unfolded = [ "Color", "Emission Shape", "Flags", "Gravity", "Initial Velocity", "Radial Accel", "Spread", "Trail" ]
+
+[node name="torch" type="StaticBody2D" index="0"]
 
 input_pickable = false
-collision_layer = 2
-collision_mask = 3
+collision_layer = 1
+collision_mask = 1
 constant_linear_velocity = Vector2( 0, 0 )
 constant_angular_velocity = 0.0
 friction = 1.0
 bounce = 0.0
+script = ExtResource( 1 )
 _sections_unfolded = [ "Collision" ]
 
 [node name="AnimatedSprite" type="AnimatedSprite" parent="." index="0"]
 
 frames = SubResource( 1 )
 animation = "default"
+frame = 5
 playing = true
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="." index="1"]
@@ -50,11 +122,11 @@ shape = SubResource( 2 )
 
 enabled = true
 editor_only = false
-texture = ExtResource( 9 )
+texture = ExtResource( 10 )
 offset = Vector2( 0, 0 )
 texture_scale = 1.0
 color = Color( 1, 1, 1, 1 )
-energy = 1.0
+energy = 0.99
 mode = 0
 range_height = 0.0
 range_z_min = -1024
@@ -71,4 +143,37 @@ shadow_filter_smooth = 4.0
 shadow_item_cull_mask = 1
 _sections_unfolded = [ "Shadow", "Visibility" ]
 
+[node name="light_animation_player" type="AnimationPlayer" parent="." index="3"]
+
+root_node = NodePath("..")
+autoplay = ""
+playback_process_mode = 1
+playback_default_blend_time = 0.0
+playback_speed = 1.0
+anims/flickering = SubResource( 3 )
+blend_times = [  ]
+
+[node name="Particles2D" type="Particles2D" parent="." index="4"]
+
+position = Vector2( -0.628052, 1.46544 )
+emitting = true
+amount = 3
+lifetime = 1.0
+one_shot = false
+preprocess = 0.0
+speed_scale = 1.0
+explosiveness = 0.0
+randomness = 0.3
+fixed_fps = 0
+fract_delta = true
+visibility_rect = Rect2( -100, -100, 200, 200 )
+local_coords = true
+draw_order = 0
+process_material = SubResource( 6 )
+texture = null
+normal_map = null
+h_frames = 1
+v_frames = 1
+_sections_unfolded = [ "Drawing", "Process Material", "Time" ]
+