Moved signals to GameEvent loader

This commit is contained in:
Anthony Foxclaw 2020-04-13 02:08:17 -04:00
parent d13622dd1b
commit 0431e0f0b6
6 changed files with 14 additions and 12 deletions

View file

@ -36,5 +36,5 @@ script = ExtResource( 1 )
[node name="RoomAnime" type="AnimatedSprite" parent="."]
frames = SubResource( 1 )
animation = "v1"
frame = 2
frame = 4
playing = true

View file

@ -22,6 +22,7 @@ config/icon="res://start.png"
[autoload]
GameData="*res://src/autoload/gamedata.gd"
GameEvent="*res://src/autoload/gameevent.gd"
[display]

View file

@ -6,10 +6,6 @@ var year: int = 1
var prev_quarter: int
var quarter: int = 1
var population: int = 0
var news: String
var news_ticker: String
enum GameSpeed { SLOW, MEDIUM, FAST }
signal quarter_income
signal one_time_income
signal pay_expense

View file

@ -0,0 +1,5 @@
extends Node
signal quarter_income
signal one_time_income
signal pay_expense

View file

@ -20,9 +20,9 @@ var num_of_tenants: int = 0
func _ready():
GameData.connect("quarter_income", self, "_get_quarter_income")
GameData.connect("one_time_income", self, "_get_one_time_income")
GameData.connect("pay_expense", self, "_get_expense")
GameEvent.connect("quarter_income", self, "_get_quarter_income")
GameEvent.connect("one_time_income", self, "_get_one_time_income")
GameEvent.connect("pay_expense", self, "_get_expense")
# Once placed in-world, it'll substract from your budget
if GameData.budget >= room_cost:

View file

@ -5,10 +5,10 @@ func _on_Quarters_timeout():
if GameData.prev_quarter == 4:
GameData.quarter = 1
GameData.year += 1
GameData.emit_signal("one_time_income")
GameData.emit_signal("pay_expense")
GameEvent.emit_signal("one_time_income")
GameEvent.emit_signal("pay_expense")
else:
GameData.emit_signal("quarter_income")
GameEvent.emit_signal("quarter_income")
GameData.quarter += 1
GameData.prev_quarter = GameData.quarter