From cc4747ab65509669d619ddd0a25796447d4f4265 Mon Sep 17 00:00:00 2001 From: Tony Bark <35226681+tonytins@users.noreply.github.com> Date: Wed, 26 May 2021 04:24:08 -0400 Subject: [PATCH] FNN and Central Tower If the Central Tower is present, change Pawprint Press to FNN. --- dialog/ticker.json | 20 +++++++++++++++++++- scenes/game.tscn | 2 +- scripts/autoload/sim_data.gd | 1 + scripts/ticker.gd | 6 ++++-- 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dialog/ticker.json b/dialog/ticker.json index 84d7d79..fae430f 100644 --- a/dialog/ticker.json +++ b/dialog/ticker.json @@ -9,7 +9,7 @@ "text": "All Raccoons Cheat At Poker, Animal Researchers Say." }, "4": { - "text": "[outlet]. Always there." + "text": "[outlet]: Don't Blame Us If You're Not Paying Attention" }, "5": { "text": "Cat Hijacks Municipal Bus; Riders Applaud Good Timing At Stops And Courteous Meows." @@ -40,5 +40,23 @@ }, "14": { "text": "This Space For Rent." + }, + "15": { + "text": "Crime Lord Spotted In [city]; Mayor Says \"No Comment\"." + }, + "16": { + "text": "Cat Burglar Spotted, Mistaken For Dalmatian." + }, + "17": { + "text": "[outlet]: Information With As Few Words As Possible." + }, + "18": { + "text": "[city] Phonebooks Print All Wrong Numbers; Results In 15 New Marriages." + }, + "19": { + "text": "[outlet]: Properly Spelled Words From Beginning To End." + }, + "20": { + "text": "[outlet]: Not For The Faint Of Heart." } } \ No newline at end of file diff --git a/scenes/game.tscn b/scenes/game.tscn index 7800980..235ab79 100644 --- a/scenes/game.tscn +++ b/scenes/game.tscn @@ -46,7 +46,7 @@ wait_time = 150.0 autostart = true [node name="RotateNews" type="Timer" parent="."] -wait_time = 5.0 +wait_time = 10.0 autostart = true [node name="Map" parent="." instance=ExtResource( 1 )] diff --git a/scripts/autoload/sim_data.gd b/scripts/autoload/sim_data.gd index 8faf872..b89b542 100644 --- a/scripts/autoload/sim_data.gd +++ b/scripts/autoload/sim_data.gd @@ -9,6 +9,7 @@ var population: int = 0 var budget: int = 20000 var expenses: int var is_alert: bool = false +var has_ctower: bool = false # Central Tower const currency: String = "ยง" diff --git a/scripts/ticker.gd b/scripts/ticker.gd index 94ab5c9..f965f44 100644 --- a/scripts/ticker.gd +++ b/scripts/ticker.gd @@ -20,6 +20,8 @@ func _load_news(): return dialogue func _ready(): + SimData.city_name = SimData.city_name.capitalize() + SimData.mayor_name = SimData.mayor_name.capitalize() SimEvents.connect("send_alert", self, "_start_alert") SimEvents.connect("resume_news", self, "_resume_ticker") _random_news("res://dialog/ticker.json") @@ -42,8 +44,8 @@ func _random_news(file): var ticker_range = rng.randi_range(0, max_mange) var news = news_keys[ticker_range].text - if SimData.city_name == "Furtropolis" and "[outlet]" in news: - # FNN = Furtropolis News Network + if SimData.has_ctower and "[outlet]" in news: + # FNN = Furtropolis/Furry News Network news = news.replace("[outlet]", "FNN") elif "[outlet]" in news: news = news.replace("[outlet]", "Pawprint Press")