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.

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

Fix Eisek (and probably other NPCs) showing up as winged dragon-boy #1839

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix Eisek (and probably other NPCs) showing up as winged dragon-boy #1839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions ...com/lilithsthrone/controller/eventListeners/tooltips/TooltipInformationEventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -901,16 +901,15 @@ public void handleEvent(Event event) {

Main.mainController.setTooltipSize(dimensions[0], dimensions[1]);

boolean showWinged = (owner.hasWings() || owner.isArmWings()) && !owner.getFleshSubspecies().isWinged();
tooltipSB.setLength(0);
tooltipSB.append("<div class='title' style='color:" + owner.getRace().getColour().toWebHexString() + ";'>"
+(owner.getRaceStage().getName()!=""
?"<b style='color:"+owner.getRaceStage().getColour().toWebHexString()+";'>" + Util.capitaliseSentence(owner.getRaceStage().getName())+"</b> "
:"")
+ "<b style='color:"+owner.getSubspecies().getColour(owner).toWebHexString()+";'>"
+ (owner.isFeminine()
?Util.capitaliseSentence((showWinged ? "winged " : "") + owner.getSubspecies().getSingularFemaleName(owner.getBody()))
:Util.capitaliseSentence((showWinged ? "winged " : "") + owner.getSubspecies().getSingularMaleName(owner.getBody())))
?Util.capitaliseSentence((owner.showWinged() ? "winged " : "") + owner.getSubspecies().getSingularFemaleName(owner.getBody()))
:Util.capitaliseSentence((owner.showWinged() ? "winged " : "") + owner.getSubspecies().getSingularMaleName(owner.getBody())))
+ "</b>"
+ "</div>");

Expand Down
8 changes: 6 additions & 2 deletions src/com/lilithsthrone/game/character/GameCharacter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3987,6 +3987,11 @@ public void incrementArtworkIndex(int increment) {
setArtworkIndex(this.artworkIndex + increment);
}

public boolean showWinged() {
AbstractSubspecies subspecies = getBodyMaterial() == BodyMaterial.FLESH ? getSubspecies() : getFleshSubspecies();
return (hasWings() || isArmWings()) && !subspecies.isWinged();
}

public String getName(String determiner) {
char firstChar = getName(true).charAt(0);
if (Character.isUpperCase(firstChar) || !Character.isAlphabetic(firstChar) || determiner.isEmpty()) { //|| getName().equals(this.getGenericName())
Expand All @@ -3996,8 +4001,7 @@ public String getName(String determiner) {
return getName(true);

} else {
boolean showWinged = (hasWings() || isArmWings()) && !getFleshSubspecies().isWinged();
String nameText = (showWinged ? "winged " : "") + getName(true);
String nameText = (showWinged() ? "winged " : "") + getName(true);
if(this.isUnique()) {
determiner = "the";
}
Expand Down
8 changes: 2 additions & 6 deletions src/com/lilithsthrone/game/dialogue/companions/OccupantManagementDialogue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1306,15 +1306,13 @@ private static String getOccupantHeader() {
}

private static String getSlaveryEntry(boolean slaveOwned, GenericPlace place, NPC slave, AffectionLevel affection, float affectionChange, ObedienceLevel obedience, float obedienceChange, boolean alternateBackground) {
boolean showWinged = (slave.hasWings() || slave.isArmWings()) && !slave.getFleshSubspecies().isWinged();

miscDialogueSB.setLength(0);
miscDialogueSB.append(
"<div class='container-full-width inner' style='margin-bottom:0;"+(alternateBackground?"background:"+PresetColour.BACKGROUND_ALT.toWebHexString()+";'":"'")+"'>"
+ "<div style='width:20%; float:left; margin:0; padding:0;'>"
+ "<b style='color:"+slave.getFemininity().getColour().toWebHexString()+";'>"+slave.getName(true)+"</b><br/>"
+ "<span style='color:"+slave.getRace().getColour().toWebHexString()+";'>"
+Util.capitaliseSentence((showWinged?"winged ":"")+(slave.isFeminine()?slave.getSubspecies().getSingularFemaleName(slave.getBody()):slave.getSubspecies().getSingularMaleName(slave.getBody())))+"</span><br/>"
+Util.capitaliseSentence((slave.showWinged()?"winged ":"")+(slave.isFeminine()?slave.getSubspecies().getSingularFemaleName(slave.getBody()):slave.getSubspecies().getSingularMaleName(slave.getBody())))+"</span><br/>"
+ "<span style='color:"+slave.getFemininity().getColour().toWebHexString()+";'>"+Util.capitaliseSentence(slave.getGender().getName())+"</span>"
+ "</div>"
+ "<div style='width:20%; float:left; margin:0; padding:0;'>"
Expand Down Expand Up @@ -1419,15 +1417,13 @@ private static String getSlaveryEntry(boolean slaveOwned, GenericPlace place, NP
}

private static String getOccupantEntry(GenericPlace place, NPC occupant, AffectionLevel affection, float affectionChange, ObedienceLevel obedience, float obedienceChange, boolean alternateBackground) {
boolean showWinged = (occupant.hasWings() || occupant.isArmWings()) && !occupant.getFleshSubspecies().isWinged();

miscDialogueSB.setLength(0);
miscDialogueSB.append(
"<div class='container-full-width inner' style='margin-bottom:0;"+(alternateBackground?"background:"+PresetColour.BACKGROUND_ALT.toWebHexString()+";'":"'")+"'>"
+ "<div style='width:20%; float:left; margin:0; padding:0;'>"
+ "<b style='color:"+occupant.getFemininity().getColour().toWebHexString()+";'>"+occupant.getName(true)+"</b><br/>"
+ "<span style='color:"+occupant.getRace().getColour().toWebHexString()+";'>"
+Util.capitaliseSentence((showWinged?"winged ":"")+(occupant.isFeminine()?occupant.getSubspecies().getSingularFemaleName(occupant.getBody()):occupant.getSubspecies().getSingularMaleName(occupant.getBody())))+"</span><br/>"
+Util.capitaliseSentence((occupant.showWinged()?"winged ":"")+(occupant.isFeminine()?occupant.getSubspecies().getSingularFemaleName(occupant.getBody()):occupant.getSubspecies().getSingularMaleName(occupant.getBody())))+"</span><br/>"
+ "<span style='color:"+occupant.getFemininity().getColour().toWebHexString()+";'>"+Util.capitaliseSentence(occupant.getGender().getName())+"</span>"
+ "</div>"
+ "<div style='width:20%; float:left; margin:0; padding:0;'>"
Expand Down