Merge branch 'main' into custom-level-loading-rewrite

* Reworked the sound override system to prevent non-playing sounds

* Weird bug where it would call to stop a non-existant hammer sound on death

.gitattributes

@@ -1,2 +1,2 @@
-# Auto detect text files and perform LF normalization
-* text=auto
+# Normalize EOL for all files that Git considers text files.
+* text=auto eol=lf

.github/ISSUE_TEMPLATE/01-bug-report.yml

@@ -0,0 +1,42 @@
+name: Bug Report
+description: Report a bug with Super Mario Bros. Remastered
+labels: ["bug"]
+title: '[Bug Report]: '
+
+body:
+  - type: input
+    id: version
+    attributes:
+      label: "Version"
+      description: "Specify the version of the game you used when you encountered the bug. You can find the game version at the bottom-left of the title screen."
+
+  - type: checkboxes
+    id: bug_type
+    attributes:
+      label: "Bug Type"
+      description: "Select all that apply (leave blank if unsure)."
+      options:
+        - label: campaign bug
+        - label: editor bug
+        - label: custom pack bug
+        - label: ui bug
+    validations:
+      required: false
+      
+  - type: textarea
+    id: description
+    attributes:
+      label: "Description"
+      description: "Please write a clear and concise description of the bug."
+      
+  - type: textarea
+    id: reproduction_steps
+    attributes:
+      label: "Reproduction Steps"
+      description: "Please list the steps taken to reproduce the bug, e.g. 1. Go to ... 2. Do ..."
+      
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: "Screenshots"
+      description: "If applicable, add screenshots to help explain the bug."

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,25 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Do '...'
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Additional context**
-Add any other context about the problem here.

.gitignore

@@ -2,3 +2,6 @@
 .godot/
 /android/
 Exports/
+Assets/LevelGuides
+addons/discord-rpc-gd/bin/windows/~discord_game_sdk_binding_debug.dll
+godotgif/bin/~godotgif.windows.template_debug.x86_64.dll

Assets/Audio/BGM/BooMenu.bgm

@@ -0,0 +1,10 @@
+{
+    "Normal": {
+        "source": "BooMenu.mp3",
+        "loop": 4.797
+    },
+    "Hurry": {
+        "source": "BooMenu.mp3",
+        "loop": 4.797
+    }
+}

Assets/Audio/BGM/BooMenu.json

@@ -0,0 +1,7 @@
+{
+	"variations": {
+		"default": {
+			"source": "BooMenu.bgm"
+		}
+	}
+}

Assets/Audio/BGM/ChallengeEnd.json

@@ -0,0 +1,5 @@
+{
+	"variations": {
+		"default": { "source": "ChallengeEnd.mp3" }
+	}
+}

Assets/Audio/BGM/ChallengeResults.bgm

@@ -0,0 +1,10 @@
+{
+    "Normal": {
+        "source": "ChallengeResults.mp3",
+        "loop": 0.0
+    },
+    "Hurry": {
+        "source": "ChallengeResults.mp3",
+        "loop": 0.0
+    }
+}

Assets/Audio/BGM/ChallengeResults.json

@@ -0,0 +1,5 @@
+{
+	"variations": {
+		"default": { "source": "ChallengeResults.bgm" }
+	}
+}

Assets/Audio/BGM/CustomLevel.bgm

@@ -0,0 +1,10 @@
+{
+	"Normal": {
+		"source": "CustomLevel.mp3",
+		"loop": 4.8
+	},
+	"Hurry": {
+		"source": "CustomLevel.mp3",
+		"loop": 4.8
+	}
+}

Assets/Audio/BGM/CustomLevel.json

@@ -0,0 +1,5 @@
+{
+	"variations": {
+		"SMB1": {"source": "CustomLevel.bgm"}
+	}
+}

Assets/Audio/BGM/Hammer.bgm

@@ -0,0 +1,4 @@
+{
+	"Normal": {"source": "Hammer.mp3", "loop": 0.0},
+	"Hurry": {"source": "HammerHurry.mp3", "loop": 0.0}
+}

Assets/Audio/BGM/Hammer.json

@@ -0,0 +1,5 @@
+{
+	"variations": {
+		"default": {"source": "Hammer.bgm"}
+	}
+}

Assets/Audio/BGM/HammerHurry.mp3.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://b18uhvghiv5i7"
+path="res://.godot/imported/HammerHurry.mp3-57fe15e311073c22b994c20a8caff2a9.mp3str"
+
+[deps]
+
+source_file="res://Assets/Audio/BGM/HammerHurry.mp3"
+dest_files=["res://.godot/imported/HammerHurry.mp3-57fe15e311073c22b994c20a8caff2a9.mp3str"]
+
+[params]
+
+loop=true
+loop_offset=0.0
+bpm=0.0
+beat_count=0
+bar_beats=4

Assets/Audio/BGM/PSwitch.bgm

@@ -0,0 +1,10 @@
+{
+	"Normal": {
+		"source": "PSwitch.mp3",
+		"loop": 8.801
+	},
+	"Hurry": {
+		"source": "PSwitchHurry.mp3",
+		"loop": 7.55
+	}
+}

Assets/Audio/BGM/PSwitch.json

@@ -1,3 +1,3 @@
 {
-	"variations": {"source": "PSwitch.mp3"}
+	"variations": {"source": "PSwitch.bgm"}
 }

Assets/Audio/BGM/PSwitchHurry.mp3.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://7iqief2hn4rg"
+path="res://.godot/imported/PSwitchHurry.mp3-3abe83c8eb89107e332495802cd7d785.mp3str"
+
+[deps]
+
+source_file="res://Assets/Audio/BGM/PSwitchHurry.mp3"
+dest_files=["res://.godot/imported/PSwitchHurry.mp3-3abe83c8eb89107e332495802cd7d785.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

Assets/Audio/BGM/TitleBGM.json

@@ -1,7 +1,7 @@
 {
 	"variations": {
 		"SMB1": {"source": "TitleSMB.mp3"},
-		"SMBLL": {"source": "TitleSMBLL.mp3"},
+		"SMBLL": {"source": "TitleSMBLL.bgm"},
 		"SMBS": {"source": "TitleSMBS.mp3"},
 		"SMBANN": {"source": "TitleANN.mp3"}
 	}

Assets/Audio/BGM/TitleSMBLL.bgm

@@ -0,0 +1,4 @@
+{
+    "Normal": {"source": "TitleSMBLL.mp3", "loop": 11.735},
+    "Hurry": {"source": "TitleSMBLL.mp3", "loop": 11.735}
+}

Assets/Audio/SFX/HammerHit.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://dmgokar32otvr"
+path="res://.godot/imported/HammerHit.wav-e7d35f1a3d3022177d665d6f2eb69a9d.sample"
+
+[deps]
+
+source_file="res://Assets/Audio/SFX/HammerHit.wav"
+dest_files=["res://.godot/imported/HammerHit.wav-e7d35f1a3d3022177d665d6f2eb69a9d.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

Assets/Audio/SFX/HammerPoint.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://clpebkune16oc"
+path="res://.godot/imported/HammerPoint.wav-d08385bab6f27e27d308496f733770b5.sample"
+
+[deps]
+
+source_file="res://Assets/Audio/SFX/HammerPoint.wav"
+dest_files=["res://.godot/imported/HammerPoint.wav-d08385bab6f27e27d308496f733770b5.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

Assets/Audio/SFX/Instruments/Bass.ogg.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://dia0bsspwrqsn"
-path="res://.godot/imported/Bass.ogg-2e0ca73f5eb18a4caad9f8787b305ede.oggvorbisstr"
-
-[deps]
-
-source_file="res://Assets/Audio/SFX/Instruments/Bass.ogg"
-dest_files=["res://.godot/imported/Bass.ogg-2e0ca73f5eb18a4caad9f8787b305ede.oggvorbisstr"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

Assets/Audio/SFX/Instruments/Bass.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://gsk2lqo8a608"
+path="res://.godot/imported/Bass.wav-0af8f2d39ffcb45d3d8d2e691dbb1ea1.sample"
+
+[deps]
+
+source_file="res://Assets/Audio/SFX/Instruments/Bass.wav"
+dest_files=["res://.godot/imported/Bass.wav-0af8f2d39ffcb45d3d8d2e691dbb1ea1.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

Assets/Audio/SFX/Instruments/Flute.ogg.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://d2elbhakm1yfq"
-path="res://.godot/imported/Flute.ogg-8b544ff9d79b0b701aadd77ce9d6606c.oggvorbisstr"
-
-[deps]
-
-source_file="res://Assets/Audio/SFX/Instruments/Flute.ogg"
-dest_files=["res://.godot/imported/Flute.ogg-8b544ff9d79b0b701aadd77ce9d6606c.oggvorbisstr"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

Assets/Audio/SFX/Instruments/Flute.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://ch68d4iy1nn2e"
+path="res://.godot/imported/Flute.wav-e60a6e6ff99db87fd29d6dbb29a32f42.sample"
+
+[deps]
+
+source_file="res://Assets/Audio/SFX/Instruments/Flute.wav"
+dest_files=["res://.godot/imported/Flute.wav-e60a6e6ff99db87fd29d6dbb29a32f42.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

Assets/Audio/SFX/Instruments/Marimba.ogg.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://vxox7t6qvyvu"
-path="res://.godot/imported/Marimba.ogg-947c966f30b050ab7664dc6b08d1ed34.oggvorbisstr"
-
-[deps]
-
-source_file="res://Assets/Audio/SFX/Instruments/Marimba.ogg"
-dest_files=["res://.godot/imported/Marimba.ogg-947c966f30b050ab7664dc6b08d1ed34.oggvorbisstr"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

Assets/Audio/SFX/Instruments/Marimba.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://b5wwm2720dks"
+path="res://.godot/imported/Marimba.wav-ff57ed66577a4a8533e47d5a7c11d18b.sample"
+
+[deps]
+
+source_file="res://Assets/Audio/SFX/Instruments/Marimba.wav"
+dest_files=["res://.godot/imported/Marimba.wav-ff57ed66577a4a8533e47d5a7c11d18b.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

Assets/Audio/SFX/Instruments/Piano.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://b8x38vefni36o"
+path="res://.godot/imported/Piano.wav-f07e9a76da6d85bbcda15c88b0800d5a.sample"
+
+[deps]
+
+source_file="res://Assets/Audio/SFX/Instruments/Piano.wav"
+dest_files=["res://.godot/imported/Piano.wav-f07e9a76da6d85bbcda15c88b0800d5a.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

Assets/Audio/SFX/Instruments/Pianop.ogg.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://w44jys81bxjj"
-path="res://.godot/imported/Pianop.ogg-c1b9a080c2dfa6832b4e2024d89d402e.oggvorbisstr"
-
-[deps]
-
-source_file="res://Assets/Audio/SFX/Instruments/Pianop.ogg"
-dest_files=["res://.godot/imported/Pianop.ogg-c1b9a080c2dfa6832b4e2024d89d402e.oggvorbisstr"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

Assets/Audio/SFX/Instruments/Rhodes.ogg.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://b2lj4akov8ami"
-path="res://.godot/imported/Rhodes.ogg-5479bc495ece849c46c35313e94a570c.oggvorbisstr"
-
-[deps]
-
-source_file="res://Assets/Audio/SFX/Instruments/Rhodes.ogg"
-dest_files=["res://.godot/imported/Rhodes.ogg-5479bc495ece849c46c35313e94a570c.oggvorbisstr"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

Assets/Audio/SFX/Instruments/Rhodes.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://d4ec6sm3ilh73"
+path="res://.godot/imported/Rhodes.wav-f1a91246cf384c05ceb5eeab55adfd01.sample"
+
+[deps]
+
+source_file="res://Assets/Audio/SFX/Instruments/Rhodes.wav"
+dest_files=["res://.godot/imported/Rhodes.wav-f1a91246cf384c05ceb5eeab55adfd01.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

Assets/Audio/SFX/Instruments/Steel.ogg.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://c03nay4r4a2lm"
-path="res://.godot/imported/Steel.ogg-96e1940d784d42ef0877720378455abf.oggvorbisstr"
-
-[deps]
-
-source_file="res://Assets/Audio/SFX/Instruments/Steel.ogg"
-dest_files=["res://.godot/imported/Steel.ogg-96e1940d784d42ef0877720378455abf.oggvorbisstr"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

Assets/Audio/SFX/Instruments/Steel.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://c62pc2e3w30va"
+path="res://.godot/imported/Steel.wav-bbaf30f9a7aa825bbb31970a83ade63a.sample"
+
+[deps]
+
+source_file="res://Assets/Audio/SFX/Instruments/Steel.wav"
+dest_files=["res://.godot/imported/Steel.wav-bbaf30f9a7aa825bbb31970a83ade63a.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

Assets/Audio/SFX/Instruments/Trumpet.ogg.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://d0pdbnpfcm80i"
-path="res://.godot/imported/Trumpet.ogg-8ce8c2cbef2f930f69bb2254c330e543.oggvorbisstr"
-
-[deps]
-
-source_file="res://Assets/Audio/SFX/Instruments/Trumpet.ogg"
-dest_files=["res://.godot/imported/Trumpet.ogg-8ce8c2cbef2f930f69bb2254c330e543.oggvorbisstr"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

Assets/Audio/SFX/Instruments/Trumpet.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://dcdihfu6fpjg1"
+path="res://.godot/imported/Trumpet.wav-d00b3d26ca9121bcb811d2b045d2dcac.sample"
+
+[deps]
+
+source_file="res://Assets/Audio/SFX/Instruments/Trumpet.wav"
+dest_files=["res://.godot/imported/Trumpet.wav-d00b3d26ca9121bcb811d2b045d2dcac.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

Assets/Audio/SFX/Instruments/Violin.ogg.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://dodww1no4v6qh"
-path="res://.godot/imported/Violin.ogg-36e2f55ddb31b5a2d46333a03d1a19c8.oggvorbisstr"
-
-[deps]
-
-source_file="res://Assets/Audio/SFX/Instruments/Violin.ogg"
-dest_files=["res://.godot/imported/Violin.ogg-36e2f55ddb31b5a2d46333a03d1a19c8.oggvorbisstr"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

Assets/Audio/SFX/Instruments/Violin.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://byet8ricnkvsf"
+path="res://.godot/imported/Violin.wav-f08bbc91d5dda0881b59b7bf811fb300.sample"
+
+[deps]
+
+source_file="res://Assets/Audio/SFX/Instruments/Violin.wav"
+dest_files=["res://.godot/imported/Violin.wav-f08bbc91d5dda0881b59b7bf811fb300.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

Assets/Sprites/Backgrounds/Hills/Hill.json

@@ -1,4 +1,7 @@
 {
+	"properties": {
+		"primary_layer_size": [512, 512]
+	},
 	"animations": {
 		"default": {
 			"frames": [[0, 0, 512, 512]],

Assets/Sprites/Backgrounds/SecondaryMushrooms/Mushrooms.json

@@ -102,7 +102,7 @@
 			},
 			"SMBLL": {
 				"Day": {
-					"source": "BeachMushroomsLLNight.png"
+					"source": "BeachMushroomsNightLL.png"
 				},
 				"Night": {
 					"source": "BeachMushroomsNightLL.png"

Assets/Sprites/Backgrounds/Skies/Sky.json

@@ -54,6 +54,15 @@
 					"speed": 5.0,
 					"loop": true
 				}}
+			},
+			"Snow": {
+				"source": "SnowNightStars.png",
+				"properties": {"sky_scroll_speed": 0},
+				"animations": {"default": {
+					"frames": [[0, 0, 512, 512], [512, 0, 512, 512]],
+					"speed": 5.0,
+					"loop": true
+				}}
 			}
 		}
 	}

Assets/Sprites/Blocks/Cannon.json

@@ -8,11 +8,11 @@
 		"Desert": {"source": "Cannon.png", "rect": [0, 16, 48, 16]},
 		"Jungle": {"source": "Cannon.png", "rect": [48, 16, 48, 16]},
 		"Snow": {"source": "Cannon.png", "rect": [96, 16, 48, 16]},
-		"Space": {"source": "Cannon.png", "rect": [144, 16, 48, 16]},
+		"Volcano": {"source": "Cannon.png", "rect": [144, 16, 48, 16]},
 		"Autumn": {"source": "Cannon.png", "rect": [0, 32, 48, 16]},
 		"Beach": {"source": "Cannon.png", "rect": [48, 32, 48, 16]},
 		"Mountain": {"source": "Cannon.png", "rect": [96, 32, 48, 16]},
-		"Volcano": {"source": "Cannon.png", "rect": [144, 32, 48, 16]},
+		"Space": {"source": "Cannon.png", "rect": [144, 32, 48, 16]},
 		"Bonus": {"source": "Cannon.png", "rect": [0, 48, 48, 16]}
 	}
 }

Assets/Sprites/Blocks/ConveyorBelt.json

@@ -1,6 +1,10 @@
 {
 	"variations": {
-		"SMB1": {"source": "ConveyorBelt.png"},
-		"SMBS": {"source": "ConveyorBeltSpecial.png"}
+		"SMB1": {
+			"source": "ConveyorBelt.png"
+		},
+		"SMBS": {
+			"source": "ConveyorBeltSpecial.png"
+		}
 	}
-}
+}

Assets/Sprites/Blocks/InvisibleBlock.json

@@ -13,14 +13,12 @@
 				16.0
 			]
 		},
-		"Castle": {
-			"source": "InvisibleBlock.png",
-			"rect": [
-				16.0,
-				0.0,
-				16.0,
-				16.0
-			]
-		}
+		"Castle": {"link": "Underground"},
+		"GhostHouse": {"link": "Underground"},
+		"Volcano": {"link": "Underground"},
+		"Bonus": {"link": "Underground"},
+		"Jungle": {"link": "Underground"},
+		"Space": {"link": "Underground"}
+		
 	}
 }

Assets/Sprites/Blocks/NoteBlock.json

@@ -13,6 +13,7 @@
 		"Castle": {"source": "NoteBlock.png", "rect": [0, 32, 16, 16]},
 		"Snow": {"source": "NoteBlock.png", "rect": [0, 48, 16, 16]},
 		"Space": {"source": "NoteBlock.png", "rect": [0, 64, 16, 16]},
-		"Volcano": {"source": "NoteBlock.png", "rect": [0, 80, 16, 16]}
+		"Volcano": {"source": "NoteBlock.png", "rect": [0, 80, 16, 16]},
+		"Bonus": {"source": "NoteBlock.png", "rect": [0, 96, 16, 16]}
 	}
 }

Assets/Sprites/Blocks/OnOffConveyor.json

@@ -1,6 +1,10 @@
 {
 	"variations": {
-		"SMB1": {"source": "OnOffConveyorBelt.png"},
-		"SMBS": {"source": "OnOffConveyorBeltSpecial.png"}
+		"SMB1": {
+			"source": "OnOffConveyorBelt.png"
+		},
+		"SMBS": {
+			"source": "OnOffConveyorBeltSpecial.png"
+		}
 	}
-}
+}

Assets/Sprites/Blocks/QuestionBlock.json

@@ -1,37 +1,156 @@
 {
 	"animations": {
 		"default": {
-			"frames": 
+			"frames": [
 				[
-					[0, 0, 16, 16],
-					[0, 0, 16, 16],
-					[0, 0, 16, 16],
-					[0, 0, 16, 16],
-					[0, 0, 16, 16],
-					[0, 0, 16, 16],
-					[0, 0, 16, 16],
-					[0, 0, 16, 16],
-					[0, 0, 16, 16],
-					[0, 0, 16, 16],
-					[0, 0, 16, 16],
-					[16, 0, 16, 16],
-					[32, 0, 16, 16],
-					[16, 0, 16, 16],
+					0.0,
+					0.0,
+					16.0,
+					16.0
 				],
+				[
+					0.0,
+					0.0,
+					16.0,
+					16.0
+				],
+				[
+					0.0,
+					0.0,
+					16.0,
+					16.0
+				],
+				[
+					0.0,
+					0.0,
+					16.0,
+					16.0
+				],
+				[
+					0.0,
+					0.0,
+					16.0,
+					16.0
+				],
+				[
+					0.0,
+					0.0,
+					16.0,
+					16.0
+				],
+				[
+					0.0,
+					0.0,
+					16.0,
+					16.0
+				],
+				[
+					0.0,
+					0.0,
+					16.0,
+					16.0
+				],
+				[
+					0.0,
+					0.0,
+					16.0,
+					16.0
+				],
+				[
+					0.0,
+					0.0,
+					16.0,
+					16.0
+				],
+				[
+					16.0,
+					0.0,
+					16.0,
+					16.0
+				],
+				[
+					32.0,
+					0.0,
+					16.0,
+					16.0
+				],
+				[
+					16.0,
+					0.0,
+					16.0,
+					16.0
+				]
+			],
 			"speed": 10.0,
 			"loop": true
 		}
 	},
-	
-	"variations":
-	{
-		"default": {"source": "QuestionBlock.png", "rect": [0, 0, 64, 16]},
-		"Underground": {"source": "QuestionBlock.png", "rect": [0, 16, 64, 16]},
-		"GhostHouse": {"link": "Underground"},
-		"Castle": {"source": "QuestionBlock.png", "rect": [0, 32, 64, 16]},
-		"Snow": {"source": "QuestionBlock.png", "rect": [0, 48, 64, 16]},
-		"Space": {"source": "QuestionBlock.png", "rect": [0, 64, 64, 16]},
-		"Volcano": {"source": "QuestionBlock.png", "rect": [0, 80, 64, 16]},
-		"Bonus": {"source": "QuestionBlock.png", "rect": [0, 96, 64, 16]}
+	"variations": {
+		"default": {
+			"source": "QuestionBlock.png",
+			"rect": [
+				0.0,
+				0.0,
+				64.0,
+				16.0
+			]
+		},
+		"Underground": {
+			"source": "QuestionBlock.png",
+			"rect": [
+				0.0,
+				16.0,
+				64.0,
+				16.0
+			]
+		},
+		"GhostHouse": {
+			"link": "Underground"
+		},
+		"Castle": {
+			"source": "QuestionBlock.png",
+			"rect": [
+				0.0,
+				32.0,
+				64.0,
+				16.0
+			]
+		},
+		"Snow": {
+			"source": "QuestionBlock.png",
+			"rect": [
+				0.0,
+				48.0,
+				64.0,
+				16.0
+			]
+		},
+		"Space": {
+			"source": "QuestionBlock.png",
+			"rect": [
+				0.0,
+				64.0,
+				64.0,
+				16.0
+			]
+		},
+		"Volcano": {
+			"source": "QuestionBlock.png",
+			"rect": [
+				0.0,
+				80.0,
+				64.0,
+				16.0
+			]
+		},
+		"Bonus": {
+			"source": "QuestionBlock.png",
+			"rect": [
+				0.0,
+				96.0,
+				64.0,
+				16.0
+			]
+		}
 	}
-}
+}

Assets/Sprites/Editor/BillCannonIcon.json

@@ -0,0 +1,24 @@
+{
+	"variations": {
+		"default": {
+			"Day": {"source": "BillCannon.png", "rect": [0, 0, 16, 16]},
+			"Night": {"source": "BillCannon.png", "rect": [16, 0, 16, 16]}
+		},
+		"Underground": {
+			"source": "BillCannon.png",
+			"rect": [
+				16.0,
+				0.0,
+				16.0,
+				16.0
+			]
+		},
+		"Castle": {"link": "Underground"},
+		"GhostHouse": {"link": "Underground"},
+		"Volcano": {"link": "Underground"},
+		"Bonus": {"link": "Underground"},
+		"Jungle": {"link": "Underground"},
+		"Space": {"link": "Underground"}
+		
+	}
+}

Assets/Sprites/Editor/Block.svg

@@ -0,0 +1 @@
+<svg version="1.2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16"><style>.a{fill:#8da5f3}</style><path fill-rule="evenodd" class="a" d="m1 0h14l1 1v14l-1 1h-14l-1-1v-14zm0 15h14v-14h-14zm1.5-12c-0.3 0-0.5-0.2-0.5-0.5 0-0.3 0.2-0.5 0.5-0.5 0.3 0 0.5 0.2 0.5 0.5 0 0.3-0.2 0.5-0.5 0.5zm11 0c-0.3 0-0.5-0.2-0.5-0.5 0-0.3 0.2-0.5 0.5-0.5 0.3 0 0.5 0.2 0.5 0.5 0 0.3-0.2 0.5-0.5 0.5zm0 11c-0.3 0-0.5-0.2-0.5-0.5 0-0.3 0.2-0.5 0.5-0.5 0.3 0 0.5 0.2 0.5 0.5 0 0.3-0.2 0.5-0.5 0.5zm-11 0c-0.3 0-0.5-0.2-0.5-0.5 0-0.3 0.2-0.5 0.5-0.5 0.3 0 0.5 0.2 0.5 0.5 0 0.3-0.2 0.5-0.5 0.5z"/></svg>

Assets/Sprites/Editor/Block.svg.import

@@ -0,0 +1,44 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://b5cfmaep0h3i8"
+path="res://.godot/imported/Block.svg-b375fcdd7f9ff578f8f4e7f5bc50abc6.ctex"
+metadata={
+"has_editor_variant": true,
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Sprites/Editor/Block.svg"
+dest_files=["res://.godot/imported/Block.svg-b375fcdd7f9ff578f8f4e7f5bc50abc6.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
+svg/scale=1.0
+editor/scale_with_editor_scale=true
+editor/convert_colors_with_editor_theme=true

Assets/Sprites/Editor/Enemy.svg

@@ -0,0 +1 @@
+<svg version="1.2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16"><style>.a{fill:#8da5f3}</style><path fill-rule="evenodd" class="a" d="m11.8 10.9c0.4 0.7 0.5 1.5 0.2 2.1 2-0.3 3 1 3 2 0 1-1 1-1 1h-4c0 0-1 0-1-1-0.4 0.1-0.7 0.1-1 0.1q-0.5 0-1-0.1c0 1-1 1-1 1h-4c0 0-1 0-1-1 0-1 1-2.3 3-2-0.3-0.6-0.3-1.4 0.2-2.1-2.2 0.6-4.2 0.3-4.2-2.4 0-2.8 3.7-5.9 4.5-6.8 1.8-1.7 2.5-1.7 3.5-1.7 1 0 1.8 0 3.5 1.7 0.8 0.9 4.5 4 4.5 6.8 0 2.7-2 3-4.2 2.4zm-2.3-0.9h-3c-2 0-3 4.5 1.5 4.5 4.5 0 3.5-4.5 1.5-4.5zm2.1-5.1c0.6-0.5 1.1-0.9 1.6-0.9-1.5-1.8-3.5 2.5-5.2 2.5-1.8 0-3.8-4.3-5.3-2.5 0.6 0 1.1 0.4 1.7 0.9-0.3 0.4-0.4 1.3-0.4 2.1 0 1.1 0.7 2 1.5 2 1.4 0 1.5-0.8 1.5-1.8q0.5 0.3 1 0.3 0.5 0 1-0.3c0 1 0.1 1.8 1.5 1.8 0.7 0 1.5-0.9 1.5-2 0-0.8-0.1-1.7-0.4-2.1z"/><path fill-rule="evenodd" class="a" d="m6 6.5c0 0.5 0 1.5-0.5 1.5-0.6 0-0.5-1.7-0.4-2.4q0.4 0.4 0.9 0.9z"/><path fill-rule="evenodd" class="a" d="m10.5 8c-0.5 0-0.5-1-0.5-1.5q0.4-0.5 0.9-0.9c0.2 0.7 0.2 2.4-0.4 2.4z"/></svg>

Assets/Sprites/Editor/Enemy.svg.import

@@ -0,0 +1,44 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bpgqqibmk2pkl"
+path="res://.godot/imported/Enemy.svg-cb6145b04638dd6109e7afcccd5a1a6c.ctex"
+metadata={
+"has_editor_variant": true,
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Sprites/Editor/Enemy.svg"
+dest_files=["res://.godot/imported/Enemy.svg-cb6145b04638dd6109e7afcccd5a1a6c.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
+svg/scale=1.0
+editor/scale_with_editor_scale=true
+editor/convert_colors_with_editor_theme=true

Assets/Sprites/Editor/Level.svg

@@ -0,0 +1 @@
+<svg version="1.2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" width="16" height="16"><style>.a{fill:#e0e0e0}</style><path fill-rule="evenodd" class="a" d="m64 28v36h-24v-14c0-6-2-10-8-10-6 0-8 4-8 10v14h-24v-36h6v6h4v-6h8v6h4v-6h8v6h4v-6h8v6h4v-6h8v6h4v-6z"/><path fill-rule="evenodd" class="a" d="m50 0v26h-6v-10c0 0 0-4-3-4-3 0-3 4-3 4v10h-12v-10c0 0 0-4-3-4-3 0-3 4-3 4v10h-6v-26h4v6h4v-6h8v6h4v-6h8v6h4v-6z"/></svg>

Assets/Sprites/Editor/Level.svg.import

@@ -0,0 +1,44 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://wfg4ua6pxefd"
+path="res://.godot/imported/Level.svg-6e0a9c00f142962bf52132d8335da095.ctex"
+metadata={
+"has_editor_variant": true,
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Sprites/Editor/Level.svg"
+dest_files=["res://.godot/imported/Level.svg-6e0a9c00f142962bf52132d8335da095.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
+svg/scale=1.0
+editor/scale_with_editor_scale=true
+editor/convert_colors_with_editor_theme=true