From cc5c85bef1305d93f78e445625f77bcab46cf57b Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Sun, 5 Feb 2023 11:22:56 +0700 Subject: [PATCH] =?UTF-8?q?=D0=BC=D0=BC=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kstarbound/defs/StatusEffectDefinition.kt | 11 ++++++++--- .../kstarbound/defs/animation/AnimationDefinition.kt | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/StatusEffectDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/StatusEffectDefinition.kt index 255a6696..46059065 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/StatusEffectDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/StatusEffectDefinition.kt @@ -2,12 +2,17 @@ package ru.dbotthepony.kstarbound.defs import com.google.common.collect.ImmutableList import ru.dbotthepony.kstarbound.defs.animation.AnimationDefinition +import ru.dbotthepony.kstarbound.defs.image.SpriteReference import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory @JsonFactory data class StatusEffectDefinition( val name: String, val defaultDuration: Double, - val scripts: ImmutableList, - val animationConfig: AssetReference, -) + val blockingStat: String? = null, + val label: String? = null, + val icon: SpriteReference? = null, + override val scripts: ImmutableList = ImmutableList.of(), + override val scriptDelta: Int = 1, + val animationConfig: AssetReference? = null, +) : IScriptable diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/animation/AnimationDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/animation/AnimationDefinition.kt index 9191928e..2355523c 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/animation/AnimationDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/animation/AnimationDefinition.kt @@ -8,7 +8,7 @@ import ru.dbotthepony.kvector.vector.ndouble.Vector2d @JsonFactory data class AnimationDefinition( - val animatedParts: AnimatedParts, + val animatedParts: AnimatedParts? = null, val sounds: ImmutableMap = ImmutableMap.of(), val transformationGroups: ImmutableMap = ImmutableMap.of(), ) {