From 6860614062a8a2ce1ea89ac8472736156de5a04f Mon Sep 17 00:00:00 2001 From: Gouvernathor <44340603+Gouvernathor@users.noreply.github.com> Date: Thu, 16 Nov 2023 17:53:29 +0100 Subject: [PATCH] Use the correct operator(s) for None (cherry picked from commit 837d6b378e02b1a17b1154bf104d52cb5c21a2f3) --- game/scripts/characters/astoria/common.rpy | 2 +- game/scripts/characters/astoria/summon.rpy | 2 +- game/scripts/characters/cho/common.rpy | 2 +- .../characters/cho/events/favors/suck_it.rpy | 6 ++-- game/scripts/characters/genie/common.rpy | 8 ++--- game/scripts/characters/hermione/chibi.rpy | 2 +- game/scripts/characters/hermione/common.rpy | 2 +- game/scripts/characters/hermione/summon.rpy | 4 +-- game/scripts/characters/hooch/common.rpy | 2 +- game/scripts/characters/luna/common.rpy | 2 +- game/scripts/characters/luna/summon.rpy | 2 +- game/scripts/characters/snape/common.rpy | 8 ++--- game/scripts/characters/susan/common.rpy | 2 +- game/scripts/characters/tonks/chibi.rpy | 4 +-- game/scripts/characters/tonks/common.rpy | 2 +- game/scripts/characters/tonks/summon.rpy | 2 +- game/scripts/events/labels.rpy | 2 +- game/scripts/interface/achievements.rpy | 6 ++-- game/scripts/interface/book.rpy | 4 +-- game/scripts/interface/brewing.rpy | 4 +-- game/scripts/interface/inventory.rpy | 6 ++-- game/scripts/inventory/potions/_potions_.txt | 4 +-- .../minigames/cardgame/__card_game_init__.rpy | 34 +++++++++---------- .../minigames/cardgame/_card_game_.rpy | 10 +++--- game/scripts/minigames/mirror/menu.rpy | 4 +-- game/scripts/shops/item/menu.rpy | 2 +- game/scripts/wardrobe/wardrobe.rpy | 2 +- 27 files changed, 65 insertions(+), 65 deletions(-) diff --git a/game/scripts/characters/astoria/common.rpy b/game/scripts/characters/astoria/common.rpy index 7165e474..1a2191d3 100644 --- a/game/scripts/characters/astoria/common.rpy +++ b/game/scripts/characters/astoria/common.rpy @@ -76,7 +76,7 @@ init python: astoria.animation = animation redraw = True - if flip != None: + if flip is not None: astoria.xzoom = -1 if flip else 1 redraw = True diff --git a/game/scripts/characters/astoria/summon.rpy b/game/scripts/characters/astoria/summon.rpy index e3dd1419..791e87b9 100644 --- a/game/scripts/characters/astoria/summon.rpy +++ b/game/scripts/characters/astoria/summon.rpy @@ -255,7 +255,7 @@ label astoria_talk: label astoria_favor_menu: menu: - # "-Level Up-" (icon="interface/icons/small/levelup.webp") if ast_level_up != None: + # "-Level Up-" (icon="interface/icons/small/levelup.webp") if ast_level_up is not None: # call luna_level_up(tier=ast_level_up) # jump luna_favor_menu diff --git a/game/scripts/characters/cho/common.rpy b/game/scripts/characters/cho/common.rpy index a77e10a9..5c1b8183 100644 --- a/game/scripts/characters/cho/common.rpy +++ b/game/scripts/characters/cho/common.rpy @@ -74,7 +74,7 @@ init python in character: renpy.store.cho.animation = animation redraw = True - if flip != None: + if flip is not None: renpy.store.cho.xzoom = -1 if flip else 1 redraw = True diff --git a/game/scripts/characters/cho/events/favors/suck_it.rpy b/game/scripts/characters/cho/events/favors/suck_it.rpy index 17a52861..7f5f1ef5 100644 --- a/game/scripts/characters/cho/events/favors/suck_it.rpy +++ b/game/scripts/characters/cho/events/favors/suck_it.rpy @@ -35,7 +35,7 @@ label cc_pf_blowjob_T3_intro_E1: call cc_pf_blowjob - if states.cho.ev.suck_it.variant == None: + if states.cho.ev.suck_it.variant is None: gen "[name_cho_genie], ready to reward your coach for a job well done?" ("base", xpos="far_left", ypos="head") cho "Of course... A deal's a deal." ("open", "narrow", "base", "mid") gen "Great, in that case I think a blowjob is in order!" ("base", xpos="far_left", ypos="head") @@ -285,7 +285,7 @@ label cc_pf_blowjob_1: gen "That's not what we agreed on." gen "Get those lips on there..." - if states.cho.ev.suck_it.variant == None: + if states.cho.ev.suck_it.variant is None: $ camera.set_image("up_wide") else: $ camera.set_image("up_worried") @@ -373,7 +373,7 @@ label cc_pf_blowjob_1: "-Take it slow...-": #Cho strokes and licks genie then goes back to stroking until climax gen "Okay... Just keep stroking it for now..." - if states.cho.ev.suck_it.variant == None: + if states.cho.ev.suck_it.variant is None: $ camera.set_imagepath("cho_bj/hj/") $ camera.set_image("up_wide") cho "Oh... Okay, I can do that..." diff --git a/game/scripts/characters/genie/common.rpy b/game/scripts/characters/genie/common.rpy index 87680323..d49fca14 100644 --- a/game/scripts/characters/genie/common.rpy +++ b/game/scripts/characters/genie/common.rpy @@ -9,9 +9,9 @@ init python: side = None #showing = renpy.showing(name=tag, layer=layer) - if xpos != None or ypos != None: - xpos = states.gen.image.xpos if xpos == None else sprite_pos.get("x").get(xpos, xpos) - ypos = states.gen.image.ypos if ypos == None else sprite_pos.get("y").get(ypos, ypos) + if xpos is not None or ypos is not None: + xpos = states.gen.image.xpos if xpos is None else sprite_pos.get("x").get(xpos, xpos) + ypos = states.gen.image.ypos if ypos is None else sprite_pos.get("y").get(ypos, ypos) states.gen.image.xpos = xpos states.gen.image.ypos = ypos @@ -36,7 +36,7 @@ init python: if renpy.showing("genie", layer=layer): renpy.show(variant, layer=layer, tag="genie", at_list=at_list) - if flip != None: + if flip is not None: states.gen.image.xzoom = -1 if flip else 1 if what: diff --git a/game/scripts/characters/hermione/chibi.rpy b/game/scripts/characters/hermione/chibi.rpy index e334d82c..c2396c72 100644 --- a/game/scripts/characters/hermione/chibi.rpy +++ b/game/scripts/characters/hermione/chibi.rpy @@ -147,7 +147,7 @@ init python: # Sets up a chibi scene with Hermione and Genie in it label her_chibi_scene(action="reset", xpos="mid", ypos="base", trans=None): - if trans != None: + if trans is not None: call hide_characters hide screen bld1 diff --git a/game/scripts/characters/hermione/common.rpy b/game/scripts/characters/hermione/common.rpy index 0e0b2050..24f9ae13 100644 --- a/game/scripts/characters/hermione/common.rpy +++ b/game/scripts/characters/hermione/common.rpy @@ -69,7 +69,7 @@ init python: hermione.animation = animation redraw = True - if flip != None: + if flip is not None: hermione.xzoom = -1 if flip else 1 redraw = True diff --git a/game/scripts/characters/hermione/summon.rpy b/game/scripts/characters/hermione/summon.rpy index 9fc61642..342223f7 100644 --- a/game/scripts/characters/hermione/summon.rpy +++ b/game/scripts/characters/hermione/summon.rpy @@ -151,11 +151,11 @@ label hermione_favor_menu: label .skip_points_check: - if her_level_up != None: + if her_level_up is not None: call tutorial("milestones") menu: - "-Level Up-" (icon="interface/icons/small/levelup.webp") if her_level_up != None: + "-Level Up-" (icon="interface/icons/small/levelup.webp") if her_level_up is not None: call hermione_level_up(tier=her_level_up) jump hermione_favor_menu diff --git a/game/scripts/characters/hooch/common.rpy b/game/scripts/characters/hooch/common.rpy index 08c21fcf..4deedae3 100644 --- a/game/scripts/characters/hooch/common.rpy +++ b/game/scripts/characters/hooch/common.rpy @@ -60,7 +60,7 @@ init python: hooch.animation = animation redraw = True - if flip != None: + if flip is not None: hooch.xzoom = -1 if flip else 1 redraw = True diff --git a/game/scripts/characters/luna/common.rpy b/game/scripts/characters/luna/common.rpy index f4ddc843..3084c3d1 100644 --- a/game/scripts/characters/luna/common.rpy +++ b/game/scripts/characters/luna/common.rpy @@ -72,7 +72,7 @@ init python: luna.animation = animation redraw = True - if flip != None: + if flip is not None: luna.xzoom = -1 if flip else 1 redraw = True diff --git a/game/scripts/characters/luna/summon.rpy b/game/scripts/characters/luna/summon.rpy index 16a31fcc..35b67ddc 100644 --- a/game/scripts/characters/luna/summon.rpy +++ b/game/scripts/characters/luna/summon.rpy @@ -125,7 +125,7 @@ label luna_level_up(tier=None): # Luna Favor Menu label luna_favor_menu: menu: - "-Level Up-" (icon="interface/icons/small/levelup.webp") if lun_level_up != None: + "-Level Up-" (icon="interface/icons/small/levelup.webp") if lun_level_up is not None: call luna_level_up(tier=lun_level_up) jump luna_favor_menu diff --git a/game/scripts/characters/snape/common.rpy b/game/scripts/characters/snape/common.rpy index 6c5a9d80..f1033751 100644 --- a/game/scripts/characters/snape/common.rpy +++ b/game/scripts/characters/snape/common.rpy @@ -11,9 +11,9 @@ init python: layer = "screens" #showing = renpy.showing(name=tag, layer=layer) - if xpos != None or ypos != None: - xpos = states.sna.image.xpos if xpos == None else sprite_pos.get("x").get(xpos, xpos) - ypos = states.sna.image.ypos if ypos == None else sprite_pos.get("y").get(ypos, ypos) + if xpos is not None or ypos is not None: + xpos = states.sna.image.xpos if xpos is None else sprite_pos.get("x").get(xpos, xpos) + ypos = states.sna.image.ypos if ypos is None else sprite_pos.get("y").get(ypos, ypos) states.sna.image.xpos = xpos states.sna.image.ypos = ypos redraw = True @@ -38,7 +38,7 @@ init python: states.sna.image.animation = animation redraw = True - if flip != None: + if flip is not None: states.sna.image.xzoom = -1 if flip else 1 redraw = True diff --git a/game/scripts/characters/susan/common.rpy b/game/scripts/characters/susan/common.rpy index 0cec9062..2782cc8a 100644 --- a/game/scripts/characters/susan/common.rpy +++ b/game/scripts/characters/susan/common.rpy @@ -71,7 +71,7 @@ init python: susan.animation = animation redraw = True - if flip != None: + if flip is not None: susan.xzoom = -1 if flip else 1 redraw = True diff --git a/game/scripts/characters/tonks/chibi.rpy b/game/scripts/characters/tonks/chibi.rpy index fea8257a..e86c9a66 100644 --- a/game/scripts/characters/tonks/chibi.rpy +++ b/game/scripts/characters/tonks/chibi.rpy @@ -65,7 +65,7 @@ label ton_sit(xpos=nxpos, ypos=nypos, flip=None, chair=True): # TODO: replace th xpos = nxpos ypos = nypos - if flip != None: + if flip is not None: tonks.xzoom = -1 if flip else 1 show screen tonks_sit_ani(nxpos, nypos, chair) @@ -147,7 +147,7 @@ init python: # Sets up a chibi scene with Tonks and Genie in it label ton_chibi_scene(action="reset", xpos="mid", ypos="base", trans=None): - if trans != None: + if trans is not None: call hide_characters if trans: # Not sure if this part is needed, depends on context? diff --git a/game/scripts/characters/tonks/common.rpy b/game/scripts/characters/tonks/common.rpy index 92e6c766..f28c2f16 100644 --- a/game/scripts/characters/tonks/common.rpy +++ b/game/scripts/characters/tonks/common.rpy @@ -91,7 +91,7 @@ init python: tonks.animation = animation redraw = True - if flip != None: + if flip is not None: tonks.xzoom = -1 if flip else 1 redraw = True diff --git a/game/scripts/characters/tonks/summon.rpy b/game/scripts/characters/tonks/summon.rpy index 5dde409b..965745e1 100644 --- a/game/scripts/characters/tonks/summon.rpy +++ b/game/scripts/characters/tonks/summon.rpy @@ -109,7 +109,7 @@ label tonks_favor_menu: # call update_tonks_favors menu: - "-Level Up-" (icon="interface/icons/small/levelup.webp") if ton_level_up != None: + "-Level Up-" (icon="interface/icons/small/levelup.webp") if ton_level_up is not None: call tonks_level_up(tier=ton_level_up) jump tonks_requests diff --git a/game/scripts/events/labels.rpy b/game/scripts/events/labels.rpy index 41bc04c1..885bb60a 100644 --- a/game/scripts/events/labels.rpy +++ b/game/scripts/events/labels.rpy @@ -148,7 +148,7 @@ label teleport(position=None,effect=True,poof_label=None): #stop music fadeout 1 hide screen heal_animation - if poof_label != None: + if poof_label is not None: $ renpy.call(poof_label) show screen teleport_animation with d5 diff --git a/game/scripts/interface/achievements.rpy b/game/scripts/interface/achievements.rpy index 3c5678b3..35c5b5ee 100644 --- a/game/scripts/interface/achievements.rpy +++ b/game/scripts/interface/achievements.rpy @@ -39,7 +39,7 @@ define achievements_dict = { } init python: - if persistent.achievements == None: + if persistent.achievements is None: persistent.achievements = achievements_dict.copy() class Achievements(object): @@ -221,7 +221,7 @@ label achievement_menu(xx=150, yy=90): elif __choice == "dec": current_page += -1 elif __choice == "filter": - if current_filter == None: + if current_filter is None: current_filter = "Locked" elif current_filter == "Locked": current_filter = "Unlocked" @@ -294,7 +294,7 @@ screen achievement_menu(xx, yy): vbox: style_prefix gui.theme('achievements_filters') pos (6, 384) - if current_filter == None: + if current_filter is None: textbutton "Show: All" action Return("filter") else: textbutton "Show: [current_filter]" action Return("filter") diff --git a/game/scripts/interface/book.rpy b/game/scripts/interface/book.rpy index 3344f17f..3954267d 100644 --- a/game/scripts/interface/book.rpy +++ b/game/scripts/interface/book.rpy @@ -125,9 +125,9 @@ screen book_menu(page, pages, title, page_title, page_text, page_overflow): xpos 600 ypos 130 xsize 250 ysize 300 - if page_title[1] != None: + if page_title[1] is not None: text page_title[1] ypos -20 size 16 xalign 0.5 - if page_text[1] != None: + if page_text[1] is not None: text page_text[1] size 12 ypos 40 text "{b}"+str(page+2)+"{/b}" xalign 0.5 ypos 350 size 11 diff --git a/game/scripts/interface/brewing.rpy b/game/scripts/interface/brewing.rpy index 0c5a6ce9..10366130 100644 --- a/game/scripts/interface/brewing.rpy +++ b/game/scripts/interface/brewing.rpy @@ -38,7 +38,7 @@ label brewing_menu(xx=150, yy=90): elif __choice == "filter": if current_filter == "Unlocked": $ current_filter = None - elif current_filter == None: + elif current_filter is None: $ current_filter = "Unlocked" $ menu_items = brewing_sortfilter(inventory.get_instances_of_type("potion"), current_sorting, current_filter) @@ -137,7 +137,7 @@ screen brewing_menu(xx, yy): style_prefix gui.theme('achievements_filters') pos (6, 384) - if current_filter == None: + if current_filter is None: textbutton "Show: All" action Return("filter") else: textbutton "Show: [current_filter]" action Return("filter") diff --git a/game/scripts/interface/inventory.rpy b/game/scripts/interface/inventory.rpy index 895915c3..3f6651a0 100644 --- a/game/scripts/interface/inventory.rpy +++ b/game/scripts/interface/inventory.rpy @@ -106,7 +106,7 @@ label inventory_menu(xx=150, yy=90): elif __choice == "filter": python: - if current_filter == None: + if current_filter is None: current_filter = "Owned" else: current_filter = None @@ -276,7 +276,7 @@ screen inventory_menu(xx, yy): vbox: style_prefix gui.theme('achievements_filters') pos (6, 384) - if current_filter == None: + if current_filter is None: textbutton "Show: All" action Return("filter") else: textbutton "Show: [current_filter]" action Return("filter") @@ -337,7 +337,7 @@ screen inventory_menuitem(xx, yy): pos (24+58*(col), 113+58*(row)) add gui.format("interface/achievements/{}/iconbox.webp") - if not current_item == None and current_item.id == menu_items[i].id: + if current_item is not None and current_item.id == menu_items[i].id: add "interface/achievements/glow.webp" align (0.5, 0.5) zoom 0.105 alpha 0.7 at rotate_circular add crop_image_zoom(menu_items[i].get_image(), 42, 42, menu_items[i].owned <= 0) align (0.5, 0.5) diff --git a/game/scripts/inventory/potions/_potions_.txt b/game/scripts/inventory/potions/_potions_.txt index 6b5ebffc..055b1763 100644 --- a/game/scripts/inventory/potions/_potions_.txt +++ b/game/scripts/inventory/potions/_potions_.txt @@ -402,7 +402,7 @@ init -1 python: def get_playables(self): requests = [] for item in self.lib: - if hasattr(item, 'start_label') and item.start_label != None: + if hasattr(item, 'start_label') and item.start_label is not None: requests.append(item) return requests @@ -430,7 +430,7 @@ init -1 python: global p_inv, potion_lib if isinstance(potion, Potion): potion = potion.id - if potion_lib.get_id_by_name(potion) != None: + if potion_lib.get_id_by_name(potion) is not None: potion = potion_lib.get_id_by_name(potion) if potion_lib.is_valid_id(potion): if potion in p_inv.keys(): diff --git a/game/scripts/minigames/cardgame/__card_game_init__.rpy b/game/scripts/minigames/cardgame/__card_game_init__.rpy index 9cb522fb..11d1522f 100644 --- a/game/scripts/minigames/cardgame/__card_game_init__.rpy +++ b/game/scripts/minigames/cardgame/__card_game_init__.rpy @@ -683,34 +683,34 @@ init python: take_over = lambda a, b : a > b - if not y == 0 and not table_cards[x][y-1] == None and take_over(table_cards[x][y].topvalue, table_cards[x][y-1].bottomvalue): + if not y == 0 and table_cards[x][y-1] is not None and take_over(table_cards[x][y].topvalue, table_cards[x][y-1].bottomvalue): table_cards[x][y-1].playercard = table_cards[x][y].playercard - if not y == 2 and not table_cards[x][y+1] == None and take_over(table_cards[x][y].bottomvalue, table_cards[x][y+1].topvalue): + if not y == 2 and table_cards[x][y+1] is not None and take_over(table_cards[x][y].bottomvalue, table_cards[x][y+1].topvalue): table_cards[x][y+1].playercard = table_cards[x][y].playercard - if not x == 0 and not table_cards[x-1][y] == None and take_over(table_cards[x][y].leftvalue, table_cards[x-1][y].rightvalue): + if not x == 0 and table_cards[x-1][y] is not None and take_over(table_cards[x][y].leftvalue, table_cards[x-1][y].rightvalue): table_cards[x-1][y].playercard = table_cards[x][y].playercard - if not x == 2 and not table_cards[x+1][y] == None and take_over(table_cards[x][y].rightvalue, table_cards[x+1][y].leftvalue): + if not x == 2 and table_cards[x+1][y] is not None and take_over(table_cards[x][y].rightvalue, table_cards[x+1][y].leftvalue): table_cards[x+1][y].playercard = table_cards[x][y].playercard if dobelt_number: dobelt_found = [] - if not y == 0 and not table_cards[x][y-1] == None: + if not y == 0 and table_cards[x][y-1] is not None: if table_cards[x][y].topvalue == table_cards[x][y-1].bottomvalue: dobelt_found.append([x,y-1]) - if not y == 2 and not table_cards[x][y+1] == None: + if not y == 2 and table_cards[x][y+1] is not None: if table_cards[x][y].bottomvalue == table_cards[x][y+1].topvalue: dobelt_found.append([x,y+1]) - if not x == 0 and not table_cards[x-1][y] == None: + if not x == 0 and table_cards[x-1][y] is not None: if table_cards[x][y].leftvalue == table_cards[x-1][y].rightvalue: dobelt_found.append([x-1,y]) - if not x == 2 and not table_cards[x+1][y] == None: + if not x == 2 and table_cards[x+1][y] is not None: if table_cards[x][y].rightvalue == table_cards[x+1][y].leftvalue: dobelt_found.append([x+1,y]) @@ -786,8 +786,8 @@ init python: for y in range(0,3): for x in range(0,3): score = 0 - if table_cards[x][y] == None: - if not y == 0 and not table_cards[x][y-1] == None and table_cards[x][y-1].playercard: + if table_cards[x][y] is None: + if not y == 0 and table_cards[x][y-1] is not None and table_cards[x][y-1].playercard: if take_over(self.topvalue, table_cards[x][y-1].bottomvalue): score += getcardscore else: @@ -795,7 +795,7 @@ init python: else: score += wallscore - if not y == 2 and not table_cards[x][y+1] == None and table_cards[x][y+1].playercard: + if not y == 2 and table_cards[x][y+1] is not None and table_cards[x][y+1].playercard: if take_over(self.bottomvalue, table_cards[x][y+1].topvalue): score += getcardscore else: @@ -803,7 +803,7 @@ init python: else: score += wallscore - if not x == 0 and not table_cards[x-1][y] == None and table_cards[x-1][y].playercard: + if not x == 0 and table_cards[x-1][y] is not None and table_cards[x-1][y].playercard: if take_over(self.leftvalue, table_cards[x-1][y].rightvalue): score += getcardscore else: @@ -811,7 +811,7 @@ init python: else: score += wallscore - if not x == 2 and not table_cards[x+1][y] == None and table_cards[x+1][y].playercard: + if not x == 2 and table_cards[x+1][y] is not None and table_cards[x+1][y].playercard: if take_over(self.rightvalue, table_cards[x+1][y].leftvalue): score += getcardscore else: @@ -821,20 +821,20 @@ init python: if dobelt_number: dobelt_found = [] - if not y == 0 and not table_cards[x][y-1] == None: + if not y == 0 and table_cards[x][y-1] is not None: if self.topvalue == table_cards[x][y-1].bottomvalue: dobelt_found.append(table_cards[x][y-1]) - if not y == 2 and not table_cards[x][y+1] == None: + if not y == 2 and table_cards[x][y+1] is not None: if self.bottomvalue == table_cards[x][y+1].topvalue: dobelt_found.append(table_cards[x][y+1]) - if not x == 0 and not table_cards[x-1][y] == None: + if not x == 0 and table_cards[x-1][y] is not None: if self.leftvalue == table_cards[x-1][y].rightvalue: dobelt_found.append(table_cards[x-1][y]) - if not x == 2 and not table_cards[x+1][y] == None: + if not x == 2 and table_cards[x+1][y] is not None: if self.rightvalue == table_cards[x+1][y].leftvalue: dobelt_found.append(table_cards[x+1][y]) diff --git a/game/scripts/minigames/cardgame/_card_game_.rpy b/game/scripts/minigames/cardgame/_card_game_.rpy index d21c58b6..e1b24af0 100644 --- a/game/scripts/minigames/cardgame/_card_game_.rpy +++ b/game/scripts/minigames/cardgame/_card_game_.rpy @@ -3,9 +3,9 @@ init python: def start_duel(opppent_deck, after_enemy = None, rules = None, duel_player_deck = None): global standard_rules global playerdeck - if rules == None: + if rules is None: rules = standard_rules - if duel_player_deck == None: + if duel_player_deck is None: duel_player_deck = playerdeck backside_list = [] @@ -45,7 +45,7 @@ init python: response_card = "" while not(response_card == "win" or response_card == "loss"): response_card = cardgame(enemy_deck, player_deck, backside_list, rules[2], rules[3]) - if response_card == "AfterEnemy" and not after_enemy == None: + if response_card == "AfterEnemy" and after_enemy is not None: after_enemy() elif response_card == "Close": return "Close" @@ -246,7 +246,7 @@ screen card_battle(l_playerdeck, l_enemydeck, shown_cards): for y in range(0,3): for x in range(0,3): - if table_cards[x][y] == None: + if table_cards[x][y] is None: hotspot (353+124*x, 25+184*y, 125, 182) clicked Return(str(x+y*3)) else: use cardrender(table_cards[x][y], 353+124*x, 25+184*y, cardzoom=0.375, animated=True) @@ -283,7 +283,7 @@ transform cardrender(pos, zoom): screen cardrender(card, xpos_card, ypos_card, interact=False, return_value=None, cardzoom=0.5, color=None, backside=False, animated=False): zorder 14 - if return_value == None: + if return_value is None: $ return_value = card $ img = card.get_image(backside=backside) diff --git a/game/scripts/minigames/mirror/menu.rpy b/game/scripts/minigames/mirror/menu.rpy index 35fcf619..f90d1ce2 100644 --- a/game/scripts/minigames/mirror/menu.rpy +++ b/game/scripts/minigames/mirror/menu.rpy @@ -54,7 +54,7 @@ label mirror_menu(xx=150, yy=90): elif __choice == "filter": if current_filter == "Unlocked": $ current_filter = None - elif current_filter == None: + elif current_filter is None: $ current_filter = "Unlocked" $ menu_items = mirror_sortfilter(mirror.get_instances_of_tag(current_category), current_sorting, current_filter) @@ -124,7 +124,7 @@ screen mirror_menu(xx, yy): style_prefix gui.theme('achievements_filters') pos (6, 384) - if current_filter == None: + if current_filter is None: textbutton "Show: All" action Return("filter") else: textbutton "Show: [current_filter]" action Return("filter") diff --git a/game/scripts/shops/item/menu.rpy b/game/scripts/shops/item/menu.rpy index 8cc8759d..252fc388 100644 --- a/game/scripts/shops/item/menu.rpy +++ b/game/scripts/shops/item/menu.rpy @@ -207,7 +207,7 @@ screen shop_item_menuitem(xx, yy): pos (24+58*(col), 113+58*(row)) add gui.format("interface/achievements/{}/iconbox.webp") - if not current_item == None and current_item.id == menu_items[i].id: + if not current_item is None and current_item.id == menu_items[i].id: add "interface/achievements/glow.webp" align (0.5, 0.5) zoom 0.105 alpha 0.7 at rotate_circular add crop_image_zoom( diff --git a/game/scripts/wardrobe/wardrobe.rpy b/game/scripts/wardrobe/wardrobe.rpy index bc5b0044..c1e4db2a 100644 --- a/game/scripts/wardrobe/wardrobe.rpy +++ b/game/scripts/wardrobe/wardrobe.rpy @@ -224,7 +224,7 @@ screen wardrobe(xx, yy): use wardrobe_menu(xx, yy) if current_category == "outfits": use wardrobe_outfit_menuitem(20, 50) - elif current_subcategory != None: + elif current_subcategory is not None: use wardrobe_menuitem(20, 50) label wardrobe_menu():