From 0be15a7d675724e1fa987659ac1877e27653390f Mon Sep 17 00:00:00 2001 From: Anthony Foxclaw <35226681+tonytins@users.noreply.github.com> Date: Sun, 12 Apr 2020 21:39:01 -0400 Subject: [PATCH] Renamed to Skyscraper Rising - Resized window to a 800px width - Turned tower label into a button so it can be used to adjust varies aspects of the gameplay. e.g. budget, ect... - Moved welcome label, tower name edit and create button into a vbox container and embedded it's script into there. - Added news ticker to the bottom --- README.md | 6 +- project/project.godot | 3 +- project/src/autoload/gamedata.gd | 2 +- project/src/gui.gd | 10 +- project/src/gui.tscn | 240 +++++++++++++++++-------------- project/src/newgame.gd | 4 +- project/src/titlescreen.tscn | 41 +++--- 7 files changed, 170 insertions(+), 136 deletions(-) diff --git a/README.md b/README.md index 8157bf2..d31e5bd 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -# Elecoms Tower (working title) +# Skyscraper Rising (working title) -Elecoms Tower is a SimTower-inspired sandbox simulation game made in Godot. In it, you've tasked to build the next regional HQ for Elecoms Corp. You've been given creative liberty over the design as long you assign offices to them. +Skyscraper Rising is a SimTower-inspired sandbox simulation game made in Godot. In it, you've tasked to build the next regional HQ for Elecoms Corp. You've been given creative liberty over the design as long you assign offices to them. ## Authors - **Anthony Foxclaw** - _Initial work_ - [tonytins](https://github.com/tonytins) -See also the list of [contributors](https://github.com/tonytins/ElecomsTower/contributors) who participated in this project. +See also the list of [contributors](https://github.com/tonytins/SkyscraperRising/contributors) who participated in this project. ## License diff --git a/project/project.godot b/project/project.godot index b8399db..591a19a 100644 --- a/project/project.godot +++ b/project/project.godot @@ -15,7 +15,7 @@ _global_script_class_icons={ [application] -config/name="Elecoms Tower" +config/name="Skyscraper Rising" run/main_scene="res://src/titlescreen.tscn" config/icon="res://icon.png" @@ -25,6 +25,7 @@ GameData="*res://src/autoload/gamedata.gd" [display] +window/size/width=800 window/stretch/mode="2d" window/stretch/aspect="keep" diff --git a/project/src/autoload/gamedata.gd b/project/src/autoload/gamedata.gd index 66a6d54..5b6284b 100644 --- a/project/src/autoload/gamedata.gd +++ b/project/src/autoload/gamedata.gd @@ -1,6 +1,6 @@ extends Node -var tower_name: String +var tower_name: String = "Elecoms HQ." var budget: int = 2000000 var year: int = 1 var prev_quarter: int diff --git a/project/src/gui.gd b/project/src/gui.gd index 34a3ef2..ae82b92 100644 --- a/project/src/gui.gd +++ b/project/src/gui.gd @@ -1,17 +1,15 @@ -extends Control - +extends MarginContainer func _ready(): $GPanel/GameStatus/MoneyLbl.text = str(GameData.budget) $GPanel/GameStatus/YearNumLbl.text = str(GameData.year) $GPanel/GameStatus/QuaterNumLbl.text = str(GameData.quarter) - $GPanel/GameMenus/NameLbl.text = GameData.tower_name - $WelcomeDlg.show() + $GPanel/GameMenus/NameBtn.text = GameData.tower_name func _process(delta): $GPanel/GameStatus/MoneyLbl.text = str(GameData.budget) $GPanel/GameStatus/YearNumLbl.text = str(GameData.year) $GPanel/GameStatus/QuaterNumLbl.text = str(GameData.quarter) -func _on_WelcomeDlg_confirmed(): - $WelcomeDlg.hide() +func _on_NameBtn_pressed(): + pass # Replace with function body. diff --git a/project/src/gui.tscn b/project/src/gui.tscn index 0e2020b..b99d2b1 100644 --- a/project/src/gui.tscn +++ b/project/src/gui.tscn @@ -5,117 +5,10 @@ [node name="GUI" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 -script = ExtResource( 1 ) __meta__ = { "_edit_use_anchors_": false } -[node name="GPanel" type="Panel" parent="."] -anchor_right = 1.0 -margin_bottom = 23.0 -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="GameMenus" type="HBoxContainer" parent="GPanel"] -anchor_top = 0.5 -anchor_bottom = 0.5 -margin_left = 3.0 -margin_top = -10.0 -margin_right = 166.0 -margin_bottom = 10.0 -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="NameLbl" type="Label" parent="GPanel/GameMenus"] -margin_top = 3.0 -margin_right = 9.0 -margin_bottom = 17.0 -text = "#" - -[node name="GameSpeed" type="MenuButton" parent="GPanel/GameMenus"] -margin_left = 13.0 -margin_right = 106.0 -margin_bottom = 20.0 -text = "Game Speed" -items = [ "Slow", null, 0, false, false, 0, 0, null, "", false, "Medium", null, 0, false, false, 1, 0, null, "", false, "Fast", null, 0, false, false, 2, 0, null, "", false ] - -[node name="Disasters" type="MenuButton" parent="GPanel/GameMenus"] -margin_left = 110.0 -margin_right = 182.0 -margin_bottom = 20.0 -text = "Disasters" - -[node name="GameStatus" type="HBoxContainer" parent="GPanel"] -anchor_left = 1.0 -anchor_top = 0.5 -anchor_right = 1.0 -anchor_bottom = 0.5 -margin_left = -276.0 -margin_top = -9.5 -margin_right = -4.0 -margin_bottom = 10.5 -alignment = 2 -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="YearLbl" type="Label" parent="GPanel/GameStatus"] -margin_left = 193.0 -margin_top = 3.0 -margin_right = 200.0 -margin_bottom = 17.0 -text = "Y" - -[node name="YearNumLbl" type="Label" parent="GPanel/GameStatus"] -margin_left = 204.0 -margin_top = 3.0 -margin_right = 212.0 -margin_bottom = 17.0 -text = "1" - -[node name="QuaterLbl" type="Label" parent="GPanel/GameStatus"] -margin_left = 216.0 -margin_top = 3.0 -margin_right = 227.0 -margin_bottom = 17.0 -text = "Q" - -[node name="QuaterNumLbl" type="Label" parent="GPanel/GameStatus"] -margin_left = 231.0 -margin_top = 3.0 -margin_right = 239.0 -margin_bottom = 17.0 -text = "1" - -[node name="VSeparator" type="VSeparator" parent="GPanel/GameStatus"] -margin_left = 243.0 -margin_right = 247.0 -margin_bottom = 20.0 - -[node name="CurrencyLbl" type="Label" parent="GPanel/GameStatus"] -margin_left = 251.0 -margin_top = 3.0 -margin_right = 259.0 -margin_bottom = 17.0 -text = "$" - -[node name="MoneyLbl" type="Label" parent="GPanel/GameStatus"] -margin_left = 263.0 -margin_top = 3.0 -margin_right = 272.0 -margin_bottom = 17.0 -text = "#" - -[node name="DebugBtn" type="Button" parent="GPanel"] -visible = false -margin_left = 932.754 -margin_top = 563.202 -margin_right = 985.754 -margin_bottom = 583.202 -text = "Debug" - [node name="WelcomeDlg" type="AcceptDialog" parent="."] pause_mode = 2 anchor_left = 0.5 @@ -142,4 +35,137 @@ text = "Elecoms Corp. has invited you to build their next regional HQ. You've be __meta__ = { "_edit_use_anchors_": false } + +[node name="GPanelContainer" type="MarginContainer" parent="."] +anchor_right = 1.0 +margin_bottom = 20.0 +script = ExtResource( 1 ) +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="GPanel" type="Panel" parent="GPanelContainer"] +margin_right = 800.0 +margin_bottom = 20.0 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="GameMenus" type="HBoxContainer" parent="GPanelContainer/GPanel"] +margin_left = 3.0 +margin_right = 197.0 +margin_bottom = 20.0 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="NameBtn" type="Button" parent="GPanelContainer/GPanel/GameMenus"] +margin_right = 21.0 +margin_bottom = 20.0 +text = "#" +flat = true + +[node name="GameSpeed" type="MenuButton" parent="GPanelContainer/GPanel/GameMenus"] +margin_left = 25.0 +margin_right = 118.0 +margin_bottom = 20.0 +text = "Game Speed" +items = [ "Slow", null, 0, false, false, 0, 0, null, "", false, "Medium", null, 0, false, false, 1, 0, null, "", false, "Fast", null, 0, false, false, 2, 0, null, "", false ] + +[node name="Disasters" type="MenuButton" parent="GPanelContainer/GPanel/GameMenus"] +margin_left = 122.0 +margin_right = 194.0 +margin_bottom = 20.0 +text = "Disasters" + +[node name="GameStatus" type="HBoxContainer" parent="GPanelContainer/GPanel"] +anchor_left = 1.0 +anchor_right = 1.0 +margin_left = -196.0 +margin_right = -2.0 +margin_bottom = 20.0 +alignment = 2 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="PopLbl" type="Label" parent="GPanelContainer/GPanel/GameStatus"] +margin_left = 76.0 +margin_top = 3.0 +margin_right = 104.0 +margin_bottom = 17.0 +text = "Pop:" + +[node name="PopNumLbl" type="Label" parent="GPanelContainer/GPanel/GameStatus"] +margin_left = 108.0 +margin_top = 3.0 +margin_right = 117.0 +margin_bottom = 17.0 +text = "#" + +[node name="YearLbl" type="Label" parent="GPanelContainer/GPanel/GameStatus"] +margin_left = 121.0 +margin_top = 3.0 +margin_right = 128.0 +margin_bottom = 17.0 +text = "Y" + +[node name="YearNumLbl" type="Label" parent="GPanelContainer/GPanel/GameStatus"] +margin_left = 132.0 +margin_top = 3.0 +margin_right = 141.0 +margin_bottom = 17.0 +text = "#" + +[node name="QuaterLbl" type="Label" parent="GPanelContainer/GPanel/GameStatus"] +margin_left = 145.0 +margin_top = 3.0 +margin_right = 156.0 +margin_bottom = 17.0 +text = "Q" + +[node name="QuaterNumLbl" type="Label" parent="GPanelContainer/GPanel/GameStatus"] +margin_left = 160.0 +margin_top = 3.0 +margin_right = 169.0 +margin_bottom = 17.0 +text = "#" + +[node name="CurrencyLbl" type="Label" parent="GPanelContainer/GPanel/GameStatus"] +margin_left = 173.0 +margin_top = 3.0 +margin_right = 181.0 +margin_bottom = 17.0 +text = "$" + +[node name="MoneyLbl" type="Label" parent="GPanelContainer/GPanel/GameStatus"] +margin_left = 185.0 +margin_top = 3.0 +margin_right = 194.0 +margin_bottom = 17.0 +text = "#" + +[node name="TickerContainer" type="MarginContainer" parent="."] +anchor_top = 1.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_top = -21.0 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="TickerPanel" type="Panel" parent="TickerContainer"] +margin_right = 800.0 +margin_bottom = 21.0 + +[node name="NewTickerLbl" type="Label" parent="TickerContainer/TickerPanel"] +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_top = 3.0 +text = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer id efficitur dui. Aliquam non aliquam sapien. Nulla. " +align = 1 +__meta__ = { +"_edit_use_anchors_": false +} [connection signal="confirmed" from="WelcomeDlg" to="." method="_on_WelcomeDlg_confirmed"] +[connection signal="pressed" from="GPanelContainer/GPanel/GameMenus/NameBtn" to="." method="_on_NameBtn_pressed"] diff --git a/project/src/newgame.gd b/project/src/newgame.gd index 9ec52b2..689ec06 100644 --- a/project/src/newgame.gd +++ b/project/src/newgame.gd @@ -1,7 +1,7 @@ -extends Control +extends VBoxContainer func _on_CreateBtn_pressed(): - var tower_name = $TwrNameEdit.text + var tower_name = $NameEdit.text GameData.tower_name = tower_name get_tree().change_scene("res://src/world.tscn") diff --git a/project/src/titlescreen.tscn b/project/src/titlescreen.tscn index 2aa2a8b..695c4fc 100644 --- a/project/src/titlescreen.tscn +++ b/project/src/titlescreen.tscn @@ -5,37 +5,46 @@ [node name="SartMenu" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="WelcomeVbox" type="VBoxContainer" parent="."] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -156.0 +margin_top = -48.0 +margin_right = 156.0 +margin_bottom = 24.0 script = ExtResource( 1 ) __meta__ = { "_edit_use_anchors_": false } -[node name="Label" type="Label" parent="."] -margin_left = 339.0 -margin_top = 235.0 -margin_right = 628.0 -margin_bottom = 249.0 +[node name="WelcomeLbl" type="Label" parent="WelcomeVbox"] +margin_right = 312.0 +margin_bottom = 14.0 text = "Welcome to Elecoms Tower!" align = 1 -[node name="TwrNameEdit" type="LineEdit" parent="."] -margin_left = 339.0 -margin_top = 261.0 -margin_right = 628.0 -margin_bottom = 285.0 +[node name="NameEdit" type="LineEdit" parent="WelcomeVbox"] +margin_top = 18.0 +margin_right = 312.0 +margin_bottom = 42.0 text = "Elecoms HQ" align = 1 __meta__ = { "_edit_use_anchors_": false } -[node name="CreateBtn" type="Button" parent="."] -margin_left = 339.0 -margin_top = 291.0 -margin_right = 628.0 -margin_bottom = 311.0 +[node name="CreateBtn" type="Button" parent="WelcomeVbox"] +margin_top = 46.0 +margin_right = 312.0 +margin_bottom = 66.0 text = "Create" __meta__ = { "_edit_use_anchors_": false } -[connection signal="pressed" from="CreateBtn" to="." method="_on_CreateBtn_pressed"] +[connection signal="pressed" from="WelcomeVbox/CreateBtn" to="WelcomeVbox" method="_on_CreateBtn_pressed"]