diff --git a/cutscenes/fami_cutscene.tscn b/cutscenes/fami_cutscene.tscn index ca2c6ff..34d5fb0 100644 --- a/cutscenes/fami_cutscene.tscn +++ b/cutscenes/fami_cutscene.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=42 format=2] [ext_resource path="res://shaders/recolor_border.shader" type="Shader" id=1] -[ext_resource path="res://graphics/player/palettes/default.png" type="Texture" id=2] +[ext_resource path="res://graphics/player/palettes/default.tex" type="Texture" id=2] [ext_resource path="res://ui/theme.tres" type="Theme" id=3] [ext_resource path="res://ui/2ndpuberty_outline.tres" type="Material" id=4] [ext_resource path="res://scripts/sg_palette.gd" type="Script" id=5] diff --git a/graphics/player/palettes/cosmological_redshift.png b/graphics/player/palettes/cosmological_redshift.png deleted file mode 100644 index c433e3b..0000000 Binary files a/graphics/player/palettes/cosmological_redshift.png and /dev/null differ diff --git a/graphics/player/palettes/cosmological_redshift.png.import b/graphics/player/palettes/cosmological_redshift.png.import deleted file mode 100644 index 957a983..0000000 --- a/graphics/player/palettes/cosmological_redshift.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/cosmological_redshift.png-f03cece39c30342518f947ceb6ce3b1a.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://graphics/player/palettes/cosmological_redshift.png" -dest_files=[ "res://.import/cosmological_redshift.png-f03cece39c30342518f947ceb6ce3b1a.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/graphics/player/palettes/costume_wriggle.png b/graphics/player/palettes/costume_wriggle.png deleted file mode 100644 index 0538053..0000000 Binary files a/graphics/player/palettes/costume_wriggle.png and /dev/null differ diff --git a/graphics/player/palettes/costume_wriggle.png.import b/graphics/player/palettes/costume_wriggle.png.import deleted file mode 100644 index b0e9ca0..0000000 --- a/graphics/player/palettes/costume_wriggle.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/costume_wriggle.png-fad3e57a7421b503255cab9833e11de8.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://graphics/player/palettes/costume_wriggle.png" -dest_files=[ "res://.import/costume_wriggle.png-fad3e57a7421b503255cab9833e11de8.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/graphics/player/palettes/default.png b/graphics/player/palettes/default.png deleted file mode 100644 index eb98d1d..0000000 Binary files a/graphics/player/palettes/default.png and /dev/null differ diff --git a/graphics/player/palettes/default.png.import b/graphics/player/palettes/default.png.import deleted file mode 100644 index 5f758ba..0000000 --- a/graphics/player/palettes/default.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/default.png-6df0b18cbcfa2be3c1e686686b6905e6.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://graphics/player/palettes/default.png" -dest_files=[ "res://.import/default.png-6df0b18cbcfa2be3c1e686686b6905e6.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/graphics/player/palettes/gravitational_redshift.png b/graphics/player/palettes/gravitational_redshift.png deleted file mode 100644 index fc8bae4..0000000 Binary files a/graphics/player/palettes/gravitational_redshift.png and /dev/null differ diff --git a/graphics/player/palettes/gravitational_redshift.png.import b/graphics/player/palettes/gravitational_redshift.png.import deleted file mode 100644 index b2a3caa..0000000 --- a/graphics/player/palettes/gravitational_redshift.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/gravitational_redshift.png-8ce20395e442f7422f4aaa0758c0c7eb.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://graphics/player/palettes/gravitational_redshift.png" -dest_files=[ "res://.import/gravitational_redshift.png-8ce20395e442f7422f4aaa0758c0c7eb.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/graphics/player/palettes/lasertag.png b/graphics/player/palettes/lasertag.png deleted file mode 100644 index 02c3e0e..0000000 Binary files a/graphics/player/palettes/lasertag.png and /dev/null differ diff --git a/graphics/player/palettes/lasertag.png.import b/graphics/player/palettes/lasertag.png.import deleted file mode 100644 index f5623aa..0000000 --- a/graphics/player/palettes/lasertag.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/lasertag.png-fe5067d58ad6ca724cdafee5ef322466.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://graphics/player/palettes/lasertag.png" -dest_files=[ "res://.import/lasertag.png-fe5067d58ad6ca724cdafee5ef322466.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/graphics/player/palettes/msx.png b/graphics/player/palettes/msx.png deleted file mode 100644 index 16e44ad..0000000 Binary files a/graphics/player/palettes/msx.png and /dev/null differ diff --git a/graphics/player/palettes/msx.png.import b/graphics/player/palettes/msx.png.import deleted file mode 100644 index 49a8b74..0000000 --- a/graphics/player/palettes/msx.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/msx.png-afd8ff86bb458e4177e0aa622ca7db04.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://graphics/player/palettes/msx.png" -dest_files=[ "res://.import/msx.png-afd8ff86bb458e4177e0aa622ca7db04.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/graphics/player/palettes/strawberry.png b/graphics/player/palettes/strawberry.png deleted file mode 100644 index 78b7496..0000000 Binary files a/graphics/player/palettes/strawberry.png and /dev/null differ diff --git a/graphics/player/palettes/strawberry.png.import b/graphics/player/palettes/strawberry.png.import deleted file mode 100644 index 220eab5..0000000 --- a/graphics/player/palettes/strawberry.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/strawberry.png-3a39f091919ee3d7a564aa066e171830.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://graphics/player/palettes/strawberry.png" -dest_files=[ "res://.import/strawberry.png-3a39f091919ee3d7a564aa066e171830.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/graphics/player/palettes/supersonic.png b/graphics/player/palettes/supersonic.png deleted file mode 100644 index 0413095..0000000 Binary files a/graphics/player/palettes/supersonic.png and /dev/null differ diff --git a/graphics/player/palettes/supersonic.png.import b/graphics/player/palettes/supersonic.png.import deleted file mode 100644 index ce67977..0000000 --- a/graphics/player/palettes/supersonic.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/supersonic.png-cf4527df1e18ff895eacc1b123a956dc.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://graphics/player/palettes/supersonic.png" -dest_files=[ "res://.import/supersonic.png-cf4527df1e18ff895eacc1b123a956dc.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/graphics/player/palettes/trans_pride.png b/graphics/player/palettes/trans_pride.png deleted file mode 100644 index df968e9..0000000 Binary files a/graphics/player/palettes/trans_pride.png and /dev/null differ diff --git a/graphics/player/palettes/trans_pride.png.import b/graphics/player/palettes/trans_pride.png.import deleted file mode 100644 index 551c867..0000000 --- a/graphics/player/palettes/trans_pride.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/trans_pride.png-671fbb28c3956d3ebdd1238761fd3b45.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://graphics/player/palettes/trans_pride.png" -dest_files=[ "res://.import/trans_pride.png-671fbb28c3956d3ebdd1238761fd3b45.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/menus/credits.tscn b/menus/credits.tscn index 346b7be..b218237 100644 --- a/menus/credits.tscn +++ b/menus/credits.tscn @@ -6,7 +6,7 @@ [ext_resource path="res://ui/2ndpuberty_outline.tres" type="Material" id=4] [ext_resource path="res://shaders/recolor_border.shader" type="Shader" id=5] [ext_resource path="res://ui/theme.tres" type="Theme" id=6] -[ext_resource path="res://graphics/player/palettes/default.png" type="Texture" id=7] +[ext_resource path="res://graphics/player/palettes/default.tex" type="Texture" id=7] [ext_resource path="res://graphics/enemy/bat.png" type="Texture" id=8] [ext_resource path="res://graphics/npc/msx_walk.png" type="Texture" id=9] [ext_resource path="res://graphics/hud/game_staff.png" type="Texture" id=10] @@ -805,6 +805,7 @@ position = Vector2( 3584, 0 ) material = SubResource( 7 ) position = Vector2( 74, 69 ) frames = SubResource( 12 ) +frame = 1 playing = true script = ExtResource( 16 ) @@ -835,6 +836,7 @@ align = 1 material = SubResource( 8 ) position = Vector2( 106, 69 ) frames = SubResource( 18 ) +frame = 2 playing = true [node name="Label" type="Label" parent="Control/RollCall1/MsX"] @@ -921,7 +923,6 @@ align = 1 material = SubResource( 13 ) position = Vector2( 2952, 24 ) frames = SubResource( 24 ) -frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall2/Catbat"] @@ -953,6 +954,7 @@ align = 1 material = SubResource( 13 ) position = Vector2( 2880, 102 ) frames = SubResource( 30 ) +frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall2/RollingFiend"] @@ -968,6 +970,7 @@ align = 1 [node name="ChipIt" type="AnimatedSprite" parent="Control/RollCall2"] position = Vector2( 2960, 62 ) frames = SubResource( 33 ) +frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall2/ChipIt"] @@ -984,6 +987,7 @@ align = 1 material = SubResource( 34 ) position = Vector2( 3024, 62 ) frames = SubResource( 43 ) +frame = 6 playing = true [node name="Label" type="Label" parent="Control/RollCall2/Skelarcher"] @@ -1016,7 +1020,6 @@ align = 1 material = SubResource( 47 ) position = Vector2( 3016, 24 ) frames = SubResource( 50 ) -frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall2/BioSlime"] @@ -1047,6 +1050,7 @@ position = Vector2( 4096, 0 ) [node name="Shedge" type="AnimatedSprite" parent="Control/RollCall3"] position = Vector2( 60, 25 ) frames = SubResource( 54 ) +frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall3/Shedge"] @@ -1062,7 +1066,6 @@ align = 1 [node name="TheScrumpsTongue" type="AnimatedSprite" parent="Control/RollCall3"] position = Vector2( 156, 20 ) frames = SubResource( 57 ) -frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall3/TheScrumpsTongue"] @@ -1108,7 +1111,7 @@ align = 1 material = SubResource( 71 ) position = Vector2( 72, 152 ) frames = SubResource( 80 ) -frame = 1 +frame = 7 playing = true [node name="Label" type="Label" parent="Control/RollCall3/Hellarcher"] @@ -1125,7 +1128,6 @@ align = 1 material = SubResource( 66 ) position = Vector2( 68, 104 ) frames = SubResource( 70 ) -frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall3/Turchin"] @@ -1155,6 +1157,7 @@ position = Vector2( 4, 0 ) z_index = 1 frames = SubResource( 61 ) animation = "chomp" +frame = 1 playing = true [node name="Border" type="AnimatedSprite" parent="Control/RollCall3/Beel/Head/Sprite"] @@ -1162,6 +1165,7 @@ material = SubResource( 62 ) z_index = -1 frames = SubResource( 61 ) animation = "chomp" +frame = 1 playing = true [node name="ShapeTransform" type="RemoteTransform2D" parent="Control/RollCall3/Beel/Head"] @@ -1312,7 +1316,7 @@ align = 1 material = SubResource( 82 ) position = Vector2( 3362, 122.5 ) frames = SubResource( 87 ) -frame = 2 +frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall4/Famicop"] diff --git a/menus/file_select_panel.tscn b/menus/file_select_panel.tscn index c655462..49cbedd 100644 --- a/menus/file_select_panel.tscn +++ b/menus/file_select_panel.tscn @@ -8,10 +8,11 @@ [ext_resource path="res://menus/file_select_panel.gd" type="Script" id=6] [ext_resource path="res://graphics/hud/deaths_head.png" type="Texture" id=7] [ext_resource path="res://graphics/player/sg_idle.png" type="Texture" id=8] -[ext_resource path="res://graphics/player/palettes/default.png" type="Texture" id=9] +[ext_resource path="res://graphics/player/palettes/default.tex" type="Texture" id=9] [ext_resource path="res://objects/enemy/death_particles.tscn" type="PackedScene" id=10] [sub_resource type="ShaderMaterial" id=1] +resource_local_to_scene = true shader = ExtResource( 1 ) shader_param/border_color = Color( 0, 0, 0, 1 ) shader_param/border_corners = true diff --git a/menus/level_select_scholar.tscn b/menus/level_select_scholar.tscn index b27dcaf..f46e34c 100644 --- a/menus/level_select_scholar.tscn +++ b/menus/level_select_scholar.tscn @@ -15,7 +15,7 @@ [ext_resource path="res://graphics/level_select/wave_particle.png" type="Texture" id=13] [ext_resource path="res://graphics/hud/levelselect_arrow.png" type="Texture" id=14] [ext_resource path="res://graphics/level_select/whirlpool.png" type="Texture" id=15] -[ext_resource path="res://graphics/player/palettes/default.png" type="Texture" id=16] +[ext_resource path="res://graphics/player/palettes/default.tex" type="Texture" id=16] [ext_resource path="res://shaders/recolor.tres" type="Shader" id=17] [sub_resource type="CanvasItemMaterial" id=9] @@ -777,9 +777,9 @@ theme = ExtResource( 4 ) [node name="PanelContainer" type="PanelContainer" parent="MenuPopup"] margin_left = 64.0 -margin_top = 67.0 +margin_top = 93.0 margin_right = 192.0 -margin_bottom = 125.0 +margin_bottom = 99.0 rect_min_size = Vector2( 128, 0 ) [node name="VBoxContainer" type="VBoxContainer" parent="MenuPopup/PanelContainer"] diff --git a/objects/hud/off_level_indicator.tscn b/objects/hud/off_level_indicator.tscn index bba10bf..ba3281e 100644 --- a/objects/hud/off_level_indicator.tscn +++ b/objects/hud/off_level_indicator.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=8 format=2] [ext_resource path="res://shaders/recolor_border.shader" type="Shader" id=1] -[ext_resource path="res://graphics/player/palettes/default.png" type="Texture" id=2] +[ext_resource path="res://graphics/player/palettes/default.tex" type="Texture" id=2] [ext_resource path="res://graphics/hud/off_level_indicator.png" type="Texture" id=3] [ext_resource path="res://graphics/hud/sg_head.png" type="Texture" id=4] [ext_resource path="res://scripts/sg_palette.gd" type="Script" id=5] diff --git a/objects/player/player.tscn b/objects/player/player.tscn index 5ad07be..de30453 100644 --- a/objects/player/player.tscn +++ b/objects/player/player.tscn @@ -1,7 +1,6 @@ -[gd_scene load_steps=43 format=2] +[gd_scene load_steps=42 format=2] [ext_resource path="res://objects/player/player.gd" type="Script" id=1] -[ext_resource path="res://graphics/player/palettes/default.png" type="Texture" id=2] [ext_resource path="res://shaders/recolor_border.shader" type="Shader" id=3] [ext_resource path="res://graphics/player/sg_idle.png" type="Texture" id=4] [ext_resource path="res://addons/godot_state_charts/parallel_state.gd" type="Script" id=5] @@ -36,7 +35,7 @@ void fragment() { [sub_resource type="ShaderMaterial" id=27] shader = SubResource( 26 ) -shader_param/palette = ExtResource( 2 ) +shader_param/palette = ExtResource( 12 ) [sub_resource type="Curve" id=13] _data = [ Vector2( 0, 1 ), 0.0, -0.0636948, 0, 0, Vector2( 1, 0 ), -3.43886, 0.0, 0, 0 ] @@ -45,7 +44,7 @@ _data = [ Vector2( 0, 1 ), 0.0, -0.0636948, 0, 0, Vector2( 1, 0 ), -3.43886, 0.0 shader = ExtResource( 3 ) shader_param/border_color = Color( 0, 0, 0, 1 ) shader_param/border_corners = true -shader_param/palette = ExtResource( 2 ) +shader_param/palette = ExtResource( 12 ) [sub_resource type="RectangleShape2D" id=2] extents = Vector2( 2.5, 5 )