Merge pull request #362 from jaysoleson/LifeGen-dev

Bugs

Author: jaysoleson

scripts/clan.py

@@ -282,7 +282,7 @@ def create_clan(self):
         for cat_id in Cat.all_cats:
             the_cat = Cat.all_cats.get(cat_id)
             the_cat.init_all_relationships()
-            if the_cat != self.instructor:
+            if the_cat not in (self.instructor, self.demon):
                 the_cat.backstory = "clan_founder"
             if the_cat.status.rank == CatRank.APPRENTICE:
                 the_cat.rank_change(CatRank.APPRENTICE)
@@ -319,7 +319,7 @@ def create_clan(self):
             self.populate_sc()
             self.populate_ur()
             self.populate_df()
-        elif self.clan_age == "new":
+        else:
             self.generate_outsiders()
             self.generate_outsider_mates()
             self.generate_outsider_families()
@@ -545,11 +545,13 @@ def generate_outsiders(self):
         for i in range(randint(0,5)):
             outsider = create_new_cat(
                 Cat,
-                rank=choice([CatRank.LONER, CatRank.ROGUE]),
                 moons=randint(15, 120),
+                outside=True,
+                original_social=choice(
+                        (CatSocial.LONER, CatSocial.ROGUE, CatSocial.KITTYPET)
+                    ),
                 thought="Wanders around beyond the Clan's borders"
                 )[0]
-            outsider.history.beginning = None
 
     def generate_outsider_mates(self):
         """Generates up to three pairs of mates."""

scripts/screens/MakeClanScreen.py

@@ -63,12 +63,16 @@ class MakeClanScreen(Screens):
         "leader": pygame.image.load(
             "resources/images/pick_clan_screen/clan_light.png"
         ).convert_alpha(),
-    }
-    
-    your_name_img = pygame.transform.scale(pygame.image.load(
-        'resources/images/pick_clan_screen/your_name_screen.png').convert_alpha(), (800, 700))
-    your_name_img_dark = pygame.transform.scale(pygame.image.load(
-        'resources/images/pick_clan_screen/your_name_screen_dark.png').convert_alpha(), (800, 700))
+
+        "your_name": (
+            (pygame.image.load(
+            'resources/images/pick_clan_screen/your_name_screen.png'
+        ).convert_alpha())
+        if not game_setting_get("dark mode") else 
+            (pygame.image.load(
+                'resources/images/pick_clan_screen/your_name_screen_dark.png'
+            ).convert_alpha()))
+        }
     your_name_txt1 = pygame.transform.scale(pygame.image.load(
         'resources/images/pick_clan_screen/your_name_text_1.png').convert_alpha(), (796, 52))
     your_name_txt2 = pygame.transform.scale(pygame.image.load(
@@ -165,6 +169,10 @@ def screen_switches(self):
             self.ui_images["leader"],
             ui_scale_dimensions((800, 700)),
         )
+        self.name_cat_img = pygame.transform.scale(
+            self.ui_images["your_name"],
+            ui_scale_dimensions((800, 700)),
+        )
 
         # Reset variables
         self.game_mode = 'expanded'
@@ -804,7 +812,6 @@ def exit_screen(self):
 
     def on_use(self):
         super().on_use()
-
         # Don't allow someone to enter no name for their clan
         if self.sub_screen == "name clan":
             if self.elements["name_entry"].get_text() == "":
@@ -831,17 +838,8 @@ def on_use(self):
             else:
                 self.elements["error"].hide()
                 self.elements['next_step'].enable()
-            # BG IMAGE BLIT
-            if game_setting_get("dark mode"):
-                image = MakeClanScreen.your_name_img_dark
-            else:
-                image = MakeClanScreen.your_name_img
-            # self.elements['background'] = pygame_gui.elements.UIImage(
-            #     ui_scale(pygame.Rect((0, 0), (800, 700))),
-            #     image,
-            #     manager=MANAGER
-            #     )
-            screen.blit(image, (0,0))
+
+            screen.blit(self.name_cat_img, ui_scale_blit((0,0)))
         if self.sub_screen == "choose symbol":
             if (
                 len(switch_get_value(Switch.disallowed_symbol_tags))

scripts/screens/ProfileScreen.py

@@ -3839,6 +3839,8 @@ def validate_flirt(self, cat_to, cat_from):
         return True
 
     def validate_talk(self, cat_to, cat_from):
+        if cat_to.moons < 0:
+            return False
         if cat_to.dead:
             if not cat_from.dead:
                 if (