From 876dabdddad05887a772c5b5da1768a663363d44 Mon Sep 17 00:00:00 2001 From: pennyrigate Date: Sun, 8 Oct 2023 21:43:13 -0400 Subject: [PATCH] cfox cheat works now (fixes #187) --- autoloads/debug.gd | 5 ++++- objects/player/player.gd | 8 ++------ objects/player/player.tscn | 19 ++++++++++++++++--- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/autoloads/debug.gd b/autoloads/debug.gd index 5cf6358..722ca6e 100644 --- a/autoloads/debug.gd +++ b/autoloads/debug.gd @@ -144,7 +144,9 @@ func _enter_code(): Game.get_map().rotation_degrees = -2 #doesnt work "CFOX": - cfox_mode = true + var player = get_tree().get_nodes_in_group("player").pop_back() + player.sprite.visible = false + player.cfox.visible = true "BANDANA": infinite_arrows = true "ESCARGOD": @@ -177,6 +179,7 @@ func _enter_code(): var texture = load("res://graphics/player/palettes/" + file_name) # add step to the tween for that texture tween.tween_property(player.sprite, "material:shader_param/palette", texture, 0.0) + tween.tween_property(player.cfox, "material:shader_param/palette", texture, 0.0) tween.tween_interval(0.2) file_name = dir.get_next() dir.list_dir_end() diff --git a/objects/player/player.gd b/objects/player/player.gd index 970ca47..356d16d 100644 --- a/objects/player/player.gd +++ b/objects/player/player.gd @@ -61,12 +61,14 @@ onready var oxygen_timer = $OxygenTimer onready var low_oxygen_label = $"%LowOxygenLabel" onready var edge_detector = $Graphics/EdgeDetector onready var body_shape: CollisionShape2D = $"%BodyShape" +onready var cfox: Sprite = $"%CFox" # OVERRIDES # func _ready() -> void: #set palette var palette = load("res://graphics/player/palettes/%s.png" % Game.current_palette) sprite.material.set_shader_param("palette", palette) + $Graphics/CFox.material.set_shader_param("palette", palette) # death handling Game.respawn_point = global_position connect("died", Game, "_on_player_died") @@ -127,12 +129,6 @@ func _physics_process(delta: float) -> void: else: #NOT UNDERWATER low_oxygen_label.text = "" - - #Cheats - #CFox mode - if Debug.cfox_mode == true: - animation_player.play("idle") - animation_player.set_speed_scale(0) # HELPER FUNCTIONS # diff --git a/objects/player/player.tscn b/objects/player/player.tscn index 10c39f9..a7131ff 100644 --- a/objects/player/player.tscn +++ b/objects/player/player.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=52 format=2] +[gd_scene load_steps=53 format=2] [ext_resource path="res://objects/player/player.gd" type="Script" id=1] [ext_resource path="res://graphics/player/palettes/default.png" type="Texture" id=2] @@ -38,6 +38,12 @@ shader_param/palette = ExtResource( 2 ) [sub_resource type="Curve" id=13] _data = [ Vector2( 0, 1 ), 0.0, -0.0636948, 0, 0, Vector2( 1, 0 ), -3.43886, 0.0, 0, 0 ] +[sub_resource type="ShaderMaterial" id=24] +shader = ExtResource( 3 ) +shader_param/border_color = Color( 0, 0, 0, 1 ) +shader_param/border_corners = true +shader_param/palette = ExtResource( 2 ) + [sub_resource type="RectangleShape2D" id=2] extents = Vector2( 2.5, 5 ) @@ -1099,6 +1105,13 @@ enabled = true cast_to = Vector2( 0, 5 ) collision_mask = 5 +[node name="CFox" type="Sprite" parent="Graphics"] +unique_name_in_owner = true +visible = false +material = SubResource( 24 ) +position = Vector2( 0, -10 ) +texture = ExtResource( 4 ) + [node name="BodyShape" type="CollisionShape2D" parent="."] unique_name_in_owner = true position = Vector2( 0.5, -5 ) @@ -1591,8 +1604,8 @@ align = 1 [connection signal="state_entered" from="StateChart/Root/Movement/Airborne" to="." method="reset_fall_speed"] [connection signal="state_entered" from="StateChart/Root/Movement/Airborne" to="." method="_on_Airborne_state_entered"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Airborne" to="." method="_process_gravity"] -[connection signal="state_physics_processing" from="StateChart/Root/Movement/Airborne/Jump" to="." method="_process_horizontal_movement"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Airborne/Jump" to="." method="_process_jump"] +[connection signal="state_physics_processing" from="StateChart/Root/Movement/Airborne/Jump" to="." method="_process_horizontal_movement"] [connection signal="state_entered" from="StateChart/Root/Movement/Airborne/Jump/NormalJump" to="." method="_on_NormalJump_state_entered"] [connection signal="state_exited" from="StateChart/Root/Movement/Airborne/Jump/NormalJump" to="." method="_on_NormalJump_state_exited"] [connection signal="state_entered" from="StateChart/Root/Movement/Airborne/Jump/LadderJump" to="." method="_on_LadderJump_state_entered"] @@ -1611,8 +1624,8 @@ align = 1 [connection signal="state_physics_processing" from="StateChart/Root/Movement/Climbing" to="." method="_process_climbing"] [connection signal="state_entered" from="StateChart/Root/Movement/Inactive" to="." method="_on_Inactive_state_entered"] [connection signal="state_exited" from="StateChart/Root/Movement/Inactive" to="." method="_on_Inactive_state_exited"] -[connection signal="state_entered" from="StateChart/Root/Movement/Teleporting" to="." method="_on_Inactive_state_entered"] [connection signal="state_entered" from="StateChart/Root/Movement/Teleporting" to="." method="_on_Teleporting_state_entered"] +[connection signal="state_entered" from="StateChart/Root/Movement/Teleporting" to="." method="_on_Inactive_state_entered"] [connection signal="state_exited" from="StateChart/Root/Movement/Teleporting" to="." method="_on_Inactive_state_exited"] [connection signal="state_entered" from="StateChart/Root/Health/Respawn" to="." method="_on_Respawn_state_entered"] [connection signal="state_entered" from="StateChart/Root/Health/Dead" to="." method="_on_Dead_state_entered"]