diff --git a/pysollib/app.py b/pysollib/app.py index 083a4e51..8c84b27d 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -696,6 +696,7 @@ class Application: color=color, images=self.progress_images) images = Images(self.dataloader, cs) + images.cardset_bottoms = self.opt.use_cardset_bottoms try: if not images.load(app=self, progress=progress): raise Exception("Invalid or damaged cardset") diff --git a/pysollib/images.py b/pysollib/images.py index 2913ef28..33f126a5 100644 --- a/pysollib/images.py +++ b/pysollib/images.py @@ -73,6 +73,8 @@ class Images: self._highlight_index = 0 # self._highlighted_images = {} # key: (suit, rank) + self.cardset_bottoms = False + def destruct(self): pass @@ -109,7 +111,8 @@ class Images: imagedir = self.d.findDir(cs_type, d) except Exception: pass - if (not USE_PIL and TOOLKIT != 'kivy') or imagedir is None: + if ((not USE_PIL and TOOLKIT != 'kivy') or self.cardset_bottoms + or imagedir is None): # load image img = self.__loadCard(filename+self.cs.ext, check_w, check_h) return img diff --git a/pysollib/options.py b/pysollib/options.py index 6c43bfe8..00d22796 100644 --- a/pysollib/options.py +++ b/pysollib/options.py @@ -112,6 +112,7 @@ mouse_type = string mouse_undo = boolean negative_bottom = boolean randomize_place = boolean +use_cardset_bottoms = boolean dragcursor = boolean save_games_geometry = boolean game_geometry = int_list(min=2, max=2) @@ -260,6 +261,7 @@ class Options: ('mouse_undo', 'bool'), ('negative_bottom', 'bool'), ('randomize_place', 'bool'), + ('use_cardset_bottoms', 'bool'), # ('save_cardsets', 'bool'), ('dragcursor', 'bool'), ('save_games_geometry', 'bool'), @@ -441,6 +443,7 @@ class Options: self.offsets = {} # cards offsets # self.randomize_place = False + self.use_cardset_bottoms = False # self.save_cardsets = True self.dragcursor = True #