diff --git a/PHI-CL/data/b/mig.lua b/PHI-CL/data/b/mig.lua index e9d124c..b86b0fd 100644 --- a/PHI-CL/data/b/mig.lua +++ b/PHI-CL/data/b/mig.lua @@ -251,16 +251,37 @@ local s = {} for i = 1, #vir_sig do local char = vir_sig:sub(i, i) - table.insert(s, { - type = 'virtual-signal', - name = 'signal-' .. char .. 'A', - icon = '__PHI-CL__/graphics/signal/signal_' .. char .. '.png', - subgroup = (i < 11 and 'virtual-signal-number') or 'virtual-signal-letter', - order = ((i < 11 and 'b[numbers]2-[') or 'c[letters]2-[') .. char .. ']', - localised_name = {'phi-cl.combine', {'virtual-signal-name.signal-' .. char}, '(II)'} - }) + + for _, j in {'A', 'B'} do + table.insert(s, { + type = 'virtual-signal', + name = 'signal-' .. char .. j, + icon = '__PHI-CL__/graphics/signal-' .. j .. '/signal_' .. char .. '.png', + subgroup = (i < 11 and 'virtual-signal-number-2') or 'virtual-signal-letter-2', + order = ((i < 11 and 'b[numbers]-[') or 'c[letters]-[') .. j .. '-' .. char .. ']', + localised_name = {'phi-cl.combine', {'virtual-signal-name.signal-' .. char}, j} + }) + end end +data:extend({{ + type = 'item-group', + name = 'signals-2', + order = 'g2', + icon = '__PHI-CL__/graphics/signals.png', + icon_size = 64, +}, { + type = 'item-subgroup', + name = 'virtual-signal-number-2', + group = 'signals', + order = 'b' +}, { + type = 'item-subgroup', + name = 'virtual-signal-letter-2', + group = 'signals-2', + order = 'c' +}}) + data:extend(s) -- MIG A 1 ELEVATED_RAILS ENTITY @@ -703,8 +724,7 @@ if items['tooltip'] and data.raw.item then for k, v in pairs(items['tooltip']) do local custom_tooltip = { name = '[virtual-signal=signal-info]', - value = {'phi-cl.combine', '[virtual-signal=signal-' .. v.color .. ']', {'virtual-signal-name.signal-' .. v.color}}, - order = 99, + value = {'phi-cl.combine', '[virtual-signal=signal-' .. v.color .. ']', {'virtual-signal-name.signal-' .. v.color}} } if v.type and v.color and data.raw[v.type] and data.raw[v.type][k] then diff --git a/PHI-CL/graphics/signal/signal_0.png b/PHI-CL/graphics/signal-A/signal_0.png similarity index 100% rename from PHI-CL/graphics/signal/signal_0.png rename to PHI-CL/graphics/signal-A/signal_0.png diff --git a/PHI-CL/graphics/signal/signal_1.png b/PHI-CL/graphics/signal-A/signal_1.png similarity index 100% rename from PHI-CL/graphics/signal/signal_1.png rename to PHI-CL/graphics/signal-A/signal_1.png diff --git a/PHI-CL/graphics/signal/signal_2.png b/PHI-CL/graphics/signal-A/signal_2.png similarity index 100% rename from PHI-CL/graphics/signal/signal_2.png rename to PHI-CL/graphics/signal-A/signal_2.png diff --git a/PHI-CL/graphics/signal/signal_3.png b/PHI-CL/graphics/signal-A/signal_3.png similarity index 100% rename from PHI-CL/graphics/signal/signal_3.png rename to PHI-CL/graphics/signal-A/signal_3.png diff --git a/PHI-CL/graphics/signal/signal_4.png b/PHI-CL/graphics/signal-A/signal_4.png similarity index 100% rename from PHI-CL/graphics/signal/signal_4.png rename to PHI-CL/graphics/signal-A/signal_4.png diff --git a/PHI-CL/graphics/signal/signal_5.png b/PHI-CL/graphics/signal-A/signal_5.png similarity index 100% rename from PHI-CL/graphics/signal/signal_5.png rename to PHI-CL/graphics/signal-A/signal_5.png diff --git a/PHI-CL/graphics/signal/signal_6.png b/PHI-CL/graphics/signal-A/signal_6.png similarity index 100% rename from PHI-CL/graphics/signal/signal_6.png rename to PHI-CL/graphics/signal-A/signal_6.png diff --git a/PHI-CL/graphics/signal/signal_7.png b/PHI-CL/graphics/signal-A/signal_7.png similarity index 100% rename from PHI-CL/graphics/signal/signal_7.png rename to PHI-CL/graphics/signal-A/signal_7.png diff --git a/PHI-CL/graphics/signal/signal_8.png b/PHI-CL/graphics/signal-A/signal_8.png similarity index 100% rename from PHI-CL/graphics/signal/signal_8.png rename to PHI-CL/graphics/signal-A/signal_8.png diff --git a/PHI-CL/graphics/signal/signal_9.png b/PHI-CL/graphics/signal-A/signal_9.png similarity index 100% rename from PHI-CL/graphics/signal/signal_9.png rename to PHI-CL/graphics/signal-A/signal_9.png diff --git a/PHI-CL/graphics/signal/signal_A.png b/PHI-CL/graphics/signal-A/signal_A.png similarity index 100% rename from PHI-CL/graphics/signal/signal_A.png rename to PHI-CL/graphics/signal-A/signal_A.png diff --git a/PHI-CL/graphics/signal/signal_B.png b/PHI-CL/graphics/signal-A/signal_B.png similarity index 100% rename from PHI-CL/graphics/signal/signal_B.png rename to PHI-CL/graphics/signal-A/signal_B.png diff --git a/PHI-CL/graphics/signal/signal_C.png b/PHI-CL/graphics/signal-A/signal_C.png similarity index 100% rename from PHI-CL/graphics/signal/signal_C.png rename to PHI-CL/graphics/signal-A/signal_C.png diff --git a/PHI-CL/graphics/signal/signal_D.png b/PHI-CL/graphics/signal-A/signal_D.png similarity index 100% rename from PHI-CL/graphics/signal/signal_D.png rename to PHI-CL/graphics/signal-A/signal_D.png diff --git a/PHI-CL/graphics/signal/signal_E.png b/PHI-CL/graphics/signal-A/signal_E.png similarity index 100% rename from PHI-CL/graphics/signal/signal_E.png rename to PHI-CL/graphics/signal-A/signal_E.png diff --git a/PHI-CL/graphics/signal/signal_F.png b/PHI-CL/graphics/signal-A/signal_F.png similarity index 100% rename from PHI-CL/graphics/signal/signal_F.png rename to PHI-CL/graphics/signal-A/signal_F.png diff --git a/PHI-CL/graphics/signal/signal_G.png b/PHI-CL/graphics/signal-A/signal_G.png similarity index 100% rename from PHI-CL/graphics/signal/signal_G.png rename to PHI-CL/graphics/signal-A/signal_G.png diff --git a/PHI-CL/graphics/signal/signal_H.png b/PHI-CL/graphics/signal-A/signal_H.png similarity index 100% rename from PHI-CL/graphics/signal/signal_H.png rename to PHI-CL/graphics/signal-A/signal_H.png diff --git a/PHI-CL/graphics/signal/signal_I.png b/PHI-CL/graphics/signal-A/signal_I.png similarity index 100% rename from PHI-CL/graphics/signal/signal_I.png rename to PHI-CL/graphics/signal-A/signal_I.png diff --git a/PHI-CL/graphics/signal/signal_J.png b/PHI-CL/graphics/signal-A/signal_J.png similarity index 100% rename from PHI-CL/graphics/signal/signal_J.png rename to PHI-CL/graphics/signal-A/signal_J.png diff --git a/PHI-CL/graphics/signal/signal_K.png b/PHI-CL/graphics/signal-A/signal_K.png similarity index 100% rename from PHI-CL/graphics/signal/signal_K.png rename to PHI-CL/graphics/signal-A/signal_K.png diff --git a/PHI-CL/graphics/signal/signal_L.png b/PHI-CL/graphics/signal-A/signal_L.png similarity index 100% rename from PHI-CL/graphics/signal/signal_L.png rename to PHI-CL/graphics/signal-A/signal_L.png diff --git a/PHI-CL/graphics/signal/signal_M.png b/PHI-CL/graphics/signal-A/signal_M.png similarity index 100% rename from PHI-CL/graphics/signal/signal_M.png rename to PHI-CL/graphics/signal-A/signal_M.png diff --git a/PHI-CL/graphics/signal/signal_N.png b/PHI-CL/graphics/signal-A/signal_N.png similarity index 100% rename from PHI-CL/graphics/signal/signal_N.png rename to PHI-CL/graphics/signal-A/signal_N.png diff --git a/PHI-CL/graphics/signal/signal_O.png b/PHI-CL/graphics/signal-A/signal_O.png similarity index 100% rename from PHI-CL/graphics/signal/signal_O.png rename to PHI-CL/graphics/signal-A/signal_O.png diff --git a/PHI-CL/graphics/signal/signal_P.png b/PHI-CL/graphics/signal-A/signal_P.png similarity index 100% rename from PHI-CL/graphics/signal/signal_P.png rename to PHI-CL/graphics/signal-A/signal_P.png diff --git a/PHI-CL/graphics/signal/signal_Q.png b/PHI-CL/graphics/signal-A/signal_Q.png similarity index 100% rename from PHI-CL/graphics/signal/signal_Q.png rename to PHI-CL/graphics/signal-A/signal_Q.png diff --git a/PHI-CL/graphics/signal/signal_R.png b/PHI-CL/graphics/signal-A/signal_R.png similarity index 100% rename from PHI-CL/graphics/signal/signal_R.png rename to PHI-CL/graphics/signal-A/signal_R.png diff --git a/PHI-CL/graphics/signal/signal_S.png b/PHI-CL/graphics/signal-A/signal_S.png similarity index 100% rename from PHI-CL/graphics/signal/signal_S.png rename to PHI-CL/graphics/signal-A/signal_S.png diff --git a/PHI-CL/graphics/signal/signal_T.png b/PHI-CL/graphics/signal-A/signal_T.png similarity index 100% rename from PHI-CL/graphics/signal/signal_T.png rename to PHI-CL/graphics/signal-A/signal_T.png diff --git a/PHI-CL/graphics/signal/signal_U.png b/PHI-CL/graphics/signal-A/signal_U.png similarity index 100% rename from PHI-CL/graphics/signal/signal_U.png rename to PHI-CL/graphics/signal-A/signal_U.png diff --git a/PHI-CL/graphics/signal/signal_V.png b/PHI-CL/graphics/signal-A/signal_V.png similarity index 100% rename from PHI-CL/graphics/signal/signal_V.png rename to PHI-CL/graphics/signal-A/signal_V.png diff --git a/PHI-CL/graphics/signal/signal_W.png b/PHI-CL/graphics/signal-A/signal_W.png similarity index 100% rename from PHI-CL/graphics/signal/signal_W.png rename to PHI-CL/graphics/signal-A/signal_W.png diff --git a/PHI-CL/graphics/signal/signal_X.png b/PHI-CL/graphics/signal-A/signal_X.png similarity index 100% rename from PHI-CL/graphics/signal/signal_X.png rename to PHI-CL/graphics/signal-A/signal_X.png diff --git a/PHI-CL/graphics/signal/signal_Y.png b/PHI-CL/graphics/signal-A/signal_Y.png similarity index 100% rename from PHI-CL/graphics/signal/signal_Y.png rename to PHI-CL/graphics/signal-A/signal_Y.png diff --git a/PHI-CL/graphics/signal/signal_Z.png b/PHI-CL/graphics/signal-A/signal_Z.png similarity index 100% rename from PHI-CL/graphics/signal/signal_Z.png rename to PHI-CL/graphics/signal-A/signal_Z.png diff --git a/PHI-CL/graphics/signal-B/signal_0.png b/PHI-CL/graphics/signal-B/signal_0.png new file mode 100644 index 0000000..bd75804 Binary files /dev/null and b/PHI-CL/graphics/signal-B/signal_0.png differ diff --git a/PHI-CL/graphics/signal-B/signal_1.png b/PHI-CL/graphics/signal-B/signal_1.png new file mode 100644 index 0000000..3aa54e5 Binary files /dev/null and b/PHI-CL/graphics/signal-B/signal_1.png differ diff --git a/PHI-CL/graphics/signal-B/signal_2.png b/PHI-CL/graphics/signal-B/signal_2.png new file mode 100644 index 0000000..09a986a Binary files /dev/null and b/PHI-CL/graphics/signal-B/signal_2.png differ diff --git a/PHI-CL/graphics/signal-B/signal_3.png b/PHI-CL/graphics/signal-B/signal_3.png new file mode 100644 index 0000000..f0f4159 Binary files /dev/null and b/PHI-CL/graphics/signal-B/signal_3.png differ diff --git a/PHI-CL/graphics/signal-B/signal_4.png b/PHI-CL/graphics/signal-B/signal_4.png new file mode 100644 index 0000000..efb08a0 Binary files /dev/null and b/PHI-CL/graphics/signal-B/signal_4.png differ diff --git a/PHI-CL/graphics/signal-B/signal_5.png b/PHI-CL/graphics/signal-B/signal_5.png new file mode 100644 index 0000000..d0e2cdb Binary files /dev/null and b/PHI-CL/graphics/signal-B/signal_5.png differ diff --git a/PHI-CL/graphics/signal-B/signal_6.png b/PHI-CL/graphics/signal-B/signal_6.png new file mode 100644 index 0000000..189e89f Binary files /dev/null and b/PHI-CL/graphics/signal-B/signal_6.png differ diff --git a/PHI-CL/graphics/signal-B/signal_7.png b/PHI-CL/graphics/signal-B/signal_7.png new file mode 100644 index 0000000..cd55c91 Binary files /dev/null and b/PHI-CL/graphics/signal-B/signal_7.png differ diff --git a/PHI-CL/graphics/signal-B/signal_8.png b/PHI-CL/graphics/signal-B/signal_8.png new file mode 100644 index 0000000..96349dd Binary files /dev/null and b/PHI-CL/graphics/signal-B/signal_8.png differ diff --git a/PHI-CL/graphics/signal-B/signal_9.png b/PHI-CL/graphics/signal-B/signal_9.png new file mode 100644 index 0000000..65b2559 Binary files /dev/null and b/PHI-CL/graphics/signal-B/signal_9.png differ diff --git a/PHI-CL/graphics/signal-B/signal_A.png b/PHI-CL/graphics/signal-B/signal_A.png new file mode 100644 index 0000000..27c15bf Binary files /dev/null and b/PHI-CL/graphics/signal-B/signal_A.png differ diff --git a/PHI-CL/graphics/signal-B/signal_B.png b/PHI-CL/graphics/signal-B/signal_B.png new file mode 100644 index 0000000..ed16d89 Binary files /dev/null and b/PHI-CL/graphics/signal-B/signal_B.png differ diff --git a/PHI-CL/graphics/signal-B/signal_C.png b/PHI-CL/graphics/signal-B/signal_C.png new file mode 100644 index 0000000..262bd77 Binary files /dev/null and b/PHI-CL/graphics/signal-B/signal_C.png differ diff --git a/PHI-CL/graphics/signal-B/signal_D.png b/PHI-CL/graphics/signal-B/signal_D.png new file mode 100644 index 0000000..d2a5bb0 Binary files /dev/null and b/PHI-CL/graphics/signal-B/signal_D.png differ diff --git a/PHI-CL/graphics/signal-B/signal_E.png b/PHI-CL/graphics/signal-B/signal_E.png new file mode 100644 index 0000000..d33a6fb Binary files /dev/null and b/PHI-CL/graphics/signal-B/signal_E.png differ diff --git a/PHI-CL/graphics/signal-B/signal_F.png b/PHI-CL/graphics/signal-B/signal_F.png new file mode 100644 index 0000000..8411343 Binary files /dev/null and b/PHI-CL/graphics/signal-B/signal_F.png differ diff --git a/PHI-CL/graphics/signal-B/signal_G.png b/PHI-CL/graphics/signal-B/signal_G.png new file mode 100644 index 0000000..3deb411 Binary files /dev/null and b/PHI-CL/graphics/signal-B/signal_G.png differ diff --git a/PHI-CL/graphics/signal-B/signal_H.png b/PHI-CL/graphics/signal-B/signal_H.png new file mode 100644 index 0000000..251a729 Binary files /dev/null and b/PHI-CL/graphics/signal-B/signal_H.png differ diff --git a/PHI-CL/graphics/signal-B/signal_I.png b/PHI-CL/graphics/signal-B/signal_I.png new file mode 100644 index 0000000..efd3f5a Binary files /dev/null and b/PHI-CL/graphics/signal-B/signal_I.png differ diff --git a/PHI-CL/graphics/signal-B/signal_J.png b/PHI-CL/graphics/signal-B/signal_J.png new file mode 100644 index 0000000..97ec3b9 Binary files /dev/null and b/PHI-CL/graphics/signal-B/signal_J.png differ diff --git a/PHI-CL/graphics/signal-B/signal_K.png b/PHI-CL/graphics/signal-B/signal_K.png new file mode 100644 index 0000000..7216d69 Binary files /dev/null and b/PHI-CL/graphics/signal-B/signal_K.png differ diff --git a/PHI-CL/graphics/signal-B/signal_L.png b/PHI-CL/graphics/signal-B/signal_L.png new file mode 100644 index 0000000..9b2e5a1 Binary files /dev/null and b/PHI-CL/graphics/signal-B/signal_L.png differ diff --git a/PHI-CL/graphics/signal-B/signal_M.png b/PHI-CL/graphics/signal-B/signal_M.png new file mode 100644 index 0000000..ec63eb9 Binary files /dev/null and b/PHI-CL/graphics/signal-B/signal_M.png differ diff --git a/PHI-CL/graphics/signal-B/signal_N.png b/PHI-CL/graphics/signal-B/signal_N.png new file mode 100644 index 0000000..e95ebd6 Binary files /dev/null and b/PHI-CL/graphics/signal-B/signal_N.png differ diff --git a/PHI-CL/graphics/signal-B/signal_O.png b/PHI-CL/graphics/signal-B/signal_O.png new file mode 100644 index 0000000..bf37564 Binary files /dev/null and b/PHI-CL/graphics/signal-B/signal_O.png differ diff --git a/PHI-CL/graphics/signal-B/signal_P.png b/PHI-CL/graphics/signal-B/signal_P.png new file mode 100644 index 0000000..fbd02a3 Binary files /dev/null and b/PHI-CL/graphics/signal-B/signal_P.png differ diff --git a/PHI-CL/graphics/signal-B/signal_Q.png b/PHI-CL/graphics/signal-B/signal_Q.png new file mode 100644 index 0000000..738bf75 Binary files /dev/null and b/PHI-CL/graphics/signal-B/signal_Q.png differ diff --git a/PHI-CL/graphics/signal-B/signal_R.png b/PHI-CL/graphics/signal-B/signal_R.png new file mode 100644 index 0000000..81906ff Binary files /dev/null and b/PHI-CL/graphics/signal-B/signal_R.png differ diff --git a/PHI-CL/graphics/signal-B/signal_S.png b/PHI-CL/graphics/signal-B/signal_S.png new file mode 100644 index 0000000..54fd249 Binary files /dev/null and b/PHI-CL/graphics/signal-B/signal_S.png differ diff --git a/PHI-CL/graphics/signal-B/signal_T.png b/PHI-CL/graphics/signal-B/signal_T.png new file mode 100644 index 0000000..52a77b4 Binary files /dev/null and b/PHI-CL/graphics/signal-B/signal_T.png differ diff --git a/PHI-CL/graphics/signal-B/signal_U.png b/PHI-CL/graphics/signal-B/signal_U.png new file mode 100644 index 0000000..9a0181f Binary files /dev/null and b/PHI-CL/graphics/signal-B/signal_U.png differ diff --git a/PHI-CL/graphics/signal-B/signal_V.png b/PHI-CL/graphics/signal-B/signal_V.png new file mode 100644 index 0000000..1e50e45 Binary files /dev/null and b/PHI-CL/graphics/signal-B/signal_V.png differ diff --git a/PHI-CL/graphics/signal-B/signal_W.png b/PHI-CL/graphics/signal-B/signal_W.png new file mode 100644 index 0000000..821a5e6 Binary files /dev/null and b/PHI-CL/graphics/signal-B/signal_W.png differ diff --git a/PHI-CL/graphics/signal-B/signal_X.png b/PHI-CL/graphics/signal-B/signal_X.png new file mode 100644 index 0000000..ae40b48 Binary files /dev/null and b/PHI-CL/graphics/signal-B/signal_X.png differ diff --git a/PHI-CL/graphics/signal-B/signal_Y.png b/PHI-CL/graphics/signal-B/signal_Y.png new file mode 100644 index 0000000..31beaf8 Binary files /dev/null and b/PHI-CL/graphics/signal-B/signal_Y.png differ diff --git a/PHI-CL/graphics/signal-B/signal_Z.png b/PHI-CL/graphics/signal-B/signal_Z.png new file mode 100644 index 0000000..75e98d6 Binary files /dev/null and b/PHI-CL/graphics/signal-B/signal_Z.png differ diff --git a/PHI-CL/graphics/signals.png b/PHI-CL/graphics/signals.png new file mode 100644 index 0000000..b2e38da Binary files /dev/null and b/PHI-CL/graphics/signals.png differ