Skip to content
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.

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

Bugfix: Minor fixes from recent discord bug report #1831

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 res/txt/places/dominion/lilayasHome/lab.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1018,7 +1018,7 @@
<p>
Once again, you find yourself surrounded by the shimmering pink outline of your arcane aura. This time, however, you see a strange ball of energy orbiting your body, which looks to be the same sort of size as the shard of energy that you remember shooting into you. Looking up at Lilaya, you see that her cheeks have completely drained of colour, and she's looking down at you with an extremely worried expression on her face.
</p>
#ELSEIF(SPECIAL_PARSE_0=="false")
#ELSEIF(!pc.isAnyEquippedClothingSealed())
<p>
[pc.speech(That's good to hear, so what would I need to do if it happens again?)] you ask.
</p>
Expand Down
6 changes: 3 additions & 3 deletions src/com/lilithsthrone/game/character/GameCharacter.java
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ public abstract class GameCharacter implements XMLSaving {


// Pregnancy:
protected List<String> pregnancyReactions;
protected Set<String> pregnancyReactions;
protected long timeProgressedToFinalPregnancyStage;
protected Map<SexAreaOrifice, Long> timeProgressedToFinalIncubationStage;
protected List<PregnancyPossibility> potentialPartnersAsMother;
Expand Down Expand Up @@ -689,7 +689,7 @@ protected GameCharacter(

fluidsStoredMap = new HashMap<>();

pregnancyReactions = new ArrayList<>();
pregnancyReactions = new HashSet<>();

timeProgressedToFinalPregnancyStage = 1;
timeProgressedToFinalIncubationStage = new HashMap<>();
Expand Down Expand Up @@ -21266,7 +21266,7 @@ public void endPregnancy(boolean withBirth, boolean withClothingManagement) {
for(Litter fatherCopy : pregnantLitter.getFather().getLittersFathered()) {
if(!fatherCopy.getId().isEmpty() && fatherCopy.getId().equals(pregnantLitter.getId())) {
fatherCopy.setBirthDate(Main.game.getDateNow());
continue;
break;
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/com/lilithsthrone/game/character/body/Leg.java
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,10 @@ public String setType(GameCharacter owner, AbstractLegType type) {
if(!Main.game.isStarted() || owner==null) {
this.type = type;
this.footStructure = type.getDefaultFootStructure(this.getLegConfiguration());
if(Main.game.isStarted() && !type.isLegConfigurationAvailable(this.getLegConfiguration())) {
this.getType().applyLegConfigurationTransformation(owner, RacialBody.valueOfRace(type.getRace()).getLegConfiguration(), true, true);
}
if(owner!=null) {
if(Main.game.isStarted() && !type.isLegConfigurationAvailable(this.getLegConfiguration())) {
this.getType().applyLegConfigurationTransformation(owner, RacialBody.valueOfRace(type.getRace()).getLegConfiguration(), true, true);
}
owner.postTransformationCalculation();
}
return "";
Expand Down