Sancaros/phantasmal-world
1
0
Fork 0
mirror of https://github.com/DaanVandenBosch/phantasmal-world.git synced 2025-04-04 22:58:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed bug that prevented a random model from being loaded when navigating to the viewer without /models or /textures or parameters.

Browse Source
This commit is contained in:
Daan Vanden Bosch 2021-03-25 21:21:08 +01:00
parent 6990aaca1b
commit 23716615bf
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
web/src/main/kotlin/world/phantasmal/web/viewer/stores/ViewerStore.kt
View File

@ -28,9 +28,10 @@ class ViewerStore(
) : Store() { ) : Store() {
private val _currentNinjaObject = mutableVal<NinjaObject<*>?>(null) private val _currentNinjaObject = mutableVal<NinjaObject<*>?>(null)
private val _currentTextures = mutableListVal<XvrTexture?>() private val _currentTextures = mutableListVal<XvrTexture?>()
private val _currentCharacterClass = mutableVal<CharacterClass?>(null) private val _currentCharacterClass = mutableVal<CharacterClass?>(CharacterClass.VALUES.random())
private val _currentSectionId = mutableVal(SectionId.Viridia) private val _currentSectionId = mutableVal(SectionId.VALUES.random())
private val _currentBody = mutableVal(0) private val _currentBody =
mutableVal((1.._currentCharacterClass.value!!.bodyStyleCount).random())
private val _currentNinjaMotion = mutableVal<NjMotion?>(null) private val _currentNinjaMotion = mutableVal<NjMotion?>(null)
// Settings // Settings
@ -55,9 +56,9 @@ class ViewerStore(
MODEL_PARAM, MODEL_PARAM,
setInitialValue = { initialValue -> setInitialValue = { initialValue ->
if (uiStore.path.value.startsWith(path)) { if (uiStore.path.value.startsWith(path)) {
_currentCharacterClass.value = CharacterClass.VALUES.find { it.slug == initialValue }?.let {
CharacterClass.VALUES.find { it.slug == initialValue } _currentCharacterClass.value = it
?: CharacterClass.VALUES.random() }
} }
}, },
value = currentCharacterClass.map { it?.slug }, value = currentCharacterClass.map { it?.slug },
@ -76,9 +77,9 @@ class ViewerStore(
SECTION_ID_PARAM, SECTION_ID_PARAM,
setInitialValue = { initialValue -> setInitialValue = { initialValue ->
if (uiStore.path.value.startsWith(path)) { if (uiStore.path.value.startsWith(path)) {
_currentSectionId.value = initialValue?.let { enumValueOfOrNull<SectionId>(it) }?.let {
initialValue?.let { enumValueOfOrNull<SectionId>(it) } _currentSectionId.value = it
?: SectionId.VALUES.random() }
} }
}, },
value = currentSectionId.map { it.name }, value = currentSectionId.map { it.name },
@ -99,11 +100,10 @@ class ViewerStore(
setInitialValue = { initialValue -> setInitialValue = { initialValue ->
if (uiStore.path.value.startsWith(path)) { if (uiStore.path.value.startsWith(path)) {
val maxBody = _currentCharacterClass.value?.bodyStyleCount ?: 1 val maxBody = _currentCharacterClass.value?.bodyStyleCount ?: 1
_currentBody.value = (
initialValue?.toIntOrNull() initialValue?.toIntOrNull()?.takeIf { it <= maxBody }?.let {
?.takeIf { it <= maxBody } _currentBody.value = it - 1
?: (1..maxBody).random() }
) - 1
} }
}, },
value = currentBody.map { (it + 1).toString() }, value = currentBody.map { (it + 1).toString() },