Assorted Small Changes

src/com/lilithsthrone/controller/CreationController.java

@@ -2847,126 +2847,39 @@ public static void initPersonalityListeners() {
 	}
 
 	public static void initSexExperienceListeners() {
+		Map<String, SexType> types = Util.newHashMapOfValues(
+				new Value<>("HANDJOBS_GIVEN", new SexType(SexParticipantType.NORMAL, SexAreaPenetration.FINGER, SexAreaPenetration.PENIS)),
+				new Value<>("FINGERINGS_GIVEN", new SexType(SexParticipantType.NORMAL, SexAreaPenetration.FINGER, SexAreaOrifice.VAGINA)),
+				new Value<>("BLOWJOBS_GIVEN", new SexType(SexParticipantType.NORMAL, SexAreaOrifice.MOUTH, SexAreaPenetration.PENIS)),
+				new Value<>("CUNNILINGUS_GIVEN", new SexType(SexParticipantType.NORMAL, SexAreaPenetration.TONGUE, SexAreaOrifice.VAGINA)),
+				new Value<>("ANILINGUS_GIVEN", new SexType(SexParticipantType.NORMAL, SexAreaPenetration.TONGUE, SexAreaOrifice.ANUS)),
+				new Value<>("VAGINAL_GIVEN", new SexType(SexParticipantType.NORMAL, SexAreaPenetration.PENIS, SexAreaOrifice.VAGINA)),
+				new Value<>("ANAL_GIVEN", new SexType(SexParticipantType.NORMAL, SexAreaPenetration.PENIS, SexAreaOrifice.ANUS)),
+				new Value<>("HANDJOBS_TAKEN", new SexType(SexParticipantType.NORMAL, SexAreaPenetration.PENIS, SexAreaPenetration.FINGER)),
+				new Value<>("FINGERINGS_TAKEN", new SexType(SexParticipantType.NORMAL, SexAreaOrifice.VAGINA, SexAreaPenetration.FINGER)),
+				new Value<>("BLOWJOBS_TAKEN", new SexType(SexParticipantType.NORMAL, SexAreaPenetration.PENIS, SexAreaOrifice.MOUTH)),
+				new Value<>("CUNNILINGUS_TAKEN", new SexType(SexParticipantType.NORMAL, SexAreaOrifice.VAGINA, SexAreaPenetration.TONGUE)),
+				new Value<>("ANILINGUS_TAKEN", new SexType(SexParticipantType.NORMAL, SexAreaOrifice.ANUS, SexAreaPenetration.TONGUE)),
+				new Value<>("VAGINAL_TAKEN", new SexType(SexParticipantType.NORMAL, SexAreaOrifice.VAGINA, SexAreaPenetration.PENIS)),
+				new Value<>("ANAL_TAKEN", new SexType(SexParticipantType.NORMAL, SexAreaOrifice.ANUS, SexAreaPenetration.PENIS)),
+				new Value<>("BLOWJOBS_GIVEN", new SexType(SexParticipantType.NORMAL, SexAreaOrifice.MOUTH, SexAreaPenetration.PENIS)));
 		Map<String, Integer> mappings = Util.newHashMapOfValues(
-				new Value<>("DECREASE_LARGE", -10),
-				new Value<>("DECREASE", -1),
-				new Value<>("INCREASE", 1),
-				new Value<>("INCREASE_LARGE", 10));
-		for (Entry<String, Integer> entry : mappings.entrySet()) {
-			String i = entry.getKey();
-			int j = entry.getValue();
-			// Given:
-			String id = "HANDJOBS_GIVEN_"+i;
-			if (MainController.document.getElementById(id) != null) {
-				((EventTarget) MainController.document.getElementById(id)).addEventListener("click", e->{
-					CharacterModificationUtils.incrementSexExperience(new SexType(SexParticipantType.NORMAL, SexAreaPenetration.FINGER, SexAreaPenetration.PENIS), j);
-					Main.game.setContent(new Response("", "", Main.game.getCurrentDialogueNode()));
-				}, false);
-			}
-
-			id = "FINGERINGS_GIVEN_"+i;
-			if (MainController.document.getElementById(id) != null) {
-				((EventTarget) MainController.document.getElementById(id)).addEventListener("click", e->{
-					CharacterModificationUtils.incrementSexExperience(new SexType(SexParticipantType.NORMAL, SexAreaPenetration.FINGER, SexAreaOrifice.VAGINA), j);
-					Main.game.setContent(new Response("", "", Main.game.getCurrentDialogueNode()));
-				}, false);
-			}
-
-			id = "BLOWJOBS_GIVEN_"+i;
-			if (MainController.document.getElementById(id) != null) {
-				((EventTarget) MainController.document.getElementById(id)).addEventListener("click", e->{
-					CharacterModificationUtils.incrementSexExperience(new SexType(SexParticipantType.NORMAL, SexAreaOrifice.MOUTH, SexAreaPenetration.PENIS), j);
-					Main.game.setContent(new Response("", "", Main.game.getCurrentDialogueNode()));
-				}, false);
-			}
-
-			id = "CUNNILINGUS_GIVEN_"+i;
-			if (MainController.document.getElementById(id) != null) {
-				((EventTarget) MainController.document.getElementById(id)).addEventListener("click", e->{
-					CharacterModificationUtils.incrementSexExperience(new SexType(SexParticipantType.NORMAL, SexAreaPenetration.TONGUE, SexAreaOrifice.VAGINA), j);
-					Main.game.setContent(new Response("", "", Main.game.getCurrentDialogueNode()));
-				}, false);
-			}
-
-			id = "ANILINGUS_GIVEN_"+i;
-			if (MainController.document.getElementById(id) != null) {
-				((EventTarget) MainController.document.getElementById(id)).addEventListener("click", e->{
-					CharacterModificationUtils.incrementSexExperience(new SexType(SexParticipantType.NORMAL, SexAreaPenetration.TONGUE, SexAreaOrifice.ANUS), j);
-					Main.game.setContent(new Response("", "", Main.game.getCurrentDialogueNode()));
-				}, false);
-			}
-
-			id = "VAGINAL_GIVEN_"+i;
-			if (MainController.document.getElementById(id) != null) {
-				((EventTarget) MainController.document.getElementById(id)).addEventListener("click", e->{
-					CharacterModificationUtils.incrementSexExperience(new SexType(SexParticipantType.NORMAL, SexAreaPenetration.PENIS, SexAreaOrifice.VAGINA), j);
-					Main.game.setContent(new Response("", "", Main.game.getCurrentDialogueNode()));
-				}, false);
-			}
-
-			id = "ANAL_GIVEN_"+i;
-			if (MainController.document.getElementById(id) != null) {
-				((EventTarget) MainController.document.getElementById(id)).addEventListener("click", e->{
-					CharacterModificationUtils.incrementSexExperience(new SexType(SexParticipantType.NORMAL, SexAreaPenetration.PENIS, SexAreaOrifice.ANUS), j);
-					Main.game.setContent(new Response("", "", Main.game.getCurrentDialogueNode()));
-				}, false);
-			}
-
-			// Received:
-			id = "HANDJOBS_TAKEN_"+i;
-			if (MainController.document.getElementById(id) != null) {
-				((EventTarget) MainController.document.getElementById(id)).addEventListener("click", e->{
-					CharacterModificationUtils.incrementSexExperience(new SexType(SexParticipantType.NORMAL, SexAreaPenetration.PENIS, SexAreaPenetration.FINGER), j);
-					Main.game.setContent(new Response("", "", Main.game.getCurrentDialogueNode()));
-				}, false);
-			}
-
-			id = "FINGERINGS_TAKEN_"+i;
-			if (MainController.document.getElementById(id) != null) {
-				((EventTarget) MainController.document.getElementById(id)).addEventListener("click", e->{
-					CharacterModificationUtils.incrementSexExperience(new SexType(SexParticipantType.NORMAL, SexAreaOrifice.VAGINA, SexAreaPenetration.FINGER), j);
-					Main.game.setContent(new Response("", "", Main.game.getCurrentDialogueNode()));
-				}, false);
-			}
-
-			id = "BLOWJOBS_TAKEN_"+i;
-			if (MainController.document.getElementById(id) != null) {
-				((EventTarget) MainController.document.getElementById(id)).addEventListener("click", e->{
-					CharacterModificationUtils.incrementSexExperience(new SexType(SexParticipantType.NORMAL, SexAreaPenetration.PENIS, SexAreaOrifice.MOUTH), j);
-					Main.game.setContent(new Response("", "", Main.game.getCurrentDialogueNode()));
-				}, false);
-			}
-
-			id = "CUNNILINGUS_TAKEN_"+i;
-			if (MainController.document.getElementById(id) != null) {
-				((EventTarget) MainController.document.getElementById(id)).addEventListener("click", e->{
-					CharacterModificationUtils.incrementSexExperience(new SexType(SexParticipantType.NORMAL, SexAreaOrifice.VAGINA, SexAreaPenetration.TONGUE), j);
-					Main.game.setContent(new Response("", "", Main.game.getCurrentDialogueNode()));
-				}, false);
-			}
-
-			id = "ANILINGUS_TAKEN_"+i;
-			if (MainController.document.getElementById(id) != null) {
-				((EventTarget) MainController.document.getElementById(id)).addEventListener("click", e->{
-					CharacterModificationUtils.incrementSexExperience(new SexType(SexParticipantType.NORMAL, SexAreaOrifice.ANUS, SexAreaPenetration.TONGUE), j);
-					Main.game.setContent(new Response("", "", Main.game.getCurrentDialogueNode()));
-				}, false);
-			}
-
-			id = "VAGINAL_TAKEN_"+i;
-			if (MainController.document.getElementById(id) != null) {
-				((EventTarget) MainController.document.getElementById(id)).addEventListener("click", e->{
-					CharacterModificationUtils.incrementSexExperience(new SexType(SexParticipantType.NORMAL, SexAreaOrifice.VAGINA, SexAreaPenetration.PENIS), j);
-					Main.game.setContent(new Response("", "", Main.game.getCurrentDialogueNode()));
-				}, false);
-			}
-
-			id = "ANAL_TAKEN_"+i;
-			if (MainController.document.getElementById(id) != null) {
-				((EventTarget) MainController.document.getElementById(id)).addEventListener("click", e->{
-					CharacterModificationUtils.incrementSexExperience(new SexType(SexParticipantType.NORMAL, SexAreaOrifice.ANUS, SexAreaPenetration.PENIS), j);
-					Main.game.setContent(new Response("", "", Main.game.getCurrentDialogueNode()));
-				}, false);
+				new Value<>("DECREASE_LARGE", -100),
+				new Value<>("DECREASE", -10),
+				new Value<>("DECREASE_SMALL", -1),
+				new Value<>("INCREASE_SMALL", 1),
+				new Value<>("INCREASE", 10),
+				new Value<>("INCREASE_LARGE", 100));
+		for (Entry<String, SexType> typeEntry : types.entrySet()) {
+			for (Entry<String, Integer> entry : mappings.entrySet()) {
+				int i = entry.getValue();
+				String id = typeEntry.getKey() + "_" + entry.getKey();
+				if (MainController.document.getElementById(id) != null) {
+					((EventTarget) MainController.document.getElementById(id)).addEventListener("click", e->{
+						CharacterModificationUtils.incrementSexExperience(typeEntry.getValue(), i);
+						Main.game.setContent(new Response("", "", Main.game.getCurrentDialogueNode()));
+					}, false);
+				}
 			}
 		}
 	}

src/com/lilithsthrone/controller/EnchantmentController.java

@@ -52,6 +52,12 @@ static void initEnchantmentMenuListeners() {
 						new TooltipInformationEventListener().setInformation("Delete Effect", ""),
 						new EnchantmentEventListener().removeEffect(effectCount), false);
 			}
+			id = "DELETE_ALL_EFFECT_"+effectCount;
+			if (MainController.document.getElementById(id) != null) {
+				MainController.addTooltipListeners(id,
+						new TooltipInformationEventListener().setInformation("Delete Effect Stack", ""),
+						new EnchantmentEventListener().removeMatchingEffect(effectCount), false);
+			}
 		}
 
 		AbstractItemEffectType effect = EnchantmentDialogue.getIngredient().getEnchantmentEffect();

src/com/lilithsthrone/controller/OptionsController.java

@@ -283,8 +283,10 @@ public static void initFurryListeners() {
 			if (MainController.document.getElementById(id) != null) {
 				((EventTarget) MainController.document.getElementById(id)).addEventListener("click", e->{
 					for (AbstractSubspecies subspecies : Subspecies.getAllSubspecies()) {
-						Main.getProperties().setFeminineFurryPreference(subspecies, preference);
-						Main.getProperties().setMasculineFurryPreference(subspecies, preference);
+						if (subspecies.isFurryPreferencesEnabled() && subspecies.isDisplayedInFurryPreferences()) {
+							Main.getProperties().setFeminineFurryPreference(subspecies, preference);
+							Main.getProperties().setMasculineFurryPreference(subspecies, preference);
+						}
 					}
 					Main.saveProperties();
 					Main.game.setContent(new Response("", "", Main.game.getCurrentDialogueNode()));
@@ -296,8 +298,10 @@ public static void initFurryListeners() {
 			if (MainController.document.getElementById(id) != null) {
 				((EventTarget) MainController.document.getElementById(id)).addEventListener("click", e->{
 					for (AbstractSubspecies subspecies : Subspecies.getAllSubspecies()) {
-						Main.getProperties().setFeminineSubspeciesPreference(subspecies, preference);
-						Main.getProperties().setMasculineSubspeciesPreference(subspecies, preference);
+						if (subspecies.isSpawnPreferencesEnabled() && subspecies.isDisplayedInFurryPreferences()) {
+							Main.getProperties().setFeminineSubspeciesPreference(subspecies, preference);
+							Main.getProperties().setMasculineSubspeciesPreference(subspecies, preference);
+						}
 					}
 					Main.saveProperties();
 					Main.game.setContent(new Response("", "", Main.game.getCurrentDialogueNode()));

src/com/lilithsthrone/controller/eventListeners/EnchantmentEventListener.java

@@ -19,7 +19,8 @@ public class EnchantmentEventListener implements EventListener {
 	private AbstractCoreItem itemToEnchant;
 	private TFModifier primaryModifier, secondaryModifier;
 	private TFPotency potency;
-	private boolean effect;
+	private boolean remove;
+	private boolean removeAll;
 	private int effectIndex;
 	private int limit;
 
@@ -41,9 +42,12 @@ public void handleEvent(Event event) {
 		} else if(potency != null) {
 			EnchantmentDialogue.setPotency(potency);
 
-		} else if(effect) {
+		} else if(remove) {
 			EnchantmentDialogue.removeEffect(effectIndex);
 
+		} else if(removeAll) {
+			EnchantmentDialogue.removeMatchingEffect(effectIndex);
+
 		} else if(limit != EnchantmentDialogue.getLimit()) {
 			EnchantmentDialogue.setLimit(limit);
 		}
@@ -94,7 +98,15 @@ public EnchantmentEventListener setPotency(TFPotency potency) {
 
 	public EnchantmentEventListener removeEffect(int effectIndex) {
 		resetVariables();
-		effect = true;
+		remove = true;
+		this.effectIndex = effectIndex;
+
+		return this;
+	}
+
+	public EnchantmentEventListener removeMatchingEffect(int effectIndex) {
+		resetVariables();
+		removeAll = true;
 		this.effectIndex = effectIndex;
 
 		return this;
@@ -108,7 +120,8 @@ public EnchantmentEventListener setLimit(int limit) {
 	}
 
 	private void resetVariables() {
-		effect = false;
+		remove = false;
+		removeAll = false;
 		effectIndex = 0;
 		itemToEnchant = null;
 		primaryModifier = null;

src/com/lilithsthrone/game/character/CharacterUtils.java

@@ -939,7 +939,7 @@ public void applyGenetics(GameCharacter offspring, Body body, Body motherBody, B
 				}
 			}
 		}
-		
+
 		if(motherBody.isFeral()) { // Feral mothers always birth feral offspring. This is done after the genetics section to make sure that the feral offspring is not modified in an unintended manner (such as making them as tall as the father).
 			body.setFeral(offspring, motherBody.getTrueSubspecies()); // Feral offspring should always be the race of the feral mother to avoid very odd birthings (e.g. elephants born from a wolf)
 		}
@@ -1193,9 +1193,9 @@ public Body generateHalfDemonBody(GameCharacter linkedCharacter, Gender starting
 		body.updateCoverings(true, true, true, true);
 
 		applyPreferenceChanges(linkedCharacter, body);
-		
+
 		setBodyHair(body);
-		
+
 		halfSubspecies.getRace().applyRaceChanges(body);
 		halfSubspecies.applySpeciesChanges(body);
 
@@ -1239,15 +1239,15 @@ public Body generateBody(GameCharacter linkedCharacter, Gender startingGender, A
 					}
 				}
 			}
-			
+
 			if(potentialSubspecies.isEmpty()) {
 				potentialSubspecies.add(Subspecies.HUMAN);
 			}
 			species = Util.randomItemFrom(potentialSubspecies);
-			
+
 			return generateHalfDemonBody(linkedCharacter, startingGender, species, true);
 		}
-		
+
 		// Handling slimes:
 		if(isSlime && (linkedCharacter==null || !linkedCharacter.isUnique())) {
 			List<AbstractSubspecies> potentialSubspecies = new ArrayList<>();
@@ -1273,13 +1273,13 @@ public Body generateBody(GameCharacter linkedCharacter, Gender startingGender, A
 				potentialSubspecies.add(Subspecies.HUMAN);
 			}
 			species = Util.randomItemFrom(potentialSubspecies);
-			
+
 			if(startingGender.isFeminine()) {
 				stage = getRaceStageFromPreferences(Main.getProperties().getSubspeciesFeminineFurryPreferencesMap().get(species), startingGender, species);
 			} else {
 				stage = getRaceStageFromPreferences(Main.getProperties().getSubspeciesMasculineFurryPreferencesMap().get(species), startingGender, species);
 			}
-			
+
 			startingBodyType = RacialBody.valueOfRace(species.getRace());
 		}
 
@@ -1731,12 +1731,12 @@ private static void applyPreferenceChanges(GameCharacter linkedCharacter, Body b
 			body.setCovering(BodyCoveringType.HUMAN, Util.getRandomObjectFromWeightedMap(BodyCoveringType.HUMAN.getNaturalPatterns()), CoveringModifier.SMOOTH, skinColour, false, skinColour, false);
 			body.updateCoverings(true, true, true, true);
 		}
-		
+
 		if(linkedCharacter==null || !linkedCharacter.isUnique() || linkedCharacter.isPlayer()) { // Unique characters should always have the default number of breast rows
 			// Set breast rows based on preferences:
 			if(Main.getProperties().multiBreasts==0 || Main.getProperties().multiBreasts==1) {
 				body.getBreast().setRows(null, 1);
-				
+
 			} else if(Main.getProperties().multiBreasts==2) {
 				if(body.getTorsoType()==TorsoType.HUMAN) {
 					body.getBreast().setRows(null, 1);
@@ -1761,7 +1761,7 @@ private static void applyPreferenceChanges(GameCharacter linkedCharacter, Body b
 			body.getPenis().getTesticle().setInternal(null, true);
 		}
 	}
-	
+
 	private static void setBodyHair(Body body) {
 		int slobLevel = (int) (Util.random.nextInt(101)*body.getRace().getDisposition().getBodyHairModifier());
 
@@ -2533,6 +2533,8 @@ public void generateItemsInInventory(NPC character, boolean generateExtraItems,
 			maxClothingCount+=1;
 			List<InventorySlot> prohibitedSlots = Util.newArrayListOfValues(InventorySlot.VAGINA, InventorySlot.PENIS, InventorySlot.ANUS, InventorySlot.NIPPLE, InventorySlot.GROIN);
 			for(AbstractClothingType ct : ClothingType.getAllClothingInSet(SetBonus.getSetBonusFromId("innoxia_bdsm"))) {
+                List<AbstractClothingType> bondageClothing = ClothingType.getAllClothingInSet(SetBonus.getSetBonusFromId("innoxia_bdsm"));
+                bondageClothing.addAll(ClothingType.getAllClothingInSet(SetBonus.getSetBonusFromId("sage_ltxset")));
 				InventorySlot defaultSlot = ct.getEquipSlots().get(0);
 				// Do not add clothing types which are sex toys, as conditionals for those are added in the next logic block, and do not add enslavement clothing as the NPC will not want to equip it.
 				if(!ct.getEffects().stream().anyMatch(ie -> ie.getSecondaryModifier()==TFModifier.CLOTHING_ENSLAVEMENT) && !prohibitedSlots.contains(defaultSlot)) {

src/com/lilithsthrone/game/character/GameCharacter.java

@@ -6459,7 +6459,7 @@ public int getExperienceNeededForNextLevel() {
 	}
 
 	public String incrementExperience(int increment, boolean withExtraModifiers) {
-		if (getLevel() == LEVEL_CAP) {
+		if (getLevel() >= LEVEL_CAP) {
 			experience = 0;
 			return "";
 		}
@@ -10789,7 +10789,7 @@ public boolean isImmuneToLevelDrain() {
 
 	public String applyLevelDrain(GameCharacter target) {
 		if(target.getTrueLevel()>1) {
-			int exp = target.getExperienceNeededForNextLevel();
+			int exp = target.getTrueLevel()*5;
 			return UtilText.parse(target, this,
 					"<p style='text-align:center; margin:0;'>"
 						+ this.getLevelDrainDescription(target)
@@ -22552,6 +22552,9 @@ public int getLevel() {
 	}
 
 	public void setLevel(int level) {
+		if (level > LEVEL_CAP) {
+			level = LEVEL_CAP;
+		}
 		this.level = level;
 	}
 
@@ -27141,19 +27144,20 @@ public int getMinimumHeight() {
 		if(this.isFeral()) {
 			return Math.min(Height.NEGATIVE_TWO_MINIMUM.getMinimumValue(), (int) (this.getFeralAttributes().getSize()*0.5f));
 		}
-		return this.getSubspecies().isShortStature()
-				?Height.NEGATIVE_TWO_MINIMUM.getMinimumValue()
-				:Height.getShortStatureCutOff();
+		if (this.getSubspecies().isShortStature() || (this.getSubspeciesOverride() != null && this.getSubspeciesOverride().isShortStature())) {
+			return Height.NEGATIVE_TWO_MINIMUM.getMinimumValue();
+		}
+		return Height.getShortStatureCutOff();
 	}
 
 	public int getMaximumHeight() {
 //		if(this.isFeral()) {
 //			return Math.max(Height.SEVEN_COLOSSAL.getMaximumValue(), (int) (this.getFeralAttributes().getSize()*2f));
 //		}
-
-		return this.getSubspecies().isShortStature()
-				?Height.getShortStatureCutOff()-1
-				:Height.SEVEN_COLOSSAL.getMaximumValue();
+		if (this.getSubspecies().isShortStature() || (this.getSubspeciesOverride() != null && this.getSubspeciesOverride().isShortStature())) {
+			return Height.getShortStatureCutOff()-1;
+		}
+		return Height.SEVEN_COLOSSAL.getMaximumValue();
 	}
 
 	public String setHeight(int height) {