diff --git a/project/assets/office.tscn b/project/assets/office.tscn index 317c4f6..9b685f0 100644 --- a/project/assets/office.tscn +++ b/project/assets/office.tscn @@ -36,5 +36,5 @@ script = ExtResource( 1 ) [node name="RoomAnime" type="AnimatedSprite" parent="."] frames = SubResource( 1 ) animation = "v1" -frame = 2 +frame = 4 playing = true diff --git a/project/project.godot b/project/project.godot index 7215fef..bda5e97 100644 --- a/project/project.godot +++ b/project/project.godot @@ -22,6 +22,7 @@ config/icon="res://start.png" [autoload] GameData="*res://src/autoload/gamedata.gd" +GameEvent="*res://src/autoload/gameevent.gd" [display] diff --git a/project/src/autoload/gamedata.gd b/project/src/autoload/gamedata.gd index f8aefca..d03d1ad 100644 --- a/project/src/autoload/gamedata.gd +++ b/project/src/autoload/gamedata.gd @@ -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 diff --git a/project/src/autoload/gameevent.gd b/project/src/autoload/gameevent.gd new file mode 100644 index 0000000..010b39d --- /dev/null +++ b/project/src/autoload/gameevent.gd @@ -0,0 +1,5 @@ +extends Node + +signal quarter_income +signal one_time_income +signal pay_expense diff --git a/project/src/room.gd b/project/src/room.gd index a62c095..3a336da 100644 --- a/project/src/room.gd +++ b/project/src/room.gd @@ -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: diff --git a/project/src/world.gd b/project/src/world.gd index 4a8083e..77b27e9 100644 --- a/project/src/world.gd +++ b/project/src/world.gd @@ -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