Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Partial lathe ECS, fix cursed lathe visualizer, a bit more audiovisual feedback for lathes (#7238)

Browse Source 
* Prototype that's mostly borked rather than completely borked

* ECS inserting mats

* Partial ECS mostly done, needs cleanup and visualizer

* Replace timers

* Power visualizes at least

* First ""working"" version

* Clean up all lathes

* Colors

* Fix animation timing

* Fixes greyscale, adds a bunch of colors

* Give every (used) material a color

* Made most lathes take long enough you can at least see there's some sort of animation

* Insertion feedback popup

* Sound for circuit printer and uniform printer

* Fix queueing, optimize update

* Remove mono crash

* cleanup

* Fix test failure

* Techfab inserting sprite

* Cleanup and commenting

* Fix bug in CanProduce check

* Fix UI resolves

* Mirror review stuff
This commit is contained in:
Rane
2022-04-17 03:34:14 -04:00
committed by GitHub
parent 5f9cb8271d
commit 93cdca4f82
70 changed files with 781 additions and 1183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Resources/Textures/Structures/Machines/autolathe.rsi/building_unlit.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 685 B

BIN
Resources/Textures/Structures/Machines/autolathe.rsi/inserting.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.9 KiB

BIN
Resources/Textures/Structures/Machines/autolathe.rsi/inserting_glass.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.5 KiB

BIN
Resources/Textures/Structures/Machines/autolathe.rsi/inserting_gold.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.6 KiB

BIN
Resources/Textures/Structures/Machines/autolathe.rsi/inserting_metal.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.5 KiB

BIN
Resources/Textures/Structures/Machines/autolathe.rsi/inserting_phoron.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.6 KiB

BIN
Resources/Textures/Structures/Machines/autolathe.rsi/inserting_plasma.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.5 KiB

BIN
Resources/Textures/Structures/Machines/autolathe.rsi/inserting_plastic.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.5 KiB

BIN
Resources/Textures/Structures/Machines/autolathe.rsi/inserting_unlit.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 656 B

125
Resources/Textures/Structures/Machines/autolathe.rsi/meta.json
View File

@@ -33,124 +33,17 @@
]
},
{
"name": "building_unlit",
"name": "inserting",
"delays": [
[
0.5,
0.5,
0.5,
0.5,
0.5,
0.5,
0.5,
0.5,
0.5
]
]
},
{
"name": "inserting_unlit",
"delays": [
[
0.5,
0.5,
0.5,
0.5,
0.5,
0.5,
0.5,
0.5,
0.5
]
]
},
{
"name": "inserting_glass",
"delays": [
[
0.5,
0.5,
0.5,
0.5,
0.5,
0.5,
0.5,
0.5
]
]
},
{
"name": "inserting_gold",
"delays": [
[
0.5,
0.5,
0.5,
0.5,
0.5,
0.5,
0.5,
0.5
]
]
},
{
"name": "inserting_metal",
"delays": [
[
0.5,
0.5,
0.5,
0.5,
0.5,
0.5,
0.5,
0.5
]
]
},
{
"name": "inserting_phoron",
"delays": [
[
0.5,
0.5,
0.5,
0.5,
0.5,
0.5,
0.5,
0.5
]
]
},
{
"name": "inserting_plasma",
"delays": [
[
0.5,
0.5,
0.5,
0.5,
0.5,
0.5,
0.5,
0.5
]
]
},
{
"name": "inserting_plastic",
"delays": [
[
0.5,
0.5,
0.5,
0.5,
0.5,
0.5,
0.5,
0.5
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
}

BIN
Resources/Textures/Structures/Machines/circuit_imprinter.rsi/building_unlit.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 697 B

85
Resources/Textures/Structures/Machines/circuit_imprinter.rsi/meta.json
View File

@@ -20,68 +20,33 @@
"name": "building",
"delays": [
[
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08
0.16,
0.16,
0.16,
0.16,
0.16,
0.16,
0.16,
0.16,
0.16,
0.16,
0.16,
0.16,
0.16,
0.16,
0.16,
0.16,
0.16,
0.16,
0.16,
0.16,
0.16,
0.16,
0.16,
0.16,
0.18
]
]
},
{
"name": "building_unlit",
"delays": [
[
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08,
0.08
]
]
},
{
"name": "inserting_unlit"
}
]
}

BIN
Resources/Textures/Structures/Machines/protolathe.rsi/building_unlit.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.8 KiB

BIN
Resources/Textures/Structures/Machines/circuit_imprinter.rsi/inserting_unlit.png → Resources/Textures/Structures/Machines/protolathe.rsi/inserting.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
Resources/Textures/Structures/Machines/protolathe.rsi/inserting_adamantine.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 452 B

BIN
Resources/Textures/Structures/Machines/protolathe.rsi/inserting_bananium.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 473 B

BIN
Resources/Textures/Structures/Machines/protolathe.rsi/inserting_diamond.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 468 B

BIN
Resources/Textures/Structures/Machines/protolathe.rsi/inserting_glass.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 445 B

BIN
Resources/Textures/Structures/Machines/protolathe.rsi/inserting_gold.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 490 B

BIN
Resources/Textures/Structures/Machines/protolathe.rsi/inserting_metal.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 447 B

BIN
Resources/Textures/Structures/Machines/protolathe.rsi/inserting_phoron.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 486 B

BIN
Resources/Textures/Structures/Machines/protolathe.rsi/inserting_plasma.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 461 B

BIN
Resources/Textures/Structures/Machines/protolathe.rsi/inserting_plastic.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 469 B

BIN
Resources/Textures/Structures/Machines/protolathe.rsi/inserting_silver.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 458 B

BIN
Resources/Textures/Structures/Machines/protolathe.rsi/inserting_unlit.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 397 B

BIN
Resources/Textures/Structures/Machines/protolathe.rsi/inserting_uranium.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 435 B

204
Resources/Textures/Structures/Machines/protolathe.rsi/meta.json
View File

@@ -37,203 +37,17 @@
]
},
{
"name": "building_unlit",
"name": "inserting",
"delays": [
[
0.8,
0.8,
0.8,
0.8,
0.8,
0.8,
0.8,
0.8,
0.8,
0.8,
0.8,
0.8,
0.8
]
]
},
{
"name": "inserting_unlit",
"delays": [
[
0.8,
0.8,
0.8,
0.8,
0.8,
0.8,
0.8,
0.8,
0.8
]
]
},
{
"name": "inserting_glass",
"delays": [
[
0.8,
0.8,
0.8,
0.8,
0.8,
0.8,
0.8,
0.8
]
]
},
{
"name": "inserting_adamantine",
"delays": [
[
0.8,
0.8,
0.8,
0.8,
0.8,
0.8,
0.8,
0.8
]
]
},
{
"name": "inserting_bananium",
"delays": [
[
0.8,
0.8,
0.8,
0.8,
0.8,
0.8,
0.8,
0.8
]
]
},
{
"name": "inserting_diamond",
"delays": [
[
0.8,
0.8,
0.8,
0.8,
0.8,
0.8,
0.8,
0.8
]
]
},
{
"name": "inserting_silver",
"delays": [
[
0.8,
0.8,
0.8,
0.8,
0.8,
0.8,
0.8,
0.8
]
]
},
{
"name": "inserting_uranium",
"delays": [
[
0.8,
0.8,
0.8,
0.8,
0.8,
0.8,
0.8,
0.8
]
]
},
{
"name": "inserting_gold",
"delays": [
[
0.8,
0.8,
0.8,
0.8,
0.8,
0.8,
0.8,
0.8
]
]
},
{
"name": "inserting_metal",
"delays": [
[
0.8,
0.8,
0.8,
0.8,
0.8,
0.8,
0.8,
0.8
]
]
},
{
"name": "inserting_phoron",
"delays": [
[
0.8,
0.8,
0.8,
0.8,
0.8,
0.8,
0.8,
0.8
]
]
},
{
"name": "inserting_plasma",
"delays": [
[
0.8,
0.8,
0.8,
0.8,
0.8,
0.8,
0.8,
0.8
]
]
},
{
"name": "inserting_plastic",
"delays": [
[
0.8,
0.8,
0.8,
0.8,
0.8,
0.8,
0.8,
0.8
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
}

BIN
Resources/Textures/Structures/Machines/security_techfab.rsi/inserting.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.6 KiB

15
Resources/Textures/Structures/Machines/security_techfab.rsi/meta.json
View File

@@ -15,6 +15,21 @@
},
{
"name": "unlit"
},
{
"name": "inserting",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
}
]
}

6
Resources/Textures/Structures/Machines/uniform_printer.rsi/meta.json
View File

@@ -11,12 +11,6 @@
"name": "icon",
"directions": 4
},
{
"name": "panel"
},
{
"name": "unlit"
},
{
"name": "building",
"directions": 4,

BIN
Resources/Textures/Structures/Machines/uniform_printer.rsi/panel.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

BIN
Resources/Textures/Structures/Machines/uniform_printer.rsi/unlit.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB