diff --git a/.vscode/launch.json b/.vscode/launch.json index 7fd5b23..cb7c79b 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -15,7 +15,6 @@ "flib": true, "cybersyn": true, "creative-mod": true, - "LogisticTrainNetwork": true, }, "disableExtraMods": true }, @@ -42,7 +41,6 @@ "flib": true, "cybersyn": true, "creative-mod": true, - "LogisticTrainNetwork": true, }, "disableExtraMods": true } diff --git a/cybersyn/TODO b/cybersyn/TODO index 92f97fa..cc65589 100644 --- a/cybersyn/TODO +++ b/cybersyn/TODO @@ -3,3 +3,4 @@ do not play close sound when a different gui is opened support space elevator do hardcore testing models & art +move signal subgroup diff --git a/cybersyn/graphics/combinator/combinator-displays.png b/cybersyn/graphics/combinator/combinator-displays.png new file mode 100644 index 0000000..ef1db3d Binary files /dev/null and b/cybersyn/graphics/combinator/combinator-displays.png differ diff --git a/cybersyn/graphics/combinator/cybernetic-combinator-remnants.png b/cybersyn/graphics/combinator/cybernetic-combinator-remnants.png new file mode 100644 index 0000000..583d417 Binary files /dev/null and b/cybersyn/graphics/combinator/cybernetic-combinator-remnants.png differ diff --git a/cybersyn/graphics/combinator/cybernetic-combinator-shadow.png b/cybersyn/graphics/combinator/cybernetic-combinator-shadow.png new file mode 100644 index 0000000..65190a9 Binary files /dev/null and b/cybersyn/graphics/combinator/cybernetic-combinator-shadow.png differ diff --git a/cybersyn/graphics/combinator/cybernetic-combinator.png b/cybersyn/graphics/combinator/cybernetic-combinator.png new file mode 100644 index 0000000..d95e376 Binary files /dev/null and b/cybersyn/graphics/combinator/cybernetic-combinator.png differ diff --git a/cybersyn/graphics/combinator/hr-combinator-displays.png b/cybersyn/graphics/combinator/hr-combinator-displays.png new file mode 100644 index 0000000..707a9eb Binary files /dev/null and b/cybersyn/graphics/combinator/hr-combinator-displays.png differ diff --git a/cybersyn/graphics/combinator/hr-cybernetic-combinator-remnants.png b/cybersyn/graphics/combinator/hr-cybernetic-combinator-remnants.png new file mode 100644 index 0000000..5d7cdee Binary files /dev/null and b/cybersyn/graphics/combinator/hr-cybernetic-combinator-remnants.png differ diff --git a/cybersyn/graphics/combinator/hr-cybernetic-combinator-shadow.png b/cybersyn/graphics/combinator/hr-cybernetic-combinator-shadow.png new file mode 100644 index 0000000..cd5d3e0 Binary files /dev/null and b/cybersyn/graphics/combinator/hr-cybernetic-combinator-shadow.png differ diff --git a/cybersyn/graphics/combinator/hr-cybernetic-combinator.png b/cybersyn/graphics/combinator/hr-cybernetic-combinator.png new file mode 100644 index 0000000..bfdc9c4 Binary files /dev/null and b/cybersyn/graphics/combinator/hr-cybernetic-combinator.png differ diff --git a/cybersyn/graphics/icons/combinator.png b/cybersyn/graphics/icons/combinator.png deleted file mode 100644 index 3f42332..0000000 Binary files a/cybersyn/graphics/icons/combinator.png and /dev/null differ diff --git a/cybersyn/graphics/icons/cybernetic-combinator.png b/cybersyn/graphics/icons/cybernetic-combinator.png new file mode 100644 index 0000000..dbf6c7e Binary files /dev/null and b/cybersyn/graphics/icons/cybernetic-combinator.png differ diff --git a/cybersyn/graphics/icons/locked-slots.png b/cybersyn/graphics/icons/locked-slots.png index 3f42332..b8766f8 100644 Binary files a/cybersyn/graphics/icons/locked-slots.png and b/cybersyn/graphics/icons/locked-slots.png differ diff --git a/cybersyn/graphics/icons/lost-train.png b/cybersyn/graphics/icons/lost-train.png index efa415f..76b1935 100644 Binary files a/cybersyn/graphics/icons/lost-train.png and b/cybersyn/graphics/icons/lost-train.png differ diff --git a/cybersyn/graphics/icons/missing-train.png b/cybersyn/graphics/icons/missing-train.png index 3f42332..33e739d 100644 Binary files a/cybersyn/graphics/icons/missing-train.png and b/cybersyn/graphics/icons/missing-train.png differ diff --git a/cybersyn/graphics/icons/nonempty-train.png b/cybersyn/graphics/icons/nonempty-train.png index 3f42332..7255cad 100644 Binary files a/cybersyn/graphics/icons/nonempty-train.png and b/cybersyn/graphics/icons/nonempty-train.png differ diff --git a/cybersyn/graphics/icons/priority.png b/cybersyn/graphics/icons/priority.png index 3f42332..e8099cc 100644 Binary files a/cybersyn/graphics/icons/priority.png and b/cybersyn/graphics/icons/priority.png differ diff --git a/cybersyn/graphics/icons/provide-threshold.png b/cybersyn/graphics/icons/provide-threshold.png index 3f42332..d5d937a 100644 Binary files a/cybersyn/graphics/icons/provide-threshold.png and b/cybersyn/graphics/icons/provide-threshold.png differ diff --git a/cybersyn/graphics/icons/request-threshold.png b/cybersyn/graphics/icons/request-threshold.png index 3f42332..5bb0ec6 100644 Binary files a/cybersyn/graphics/icons/request-threshold.png and b/cybersyn/graphics/icons/request-threshold.png differ diff --git a/cybersyn/prototypes/entity.lua b/cybersyn/prototypes/entity.lua index 099306a..c5fd57c 100644 --- a/cybersyn/prototypes/entity.lua +++ b/cybersyn/prototypes/entity.lua @@ -1,6 +1,6 @@ --By Mami combinator_entity = flib.copy_prototype(data.raw["arithmetic-combinator"]["arithmetic-combinator"], COMBINATOR_NAME) -combinator_entity.icon = "__cybersyn__/graphics/icons/combinator.png" +combinator_entity.icon = "__cybersyn__/graphics/icons/cybernetic-combinator.png" combinator_entity.radius_visualisation_specification = { sprite = { filename = "__cybersyn__/graphics/icons/area-of-effect.png", @@ -15,6 +15,88 @@ combinator_entity.active_energy_usage = "10KW" combinator_entity.allow_copy_paste = false + +local comb = combinator_entity +--local display_base = { +-- filename = "__cybersyn__/graphics/combinator/combinator-displays.png", +-- width = 15, +-- height = 11, +-- hr_version = { +-- filename = "__cybersyn__/graphics/combinator/hr-combinator-displays.png", +-- width = 30, +-- height = 21, +-- } +--} + +--local north = table.deepcopy(display_base) +--north.scale = comb.and_symbol_sprites.north.scale +--north.shift = comb.and_symbol_sprites.north.shift +--north.hr_version.scale = comb.and_symbol_sprites.north.hr_version.scale +--north.hr_version.shift = comb.and_symbol_sprites.north.hr_version.shift +--local east = table.deepcopy(display_base) +--east.scale = comb.and_symbol_sprites.east.scale +--east.shift = comb.and_symbol_sprites.east.shift +--east.hr_version.scale = comb.and_symbol_sprites.east.hr_version.scale +--east.hr_version.shift = comb.and_symbol_sprites.east.hr_version.shift +--local south = table.deepcopy(display_base) +--south.scale = comb.and_symbol_sprites.south.scale +--south.shift = comb.and_symbol_sprites.south.shift +--south.hr_version.scale = comb.and_symbol_sprites.south.hr_version.scale +--south.hr_version.shift = comb.and_symbol_sprites.south.hr_version.shift +--local west = table.deepcopy(display_base) +--west.scale = comb.and_symbol_sprites.west.scale +--west.shift = comb.and_symbol_sprites.west.shift +--west.hr_version.scale = comb.and_symbol_sprites.west.hr_version.scale +--west.hr_version.shift = comb.and_symbol_sprites.west.hr_version.shift + +--local display = { +-- north = north, +-- east = east, +-- south = south, +-- west = west +--} +--comb.and_symbol_sprites = table.deepcopy(display) +--comb.divide_symbol_sprites = table.deepcopy(display) +--comb.left_shift_symbol_sprites = table.deepcopy(display) +--comb.minus_symbol_sprites = table.deepcopy(display) +--comb.modulo_symbol_sprites = table.deepcopy(display) +--comb.multiply_symbol_sprites = table.deepcopy(display) +--comb.or_symbol_sprites = table.deepcopy(display) +--comb.plus_symbol_sprites = table.deepcopy(display) +--comb.power_symbol_sprites = table.deepcopy(display) +--comb.right_shift_symbol_sprites = table.deepcopy(display) +--comb.xor_symbol_sprites = table.deepcopy(display) + + +--local sprite_base = { +-- filename = "__cybersyn__/graphics/combinator/cybernetic-combinator.png", +-- hr_version = { +-- filename = "__cybersyn__/graphics/combinator/hr-cybernetic-combinator-shadow.png", +-- } +--} + +--comb.sprites.north.layers[1].filename = "__cybersyn__/graphics/combinator/cybernetic-combinator.png" +--comb.sprites.north.layers[1].hr_version.filename = "__cybersyn__/graphics/combinator/hr-cybernetic-combinator-shadow.png" +--comb.sprites.north.layers[2].filename = "__cybersyn__/graphics/combinator/cybernetic-combinator.png" +--comb.sprites.north.layers[2].hr_version.filename = "__cybersyn__/graphics/combinator/hr-cybernetic-combinator-shadow.png" + +--comb.sprites.east.layers[1].filename = "__cybersyn__/graphics/combinator/cybernetic-combinator.png" +--comb.sprites.east.layers[1].hr_version.filename = "__cybersyn__/graphics/combinator/hr-cybernetic-combinator-shadow.png" +--comb.sprites.east.layers[2].filename = "__cybersyn__/graphics/combinator/cybernetic-combinator.png" +--comb.sprites.east.layers[2].hr_version.filename = "__cybersyn__/graphics/combinator/hr-cybernetic-combinator-shadow.png" + +--comb.sprites.south.layers[1].filename = "__cybersyn__/graphics/combinator/cybernetic-combinator.png" +--comb.sprites.south.layers[1].hr_version.filename = "__cybersyn__/graphics/combinator/hr-cybernetic-combinator-shadow.png" +--comb.sprites.south.layers[2].filename = "__cybersyn__/graphics/combinator/cybernetic-combinator.png" +--comb.sprites.south.layers[2].hr_version.filename = "__cybersyn__/graphics/combinator/hr-cybernetic-combinator-shadow.png" + +--comb.sprites.west.layers[1].filename = "__cybersyn__/graphics/combinator/cybernetic-combinator.png" +--comb.sprites.west.layers[1].hr_version.filename = "__cybersyn__/graphics/combinator/hr-cybernetic-combinator-shadow.png" +--comb.sprites.west.layers[2].filename = "__cybersyn__/graphics/combinator/cybernetic-combinator.png" +--comb.sprites.west.layers[2].hr_version.filename = "__cybersyn__/graphics/combinator/hr-cybernetic-combinator-shadow.png" + + + combinator_out_entity = flib.copy_prototype(data.raw["constant-combinator"]["constant-combinator"], COMBINATOR_OUT_NAME) combinator_out_entity.icon = nil combinator_out_entity.icon_size = nil diff --git a/cybersyn/prototypes/item.lua b/cybersyn/prototypes/item.lua index a2c20b0..5749e50 100644 --- a/cybersyn/prototypes/item.lua +++ b/cybersyn/prototypes/item.lua @@ -1,6 +1,7 @@ --By Mami combinator_item = flib.copy_prototype(data.raw["item"]["arithmetic-combinator"], COMBINATOR_NAME) -combinator_item.icon = "__cybersyn__/graphics/icons/combinator.png" +combinator_item.icon = "__cybersyn__/graphics/icons/cybernetic-combinator.png" combinator_item.icon_size = 64 combinator_item.icon_mipmaps = 4 combinator_item.order = data.raw["item"]["decider-combinator"].order.."-b" +combinator_item.place_result = COMBINATOR_NAME diff --git a/cybersyn/prototypes/signal.lua b/cybersyn/prototypes/signal.lua index 6e80e5b..0390528 100644 --- a/cybersyn/prototypes/signal.lua +++ b/cybersyn/prototypes/signal.lua @@ -3,37 +3,41 @@ subgroup_signal = { type = "item-subgroup", name = "cybersyn-signal", group = "signals", - order = "cybersyn0[cybersyn-signal]" + order = "f" } priority_signal = { type = "virtual-signal", name = SIGNAL_PRIORITY, icon = "__cybersyn__/graphics/icons/priority.png", icon_size = 64, + icon_mipmaps = 4, subgroup = "cybersyn-signal", - order = "a-a" + order = "a" } p_threshold_signal = { type = "virtual-signal", name = PROVIDE_THRESHOLD, icon = "__cybersyn__/graphics/icons/provide-threshold.png", icon_size = 64, + icon_mipmaps = 4, subgroup = "cybersyn-signal", - order = "a-b" + order = "b" } r_threshold_signal = { type = "virtual-signal", name = REQUEST_THRESHOLD, icon = "__cybersyn__/graphics/icons/request-threshold.png", icon_size = 64, + icon_mipmaps = 4, subgroup = "cybersyn-signal", - order = "a-c" + order = "c" } locked_slots_signal = { type = "virtual-signal", name = LOCKED_SLOTS, icon = "__cybersyn__/graphics/icons/locked-slots.png", icon_size = 64, + icon_mipmaps = 4, subgroup = "cybersyn-signal", - order = "a-d" + order = "d" } diff --git a/dev/locked-slots.xcf b/dev/locked-slots.xcf new file mode 100644 index 0000000..98c7a2e Binary files /dev/null and b/dev/locked-slots.xcf differ diff --git a/dev/logistic-chest-passive-provider.png b/dev/logistic-chest-passive-provider.png new file mode 100644 index 0000000..1684b7d Binary files /dev/null and b/dev/logistic-chest-passive-provider.png differ diff --git a/dev/logistic-chest-requester.png b/dev/logistic-chest-requester.png new file mode 100644 index 0000000..689f874 Binary files /dev/null and b/dev/logistic-chest-requester.png differ diff --git a/dev/lost-train.xcf b/dev/lost-train.xcf new file mode 100644 index 0000000..0dd6dcf Binary files /dev/null and b/dev/lost-train.xcf differ diff --git a/dev/provide-threshold.xcf b/dev/provide-threshold.xcf new file mode 100644 index 0000000..d2ef6d1 Binary files /dev/null and b/dev/provide-threshold.xcf differ diff --git a/dev/signal_X.png b/dev/signal_X.png new file mode 100644 index 0000000..b257184 Binary files /dev/null and b/dev/signal_X.png differ diff --git a/dev/signal_yellow.png b/dev/signal_yellow.png new file mode 100644 index 0000000..97ff46b Binary files /dev/null and b/dev/signal_yellow.png differ