DBot/KStarbound
DBot/KStarbound
3
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

rename movement params classes

Browse Source
This commit is contained in:
DBotThePony 2023-09-29 22:32:11 +07:00
parent b3f7cee963
commit 2aac9f405d
Signed by: DBot
GPG Key ID: DCC23B5715498507
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/kotlin/ru/dbotthepony/kstarbound/GlobalDefaults.kt
View File

@ -1,7 +1,7 @@
package ru.dbotthepony.kstarbound package ru.dbotthepony.kstarbound
import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.LogManager
import ru.dbotthepony.kstarbound.defs.MovementParameters import ru.dbotthepony.kstarbound.defs.player.PlayerMovementParameters
import java.util.concurrent.ForkJoinPool import java.util.concurrent.ForkJoinPool
import java.util.concurrent.ForkJoinTask import java.util.concurrent.ForkJoinTask
import kotlin.reflect.KMutableProperty0 import kotlin.reflect.KMutableProperty0
@ -9,7 +9,7 @@ import kotlin.reflect.KMutableProperty0
object GlobalDefaults { object GlobalDefaults {
private val LOGGER = LogManager.getLogger() private val LOGGER = LogManager.getLogger()
var defaultMovementParameters = MovementParameters() var defaultMovementParameters = PlayerMovementParameters()
private set private set
private object EmptyTask : ForkJoinTask<Unit>() { private object EmptyTask : ForkJoinTask<Unit>() {

4
src/main/kotlin/ru/dbotthepony/kstarbound/defs/monster/MonsterTypeDefinition.kt
View File

@ -6,7 +6,7 @@ import com.google.common.collect.ImmutableSet
import ru.dbotthepony.kstarbound.defs.AssetReference import ru.dbotthepony.kstarbound.defs.AssetReference
import ru.dbotthepony.kstarbound.defs.IScriptable import ru.dbotthepony.kstarbound.defs.IScriptable
import ru.dbotthepony.kstarbound.defs.IThingWithDescription import ru.dbotthepony.kstarbound.defs.IThingWithDescription
import ru.dbotthepony.kstarbound.defs.MovementParameters import ru.dbotthepony.kstarbound.defs.player.PlayerMovementParameters
import ru.dbotthepony.kstarbound.defs.RegistryReference import ru.dbotthepony.kstarbound.defs.RegistryReference
import ru.dbotthepony.kstarbound.defs.animation.AnimationDefinition import ru.dbotthepony.kstarbound.defs.animation.AnimationDefinition
import ru.dbotthepony.kstarbound.defs.item.TreasurePoolDefinition import ru.dbotthepony.kstarbound.defs.item.TreasurePoolDefinition
@ -29,7 +29,7 @@ data class MonsterTypeDefinition(
) : IThingWithDescription by desc { ) : IThingWithDescription by desc {
@JsonFactory @JsonFactory
data class BaseParameters( data class BaseParameters(
val movementSettings: MovementParameters? = null, val movementSettings: PlayerMovementParameters? = null,
@JsonFlat @JsonFlat
val script: IScriptable, val script: IScriptable,
) : IScriptable by script ) : IScriptable by script

5
src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/PlayerDefinition.kt
View File

@ -5,7 +5,6 @@ import com.google.common.collect.ImmutableMap
import com.google.common.collect.ImmutableSet import com.google.common.collect.ImmutableSet
import com.google.gson.JsonObject import com.google.gson.JsonObject
import ru.dbotthepony.kstarbound.defs.AssetReference import ru.dbotthepony.kstarbound.defs.AssetReference
import ru.dbotthepony.kstarbound.defs.MovementParameters
import ru.dbotthepony.kstarbound.defs.RegistryReference import ru.dbotthepony.kstarbound.defs.RegistryReference
import ru.dbotthepony.kstarbound.defs.Species import ru.dbotthepony.kstarbound.defs.Species
import ru.dbotthepony.kstarbound.util.SBPattern import ru.dbotthepony.kstarbound.util.SBPattern
@ -32,8 +31,8 @@ data class PlayerDefinition(
val defaultCodexes: ImmutableMap<String, ImmutableList<RegistryReference<IItemDefinition>>>, val defaultCodexes: ImmutableMap<String, ImmutableList<RegistryReference<IItemDefinition>>>,
val metaBoundBox: AABB, val metaBoundBox: AABB,
val movementParameters: MovementParameters, val movementParameters: PlayerMovementParameters,
val zeroGMovementParameters: MovementParameters, val zeroGMovementParameters: PlayerMovementParameters,
val statusControllerSettings: StatusControllerSettings, val statusControllerSettings: StatusControllerSettings,

8
src/main/kotlin/ru/dbotthepony/kstarbound/defs/MovementModifiers.kt → src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/PlayerMovementModifiers.kt
View File

@ -1,9 +1,9 @@
package ru.dbotthepony.kstarbound.defs package ru.dbotthepony.kstarbound.defs.player
import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory
@JsonFactory @JsonFactory
class MovementModifiers( class PlayerMovementModifiers(
val groundMovementModifier: Double = 1.0, val groundMovementModifier: Double = 1.0,
val liquidMovementModifier: Double = 1.0, val liquidMovementModifier: Double = 1.0,
val speedModifier: Double = 1.0, val speedModifier: Double = 1.0,
@ -14,8 +14,8 @@ class MovementModifiers(
val facingSuppressed: Boolean = false, val facingSuppressed: Boolean = false,
val movementSuppressed: Boolean = false, val movementSuppressed: Boolean = false,
) { ) {
fun combine(other: MovementModifiers): MovementModifiers { fun combine(other: PlayerMovementModifiers): PlayerMovementModifiers {
return MovementModifiers( return PlayerMovementModifiers(
groundMovementModifier = groundMovementModifier * other.groundMovementModifier, groundMovementModifier = groundMovementModifier * other.groundMovementModifier,
liquidMovementModifier = liquidMovementModifier * other.liquidMovementModifier, liquidMovementModifier = liquidMovementModifier * other.liquidMovementModifier,
speedModifier = speedModifier * other.speedModifier, speedModifier = speedModifier * other.speedModifier,

9
src/main/kotlin/ru/dbotthepony/kstarbound/defs/MovementParameters.kt → src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/PlayerMovementParameters.kt
View File

@ -1,14 +1,15 @@
package ru.dbotthepony.kstarbound.defs package ru.dbotthepony.kstarbound.defs.player
import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableList
import com.google.common.collect.ImmutableSet import com.google.common.collect.ImmutableSet
import ru.dbotthepony.kstarbound.defs.JumpProfile
import ru.dbotthepony.kstarbound.io.json.builder.JsonAlias import ru.dbotthepony.kstarbound.io.json.builder.JsonAlias
import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory
import ru.dbotthepony.kstarbound.util.KOptional import ru.dbotthepony.kstarbound.util.KOptional
import ru.dbotthepony.kvector.vector.Vector2d import ru.dbotthepony.kvector.vector.Vector2d
@JsonFactory @JsonFactory
data class MovementParameters( data class PlayerMovementParameters(
val mass: KOptional<Double> = KOptional.empty(), val mass: KOptional<Double> = KOptional.empty(),
val gravityMultiplier: KOptional<Double> = KOptional.empty(), val gravityMultiplier: KOptional<Double> = KOptional.empty(),
val liquidBuoyancy: KOptional<Double> = KOptional.empty(), val liquidBuoyancy: KOptional<Double> = KOptional.empty(),
@ -59,8 +60,8 @@ data class MovementParameters(
val pathExploreRate: KOptional<Double> = KOptional.empty(), val pathExploreRate: KOptional<Double> = KOptional.empty(),
) { ) {
fun merge(other: MovementParameters): MovementParameters { fun merge(other: PlayerMovementParameters): PlayerMovementParameters {
return MovementParameters( return PlayerMovementParameters(
mass = mass.or(other.mass), mass = mass.or(other.mass),
gravityMultiplier = gravityMultiplier.or(other.gravityMultiplier), gravityMultiplier = gravityMultiplier.or(other.gravityMultiplier),
liquidBuoyancy = liquidBuoyancy.or(other.liquidBuoyancy), liquidBuoyancy = liquidBuoyancy.or(other.liquidBuoyancy),