lazzexus/Kafkatorio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix init of global vars, make MapTile DTO more concise, and version bump

Browse source
This commit is contained in:
Adam 2022-02-21 15:36:12 +01:00
parent 8dff124a71
commit 494913d3b9
22 changed files with 137 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/events-schema/src/commonMain/kotlin/dev/adamko/kafkatorio/events/schema/factorioCommonData.kt
View file

@ -98,8 +98,9 @@ data class ColourHex(
@Serializable
data class MapTile(
val prototypeName: PrototypeName,
val position: MapTilePosition,
val x: Int,
val y: Int,
val proto: PrototypeName,
)

2
modules/events-schema/src/commonMain/kotlin/dev/adamko/kafkatorio/events/schema/factorioPrototypes.kt
View file

@ -64,7 +64,7 @@ object FactorioPrototypeJsonSerializer : JsonContentPolymorphicSerializer<Factor
@Serializable
data class MapTilePrototype(
val name: String,
val name: PrototypeName,
val layer: UInt,
val mapColour: Colour,
// @Serializable(with = FactorioJsonListSerializer::class)

52
modules/events-schema/src/commonTest/kotlin/dev/adamko/kafkatorio/events/schema/FactorioEventTest.kt
View file

@ -209,32 +209,24 @@ class FactorioEventTest : FunSpec({
"surfaceIndex": 1,
"tiles": [
{
"position": {
"y": 10,
"x": -65
},
"prototypeName": "refined-concrete"
"y": 10,
"x": -65,
"proto": "refined-concrete"
},
{
"position": {
"y": 11,
"x": -65
},
"prototypeName": "red-earth"
"y": 11,
"x": -65,
"proto": "red-earth"
},
{
"position": {
"y": 10,
"x": -64
},
"prototypeName": "blue-cheese"
"y": 10,
"x": -64,
"proto": "blue-cheese"
},
{
"position": {
"y": 11,
"x": -64
},
"prototypeName": "refined-concrete"
"y": 11,
"x": -64,
"proto": "refined-concrete"
}
]
},
@ -254,20 +246,24 @@ class FactorioEventTest : FunSpec({
surfaceIndex = SurfaceIndex(1u),
tiles = listOf(
MapTile(
prototypeName = PrototypeName("refined-concrete"),
position = MapTilePosition(-65, 10)
proto = PrototypeName("refined-concrete"),
x = -65,
y = 10,
),
MapTile(
prototypeName = PrototypeName("red-earth"),
position = MapTilePosition(-65, 11)
proto = PrototypeName("red-earth"),
x = -65,
y = 11,
),
MapTile(
prototypeName = PrototypeName("blue-cheese"),
position = MapTilePosition(-64, 10)
proto = PrototypeName("blue-cheese"),
x = -64,
y = 10,
),
MapTile(
prototypeName = PrototypeName("refined-concrete"),
position = MapTilePosition(-64, 11)
proto = PrototypeName("refined-concrete"),
x = -64,
y = 11,
),
)
),