From 5de5a0c3159a4c06687c437c35d2e6d33b3250a5 Mon Sep 17 00:00:00 2001
From: Tony Bark <35226681+tonytins@users.noreply.github.com>
Date: Mon, 8 Aug 2022 18:29:56 -0400
Subject: [PATCH] [Broken] Removed news branding

- Ticker files are no longer baked into the game
- Removed secondary outlet
- News window uses outlet name from Json name
- Lowered maximum amount of news items
---
 assets/ticker/fnn.png                  | Bin 1807 -> 0 bytes
 assets/ticker/fnn.png.import           |  35 ---------------------
 json/ticker/README.md                  |  20 ++++++++++--
 json/ticker/{meta.json => config.json} |   6 ++--
 project.godot                          |   1 -
 scenes/game.tscn                       |  33 +++++--------------
 scripts/ticker.gd                      |  42 +++++++++----------------
 7 files changed, 42 insertions(+), 95 deletions(-)
 delete mode 100644 assets/ticker/fnn.png
 delete mode 100644 assets/ticker/fnn.png.import
 rename json/ticker/{meta.json => config.json} (61%)

diff --git a/assets/ticker/fnn.png b/assets/ticker/fnn.png
deleted file mode 100644
index 27d2e74170bfe71a666f281272871c63c4f26dd6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1807
zcmeAS@N?(olHy`uVBq!ia0vp^?m(=<!3-qd@Lj(Nq*&4&eH|GXHuiJ>Nn{1`6_P!I
zd>I(3)EF2VS{N990fib~Fff!FFfhDIU|_JC!N4G1FlSew4FdyHP=HT}D^S4;bKOxi
z8Uj=af&c&if1RT*2uxK+N`m}?8QA?6o`3PTM||n~&xdphJQB2aetEmuEW)M4B<Ly2
z<!Xu7zd{)2#szeJo3ZZJ1-4i1PAWnI9CtLYZB6{S$@a|x-ZRRXsm}lGDwxtw{NPOd
zs@D5}PjK(#H77N)FD~kv|J&<HgSz&2Yu!Jh=BHWnr24tHZ)ja|^aEF_jbzT2=etyW
z?(bifKl?y)SWB|3RbcJil*Mx%mop!Uylt%bQLgO9%!4ZxKKWZFIWFUg-`#!oWpSvl
z{yUkg(<)<3JAzZ{p9M`cS)1|c)izO}e;AXz-Cd3*b8D9aIh^@!ZpA>F4TuF9;#ZX&
z1__oGIHm*X7$Ej#(DrmW%fP^F>gnPb;&Ht9+E4qCKoN!y&NFl-$3`9LIhp5`*5;Hk
zbC#0mq$3MDf_PK&mre=M(wriul_~tT``YLB(s#3G_E&yh_w26xIotR5e(#%K`TXAZ
zN@fKU^Y5&3^Wr+VB3`_G{Q5axv2SNb_a99bhlGFvkBk|I?<7g_#XBXg{91LhXp5Qa
z5w3;(Pb>qq%$D}eJAZMFOLg#(8<QgXgwyACg`az@@?g&74DXP@AoY`G)7Lz;V$8|A
z`f7^lN~^i|m@iJ4=Et0^dTtlbkuz()PC5E<PRO?_H!V$OIrlLdiktnobipk>T{xP3
zc5g>qw8gowS9?sC<=*~$qnOk0AD<U@*(Vv>H;eMh7hYMoJWTXuckWlgIko{#Kksq$
z1@Ah)w&&MhA@$xQ%a8?&lh^sIUDTa5FSy`A0<Y@Db9}d7+;VoC82mg^-cR}2VHx&*
z6PcwdPi9Omo^vWKQGK!D>Juypr5iX;Won!}RQRDqtz(ly?+we&2-dS5x@!;VZ?(Lk
zHbt@VdBxW94Z80{td|R1erWPYQo!<H`qVW%&n@`o>Gz}_-xcztWTP~<!0ysDFW>UL
zy~f%#@2gCE*=wbvci7yQx8I%7{>W<cmq`I_YV(?>>%NhFIrZt4t7RL?A8?)j_>$ZB
za@Xo28Lh*nUHjh2u<!P{uKDf$gvSqjceoZdJb&=^p!GIO_w;o)=gQr3+LJB0>7Htt
z(95IY{QY+}pZoj&`;?GPMt9OvCs<rvEF!n%*omSCim`S=rxXf(>JCZP>YNswr&+XN
z=Hml5EK2>m*q&H?m||6Y<AlZW#`G&It<-vgp6~o&GnsksmIDSqo1Qxef7Lf#zr=4_
z#r_$WKg<dXaWFr>vflaRlxxm?%#CkCYrRt^SQ+?w9`i}qBf~CsaZ>sF;2s%wi^cMv
ztWzy#B|Vf4_%P>WotM4SVj1>dQ5hH2-?AKUEc<2Oa5>PpNalx6_m%hslO7)kPyC!1
z(s#IwyIpO6;GcJIGA6g4oxjxL%_Yyjj;EboW;fW+l?~YR`M37uLo>YD|GZ8AyZuO`
z=Itp_uWu#Bt6iJ)CFr<F%3N<2$#W0n6LWcvGsf!8PLlVz&X@6T+Es~L4bL0uu1%Q!
chW`Wq?z3J!KWe%pfH{f5)78&qol`;+068Bqd;kCd

diff --git a/assets/ticker/fnn.png.import b/assets/ticker/fnn.png.import
deleted file mode 100644
index 9f208ae..0000000
--- a/assets/ticker/fnn.png.import
+++ /dev/null
@@ -1,35 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/fnn.png-5c63f68777d5a929666ef2d1f774ecb5.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/ticker/fnn.png"
-dest_files=[ "res://.import/fnn.png-5c63f68777d5a929666ef2d1f774ecb5.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-process/normal_map_invert_y=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
diff --git a/json/ticker/README.md b/json/ticker/README.md
index f6f31df..830babd 100644
--- a/json/ticker/README.md
+++ b/json/ticker/README.md
@@ -2,6 +2,22 @@
 
 With the exception of certain policies, the majority of the lore in City Limits comes from the news ticker. During regular gameplay (when there isn't any disasters or financial problems), the news ticker provides fictional turn of events that happen in the city, such as the Kitty Kibble shortage from SimCity 3000.
 
-## Extra Lore
+## Configuration
 
-Additionally, I've added my own turn of events with the ``extra_lore.json`` file. Internally, this is known as "Caseyverse" and has a global node of the same name. That node is designed so the game can function without it through the use of the ``is_caseyverse()`` function (which checks for that json file, at the moment) and any future related functions that deal with events.
+The news ticker is completely configurable. News can be added or removed from the game without having to touch the code. The configuration is stored in the `config.json` file.
+
+```json
+{
+    "outlet": "Pawprint Press",
+    "competing_outlet": "Citizen Telegram",
+    "ticker_files": [
+        "adverts.json",
+        "sammy.json",
+        "kittykibble.json",
+        "citylife.json",
+        "extra_lore.json"
+    ]
+}
+```
+
+The ``outlet`` is the city's news brand, the ``competing_outlet`` is part of the optional ``extra_lore.json`` file, and ```ticker_files``` is an array of filenames that contain the news itself.
diff --git a/json/ticker/meta.json b/json/ticker/config.json
similarity index 61%
rename from json/ticker/meta.json
rename to json/ticker/config.json
index bbe811e..f7278b3 100644
--- a/json/ticker/meta.json
+++ b/json/ticker/config.json
@@ -1,11 +1,11 @@
 {
-    "primary_outlet": "Pawprint Press",
-    "secondary_outlet": "FNN",
+    "outlet": "Pawprint Press",
     "competing_outlet": "Citizen Telegram",
     "ticker_files": [
         "adverts.json",
         "sammy.json",
         "kittykibble.json",
-        "citylife.json"
+        "citylife.json",
+        "extra_lore.json"
     ]
 }
\ No newline at end of file
diff --git a/project.godot b/project.godot
index b8b6a44..9db388f 100644
--- a/project.godot
+++ b/project.godot
@@ -22,7 +22,6 @@ SimData="*res://scripts/autoload/sim_data.gd"
 SimEvents="*res://scripts/autoload/sim_events.gd"
 SimTime="*res://scripts/autoload/sim_time.gd"
 ZoneData="*res://scripts/autoload/zone_data.gd"
-Caseyverse="*res://scripts/autoload/caseyverse.gd"
 JsonHelper="*res://scripts/autoload/jsonhelper.gd"
 
 [display]
diff --git a/scenes/game.tscn b/scenes/game.tscn
index a5cd17e..217a1a7 100644
--- a/scenes/game.tscn
+++ b/scenes/game.tscn
@@ -1,7 +1,6 @@
-[gd_scene load_steps=46 format=2]
+[gd_scene load_steps=45 format=2]
 
 [ext_resource path="res://scenes/maps/MapOne.tscn" type="PackedScene" id=1]
-[ext_resource path="res://assets/ticker/pawprint-logo.svg" type="Texture" id=2]
 [ext_resource path="res://assets/symbols/fontawesome/population.svg" type="Texture" id=3]
 [ext_resource path="res://scenes/windows/Advisor.tscn" type="PackedScene" id=4]
 [ext_resource path="res://assets/ui/iccom.png" type="Texture" id=5]
@@ -269,42 +268,24 @@ __meta__ = {
 }
 
 [node name="NewsWindow" type="WindowDialog" parent="Controls/Control Panel/Windows"]
-visible = true
 anchor_left = 0.0877193
 anchor_top = 0.234496
 anchor_right = 0.69883
-anchor_bottom = 0.656977
+anchor_bottom = 0.591085
+window_title = "News"
 __meta__ = {
 "_edit_use_anchors_": true
 }
 
 [node name="News" type="ItemList" parent="Controls/Control Panel/Windows/NewsWindow"]
-anchor_right = 1.0
-anchor_bottom = 1.0
-margin_top = 53.0
-
-[node name="Brand" type="HSplitContainer" parent="Controls/Control Panel/Windows/NewsWindow"]
-anchor_left = 0.0175719
-anchor_top = 0.0242718
-anchor_right = 0.982428
-anchor_bottom = 0.23301
+anchor_left = 0.00797449
+anchor_top = 0.0412844
+anchor_right = 0.992026
+anchor_bottom = 0.967889
 __meta__ = {
 "_edit_use_anchors_": true
 }
 
-[node name="NewsBrand" type="TextureRect" parent="Controls/Control Panel/Windows/NewsWindow/Brand"]
-margin_right = 288.0
-margin_bottom = 45.505
-texture = ExtResource( 2 )
-
-[node name="NewsMotto" type="Label" parent="Controls/Control Panel/Windows/NewsWindow/Brand"]
-margin_left = 300.0
-margin_top = 15.0
-margin_right = 604.964
-margin_bottom = 29.0
-align = 2
-valign = 1
-
 [node name="Status" type="Panel" parent="Controls/Control Panel"]
 anchor_top = 12.95
 anchor_right = 25.65
diff --git a/scripts/ticker.gd b/scripts/ticker.gd
index 41cd451..7405cdd 100644
--- a/scripts/ticker.gd
+++ b/scripts/ticker.gd
@@ -2,13 +2,11 @@ extends Control
 
 const TICKER_PATH = "res://json/ticker/"
 const FNN_LOGO = "res://assets/ticker/fnn.png"
-const META_FILE = "meta.json"
+const CONFIG_FILE = "config.json"
 
 onready var ticker_text = $Status/NewsBtn
 onready var ticker_box = $Windows/NewsWindow/News
 onready var ticker_window = $Windows/NewsWindow
-onready var news_brand = $Windows/NewsWindow/Brand/NewsBrand
-onready var news_motto = $Windows/NewsWindow/Brand/NewsMotto
 
 var news_file: String = ""
 var rng = RandomNumberGenerator.new()
@@ -35,15 +33,8 @@ func _index_news():
 	randomize()
 	all_news.shuffle()
 
-func _init():
-	json_files = JsonHelper.key_value(TICKER_PATH, META_FILE, "ticker_files")
-
-func _ready():	
-	if SimData.city_name == "Furtropolis" or "Furville":
-		news_brand.texture = load(FNN_LOGO)
-	
-	if Caseyverse.is_caseyverse():
-		json_files.append("extra_lore.json")
+func _ready():
+	ticker_window.window_title = JsonHelper.key_value(TICKER_PATH, CONFIG_FILE, "outlet")
 	
 	_randomize_news(json_files)
 
@@ -87,6 +78,9 @@ func _start_alert(message):
 	pass
 
 func _randomize_news(files: Array):	
+	if all_news == null:
+		json_files = JsonHelper.key_value(TICKER_PATH, CONFIG_FILE, "ticker_files")
+		
 	for file in files:
 		news_file = str(TICKER_PATH + file)
 		_load_json()
@@ -99,15 +93,11 @@ func _randomize_news(files: Array):
 	var news_range = rng.randi_range(0, all_news.size() - 1)
 	var news_text: String = all_news[news_range]
 	
-	if Caseyverse.is_caseyverse():
-		news_text = news_text.replace("[competing_outlet]", JsonHelper.key_value(TICKER_PATH, META_FILE, "competing_outlet"))
+	if "[competing_outlet]" in news_text:
+		news_text = news_text.replace("[competing_outlet]", JsonHelper.key_value(TICKER_PATH, CONFIG_FILE, "competing_outlet"))
 	
-	# If city name Furtropolis or Furville use Pawprint Press
-	if SimData.city_name != "Furtropolis" or "Furville":
-		news_text = news_text.replace("[outlet]", JsonHelper.key_value(TICKER_PATH, META_FILE, "secondary_outlet"))
-	else:
-		# FNN = Furtropolis/Furry News Network
-		news_text = news_text.replace("[outlet]", JsonHelper.key_value(TICKER_PATH, META_FILE, "primary_outlet"))
+	if "[outlet]" in news_text:	
+		news_text = news_text.replace("[outlet]", JsonHelper.key_value(TICKER_PATH, CONFIG_FILE, "outlet"))
 
 	if "[species]" in news_text:
 		speices.shuffle()
@@ -120,16 +110,12 @@ func _randomize_news(files: Array):
 	if "[mayor]" in news_text:
 		news_text = news_text.replace("[mayor]", SimData.mayor_name)
 	
-	if ticker_box.items.size() > 15:
+	# Prevent stack overflaw
+	if ticker_box.items.size() > 10:
 		ticker_box.clear()
 	
-	# Prevent duplicates
-	var prev_news_text = ticker_text.text
-	if news_text == prev_news_text:
-		_randomize_news(json_files)
-	else:
-		json_files.shuffle()
-		_add_news(news_text)
+	_randomize_news(json_files)
+	_add_news(news_text)
 
 func _add_news(news_item):
 	ticker_text.text = news_item