tonytins/citylimits
1
0
Fork 0
mirror of https://github.com/tonytins/citylimits.git synced 2025-03-22 07:22:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed some redundant code

Browse source 
- Change month and day within debug console
- Removed get_week() in SimData
This commit is contained in:
Tony Bark 2021-05-27 22:31:40 -04:00
parent 622eea364e
commit ae1b600928
3 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/autoload/sim_data.gd
View file

@ -14,6 +14,7 @@ var month: int = 1
var prev_month: int var prev_month: int
var day: int = 1 var day: int = 1
var prev_day: int var prev_day: int
var last_total_days: int
var total_days: int = 1 var total_days: int = 1
var power_grid: int # Number of power stations in the area. Helps provide redundancies. var power_grid: int # Number of power stations in the area. Helps provide redundancies.
@ -79,9 +80,6 @@ enum Ordinances {
TIRE_RECYCLE TIRE_RECYCLE
} }
func get_week():
return (10 + total_days - day) / 7
#func starting_budget(lev = Level.EASY): #func starting_budget(lev = Level.EASY):
# match lev: # match lev:
# Level.EASY: # Level.EASY:

10
scripts/command_handler.gd
View file

@ -11,9 +11,17 @@ const valid_commands = [
["money", [ARG_STRING] ], ["money", [ARG_STRING] ],
["whereyoufrom", [ARG_STRING] ], ["whereyoufrom", [ARG_STRING] ],
["whatyearisit", [ARG_STRING] ], ["whatyearisit", [ARG_STRING] ],
["show_policy", [ARG_INT]] ["show_policy", [ARG_INT]],
["set_month", [ARG_INT]],
["set_year", [ARG_INT]]
] ]
func set_month(month):
SimData.month = month
func set_year(year):
SimData.year = year
func show_policy(policy): func show_policy(policy):
SimEvents.emit_signal("policy_message", policy) SimEvents.emit_signal("policy_message", policy)

12
scripts/game.gd
View file

@ -17,23 +17,29 @@ func _resume_rotation():
func _on_DayCycle_timeout(): func _on_DayCycle_timeout():
if SimData.prev_month < 12:
SimData.last_total_days = SimData.total_days
SimData.total_days += 1
# Increment the number days until it reaches 30
if SimData.prev_day < 30: if SimData.prev_day < 30:
SimData.prev_day = SimData.day
SimData.day += 1 SimData.day += 1
# Reset the number of days to 1 on day 30 and increment the month
if SimData.prev_day == 30: if SimData.prev_day == 30:
SimData.prev_day = SimData.day
SimData.day = 1 SimData.day = 1
SimData.prev_month = SimData.month SimData.prev_month = SimData.month
SimData.month += 1 SimData.month += 1
SimEvents.emit_signal("budget") SimEvents.emit_signal("budget")
# Increment the year on the 12th month
if SimData.prev_month == 12: if SimData.prev_month == 12:
SimData.prev_year = SimData.year SimData.prev_year = SimData.year
SimData.total_days = 1 SimData.total_days = 1
SimData.month = 1 SimData.month = 1
SimData.year += 1 SimData.year += 1
SimData.last_total_days = SimData.total_days
SimData.prev_day = SimData.day SimData.prev_day = SimData.day
func _on_TurtleBtn_toggled(button_pressed): func _on_TurtleBtn_toggled(button_pressed):