Bug fixes

* Fixed animations (again)
* Added unstaged butt plug files
* Updated save compatibility

game/scripts/characters/astoria/events/clothing.rpy

@@ -7,7 +7,7 @@ label astoria_summon_setup:
     # Reset doll state
     $ astoria.wear("all")
     $ astoria.set_cum(None)
-    $ astoria.animation = []
+    $ astoria.animation = None
 
     if astoria_outfits_schedule:
         $ astoria.equip_random_outfit()

game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy

@@ -130,7 +130,7 @@ label gryffindor_match:
 
     $ cho.equip(cho_outfit_quidditch)
     $ cho.set_pose("broom")
-    $ cho.animation = [sprite_fly_idle]
+    $ cho.animation = sprite_fly_idle
 
     $ snape_chibi.zorder = 4
     $ tonks_chibi.zorder = 3
@@ -629,7 +629,7 @@ label gryffindor_match:
     sna "..." ("snape_25") #Oh shit... face
     ton "What did I tell you about calling me--" ("mad", "wide", "annoyed", "mid", xpos="far_right", ypos=200)
     gen "I'm trying to watch the game here..." ("base", xpos="far_left", ypos="head")
-    $ tonks.animation = []
+    $ tonks.animation = None
     $ tonks.set_body_hue(0)
     with d9
     ton "He started it..." ("mad", "narrow", "annoyed", "mid", ypos="head")
@@ -965,7 +965,7 @@ label gryffindor_match:
      # Transition to Cho on her broom
     $ cho.equip(cho_outfit_quidditch_gryffindor)
     $ cho.set_pose("broom")
-    $ cho.animation = [sprite_fly_idle]
+    $ cho.animation = sprite_fly_idle
 
     call cho_chibi("fly", 1100, 140)
     call cho_walk(530, 360, speed=2)
@@ -1462,7 +1462,7 @@ label gryffindor_match_return:
     pause 1
 
     $ cho.set_pose(None)
-    $ cho.animation = []
+    $ cho.animation = None
     $ cho.strip("all")
 
     call play_music("stop")

game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy

@@ -941,7 +941,7 @@ label hufflepuff_match:
 
     # Transition to Cho on her broom
     $ cho.set_pose("broom")
-    $ cho.animation = [sprite_fly_idle]
+    $ cho.animation = sprite_fly_idle
 
     call cho_chibi("fly", 1100, 140)
     call cho_walk(530, 360, speed=2)
@@ -1005,7 +1005,7 @@ label hufflepuff_match:
 
     call cho_walk(1200, 500+180, speed=2)
     pause 2
-    $ cho.animation = []
+    $ cho.animation = None
     $ cho.set_pose(None)
     call cho_chibi("reset")
 

game/scripts/characters/cho/events/summon.rpy

@@ -5,7 +5,7 @@ label cho_summon_setup:
     # Reset doll state
     $ cho.wear("all")
     $ cho.set_cum(None)
-    $ cho.animation = []
+    $ cho.animation = None
 
     # Unlock favours at tier 3
     # this will probably move to a cho_quid_E# event once we've implemented Gryffindor lead-up events

game/scripts/characters/hermione/events/clothing.rpy

@@ -4,7 +4,7 @@ label hermione_summon_setup:
     # Reset doll state
     $ hermione.wear("all")
     $ hermione.set_cum(None)
-    $ hermione.animation = []
+    $ hermione.animation = None
 
     #
     # TODO: Remove obsolete variables and fix the code after clothes have been added.

game/scripts/characters/tonks/events/clothing.rpy

@@ -3,7 +3,7 @@ label tonks_summon_setup:
     # Reset doll state
     $ tonks.wear("all")
     $ tonks.set_cum(None)
-    $ tonks.animation = []
+    $ tonks.animation = None
 
     if not tonks_strip_happened and cc_pf_strip.is_event_complete(3, 3) and ton_friendship >= 20 and tonks.is_any_worn("top", "bottom", "bra", "panties"):
         $ tonks_strip_happened = True #TODO use to make event not repeat

game/scripts/characters/tonks/events/clothing_old.txt

@@ -9,7 +9,7 @@ label tonks_summon_setup:
     # Reset doll state
     $ tonks.wear("all")
     $ tonks.set_cum(None)
-    $ tonks.animation = []
+    $ tonks.animation = None
 
     $ random_number = renpy.random.randint(1, 20)
     if 5 > random_number > 0 and tonks.is_worn("top") and ton_friendship >= 50:

game/scripts/utility/updater.rpy

@@ -87,6 +87,20 @@ init python:
             her_buttplug_large1.set_imagepath()
             her_buttplug_large1.set_layers()
 
+            # Need to repeat the fix, because I am a donkey
+            for i in CHARACTERS:
+                char = get_character_object(i)
+
+                if isinstance(char.animation, list) and char.animation:
+                    char.animation = char.animation[0]
+                else:
+                    char.animation = None
+
+            if hasattr(store, "color_favorites"):
+                for i, col in enumerate(store.color_favorites):
+                    col = Color(tuple(col))
+                    store.colorpicker.favorites[i] = col
+
         if current > latest:
             raise Exception("Loaded save file is incompatible. (Save Version: {}, Game Version: {})".format(current, latest))