diff --git a/.import/Blue_Square.png-ae535163e31b183d7b98f1e9b7ee13d3.stex b/.import/Blue_Square.png-ae535163e31b183d7b98f1e9b7ee13d3.stex deleted file mode 100644 index 370a967..0000000 Binary files a/.import/Blue_Square.png-ae535163e31b183d7b98f1e9b7ee13d3.stex and /dev/null differ diff --git a/.import/Gray_Square.png-d5ad6972cdab444707cd2d5ce5bcfd25.stex b/.import/Gray_Square.png-d5ad6972cdab444707cd2d5ce5bcfd25.stex deleted file mode 100644 index cee8663..0000000 Binary files a/.import/Gray_Square.png-d5ad6972cdab444707cd2d5ce5bcfd25.stex and /dev/null differ diff --git a/.import/Red_Square.png-770b8c2c1fe78febcf1c5cf3528e08fe.stex b/.import/Red_Square.png-770b8c2c1fe78febcf1c5cf3528e08fe.stex deleted file mode 100644 index ff606b4..0000000 Binary files a/.import/Red_Square.png-770b8c2c1fe78febcf1c5cf3528e08fe.stex and /dev/null differ diff --git a/.import/collapse-arrow.svg-72c7f945ce755a8cc53756e519f437b7.stex b/.import/collapse-arrow.svg-72c7f945ce755a8cc53756e519f437b7.stex deleted file mode 100644 index f914fd1..0000000 Binary files a/.import/collapse-arrow.svg-72c7f945ce755a8cc53756e519f437b7.stex and /dev/null differ diff --git a/.import/expand-arrow.svg-9aa23b22d64732fef59bcdc40100a283.stex b/.import/expand-arrow.svg-9aa23b22d64732fef59bcdc40100a283.stex deleted file mode 100644 index 0ae1bf2..0000000 Binary files a/.import/expand-arrow.svg-9aa23b22d64732fef59bcdc40100a283.stex and /dev/null differ diff --git a/Assets/Blue_Square.png b/Assets/Blue_Square.png deleted file mode 100644 index ca77a3b..0000000 Binary files a/Assets/Blue_Square.png and /dev/null differ diff --git a/Assets/Blue_Square.png.import b/Assets/Blue_Square.png.import deleted file mode 100644 index 5a879c0..0000000 --- a/Assets/Blue_Square.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/Blue_Square.png-ae535163e31b183d7b98f1e9b7ee13d3.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Assets/Blue_Square.png" -dest_files=[ "res://.import/Blue_Square.png-ae535163e31b183d7b98f1e9b7ee13d3.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=2.0 diff --git a/Assets/Gray_Square.png b/Assets/Gray_Square.png deleted file mode 100644 index 98f876e..0000000 Binary files a/Assets/Gray_Square.png and /dev/null differ diff --git a/Assets/Red_Square.png b/Assets/Red_Square.png deleted file mode 100644 index 931381d..0000000 Binary files a/Assets/Red_Square.png and /dev/null differ diff --git a/Assets/blue-square.svg b/Assets/blue-square.svg new file mode 100644 index 0000000..0f00ebc --- /dev/null +++ b/Assets/blue-square.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/Assets/Gray_Square.png.import b/Assets/blue-square.svg.import similarity index 69% rename from Assets/Gray_Square.png.import rename to Assets/blue-square.svg.import index af337ef..d3c5da8 100644 --- a/Assets/Gray_Square.png.import +++ b/Assets/blue-square.svg.import @@ -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] diff --git a/Assets/collapse-arrow.svg b/Assets/collapse-arrow.svg deleted file mode 100644 index ee15cbc..0000000 --- a/Assets/collapse-arrow.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/Assets/expand-arrow.svg b/Assets/expand-arrow.svg deleted file mode 100644 index f598047..0000000 --- a/Assets/expand-arrow.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/Assets/neutral-circle.svg b/Assets/neutral-circle.svg new file mode 100644 index 0000000..32bf995 --- /dev/null +++ b/Assets/neutral-circle.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/Assets/collapse-arrow.svg.import b/Assets/neutral-circle.svg.import similarity index 68% rename from Assets/collapse-arrow.svg.import rename to Assets/neutral-circle.svg.import index 097ec1b..bc036a8 100644 --- a/Assets/collapse-arrow.svg.import +++ b/Assets/neutral-circle.svg.import @@ -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] diff --git a/Assets/red-pentagon-3.svg.import b/Assets/red-pentagon-3.svg.import new file mode 100644 index 0000000..c5968d4 --- /dev/null +++ b/Assets/red-pentagon-3.svg.import @@ -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 diff --git a/Assets/red-pentagon.svg b/Assets/red-pentagon.svg new file mode 100644 index 0000000..b3d6add --- /dev/null +++ b/Assets/red-pentagon.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/Assets/expand-arrow.svg.import b/Assets/red-pentagon.svg.import similarity index 69% rename from Assets/expand-arrow.svg.import rename to Assets/red-pentagon.svg.import index 7d780ce..9b09d05 100644 --- a/Assets/expand-arrow.svg.import +++ b/Assets/red-pentagon.svg.import @@ -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] diff --git a/Assets/reinforcements.svg b/Assets/reinforcements.svg new file mode 100644 index 0000000..e07494a --- /dev/null +++ b/Assets/reinforcements.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/Assets/reinforcements.svg.import b/Assets/reinforcements.svg.import new file mode 100644 index 0000000..d6d7a0a --- /dev/null +++ b/Assets/reinforcements.svg.import @@ -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 diff --git a/Assets/soldier-army.svg b/Assets/soldier-army.svg new file mode 100644 index 0000000..1e57d00 --- /dev/null +++ b/Assets/soldier-army.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Assets/Red_Square.png.import b/Assets/soldier-army.svg.import similarity index 69% rename from Assets/Red_Square.png.import rename to Assets/soldier-army.svg.import index 94b92b2..d10a1a0 100644 --- a/Assets/Red_Square.png.import +++ b/Assets/soldier-army.svg.import @@ -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] diff --git a/Scenes/Levels/Level Components/Country.tscn b/Scenes/Levels/Level Components/Country.tscn index 88a71a6..b0863cb 100644 --- a/Scenes/Levels/Level Components/Country.tscn +++ b/Scenes/Levels/Level Components/Country.tscn @@ -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 @@ -40,16 +37,28 @@ __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 @@ -57,3 +66,5 @@ valign = 1 __meta__ = { "_edit_use_anchors_": false } + +[node name="Tween" type="Tween" parent="."] diff --git a/Scenes/Levels/Level Components/Player.tscn b/Scenes/Levels/Level Components/Player.tscn index 42ed3dc..abb2e0f 100644 --- a/Scenes/Levels/Level Components/Player.tscn +++ b/Scenes/Levels/Level Components/Player.tscn @@ -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 -} diff --git a/Scenes/Levels/Level Main.tscn b/Scenes/Levels/Level Main.tscn index 6866f0e..0473e6b 100644 --- a/Scenes/Levels/Level Main.tscn +++ b/Scenes/Levels/Level Main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=20 format=2] +[gd_scene load_steps=22 format=2] [ext_resource path="res://Assets/Our World.png" type="Texture" id=1] [ext_resource path="res://Scripts/Levels/Level Main.gd" type="Script" id=2] @@ -10,24 +10,23 @@ [ext_resource path="res://Assets/Fonts/Font_50.tres" type="DynamicFont" id=8] [ext_resource path="res://Assets/zoom-out-line.svg" type="Texture" id=9] [ext_resource path="res://Assets/zoom-in-line.svg" type="Texture" id=10] -[ext_resource path="res://Assets/expand-arrow.svg" type="Texture" id=11] -[ext_resource path="res://Assets/collapse-arrow.svg" type="Texture" id=12] +[ext_resource path="res://Assets/red-pentagon.svg" type="Texture" id=11] [ext_resource path="res://Assets/label_background.tres" type="StyleBox" id=13] [ext_resource path="res://Assets/Parallax Background.png" type="Texture" id=14] [ext_resource path="res://Assets/Lose.svg" type="Texture" id=15] [ext_resource path="res://Assets/Win.svg" type="Texture" id=16] [ext_resource path="res://Assets/black-flag.svg" type="Texture" id=17] +[ext_resource path="res://Assets/reinforcements.svg" type="Texture" id=18] +[ext_resource path="res://Assets/soldier-army.svg" type="Texture" id=19] +[ext_resource path="res://Assets/blue-square.svg" type="Texture" id=21] +[ext_resource path="res://Assets/Fonts/Font_100.tres" type="DynamicFont" id=22] [sub_resource type="DynamicFont" id=1] size = 50 font_data = ExtResource( 7 ) -[sub_resource type="DynamicFont" id=2] -size = 50 -font_data = ExtResource( 7 ) - [node name="Level 1" type="Node2D"] -position = Vector2( 122.348, 0 ) +position = Vector2( 0.347961, 1 ) script = ExtResource( 2 ) [node name="CanvasLayer" type="CanvasLayer" parent="."] @@ -50,9 +49,10 @@ position = Vector2( 0, 513 ) [node name="End Attack" type="Button" parent="CanvasLayer"] visible = false -anchor_left = 0.0637231 -anchor_right = 0.149661 -anchor_bottom = 0.0351852 +anchor_left = 0.000181421 +anchor_top = 0.000925926 +anchor_right = 0.0861193 +anchor_bottom = 0.0361111 margin_left = -0.348328 margin_right = 124.652 margin_bottom = 30.0 @@ -64,8 +64,10 @@ __meta__ = { [node name="End Reinforcement" type="Button" parent="CanvasLayer"] visible = false -anchor_left = 0.0637231 -anchor_right = 0.0637231 +anchor_left = 0.000181421 +anchor_top = 0.000925926 +anchor_right = 0.000181452 +anchor_bottom = 0.000925926 margin_left = 289.652 margin_right = 791.652 margin_bottom = 68.0 @@ -75,16 +77,169 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Player and Round Tracker" type="Label" parent="CanvasLayer"] -margin_top = 119.0 -margin_right = 40.0 -margin_bottom = 181.0 -custom_styles/normal = ExtResource( 13 ) -custom_fonts/font = SubResource( 2 ) +[node name="Game Info" type="VBoxContainer" parent="CanvasLayer"] +margin_top = 1016.0 +margin_right = 3840.0 +margin_bottom = 1144.0 +rect_scale = Vector2( 0.5, 0.5 ) +alignment = 1 __meta__ = { "_edit_use_anchors_": false } +[node name="HBoxContainer" type="HBoxContainer" parent="CanvasLayer/Game Info"] +margin_right = 3840.0 +margin_bottom = 128.0 +alignment = 1 + +[node name="Curr Player" type="TextureRect" parent="CanvasLayer/Game Info/HBoxContainer"] +margin_left = 862.0 +margin_right = 990.0 +margin_bottom = 128.0 +rect_min_size = Vector2( 128, 128 ) +texture = ExtResource( 21 ) +stretch_mode = 1 + +[node name="Round" type="Label" parent="CanvasLayer/Game Info/HBoxContainer"] +margin_left = 994.0 +margin_top = 2.0 +margin_right = 1383.0 +margin_bottom = 125.0 +custom_fonts/font = ExtResource( 22 ) +text = "round 2" + +[node name="TextureRect2" type="TextureRect" parent="CanvasLayer/Game Info/HBoxContainer"] +modulate = Color( 0, 0, 0, 0 ) +margin_left = 1387.0 +margin_right = 1510.0 +margin_bottom = 128.0 +texture = ExtResource( 18 ) + +[node name="Blue" type="HBoxContainer" parent="CanvasLayer/Game Info/HBoxContainer"] +margin_left = 1514.0 +margin_right = 2180.0 +margin_bottom = 128.0 + +[node name="Container" type="HBoxContainer" parent="CanvasLayer/Game Info/HBoxContainer/Blue"] +margin_right = 110.0 +margin_bottom = 128.0 + +[node name="TextureRect4" type="TextureRect" parent="CanvasLayer/Game Info/HBoxContainer/Blue/Container"] +margin_right = 110.0 +margin_bottom = 128.0 +rect_min_size = Vector2( 110, 110 ) +texture = ExtResource( 21 ) +stretch_mode = 1 + +[node name="TextureRect" type="TextureRect" parent="CanvasLayer/Game Info/HBoxContainer/Blue"] +margin_left = 114.0 +margin_right = 236.0 +margin_bottom = 128.0 +texture = ExtResource( 19 ) + +[node name="Units" type="Label" parent="CanvasLayer/Game Info/HBoxContainer/Blue"] +margin_left = 240.0 +margin_top = 2.0 +margin_right = 297.0 +margin_bottom = 125.0 +size_flags_horizontal = 3 +custom_fonts/font = ExtResource( 22 ) +text = "2" + +[node name="TextureRect2" type="TextureRect" parent="CanvasLayer/Game Info/HBoxContainer/Blue"] +margin_left = 301.0 +margin_right = 424.0 +margin_bottom = 128.0 +texture = ExtResource( 18 ) + +[node name="Reinforcements" type="Label" parent="CanvasLayer/Game Info/HBoxContainer/Blue"] +margin_left = 428.0 +margin_top = 2.0 +margin_right = 485.0 +margin_bottom = 125.0 +size_flags_horizontal = 3 +custom_fonts/font = ExtResource( 22 ) +text = "2" + +[node name="TextureRect3" type="TextureRect" parent="CanvasLayer/Game Info/HBoxContainer/Blue"] +margin_left = 489.0 +margin_right = 605.0 +margin_bottom = 128.0 +texture = ExtResource( 17 ) + +[node name="Countries" type="Label" parent="CanvasLayer/Game Info/HBoxContainer/Blue"] +margin_left = 609.0 +margin_top = 2.0 +margin_right = 666.0 +margin_bottom = 125.0 +size_flags_horizontal = 3 +custom_fonts/font = ExtResource( 22 ) +text = "2" + +[node name="TextureRect" type="TextureRect" parent="CanvasLayer/Game Info/HBoxContainer"] +modulate = Color( 0, 0, 0, 0 ) +margin_left = 2184.0 +margin_right = 2307.0 +margin_bottom = 128.0 +texture = ExtResource( 18 ) + +[node name="Red" type="HBoxContainer" parent="CanvasLayer/Game Info/HBoxContainer"] +margin_left = 2311.0 +margin_right = 2977.0 +margin_bottom = 128.0 + +[node name="TextureRect4" type="TextureRect" parent="CanvasLayer/Game Info/HBoxContainer/Red"] +margin_right = 110.0 +margin_bottom = 128.0 +rect_min_size = Vector2( 110, 110 ) +texture = ExtResource( 11 ) +stretch_mode = 1 + +[node name="TextureRect" type="TextureRect" parent="CanvasLayer/Game Info/HBoxContainer/Red"] +margin_left = 114.0 +margin_right = 236.0 +margin_bottom = 128.0 +texture = ExtResource( 19 ) + +[node name="Units" type="Label" parent="CanvasLayer/Game Info/HBoxContainer/Red"] +margin_left = 240.0 +margin_top = 2.0 +margin_right = 297.0 +margin_bottom = 125.0 +size_flags_horizontal = 3 +custom_fonts/font = ExtResource( 22 ) +text = "2" + +[node name="TextureRect2" type="TextureRect" parent="CanvasLayer/Game Info/HBoxContainer/Red"] +margin_left = 301.0 +margin_right = 424.0 +margin_bottom = 128.0 +texture = ExtResource( 18 ) + +[node name="Reinforcements" type="Label" parent="CanvasLayer/Game Info/HBoxContainer/Red"] +margin_left = 428.0 +margin_top = 2.0 +margin_right = 485.0 +margin_bottom = 125.0 +size_flags_horizontal = 3 +custom_fonts/font = ExtResource( 22 ) +text = "2" + +[node name="TextureRect3" type="TextureRect" parent="CanvasLayer/Game Info/HBoxContainer/Red"] +margin_left = 489.0 +margin_right = 605.0 +margin_bottom = 128.0 +texture = ExtResource( 17 ) + +[node name="Countries" type="Label" parent="CanvasLayer/Game Info/HBoxContainer/Red"] +margin_left = 609.0 +margin_top = 2.0 +margin_right = 666.0 +margin_bottom = 125.0 +size_flags_horizontal = 3 +custom_fonts/font = ExtResource( 22 ) +text = "2" + [node name="Zoom Out" type="TextureButton" parent="CanvasLayer"] anchor_left = -5.46773e-05 anchor_top = -9.73172e-05 @@ -113,24 +268,14 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Toggle Info" type="TextureButton" parent="CanvasLayer"] -margin_right = 40.0 -margin_bottom = 40.0 -toggle_mode = true -texture_normal = ExtResource( 12 ) -texture_pressed = ExtResource( 11 ) -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="Resign" type="TextureButton" parent="CanvasLayer"] -visible = false -margin_left = 1791.0 -margin_top = 400.0 -margin_right = 1913.0 -margin_bottom = 522.0 +[node name="Resign" type="Button" parent="CanvasLayer"] +margin_left = 1739.63 +margin_top = 68.0 +margin_right = 1922.63 +margin_bottom = 136.0 +custom_fonts/font = ExtResource( 8 ) toggle_mode = true -texture_normal = ExtResource( 17 ) +text = "Resign" __meta__ = { "_edit_use_anchors_": false } @@ -317,6 +462,7 @@ centered = false scroll_limit_end = Vector2( 0, 1080 ) [node name="ParallaxLayer" type="ParallaxLayer" parent="ParallaxBackground"] +visible = false motion_mirroring = Vector2( 1920, 1080 ) [node name="Sprite" type="Sprite" parent="ParallaxBackground/ParallaxLayer"] diff --git a/Scripts/Levels/Level Components/Country.gd b/Scripts/Levels/Level Components/Country.gd index b54c777..4298e49 100644 --- a/Scripts/Levels/Level Components/Country.gd +++ b/Scripts/Levels/Level Components/Country.gd @@ -5,6 +5,7 @@ var belongs_to = null var connected_countries = [] var country_name = null var Game_Manager = null + # This is so during reinforcement the label can show up as # {num_troops} + {num_reinforcements} var num_reinforcements: int = 0 @@ -29,6 +30,19 @@ func save(): save_dict["connections"].append(country.country_name) return save_dict +var colors = {"blue": load("res://Assets/blue-square.svg"), + "red": load("res://Assets/red-pentagon.svg"), + "gray": load("res://Assets/neutral-circle.svg")} + +func change_color_to(color): + get_node("Sprite").texture = colors[color] + get_node("Reinforcements/Sprite").texture = colors[color] + +# Called when the node enters the scene tree for the first time. +func _ready(): + Game_Manager = get_parent() + change_color_to(belongs_to.color) + func change_ownership_to(player): # Transfer of Ownership belongs_to.owned_countries.erase(self) @@ -36,17 +50,19 @@ func change_ownership_to(player): player.owned_countries.append(self) # Visual Update - player.update_labels() - get_node("Sprite").change_color_to(player.color) + if Game_Manager: + Game_Manager.update_labels() + change_color_to(player.color) func update_labels(): get_node("Units").text = str(num_troops) if num_reinforcements > 0: get_node("Reinforcements").visible = true - get_node("Reinforcements").text = "+" + str(num_reinforcements) + get_node("Reinforcements/Label").text = "+" + str(num_reinforcements) else: get_node("Reinforcements").visible = false - belongs_to.update_labels() + if Game_Manager: + Game_Manager.update_labels() func flash_attackable_neighbours(player): for country in connected_countries: @@ -192,7 +208,7 @@ func on_click(event): Game_Manager.curr_player.num_reinforcements += 1 update_labels() - Game_Manager.curr_player.update_labels() + Game_Manager.update_labels() pass "game over": @@ -227,12 +243,6 @@ func init(_x, _y, _country_name, player): update_labels() return self -# Called when the node enters the scene tree for the first time. -func _ready(): - Game_Manager = get_parent() - - - func stop_flashing(): if flash_mask_sprite != null: flash_mask_sprite.visible = false diff --git a/Scripts/Levels/Level Components/Player.gd b/Scripts/Levels/Level Components/Player.gd index af5c457..65972f5 100644 --- a/Scripts/Levels/Level Components/Player.gd +++ b/Scripts/Levels/Level Components/Player.gd @@ -32,25 +32,3 @@ func get_num_reinforcements(): func give_reinforcements(): num_reinforcements = get_num_reinforcements() - update_labels() - -func update_labels(): - var player_name = "Player: " - if network_id != null: - if network_id == 1: - player_name = "Host: " - else: - player_name = "Guest: " - get_node("Label").text = player_name + color + \ - "\nUnits: " + str(get_num_troops()) + \ - "\nReinforcements: " + str(num_reinforcements) + "/" + str(get_num_reinforcements()) + \ - "\nNumber of Countries: " + str(len(owned_countries)) - -# Called when the node enters the scene tree for the first time. -func _ready(): - update_labels() - - -# Called every frame. 'delta' is the elapsed time since the previous frame. -#func _process(delta): -# pass diff --git a/Scripts/Levels/Level Components/Sprite.gd b/Scripts/Levels/Level Components/Sprite.gd index aa95320..af6a9ab 100644 --- a/Scripts/Levels/Level Components/Sprite.gd +++ b/Scripts/Levels/Level Components/Sprite.gd @@ -1,11 +1,10 @@ extends Sprite -var colors = {"blue": load("res://Assets/Blue_Square.png"), - "red": load("res://Assets/Red_Square.png"), - "gray": load("res://Assets/Gray_Square.png")} +var colors = {"blue": load("res://Assets/blue-square.svg"), + "red": load("res://Assets/red-pentagon-3.svg"), + "gray": load("res://Assets/neutral-circle.svg")} func change_color_to(color): - print(color) texture = colors[color] # Called when the node enters the scene tree for the first time. diff --git a/Scripts/Levels/Level Main.gd b/Scripts/Levels/Level Main.gd index b448744..9653761 100644 --- a/Scripts/Levels/Level Main.gd +++ b/Scripts/Levels/Level Main.gd @@ -4,6 +4,10 @@ onready var _root: Main = get_tree().get_root().get_node("Main") var input_allowed = true +var colors = {"blue": load("res://Assets/blue-square.svg"), + "red": load("res://Assets/red-pentagon.svg"), + "gray": load("res://Assets/neutral-circle.svg")} + func stop_flashing(): for country in all_countries.values(): country.stop_flashing() @@ -66,15 +70,13 @@ func spawn_and_allocate(): country.update_labels() print("The first player is " + curr_player.color) + print(curr_player.color) update_labels() # Called when the node enters the scene tree for the first time. func _ready(): spawn_and_allocate() - # Button to toggle showing player and round info - get_node("CanvasLayer/Toggle Info").connect("pressed", self, "toggle_info_visibility") - # Buttons to zoom in and out get_node("CanvasLayer/Zoom In").connect("pressed", get_node("Camera2D"), "zoom_in") get_node("CanvasLayer/Zoom Out").connect("pressed", get_node("Camera2D"), "zoom_out") @@ -131,11 +133,6 @@ func show_help_menu(): _root.scene_manager.save_and_hide_current_scene() _root.add_child(scene) -func toggle_info_visibility(): - get_node("CanvasLayer/Player and Round Tracker").visible = !get_node("CanvasLayer/Player and Round Tracker").visible - for player in players.values(): - player.get_node("Label").visible = !player.get_node("Label").visible - # Button Removal and Hiding Functions ####### # This relies on an assumption that this funciton is only called in offline games @@ -196,6 +193,7 @@ func reroll_spawn(): for player in players.values(): if player.color == "gray": continue player.reset() + curr_player = null for country in all_countries.values(): country.change_ownership_to(players["gray"]) country.randomise_troops() @@ -260,7 +258,7 @@ func add_random_countries(player, num_countries): if country.belongs_to.color == "gray" and not is_country_neighbour_of_player(country, get_next_player()): country.change_ownership_to(player) num_added_countries += 1 - player.update_labels() + update_labels() func is_attack_over(): for country in curr_player.owned_countries: @@ -333,8 +331,24 @@ remote func end_game(loser_color): rpc_id(players[winner_color].network_id , "end_game", loser_color) func update_labels(): - get_node("CanvasLayer/Player and Round Tracker").text = "Current Player: " +\ - curr_player.color + "\nRound: " + str(round_number) + # Update Red labels + get_node("CanvasLayer/Game Info/HBoxContainer/Red/Reinforcements").text = \ + str(players["red"].num_reinforcements) + "/" + str(players["red"].get_num_reinforcements()) + get_node("CanvasLayer/Game Info/HBoxContainer/Red/Units").text = str(players["red"].get_num_troops()) + get_node("CanvasLayer/Game Info/HBoxContainer/Red/Countries").text = str(len(players["red"].owned_countries)) + + # Update Blue labels + get_node("CanvasLayer/Game Info/HBoxContainer/Blue/Reinforcements").text = \ + str(players["blue"].num_reinforcements) + "/" + str(players["blue"].get_num_reinforcements()) + get_node("CanvasLayer/Game Info/HBoxContainer/Blue/Units").text = str(players["blue"].get_num_troops()) + get_node("CanvasLayer/Game Info/HBoxContainer/Blue/Countries").text = str(len(players["blue"].owned_countries)) + + # Update Round info + get_node("CanvasLayer/Game Info/HBoxContainer/Round").text = "Round: " + str(round_number) + var curr_texture = colors["gray"] + if curr_player: + curr_texture = colors[curr_player.color] + get_node("CanvasLayer/Game Info/HBoxContainer/Curr Player").texture = curr_texture func _input(event): if event.is_pressed() and input_allowed: @@ -373,7 +387,6 @@ remote func synchronise_player(player_info): var curr_player = players[player_info["color"]] curr_player.network_id = player_info["network_id"] curr_player.num_reinforcements = player_info["num_reinforcements"] - curr_player.update_labels() remote func synchronise_meta_info(_curr_player_index, _round_number, _game_started): game_started = _game_started