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

Name of "Seaside Area at Night" now becomes "West Tower" when the area variant is 1. Phantasmal World 4 and Lost heart breaker use this to have two tower maps.

Browse Source
This commit is contained in:
Daan Vanden Bosch 2021-03-23 22:17:42 +01:00
parent a1d4e38a7c
commit 445878fb6e
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/QuestEditorToolbarController.kt
View File

@ -80,10 +80,11 @@ class QuestEditorToolbarController(
// should update). // should update).
val areas: Val<List<AreaAndLabel>> = questEditorStore.currentQuest.flatMap { quest -> val areas: Val<List<AreaAndLabel>> = questEditorStore.currentQuest.flatMap { quest ->
quest?.let { quest?.let {
quest.entitiesPerArea.map { entitiesPerArea -> map(quest.entitiesPerArea, quest.areaVariants) { entitiesPerArea, variants ->
areaStore.getAreasForEpisode(quest.episode).map { area -> areaStore.getAreasForEpisode(quest.episode).map { area ->
val entityCount = entitiesPerArea[area.id] val entityCount = entitiesPerArea[area.id]
AreaAndLabel(area, area.name + (entityCount?.let { " ($it)" } ?: "")) val name = variants.firstOrNull { it.area == area }?.name ?: area.name
AreaAndLabel(area, name + (entityCount?.let { " ($it)" } ?: ""))
} }
} }
} ?: value(emptyList()) } ?: value(emptyList())

2
web/src/main/kotlin/world/phantasmal/web/questEditor/loading/AreaAssetLoader.kt
View File

@ -246,7 +246,7 @@ private fun areaVersionToBaseUrl(episode: Episode, areaVariant: AreaVariantModel
var areaId = areaVariant.area.id var areaId = areaVariant.area.id
var areaVariantId = areaVariant.id var areaVariantId = areaVariant.id
// Exception for Seaside area at night, variant 1. // Exception for Seaside Area at Night, variant 1.
// Phantasmal World 4 and Lost heart breaker use this to have two tower maps. // Phantasmal World 4 and Lost heart breaker use this to have two tower maps.
if (areaId == 16 && areaVariantId == 1) { if (areaId == 16 && areaVariantId == 1) {
areaId = 17 areaId = 17

4
web/src/main/kotlin/world/phantasmal/web/questEditor/models/AreaVariantModel.kt
View File

@ -7,6 +7,10 @@ import world.phantasmal.observable.value.list.mutableListVal
class AreaVariantModel(val id: Int, val area: AreaModel) { class AreaVariantModel(val id: Int, val area: AreaModel) {
private val _sections = mutableListVal<SectionModel>() private val _sections = mutableListVal<SectionModel>()
// Exception for Seaside Area at Night, variant 1.
// Phantasmal World 4 and Lost heart breaker use this to have two tower maps.
val name: String = if (area.id == 16 && id == 1) "West Tower" else area.name
val sections: ListVal<SectionModel> = _sections val sections: ListVal<SectionModel> = _sections
init { init {