Skip to content

Make npc and object definition cloning explicilty not cross-file #866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GregHib merged 3 commits into from
Jan 28, 2026
Merged

Make npc and object definition cloning explicilty not cross-file #866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8218403
Fix tz_kih reference
GregHib Jan 28, 2026
aa9c3b1
Make NPC definition cloning explicitly in-file only
GregHib Jan 28, 2026
b4dcb53
Make Object definition cloning explicitly in-file only
GregHib Jan 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/minigame/tzhaar_fight_pits/tzhaar_fight_pit.npcs.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ categories = ["tz_haar"]
examine = "Some kind of bat..."

[tz_kih_fight_pits_2]
clone = "tz_kih"
clone = "tz_kih_fight_pits"
id = 2628

[tz_kek_fight_pits]
Expand Down
7 changes: 5 additions & 2 deletions engine/src/main/kotlin/world/gregs/voidps/engine/data/definition/NPCDefinitions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,10 @@ object NPCDefinitions : DefinitionsDecoder<NPCDefinition> {
) {
timedLoad("npc extra") {
val ids = Object2IntOpenHashMap<String>()
val refs = Object2IntOpenHashMap<String>()
ids.defaultReturnValue(-1)
for (path in paths) {
refs.clear()
Config.fileReader(path, 150) {
while (nextSection()) {
val stringId = section()
Expand All @@ -48,8 +50,8 @@ object NPCDefinitions : DefinitionsDecoder<NPCDefinition> {
when (val key = key()) {
"clone" -> {
val name = string()
val npc = ids.getInt(name)
require(npc >= 0) { "Cannot find npc id to clone '$name'" }
val npc = refs.getInt(name)
require(npc >= 0) { "Cannot find npc to clone with id '$name' in ${path}. Make sure it's in the same file." }
val definition = definitions[npc]
extras.putAll(definition.extras ?: continue)
}
Expand Down Expand Up @@ -80,6 +82,7 @@ object NPCDefinitions : DefinitionsDecoder<NPCDefinition> {
}
}
require(!ids.containsKey(stringId)) { "Duplicate npc id found '$stringId' at $path." }
refs[stringId] = id
ids[stringId] = id
definitions[id].stringId = stringId
if (extras.isNotEmpty()) {
Expand Down
7 changes: 5 additions & 2 deletions engine/src/main/kotlin/world/gregs/voidps/engine/data/definition/ObjectDefinitions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,10 @@ object ObjectDefinitions : DefinitionsDecoder<ObjectDefinition> {
fun load(paths: List<String>): ObjectDefinitions {
timedLoad("object extra") {
val ids = Object2IntOpenHashMap<String>()
val refs = Object2IntOpenHashMap<String>()
ids.defaultReturnValue(-1)
for (path in paths) {
refs.clear()
Config.fileReader(path) {
while (nextSection()) {
val stringId = section()
Expand All @@ -50,8 +52,8 @@ object ObjectDefinitions : DefinitionsDecoder<ObjectDefinition> {
"mining" -> extras[key] = Rock(this)
"clone" -> {
val name = string()
val obj = ids.getInt(name)
require(obj >= 0) { "Cannot find object id to clone '$name'" }
val obj = refs.getInt(name)
require(obj >= 0) { "Cannot find object to clone with id '$name' in ${path}. Make sure it's in the same file." }
val definition = definitions[obj]
extras.putAll(definition.extras ?: continue)
}
Expand All @@ -67,6 +69,7 @@ object ObjectDefinitions : DefinitionsDecoder<ObjectDefinition> {
}
require(!ids.containsKey(stringId)) { "Duplicate object id found '$stringId' at $path." }
ids[stringId] = id
refs[stringId] = id
definitions[id].stringId = stringId
if (extras.isNotEmpty()) {
definitions[id].extras = extras
Expand Down
Loading