From b032eea7ea480c904f8468747543562107c6688e Mon Sep 17 00:00:00 2001 From: pennyrigate Date: Fri, 8 Mar 2024 20:18:37 -0500 Subject: [PATCH] more palette stuff --- .../player/palettes/cosmological_redshift.png | Bin 0 -> 178 bytes .../palettes/cosmological_redshift.png.import | 35 ++++++++++++ .../palettes/gravitational_redshift.png | Bin 0 -> 178 bytes .../gravitational_redshift.png.import | 35 ++++++++++++ graphics/player/palettes/trans_pride.png | Bin 0 -> 186 bytes .../player/palettes/trans_pride.png.import | 35 ++++++++++++ menus/palette_select.gd | 2 +- menus/palette_select.tscn | 51 +++++++++++++----- 8 files changed, 144 insertions(+), 14 deletions(-) create mode 100644 graphics/player/palettes/cosmological_redshift.png create mode 100644 graphics/player/palettes/cosmological_redshift.png.import create mode 100644 graphics/player/palettes/gravitational_redshift.png create mode 100644 graphics/player/palettes/gravitational_redshift.png.import create mode 100644 graphics/player/palettes/trans_pride.png create mode 100644 graphics/player/palettes/trans_pride.png.import diff --git a/graphics/player/palettes/cosmological_redshift.png b/graphics/player/palettes/cosmological_redshift.png new file mode 100644 index 0000000000000000000000000000000000000000..c433e3b26655008acdd96ba204d8d38804c43d42 GIT binary patch literal 178 zcmeAS@N?(olHy`uVBq!ia0vp^EFjFm1|(O0oL2{=7>k44ofy`glX(e}Nq6*hWMJ6X z&;2Kn70Bl-@Q5sCVBp&i!i*NI!74yOcTX3`5Q*^QA6aj{{IB=B_5XkP^S|i{2|vz1 z&|LFjf4J{^`v@kE8Rs$$jn|wDOpaK)x3N)>V}{ND4g(jt-v<=tSBR~+`_i7F=!Kl$ U;u9TzfkrZTy85}Sb4q9e0I(N5rvLx| literal 0 HcmV?d00001 diff --git a/graphics/player/palettes/cosmological_redshift.png.import b/graphics/player/palettes/cosmological_redshift.png.import new file mode 100644 index 0000000..957a983 --- /dev/null +++ b/graphics/player/palettes/cosmological_redshift.png.import @@ -0,0 +1,35 @@ +[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/gravitational_redshift.png b/graphics/player/palettes/gravitational_redshift.png new file mode 100644 index 0000000000000000000000000000000000000000..fc8bae423b26f65ff03fc1622a06176afef31377 GIT binary patch literal 178 zcmeAS@N?(olHy`uVBq!ia0vp^EFjFm1|(O0oL2{=7>k44ofy`glX(e}Nq6*hWMJ6X z&;2Kn70Bl-@Q5sCVBp&i!i*NI!74yOcTX3`5Q*^QA6aj{{IB=B^}o!1^?x27p8t|I zt)l=5 T-4Q$hG?Ky7)z4*}Q$iB}hVD0s literal 0 HcmV?d00001 diff --git a/graphics/player/palettes/gravitational_redshift.png.import b/graphics/player/palettes/gravitational_redshift.png.import new file mode 100644 index 0000000..b2a3caa --- /dev/null +++ b/graphics/player/palettes/gravitational_redshift.png.import @@ -0,0 +1,35 @@ +[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/trans_pride.png b/graphics/player/palettes/trans_pride.png new file mode 100644 index 0000000000000000000000000000000000000000..df968e9828dc129c8e749c553ada880a2ba4ddcb GIT binary patch literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^EFjFm1|(O0oL2{=7>k44ofy`glX(e}Nq6*hWMJ6X z&;2Kn70Bl-@Q5sCVBp&i!i*NI!74yOe@_?35Q%U`7lz&c8D3YN{{MEtjsO3z&ifCP z`_E#|C&OUJ$;_br!jIwq|Njgu|7Th;+>w@M5M{W@!07y%k;z^{j3HEpgTbqL6~k9! ar~j;)lJ_UeNL~kOXYh3Ob6Mw<&;$TC%QUe7 literal 0 HcmV?d00001 diff --git a/graphics/player/palettes/trans_pride.png.import b/graphics/player/palettes/trans_pride.png.import new file mode 100644 index 0000000..551c867 --- /dev/null +++ b/graphics/player/palettes/trans_pride.png.import @@ -0,0 +1,35 @@ +[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/palette_select.gd b/menus/palette_select.gd index b0e11c3..7acda40 100644 --- a/menus/palette_select.gd +++ b/menus/palette_select.gd @@ -9,7 +9,7 @@ export var previous_screen: PackedScene var current_palette: int = 0 -onready var sg: TextureRect = $SG +onready var sg: AnimatedSprite = $SG func _ready() -> void: diff --git a/menus/palette_select.tscn b/menus/palette_select.tscn index 41c4b1e..75e53bc 100644 --- a/menus/palette_select.tscn +++ b/menus/palette_select.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=20 format=2] +[gd_scene load_steps=27 format=2] [ext_resource path="res://shaders/ska_plane.gdshader" type="Shader" id=1] [ext_resource path="res://ui/theme.tres" type="Theme" id=2] @@ -9,12 +9,14 @@ [ext_resource path="res://graphics/player/palettes/default.png" type="Texture" id=7] [ext_resource path="res://shaders/wibble_wobble.gdshader" type="Shader" id=8] [ext_resource path="res://graphics/hud/pause_arrow.png" type="Texture" id=9] -[ext_resource path="res://graphics/player/sg_idle.png" type="Texture" id=10] +[ext_resource path="res://graphics/player/sg.png" type="Texture" id=10] [ext_resource path="res://graphics/player/palettes/msx.png" type="Texture" id=11] [ext_resource path="res://graphics/player/palettes/lasertag.png" type="Texture" id=12] [ext_resource path="res://graphics/player/palettes/strawberry.png" type="Texture" id=13] -[ext_resource path="res://graphics/player/palettes/db32.png" type="Texture" id=14] +[ext_resource path="res://graphics/player/palettes/trans_pride.png" type="Texture" id=14] [ext_resource path="res://menus/level_select_scholar.tscn" type="PackedScene" id=15] +[ext_resource path="res://graphics/player/palettes/cosmological_redshift.png" type="Texture" id=16] +[ext_resource path="res://graphics/player/palettes/gravitational_redshift.png" type="Texture" id=17] [sub_resource type="ShaderMaterial" id=1] shader = ExtResource( 1 ) @@ -29,9 +31,33 @@ shader_param/uv_transform = Transform2D( 0.5, -0.5, 0.5, 1, 0, 0 ) [sub_resource type="ShaderMaterial" id=2] shader = ExtResource( 4 ) shader_param/border_color = Color( 0, 0, 0, 1 ) -shader_param/border_corners = false +shader_param/border_corners = true shader_param/palette = ExtResource( 7 ) +[sub_resource type="AtlasTexture" id=5] +atlas = ExtResource( 10 ) +region = Rect2( 0, 32, 32, 32 ) + +[sub_resource type="AtlasTexture" id=6] +atlas = ExtResource( 10 ) +region = Rect2( 32, 32, 32, 32 ) + +[sub_resource type="AtlasTexture" id=7] +atlas = ExtResource( 10 ) +region = Rect2( 64, 32, 32, 32 ) + +[sub_resource type="AtlasTexture" id=8] +atlas = ExtResource( 10 ) +region = Rect2( 96, 32, 32, 32 ) + +[sub_resource type="SpriteFrames" id=9] +animations = [ { +"frames": [ SubResource( 5 ), SubResource( 6 ), SubResource( 7 ), SubResource( 8 ) ], +"loop": true, +"name": "default", +"speed": 10.0 +} ] + [sub_resource type="ShaderMaterial" id=3] shader = ExtResource( 8 ) shader_param/speed = Vector2( 4, 0 ) @@ -51,8 +77,8 @@ anchor_right = 1.0 anchor_bottom = 1.0 theme = ExtResource( 2 ) script = ExtResource( 3 ) -titles = [ "Default", "Dawnbringer", "Lasertag", "Ms. X", "Strawberry" ] -palettes = [ ExtResource( 7 ), ExtResource( 14 ), ExtResource( 12 ), ExtResource( 11 ), ExtResource( 13 ) ] +titles = [ "Default", "Lasertag", "Ms. X", "Strawberry", "Trans Pride", "Cosmological Redshift", "Gravitational Redshift" ] +palettes = [ ExtResource( 7 ), ExtResource( 12 ), ExtResource( 11 ), ExtResource( 13 ), ExtResource( 14 ), ExtResource( 16 ), ExtResource( 17 ) ] previous_screen = ExtResource( 15 ) [node name="ColorRect" type="ColorRect" parent="."] @@ -68,14 +94,13 @@ text = "Choose your colors" align = 1 valign = 1 -[node name="SG" type="TextureRect" parent="."] +[node name="SG" type="AnimatedSprite" parent="."] material = SubResource( 2 ) -margin_left = 101.0 -margin_top = 112.0 -margin_right = 121.0 -margin_bottom = 132.0 -rect_scale = Vector2( 2, 2 ) -texture = ExtResource( 10 ) +position = Vector2( 128, 128 ) +scale = Vector2( 3, 3 ) +frames = SubResource( 9 ) +frame = 2 +playing = true [node name="PanelContainer" type="PanelContainer" parent="."] margin_left = 57.0