mirror of
https://github.com/JHDev2006/Super-Mario-Bros.-Remastered-Public.git
synced 2025-10-21 15:08:12 +00:00
Fixed Space Title Stars and PlayerSprite
Fallback Check (#619)
* Fixed Space Title Stars Fixes the position of the title stars in the space theme * Fixed `PlayerSprite` Fallback Check PlayerSprites check recursively for fallbacks. However, this does mean that if one fallback links to something that was already checked, it would make an infinite loop. Also fixes the Pipe Cutscene, and updated Mario's `Big.tres` UIDs
This commit is contained in:
@@ -31,7 +31,7 @@
|
|||||||
"Autumn": {"source": "TitleSMBLL.png", "rect": [352, 88, 176, 88], "properties": {"star_offset_x": 0, "star_offset_y": -4}},
|
"Autumn": {"source": "TitleSMBLL.png", "rect": [352, 88, 176, 88], "properties": {"star_offset_x": 0, "star_offset_y": -4}},
|
||||||
"Beach": {"source": "TitleSMBLL.png", "rect": [0, 176, 176, 88], "properties": {"star_offset_x": 0, "star_offset_y": -4}},
|
"Beach": {"source": "TitleSMBLL.png", "rect": [0, 176, 176, 88], "properties": {"star_offset_x": 0, "star_offset_y": -4}},
|
||||||
"Mountain": {"source": "TitleSMBLL.png", "rect": [176, 176, 176, 88], "properties": {"star_offset_x": 0, "star_offset_y": -4}},
|
"Mountain": {"source": "TitleSMBLL.png", "rect": [176, 176, 176, 88], "properties": {"star_offset_x": 0, "star_offset_y": -4}},
|
||||||
"Space": {"source": "TitleSMBLL.png", "rect": [352, 176, 176, 88], "properties": {"star_offset_x": 0, "star_offset_y": -0}}
|
"Space": {"source": "TitleSMBLL.png", "rect": [352, 176, 176, 88], "properties": {"star_offset_x": 0, "star_offset_y": -4}}
|
||||||
},
|
},
|
||||||
"SMBANN": {
|
"SMBANN": {
|
||||||
"default": {"source": "TitleSMBANN.png", "rect": [0, 0, 176, 88], "properties": {"star_offset_x": -88, "star_offset_y": 4}},
|
"default": {"source": "TitleSMBANN.png", "rect": [0, 0, 176, 88], "properties": {"star_offset_x": -88, "star_offset_y": 4}},
|
||||||
@@ -42,7 +42,7 @@
|
|||||||
"Autumn": {"source": "TitleSMBANN.png", "rect": [352, 88, 176, 88], "properties": {"star_offset_x": -88, "star_offset_y": 4}},
|
"Autumn": {"source": "TitleSMBANN.png", "rect": [352, 88, 176, 88], "properties": {"star_offset_x": -88, "star_offset_y": 4}},
|
||||||
"Beach": {"source": "TitleSMBANN.png", "rect": [0, 176, 176, 88], "properties": {"star_offset_x": -88, "star_offset_y": 4}},
|
"Beach": {"source": "TitleSMBANN.png", "rect": [0, 176, 176, 88], "properties": {"star_offset_x": -88, "star_offset_y": 4}},
|
||||||
"Mountain": {"source": "TitleSMBANN.png", "rect": [176, 176, 176, 88], "properties": {"star_offset_x": -88, "star_offset_y": 4}},
|
"Mountain": {"source": "TitleSMBANN.png", "rect": [176, 176, 176, 88], "properties": {"star_offset_x": -88, "star_offset_y": 4}},
|
||||||
"Space": {"source": "TitleSMBANN.png", "rect": [352, 176, 176, 88], "properties": {"star_offset_x": 0, "star_offset_y": -0}}
|
"Space": {"source": "TitleSMBANN.png", "rect": [352, 176, 176, 88], "properties": {"star_offset_x": -88, "star_offset_y": 4}}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
[gd_resource type="SpriteFrames" load_steps=25 format=3 uid="uid://cjblhx4flkqva"]
|
[gd_resource type="SpriteFrames" load_steps=25 format=3 uid="uid://cjblhx4flkqva"]
|
||||||
|
|
||||||
[ext_resource type="Texture2D" uid="uid://cf6up03lxcul2" path="res://Assets/Sprites/Players/Mario/Big.png" id="1_akfsq"]
|
[ext_resource type="Texture2D" uid="uid://b45d7xacnaoxl" path="res://Assets/Sprites/Players/Mario/Big.png" id="1_akfsq"]
|
||||||
[ext_resource type="Texture2D" uid="uid://ecig0d3sw5jm" path="res://Assets/Sprites/Players/Mario/Small.png" id="1_dg100"]
|
[ext_resource type="Texture2D" uid="uid://d8g0ff0oepgy" path="res://Assets/Sprites/Players/Mario/Small.png" id="1_dg100"]
|
||||||
|
|
||||||
[sub_resource type="AtlasTexture" id="AtlasTexture_a6q03"]
|
[sub_resource type="AtlasTexture" id="AtlasTexture_a6q03"]
|
||||||
atlas = ExtResource("1_akfsq")
|
atlas = ExtResource("1_akfsq")
|
||||||
|
@@ -33,5 +33,7 @@ func update() -> void:
|
|||||||
offset.y = -(sprite_frames.get_frame_texture(animation, frame).get_height() / 2.0)
|
offset.y = -(sprite_frames.get_frame_texture(animation, frame).get_height() / 2.0)
|
||||||
|
|
||||||
func on_animation_changed() -> void:
|
func on_animation_changed() -> void:
|
||||||
if sprite_frames.has_animation(animation) == false and Player.ANIMATION_FALLBACKS.has(animation):
|
var fallback = animation
|
||||||
play(Player.ANIMATION_FALLBACKS[animation])
|
while not sprite_frames.has_animation(fallback) and Player.ANIMATION_FALLBACKS.has(fallback):
|
||||||
|
fallback = Player.ANIMATION_FALLBACKS[fallback]
|
||||||
|
play(fallback)
|
||||||
|
Reference in New Issue
Block a user