From 76b67cbe738d66e4e838c0a6fe0cf0d8cb1b94dd Mon Sep 17 00:00:00 2001
From: Tony Bark <35226681+tonytins@users.noreply.github.com>
Date: Wed, 26 May 2021 05:50:47 -0400
Subject: [PATCH] Added more news messages

- Shuffle news keys
- Brought back check if city name is named "Furtropolis" to change outlet to "FNN"
- Reduced ticker timer from 10 to 6 seconds
---
 dialog/ticker.json | 30 ++++++++++++++++++++++++++++++
 scenes/game.tscn   |  2 +-
 scripts/game.gd    |  2 +-
 scripts/ticker.gd  |  6 ++++--
 4 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/dialog/ticker.json b/dialog/ticker.json
index fae430f..27644b3 100644
--- a/dialog/ticker.json
+++ b/dialog/ticker.json
@@ -58,5 +58,35 @@
     },
     "20": {
         "text": "[outlet]: Not For The Faint Of Heart."
+    },
+    "21": {
+        "text": "[city] Tourist Bureau Launches City Beautification Project."
+    },
+    "22": {
+        "text": "Local Cop Found To Be Ticketing Only Lantern-Jawed Males."
+    },
+    "23": {
+        "text": "Tree Stuck In Cat; Firefighters Baffled."
+    },
+    "24": {
+        "text": "Weasel Rejected As [city]'s Crime-Fighting Mascot."
+    },
+    "25": {
+        "text": "Cats Demand Longer Breaks, Cleaner Litter, Slower Mice."
+    },
+    "26": {
+        "text": "Black And White Ball Disrupted By Bank Robbery."
+    },
+    "27": {
+        "text": "[outlet]: Journalistic Integrity Without All The Advertising."
+    },
+    "28": {
+        "text": "Chefs Find Broccoli Effective Tool For Cutting Cheese."
+    },
+    "29": {
+        "text": "[outlet]: No Advertisements Since Before The Beginning."
+    },
+    "30": {
+        "text": "[city] Baker Wins Pickled Crumpet Toss Three Years Running."
     }
 }
\ No newline at end of file
diff --git a/scenes/game.tscn b/scenes/game.tscn
index 235ab79..7c770f5 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 = 10.0
+wait_time = 6.0
 autostart = true
 
 [node name="Map" parent="." instance=ExtResource( 1 )]
diff --git a/scripts/game.gd b/scripts/game.gd
index 00d2009..dcfe3e5 100644
--- a/scripts/game.gd
+++ b/scripts/game.gd
@@ -6,7 +6,7 @@ onready var quarters = $Quarters
 func _ready():
 	SimEvents.connect("resume_news", self, "_resume_rotation")
 	SimEvents.connect("send_alert", self, "_stop_news")
-
+	
 func _on_Quarters_timeout():
 	SimData.year += 1
 	SimData.prev_quarter = SimData.quarter
diff --git a/scripts/ticker.gd b/scripts/ticker.gd
index f965f44..6b44753 100644
--- a/scripts/ticker.gd
+++ b/scripts/ticker.gd
@@ -11,6 +11,8 @@ func _index_news():
 	news_keys.clear()
 	for key in news:
 		news_keys.append(news[key])
+		
+	news_keys[rng.randi()%news_keys.size()] # Sbuffle Keys
 
 func _load_news():
 	var file = File.new()
@@ -42,9 +44,9 @@ func _random_news(file):
 	rng.randomize()
 	var max_mange = news_keys.size() - 1
 	var ticker_range = rng.randi_range(0, max_mange)
-	var news = news_keys[ticker_range].text
+	var news = news_keys[ticker_range].text # Shuffle News
 	
-	if SimData.has_ctower and "[outlet]" in news:
+	if SimData.has_ctower or SimData.city_name == "Furtrpolis" and "[outlet]" in news:
 		# FNN = Furtropolis/Furry News Network
 		news = news.replace("[outlet]", "FNN")
 	elif "[outlet]" in news: