Skip to content

Player item condition decays when cloning #1828

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
Josh-Larson merged 2 commits into from
Sep 27, 2026
Merged

Player item condition decays when cloning #1828

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c871c72
Player item condition decays when cloning
madsboddum Sep 10, 2026
103efef
Refactored teleport function, extracting the decayItems invocation
madsboddum Sep 10, 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
47 changes: 39 additions & 8 deletions src/main/java/com/projectswg/holocore/services/gameplay/combat/cloning/CloningService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import com.projectswg.common.data.encodables.tangible.Posture
import com.projectswg.common.data.encodables.tangible.PvpFaction
import com.projectswg.common.data.encodables.tangible.PvpStatus
import com.projectswg.common.data.location.Location
import com.projectswg.common.data.objects.GameObjectType
import com.projectswg.common.data.sui.SuiEvent
import com.projectswg.common.network.packets.swg.zone.PlayClientEffectObjectMessage
import com.projectswg.common.network.packets.swg.zone.PlayMusicMessage
Expand All @@ -52,6 +53,8 @@ import com.projectswg.holocore.resources.support.global.zone.sui.SuiWindow
import com.projectswg.holocore.resources.support.objects.swg.building.BuildingObject
import com.projectswg.holocore.resources.support.objects.swg.cell.CellObject
import com.projectswg.holocore.resources.support.objects.swg.creature.CreatureObject
import com.projectswg.holocore.resources.support.objects.swg.tangible.OptionFlag
import com.projectswg.holocore.resources.support.objects.swg.tangible.TangibleObject
import com.projectswg.holocore.services.support.objects.ObjectStorageService.BuildingLookup
import com.projectswg.holocore.utilities.HolocoreCoroutine
import com.projectswg.holocore.utilities.cancelAndWait
Expand All @@ -67,7 +70,7 @@ import java.util.stream.Collectors

class CloningService : Service() {
private val coroutineScope = HolocoreCoroutine.childScope()
private val reviveTimers: MutableMap<CreatureObject, Job> = HashMap()
private val reviveTimers: MutableMap<CreatureObject, ReviveTimer> = HashMap()
private val cloningFacilities: MutableList<BuildingObject> = ArrayList()

override fun stop(): Boolean {
Expand All @@ -86,7 +89,7 @@ class CloningService : Service() {
SystemMessageIntent(corpseOwner, ProsePackage(StringId("base_player", "revive_exp_msg"), "TT", "$CLONE_TIMER minutes.")).broadcast()
}

scheduleCloneTimer(corpse)
scheduleCloneTimer(corpse, i.killer.isPlayer)
}

@IntentHandler
Expand Down Expand Up @@ -114,7 +117,7 @@ class CloningService : Service() {
private fun handlePlayerEventIntent(i: PlayerEventIntent) {
val creature = i.player.creatureObject
when (i.event) {
PlayerEvent.PE_DISAPPEAR -> reviveTimers.remove(creature)?.cancel()
PlayerEvent.PE_DISAPPEAR -> reviveTimers.remove(creature)?.job?.cancel()
PlayerEvent.PE_FIRST_ZONE -> if (creature.posture == Posture.DEAD) {
// They're dead, but they have no active revive timer.
// In this case, they didn't clone before the application was shut down and started back up.
Expand All @@ -126,7 +129,7 @@ class CloningService : Service() {
}
}

private fun scheduleCloneTimer(corpse: CreatureObject) {
private fun scheduleCloneTimer(corpse: CreatureObject, pvpDeath: Boolean = false) {
val availableFacilities = getAvailableFacilities(corpse)
if (availableFacilities.isEmpty()) {
val defaultCloner = defaultCloner
Expand All @@ -137,10 +140,11 @@ class CloningService : Service() {

cloningWindow.display(corpse.owner!!)
synchronized(reviveTimers) {
reviveTimers[corpse] = coroutineScope.launch {
val job = coroutineScope.launch {
delay(TimeUnit.MINUTES.toMillis(CLONE_TIMER))
expireCloneTimer(corpse, availableFacilities, cloningWindow)
}
reviveTimers[corpse] = ReviveTimer(job, pvpDeath)
}

StandardLog.onPlayerEvent(this, corpse, "has %d minutes to clone", CLONE_TIMER)
Expand Down Expand Up @@ -202,12 +206,14 @@ class CloningService : Service() {


// Cancel the forced cloning timer
synchronized(reviveTimers) {
reviveTimers.remove(corpse)?.cancel()
val reviveTimer = synchronized(reviveTimers) {
reviveTimers.remove(corpse)
}
reviveTimer?.job?.cancel()

StandardLog.onPlayerEvent(this, corpse, "cloned to %s @ %s", selectedFacility, selectedFacility.location)
val diedOnTerrain = corpse.terrain
if (reviveTimer?.pvpDeath != true) decayItems(corpse)
teleport(corpse, cellObject, getCloneLocation(facilityData, selectedFacility))
CloneActivatedIntent(corpse, diedOnTerrain).broadcast()
return CloneResult.SUCCESS
Expand Down Expand Up @@ -254,6 +260,26 @@ class CloningService : Service() {
corpse.healthWounds = (corpse.healthWounds + CLONE_WOUNDS).coerceAtMost(woundCeiling)
}

private fun decayItems(corpse: CreatureObject) {
getDecayableItems(corpse).filterNot { it.hasOptionFlags(OptionFlag.INSURED, OptionFlag.UNINSURABLE) }.forEach { decayItem(it) }
}

private fun decayItem(item: TangibleObject) {
val insured = item.hasOptionFlags(OptionFlag.INSURED)
val decay = (item.maxHitPoints * if (insured) INSURED_DECAY_PERCENTAGE else UNINSURED_DECAY_PERCENTAGE).toInt()

item.conditionDamage = (item.conditionDamage + decay).coerceAtMost(item.maxHitPoints)

if (insured) item.removeOptionFlags(OptionFlag.INSURED)
}

private fun getDecayableItems(corpse: CreatureObject): List<TangibleObject> {
val equipped = corpse.slottedObjects
val carried = corpse.inventory.childObjectsRecursively

return (equipped + carried).filterIsInstance<TangibleObject>().filter { it.gameObjectType.mask in DECAYABLE_TYPES }
}

/**
* Picks the closest cloning facility and clones `cloneRequestor`
* there. If an error occurs upon attempting to clone, it will pick the next
Expand All @@ -276,7 +302,7 @@ class CloningService : Service() {
}

private fun expireCloneTimer(corpse: CreatureObject, facilitiesInTerrain: List<BuildingObject>, suiWindow: SuiWindow) {
if (reviveTimers.remove(corpse) != null) {
if (reviveTimers.containsKey(corpse)) {
val corpseOwner = corpse.owner

if (corpseOwner != null) {
Expand Down Expand Up @@ -316,6 +342,8 @@ class CloningService : Service() {
return factionRestriction == null || factionRestriction == corpse.pvpFaction
}

private data class ReviveTimer(val job: Job, val pvpDeath: Boolean)

private enum class CloneResult {
INVALID_SELECTION,
TEMPLATE_MISSING,
Expand All @@ -327,6 +355,9 @@ class CloningService : Service() {
private const val CLONE_TIMER: Long = 30 // Amount of minutes before a player is forced to clone
private const val CLONE_WOUNDS = 100 // Health wounds received when cloning away from your clone data
private const val MAX_WOUND_PERCENTAGE = 0.7 // Wounds can never take more than this share of unmodified maximum health
private const val INSURED_DECAY_PERCENTAGE = 0.01
private const val UNINSURED_DECAY_PERCENTAGE = 0.05
private val DECAYABLE_TYPES = setOf(GameObjectType.GOT_ARMOR, GameObjectType.GOT_CLOTHING, GameObjectType.GOT_JEWELRY, GameObjectType.GOT_TOOL)
private val defaultCloner: BuildingObject?
get() {
val defaultCloner = BuildingLookup.getBuildingByTag("tat_moseisley_cloning1")
Expand Down