Skip to content

Added artwork for unstacker #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev/b6-fb-forks-v5
Choose a base branch
from
Open

Added artwork for unstacker #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added res/ui/building_icons/counter.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
376 changes: 204 additions & 172 deletions res_built/atlas/atlas0_10.json
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified res_built/atlas/atlas0_10.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
358 changes: 195 additions & 163 deletions res_built/atlas/atlas0_100.json
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified res_built/atlas/atlas0_100.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
372 changes: 202 additions & 170 deletions res_built/atlas/atlas0_25.json
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified res_built/atlas/atlas0_25.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
352 changes: 192 additions & 160 deletions res_built/atlas/atlas0_50.json
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified res_built/atlas/atlas0_50.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
342 changes: 187 additions & 155 deletions res_built/atlas/atlas0_75.json
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified res_built/atlas/atlas0_75.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
648 changes: 648 additions & 0 deletions res_raw/atlas – kopio.tps
View file
Open in desktop

Large diffs are not rendered by default.

72 changes: 39 additions & 33 deletions res_raw/atlas.tps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,43 @@
<key>scale9FromFile</key>
<false/>
</struct>
<key type="filename">sprites/blueprints/counter.png</key>
<key type="filename">sprites/blueprints/miner-chainable.png</key>
<key type="filename">sprites/blueprints/miner.png</key>
<key type="filename">sprites/blueprints/rotater-ccw.png</key>
<key type="filename">sprites/blueprints/rotater-fl.png</key>
<key type="filename">sprites/blueprints/rotater.png</key>
<key type="filename">sprites/blueprints/splitter-compact-inverse.png</key>
<key type="filename">sprites/blueprints/splitter-compact.png</key>
<key type="filename">sprites/blueprints/trash.png</key>
<key type="filename">sprites/blueprints/underground_belt_entry-tier2.png</key>
<key type="filename">sprites/blueprints/underground_belt_entry.png</key>
<key type="filename">sprites/blueprints/underground_belt_exit-tier2.png</key>
<key type="filename">sprites/blueprints/underground_belt_exit.png</key>
<key type="filename">sprites/buildings/counter.png</key>
<key type="filename">sprites/buildings/miner-chainable.png</key>
<key type="filename">sprites/buildings/rotater-ccw.png</key>
<key type="filename">sprites/buildings/rotater-fl.png</key>
<key type="filename">sprites/buildings/splitter-compact-inverse.png</key>
<key type="filename">sprites/buildings/splitter-compact.png</key>
<key type="filename">sprites/buildings/underground_belt_entry-tier2.png</key>
<key type="filename">sprites/buildings/underground_belt_entry.png</key>
<key type="filename">sprites/buildings/underground_belt_exit-tier2.png</key>
<key type="filename">sprites/buildings/underground_belt_exit.png</key>
<struct type="IndividualSpriteSettings">
<key>pivotPoint</key>
<point_f>0.5,0.5</point_f>
<key>spriteScale</key>
<double>1</double>
<key>scale9Enabled</key>
<false/>
<key>scale9Borders</key>
<rect>48,48,96,96</rect>
<key>scale9Paddings</key>
<rect>48,48,96,96</rect>
<key>scale9FromFile</key>
<false/>
</struct>
<key type="filename">sprites/blueprints/cutter-quad.png</key>
<key type="filename">sprites/blueprints/painter-quad.png</key>
<key type="filename">sprites/buildings/cutter-quad.png</key>
Expand All @@ -431,7 +468,9 @@
<key type="filename">sprites/blueprints/painter.png</key>
<key type="filename">sprites/blueprints/splitter.png</key>
<key type="filename">sprites/blueprints/stacker.png</key>
<key type="filename">sprites/blueprints/unstacker.png</key>
<key type="filename">sprites/buildings/painter-mirrored.png</key>
<key type="filename">sprites/buildings/unstacker.png</key>
<struct type="IndividualSpriteSettings">
<key>pivotPoint</key>
<point_f>0.5,0.5</point_f>
Expand All @@ -446,39 +485,6 @@
<key>scale9FromFile</key>
<false/>
</struct>
<key type="filename">sprites/blueprints/miner-chainable.png</key>
<key type="filename">sprites/blueprints/miner.png</key>
<key type="filename">sprites/blueprints/rotater-ccw.png</key>
<key type="filename">sprites/blueprints/rotater.png</key>
<key type="filename">sprites/blueprints/splitter-compact-inverse.png</key>
<key type="filename">sprites/blueprints/splitter-compact.png</key>
<key type="filename">sprites/blueprints/trash.png</key>
<key type="filename">sprites/blueprints/underground_belt_entry-tier2.png</key>
<key type="filename">sprites/blueprints/underground_belt_entry.png</key>
<key type="filename">sprites/blueprints/underground_belt_exit-tier2.png</key>
<key type="filename">sprites/blueprints/underground_belt_exit.png</key>
<key type="filename">sprites/buildings/miner-chainable.png</key>
<key type="filename">sprites/buildings/rotater-ccw.png</key>
<key type="filename">sprites/buildings/splitter-compact-inverse.png</key>
<key type="filename">sprites/buildings/splitter-compact.png</key>
<key type="filename">sprites/buildings/underground_belt_entry-tier2.png</key>
<key type="filename">sprites/buildings/underground_belt_entry.png</key>
<key type="filename">sprites/buildings/underground_belt_exit-tier2.png</key>
<key type="filename">sprites/buildings/underground_belt_exit.png</key>
<struct type="IndividualSpriteSettings">
<key>pivotPoint</key>
<point_f>0.5,0.5</point_f>
<key>spriteScale</key>
<double>1</double>
<key>scale9Enabled</key>
<false/>
<key>scale9Borders</key>
<rect>48,48,96,96</rect>
<key>scale9Paddings</key>
<rect>48,48,96,96</rect>
<key>scale9FromFile</key>
<false/>
</struct>
<key type="filename">sprites/buildings/cutter.png</key>
<key type="filename">sprites/buildings/mixer.png</key>
<key type="filename">sprites/buildings/painter.png</key>
Expand Down
Binary file added res_raw/sprites/blueprints/counter.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res_raw/sprites/blueprints/unstacker.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res_raw/sprites/buildings/counter.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res_raw/sprites/buildings/unstacker.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
97 changes: 51 additions & 46 deletions src/js/game/custom/unstacker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
import { MetaBuilding,
enumDirection,
enumItemProcessorTypes,
T,
ItemProcessorComponent,
ItemEjectorComponent,
ItemAcceptorComponent,
Vector,
formatItemsPerSecond,
ShapeItem,
ShapeDefinition,
import {
MetaBuilding,
enumDirection,
enumItemProcessorTypes,
T,
ItemProcessorComponent,
ItemEjectorComponent,
ItemAcceptorComponent,
Vector,
formatItemsPerSecond,
ShapeItem,
ShapeDefinition,
} from "./gameData";




export class MetaUnstackerBuilding extends MetaBuilding {
constructor() {
super("unstacker");
Expand Down Expand Up @@ -82,71 +80,78 @@ export class MetaUnstackerBuilding extends MetaBuilding {
}
}




// returns trackProduction
export function UnstackerProcess({ items, trackProduction, entity, outItems, self }) {
console.log("Unstacker PROCESSES");

const inputItem = items[0].item;
trackProduction = false;

// debugger;
// debugger;
let input = items.map(e => e.item.definition.getHash());



let [it] = input;
let out = [];
let a = it.split(':');
let top = a.pop();
let right = a.join(':');
out = [top, right]




let a = it.split(":");
let right = a.pop();
let top = a.join(":");
out = [top, right];

for (let i = 0; i < out.length; ++i) {
if (!out[i]) continue;
outItems.push({
item: new ShapeItem(ShapeDefinition.fromShortKey(out[i])),
requiredSlot: i,
})
if (!out[i]) continue;
outItems.push({
item: new ShapeItem(ShapeDefinition.fromShortKey(out[i])),
requiredSlot: i,
});
}

return trackProduction;
}


export const UnstackerSprite = [
{ // data:
{
// data:
w: 192 * 2,
h: 192,
}, { // base:
},
{
// base:
path: "M 0 0 L 0 100 100 100 100 0 z",
}, { // red cross:
},
{
// red cross:
path: "M 175,40 l 12,12 -12,12 12,12 -12,12 -12,-12 -12,12 -12,-12 12,-12 -12,-12 12,-12 12,12 z",
fill: "red",
}, { // green arrow:
},
{
// green arrow:
path: "M 40,35 l 30,-30 30,30 z",
fill: "lightgreen",
},
];
export const UnstackerSpriteBp = [
{ // data:
{
// data:
w: 192 * 2,
h: 192,
}, { // base:
},
{
// base:
path: "M 11,31 v 130 l 20,20 h 130 l 20,-20 v -130 l -20,-20 h -130 z",
fill: "#6CD1FF", stroke: "#56A7D8",
}, { // red cross:
fill: "#6CD1FF",
stroke: "#56A7D8",
},
{
// red cross:
path: "M 175,40 l 12,12 -12,12 12,12 -12,12 -12,-12 -12,12 -12,-12 12,-12 -12,-12 12,-12 12,12 z",
fill: "#5EB7ED", stroke: "#56A7D8",
}, { // green arrow:
fill: "#5EB7ED",
stroke: "#56A7D8",
},
{
// green arrow:
path: "M 40,35 l 30,-30 30,30 z",
fill: "#5EB7ED", stroke: "#56A7D8",
fill: "#5EB7ED",
stroke: "#56A7D8",
},
];

Expand All @@ -162,4 +167,4 @@ export const unstackerBuildingData = {
// TODO: T
Tname: "Unstacker",
Tdesc: "Whatever...",
};
};