Add background panel

outfrost · Apr 27, 2021 · 49a5dfa · 49a5dfa
1 parent e52ba48
commit 49a5dfa
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/environment/props/TableWide1.tscn b/environment/props/TableWide1.tscn
@@ -1,10 +1,9 @@
-[gd_scene load_steps=10 format=2]
+[gd_scene load_steps=9 format=2]
 
 [ext_resource path="res://environment/props/desk.png" type="Texture" id=1]
 [ext_resource path="res://game/menu/InventoryButton.tscn" type="PackedScene" id=2]
 [ext_resource path="res://game/ui-theme/ui_theme.tres" type="Theme" id=3]
 [ext_resource path="res://game/ui-theme/font_large.tres" type="DynamicFont" id=4]
-[ext_resource path="res://game/ui-theme/panel_style_transparent.tres" type="StyleBox" id=5]
 [ext_resource path="res://game/ui-theme/oinventoryitembackground.png" type="Texture" id=6]
 [ext_resource path="res://environment/props/CraftingTable.gd" type="Script" id=7]
 
@@ -45,7 +44,6 @@ margin_bottom = 200.0
 grow_horizontal = 2
 grow_vertical = 2
 theme = ExtResource( 3 )
-custom_styles/panel = ExtResource( 5 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
@@ -220,6 +218,8 @@ __meta__ = {
 anchor_right = 1.0
 margin_bottom = 80.0
 custom_fonts/font = ExtResource( 4 )
+custom_colors/font_color = Color( 0, 0, 0, 1 )
+custom_colors/font_color_shadow = Color( 0, 0, 0, 0 )
 text = "Choose a recipe to craft"
 align = 1
 valign = 1
@@ -233,6 +233,8 @@ margin_left = 300.0
 margin_top = 150.0
 margin_right = 510.0
 margin_bottom = 180.0
+custom_colors/font_color = Color( 0, 0, 0, 1 )
+custom_colors/font_color_shadow = Color( 0, 0, 0, 0 )
 text = "Test"
 align = 1
 valign = 1
diff --git a/environment/props/TableWide2.tscn b/environment/props/TableWide2.tscn
@@ -1,10 +1,9 @@
-[gd_scene load_steps=10 format=2]
+[gd_scene load_steps=9 format=2]
 
 [ext_resource path="res://environment/props/table.png" type="Texture" id=1]
 [ext_resource path="res://environment/props/ResearchTable.gd" type="Script" id=2]
 [ext_resource path="res://game/ui-theme/ui_theme.tres" type="Theme" id=3]
 [ext_resource path="res://game/menu/InventoryButton.tscn" type="PackedScene" id=4]
-[ext_resource path="res://game/ui-theme/panel_style_transparent.tres" type="StyleBox" id=5]
 [ext_resource path="res://game/ui-theme/font_large.tres" type="DynamicFont" id=6]
 [ext_resource path="res://game/ui-theme/oinventoryitembackground.png" type="Texture" id=7]
 
@@ -45,7 +44,6 @@ margin_bottom = 200.0
 grow_horizontal = 2
 grow_vertical = 2
 theme = ExtResource( 3 )
-custom_styles/panel = ExtResource( 5 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
@@ -187,6 +185,8 @@ __meta__ = {
 anchor_right = 1.0
 margin_bottom = 80.0
 custom_fonts/font = ExtResource( 6 )
+custom_colors/font_color = Color( 0, 0, 0, 1 )
+custom_colors/font_color_shadow = Color( 0, 0, 0, 0 )
 text = "Choose an item to research"
 align = 1
 valign = 1

diff --git a/game/menu/MainMenu.tscn b/game/menu/MainMenu.tscn
@@ -36,7 +36,7 @@ margin_top = -64.0
 margin_right = 512.0
 margin_bottom = -8.0
 grow_vertical = 0
-text = "v0.1.3"
+text = "v0.1.4"
 valign = 2
 __meta__ = {
 "_edit_use_anchors_": false

diff --git a/game/ui-theme/ui_theme.tres b/game/ui-theme/ui_theme.tres
@@ -1,15 +1,23 @@
-[gd_resource type="Theme" load_steps=10 format=2]
+[gd_resource type="Theme" load_steps=11 format=2]
 
 [ext_resource path="res://game/ui-theme/button_style_empty.tres" type="StyleBox" id=1]
 [ext_resource path="res://game/ui-theme/button_style_pressed.tres" type="StyleBox" id=2]
 [ext_resource path="res://game/ui-theme/font_default.tres" type="DynamicFont" id=3]
 [ext_resource path="res://game/ui-theme/progress_bar_fg.tres" type="StyleBox" id=4]
 [ext_resource path="res://game/ui-theme/progress_bar_bg.tres" type="StyleBox" id=5]
 [ext_resource path="res://game/ui-theme/button_style_base.tres" type="StyleBox" id=6]
-[ext_resource path="res://game/ui-theme/panel_style_base.tres" type="StyleBox" id=7]
+[ext_resource path="res://game/ui-theme/text.png" type="Texture" id=7]
 [ext_resource path="res://game/ui-theme/panel_style_popup.tres" type="StyleBox" id=8]
 [ext_resource path="res://game/ui-theme/font_tiny.tres" type="DynamicFont" id=9]
 
+[sub_resource type="StyleBoxTexture" id=1]
+texture = ExtResource( 7 )
+region_rect = Rect2( 10, 94, 32, 32 )
+margin_left = 6.0
+margin_right = 6.0
+margin_top = 6.0
+margin_bottom = 6.0
+
 [resource]
 default_font = ExtResource( 3 )
 Button/colors/font_color = Color( 1, 1, 1, 1 )
@@ -223,7 +231,7 @@ OptionButton/styles/focus = null
 OptionButton/styles/hover = null
 OptionButton/styles/normal = null
 OptionButton/styles/pressed = null
-Panel/styles/panel = ExtResource( 7 )
+Panel/styles/panel = SubResource( 1 )
 PanelContainer/styles/panel = null
 PopupDialog/styles/panel = null
 PopupMenu/colors/font_color = Color( 0, 0, 0, 1 )