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

Resolve the visual glitch of Mericus & Merikle. (#26)
Some checks failed
Tests / build (push) Has been cancelled
Details

Browse Source
This commit is contained in:
warmonipa 2025-03-29 15:11:20 -07:00 committed by GitHub
parent 61949b2377
commit 9b6aea9c59
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/NpcType.kt
View File

@ -1071,8 +1071,8 @@ enum class NpcType(
skin = 0,
special = false,
),
Mericus(
uniqueName = "Mericus",
Merikle(
uniqueName = "Merikle",
episode = Episode.II,
enemy = true,
areaIds = listOf(5, 6, 7, 8, 9, 16, 17),
@ -1080,8 +1080,8 @@ enum class NpcType(
skin = 1,
special = false,
),
Merikle(
uniqueName = "Merikle",
Mericus(
uniqueName = "Mericus",
episode = Episode.II,
enemy = true,
areaIds = listOf(5, 6, 7, 8, 9, 16, 17),
@ -1490,6 +1490,6 @@ enum class NpcType(
/**
* Use this instead of [values] to avoid unnecessary copying.
*/
val VALUES: Array<NpcType> = values()
val VALUES: Array<NpcType> = entries.toTypedArray()
}
}

4
psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/NpcTypeFromData.kt
View File

@ -104,8 +104,8 @@ fun npcTypeFromQuestNpc(npc: QuestNpc): NpcType {
}
0x0D6 -> when (skin % 3) {
0 -> NpcType.Mericarol
1 -> NpcType.Mericus
else -> NpcType.Merikle
1 -> NpcType.Merikle
else -> NpcType.Mericus
}
0x0D7 -> when (skin % 2) {
0 -> NpcType.UlGibbon