Skip to content

Commit

Permalink
sprite fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Chinch-Bug committed Dec 12, 2023
1 parent b22cea3 commit 7148dc8
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions scripts/cat/phenotype.py
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ def SpriteInfo(self, moons):
self.spritecolour = "albino"
self.caramel = ""
self.maincolour = self.spritecolour
elif self.genotype.white[0] == "W":
elif self.genotype.white[0] == "W" or (self.genotype.brindledbi and (('o' not in self.genotype.sexgene) or (self.genotype.ext[0] == 'ea' and ((moons > 11 and self.genotype.agouti[0] != 'a') or (moons > 23))) or (self.genotype.ext[0] == 'er' and moons > 23 and 'O' not in self.genotype.sexgene) or (self.genotype.ext[0] == 'ec' and (self.genotype.agouti[0] != 'a' or moons > 5)))):
self.spritecolour = "white"
self.caramel = ""
self.maincolour = self.spritecolour
Expand Down Expand Up @@ -493,7 +493,7 @@ def FindBlack(self, genes, moons, special=None):
maincolour = colour

if (genes.agouti[0] != "a" and genes.ext[0] != "Eg") or (genes.ext[0] not in ['Eg', 'E'] and moons > 0):
if genes.silver[0] == "I" or (moons < 3 and genes.karp[0] == "K"):
if genes.silver[0] == "I" or genes.brindledbi or (moons < 3 and genes.karp[0] == "K"):
if genes.sunshine[0] == "sg":
colour = colour + "silver" + "chinchilla"
elif genes.sunshine[0] == "sh" or genes.sunshine[0] == "fg" or (genes.ext[0] == 'ea' and moons > 3):
Expand Down
Binary file modified sprites/genemod/borders/bobtails.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified sprites/genemod/borders/isolateears.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified sprites/genemod/borders/normal border.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified sprites/genemod/borders/rexborder.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 7148dc8

Please sign in to comment.