Compare commits

...

8 commits

Author SHA1 Message Date
JHDev2006
b17acb4deb removed dev warning, we're ready 2025-10-25 21:47:51 +01:00
JHDev2006
9ad315d417 couple more unused 2025-10-25 21:05:38 +01:00
JHDev2006
e45681abd2 Update Credits.tscn 2025-10-25 21:03:08 +01:00
JHDev2006
dee5948bcd oh yea, also this one too, BYE BYE 2025-10-25 21:00:52 +01:00
JHDev2006
264f272b5e haha no world map for you 🖕 2025-10-25 20:50:51 +01:00
JHDev2006
0f90d1cc55 added icon to falkimore 2025-10-25 20:16:35 +01:00
John Cooper McDonald
2cb9675227
Fix not being able to collect Red Coins from bumping blocks (#672) 2025-10-25 20:15:03 +01:00
JHDev2006
bb3ece8922 fixed a typo in Tristan35's namein the credits, SORRY!!!! 2025-10-25 19:52:55 +01:00
13 changed files with 59 additions and 172 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

View file

@ -1,40 +0,0 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://clph6cskwmoqn"
path="res://.godot/imported/AnniversaryQuestionBlock.png-03e33ea0390ea91d8472d5afd8a7d0e4.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Assets/Sprites/Blocks/AnniversaryQuestionBlock.png"
dest_files=["res://.godot/imported/AnniversaryQuestionBlock.png-03e33ea0390ea91d8472d5afd8a7d0e4.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

View file

@ -1,40 +0,0 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://dnnly1a6umail"
path="res://.godot/imported/TripleQuestionBlock.png-4c9f5a922af16a287ee4123222317885.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Assets/Sprites/Blocks/TripleQuestionBlock.png"
dest_files=["res://.godot/imported/TripleQuestionBlock.png-4c9f5a922af16a287ee4123222317885.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

View file

@ -1,40 +0,0 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://cxbne173w4h8d"
path="res://.godot/imported/TrueBowser.png-06be2b960df415db1a1f58e9a78fed0d.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Assets/Sprites/Enemies/TrueBowser.png"
dest_files=["res://.godot/imported/TrueBowser.png-06be2b960df415db1a1f58e9a78fed0d.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

View file

@ -1,40 +0,0 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://qkmv2jmid7qx"
path="res://.godot/imported/OverworldMap.png-347de3a2312bb9d8e5c0d00b7db68ac2.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Assets/Sprites/Tilesets/OverworldMap.png"
dest_files=["res://.godot/imported/OverworldMap.png-347de3a2312bb9d8e5c0d00b7db68ac2.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.5 KiB

After

Width:  |  Height:  |  Size: 9.7 KiB

Before After
Before After

View file

@ -1,4 +1,4 @@
[gd_scene load_steps=88 format=3 uid="uid://bgeh6ex0lbqfq"]
[gd_scene load_steps=89 format=3 uid="uid://bgeh6ex0lbqfq"]
[ext_resource type="Script" uid="uid://b3stoe2kp1nv1" path="res://Scripts/UI/Credits.gd" id="1_db8c5"]
[ext_resource type="AudioStream" uid="uid://cdhsj02wqdt7y" path="res://Assets/Audio/BGM/Credits.mp3" id="1_k57dj"]
@ -289,6 +289,10 @@ region = Rect2(64, 96, 16, 16)
atlas = ExtResource("4_g2gtw")
region = Rect2(32, 0, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_ma7ga"]
atlas = ExtResource("4_g2gtw")
region = Rect2(96, 96, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_7s4gc"]
atlas = ExtResource("14_4e2pw")
region = Rect2(144, 0, 64, 64)
@ -2574,9 +2578,9 @@ metadata/_custom_type_script = "uid://ca3bew33g45eq"
[node name="Label11" type="Label" parent="Labels/Github/Label3"]
layout_mode = 0
offset_left = 48.0
offset_left = 64.0
offset_top = 104.0
offset_right = 112.0
offset_right = 128.0
offset_bottom = 120.0
text = "amer241"
uppercase = true
@ -2604,7 +2608,6 @@ text = "falkimore"
uppercase = true
[node name="TextureRect" type="TextureRect" parent="Labels/Github/Label3/Label12"]
visible = false
layout_mode = 1
anchors_preset = -1
anchor_left = 1.0
@ -2612,7 +2615,7 @@ anchor_right = 1.0
offset_right = 16.0
offset_bottom = 16.0
grow_horizontal = 0
texture = SubResource("AtlasTexture_x68qv")
texture = SubResource("AtlasTexture_ma7ga")
stretch_mode = 2
script = ExtResource("11_d4vu4")
metadata/_custom_type_script = "uid://ca3bew33g45eq"
@ -2665,9 +2668,9 @@ metadata/_custom_type_script = "uid://ca3bew33g45eq"
[node name="Label16" type="Label" parent="Labels/Github/Label3"]
layout_mode = 0
offset_left = 136.0
offset_left = 152.0
offset_top = 104.0
offset_right = 184.0
offset_right = 200.0
offset_bottom = 120.0
text = "a2937"
uppercase = true
@ -2692,7 +2695,7 @@ offset_left = -40.0
offset_top = 136.0
offset_right = 40.0
offset_bottom = 152.0
text = "trsitan35"
text = "tristan35"
uppercase = true
[node name="TextureRect" type="TextureRect" parent="Labels/Github/Label3/Label17"]
@ -2868,6 +2871,29 @@ stretch_mode = 2
script = ExtResource("11_d4vu4")
metadata/_custom_type_script = "uid://ca3bew33g45eq"
[node name="Label24" type="Label" parent="Labels/Github/Label3"]
layout_mode = 0
offset_left = -40.0
offset_top = 184.0
offset_right = 56.0
offset_bottom = 200.0
text = "yuriko-shimizu"
uppercase = true
[node name="TextureRect" type="TextureRect" parent="Labels/Github/Label3/Label24"]
visible = false
layout_mode = 1
anchors_preset = -1
anchor_left = 1.0
anchor_right = 1.0
offset_right = 16.0
offset_bottom = 16.0
grow_horizontal = 0
texture = SubResource("AtlasTexture_c51sb")
stretch_mode = 2
script = ExtResource("11_d4vu4")
metadata/_custom_type_script = "uid://ca3bew33g45eq"
[node name="SpecialThanks" type="Control" parent="Labels"]
visible = false
layout_mode = 3

View file

@ -917,6 +917,7 @@ color = Color(0, 0, 0, 1)
autostart = true
[node name="DevBuildWarning" type="Label" parent="CanvasLayer2/VersionLabel"]
visible = false
layout_mode = 1
offset_top = 16.0
offset_right = 56.0

View file

@ -1,4 +1,4 @@
[gd_scene load_steps=17 format=3 uid="uid://cmbpqnq10arts"]
[gd_scene load_steps=19 format=3 uid="uid://cmbpqnq10arts"]
[ext_resource type="Script" uid="uid://xwq5ac650e76" path="res://Scripts/Classes/Entities/Items/RedCoin.gd" id="1_c6tmk"]
[ext_resource type="Texture2D" uid="uid://c8wpxm7b5tgiq" path="res://Assets/Sprites/Items/RedCoin.png" id="2_lwdcj"]
@ -6,6 +6,7 @@
[ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="3_0xloa"]
[ext_resource type="Script" uid="uid://cmg61722ktg2m" path="res://Scripts/Classes/Components/BlockBouncingDetection.gd" id="4_lwdcj"]
[ext_resource type="JSON" path="res://Assets/Sprites/Items/RedCoin.json" id="5_0fjrw"]
[ext_resource type="Script" uid="uid://maqpreddu5kg" path="res://Scripts/Classes/Components/LevelPersistance.gd" id="7_0r8d3"]
[sub_resource type="AtlasTexture" id="AtlasTexture_lwdcj"]
atlas = ExtResource("2_lwdcj")
@ -79,6 +80,9 @@ animations = [{
[sub_resource type="RectangleShape2D" id="RectangleShape2D_4qu2r"]
size = Vector2(12, 15)
[sub_resource type="RectangleShape2D" id="RectangleShape2D_0xloa"]
size = Vector2(8, 8)
[node name="RedCoin" type="Node2D"]
visibility_layer = 3
z_index = -2
@ -110,8 +114,21 @@ shape = SubResource("RectangleShape2D_4qu2r")
[node name="BlockBouncingDetection" type="Node" parent="." node_paths=PackedStringArray("hitbox")]
script = ExtResource("4_lwdcj")
detection_type = 1
hitbox = NodePath("")
hitbox = NodePath("../BlockHitbox")
metadata/_custom_type_script = "uid://cmg61722ktg2m"
[node name="BlockHitbox" type="Area2D" parent="."]
collision_layer = 0
collision_mask = 6
[node name="Shape" type="CollisionShape2D" parent="BlockHitbox"]
position = Vector2(0, 12)
shape = SubResource("RectangleShape2D_0xloa")
[node name="LevelPersistance" type="Node" parent="."]
script = ExtResource("7_0r8d3")
[connection signal="collected" from="." to="LevelPersistance" method="set_as_active"]
[connection signal="area_entered" from="Hitbox" to="." method="on_area_entered"]
[connection signal="block_bounced" from="BlockBouncingDetection" to="." method="summon_bounced_coin" unbinds=1]
[connection signal="enabled" from="LevelPersistance" to="." method="queue_free"]

View file

@ -8,6 +8,8 @@ var can_spawn_particles := false
@onready var COIN_SPARKLE = load("res://Scenes/Prefabs/Particles/RedCoinSparkle.tscn")
signal collected
func _ready() -> void:
if ChallengeModeHandler.is_coin_collected(id):
already_collected = true
@ -16,9 +18,10 @@ func _ready() -> void:
func on_area_entered(area: Area2D) -> void:
if area.owner is Player:
collected()
collect()
func collected() -> void:
func collect() -> void:
collected.emit()
if already_collected:
AudioManager.play_sfx("coin", global_position, 2)
else: