diff --git a/README.md b/README.md index 08a559f..db2bbf0 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ![Screenshot](screenshot.png) -City Limits is a re-imagining of SimCity Classic that contains features and concepts from later games. Such as advisors, free zones, news tickers, neighboring cities, and so on. Though it shares a lot of core gameplay and style, it's not compatible with Micropolis. +City Limits is a re-imagining of SimCity Classic using ## Getting Started @@ -14,7 +14,7 @@ City Limits is a re-imagining of SimCity Classic that contains features and conc - **Tony Bark** - _Initial work_ - [tonytins](https://github.com/tonytins) - **Maxis** - _Assets_ - [SimHacker](https://github.com/SimHacker/) -- **Font Awesome** - *Icons* - [FontAwesome.com](https://fontawesome.com/) +- **Font Awesome** - *Icons* - [FortAwesome](https://github.com/FortAwesome) See also the list of [contributors](https://github.com/tonytins/citylimits/contributors) who participated in this project. diff --git a/dialog/policies/cityplanner_analysis.json b/dialog/policies/cityplanner_analysis.json new file mode 100644 index 0000000..6028fdf --- /dev/null +++ b/dialog/policies/cityplanner_analysis.json @@ -0,0 +1,11 @@ +{ + "1": { + "text": "Ut luctus tristique dui ac sagittis. Duis at turpis aliquam felis vestibulum vulputate at nec nisl. Curabitur dolor orci, facilisis eu interdum ac, maximus ut est. Aliquam erat volutpat. Nam mollis interdum nisi, non luctus massa pharetra sed. Maecenas vestibulum dapibus erat, sit amet semper risus. Suspendisse mollis tincidunt tempor. Quisque id porttitor risus, varius dictum odio. Quisque congue, lorem mollis efficitur imperdiet, lorem sem tincidunt turpis, at sodales magna ex sit amet diam. Mauris vehicula diam ante, in accumsan erat imperdiet et." + }, + "2": { + "text": "Fusce feugiat, dui sed feugiat feugiat, magna augue fermentum arcu, eget elementum ex dui lobortis mi. Nam tincidunt nunc a neque dapibus sollicitudin. Maecenas pellentesque magna sit amet quam luctus feugiat. Morbi id aliquam odio. Nullam ullamcorper risus nulla, nec mattis neque condimentum ac. Nunc hendrerit tellus ante. Phasellus imperdiet sit amet dolor ut ornare. Maecenas dapibus lectus eu lacinia ultricies. Ut id quam euismod, laoreet tortor quis, scelerisque orci. Praesent ornare tempus leo, sed egestas massa laoreet eget. Vivamus sagittis est ac condimentum fringilla. Nullam blandit rutrum quam non ullamcorper. Sed eget ex mattis, maximus massa at, pretium nisi." + }, + "3": { + "text": "Fusce feugiat, dui sed feugiat feugiat, magna augue fermentum arcu, eget elementum ex dui lobortis mi. Nam tincidunt nunc a neque dapibus sollicitudin. Maecenas pellentesque magna sit amet quam luctus feugiat. Morbi id aliquam odio. Nullam ullamcorper risus nulla, nec mattis neque condimentum ac. Nunc hendrerit tellus ante. Phasellus imperdiet sit amet dolor ut ornare. Maecenas dapibus lectus eu lacinia ultricies. Ut id quam euismod, laoreet tortor quis, scelerisque orci. Praesent ornare tempus leo, sed egestas massa laoreet eget. Vivamus sagittis est ac condimentum fringilla. Nullam blandit rutrum quam non ullamcorper. Sed eget ex mattis, maximus massa at, pretium nisi." + } +} \ No newline at end of file diff --git a/dialog/policies/policies.json b/dialog/policies/policies.json new file mode 100644 index 0000000..b277aeb --- /dev/null +++ b/dialog/policies/policies.json @@ -0,0 +1,14 @@ +{ + "1": { + "name": "Industry for a better Tomorrow", + "text": "Ut luctus tristique dui ac sagittis. Duis at turpis aliquam felis vestibulum vulputate at nec nisl. Curabitur dolor orci, facilisis eu interdum ac, maximus ut est. Aliquam erat volutpat. Nam mollis interdum nisi, non luctus massa pharetra sed. Maecenas vestibulum dapibus erat, sit amet semper risus. Suspendisse mollis tincidunt tempor. Quisque id porttitor risus, varius dictum odio. Quisque congue, lorem mollis efficitur imperdiet, lorem sem tincidunt turpis, at sodales magna ex sit amet diam. Mauris vehicula diam ante, in accumsan erat imperdiet et." + }, + "2": { + "name": "Clean Air Act", + "text": "Fusce feugiat, dui sed feugiat feugiat, magna augue fermentum arcu, eget elementum ex dui lobortis mi. Nam tincidunt nunc a neque dapibus sollicitudin. Maecenas pellentesque magna sit amet quam luctus feugiat. Morbi id aliquam odio. Nullam ullamcorper risus nulla, nec mattis neque condimentum ac. Nunc hendrerit tellus ante. Phasellus imperdiet sit amet dolor ut ornare. Maecenas dapibus lectus eu lacinia ultricies. Ut id quam euismod, laoreet tortor quis, scelerisque orci. Praesent ornare tempus leo, sed egestas massa laoreet eget. Vivamus sagittis est ac condimentum fringilla. Nullam blandit rutrum quam non ullamcorper. Sed eget ex mattis, maximus massa at, pretium nisi." + }, + "3": { + "name": "Tire Recylcing Proposed", + "text": "Mayor [name], used tires a big are a big problem. They waste land space or accumlate in piles that, if ignited, pollute our air. Do you know that tires could be recycled and used in paving material? It can even reduce the cost of building roads. [city] would greatly benefit from having a tire recylcing program.\nWe could set the sheels in motion today, if you agree to enact the Tire Recylcing Program." + } +} \ No newline at end of file diff --git a/dialog/ticker/ticker.json b/dialog/ticker/ticker.json index 0a5608f..b3123d4 100644 --- a/dialog/ticker/ticker.json +++ b/dialog/ticker/ticker.json @@ -124,5 +124,35 @@ }, "52": { "text": "From The Desk Of Wise Guy Sammy: You Can't Outwait A Bureaucracy." + }, + "53": { + "text": "Mr. Fluffy’s Futures Rise in the Wake of Kitty Kibble Shortage Rumors." + }, + "54": { + "text": "[species] Discovers Picayune Newspaper in Trash." + }, + "55": { + "text": "Local [species] Bill Flopsby Heads County Commission On Snuggles And Hugs." + }, + "56": { + "text": "[species] Offers To Let City Bus Run Him Over For Lifetime Salad Bar Privileges." + }, + "57": { + "text": "School Field Trip To Museum Sparks Interest In Local History." + }, + "58": { + "text": "Survey: 80% Of Animals Hang Up On Telephone Solicitors." + }, + "59": { + "text": "Animals Everywhere Agree: The Egg Came First, But Only After The Chicken." + }, + "60": { + "text": "Today's Forecast: Sunny, High 70's, Winds From The East." + }, + "61": { + "text": "Bus Misses Turn, Dozens Late For Work." + }, + "62": { + "text": "." } } \ No newline at end of file diff --git a/docs/README.md b/docs/README.md new file mode 100644 index 0000000..29abb3e --- /dev/null +++ b/docs/README.md @@ -0,0 +1 @@ +# City Limits \ No newline at end of file diff --git a/project.godot b/project.godot index 26f174a..2a28b7d 100644 --- a/project.godot +++ b/project.godot @@ -41,28 +41,24 @@ ui_left={ "deadzone": 0.5, "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777231,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":14,"pressure":0.0,"pressed":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"unicode":0,"echo":false,"script":null) ] } ui_right={ "deadzone": 0.5, "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":15,"pressure":0.0,"pressed":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"unicode":0,"echo":false,"script":null) ] } ui_up={ "deadzone": 0.5, "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":12,"pressure":0.0,"pressed":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"unicode":0,"echo":false,"script":null) ] } ui_down={ "deadzone": 0.5, "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777234,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":13,"pressure":0.0,"pressed":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"unicode":0,"echo":false,"script":null) ] } ui_cheats={ diff --git a/resources/sc3k-ticker.txt b/resources/sc3k-ticker.txt index 75f30a9..65cc1a2 100644 --- a/resources/sc3k-ticker.txt +++ b/resources/sc3k-ticker.txt @@ -1,5 +1,5 @@ 50 Car Pile-Up Results In New City Sculpture -9 Out Of 10 Sims Prefer Cranberry Jelly Over Preserves +9 Out Of 10 Animals Prefer Cranberry Jelly Over Preserves After 36 Years Of Marriage, Man Discovers Wife Is Actually A Rare Yucca Plant All Raccoons Cheat At Poker, Animal Researchers Say Ancient Meteorite Revealed To Be Burnt Burger @@ -19,7 +19,7 @@ Broccoli Pops Cereal Not As Popular As Presumed Broccoli Tops For Moms, Last For Kids; Dads Indifferent Building Turned Into Aviary After Birds Stick To New Paint Bus Misses Turn, Dozens Late For Work -Cab Fares In ''city name'' To Increase; Sims Brace For Worst +Cab Fares In [city] To Increase; Animals Brace For Worst Cable Disruption Blamed For Rising Birthrates Cat Burglar Spotted, Mistaken For Dalmatian Cat Hijacks Municipal Bus; Riders Applaud Good Timing At Stops And Courteous Meows @@ -89,7 +89,7 @@ Here Comes The Sun House Made Entirely Of Broccoli Built In [city] [mayor]; Furniture Made Of Wheat Germ Humming Show Tunes Sure Sign Of Poor Motor Skills, Researchers Declare I Was Framed, Jokes Local Artist -\"I'm Just A Sim, Sim, Simple Guy\" Rises To Top Of Charts +\"I'm Just A [species], [species], Simple Guy\" Rises To Top Of Charts If Tin Whistles Are Made Of Tin, What Do They Make Foghorns Out Of? Information Shown Here Frequently Absurd, Poll Indicates Lady's Knitting Circle Raises Cash For Homeless @@ -99,21 +99,21 @@ Local Kindergartners Prefer Oi Brand Paste; Claim It Just Tastes Better Local Mustard Magnate Marries Daughter Of Dill Pickle Mogul Local Politicians Take Both Sides Of Issues, Little Accomplished Local Scientists Conclude: Kitties Like Fish, Dogs Less Picky -Local Sim Bill Flopsby Heads County Commission On Snuggles And Hugs -Local Sim Discovers Just Who Wrote Book Of Love -Local Sim Mentioned In Out Of Town Newspaper; Starts Scrapbook +Local [species] Bill Flopsby Heads County Commission On Snuggles And Hugs +Local [species] Discovers Just Who Wrote Book Of Love +Local [species] Mentioned In Out Of Town Newspaper; Starts Scrapbook Lou Turns Away Every Person Who Skips To Her; \"They Have No Rhythm,\" She Says Lunar Eclipse Obscured By Clouds Lying Found To Be Effective Calorie Reducer Man Caught Shoplifting Spatulas; Thousands Of Flippers Found In Bedroom Man Discovers Neighbor Completely Enclosed In Mailbox; Returns Him For Postage Man Survives Wintry Night Adhered To Bus Bench By Chewing Gum -Marathon! Sims Hit The Ground Running +Marathon! Animals Hit The Ground Running Mediums Agree Blue-Striped Socks No More Lucky Than Clovers Or Pennies Middle Age A Hoax, Declares Study; Turns Out To Be Bad Posture After All Miracle Lint Remover Based On Broccoli Juice Sweeps Market Molasses Truck Springs Leak; Sweetest Accident In Long Time -Most Sims Ignore Tickers, Study Reveals +Most Animals Ignore Tickers, Study Reveals Mrs. SimLeary Gets Prize Cow Mysterious Loud Rumbling Noises In [city] name Found To Be Mysterious Loud Rumblings Never Feed Broccoli To Your Dog, No Matter How Much He Begs @@ -136,39 +136,39 @@ School Field Trip To Museum Sparks Interest In Local History Scientists Assert That Swearing Is Source Of Bad Breath Semicolon Declared Sexier Than Comma At Grammarian's Fete Shopping After Hours Source Of Purchase Embarrassment Says Survey -Sim Offers To Let City Bus Run Him Over For Lifetime Salad Bar Privileges -Sim Scientist Discovers Gravity While Falling Down Stairs +[species] Offers To Let City Bus Run Him Over For Lifetime Salad Bar Privileges +[species] Scientist Discovers Gravity While Falling Down Stairs SimFirefighters Wanted: Apply At Your Local Fire Station -SimNation Report: Criminals Demand Cell Phones -SimNation To Host Energy Symposium -SimPolice Officers Wanted: Apply At Your Local Police Precinct -SimScientist Discovers Abacus Can Be Used To Dry Towels -SimScientist Discovers New Dry Cleaning Method Using Sparklers -SimSurvey Reports Rise in Vegetarian Sims -SimSurvey: \"Cheese Louise\" Voted Best Pizza Restaurant In [city] [mayor] -SimSurvey: 3 Out Of 5 Sims Loathe Modern Art -SimSurvey: 4 Out Of 5 Sims Prefer Hard Cheese To Brie -SimSurvey: 4 Out Of 5 Sims Surveyed Find Surveys Satisfactory -SimSurvey: 50% Of Sims Say YES -SimSurvey: 80% Of Sims Hang Up On Telephone Solicitors -SimSurvey: 80% Of Sims Love Clog-Dancing -SimSurvey: Sims Sleep Seven Hours -Sims Everywhere Agree: A Sound Financial Future Begins With Inheriting Lots Of Money -Sims Everywhere Agree: All Sales Are Final -Sims Everywhere Agree: Brush Before, After, And Between Meals -Sims Everywhere Agree: For The Best In News Ticker Entertainment, The Picayune Can't Be Beat -Sims Everywhere Agree: Frequent Saving Prevents File Loss -Sims Everywhere Agree: Good Grooming Is Essential To Success -Sims Everywhere Agree: History Laughs At Many People Who Deserved To Be Laughed At -Sims Everywhere Agree: If You Throw A Stone, It Will Hit Something -Sims Everywhere Agree: It's Not What You Make, It's What You Keep -Sims Everywhere Agree: Past Performance Does Not Guarantee Future Returns -Sims Everywhere Agree: Purring Kitties Are Happy Kitties -Sims Everywhere Agree: The Egg Came First, But Only After The Chicken -Sims Everywhere Agree: Vote Early, Vote Often -Sims Everywhere Agree: Your Actual Costs May Vary -Sims Flock To Grand Opening Of Betty's Bird Boutique -Sims Report Widespread SimAnt Problem +Nethington Report: Criminals Demand Cell Phones +Nethington To Host Energy Symposium +Police Officers Wanted: Apply At Your Local Police Precinct +Scientist Discovers Abacus Can Be Used To Dry Towels +Scientist Discovers New Dry Cleaning Method Using Sparklers +Survey Reports Rise in Vegetarian Animals +Survey: \"Cheese Louise\" Voted Best Pizza Restaurant In [city] [mayor] +Survey: 3 Out Of 5 Animals Loathe Modern Art +Survey: 4 Out Of 5 Animals Prefer Hard Cheese To Brie +Survey: 4 Out Of 5 Animals Surveyed Find Surveys Satisfactory +Survey: 50% Of Animals Say YES +Survey: 80% Of Animals Hang Up On Telephone Solicitors +Survey: 80% Of Animals Love Clog-Dancing +Survey: Animals Sleep Seven Hours +Animals Everywhere Agree: A Sound Financial Future Begins With Inheriting Lots Of Money +Animals Everywhere Agree: All Sales Are Final +Animals Everywhere Agree: Brush Before, After, And Between Meals +Animals Everywhere Agree: For The Best In News Ticker Entertainment, The Picayune Can't Be Beat +Animals Everywhere Agree: Frequent Saving Prevents File Loss +Animals Everywhere Agree: Good Grooming Is Essential To Success +Animals Everywhere Agree: History Laughs At Many People Who Deserved To Be Laughed At +Animals Everywhere Agree: If You Throw A Stone, It Will Hit Something +Animals Everywhere Agree: It's Not What You Make, It's What You Keep +Animals Everywhere Agree: Past Performance Does Not Guarantee Future Returns +Animals Everywhere Agree: Purring Kitties Are Happy Kitties +Animals Everywhere Agree: The Egg Came First, But Only After The Chicken +Animals Everywhere Agree: Vote Early, Vote Often +Animals Everywhere Agree: Your Actual Costs May Vary +Animals Flock To Grand Opening Of Betty's Bird Boutique +Animals Report Widespread SimAnt Problem Skirmish At Writer's Workshop, Speaker Used Fighting Words Some Destruction, But Not Too Much, In Practical Joke Derby Spotted Owl Spotted @@ -176,7 +176,7 @@ Stand Up And Cheer If You Like SimCity Staring At Football-Shaped Bladders Good For Concentration, Researchers Proclaim Staring At Lapping Ocean Waves Makes You More Assertive During Lunch State Governor Found To Be Mule; \"His Clothes Always Fit Funny,\" Says Aide -Studies Show Most Sims Mispronounce \"Zsdersw\" +Studies Show Most Animals Mispronounce \"Zsdersw\" Study Demonstrates That Singing In The Shower Makes Teeth Crooked Survey Shows Less Is More, More Or Less Swamp Gas Verified To Be Exhalations Of Stars--Movie Stars--Long Passed @@ -229,7 +229,7 @@ Is Kitty Kibble Shortage Real? Authorities Say Rumors Unfounded Unlicensed Kitty Kibble Factory Fuels Rumors Of Shortage Enough Kitty Kibble For Twenty Years, Experts Agree Kitty Kibble Association Flooded With Letters: Where Is Kitty Kibble? -Is Kitty Kibble Shortage A Hoax? Sims Search For Truth +Is Kitty Kibble Shortage A Hoax? Animals Search For Truth Rumors Persist In Kitty Kibble Shortage; Unfounded Say Many Kitties Want Answers In Possible Kitty Kibble Shortage Kitties Say Not Enough Being Done In Kitty Kibble Shortage diff --git a/scenes/game.tscn b/scenes/game.tscn index a794b68..fa52765 100644 --- a/scenes/game.tscn +++ b/scenes/game.tscn @@ -1,13 +1,13 @@ -[gd_scene load_steps=40 format=2] +[gd_scene load_steps=45 format=2] [ext_resource path="res://scenes/Map.tscn" type="PackedScene" id=1] -[ext_resource path="res://sprites/symbols/population.svg" type="Texture" id=2] +[ext_resource path="res://sprites/symbols/fontawesome/population.svg" type="Texture" id=2] [ext_resource path="res://scripts/city_status.gd" type="Script" id=3] -[ext_resource path="res://scenes/Advisor.tscn" type="PackedScene" id=4] +[ext_resource path="res://scenes/windows/Advisor.tscn" type="PackedScene" id=4] [ext_resource path="res://sprites/ui/iccom.png" type="Texture" id=5] -[ext_resource path="res://scenes/DebugConsole.tscn" type="PackedScene" id=6] -[ext_resource path="res://sprites/symbols/graph.svg" type="Texture" id=7] -[ext_resource path="res://sprites/symbols/calendar.svg" type="Texture" id=8] +[ext_resource path="res://scenes/windows/DebugConsole.tscn" type="PackedScene" id=6] +[ext_resource path="res://sprites/symbols/fontawesome/pie-chart.svg" type="Texture" id=7] +[ext_resource path="res://sprites/symbols/fontawesome/calendar.svg" type="Texture" id=8] [ext_resource path="res://sprites/ui/icres.png" type="Texture" id=9] [ext_resource path="res://sprites/ui/icreshi.png" type="Texture" id=10] [ext_resource path="res://sprites/ui/icfire.png" type="Texture" id=11] @@ -20,7 +20,7 @@ [ext_resource path="res://sprites/ui/iccoalhi.png" type="Texture" id=18] [ext_resource path="res://sprites/ui/iccoal.png" type="Texture" id=19] [ext_resource path="res://scripts/game.gd" type="Script" id=20] -[ext_resource path="res://scenes/Meet.tscn" type="PackedScene" id=21] +[ext_resource path="res://scenes/windows/Meet.tscn" type="PackedScene" id=21] [ext_resource path="res://sprites/ui/icparkhi.png" type="Texture" id=22] [ext_resource path="res://sprites/ui/icnuc.png" type="Texture" id=23] [ext_resource path="res://sprites/ui/icpark.png" type="Texture" id=24] @@ -31,21 +31,29 @@ [ext_resource path="res://sprites/ui/icpolhi.png" type="Texture" id=29] [ext_resource path="res://sprites/ui/iccomhi.png" type="Texture" id=30] [ext_resource path="res://sprites/ui/icdozrhi.png" type="Texture" id=31] -[ext_resource path="res://scenes/TaxWindow.tscn" type="PackedScene" id=32] +[ext_resource path="res://scenes/windows/TaxWindow.tscn" type="PackedScene" id=32] [ext_resource path="res://sprites/ui/icfirehi.png" type="Texture" id=33] -[ext_resource path="res://scenes/Credits.tscn" type="PackedScene" id=34] +[ext_resource path="res://scenes/windows/Credits.tscn" type="PackedScene" id=34] [ext_resource path="res://scripts/ticker.gd" type="Script" id=35] -[ext_resource path="res://sprites/symbols/building.svg" type="Texture" id=36] +[ext_resource path="res://sprites/symbols/fontawesome/city.svg" type="Texture" id=36] [ext_resource path="res://scripts/windows.gd" type="Script" id=37] -[ext_resource path="res://sprites/symbols/meet.svg" type="Texture" id=38] +[ext_resource path="res://sprites/symbols/fontawesome/envelope.svg" type="Texture" id=38] [ext_resource path="res://sprites/ui/pause.svg" type="Texture" id=39] +[ext_resource path="res://sprites/symbols/fontawesome/slow.svg" type="Texture" id=40] +[ext_resource path="res://sprites/symbols/fontawesome/fast.svg" type="Texture" id=41] +[ext_resource path="res://sprites/symbols/fontawesome/coins.svg" type="Texture" id=42] +[ext_resource path="res://sprites/symbols/fontawesome/cogs.svg" type="Texture" id=43] +[ext_resource path="res://scenes/windows/Ordinance.tscn" type="PackedScene" id=44] [node name="Game" type="Node2D"] script = ExtResource( 20 ) -[node name="Quarters" type="Timer" parent="."] -wait_time = 150.0 +[node name="DayCycle" type="Timer" parent="."] +wait_time = 12.0 autostart = true +__meta__ = { +"_editor_description_": "Calculation based on: https://gaming.stackexchange.com/questions/110529/real-world-time-in-a-simcity-day-on-various-speeds" +} [node name="RotateNews" type="Timer" parent="."] wait_time = 6.0 @@ -58,18 +66,17 @@ autostart = true [node name="Windows" type="Control" parent="Controls"] anchor_right = 1.0 anchor_bottom = 1.0 -margin_right = -81.0 -margin_bottom = -54.0 script = ExtResource( 37 ) __meta__ = { +"_edit_lock_": true, "_edit_use_anchors_": false } [node name="Console" parent="Controls/Windows" instance=ExtResource( 6 )] -anchor_left = 0.594727 -anchor_top = 0.05 -anchor_right = 0.985352 -anchor_bottom = 0.3 +anchor_left = 0.52391 +anchor_top = 0.0691609 +anchor_right = 0.918441 +anchor_bottom = 0.320828 rect_min_size = Vector2( 400, 150 ) resizable = true @@ -110,10 +117,10 @@ __meta__ = { } [node name="VertCtr" type="VBoxContainer" parent="Controls/Windows/ToolsWindow/CenterCtr"] -margin_left = 4.0 -margin_top = 14.0 -margin_right = 184.0 -margin_bottom = 186.0 +margin_left = 12.0 +margin_top = 24.0 +margin_right = 192.0 +margin_bottom = 196.0 [node name="LargeCtr" type="HBoxContainer" parent="Controls/Windows/ToolsWindow/CenterCtr/VertCtr"] margin_right = 180.0 @@ -229,7 +236,6 @@ texture_normal = ExtResource( 13 ) texture_pressed = ExtResource( 12 ) [node name="Credits" parent="Controls/Windows" instance=ExtResource( 34 )] -visible = false [node name="PauseIndicator" type="TextureRect" parent="Controls/Windows"] visible = false @@ -242,133 +248,138 @@ __meta__ = { "_edit_use_anchors_": false } +[node name="Ordinance" parent="Controls/Windows" instance=ExtResource( 44 )] + [node name="Menu" type="Panel" parent="Controls"] -anchor_left = 0.919922 -anchor_top = -0.02 +anchor_left = 1.0 anchor_right = 1.0 -anchor_bottom = 0.963333 +anchor_bottom = 1.0 +margin_left = -57.0 +margin_top = -18.0 __meta__ = { -"_edit_lock_": true, -"_edit_use_anchors_": true +"_edit_use_anchors_": false } [node name="ButtonCtr" type="VBoxContainer" parent="Controls/Menu"] -anchor_top = 0.0491526 +anchor_top = 0.0420712 anchor_right = 1.0 -anchor_bottom = 0.772882 -margin_right = 7.62939e-06 +anchor_bottom = 1.0 +custom_constants/separation = 5 __meta__ = { "_edit_use_anchors_": true } [node name="TaxBtn" type="Button" parent="Controls/Menu/ButtonCtr"] -margin_left = 9.0 -margin_right = 71.0 -margin_bottom = 56.0 +margin_left = 7.0 +margin_right = 49.0 +margin_bottom = 36.0 +hint_tooltip = "RCI" size_flags_horizontal = 4 icon = ExtResource( 7 ) [node name="ToolsBtn" type="Button" parent="Controls/Menu/ButtonCtr"] -margin_left = 13.0 -margin_top = 60.0 -margin_right = 68.0 -margin_bottom = 121.0 +margin_left = 7.0 +margin_top = 41.0 +margin_right = 49.0 +margin_bottom = 72.0 +hint_tooltip = "Tools" size_flags_horizontal = 4 icon = ExtResource( 36 ) [node name="AdvsiorBtn" type="Button" parent="Controls/Menu/ButtonCtr"] -margin_left = 10.0 -margin_top = 125.0 -margin_right = 71.0 -margin_bottom = 171.0 +margin_left = 7.0 +margin_top = 77.0 +margin_right = 49.0 +margin_bottom = 103.0 +hint_tooltip = "Meet" size_flags_horizontal = 4 icon = ExtResource( 38 ) +[node name="SettingsBtn" type="Button" parent="Controls/Menu/ButtonCtr"] +margin_left = 7.0 +margin_top = 108.0 +margin_right = 49.0 +margin_bottom = 140.0 +hint_tooltip = "Meet" +size_flags_horizontal = 4 +icon = ExtResource( 43 ) + [node name="Status" type="Panel" parent="Controls"] -anchor_top = 1.0 -anchor_right = 1.0 +anchor_left = -0.0126953 +anchor_top = 0.908333 +anchor_right = 1.01953 anchor_bottom = 1.0 -margin_top = -55.0 __meta__ = { -"_edit_lock_": true, -"_edit_use_anchors_": false +"_edit_use_anchors_": true } [node name="StatCtr" type="HBoxContainer" parent="Controls/Status"] -anchor_left = 0.00585938 -anchor_top = 0.545455 -anchor_right = 0.853516 -anchor_bottom = 1.0 +anchor_left = 0.0302744 +anchor_top = 0.527271 +anchor_right = 0.808894 +anchor_bottom = 0.981815 margin_bottom = -3.8147e-06 -custom_constants/separation = 65 +custom_constants/separation = 50 alignment = 1 script = ExtResource( 3 ) __meta__ = { -"_edit_lock_": true, "_edit_use_anchors_": true } [node name="CityNameLbl" type="Label" parent="Controls/Status/StatCtr"] -margin_left = 154.0 +margin_left = 237.0 margin_top = 5.0 -margin_right = 220.0 +margin_right = 303.0 margin_bottom = 19.0 text = "City Name" -[node name="CityYearSep" type="VSeparator" parent="Controls/Status/StatCtr"] -margin_left = 285.0 -margin_right = 289.0 -margin_bottom = 24.0 - [node name="YearCtr" type="HBoxContainer" parent="Controls/Status/StatCtr"] -margin_left = 354.0 -margin_right = 404.0 -margin_bottom = 24.0 +margin_left = 353.0 +margin_right = 433.0 +margin_bottom = 25.0 [node name="CalIcon" type="TextureRect" parent="Controls/Status/StatCtr/YearCtr"] -margin_right = 14.0 -margin_bottom = 24.0 +margin_right = 10.0 +margin_bottom = 25.0 texture = ExtResource( 8 ) stretch_mode = 4 -[node name="YearLbl" type="Label" parent="Controls/Status/StatCtr/YearCtr"] +[node name="CalendarLbl" type="Label" parent="Controls/Status/StatCtr/YearCtr"] +margin_left = 14.0 +margin_top = 5.0 +margin_right = 80.0 +margin_bottom = 19.0 +text = "1/1/12000" +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="BudgetCtr" type="HBoxContainer" parent="Controls/Status/StatCtr"] +margin_left = 483.0 +margin_right = 509.0 +margin_bottom = 25.0 + +[node name="CoinsIcon" type="TextureRect" parent="Controls/Status/StatCtr/BudgetCtr"] +margin_right = 14.0 +margin_bottom = 25.0 +texture = ExtResource( 42 ) +stretch_mode = 4 + +[node name="BudgetLbl" type="Label" parent="Controls/Status/StatCtr/BudgetCtr"] margin_left = 18.0 margin_top = 5.0 -margin_right = 50.0 +margin_right = 26.0 margin_bottom = 19.0 -text = "1980" - -[node name="YearBudgetSep" type="VSeparator" parent="Controls/Status/StatCtr"] -margin_left = 469.0 -margin_right = 473.0 -margin_bottom = 24.0 -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="BudgetLbl" type="Label" parent="Controls/Status/StatCtr"] -margin_left = 538.0 -margin_top = 5.0 -margin_right = 553.0 -margin_bottom = 19.0 -text = "§0" - -[node name="BudgetPopSep" type="VSeparator" parent="Controls/Status/StatCtr"] -margin_left = 618.0 -margin_right = 622.0 -margin_bottom = 24.0 -__meta__ = { -"_edit_use_anchors_": false -} +text = "0" [node name="PopCtr" type="HBoxContainer" parent="Controls/Status/StatCtr"] -margin_left = 687.0 -margin_right = 713.0 -margin_bottom = 24.0 +margin_left = 559.0 +margin_right = 585.0 +margin_bottom = 25.0 [node name="PopIcon" type="TextureRect" parent="Controls/Status/StatCtr/PopCtr"] margin_right = 14.0 -margin_bottom = 24.0 +margin_bottom = 25.0 texture = ExtResource( 2 ) stretch_mode = 4 @@ -380,10 +391,10 @@ margin_bottom = 19.0 text = "0" [node name="TickerBg" type="ColorRect" parent="Controls/Status"] -anchor_left = 0.00976562 -anchor_top = 0.0727273 -anchor_right = 0.854492 -anchor_bottom = 0.472727 +anchor_left = 0.0331126 +anchor_top = 0.0363635 +anchor_right = 0.808894 +anchor_bottom = 0.436362 color = Color( 0, 0, 0, 1 ) script = ExtResource( 35 ) __meta__ = { @@ -402,20 +413,38 @@ __meta__ = { "_edit_use_anchors_": true } -[node name="MiniMap" type="Panel" parent="Controls"] -anchor_left = 0.853516 -anchor_top = 0.75 -anchor_right = 1.0 -anchor_bottom = 1.0 +[node name="SpeedCtr" type="HBoxContainer" parent="Controls/Status"] +anchor_left = 0.816463 +anchor_top = 0.181818 +anchor_right = 0.918639 +anchor_bottom = 0.818179 +alignment = 1 __meta__ = { -"_edit_lock_": true, "_edit_use_anchors_": true } -[connection signal="timeout" from="Quarters" to="." method="_on_Quarters_timeout"] +[node name="TurtleBtn" type="Button" parent="Controls/Status/SpeedCtr"] +margin_left = 7.0 +margin_right = 48.0 +margin_bottom = 35.0 +hint_tooltip = "Slow" +toggle_mode = true +icon = ExtResource( 40 ) + +[node name="CheetaBtn" type="Button" parent="Controls/Status/SpeedCtr"] +margin_left = 52.0 +margin_right = 99.0 +margin_bottom = 35.0 +hint_tooltip = "Fast" +toggle_mode = true +icon = ExtResource( 41 ) + +[connection signal="timeout" from="DayCycle" to="." method="_on_DayCycle_timeout"] [connection signal="timeout" from="RotateNews" to="Controls/Status/TickerBg" method="_on_RotateNews_timeout"] [connection signal="pressed" from="Controls/Windows/ToolsWindow/CenterCtr/VertCtr/LargeCtr/CoalBtn" to="Map" method="_on_CoalBtn_pressed"] [connection signal="pressed" from="Controls/Windows/ToolsWindow/CenterCtr/VertCtr/ZonesCtr/ResBtn" to="Map" method="_on_ResBtn_pressed"] [connection signal="pressed" from="Controls/Menu/ButtonCtr/TaxBtn" to="Controls/Windows" method="_on_TaxBtn_pressed"] [connection signal="pressed" from="Controls/Menu/ButtonCtr/ToolsBtn" to="Controls/Windows" method="_on_ToolsBtn_pressed"] [connection signal="pressed" from="Controls/Menu/ButtonCtr/AdvsiorBtn" to="Controls/Windows" method="_on_AdvsiorBtn_pressed"] +[connection signal="toggled" from="Controls/Status/SpeedCtr/TurtleBtn" to="." method="_on_TurtleBtn_toggled"] +[connection signal="toggled" from="Controls/Status/SpeedCtr/CheetaBtn" to="." method="_on_CheetaBtn_toggled"] diff --git a/scenes/Advisor.tscn b/scenes/windows/Advisor.tscn similarity index 100% rename from scenes/Advisor.tscn rename to scenes/windows/Advisor.tscn diff --git a/scenes/Credits.tscn b/scenes/windows/Credits.tscn similarity index 89% rename from scenes/Credits.tscn rename to scenes/windows/Credits.tscn index 20c037b..48e27f1 100644 --- a/scenes/Credits.tscn +++ b/scenes/windows/Credits.tscn @@ -1,7 +1,6 @@ [gd_scene format=2] [node name="Credits" type="WindowDialog"] -visible = true anchor_left = 0.394043 anchor_top = 0.293333 anchor_right = 0.605957 @@ -19,10 +18,10 @@ bbcode_text = "[center] Developed by Tony Bark -Assets by +Sprites by Maxis -Interface Icons by +Icons by Font Awesome Powered by @@ -35,10 +34,10 @@ text = " Developed by Tony Bark -Assets by +Sprites by Maxis -Interface Icons by +Icons by Font Awesome Powered by diff --git a/scenes/DebugConsole.tscn b/scenes/windows/DebugConsole.tscn similarity index 95% rename from scenes/DebugConsole.tscn rename to scenes/windows/DebugConsole.tscn index 767c412..205795c 100644 --- a/scenes/DebugConsole.tscn +++ b/scenes/windows/DebugConsole.tscn @@ -28,6 +28,7 @@ anchor_bottom = 0.751553 readonly = true wrap_enabled = true __meta__ = { +"_edit_lock_": true, "_edit_use_anchors_": true } @@ -39,6 +40,7 @@ anchor_bottom = 0.950311 caret_blink = true caret_blink_speed = 0.5 __meta__ = { +"_edit_lock_": true, "_edit_use_anchors_": true } @@ -50,6 +52,7 @@ anchor_bottom = 0.951903 margin_top = 7.62939e-06 text = "Submit" __meta__ = { +"_edit_lock_": true, "_edit_use_anchors_": true } diff --git a/scenes/Meet.tscn b/scenes/windows/Meet.tscn similarity index 90% rename from scenes/Meet.tscn rename to scenes/windows/Meet.tscn index d7aa87b..cf4efa4 100644 --- a/scenes/Meet.tscn +++ b/scenes/windows/Meet.tscn @@ -27,20 +27,20 @@ __meta__ = { } [node name="CityPlannerBtn" type="TextureButton" parent="Advsiors"] -margin_left = 100.0 -margin_right = 200.0 +margin_left = 47.0 +margin_right = 147.0 margin_bottom = 100.0 texture_normal = ExtResource( 1 ) [node name="FinanceBtn" type="TextureButton" parent="Advsiors"] -margin_left = 204.0 -margin_right = 304.0 +margin_left = 151.0 +margin_right = 251.0 margin_bottom = 100.0 texture_normal = ExtResource( 2 ) [node name="TransportBtn" type="TextureButton" parent="Advsiors"] -margin_left = 204.0 -margin_right = 304.0 +margin_left = 255.0 +margin_right = 355.0 margin_bottom = 100.0 texture_normal = ExtResource( 3 ) @@ -49,7 +49,6 @@ anchor_left = 0.0148515 anchor_top = 0.411552 anchor_right = 0.987624 anchor_bottom = 0.978339 -margin_top = -7.62939e-06 __meta__ = { "_edit_use_anchors_": true } diff --git a/scenes/windows/Ordinance.tscn b/scenes/windows/Ordinance.tscn new file mode 100644 index 0000000..2f2c1ab --- /dev/null +++ b/scenes/windows/Ordinance.tscn @@ -0,0 +1,127 @@ +[gd_scene load_steps=5 format=2] + +[ext_resource path="res://sprites/symbols/fontawesome/thumbs-down.svg" type="Texture" id=1] +[ext_resource path="res://sprites/symbols/fontawesome/thumbs-up.svg" type="Texture" id=2] +[ext_resource path="res://sprites/symbols/fontawesome/question-circle.svg" type="Texture" id=3] +[ext_resource path="res://scripts/policy_window.gd" type="Script" id=4] + +[node name="Ordinance" type="WindowDialog"] +anchor_left = 0.324707 +anchor_top = 0.238333 +anchor_right = 0.675293 +anchor_bottom = 0.761667 +window_title = "Ordinance" +script = ExtResource( 4 ) +__meta__ = { +"_edit_use_anchors_": true +} + +[node name="OrdinanceLbl" type="Label" parent="."] +anchor_left = 0.0222841 +anchor_top = 0.022293 +anchor_right = 0.97493 +anchor_bottom = 0.0700637 +__meta__ = { +"_edit_use_anchors_": true +} + +[node name="ActionCtr" type="VBoxContainer" parent="."] +anchor_left = 0.0278552 +anchor_top = 0.729299 +anchor_right = 0.245125 +anchor_bottom = 0.977707 +custom_constants/separation = 5 +__meta__ = { +"_edit_lock_": true, +"_edit_use_anchors_": true +} + +[node name="TakeActionLbl" type="Label" parent="ActionCtr"] +margin_right = 78.0 +margin_bottom = 14.0 +text = "Take Action:" + +[node name="EnectCtr" type="HBoxContainer" parent="ActionCtr"] +margin_top = 19.0 +margin_right = 78.0 +margin_bottom = 39.0 +custom_constants/separation = 10 + +[node name="EnectBtn" type="Button" parent="ActionCtr/EnectCtr"] +margin_right = 22.0 +margin_bottom = 20.0 +icon = ExtResource( 2 ) + +[node name="EnectLbl" type="Label" parent="ActionCtr/EnectCtr"] +margin_left = 32.0 +margin_top = 3.0 +margin_right = 66.0 +margin_bottom = 17.0 +text = "Enact" + +[node name="IgnoreCtr" type="HBoxContainer" parent="ActionCtr"] +margin_top = 44.0 +margin_right = 78.0 +margin_bottom = 64.0 +custom_constants/separation = 10 + +[node name="IgnoreBtn" type="Button" parent="ActionCtr/IgnoreCtr"] +margin_right = 22.0 +margin_bottom = 20.0 +icon = ExtResource( 1 ) + +[node name="IgnoreLbl" type="Label" parent="ActionCtr/IgnoreCtr"] +margin_left = 32.0 +margin_top = 3.0 +margin_right = 73.0 +margin_bottom = 17.0 +text = "Ignore" + +[node name="DescPanel" type="Panel" parent="."] +anchor_left = 0.281337 +anchor_top = 0.0859873 +anchor_right = 0.97493 +anchor_bottom = 0.684713 +__meta__ = { +"_edit_use_anchors_": true +} + +[node name="DescriptionLbl" type="RichTextLabel" parent="DescPanel"] +anchor_left = 0.0160643 +anchor_top = 0.0194175 +anchor_right = 0.971888 +anchor_bottom = 0.975728 +margin_left = 0.652039 +margin_right = 0.652039 +__meta__ = { +"_edit_lock_": true, +"_edit_use_anchors_": true +} + +[node name="AnalysisCtr" type="HBoxContainer" parent="."] +anchor_left = 0.549742 +anchor_top = 0.869427 +anchor_right = 0.967569 +anchor_bottom = 0.933121 +custom_constants/separation = 10 +alignment = 1 +__meta__ = { +"_edit_use_anchors_": true +} + +[node name="AnalysisLbl" type="Label" parent="AnalysisCtr"] +margin_left = 5.0 +margin_top = 3.0 +margin_right = 111.0 +margin_bottom = 17.0 +text = "Impact Analysis:" + +[node name="AnalysisBtn" type="Button" parent="AnalysisCtr"] +margin_left = 121.0 +margin_right = 143.0 +margin_bottom = 20.0 +icon = ExtResource( 3 ) + +[connection signal="pressed" from="ActionCtr/EnectCtr/EnectBtn" to="." method="_on_EnectBtn_pressed"] +[connection signal="pressed" from="ActionCtr/IgnoreCtr/IgnoreBtn" to="." method="_on_IgnoreBtn_pressed"] +[connection signal="pressed" from="AnalysisCtr/AnalysisBtn" to="." method="_on_AnalysisBtn_pressed"] diff --git a/scenes/TaxWindow.tscn b/scenes/windows/TaxWindow.tscn similarity index 100% rename from scenes/TaxWindow.tscn rename to scenes/windows/TaxWindow.tscn diff --git a/scenes/ToolsWindow.tscn b/scenes/windows/ToolsWindow.tscn similarity index 100% rename from scenes/ToolsWindow.tscn rename to scenes/windows/ToolsWindow.tscn diff --git a/scripts/advisor_window.gd b/scripts/advisor_window.gd index ae84775..ff621c4 100644 --- a/scripts/advisor_window.gd +++ b/scripts/advisor_window.gd @@ -15,31 +15,64 @@ onready var rank_label = $Container/Advisor/RankLbl onready var name_label = $Container/Advisor/NameLbl onready var description_label = $Container/DescriptionLbl -func _start_dialogue(advisor, message): - if advisor == SimData.Advisors.CITY_PLANNER: - dialogue_file = "res://dialog/advisors/cityplanner.json" - _load_dialogue() - avatar_texture.texture = preload("res://sprites/avatars/cindy.png") - name_label.text = "Cindy Diamond" - rank_label.text = "City Planner" - elif advisor == SimData.Advisors.FINANCIAL: - dialogue_file = "res://dialog/advisors/finacial.json" - _load_dialogue() - avatar_texture.texture = preload("res://sprites/avatars/kit.png") - name_label.text = "Kit Welsh" - rank_label.text = "Financial Advisor" - elif advisor == SimData.Advisors.FINANCIAL: - dialogue_file = "res://dialog/advisors/transport.json" - _load_dialogue() - avatar_texture.texture = preload("res://sprites/avatars/zc.png") - name_label.text = "Zack Casey" - rank_label.text = "Transportation Advisor" +enum JsonFile { + ANNOUNCEMENTS, + ANALYSIS +} + +func _ready(): + SimEvents.connect("advisor_message", self, "_advisor_dialogue") + SimEvents.connect("policy_analysis", self, "_analysis_dialouge") + +func _init_advisor(file, advisor): + match advisor: + SimData.Advisors.CITY_PLANNER: + match file: + JsonFile.ANNOUNCEMENTS: + dialogue_file = "res://dialog/advisors/cityplanner.json" + JsonFile.ANALYSIS: + dialogue_file = "res://dialog/policies/cityplanner_analysis.json" + + avatar_texture.texture = preload("res://sprites/avatars/cindy.png") + name_label.text = "Cindy Diamond" + rank_label.text = "City Planner" + SimData.Advisors.FINANCIAL: + match file: + JsonFile.ANNOUNCEMENTS: + dialogue_file = "res://dialog/advisors/finacial.json" + JsonFile.ANALYSIS: + dialogue_file = "res://dialog/policies/finacial_analysis.json" + + avatar_texture.texture = preload("res://sprites/avatars/kit.png") + name_label.text = "Kit Welsh" + rank_label.text = "Financial Advisor" + + SimData.Advisors.TRANSPORT: + match file: + JsonFile.ANNOUNCEMENTS: + dialogue_file = "res://dialog/advisors/transport.json" + JsonFile.ANALYSIS: + dialogue_file = "res://dialog/policies/transport_analysis.json" + + avatar_texture.texture = preload("res://sprites/avatars/zc.png") + name_label.text = "Zack Casey" + rank_label.text = "Transportation Advisor" + +func _launch_advisor_window(key): _index_dialogue() - description_label.text = dialogue_keys[message].text - window_title = dialogue_keys[message].name + description_label.text = dialogue_keys[key].text + window_title = dialogue_keys[key].name show() +func _advisor_dialogue(advisor, message): + _init_advisor(JsonFile.ANNOUNCEMENTS, advisor) + _launch_advisor_window(message) + +func _analysis_dialouge(advisor, policy): + _init_advisor(JsonFile.ANALYSIS, advisor) + _launch_advisor_window(policy) + func _index_dialogue(): var dialogue = _load_dialogue() dialogue_keys.clear() @@ -52,6 +85,3 @@ func _load_dialogue(): file.open(dialogue_file, file.READ) var dialogue = parse_json(file.get_as_text()) return dialogue - -func _ready(): - SimEvents.connect("advisor_message", self, "_start_dialogue") diff --git a/scripts/autoload/sim_data.gd b/scripts/autoload/sim_data.gd index b89b542..c092c4f 100644 --- a/scripts/autoload/sim_data.gd +++ b/scripts/autoload/sim_data.gd @@ -1,17 +1,22 @@ extends Node +const CURRENCY: String = "§" + var city_name: String = "Furtropolis" # Hard-coded, for now var mayor_name: String = "Defecto" -var year: int = 1980 -var prev_quarter: int -var quarter: int = 1 var population: int = 0 var budget: int = 20000 var expenses: int -var is_alert: bool = false +var on_alert: bool = false var has_ctower: bool = false # Central Tower -const currency: String = "§" +var year: int = 2000 +var prev_year: int +var month: int = 1 +var prev_month: int +var day: int = 1 +var prev_day: int +var total_days: int = 1 var power_grid: int # Number of power stations in the area. Helps provide redundancies. var power_capacity: int @@ -37,18 +42,50 @@ enum GameSpeed { FAST } -enum Advisors { - CITY_PLANNER, - FINANCIAL +enum Level { + EASY, + MEDIUM, + HARD } -func starting_budget(lev: int): - - if lev == 1 or lev == 0: - budget = 20000 - elif lev == 2: - budget = 10000 - elif lev == 3: - budget = 5000 - else: - budget = NAN +enum Advisors { + CITY_PLANNER, + FINANCIAL, + TRANSPORT +} + +enum Ordinances { + # Education + CPR_TRAINING, + PRO_READING, + NHOOD_WATCH, + # Financial + PARKING_FINES, + GAMBLING, + SALES_TAX, + # Promo + ANNUAL_CARNIVAL, + BUSINESS_ADS, + CITY_BEAUTY, + TOURIST_ADS + # Health & Safety + FREE_CLINICS, + JUNIOR_SPORTS, + SMOKING_BAN, + VOLUNTEER_FIRE, + SMOKE_DETECTOR, + # Environment + ENERGY_CONSERVATION, + HOMELESS_SHELTERS, + CLEAN_AIR_ACT, + TIRE_RECYCLE +} + +func starting_budget(lev = Level.EASY): + match lev: + Level.EASY: + budget = 20000 + Level.MEDIUM: + budget = 10000 + Level.HARD: + budget = 5000 diff --git a/scripts/autoload/sim_events.gd b/scripts/autoload/sim_events.gd index 62b9750..b74f36e 100644 --- a/scripts/autoload/sim_events.gd +++ b/scripts/autoload/sim_events.gd @@ -3,8 +3,15 @@ extends Node signal has_power signal budget signal game_speed + +signal policy_message(policy) +signal policy_analysis(advisor, policy) signal advisor_message(advisor, message) # News signal send_alert(message) signal resume_news + +# Policies +signal clean_air_act +signal energy_saving diff --git a/scripts/city_status.gd b/scripts/city_status.gd index a99a239..7b3ca63 100644 --- a/scripts/city_status.gd +++ b/scripts/city_status.gd @@ -1,10 +1,10 @@ extends HBoxContainer onready var city_name = $CityNameLbl -onready var budget = $BudgetLbl -onready var year = $YearCtr/YearLbl +onready var budget = $BudgetCtr/BudgetLbl +onready var calendar = $YearCtr/CalendarLbl func _process(delta): city_name.text = SimData.city_name - budget.text = SimData.currency + str(SimData.budget) - year.text = str(SimData.year) + budget.text = str(SimData.budget) + calendar.text = str(SimData.day) + "/" + str(SimData.month) + "/" + str(SimData.year) diff --git a/scripts/command_handler.gd b/scripts/command_handler.gd index ea583e7..6de481e 100644 --- a/scripts/command_handler.gd +++ b/scripts/command_handler.gd @@ -10,9 +10,13 @@ enum { const valid_commands = [ ["money", [ARG_STRING] ], ["whereyoufrom", [ARG_STRING] ], - ["whatyearisit", [ARG_STRING] ] + ["whatyearisit", [ARG_STRING] ], + ["show_policy", [ARG_INT]] ] +func show_policy(policy): + SimEvents.emit_signal("policy_message", policy) + func _budget_print(value: int): return "Budget increased to " + str(value) diff --git a/scripts/game.gd b/scripts/game.gd index dcfe3e5..4be0b05 100644 --- a/scripts/game.gd +++ b/scripts/game.gd @@ -1,20 +1,45 @@ extends Node2D onready var rotate_news = $RotateNews -onready var quarters = $Quarters +onready var day_cycle = $DayCycle +onready var turtle_btn = $Controls/Status/SpeedCtr/TurtleBtn +onready var cheeta_btn = $Controls/Status/SpeedCtr/CheetaBtn 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 - - SimEvents.emit_signal("budget") - func _stop_news(): rotate_news.stop() func _resume_rotation(): rotate_news.start() + +func _on_DayCycle_timeout(): + + if SimData.prev_day < 30: + SimData.day += 1 + + if SimData.prev_day == 30: + SimData.month =+ 1 + SimData.prev_month = SimData.month + SimData.day = 1 + SimEvents.emit_signal("budget") + + if SimData.prev_month == 12: + SimData.prev_year = SimData.year + SimData.total_days = 1 + SimData.month = 1 + SimData.year += 1 + + SimData.prev_day = SimData.day + +func _on_TurtleBtn_toggled(button_pressed): + if button_pressed: + day_cycle.wait_time = 12 + cheeta_btn.pressed = false + +func _on_CheetaBtn_toggled(button_pressed): + if button_pressed: + day_cycle.wait_time = 2 + turtle_btn.pressed = false diff --git a/scripts/policy_window.gd b/scripts/policy_window.gd new file mode 100644 index 0000000..a89add3 --- /dev/null +++ b/scripts/policy_window.gd @@ -0,0 +1,69 @@ +extends WindowDialog + +var dialogue_file = "res://dialog/policies/policies.json" + +var dialogue_keys = [] +var dialogue_name = "" +var dialogue_text = "" +var policy: int + +onready var ordinance_label = $OrdinanceLbl +onready var description_label = $DescPanel/DescriptionLbl + +func _start_dialogue(ordinance): + + _index_dialogue() + + match ordinance: + 1: + policy = 1 + 2: + policy = 2 + 3: + policy = 3 + + var proposel: String = dialogue_keys[policy].text + + if "[name]" in proposel: + proposel = proposel.replace("[name]", SimData.mayor_name) + + if "[city]" in proposel: + proposel = proposel.replace("[city]", SimData.city_name) + + description_label.text = proposel + ordinance_label.text = dialogue_keys[policy].name + + show() + +func _index_dialogue(): + var dialogue = _load_dialogue() + dialogue_keys.clear() + for key in dialogue: + dialogue_keys.append(dialogue[key]) + +func _load_dialogue(): + var file = File.new() + if file.file_exists(dialogue_file): + file.open(dialogue_file, file.READ) + var dialogue = parse_json(file.get_as_text()) + return dialogue + +func _ready(): + SimEvents.connect("policy_message", self, "_start_dialogue") + +func _on_IgnoreBtn_pressed(): + policy = 0 + description_label.text = "" + ordinance_label.text = "" + hide() + +func _on_EnectBtn_pressed(): + match policy: + 1: SimEvents.emit_signal("energy_saving") + 2: SimEvents.emit_signal("clean_air_act") + +func _on_AnalysisBtn_pressed(): + match policy: + 1: SimEvents.emit_signal("policy_analysis", SimData.Advisors.CITY_PLANNER, policy) + 2: SimEvents.emit_signal("policy_analysis", SimData.Advisors.CITY_PLANNER, policy) + 3: SimEvents.emit_signal("policy_analysis", SimData.Advisors.CITY_PLANNER, policy) diff --git a/scripts/ticker.gd b/scripts/ticker.gd index 01d9034..1221670 100644 --- a/scripts/ticker.gd +++ b/scripts/ticker.gd @@ -5,6 +5,11 @@ onready var ticker_text = $TickerTxt var news_file = "" var rng = RandomNumberGenerator.new() var news_keys = [] +var speices = [ + "Cat", + "Fennec", + "Fox" +] func _index_news(): var news = _load_news() @@ -30,12 +35,8 @@ func _ready(): SimEvents.connect("resume_news", self, "_resume_ticker") _random_news("res://dialog/ticker/ticker.json") -func _process(delta): - if get_tree().paused: - ticker_text.text = "Simulation Paused" - func _start_alert(message): - SimData.is_alert = true + SimData.on_alert = true news_file = "res://dialog/ticker/ticker_alerts.json" ticker_text.text = news_keys[message].text @@ -56,6 +57,11 @@ func _random_news(file): elif "[outlet]" in news: news = news.replace("[outlet]", "Pawprint Press") + if "[species]" in news: + randomize() + speices.shuffle() + news = news.replace("[species]", speices[rng.randi()%speices.size()]) + if "[city]" in news: news = news.replace("[city]", SimData.city_name) diff --git a/scripts/windows.gd b/scripts/windows.gd index a756034..9370b74 100644 --- a/scripts/windows.gd +++ b/scripts/windows.gd @@ -4,7 +4,6 @@ onready var debug_console = $Console onready var tax_window = $TaxWindow onready var advsior_meet_window = $AdvisorMeet onready var tools_window = $ToolsWindow -# onready var news_ticker = $ func _ready(): SimEvents.emit_signal("advisor_message", SimData.Advisors.CITY_PLANNER, 0) diff --git a/sprites/adorable-z.png b/sprites/adorable-z.png new file mode 100644 index 0000000..5f9e957 Binary files /dev/null and b/sprites/adorable-z.png differ diff --git a/sprites/adorable-z.png.import b/sprites/adorable-z.png.import new file mode 100644 index 0000000..4b6f79e --- /dev/null +++ b/sprites/adorable-z.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/adorable-z.png-5fdc63fd95e4c69749d0532f2ec2287e.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/adorable-z.png" +dest_files=[ "res://.import/adorable-z.png-5fdc63fd95e4c69749d0532f2ec2287e.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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/sprites/cirria.png b/sprites/cirria.png new file mode 100644 index 0000000..972548f Binary files /dev/null and b/sprites/cirria.png differ diff --git a/sprites/symbols/meet.svg.import b/sprites/cirria.png.import similarity index 70% rename from sprites/symbols/meet.svg.import rename to sprites/cirria.png.import index ce0e22b..4edec68 100644 --- a/sprites/symbols/meet.svg.import +++ b/sprites/cirria.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/meet.svg-01ad78e7fe219a3f705e2a6c758737df.stex" +path="res://.import/cirria.png-f037ba8539ca9e051c75c784f093dc47.stex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/symbols/meet.svg" -dest_files=[ "res://.import/meet.svg-01ad78e7fe219a3f705e2a6c758737df.stex" ] +source_file="res://sprites/cirria.png" +dest_files=[ "res://.import/cirria.png-f037ba8539ca9e051c75c784f093dc47.stex" ] [params] diff --git a/sprites/symbols/calendar.svg b/sprites/symbols/calendar.svg deleted file mode 100644 index 519eb9d..0000000 --- a/sprites/symbols/calendar.svg +++ /dev/null @@ -1,117 +0,0 @@ - -image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sprites/symbols/fast.svg b/sprites/symbols/fast.svg deleted file mode 100644 index 6467cab..0000000 --- a/sprites/symbols/fast.svg +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sprites/symbols/fontawesome/LICENSE b/sprites/symbols/fontawesome/LICENSE new file mode 100644 index 0000000..f987f3d --- /dev/null +++ b/sprites/symbols/fontawesome/LICENSE @@ -0,0 +1,395 @@ +Attribution 4.0 International + +======================================================================= + +Creative Commons Corporation ("Creative Commons") is not a law firm and +does not provide legal services or legal advice. Distribution of +Creative Commons public licenses does not create a lawyer-client or +other relationship. Creative Commons makes its licenses and related +information available on an "as-is" basis. Creative Commons gives no +warranties regarding its licenses, any material licensed under their +terms and conditions, or any related information. Creative Commons +disclaims all liability for damages resulting from their use to the +fullest extent possible. + +Using Creative Commons Public Licenses + +Creative Commons public licenses provide a standard set of terms and +conditions that creators and other rights holders may use to share +original works of authorship and other material subject to copyright +and certain other rights specified in the public license below. The +following considerations are for informational purposes only, are not +exhaustive, and do not form part of our licenses. + + Considerations for licensors: Our public licenses are + intended for use by those authorized to give the public + permission to use material in ways otherwise restricted by + copyright and certain other rights. Our licenses are + irrevocable. Licensors should read and understand the terms + and conditions of the license they choose before applying it. + Licensors should also secure all rights necessary before + applying our licenses so that the public can reuse the + material as expected. Licensors should clearly mark any + material not subject to the license. This includes other CC- + licensed material, or material used under an exception or + limitation to copyright. More considerations for licensors: + wiki.creativecommons.org/Considerations_for_licensors + + Considerations for the public: By using one of our public + licenses, a licensor grants the public permission to use the + licensed material under specified terms and conditions. If + the licensor's permission is not necessary for any reason--for + example, because of any applicable exception or limitation to + copyright--then that use is not regulated by the license. Our + licenses grant only permissions under copyright and certain + other rights that a licensor has authority to grant. Use of + the licensed material may still be restricted for other + reasons, including because others have copyright or other + rights in the material. A licensor may make special requests, + such as asking that all changes be marked or described. + Although not required by our licenses, you are encouraged to + respect those requests where reasonable. More considerations + for the public: + wiki.creativecommons.org/Considerations_for_licensees + +======================================================================= + +Creative Commons Attribution 4.0 International Public License + +By exercising the Licensed Rights (defined below), You accept and agree +to be bound by the terms and conditions of this Creative Commons +Attribution 4.0 International Public License ("Public License"). To the +extent this Public License may be interpreted as a contract, You are +granted the Licensed Rights in consideration of Your acceptance of +these terms and conditions, and the Licensor grants You such rights in +consideration of benefits the Licensor receives from making the +Licensed Material available under these terms and conditions. + + +Section 1 -- Definitions. + + a. Adapted Material means material subject to Copyright and Similar + Rights that is derived from or based upon the Licensed Material + and in which the Licensed Material is translated, altered, + arranged, transformed, or otherwise modified in a manner requiring + permission under the Copyright and Similar Rights held by the + Licensor. For purposes of this Public License, where the Licensed + Material is a musical work, performance, or sound recording, + Adapted Material is always produced where the Licensed Material is + synched in timed relation with a moving image. + + b. Adapter's License means the license You apply to Your Copyright + and Similar Rights in Your contributions to Adapted Material in + accordance with the terms and conditions of this Public License. + + c. Copyright and Similar Rights means copyright and/or similar rights + closely related to copyright including, without limitation, + performance, broadcast, sound recording, and Sui Generis Database + Rights, without regard to how the rights are labeled or + categorized. For purposes of this Public License, the rights + specified in Section 2(b)(1)-(2) are not Copyright and Similar + Rights. + + d. Effective Technological Measures means those measures that, in the + absence of proper authority, may not be circumvented under laws + fulfilling obligations under Article 11 of the WIPO Copyright + Treaty adopted on December 20, 1996, and/or similar international + agreements. + + e. Exceptions and Limitations means fair use, fair dealing, and/or + any other exception or limitation to Copyright and Similar Rights + that applies to Your use of the Licensed Material. + + f. Licensed Material means the artistic or literary work, database, + or other material to which the Licensor applied this Public + License. + + g. Licensed Rights means the rights granted to You subject to the + terms and conditions of this Public License, which are limited to + all Copyright and Similar Rights that apply to Your use of the + Licensed Material and that the Licensor has authority to license. + + h. Licensor means the individual(s) or entity(ies) granting rights + under this Public License. + + i. Share means to provide material to the public by any means or + process that requires permission under the Licensed Rights, such + as reproduction, public display, public performance, distribution, + dissemination, communication, or importation, and to make material + available to the public including in ways that members of the + public may access the material from a place and at a time + individually chosen by them. + + j. Sui Generis Database Rights means rights other than copyright + resulting from Directive 96/9/EC of the European Parliament and of + the Council of 11 March 1996 on the legal protection of databases, + as amended and/or succeeded, as well as other essentially + equivalent rights anywhere in the world. + + k. You means the individual or entity exercising the Licensed Rights + under this Public License. Your has a corresponding meaning. + + +Section 2 -- Scope. + + a. License grant. + + 1. Subject to the terms and conditions of this Public License, + the Licensor hereby grants You a worldwide, royalty-free, + non-sublicensable, non-exclusive, irrevocable license to + exercise the Licensed Rights in the Licensed Material to: + + a. reproduce and Share the Licensed Material, in whole or + in part; and + + b. produce, reproduce, and Share Adapted Material. + + 2. Exceptions and Limitations. For the avoidance of doubt, where + Exceptions and Limitations apply to Your use, this Public + License does not apply, and You do not need to comply with + its terms and conditions. + + 3. Term. The term of this Public License is specified in Section + 6(a). + + 4. Media and formats; technical modifications allowed. The + Licensor authorizes You to exercise the Licensed Rights in + all media and formats whether now known or hereafter created, + and to make technical modifications necessary to do so. The + Licensor waives and/or agrees not to assert any right or + authority to forbid You from making technical modifications + necessary to exercise the Licensed Rights, including + technical modifications necessary to circumvent Effective + Technological Measures. For purposes of this Public License, + simply making modifications authorized by this Section 2(a) + (4) never produces Adapted Material. + + 5. Downstream recipients. + + a. Offer from the Licensor -- Licensed Material. Every + recipient of the Licensed Material automatically + receives an offer from the Licensor to exercise the + Licensed Rights under the terms and conditions of this + Public License. + + b. No downstream restrictions. You may not offer or impose + any additional or different terms or conditions on, or + apply any Effective Technological Measures to, the + Licensed Material if doing so restricts exercise of the + Licensed Rights by any recipient of the Licensed + Material. + + 6. No endorsement. Nothing in this Public License constitutes or + may be construed as permission to assert or imply that You + are, or that Your use of the Licensed Material is, connected + with, or sponsored, endorsed, or granted official status by, + the Licensor or others designated to receive attribution as + provided in Section 3(a)(1)(A)(i). + + b. Other rights. + + 1. Moral rights, such as the right of integrity, are not + licensed under this Public License, nor are publicity, + privacy, and/or other similar personality rights; however, to + the extent possible, the Licensor waives and/or agrees not to + assert any such rights held by the Licensor to the limited + extent necessary to allow You to exercise the Licensed + Rights, but not otherwise. + + 2. Patent and trademark rights are not licensed under this + Public License. + + 3. To the extent possible, the Licensor waives any right to + collect royalties from You for the exercise of the Licensed + Rights, whether directly or through a collecting society + under any voluntary or waivable statutory or compulsory + licensing scheme. In all other cases the Licensor expressly + reserves any right to collect such royalties. + + +Section 3 -- License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the +following conditions. + + a. Attribution. + + 1. If You Share the Licensed Material (including in modified + form), You must: + + a. retain the following if it is supplied by the Licensor + with the Licensed Material: + + i. identification of the creator(s) of the Licensed + Material and any others designated to receive + attribution, in any reasonable manner requested by + the Licensor (including by pseudonym if + designated); + + ii. a copyright notice; + + iii. a notice that refers to this Public License; + + iv. a notice that refers to the disclaimer of + warranties; + + v. a URI or hyperlink to the Licensed Material to the + extent reasonably practicable; + + b. indicate if You modified the Licensed Material and + retain an indication of any previous modifications; and + + c. indicate the Licensed Material is licensed under this + Public License, and include the text of, or the URI or + hyperlink to, this Public License. + + 2. You may satisfy the conditions in Section 3(a)(1) in any + reasonable manner based on the medium, means, and context in + which You Share the Licensed Material. For example, it may be + reasonable to satisfy the conditions by providing a URI or + hyperlink to a resource that includes the required + information. + + 3. If requested by the Licensor, You must remove any of the + information required by Section 3(a)(1)(A) to the extent + reasonably practicable. + + 4. If You Share Adapted Material You produce, the Adapter's + License You apply must not prevent recipients of the Adapted + Material from complying with this Public License. + + +Section 4 -- Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that +apply to Your use of the Licensed Material: + + a. for the avoidance of doubt, Section 2(a)(1) grants You the right + to extract, reuse, reproduce, and Share all or a substantial + portion of the contents of the database; + + b. if You include all or a substantial portion of the database + contents in a database in which You have Sui Generis Database + Rights, then the database in which You have Sui Generis Database + Rights (but not its individual contents) is Adapted Material; and + + c. You must comply with the conditions in Section 3(a) if You Share + all or a substantial portion of the contents of the database. + +For the avoidance of doubt, this Section 4 supplements and does not +replace Your obligations under this Public License where the Licensed +Rights include other Copyright and Similar Rights. + + +Section 5 -- Disclaimer of Warranties and Limitation of Liability. + + a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE + EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS + AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF + ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, + IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, + WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, + ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT + KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT + ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. + + b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE + TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, + NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, + INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, + COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR + USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR + DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR + IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. + + c. The disclaimer of warranties and limitation of liability provided + above shall be interpreted in a manner that, to the extent + possible, most closely approximates an absolute disclaimer and + waiver of all liability. + + +Section 6 -- Term and Termination. + + a. This Public License applies for the term of the Copyright and + Similar Rights licensed here. However, if You fail to comply with + this Public License, then Your rights under this Public License + terminate automatically. + + b. Where Your right to use the Licensed Material has terminated under + Section 6(a), it reinstates: + + 1. automatically as of the date the violation is cured, provided + it is cured within 30 days of Your discovery of the + violation; or + + 2. upon express reinstatement by the Licensor. + + For the avoidance of doubt, this Section 6(b) does not affect any + right the Licensor may have to seek remedies for Your violations + of this Public License. + + c. For the avoidance of doubt, the Licensor may also offer the + Licensed Material under separate terms or conditions or stop + distributing the Licensed Material at any time; however, doing so + will not terminate this Public License. + + d. Sections 1, 5, 6, 7, and 8 survive termination of this Public + License. + + +Section 7 -- Other Terms and Conditions. + + a. The Licensor shall not be bound by any additional or different + terms or conditions communicated by You unless expressly agreed. + + b. Any arrangements, understandings, or agreements regarding the + Licensed Material not stated herein are separate from and + independent of the terms and conditions of this Public License. + + +Section 8 -- Interpretation. + + a. For the avoidance of doubt, this Public License does not, and + shall not be interpreted to, reduce, limit, restrict, or impose + conditions on any use of the Licensed Material that could lawfully + be made without permission under this Public License. + + b. To the extent possible, if any provision of this Public License is + deemed unenforceable, it shall be automatically reformed to the + minimum extent necessary to make it enforceable. If the provision + cannot be reformed, it shall be severed from this Public License + without affecting the enforceability of the remaining terms and + conditions. + + c. No term or condition of this Public License will be waived and no + failure to comply consented to unless expressly agreed to by the + Licensor. + + d. Nothing in this Public License constitutes or may be interpreted + as a limitation upon, or waiver of, any privileges and immunities + that apply to the Licensor or You, including from the legal + processes of any jurisdiction or authority. + + +======================================================================= + +Creative Commons is not a party to its public licenses. +Notwithstanding, Creative Commons may elect to apply one of its public +licenses to material it publishes and in those instances will be +considered the “Licensor.” The text of the Creative Commons public +licenses is dedicated to the public domain under the CC0 Public Domain +Dedication. Except for the limited purpose of indicating that material +is shared under a Creative Commons public license or as otherwise +permitted by the Creative Commons policies published at +creativecommons.org/policies, Creative Commons does not authorize the +use of the trademark "Creative Commons" or any other trademark or logo +of Creative Commons without its prior written consent including, +without limitation, in connection with any unauthorized modifications +to any of its public licenses or any other arrangements, +understandings, or agreements concerning use of licensed material. For +the avoidance of doubt, this paragraph does not form part of the public +licenses. + +Creative Commons may be contacted at creativecommons.org. \ No newline at end of file diff --git a/sprites/symbols/building.svg b/sprites/symbols/fontawesome/building.svg similarity index 100% rename from sprites/symbols/building.svg rename to sprites/symbols/fontawesome/building.svg diff --git a/sprites/symbols/fontawesome/building.svg.import b/sprites/symbols/fontawesome/building.svg.import new file mode 100644 index 0000000..e1bc6f4 --- /dev/null +++ b/sprites/symbols/fontawesome/building.svg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/building.svg-69d7b6000bbe020259a891c8f20ba314.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/symbols/fontawesome/building.svg" +dest_files=[ "res://.import/building.svg-69d7b6000bbe020259a891c8f20ba314.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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/sprites/symbols/fontawesome/calendar.svg b/sprites/symbols/fontawesome/calendar.svg new file mode 100644 index 0000000..3d6e905 --- /dev/null +++ b/sprites/symbols/fontawesome/calendar.svg @@ -0,0 +1,61 @@ + + + + + + image/svg+xml + + + + + + + + + + diff --git a/sprites/symbols/fontawesome/calendar.svg.import b/sprites/symbols/fontawesome/calendar.svg.import new file mode 100644 index 0000000..2cdcb6a --- /dev/null +++ b/sprites/symbols/fontawesome/calendar.svg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/calendar.svg-6636a1009e89a3ffb64fb3e3b42d1859.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/symbols/fontawesome/calendar.svg" +dest_files=[ "res://.import/calendar.svg-6636a1009e89a3ffb64fb3e3b42d1859.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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/sprites/symbols/fontawesome/city.svg b/sprites/symbols/fontawesome/city.svg new file mode 100644 index 0000000..1b4fb9a --- /dev/null +++ b/sprites/symbols/fontawesome/city.svg @@ -0,0 +1,61 @@ + + + + + + image/svg+xml + + + + + + + + + + diff --git a/sprites/symbols/fontawesome/city.svg.import b/sprites/symbols/fontawesome/city.svg.import new file mode 100644 index 0000000..28d13c4 --- /dev/null +++ b/sprites/symbols/fontawesome/city.svg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/city.svg-8d4c29ab828a6ad06f0000da24d8fdf6.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/symbols/fontawesome/city.svg" +dest_files=[ "res://.import/city.svg-8d4c29ab828a6ad06f0000da24d8fdf6.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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/sprites/symbols/fontawesome/cogs.svg b/sprites/symbols/fontawesome/cogs.svg new file mode 100644 index 0000000..5541389 --- /dev/null +++ b/sprites/symbols/fontawesome/cogs.svg @@ -0,0 +1,60 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/sprites/symbols/fontawesome/cogs.svg.import b/sprites/symbols/fontawesome/cogs.svg.import new file mode 100644 index 0000000..1b37e94 --- /dev/null +++ b/sprites/symbols/fontawesome/cogs.svg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/cogs.svg-4981dda10bbfacabb8e193d2031d89fd.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/symbols/fontawesome/cogs.svg" +dest_files=[ "res://.import/cogs.svg-4981dda10bbfacabb8e193d2031d89fd.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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/sprites/symbols/fontawesome/coins.svg b/sprites/symbols/fontawesome/coins.svg new file mode 100644 index 0000000..a06cb27 --- /dev/null +++ b/sprites/symbols/fontawesome/coins.svg @@ -0,0 +1,61 @@ + + + + + + image/svg+xml + + + + + + + + + + diff --git a/sprites/symbols/building.svg.import b/sprites/symbols/fontawesome/coins.svg.import similarity index 69% rename from sprites/symbols/building.svg.import rename to sprites/symbols/fontawesome/coins.svg.import index 7cc2ef9..076addd 100644 --- a/sprites/symbols/building.svg.import +++ b/sprites/symbols/fontawesome/coins.svg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/building.svg-565a4a6da30528637c52860f03f9ac31.stex" +path="res://.import/coins.svg-70f9299636a88850d5eb95148ff6bdbb.stex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/symbols/building.svg" -dest_files=[ "res://.import/building.svg-565a4a6da30528637c52860f03f9ac31.stex" ] +source_file="res://sprites/symbols/fontawesome/coins.svg" +dest_files=[ "res://.import/coins.svg-70f9299636a88850d5eb95148ff6bdbb.stex" ] [params] diff --git a/sprites/symbols/fontawesome/comments.svg b/sprites/symbols/fontawesome/comments.svg new file mode 100644 index 0000000..99ce02a --- /dev/null +++ b/sprites/symbols/fontawesome/comments.svg @@ -0,0 +1,61 @@ + + + + + + image/svg+xml + + + + + + + + + + diff --git a/sprites/symbols/fontawesome/comments.svg.import b/sprites/symbols/fontawesome/comments.svg.import new file mode 100644 index 0000000..840d1f2 --- /dev/null +++ b/sprites/symbols/fontawesome/comments.svg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/comments.svg-87f0c0915dbf4e8af165e7e429a57326.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/symbols/fontawesome/comments.svg" +dest_files=[ "res://.import/comments.svg-87f0c0915dbf4e8af165e7e429a57326.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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/sprites/symbols/fontawesome/envelope-open.svg b/sprites/symbols/fontawesome/envelope-open.svg new file mode 100644 index 0000000..8159a74 --- /dev/null +++ b/sprites/symbols/fontawesome/envelope-open.svg @@ -0,0 +1,61 @@ + + + + + + image/svg+xml + + + + + + + + + + diff --git a/sprites/symbols/fontawesome/envelope-open.svg.import b/sprites/symbols/fontawesome/envelope-open.svg.import new file mode 100644 index 0000000..02b4c43 --- /dev/null +++ b/sprites/symbols/fontawesome/envelope-open.svg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/envelope-open.svg-eddd32f621a1eac220839f0f75d96fd0.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/symbols/fontawesome/envelope-open.svg" +dest_files=[ "res://.import/envelope-open.svg-eddd32f621a1eac220839f0f75d96fd0.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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/sprites/symbols/fontawesome/envelope.svg b/sprites/symbols/fontawesome/envelope.svg new file mode 100644 index 0000000..4ee81c8 --- /dev/null +++ b/sprites/symbols/fontawesome/envelope.svg @@ -0,0 +1,61 @@ + + + + + + image/svg+xml + + + + + + + + + + diff --git a/sprites/symbols/fontawesome/envelope.svg.import b/sprites/symbols/fontawesome/envelope.svg.import new file mode 100644 index 0000000..95946ec --- /dev/null +++ b/sprites/symbols/fontawesome/envelope.svg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/envelope.svg-0827bc4ba1ff6848614b2ab7b4b72834.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/symbols/fontawesome/envelope.svg" +dest_files=[ "res://.import/envelope.svg-0827bc4ba1ff6848614b2ab7b4b72834.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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/sprites/symbols/fontawesome/fast.svg b/sprites/symbols/fontawesome/fast.svg new file mode 100644 index 0000000..1dbb80d --- /dev/null +++ b/sprites/symbols/fontawesome/fast.svg @@ -0,0 +1,119 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sprites/symbols/fast.svg.import b/sprites/symbols/fontawesome/fast.svg.import similarity index 70% rename from sprites/symbols/fast.svg.import rename to sprites/symbols/fontawesome/fast.svg.import index d667997..d80d2fb 100644 --- a/sprites/symbols/fast.svg.import +++ b/sprites/symbols/fontawesome/fast.svg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/fast.svg-ed2ede9e5f07eaa54eda00268034b8f2.stex" +path="res://.import/fast.svg-0e5f26df08f9dba97ccf4b880eb0ee06.stex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/symbols/fast.svg" -dest_files=[ "res://.import/fast.svg-ed2ede9e5f07eaa54eda00268034b8f2.stex" ] +source_file="res://sprites/symbols/fontawesome/fast.svg" +dest_files=[ "res://.import/fast.svg-0e5f26df08f9dba97ccf4b880eb0ee06.stex" ] [params] diff --git a/sprites/symbols/fontawesome/folder-open.svg b/sprites/symbols/fontawesome/folder-open.svg new file mode 100644 index 0000000..1b0852d --- /dev/null +++ b/sprites/symbols/fontawesome/folder-open.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/sprites/symbols/fontawesome/folder-open.svg.import b/sprites/symbols/fontawesome/folder-open.svg.import new file mode 100644 index 0000000..312be46 --- /dev/null +++ b/sprites/symbols/fontawesome/folder-open.svg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/folder-open.svg-8470fba77683e1b2241aa1ad8cf986be.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/symbols/fontawesome/folder-open.svg" +dest_files=[ "res://.import/folder-open.svg-8470fba77683e1b2241aa1ad8cf986be.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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/sprites/symbols/fontawesome/folder.svg b/sprites/symbols/fontawesome/folder.svg new file mode 100644 index 0000000..3351c67 --- /dev/null +++ b/sprites/symbols/fontawesome/folder.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/sprites/symbols/calendar.svg.import b/sprites/symbols/fontawesome/folder.svg.import similarity index 68% rename from sprites/symbols/calendar.svg.import rename to sprites/symbols/fontawesome/folder.svg.import index bf5be5c..d033e6f 100644 --- a/sprites/symbols/calendar.svg.import +++ b/sprites/symbols/fontawesome/folder.svg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/calendar.svg-4fbe4e8ff7750f8c6b821d1ab5f5b51e.stex" +path="res://.import/folder.svg-ce833f26ffea4200cf08eaf8a14c25b9.stex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/symbols/calendar.svg" -dest_files=[ "res://.import/calendar.svg-4fbe4e8ff7750f8c6b821d1ab5f5b51e.stex" ] +source_file="res://sprites/symbols/fontawesome/folder.svg" +dest_files=[ "res://.import/folder.svg-ce833f26ffea4200cf08eaf8a14c25b9.stex" ] [params] diff --git a/sprites/symbols/github-sign.svg b/sprites/symbols/fontawesome/github-sign.svg similarity index 100% rename from sprites/symbols/github-sign.svg rename to sprites/symbols/fontawesome/github-sign.svg diff --git a/sprites/symbols/fontawesome/github-sign.svg.import b/sprites/symbols/fontawesome/github-sign.svg.import new file mode 100644 index 0000000..7ea2e91 --- /dev/null +++ b/sprites/symbols/fontawesome/github-sign.svg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/github-sign.svg-71b663b9b6ce68b4de56f57fe829d93f.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/symbols/fontawesome/github-sign.svg" +dest_files=[ "res://.import/github-sign.svg-71b663b9b6ce68b4de56f57fe829d93f.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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/sprites/symbols/graph.svg b/sprites/symbols/fontawesome/graph.svg similarity index 100% rename from sprites/symbols/graph.svg rename to sprites/symbols/fontawesome/graph.svg diff --git a/sprites/symbols/graph.svg.import b/sprites/symbols/fontawesome/graph.svg.import similarity index 70% rename from sprites/symbols/graph.svg.import rename to sprites/symbols/fontawesome/graph.svg.import index 7c14d76..27529ed 100644 --- a/sprites/symbols/graph.svg.import +++ b/sprites/symbols/fontawesome/graph.svg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/graph.svg-a3897e2373c1268fce188530eba003b4.stex" +path="res://.import/graph.svg-3cca1cfea19f93fea6bdd718139de3c3.stex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/symbols/graph.svg" -dest_files=[ "res://.import/graph.svg-a3897e2373c1268fce188530eba003b4.stex" ] +source_file="res://sprites/symbols/fontawesome/graph.svg" +dest_files=[ "res://.import/graph.svg-3cca1cfea19f93fea6bdd718139de3c3.stex" ] [params] diff --git a/sprites/symbols/fontawesome/layer-group.svg b/sprites/symbols/fontawesome/layer-group.svg new file mode 100644 index 0000000..ffdc26b --- /dev/null +++ b/sprites/symbols/fontawesome/layer-group.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/sprites/symbols/fontawesome/layer-group.svg.import b/sprites/symbols/fontawesome/layer-group.svg.import new file mode 100644 index 0000000..8baa0bb --- /dev/null +++ b/sprites/symbols/fontawesome/layer-group.svg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/layer-group.svg-6827368c0c6ce14e2c955dfa928a3176.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/symbols/fontawesome/layer-group.svg" +dest_files=[ "res://.import/layer-group.svg-6827368c0c6ce14e2c955dfa928a3176.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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/sprites/symbols/meet.svg b/sprites/symbols/fontawesome/meet.svg similarity index 100% rename from sprites/symbols/meet.svg rename to sprites/symbols/fontawesome/meet.svg diff --git a/sprites/symbols/fontawesome/meet.svg.import b/sprites/symbols/fontawesome/meet.svg.import new file mode 100644 index 0000000..6226e36 --- /dev/null +++ b/sprites/symbols/fontawesome/meet.svg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/meet.svg-eb48f1b7416ddbdba594a6fa9cbd82c0.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/symbols/fontawesome/meet.svg" +dest_files=[ "res://.import/meet.svg-eb48f1b7416ddbdba594a6fa9cbd82c0.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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/sprites/symbols/fontawesome/pie-chart.svg b/sprites/symbols/fontawesome/pie-chart.svg new file mode 100644 index 0000000..c3af962 --- /dev/null +++ b/sprites/symbols/fontawesome/pie-chart.svg @@ -0,0 +1,61 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/sprites/symbols/fontawesome/pie-chart.svg.import b/sprites/symbols/fontawesome/pie-chart.svg.import new file mode 100644 index 0000000..556f553 --- /dev/null +++ b/sprites/symbols/fontawesome/pie-chart.svg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/pie-chart.svg-606a3d27b54db4d7f8cfb319ab1e17a4.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/symbols/fontawesome/pie-chart.svg" +dest_files=[ "res://.import/pie-chart.svg-606a3d27b54db4d7f8cfb319ab1e17a4.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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/sprites/symbols/population.svg b/sprites/symbols/fontawesome/population.svg similarity index 100% rename from sprites/symbols/population.svg rename to sprites/symbols/fontawesome/population.svg diff --git a/sprites/symbols/population.svg.import b/sprites/symbols/fontawesome/population.svg.import similarity index 67% rename from sprites/symbols/population.svg.import rename to sprites/symbols/fontawesome/population.svg.import index 46efca1..e2310a3 100644 --- a/sprites/symbols/population.svg.import +++ b/sprites/symbols/fontawesome/population.svg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/population.svg-3d56f4f7e17f6028aa5b7980dc8fdf72.stex" +path="res://.import/population.svg-043590508eea1d73848ec90a0110280c.stex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/symbols/population.svg" -dest_files=[ "res://.import/population.svg-3d56f4f7e17f6028aa5b7980dc8fdf72.stex" ] +source_file="res://sprites/symbols/fontawesome/population.svg" +dest_files=[ "res://.import/population.svg-043590508eea1d73848ec90a0110280c.stex" ] [params] diff --git a/sprites/symbols/fontawesome/question-circle.svg b/sprites/symbols/fontawesome/question-circle.svg new file mode 100644 index 0000000..36e1571 --- /dev/null +++ b/sprites/symbols/fontawesome/question-circle.svg @@ -0,0 +1,61 @@ + + + + + + image/svg+xml + + + + + + + + + + diff --git a/sprites/symbols/fontawesome/question-circle.svg.import b/sprites/symbols/fontawesome/question-circle.svg.import new file mode 100644 index 0000000..fbc107d --- /dev/null +++ b/sprites/symbols/fontawesome/question-circle.svg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/question-circle.svg-904864308a73f59a2589b236f1cdc0a1.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/symbols/fontawesome/question-circle.svg" +dest_files=[ "res://.import/question-circle.svg-904864308a73f59a2589b236f1cdc0a1.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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/sprites/symbols/fontawesome/slow.svg b/sprites/symbols/fontawesome/slow.svg new file mode 100644 index 0000000..81b64b9 --- /dev/null +++ b/sprites/symbols/fontawesome/slow.svg @@ -0,0 +1,117 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sprites/symbols/slow.svg.import b/sprites/symbols/fontawesome/slow.svg.import similarity index 70% rename from sprites/symbols/slow.svg.import rename to sprites/symbols/fontawesome/slow.svg.import index bb39d2c..cf6f6f1 100644 --- a/sprites/symbols/slow.svg.import +++ b/sprites/symbols/fontawesome/slow.svg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/slow.svg-1edfad60d84ce0c376f5c18d7946a2da.stex" +path="res://.import/slow.svg-7c07a3120e693626de47e81cb7f351a2.stex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/symbols/slow.svg" -dest_files=[ "res://.import/slow.svg-1edfad60d84ce0c376f5c18d7946a2da.stex" ] +source_file="res://sprites/symbols/fontawesome/slow.svg" +dest_files=[ "res://.import/slow.svg-7c07a3120e693626de47e81cb7f351a2.stex" ] [params] diff --git a/sprites/symbols/fontawesome/spinner.svg b/sprites/symbols/fontawesome/spinner.svg new file mode 100644 index 0000000..102b22f --- /dev/null +++ b/sprites/symbols/fontawesome/spinner.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/sprites/symbols/github-sign.svg.import b/sprites/symbols/fontawesome/spinner.svg.import similarity index 68% rename from sprites/symbols/github-sign.svg.import rename to sprites/symbols/fontawesome/spinner.svg.import index de9bd96..c9cd528 100644 --- a/sprites/symbols/github-sign.svg.import +++ b/sprites/symbols/fontawesome/spinner.svg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/github-sign.svg-206b3863570889f5db50a3777e9d6707.stex" +path="res://.import/spinner.svg-4415e9a3f05430fe303e0221221333c9.stex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/symbols/github-sign.svg" -dest_files=[ "res://.import/github-sign.svg-206b3863570889f5db50a3777e9d6707.stex" ] +source_file="res://sprites/symbols/fontawesome/spinner.svg" +dest_files=[ "res://.import/spinner.svg-4415e9a3f05430fe303e0221221333c9.stex" ] [params] diff --git a/sprites/symbols/fontawesome/thumbs-down.svg b/sprites/symbols/fontawesome/thumbs-down.svg new file mode 100644 index 0000000..d4aa742 --- /dev/null +++ b/sprites/symbols/fontawesome/thumbs-down.svg @@ -0,0 +1,61 @@ + + + + + + image/svg+xml + + + + + + + + + + diff --git a/sprites/symbols/fontawesome/thumbs-down.svg.import b/sprites/symbols/fontawesome/thumbs-down.svg.import new file mode 100644 index 0000000..cacf32d --- /dev/null +++ b/sprites/symbols/fontawesome/thumbs-down.svg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/thumbs-down.svg-51ba8a083698a3a5912563d5f4254dee.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/symbols/fontawesome/thumbs-down.svg" +dest_files=[ "res://.import/thumbs-down.svg-51ba8a083698a3a5912563d5f4254dee.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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/sprites/symbols/fontawesome/thumbs-up.svg b/sprites/symbols/fontawesome/thumbs-up.svg new file mode 100644 index 0000000..5362c7f --- /dev/null +++ b/sprites/symbols/fontawesome/thumbs-up.svg @@ -0,0 +1,61 @@ + + + + + + image/svg+xml + + + + + + + + + + diff --git a/sprites/symbols/fontawesome/thumbs-up.svg.import b/sprites/symbols/fontawesome/thumbs-up.svg.import new file mode 100644 index 0000000..f163f5f --- /dev/null +++ b/sprites/symbols/fontawesome/thumbs-up.svg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/thumbs-up.svg-958754712d05659a28bf9ef95c9deb5a.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/symbols/fontawesome/thumbs-up.svg" +dest_files=[ "res://.import/thumbs-up.svg-958754712d05659a28bf9ef95c9deb5a.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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/sprites/symbols/slow.svg b/sprites/symbols/slow.svg deleted file mode 100644 index 4f96719..0000000 --- a/sprites/symbols/slow.svg +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -