diff --git a/README.md b/README.md index 203cdc5..4882738 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ![Screenshot](screenshot.png) -A city building game based on Godot using the Micropolis assets (initially). +City Limits is a reimagining of SimCity Classic that contains features and concepts from later iterations. Such as advisors, free zones, news tickers, neighboring cities, and so on. ## Getting Started @@ -17,17 +17,6 @@ A city building game based on Godot using the Micropolis assets (initially). See also the list of [contributors](https://github.com/tonytins/citylimits/contributors) who participated in this project. -## To-do - -With the exception of the world generator, this isn't any real order. - -- [x] Map generator -- [x] Currency -- [x] Mayor mode -- [ ] Save & load maps - -Note: this is subject to change in the future. - ## License This project is licensed under the Artistic-2.0 License - see the [LICENSE](LICENSE) file for details diff --git a/dialog/cityplanner.json b/dialog/cityplanner.json index b473ab0..b581019 100644 --- a/dialog/cityplanner.json +++ b/dialog/cityplanner.json @@ -1,6 +1,6 @@ { "1": { "name": "Roll up your sleeves, Mayor!", - "text": "Welcome to City Limits! I'm Zack, and I'll be your city planner." + "text": "Welcome to City Limits! I'm Zack, and I'll be your city planner. I'll help you with zoning, land values, and handling connections to and from the city." } } \ No newline at end of file diff --git a/dialog/finacial.json b/dialog/finacial.json new file mode 100644 index 0000000..5ce9410 --- /dev/null +++ b/dialog/finacial.json @@ -0,0 +1,6 @@ +{ + "1": { + "name": "Let's get number crunching.", + "text": "Hello, Mayor, I'm Kit Welsh. I'll be your financial advisor. I control the income and expenditures for your city. I'll keep you up-to-date on expenditures and let you know if we may need to lower or rise taxes." + } +} \ No newline at end of file diff --git a/project.godot b/project.godot index e2fa911..d38f13f 100644 --- a/project.godot +++ b/project.godot @@ -39,9 +39,7 @@ enabled=PoolStringArray( ) ui_cheats={ "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":16777238,"unicode":0,"echo":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":16777237,"unicode":0,"echo":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":67,"unicode":0,"echo":false,"script":null) +"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":96,"unicode":0,"echo":false,"script":null) ] } diff --git a/scenes/Credits.tscn b/scenes/Credits.tscn new file mode 100644 index 0000000..253b057 --- /dev/null +++ b/scenes/Credits.tscn @@ -0,0 +1,46 @@ +[gd_scene format=2] + +[node name="Credits" type="WindowDialog"] +visible = true +anchor_left = 0.394043 +anchor_top = 0.293333 +anchor_right = 0.605957 +anchor_bottom = 0.706667 +window_title = "Credits" +__meta__ = { +"_edit_use_anchors_": true +} + +[node name="RichText" type="RichTextLabel" parent="."] +anchor_right = 1.0 +anchor_bottom = 1.0 +bbcode_enabled = true +bbcode_text = "[center] +Developed by +Tony Bark + +Assets by +Maxis + +Powered by +Godot Engine + +Inspired by +SimCity +[/center]" +text = " +Developed by +Tony Bark + +Assets by +Maxis + +Powered by +Godot Engine + +Inspired by +SimCity +" +__meta__ = { +"_edit_use_anchors_": false +} diff --git a/scenes/DebugConsole.tscn b/scenes/DebugConsole.tscn new file mode 100644 index 0000000..63a96d7 --- /dev/null +++ b/scenes/DebugConsole.tscn @@ -0,0 +1,30 @@ +[gd_scene load_steps=2 format=2] + +[ext_resource path="res://scripts/debug_console.gd" type="Script" id=1] + +[node name="DebugConsole" type="Control"] +anchor_right = 1.0 +margin_bottom = 113.0 +script = ExtResource( 1 ) +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Output" type="TextEdit" parent="."] +anchor_right = 1.0 +anchor_bottom = 0.752212 +readonly = true +wrap_enabled = true +__meta__ = { +"_edit_use_anchors_": true +} + +[node name="Input" type="LineEdit" parent="."] +anchor_top = 0.787611 +anchor_right = 1.0 +anchor_bottom = 1.0 +caret_blink = true +caret_blink_speed = 0.5 +__meta__ = { +"_edit_use_anchors_": true +} diff --git a/scenes/advisors/Advise.tscn b/scenes/advisors/Advise.tscn index f7a5592..1e44fa0 100644 --- a/scenes/advisors/Advise.tscn +++ b/scenes/advisors/Advise.tscn @@ -1,8 +1,11 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://sprites/avatars/zc.png" type="Texture" id=1] [ext_resource path="res://scripts/Adviser.gd" type="Script" id=2] +[sub_resource type="StreamTexture" id=1] +flags = 4 +load_path = "res://.import/zc.png-c7ffa83bf28af8def63c79202632e383.stex" + [node name="AdvsiorNotice" type="AcceptDialog"] anchor_left = 0.293945 anchor_top = 0.303333 @@ -13,9 +16,9 @@ __meta__ = { "_edit_use_anchors_": true } dialogue_file = "res://dialog/cityplanner.json" -advisor_name = "Zack Casey" +character = "Zack Casey" rank = "City Planner" -avatar = ExtResource( 1 ) +avatar = SubResource( 1 ) [node name="Container" type="HSplitContainer" parent="."] anchor_right = 1.0 diff --git a/scenes/game.tscn b/scenes/game.tscn index b2affd4..13be3c9 100644 --- a/scenes/game.tscn +++ b/scenes/game.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=29 format=2] +[gd_scene load_steps=31 format=2] [ext_resource path="res://scenes/Map.tscn" type="PackedScene" id=1] [ext_resource path="res://scenes/advisors/Advise.tscn" type="PackedScene" id=2] @@ -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://sprites/ui/demandg.png" type="Texture" id=21] +[ext_resource path="res://scenes/DebugConsole.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] @@ -28,6 +28,8 @@ [ext_resource path="res://sprites/ui/icseap.png" type="Texture" id=26] [ext_resource path="res://sprites/ui/icseaphi.png" type="Texture" id=27] [ext_resource path="res://sprites/ui/icstad.png" type="Texture" id=28] +[ext_resource path="res://scripts/core_gui.gd" type="Script" id=29] +[ext_resource path="res://sprites/avatars/zc.png" type="Texture" id=30] [node name="Game" type="Node2D"] script = ExtResource( 20 ) @@ -40,7 +42,7 @@ autostart = true [node name="Controls" type="CanvasLayer" parent="."] -[node name="GUI" type="Control" parent="Controls"] +[node name="Core" type="Control" parent="Controls"] anchor_left = -0.000731155 anchor_top = -0.000954026 anchor_right = 0.999269 @@ -49,14 +51,23 @@ margin_left = -0.172424 margin_top = 2.77234 margin_right = -0.172424 margin_bottom = 2.77234 +script = ExtResource( 29 ) __meta__ = { "_edit_use_anchors_": false } -[node name="AdvsiorNotice" parent="Controls/GUI" instance=ExtResource( 2 )] +[node name="Console" parent="Controls/Core" instance=ExtResource( 21 )] +visible = false +anchor_left = 0.00585937 +anchor_right = 0.994141 +anchor_bottom = 0.185 +margin_bottom = 0.0 -[node name="StatusPanel" type="Panel" parent="Controls/GUI"] -anchor_left = 0.517578 +[node name="AdvsiorNotice" parent="Controls/Core" instance=ExtResource( 2 )] +avatar = ExtResource( 30 ) + +[node name="StatusPanel" type="Panel" parent="Controls/Core"] +anchor_left = 0.52832 anchor_top = 0.830002 anchor_right = 0.640625 anchor_bottom = 1.0 @@ -64,45 +75,38 @@ __meta__ = { "_edit_use_anchors_": true } -[node name="StatusCtr" type="CenterContainer" parent="Controls/GUI/StatusPanel"] +[node name="StatusCtr" type="CenterContainer" parent="Controls/Core/StatusPanel"] anchor_right = 1.0 anchor_bottom = 1.0 __meta__ = { "_edit_use_anchors_": false } -[node name="StatBox" type="HBoxContainer" parent="Controls/GUI/StatusPanel/StatusCtr"] -margin_left = 8.0 -margin_top = 25.0 -margin_right = 117.0 -margin_bottom = 75.0 -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="InfoBox" type="VBoxContainer" parent="Controls/GUI/StatusPanel/StatusCtr/StatBox"] -margin_right = 66.0 -margin_bottom = 50.0 +[node name="InfoBox" type="VBoxContainer" parent="Controls/Core/StatusPanel/StatusCtr"] +margin_left = 24.0 +margin_top = 26.0 +margin_right = 90.0 +margin_bottom = 76.0 alignment = 1 script = ExtResource( 3 ) __meta__ = { "_edit_use_anchors_": false } -[node name="CityNameLbl" type="Label" parent="Controls/GUI/StatusPanel/StatusCtr/StatBox/InfoBox"] +[node name="CityNameLbl" type="Label" parent="Controls/Core/StatusPanel/StatusCtr/InfoBox"] margin_right = 66.0 margin_bottom = 14.0 text = "City Name" align = 1 -[node name="YearLbl" type="Label" parent="Controls/GUI/StatusPanel/StatusCtr/StatBox/InfoBox"] +[node name="YearLbl" type="Label" parent="Controls/Core/StatusPanel/StatusCtr/InfoBox"] margin_top = 18.0 margin_right = 66.0 margin_bottom = 32.0 text = "Y1980" align = 1 -[node name="Money" type="HBoxContainer" parent="Controls/GUI/StatusPanel/StatusCtr/StatBox/InfoBox"] +[node name="Money" type="HBoxContainer" parent="Controls/Core/StatusPanel/StatusCtr/InfoBox"] margin_top = 36.0 margin_right = 66.0 margin_bottom = 50.0 @@ -111,36 +115,19 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="CurrencyLbl" type="Label" parent="Controls/GUI/StatusPanel/StatusCtr/StatBox/InfoBox/Money"] +[node name="CurrencyLbl" type="Label" parent="Controls/Core/StatusPanel/StatusCtr/InfoBox/Money"] margin_left = 23.0 margin_right = 30.0 margin_bottom = 14.0 text = "ยง" -[node name="MoneyLbl" type="Label" parent="Controls/GUI/StatusPanel/StatusCtr/StatBox/InfoBox/Money"] +[node name="MoneyLbl" type="Label" parent="Controls/Core/StatusPanel/StatusCtr/InfoBox/Money"] margin_left = 34.0 margin_right = 42.0 margin_bottom = 14.0 text = "0" -[node name="RciBox" type="CenterContainer" parent="Controls/GUI/StatusPanel/StatusCtr/StatBox"] -margin_left = 70.0 -margin_right = 109.0 -margin_bottom = 50.0 -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="RciBtn" type="TextureButton" parent="Controls/GUI/StatusPanel/StatusCtr/StatBox/RciBox"] -margin_top = 1.0 -margin_right = 39.0 -margin_bottom = 48.0 -texture_normal = ExtResource( 21 ) -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="BuyPanel" type="Panel" parent="Controls/GUI"] +[node name="BuyPanel" type="Panel" parent="Controls/Core"] anchor_left = 1.0 anchor_top = 1.0 anchor_right = 1.0 @@ -153,7 +140,7 @@ __meta__ = { "_edit_use_anchors_": true } -[node name="Tabs" type="TabContainer" parent="Controls/GUI/BuyPanel"] +[node name="Tabs" type="TabContainer" parent="Controls/Core/BuyPanel"] anchor_left = 0.00144509 anchor_top = -0.0294118 anchor_right = 1.0 @@ -162,7 +149,7 @@ __meta__ = { "_edit_use_anchors_": true } -[node name="Zones" type="Tabs" parent="Controls/GUI/BuyPanel/Tabs"] +[node name="Zones" type="Tabs" parent="Controls/Core/BuyPanel/Tabs"] anchor_right = 1.0 anchor_bottom = 1.0 margin_left = 4.0 @@ -170,34 +157,34 @@ margin_top = 32.0 margin_right = -4.0 margin_bottom = -4.0 -[node name="ZonesCtr" type="HBoxContainer" parent="Controls/GUI/BuyPanel/Tabs/Zones"] +[node name="ZonesCtr" type="HBoxContainer" parent="Controls/Core/BuyPanel/Tabs/Zones"] anchor_right = 1.0 anchor_bottom = 1.0 __meta__ = { "_edit_use_anchors_": false } -[node name="ResBtn" type="TextureButton" parent="Controls/GUI/BuyPanel/Tabs/Zones/ZonesCtr"] +[node name="ResBtn" type="TextureButton" parent="Controls/Core/BuyPanel/Tabs/Zones/ZonesCtr"] margin_right = 34.0 margin_bottom = 69.0 texture_normal = ExtResource( 9 ) texture_pressed = ExtResource( 10 ) -[node name="ComBtn" type="TextureButton" parent="Controls/GUI/BuyPanel/Tabs/Zones/ZonesCtr"] +[node name="ComBtn" type="TextureButton" parent="Controls/Core/BuyPanel/Tabs/Zones/ZonesCtr"] margin_left = 38.0 margin_right = 72.0 margin_bottom = 69.0 texture_normal = ExtResource( 5 ) texture_pressed = ExtResource( 8 ) -[node name="IndBtn" type="TextureButton" parent="Controls/GUI/BuyPanel/Tabs/Zones/ZonesCtr"] +[node name="IndBtn" type="TextureButton" parent="Controls/Core/BuyPanel/Tabs/Zones/ZonesCtr"] margin_left = 76.0 margin_right = 110.0 margin_bottom = 69.0 texture_normal = ExtResource( 13 ) texture_pressed = ExtResource( 12 ) -[node name="Small" type="Tabs" parent="Controls/GUI/BuyPanel/Tabs"] +[node name="Small" type="Tabs" parent="Controls/Core/BuyPanel/Tabs"] visible = false anchor_right = 1.0 anchor_bottom = 1.0 @@ -206,7 +193,7 @@ margin_top = 32.0 margin_right = -4.0 margin_bottom = -4.0 -[node name="SmallCtr" type="HBoxContainer" parent="Controls/GUI/BuyPanel/Tabs/Small"] +[node name="SmallCtr" type="HBoxContainer" parent="Controls/Core/BuyPanel/Tabs/Small"] anchor_right = 1.0 anchor_bottom = 1.41667 margin_bottom = -10.0 @@ -214,27 +201,27 @@ __meta__ = { "_edit_use_anchors_": true } -[node name="PoliceBtn" type="TextureButton" parent="Controls/GUI/BuyPanel/Tabs/Small/SmallCtr"] +[node name="PoliceBtn" type="TextureButton" parent="Controls/Core/BuyPanel/Tabs/Small/SmallCtr"] margin_right = 34.0 margin_bottom = 34.0 texture_normal = ExtResource( 4 ) texture_pressed = ExtResource( 16 ) -[node name="FireBtn" type="TextureButton" parent="Controls/GUI/BuyPanel/Tabs/Small/SmallCtr"] +[node name="FireBtn" type="TextureButton" parent="Controls/Core/BuyPanel/Tabs/Small/SmallCtr"] margin_left = 38.0 margin_right = 72.0 margin_bottom = 34.0 texture_normal = ExtResource( 6 ) texture_pressed = ExtResource( 11 ) -[node name="ParkBtn" type="TextureButton" parent="Controls/GUI/BuyPanel/Tabs/Small/SmallCtr"] +[node name="ParkBtn" type="TextureButton" parent="Controls/Core/BuyPanel/Tabs/Small/SmallCtr"] margin_left = 76.0 margin_right = 110.0 margin_bottom = 34.0 texture_normal = ExtResource( 24 ) texture_pressed = ExtResource( 22 ) -[node name="Large" type="Tabs" parent="Controls/GUI/BuyPanel/Tabs"] +[node name="Large" type="Tabs" parent="Controls/Core/BuyPanel/Tabs"] visible = false anchor_right = 1.0 anchor_bottom = 1.0 @@ -243,40 +230,40 @@ margin_top = 32.0 margin_right = -4.0 margin_bottom = -4.0 -[node name="LargeCtr" type="HBoxContainer" parent="Controls/GUI/BuyPanel/Tabs/Large"] +[node name="LargeCtr" type="HBoxContainer" parent="Controls/Core/BuyPanel/Tabs/Large"] anchor_right = 1.0 anchor_bottom = 1.0 __meta__ = { "_edit_use_anchors_": false } -[node name="TextureButton" type="TextureButton" parent="Controls/GUI/BuyPanel/Tabs/Large/LargeCtr"] +[node name="TextureButton" type="TextureButton" parent="Controls/Core/BuyPanel/Tabs/Large/LargeCtr"] margin_right = 42.0 margin_bottom = 69.0 texture_normal = ExtResource( 28 ) -[node name="TextureButton2" type="TextureButton" parent="Controls/GUI/BuyPanel/Tabs/Large/LargeCtr"] +[node name="TextureButton2" type="TextureButton" parent="Controls/Core/BuyPanel/Tabs/Large/LargeCtr"] margin_left = 46.0 margin_right = 88.0 margin_bottom = 69.0 texture_normal = ExtResource( 26 ) texture_pressed = ExtResource( 27 ) -[node name="NuclearBtn" type="TextureButton" parent="Controls/GUI/BuyPanel/Tabs/Large/LargeCtr"] +[node name="NuclearBtn" type="TextureButton" parent="Controls/Core/BuyPanel/Tabs/Large/LargeCtr"] margin_left = 92.0 margin_right = 134.0 margin_bottom = 69.0 texture_normal = ExtResource( 23 ) texture_pressed = ExtResource( 25 ) -[node name="CoalBtn" type="TextureButton" parent="Controls/GUI/BuyPanel/Tabs/Large/LargeCtr"] +[node name="CoalBtn" type="TextureButton" parent="Controls/Core/BuyPanel/Tabs/Large/LargeCtr"] margin_left = 138.0 margin_right = 180.0 margin_bottom = 69.0 texture_normal = ExtResource( 19 ) texture_pressed = ExtResource( 18 ) -[node name="Tools" type="Tabs" parent="Controls/GUI/BuyPanel/Tabs"] +[node name="Tools" type="Tabs" parent="Controls/Core/BuyPanel/Tabs"] visible = false anchor_right = 1.0 anchor_bottom = 1.0 @@ -285,20 +272,20 @@ margin_top = 32.0 margin_right = -4.0 margin_bottom = -4.0 -[node name="ToolsCtr" type="HBoxContainer" parent="Controls/GUI/BuyPanel/Tabs/Tools"] +[node name="ToolsCtr" type="HBoxContainer" parent="Controls/Core/BuyPanel/Tabs/Tools"] anchor_right = 1.33228 anchor_bottom = 2.83333 __meta__ = { "_edit_use_anchors_": true } -[node name="InfoBtn" type="TextureButton" parent="Controls/GUI/BuyPanel/Tabs/Tools/ToolsCtr"] +[node name="InfoBtn" type="TextureButton" parent="Controls/Core/BuyPanel/Tabs/Tools/ToolsCtr"] margin_right = 34.0 margin_bottom = 68.0 texture_normal = ExtResource( 15 ) texture_pressed = ExtResource( 14 ) -[node name="BulldozeBtn" type="TextureButton" parent="Controls/GUI/BuyPanel/Tabs/Tools/ToolsCtr"] +[node name="BulldozeBtn" type="TextureButton" parent="Controls/Core/BuyPanel/Tabs/Tools/ToolsCtr"] margin_left = 38.0 margin_right = 72.0 margin_bottom = 68.0 @@ -309,5 +296,5 @@ __meta__ = { } [connection signal="timeout" from="Quarters" to="." method="_on_Quarters_timeout"] -[connection signal="pressed" from="Controls/GUI/BuyPanel/Tabs/Zones/ZonesCtr/ResBtn" to="Map" method="_on_ResBtn_pressed"] -[connection signal="pressed" from="Controls/GUI/BuyPanel/Tabs/Large/LargeCtr/CoalBtn" to="Map" method="_on_CoalBtn_pressed"] +[connection signal="pressed" from="Controls/Core/BuyPanel/Tabs/Zones/ZonesCtr/ResBtn" to="Map" method="_on_ResBtn_pressed"] +[connection signal="pressed" from="Controls/Core/BuyPanel/Tabs/Large/LargeCtr/CoalBtn" to="Map" method="_on_CoalBtn_pressed"] diff --git a/scripts/Adviser.gd b/scripts/Adviser.gd index 5a1cf0d..26ca3b3 100644 --- a/scripts/Adviser.gd +++ b/scripts/Adviser.gd @@ -1,7 +1,8 @@ extends AcceptDialog export(String, FILE, "*.json") var dialogue_file -export var advisor_name: String +# "character" would be "name" but it's already used by the base class +export var character: String export var rank: String export(Texture) var avatar export var dialog = 0 @@ -18,7 +19,7 @@ onready var description_label = $Container/DescriptionLbl func start_dialogue(): index_dialogue() description_label.text = dialogue_keys[dialog].text - self.window_title = dialogue_keys[dialog].name + window_title = dialogue_keys[dialog].name func index_dialogue(): @@ -36,8 +37,7 @@ func load_dialogue(file_path): func _ready(): load_dialogue(dialogue_file) - self.show() start_dialogue() avatar_texture.texture = avatar - name_label.text = advisor_name + name_label.text = character rank_label.text = rank diff --git a/scripts/core_gui.gd b/scripts/core_gui.gd new file mode 100644 index 0000000..955a0fb --- /dev/null +++ b/scripts/core_gui.gd @@ -0,0 +1,11 @@ +extends Control + +onready var debug_console = $Console +onready var advisor = $AdvsiorNotice + +func _ready(): + advisor.show() + +func _process(delta): + if Input.is_action_just_released("ui_cheats"): + debug_console.show() diff --git a/scripts/debug_console.gd b/scripts/debug_console.gd new file mode 100644 index 0000000..cd549fd --- /dev/null +++ b/scripts/debug_console.gd @@ -0,0 +1,14 @@ +extends Control + +onready var input_box = $Input +onready var output_box = $Output + +func _ready(): + input_box.grab_focus() + +func output_text(text): + output_box.text = text + "\n" + +func _on_Input_text_entered(new_text): + input_box.clear() + output_text(new_text) diff --git a/sprites/avatars/kit.png b/sprites/avatars/kit.png new file mode 100644 index 0000000..261c6b2 Binary files /dev/null and b/sprites/avatars/kit.png differ diff --git a/sprites/avatars/kit.png.import b/sprites/avatars/kit.png.import new file mode 100644 index 0000000..25d1e5b --- /dev/null +++ b/sprites/avatars/kit.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/kit.png-8275ee4c1db28f6ed496cab95bfd1e82.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/avatars/kit.png" +dest_files=[ "res://.import/kit.png-8275ee4c1db28f6ed496cab95bfd1e82.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/avatars/zc.png b/sprites/avatars/zc.png old mode 100755 new mode 100644 index 3124203..119eb8d Binary files a/sprites/avatars/zc.png and b/sprites/avatars/zc.png differ