From 4848dca875f5f9a8b78c790464e5306a088851d2 Mon Sep 17 00:00:00 2001
From: Haze Weathers <hazel.lsnider@gmail.com>
Date: Tue, 16 Jan 2024 03:22:17 -0500
Subject: [PATCH] revisit abyss lighting. make bullet fish, stars, and shards
 draw at full brightness as they glow in the depths.

---
 autoloads/debug.gd              |  1 +
 maps/abyss_scholar.tscn         | 28 ++++++++++++++++++++++++----
 objects/collectibles/key.tscn   |  2 +-
 objects/collectibles/shard.tscn |  2 ++
 objects/collectibles/star.tscn  |  4 +++-
 objects/enemy/fish.tscn         | 15 +++++++--------
 6 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/autoloads/debug.gd b/autoloads/debug.gd
index a45b6de..73ddb43 100644
--- a/autoloads/debug.gd
+++ b/autoloads/debug.gd
@@ -102,6 +102,7 @@ func _enter_code():
 				var goldsprite = gold.get_node("AnimatedSprite")
 				goldsprite.play("30385")
 				goldsprite.position.y -= 1
+				goldsprite.light_mask = 0
 				#goldsprite.material.set_shader_param("palette",load("res://graphics/collectibles/pal_star_green.png"))
 		"1989":
 			for enemy in get_tree().get_nodes_in_group("enemy"):
diff --git a/maps/abyss_scholar.tscn b/maps/abyss_scholar.tscn
index a6f8d43..da2f483 100644
--- a/maps/abyss_scholar.tscn
+++ b/maps/abyss_scholar.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=49 format=2]
+[gd_scene load_steps=50 format=2]
 
 [ext_resource path="res://maps/map.gd" type="Script" id=1]
 [ext_resource path="res://objects/hud/hud.tscn" type="PackedScene" id=2]
@@ -33,6 +33,7 @@
 [ext_resource path="res://objects/lore/abyss/mine.tscn" type="PackedScene" id=31]
 [ext_resource path="res://objects/lore/abyss/squig.tscn" type="PackedScene" id=32]
 [ext_resource path="res://objects/lore/abyss/turchin.tscn" type="PackedScene" id=33]
+[ext_resource path="res://graphics/particles/pixel.png" type="Texture" id=34]
 
 [sub_resource type="CanvasItemMaterial" id=12]
 blend_mode = 3
@@ -127,6 +128,7 @@ layer = 50
 follow_viewport_enable = true
 
 [node name="Depth1" type="ColorRect" parent="EffectLayer"]
+visible = false
 material = SubResource( 12 )
 anchor_right = 1.0
 anchor_bottom = 1.0
@@ -138,15 +140,13 @@ __meta__ = {
 }
 
 [node name="Depth2" type="ColorRect" parent="EffectLayer"]
+visible = false
 material = SubResource( 12 )
 anchor_right = 1.0
 anchor_bottom = 1.0
 margin_top = 384.0
 margin_bottom = 384.0
 color = Color( 0.768627, 0.556863, 0.556863, 1 )
-__meta__ = {
-"_edit_lock_": true
-}
 
 [node name="WaterRipple" type="ColorRect" parent="EffectLayer"]
 material = SubResource( 1 )
@@ -161,6 +161,26 @@ __meta__ = {
 [node name="HUD" parent="." instance=ExtResource( 2 )]
 song_name = "♫Moon Trail 2023"
 
+[node name="Depth1" type="Light2D" parent="."]
+position = Vector2( 0, 192 )
+scale = Vector2( 256, 192 )
+texture = ExtResource( 34 )
+offset = Vector2( 0.5, 0.5 )
+color = Color( 0.148438, 0.0363846, 0.126981, 1 )
+energy = 0.25
+mode = 2
+range_layer_min = -50
+
+[node name="Depth2" type="Light2D" parent="."]
+position = Vector2( 0, 384 )
+scale = Vector2( 256, 192 )
+texture = ExtResource( 34 )
+offset = Vector2( 0.5, 0.5 )
+color = Color( 0.333333, 0.0901961, 0.0901961, 1 )
+energy = 0.5
+mode = 2
+range_layer_min = -50
+
 [node name="Player" parent="." instance=ExtResource( 8 )]
 position = Vector2( 24, 560 )
 underwater = true
diff --git a/objects/collectibles/key.tscn b/objects/collectibles/key.tscn
index 468acda..41cc04b 100644
--- a/objects/collectibles/key.tscn
+++ b/objects/collectibles/key.tscn
@@ -76,7 +76,6 @@ material = SubResource( 7 )
 position = Vector2( 0, -1 )
 frames = SubResource( 5 )
 animation = "key"
-frame = 2
 playing = true
 centered = false
 
@@ -91,6 +90,7 @@ position = Vector2( 4, 4 )
 shape = SubResource( 6 )
 
 [node name="Sparkles" type="CPUParticles2D" parent="."]
+light_mask = 0
 position = Vector2( 4.5, 4 )
 amount = 1
 lifetime = 2.0
diff --git a/objects/collectibles/shard.tscn b/objects/collectibles/shard.tscn
index d8c53f6..46603f6 100644
--- a/objects/collectibles/shard.tscn
+++ b/objects/collectibles/shard.tscn
@@ -40,6 +40,7 @@ script = ExtResource( 3 )
 
 [node name="Sprite" type="Sprite" parent="."]
 modulate = Color( 0.861621, 0.868095, 0.96844, 1 )
+light_mask = 0
 material = SubResource( 7 )
 position = Vector2( 5, 3 )
 texture = ExtResource( 2 )
@@ -57,6 +58,7 @@ shape = SubResource( 6 )
 anims/glow = SubResource( 8 )
 
 [node name="Sparkles" type="CPUParticles2D" parent="."]
+light_mask = 0
 position = Vector2( 4.5, 2.5 )
 amount = 1
 lifetime = 2.0
diff --git a/objects/collectibles/star.tscn b/objects/collectibles/star.tscn
index 3c0306a..625ed61 100644
--- a/objects/collectibles/star.tscn
+++ b/objects/collectibles/star.tscn
@@ -58,10 +58,11 @@ script = ExtResource( 3 )
 particle_colors = [ Color( 1, 0.741176, 0.709804, 1 ), Color( 1, 0.968627, 0.709804, 1 ), Color( 0.709804, 1, 0.74902, 1 ), Color( 0.709804, 0.752941, 1, 1 ), Color( 1, 0.709804, 0.984314, 1 ) ]
 
 [node name="AnimatedSprite" type="AnimatedSprite" parent="."]
+light_mask = 0
 material = SubResource( 10 )
 position = Vector2( -1, -3 )
 frames = SubResource( 8 )
-frame = 4
+frame = 1
 playing = true
 centered = false
 
@@ -75,6 +76,7 @@ position = Vector2( 4, 4 )
 shape = SubResource( 9 )
 
 [node name="Sparkles" type="CPUParticles2D" parent="."]
+light_mask = 0
 position = Vector2( 4.5, 4 )
 amount = 1
 lifetime = 2.0
diff --git a/objects/enemy/fish.tscn b/objects/enemy/fish.tscn
index 5cbf07e..876e086 100644
--- a/objects/enemy/fish.tscn
+++ b/objects/enemy/fish.tscn
@@ -28,19 +28,19 @@ extents = Vector2( 4, 4 )
 
 [sub_resource type="Animation" id=8]
 resource_name = "glow"
-length = 3.0
+length = 2.0
 loop = true
 tracks/0/type = "value"
 tracks/0/path = NodePath("AnimatedSprite:modulate")
-tracks/0/interp = 1
+tracks/0/interp = 2
 tracks/0/loop_wrap = true
 tracks/0/imported = false
 tracks/0/enabled = true
 tracks/0/keys = {
-"times": PoolRealArray( 0, 1.5, 2.9 ),
-"transitions": PoolRealArray( 1, 1, 1 ),
+"times": PoolRealArray( 0, 1, 2 ),
+"transitions": PoolRealArray( 0.5, 4, 1 ),
 "update": 0,
-"values": [ Color( 1, 1, 1, 1 ), Color( 0.396078, 0.396078, 0.396078, 1 ), Color( 1, 1, 1, 1 ) ]
+"values": [ Color( 1.5, 1.5, 1.5, 1 ), Color( 0.8, 0.8, 0.8, 1 ), Color( 1.5, 1.5, 1.5, 1 ) ]
 }
 
 [sub_resource type="Animation" id=9]
@@ -61,12 +61,11 @@ tracks/0/keys = {
 
 [node name="Fish" type="Node2D" groups=["enemy"]]
 script = ExtResource( 3 )
-score_for_killing = 15
 node_to_flip = NodePath("AnimatedSprite")
 
 [node name="AnimatedSprite" type="AnimatedSprite" parent="."]
-modulate = Color( 0.830741, 0.830741, 0.830741, 1 )
-position = Vector2( 0, 5.79026 )
+modulate = Color( 0.8, 0.8, 0.8, 1 )
+light_mask = 0
 frames = SubResource( 4 )
 frame = 2
 playing = true