From 202ae86c95c4f4660abdcddc80b5b2598f2fbca4 Mon Sep 17 00:00:00 2001 From: Monica Moniot Date: Sun, 30 Oct 2022 00:30:26 -0400 Subject: [PATCH] fixed art --- cybersyn/TODO | 4 +++ cybersyn/graphics/icons/area-of-effect.png | Bin 1364 -> 1363 bytes cybersyn/prototypes/entity.lua | 5 ++-- cybersyn/scripts/gui.lua | 31 +++++++++++++++++---- 4 files changed, 33 insertions(+), 7 deletions(-) create mode 100644 cybersyn/TODO diff --git a/cybersyn/TODO b/cybersyn/TODO new file mode 100644 index 0000000..bebcb0a --- /dev/null +++ b/cybersyn/TODO @@ -0,0 +1,4 @@ +finish wagon manifest +add rail networks +figure out how to make the area-of-effect graphic the correct size +close gui when the combinator is destroyed diff --git a/cybersyn/graphics/icons/area-of-effect.png b/cybersyn/graphics/icons/area-of-effect.png index 4815fb790c493dd8e079571f2f252f3958d26b4f..38e64b34addf1e47ed00e6166eff38b3b8b16d2b 100644 GIT binary patch delta 671 zcmV;Q0$}~r3eyUZ0StUwVw3z$F|E|j?>X?TJcGzZ6|%L-%{x@ zBjPJEKW1cdh4`%BXlaao&aQ;$AXnUzx=m%ZFt9?-Q;mpXxD{<%C8H!?`~hkWQ?1Td zbTToN9Tcchp+SAs2OUT;aA!l!e6TEA664H=Oax&T8f*?6nr9@iIY3Te<|`Lkar2Ca zUCy^$@mya>W0IRsi~@7{!wgX6n*otIGK)^>VY_rM%Jpq6F!I9c^*olY$ z00D$)LqkwWLqi~Na&Km7Y-Iodc$|HaJxIeq9K~N#rBW&m?I6-2Lv^xHREnciu?QAQ zTcK44lS{v#NlTLA;wZQl9Q;_UI=DFN>fkB}f*&A`PELw0QsV!TLW>v=j{EWM-sA2a zAhc^tH3njUs+oEwnGk>Tg;mk_3O~XKB8Ircj7BQEn1k#1x`&6acTt|@e(ujPtP~9f zctqkk*3eDj4dVEw+2FiS9AXtoAwDOb)aio6k6f1>e&bxWS>Tx=J(rm$4iSsxK9>8K zRdkhjhB%_A8s!UlhZW9SoYh*Bb??bv7$|BhS+3IzBZ(!XkcNK<8BJ7CgNZ1u8Yu=c zw4ZSCkJS>W9U}PJ(xbA849&ot>j6O9aU9u%FO`%i*-p}Zp3PA7{@UJ<& zb@y@l0OY8v1TzN{F%9}U#GjMe F1bT74JyHMw delta 672 zcmV;R0$=^p3e*aamvk=#yjoBC`D5GVF30KUHm&%i)3%eo)^Dlw zm=W<6nIAJUxk7x_Z?rTxH+is4qYZIz6YeDMdUHB7ZS zU(w0LP87;C8#XTFoT0S@$V=i+dpDwMC7ti&DG$y(E#3%rvu{G7DFS)bw&({Pi zAgD{`gb5a3PZw3`zP4m>7OxIN!`{+lZ99NOh^*F8LZy^HcJ_j7-aUO8_t zz#|aPF-fnfRP|T&D{XKXP4i_>FVXW-reS>6z3#afnzbcCggJ ztfVW%)5H;3Q7PY>by()S#aXG;SnHnrg~7bKlIA+iFydH30!e=ekWfPz6_|+9s*++L zMf))q|FG>(l1n028H^kYs6v5g`@#RQmeo7~ ze9yp@+V)o)!0adK^|lr{0{XUri|e)~?E#lNz|fN>>Y^?AXnG3;;QfrgDF+PP0)aKB zx7I#RAAk&XwR{`{92^3pMao`xd3R4|Z~vZY_4fm|YI4Hj*aGU4p9C`p5+^C!WB;y` G*#vqo&pFBf diff --git a/cybersyn/prototypes/entity.lua b/cybersyn/prototypes/entity.lua index f9c71c6..099306a 100644 --- a/cybersyn/prototypes/entity.lua +++ b/cybersyn/prototypes/entity.lua @@ -4,11 +4,12 @@ combinator_entity.icon = "__cybersyn__/graphics/icons/combinator.png" combinator_entity.radius_visualisation_specification = { sprite = { filename = "__cybersyn__/graphics/icons/area-of-effect.png", - tint = {r = 1, g = 1, b = .25, a = 1}, + tint = {r = 1, g = 1, b = 0, a = .5}, height = 64, width = 64, }, - distance = 1, + --offset = {0, .5}, + distance = 1.5, } combinator_entity.active_energy_usage = "10KW" combinator_entity.allow_copy_paste = false diff --git a/cybersyn/scripts/gui.lua b/cybersyn/scripts/gui.lua index cdea2fa..309adbf 100644 --- a/cybersyn/scripts/gui.lua +++ b/cybersyn/scripts/gui.lua @@ -52,10 +52,10 @@ function gui_opened(comb, player) on_click = {"close", comb.unit_number} }} }}, - {type="frame", style="inside_shallow_frame_with_padding", style_mods={padding=8}, children={ + {type="frame", style="inside_shallow_frame_with_padding", style_mods={padding=12}, children={ {type="flow", direction="vertical", style_mods={horizontal_align="left"}, children={ --status - {type="flow", style = "status_flow", direction = "horizontal", style_mods={vertical_align="center", horizontally_stretchable=true}, children={ + {type="flow", style = "status_flow", direction = "horizontal", style_mods={vertical_align="center", horizontally_stretchable=true, bottom_padding=4}, children={ {type="sprite", sprite=STATUS_SPRITES[comb.status] or STATUS_SPRITES_DEFAULT, style="status_image", ref={"status_icon"}, style_mods={stretch_image_to_widget_size=true}}, {type="label", caption={STATUS_NAMES[comb.status] or STATUS_NAMES_DEFAULT}, ref={"status_label"}} }}, @@ -63,15 +63,22 @@ function gui_opened(comb, player) {type="frame", style="deep_frame_in_shallow_frame", style_mods={minimal_width=0, horizontally_stretchable=true, padding=0}, children={ {type="entity-preview", style="wide_entity_button", ref={"preview"}}, }}, - {type="label", caption={"cybersyn-gui.operation"}, style_mods={top_padding=8}}, - {type="drop-down", ref={"operation"}, actions={ - on_selection_state_changed = {"drop-down", comb.unit_number} + --drop down + {type="label", style="heading_3_label", caption={"cybersyn-gui.operation"}, style_mods={top_padding=8}}, + {type="drop-down", style_mods={top_padding=3}, ref={"operation"}, actions={ + on_selection_state_changed={"drop-down", comb.unit_number} }, selected_index=selected_index, items={ {"cybersyn-gui.comb1"}, {"cybersyn-gui.comb2"}, {"cybersyn-gui.depot"}, {"cybersyn-gui.wagon-manifest"}, }}, + ---choose-elem-button + {type="line", style_mods={top_padding=10}}, + {type="label", style="heading_3_label", caption={"cybersyn-gui.operation"}, style_mods={top_padding=7}}, + {type="choose-elem-button", ref={"network"}, elem_type="signal", signal=control.first_signal, style_mods={bottom_margin=2}, actions={ + on_elem_changed={"choose-elem-button", comb.unit_number} + }}, }} }} }} @@ -139,6 +146,20 @@ function register_gui_actions() end a.parameters = control on_combinator_updated(global, comb) + elseif msg[1] == "choose-elem-button" then + local element = event.element + if not element then return end + local comb = global.to_comb[msg[2]] + if not comb or not comb.valid then return end + + local signal = element.elem_value + + local a = comb.get_or_create_control_behavior() + local control = a.parameters + + control.first_signal = signal + + a.parameters = control end end end)