Merge pull request #465 from larswijn/crash-avoider

Attempt to avoid lovely crashes

Author: Jevonnissocoolman

lovely/lib_misc.toml

@@ -219,7 +219,7 @@ assembled_string = assembled_string..(type(subpart) == 'string' and subpart or f
 '''
 position = "at"
 payload = '''
-assembled_string = assembled_string..(type(subpart) == 'string' and subpart or Cryptid.pluralize(subpart[1], args.vars) or format_ui_value(args.vars[tonumber(subpart[1])]) or 'ERROR')
+assembled_string = assembled_string..(type(subpart) == 'string' and subpart or (Cryptid.pluralize and Cryptid.pluralize(subpart[1], args.vars)) or format_ui_value(args.vars[tonumber(subpart[1])]) or 'ERROR')
 '''
 match_indent = true
 

lovely/lib_ui.toml

@@ -27,7 +27,7 @@ target = '''=[SMODS _ "src/card_draw.lua"]'''
 pattern = "if self.sticker and G.shared_stickers[self.sticker] then"
 position = "before"
 payload = '''
-if not Cryptid.shared_gamesets then
+if not Cryptid.shared_gamesets and G.ASSET_ATLAS["cry_gameset"] then
     Cryptid.shared_gamesets = {
         modest = Sprite(0, 0, G.CARD_W, G.CARD_H, G.ASSET_ATLAS["cry_gameset"], {x = 0,y = 0}),
         mainline = Sprite(0, 0, G.CARD_W, G.CARD_H, G.ASSET_ATLAS["cry_gameset"], {x = 1,y = 0}),
@@ -59,7 +59,7 @@ match_indent = true
 target = '''=[SMODS _ "src/card_draw.lua"]'''
 pattern = "if self.debuff then"
 position = "at"
-payload = "if self.debuff or Cryptid.gameset(self) == 'disabled' or (self.config.center.gameset_config and self.config.center.gameset_config[Cryptid.gameset(self)] and self.config.center.gameset_config[Cryptid.gameset(self)].disabled) or (self.config.center.cry_disabled and not self.gameset_select) then"
+payload = "if self.debuff or (Cryptid.gameset and Cryptid.gameset(self) == 'disabled') or (self.config.center.gameset_config and self.config.center.gameset_config[Cryptid.gameset(self)] and self.config.center.gameset_config[Cryptid.gameset(self)].disabled) or (self.config.center.cry_disabled and not self.gameset_select) then"
 match_indent = true
 
 # Shine on Oversaturated to make it more noticable