Skip to content

Commit

Permalink
Started on save features, BUB
Browse files Browse the repository at this point in the history
  • Loading branch information
keyraven committed Jun 21, 2023
1 parent e0e62c9 commit dce485b
Show file tree
Hide file tree
Showing 13 changed files with 167 additions and 53 deletions.
23 changes: 23 additions & 0 deletions resources/buttons.json
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,29 @@
"path": "resources/images/buttons/relationship_list_arrow_r_unavailable.png"
}
}
},
"#general_info_tab_button":
{
"prototype": "#image_button",
"images":
{
"normal_image":
{
"path": "resources/images/buttons/general_info.png"
},
"hovered_image":
{
"path": "resources/images/buttons/general_info_hover.png"
},
"selected_image":
{
"path": "resources/images/buttons/general_info_hover.png"
},
"disabled_image":
{
"path": "resources/images/buttons/general_info_selected.png"
}
}
}
}

Expand Down
Binary file added resources/images/buttons/general_info.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 added resources/images/buttons/general_info_hover.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 added resources/images/buttons/general_info_selected.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion scripts/cat/sprites.py
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ def load_scars(self):
'MAO', 'LUNA', 'CHESTSPECK', 'WINGS', 'PAINTED', 'HEARTTWO', 'WOODPECKER']):
sprites.make_group('whitepatches', (a, 5), f'white{i}')
# acorn's woodpecker, boots, miss, cow and cow2
for a, i in enumerate(['BOOTS', 'MISS', 'COW', 'COWTWO']):
for a, i in enumerate(['BOOTS', 'MISS', 'COW', 'COWTWO', 'BUB']):
sprites.make_group('whitepatches', (a, 6), 'white' + i)

# single (solid)
Expand Down
2 changes: 1 addition & 1 deletion scripts/global_vars.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ def sort_bidict(d: bidict, first_element=None):
"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"})
"COWTWO": "Cow 2", "BUB": "Bub"})
white_patches = sort_bidict(white_patches, None)

points = bidict({None: 'None', 'COLOURPOINT': 'Colorpoint', 'RAGDOLL': 'Ragdoll', 'SEPIAPOINT': 'Sepiapoint', 'MINKPOINT': 'Minkpoint',
Expand Down
3 changes: 2 additions & 1 deletion scripts/screens/all_screens.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from .base_screens import Screens
from scripts.screens.organization_screens import StartScreen
from scripts.screens.creation_screen import CreationScreen
from scripts.screens.creation_screen import CreationScreen, MoreDetailScreen


# ---------------------------------------------------------------------------- #
Expand Down Expand Up @@ -37,3 +37,4 @@
# ---------------------------------------------------------------------------- #

creation_screen = CreationScreen('creation screen')
export_prepare_screen = MoreDetailScreen('detail screen')
186 changes: 138 additions & 48 deletions scripts/screens/creation_screen.py

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions scripts/utility.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def update_sprite(cat):


def generate_sprite(cat, life_state=None, scars_hidden=False, acc_hidden=False, always_living=False,
no_not_working=False) -> pygame.Surface:
no_not_working=False, no_para=False) -> pygame.Surface:
"""Generates the sprite for a cat, with optional arugments that will override certain things.
life_stage: sets the age life_stage of the cat, overriding the one set by it's age. Set to string.
scar_hidden: If True, doesn't display the cat's scars. If False, display cat scars.
Expand Down Expand Up @@ -43,7 +43,7 @@ def generate_sprite(cat, life_state=None, scars_hidden=False, acc_hidden=False,
cat_sprite = str(19)
else:
cat_sprite = str(18)
elif cat.pelt.paralyzed and age != 'newborn':
elif cat.pelt.paralyzed and age != 'newborn' and not no_para:
if age in ['kitten', 'adolescent']:
cat_sprite = str(17)
else:
Expand Down
Binary file modified sprites/marbledcolours.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/tabbycolours.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/tortiepatchesmasks.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/whitepatches.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 dce485b

Please sign in to comment.