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

fix item subgroup mapping

Browse source
This commit is contained in:
Adam 2022-09-01 22:57:40 +02:00
parent 5afbbd736d
commit b1cf94a8a8
2 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/events-mod/src/generated/lua/main/events/prototypeUpdates.lua
View file

@ -1,5 +1,5 @@
local ____exports = {} local ____exports = {}
local emit, getMapTilePrototypes, getEntityPrototypes, convertItemGroup local emit, getMapTilePrototypes, getEntityPrototypes, convertItemGroup, convertItemSubgroup
local ____kafkatorio_2Dschema = require("generated.kafkatorio-schema") local ____kafkatorio_2Dschema = require("generated.kafkatorio-schema")
local FactorioPrototype = ____kafkatorio_2Dschema.FactorioPrototype local FactorioPrototype = ____kafkatorio_2Dschema.FactorioPrototype
local KafkatorioPacketData = ____kafkatorio_2Dschema.KafkatorioPacketData local KafkatorioPacketData = ____kafkatorio_2Dschema.KafkatorioPacketData
@ -38,7 +38,7 @@ function getEntityPrototypes()
type = FactorioPrototype.Type.Entity, type = FactorioPrototype.Type.Entity,
protoId = Converters.prototypeId(entity.type, entity.name), protoId = Converters.prototypeId(entity.type, entity.name),
group = convertItemGroup(entity.group), group = convertItemGroup(entity.group),
subgroup = convertItemGroup(entity.subgroup), subgroup = convertItemSubgroup(entity.subgroup),
isBuilding = entity.is_building, isBuilding = entity.is_building,
isEntityWithOwner = entity.is_entity_with_owner, isEntityWithOwner = entity.is_entity_with_owner,
isMilitaryTarget = entity.is_military_target, isMilitaryTarget = entity.is_military_target,
@ -64,6 +64,9 @@ function getEntityPrototypes()
return protos return protos
end end
function convertItemGroup(itemGroup) function convertItemGroup(itemGroup)
return {name = itemGroup.name, type = itemGroup.type, parentName = nil}
end
function convertItemSubgroup(itemGroup)
local ____itemGroup_name_3 = itemGroup.name local ____itemGroup_name_3 = itemGroup.name
local ____itemGroup_type_4 = itemGroup.type local ____itemGroup_type_4 = itemGroup.type
local ____itemGroup_group_name_1 = itemGroup.group local ____itemGroup_group_name_1 = itemGroup.group

12
modules/events-mod/src/main/typescript/main/events/prototypeUpdates.ts
View file

@ -65,7 +65,7 @@ function getEntityPrototypes(): PrototypesByType<FactorioPrototype.Entity> {
protoId: Converters.prototypeId(entity.type, entity.name), protoId: Converters.prototypeId(entity.type, entity.name),
group: convertItemGroup(entity.group), group: convertItemGroup(entity.group),
subgroup: convertItemGroup(entity.subgroup), subgroup: convertItemSubgroup(entity.subgroup),
isBuilding: entity.is_building, isBuilding: entity.is_building,
isEntityWithOwner: entity.is_entity_with_owner, isEntityWithOwner: entity.is_entity_with_owner,
@ -76,7 +76,6 @@ function getEntityPrototypes(): PrototypesByType<FactorioPrototype.Entity> {
tileWidth: entity.tile_width, tileWidth: entity.tile_width,
tileHeight: entity.tile_height, tileHeight: entity.tile_height,
} }
entity.infinite_resource
if (entity.map_color != undefined) { if (entity.map_color != undefined) {
entityProto.mapColour = Converters.mapColour(entity.map_color) entityProto.mapColour = Converters.mapColour(entity.map_color)
@ -96,6 +95,15 @@ function getEntityPrototypes(): PrototypesByType<FactorioPrototype.Entity> {
function convertItemGroup(itemGroup: LuaGroup): EntityItemGroup { function convertItemGroup(itemGroup: LuaGroup): EntityItemGroup {
return {
name: itemGroup.name,
type: itemGroup.type,
parentName: null,
}
}
function convertItemSubgroup(itemGroup: LuaGroup): EntityItemGroup {
return { return {
name: itemGroup.name, name: itemGroup.name,
type: itemGroup.type, type: itemGroup.type,