Merge pull request #286 from GTcreyon/fix-4-1-ld-bugs

Fix Level Designer bugs
Redux-Team · Apr 1, 2024 · 5dc6cc6 · 5dc6cc6
2 parents 0befeed + b858bd8
commit 5dc6cc6
Show file tree

Hide file tree

Showing 41 changed files with 1,331 additions and 929 deletions.
diff --git a/classes/entity/entity.gd b/classes/entity/entity.gd
@@ -101,7 +101,7 @@ func _on_WaterCheck_area_exited(_area):
 func set_disabled(val):
 	disabled = val
 	_preempt_all_node_readies()
-	set_collision_layer_value(0, 0 if val else 1)
+	set_collision_layer_value(3, 0 if val else 1)
 
 
 # The following functions deal with child nodes that may or may not exist.

diff --git a/classes/entity/passive/goonie/goonie.gd b/classes/entity/passive/goonie/goonie.gd
@@ -99,7 +99,7 @@ func physics_step() -> void:
 func set_disabled(val) -> void:
 	disabled = val
 	await self.ready
-	set_collision_layer_value(0, 0 if val else 1)
+	set_collision_layer_value(1, 0 if val else 1)
 	safety_net.monitoring = !val
 	ride_area.monitoring = !val
 	if disabled:

diff --git a/classes/interactable/pipe/pipe.gd b/classes/interactable/pipe/pipe.gd
@@ -100,4 +100,4 @@ func _end_animation(_player):
 
 func set_disabled(val):
 	super.set_disabled(val)
-	$StaticBody2D.set_collision_layer_value(0, 0 if val else 1)
+	$StaticBody2D.set_collision_layer_value(1, 0 if val else 1)
diff --git a/classes/interactable/sign/sign.tres b/classes/interactable/sign/sign.tres
@@ -4,7 +4,8 @@
 
 [resource]
 shader = ExtResource("1_1ac2n")
-shader_parameter/width = 2.0
-shader_parameter/recenter = false
+shader_parameter/width = 2
 shader_parameter/radial = false
 shader_parameter/outline_color = Color(1, 1, 1, 1)
+shader_parameter/cel_count = Vector2(1, 1)
+shader_parameter/sprite_offset = Vector2(0, 0)
diff --git a/classes/ld_item/ld_item.gd b/classes/ld_item/ld_item.gd
diff --git a/classes/pickup/fludd_box/fludd_box.gd b/classes/pickup/fludd_box/fludd_box.gd
@@ -2,7 +2,7 @@ class_name FluddBox
 extends Area2D
 # Box that drops a fludd nozzle when stomped.
 
-@export var nozzle: FluddPickup.Nozzles
+@export var nozzle: FluddPickup.Nozzles = FluddPickup.Nozzles.HOVER
 
 var PICKUP_PREFABS = [
 	preload("./fludd_pickup_hover.tscn"),

diff --git a/classes/pickup/shine/shine.tscn b/classes/pickup/shine/shine.tscn
@@ -1,8 +1,18 @@
-[gd_scene load_steps=18 format=3 uid="uid://cbo20l1o5giao"]
+[gd_scene load_steps=19 format=3 uid="uid://cbo20l1o5giao"]
 
 [ext_resource type="Texture2D" uid="uid://dtydgkpoe56rn" path="res://classes/pickup/shine/shine.png" id="1"]
 [ext_resource type="Script" path="res://classes/pickup/shine/shine.gd" id="2"]
-[ext_resource type="Material" uid="uid://ckiokx8dmutdj" path="res://shaders/glow.tres" id="4"]
+[ext_resource type="Shader" path="res://shaders/glow.gdshader" id="2_sdcq1"]
+
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_ig4yr"]
+resource_local_to_scene = true
+resource_name = "shine_glow"
+shader = ExtResource("2_sdcq1")
+shader_parameter/width = 1
+shader_parameter/radial = false
+shader_parameter/outline_color = Color(1, 1, 1, 1)
+shader_parameter/cel_count = Vector2(12, 1)
+shader_parameter/sprite_offset = Vector2(0, -1.5)
 
 [sub_resource type="AtlasTexture" id="1"]
 atlas = ExtResource("1")
@@ -107,7 +117,7 @@ monitorable = false
 script = ExtResource("2")
 
 [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
-material = ExtResource("4")
+material = SubResource("ShaderMaterial_ig4yr")
 sprite_frames = SubResource("13")
 offset = Vector2(0, -1.5)