added graphics

This commit is contained in:
Monica Moniot
2022-11-05 10:31:14 -04:00
parent ccaa7e989e
commit 2c5bee0c6a
29 changed files with 95 additions and 9 deletions

2
.vscode/launch.json vendored
View File

@@ -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
}

View File

@@ -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

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 76 KiB

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.7 KiB

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 96 KiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 11 KiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 11 KiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 12 KiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 10 KiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 8.0 KiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 16 KiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 16 KiB

View File

@@ -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

View File

@@ -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

View File

@@ -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"
}

BIN
dev/locked-slots.xcf Normal file
View File

Binary file not shown.

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

BIN
dev/lost-train.xcf Normal file
View File

Binary file not shown.

BIN
dev/provide-threshold.xcf Normal file
View File

Binary file not shown.

BIN
dev/signal_X.png Normal file
View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
dev/signal_yellow.png Normal file
View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB