From 48540be626c945a92e5e2564ca668d486030d784 Mon Sep 17 00:00:00 2001 From: boubou19 Date: Thu, 19 Nov 2026 05:42:13 +0100 Subject: [PATCH] Edit lifespan changes health too (#122) (#127) Co-authored-by: Marlo Greisser --- .../binnie/genetics/machine/inoculator/Inoculator.java | 7 +++++++ src/main/java/binnie/genetics/machine/splicer/Splicer.java | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/src/main/java/binnie/genetics/machine/inoculator/Inoculator.java b/src/main/java/binnie/genetics/machine/inoculator/Inoculator.java index c8b4fd9c..370c09ae 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/Inoculator.java +++ b/src/main/java/binnie/genetics/machine/inoculator/Inoculator.java @@ -39,6 +39,13 @@ public class Inoculator { NBTTagList chromosomes = genomeNBT.getTagList("Chromosomes", 10); NBTTagCompound chromosomeNBT = chromosomes.getCompoundTagAt(chromosomeID); chromosomeNBT.setString("UID" + chromoN, gene.getAllele().getUID()); + if (gene.getChromosome() == EnumBeeChromosome.LIFESPAN && gene.getSpeciesRoot() instanceof IBeeRoot beeRoot) { + int lifespan = beeRoot.getMember(target).getGenome().getLifespan(); + beeNBT.setInteger( + "Health", + Math.max(0, beeNBT.getInteger("Health") + lifespan - beeNBT.getInteger("MaxH"))); + beeNBT.setInteger("MaxH", lifespan); + } target.setTagCompound(beeNBT); } } diff --git a/src/main/java/binnie/genetics/machine/splicer/Splicer.java b/src/main/java/binnie/genetics/machine/splicer/Splicer.java index 4b7f0011..13a6e9ce 100644 --- a/src/main/java/binnie/genetics/machine/splicer/Splicer.java +++ b/src/main/java/binnie/genetics/machine/splicer/Splicer.java @@ -37,6 +37,13 @@ public class Splicer { NBTTagList chromosomes = genomeNBT.getTagList("Chromosomes", 10); NBTTagCompound chromosomeNBT = chromosomes.getCompoundTagAt(chromosomeID); chromosomeNBT.setString("UID" + chromoN, gene.getAllele().getUID()); + if (gene.getChromosome() == EnumBeeChromosome.LIFESPAN && gene.getSpeciesRoot() instanceof IBeeRoot beeRoot) { + int lifespan = beeRoot.getMember(target).getGenome().getLifespan(); + beeNBT.setInteger( + "Health", + Math.max(0, beeNBT.getInteger("Health") + lifespan - beeNBT.getInteger("MaxH"))); + beeNBT.setInteger("MaxH", lifespan); + } target.setTagCompound(beeNBT); } }