Skip to content

Commit

Permalink
Big UI overhaul
Browse files Browse the repository at this point in the history
Removed big info menu on left. Symbolic bar on the bottom that conveys all that info. Country icons are changed to different polygons to represent shape. This is still color blind friendly and the markings no longer obstruct the text. Reinforcement now shows up as the same shape as the country's polygon.
  • Loading branch information
ra314 committed Sep 12, 2021
1 parent 9f83cd0 commit 2fed8c6
Show file tree
Hide file tree
Showing 29 changed files with 386 additions and 165 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed Assets/Blue_Square.png
Binary file not shown.
34 changes: 0 additions & 34 deletions Assets/Blue_Square.png.import

This file was deleted.

Binary file removed Assets/Gray_Square.png
Binary file not shown.
Binary file removed Assets/Red_Square.png
Binary file not shown.
10 changes: 10 additions & 0 deletions Assets/blue-square.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/Gray_Square.png-d5ad6972cdab444707cd2d5ce5bcfd25.stex"
path="res://.import/blue-square.svg-b5f89414f3fa8dd49701b4e6f92d0a18.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Gray_Square.png"
dest_files=[ "res://.import/Gray_Square.png-d5ad6972cdab444707cd2d5ce5bcfd25.stex" ]
source_file="res://Assets/blue-square.svg"
dest_files=[ "res://.import/blue-square.svg-b5f89414f3fa8dd49701b4e6f92d0a18.stex" ]

[params]

Expand Down
1 change: 0 additions & 1 deletion Assets/collapse-arrow.svg

This file was deleted.

1 change: 0 additions & 1 deletion Assets/expand-arrow.svg

This file was deleted.

10 changes: 10 additions & 0 deletions Assets/neutral-circle.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/collapse-arrow.svg-72c7f945ce755a8cc53756e519f437b7.stex"
path="res://.import/neutral-circle.svg-859f043d8623e1f1ed54d84c7d672c2d.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/collapse-arrow.svg"
dest_files=[ "res://.import/collapse-arrow.svg-72c7f945ce755a8cc53756e519f437b7.stex" ]
source_file="res://Assets/neutral-circle.svg"
dest_files=[ "res://.import/neutral-circle.svg-859f043d8623e1f1ed54d84c7d672c2d.stex" ]

[params]

Expand Down
34 changes: 34 additions & 0 deletions Assets/red-pentagon-3.svg.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/red-pentagon-3.svg-2bd1014f4dae891be0b88dc7b61af3af.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/red-pentagon-3.svg"
dest_files=[ "res://.import/red-pentagon-3.svg-2bd1014f4dae891be0b88dc7b61af3af.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=true
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
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
10 changes: 10 additions & 0 deletions Assets/red-pentagon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/expand-arrow.svg-9aa23b22d64732fef59bcdc40100a283.stex"
path="res://.import/red-pentagon.svg-6e00fef1df886c3a02532cf20c3b397c.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/expand-arrow.svg"
dest_files=[ "res://.import/expand-arrow.svg-9aa23b22d64732fef59bcdc40100a283.stex" ]
source_file="res://Assets/red-pentagon.svg"
dest_files=[ "res://.import/red-pentagon.svg-6e00fef1df886c3a02532cf20c3b397c.stex" ]

[params]

Expand Down
16 changes: 16 additions & 0 deletions Assets/reinforcements.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions Assets/reinforcements.svg.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/reinforcements.svg-cb07e6a3989fc100310a2e8a3afd85b1.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/reinforcements.svg"
dest_files=[ "res://.import/reinforcements.svg-cb07e6a3989fc100310a2e8a3afd85b1.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=true
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
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
1 change: 1 addition & 0 deletions Assets/soldier-army.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/Red_Square.png-770b8c2c1fe78febcf1c5cf3528e08fe.stex"
path="res://.import/soldier-army.svg-0c9eb4463b45cc836b29f42da086e47a.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Red_Square.png"
dest_files=[ "res://.import/Red_Square.png-770b8c2c1fe78febcf1c5cf3528e08fe.stex" ]
source_file="res://Assets/soldier-army.svg"
dest_files=[ "res://.import/soldier-army.svg-0c9eb4463b45cc836b29f42da086e47a.stex" ]

[params]

Expand Down
43 changes: 27 additions & 16 deletions Scenes/Levels/Level Components/Country.tscn
Original file line number Diff line number Diff line change
@@ -1,35 +1,32 @@
[gd_scene load_steps=9 format=2]
[gd_scene load_steps=7 format=2]

[ext_resource path="res://Scripts/Levels/Level Components/Country.gd" type="Script" id=1]
[ext_resource path="res://Assets/Blue_Square.png" type="Texture" id=2]
[ext_resource path="res://Scripts/Levels/Level Components/Sprite.gd" type="Script" id=3]
[ext_resource path="res://Assets/red-pentagon-3.svg" type="Texture" id=2]
[ext_resource path="res://Assets/Montserrat-Regular.ttf" type="DynamicFontData" id=4]
[ext_resource path="res://Assets/label_background.tres" type="StyleBox" id=5]

[sub_resource type="DynamicFont" id=1]
size = 25
font_data = ExtResource( 4 )

[sub_resource type="RectangleShape2D" id=2]
extents = Vector2( 16.0538, 16.1497 )
extents = Vector2( 24, 24 )

[sub_resource type="DynamicFont" id=3]
size = 25
font_data = ExtResource( 4 )

[node name="Country" type="Area2D"]
position = Vector2( 107.645, 36.941 )
z_index = 5
script = ExtResource( 1 )

[node name="Sprite" type="Sprite" parent="."]
scale = Vector2( 0.75, 0.75 )
texture = ExtResource( 2 )
centered = false
script = ExtResource( 3 )

[node name="Units" type="Label" parent="."]
margin_right = 32.0
margin_bottom = 32.0
margin_right = 48.0
margin_bottom = 48.0
custom_fonts/font = SubResource( 1 )
text = "12"
align = 1
Expand All @@ -40,20 +37,34 @@ __meta__ = {
}

[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2( 16, 16 )
position = Vector2( 24, 24 )
shape = SubResource( 2 )

[node name="Tween" type="Tween" parent="."]
[node name="Reinforcements" type="Control" parent="."]
margin_right = 40.0
margin_bottom = 40.0
__meta__ = {
"_edit_use_anchors_": false
}

[node name="Reinforcements" type="Label" parent="."]
margin_top = 32.0
margin_right = 32.0
margin_bottom = 64.0
custom_styles/normal = ExtResource( 5 )
[node name="Sprite" type="Sprite" parent="Reinforcements"]
modulate = Color( 0, 0, 0, 1 )
position = Vector2( 0, 48 )
scale = Vector2( 0.75, 0.75 )
texture = ExtResource( 2 )
centered = false
flip_v = true

[node name="Label" type="Label" parent="Reinforcements"]
margin_top = 48.0
margin_right = 48.0
margin_bottom = 96.0
custom_fonts/font = SubResource( 3 )
text = "1"
align = 1
valign = 1
__meta__ = {
"_edit_use_anchors_": false
}

[node name="Tween" type="Tween" parent="."]
17 changes: 1 addition & 16 deletions Scenes/Levels/Level Components/Player.tscn
Original file line number Diff line number Diff line change
@@ -1,21 +1,6 @@
[gd_scene load_steps=5 format=2]
[gd_scene load_steps=2 format=2]

[ext_resource path="res://Scripts/Levels/Level Components/Player.gd" type="Script" id=1]
[ext_resource path="res://Assets/Montserrat-Regular.ttf" type="DynamicFontData" id=2]
[ext_resource path="res://Assets/label_background.tres" type="StyleBox" id=3]

[sub_resource type="DynamicFont" id=1]
size = 50
font_data = ExtResource( 2 )

[node name="Player" type="Node2D"]
script = ExtResource( 1 )

[node name="Label" type="Label" parent="."]
margin_right = 40.0
margin_bottom = 14.0
custom_styles/normal = ExtResource( 3 )
custom_fonts/font = SubResource( 1 )
__meta__ = {
"_edit_use_anchors_": false
}
Loading

0 comments on commit 2fed8c6

Please sign in to comment.