diff --git a/Assets/Sprites/Players/Luigi/Small.png b/Assets/Sprites/Players/Luigi/Small.png index db6ae9a..e568551 100644 Binary files a/Assets/Sprites/Players/Luigi/Small.png and b/Assets/Sprites/Players/Luigi/Small.png differ diff --git a/Assets/Sprites/Players/Mario/Small.png b/Assets/Sprites/Players/Mario/Small.png index 30e49bf..f5c08d5 100644 Binary files a/Assets/Sprites/Players/Mario/Small.png and b/Assets/Sprites/Players/Mario/Small.png differ diff --git a/Resources/AssetRipper/Sprites/Players/Mario/Small.json b/Resources/AssetRipper/Sprites/Players/Mario/Small.json index 31c2d9e..c93de6a 100644 --- a/Resources/AssetRipper/Sprites/Players/Mario/Small.json +++ b/Resources/AssetRipper/Sprites/Players/Mario/Small.json @@ -1 +1 @@ -{"columns":"1","palette_base":"Mario","palettes":"{\n\"Mario\": [\"default\"]\n}","sheet_size":"Vector2i(512, 512)","source_path":"res://Assets/Sprites/Players/Mario/Small.png","tiles":"{\nVector2(7, 47): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 50\n},\nVector2(7, 55): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 68\n},\nVector2(8, 16): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 58\n},\nVector2(8, 24): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 79\n},\nVector2(8, 72): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 0\n},\nVector2(8, 80): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 76\n},\nVector2(8, 88): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 78\n},\nVector2(15, 47): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 51\n},\nVector2(15, 55): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 69\n},\nVector2(16, 16): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 55\n},\nVector2(16, 24): {\n\"flip_h\": true,\n\"flip_v\": false,\n\"index\": 79\n},\nVector2(16, 72): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 1\n},\nVector2(16, 80): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 77\n},\nVector2(16, 88): {\n\"flip_h\": true,\n\"flip_v\": false,\n\"index\": 78\n},\nVector2(39, 47): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 50\n},\nVector2(39, 55): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 68\n},\nVector2(40, 88): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 79\n},\nVector2(47, 47): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 51\n},\nVector2(47, 55): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 71\n},\nVector2(48, 88): {\n\"flip_h\": true,\n\"flip_v\": false,\n\"index\": 79\n},\nVector2(71, 47): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 50\n},\nVector2(71, 55): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 70\n},\nVector2(72, 16): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 54\n},\nVector2(72, 24): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 56\n},\nVector2(79, 47): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 51\n},\nVector2(79, 55): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 71\n},\nVector2(80, 16): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 55\n},\nVector2(80, 24): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 57\n},\nVector2(80, 88): {\n\"flip_h\": true,\n\"flip_v\": false,\n\"index\": 79\n},\nVector2(103, 47): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 50\n},\nVector2(103, 55): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 72\n},\nVector2(104, 16): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 58\n},\nVector2(104, 24): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 59\n},\nVector2(111, 47): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 51\n},\nVector2(111, 55): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 73\n},\nVector2(112, 16): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 55\n},\nVector2(112, 24): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 60\n},\nVector2(135, 16): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 50\n},\nVector2(135, 24): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 52\n},\nVector2(135, 47): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 50\n},\nVector2(143, 16): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 51\n},\nVector2(143, 24): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 53\n},\nVector2(143, 47): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 51\n},\nVector2(143, 55): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 73\n},\nVector2(166, 48): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 50\n},\nVector2(166, 56): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 146\n},\nVector2(168, 16): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 61\n},\nVector2(168, 24): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 63\n},\nVector2(174, 48): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 51\n},\nVector2(174, 56): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 145\n},\nVector2(176, 16): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 62\n},\nVector2(176, 24): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 64\n},\nVector2(199, 48): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 58\n},\nVector2(199, 56): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 146\n},\nVector2(200, 16): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 50\n},\nVector2(200, 24): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 66\n},\nVector2(207, 48): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 55\n},\nVector2(207, 56): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 147\n},\nVector2(208, 16): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 65\n},\nVector2(208, 24): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 67\n},\nVector2(232, 48): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 158\n},\nVector2(232, 56): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 159\n},\nVector2(240, 48): {\n\"flip_h\": true,\n\"flip_v\": false,\n\"index\": 158\n},\nVector2(240, 56): {\n\"flip_h\": true,\n\"flip_v\": false,\n\"index\": 159\n}\n}"} +{"columns":"1","palette_base":"Mario","palettes":"{\n\"Mario\": [\"default\"]\n}","sheet_size":"Vector2i(256, 96)","source_path":"res://Assets/Sprites/Players/Mario/Small.png","tiles":"{\nVector2(7, 47): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 50\n},\nVector2(7, 55): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 68\n},\nVector2(8, 16): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 58\n},\nVector2(8, 24): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 79\n},\nVector2(8, 72): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 0\n},\nVector2(8, 80): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 76\n},\nVector2(8, 88): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 78\n},\nVector2(15, 47): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 51\n},\nVector2(15, 55): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 69\n},\nVector2(16, 16): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 55\n},\nVector2(16, 24): {\n\"flip_h\": true,\n\"flip_v\": false,\n\"index\": 79\n},\nVector2(16, 72): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 1\n},\nVector2(16, 80): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 77\n},\nVector2(16, 88): {\n\"flip_h\": true,\n\"flip_v\": false,\n\"index\": 78\n},\nVector2(39, 47): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 50\n},\nVector2(39, 55): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 68\n},\nVector2(40, 88): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 79\n},\nVector2(47, 47): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 51\n},\nVector2(47, 55): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 71\n},\nVector2(48, 88): {\n\"flip_h\": true,\n\"flip_v\": false,\n\"index\": 79\n},\nVector2(71, 47): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 50\n},\nVector2(71, 55): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 70\n},\nVector2(72, 16): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 54\n},\nVector2(72, 24): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 56\n},\nVector2(79, 47): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 51\n},\nVector2(79, 55): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 71\n},\nVector2(80, 16): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 55\n},\nVector2(80, 24): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 57\n},\nVector2(80, 88): {\n\"flip_h\": true,\n\"flip_v\": false,\n\"index\": 79\n},\nVector2(103, 47): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 50\n},\nVector2(103, 55): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 72\n},\nVector2(104, 16): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 58\n},\nVector2(104, 24): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 59\n},\nVector2(111, 47): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 51\n},\nVector2(111, 55): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 73\n},\nVector2(112, 16): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 55\n},\nVector2(112, 24): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 60\n},\nVector2(136, 16): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 50\n},\nVector2(136, 24): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 52\n},\nVector2(135, 47): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 50\n},\nVector2(144, 16): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 51\n},\nVector2(144, 24): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 53\n},\nVector2(143, 47): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 51\n},\nVector2(143, 55): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 73\n},\nVector2(166, 48): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 50\n},\nVector2(166, 56): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 146\n},\nVector2(168, 16): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 61\n},\nVector2(168, 24): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 63\n},\nVector2(174, 48): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 51\n},\nVector2(174, 56): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 145\n},\nVector2(176, 16): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 62\n},\nVector2(176, 24): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 64\n},\nVector2(199, 48): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 58\n},\nVector2(199, 56): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 146\n},\nVector2(200, 16): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 50\n},\nVector2(200, 24): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 66\n},\nVector2(207, 48): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 55\n},\nVector2(207, 56): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 147\n},\nVector2(208, 16): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 65\n},\nVector2(208, 24): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 67\n},\nVector2(232, 48): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 158\n},\nVector2(232, 56): {\n\"flip_h\": false,\n\"flip_v\": false,\n\"index\": 159\n},\nVector2(240, 48): {\n\"flip_h\": true,\n\"flip_v\": false,\n\"index\": 158\n},\nVector2(240, 56): {\n\"flip_h\": true,\n\"flip_v\": false,\n\"index\": 159\n}\n}"} diff --git a/Scripts/Classes/Singletons/Global.gd b/Scripts/Classes/Singletons/Global.gd index 93380e7..12154cc 100644 --- a/Scripts/Classes/Singletons/Global.gd +++ b/Scripts/Classes/Singletons/Global.gd @@ -34,7 +34,7 @@ var ROM_POINTER_PATH = config_path.path_join("rom_pointer.smb") var ROM_PATH = config_path.path_join("baserom.nes") var ROM_ASSETS_PATH = config_path.path_join("resource_packs/BaseAssets") const ROM_PACK_NAME := "BaseAssets" -const ROM_ASSETS_VERSION := 1 +const ROM_ASSETS_VERSION := 2 var server_version := -1 var current_version := -1