QoL improvements#984
Merged
Merged
Conversation
Contributor
Qodana for JVM2 new problems were found
💡 Qodana analysis was run in the pull request mode: only the changed files were checked Contact Qodana teamContact us at qodana-support@jetbrains.com
|
…ay closing interfaces)
HarleyGilpin
added a commit
to HarleyGilpin/void
that referenced
this pull request
May 17, 2026
Merges upstream/main (PR GregHib#984 brings inc(max) and skill drop gating). Engine reverts per Greg: - Delete DoubleValues from VariableValues, plus its factory mapping. - Remove both legacy double migrations from PlayerSave (variables loop and the experience fractional path). Doubles are not used in any player variable in the new schema. Pet stats moved to integers on a 0..10000 scale: - pet_state.vars.toml regenerated with format = "int". - pets.tables.toml swaps growth_rate (double) for growth_per_tick (int = rate * 50 * 100 per 30s tick). - PetState drops the PetStats class and updatePetStats wrapper; the getters return Int, callers use inc(key, amount, max = PET_STAT_MAX) and dec(key, amount) directly (PR GregHib#984 added the max parameter). - PetTimers thresholds become 7500 / 9000 / 10000 on the new scale, HUNGER_BABY/GROWN become 125 / 90 per tick. PetFeeding feeds 1500. - sendPetDetailsStats divides by 100 on the way out so the orb bars stay on the 0..100 client scale. PetDefinitions deleted; data lives in Tables now. The PetDefinition data class is gone too. Pets.kt adds RowDefinition extensions (isCatLike, stageForItem/Npc, npcFor/itemFor, nextStageItem/Npc, isFinalStage, ambientPhrases) plus petRowForItem / petRowForNpc and allPetRows lookup helpers. Every caller (Pet, KittenInteract, PetTimers, PetFeeding) now consumes RowDefinition directly. The Koin singleton in GameModules is gone. Incubator suffix derivation collapses to it.target.id.removePrefix("incubator_"). Renamed the per-region base objects to incubator_taverley (28550) and incubator_yanille (28352); kept the shared incubator_idle (28336) / incubator_active (28359) transform names so the dispatch finds a registered string id for the displayed mesh. target.id always reflects the base, so the suffix extraction never sees idle/active. The regionVarbits map and the tile.region.id helper are deleted. KittenInteract: - isRat simplifies to id.startsWith("rat") so giant_rat / warped_rat drop out of the chase pool. - talkToCatWithAmulet replaces the while(true) + keepGoing flag with Greg's recursive-option pattern: each answer recurses back into talkToCatWithAmulet, the quit option has no body. pet.npcs.toml: every options = { ... } map deleted; npcs only need the id field. dragon.drops.toml: black dragon egg gated on skill = "summoning", equals = 99 (PR GregHib#984 syntax). Tests adapted: PetLogoutTest stats are ints; IncubatorUseEggTest uses incubator_taverley for the test fixtures.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
NPCs.findBySpawn()