Further progress on the energy generator / wires, fix translations

2026-03-02 03:39:21 +00:00 · 2020-07-01 17:51:11 +02:00
parent 030194f5b8
commit bd899df5fe
53 changed files with 1243 additions and 893 deletions
--- a/res_raw/atlas.tps
+++ b/res_raw/atlas.tps
@@ -381,6 +381,27 @@
                <key>scale9FromFile</key>
                <false/>
            </struct>
+            <key type="filename">sprites/blueprints/advanced_processor.png</key>
+            <key type="filename">sprites/blueprints/energy_generator.png</key>
+            <key type="filename">sprites/blueprints/painter-double.png</key>
+            <key type="filename">sprites/blueprints/trash-storage.png</key>
+            <key type="filename">sprites/buildings/advanced_processor.png</key>
+            <key type="filename">sprites/buildings/energy_generator.png</key>
+            <key type="filename">sprites/buildings/painter-double.png</key>
+            <struct type="IndividualSpriteSettings">
+                <key>pivotPoint</key>
+                <point_f>0.5,0.5</point_f>
+                <key>spriteScale</key>
+                <double>1</double>
+                <key>scale9Enabled</key>
+                <false/>
+                <key>scale9Borders</key>
+                <rect>96,96,192,192</rect>
+                <key>scale9Paddings</key>
+                <rect>96,96,192,192</rect>
+                <key>scale9FromFile</key>
+                <false/>
+            </struct>
            <key type="filename">sprites/blueprints/cutter-quad.png</key>
            <key type="filename">sprites/blueprints/painter-quad.png</key>
            <key type="filename">sprites/buildings/cutter-quad.png</key>
@@ -420,25 +441,6 @@
                <key>scale9FromFile</key>
                <false/>
            </struct>
-            <key type="filename">sprites/blueprints/energy_generator.png</key>
-            <key type="filename">sprites/blueprints/painter-double.png</key>
-            <key type="filename">sprites/blueprints/trash-storage.png</key>
-            <key type="filename">sprites/buildings/energy_generator.png</key>
-            <key type="filename">sprites/buildings/painter-double.png</key>
-            <struct type="IndividualSpriteSettings">
-                <key>pivotPoint</key>
-                <point_f>0.5,0.5</point_f>
-                <key>spriteScale</key>
-                <double>1</double>
-                <key>scale9Enabled</key>
-                <false/>
-                <key>scale9Borders</key>
-                <rect>96,96,192,192</rect>
-                <key>scale9Paddings</key>
-                <rect>96,96,192,192</rect>
-                <key>scale9FromFile</key>
-                <false/>
-            </struct>
            <key type="filename">sprites/blueprints/miner-chainable.png</key>
            <key type="filename">sprites/blueprints/miner.png</key>
            <key type="filename">sprites/blueprints/rotater-ccw.png</key>
@@ -589,6 +591,10 @@
                <key>scale9FromFile</key>
                <false/>
            </struct>
+            <key type="filename">sprites/wires/battery_empty.png</key>
+            <key type="filename">sprites/wires/battery_full.png</key>
+            <key type="filename">sprites/wires/battery_low.png</key>
+            <key type="filename">sprites/wires/battery_medium.png</key>
            <key type="filename">sprites/wires/negative_energy.png</key>
            <key type="filename">sprites/wires/positive_energy.png</key>
            <struct type="IndividualSpriteSettings">
--- a/res_raw/sounds/music/theme.wav
+++ b/res_raw/sounds/music/theme.wav
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8c334a9f100fce4647b4803d2a8270b30e26d53622b3717bdb81b3ea07f84aed
-size 150286082
+oid sha256:df7487fb5e8cb34cecee2519b9c3162a5107d2d7b1301c4a550904cfb108a015
+size 223361394
--- a/res_raw/sprites/blueprints/advanced_processor.png
+++ b/res_raw/sprites/blueprints/advanced_processor.png
--- a/res_raw/sprites/blueprints/energy_generator.png
+++ b/res_raw/sprites/blueprints/energy_generator.png
--- a/res_raw/sprites/blueprints/wire_left.png
+++ b/res_raw/sprites/blueprints/wire_left.png
--- a/res_raw/sprites/blueprints/wire_right.png
+++ b/res_raw/sprites/blueprints/wire_right.png
--- a/res_raw/sprites/blueprints/wire_top.png
+++ b/res_raw/sprites/blueprints/wire_top.png
--- a/res_raw/sprites/buildings/advanced_processor.png
+++ b/res_raw/sprites/buildings/advanced_processor.png
--- a/res_raw/sprites/buildings/energy_generator.png
+++ b/res_raw/sprites/buildings/energy_generator.png
--- a/res_raw/sprites/buildings/wire_left.png
+++ b/res_raw/sprites/buildings/wire_left.png
--- a/res_raw/sprites/buildings/wire_right.png
+++ b/res_raw/sprites/buildings/wire_right.png
--- a/res_raw/sprites/buildings/wire_top.png
+++ b/res_raw/sprites/buildings/wire_top.png
--- a/res_raw/sprites/wires/battery_empty.png
+++ b/res_raw/sprites/wires/battery_empty.png
--- a/res_raw/sprites/wires/battery_full.png
+++ b/res_raw/sprites/wires/battery_full.png
--- a/res_raw/sprites/wires/battery_low.png
+++ b/res_raw/sprites/wires/battery_low.png
--- a/res_raw/sprites/wires/battery_medium.png
+++ b/res_raw/sprites/wires/battery_medium.png
--- a/res_raw/sprites/wires/pin_positive_accept.png
+++ b/res_raw/sprites/wires/pin_positive_accept.png
--- a/res_raw/sprites/wires/pin_positive_eject.png
+++ b/res_raw/sprites/wires/pin_positive_eject.png
--- a/res_raw/sprites/wires/positive_energy.png
+++ b/res_raw/sprites/wires/positive_energy.png