From 3543c98c469930cf01b4fc22c509541a31a5e429 Mon Sep 17 00:00:00 2001 From: pennyrigate Date: Mon, 11 Mar 2024 16:13:48 -0400 Subject: [PATCH] who is elaine? --- menus/palette_select.tscn | 118 +++++++++++++++++++++++++++----------- 1 file changed, 85 insertions(+), 33 deletions(-) diff --git a/menus/palette_select.tscn b/menus/palette_select.tscn index 6431d48..12cf6c6 100644 --- a/menus/palette_select.tscn +++ b/menus/palette_select.tscn @@ -6,18 +6,24 @@ [ext_resource path="res://shaders/recolor_border.shader" type="Shader" id=4] [ext_resource path="res://ui/2ndpuberty_scholar_outline.fnt" type="BitmapFont" id=5] [ext_resource path="res://ui/2ndpuberty_outline.tres" type="Material" id=6] -[ext_resource path="res://graphics/player/palettes/default.png" type="Texture" id=7] +[ext_resource path="res://graphics/player/palettes/gravitational_redshift.tex" 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.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/trans_pride.png" type="Texture" id=14] +[ext_resource path="res://graphics/player/palettes/strawberry.tex" type="Texture" id=11] +[ext_resource path="res://graphics/player/palettes/lasertag.tex" type="Texture" id=12] +[ext_resource path="res://graphics/player/palettes/trans_pride.tex" type="Texture" id=13] +[ext_resource path="res://graphics/player/palettes/supersonic.tex" type="Texture" id=14] [ext_resource path="res://menus/level_select_scholar.tscn" type="PackedScene" id=15] +<<<<<<< HEAD [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] [ext_resource path="res://graphics/player/palettes/elaine.tex" type="Texture" id=18] +======= +[ext_resource path="res://graphics/player/palettes/cosmological_redshift.tex" type="Texture" id=16] +[ext_resource path="res://graphics/player/palettes/msx.tex" type="Texture" id=17] +[ext_resource path="res://graphics/player/palettes/default.tex" type="Texture" id=18] +>>>>>>> 9c1f521 (more palettes) [sub_resource type="ShaderMaterial" id=1] shader = ExtResource( 1 ) @@ -78,8 +84,8 @@ anchor_right = 1.0 anchor_bottom = 1.0 theme = ExtResource( 2 ) script = ExtResource( 3 ) -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 ) ] +titles = [ "Default", "Lasertag", "Ms. X", "Strawberry", "Trans Pride", "Cosmological Redshift", "Gravitational Redshift", "new" ] +palettes = [ ExtResource( 18 ), ExtResource( 12 ), ExtResource( 17 ), ExtResource( 11 ), ExtResource( 13 ), ExtResource( 16 ), ExtResource( 7 ), ExtResource( 14 ) ] previous_screen = ExtResource( 15 ) [node name="ColorRect" type="ColorRect" parent="."] @@ -87,11 +93,48 @@ material = SubResource( 1 ) anchor_right = 1.0 anchor_bottom = 1.0 -[node name="Label" type="Label" parent="."] +[node name="ChooseYourColors" type="Label" parent="."] anchor_right = 1.0 margin_bottom = 16.0 custom_fonts/font = ExtResource( 5 ) -text = "Choose your colors" +text = "Choose your palette" +align = 1 +valign = 1 + +[node name="FlavorTextParagraph" type="Label" parent="."] +anchor_right = 1.0 +margin_top = 24.0 +margin_bottom = 40.0 +custom_fonts/font = ExtResource( 5 ) +text = "Heroes from other universes may +aid in your journey, many are +waiting to help save the future." +align = 1 +valign = 1 + +[node name="InfiniteSGs" type="Label" parent="."] +anchor_right = 1.0 +margin_left = 16.0 +margin_top = 128.0 +margin_right = -168.0 +margin_bottom = 164.0 +custom_fonts/font = ExtResource( 5 ) +text = "There are +infinite +sgs" +align = 1 +valign = 1 + +[node name="InfiniteSGs2" type="Label" parent="."] +anchor_right = 1.0 +margin_left = 176.0 +margin_top = 128.0 +margin_right = -16.0 +margin_bottom = 164.0 +custom_fonts/font = ExtResource( 5 ) +text = "but also +infinite +famis" align = 1 valign = 1 @@ -100,52 +143,61 @@ material = SubResource( 2 ) 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 -margin_top = 63.0 -margin_right = 200.0 -margin_bottom = 98.0 +[node name="CenterContainer" type="CenterContainer" parent="."] +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_top = 8.0 +margin_bottom = -24.0 +__meta__ = { +"_edit_lock_": true +} -[node name="HBoxContainer" type="HBoxContainer" parent="PanelContainer"] +[node name="PanelContainer" type="PanelContainer" parent="CenterContainer"] +margin_left = 60.0 +margin_top = 63.0 +margin_right = 195.0 +margin_bottom = 96.0 +rect_min_size = Vector2( 135, 33 ) + +[node name="HBoxContainer" type="HBoxContainer" parent="CenterContainer/PanelContainer"] margin_left = 3.0 margin_top = 3.0 -margin_right = 140.0 -margin_bottom = 32.0 +margin_right = 132.0 +margin_bottom = 30.0 theme = ExtResource( 2 ) alignment = 1 -[node name="BackArrow" type="TextureRect" parent="PanelContainer/HBoxContainer"] +[node name="BackArrow" type="TextureRect" parent="CenterContainer/PanelContainer/HBoxContainer"] unique_name_in_owner = true material = SubResource( 3 ) -margin_left = 34.0 -margin_top = 10.0 -margin_right = 40.0 -margin_bottom = 18.0 +margin_left = 30.0 +margin_top = 9.0 +margin_right = 36.0 +margin_bottom = 17.0 size_flags_vertical = 4 texture = ExtResource( 9 ) flip_h = true -[node name="PaletteTitle" type="Label" parent="PanelContainer/HBoxContainer"] +[node name="PaletteTitle" type="Label" parent="CenterContainer/PanelContainer/HBoxContainer"] unique_name_in_owner = true material = ExtResource( 6 ) -margin_left = 44.0 -margin_top = 9.0 -margin_right = 93.0 -margin_bottom = 19.0 +margin_left = 40.0 +margin_top = 8.0 +margin_right = 89.0 +margin_bottom = 18.0 theme = ExtResource( 2 ) text = "Default" align = 1 valign = 1 -[node name="ForwardArrow" type="TextureRect" parent="PanelContainer/HBoxContainer"] +[node name="ForwardArrow" type="TextureRect" parent="CenterContainer/PanelContainer/HBoxContainer"] unique_name_in_owner = true material = SubResource( 4 ) -margin_left = 97.0 -margin_top = 10.0 -margin_right = 103.0 -margin_bottom = 18.0 +margin_left = 93.0 +margin_top = 9.0 +margin_right = 99.0 +margin_bottom = 17.0 size_flags_vertical = 4 texture = ExtResource( 9 )