added graphics
2
.vscode/launch.json
vendored
@@ -15,7 +15,6 @@
|
|||||||
"flib": true,
|
"flib": true,
|
||||||
"cybersyn": true,
|
"cybersyn": true,
|
||||||
"creative-mod": true,
|
"creative-mod": true,
|
||||||
"LogisticTrainNetwork": true,
|
|
||||||
},
|
},
|
||||||
"disableExtraMods": true
|
"disableExtraMods": true
|
||||||
},
|
},
|
||||||
@@ -42,7 +41,6 @@
|
|||||||
"flib": true,
|
"flib": true,
|
||||||
"cybersyn": true,
|
"cybersyn": true,
|
||||||
"creative-mod": true,
|
"creative-mod": true,
|
||||||
"LogisticTrainNetwork": true,
|
|
||||||
},
|
},
|
||||||
"disableExtraMods": true
|
"disableExtraMods": true
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,3 +3,4 @@ do not play close sound when a different gui is opened
|
|||||||
support space elevator
|
support space elevator
|
||||||
do hardcore testing
|
do hardcore testing
|
||||||
models & art
|
models & art
|
||||||
|
move signal subgroup
|
||||||
|
|||||||
BIN
cybersyn/graphics/combinator/combinator-displays.png
Normal file
|
After Width: | Height: | Size: 4.6 KiB |
BIN
cybersyn/graphics/combinator/cybernetic-combinator-remnants.png
Normal file
|
After Width: | Height: | Size: 23 KiB |
BIN
cybersyn/graphics/combinator/cybernetic-combinator-shadow.png
Normal file
|
After Width: | Height: | Size: 2.8 KiB |
BIN
cybersyn/graphics/combinator/cybernetic-combinator.png
Normal file
|
After Width: | Height: | Size: 28 KiB |
BIN
cybersyn/graphics/combinator/hr-combinator-displays.png
Normal file
|
After Width: | Height: | Size: 15 KiB |
|
After Width: | Height: | Size: 76 KiB |
BIN
cybersyn/graphics/combinator/hr-cybernetic-combinator-shadow.png
Normal file
|
After Width: | Height: | Size: 7.7 KiB |
BIN
cybersyn/graphics/combinator/hr-cybernetic-combinator.png
Normal file
|
After Width: | Height: | Size: 96 KiB |
|
Before Width: | Height: | Size: 2.5 KiB |
BIN
cybersyn/graphics/icons/cybernetic-combinator.png
Normal file
|
After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 8.0 KiB |
|
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 16 KiB |
@@ -1,6 +1,6 @@
|
|||||||
--By Mami
|
--By Mami
|
||||||
combinator_entity = flib.copy_prototype(data.raw["arithmetic-combinator"]["arithmetic-combinator"], COMBINATOR_NAME)
|
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 = {
|
combinator_entity.radius_visualisation_specification = {
|
||||||
sprite = {
|
sprite = {
|
||||||
filename = "__cybersyn__/graphics/icons/area-of-effect.png",
|
filename = "__cybersyn__/graphics/icons/area-of-effect.png",
|
||||||
@@ -15,6 +15,88 @@ combinator_entity.active_energy_usage = "10KW"
|
|||||||
combinator_entity.allow_copy_paste = false
|
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 = flib.copy_prototype(data.raw["constant-combinator"]["constant-combinator"], COMBINATOR_OUT_NAME)
|
||||||
combinator_out_entity.icon = nil
|
combinator_out_entity.icon = nil
|
||||||
combinator_out_entity.icon_size = nil
|
combinator_out_entity.icon_size = nil
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
--By Mami
|
--By Mami
|
||||||
combinator_item = flib.copy_prototype(data.raw["item"]["arithmetic-combinator"], COMBINATOR_NAME)
|
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_size = 64
|
||||||
combinator_item.icon_mipmaps = 4
|
combinator_item.icon_mipmaps = 4
|
||||||
combinator_item.order = data.raw["item"]["decider-combinator"].order.."-b"
|
combinator_item.order = data.raw["item"]["decider-combinator"].order.."-b"
|
||||||
|
combinator_item.place_result = COMBINATOR_NAME
|
||||||
|
|||||||
@@ -3,37 +3,41 @@ subgroup_signal = {
|
|||||||
type = "item-subgroup",
|
type = "item-subgroup",
|
||||||
name = "cybersyn-signal",
|
name = "cybersyn-signal",
|
||||||
group = "signals",
|
group = "signals",
|
||||||
order = "cybersyn0[cybersyn-signal]"
|
order = "f"
|
||||||
}
|
}
|
||||||
priority_signal = {
|
priority_signal = {
|
||||||
type = "virtual-signal",
|
type = "virtual-signal",
|
||||||
name = SIGNAL_PRIORITY,
|
name = SIGNAL_PRIORITY,
|
||||||
icon = "__cybersyn__/graphics/icons/priority.png",
|
icon = "__cybersyn__/graphics/icons/priority.png",
|
||||||
icon_size = 64,
|
icon_size = 64,
|
||||||
|
icon_mipmaps = 4,
|
||||||
subgroup = "cybersyn-signal",
|
subgroup = "cybersyn-signal",
|
||||||
order = "a-a"
|
order = "a"
|
||||||
}
|
}
|
||||||
p_threshold_signal = {
|
p_threshold_signal = {
|
||||||
type = "virtual-signal",
|
type = "virtual-signal",
|
||||||
name = PROVIDE_THRESHOLD,
|
name = PROVIDE_THRESHOLD,
|
||||||
icon = "__cybersyn__/graphics/icons/provide-threshold.png",
|
icon = "__cybersyn__/graphics/icons/provide-threshold.png",
|
||||||
icon_size = 64,
|
icon_size = 64,
|
||||||
|
icon_mipmaps = 4,
|
||||||
subgroup = "cybersyn-signal",
|
subgroup = "cybersyn-signal",
|
||||||
order = "a-b"
|
order = "b"
|
||||||
}
|
}
|
||||||
r_threshold_signal = {
|
r_threshold_signal = {
|
||||||
type = "virtual-signal",
|
type = "virtual-signal",
|
||||||
name = REQUEST_THRESHOLD,
|
name = REQUEST_THRESHOLD,
|
||||||
icon = "__cybersyn__/graphics/icons/request-threshold.png",
|
icon = "__cybersyn__/graphics/icons/request-threshold.png",
|
||||||
icon_size = 64,
|
icon_size = 64,
|
||||||
|
icon_mipmaps = 4,
|
||||||
subgroup = "cybersyn-signal",
|
subgroup = "cybersyn-signal",
|
||||||
order = "a-c"
|
order = "c"
|
||||||
}
|
}
|
||||||
locked_slots_signal = {
|
locked_slots_signal = {
|
||||||
type = "virtual-signal",
|
type = "virtual-signal",
|
||||||
name = LOCKED_SLOTS,
|
name = LOCKED_SLOTS,
|
||||||
icon = "__cybersyn__/graphics/icons/locked-slots.png",
|
icon = "__cybersyn__/graphics/icons/locked-slots.png",
|
||||||
icon_size = 64,
|
icon_size = 64,
|
||||||
|
icon_mipmaps = 4,
|
||||||
subgroup = "cybersyn-signal",
|
subgroup = "cybersyn-signal",
|
||||||
order = "a-d"
|
order = "d"
|
||||||
}
|
}
|
||||||
|
|||||||
BIN
dev/locked-slots.xcf
Normal file
BIN
dev/logistic-chest-passive-provider.png
Normal file
|
After Width: | Height: | Size: 12 KiB |
BIN
dev/logistic-chest-requester.png
Normal file
|
After Width: | Height: | Size: 12 KiB |
BIN
dev/lost-train.xcf
Normal file
BIN
dev/provide-threshold.xcf
Normal file
BIN
dev/signal_X.png
Normal file
|
After Width: | Height: | Size: 4.1 KiB |
BIN
dev/signal_yellow.png
Normal file
|
After Width: | Height: | Size: 2.1 KiB |