Skip to content

Commit

Permalink
big update
Browse files Browse the repository at this point in the history
  • Loading branch information
@Chinch-Bug
Chinch-Bug committed Dec 20, 2024
1 parent b2fdfad commit 3e550ed
Show file tree
Hide file tree
Showing 94 changed files with 1,161 additions and 656 deletions.
15 changes: 12 additions & 3 deletions scripts/cat/cats.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,9 @@ def randomize_looks(self, just_pattern=False):

def SubRandomize(genotype, phenotype):
phenotype.SetPoints(choice(['Normal', 'Colourpoint', 'Mink', 'Sepia', 'Point-Albino', 'Sepia-Albino', 'Siamocha', 'Burmocha', 'Mocha', 'Mocha-Albino']))
genotype.tortiepattern = choice(list(tortie_patches_shapes.keys()))
genotype.tortiepattern = [choice(list(tortie_patches_shapes.keys()))]
if random() < 0.1:
genotype.merlepattern = [choice(list(tortie_patches_shapes.keys()))]
genotype.chimerapattern = choice(list(tortie_patches_shapes.keys()))
if genotype.sexgene is not ['O', 'O']:
genotype.sexgene = choice([['o', 'o'], ['o', 'o'], ['O', 'o']])
Expand All @@ -84,15 +86,21 @@ def SubRandomize(genotype, phenotype):
phenotype.tortie = False
phenotype.SetBaseColour(choice(['Black', 'Blue', 'Red', 'Cream', 'White', 'Albino', 'Chocolate', 'Lilac', 'Cinnamon', 'Fawn', 'Dove', 'Platinum',
'Honey', 'Ivory', 'Champagne', 'Lavender', 'Buff', 'Beige']).lower())

if random() < 0.1:
genotype.specialred = choice(['cameo', 'cameo', 'cameo', 'cameo', 'cameo', 'cameo', 'cameo', 'pseudo-cinnamon', 'blue-red', 'blue-tipped', 'blue-tipped'])
else:
genotype.specialred = "none"

genotype.dilutemd[0] = choice(['dm', 'dm', 'dm', 'dm', 'dm', 'Dm'])
genotype.bleach[0] = choice(['Lb', 'Lb', 'Lb', 'Lb', 'Lb', 'lb'])
genotype.ghosting[0] = choice(['gh', 'gh', 'gh', 'gh', 'gh', 'Gh'])
genotype.satin[0] = choice(['St', 'St', 'St', 'St', 'St', 'st'])
genotype.brindledbi = (random.random() < 0.1)
if (random.random() < 0.1 and genotype.tortiepattern):
genotype.tortiepattern = 'rev' + genotype.tortiepattern
genotype.tortiepattern[0] = 'rev' + genotype.tortiepattern
elif genotype.tortiepattern:
genotype.tortiepattern = genotype.tortiepattern.replace('rev', '')
genotype.tortiepattern[0] = genotype.tortiepattern.replace('rev', '')

genotype.karp = choice([['k', 'k'], ['k', 'k'], ['k', 'k'], ['k', 'k'], ['k', 'k'], ['k', 'k'], ['K', 'k'], ['K', 'k'], ['K', 'k'], ['K', 'K']])
if global_vars.CREATED_CAT.genotype.karp == ['k', 'k']:
Expand Down Expand Up @@ -137,6 +145,7 @@ def SubRandomize(genotype, phenotype):

genotype.soktype = choice(['normal markings', 'normal markings', 'normal markings', 'normal markings','normal markings' , 'full sokoke', 'mild fading', 'mild fading'])

genotype.fevercoat = random() < 0.1
genotype.silver[0] = choice(['I', 'i', 'i'])
genotype.wbtype = choice(['low', 'medium', 'high', 'shaded', 'chinchilla'])
genotype.ruftype = choice(['low', 'medium', 'rufoused'])
Expand Down
7 changes: 5 additions & 2 deletions scripts/cat/genotype.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,24 @@ def __init__(self, spec=None):
self.eumelanin = ["B", "B"]
self.sexgene = ["o", "o"]
self.specialred = "none"
self.tortiepattern = None
self.tortiepattern = []
self.brindledbi = False
self.chimera = False
if spec:
self.chimerageno = None
else:
self.chimerageno = Genotype('chimera')
self.chimerapattern = None
self.pseudomerle = False
self.merlepattern = []
self.gender = ""
self.dilute = ["D", "D"]
self.white = ["w", "w"]
self.whitegrade = randint(1, 5)
self.white_pattern = [None]
self.vitiligo = False
self.deaf = False
self.fevercoat = False
self.pointgene = ["C", "C"]
self.silver = ["i", "i"]
self.agouti = ["a", "a"]
Expand Down Expand Up @@ -64,7 +67,7 @@ def __init__(self, spec=None):
self.ring = ["Rt", "Rt"]
self.munch = ["mk", "mk"]
self.poly = ["pd", "pd"]
self.altai = ["al", "al"]
self.pax3 = ["NoDBE", "NoDBE"]

self.wideband = ""
self.wbtype = "medium"
Expand Down
295 changes: 179 additions & 116 deletions scripts/cat/phenotype.py
View file

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions scripts/cat/sprites.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,11 +174,11 @@ def load_all(self):
"dove", "champagne", "buff",
"platinum", "lavender", "beige"]):
self.make_group('base/eumelanin', (0, i), f'{x}', sprites_x=7, sprites_y=1)
for i, x in enumerate(["lowred", "mediumred", "rufousedred",
"lowcream", "mediumcream", "rufousedcream",
"lowhoney", "mediumhoney", "rufousedhoney",
"lowivory", "mediumivory", "rufousedivory"]):
self.make_group('base/pheomelanin', (int(i%3), int(i/3)), f'{x}', sprites_x=1, sprites_y=1)
for i, x in enumerate(["rufousedred", "mediumred", "lowred",
"rufousedcream", "mediumcream", "lowcream",
"rufousedhoney", "mediumhoney", "lowhoney",
"rufousedivory", "mediumivory", "lowivory"]):
self.make_group('base/pheomelanin', (0, i), f'{x}', sprites_x=7, sprites_y=1)
self.make_group('base/lightbases', (0, 0), 'lightbasecolours', sprites_x=4, sprites_y=1)


Expand Down Expand Up @@ -318,7 +318,7 @@ def load_all(self):
self.make_group('tortiepatchesmasks', (a, 2), f"{i}")
for a, i in enumerate(['ORIOLE', 'ROBIN', 'BRINDLE', 'PAIGE', 'ROSETAIL', 'SAFI', 'DAPPLENIGHT', 'BLANKET', 'BELOVED', 'BODY']):
self.make_group('tortiepatchesmasks', (a, 3), f"{i}")
for a, i in enumerate(['SHILOH', 'FRECKLED', 'HEARTBEAT']):
for a, i in enumerate(['SHILOH', 'FRECKLED', 'HEARTBEAT', "CRYPTIC"]):
self.make_group('tortiepatchesmasks', (a, 4), f"{i}")
self.make_group('Other/blue-tipped', (0, 0), 'BLUE-TIPPED')

Expand Down
72 changes: 44 additions & 28 deletions scripts/global_vars.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,34 @@ def sort_bidict(d: bidict, first_element=None):
extention = bidict({"E": "Normal", "ea": "Amber", "er": "Russet", "ec": "Carnelian",
"Eg": "Chausie Grizzle", 'ecc': 'Carnelian Carrier'})


white_patches = bidict({None: 'None', 'MAO': 'Mao', 'LUNA': 'Luna', 'CHESTSPECK': 'Chest Speck', 'WINGS': 'Wings',
'PAINTED': 'Painted', 'BLACKSTAR': 'Blackstar', 'LITTLE': 'Little', 'TUXEDO': 'Tuxedo',
'LIGHTTUXEDO': 'Light Tuxedo', 'BUZZARDFANG': 'Buzzardfang', 'TIP': 'Tip', 'BLAZE': 'Blaze',
'BIB': 'Bib', 'VEE': 'Vee', 'PAWS': 'Paws', 'BELLY': 'Belly', 'TAILTIP': 'Tail Tip',
'TOES': 'Toes', 'BROKENBLAZE': 'Broken Blaze', 'LILTWO': 'Lil Two', 'SCOURGE': 'Scourge',
'TOESTAIL': 'Toes Tail', 'RAVENPAW': 'Ravenpaw', 'HONEY': 'Honey', 'FANCY': 'Fancy',
'UNDERS': 'Unders', 'DAMIEN': 'Damien', 'SKUNK': 'Skunk', 'MITAINE': 'Mitaine',
'SQUEAKS': 'Squeaks', 'STAR': 'Star', 'ANY': 'Any', 'ANYTWO': 'Any Two', 'BROKEN': 'Broken',
'FRECKLES': 'Freckles', 'RINGTAIL': 'Ringtail', 'HALFFACE': 'Half Face', 'PANTSTWO': 'Pants 2',
'GOATEE': 'Goatee', 'PRINCE': 'Prince', 'FAROFA': 'Farofa', 'MISTER': 'Mister',
'PANTS': 'Pants', 'REVERSEPANTS': 'Reverse Pants', 'HALFWHITE': 'Half White',
'APPALOOSA': 'Appaloosa', 'PIEBALD': 'Piebald', 'CURVED': 'Curved', 'GLASS': 'Glass',
'MASKMANTLE': 'Mask Mantle', 'VAN': 'Van', 'ONEEAR': 'One Ear', 'LIGHTSONG': 'Lightsong',
'TAIL': 'Tail', 'HEART': 'Heart', 'HEARTTWO': 'Heart 2', 'MOORISH': 'Moorish', 'APRON': 'Apron',
'CAPSADDLE': 'Cap Saddle', 'FULLWHITE': 'Full White', "EXTRA": "Extra", 'PETAL': 'Petal',
"DIVA": "Diva", "SAVANNAH": "Savannah", "FADESPOTS": "Fadespots", "SHIBAINU": "Shiba Inu",
"TOPCOVER": "Top Cover", "DAPPLEPAW": "Dapplepaw", "BEARD": "Beard", "PEBBLESHINE": "Pebbleshine",
"OWL": "Owl", "WOODPECKER": "Woodpecker", "MISS": "Miss", "BOOTS": "Boots", "COW": "Cow",
"COWTWO": "Cow 2", "BUB": "Bub", "BOWTIE": "Bowtie", "MUSTACHE" : "Mustache", "REVERSEHEART": "Reverse Heart",
"SPARROW": "Sparrow", "VEST": "Vest", "LOVEBUG" : "Lovebug", "TRIXIE": "Trixie", "SPARKLE": "Sparkle",
"RIGHTEAR" : "Right Ear", "LEFTEAR": "Left Ear", "ESTRELLA": "Estrella", "REVERSEEYE" : "Reverse Eye",
"BACKSPOT": "Back spot", "EYEBAGS": "Eye Bags", "FADEBELLY": "Fade Belly", "SAMMY": "Sammy", "FRONT" : "Front",
"BLOSSOMSTEP": "Blossomstep", "BULLSEYE": "Bullseye", "SHOOTINGSTAR" : "Shooting Star", "EYESPOT" : "Eye Spot",
"PEBBLE": "Pebble", "TAILTWO": "Tail Two", "BUDDY": "Buddy", "FCONE": "FC One", "FCTWO": "FC Two",
"MIA": "Mia", "DIGIT": "Digit", "SCAR": "Scar", "BUSTER": "Buster", "FINN": "Finn", "KROPKA": "Kropka",
"HAWKBLAZE": "Hawkblaze", "LOCKET": "Locket", "PRINCESS": "Princess", "ROSINA" : "Rosina", "CAKE" : "Cake", "BLAZEMASK" : 'Blazemask', "TEARS" : "Tears", "DOUGIE" : 'Dougie'})
white_patches = sort_bidict(white_patches, None)
tortie_patches_shapes = bidict({"ONE": "One", "TWO": "Two", "THREE": "Three", "FOUR": "Four", 'REDTAIL': "Redtail",
'DELILAH': "Delilah", 'MINIMALONE': "Minimal 1", 'MINIMALTWO': "Minimal 2",
'MINIMALTHREE': "Minimal 3", 'MINIMALFOUR': "Minimal 4", 'OREO': "Oreo", 'SWOOP': "Swoop",
Expand All @@ -56,6 +84,22 @@ def sort_bidict(d: bidict, first_element=None):
"GRUMPYFACE": "Grumpy Face", "BRIE": "Brie", "BELOVED": "Beloved", "SHILOH" : "Shiloh",
"BODY" : "Body"})
tortie_patches_shapes = sort_bidict(tortie_patches_shapes)
tortie_patches_shapes.update(white_patches)

merle_patches_shapes = bidict({None: 'None', 'DELILAH' : "Delilah", 'MOTTLED' : "Mottled", 'EYEDOT' : "Eye dot", 'BANDANA' : "Bandana",
'SMUDGED' : "Smudged", 'EMBER' : "Ember", 'BRINDLE' : "Brindle", 'SAFI' : "Safi", 'BELOVED' : "Beloved",
'BODY' : "Body", 'SHILOH' : "Shiloh", 'FRECKLED' : "Freckled", "BACKSPOT" : "Backspot", "BEARD" : "Beard",
"BELLY" : "Belly", "BIB" : "Bib", "revBLACKSTAR" : "Blackstar", "BLAZE" : "Blaze", "BLAZEMASK" : "Blaze mask",
"revBOOTS" : "Boots", "revCHESTSPECK" : "Chest speck", "ESTRELLA" : "Estrelle", 'ONE' : "One", 'TWO' : "Two",
'SMOKE' : "Smoke", 'MINIMALONE': "Minimal 1", 'MINIMALTWO': "Minimal 2", 'MINIMALTHREE': "Minimal 3",
'MINIMALFOUR': "Minimal 4", 'OREO' : "Oreo", 'CHIMERA' : "Chimera", 'CHEST' : "Chest", 'GRUMPYFACE' : "Grumpyface",
'SIDEMASK' : "Sidemask", 'PACMAN' : "Pacman", 'BRIE' : "Brie" ,'ORIOLE' : "Oriole", 'ROBIN' : "Robin",
'PAIGE' : "Paige", 'HEARTBEAT' : "Heartbeat", "EYEBAGS" : "Eyebags", "revEYESPOT": "Eye spot",
"revHEART": "Heart", "HONEY" : "Honey", "LEFTEAR": "Left ear", "LITTLE" : "Little", "PAWS" : "Paws",
"REVERSEEYE" : "Reverse eye", "REVERSEHEART" : "Reverse heart", "RIGHTEAR" : "Right ear", "SCOURGE" : "Scourge",
"SPARKLE" : "Sparkle", "revTAIL" : "Tail", 'revTAILTWO': "Tail 2", "TAILTIP": "Tailtip", "TEARS": "Tears",
"TIP": "Tip", "TOES": "Toes", "TOESTAIL": "Toes & Tail", "VEE" : "Vee"})
merle_patches_shapes = sort_bidict(merle_patches_shapes)

eye_colors = bidict( {'YELLOW': "Yellow", 'AMBER': "Amber", 'HAZEL': "Hazel", 'PALEGREEN': "Pale Green",
'GREEN': "Green", 'BLUE': "Blue", 'DARKBLUE': "Dark Blue", 'GREY': "Grey", 'CYAN': "Cyan",
Expand All @@ -82,34 +126,6 @@ def sort_bidict(d: bidict, first_element=None):
colors = ['Black', 'Blue', 'Red', 'Cream', 'White', 'Albino', 'Chocolate', 'Lilac', 'Cinnamon', 'Fawn', 'Dove', 'Platinum',
'Honey', 'Ivory', 'Champagne', 'Lavender', 'Buff', 'Beige']

white_patches = bidict({None: 'None', 'MAO': 'Mao', 'LUNA': 'Luna', 'CHESTSPECK': 'Chest Speck', 'WINGS': 'Wings',
'PAINTED': 'Painted', 'BLACKSTAR': 'Blackstar', 'LITTLE': 'Little', 'TUXEDO': 'Tuxedo',
'LIGHTTUXEDO': 'Light Tuxedo', 'BUZZARDFANG': 'Buzzardfang', 'TIP': 'Tip', 'BLAZE': 'Blaze',
'BIB': 'Bib', 'VEE': 'Vee', 'PAWS': 'Paws', 'BELLY': 'Belly', 'TAILTIP': 'Tail Tip',
'TOES': 'Toes', 'BROKENBLAZE': 'Broken Blaze', 'LILTWO': 'Lil Two', 'SCOURGE': 'Scourge',
'TOESTAIL': 'Toes Tail', 'RAVENPAW': 'Ravenpaw', 'HONEY': 'Honey', 'FANCY': 'Fancy',
'UNDERS': 'Unders', 'DAMIEN': 'Damien', 'SKUNK': 'Skunk', 'MITAINE': 'Mitaine',
'SQUEAKS': 'Squeaks', 'STAR': 'Star', 'ANY': 'Any', 'ANYTWO': 'Any Two', 'BROKEN': 'Broken',
'FRECKLES': 'Freckles', 'RINGTAIL': 'Ringtail', 'HALFFACE': 'Half Face', 'PANTSTWO': 'Pants 2',
'GOATEE': 'Goatee', 'PRINCE': 'Prince', 'FAROFA': 'Farofa', 'MISTER': 'Mister',
'PANTS': 'Pants', 'REVERSEPANTS': 'Reverse Pants', 'HALFWHITE': 'Half White',
'APPALOOSA': 'Appaloosa', 'PIEBALD': 'Piebald', 'CURVED': 'Curved', 'GLASS': 'Glass',
'MASKMANTLE': 'Mask Mantle', 'VAN': 'Van', 'ONEEAR': 'One Ear', 'LIGHTSONG': 'Lightsong',
'TAIL': 'Tail', 'HEART': 'Heart', 'HEARTTWO': 'Heart 2', 'MOORISH': 'Moorish', 'APRON': 'Apron',
'CAPSADDLE': 'Cap Saddle', 'FULLWHITE': 'Full White', "EXTRA": "Extra", 'PETAL': 'Petal',
"DIVA": "Diva", "SAVANNAH": "Savannah", "FADESPOTS": "Fadespots", "SHIBAINU": "Shiba Inu",
"TOPCOVER": "Top Cover", "DAPPLEPAW": "Dapplepaw", "BEARD": "Beard", "PEBBLESHINE": "Pebbleshine",
"OWL": "Owl", "WOODPECKER": "Woodpecker", "MISS": "Miss", "BOOTS": "Boots", "COW": "Cow",
"COWTWO": "Cow 2", "BUB": "Bub", "BOWTIE": "Bowtie", "MUSTACHE" : "Mustache", "REVERSEHEART": "Reverse Heart",
"SPARROW": "Sparrow", "VEST": "Vest", "LOVEBUG" : "Lovebug", "TRIXIE": "Trixie", "SPARKLE": "Sparkle",
"RIGHTEAR" : "Right Ear", "LEFTEAR": "Left Ear", "ESTRELLA": "Estrella", "REVERSEEYE" : "Reverse Eye",
"BACKSPOT": "Back spot", "EYEBAGS": "Eye Bags", "FADEBELLY": "Fade Belly", "SAMMY": "Sammy", "FRONT" : "Front",
"BLOSSOMSTEP": "Blossomstep", "BULLSEYE": "Bullseye", "SHOOTINGSTAR" : "Shooting Star", "EYESPOT" : "Eye Spot",
"PEBBLE": "Pebble", "TAILTWO": "Tail Two", "BUDDY": "Buddy", "FCONE": "FC One", "FCTWO": "FC Two",
"MIA": "Mia", "DIGIT": "Digit", "SCAR": "Scar", "BUSTER": "Buster", "FINN": "Finn", "KROPKA": "Kropka",
"HAWKBLAZE": "Hawkblaze", "LOCKET": "Locket", "PRINCESS": "Princess", "ROSINA" : "Rosina", "CAKE" : "Cake", "BLAZEMASK" : 'Blazemask', "TEARS" : "Tears", "DOUGIE" : 'Dougie'})
white_patches = sort_bidict(white_patches, None)

genemod_white = bidict({None: 'None',
'None1': '-Right Front Leg-',
'right front toes' : 'RF Toes', 'right front mitten' : 'RF Mitten', 'right front low sock' : 'RF Low Sock', 'right front high sock' : 'RF High Sock', 'right front bicolour1' : 'RF Bicolour1', 'right front bicolour2' : 'RF Bicolour2', 'break/right front mitten' : 'RF No Mitten', 'break/bracelet right' : 'RF Dark Band',
Expand Down
Loading

0 comments on commit 3e550ed

Please sign in to comment.