From cb01a9c1d3f40ddb30b4ecb49dd842af0ed03929 Mon Sep 17 00:00:00 2001 From: Chinch-Bug <77509218+Chinch-Bug@users.noreply.github.com> Date: Tue, 17 Sep 2024 23:15:46 +0300 Subject: [PATCH] edited mink & sepia newborns a lil --- scripts/utility.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/utility.py b/scripts/utility.py index 350c6b5..2fba89b 100644 --- a/scripts/utility.py +++ b/scripts/utility.py @@ -342,7 +342,7 @@ def MakeCat(whichmain, whichcolour, whichbase, cat_unders, special=None): elif((("cinnamon" in whichcolour and genotype.pointgene == ["cb", "cb"]) or ("chocolate" in whichcolour and "cb" in genotype.pointgene) or ("black" in whichcolour and genotype.pointgene == ["cs", "cs"])) and cat_sprite != "20" or (("chocolate" in whichcolour and genotype.pointgene == ["cb", "cb"]) or ("black" in whichcolour and "cb" in genotype.pointgene))): whichmain = AddStripes(whichmain, 'lightbasecolours1', whichbase) - elif(genotype.pointgene == ["cb", "cb"]): + elif(genotype.pointgene == ["cb", "cb"]) and cat_sprite != "20": pointbase = pygame.Surface((sprites.size, sprites.size), pygame.HWSURFACE | pygame.SRCALPHA) pointbase.blit(sprites.sprites[stripecolourdict.get(whichcolour, whichcolour)], (0, 0)) if phenotype.caramel == 'caramel' and not is_red: @@ -352,7 +352,7 @@ def MakeCat(whichmain, whichcolour, whichbase, cat_unders, special=None): pointbase2.blit(sprites.sprites['lightbasecolours0'], (0, 0)) pointbase2.blit(pointbase, (0, 0)) whichmain = AddStripes(whichmain, whichcolour, whichbase, coloursurface=pointbase2) - elif("cb" in genotype.pointgene): + elif("cb" in genotype.pointgene) and (cat_sprite != "20" or genotype.pointgene == ["cb", "cb"]): pointbase = pygame.Surface((sprites.size, sprites.size), pygame.HWSURFACE | pygame.SRCALPHA) pointbase.blit(sprites.sprites[stripecolourdict.get(whichcolour, whichcolour)], (0, 0)) if phenotype.caramel == 'caramel' and not is_red: @@ -573,15 +573,15 @@ def MakeCat(whichmain, whichcolour, whichbase, cat_unders, special=None): whichmain.blit(sprites.sprites['lightbasecolours3'], (0, 0)) colour = 'lightbasecolours3' whichmain = ApplySmokeEffects(whichmain) - elif((("chocolate" in whichcolour and genotype.pointgene == ["cb", "cb"]) or ("black" in whichcolour and "cb" in genotype.pointgene)) and cat_sprite != "20" or ("black" in whichcolour and genotype.pointgene == ["cb", "cb"])): + elif((("chocolate" in whichcolour and genotype.pointgene == ["cb", "cb"]) or ("black" in whichcolour and "cb" in genotype.pointgene)) and cat_sprite != "20") or ("black" in whichcolour and genotype.pointgene == ["cb", "cb"]): whichmain.blit(sprites.sprites['lightbasecolours2'], (0, 0)) colour = 'lightbasecolours2' whichmain = ApplySmokeEffects(whichmain) - elif((("chocolate" in whichcolour and genotype.pointgene == ["cb", "cb"]) or ("chocolate" in whichcolour and "cb" in genotype.pointgene) or ("black" in whichcolour and genotype.pointgene == ["cs", "cs"])) and cat_sprite != "20" or (("chocolate" in whichcolour and genotype.pointgene == ["cb", "cb"]) or ("black" in whichcolour and "cb" in genotype.pointgene))): + elif((("cinnamon" in whichcolour and genotype.pointgene == ["cb", "cb"]) or ("chocolate" in whichcolour and "cb" in genotype.pointgene) or ("black" in whichcolour and genotype.pointgene == ["cs", "cs"])) and cat_sprite != "20") or (("chocolate" in whichcolour and genotype.pointgene == ["cb", "cb"]) or ("black" in whichcolour and "cb" in genotype.pointgene)): whichmain.blit(sprites.sprites['lightbasecolours1'], (0, 0)) colour = 'lightbasecolours1' whichmain = ApplySmokeEffects(whichmain) - elif(genotype.pointgene == ["cb", "cb"]): + elif(genotype.pointgene == ["cb", "cb"]) and cat_sprite != "20": pointbase = pygame.Surface((sprites.size, sprites.size), pygame.HWSURFACE | pygame.SRCALPHA) pointbase.blit(sprites.sprites[whichcolour], (0, 0)) if phenotype.caramel == 'caramel' and not is_red: @@ -593,7 +593,7 @@ def MakeCat(whichmain, whichcolour, whichbase, cat_unders, special=None): pointbase.blit(whichmain, (0, 0)) coloursurface = pointbase whichmain = ApplySmokeEffects(whichmain) - elif("cb" in genotype.pointgene): + elif("cb" in genotype.pointgene) and (cat_sprite != "20" or genotype.pointgene == ["cb", "cb"]): pointbase = pygame.Surface((sprites.size, sprites.size), pygame.HWSURFACE | pygame.SRCALPHA) pointbase.blit(sprites.sprites[whichcolour], (0, 0)) if phenotype.caramel == 'caramel' and not is_red: