Redid interface

- Redid the interface with everything now at the bottom.
- Advisors can now address the mayor and city
- Updated tax window with red and green arrow icons
- Tweaked income algorithm
This commit is contained in:
Tony Bark 2021-05-27 13:54:08 -04:00
parent 7a4619f874
commit d3350dd8a6
18 changed files with 529 additions and 186 deletions

View file

@ -0,0 +1,117 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="Capa_1"
x="0px"
y="0px"
width="9.9999981"
height="10"
viewBox="0 0 9.9999981 10"
xml:space="preserve"
sodipodi:docname="arrow-pointing-down.svg"
inkscape:version="1.0.2 (e86c8708, 2021-01-15)"><metadata
id="metadata872"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs870" /><sodipodi:namedview
pagecolor="#000000"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="987"
id="namedview868"
showgrid="false"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:pagecheckerboard="true"
inkscape:zoom="3.3016737"
inkscape:cx="16.69721"
inkscape:cy="15.681365"
inkscape:window-x="0"
inkscape:window-y="23"
inkscape:window-maximized="1"
inkscape:current-layer="Capa_1" />
<g
id="g835"
transform="matrix(0.0224811,0,0,0.02361816,0,-0.25290326)"
style="fill:#ffffff">
<path
d="m 434.252,185.721 -21.409,-21.413 c -7.419,-7.042 -16.084,-10.564 -25.975,-10.564 -10.095,0 -18.657,3.521 -25.7,10.564 L 277.23,248.247 V 47.255 c 0,-9.9 -3.621,-18.464 -10.855,-25.697 -7.234,-7.232 -15.797,-10.85 -25.693,-10.85 h -36.545 c -9.897,0 -18.464,3.621 -25.693,10.85 -7.236,7.233 -10.85,15.797 -10.85,25.697 V 248.247 L 83.655,164.308 c -7.042,-7.042 -15.606,-10.564 -25.697,-10.564 -9.896,0 -18.559,3.521 -25.979,10.564 L 10.851,185.721 C 3.615,192.948 0,201.615 0,211.7 c 0,10.282 3.619,18.848 10.848,25.698 l 185.864,186.146 c 7.045,7.046 15.609,10.567 25.697,10.567 9.897,0 18.558,-3.521 25.977,-10.567 L 434.251,237.398 c 7.043,-7.043 10.567,-15.608 10.567,-25.698 0.001,-9.895 -3.523,-18.555 -10.566,-25.979 z"
id="path833"
style="fill:#ffffff" />
</g>
<g
id="g837"
transform="translate(0,-10.708)">
</g>
<g
id="g839"
transform="translate(0,-10.708)">
</g>
<g
id="g841"
transform="translate(0,-10.708)">
</g>
<g
id="g843"
transform="translate(0,-10.708)">
</g>
<g
id="g845"
transform="translate(0,-10.708)">
</g>
<g
id="g847"
transform="translate(0,-10.708)">
</g>
<g
id="g849"
transform="translate(0,-10.708)">
</g>
<g
id="g851"
transform="translate(0,-10.708)">
</g>
<g
id="g853"
transform="translate(0,-10.708)">
</g>
<g
id="g855"
transform="translate(0,-10.708)">
</g>
<g
id="g857"
transform="translate(0,-10.708)">
</g>
<g
id="g859"
transform="translate(0,-10.708)">
</g>
<g
id="g861"
transform="translate(0,-10.708)">
</g>
<g
id="g863"
transform="translate(0,-10.708)">
</g>
<g
id="g865"
transform="translate(0,-10.708)">
</g>
</svg>

After

Width:  |  Height:  |  Size: 3.3 KiB

View file

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/arrow-pointing-down.svg-2e9bf66bb94d470af7a92af17efa38ff.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://sprites/symbols/fontawesome/arrow-pointing-down.svg"
dest_files=[ "res://.import/arrow-pointing-down.svg-2e9bf66bb94d470af7a92af17efa38ff.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

View file

@ -0,0 +1,117 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="Capa_1"
x="0px"
y="0px"
width="9.9999981"
height="10.000001"
viewBox="0 0 9.9999981 10.000001"
xml:space="preserve"
sodipodi:docname="arrow-up.svg"
inkscape:version="1.0.2 (e86c8708, 2021-01-15)"><metadata
id="metadata913"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs911" /><sodipodi:namedview
pagecolor="#000000"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="987"
id="namedview909"
showgrid="false"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:pagecheckerboard="true"
inkscape:zoom="1.8951529"
inkscape:cx="222.4095"
inkscape:cy="210.1305"
inkscape:window-x="0"
inkscape:window-y="23"
inkscape:window-maximized="1"
inkscape:current-layer="Capa_1" />
<g
id="g876"
style="fill:#ffffff"
transform="matrix(0.0224811,0,0,0.02379474,0,-0.29217561)">
<path
d="M 434.252,208.708 248.387,22.843 C 241.345,15.8 232.694,12.279 222.41,12.279 c -10.467,0 -19.036,3.521 -25.697,10.564 L 10.848,208.708 C 3.615,215.94 0,224.604 0,234.692 c 0,9.897 3.619,18.459 10.848,25.693 l 21.411,21.409 c 6.854,7.231 15.42,10.855 25.697,10.855 10.278,0 18.842,-3.624 25.697,-10.855 l 83.939,-83.651 v 200.998 c 0,9.89 3.567,17.936 10.706,24.126 7.139,6.184 15.752,9.273 25.837,9.273 h 36.545 c 10.089,0 18.698,-3.09 25.837,-9.273 7.139,-6.188 10.712,-14.236 10.712,-24.126 V 198.144 l 83.938,83.651 c 6.848,7.231 15.413,10.855 25.7,10.855 10.082,0 18.747,-3.624 25.975,-10.855 l 21.409,-21.409 c 7.043,-7.426 10.567,-15.988 10.567,-25.693 0.001,-9.898 -3.523,-18.559 -10.566,-25.985 z"
id="path874"
style="fill:#ffffff" />
</g>
<g
id="g878"
transform="translate(0,-12.279)">
</g>
<g
id="g880"
transform="translate(0,-12.279)">
</g>
<g
id="g882"
transform="translate(0,-12.279)">
</g>
<g
id="g884"
transform="translate(0,-12.279)">
</g>
<g
id="g886"
transform="translate(0,-12.279)">
</g>
<g
id="g888"
transform="translate(0,-12.279)">
</g>
<g
id="g890"
transform="translate(0,-12.279)">
</g>
<g
id="g892"
transform="translate(0,-12.279)">
</g>
<g
id="g894"
transform="translate(0,-12.279)">
</g>
<g
id="g896"
transform="translate(0,-12.279)">
</g>
<g
id="g898"
transform="translate(0,-12.279)">
</g>
<g
id="g900"
transform="translate(0,-12.279)">
</g>
<g
id="g902"
transform="translate(0,-12.279)">
</g>
<g
id="g904"
transform="translate(0,-12.279)">
</g>
<g
id="g906"
transform="translate(0,-12.279)">
</g>
</svg>

After

Width:  |  Height:  |  Size: 3.2 KiB

View file

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/arrow-up.svg-5447ff6f0f50b151c17fd310ad1c924b.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://sprites/symbols/fontawesome/arrow-up.svg"
dest_files=[ "res://.import/arrow-up.svg-5447ff6f0f50b151c17fd310ad1c924b.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