Use the correct operator(s) for None

(cherry picked from commit 837d6b378e)

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
 

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
 

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
 

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..."

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:
+        if xpos is not None or ypos is not None:
-            xpos = states.gen.image.xpos if xpos == None else sprite_pos.get("x").get(xpos, xpos)
+            xpos = states.gen.image.xpos if xpos is 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)
+            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:

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

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
 

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
 

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
 

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
 

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
 

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:
+        if xpos is not None or ypos is not None:
-            xpos = states.sna.image.xpos if xpos == None else sprite_pos.get("x").get(xpos, xpos)
+            xpos = states.sna.image.xpos if xpos is 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)
+            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
 

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
 

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?

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
 

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
 

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

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")

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
 

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")