diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/Types.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/Types.kt index 250c22cc..aab5bff1 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/Types.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/Types.kt @@ -1,7 +1,11 @@ package ru.dbotthepony.kstarbound.defs.actor +import ru.dbotthepony.kommons.util.Either import ru.dbotthepony.kstarbound.json.builder.IStringSerializable +// stat modifier or named status effect +typealias PersistentStatusEffect = Either + // uint8_t enum class Gender(override val jsonName: String) : IStringSerializable { MALE("Male"), FEMALE("Female"); diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/tile/LoungeableObject.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/tile/LoungeableObject.kt index e0d0501e..e34d3cc6 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/tile/LoungeableObject.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/tile/LoungeableObject.kt @@ -13,6 +13,7 @@ import ru.dbotthepony.kstarbound.Registry import ru.dbotthepony.kstarbound.Starbound import ru.dbotthepony.kstarbound.defs.InteractAction import ru.dbotthepony.kstarbound.defs.InteractRequest +import ru.dbotthepony.kstarbound.defs.actor.PersistentStatusEffect import ru.dbotthepony.kstarbound.defs.actor.StatModifier import ru.dbotthepony.kstarbound.defs.`object`.LoungeOrientation import ru.dbotthepony.kstarbound.defs.`object`.ObjectDefinition @@ -41,7 +42,7 @@ class LoungeableObject(config: Registry.Entry) : WorldObject(c var sitFlipImages = false private set - val sitStatusEffects = ObjectArraySet>() + val sitStatusEffects = ObjectArraySet() val sitEffectEmitters = ObjectArraySet() var sitEmote: String? = null