Revert "Simplefied: mannequin drawing and unified tag naming."

This reverts commit 56544ef4.

Mods/Core/Mechanics/Person_Extensions/person_class_extensions.rpy

@@ -816,7 +816,7 @@ init -1 python:
         else:
             final_image = Flatten(self.build_person_displayable(position, emotion, special_modifier, lighting, background_fill))
 
-        renpy.show(self.name + self.last_name,at_list=[character_placement, scale_person(self.height)],layer="Active",what=final_image,tag=self.name + self.last_name)
+        renpy.show(self.name + self.last_name + "_anim",at_list=[character_placement, scale_person(self.height)],layer="Active",what=final_image,tag=self.name + self.last_name +"_anim")
 
     # replace the default draw_person function of the person class
     Person.draw_person = draw_person_enhanced

Mods/Screens/Outfit_Screens/mannequin.rpy

@@ -8,11 +8,20 @@ init 2 python:
         if emotion is None:
             emotion = mannequin.get_emotion()
 
-        mannequin.apply_outfit(outfit)
+        if not persistent.vren_animation:
+            background_fill = None
 
-        final_image = Flatten(mannequin.build_person_displayable(position, emotion,special_modifier, [0.98,0.98,0.98], None, no_frame = True))
+        lighting = [0.98,0.98,0.98]
 
-        renpy.show(mannequin.name + mannequin.last_name,at_list=[character_right, scale_person(mannequin.height)],layer="Active",what=final_image,tag=mannequin.name + mannequin.last_name)
+        draw_outfit = outfit.get_copy()
+        if mannequin.base_outfit:
+            draw_outfit = outfit.merge_outfit(mannequin.base_outfit)
+
+        mannequin.apply_outfit(draw_outfit)
+
+        final_image = Flatten(mannequin.build_person_displayable(position, emotion,special_modifier, lighting, background_fill))
+
+        renpy.show(mannequin.name,at_list=[character_right, scale_person(mannequin.height)],layer="Active",what=final_image,tag=mannequin.name)
         renpy.restart_interaction()       
 
 init 2: # Moved to screen so that it can be refreshed upon changes made in outfit_creator