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

APC & SMES appearances. (#78)

Browse Source 
* CEV-Eris SMES sprite as RSI.

Has been modified so that the light overlay states use alpha blending.

* Add tiny glow to SMES display sprite.

* Appearances work v2

* More WiP

* RoundToLevels works correctly on even level counts now.

* SMES -> Smes because MS guidelines.

* CEV-Eris APC sprite.

* APC visuals.

* Reduce SMES scale again to normal levels.

* Update submodule
This commit is contained in:
Pieter-Jan Briers
2018-07-17 11:39:55 +02:00
committed by GitHub
parent 7629d447aa
commit ad5c82fec9
69 changed files with 1253 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Resources/Maps/stationstation.yml
View File

@@ -1745,6 +1745,8 @@
- &1206253354
type: &1921049841 PowerStorage
- type: PowerNode
- type: Smes
- type: Appearance
- type: entity
id: SMES
name: SMES
@@ -1760,6 +1762,8 @@
- type: Sprite
- type: PowerStorage
- type: PowerNode
- type: Smes
- type: Appearance
- type: entity
id: &400177229 BlueWire
name: BlueWire
@@ -2236,8 +2240,8 @@
- type: PowerDevice
- type: PoweredLight
- type: entity
id: &692485458 WPP
name: WPP
id: &692485458 APC
name: APC
components:
- type: PowerStorage
- type: PowerNode
@@ -2251,9 +2255,11 @@
- type: Sprite
- &1938028994
type: &323998104 PowerProvider
- type: Apc
- type: Appearance
- type: entity
id: WPP
name: WPP
id: APC
name: APC
components:
- type: PowerStorage
- type: PowerNode
@@ -2266,6 +2272,8 @@
- type: BoundingBox
- type: Sprite
- type: PowerProvider
- type: Apc
- type: Appearance
- type: entity
id: Wire
name: Wire
@@ -2369,8 +2377,8 @@
- type: PowerDevice
- type: PoweredLight
- type: entity
id: WPP
name: WPP
id: APC
name: APC
components:
- type: PowerStorage
- type: PowerNode
@@ -2382,6 +2390,8 @@
- type: BoundingBox
- type: Sprite
- type: PowerProvider
- type: Apc
- type: Appearance
- type: entity
id: Wire
name: Wire
@@ -2396,8 +2406,8 @@
color: '#FF0000FF'
- type: PowerTransfer
- type: entity
id: WPP
name: WPP
id: APC
name: APC
components:
- type: PowerStorage
- type: PowerNode
@@ -2409,6 +2419,8 @@
- type: BoundingBox
- type: Sprite
- type: PowerProvider
- type: Apc
- type: Appearance
- type: entity
id: Wire
name: Wire
@@ -2649,8 +2661,8 @@
color: '#FF0000FF'
- type: PowerTransfer
- type: entity
id: WPP
name: WPP
id: APC
name: APC
components:
- type: PowerStorage
- type: PowerNode
@@ -2663,9 +2675,11 @@
- type: BoundingBox
- type: Sprite
- type: PowerProvider
- type: Apc
- type: Appearance
- type: entity
id: WPP
name: WPP
id: APC
name: APC
components:
- type: PowerStorage
- type: PowerNode
@@ -2678,6 +2692,8 @@
- type: BoundingBox
- type: Sprite
- type: PowerProvider
- type: Apc
- type: Appearance
- type: entity
id: Wire
name: Wire

32
Resources/Prototypes/Entities/Power.yml
View File

@@ -70,25 +70,49 @@
chargerate: 200
chargepowernet: false
- type: entity
parent: WPP
id: APC
name: APC
components:
- type: Apc
- type: Sprite
netsync: false
texture: ""
sprite: "Buildings/apc.rsi"
state: apc0
- type: Appearance
visuals:
- type: ApcVisualizer2D
- type: entity
id: SMES
name: SMES
description: Stores power in its supermagnetic cells
name: Smes
description: Stores power in its super-magnetic cells
components:
- type: Transform
- type: Clickable
- type: BoundingBox
- type: Sprite
texture: Objects/storage.png
netsync: false
sprite: Buildings/smes.rsi
state: smes
layers:
- state: smes-display
shader: unshaded
- type: Icon
texture: Objects/storage.png
sprite: Buildings/smes.rsi
state: smes
- type: PowerStorage
capacity: 3000
charge: 1000
chargerate: 200
distributionrate: 400
chargepowernet: true
- type: Smes
- type: Appearance
visuals:
- type: SmesVisualizer2D
- type: entity
id: WiredMachine

BIN
Resources/Textures/Buildings/apc.rsi/apc-b.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 704 B

BIN
Resources/Textures/Buildings/apc.rsi/apc-spark.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 966 B

BIN
Resources/Textures/Buildings/apc.rsi/apc0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 408 B

BIN
Resources/Textures/Buildings/apc.rsi/apc1-b-nocover.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 296 B

BIN
Resources/Textures/Buildings/apc.rsi/apc1-nocover.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 299 B

BIN
Resources/Textures/Buildings/apc.rsi/apc1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 536 B

BIN
Resources/Textures/Buildings/apc.rsi/apc2-b-nocover.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 329 B

BIN
Resources/Textures/Buildings/apc.rsi/apc2-nocover.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 335 B

BIN
Resources/Textures/Buildings/apc.rsi/apc2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 575 B

BIN
Resources/Textures/Buildings/apc.rsi/apcemag.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 523 B

BIN
Resources/Textures/Buildings/apc.rsi/apcewires.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 470 B

BIN
Resources/Textures/Buildings/apc.rsi/apcmaint.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 483 B

BIN
Resources/Textures/Buildings/apc.rsi/apco0-0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 101 B

BIN
Resources/Textures/Buildings/apc.rsi/apco0-1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 103 B

BIN
Resources/Textures/Buildings/apc.rsi/apco0-2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 103 B

BIN
Resources/Textures/Buildings/apc.rsi/apco0-3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 103 B

BIN
Resources/Textures/Buildings/apc.rsi/apco1-0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 101 B

BIN
Resources/Textures/Buildings/apc.rsi/apco1-1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 103 B

BIN
Resources/Textures/Buildings/apc.rsi/apco1-2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 103 B

BIN
Resources/Textures/Buildings/apc.rsi/apco1-3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 103 B

BIN
Resources/Textures/Buildings/apc.rsi/apco2-0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 101 B

BIN
Resources/Textures/Buildings/apc.rsi/apco2-1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 103 B

BIN
Resources/Textures/Buildings/apc.rsi/apco2-2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 103 B

BIN
Resources/Textures/Buildings/apc.rsi/apco2-3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 102 B

BIN
Resources/Textures/Buildings/apc.rsi/apco3-0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 257 B

BIN
Resources/Textures/Buildings/apc.rsi/apco3-1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 358 B

BIN
Resources/Textures/Buildings/apc.rsi/apco3-2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 280 B

BIN
Resources/Textures/Buildings/apc.rsi/apcox-0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 107 B

BIN
Resources/Textures/Buildings/apc.rsi/apcox-1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 106 B

344
Resources/Textures/Buildings/apc.rsi/meta.json Normal file
View File

@@ -0,0 +1,344 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/d1e0161af146835f4fb79d21a6200caa9cc842d0/icons/obj/power.dmi",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "apc-b",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "apc-spark",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "apc0",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "apc1",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "apc1-b-nocover",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "apc1-nocover",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "apc2",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "apc2-b-nocover",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "apc2-nocover",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "apcemag",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
0.5,
0.5
]
]
},
{
"name": "apcewires",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "apcmaint",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "apco0-0",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "apco0-1",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "apco0-2",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "apco0-3",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "apco1-0",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "apco1-1",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "apco1-2",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "apco1-3",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "apco2-0",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "apco2-1",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "apco2-2",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "apco2-3",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "apco3-0",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
1.0,
2.0
]
]
},
{
"name": "apco3-1",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.2
]
]
},
{
"name": "apco3-2",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
1.0,
1.0
]
]
},
{
"name": "apcox-0",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "apcox-1",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
1.0
]
]
}
]
}

170
Resources/Textures/Buildings/smes.rsi/meta.json Normal file
View File

@@ -0,0 +1,170 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/d1e0161af146835f4fb79d21a6200caa9cc842d0/icons/obj/power.dmi and modified.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "smes",
"select": [],
"flags": {},
"directions": 1
},
{
"name": "smes-display",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
0.2,
0.2,
0.2,
0.2,
0.2
]
]
},
{
"name": "smes-crit",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
0.2,
0.2,
0.2,
0.2
]
]
},
{
"name": "smes-oc0",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "smes-oc1",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
0.5,
0.5
]
]
},
{
"name": "smes-oc2",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
0.5,
0.5
]
]
},
{
"name": "smes-og1",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "smes-og2",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "smes-og3",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "smes-og4",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "smes-og5",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "smes-op0",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "smes-op1",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
1.0,
1.0
]
]
},
{
"name": "smes-op2",
"select": [],
"flags": {},
"directions": 1,
"delays": [
[
1.0
]
]
}
]
}

BIN
Resources/Textures/Buildings/smes.rsi/smes-crit.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 721 B

BIN
Resources/Textures/Buildings/smes.rsi/smes-display.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 514 B

BIN
Resources/Textures/Buildings/smes.rsi/smes-oc0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 162 B

BIN
Resources/Textures/Buildings/smes.rsi/smes-oc1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 171 B

BIN
Resources/Textures/Buildings/smes.rsi/smes-oc2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 171 B

BIN
Resources/Textures/Buildings/smes.rsi/smes-og1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 146 B

BIN
Resources/Textures/Buildings/smes.rsi/smes-og2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 181 B

BIN
Resources/Textures/Buildings/smes.rsi/smes-og3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 198 B

BIN
Resources/Textures/Buildings/smes.rsi/smes-og4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 230 B

BIN
Resources/Textures/Buildings/smes.rsi/smes-og5.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 255 B

BIN
Resources/Textures/Buildings/smes.rsi/smes-op0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 146 B

BIN
Resources/Textures/Buildings/smes.rsi/smes-op1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 192 B

BIN
Resources/Textures/Buildings/smes.rsi/smes-op2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 146 B

BIN
Resources/Textures/Buildings/smes.rsi/smes.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB