GitHub/Super-Mario-Bros.-Remastered-Public
1
0
Fork 0
mirror of https://github.com/JHDev2006/Super-Mario-Bros.-Remastered-Public.git synced 2025-10-22 07:28:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: GitHub:9e278d70ca255839954eaee94f1e78527f418335
Branches Tags
GitHub:main GitHub:custom-level-loading-rewrite
GitHub:1.0.1 GitHub:1.0.0
...
compare: GitHub:22a4afbc9518734ae510005a027b537ba8cfb06c
Branches Tags
GitHub:main GitHub:custom-level-loading-rewrite
GitHub:1.0.1 GitHub:1.0.0

3 Commits
9e278d70ca ... 22a4afbc95

Author SHA1 Message Date
SkyanUltra
22a4afbc95 Slight tweak to animation fallbacks (#573) 
Changes a few animation fallbacks to something more reasonable, and fixes potential broken animation fallbacks (notably PipeMove, which didn't work if you didn't define a Move animation.)
 2025-10-12 23:06:29 +01:00
guzlad
11da83fd8a Fixed fire flower palette in Cave, Underwater and CastleWater. Added new fireflower sprite for Special (#575) 2025-10-12 23:06:08 +01:00
guzlad
79339ab5ae Fixed peach sprite in -1 (#576) 2025-10-12 23:05:35 +01:00
6 changed files with 69 additions and 77 deletions
Expand all files Collapse all files

87
Assets/Sprites/Items/FireFlower.json
View File

@@ -33,70 +33,55 @@
}, },
"variations": { "variations": {
"default": { "default": {
"source": "FireFlower.png", "SMB1": {"source": "FireFlower.png", "rect": [0.0,0.0,64.0,16.0]},
"rect": [ "SMBLL": {"link": "SMB1"},
0.0, "SMBANN": {"link": "SMB1"},
0.0, "SMBS": {"source": "FireFlowerSpecial.png", "rect": [0.0,0.0,64.0,16.0]}
64.0,
16.0
]
}, },
"Underground": { "Underground": {
"source": "FireFlower.png", "SMB1": {"source": "FireFlower.png", "rect": [0.0,16.0,64.0,16.0]},
"rect": [ "SMBLL": {"link": "SMB1"},
0.0, "SMBANN": {"link": "SMB1"},
16.0, "SMBS": {"source": "FireFlowerSpecial.png", "rect": [0.0,16.0,64.0,16.0]}
64.0, },
16.0 "Castle": {
] "link": "Underground"
}, },
"GhostHouse": { "GhostHouse": {
"link": "Underground" "link": "Underground"
}, },
"Castle": { "Underwater": {
"source": "FireFlower.png", "SMB1": {"source": "FireFlower.png", "rect": [0.0,32.0,64.0,16.0]},
"rect": [ "SMBLL": {"link": "SMB1"},
0.0, "SMBANN": {"link": "SMB1"},
32.0, "SMBS": {"source": "FireFlowerSpecial.png", "rect": [0.0,32.0,64.0,16.0]}
64.0, },
16.0 "CastleWater": {
] "link": "Underwater"
}, },
"Snow": { "Snow": {
"source": "FireFlower.png", "SMB1": {"source": "FireFlower.png", "rect": [0.0,48.0,64.0,16.0]},
"rect": [ "SMBLL": {"link": "SMB1"},
0.0, "SMBANN": {"link": "SMB1"},
48.0, "SMBS": {"source": "FireFlowerSpecial.png", "rect": [0.0,48.0,64.0,16.0]}
64.0,
16.0
]
}, },
"Space": { "Space": {
"source": "FireFlower.png", "SMB1": {"source": "FireFlower.png", "rect": [0.0,64.0,64.0,16.0]},
"rect": [ "SMBLL": {"link": "SMB1"},
0.0, "SMBANN": {"link": "SMB1"},
64.0, "SMBS": {"source": "FireFlowerSpecial.png", "rect": [0.0,64.0,64.0,16.0]}
64.0,
16.0
]
}, },
"Volcano": { "Volcano": {
"source": "FireFlower.png", "SMB1": {"source": "FireFlower.png", "rect": [0.0,80.0,64.0,16.0]},
"rect": [ "SMBLL": {"link": "SMB1"},
0.0, "SMBANN": {"link": "SMB1"},
80.0, "SMBS": {"source": "FireFlowerSpecial.png", "rect": [0.0,80.0,64.0,16.0]}
64.0,
16.0
]
}, },
"Bonus": { "Bonus": {
"source": "FireFlower.png", "SMB1": {"source": "FireFlower.png", "rect": [0.0,96.0,64.0,16.0]},
"rect": [ "SMBLL": {"link": "SMB1"},
0.0, "SMBANN": {"link": "SMB1"},
96.0, "SMBS": {"source": "FireFlowerSpecial.png", "rect": [0.0,96.0,64.0,16.0]}
64.0,
16.0
]
} }
} }
} }

BIN
Assets/Sprites/Items/FireFlowerSpecial.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 617 B

1
Resources/AssetRipper/SpriteList.json
View File

@@ -41,6 +41,7 @@
"res://Assets/Sprites/Items/BridgeAxe.png", "res://Assets/Sprites/Items/BridgeAxe.png",
"res://Assets/Sprites/Items/Fireball.png", "res://Assets/Sprites/Items/Fireball.png",
"res://Assets/Sprites/Items/FireFlower.png", "res://Assets/Sprites/Items/FireFlower.png",
"res://Assets/Sprites/Items/FireFlowerSpecial.png",
"res://Assets/Sprites/Items/Hammer.png", "res://Assets/Sprites/Items/Hammer.png",
"res://Assets/Sprites/Items/PoisonMushroom.png", "res://Assets/Sprites/Items/PoisonMushroom.png",
"res://Assets/Sprites/Items/SpinningCoin.png", "res://Assets/Sprites/Items/SpinningCoin.png",

1
Resources/AssetRipper/Sprites/Items/FireFlowerSpecial.json Normal file
View File

@@ -0,0 +1 @@
{"columns":"4","palette_base":"FireFlower","palettes":"{\n\"FireFlower\": [\"default1\", \"default2\", \"default3\", \"default4\", \"default1\", \"default2\", \"default3\", \"default4\", \"default1\", \"default2\", \"default3\", \"default4\", \"default1\", \"default2\", \"default3\", \"default4\", \"default1\", \"default2\", \"default3\", \"default4\", \"default1\", \"default2\", \"default3\", \"default4\", \"default1\", \"default2\", \"default3\", \"default4\"],\n\"Green\": [\"default\", \"default\", \"default\", \"default\", \"Underground\", \"Underground\", \"Underground\", \"Underground\", \"Underwater\", \"Underwater\", \"Underwater\", \"Underwater\", \"Snow\", \"Snow\", \"Snow\", \"Snow\", \"Space\", \"Space\", \"Space\", \"Space\", \"Volcano\", \"Volcano\", \"Volcano\", \"Volcano\", \"Bonus\", \"Bonus\", \"Bonus\", \"Bonus\"]\n}","sheet_size":"Vector2i(16, 16)","source_path":"res://Assets/Sprites/Items/FireFlowerSpecial.png","tiles":"{\nVector2(0, 0): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 214\n},\nVector2(0, 8): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 217,\n\"palette\": \"Green\"\n},\nVector2(8, 0): {\n\"flip_h\": true,\n\"flip_v\": false,\n\"index\": 214\n},\nVector2(8, 8): {\n\"flip_h\": true,\n\"flip_v\": false,\n\"index\": 217,\n\"palette\": \"Green\"\n}\n}"}

51
Scenes/Levels/SMB1/World-1/-1-1.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=24 format=4 uid="uid://cel0ku4pdmu2u"] [gd_scene load_steps=25 format=4 uid="uid://cel0ku4pdmu2u"]
[ext_resource type="Script" uid="uid://bcqr1v25ygedb" path="res://Scripts/Classes/LevelClass.gd" id="1_0pu1d"] [ext_resource type="Script" uid="uid://bcqr1v25ygedb" path="res://Scripts/Classes/LevelClass.gd" id="1_0pu1d"]
[ext_resource type="JSON" path="res://Assets/Audio/BGM/Underwater.json" id="2_4i10n"] [ext_resource type="JSON" path="res://Assets/Audio/BGM/Underwater.json" id="2_4i10n"]
@@ -16,6 +16,7 @@
[ext_resource type="PackedScene" uid="uid://h7ys3yw5jvx3" path="res://Scenes/Prefabs/LevelObjects/Checkpoint.tscn" id="17_bdyl0"] [ext_resource type="PackedScene" uid="uid://h7ys3yw5jvx3" path="res://Scenes/Prefabs/LevelObjects/Checkpoint.tscn" id="17_bdyl0"]
[ext_resource type="Texture2D" uid="uid://boivfkpqvnx45" path="res://Assets/Sprites/Players/Peach.png" id="17_itite"] [ext_resource type="Texture2D" uid="uid://boivfkpqvnx45" path="res://Assets/Sprites/Players/Peach.png" id="17_itite"]
[ext_resource type="PackedScene" uid="uid://bjysym6bhxljv" path="res://Scenes/Prefabs/Entities/Enemies/BowsersBro.tscn" id="18_4i10n"] [ext_resource type="PackedScene" uid="uid://bjysym6bhxljv" path="res://Scenes/Prefabs/Entities/Enemies/BowsersBro.tscn" id="18_4i10n"]
[ext_resource type="Script" uid="uid://364rywt44hy6" path="res://Scripts/Classes/UI/PackSprite.gd" id="19_62ed8"]
[ext_resource type="PackedScene" uid="uid://r6dlmokkdyar" path="res://Scenes/Prefabs/Entities/Enemies/GreenKoopaTroopa.tscn" id="19_j3p10"] [ext_resource type="PackedScene" uid="uid://r6dlmokkdyar" path="res://Scenes/Prefabs/Entities/Enemies/GreenKoopaTroopa.tscn" id="19_j3p10"]
[ext_resource type="PackedScene" uid="uid://dnx48rakxib6u" path="res://Scenes/Prefabs/Entities/Enemies/Goomba.tscn" id="20_4i10n"] [ext_resource type="PackedScene" uid="uid://dnx48rakxib6u" path="res://Scenes/Prefabs/Entities/Enemies/Goomba.tscn" id="20_4i10n"]
[ext_resource type="PackedScene" uid="uid://f48a0jmx334d" path="res://Scenes/Prefabs/Entities/Objects/SmallElevatorPlatform.tscn" id="21_4i10n"] [ext_resource type="PackedScene" uid="uid://f48a0jmx334d" path="res://Scenes/Prefabs/Entities/Objects/SmallElevatorPlatform.tscn" id="21_4i10n"]
@@ -87,12 +88,16 @@ position = Vector2(24, -16)
texture = ExtResource("17_itite") texture = ExtResource("17_itite")
region_enabled = true region_enabled = true
region_rect = Rect2(16, 0, 16, 32) region_rect = Rect2(16, 0, 16, 32)
script = ExtResource("19_62ed8")
metadata/_custom_type_script = "uid://364rywt44hy6"
[node name="Sprite2D2" type="Sprite2D" parent="."] [node name="Sprite2D2" type="Sprite2D" parent="."]
position = Vector2(1280, -8) position = Vector2(1280, -8)
texture = ExtResource("17_itite") texture = ExtResource("17_itite")
region_enabled = true region_enabled = true
region_rect = Rect2(16, 0, 16, 32) region_rect = Rect2(16, 0, 16, 32)
script = ExtResource("19_62ed8")
metadata/_custom_type_script = "uid://364rywt44hy6"
[node name="BowsersBro" parent="." instance=ExtResource("18_4i10n")] [node name="BowsersBro" parent="." instance=ExtResource("18_4i10n")]
position = Vector2(584, 0) position = Vector2(584, 0)
@@ -125,25 +130,25 @@ position = Vector2(1592, -16)
position = Vector2(2008, -96) position = Vector2(2008, -96)
[connection signal="collected" from="Tiles/Coin" to="Tiles/Coin/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/Coin" to="Tiles/Coin/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@190955" to="Tiles/@Node2D@190955/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@22836" to="Tiles/@Node2D@22836/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@190956" to="Tiles/@Node2D@190956/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@22837" to="Tiles/@Node2D@22837/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@190957" to="Tiles/@Node2D@190957/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@22838" to="Tiles/@Node2D@22838/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@190958" to="Tiles/@Node2D@190958/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@22839" to="Tiles/@Node2D@22839/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@190959" to="Tiles/@Node2D@190959/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@22840" to="Tiles/@Node2D@22840/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@190960" to="Tiles/@Node2D@190960/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@22841" to="Tiles/@Node2D@22841/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@190961" to="Tiles/@Node2D@190961/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@22842" to="Tiles/@Node2D@22842/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@190962" to="Tiles/@Node2D@190962/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@22843" to="Tiles/@Node2D@22843/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@190963" to="Tiles/@Node2D@190963/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@22844" to="Tiles/@Node2D@22844/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@190964" to="Tiles/@Node2D@190964/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@22845" to="Tiles/@Node2D@22845/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@190965" to="Tiles/@Node2D@190965/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@22846" to="Tiles/@Node2D@22846/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@190966" to="Tiles/@Node2D@190966/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@22847" to="Tiles/@Node2D@22847/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@190967" to="Tiles/@Node2D@190967/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@22848" to="Tiles/@Node2D@22848/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@190968" to="Tiles/@Node2D@190968/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@22849" to="Tiles/@Node2D@22849/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@190969" to="Tiles/@Node2D@190969/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@22850" to="Tiles/@Node2D@22850/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@190970" to="Tiles/@Node2D@190970/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@22851" to="Tiles/@Node2D@22851/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@190971" to="Tiles/@Node2D@190971/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@22852" to="Tiles/@Node2D@22852/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@190972" to="Tiles/@Node2D@190972/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@22853" to="Tiles/@Node2D@22853/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@190973" to="Tiles/@Node2D@190973/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@22854" to="Tiles/@Node2D@22854/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@190974" to="Tiles/@Node2D@190974/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@22855" to="Tiles/@Node2D@22855/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@190975" to="Tiles/@Node2D@190975/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@22856" to="Tiles/@Node2D@22856/LevelPersistance" method="set_as_active"]
[connection signal="collected" from="Tiles/@Node2D@190976" to="Tiles/@Node2D@190976/LevelPersistance" method="set_as_active"] [connection signal="collected" from="Tiles/@Node2D@22857" to="Tiles/@Node2D@22857/LevelPersistance" method="set_as_active"]

6
Scripts/Classes/Entities/Player.gd
View File

@@ -146,16 +146,16 @@ const ANIMATION_FALLBACKS := {
"Pipe": "Idle", "Pipe": "Idle",
"Walk": "Move", "Walk": "Move",
"Run": "Move", "Run": "Move",
"PipeWalk": "Move", "PipeWalk": "Walk",
"LookUp": "Idle", "LookUp": "Idle",
"Crouch": "Idle", "Crouch": "Idle",
"CrouchFall": "Crouch", "CrouchFall": "Crouch",
"CrouchJump": "Crouch", "CrouchJump": "Crouch",
"CrouchBump": "Bump", "CrouchBump": "Bump",
"CrouchMove": "Crouch", "CrouchMove": "Crouch",
"IdleAttack": "Attack", "IdleAttack": "MoveAttack",
"CrouchAttack": "IdleAttack", "CrouchAttack": "IdleAttack",
"MoveAttack": "IdleAttack", "MoveAttack": "Attack",
"WalkAttack": "MoveAttack", "WalkAttack": "MoveAttack",
"RunAttack": "MoveAttack", "RunAttack": "MoveAttack",
"SkidAttack": "MoveAttack", "SkidAttack": "MoveAttack",