From 49a1186115e8d2133eb1f1b8bae9b97d266a3c4a Mon Sep 17 00:00:00 2001 From: Tony Bark <35226681+tonytins@users.noreply.github.com> Date: Fri, 21 May 2021 00:25:37 -0400 Subject: [PATCH] Reduced starting budget - Redid money cheat code - Reduced starting budget to 20k now that the money cheat codes can handle any additional income --- README.md | 4 ++-- project.godot | 3 ++- scripts/autoload/sim_data.gd | 2 +- scripts/command_handler.gd | 25 +++++++++++++++++++++---- scripts/core_gui.gd | 4 ---- 5 files changed, 26 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 4882738..bf8675a 100644 --- a/README.md +++ b/README.md @@ -2,13 +2,13 @@ ![Screenshot](screenshot.png) -City Limits is a reimagining of SimCity Classic that contains features and concepts from later iterations. Such as advisors, free zones, news tickers, neighboring cities, and so on. +City Limits is a re-imagining of SimCity Classic that contains features and concepts from later games. Such as advisors, free zones, news tickers, neighboring cities, and so on. Though it shares a lot of core gameplay and style, it's not compatible with Micropolis. ## Getting Started ### Prerequisites -- Godot Engine 3.1 +- Godot Engine 3.x ## Authors diff --git a/project.godot b/project.godot index d38f13f..3dbd3a8 100644 --- a/project.godot +++ b/project.godot @@ -39,7 +39,8 @@ enabled=PoolStringArray( ) ui_cheats={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":96,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":true,"control":false,"meta":true,"command":true,"pressed":false,"scancode":67,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":true,"command":true,"pressed":false,"scancode":88,"unicode":0,"echo":false,"script":null) ] } diff --git a/scripts/autoload/sim_data.gd b/scripts/autoload/sim_data.gd index 4fa4cba..8ba9196 100644 --- a/scripts/autoload/sim_data.gd +++ b/scripts/autoload/sim_data.gd @@ -7,7 +7,7 @@ var prev_quarter: int var quarter: int = 1 var population: int = 0 var news_ticker: String -var budget: int = 10000000 +var budget: int = 20000 var prev_budget: int var power_grid: int diff --git a/scripts/command_handler.gd b/scripts/command_handler.gd index f8cc484..b928c29 100644 --- a/scripts/command_handler.gd +++ b/scripts/command_handler.gd @@ -8,14 +8,31 @@ enum { } const valid_commands = [ - ["money", [ARG_INT] ], - ["whereyoufrom", [ARG_STRING] ] + ["money", [ARG_STRING] ], + ["whereyoufrom", [ARG_STRING] ], + ["whatyearisit", [ARG_STRING] ] ] +func _budget_print(value: int): + return "Budget increased to " + str(value) + func money(value): - SimData.budget += int(value) - return "Budget changed to " + str(value) + var motherlode = 50000 + var rosebud = 1000 + if value == "motherlode": + SimData.budget += motherlode + return _budget_print(motherlode) + + if value == "rosebud": + SimData.budget += rosebud + return _budget_print(rosebud) + + return "" func whereyoufrom(value): SimData.city_name = str(value) return "Changed city name to: " + str(value) + +func whatyearisit(value): + SimData.year = int(value) + return "Change year to: " + str(value) diff --git a/scripts/core_gui.gd b/scripts/core_gui.gd index d9dd5f3..165895c 100644 --- a/scripts/core_gui.gd +++ b/scripts/core_gui.gd @@ -2,10 +2,6 @@ extends Control onready var debug_console = $Console onready var advisor = $AdvsiorNotice -# onready var news_ticker = $TickerPanel/ScrollContainer - -func _ready(): - advisor.show() func _process(delta): if Input.is_action_pressed("ui_cheats"):