From c1b04f6ccd5792ff53b06c17d95f1ed8204292c9 Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Sat, 14 Jan 2023 23:04:54 +0000 Subject: [PATCH] IO Overhaul, Refactoring, and more * Refactored DollFace * Refactored DollBody * Refactored DollCum * Refactored DollCloth * Refactored Doll * Refactored clothing item zorders * Refactored implementation of body, face, cum, clothing layers * Refactored function calls * Removed DollLipstick * Added DollMakeup class, allowing adding dynamic clothes tracking face states * Added DollClothDynamic, allowing dynamic clothes tracking other cloth states with bangs support * Added cache to frequently called functions, drastically reducing the overhead * Added hash system, reducing clone redundancy * Added layer modifiers support for all types (face, body, cum, clothes etc.) * Added support for an arbitrary number of equipped multislot clothing items (makeup, tattoos, piercings, etc.) * Simplified initialization for clothing items and dolls * Simplified class function calls * Reduced the number of image creation calls * Added hue support for additional skin layers * Added displayable support to image cropping function * Replaced store cache with built-in functools cache for _list_files function * Refactored all character files * and more... --- game/characters/astoria/body/armfix.webp | 3 + .../astoria/body/armleft/on_hips_fix.webp | 3 - .../astoria/body/armright/on_hips_fix.webp | 3 - .../astoria/body/{base => }/front.webp | 0 .../on_hips.webp => larm_zorder_1.webp} | 0 .../normal.webp => nbreast_zorder_2.webp} | 0 .../on_hips.webp => rarm_zorder_1.webp} | 0 .../clothes/bottom/pants_1/armfix.webp | 3 + .../clothes/bottom/pants_1_short/armfix.webp | 3 + .../clothes/bottom/school_skirt_1/armfix.webp | 3 + .../clothes/bottom/school_skirt_2/armfix.webp | 3 + .../clothes/bottom/school_skirt_3/armfix.webp | 3 + .../clothes/bottom/school_skirt_4/armfix.webp | 3 + .../ann_takamaki/{ => default}/0.webp | 0 .../ann_takamaki/{ => default}/1.webp | 0 .../ann_takamaki/{ => default}/outline.webp | 0 .../lipstick/{angry.webp => angry/0.webp} | 0 .../lipstick/{annoyed.webp => annoyed/0.webp} | 0 .../lipstick/{base.webp => base/0.webp} | 0 .../lipstick/{clench.webp => clench/0.webp} | 0 .../lipstick/{grin.webp => grin/0.webp} | 0 .../lipstick/{horny.webp => horny/0.webp} | 0 .../lipstick/{open.webp => open/0.webp} | 0 .../lipstick/{scream.webp => scream/0.webp} | 0 .../lipstick/{smile.webp => smile/0.webp} | 0 .../lipstick/{upset.webp => upset/0.webp} | 0 .../panties/basic_panties_1/armfix.webp | 3 + .../panties/basic_panties_2/armfix.webp | 3 + .../stockings/ann_takamaki/armfix.webp | 3 + .../clothes/stockings/pantyhose/armfix.webp | 3 + .../clothes/top/ann_takamaki/armfix.webp | 3 + .../top/ann_takamaki/skin.webp} | 0 .../clothes/top/top_school_1/armfix.webp | 3 + .../clothes/top/top_school_2/armfix.webp | 3 + .../clothes/top/top_school_3/armfix.webp | 3 + .../clothes/top/top_school_4/armfix.webp | 3 + .../clothes/top/top_school_5/armfix.webp | 3 + .../clothes/top/top_school_6/armfix.webp | 3 + .../{blush.webp => blush/expression.webp} | 0 .../{angry.webp => angry/expression.webp} | 0 .../{base.webp => base/expression.webp} | 0 .../{worried.webp => worried/expression.webp} | 0 .../eyes/{base.webp => base/expression.webp} | 0 .../{base_mask.webp => base/eyemask.webp} | 0 .../{closed.webp => closed/expression.webp} | 0 .../{narrow.webp => narrow/expression.webp} | 0 .../{narrow_mask.webp => narrow/eyemask.webp} | 0 .../eyes/{wink.webp => wink/expression.webp} | 0 .../{wink_mask.webp => wink/eyemask.webp} | 0 .../{angry.webp => angry/expression.webp} | 0 .../{annoyed.webp => annoyed/expression.webp} | 0 .../mouth/{base.webp => base/expression.webp} | 0 .../{clench.webp => clench/expression.webp} | 0 .../mouth/{grin.webp => grin/expression.webp} | 0 .../{horny.webp => horny/expression.webp} | 0 .../mouth/{open.webp => open/expression.webp} | 0 .../{scream.webp => scream/expression.webp} | 0 .../{smile.webp => smile/expression.webp} | 0 .../{upset.webp => upset/expression.webp} | 0 .../face/pupils/{L.webp => L/expression.webp} | 0 .../face/pupils/{R.webp => R/expression.webp} | 0 .../{ahegao.webp => ahegao/expression.webp} | 0 .../{down.webp => down/expression.webp} | 0 .../pupils/{mid.webp => mid/expression.webp} | 0 .../pupils/{up.webp => up/expression.webp} | 0 .../{crying.webp => crying/expression.webp} | 0 .../cho/body/armright/down_fix.webp | 3 - game/characters/cho/body/armright/up.webp | 3 - .../characters/cho/body/{base => }/front.webp | 0 .../{armleft/down.webp => larm_zorder_1.webp} | 0 .../normal.webp => nbreast_zorder_2.webp} | 0 .../down.webp => rarm_zorder_1.webp} | 0 .../bottom/j_school_skirt_1/armfix.webp} | 0 .../clothes/bottom/pants_long_1/armfix.webp | 3 + .../clothes/bottom/pants_long_2/armfix.webp | 3 + .../clothes/bottom/pants_short_1/armfix.webp | 3 + .../clothes/bottom/pants_short_2/armfix.webp | 3 + .../clothes/bottom/pants_short_3/armfix.webp | 3 + .../clothes/bottom/pants_short_4/armfix.webp | 3 + .../clothes/bottom/quid_skirt_1/armfix.webp | 3 + .../clothes/bottom/school_skirt_1/armfix.webp | 3 + .../clothes/bottom/school_skirt_2/armfix.webp | 3 + .../clothes/bottom/school_skirt_3/armfix.webp | 3 + .../clothes/bottom/school_skirt_4/armfix.webp | 3 + .../clothes/bottom/skirt_short_1/armfix.webp | 3 + .../clothes/bottom/skirt_short_2/armfix.webp | 3 + .../clothes/bottom/toon_shorts/armfix.webp | 3 + .../headgear/antlers/{ => default}/0.webp | 0 .../headgear/antlers/{ => default}/1.webp | 0 .../headgear/antlers/{ => default}/2.webp | 0 .../antlers/{ => default}/outline.webp | 0 .../headgear/bunny_hat_1/{ => default}/0.webp | 0 .../headgear/bunny_hat_1/{ => default}/1.webp | 0 .../bunny_hat_1/{ => default}/outline.webp | 0 .../headgear/catears/{ => default}/0.webp | 0 .../headgear/catears/{ => default}/extra.webp | 0 .../catears/{ => default}/outline.webp | 0 .../chun_li_puffies/{ => default}/0.webp | 0 .../{ => default}/outline.webp | 0 .../headgear/goggles/{ => default}/0.webp | 0 .../headgear/goggles/{ => default}/1.webp | 0 .../headgear/goggles/{ => default}/extra.webp | 0 .../goggles/{ => default}/outline.webp | 0 .../headgear/goggles/{ => default}/skin.webp | 0 .../headgear/police_cap/{ => default}/0.webp | 0 .../headgear/police_cap/{ => default}/1.webp | 0 .../headgear/police_cap/{ => default}/2.webp | 0 .../headgear/police_cap/{ => default}/3.webp | 0 .../police_cap/{ => default}/outline.webp | 0 .../headgear/smurfette/{ => default}/0.webp | 0 .../smurfette/{ => default}/outline.webp | 0 .../headgear/toon_band/{ => default}/0.webp | 0 .../toon_band/{ => default}/outline.webp | 0 .../headgear/witch/{ => default}/0.webp | 0 .../headgear/witch/{ => default}/1.webp | 0 .../headgear/witch/{ => default}/outline.webp | 0 .../headgear/witch/{ => default}/skin.webp | 0 .../lipstick/{angry.webp => angry/0.webp} | 0 .../lipstick/{annoyed.webp => annoyed/0.webp} | 0 .../lipstick/{base.webp => base/0.webp} | 0 .../lipstick/{clench.webp => clench/0.webp} | 0 .../0.webp} | 0 .../lipstick/{disgust.webp => disgust/0.webp} | 0 .../lipstick/{grin.webp => grin/0.webp} | 0 .../lipstick/{horny.webp => horny/0.webp} | 0 .../makeup/lipstick/{mad.webp => mad/0.webp} | 0 .../lipstick/{normal.webp => normal/0.webp} | 0 .../lipstick/{open.webp => open/0.webp} | 0 .../{open_tongue.webp => open_tongue/0.webp} | 0 .../0.webp} | 0 .../lipstick/{quiver.webp => quiver/0.webp} | 0 .../lipstick/{scream.webp => scream/0.webp} | 0 .../lipstick/{silly.webp => silly/0.webp} | 0 .../lipstick/{smile.webp => smile/0.webp} | 0 .../lipstick/{soft.webp => soft/0.webp} | 0 .../lipstick/{upset.webp => upset/0.webp} | 0 .../panties/bikini_bottom_1/armfix.webp | 3 + .../panties/bikini_bottom_2/armfix.webp | 3 + .../panties/sport_panties_1/armfix.webp | 3 + .../clothes/robe/robe_quidditch_1/armfix.webp | 3 + .../stockings/bunny_stockings_1/armfix.webp | 3 + .../cho/clothes/stockings/fishnet/armfix.webp | 3 + .../stockings/lace_stockings_1/armfix.webp | 3 + .../clothes/stockings/pantyhose/armfix.webp | 3 + .../cho/clothes/stockings/sailor/armfix.webp | 3 + .../cho/clothes/top/chun_li_dress/armfix.webp | 3 + .../cho/clothes/top/dress_1/armfix.webp | 3 + .../cho/clothes/top/police/armfix.webp | 3 + .../cho/clothes/top/smurfette/armfix.webp | 3 + .../clothes/top/top_j_school_1/armfix.webp | 3 + .../cho/clothes/top/top_sweater_1/armfix.webp | 3 + .../cum/body/{heavy.webp => heavy/cum.webp} | 0 .../body/{heavy_skin.webp => heavy/skin.webp} | 0 .../cum/body/{light.webp => light/cum.webp} | 0 .../body/{light_skin.webp => light/skin.webp} | 0 .../breasts/{heavy.webp => heavy/cum.webp} | 0 .../{heavy_skin.webp => heavy/skin.webp} | 0 .../breasts/{light.webp => light/cum.webp} | 0 .../{light_skin.webp => light/skin.webp} | 0 .../cum/crotch/{heavy.webp => heavy/cum.webp} | 0 .../{heavy_skin.webp => heavy/skin.webp} | 0 .../cum/crotch/{light.webp => light/cum.webp} | 0 .../{light_skin.webp => light/skin.webp} | 0 .../cum/face/{heavy.webp => heavy/cum.webp} | 0 .../face/{heavy_skin.webp => heavy/skin.webp} | 0 .../cum/face/{light.webp => light/cum.webp} | 0 .../face/{light_skin.webp => light/skin.webp} | 0 .../cum/hair/{heavy.webp => heavy/cum.webp} | 0 .../cum/hair/{light.webp => light/cum.webp} | 0 .../cum/legs/{heavy.webp => heavy/cum.webp} | 0 .../legs/{heavy_skin.webp => heavy/skin.webp} | 0 .../cum/legs/{light.webp => light/cum.webp} | 0 .../legs/{light_skin.webp => light/skin.webp} | 0 .../cum/pussy/{heavy.webp => heavy/cum.webp} | 0 .../cum/pussy/{light.webp => light/cum.webp} | 0 .../{blush.webp => blush/expression.webp} | 0 .../expression.webp} | 0 game/characters/cho/face/cheeks/dummy.webp | 3 - .../{angry.webp => angry/expression.webp} | 0 .../{angry_skin.webp => angry/skin.webp} | 0 .../{base.webp => base/expression.webp} | 0 .../{base_skin.webp => base/skin.webp} | 0 .../{raised.webp => raised/expression.webp} | 0 .../{raised_skin.webp => raised/skin.webp} | 0 .../{worried.webp => worried/expression.webp} | 0 .../{worried_skin.webp => worried/skin.webp} | 0 .../eyes/{base.webp => base/expression.webp} | 0 .../{base_mask.webp => base/eyemask.webp} | 0 .../eyes/{base_skin.webp => base/skin.webp} | 0 .../{closed.webp => closed/expression.webp} | 0 .../{closed_skin.webp => closed/skin.webp} | 0 .../{happyCl.webp => happyCl/expression.webp} | 0 .../{happyCl_skin.webp => happyCl/skin.webp} | 0 .../{narrow.webp => narrow/expression.webp} | 0 .../{narrow_mask.webp => narrow/eyemask.webp} | 0 .../{narrow_skin.webp => narrow/skin.webp} | 0 .../eyes/{wide.webp => wide/expression.webp} | 0 .../{wide_mask.webp => wide/eyemask.webp} | 0 .../eyes/{wide_skin.webp => wide/skin.webp} | 0 .../eyes/{wink.webp => wink/expression.webp} | 0 .../{wink_mask.webp => wink/eyemask.webp} | 0 .../eyes/{wink_skin.webp => wink/skin.webp} | 0 .../{angry.webp => angry/expression.webp} | 0 .../{annoyed.webp => annoyed/expression.webp} | 0 .../mouth/{base.webp => base/expression.webp} | 0 .../{clench.webp => clench/expression.webp} | 0 .../smile.webp} | 0 .../{disgust.webp => disgust/expression.webp} | 0 .../mouth/{grin.webp => grin/expression.webp} | 0 .../{horny.webp => horny/expression.webp} | 0 .../mouth/{mad.webp => mad/expression.webp} | 0 .../{normal.webp => normal/expression.webp} | 0 .../mouth/{open.webp => open/expression.webp} | 0 .../expression.webp} | 0 .../expression.webp} | 0 .../{quiver.webp => quiver/expression.webp} | 0 .../{scream.webp => scream/expression.webp} | 0 .../{silly.webp => silly/expression.webp} | 0 .../{smile.webp => smile/expression.webp} | 0 .../mouth/{soft.webp => soft/expression.webp} | 0 .../{upset.webp => upset/expression.webp} | 0 .../face/pupils/{L.webp => L/expression.webp} | 0 .../face/pupils/{R.webp => R/expression.webp} | 0 .../{ahegao.webp => ahegao/expression.webp} | 0 .../{down.webp => down/expression.webp} | 0 .../{downR.webp => downR/expression.webp} | 0 .../pupils/{mid.webp => mid/expression.webp} | 0 .../{stare.webp => stare/expression.webp} | 0 .../pupils/{up.webp => up/expression.webp} | 0 .../cho/poses/broom/body/armleft/down.webp | 3 - .../poses/broom/body/armleft/down_fix.webp | 3 - .../cho/poses/broom/body/armright/down.webp | 3 - .../poses/broom/body/armright/down_fix.webp | 3 - .../poses/broom/body/armright/snitch_fix.webp | 3 - .../cho/poses/broom/body/armright/up.webp | 3 - .../cho/poses/broom/body/breasts/normal.webp | 3 - .../poses/broom/body/{base => }/front.webp | 0 .../broom/body/{armright => }/snitch.webp | 0 .../{blush.webp => blush/expression.webp} | 0 .../expression.webp} | 0 .../{angry.webp => angry/expression.webp} | 0 .../{angry_skin.webp => angry/skin.webp} | 0 .../{base.webp => base/expression.webp} | 0 .../{base_skin.webp => base/skin.webp} | 0 .../{raised.webp => raised/expression.webp} | 0 .../{raised_skin.webp => raised/skin.webp} | 0 .../{worried.webp => worried/expression.webp} | 0 .../{worried_skin.webp => worried/skin.webp} | 0 .../eyes/{base.webp => base/expression.webp} | 0 .../{base_mask.webp => base/eyemask.webp} | 0 .../eyes/{base_skin.webp => base/skin.webp} | 0 .../{closed.webp => closed/expression.webp} | 0 .../{closed_skin.webp => closed/skin.webp} | 0 .../{happyCl.webp => happyCl/expression.webp} | 0 .../{happyCl_skin.webp => happyCl/skin.webp} | 0 .../{narrow.webp => narrow/expression.webp} | 0 .../{narrow_mask.webp => narrow/eyemask.webp} | 0 .../{narrow_skin.webp => narrow/skin.webp} | 0 .../eyes/{wide.webp => wide/expression.webp} | 0 .../{wide_mask.webp => wide/eyemask.webp} | 0 .../eyes/{wide_skin.webp => wide/skin.webp} | 0 .../eyes/{wink.webp => wink/expression.webp} | 0 .../{wink_mask.webp => wink/eyemask.webp} | 0 .../eyes/{wink_skin.webp => wink/skin.webp} | 0 .../{angry.webp => angry/expression.webp} | 0 .../{annoyed.webp => annoyed/expression.webp} | 0 .../mouth/{base.webp => base/expression.webp} | 0 .../{clench.webp => clench/expression.webp} | 0 .../smile.webp} | 0 .../{disgust.webp => disgust/expression.webp} | 0 .../mouth/{grin.webp => grin/expression.webp} | 0 .../{horny.webp => horny/expression.webp} | 0 .../mouth/{mad.webp => mad/expression.webp} | 0 .../{normal.webp => normal/expression.webp} | 0 .../mouth/{open.webp => open/expression.webp} | 0 .../expression.webp} | 0 .../expression.webp} | 0 .../mouth/{pout.webp => pout/expression.webp} | 0 .../{quiver.webp => quiver/expression.webp} | 0 .../{scream.webp => scream/expression.webp} | 0 .../{silly.webp => silly/expression.webp} | 0 .../{smile.webp => smile/expression.webp} | 0 .../mouth/{soft.webp => soft/expression.webp} | 0 .../{upset.webp => upset/expression.webp} | 0 .../face/pupils/{L.webp => L/expression.webp} | 0 .../face/pupils/{R.webp => R/expression.webp} | 0 .../{ahegao.webp => ahegao/expression.webp} | 0 .../{down.webp => down/expression.webp} | 0 .../{downR.webp => downR/expression.webp} | 0 .../pupils/{mid.webp => mid/expression.webp} | 0 .../pupils/{up.webp => up/expression.webp} | 0 game/characters/cho/poses/broom/loadable.webp | 3 - game/characters/hermione/body/base/back.webp | 3 - .../hermione/body/{base => }/front.webp | 0 .../hermione/body/kneel/kneel_arm.webp | 3 - .../hermione/body/kneel/kneel_base.webp | 3 - .../hermione/body/kneel/kneel_base_2.webp | 3 - .../hermione/body/kneel/kneel_cock.webp | 3 - .../hermione/body/kneel/kneel_cum_1.webp | 3 - .../hermione/body/kneel/kneel_hair.webp | 3 - .../hermione/body/kneel/kneel_leg.webp | 3 - .../{armleft/down.webp => larm_zorder_1.webp} | 0 .../hermione/body/nbreasts_zorder_2.webp | 3 + .../down.webp => rarm_zorder_1.webp} | 0 .../headgear/antlers/{ => default}/0.webp | 0 .../antlers/{ => default}/outline.webp | 0 .../headgear/antlers_2/{ => default}/0.webp | 0 .../headgear/antlers_2/{ => default}/1.webp | 0 .../headgear/antlers_2/{ => default}/2.webp | 0 .../antlers_2/{ => default}/outline.webp | 0 .../headgear/bunny_hat_1/{ => default}/0.webp | 0 .../headgear/bunny_hat_1/{ => default}/1.webp | 0 .../bunny_hat_1/{ => default}/outline.webp | 0 .../headgear/bunny_hat_2/{ => default}/0.webp | 0 .../headgear/bunny_hat_2/{ => default}/1.webp | 0 .../headgear/bunny_hat_2/{ => default}/2.webp | 0 .../bunny_hat_2/{ => default}/outline.webp | 0 .../headgear/cat_ears/{ => default}/0.webp | 0 .../headgear/cat_ears/{ => default}/1.webp | 0 .../cat_ears/{ => default}/outline.webp | 0 .../clothes/headgear/elf/{ => default}/0.webp | 0 .../clothes/headgear/elf/{ => default}/1.webp | 0 .../headgear/elf/{ => default}/extra.webp | 0 .../headgear/elf/{ => default}/outline.webp | 0 .../headgear/maid_hat_1/{ => default}/0.webp | 0 .../maid_hat_1/{ => default}/outline.webp | 0 .../panties_on_head/{ => default}/0.webp | 0 .../{ => default}/outline.webp | 0 .../headgear/poker_hat_1/{ => default}/0.webp | 0 .../headgear/poker_hat_1/{ => default}/1.webp | 0 .../headgear/poker_hat_1/{ => default}/2.webp | 0 .../poker_hat_1/{ => default}/extra.webp | 0 .../poker_hat_1/{ => default}/outline.webp | 0 .../poker_hat_1/{ => default}/overlay.webp | 0 .../headgear/poker_hat_2/{ => default}/0.webp | 0 .../headgear/poker_hat_2/{ => default}/1.webp | 0 .../headgear/poker_hat_2/{ => default}/2.webp | 0 .../poker_hat_2/{ => default}/extra.webp | 0 .../poker_hat_2/{ => default}/outline.webp | 0 .../poker_hat_2/{ => default}/overlay.webp | 0 .../lipstick/{angry.webp => angry/0.webp} | 0 .../lipstick/{annoyed.webp => annoyed/0.webp} | 0 .../lipstick/{base.webp => base/0.webp} | 0 .../lipstick/{clench.webp => clench/0.webp} | 0 .../0.webp} | 0 .../makeup/lipstick/{cum.webp => cum/0.webp} | 0 .../lipstick/{disgust.webp => disgust/0.webp} | 0 .../lipstick/{full.webp => full/0.webp} | 0 .../{full_cum.webp => full_cum/0.webp} | 0 .../0.webp} | 0 .../lipstick/{grin.webp => grin/0.webp} | 0 .../makeup/lipstick/{mad.webp => mad/0.webp} | 0 .../lipstick/{normal.webp => normal/0.webp} | 0 .../lipstick/{open.webp => open/0.webp} | 0 .../{open_tongue.webp => open_tongue/0.webp} | 0 .../0.webp} | 0 .../0.webp} | 0 .../0.webp} | 0 .../lipstick/{scream.webp => scream/0.webp} | 0 .../lipstick/{shock.webp => shock/0.webp} | 0 .../lipstick/{silly.webp => silly/0.webp} | 0 .../lipstick/{smile.webp => smile/0.webp} | 0 .../lipstick/{soft.webp => soft/0.webp} | 0 .../lipstick/{upset.webp => upset/0.webp} | 0 .../cum/body/{heavy.webp => heavy/cum.webp} | 0 .../cum/body/{light.webp => light/cum.webp} | 0 .../breasts/{heavy.webp => heavy/cum.webp} | 0 .../breasts/{light.webp => light/cum.webp} | 0 .../cum/crotch/{heavy.webp => heavy/cum.webp} | 0 .../cum/crotch/{light.webp => light/cum.webp} | 0 .../cum/face/{heavy.webp => heavy/cum.webp} | 0 .../cum/face/{light.webp => light/cum.webp} | 0 .../cum/hair/{heavy.webp => heavy/cum.webp} | 0 .../cum/hair/{light.webp => light/cum.webp} | 0 .../cum/legs/{heavy.webp => heavy/cum.webp} | 0 .../cum/legs/{light.webp => light/cum.webp} | 0 .../cum/pussy/{heavy.webp => heavy/cum.webp} | 0 .../cum/pussy/{light.webp => light/cum.webp} | 0 .../pussy/{squirt.webp => squirt/cum.webp} | 0 .../cum.webp} | 0 .../cum.webp} | 0 .../cum.webp} | 0 .../cum.webp} | 0 .../cum.webp} | 0 .../cum.webp} | 0 .../cum.webp} | 0 .../cum.webp} | 0 .../cum.webp} | 0 .../cum/pussy/{wet.webp => wet/cum.webp} | 0 .../{blush.webp => blush/expression.webp} | 0 .../{angry.webp => angry/expression.webp} | 0 .../{angry_skin.webp => angry/skin.webp} | 0 .../{annoyed.webp => annoyed/expression.webp} | 0 .../{annoyed_skin.webp => annoyed/skin.webp} | 0 .../{base.webp => base/expression.webp} | 0 .../{base_skin.webp => base/skin.webp} | 0 .../{low.webp => low/expression.webp} | 0 .../eyebrows/{low_skin.webp => low/skin.webp} | 0 .../{worried.webp => worried/expression.webp} | 0 .../{worried_skin.webp => worried/skin.webp} | 0 .../eyes/{base.webp => base/expression.webp} | 0 .../{base_mask.webp => base/eyemask.webp} | 0 .../{closed.webp => closed/expression.webp} | 0 .../{happy.webp => happy/expression.webp} | 0 .../{happy_mask.webp => happy/eyemask.webp} | 0 .../{happyCl.webp => happyCl/expression.webp} | 0 .../{narrow.webp => narrow/expression.webp} | 0 .../{narrow_mask.webp => narrow/eyemask.webp} | 0 .../eyes/{slit.webp => slit/expression.webp} | 0 .../{slit_mask.webp => slit/eyemask.webp} | 0 .../{squint.webp => squint/expression.webp} | 0 .../{squint_mask.webp => squint/eyemask.webp} | 0 .../eyes/{wide.webp => wide/expression.webp} | 0 .../{wide_mask.webp => wide/eyemask.webp} | 0 .../eyes/{wink.webp => wink/expression.webp} | 0 .../{wink_mask.webp => wink/eyemask.webp} | 0 .../{angry.webp => angry/expression.webp} | 0 .../{annoyed.webp => annoyed/expression.webp} | 0 .../mouth/{base.webp => base/expression.webp} | 0 .../{clench.webp => clench/expression.webp} | 0 .../expression.webp} | 0 .../mouth/{cum.webp => cum/expression.webp} | 0 .../{disgust.webp => disgust/expression.webp} | 0 .../mouth/{full.webp => full/expression.webp} | 0 .../expression.webp} | 0 .../expression.webp} | 0 .../mouth/{grin.webp => grin/expression.webp} | 0 .../mouth/{mad.webp => mad/expression.webp} | 0 .../{normal.webp => normal/expression.webp} | 0 .../mouth/{open.webp => open/expression.webp} | 0 .../expression.webp} | 0 .../expression.webp} | 0 .../face/mouth/open_wide_tongue_cum.webp | 3 - .../face/mouth/open_wide_tongue_panties.webp | 3 - .../{scream.webp => scream/expression.webp} | 0 .../{shock.webp => shock/expression.webp} | 0 .../{silly.webp => silly/expression.webp} | 0 .../{smile.webp => smile/expression.webp} | 0 .../mouth/{soft.webp => soft/expression.webp} | 0 .../{upset.webp => upset/expression.webp} | 0 .../face/pupils/{L.webp => L/expression.webp} | 0 .../{L_soft.webp => L_soft/expression.webp} | 0 .../face/pupils/{R.webp => R/expression.webp} | 0 .../{R_soft.webp => R_soft/expression.webp} | 0 .../{ahegao.webp => ahegao/expression.webp} | 0 .../{dead.webp => dead/expression.webp} | 0 .../{down.webp => down/expression.webp} | 0 .../expression.webp} | 0 .../pupils/{mid.webp => mid/expression.webp} | 0 .../expression.webp} | 0 .../{shocked.webp => shocked/expression.webp} | 0 .../{squint.webp => squint/expression.webp} | 0 .../expression.webp} | 0 .../{stare.webp => stare/expression.webp} | 0 .../expression.webp} | 0 .../pupils/{up.webp => up/expression.webp} | 0 .../{up_soft.webp => up_soft/expression.webp} | 0 .../{crying.webp => crying/expression.webp} | 0 .../expression.webp} | 0 .../{mascara.webp => mascara/expression.webp} | 0 .../expression.webp} | 0 .../expression.webp} | 0 .../face/tears/mascara_soft_blink.webp | 3 - .../{messy.webp => messy/expression.webp} | 0 .../tears/{soft.webp => soft/expression.webp} | 0 .../expression.webp} | 0 .../{sweat.webp => sweat/expression.webp} | 0 .../expression.webp} | 0 .../expression.webp} | 0 .../expression.webp} | 0 .../expression.webp} | 0 .../hooch/body/{base => }/front.webp | 0 .../{blush.webp => blush/expression.webp} | 0 .../expression.webp} | 0 .../{angry.webp => angry/expression.webp} | 0 .../{base.webp => base/expression.webp} | 0 .../{raised.webp => raised/expression.webp} | 0 .../{shocked.webp => shocked/expression.webp} | 0 .../{worried.webp => worried/expression.webp} | 0 .../eyes/{base.webp => base/expression.webp} | 0 .../{base_mask.webp => base/eyemask.webp} | 0 .../{closed.webp => closed/expression.webp} | 0 .../{narrow.webp => narrow/expression.webp} | 0 .../{narrow_mask.webp => narrow/eyemask.webp} | 0 .../{shocked.webp => shocked/expression.webp} | 0 .../eyemask.webp} | 0 .../eyes/{wink.webp => wink/expression.webp} | 0 .../{wink_mask.webp => wink/eyemask.webp} | 0 .../{angry.webp => angry/expression.webp} | 0 .../mouth/{base.webp => base/expression.webp} | 0 .../mouth/{grin.webp => grin/expression.webp} | 0 .../{normal.webp => normal/expression.webp} | 0 .../mouth/{open.webp => open/expression.webp} | 0 .../face/pupils/{L.webp => L/expression.webp} | 0 .../face/pupils/{R.webp => R/expression.webp} | 0 .../{down.webp => down/expression.webp} | 0 .../{downL.webp => downL/expression.webp} | 0 .../{downR.webp => downR/expression.webp} | 0 .../pupils/{mid.webp => mid/expression.webp} | 0 .../{stare.webp => stare/expression.webp} | 0 .../pupils/{up.webp => up/expression.webp} | 0 game/characters/luna/body/armleft/down.webp | 3 - game/characters/luna/body/armright/down.webp | 3 - .../luna/body/breasts/normal_tight.webp | 3 - .../luna/body/{base => }/front.webp | 0 .../{armleft/up.webp => larm_zorder_2.webp} | 0 .../normal.webp => nbreasts_zorder_1.webp} | 0 .../{armright/up.webp => rarm_zorder_2.webp} | 0 .../headgear/antlers/{ => default}/0.webp | 0 .../headgear/antlers/{ => default}/1.webp | 0 .../headgear/antlers/{ => default}/2.webp | 0 .../headgear/antlers/{ => default}/extra.webp | 0 .../antlers/{ => default}/outline.webp | 0 .../headgear/bunny_hat_1/{ => default}/0.webp | 0 .../headgear/bunny_hat_1/{ => default}/1.webp | 0 .../bunny_hat_1/{ => default}/outline.webp | 0 .../flight_attendant/{ => default}/0.webp | 0 .../{ => default}/outline.webp | 0 .../cum/body/{heavy.webp => heavy/cum.webp} | 0 .../cum/body/{light.webp => light/cum.webp} | 0 .../breasts/{heavy.webp => heavy/cum.webp} | 0 .../breasts/{light.webp => light/cum.webp} | 0 .../cum/crotch/{heavy.webp => heavy/cum.webp} | 0 .../cum/crotch/{light.webp => light/cum.webp} | 0 .../cum/face/{heavy.webp => heavy/cum.webp} | 0 .../cum/face/{light.webp => light/cum.webp} | 0 .../cum/hair/{heavy.webp => heavy/cum.webp} | 0 .../cum/hair/{light.webp => light/cum.webp} | 0 .../cum/legs/{heavy.webp => heavy/cum.webp} | 0 .../cum/legs/{light.webp => light/cum.webp} | 0 .../cum/pussy/{heavy.webp => heavy/cum.webp} | 0 .../cum/pussy/{light.webp => light/cum.webp} | 0 .../pussy/{squirt.webp => squirt/cum.webp} | 0 .../cum.webp} | 0 .../luna/cum/pussy/{wet.webp => wet/cum.webp} | 0 .../{blush.webp => blush/expression.webp} | 0 .../{angry.webp => angry/expression.webp} | 0 .../{angry_skin.webp => angry/skin.webp} | 0 .../{annoyed.webp => annoyed/expression.webp} | 0 .../{annoyed_skin.webp => annoyed/skin.webp} | 0 .../{base.webp => base/expression.webp} | 0 .../{base_skin.webp => base/skin.webp} | 0 .../{low.webp => low/expression.webp} | 0 .../eyebrows/{low_skin.webp => low/skin.webp} | 0 .../{raised.webp => raised/expression.webp} | 0 .../{raised_skin.webp => raised/skin.webp} | 0 .../{worried.webp => worried/expression.webp} | 0 .../{worried_skin.webp => worried/skin.webp} | 0 .../eyes/{base.webp => base/expression.webp} | 0 .../eyes/{base_mask.webp => base/mask.webp} | 0 .../eyes/{base_skin.webp => base/skin.webp} | 0 .../{closed.webp => closed/expression.webp} | 0 .../{closed_skin.webp => closed/skin.webp} | 0 .../{happyCl.webp => happyCl/expression.webp} | 0 .../{happyCl_skin.webp => happyCl/skin.webp} | 0 .../{narrow.webp => narrow/expression.webp} | 0 .../{narrow_mask.webp => narrow/mask.webp} | 0 .../{narrow_skin.webp => narrow/skin.webp} | 0 .../eyes/{wide.webp => wide/expression.webp} | 0 .../eyes/{wide_mask.webp => wide/mask.webp} | 0 .../eyes/{wide_skin.webp => wide/skin.webp} | 0 .../eyes/{wink.webp => wink/expression.webp} | 0 .../eyes/{wink_mask.webp => wink/mask.webp} | 0 .../eyes/{wink_skin.webp => wink/skin.webp} | 0 .../{angry.webp => angry/expression.webp} | 0 .../{annoyed.webp => annoyed/expression.webp} | 0 .../mouth/{base.webp => base/expression.webp} | 0 .../{clench.webp => clench/expression.webp} | 0 .../expression.webp} | 0 .../{disgust.webp => disgust/expression.webp} | 0 .../mouth/{full.webp => full/expression.webp} | 0 .../mouth/{grin.webp => grin/expression.webp} | 0 .../mouth/{mad.webp => mad/expression.webp} | 0 .../{normal.webp => normal/expression.webp} | 0 .../mouth/{open.webp => open/expression.webp} | 0 .../expression.webp} | 0 .../expression.webp} | 0 .../{scream.webp => scream/expression.webp} | 0 .../{shock.webp => shock/expression.webp} | 0 .../{silly.webp => silly/expression.webp} | 0 .../{smile.webp => smile/expression.webp} | 0 .../mouth/{soft.webp => soft/expression.webp} | 0 .../{upset.webp => upset/expression.webp} | 0 .../face/pupils/{L.webp => L/expression.webp} | 0 .../face/pupils/{R.webp => R/expression.webp} | 0 .../{ahegao.webp => ahegao/expression.webp} | 0 .../{dead.webp => dead/expression.webp} | 0 .../{down.webp => down/expression.webp} | 0 .../{downL.webp => downL/expression.webp} | 0 .../{downR.webp => downR/expression.webp} | 0 .../pupils/{mid.webp => mid/expression.webp} | 0 .../{squint.webp => squint/expression.webp} | 0 .../{stare.webp => stare/expression.webp} | 0 .../pupils/{up.webp => up/expression.webp} | 0 .../{crying.webp => crying/expression.webp} | 0 .../luna/face/tears/crying_blink.webp | 3 - .../face/tears/crying_blink/expression.webp} | 0 game/characters/luna/face/tears/mascara.webp | 3 - .../face/tears/mascara/expression.webp} | 0 game/characters/luna/face/tears/messy.webp | 3 - .../face/tears/messy/expression.webp} | 0 game/characters/luna/face/tears/soft.webp | 3 - .../face/tears/soft/expression.webp} | 0 .../susan/body/{base => }/front.webp | 0 .../priestess_headdress/{ => default}/0.webp | 0 .../{ => default}/0_back.webp | 0 .../priestess_headdress/{ => default}/1.webp | 0 .../{ => default}/mask.webp | 0 .../{ => default}/outline.webp | 0 .../{ => default}/outline_back.webp | 0 .../{blush.webp => blush/expression.webp} | 0 .../{angry.webp => angry/expression.webp} | 0 .../{angry_skin.webp => angry/skin.webp} | 0 .../{annoyed.webp => annoyed/expression.webp} | 0 .../{annoyed_skin.webp => annoyed/skin.webp} | 0 .../{base.webp => base/expression.webp} | 0 .../{base_skin.webp => base/skin.webp} | 0 .../{low.webp => low/expression.webp} | 0 .../eyebrows/{low_skin.webp => low/skin.webp} | 0 .../{raised.webp => raised/expression.webp} | 0 .../{raised_skin.webp => raised/skin.webp} | 0 .../{sad.webp => sad/expression.webp} | 0 .../eyebrows/{sad_skin.webp => sad/skin.webp} | 0 .../{shocked.webp => shocked/expression.webp} | 0 .../{shocked_skin.webp => shocked/skin.webp} | 0 .../{worried.webp => worried/expression.webp} | 0 .../{worried_skin.webp => worried/skin.webp} | 0 .../eyes/{base.webp => base/expression.webp} | 0 .../{base_mask.webp => base/eyemask.webp} | 0 .../eyes/{base_skin.webp => base/skin.webp} | 0 .../{closed.webp => closed/expression.webp} | 0 .../{closed_skin.webp => closed/skin.webp} | 0 .../{happy.webp => happy/expression.webp} | 0 .../{happy_mask.webp => happy/eyemask.webp} | 0 .../eyes/{happy_skin.webp => happy/skin.webp} | 0 .../{happyCl.webp => happyCl/expression.webp} | 0 .../{happyCl_skin.webp => happyCl/skin.webp} | 0 .../{narrow.webp => narrow/expression.webp} | 0 .../{narrow_mask.webp => narrow/eyemask.webp} | 0 .../{narrow_skin.webp => narrow/skin.webp} | 0 .../eyes/{wide.webp => wide/expression.webp} | 0 .../{wide_mask.webp => wide/eyemask.webp} | 0 .../eyes/{wide_skin.webp => wide/skin.webp} | 0 .../eyes/{wink.webp => wink/expression.webp} | 0 .../{wink_mask.webp => wink/eyemask.webp} | 0 .../eyes/{wink_skin.webp => wink/skin.webp} | 0 .../{ahegao.webp => ahegao/expression.webp} | 0 .../expression.webp} | 0 .../{angry.webp => angry/expression.webp} | 0 .../{annoyed.webp => annoyed/expression.webp} | 0 .../mouth/{base.webp => base/expression.webp} | 0 .../{clench.webp => clench/expression.webp} | 0 .../{disgust.webp => disgust/expression.webp} | 0 .../mouth/{grin.webp => grin/expression.webp} | 0 .../{horny.webp => horny/expression.webp} | 0 .../{normal.webp => normal/expression.webp} | 0 .../mouth/{open.webp => open/expression.webp} | 0 .../expression.webp} | 0 .../expression.webp} | 0 .../susan/face/mouth/open_wide_tongue.webp | 3 - .../{smile.webp => smile/expression.webp} | 0 .../mouth/{soft.webp => soft/expression.webp} | 0 .../{upset.webp => upset/expression.webp} | 0 .../{ahegao.webp => ahegao/expression.webp} | 0 .../{down.webp => down/expression.webp} | 0 .../{downL.webp => downL/expression.webp} | 0 .../{downR.webp => downR/expression.webp} | 0 .../{left.webp => left/expression.webp} | 0 .../pupils/{mid.webp => mid/expression.webp} | 0 .../{right.webp => right/expression.webp} | 0 .../{stare.webp => stare/expression.webp} | 0 .../expression.webp} | 0 .../pupils/{up.webp => up/expression.webp} | 0 .../tonks/body/armleft/on_hips_fix.webp | 3 - .../tonks/body/armright/on_hips_fix.webp | 3 - .../tonks/body/{base/front.webp => base.webp} | 0 .../tonks/body/breasts/normal_tight.webp | 3 - .../characters/tonks/body/breasts/ribbon.webp | 3 - .../body/{armleft/on_hips.webp => larm.webp} | 0 .../normal.webp => nbreast_zorder_1.webp} | 0 .../body/{armright/on_hips.webp => rarm.webp} | 0 .../tonks/clothes/bottom/jeans/armfix.webp | 3 + .../clothes/bottom/latex_leggings/armfix.webp | 3 + .../tonks/clothes/bottom/leggings/armfix.webp | 3 + .../clothes/bottom/leggings_hole/armfix.webp | 3 + .../bottom/mechanic_shorts/armfix.webp | 3 + .../tonks/clothes/bottom/office/armfix.webp | 3 + .../tonks/clothes/bottom/police/armfix.webp | 3 + .../bottom/school_skirt_1/not_implemented.txt | 0 .../clothes/bottom/school_skirt_2/armfix.webp | 3 + .../clothes/bottom/school_skirt_3/armfix.webp | 3 + .../clothes/bottom/school_skirt_4/armfix.webp | 3 + .../clothes/bottom/sweatpants/armfix.webp | 3 + .../tonks/clothes/bottom/xmas/armfix.webp | 3 + .../clothes/gloves/auror_gloves/armfix.webp | 3 + .../clothes/gloves/leather_gloves/armfix.webp | 3 + .../headgear/antlers/{ => default}/0.webp | 0 .../antlers/{ => default}/outline.webp | 0 .../tonks/clothes/headgear/bunny/base/0.webp | 3 + .../tonks/clothes/headgear/bunny/base/1.webp | 3 + .../clothes/headgear/bunny/base/outline.webp | 3 + .../headgear/bunny/{ => default}/0.webp | 0 .../headgear/bunny/{ => default}/1.webp | 0 .../headgear/bunny/{ => default}/outline.webp | 0 .../headgear/classy_hat/{ => default}/0.webp | 0 .../classy_hat/{ => default}/0_back.webp | 0 .../classy_hat/{ => default}/0_front.webp | 0 .../classy_hat/{ => default}/extra.webp | 0 .../classy_hat/{ => default}/extra_front.webp | 0 .../classy_hat/{ => default}/outline.webp | 0 .../{ => default}/outline_back.webp | 0 .../{ => default}/outline_front.webp | 0 .../clothes/headgear/elf/{ => default}/0.webp | 0 .../clothes/headgear/elf/{ => default}/1.webp | 0 .../headgear/elf/{ => default}/extra.webp | 0 .../headgear/elf/{ => default}/outline.webp | 0 .../headgear/horns/{ => default}/0.webp | 0 .../headgear/horns/{ => default}/1.webp | 0 .../headgear/horns/{ => default}/outline.webp | 0 .../mechanic_cap/{ => default}/0.webp | 0 .../mechanic_cap/{ => default}/1.webp | 0 .../mechanic_cap/{ => default}/extra.webp | 0 .../mechanic_cap/{ => default}/mask.webp | 0 .../mechanic_cap/{ => default}/outline.webp | 0 .../mechanic_cap/{ => default}/skin.webp | 0 .../headgear/police/{ => default}/0.webp | 0 .../headgear/police/{ => default}/1.webp | 0 .../headgear/police/{ => default}/2.webp | 0 .../headgear/police/{ => default}/mask.webp | 0 .../police/{ => default}/outline.webp | 0 .../headgear/police/{ => default}/skin.webp | 0 .../tonks/clothes/makeup/elf_ears/0.webp | 3 - .../tonks/clothes/makeup/elf_ears/extra.webp | 3 - .../clothes/makeup/elf_ears/outline.webp | 3 - .../makeup/elf_ears/skin_zorder_5.webp | 3 + .../lipstick/{annoyed.webp => annoyed/0.webp} | 0 .../lipstick/{base.webp => base/0.webp} | 0 .../lipstick/{clench.webp => clench/0.webp} | 0 .../0.webp} | 0 .../lipstick/{disgust.webp => disgust/0.webp} | 0 .../lipstick/{grin.webp => grin/0.webp} | 0 .../lipstick/{horny.webp => horny/0.webp} | 0 .../makeup/lipstick/{mad.webp => mad/0.webp} | 0 .../lipstick/{normal.webp => normal/0.webp} | 0 .../lipstick/{open.webp => open/0.webp} | 0 .../{open_wide.webp => open_wide/0.webp} | 0 .../0.webp} | 0 .../0.webp} | 0 .../0.webp} | 0 .../0.webp} | 0 .../lipstick/{scream.webp => scream/0.webp} | 0 .../lipstick/{silly.webp => silly/0.webp} | 0 .../lipstick/{soft.webp => soft/0.webp} | 0 .../lipstick/{upset.webp => upset/0.webp} | 0 .../tonks/clothes/panties/base/armfix.webp | 3 + .../tonks/clothes/panties/ribbon/armfix.webp | 3 + .../panties/succubus_panties/armfix.webp | 3 + .../tonks/clothes/robe/auror_coat/armfix.webp | 3 + .../clothes/robe/dressing_gown/armfix.webp | 3 + .../tonks/clothes/robe/office/armfix.webp | 3 + .../tonks/clothes/robe/silk_robe/armfix.webp | 3 + .../tonks/clothes/stockings/auror/armfix.webp | 3 + .../stockings/bunny_stockings_1/armfix.webp | 3 + .../stockings/long_basic_1/armfix.webp | 3 + .../tonks/clothes/stockings/xmas/armfix.webp | 3 + .../tonks/clothes/top/auror/armfix.webp | 3 + .../tonks/clothes/top/auror2/armfix.webp | 3 + .../clothes/top/cavegirl_dress/armfix.webp | 3 + .../clothes/top/classy_dress/armfix.webp | 3 + .../tonks/clothes/top/corset/armfix.webp | 3 + .../tonks/clothes/top/elf_dress/armfix.webp | 3 + .../tonks/clothes/top/nightie_1/armfix.webp | 3 + .../tonks/clothes/top/office/armfix.webp | 3 + .../tonks/clothes/top/police1/armfix.webp | 3 + .../tonks/clothes/top/police2/armfix.webp | 3 + .../tonks/clothes/top/police3/armfix.webp | 3 + .../tonks/clothes/top/pullover/armfix.webp | 3 + .../tonks/clothes/top/silk_dress/armfix.webp | 3 + .../clothes/top/skimpy_dress/armfix.webp | 3 + .../clothes/top/skimpy_dress_2/armfix.webp | 3 + .../cum/body/{heavy.webp => heavy/cum.webp} | 0 .../body/{heavy_skin.webp => heavy/skin.webp} | 0 .../cum/body/{light.webp => light/cum.webp} | 0 .../body/{light_skin.webp => light/skin.webp} | 0 .../breasts/{heavy.webp => heavy/cum.webp} | 0 .../{heavy_skin.webp => heavy/skin.webp} | 0 .../breasts/{light.webp => light/cum.webp} | 0 .../{light_skin.webp => light/skin.webp} | 0 .../cum/crotch/{heavy.webp => heavy/cum.webp} | 0 .../{heavy_skin.webp => heavy/skin.webp} | 0 .../cum/crotch/{light.webp => light/cum.webp} | 0 .../{light_skin.webp => light/skin.webp} | 0 .../cum/face/{heavy.webp => heavy/cum.webp} | 0 .../face/{heavy_skin.webp => heavy/skin.webp} | 0 .../cum/face/{light.webp => light/cum.webp} | 0 .../face/{light_skin.webp => light/skin.webp} | 0 .../cum/hair/{heavy.webp => heavy/cum.webp} | 0 .../cum/hair/{light.webp => light/cum.webp} | 0 .../cum/legs/{heavy.webp => heavy/cum.webp} | 0 .../legs/{heavy_skin.webp => heavy/skin.webp} | 0 .../cum/legs/{light.webp => light/cum.webp} | 0 .../legs/{light_skin.webp => light/skin.webp} | 0 .../cum/pussy/{heavy.webp => heavy/cum.webp} | 0 .../cum/pussy/{light.webp => light/cum.webp} | 0 .../cheeks/{blush.webp => blush/skin.webp} | 0 .../{gloom.webp => gloom/expression.webp} | 0 .../skin.webp} | 0 .../{angry.webp => angry/expression.webp} | 0 .../{angry_skin.webp => angry/skin.webp} | 0 .../{annoyed.webp => annoyed/expression.webp} | 0 .../{annoyed_skin.webp => annoyed/skin.webp} | 0 .../{base.webp => base/expression.webp} | 0 .../{base_skin.webp => base/skin.webp} | 0 .../{raised.webp => raised/expression.webp} | 0 .../{raised_skin.webp => raised/skin.webp} | 0 .../{shocked.webp => shocked/expression.webp} | 0 .../{shocked_skin.webp => shocked/skin.webp} | 0 .../{worried.webp => worried/expression.webp} | 0 .../{worried_skin.webp => worried/skin.webp} | 0 .../eyes/{base.webp => base/expression.webp} | 0 .../{base_mask.webp => base/eyemask.webp} | 0 .../eyes/{base_skin.webp => base/skin.webp} | 0 .../{closed.webp => closed/expression.webp} | 0 .../{closed_skin.webp => closed/skin.webp} | 0 .../{happyCl.webp => happyCl/expression.webp} | 0 .../{happyCl_skin.webp => happyCl/skin.webp} | 0 .../{narrow.webp => narrow/expression.webp} | 0 .../{narrow_mask.webp => narrow/eyemask.webp} | 0 .../{narrow_skin.webp => narrow/skin.webp} | 0 .../{shocked.webp => shocked/expression.webp} | 0 .../eyemask.webp} | 0 .../{shocked_skin.webp => shocked/skin.webp} | 0 .../eyes/{wide.webp => wide/expression.webp} | 0 .../{wide_mask.webp => wide/eyemask.webp} | 0 .../eyes/{wide_skin.webp => wide/skin.webp} | 0 .../eyes/{wink.webp => wink/expression.webp} | 0 .../{wink_mask.webp => wink/eyemask.webp} | 0 .../eyes/{wink_skin.webp => wink/skin.webp} | 0 .../{angry.webp => angry/expression.webp} | 0 .../{annoyed.webp => annoyed/expression.webp} | 0 .../{annoyed_skin.webp => annoyed/skin.webp} | 0 .../mouth/{base.webp => base/expression.webp} | 0 .../mouth/{base_skin.webp => base/skin.webp} | 0 .../{clench.webp => clench/expression.webp} | 0 .../{clench_skin.webp => clench/skin.webp} | 0 .../expression.webp} | 0 .../skin.webp} | 0 .../{disgust.webp => disgust/expression.webp} | 0 .../{disgust_skin.webp => disgust/skin.webp} | 0 .../mouth/{grin.webp => grin/expression.webp} | 0 .../mouth/{grin_skin.webp => grin/skin.webp} | 0 .../{horny.webp => horny/expression.webp} | 0 .../{horny_skin.webp => horny/skin.webp} | 0 .../mouth/{mad.webp => mad/expression.webp} | 0 .../mouth/{mad_skin.webp => mad/skin.webp} | 0 .../{normal.webp => normal/expression.webp} | 0 .../{normal_skin.webp => normal/skin.webp} | 0 .../mouth/{open.webp => open/expression.webp} | 0 .../mouth/{open_skin.webp => open/skin.webp} | 0 .../expression.webp} | 0 .../expression.webp} | 0 .../expression.webp} | 0 .../expression.webp} | 0 .../expression.webp} | 0 .../{scream.webp => scream/expression.webp} | 0 .../{scream_skin.webp => scream/skin.webp} | 0 .../{silly.webp => silly/expression.webp} | 0 .../{silly_skin.webp => silly/skin.webp} | 0 .../mouth/{soft.webp => soft/expression.webp} | 0 .../mouth/{soft_skin.webp => soft/skin.webp} | 0 .../{upset.webp => upset/expression.webp} | 0 .../{upset_skin.webp => upset/skin.webp} | 0 .../face/pupils/{L.webp => L/overlay.webp} | 0 .../face/pupils/{R.webp => R/overlay.webp} | 0 .../{ahegao.webp => ahegao/overlay.webp} | 0 .../pupils/{down.webp => down/overlay.webp} | 0 .../pupils/{downR.webp => downR/overlay.webp} | 0 .../pupils/{mid.webp => mid/overlay.webp} | 0 .../pupils/{stare.webp => stare/overlay.webp} | 0 .../face/pupils/{up.webp => up/overlay.webp} | 0 .../expression.webp} | 0 .../expression.webp} | 0 game/scripts/characters/astoria/wardrobe.rpy | 89 ++--- game/scripts/characters/cho/wardrobe.rpy | 165 ++++----- game/scripts/characters/hermione/wardrobe.rpy | 189 ++++------ game/scripts/characters/hooch/wardrobe.rpy | 51 +-- game/scripts/characters/luna/wardrobe.rpy | 95 ++--- game/scripts/characters/susan/wardrobe.rpy | 47 +-- game/scripts/characters/tonks/wardrobe.rpy | 197 ++++------- game/scripts/doll/body.rpy | 135 ++++--- game/scripts/doll/clothes.rpy | 331 ++++++++---------- game/scripts/doll/clothes_dynamic.rpy | 156 +++++++++ game/scripts/doll/common.rpy | 37 +- game/scripts/doll/cum.rpy | 166 +++++++-- game/scripts/doll/face.rpy | 185 ++++++---- game/scripts/doll/lipstick.rpy | 68 ---- game/scripts/doll/main.rpy | 239 ++++++++----- game/scripts/doll/makeup.rpy | 65 ++++ game/scripts/doll/outfits.rpy | 53 +-- game/scripts/utility/common_screens.rpy | 2 +- game/scripts/utility/engine.rpy | 17 +- game/scripts/utility/image_crop.rpy | 7 +- game/scripts/wardrobe/wardrobe.rpy | 29 +- 903 files changed, 1420 insertions(+), 1296 deletions(-) create mode 100644 game/characters/astoria/body/armfix.webp delete mode 100644 game/characters/astoria/body/armleft/on_hips_fix.webp delete mode 100644 game/characters/astoria/body/armright/on_hips_fix.webp rename game/characters/astoria/body/{base => }/front.webp (100%) rename game/characters/astoria/body/{armleft/on_hips.webp => larm_zorder_1.webp} (100%) rename game/characters/astoria/body/{breasts/normal.webp => nbreast_zorder_2.webp} (100%) rename game/characters/astoria/body/{armright/on_hips.webp => rarm_zorder_1.webp} (100%) create mode 100644 game/characters/astoria/clothes/bottom/pants_1/armfix.webp create mode 100644 game/characters/astoria/clothes/bottom/pants_1_short/armfix.webp create mode 100644 game/characters/astoria/clothes/bottom/school_skirt_1/armfix.webp create mode 100644 game/characters/astoria/clothes/bottom/school_skirt_2/armfix.webp create mode 100644 game/characters/astoria/clothes/bottom/school_skirt_3/armfix.webp create mode 100644 game/characters/astoria/clothes/bottom/school_skirt_4/armfix.webp rename game/characters/astoria/clothes/headgear/ann_takamaki/{ => default}/0.webp (100%) rename game/characters/astoria/clothes/headgear/ann_takamaki/{ => default}/1.webp (100%) rename game/characters/astoria/clothes/headgear/ann_takamaki/{ => default}/outline.webp (100%) rename game/characters/astoria/clothes/makeup/lipstick/{angry.webp => angry/0.webp} (100%) rename game/characters/astoria/clothes/makeup/lipstick/{annoyed.webp => annoyed/0.webp} (100%) rename game/characters/astoria/clothes/makeup/lipstick/{base.webp => base/0.webp} (100%) rename game/characters/astoria/clothes/makeup/lipstick/{clench.webp => clench/0.webp} (100%) rename game/characters/astoria/clothes/makeup/lipstick/{grin.webp => grin/0.webp} (100%) rename game/characters/astoria/clothes/makeup/lipstick/{horny.webp => horny/0.webp} (100%) rename game/characters/astoria/clothes/makeup/lipstick/{open.webp => open/0.webp} (100%) rename game/characters/astoria/clothes/makeup/lipstick/{scream.webp => scream/0.webp} (100%) rename game/characters/astoria/clothes/makeup/lipstick/{smile.webp => smile/0.webp} (100%) rename game/characters/astoria/clothes/makeup/lipstick/{upset.webp => upset/0.webp} (100%) create mode 100644 game/characters/astoria/clothes/panties/basic_panties_1/armfix.webp create mode 100644 game/characters/astoria/clothes/panties/basic_panties_2/armfix.webp create mode 100644 game/characters/astoria/clothes/stockings/ann_takamaki/armfix.webp create mode 100644 game/characters/astoria/clothes/stockings/pantyhose/armfix.webp create mode 100644 game/characters/astoria/clothes/top/ann_takamaki/armfix.webp rename game/characters/astoria/{body/breasts/normal_tight.webp => clothes/top/ann_takamaki/skin.webp} (100%) create mode 100644 game/characters/astoria/clothes/top/top_school_1/armfix.webp create mode 100644 game/characters/astoria/clothes/top/top_school_2/armfix.webp create mode 100644 game/characters/astoria/clothes/top/top_school_3/armfix.webp create mode 100644 game/characters/astoria/clothes/top/top_school_4/armfix.webp create mode 100644 game/characters/astoria/clothes/top/top_school_5/armfix.webp create mode 100644 game/characters/astoria/clothes/top/top_school_6/armfix.webp rename game/characters/astoria/face/cheeks/{blush.webp => blush/expression.webp} (100%) rename game/characters/astoria/face/eyebrows/{angry.webp => angry/expression.webp} (100%) rename game/characters/astoria/face/eyebrows/{base.webp => base/expression.webp} (100%) rename game/characters/astoria/face/eyebrows/{worried.webp => worried/expression.webp} (100%) rename game/characters/astoria/face/eyes/{base.webp => base/expression.webp} (100%) rename game/characters/astoria/face/eyes/{base_mask.webp => base/eyemask.webp} (100%) rename game/characters/astoria/face/eyes/{closed.webp => closed/expression.webp} (100%) rename game/characters/astoria/face/eyes/{narrow.webp => narrow/expression.webp} (100%) rename game/characters/astoria/face/eyes/{narrow_mask.webp => narrow/eyemask.webp} (100%) rename game/characters/astoria/face/eyes/{wink.webp => wink/expression.webp} (100%) rename game/characters/astoria/face/eyes/{wink_mask.webp => wink/eyemask.webp} (100%) rename game/characters/astoria/face/mouth/{angry.webp => angry/expression.webp} (100%) rename game/characters/astoria/face/mouth/{annoyed.webp => annoyed/expression.webp} (100%) rename game/characters/astoria/face/mouth/{base.webp => base/expression.webp} (100%) rename game/characters/astoria/face/mouth/{clench.webp => clench/expression.webp} (100%) rename game/characters/astoria/face/mouth/{grin.webp => grin/expression.webp} (100%) rename game/characters/astoria/face/mouth/{horny.webp => horny/expression.webp} (100%) rename game/characters/astoria/face/mouth/{open.webp => open/expression.webp} (100%) rename game/characters/astoria/face/mouth/{scream.webp => scream/expression.webp} (100%) rename game/characters/astoria/face/mouth/{smile.webp => smile/expression.webp} (100%) rename game/characters/astoria/face/mouth/{upset.webp => upset/expression.webp} (100%) rename game/characters/astoria/face/pupils/{L.webp => L/expression.webp} (100%) rename game/characters/astoria/face/pupils/{R.webp => R/expression.webp} (100%) rename game/characters/astoria/face/pupils/{ahegao.webp => ahegao/expression.webp} (100%) rename game/characters/astoria/face/pupils/{down.webp => down/expression.webp} (100%) rename game/characters/astoria/face/pupils/{mid.webp => mid/expression.webp} (100%) rename game/characters/astoria/face/pupils/{up.webp => up/expression.webp} (100%) rename game/characters/astoria/face/tears/{crying.webp => crying/expression.webp} (100%) delete mode 100644 game/characters/cho/body/armright/down_fix.webp delete mode 100644 game/characters/cho/body/armright/up.webp rename game/characters/cho/body/{base => }/front.webp (100%) rename game/characters/cho/body/{armleft/down.webp => larm_zorder_1.webp} (100%) rename game/characters/cho/body/{breasts/normal.webp => nbreast_zorder_2.webp} (100%) rename game/characters/cho/body/{armright/down.webp => rarm_zorder_1.webp} (100%) rename game/characters/cho/{body/armleft/down_fix.webp => clothes/bottom/j_school_skirt_1/armfix.webp} (100%) create mode 100644 game/characters/cho/clothes/bottom/pants_long_1/armfix.webp create mode 100644 game/characters/cho/clothes/bottom/pants_long_2/armfix.webp create mode 100644 game/characters/cho/clothes/bottom/pants_short_1/armfix.webp create mode 100644 game/characters/cho/clothes/bottom/pants_short_2/armfix.webp create mode 100644 game/characters/cho/clothes/bottom/pants_short_3/armfix.webp create mode 100644 game/characters/cho/clothes/bottom/pants_short_4/armfix.webp create mode 100644 game/characters/cho/clothes/bottom/quid_skirt_1/armfix.webp create mode 100644 game/characters/cho/clothes/bottom/school_skirt_1/armfix.webp create mode 100644 game/characters/cho/clothes/bottom/school_skirt_2/armfix.webp create mode 100644 game/characters/cho/clothes/bottom/school_skirt_3/armfix.webp create mode 100644 game/characters/cho/clothes/bottom/school_skirt_4/armfix.webp create mode 100644 game/characters/cho/clothes/bottom/skirt_short_1/armfix.webp create mode 100644 game/characters/cho/clothes/bottom/skirt_short_2/armfix.webp create mode 100644 game/characters/cho/clothes/bottom/toon_shorts/armfix.webp rename game/characters/cho/clothes/headgear/antlers/{ => default}/0.webp (100%) rename game/characters/cho/clothes/headgear/antlers/{ => default}/1.webp (100%) rename game/characters/cho/clothes/headgear/antlers/{ => default}/2.webp (100%) rename game/characters/cho/clothes/headgear/antlers/{ => default}/outline.webp (100%) rename game/characters/cho/clothes/headgear/bunny_hat_1/{ => default}/0.webp (100%) rename game/characters/cho/clothes/headgear/bunny_hat_1/{ => default}/1.webp (100%) rename game/characters/cho/clothes/headgear/bunny_hat_1/{ => default}/outline.webp (100%) rename game/characters/cho/clothes/headgear/catears/{ => default}/0.webp (100%) rename game/characters/cho/clothes/headgear/catears/{ => default}/extra.webp (100%) rename game/characters/cho/clothes/headgear/catears/{ => default}/outline.webp (100%) rename game/characters/cho/clothes/headgear/chun_li_puffies/{ => default}/0.webp (100%) rename game/characters/cho/clothes/headgear/chun_li_puffies/{ => default}/outline.webp (100%) rename game/characters/cho/clothes/headgear/goggles/{ => default}/0.webp (100%) rename game/characters/cho/clothes/headgear/goggles/{ => default}/1.webp (100%) rename game/characters/cho/clothes/headgear/goggles/{ => default}/extra.webp (100%) rename game/characters/cho/clothes/headgear/goggles/{ => default}/outline.webp (100%) rename game/characters/cho/clothes/headgear/goggles/{ => default}/skin.webp (100%) rename game/characters/cho/clothes/headgear/police_cap/{ => default}/0.webp (100%) rename game/characters/cho/clothes/headgear/police_cap/{ => default}/1.webp (100%) rename game/characters/cho/clothes/headgear/police_cap/{ => default}/2.webp (100%) rename game/characters/cho/clothes/headgear/police_cap/{ => default}/3.webp (100%) rename game/characters/cho/clothes/headgear/police_cap/{ => default}/outline.webp (100%) rename game/characters/cho/clothes/headgear/smurfette/{ => default}/0.webp (100%) rename game/characters/cho/clothes/headgear/smurfette/{ => default}/outline.webp (100%) rename game/characters/cho/clothes/headgear/toon_band/{ => default}/0.webp (100%) rename game/characters/cho/clothes/headgear/toon_band/{ => default}/outline.webp (100%) rename game/characters/cho/clothes/headgear/witch/{ => default}/0.webp (100%) rename game/characters/cho/clothes/headgear/witch/{ => default}/1.webp (100%) rename game/characters/cho/clothes/headgear/witch/{ => default}/outline.webp (100%) rename game/characters/cho/clothes/headgear/witch/{ => default}/skin.webp (100%) rename game/characters/cho/clothes/makeup/lipstick/{angry.webp => angry/0.webp} (100%) rename game/characters/cho/clothes/makeup/lipstick/{annoyed.webp => annoyed/0.webp} (100%) rename game/characters/cho/clothes/makeup/lipstick/{base.webp => base/0.webp} (100%) rename game/characters/cho/clothes/makeup/lipstick/{clench.webp => clench/0.webp} (100%) rename game/characters/cho/clothes/makeup/lipstick/{crooked_smile.webp => crooked_smile/0.webp} (100%) rename game/characters/cho/clothes/makeup/lipstick/{disgust.webp => disgust/0.webp} (100%) rename game/characters/cho/clothes/makeup/lipstick/{grin.webp => grin/0.webp} (100%) rename game/characters/cho/clothes/makeup/lipstick/{horny.webp => horny/0.webp} (100%) rename game/characters/cho/clothes/makeup/lipstick/{mad.webp => mad/0.webp} (100%) rename game/characters/cho/clothes/makeup/lipstick/{normal.webp => normal/0.webp} (100%) rename game/characters/cho/clothes/makeup/lipstick/{open.webp => open/0.webp} (100%) rename game/characters/cho/clothes/makeup/lipstick/{open_tongue.webp => open_tongue/0.webp} (100%) rename game/characters/cho/clothes/makeup/lipstick/{open_wide_tongue.webp => open_wide_tongue/0.webp} (100%) rename game/characters/cho/clothes/makeup/lipstick/{quiver.webp => quiver/0.webp} (100%) rename game/characters/cho/clothes/makeup/lipstick/{scream.webp => scream/0.webp} (100%) rename game/characters/cho/clothes/makeup/lipstick/{silly.webp => silly/0.webp} (100%) rename game/characters/cho/clothes/makeup/lipstick/{smile.webp => smile/0.webp} (100%) rename game/characters/cho/clothes/makeup/lipstick/{soft.webp => soft/0.webp} (100%) rename game/characters/cho/clothes/makeup/lipstick/{upset.webp => upset/0.webp} (100%) create mode 100644 game/characters/cho/clothes/panties/bikini_bottom_1/armfix.webp create mode 100644 game/characters/cho/clothes/panties/bikini_bottom_2/armfix.webp create mode 100644 game/characters/cho/clothes/panties/sport_panties_1/armfix.webp create mode 100644 game/characters/cho/clothes/robe/robe_quidditch_1/armfix.webp create mode 100644 game/characters/cho/clothes/stockings/bunny_stockings_1/armfix.webp create mode 100644 game/characters/cho/clothes/stockings/fishnet/armfix.webp create mode 100644 game/characters/cho/clothes/stockings/lace_stockings_1/armfix.webp create mode 100644 game/characters/cho/clothes/stockings/pantyhose/armfix.webp create mode 100644 game/characters/cho/clothes/stockings/sailor/armfix.webp create mode 100644 game/characters/cho/clothes/top/chun_li_dress/armfix.webp create mode 100644 game/characters/cho/clothes/top/dress_1/armfix.webp create mode 100644 game/characters/cho/clothes/top/police/armfix.webp create mode 100644 game/characters/cho/clothes/top/smurfette/armfix.webp create mode 100644 game/characters/cho/clothes/top/top_j_school_1/armfix.webp create mode 100644 game/characters/cho/clothes/top/top_sweater_1/armfix.webp rename game/characters/cho/cum/body/{heavy.webp => heavy/cum.webp} (100%) rename game/characters/cho/cum/body/{heavy_skin.webp => heavy/skin.webp} (100%) rename game/characters/cho/cum/body/{light.webp => light/cum.webp} (100%) rename game/characters/cho/cum/body/{light_skin.webp => light/skin.webp} (100%) rename game/characters/cho/cum/breasts/{heavy.webp => heavy/cum.webp} (100%) rename game/characters/cho/cum/breasts/{heavy_skin.webp => heavy/skin.webp} (100%) rename game/characters/cho/cum/breasts/{light.webp => light/cum.webp} (100%) rename game/characters/cho/cum/breasts/{light_skin.webp => light/skin.webp} (100%) rename game/characters/cho/cum/crotch/{heavy.webp => heavy/cum.webp} (100%) rename game/characters/cho/cum/crotch/{heavy_skin.webp => heavy/skin.webp} (100%) rename game/characters/cho/cum/crotch/{light.webp => light/cum.webp} (100%) rename game/characters/cho/cum/crotch/{light_skin.webp => light/skin.webp} (100%) rename game/characters/cho/cum/face/{heavy.webp => heavy/cum.webp} (100%) rename game/characters/cho/cum/face/{heavy_skin.webp => heavy/skin.webp} (100%) rename game/characters/cho/cum/face/{light.webp => light/cum.webp} (100%) rename game/characters/cho/cum/face/{light_skin.webp => light/skin.webp} (100%) rename game/characters/cho/cum/hair/{heavy.webp => heavy/cum.webp} (100%) rename game/characters/cho/cum/hair/{light.webp => light/cum.webp} (100%) rename game/characters/cho/cum/legs/{heavy.webp => heavy/cum.webp} (100%) rename game/characters/cho/cum/legs/{heavy_skin.webp => heavy/skin.webp} (100%) rename game/characters/cho/cum/legs/{light.webp => light/cum.webp} (100%) rename game/characters/cho/cum/legs/{light_skin.webp => light/skin.webp} (100%) rename game/characters/cho/cum/pussy/{heavy.webp => heavy/cum.webp} (100%) rename game/characters/cho/cum/pussy/{light.webp => light/cum.webp} (100%) rename game/characters/cho/face/cheeks/{blush.webp => blush/expression.webp} (100%) rename game/characters/cho/face/cheeks/{heavy_blush.webp => blush_heavy/expression.webp} (100%) delete mode 100644 game/characters/cho/face/cheeks/dummy.webp rename game/characters/cho/face/eyebrows/{angry.webp => angry/expression.webp} (100%) rename game/characters/cho/face/eyebrows/{angry_skin.webp => angry/skin.webp} (100%) rename game/characters/cho/face/eyebrows/{base.webp => base/expression.webp} (100%) rename game/characters/cho/face/eyebrows/{base_skin.webp => base/skin.webp} (100%) rename game/characters/cho/face/eyebrows/{raised.webp => raised/expression.webp} (100%) rename game/characters/cho/face/eyebrows/{raised_skin.webp => raised/skin.webp} (100%) rename game/characters/cho/face/eyebrows/{worried.webp => worried/expression.webp} (100%) rename game/characters/cho/face/eyebrows/{worried_skin.webp => worried/skin.webp} (100%) rename game/characters/cho/face/eyes/{base.webp => base/expression.webp} (100%) rename game/characters/cho/face/eyes/{base_mask.webp => base/eyemask.webp} (100%) rename game/characters/cho/face/eyes/{base_skin.webp => base/skin.webp} (100%) rename game/characters/cho/face/eyes/{closed.webp => closed/expression.webp} (100%) rename game/characters/cho/face/eyes/{closed_skin.webp => closed/skin.webp} (100%) rename game/characters/cho/face/eyes/{happyCl.webp => happyCl/expression.webp} (100%) rename game/characters/cho/face/eyes/{happyCl_skin.webp => happyCl/skin.webp} (100%) rename game/characters/cho/face/eyes/{narrow.webp => narrow/expression.webp} (100%) rename game/characters/cho/face/eyes/{narrow_mask.webp => narrow/eyemask.webp} (100%) rename game/characters/cho/face/eyes/{narrow_skin.webp => narrow/skin.webp} (100%) rename game/characters/cho/face/eyes/{wide.webp => wide/expression.webp} (100%) rename game/characters/cho/face/eyes/{wide_mask.webp => wide/eyemask.webp} (100%) rename game/characters/cho/face/eyes/{wide_skin.webp => wide/skin.webp} (100%) rename game/characters/cho/face/eyes/{wink.webp => wink/expression.webp} (100%) rename game/characters/cho/face/eyes/{wink_mask.webp => wink/eyemask.webp} (100%) rename game/characters/cho/face/eyes/{wink_skin.webp => wink/skin.webp} (100%) rename game/characters/cho/face/mouth/{angry.webp => angry/expression.webp} (100%) rename game/characters/cho/face/mouth/{annoyed.webp => annoyed/expression.webp} (100%) rename game/characters/cho/face/mouth/{base.webp => base/expression.webp} (100%) rename game/characters/cho/face/mouth/{clench.webp => clench/expression.webp} (100%) rename game/characters/cho/face/mouth/{crooked_smile.webp => crooked/smile.webp} (100%) rename game/characters/cho/face/mouth/{disgust.webp => disgust/expression.webp} (100%) rename game/characters/cho/face/mouth/{grin.webp => grin/expression.webp} (100%) rename game/characters/cho/face/mouth/{horny.webp => horny/expression.webp} (100%) rename game/characters/cho/face/mouth/{mad.webp => mad/expression.webp} (100%) rename game/characters/cho/face/mouth/{normal.webp => normal/expression.webp} (100%) rename game/characters/cho/face/mouth/{open.webp => open/expression.webp} (100%) rename game/characters/cho/face/mouth/{open_tongue.webp => open_tongue/expression.webp} (100%) rename game/characters/cho/face/mouth/{open_wide_tongue.webp => open_wide/expression.webp} (100%) rename game/characters/cho/face/mouth/{quiver.webp => quiver/expression.webp} (100%) rename game/characters/cho/face/mouth/{scream.webp => scream/expression.webp} (100%) rename game/characters/cho/face/mouth/{silly.webp => silly/expression.webp} (100%) rename game/characters/cho/face/mouth/{smile.webp => smile/expression.webp} (100%) rename game/characters/cho/face/mouth/{soft.webp => soft/expression.webp} (100%) rename game/characters/cho/face/mouth/{upset.webp => upset/expression.webp} (100%) rename game/characters/cho/face/pupils/{L.webp => L/expression.webp} (100%) rename game/characters/cho/face/pupils/{R.webp => R/expression.webp} (100%) rename game/characters/cho/face/pupils/{ahegao.webp => ahegao/expression.webp} (100%) rename game/characters/cho/face/pupils/{down.webp => down/expression.webp} (100%) rename game/characters/cho/face/pupils/{downR.webp => downR/expression.webp} (100%) rename game/characters/cho/face/pupils/{mid.webp => mid/expression.webp} (100%) rename game/characters/cho/face/pupils/{stare.webp => stare/expression.webp} (100%) rename game/characters/cho/face/pupils/{up.webp => up/expression.webp} (100%) delete mode 100644 game/characters/cho/poses/broom/body/armleft/down.webp delete mode 100644 game/characters/cho/poses/broom/body/armleft/down_fix.webp delete mode 100644 game/characters/cho/poses/broom/body/armright/down.webp delete mode 100644 game/characters/cho/poses/broom/body/armright/down_fix.webp delete mode 100644 game/characters/cho/poses/broom/body/armright/snitch_fix.webp delete mode 100644 game/characters/cho/poses/broom/body/armright/up.webp delete mode 100644 game/characters/cho/poses/broom/body/breasts/normal.webp rename game/characters/cho/poses/broom/body/{base => }/front.webp (100%) rename game/characters/cho/poses/broom/body/{armright => }/snitch.webp (100%) rename game/characters/cho/poses/broom/face/cheeks/{blush.webp => blush/expression.webp} (100%) rename game/characters/cho/poses/broom/face/cheeks/{heavy_blush.webp => blush_heavy/expression.webp} (100%) rename game/characters/cho/poses/broom/face/eyebrows/{angry.webp => angry/expression.webp} (100%) rename game/characters/cho/poses/broom/face/eyebrows/{angry_skin.webp => angry/skin.webp} (100%) rename game/characters/cho/poses/broom/face/eyebrows/{base.webp => base/expression.webp} (100%) rename game/characters/cho/poses/broom/face/eyebrows/{base_skin.webp => base/skin.webp} (100%) rename game/characters/cho/poses/broom/face/eyebrows/{raised.webp => raised/expression.webp} (100%) rename game/characters/cho/poses/broom/face/eyebrows/{raised_skin.webp => raised/skin.webp} (100%) rename game/characters/cho/poses/broom/face/eyebrows/{worried.webp => worried/expression.webp} (100%) rename game/characters/cho/poses/broom/face/eyebrows/{worried_skin.webp => worried/skin.webp} (100%) rename game/characters/cho/poses/broom/face/eyes/{base.webp => base/expression.webp} (100%) rename game/characters/cho/poses/broom/face/eyes/{base_mask.webp => base/eyemask.webp} (100%) rename game/characters/cho/poses/broom/face/eyes/{base_skin.webp => base/skin.webp} (100%) rename game/characters/cho/poses/broom/face/eyes/{closed.webp => closed/expression.webp} (100%) rename game/characters/cho/poses/broom/face/eyes/{closed_skin.webp => closed/skin.webp} (100%) rename game/characters/cho/poses/broom/face/eyes/{happyCl.webp => happyCl/expression.webp} (100%) rename game/characters/cho/poses/broom/face/eyes/{happyCl_skin.webp => happyCl/skin.webp} (100%) rename game/characters/cho/poses/broom/face/eyes/{narrow.webp => narrow/expression.webp} (100%) rename game/characters/cho/poses/broom/face/eyes/{narrow_mask.webp => narrow/eyemask.webp} (100%) rename game/characters/cho/poses/broom/face/eyes/{narrow_skin.webp => narrow/skin.webp} (100%) rename game/characters/cho/poses/broom/face/eyes/{wide.webp => wide/expression.webp} (100%) rename game/characters/cho/poses/broom/face/eyes/{wide_mask.webp => wide/eyemask.webp} (100%) rename game/characters/cho/poses/broom/face/eyes/{wide_skin.webp => wide/skin.webp} (100%) rename game/characters/cho/poses/broom/face/eyes/{wink.webp => wink/expression.webp} (100%) rename game/characters/cho/poses/broom/face/eyes/{wink_mask.webp => wink/eyemask.webp} (100%) rename game/characters/cho/poses/broom/face/eyes/{wink_skin.webp => wink/skin.webp} (100%) rename game/characters/cho/poses/broom/face/mouth/{angry.webp => angry/expression.webp} (100%) rename game/characters/cho/poses/broom/face/mouth/{annoyed.webp => annoyed/expression.webp} (100%) rename game/characters/cho/poses/broom/face/mouth/{base.webp => base/expression.webp} (100%) rename game/characters/cho/poses/broom/face/mouth/{clench.webp => clench/expression.webp} (100%) rename game/characters/cho/poses/broom/face/mouth/{crooked_smile.webp => crooked/smile.webp} (100%) rename game/characters/cho/poses/broom/face/mouth/{disgust.webp => disgust/expression.webp} (100%) rename game/characters/cho/poses/broom/face/mouth/{grin.webp => grin/expression.webp} (100%) rename game/characters/cho/poses/broom/face/mouth/{horny.webp => horny/expression.webp} (100%) rename game/characters/cho/poses/broom/face/mouth/{mad.webp => mad/expression.webp} (100%) rename game/characters/cho/poses/broom/face/mouth/{normal.webp => normal/expression.webp} (100%) rename game/characters/cho/poses/broom/face/mouth/{open.webp => open/expression.webp} (100%) rename game/characters/cho/poses/broom/face/mouth/{open_tongue.webp => open_tongue/expression.webp} (100%) rename game/characters/cho/poses/broom/face/mouth/{open_wide_tongue.webp => open_wide/expression.webp} (100%) rename game/characters/cho/poses/broom/face/mouth/{pout.webp => pout/expression.webp} (100%) rename game/characters/cho/poses/broom/face/mouth/{quiver.webp => quiver/expression.webp} (100%) rename game/characters/cho/poses/broom/face/mouth/{scream.webp => scream/expression.webp} (100%) rename game/characters/cho/poses/broom/face/mouth/{silly.webp => silly/expression.webp} (100%) rename game/characters/cho/poses/broom/face/mouth/{smile.webp => smile/expression.webp} (100%) rename game/characters/cho/poses/broom/face/mouth/{soft.webp => soft/expression.webp} (100%) rename game/characters/cho/poses/broom/face/mouth/{upset.webp => upset/expression.webp} (100%) rename game/characters/cho/poses/broom/face/pupils/{L.webp => L/expression.webp} (100%) rename game/characters/cho/poses/broom/face/pupils/{R.webp => R/expression.webp} (100%) rename game/characters/cho/poses/broom/face/pupils/{ahegao.webp => ahegao/expression.webp} (100%) rename game/characters/cho/poses/broom/face/pupils/{down.webp => down/expression.webp} (100%) rename game/characters/cho/poses/broom/face/pupils/{downR.webp => downR/expression.webp} (100%) rename game/characters/cho/poses/broom/face/pupils/{mid.webp => mid/expression.webp} (100%) rename game/characters/cho/poses/broom/face/pupils/{up.webp => up/expression.webp} (100%) delete mode 100644 game/characters/cho/poses/broom/loadable.webp delete mode 100644 game/characters/hermione/body/base/back.webp rename game/characters/hermione/body/{base => }/front.webp (100%) delete mode 100644 game/characters/hermione/body/kneel/kneel_arm.webp delete mode 100644 game/characters/hermione/body/kneel/kneel_base.webp delete mode 100644 game/characters/hermione/body/kneel/kneel_base_2.webp delete mode 100644 game/characters/hermione/body/kneel/kneel_cock.webp delete mode 100644 game/characters/hermione/body/kneel/kneel_cum_1.webp delete mode 100644 game/characters/hermione/body/kneel/kneel_hair.webp delete mode 100644 game/characters/hermione/body/kneel/kneel_leg.webp rename game/characters/hermione/body/{armleft/down.webp => larm_zorder_1.webp} (100%) create mode 100644 game/characters/hermione/body/nbreasts_zorder_2.webp rename game/characters/hermione/body/{armright/down.webp => rarm_zorder_1.webp} (100%) rename game/characters/hermione/clothes/headgear/antlers/{ => default}/0.webp (100%) rename game/characters/hermione/clothes/headgear/antlers/{ => default}/outline.webp (100%) rename game/characters/hermione/clothes/headgear/antlers_2/{ => default}/0.webp (100%) rename game/characters/hermione/clothes/headgear/antlers_2/{ => default}/1.webp (100%) rename game/characters/hermione/clothes/headgear/antlers_2/{ => default}/2.webp (100%) rename game/characters/hermione/clothes/headgear/antlers_2/{ => default}/outline.webp (100%) rename game/characters/hermione/clothes/headgear/bunny_hat_1/{ => default}/0.webp (100%) rename game/characters/hermione/clothes/headgear/bunny_hat_1/{ => default}/1.webp (100%) rename game/characters/hermione/clothes/headgear/bunny_hat_1/{ => default}/outline.webp (100%) rename game/characters/hermione/clothes/headgear/bunny_hat_2/{ => default}/0.webp (100%) rename game/characters/hermione/clothes/headgear/bunny_hat_2/{ => default}/1.webp (100%) rename game/characters/hermione/clothes/headgear/bunny_hat_2/{ => default}/2.webp (100%) rename game/characters/hermione/clothes/headgear/bunny_hat_2/{ => default}/outline.webp (100%) rename game/characters/hermione/clothes/headgear/cat_ears/{ => default}/0.webp (100%) rename game/characters/hermione/clothes/headgear/cat_ears/{ => default}/1.webp (100%) rename game/characters/hermione/clothes/headgear/cat_ears/{ => default}/outline.webp (100%) rename game/characters/hermione/clothes/headgear/elf/{ => default}/0.webp (100%) rename game/characters/hermione/clothes/headgear/elf/{ => default}/1.webp (100%) rename game/characters/hermione/clothes/headgear/elf/{ => default}/extra.webp (100%) rename game/characters/hermione/clothes/headgear/elf/{ => default}/outline.webp (100%) rename game/characters/hermione/clothes/headgear/maid_hat_1/{ => default}/0.webp (100%) rename game/characters/hermione/clothes/headgear/maid_hat_1/{ => default}/outline.webp (100%) rename game/characters/hermione/clothes/headgear/panties_on_head/{ => default}/0.webp (100%) rename game/characters/hermione/clothes/headgear/panties_on_head/{ => default}/outline.webp (100%) rename game/characters/hermione/clothes/headgear/poker_hat_1/{ => default}/0.webp (100%) rename game/characters/hermione/clothes/headgear/poker_hat_1/{ => default}/1.webp (100%) rename game/characters/hermione/clothes/headgear/poker_hat_1/{ => default}/2.webp (100%) rename game/characters/hermione/clothes/headgear/poker_hat_1/{ => default}/extra.webp (100%) rename game/characters/hermione/clothes/headgear/poker_hat_1/{ => default}/outline.webp (100%) rename game/characters/hermione/clothes/headgear/poker_hat_1/{ => default}/overlay.webp (100%) rename game/characters/hermione/clothes/headgear/poker_hat_2/{ => default}/0.webp (100%) rename game/characters/hermione/clothes/headgear/poker_hat_2/{ => default}/1.webp (100%) rename game/characters/hermione/clothes/headgear/poker_hat_2/{ => default}/2.webp (100%) rename game/characters/hermione/clothes/headgear/poker_hat_2/{ => default}/extra.webp (100%) rename game/characters/hermione/clothes/headgear/poker_hat_2/{ => default}/outline.webp (100%) rename game/characters/hermione/clothes/headgear/poker_hat_2/{ => default}/overlay.webp (100%) rename game/characters/hermione/clothes/makeup/lipstick/{angry.webp => angry/0.webp} (100%) rename game/characters/hermione/clothes/makeup/lipstick/{annoyed.webp => annoyed/0.webp} (100%) rename game/characters/hermione/clothes/makeup/lipstick/{base.webp => base/0.webp} (100%) rename game/characters/hermione/clothes/makeup/lipstick/{clench.webp => clench/0.webp} (100%) rename game/characters/hermione/clothes/makeup/lipstick/{crooked_smile.webp => crooked_smile/0.webp} (100%) rename game/characters/hermione/clothes/makeup/lipstick/{cum.webp => cum/0.webp} (100%) rename game/characters/hermione/clothes/makeup/lipstick/{disgust.webp => disgust/0.webp} (100%) rename game/characters/hermione/clothes/makeup/lipstick/{full.webp => full/0.webp} (100%) rename game/characters/hermione/clothes/makeup/lipstick/{full_cum.webp => full_cum/0.webp} (100%) rename game/characters/hermione/clothes/makeup/lipstick/{full_panties.webp => full_panties/0.webp} (100%) rename game/characters/hermione/clothes/makeup/lipstick/{grin.webp => grin/0.webp} (100%) rename game/characters/hermione/clothes/makeup/lipstick/{mad.webp => mad/0.webp} (100%) rename game/characters/hermione/clothes/makeup/lipstick/{normal.webp => normal/0.webp} (100%) rename game/characters/hermione/clothes/makeup/lipstick/{open.webp => open/0.webp} (100%) rename game/characters/hermione/clothes/makeup/lipstick/{open_tongue.webp => open_tongue/0.webp} (100%) rename game/characters/hermione/clothes/makeup/lipstick/{open_wide_tongue.webp => open_wide_tongue/0.webp} (100%) rename game/characters/hermione/clothes/makeup/lipstick/{open_wide_tongue_cum.webp => open_wide_tongue_cum/0.webp} (100%) rename game/characters/hermione/clothes/makeup/lipstick/{open_wide_tongue_panties.webp => open_wide_tongue_panties/0.webp} (100%) rename game/characters/hermione/clothes/makeup/lipstick/{scream.webp => scream/0.webp} (100%) rename game/characters/hermione/clothes/makeup/lipstick/{shock.webp => shock/0.webp} (100%) rename game/characters/hermione/clothes/makeup/lipstick/{silly.webp => silly/0.webp} (100%) rename game/characters/hermione/clothes/makeup/lipstick/{smile.webp => smile/0.webp} (100%) rename game/characters/hermione/clothes/makeup/lipstick/{soft.webp => soft/0.webp} (100%) rename game/characters/hermione/clothes/makeup/lipstick/{upset.webp => upset/0.webp} (100%) rename game/characters/hermione/cum/body/{heavy.webp => heavy/cum.webp} (100%) rename game/characters/hermione/cum/body/{light.webp => light/cum.webp} (100%) rename game/characters/hermione/cum/breasts/{heavy.webp => heavy/cum.webp} (100%) rename game/characters/hermione/cum/breasts/{light.webp => light/cum.webp} (100%) rename game/characters/hermione/cum/crotch/{heavy.webp => heavy/cum.webp} (100%) rename game/characters/hermione/cum/crotch/{light.webp => light/cum.webp} (100%) rename game/characters/hermione/cum/face/{heavy.webp => heavy/cum.webp} (100%) rename game/characters/hermione/cum/face/{light.webp => light/cum.webp} (100%) rename game/characters/hermione/cum/hair/{heavy.webp => heavy/cum.webp} (100%) rename game/characters/hermione/cum/hair/{light.webp => light/cum.webp} (100%) rename game/characters/hermione/cum/legs/{heavy.webp => heavy/cum.webp} (100%) rename game/characters/hermione/cum/legs/{light.webp => light/cum.webp} (100%) rename game/characters/hermione/cum/pussy/{heavy.webp => heavy/cum.webp} (100%) rename game/characters/hermione/cum/pussy/{light.webp => light/cum.webp} (100%) rename game/characters/hermione/cum/pussy/{squirt.webp => squirt/cum.webp} (100%) rename game/characters/hermione/cum/pussy/{squirt_post.webp => squirt_post/cum.webp} (100%) rename game/characters/hermione/cum/pussy/{squirt_transition.webp => squirt_transition/cum.webp} (100%) rename game/characters/hermione/cum/pussy/{underwear_heavy.webp => underwear_heavy/cum.webp} (100%) rename game/characters/hermione/cum/pussy/{underwear_light.webp => underwear_light/cum.webp} (100%) rename game/characters/hermione/cum/pussy/{vibrator_post.webp => vibrator_post/cum.webp} (100%) rename game/characters/hermione/cum/pussy/{vibrator_pre.webp => vibrator_pre/cum.webp} (100%) rename game/characters/hermione/cum/pussy/{vibrator_squirt.webp => vibrator_squirt/cum.webp} (100%) rename game/characters/hermione/cum/pussy/{vibratorp_heavy.webp => vibratorp_heavy/cum.webp} (100%) rename game/characters/hermione/cum/pussy/{vibratorp_light.webp => vibratorp_light/cum.webp} (100%) rename game/characters/hermione/cum/pussy/{wet.webp => wet/cum.webp} (100%) rename game/characters/hermione/face/cheeks/{blush.webp => blush/expression.webp} (100%) rename game/characters/hermione/face/eyebrows/{angry.webp => angry/expression.webp} (100%) rename game/characters/hermione/face/eyebrows/{angry_skin.webp => angry/skin.webp} (100%) rename game/characters/hermione/face/eyebrows/{annoyed.webp => annoyed/expression.webp} (100%) rename game/characters/hermione/face/eyebrows/{annoyed_skin.webp => annoyed/skin.webp} (100%) rename game/characters/hermione/face/eyebrows/{base.webp => base/expression.webp} (100%) rename game/characters/hermione/face/eyebrows/{base_skin.webp => base/skin.webp} (100%) rename game/characters/hermione/face/eyebrows/{low.webp => low/expression.webp} (100%) rename game/characters/hermione/face/eyebrows/{low_skin.webp => low/skin.webp} (100%) rename game/characters/hermione/face/eyebrows/{worried.webp => worried/expression.webp} (100%) rename game/characters/hermione/face/eyebrows/{worried_skin.webp => worried/skin.webp} (100%) rename game/characters/hermione/face/eyes/{base.webp => base/expression.webp} (100%) rename game/characters/hermione/face/eyes/{base_mask.webp => base/eyemask.webp} (100%) rename game/characters/hermione/face/eyes/{closed.webp => closed/expression.webp} (100%) rename game/characters/hermione/face/eyes/{happy.webp => happy/expression.webp} (100%) rename game/characters/hermione/face/eyes/{happy_mask.webp => happy/eyemask.webp} (100%) rename game/characters/hermione/face/eyes/{happyCl.webp => happyCl/expression.webp} (100%) rename game/characters/hermione/face/eyes/{narrow.webp => narrow/expression.webp} (100%) rename game/characters/hermione/face/eyes/{narrow_mask.webp => narrow/eyemask.webp} (100%) rename game/characters/hermione/face/eyes/{slit.webp => slit/expression.webp} (100%) rename game/characters/hermione/face/eyes/{slit_mask.webp => slit/eyemask.webp} (100%) rename game/characters/hermione/face/eyes/{squint.webp => squint/expression.webp} (100%) rename game/characters/hermione/face/eyes/{squint_mask.webp => squint/eyemask.webp} (100%) rename game/characters/hermione/face/eyes/{wide.webp => wide/expression.webp} (100%) rename game/characters/hermione/face/eyes/{wide_mask.webp => wide/eyemask.webp} (100%) rename game/characters/hermione/face/eyes/{wink.webp => wink/expression.webp} (100%) rename game/characters/hermione/face/eyes/{wink_mask.webp => wink/eyemask.webp} (100%) rename game/characters/hermione/face/mouth/{angry.webp => angry/expression.webp} (100%) rename game/characters/hermione/face/mouth/{annoyed.webp => annoyed/expression.webp} (100%) rename game/characters/hermione/face/mouth/{base.webp => base/expression.webp} (100%) rename game/characters/hermione/face/mouth/{clench.webp => clench/expression.webp} (100%) rename game/characters/hermione/face/mouth/{crooked_smile.webp => crooked_smile/expression.webp} (100%) rename game/characters/hermione/face/mouth/{cum.webp => cum/expression.webp} (100%) rename game/characters/hermione/face/mouth/{disgust.webp => disgust/expression.webp} (100%) rename game/characters/hermione/face/mouth/{full.webp => full/expression.webp} (100%) rename game/characters/hermione/face/mouth/{full_cum.webp => full_cum/expression.webp} (100%) rename game/characters/hermione/face/mouth/{full_panties.webp => full_panties/expression.webp} (100%) rename game/characters/hermione/face/mouth/{grin.webp => grin/expression.webp} (100%) rename game/characters/hermione/face/mouth/{mad.webp => mad/expression.webp} (100%) rename game/characters/hermione/face/mouth/{normal.webp => normal/expression.webp} (100%) rename game/characters/hermione/face/mouth/{open.webp => open/expression.webp} (100%) rename game/characters/hermione/face/mouth/{open_tongue.webp => open_tongue/expression.webp} (100%) rename game/characters/hermione/face/mouth/{open_wide_tongue.webp => open_wide/expression.webp} (100%) delete mode 100644 game/characters/hermione/face/mouth/open_wide_tongue_cum.webp delete mode 100644 game/characters/hermione/face/mouth/open_wide_tongue_panties.webp rename game/characters/hermione/face/mouth/{scream.webp => scream/expression.webp} (100%) rename game/characters/hermione/face/mouth/{shock.webp => shock/expression.webp} (100%) rename game/characters/hermione/face/mouth/{silly.webp => silly/expression.webp} (100%) rename game/characters/hermione/face/mouth/{smile.webp => smile/expression.webp} (100%) rename game/characters/hermione/face/mouth/{soft.webp => soft/expression.webp} (100%) rename game/characters/hermione/face/mouth/{upset.webp => upset/expression.webp} (100%) rename game/characters/hermione/face/pupils/{L.webp => L/expression.webp} (100%) rename game/characters/hermione/face/pupils/{L_soft.webp => L_soft/expression.webp} (100%) rename game/characters/hermione/face/pupils/{R.webp => R/expression.webp} (100%) rename game/characters/hermione/face/pupils/{R_soft.webp => R_soft/expression.webp} (100%) rename game/characters/hermione/face/pupils/{ahegao.webp => ahegao/expression.webp} (100%) rename game/characters/hermione/face/pupils/{dead.webp => dead/expression.webp} (100%) rename game/characters/hermione/face/pupils/{down.webp => down/expression.webp} (100%) rename game/characters/hermione/face/pupils/{down_soft.webp => down_soft/expression.webp} (100%) rename game/characters/hermione/face/pupils/{mid.webp => mid/expression.webp} (100%) rename game/characters/hermione/face/pupils/{mid_soft.webp => mid_soft/expression.webp} (100%) rename game/characters/hermione/face/pupils/{shocked.webp => shocked/expression.webp} (100%) rename game/characters/hermione/face/pupils/{squint.webp => squint/expression.webp} (100%) rename game/characters/hermione/face/pupils/{squint_soft.webp => squint_soft/expression.webp} (100%) rename game/characters/hermione/face/pupils/{stare.webp => stare/expression.webp} (100%) rename game/characters/hermione/face/pupils/{stare_soft.webp => stare_soft/expression.webp} (100%) rename game/characters/hermione/face/pupils/{up.webp => up/expression.webp} (100%) rename game/characters/hermione/face/pupils/{up_soft.webp => up_soft/expression.webp} (100%) rename game/characters/hermione/face/tears/{crying.webp => crying/expression.webp} (100%) rename game/characters/hermione/face/tears/{crying_blink.webp => crying_blink/expression.webp} (100%) rename game/characters/hermione/face/tears/{mascara.webp => mascara/expression.webp} (100%) rename game/characters/hermione/face/tears/{mascara_crying.webp => mascara_cryng/expression.webp} (100%) rename game/characters/hermione/face/tears/{mascara_soft.webp => mascara_soft/expression.webp} (100%) delete mode 100644 game/characters/hermione/face/tears/mascara_soft_blink.webp rename game/characters/hermione/face/tears/{messy.webp => messy/expression.webp} (100%) rename game/characters/hermione/face/tears/{soft.webp => soft/expression.webp} (100%) rename game/characters/hermione/face/tears/{soft_blink.webp => soft_blink/expression.webp} (100%) rename game/characters/hermione/face/tears/{sweat.webp => sweat/expression.webp} (100%) rename game/characters/hermione/face/tears/{tears_crying_side.webp => tears_crying/expression.webp} (100%) rename game/characters/hermione/face/tears/{tears_down.webp => tears_down/expression.webp} (100%) rename game/characters/hermione/face/tears/{tears_mascara_crying_blink.webp => tears_mascara/expression.webp} (100%) rename game/characters/hermione/face/tears/{tears_soft_sweat.webp => tears_soft/expression.webp} (100%) rename game/characters/hooch/body/{base => }/front.webp (100%) rename game/characters/hooch/face/cheeks/{blush.webp => blush/expression.webp} (100%) rename game/characters/hooch/face/cheeks/{blush_heavy.webp => blush_heavy/expression.webp} (100%) rename game/characters/hooch/face/eyebrows/{angry.webp => angry/expression.webp} (100%) rename game/characters/hooch/face/eyebrows/{base.webp => base/expression.webp} (100%) rename game/characters/hooch/face/eyebrows/{raised.webp => raised/expression.webp} (100%) rename game/characters/hooch/face/eyebrows/{shocked.webp => shocked/expression.webp} (100%) rename game/characters/hooch/face/eyebrows/{worried.webp => worried/expression.webp} (100%) rename game/characters/hooch/face/eyes/{base.webp => base/expression.webp} (100%) rename game/characters/hooch/face/eyes/{base_mask.webp => base/eyemask.webp} (100%) rename game/characters/hooch/face/eyes/{closed.webp => closed/expression.webp} (100%) rename game/characters/hooch/face/eyes/{narrow.webp => narrow/expression.webp} (100%) rename game/characters/hooch/face/eyes/{narrow_mask.webp => narrow/eyemask.webp} (100%) rename game/characters/hooch/face/eyes/{shocked.webp => shocked/expression.webp} (100%) rename game/characters/hooch/face/eyes/{shocked_mask.webp => shocked/eyemask.webp} (100%) rename game/characters/hooch/face/eyes/{wink.webp => wink/expression.webp} (100%) rename game/characters/hooch/face/eyes/{wink_mask.webp => wink/eyemask.webp} (100%) rename game/characters/hooch/face/mouth/{angry.webp => angry/expression.webp} (100%) rename game/characters/hooch/face/mouth/{base.webp => base/expression.webp} (100%) rename game/characters/hooch/face/mouth/{grin.webp => grin/expression.webp} (100%) rename game/characters/hooch/face/mouth/{normal.webp => normal/expression.webp} (100%) rename game/characters/hooch/face/mouth/{open.webp => open/expression.webp} (100%) rename game/characters/hooch/face/pupils/{L.webp => L/expression.webp} (100%) rename game/characters/hooch/face/pupils/{R.webp => R/expression.webp} (100%) rename game/characters/hooch/face/pupils/{down.webp => down/expression.webp} (100%) rename game/characters/hooch/face/pupils/{downL.webp => downL/expression.webp} (100%) rename game/characters/hooch/face/pupils/{downR.webp => downR/expression.webp} (100%) rename game/characters/hooch/face/pupils/{mid.webp => mid/expression.webp} (100%) rename game/characters/hooch/face/pupils/{stare.webp => stare/expression.webp} (100%) rename game/characters/hooch/face/pupils/{up.webp => up/expression.webp} (100%) delete mode 100644 game/characters/luna/body/armleft/down.webp delete mode 100644 game/characters/luna/body/armright/down.webp delete mode 100644 game/characters/luna/body/breasts/normal_tight.webp rename game/characters/luna/body/{base => }/front.webp (100%) rename game/characters/luna/body/{armleft/up.webp => larm_zorder_2.webp} (100%) rename game/characters/luna/body/{breasts/normal.webp => nbreasts_zorder_1.webp} (100%) rename game/characters/luna/body/{armright/up.webp => rarm_zorder_2.webp} (100%) rename game/characters/luna/clothes/headgear/antlers/{ => default}/0.webp (100%) rename game/characters/luna/clothes/headgear/antlers/{ => default}/1.webp (100%) rename game/characters/luna/clothes/headgear/antlers/{ => default}/2.webp (100%) rename game/characters/luna/clothes/headgear/antlers/{ => default}/extra.webp (100%) rename game/characters/luna/clothes/headgear/antlers/{ => default}/outline.webp (100%) rename game/characters/luna/clothes/headgear/bunny_hat_1/{ => default}/0.webp (100%) rename game/characters/luna/clothes/headgear/bunny_hat_1/{ => default}/1.webp (100%) rename game/characters/luna/clothes/headgear/bunny_hat_1/{ => default}/outline.webp (100%) rename game/characters/luna/clothes/headgear/flight_attendant/{ => default}/0.webp (100%) rename game/characters/luna/clothes/headgear/flight_attendant/{ => default}/outline.webp (100%) rename game/characters/luna/cum/body/{heavy.webp => heavy/cum.webp} (100%) rename game/characters/luna/cum/body/{light.webp => light/cum.webp} (100%) rename game/characters/luna/cum/breasts/{heavy.webp => heavy/cum.webp} (100%) rename game/characters/luna/cum/breasts/{light.webp => light/cum.webp} (100%) rename game/characters/luna/cum/crotch/{heavy.webp => heavy/cum.webp} (100%) rename game/characters/luna/cum/crotch/{light.webp => light/cum.webp} (100%) rename game/characters/luna/cum/face/{heavy.webp => heavy/cum.webp} (100%) rename game/characters/luna/cum/face/{light.webp => light/cum.webp} (100%) rename game/characters/luna/cum/hair/{heavy.webp => heavy/cum.webp} (100%) rename game/characters/luna/cum/hair/{light.webp => light/cum.webp} (100%) rename game/characters/luna/cum/legs/{heavy.webp => heavy/cum.webp} (100%) rename game/characters/luna/cum/legs/{light.webp => light/cum.webp} (100%) rename game/characters/luna/cum/pussy/{heavy.webp => heavy/cum.webp} (100%) rename game/characters/luna/cum/pussy/{light.webp => light/cum.webp} (100%) rename game/characters/luna/cum/pussy/{squirt.webp => squirt/cum.webp} (100%) rename game/characters/luna/cum/pussy/{squirt_post.webp => squirt_post/cum.webp} (100%) rename game/characters/luna/cum/pussy/{wet.webp => wet/cum.webp} (100%) rename game/characters/luna/face/cheeks/{blush.webp => blush/expression.webp} (100%) rename game/characters/luna/face/eyebrows/{angry.webp => angry/expression.webp} (100%) rename game/characters/luna/face/eyebrows/{angry_skin.webp => angry/skin.webp} (100%) rename game/characters/luna/face/eyebrows/{annoyed.webp => annoyed/expression.webp} (100%) rename game/characters/luna/face/eyebrows/{annoyed_skin.webp => annoyed/skin.webp} (100%) rename game/characters/luna/face/eyebrows/{base.webp => base/expression.webp} (100%) rename game/characters/luna/face/eyebrows/{base_skin.webp => base/skin.webp} (100%) rename game/characters/luna/face/eyebrows/{low.webp => low/expression.webp} (100%) rename game/characters/luna/face/eyebrows/{low_skin.webp => low/skin.webp} (100%) rename game/characters/luna/face/eyebrows/{raised.webp => raised/expression.webp} (100%) rename game/characters/luna/face/eyebrows/{raised_skin.webp => raised/skin.webp} (100%) rename game/characters/luna/face/eyebrows/{worried.webp => worried/expression.webp} (100%) rename game/characters/luna/face/eyebrows/{worried_skin.webp => worried/skin.webp} (100%) rename game/characters/luna/face/eyes/{base.webp => base/expression.webp} (100%) rename game/characters/luna/face/eyes/{base_mask.webp => base/mask.webp} (100%) rename game/characters/luna/face/eyes/{base_skin.webp => base/skin.webp} (100%) rename game/characters/luna/face/eyes/{closed.webp => closed/expression.webp} (100%) rename game/characters/luna/face/eyes/{closed_skin.webp => closed/skin.webp} (100%) rename game/characters/luna/face/eyes/{happyCl.webp => happyCl/expression.webp} (100%) rename game/characters/luna/face/eyes/{happyCl_skin.webp => happyCl/skin.webp} (100%) rename game/characters/luna/face/eyes/{narrow.webp => narrow/expression.webp} (100%) rename game/characters/luna/face/eyes/{narrow_mask.webp => narrow/mask.webp} (100%) rename game/characters/luna/face/eyes/{narrow_skin.webp => narrow/skin.webp} (100%) rename game/characters/luna/face/eyes/{wide.webp => wide/expression.webp} (100%) rename game/characters/luna/face/eyes/{wide_mask.webp => wide/mask.webp} (100%) rename game/characters/luna/face/eyes/{wide_skin.webp => wide/skin.webp} (100%) rename game/characters/luna/face/eyes/{wink.webp => wink/expression.webp} (100%) rename game/characters/luna/face/eyes/{wink_mask.webp => wink/mask.webp} (100%) rename game/characters/luna/face/eyes/{wink_skin.webp => wink/skin.webp} (100%) rename game/characters/luna/face/mouth/{angry.webp => angry/expression.webp} (100%) rename game/characters/luna/face/mouth/{annoyed.webp => annoyed/expression.webp} (100%) rename game/characters/luna/face/mouth/{base.webp => base/expression.webp} (100%) rename game/characters/luna/face/mouth/{clench.webp => clench/expression.webp} (100%) rename game/characters/luna/face/mouth/{crooked_smile.webp => crooked_smile/expression.webp} (100%) rename game/characters/luna/face/mouth/{disgust.webp => disgust/expression.webp} (100%) rename game/characters/luna/face/mouth/{full.webp => full/expression.webp} (100%) rename game/characters/luna/face/mouth/{grin.webp => grin/expression.webp} (100%) rename game/characters/luna/face/mouth/{mad.webp => mad/expression.webp} (100%) rename game/characters/luna/face/mouth/{normal.webp => normal/expression.webp} (100%) rename game/characters/luna/face/mouth/{open.webp => open/expression.webp} (100%) rename game/characters/luna/face/mouth/{open_tongue.webp => open_tongue/expression.webp} (100%) rename game/characters/luna/face/mouth/{open_wide_tongue.webp => open_wide/expression.webp} (100%) rename game/characters/luna/face/mouth/{scream.webp => scream/expression.webp} (100%) rename game/characters/luna/face/mouth/{shock.webp => shock/expression.webp} (100%) rename game/characters/luna/face/mouth/{silly.webp => silly/expression.webp} (100%) rename game/characters/luna/face/mouth/{smile.webp => smile/expression.webp} (100%) rename game/characters/luna/face/mouth/{soft.webp => soft/expression.webp} (100%) rename game/characters/luna/face/mouth/{upset.webp => upset/expression.webp} (100%) rename game/characters/luna/face/pupils/{L.webp => L/expression.webp} (100%) rename game/characters/luna/face/pupils/{R.webp => R/expression.webp} (100%) rename game/characters/luna/face/pupils/{ahegao.webp => ahegao/expression.webp} (100%) rename game/characters/luna/face/pupils/{dead.webp => dead/expression.webp} (100%) rename game/characters/luna/face/pupils/{down.webp => down/expression.webp} (100%) rename game/characters/luna/face/pupils/{downL.webp => downL/expression.webp} (100%) rename game/characters/luna/face/pupils/{downR.webp => downR/expression.webp} (100%) rename game/characters/luna/face/pupils/{mid.webp => mid/expression.webp} (100%) rename game/characters/luna/face/pupils/{squint.webp => squint/expression.webp} (100%) rename game/characters/luna/face/pupils/{stare.webp => stare/expression.webp} (100%) rename game/characters/luna/face/pupils/{up.webp => up/expression.webp} (100%) rename game/characters/luna/face/tears/{crying.webp => crying/expression.webp} (100%) delete mode 100644 game/characters/luna/face/tears/crying_blink.webp rename game/characters/{cho/poses/broom/face/extras/tears_2.webp => luna/face/tears/crying_blink/expression.webp} (100%) delete mode 100644 game/characters/luna/face/tears/mascara.webp rename game/characters/{cho/poses/broom/face/extras/tears_3.webp => luna/face/tears/mascara/expression.webp} (100%) delete mode 100644 game/characters/luna/face/tears/messy.webp rename game/characters/{cho/poses/broom/face/extras/tears_4.webp => luna/face/tears/messy/expression.webp} (100%) delete mode 100644 game/characters/luna/face/tears/soft.webp rename game/characters/{cho/poses/broom/face/extras/tears_1.webp => luna/face/tears/soft/expression.webp} (100%) rename game/characters/susan/body/{base => }/front.webp (100%) rename game/characters/susan/clothes/headgear/priestess_headdress/{ => default}/0.webp (100%) rename game/characters/susan/clothes/headgear/priestess_headdress/{ => default}/0_back.webp (100%) rename game/characters/susan/clothes/headgear/priestess_headdress/{ => default}/1.webp (100%) rename game/characters/susan/clothes/headgear/priestess_headdress/{ => default}/mask.webp (100%) rename game/characters/susan/clothes/headgear/priestess_headdress/{ => default}/outline.webp (100%) rename game/characters/susan/clothes/headgear/priestess_headdress/{ => default}/outline_back.webp (100%) rename game/characters/susan/face/cheeks/{blush.webp => blush/expression.webp} (100%) rename game/characters/susan/face/eyebrows/{angry.webp => angry/expression.webp} (100%) rename game/characters/susan/face/eyebrows/{angry_skin.webp => angry/skin.webp} (100%) rename game/characters/susan/face/eyebrows/{annoyed.webp => annoyed/expression.webp} (100%) rename game/characters/susan/face/eyebrows/{annoyed_skin.webp => annoyed/skin.webp} (100%) rename game/characters/susan/face/eyebrows/{base.webp => base/expression.webp} (100%) rename game/characters/susan/face/eyebrows/{base_skin.webp => base/skin.webp} (100%) rename game/characters/susan/face/eyebrows/{low.webp => low/expression.webp} (100%) rename game/characters/susan/face/eyebrows/{low_skin.webp => low/skin.webp} (100%) rename game/characters/susan/face/eyebrows/{raised.webp => raised/expression.webp} (100%) rename game/characters/susan/face/eyebrows/{raised_skin.webp => raised/skin.webp} (100%) rename game/characters/susan/face/eyebrows/{sad.webp => sad/expression.webp} (100%) rename game/characters/susan/face/eyebrows/{sad_skin.webp => sad/skin.webp} (100%) rename game/characters/susan/face/eyebrows/{shocked.webp => shocked/expression.webp} (100%) rename game/characters/susan/face/eyebrows/{shocked_skin.webp => shocked/skin.webp} (100%) rename game/characters/susan/face/eyebrows/{worried.webp => worried/expression.webp} (100%) rename game/characters/susan/face/eyebrows/{worried_skin.webp => worried/skin.webp} (100%) rename game/characters/susan/face/eyes/{base.webp => base/expression.webp} (100%) rename game/characters/susan/face/eyes/{base_mask.webp => base/eyemask.webp} (100%) rename game/characters/susan/face/eyes/{base_skin.webp => base/skin.webp} (100%) rename game/characters/susan/face/eyes/{closed.webp => closed/expression.webp} (100%) rename game/characters/susan/face/eyes/{closed_skin.webp => closed/skin.webp} (100%) rename game/characters/susan/face/eyes/{happy.webp => happy/expression.webp} (100%) rename game/characters/susan/face/eyes/{happy_mask.webp => happy/eyemask.webp} (100%) rename game/characters/susan/face/eyes/{happy_skin.webp => happy/skin.webp} (100%) rename game/characters/susan/face/eyes/{happyCl.webp => happyCl/expression.webp} (100%) rename game/characters/susan/face/eyes/{happyCl_skin.webp => happyCl/skin.webp} (100%) rename game/characters/susan/face/eyes/{narrow.webp => narrow/expression.webp} (100%) rename game/characters/susan/face/eyes/{narrow_mask.webp => narrow/eyemask.webp} (100%) rename game/characters/susan/face/eyes/{narrow_skin.webp => narrow/skin.webp} (100%) rename game/characters/susan/face/eyes/{wide.webp => wide/expression.webp} (100%) rename game/characters/susan/face/eyes/{wide_mask.webp => wide/eyemask.webp} (100%) rename game/characters/susan/face/eyes/{wide_skin.webp => wide/skin.webp} (100%) rename game/characters/susan/face/eyes/{wink.webp => wink/expression.webp} (100%) rename game/characters/susan/face/eyes/{wink_mask.webp => wink/eyemask.webp} (100%) rename game/characters/susan/face/eyes/{wink_skin.webp => wink/skin.webp} (100%) rename game/characters/susan/face/mouth/{ahegao.webp => ahegao/expression.webp} (100%) rename game/characters/susan/face/mouth/{ahegao_drool.webp => ahegao_drool/expression.webp} (100%) rename game/characters/susan/face/mouth/{angry.webp => angry/expression.webp} (100%) rename game/characters/susan/face/mouth/{annoyed.webp => annoyed/expression.webp} (100%) rename game/characters/susan/face/mouth/{base.webp => base/expression.webp} (100%) rename game/characters/susan/face/mouth/{clench.webp => clench/expression.webp} (100%) rename game/characters/susan/face/mouth/{disgust.webp => disgust/expression.webp} (100%) rename game/characters/susan/face/mouth/{grin.webp => grin/expression.webp} (100%) rename game/characters/susan/face/mouth/{horny.webp => horny/expression.webp} (100%) rename game/characters/susan/face/mouth/{normal.webp => normal/expression.webp} (100%) rename game/characters/susan/face/mouth/{open.webp => open/expression.webp} (100%) rename game/characters/susan/face/mouth/{open_tongue.webp => open_tongue/expression.webp} (100%) rename game/characters/susan/face/mouth/{open_wide.webp => open_wide/expression.webp} (100%) delete mode 100644 game/characters/susan/face/mouth/open_wide_tongue.webp rename game/characters/susan/face/mouth/{smile.webp => smile/expression.webp} (100%) rename game/characters/susan/face/mouth/{soft.webp => soft/expression.webp} (100%) rename game/characters/susan/face/mouth/{upset.webp => upset/expression.webp} (100%) rename game/characters/susan/face/pupils/{ahegao.webp => ahegao/expression.webp} (100%) rename game/characters/susan/face/pupils/{down.webp => down/expression.webp} (100%) rename game/characters/susan/face/pupils/{downL.webp => downL/expression.webp} (100%) rename game/characters/susan/face/pupils/{downR.webp => downR/expression.webp} (100%) rename game/characters/susan/face/pupils/{left.webp => left/expression.webp} (100%) rename game/characters/susan/face/pupils/{mid.webp => mid/expression.webp} (100%) rename game/characters/susan/face/pupils/{right.webp => right/expression.webp} (100%) rename game/characters/susan/face/pupils/{stare.webp => stare/expression.webp} (100%) rename game/characters/susan/face/pupils/{unfocused.webp => unfocused/expression.webp} (100%) rename game/characters/susan/face/pupils/{up.webp => up/expression.webp} (100%) delete mode 100644 game/characters/tonks/body/armleft/on_hips_fix.webp delete mode 100644 game/characters/tonks/body/armright/on_hips_fix.webp rename game/characters/tonks/body/{base/front.webp => base.webp} (100%) delete mode 100644 game/characters/tonks/body/breasts/normal_tight.webp delete mode 100644 game/characters/tonks/body/breasts/ribbon.webp rename game/characters/tonks/body/{armleft/on_hips.webp => larm.webp} (100%) rename game/characters/tonks/body/{breasts/normal.webp => nbreast_zorder_1.webp} (100%) rename game/characters/tonks/body/{armright/on_hips.webp => rarm.webp} (100%) create mode 100644 game/characters/tonks/clothes/bottom/jeans/armfix.webp create mode 100644 game/characters/tonks/clothes/bottom/latex_leggings/armfix.webp create mode 100644 game/characters/tonks/clothes/bottom/leggings/armfix.webp create mode 100644 game/characters/tonks/clothes/bottom/leggings_hole/armfix.webp create mode 100644 game/characters/tonks/clothes/bottom/mechanic_shorts/armfix.webp create mode 100644 game/characters/tonks/clothes/bottom/office/armfix.webp create mode 100644 game/characters/tonks/clothes/bottom/police/armfix.webp delete mode 100644 game/characters/tonks/clothes/bottom/school_skirt_1/not_implemented.txt create mode 100644 game/characters/tonks/clothes/bottom/school_skirt_2/armfix.webp create mode 100644 game/characters/tonks/clothes/bottom/school_skirt_3/armfix.webp create mode 100644 game/characters/tonks/clothes/bottom/school_skirt_4/armfix.webp create mode 100644 game/characters/tonks/clothes/bottom/sweatpants/armfix.webp create mode 100644 game/characters/tonks/clothes/bottom/xmas/armfix.webp create mode 100644 game/characters/tonks/clothes/gloves/auror_gloves/armfix.webp create mode 100644 game/characters/tonks/clothes/gloves/leather_gloves/armfix.webp rename game/characters/tonks/clothes/headgear/antlers/{ => default}/0.webp (100%) rename game/characters/tonks/clothes/headgear/antlers/{ => default}/outline.webp (100%) create mode 100644 game/characters/tonks/clothes/headgear/bunny/base/0.webp create mode 100644 game/characters/tonks/clothes/headgear/bunny/base/1.webp create mode 100644 game/characters/tonks/clothes/headgear/bunny/base/outline.webp rename game/characters/tonks/clothes/headgear/bunny/{ => default}/0.webp (100%) rename game/characters/tonks/clothes/headgear/bunny/{ => default}/1.webp (100%) rename game/characters/tonks/clothes/headgear/bunny/{ => default}/outline.webp (100%) rename game/characters/tonks/clothes/headgear/classy_hat/{ => default}/0.webp (100%) rename game/characters/tonks/clothes/headgear/classy_hat/{ => default}/0_back.webp (100%) rename game/characters/tonks/clothes/headgear/classy_hat/{ => default}/0_front.webp (100%) rename game/characters/tonks/clothes/headgear/classy_hat/{ => default}/extra.webp (100%) rename game/characters/tonks/clothes/headgear/classy_hat/{ => default}/extra_front.webp (100%) rename game/characters/tonks/clothes/headgear/classy_hat/{ => default}/outline.webp (100%) rename game/characters/tonks/clothes/headgear/classy_hat/{ => default}/outline_back.webp (100%) rename game/characters/tonks/clothes/headgear/classy_hat/{ => default}/outline_front.webp (100%) rename game/characters/tonks/clothes/headgear/elf/{ => default}/0.webp (100%) rename game/characters/tonks/clothes/headgear/elf/{ => default}/1.webp (100%) rename game/characters/tonks/clothes/headgear/elf/{ => default}/extra.webp (100%) rename game/characters/tonks/clothes/headgear/elf/{ => default}/outline.webp (100%) rename game/characters/tonks/clothes/headgear/horns/{ => default}/0.webp (100%) rename game/characters/tonks/clothes/headgear/horns/{ => default}/1.webp (100%) rename game/characters/tonks/clothes/headgear/horns/{ => default}/outline.webp (100%) rename game/characters/tonks/clothes/headgear/mechanic_cap/{ => default}/0.webp (100%) rename game/characters/tonks/clothes/headgear/mechanic_cap/{ => default}/1.webp (100%) rename game/characters/tonks/clothes/headgear/mechanic_cap/{ => default}/extra.webp (100%) rename game/characters/tonks/clothes/headgear/mechanic_cap/{ => default}/mask.webp (100%) rename game/characters/tonks/clothes/headgear/mechanic_cap/{ => default}/outline.webp (100%) rename game/characters/tonks/clothes/headgear/mechanic_cap/{ => default}/skin.webp (100%) rename game/characters/tonks/clothes/headgear/police/{ => default}/0.webp (100%) rename game/characters/tonks/clothes/headgear/police/{ => default}/1.webp (100%) rename game/characters/tonks/clothes/headgear/police/{ => default}/2.webp (100%) rename game/characters/tonks/clothes/headgear/police/{ => default}/mask.webp (100%) rename game/characters/tonks/clothes/headgear/police/{ => default}/outline.webp (100%) rename game/characters/tonks/clothes/headgear/police/{ => default}/skin.webp (100%) delete mode 100644 game/characters/tonks/clothes/makeup/elf_ears/0.webp delete mode 100644 game/characters/tonks/clothes/makeup/elf_ears/extra.webp delete mode 100644 game/characters/tonks/clothes/makeup/elf_ears/outline.webp create mode 100644 game/characters/tonks/clothes/makeup/elf_ears/skin_zorder_5.webp rename game/characters/tonks/clothes/makeup/lipstick/{annoyed.webp => annoyed/0.webp} (100%) rename game/characters/tonks/clothes/makeup/lipstick/{base.webp => base/0.webp} (100%) rename game/characters/tonks/clothes/makeup/lipstick/{clench.webp => clench/0.webp} (100%) rename game/characters/tonks/clothes/makeup/lipstick/{crooked_smile.webp => crooked_smile/0.webp} (100%) rename game/characters/tonks/clothes/makeup/lipstick/{disgust.webp => disgust/0.webp} (100%) rename game/characters/tonks/clothes/makeup/lipstick/{grin.webp => grin/0.webp} (100%) rename game/characters/tonks/clothes/makeup/lipstick/{horny.webp => horny/0.webp} (100%) rename game/characters/tonks/clothes/makeup/lipstick/{mad.webp => mad/0.webp} (100%) rename game/characters/tonks/clothes/makeup/lipstick/{normal.webp => normal/0.webp} (100%) rename game/characters/tonks/clothes/makeup/lipstick/{open.webp => open/0.webp} (100%) rename game/characters/tonks/clothes/makeup/lipstick/{open_wide.webp => open_wide/0.webp} (100%) rename game/characters/tonks/clothes/makeup/lipstick/{open_wide_tongue.webp => open_wide_tongue/0.webp} (100%) rename game/characters/tonks/clothes/makeup/lipstick/{open_wide_tongue2.webp => open_wide_tongue2/0.webp} (100%) rename game/characters/tonks/clothes/makeup/lipstick/{open_wide_tongue2_cum.webp => open_wide_tongue2_cum/0.webp} (100%) rename game/characters/tonks/clothes/makeup/lipstick/{open_wide_tongue_cum.webp => open_wide_tongue_cum/0.webp} (100%) rename game/characters/tonks/clothes/makeup/lipstick/{scream.webp => scream/0.webp} (100%) rename game/characters/tonks/clothes/makeup/lipstick/{silly.webp => silly/0.webp} (100%) rename game/characters/tonks/clothes/makeup/lipstick/{soft.webp => soft/0.webp} (100%) rename game/characters/tonks/clothes/makeup/lipstick/{upset.webp => upset/0.webp} (100%) create mode 100644 game/characters/tonks/clothes/panties/base/armfix.webp create mode 100644 game/characters/tonks/clothes/panties/ribbon/armfix.webp create mode 100644 game/characters/tonks/clothes/panties/succubus_panties/armfix.webp create mode 100644 game/characters/tonks/clothes/robe/auror_coat/armfix.webp create mode 100644 game/characters/tonks/clothes/robe/dressing_gown/armfix.webp create mode 100644 game/characters/tonks/clothes/robe/office/armfix.webp create mode 100644 game/characters/tonks/clothes/robe/silk_robe/armfix.webp create mode 100644 game/characters/tonks/clothes/stockings/auror/armfix.webp create mode 100644 game/characters/tonks/clothes/stockings/bunny_stockings_1/armfix.webp create mode 100644 game/characters/tonks/clothes/stockings/long_basic_1/armfix.webp create mode 100644 game/characters/tonks/clothes/stockings/xmas/armfix.webp create mode 100644 game/characters/tonks/clothes/top/auror/armfix.webp create mode 100644 game/characters/tonks/clothes/top/auror2/armfix.webp create mode 100644 game/characters/tonks/clothes/top/cavegirl_dress/armfix.webp create mode 100644 game/characters/tonks/clothes/top/classy_dress/armfix.webp create mode 100644 game/characters/tonks/clothes/top/corset/armfix.webp create mode 100644 game/characters/tonks/clothes/top/elf_dress/armfix.webp create mode 100644 game/characters/tonks/clothes/top/nightie_1/armfix.webp create mode 100644 game/characters/tonks/clothes/top/office/armfix.webp create mode 100644 game/characters/tonks/clothes/top/police1/armfix.webp create mode 100644 game/characters/tonks/clothes/top/police2/armfix.webp create mode 100644 game/characters/tonks/clothes/top/police3/armfix.webp create mode 100644 game/characters/tonks/clothes/top/pullover/armfix.webp create mode 100644 game/characters/tonks/clothes/top/silk_dress/armfix.webp create mode 100644 game/characters/tonks/clothes/top/skimpy_dress/armfix.webp create mode 100644 game/characters/tonks/clothes/top/skimpy_dress_2/armfix.webp rename game/characters/tonks/cum/body/{heavy.webp => heavy/cum.webp} (100%) rename game/characters/tonks/cum/body/{heavy_skin.webp => heavy/skin.webp} (100%) rename game/characters/tonks/cum/body/{light.webp => light/cum.webp} (100%) rename game/characters/tonks/cum/body/{light_skin.webp => light/skin.webp} (100%) rename game/characters/tonks/cum/breasts/{heavy.webp => heavy/cum.webp} (100%) rename game/characters/tonks/cum/breasts/{heavy_skin.webp => heavy/skin.webp} (100%) rename game/characters/tonks/cum/breasts/{light.webp => light/cum.webp} (100%) rename game/characters/tonks/cum/breasts/{light_skin.webp => light/skin.webp} (100%) rename game/characters/tonks/cum/crotch/{heavy.webp => heavy/cum.webp} (100%) rename game/characters/tonks/cum/crotch/{heavy_skin.webp => heavy/skin.webp} (100%) rename game/characters/tonks/cum/crotch/{light.webp => light/cum.webp} (100%) rename game/characters/tonks/cum/crotch/{light_skin.webp => light/skin.webp} (100%) rename game/characters/tonks/cum/face/{heavy.webp => heavy/cum.webp} (100%) rename game/characters/tonks/cum/face/{heavy_skin.webp => heavy/skin.webp} (100%) rename game/characters/tonks/cum/face/{light.webp => light/cum.webp} (100%) rename game/characters/tonks/cum/face/{light_skin.webp => light/skin.webp} (100%) rename game/characters/tonks/cum/hair/{heavy.webp => heavy/cum.webp} (100%) rename game/characters/tonks/cum/hair/{light.webp => light/cum.webp} (100%) rename game/characters/tonks/cum/legs/{heavy.webp => heavy/cum.webp} (100%) rename game/characters/tonks/cum/legs/{heavy_skin.webp => heavy/skin.webp} (100%) rename game/characters/tonks/cum/legs/{light.webp => light/cum.webp} (100%) rename game/characters/tonks/cum/legs/{light_skin.webp => light/skin.webp} (100%) rename game/characters/tonks/cum/pussy/{heavy.webp => heavy/cum.webp} (100%) rename game/characters/tonks/cum/pussy/{light.webp => light/cum.webp} (100%) rename game/characters/tonks/face/cheeks/{blush.webp => blush/skin.webp} (100%) rename game/characters/tonks/face/cheeks/{gloom.webp => gloom/expression.webp} (100%) rename game/characters/tonks/face/cheeks/{heavy_blush.webp => heavy_blush/skin.webp} (100%) rename game/characters/tonks/face/eyebrows/{angry.webp => angry/expression.webp} (100%) rename game/characters/tonks/face/eyebrows/{angry_skin.webp => angry/skin.webp} (100%) rename game/characters/tonks/face/eyebrows/{annoyed.webp => annoyed/expression.webp} (100%) rename game/characters/tonks/face/eyebrows/{annoyed_skin.webp => annoyed/skin.webp} (100%) rename game/characters/tonks/face/eyebrows/{base.webp => base/expression.webp} (100%) rename game/characters/tonks/face/eyebrows/{base_skin.webp => base/skin.webp} (100%) rename game/characters/tonks/face/eyebrows/{raised.webp => raised/expression.webp} (100%) rename game/characters/tonks/face/eyebrows/{raised_skin.webp => raised/skin.webp} (100%) rename game/characters/tonks/face/eyebrows/{shocked.webp => shocked/expression.webp} (100%) rename game/characters/tonks/face/eyebrows/{shocked_skin.webp => shocked/skin.webp} (100%) rename game/characters/tonks/face/eyebrows/{worried.webp => worried/expression.webp} (100%) rename game/characters/tonks/face/eyebrows/{worried_skin.webp => worried/skin.webp} (100%) rename game/characters/tonks/face/eyes/{base.webp => base/expression.webp} (100%) rename game/characters/tonks/face/eyes/{base_mask.webp => base/eyemask.webp} (100%) rename game/characters/tonks/face/eyes/{base_skin.webp => base/skin.webp} (100%) rename game/characters/tonks/face/eyes/{closed.webp => closed/expression.webp} (100%) rename game/characters/tonks/face/eyes/{closed_skin.webp => closed/skin.webp} (100%) rename game/characters/tonks/face/eyes/{happyCl.webp => happyCl/expression.webp} (100%) rename game/characters/tonks/face/eyes/{happyCl_skin.webp => happyCl/skin.webp} (100%) rename game/characters/tonks/face/eyes/{narrow.webp => narrow/expression.webp} (100%) rename game/characters/tonks/face/eyes/{narrow_mask.webp => narrow/eyemask.webp} (100%) rename game/characters/tonks/face/eyes/{narrow_skin.webp => narrow/skin.webp} (100%) rename game/characters/tonks/face/eyes/{shocked.webp => shocked/expression.webp} (100%) rename game/characters/tonks/face/eyes/{shocked_mask.webp => shocked/eyemask.webp} (100%) rename game/characters/tonks/face/eyes/{shocked_skin.webp => shocked/skin.webp} (100%) rename game/characters/tonks/face/eyes/{wide.webp => wide/expression.webp} (100%) rename game/characters/tonks/face/eyes/{wide_mask.webp => wide/eyemask.webp} (100%) rename game/characters/tonks/face/eyes/{wide_skin.webp => wide/skin.webp} (100%) rename game/characters/tonks/face/eyes/{wink.webp => wink/expression.webp} (100%) rename game/characters/tonks/face/eyes/{wink_mask.webp => wink/eyemask.webp} (100%) rename game/characters/tonks/face/eyes/{wink_skin.webp => wink/skin.webp} (100%) rename game/characters/tonks/face/mouth/{angry.webp => angry/expression.webp} (100%) rename game/characters/tonks/face/mouth/{annoyed.webp => annoyed/expression.webp} (100%) rename game/characters/tonks/face/mouth/{annoyed_skin.webp => annoyed/skin.webp} (100%) rename game/characters/tonks/face/mouth/{base.webp => base/expression.webp} (100%) rename game/characters/tonks/face/mouth/{base_skin.webp => base/skin.webp} (100%) rename game/characters/tonks/face/mouth/{clench.webp => clench/expression.webp} (100%) rename game/characters/tonks/face/mouth/{clench_skin.webp => clench/skin.webp} (100%) rename game/characters/tonks/face/mouth/{crooked_smile.webp => crooked_smile/expression.webp} (100%) rename game/characters/tonks/face/mouth/{crooked_smile_skin.webp => crooked_smile/skin.webp} (100%) rename game/characters/tonks/face/mouth/{disgust.webp => disgust/expression.webp} (100%) rename game/characters/tonks/face/mouth/{disgust_skin.webp => disgust/skin.webp} (100%) rename game/characters/tonks/face/mouth/{grin.webp => grin/expression.webp} (100%) rename game/characters/tonks/face/mouth/{grin_skin.webp => grin/skin.webp} (100%) rename game/characters/tonks/face/mouth/{horny.webp => horny/expression.webp} (100%) rename game/characters/tonks/face/mouth/{horny_skin.webp => horny/skin.webp} (100%) rename game/characters/tonks/face/mouth/{mad.webp => mad/expression.webp} (100%) rename game/characters/tonks/face/mouth/{mad_skin.webp => mad/skin.webp} (100%) rename game/characters/tonks/face/mouth/{normal.webp => normal/expression.webp} (100%) rename game/characters/tonks/face/mouth/{normal_skin.webp => normal/skin.webp} (100%) rename game/characters/tonks/face/mouth/{open.webp => open/expression.webp} (100%) rename game/characters/tonks/face/mouth/{open_skin.webp => open/skin.webp} (100%) rename game/characters/tonks/face/mouth/{open_wide.webp => open_wide/expression.webp} (100%) rename game/characters/tonks/face/mouth/{open_wide_tongue.webp => open_wide_tongue/expression.webp} (100%) rename game/characters/tonks/face/mouth/{open_wide_tongue2.webp => open_wide_tongue2/expression.webp} (100%) rename game/characters/tonks/face/mouth/{open_wide_tongue2_cum.webp => open_wide_tongue2_cum/expression.webp} (100%) rename game/characters/tonks/face/mouth/{open_wide_tongue_cum.webp => open_wide_tongue_cum/expression.webp} (100%) rename game/characters/tonks/face/mouth/{scream.webp => scream/expression.webp} (100%) rename game/characters/tonks/face/mouth/{scream_skin.webp => scream/skin.webp} (100%) rename game/characters/tonks/face/mouth/{silly.webp => silly/expression.webp} (100%) rename game/characters/tonks/face/mouth/{silly_skin.webp => silly/skin.webp} (100%) rename game/characters/tonks/face/mouth/{soft.webp => soft/expression.webp} (100%) rename game/characters/tonks/face/mouth/{soft_skin.webp => soft/skin.webp} (100%) rename game/characters/tonks/face/mouth/{upset.webp => upset/expression.webp} (100%) rename game/characters/tonks/face/mouth/{upset_skin.webp => upset/skin.webp} (100%) rename game/characters/tonks/face/pupils/{L.webp => L/overlay.webp} (100%) rename game/characters/tonks/face/pupils/{R.webp => R/overlay.webp} (100%) rename game/characters/tonks/face/pupils/{ahegao.webp => ahegao/overlay.webp} (100%) rename game/characters/tonks/face/pupils/{down.webp => down/overlay.webp} (100%) rename game/characters/tonks/face/pupils/{downR.webp => downR/overlay.webp} (100%) rename game/characters/tonks/face/pupils/{mid.webp => mid/overlay.webp} (100%) rename game/characters/tonks/face/pupils/{stare.webp => stare/overlay.webp} (100%) rename game/characters/tonks/face/pupils/{up.webp => up/overlay.webp} (100%) rename game/characters/tonks/face/tears/{tears_mascara.webp => mascara/expression.webp} (100%) rename game/characters/tonks/face/tears/{tears_tears.webp => tears/expression.webp} (100%) create mode 100644 game/scripts/doll/clothes_dynamic.rpy delete mode 100644 game/scripts/doll/lipstick.rpy create mode 100644 game/scripts/doll/makeup.rpy diff --git a/game/characters/astoria/body/armfix.webp b/game/characters/astoria/body/armfix.webp new file mode 100644 index 00000000..51349bad --- /dev/null +++ b/game/characters/astoria/body/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d076bcc114a31ac371c4945aaae53a33a6cd449280ab0399986fc1bcca483158 +size 10772 diff --git a/game/characters/astoria/body/armleft/on_hips_fix.webp b/game/characters/astoria/body/armleft/on_hips_fix.webp deleted file mode 100644 index 56458ffd..00000000 --- a/game/characters/astoria/body/armleft/on_hips_fix.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a32c1e69a75188f9cab0f3e31c7967f894a0126c3e1bc43fff431b0c015b7113 -size 4794 diff --git a/game/characters/astoria/body/armright/on_hips_fix.webp b/game/characters/astoria/body/armright/on_hips_fix.webp deleted file mode 100644 index 8e2447be..00000000 --- a/game/characters/astoria/body/armright/on_hips_fix.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:329e18bfcffaca912bb15bd6cfa5f22c36e5e5322f0b539a1cc2c29b49fe960a -size 6846 diff --git a/game/characters/astoria/body/base/front.webp b/game/characters/astoria/body/front.webp similarity index 100% rename from game/characters/astoria/body/base/front.webp rename to game/characters/astoria/body/front.webp diff --git a/game/characters/astoria/body/armleft/on_hips.webp b/game/characters/astoria/body/larm_zorder_1.webp similarity index 100% rename from game/characters/astoria/body/armleft/on_hips.webp rename to game/characters/astoria/body/larm_zorder_1.webp diff --git a/game/characters/astoria/body/breasts/normal.webp b/game/characters/astoria/body/nbreast_zorder_2.webp similarity index 100% rename from game/characters/astoria/body/breasts/normal.webp rename to game/characters/astoria/body/nbreast_zorder_2.webp diff --git a/game/characters/astoria/body/armright/on_hips.webp b/game/characters/astoria/body/rarm_zorder_1.webp similarity index 100% rename from game/characters/astoria/body/armright/on_hips.webp rename to game/characters/astoria/body/rarm_zorder_1.webp diff --git a/game/characters/astoria/clothes/bottom/pants_1/armfix.webp b/game/characters/astoria/clothes/bottom/pants_1/armfix.webp new file mode 100644 index 00000000..51349bad --- /dev/null +++ b/game/characters/astoria/clothes/bottom/pants_1/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d076bcc114a31ac371c4945aaae53a33a6cd449280ab0399986fc1bcca483158 +size 10772 diff --git a/game/characters/astoria/clothes/bottom/pants_1_short/armfix.webp b/game/characters/astoria/clothes/bottom/pants_1_short/armfix.webp new file mode 100644 index 00000000..51349bad --- /dev/null +++ b/game/characters/astoria/clothes/bottom/pants_1_short/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d076bcc114a31ac371c4945aaae53a33a6cd449280ab0399986fc1bcca483158 +size 10772 diff --git a/game/characters/astoria/clothes/bottom/school_skirt_1/armfix.webp b/game/characters/astoria/clothes/bottom/school_skirt_1/armfix.webp new file mode 100644 index 00000000..51349bad --- /dev/null +++ b/game/characters/astoria/clothes/bottom/school_skirt_1/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d076bcc114a31ac371c4945aaae53a33a6cd449280ab0399986fc1bcca483158 +size 10772 diff --git a/game/characters/astoria/clothes/bottom/school_skirt_2/armfix.webp b/game/characters/astoria/clothes/bottom/school_skirt_2/armfix.webp new file mode 100644 index 00000000..51349bad --- /dev/null +++ b/game/characters/astoria/clothes/bottom/school_skirt_2/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d076bcc114a31ac371c4945aaae53a33a6cd449280ab0399986fc1bcca483158 +size 10772 diff --git a/game/characters/astoria/clothes/bottom/school_skirt_3/armfix.webp b/game/characters/astoria/clothes/bottom/school_skirt_3/armfix.webp new file mode 100644 index 00000000..51349bad --- /dev/null +++ b/game/characters/astoria/clothes/bottom/school_skirt_3/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d076bcc114a31ac371c4945aaae53a33a6cd449280ab0399986fc1bcca483158 +size 10772 diff --git a/game/characters/astoria/clothes/bottom/school_skirt_4/armfix.webp b/game/characters/astoria/clothes/bottom/school_skirt_4/armfix.webp new file mode 100644 index 00000000..51349bad --- /dev/null +++ b/game/characters/astoria/clothes/bottom/school_skirt_4/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d076bcc114a31ac371c4945aaae53a33a6cd449280ab0399986fc1bcca483158 +size 10772 diff --git a/game/characters/astoria/clothes/headgear/ann_takamaki/0.webp b/game/characters/astoria/clothes/headgear/ann_takamaki/default/0.webp similarity index 100% rename from game/characters/astoria/clothes/headgear/ann_takamaki/0.webp rename to game/characters/astoria/clothes/headgear/ann_takamaki/default/0.webp diff --git a/game/characters/astoria/clothes/headgear/ann_takamaki/1.webp b/game/characters/astoria/clothes/headgear/ann_takamaki/default/1.webp similarity index 100% rename from game/characters/astoria/clothes/headgear/ann_takamaki/1.webp rename to game/characters/astoria/clothes/headgear/ann_takamaki/default/1.webp diff --git a/game/characters/astoria/clothes/headgear/ann_takamaki/outline.webp b/game/characters/astoria/clothes/headgear/ann_takamaki/default/outline.webp similarity index 100% rename from game/characters/astoria/clothes/headgear/ann_takamaki/outline.webp rename to game/characters/astoria/clothes/headgear/ann_takamaki/default/outline.webp diff --git a/game/characters/astoria/clothes/makeup/lipstick/angry.webp b/game/characters/astoria/clothes/makeup/lipstick/angry/0.webp similarity index 100% rename from game/characters/astoria/clothes/makeup/lipstick/angry.webp rename to game/characters/astoria/clothes/makeup/lipstick/angry/0.webp diff --git a/game/characters/astoria/clothes/makeup/lipstick/annoyed.webp b/game/characters/astoria/clothes/makeup/lipstick/annoyed/0.webp similarity index 100% rename from game/characters/astoria/clothes/makeup/lipstick/annoyed.webp rename to game/characters/astoria/clothes/makeup/lipstick/annoyed/0.webp diff --git a/game/characters/astoria/clothes/makeup/lipstick/base.webp b/game/characters/astoria/clothes/makeup/lipstick/base/0.webp similarity index 100% rename from game/characters/astoria/clothes/makeup/lipstick/base.webp rename to game/characters/astoria/clothes/makeup/lipstick/base/0.webp diff --git a/game/characters/astoria/clothes/makeup/lipstick/clench.webp b/game/characters/astoria/clothes/makeup/lipstick/clench/0.webp similarity index 100% rename from game/characters/astoria/clothes/makeup/lipstick/clench.webp rename to game/characters/astoria/clothes/makeup/lipstick/clench/0.webp diff --git a/game/characters/astoria/clothes/makeup/lipstick/grin.webp b/game/characters/astoria/clothes/makeup/lipstick/grin/0.webp similarity index 100% rename from game/characters/astoria/clothes/makeup/lipstick/grin.webp rename to game/characters/astoria/clothes/makeup/lipstick/grin/0.webp diff --git a/game/characters/astoria/clothes/makeup/lipstick/horny.webp b/game/characters/astoria/clothes/makeup/lipstick/horny/0.webp similarity index 100% rename from game/characters/astoria/clothes/makeup/lipstick/horny.webp rename to game/characters/astoria/clothes/makeup/lipstick/horny/0.webp diff --git a/game/characters/astoria/clothes/makeup/lipstick/open.webp b/game/characters/astoria/clothes/makeup/lipstick/open/0.webp similarity index 100% rename from game/characters/astoria/clothes/makeup/lipstick/open.webp rename to game/characters/astoria/clothes/makeup/lipstick/open/0.webp diff --git a/game/characters/astoria/clothes/makeup/lipstick/scream.webp b/game/characters/astoria/clothes/makeup/lipstick/scream/0.webp similarity index 100% rename from game/characters/astoria/clothes/makeup/lipstick/scream.webp rename to game/characters/astoria/clothes/makeup/lipstick/scream/0.webp diff --git a/game/characters/astoria/clothes/makeup/lipstick/smile.webp b/game/characters/astoria/clothes/makeup/lipstick/smile/0.webp similarity index 100% rename from game/characters/astoria/clothes/makeup/lipstick/smile.webp rename to game/characters/astoria/clothes/makeup/lipstick/smile/0.webp diff --git a/game/characters/astoria/clothes/makeup/lipstick/upset.webp b/game/characters/astoria/clothes/makeup/lipstick/upset/0.webp similarity index 100% rename from game/characters/astoria/clothes/makeup/lipstick/upset.webp rename to game/characters/astoria/clothes/makeup/lipstick/upset/0.webp diff --git a/game/characters/astoria/clothes/panties/basic_panties_1/armfix.webp b/game/characters/astoria/clothes/panties/basic_panties_1/armfix.webp new file mode 100644 index 00000000..51349bad --- /dev/null +++ b/game/characters/astoria/clothes/panties/basic_panties_1/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d076bcc114a31ac371c4945aaae53a33a6cd449280ab0399986fc1bcca483158 +size 10772 diff --git a/game/characters/astoria/clothes/panties/basic_panties_2/armfix.webp b/game/characters/astoria/clothes/panties/basic_panties_2/armfix.webp new file mode 100644 index 00000000..51349bad --- /dev/null +++ b/game/characters/astoria/clothes/panties/basic_panties_2/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d076bcc114a31ac371c4945aaae53a33a6cd449280ab0399986fc1bcca483158 +size 10772 diff --git a/game/characters/astoria/clothes/stockings/ann_takamaki/armfix.webp b/game/characters/astoria/clothes/stockings/ann_takamaki/armfix.webp new file mode 100644 index 00000000..51349bad --- /dev/null +++ b/game/characters/astoria/clothes/stockings/ann_takamaki/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d076bcc114a31ac371c4945aaae53a33a6cd449280ab0399986fc1bcca483158 +size 10772 diff --git a/game/characters/astoria/clothes/stockings/pantyhose/armfix.webp b/game/characters/astoria/clothes/stockings/pantyhose/armfix.webp new file mode 100644 index 00000000..51349bad --- /dev/null +++ b/game/characters/astoria/clothes/stockings/pantyhose/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d076bcc114a31ac371c4945aaae53a33a6cd449280ab0399986fc1bcca483158 +size 10772 diff --git a/game/characters/astoria/clothes/top/ann_takamaki/armfix.webp b/game/characters/astoria/clothes/top/ann_takamaki/armfix.webp new file mode 100644 index 00000000..51349bad --- /dev/null +++ b/game/characters/astoria/clothes/top/ann_takamaki/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d076bcc114a31ac371c4945aaae53a33a6cd449280ab0399986fc1bcca483158 +size 10772 diff --git a/game/characters/astoria/body/breasts/normal_tight.webp b/game/characters/astoria/clothes/top/ann_takamaki/skin.webp similarity index 100% rename from game/characters/astoria/body/breasts/normal_tight.webp rename to game/characters/astoria/clothes/top/ann_takamaki/skin.webp diff --git a/game/characters/astoria/clothes/top/top_school_1/armfix.webp b/game/characters/astoria/clothes/top/top_school_1/armfix.webp new file mode 100644 index 00000000..51349bad --- /dev/null +++ b/game/characters/astoria/clothes/top/top_school_1/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d076bcc114a31ac371c4945aaae53a33a6cd449280ab0399986fc1bcca483158 +size 10772 diff --git a/game/characters/astoria/clothes/top/top_school_2/armfix.webp b/game/characters/astoria/clothes/top/top_school_2/armfix.webp new file mode 100644 index 00000000..51349bad --- /dev/null +++ b/game/characters/astoria/clothes/top/top_school_2/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d076bcc114a31ac371c4945aaae53a33a6cd449280ab0399986fc1bcca483158 +size 10772 diff --git a/game/characters/astoria/clothes/top/top_school_3/armfix.webp b/game/characters/astoria/clothes/top/top_school_3/armfix.webp new file mode 100644 index 00000000..51349bad --- /dev/null +++ b/game/characters/astoria/clothes/top/top_school_3/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d076bcc114a31ac371c4945aaae53a33a6cd449280ab0399986fc1bcca483158 +size 10772 diff --git a/game/characters/astoria/clothes/top/top_school_4/armfix.webp b/game/characters/astoria/clothes/top/top_school_4/armfix.webp new file mode 100644 index 00000000..51349bad --- /dev/null +++ b/game/characters/astoria/clothes/top/top_school_4/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d076bcc114a31ac371c4945aaae53a33a6cd449280ab0399986fc1bcca483158 +size 10772 diff --git a/game/characters/astoria/clothes/top/top_school_5/armfix.webp b/game/characters/astoria/clothes/top/top_school_5/armfix.webp new file mode 100644 index 00000000..51349bad --- /dev/null +++ b/game/characters/astoria/clothes/top/top_school_5/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d076bcc114a31ac371c4945aaae53a33a6cd449280ab0399986fc1bcca483158 +size 10772 diff --git a/game/characters/astoria/clothes/top/top_school_6/armfix.webp b/game/characters/astoria/clothes/top/top_school_6/armfix.webp new file mode 100644 index 00000000..51349bad --- /dev/null +++ b/game/characters/astoria/clothes/top/top_school_6/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d076bcc114a31ac371c4945aaae53a33a6cd449280ab0399986fc1bcca483158 +size 10772 diff --git a/game/characters/astoria/face/cheeks/blush.webp b/game/characters/astoria/face/cheeks/blush/expression.webp similarity index 100% rename from game/characters/astoria/face/cheeks/blush.webp rename to game/characters/astoria/face/cheeks/blush/expression.webp diff --git a/game/characters/astoria/face/eyebrows/angry.webp b/game/characters/astoria/face/eyebrows/angry/expression.webp similarity index 100% rename from game/characters/astoria/face/eyebrows/angry.webp rename to game/characters/astoria/face/eyebrows/angry/expression.webp diff --git a/game/characters/astoria/face/eyebrows/base.webp b/game/characters/astoria/face/eyebrows/base/expression.webp similarity index 100% rename from game/characters/astoria/face/eyebrows/base.webp rename to game/characters/astoria/face/eyebrows/base/expression.webp diff --git a/game/characters/astoria/face/eyebrows/worried.webp b/game/characters/astoria/face/eyebrows/worried/expression.webp similarity index 100% rename from game/characters/astoria/face/eyebrows/worried.webp rename to game/characters/astoria/face/eyebrows/worried/expression.webp diff --git a/game/characters/astoria/face/eyes/base.webp b/game/characters/astoria/face/eyes/base/expression.webp similarity index 100% rename from game/characters/astoria/face/eyes/base.webp rename to game/characters/astoria/face/eyes/base/expression.webp diff --git a/game/characters/astoria/face/eyes/base_mask.webp b/game/characters/astoria/face/eyes/base/eyemask.webp similarity index 100% rename from game/characters/astoria/face/eyes/base_mask.webp rename to game/characters/astoria/face/eyes/base/eyemask.webp diff --git a/game/characters/astoria/face/eyes/closed.webp b/game/characters/astoria/face/eyes/closed/expression.webp similarity index 100% rename from game/characters/astoria/face/eyes/closed.webp rename to game/characters/astoria/face/eyes/closed/expression.webp diff --git a/game/characters/astoria/face/eyes/narrow.webp b/game/characters/astoria/face/eyes/narrow/expression.webp similarity index 100% rename from game/characters/astoria/face/eyes/narrow.webp rename to game/characters/astoria/face/eyes/narrow/expression.webp diff --git a/game/characters/astoria/face/eyes/narrow_mask.webp b/game/characters/astoria/face/eyes/narrow/eyemask.webp similarity index 100% rename from game/characters/astoria/face/eyes/narrow_mask.webp rename to game/characters/astoria/face/eyes/narrow/eyemask.webp diff --git a/game/characters/astoria/face/eyes/wink.webp b/game/characters/astoria/face/eyes/wink/expression.webp similarity index 100% rename from game/characters/astoria/face/eyes/wink.webp rename to game/characters/astoria/face/eyes/wink/expression.webp diff --git a/game/characters/astoria/face/eyes/wink_mask.webp b/game/characters/astoria/face/eyes/wink/eyemask.webp similarity index 100% rename from game/characters/astoria/face/eyes/wink_mask.webp rename to game/characters/astoria/face/eyes/wink/eyemask.webp diff --git a/game/characters/astoria/face/mouth/angry.webp b/game/characters/astoria/face/mouth/angry/expression.webp similarity index 100% rename from game/characters/astoria/face/mouth/angry.webp rename to game/characters/astoria/face/mouth/angry/expression.webp diff --git a/game/characters/astoria/face/mouth/annoyed.webp b/game/characters/astoria/face/mouth/annoyed/expression.webp similarity index 100% rename from game/characters/astoria/face/mouth/annoyed.webp rename to game/characters/astoria/face/mouth/annoyed/expression.webp diff --git a/game/characters/astoria/face/mouth/base.webp b/game/characters/astoria/face/mouth/base/expression.webp similarity index 100% rename from game/characters/astoria/face/mouth/base.webp rename to game/characters/astoria/face/mouth/base/expression.webp diff --git a/game/characters/astoria/face/mouth/clench.webp b/game/characters/astoria/face/mouth/clench/expression.webp similarity index 100% rename from game/characters/astoria/face/mouth/clench.webp rename to game/characters/astoria/face/mouth/clench/expression.webp diff --git a/game/characters/astoria/face/mouth/grin.webp b/game/characters/astoria/face/mouth/grin/expression.webp similarity index 100% rename from game/characters/astoria/face/mouth/grin.webp rename to game/characters/astoria/face/mouth/grin/expression.webp diff --git a/game/characters/astoria/face/mouth/horny.webp b/game/characters/astoria/face/mouth/horny/expression.webp similarity index 100% rename from game/characters/astoria/face/mouth/horny.webp rename to game/characters/astoria/face/mouth/horny/expression.webp diff --git a/game/characters/astoria/face/mouth/open.webp b/game/characters/astoria/face/mouth/open/expression.webp similarity index 100% rename from game/characters/astoria/face/mouth/open.webp rename to game/characters/astoria/face/mouth/open/expression.webp diff --git a/game/characters/astoria/face/mouth/scream.webp b/game/characters/astoria/face/mouth/scream/expression.webp similarity index 100% rename from game/characters/astoria/face/mouth/scream.webp rename to game/characters/astoria/face/mouth/scream/expression.webp diff --git a/game/characters/astoria/face/mouth/smile.webp b/game/characters/astoria/face/mouth/smile/expression.webp similarity index 100% rename from game/characters/astoria/face/mouth/smile.webp rename to game/characters/astoria/face/mouth/smile/expression.webp diff --git a/game/characters/astoria/face/mouth/upset.webp b/game/characters/astoria/face/mouth/upset/expression.webp similarity index 100% rename from game/characters/astoria/face/mouth/upset.webp rename to game/characters/astoria/face/mouth/upset/expression.webp diff --git a/game/characters/astoria/face/pupils/L.webp b/game/characters/astoria/face/pupils/L/expression.webp similarity index 100% rename from game/characters/astoria/face/pupils/L.webp rename to game/characters/astoria/face/pupils/L/expression.webp diff --git a/game/characters/astoria/face/pupils/R.webp b/game/characters/astoria/face/pupils/R/expression.webp similarity index 100% rename from game/characters/astoria/face/pupils/R.webp rename to game/characters/astoria/face/pupils/R/expression.webp diff --git a/game/characters/astoria/face/pupils/ahegao.webp b/game/characters/astoria/face/pupils/ahegao/expression.webp similarity index 100% rename from game/characters/astoria/face/pupils/ahegao.webp rename to game/characters/astoria/face/pupils/ahegao/expression.webp diff --git a/game/characters/astoria/face/pupils/down.webp b/game/characters/astoria/face/pupils/down/expression.webp similarity index 100% rename from game/characters/astoria/face/pupils/down.webp rename to game/characters/astoria/face/pupils/down/expression.webp diff --git a/game/characters/astoria/face/pupils/mid.webp b/game/characters/astoria/face/pupils/mid/expression.webp similarity index 100% rename from game/characters/astoria/face/pupils/mid.webp rename to game/characters/astoria/face/pupils/mid/expression.webp diff --git a/game/characters/astoria/face/pupils/up.webp b/game/characters/astoria/face/pupils/up/expression.webp similarity index 100% rename from game/characters/astoria/face/pupils/up.webp rename to game/characters/astoria/face/pupils/up/expression.webp diff --git a/game/characters/astoria/face/tears/crying.webp b/game/characters/astoria/face/tears/crying/expression.webp similarity index 100% rename from game/characters/astoria/face/tears/crying.webp rename to game/characters/astoria/face/tears/crying/expression.webp diff --git a/game/characters/cho/body/armright/down_fix.webp b/game/characters/cho/body/armright/down_fix.webp deleted file mode 100644 index 39a8046c..00000000 --- a/game/characters/cho/body/armright/down_fix.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cd6b6d997a29e8d00977006c9307a31fc7ba89e3652022c1bc96925fac3ee0c3 -size 54 diff --git a/game/characters/cho/body/armright/up.webp b/game/characters/cho/body/armright/up.webp deleted file mode 100644 index 70ed609a..00000000 --- a/game/characters/cho/body/armright/up.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:79198aaa022725f2f28ce18051197ca457947af018bd6c870c91e46436c49290 -size 25250 diff --git a/game/characters/cho/body/base/front.webp b/game/characters/cho/body/front.webp similarity index 100% rename from game/characters/cho/body/base/front.webp rename to game/characters/cho/body/front.webp diff --git a/game/characters/cho/body/armleft/down.webp b/game/characters/cho/body/larm_zorder_1.webp similarity index 100% rename from game/characters/cho/body/armleft/down.webp rename to game/characters/cho/body/larm_zorder_1.webp diff --git a/game/characters/cho/body/breasts/normal.webp b/game/characters/cho/body/nbreast_zorder_2.webp similarity index 100% rename from game/characters/cho/body/breasts/normal.webp rename to game/characters/cho/body/nbreast_zorder_2.webp diff --git a/game/characters/cho/body/armright/down.webp b/game/characters/cho/body/rarm_zorder_1.webp similarity index 100% rename from game/characters/cho/body/armright/down.webp rename to game/characters/cho/body/rarm_zorder_1.webp diff --git a/game/characters/cho/body/armleft/down_fix.webp b/game/characters/cho/clothes/bottom/j_school_skirt_1/armfix.webp similarity index 100% rename from game/characters/cho/body/armleft/down_fix.webp rename to game/characters/cho/clothes/bottom/j_school_skirt_1/armfix.webp diff --git a/game/characters/cho/clothes/bottom/pants_long_1/armfix.webp b/game/characters/cho/clothes/bottom/pants_long_1/armfix.webp new file mode 100644 index 00000000..ea2266ad --- /dev/null +++ b/game/characters/cho/clothes/bottom/pants_long_1/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:183ea04b987eaab585275c67a398a49dd972a736c0acc22042b334f74449d96b +size 6334 diff --git a/game/characters/cho/clothes/bottom/pants_long_2/armfix.webp b/game/characters/cho/clothes/bottom/pants_long_2/armfix.webp new file mode 100644 index 00000000..ea2266ad --- /dev/null +++ b/game/characters/cho/clothes/bottom/pants_long_2/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:183ea04b987eaab585275c67a398a49dd972a736c0acc22042b334f74449d96b +size 6334 diff --git a/game/characters/cho/clothes/bottom/pants_short_1/armfix.webp b/game/characters/cho/clothes/bottom/pants_short_1/armfix.webp new file mode 100644 index 00000000..ea2266ad --- /dev/null +++ b/game/characters/cho/clothes/bottom/pants_short_1/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:183ea04b987eaab585275c67a398a49dd972a736c0acc22042b334f74449d96b +size 6334 diff --git a/game/characters/cho/clothes/bottom/pants_short_2/armfix.webp b/game/characters/cho/clothes/bottom/pants_short_2/armfix.webp new file mode 100644 index 00000000..ea2266ad --- /dev/null +++ b/game/characters/cho/clothes/bottom/pants_short_2/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:183ea04b987eaab585275c67a398a49dd972a736c0acc22042b334f74449d96b +size 6334 diff --git a/game/characters/cho/clothes/bottom/pants_short_3/armfix.webp b/game/characters/cho/clothes/bottom/pants_short_3/armfix.webp new file mode 100644 index 00000000..ea2266ad --- /dev/null +++ b/game/characters/cho/clothes/bottom/pants_short_3/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:183ea04b987eaab585275c67a398a49dd972a736c0acc22042b334f74449d96b +size 6334 diff --git a/game/characters/cho/clothes/bottom/pants_short_4/armfix.webp b/game/characters/cho/clothes/bottom/pants_short_4/armfix.webp new file mode 100644 index 00000000..ea2266ad --- /dev/null +++ b/game/characters/cho/clothes/bottom/pants_short_4/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:183ea04b987eaab585275c67a398a49dd972a736c0acc22042b334f74449d96b +size 6334 diff --git a/game/characters/cho/clothes/bottom/quid_skirt_1/armfix.webp b/game/characters/cho/clothes/bottom/quid_skirt_1/armfix.webp new file mode 100644 index 00000000..ea2266ad --- /dev/null +++ b/game/characters/cho/clothes/bottom/quid_skirt_1/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:183ea04b987eaab585275c67a398a49dd972a736c0acc22042b334f74449d96b +size 6334 diff --git a/game/characters/cho/clothes/bottom/school_skirt_1/armfix.webp b/game/characters/cho/clothes/bottom/school_skirt_1/armfix.webp new file mode 100644 index 00000000..ea2266ad --- /dev/null +++ b/game/characters/cho/clothes/bottom/school_skirt_1/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:183ea04b987eaab585275c67a398a49dd972a736c0acc22042b334f74449d96b +size 6334 diff --git a/game/characters/cho/clothes/bottom/school_skirt_2/armfix.webp b/game/characters/cho/clothes/bottom/school_skirt_2/armfix.webp new file mode 100644 index 00000000..ea2266ad --- /dev/null +++ b/game/characters/cho/clothes/bottom/school_skirt_2/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:183ea04b987eaab585275c67a398a49dd972a736c0acc22042b334f74449d96b +size 6334 diff --git a/game/characters/cho/clothes/bottom/school_skirt_3/armfix.webp b/game/characters/cho/clothes/bottom/school_skirt_3/armfix.webp new file mode 100644 index 00000000..ea2266ad --- /dev/null +++ b/game/characters/cho/clothes/bottom/school_skirt_3/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:183ea04b987eaab585275c67a398a49dd972a736c0acc22042b334f74449d96b +size 6334 diff --git a/game/characters/cho/clothes/bottom/school_skirt_4/armfix.webp b/game/characters/cho/clothes/bottom/school_skirt_4/armfix.webp new file mode 100644 index 00000000..ea2266ad --- /dev/null +++ b/game/characters/cho/clothes/bottom/school_skirt_4/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:183ea04b987eaab585275c67a398a49dd972a736c0acc22042b334f74449d96b +size 6334 diff --git a/game/characters/cho/clothes/bottom/skirt_short_1/armfix.webp b/game/characters/cho/clothes/bottom/skirt_short_1/armfix.webp new file mode 100644 index 00000000..ea2266ad --- /dev/null +++ b/game/characters/cho/clothes/bottom/skirt_short_1/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:183ea04b987eaab585275c67a398a49dd972a736c0acc22042b334f74449d96b +size 6334 diff --git a/game/characters/cho/clothes/bottom/skirt_short_2/armfix.webp b/game/characters/cho/clothes/bottom/skirt_short_2/armfix.webp new file mode 100644 index 00000000..ea2266ad --- /dev/null +++ b/game/characters/cho/clothes/bottom/skirt_short_2/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:183ea04b987eaab585275c67a398a49dd972a736c0acc22042b334f74449d96b +size 6334 diff --git a/game/characters/cho/clothes/bottom/toon_shorts/armfix.webp b/game/characters/cho/clothes/bottom/toon_shorts/armfix.webp new file mode 100644 index 00000000..ea2266ad --- /dev/null +++ b/game/characters/cho/clothes/bottom/toon_shorts/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:183ea04b987eaab585275c67a398a49dd972a736c0acc22042b334f74449d96b +size 6334 diff --git a/game/characters/cho/clothes/headgear/antlers/0.webp b/game/characters/cho/clothes/headgear/antlers/default/0.webp similarity index 100% rename from game/characters/cho/clothes/headgear/antlers/0.webp rename to game/characters/cho/clothes/headgear/antlers/default/0.webp diff --git a/game/characters/cho/clothes/headgear/antlers/1.webp b/game/characters/cho/clothes/headgear/antlers/default/1.webp similarity index 100% rename from game/characters/cho/clothes/headgear/antlers/1.webp rename to game/characters/cho/clothes/headgear/antlers/default/1.webp diff --git a/game/characters/cho/clothes/headgear/antlers/2.webp b/game/characters/cho/clothes/headgear/antlers/default/2.webp similarity index 100% rename from game/characters/cho/clothes/headgear/antlers/2.webp rename to game/characters/cho/clothes/headgear/antlers/default/2.webp diff --git a/game/characters/cho/clothes/headgear/antlers/outline.webp b/game/characters/cho/clothes/headgear/antlers/default/outline.webp similarity index 100% rename from game/characters/cho/clothes/headgear/antlers/outline.webp rename to game/characters/cho/clothes/headgear/antlers/default/outline.webp diff --git a/game/characters/cho/clothes/headgear/bunny_hat_1/0.webp b/game/characters/cho/clothes/headgear/bunny_hat_1/default/0.webp similarity index 100% rename from game/characters/cho/clothes/headgear/bunny_hat_1/0.webp rename to game/characters/cho/clothes/headgear/bunny_hat_1/default/0.webp diff --git a/game/characters/cho/clothes/headgear/bunny_hat_1/1.webp b/game/characters/cho/clothes/headgear/bunny_hat_1/default/1.webp similarity index 100% rename from game/characters/cho/clothes/headgear/bunny_hat_1/1.webp rename to game/characters/cho/clothes/headgear/bunny_hat_1/default/1.webp diff --git a/game/characters/cho/clothes/headgear/bunny_hat_1/outline.webp b/game/characters/cho/clothes/headgear/bunny_hat_1/default/outline.webp similarity index 100% rename from game/characters/cho/clothes/headgear/bunny_hat_1/outline.webp rename to game/characters/cho/clothes/headgear/bunny_hat_1/default/outline.webp diff --git a/game/characters/cho/clothes/headgear/catears/0.webp b/game/characters/cho/clothes/headgear/catears/default/0.webp similarity index 100% rename from game/characters/cho/clothes/headgear/catears/0.webp rename to game/characters/cho/clothes/headgear/catears/default/0.webp diff --git a/game/characters/cho/clothes/headgear/catears/extra.webp b/game/characters/cho/clothes/headgear/catears/default/extra.webp similarity index 100% rename from game/characters/cho/clothes/headgear/catears/extra.webp rename to game/characters/cho/clothes/headgear/catears/default/extra.webp diff --git a/game/characters/cho/clothes/headgear/catears/outline.webp b/game/characters/cho/clothes/headgear/catears/default/outline.webp similarity index 100% rename from game/characters/cho/clothes/headgear/catears/outline.webp rename to game/characters/cho/clothes/headgear/catears/default/outline.webp diff --git a/game/characters/cho/clothes/headgear/chun_li_puffies/0.webp b/game/characters/cho/clothes/headgear/chun_li_puffies/default/0.webp similarity index 100% rename from game/characters/cho/clothes/headgear/chun_li_puffies/0.webp rename to game/characters/cho/clothes/headgear/chun_li_puffies/default/0.webp diff --git a/game/characters/cho/clothes/headgear/chun_li_puffies/outline.webp b/game/characters/cho/clothes/headgear/chun_li_puffies/default/outline.webp similarity index 100% rename from game/characters/cho/clothes/headgear/chun_li_puffies/outline.webp rename to game/characters/cho/clothes/headgear/chun_li_puffies/default/outline.webp diff --git a/game/characters/cho/clothes/headgear/goggles/0.webp b/game/characters/cho/clothes/headgear/goggles/default/0.webp similarity index 100% rename from game/characters/cho/clothes/headgear/goggles/0.webp rename to game/characters/cho/clothes/headgear/goggles/default/0.webp diff --git a/game/characters/cho/clothes/headgear/goggles/1.webp b/game/characters/cho/clothes/headgear/goggles/default/1.webp similarity index 100% rename from game/characters/cho/clothes/headgear/goggles/1.webp rename to game/characters/cho/clothes/headgear/goggles/default/1.webp diff --git a/game/characters/cho/clothes/headgear/goggles/extra.webp b/game/characters/cho/clothes/headgear/goggles/default/extra.webp similarity index 100% rename from game/characters/cho/clothes/headgear/goggles/extra.webp rename to game/characters/cho/clothes/headgear/goggles/default/extra.webp diff --git a/game/characters/cho/clothes/headgear/goggles/outline.webp b/game/characters/cho/clothes/headgear/goggles/default/outline.webp similarity index 100% rename from game/characters/cho/clothes/headgear/goggles/outline.webp rename to game/characters/cho/clothes/headgear/goggles/default/outline.webp diff --git a/game/characters/cho/clothes/headgear/goggles/skin.webp b/game/characters/cho/clothes/headgear/goggles/default/skin.webp similarity index 100% rename from game/characters/cho/clothes/headgear/goggles/skin.webp rename to game/characters/cho/clothes/headgear/goggles/default/skin.webp diff --git a/game/characters/cho/clothes/headgear/police_cap/0.webp b/game/characters/cho/clothes/headgear/police_cap/default/0.webp similarity index 100% rename from game/characters/cho/clothes/headgear/police_cap/0.webp rename to game/characters/cho/clothes/headgear/police_cap/default/0.webp diff --git a/game/characters/cho/clothes/headgear/police_cap/1.webp b/game/characters/cho/clothes/headgear/police_cap/default/1.webp similarity index 100% rename from game/characters/cho/clothes/headgear/police_cap/1.webp rename to game/characters/cho/clothes/headgear/police_cap/default/1.webp diff --git a/game/characters/cho/clothes/headgear/police_cap/2.webp b/game/characters/cho/clothes/headgear/police_cap/default/2.webp similarity index 100% rename from game/characters/cho/clothes/headgear/police_cap/2.webp rename to game/characters/cho/clothes/headgear/police_cap/default/2.webp diff --git a/game/characters/cho/clothes/headgear/police_cap/3.webp b/game/characters/cho/clothes/headgear/police_cap/default/3.webp similarity index 100% rename from game/characters/cho/clothes/headgear/police_cap/3.webp rename to game/characters/cho/clothes/headgear/police_cap/default/3.webp diff --git a/game/characters/cho/clothes/headgear/police_cap/outline.webp b/game/characters/cho/clothes/headgear/police_cap/default/outline.webp similarity index 100% rename from game/characters/cho/clothes/headgear/police_cap/outline.webp rename to game/characters/cho/clothes/headgear/police_cap/default/outline.webp diff --git a/game/characters/cho/clothes/headgear/smurfette/0.webp b/game/characters/cho/clothes/headgear/smurfette/default/0.webp similarity index 100% rename from game/characters/cho/clothes/headgear/smurfette/0.webp rename to game/characters/cho/clothes/headgear/smurfette/default/0.webp diff --git a/game/characters/cho/clothes/headgear/smurfette/outline.webp b/game/characters/cho/clothes/headgear/smurfette/default/outline.webp similarity index 100% rename from game/characters/cho/clothes/headgear/smurfette/outline.webp rename to game/characters/cho/clothes/headgear/smurfette/default/outline.webp diff --git a/game/characters/cho/clothes/headgear/toon_band/0.webp b/game/characters/cho/clothes/headgear/toon_band/default/0.webp similarity index 100% rename from game/characters/cho/clothes/headgear/toon_band/0.webp rename to game/characters/cho/clothes/headgear/toon_band/default/0.webp diff --git a/game/characters/cho/clothes/headgear/toon_band/outline.webp b/game/characters/cho/clothes/headgear/toon_band/default/outline.webp similarity index 100% rename from game/characters/cho/clothes/headgear/toon_band/outline.webp rename to game/characters/cho/clothes/headgear/toon_band/default/outline.webp diff --git a/game/characters/cho/clothes/headgear/witch/0.webp b/game/characters/cho/clothes/headgear/witch/default/0.webp similarity index 100% rename from game/characters/cho/clothes/headgear/witch/0.webp rename to game/characters/cho/clothes/headgear/witch/default/0.webp diff --git a/game/characters/cho/clothes/headgear/witch/1.webp b/game/characters/cho/clothes/headgear/witch/default/1.webp similarity index 100% rename from game/characters/cho/clothes/headgear/witch/1.webp rename to game/characters/cho/clothes/headgear/witch/default/1.webp diff --git a/game/characters/cho/clothes/headgear/witch/outline.webp b/game/characters/cho/clothes/headgear/witch/default/outline.webp similarity index 100% rename from game/characters/cho/clothes/headgear/witch/outline.webp rename to game/characters/cho/clothes/headgear/witch/default/outline.webp diff --git a/game/characters/cho/clothes/headgear/witch/skin.webp b/game/characters/cho/clothes/headgear/witch/default/skin.webp similarity index 100% rename from game/characters/cho/clothes/headgear/witch/skin.webp rename to game/characters/cho/clothes/headgear/witch/default/skin.webp diff --git a/game/characters/cho/clothes/makeup/lipstick/angry.webp b/game/characters/cho/clothes/makeup/lipstick/angry/0.webp similarity index 100% rename from game/characters/cho/clothes/makeup/lipstick/angry.webp rename to game/characters/cho/clothes/makeup/lipstick/angry/0.webp diff --git a/game/characters/cho/clothes/makeup/lipstick/annoyed.webp b/game/characters/cho/clothes/makeup/lipstick/annoyed/0.webp similarity index 100% rename from game/characters/cho/clothes/makeup/lipstick/annoyed.webp rename to game/characters/cho/clothes/makeup/lipstick/annoyed/0.webp diff --git a/game/characters/cho/clothes/makeup/lipstick/base.webp b/game/characters/cho/clothes/makeup/lipstick/base/0.webp similarity index 100% rename from game/characters/cho/clothes/makeup/lipstick/base.webp rename to game/characters/cho/clothes/makeup/lipstick/base/0.webp diff --git a/game/characters/cho/clothes/makeup/lipstick/clench.webp b/game/characters/cho/clothes/makeup/lipstick/clench/0.webp similarity index 100% rename from game/characters/cho/clothes/makeup/lipstick/clench.webp rename to game/characters/cho/clothes/makeup/lipstick/clench/0.webp diff --git a/game/characters/cho/clothes/makeup/lipstick/crooked_smile.webp b/game/characters/cho/clothes/makeup/lipstick/crooked_smile/0.webp similarity index 100% rename from game/characters/cho/clothes/makeup/lipstick/crooked_smile.webp rename to game/characters/cho/clothes/makeup/lipstick/crooked_smile/0.webp diff --git a/game/characters/cho/clothes/makeup/lipstick/disgust.webp b/game/characters/cho/clothes/makeup/lipstick/disgust/0.webp similarity index 100% rename from game/characters/cho/clothes/makeup/lipstick/disgust.webp rename to game/characters/cho/clothes/makeup/lipstick/disgust/0.webp diff --git a/game/characters/cho/clothes/makeup/lipstick/grin.webp b/game/characters/cho/clothes/makeup/lipstick/grin/0.webp similarity index 100% rename from game/characters/cho/clothes/makeup/lipstick/grin.webp rename to game/characters/cho/clothes/makeup/lipstick/grin/0.webp diff --git a/game/characters/cho/clothes/makeup/lipstick/horny.webp b/game/characters/cho/clothes/makeup/lipstick/horny/0.webp similarity index 100% rename from game/characters/cho/clothes/makeup/lipstick/horny.webp rename to game/characters/cho/clothes/makeup/lipstick/horny/0.webp diff --git a/game/characters/cho/clothes/makeup/lipstick/mad.webp b/game/characters/cho/clothes/makeup/lipstick/mad/0.webp similarity index 100% rename from game/characters/cho/clothes/makeup/lipstick/mad.webp rename to game/characters/cho/clothes/makeup/lipstick/mad/0.webp diff --git a/game/characters/cho/clothes/makeup/lipstick/normal.webp b/game/characters/cho/clothes/makeup/lipstick/normal/0.webp similarity index 100% rename from game/characters/cho/clothes/makeup/lipstick/normal.webp rename to game/characters/cho/clothes/makeup/lipstick/normal/0.webp diff --git a/game/characters/cho/clothes/makeup/lipstick/open.webp b/game/characters/cho/clothes/makeup/lipstick/open/0.webp similarity index 100% rename from game/characters/cho/clothes/makeup/lipstick/open.webp rename to game/characters/cho/clothes/makeup/lipstick/open/0.webp diff --git a/game/characters/cho/clothes/makeup/lipstick/open_tongue.webp b/game/characters/cho/clothes/makeup/lipstick/open_tongue/0.webp similarity index 100% rename from game/characters/cho/clothes/makeup/lipstick/open_tongue.webp rename to game/characters/cho/clothes/makeup/lipstick/open_tongue/0.webp diff --git a/game/characters/cho/clothes/makeup/lipstick/open_wide_tongue.webp b/game/characters/cho/clothes/makeup/lipstick/open_wide_tongue/0.webp similarity index 100% rename from game/characters/cho/clothes/makeup/lipstick/open_wide_tongue.webp rename to game/characters/cho/clothes/makeup/lipstick/open_wide_tongue/0.webp diff --git a/game/characters/cho/clothes/makeup/lipstick/quiver.webp b/game/characters/cho/clothes/makeup/lipstick/quiver/0.webp similarity index 100% rename from game/characters/cho/clothes/makeup/lipstick/quiver.webp rename to game/characters/cho/clothes/makeup/lipstick/quiver/0.webp diff --git a/game/characters/cho/clothes/makeup/lipstick/scream.webp b/game/characters/cho/clothes/makeup/lipstick/scream/0.webp similarity index 100% rename from game/characters/cho/clothes/makeup/lipstick/scream.webp rename to game/characters/cho/clothes/makeup/lipstick/scream/0.webp diff --git a/game/characters/cho/clothes/makeup/lipstick/silly.webp b/game/characters/cho/clothes/makeup/lipstick/silly/0.webp similarity index 100% rename from game/characters/cho/clothes/makeup/lipstick/silly.webp rename to game/characters/cho/clothes/makeup/lipstick/silly/0.webp diff --git a/game/characters/cho/clothes/makeup/lipstick/smile.webp b/game/characters/cho/clothes/makeup/lipstick/smile/0.webp similarity index 100% rename from game/characters/cho/clothes/makeup/lipstick/smile.webp rename to game/characters/cho/clothes/makeup/lipstick/smile/0.webp diff --git a/game/characters/cho/clothes/makeup/lipstick/soft.webp b/game/characters/cho/clothes/makeup/lipstick/soft/0.webp similarity index 100% rename from game/characters/cho/clothes/makeup/lipstick/soft.webp rename to game/characters/cho/clothes/makeup/lipstick/soft/0.webp diff --git a/game/characters/cho/clothes/makeup/lipstick/upset.webp b/game/characters/cho/clothes/makeup/lipstick/upset/0.webp similarity index 100% rename from game/characters/cho/clothes/makeup/lipstick/upset.webp rename to game/characters/cho/clothes/makeup/lipstick/upset/0.webp diff --git a/game/characters/cho/clothes/panties/bikini_bottom_1/armfix.webp b/game/characters/cho/clothes/panties/bikini_bottom_1/armfix.webp new file mode 100644 index 00000000..ea2266ad --- /dev/null +++ b/game/characters/cho/clothes/panties/bikini_bottom_1/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:183ea04b987eaab585275c67a398a49dd972a736c0acc22042b334f74449d96b +size 6334 diff --git a/game/characters/cho/clothes/panties/bikini_bottom_2/armfix.webp b/game/characters/cho/clothes/panties/bikini_bottom_2/armfix.webp new file mode 100644 index 00000000..ea2266ad --- /dev/null +++ b/game/characters/cho/clothes/panties/bikini_bottom_2/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:183ea04b987eaab585275c67a398a49dd972a736c0acc22042b334f74449d96b +size 6334 diff --git a/game/characters/cho/clothes/panties/sport_panties_1/armfix.webp b/game/characters/cho/clothes/panties/sport_panties_1/armfix.webp new file mode 100644 index 00000000..ea2266ad --- /dev/null +++ b/game/characters/cho/clothes/panties/sport_panties_1/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:183ea04b987eaab585275c67a398a49dd972a736c0acc22042b334f74449d96b +size 6334 diff --git a/game/characters/cho/clothes/robe/robe_quidditch_1/armfix.webp b/game/characters/cho/clothes/robe/robe_quidditch_1/armfix.webp new file mode 100644 index 00000000..ea2266ad --- /dev/null +++ b/game/characters/cho/clothes/robe/robe_quidditch_1/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:183ea04b987eaab585275c67a398a49dd972a736c0acc22042b334f74449d96b +size 6334 diff --git a/game/characters/cho/clothes/stockings/bunny_stockings_1/armfix.webp b/game/characters/cho/clothes/stockings/bunny_stockings_1/armfix.webp new file mode 100644 index 00000000..ea2266ad --- /dev/null +++ b/game/characters/cho/clothes/stockings/bunny_stockings_1/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:183ea04b987eaab585275c67a398a49dd972a736c0acc22042b334f74449d96b +size 6334 diff --git a/game/characters/cho/clothes/stockings/fishnet/armfix.webp b/game/characters/cho/clothes/stockings/fishnet/armfix.webp new file mode 100644 index 00000000..ea2266ad --- /dev/null +++ b/game/characters/cho/clothes/stockings/fishnet/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:183ea04b987eaab585275c67a398a49dd972a736c0acc22042b334f74449d96b +size 6334 diff --git a/game/characters/cho/clothes/stockings/lace_stockings_1/armfix.webp b/game/characters/cho/clothes/stockings/lace_stockings_1/armfix.webp new file mode 100644 index 00000000..ea2266ad --- /dev/null +++ b/game/characters/cho/clothes/stockings/lace_stockings_1/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:183ea04b987eaab585275c67a398a49dd972a736c0acc22042b334f74449d96b +size 6334 diff --git a/game/characters/cho/clothes/stockings/pantyhose/armfix.webp b/game/characters/cho/clothes/stockings/pantyhose/armfix.webp new file mode 100644 index 00000000..ea2266ad --- /dev/null +++ b/game/characters/cho/clothes/stockings/pantyhose/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:183ea04b987eaab585275c67a398a49dd972a736c0acc22042b334f74449d96b +size 6334 diff --git a/game/characters/cho/clothes/stockings/sailor/armfix.webp b/game/characters/cho/clothes/stockings/sailor/armfix.webp new file mode 100644 index 00000000..ea2266ad --- /dev/null +++ b/game/characters/cho/clothes/stockings/sailor/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:183ea04b987eaab585275c67a398a49dd972a736c0acc22042b334f74449d96b +size 6334 diff --git a/game/characters/cho/clothes/top/chun_li_dress/armfix.webp b/game/characters/cho/clothes/top/chun_li_dress/armfix.webp new file mode 100644 index 00000000..ea2266ad --- /dev/null +++ b/game/characters/cho/clothes/top/chun_li_dress/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:183ea04b987eaab585275c67a398a49dd972a736c0acc22042b334f74449d96b +size 6334 diff --git a/game/characters/cho/clothes/top/dress_1/armfix.webp b/game/characters/cho/clothes/top/dress_1/armfix.webp new file mode 100644 index 00000000..ea2266ad --- /dev/null +++ b/game/characters/cho/clothes/top/dress_1/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:183ea04b987eaab585275c67a398a49dd972a736c0acc22042b334f74449d96b +size 6334 diff --git a/game/characters/cho/clothes/top/police/armfix.webp b/game/characters/cho/clothes/top/police/armfix.webp new file mode 100644 index 00000000..ea2266ad --- /dev/null +++ b/game/characters/cho/clothes/top/police/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:183ea04b987eaab585275c67a398a49dd972a736c0acc22042b334f74449d96b +size 6334 diff --git a/game/characters/cho/clothes/top/smurfette/armfix.webp b/game/characters/cho/clothes/top/smurfette/armfix.webp new file mode 100644 index 00000000..ea2266ad --- /dev/null +++ b/game/characters/cho/clothes/top/smurfette/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:183ea04b987eaab585275c67a398a49dd972a736c0acc22042b334f74449d96b +size 6334 diff --git a/game/characters/cho/clothes/top/top_j_school_1/armfix.webp b/game/characters/cho/clothes/top/top_j_school_1/armfix.webp new file mode 100644 index 00000000..ea2266ad --- /dev/null +++ b/game/characters/cho/clothes/top/top_j_school_1/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:183ea04b987eaab585275c67a398a49dd972a736c0acc22042b334f74449d96b +size 6334 diff --git a/game/characters/cho/clothes/top/top_sweater_1/armfix.webp b/game/characters/cho/clothes/top/top_sweater_1/armfix.webp new file mode 100644 index 00000000..ea2266ad --- /dev/null +++ b/game/characters/cho/clothes/top/top_sweater_1/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:183ea04b987eaab585275c67a398a49dd972a736c0acc22042b334f74449d96b +size 6334 diff --git a/game/characters/cho/cum/body/heavy.webp b/game/characters/cho/cum/body/heavy/cum.webp similarity index 100% rename from game/characters/cho/cum/body/heavy.webp rename to game/characters/cho/cum/body/heavy/cum.webp diff --git a/game/characters/cho/cum/body/heavy_skin.webp b/game/characters/cho/cum/body/heavy/skin.webp similarity index 100% rename from game/characters/cho/cum/body/heavy_skin.webp rename to game/characters/cho/cum/body/heavy/skin.webp diff --git a/game/characters/cho/cum/body/light.webp b/game/characters/cho/cum/body/light/cum.webp similarity index 100% rename from game/characters/cho/cum/body/light.webp rename to game/characters/cho/cum/body/light/cum.webp diff --git a/game/characters/cho/cum/body/light_skin.webp b/game/characters/cho/cum/body/light/skin.webp similarity index 100% rename from game/characters/cho/cum/body/light_skin.webp rename to game/characters/cho/cum/body/light/skin.webp diff --git a/game/characters/cho/cum/breasts/heavy.webp b/game/characters/cho/cum/breasts/heavy/cum.webp similarity index 100% rename from game/characters/cho/cum/breasts/heavy.webp rename to game/characters/cho/cum/breasts/heavy/cum.webp diff --git a/game/characters/cho/cum/breasts/heavy_skin.webp b/game/characters/cho/cum/breasts/heavy/skin.webp similarity index 100% rename from game/characters/cho/cum/breasts/heavy_skin.webp rename to game/characters/cho/cum/breasts/heavy/skin.webp diff --git a/game/characters/cho/cum/breasts/light.webp b/game/characters/cho/cum/breasts/light/cum.webp similarity index 100% rename from game/characters/cho/cum/breasts/light.webp rename to game/characters/cho/cum/breasts/light/cum.webp diff --git a/game/characters/cho/cum/breasts/light_skin.webp b/game/characters/cho/cum/breasts/light/skin.webp similarity index 100% rename from game/characters/cho/cum/breasts/light_skin.webp rename to game/characters/cho/cum/breasts/light/skin.webp diff --git a/game/characters/cho/cum/crotch/heavy.webp b/game/characters/cho/cum/crotch/heavy/cum.webp similarity index 100% rename from game/characters/cho/cum/crotch/heavy.webp rename to game/characters/cho/cum/crotch/heavy/cum.webp diff --git a/game/characters/cho/cum/crotch/heavy_skin.webp b/game/characters/cho/cum/crotch/heavy/skin.webp similarity index 100% rename from game/characters/cho/cum/crotch/heavy_skin.webp rename to game/characters/cho/cum/crotch/heavy/skin.webp diff --git a/game/characters/cho/cum/crotch/light.webp b/game/characters/cho/cum/crotch/light/cum.webp similarity index 100% rename from game/characters/cho/cum/crotch/light.webp rename to game/characters/cho/cum/crotch/light/cum.webp diff --git a/game/characters/cho/cum/crotch/light_skin.webp b/game/characters/cho/cum/crotch/light/skin.webp similarity index 100% rename from game/characters/cho/cum/crotch/light_skin.webp rename to game/characters/cho/cum/crotch/light/skin.webp diff --git a/game/characters/cho/cum/face/heavy.webp b/game/characters/cho/cum/face/heavy/cum.webp similarity index 100% rename from game/characters/cho/cum/face/heavy.webp rename to game/characters/cho/cum/face/heavy/cum.webp diff --git a/game/characters/cho/cum/face/heavy_skin.webp b/game/characters/cho/cum/face/heavy/skin.webp similarity index 100% rename from game/characters/cho/cum/face/heavy_skin.webp rename to game/characters/cho/cum/face/heavy/skin.webp diff --git a/game/characters/cho/cum/face/light.webp b/game/characters/cho/cum/face/light/cum.webp similarity index 100% rename from game/characters/cho/cum/face/light.webp rename to game/characters/cho/cum/face/light/cum.webp diff --git a/game/characters/cho/cum/face/light_skin.webp b/game/characters/cho/cum/face/light/skin.webp similarity index 100% rename from game/characters/cho/cum/face/light_skin.webp rename to game/characters/cho/cum/face/light/skin.webp diff --git a/game/characters/cho/cum/hair/heavy.webp b/game/characters/cho/cum/hair/heavy/cum.webp similarity index 100% rename from game/characters/cho/cum/hair/heavy.webp rename to game/characters/cho/cum/hair/heavy/cum.webp diff --git a/game/characters/cho/cum/hair/light.webp b/game/characters/cho/cum/hair/light/cum.webp similarity index 100% rename from game/characters/cho/cum/hair/light.webp rename to game/characters/cho/cum/hair/light/cum.webp diff --git a/game/characters/cho/cum/legs/heavy.webp b/game/characters/cho/cum/legs/heavy/cum.webp similarity index 100% rename from game/characters/cho/cum/legs/heavy.webp rename to game/characters/cho/cum/legs/heavy/cum.webp diff --git a/game/characters/cho/cum/legs/heavy_skin.webp b/game/characters/cho/cum/legs/heavy/skin.webp similarity index 100% rename from game/characters/cho/cum/legs/heavy_skin.webp rename to game/characters/cho/cum/legs/heavy/skin.webp diff --git a/game/characters/cho/cum/legs/light.webp b/game/characters/cho/cum/legs/light/cum.webp similarity index 100% rename from game/characters/cho/cum/legs/light.webp rename to game/characters/cho/cum/legs/light/cum.webp diff --git a/game/characters/cho/cum/legs/light_skin.webp b/game/characters/cho/cum/legs/light/skin.webp similarity index 100% rename from game/characters/cho/cum/legs/light_skin.webp rename to game/characters/cho/cum/legs/light/skin.webp diff --git a/game/characters/cho/cum/pussy/heavy.webp b/game/characters/cho/cum/pussy/heavy/cum.webp similarity index 100% rename from game/characters/cho/cum/pussy/heavy.webp rename to game/characters/cho/cum/pussy/heavy/cum.webp diff --git a/game/characters/cho/cum/pussy/light.webp b/game/characters/cho/cum/pussy/light/cum.webp similarity index 100% rename from game/characters/cho/cum/pussy/light.webp rename to game/characters/cho/cum/pussy/light/cum.webp diff --git a/game/characters/cho/face/cheeks/blush.webp b/game/characters/cho/face/cheeks/blush/expression.webp similarity index 100% rename from game/characters/cho/face/cheeks/blush.webp rename to game/characters/cho/face/cheeks/blush/expression.webp diff --git a/game/characters/cho/face/cheeks/heavy_blush.webp b/game/characters/cho/face/cheeks/blush_heavy/expression.webp similarity index 100% rename from game/characters/cho/face/cheeks/heavy_blush.webp rename to game/characters/cho/face/cheeks/blush_heavy/expression.webp diff --git a/game/characters/cho/face/cheeks/dummy.webp b/game/characters/cho/face/cheeks/dummy.webp deleted file mode 100644 index 9357818b..00000000 --- a/game/characters/cho/face/cheeks/dummy.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:86be52bdb7547413cafb3ed175a806a798c65de98b40849e0b974c47d187de65 -size 34 diff --git a/game/characters/cho/face/eyebrows/angry.webp b/game/characters/cho/face/eyebrows/angry/expression.webp similarity index 100% rename from game/characters/cho/face/eyebrows/angry.webp rename to game/characters/cho/face/eyebrows/angry/expression.webp diff --git a/game/characters/cho/face/eyebrows/angry_skin.webp b/game/characters/cho/face/eyebrows/angry/skin.webp similarity index 100% rename from game/characters/cho/face/eyebrows/angry_skin.webp rename to game/characters/cho/face/eyebrows/angry/skin.webp diff --git a/game/characters/cho/face/eyebrows/base.webp b/game/characters/cho/face/eyebrows/base/expression.webp similarity index 100% rename from game/characters/cho/face/eyebrows/base.webp rename to game/characters/cho/face/eyebrows/base/expression.webp diff --git a/game/characters/cho/face/eyebrows/base_skin.webp b/game/characters/cho/face/eyebrows/base/skin.webp similarity index 100% rename from game/characters/cho/face/eyebrows/base_skin.webp rename to game/characters/cho/face/eyebrows/base/skin.webp diff --git a/game/characters/cho/face/eyebrows/raised.webp b/game/characters/cho/face/eyebrows/raised/expression.webp similarity index 100% rename from game/characters/cho/face/eyebrows/raised.webp rename to game/characters/cho/face/eyebrows/raised/expression.webp diff --git a/game/characters/cho/face/eyebrows/raised_skin.webp b/game/characters/cho/face/eyebrows/raised/skin.webp similarity index 100% rename from game/characters/cho/face/eyebrows/raised_skin.webp rename to game/characters/cho/face/eyebrows/raised/skin.webp diff --git a/game/characters/cho/face/eyebrows/worried.webp b/game/characters/cho/face/eyebrows/worried/expression.webp similarity index 100% rename from game/characters/cho/face/eyebrows/worried.webp rename to game/characters/cho/face/eyebrows/worried/expression.webp diff --git a/game/characters/cho/face/eyebrows/worried_skin.webp b/game/characters/cho/face/eyebrows/worried/skin.webp similarity index 100% rename from game/characters/cho/face/eyebrows/worried_skin.webp rename to game/characters/cho/face/eyebrows/worried/skin.webp diff --git a/game/characters/cho/face/eyes/base.webp b/game/characters/cho/face/eyes/base/expression.webp similarity index 100% rename from game/characters/cho/face/eyes/base.webp rename to game/characters/cho/face/eyes/base/expression.webp diff --git a/game/characters/cho/face/eyes/base_mask.webp b/game/characters/cho/face/eyes/base/eyemask.webp similarity index 100% rename from game/characters/cho/face/eyes/base_mask.webp rename to game/characters/cho/face/eyes/base/eyemask.webp diff --git a/game/characters/cho/face/eyes/base_skin.webp b/game/characters/cho/face/eyes/base/skin.webp similarity index 100% rename from game/characters/cho/face/eyes/base_skin.webp rename to game/characters/cho/face/eyes/base/skin.webp diff --git a/game/characters/cho/face/eyes/closed.webp b/game/characters/cho/face/eyes/closed/expression.webp similarity index 100% rename from game/characters/cho/face/eyes/closed.webp rename to game/characters/cho/face/eyes/closed/expression.webp diff --git a/game/characters/cho/face/eyes/closed_skin.webp b/game/characters/cho/face/eyes/closed/skin.webp similarity index 100% rename from game/characters/cho/face/eyes/closed_skin.webp rename to game/characters/cho/face/eyes/closed/skin.webp diff --git a/game/characters/cho/face/eyes/happyCl.webp b/game/characters/cho/face/eyes/happyCl/expression.webp similarity index 100% rename from game/characters/cho/face/eyes/happyCl.webp rename to game/characters/cho/face/eyes/happyCl/expression.webp diff --git a/game/characters/cho/face/eyes/happyCl_skin.webp b/game/characters/cho/face/eyes/happyCl/skin.webp similarity index 100% rename from game/characters/cho/face/eyes/happyCl_skin.webp rename to game/characters/cho/face/eyes/happyCl/skin.webp diff --git a/game/characters/cho/face/eyes/narrow.webp b/game/characters/cho/face/eyes/narrow/expression.webp similarity index 100% rename from game/characters/cho/face/eyes/narrow.webp rename to game/characters/cho/face/eyes/narrow/expression.webp diff --git a/game/characters/cho/face/eyes/narrow_mask.webp b/game/characters/cho/face/eyes/narrow/eyemask.webp similarity index 100% rename from game/characters/cho/face/eyes/narrow_mask.webp rename to game/characters/cho/face/eyes/narrow/eyemask.webp diff --git a/game/characters/cho/face/eyes/narrow_skin.webp b/game/characters/cho/face/eyes/narrow/skin.webp similarity index 100% rename from game/characters/cho/face/eyes/narrow_skin.webp rename to game/characters/cho/face/eyes/narrow/skin.webp diff --git a/game/characters/cho/face/eyes/wide.webp b/game/characters/cho/face/eyes/wide/expression.webp similarity index 100% rename from game/characters/cho/face/eyes/wide.webp rename to game/characters/cho/face/eyes/wide/expression.webp diff --git a/game/characters/cho/face/eyes/wide_mask.webp b/game/characters/cho/face/eyes/wide/eyemask.webp similarity index 100% rename from game/characters/cho/face/eyes/wide_mask.webp rename to game/characters/cho/face/eyes/wide/eyemask.webp diff --git a/game/characters/cho/face/eyes/wide_skin.webp b/game/characters/cho/face/eyes/wide/skin.webp similarity index 100% rename from game/characters/cho/face/eyes/wide_skin.webp rename to game/characters/cho/face/eyes/wide/skin.webp diff --git a/game/characters/cho/face/eyes/wink.webp b/game/characters/cho/face/eyes/wink/expression.webp similarity index 100% rename from game/characters/cho/face/eyes/wink.webp rename to game/characters/cho/face/eyes/wink/expression.webp diff --git a/game/characters/cho/face/eyes/wink_mask.webp b/game/characters/cho/face/eyes/wink/eyemask.webp similarity index 100% rename from game/characters/cho/face/eyes/wink_mask.webp rename to game/characters/cho/face/eyes/wink/eyemask.webp diff --git a/game/characters/cho/face/eyes/wink_skin.webp b/game/characters/cho/face/eyes/wink/skin.webp similarity index 100% rename from game/characters/cho/face/eyes/wink_skin.webp rename to game/characters/cho/face/eyes/wink/skin.webp diff --git a/game/characters/cho/face/mouth/angry.webp b/game/characters/cho/face/mouth/angry/expression.webp similarity index 100% rename from game/characters/cho/face/mouth/angry.webp rename to game/characters/cho/face/mouth/angry/expression.webp diff --git a/game/characters/cho/face/mouth/annoyed.webp b/game/characters/cho/face/mouth/annoyed/expression.webp similarity index 100% rename from game/characters/cho/face/mouth/annoyed.webp rename to game/characters/cho/face/mouth/annoyed/expression.webp diff --git a/game/characters/cho/face/mouth/base.webp b/game/characters/cho/face/mouth/base/expression.webp similarity index 100% rename from game/characters/cho/face/mouth/base.webp rename to game/characters/cho/face/mouth/base/expression.webp diff --git a/game/characters/cho/face/mouth/clench.webp b/game/characters/cho/face/mouth/clench/expression.webp similarity index 100% rename from game/characters/cho/face/mouth/clench.webp rename to game/characters/cho/face/mouth/clench/expression.webp diff --git a/game/characters/cho/face/mouth/crooked_smile.webp b/game/characters/cho/face/mouth/crooked/smile.webp similarity index 100% rename from game/characters/cho/face/mouth/crooked_smile.webp rename to game/characters/cho/face/mouth/crooked/smile.webp diff --git a/game/characters/cho/face/mouth/disgust.webp b/game/characters/cho/face/mouth/disgust/expression.webp similarity index 100% rename from game/characters/cho/face/mouth/disgust.webp rename to game/characters/cho/face/mouth/disgust/expression.webp diff --git a/game/characters/cho/face/mouth/grin.webp b/game/characters/cho/face/mouth/grin/expression.webp similarity index 100% rename from game/characters/cho/face/mouth/grin.webp rename to game/characters/cho/face/mouth/grin/expression.webp diff --git a/game/characters/cho/face/mouth/horny.webp b/game/characters/cho/face/mouth/horny/expression.webp similarity index 100% rename from game/characters/cho/face/mouth/horny.webp rename to game/characters/cho/face/mouth/horny/expression.webp diff --git a/game/characters/cho/face/mouth/mad.webp b/game/characters/cho/face/mouth/mad/expression.webp similarity index 100% rename from game/characters/cho/face/mouth/mad.webp rename to game/characters/cho/face/mouth/mad/expression.webp diff --git a/game/characters/cho/face/mouth/normal.webp b/game/characters/cho/face/mouth/normal/expression.webp similarity index 100% rename from game/characters/cho/face/mouth/normal.webp rename to game/characters/cho/face/mouth/normal/expression.webp diff --git a/game/characters/cho/face/mouth/open.webp b/game/characters/cho/face/mouth/open/expression.webp similarity index 100% rename from game/characters/cho/face/mouth/open.webp rename to game/characters/cho/face/mouth/open/expression.webp diff --git a/game/characters/cho/face/mouth/open_tongue.webp b/game/characters/cho/face/mouth/open_tongue/expression.webp similarity index 100% rename from game/characters/cho/face/mouth/open_tongue.webp rename to game/characters/cho/face/mouth/open_tongue/expression.webp diff --git a/game/characters/cho/face/mouth/open_wide_tongue.webp b/game/characters/cho/face/mouth/open_wide/expression.webp similarity index 100% rename from game/characters/cho/face/mouth/open_wide_tongue.webp rename to game/characters/cho/face/mouth/open_wide/expression.webp diff --git a/game/characters/cho/face/mouth/quiver.webp b/game/characters/cho/face/mouth/quiver/expression.webp similarity index 100% rename from game/characters/cho/face/mouth/quiver.webp rename to game/characters/cho/face/mouth/quiver/expression.webp diff --git a/game/characters/cho/face/mouth/scream.webp b/game/characters/cho/face/mouth/scream/expression.webp similarity index 100% rename from game/characters/cho/face/mouth/scream.webp rename to game/characters/cho/face/mouth/scream/expression.webp diff --git a/game/characters/cho/face/mouth/silly.webp b/game/characters/cho/face/mouth/silly/expression.webp similarity index 100% rename from game/characters/cho/face/mouth/silly.webp rename to game/characters/cho/face/mouth/silly/expression.webp diff --git a/game/characters/cho/face/mouth/smile.webp b/game/characters/cho/face/mouth/smile/expression.webp similarity index 100% rename from game/characters/cho/face/mouth/smile.webp rename to game/characters/cho/face/mouth/smile/expression.webp diff --git a/game/characters/cho/face/mouth/soft.webp b/game/characters/cho/face/mouth/soft/expression.webp similarity index 100% rename from game/characters/cho/face/mouth/soft.webp rename to game/characters/cho/face/mouth/soft/expression.webp diff --git a/game/characters/cho/face/mouth/upset.webp b/game/characters/cho/face/mouth/upset/expression.webp similarity index 100% rename from game/characters/cho/face/mouth/upset.webp rename to game/characters/cho/face/mouth/upset/expression.webp diff --git a/game/characters/cho/face/pupils/L.webp b/game/characters/cho/face/pupils/L/expression.webp similarity index 100% rename from game/characters/cho/face/pupils/L.webp rename to game/characters/cho/face/pupils/L/expression.webp diff --git a/game/characters/cho/face/pupils/R.webp b/game/characters/cho/face/pupils/R/expression.webp similarity index 100% rename from game/characters/cho/face/pupils/R.webp rename to game/characters/cho/face/pupils/R/expression.webp diff --git a/game/characters/cho/face/pupils/ahegao.webp b/game/characters/cho/face/pupils/ahegao/expression.webp similarity index 100% rename from game/characters/cho/face/pupils/ahegao.webp rename to game/characters/cho/face/pupils/ahegao/expression.webp diff --git a/game/characters/cho/face/pupils/down.webp b/game/characters/cho/face/pupils/down/expression.webp similarity index 100% rename from game/characters/cho/face/pupils/down.webp rename to game/characters/cho/face/pupils/down/expression.webp diff --git a/game/characters/cho/face/pupils/downR.webp b/game/characters/cho/face/pupils/downR/expression.webp similarity index 100% rename from game/characters/cho/face/pupils/downR.webp rename to game/characters/cho/face/pupils/downR/expression.webp diff --git a/game/characters/cho/face/pupils/mid.webp b/game/characters/cho/face/pupils/mid/expression.webp similarity index 100% rename from game/characters/cho/face/pupils/mid.webp rename to game/characters/cho/face/pupils/mid/expression.webp diff --git a/game/characters/cho/face/pupils/stare.webp b/game/characters/cho/face/pupils/stare/expression.webp similarity index 100% rename from game/characters/cho/face/pupils/stare.webp rename to game/characters/cho/face/pupils/stare/expression.webp diff --git a/game/characters/cho/face/pupils/up.webp b/game/characters/cho/face/pupils/up/expression.webp similarity index 100% rename from game/characters/cho/face/pupils/up.webp rename to game/characters/cho/face/pupils/up/expression.webp diff --git a/game/characters/cho/poses/broom/body/armleft/down.webp b/game/characters/cho/poses/broom/body/armleft/down.webp deleted file mode 100644 index 9357818b..00000000 --- a/game/characters/cho/poses/broom/body/armleft/down.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:86be52bdb7547413cafb3ed175a806a798c65de98b40849e0b974c47d187de65 -size 34 diff --git a/game/characters/cho/poses/broom/body/armleft/down_fix.webp b/game/characters/cho/poses/broom/body/armleft/down_fix.webp deleted file mode 100644 index 9357818b..00000000 --- a/game/characters/cho/poses/broom/body/armleft/down_fix.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:86be52bdb7547413cafb3ed175a806a798c65de98b40849e0b974c47d187de65 -size 34 diff --git a/game/characters/cho/poses/broom/body/armright/down.webp b/game/characters/cho/poses/broom/body/armright/down.webp deleted file mode 100644 index 9357818b..00000000 --- a/game/characters/cho/poses/broom/body/armright/down.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:86be52bdb7547413cafb3ed175a806a798c65de98b40849e0b974c47d187de65 -size 34 diff --git a/game/characters/cho/poses/broom/body/armright/down_fix.webp b/game/characters/cho/poses/broom/body/armright/down_fix.webp deleted file mode 100644 index 9357818b..00000000 --- a/game/characters/cho/poses/broom/body/armright/down_fix.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:86be52bdb7547413cafb3ed175a806a798c65de98b40849e0b974c47d187de65 -size 34 diff --git a/game/characters/cho/poses/broom/body/armright/snitch_fix.webp b/game/characters/cho/poses/broom/body/armright/snitch_fix.webp deleted file mode 100644 index 9357818b..00000000 --- a/game/characters/cho/poses/broom/body/armright/snitch_fix.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:86be52bdb7547413cafb3ed175a806a798c65de98b40849e0b974c47d187de65 -size 34 diff --git a/game/characters/cho/poses/broom/body/armright/up.webp b/game/characters/cho/poses/broom/body/armright/up.webp deleted file mode 100644 index 9357818b..00000000 --- a/game/characters/cho/poses/broom/body/armright/up.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:86be52bdb7547413cafb3ed175a806a798c65de98b40849e0b974c47d187de65 -size 34 diff --git a/game/characters/cho/poses/broom/body/breasts/normal.webp b/game/characters/cho/poses/broom/body/breasts/normal.webp deleted file mode 100644 index 9357818b..00000000 --- a/game/characters/cho/poses/broom/body/breasts/normal.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:86be52bdb7547413cafb3ed175a806a798c65de98b40849e0b974c47d187de65 -size 34 diff --git a/game/characters/cho/poses/broom/body/base/front.webp b/game/characters/cho/poses/broom/body/front.webp similarity index 100% rename from game/characters/cho/poses/broom/body/base/front.webp rename to game/characters/cho/poses/broom/body/front.webp diff --git a/game/characters/cho/poses/broom/body/armright/snitch.webp b/game/characters/cho/poses/broom/body/snitch.webp similarity index 100% rename from game/characters/cho/poses/broom/body/armright/snitch.webp rename to game/characters/cho/poses/broom/body/snitch.webp diff --git a/game/characters/cho/poses/broom/face/cheeks/blush.webp b/game/characters/cho/poses/broom/face/cheeks/blush/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/cheeks/blush.webp rename to game/characters/cho/poses/broom/face/cheeks/blush/expression.webp diff --git a/game/characters/cho/poses/broom/face/cheeks/heavy_blush.webp b/game/characters/cho/poses/broom/face/cheeks/blush_heavy/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/cheeks/heavy_blush.webp rename to game/characters/cho/poses/broom/face/cheeks/blush_heavy/expression.webp diff --git a/game/characters/cho/poses/broom/face/eyebrows/angry.webp b/game/characters/cho/poses/broom/face/eyebrows/angry/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/eyebrows/angry.webp rename to game/characters/cho/poses/broom/face/eyebrows/angry/expression.webp diff --git a/game/characters/cho/poses/broom/face/eyebrows/angry_skin.webp b/game/characters/cho/poses/broom/face/eyebrows/angry/skin.webp similarity index 100% rename from game/characters/cho/poses/broom/face/eyebrows/angry_skin.webp rename to game/characters/cho/poses/broom/face/eyebrows/angry/skin.webp diff --git a/game/characters/cho/poses/broom/face/eyebrows/base.webp b/game/characters/cho/poses/broom/face/eyebrows/base/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/eyebrows/base.webp rename to game/characters/cho/poses/broom/face/eyebrows/base/expression.webp diff --git a/game/characters/cho/poses/broom/face/eyebrows/base_skin.webp b/game/characters/cho/poses/broom/face/eyebrows/base/skin.webp similarity index 100% rename from game/characters/cho/poses/broom/face/eyebrows/base_skin.webp rename to game/characters/cho/poses/broom/face/eyebrows/base/skin.webp diff --git a/game/characters/cho/poses/broom/face/eyebrows/raised.webp b/game/characters/cho/poses/broom/face/eyebrows/raised/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/eyebrows/raised.webp rename to game/characters/cho/poses/broom/face/eyebrows/raised/expression.webp diff --git a/game/characters/cho/poses/broom/face/eyebrows/raised_skin.webp b/game/characters/cho/poses/broom/face/eyebrows/raised/skin.webp similarity index 100% rename from game/characters/cho/poses/broom/face/eyebrows/raised_skin.webp rename to game/characters/cho/poses/broom/face/eyebrows/raised/skin.webp diff --git a/game/characters/cho/poses/broom/face/eyebrows/worried.webp b/game/characters/cho/poses/broom/face/eyebrows/worried/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/eyebrows/worried.webp rename to game/characters/cho/poses/broom/face/eyebrows/worried/expression.webp diff --git a/game/characters/cho/poses/broom/face/eyebrows/worried_skin.webp b/game/characters/cho/poses/broom/face/eyebrows/worried/skin.webp similarity index 100% rename from game/characters/cho/poses/broom/face/eyebrows/worried_skin.webp rename to game/characters/cho/poses/broom/face/eyebrows/worried/skin.webp diff --git a/game/characters/cho/poses/broom/face/eyes/base.webp b/game/characters/cho/poses/broom/face/eyes/base/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/eyes/base.webp rename to game/characters/cho/poses/broom/face/eyes/base/expression.webp diff --git a/game/characters/cho/poses/broom/face/eyes/base_mask.webp b/game/characters/cho/poses/broom/face/eyes/base/eyemask.webp similarity index 100% rename from game/characters/cho/poses/broom/face/eyes/base_mask.webp rename to game/characters/cho/poses/broom/face/eyes/base/eyemask.webp diff --git a/game/characters/cho/poses/broom/face/eyes/base_skin.webp b/game/characters/cho/poses/broom/face/eyes/base/skin.webp similarity index 100% rename from game/characters/cho/poses/broom/face/eyes/base_skin.webp rename to game/characters/cho/poses/broom/face/eyes/base/skin.webp diff --git a/game/characters/cho/poses/broom/face/eyes/closed.webp b/game/characters/cho/poses/broom/face/eyes/closed/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/eyes/closed.webp rename to game/characters/cho/poses/broom/face/eyes/closed/expression.webp diff --git a/game/characters/cho/poses/broom/face/eyes/closed_skin.webp b/game/characters/cho/poses/broom/face/eyes/closed/skin.webp similarity index 100% rename from game/characters/cho/poses/broom/face/eyes/closed_skin.webp rename to game/characters/cho/poses/broom/face/eyes/closed/skin.webp diff --git a/game/characters/cho/poses/broom/face/eyes/happyCl.webp b/game/characters/cho/poses/broom/face/eyes/happyCl/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/eyes/happyCl.webp rename to game/characters/cho/poses/broom/face/eyes/happyCl/expression.webp diff --git a/game/characters/cho/poses/broom/face/eyes/happyCl_skin.webp b/game/characters/cho/poses/broom/face/eyes/happyCl/skin.webp similarity index 100% rename from game/characters/cho/poses/broom/face/eyes/happyCl_skin.webp rename to game/characters/cho/poses/broom/face/eyes/happyCl/skin.webp diff --git a/game/characters/cho/poses/broom/face/eyes/narrow.webp b/game/characters/cho/poses/broom/face/eyes/narrow/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/eyes/narrow.webp rename to game/characters/cho/poses/broom/face/eyes/narrow/expression.webp diff --git a/game/characters/cho/poses/broom/face/eyes/narrow_mask.webp b/game/characters/cho/poses/broom/face/eyes/narrow/eyemask.webp similarity index 100% rename from game/characters/cho/poses/broom/face/eyes/narrow_mask.webp rename to game/characters/cho/poses/broom/face/eyes/narrow/eyemask.webp diff --git a/game/characters/cho/poses/broom/face/eyes/narrow_skin.webp b/game/characters/cho/poses/broom/face/eyes/narrow/skin.webp similarity index 100% rename from game/characters/cho/poses/broom/face/eyes/narrow_skin.webp rename to game/characters/cho/poses/broom/face/eyes/narrow/skin.webp diff --git a/game/characters/cho/poses/broom/face/eyes/wide.webp b/game/characters/cho/poses/broom/face/eyes/wide/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/eyes/wide.webp rename to game/characters/cho/poses/broom/face/eyes/wide/expression.webp diff --git a/game/characters/cho/poses/broom/face/eyes/wide_mask.webp b/game/characters/cho/poses/broom/face/eyes/wide/eyemask.webp similarity index 100% rename from game/characters/cho/poses/broom/face/eyes/wide_mask.webp rename to game/characters/cho/poses/broom/face/eyes/wide/eyemask.webp diff --git a/game/characters/cho/poses/broom/face/eyes/wide_skin.webp b/game/characters/cho/poses/broom/face/eyes/wide/skin.webp similarity index 100% rename from game/characters/cho/poses/broom/face/eyes/wide_skin.webp rename to game/characters/cho/poses/broom/face/eyes/wide/skin.webp diff --git a/game/characters/cho/poses/broom/face/eyes/wink.webp b/game/characters/cho/poses/broom/face/eyes/wink/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/eyes/wink.webp rename to game/characters/cho/poses/broom/face/eyes/wink/expression.webp diff --git a/game/characters/cho/poses/broom/face/eyes/wink_mask.webp b/game/characters/cho/poses/broom/face/eyes/wink/eyemask.webp similarity index 100% rename from game/characters/cho/poses/broom/face/eyes/wink_mask.webp rename to game/characters/cho/poses/broom/face/eyes/wink/eyemask.webp diff --git a/game/characters/cho/poses/broom/face/eyes/wink_skin.webp b/game/characters/cho/poses/broom/face/eyes/wink/skin.webp similarity index 100% rename from game/characters/cho/poses/broom/face/eyes/wink_skin.webp rename to game/characters/cho/poses/broom/face/eyes/wink/skin.webp diff --git a/game/characters/cho/poses/broom/face/mouth/angry.webp b/game/characters/cho/poses/broom/face/mouth/angry/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/mouth/angry.webp rename to game/characters/cho/poses/broom/face/mouth/angry/expression.webp diff --git a/game/characters/cho/poses/broom/face/mouth/annoyed.webp b/game/characters/cho/poses/broom/face/mouth/annoyed/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/mouth/annoyed.webp rename to game/characters/cho/poses/broom/face/mouth/annoyed/expression.webp diff --git a/game/characters/cho/poses/broom/face/mouth/base.webp b/game/characters/cho/poses/broom/face/mouth/base/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/mouth/base.webp rename to game/characters/cho/poses/broom/face/mouth/base/expression.webp diff --git a/game/characters/cho/poses/broom/face/mouth/clench.webp b/game/characters/cho/poses/broom/face/mouth/clench/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/mouth/clench.webp rename to game/characters/cho/poses/broom/face/mouth/clench/expression.webp diff --git a/game/characters/cho/poses/broom/face/mouth/crooked_smile.webp b/game/characters/cho/poses/broom/face/mouth/crooked/smile.webp similarity index 100% rename from game/characters/cho/poses/broom/face/mouth/crooked_smile.webp rename to game/characters/cho/poses/broom/face/mouth/crooked/smile.webp diff --git a/game/characters/cho/poses/broom/face/mouth/disgust.webp b/game/characters/cho/poses/broom/face/mouth/disgust/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/mouth/disgust.webp rename to game/characters/cho/poses/broom/face/mouth/disgust/expression.webp diff --git a/game/characters/cho/poses/broom/face/mouth/grin.webp b/game/characters/cho/poses/broom/face/mouth/grin/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/mouth/grin.webp rename to game/characters/cho/poses/broom/face/mouth/grin/expression.webp diff --git a/game/characters/cho/poses/broom/face/mouth/horny.webp b/game/characters/cho/poses/broom/face/mouth/horny/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/mouth/horny.webp rename to game/characters/cho/poses/broom/face/mouth/horny/expression.webp diff --git a/game/characters/cho/poses/broom/face/mouth/mad.webp b/game/characters/cho/poses/broom/face/mouth/mad/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/mouth/mad.webp rename to game/characters/cho/poses/broom/face/mouth/mad/expression.webp diff --git a/game/characters/cho/poses/broom/face/mouth/normal.webp b/game/characters/cho/poses/broom/face/mouth/normal/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/mouth/normal.webp rename to game/characters/cho/poses/broom/face/mouth/normal/expression.webp diff --git a/game/characters/cho/poses/broom/face/mouth/open.webp b/game/characters/cho/poses/broom/face/mouth/open/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/mouth/open.webp rename to game/characters/cho/poses/broom/face/mouth/open/expression.webp diff --git a/game/characters/cho/poses/broom/face/mouth/open_tongue.webp b/game/characters/cho/poses/broom/face/mouth/open_tongue/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/mouth/open_tongue.webp rename to game/characters/cho/poses/broom/face/mouth/open_tongue/expression.webp diff --git a/game/characters/cho/poses/broom/face/mouth/open_wide_tongue.webp b/game/characters/cho/poses/broom/face/mouth/open_wide/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/mouth/open_wide_tongue.webp rename to game/characters/cho/poses/broom/face/mouth/open_wide/expression.webp diff --git a/game/characters/cho/poses/broom/face/mouth/pout.webp b/game/characters/cho/poses/broom/face/mouth/pout/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/mouth/pout.webp rename to game/characters/cho/poses/broom/face/mouth/pout/expression.webp diff --git a/game/characters/cho/poses/broom/face/mouth/quiver.webp b/game/characters/cho/poses/broom/face/mouth/quiver/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/mouth/quiver.webp rename to game/characters/cho/poses/broom/face/mouth/quiver/expression.webp diff --git a/game/characters/cho/poses/broom/face/mouth/scream.webp b/game/characters/cho/poses/broom/face/mouth/scream/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/mouth/scream.webp rename to game/characters/cho/poses/broom/face/mouth/scream/expression.webp diff --git a/game/characters/cho/poses/broom/face/mouth/silly.webp b/game/characters/cho/poses/broom/face/mouth/silly/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/mouth/silly.webp rename to game/characters/cho/poses/broom/face/mouth/silly/expression.webp diff --git a/game/characters/cho/poses/broom/face/mouth/smile.webp b/game/characters/cho/poses/broom/face/mouth/smile/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/mouth/smile.webp rename to game/characters/cho/poses/broom/face/mouth/smile/expression.webp diff --git a/game/characters/cho/poses/broom/face/mouth/soft.webp b/game/characters/cho/poses/broom/face/mouth/soft/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/mouth/soft.webp rename to game/characters/cho/poses/broom/face/mouth/soft/expression.webp diff --git a/game/characters/cho/poses/broom/face/mouth/upset.webp b/game/characters/cho/poses/broom/face/mouth/upset/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/mouth/upset.webp rename to game/characters/cho/poses/broom/face/mouth/upset/expression.webp diff --git a/game/characters/cho/poses/broom/face/pupils/L.webp b/game/characters/cho/poses/broom/face/pupils/L/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/pupils/L.webp rename to game/characters/cho/poses/broom/face/pupils/L/expression.webp diff --git a/game/characters/cho/poses/broom/face/pupils/R.webp b/game/characters/cho/poses/broom/face/pupils/R/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/pupils/R.webp rename to game/characters/cho/poses/broom/face/pupils/R/expression.webp diff --git a/game/characters/cho/poses/broom/face/pupils/ahegao.webp b/game/characters/cho/poses/broom/face/pupils/ahegao/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/pupils/ahegao.webp rename to game/characters/cho/poses/broom/face/pupils/ahegao/expression.webp diff --git a/game/characters/cho/poses/broom/face/pupils/down.webp b/game/characters/cho/poses/broom/face/pupils/down/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/pupils/down.webp rename to game/characters/cho/poses/broom/face/pupils/down/expression.webp diff --git a/game/characters/cho/poses/broom/face/pupils/downR.webp b/game/characters/cho/poses/broom/face/pupils/downR/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/pupils/downR.webp rename to game/characters/cho/poses/broom/face/pupils/downR/expression.webp diff --git a/game/characters/cho/poses/broom/face/pupils/mid.webp b/game/characters/cho/poses/broom/face/pupils/mid/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/pupils/mid.webp rename to game/characters/cho/poses/broom/face/pupils/mid/expression.webp diff --git a/game/characters/cho/poses/broom/face/pupils/up.webp b/game/characters/cho/poses/broom/face/pupils/up/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/pupils/up.webp rename to game/characters/cho/poses/broom/face/pupils/up/expression.webp diff --git a/game/characters/cho/poses/broom/loadable.webp b/game/characters/cho/poses/broom/loadable.webp deleted file mode 100644 index 9357818b..00000000 --- a/game/characters/cho/poses/broom/loadable.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:86be52bdb7547413cafb3ed175a806a798c65de98b40849e0b974c47d187de65 -size 34 diff --git a/game/characters/hermione/body/base/back.webp b/game/characters/hermione/body/base/back.webp deleted file mode 100644 index ce3f88cd..00000000 --- a/game/characters/hermione/body/base/back.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6a2bd78c6022c7c761cb3ad044cbba61e66514493311cd3508e90e2f98cc12fa -size 303964 diff --git a/game/characters/hermione/body/base/front.webp b/game/characters/hermione/body/front.webp similarity index 100% rename from game/characters/hermione/body/base/front.webp rename to game/characters/hermione/body/front.webp diff --git a/game/characters/hermione/body/kneel/kneel_arm.webp b/game/characters/hermione/body/kneel/kneel_arm.webp deleted file mode 100644 index d007f04f..00000000 --- a/game/characters/hermione/body/kneel/kneel_arm.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:766df59c36c68602c4c892bc2086128d2cea2b6058ede9b1d4d1abb3afa8c460 -size 39236 diff --git a/game/characters/hermione/body/kneel/kneel_base.webp b/game/characters/hermione/body/kneel/kneel_base.webp deleted file mode 100644 index 39a6783f..00000000 --- a/game/characters/hermione/body/kneel/kneel_base.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6b84aebcfb5121e29d0af020362e9da299041d8aea4c48423013682f43db9901 -size 284532 diff --git a/game/characters/hermione/body/kneel/kneel_base_2.webp b/game/characters/hermione/body/kneel/kneel_base_2.webp deleted file mode 100644 index 54c22cc7..00000000 --- a/game/characters/hermione/body/kneel/kneel_base_2.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:423971bcf2fdb2a3770c0227a68fd5c726924940cde21741f22563639ebcb379 -size 265798 diff --git a/game/characters/hermione/body/kneel/kneel_cock.webp b/game/characters/hermione/body/kneel/kneel_cock.webp deleted file mode 100644 index fb05ae88..00000000 --- a/game/characters/hermione/body/kneel/kneel_cock.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:057b2bfe3e13e7916f0ecda7438b8252101129a53ae0e318104a476cb417d16c -size 34458 diff --git a/game/characters/hermione/body/kneel/kneel_cum_1.webp b/game/characters/hermione/body/kneel/kneel_cum_1.webp deleted file mode 100644 index 616ec11f..00000000 --- a/game/characters/hermione/body/kneel/kneel_cum_1.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fde75bf945e51a9ffd7639e54a68696084c7831bd5725b3857211d306eaa76ef -size 56012 diff --git a/game/characters/hermione/body/kneel/kneel_hair.webp b/game/characters/hermione/body/kneel/kneel_hair.webp deleted file mode 100644 index 1c882485..00000000 --- a/game/characters/hermione/body/kneel/kneel_hair.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:efb2fafc1004f7f37f4e271feab9d12fa0dc0a8ceb5dbc0a99ac38beed649030 -size 59752 diff --git a/game/characters/hermione/body/kneel/kneel_leg.webp b/game/characters/hermione/body/kneel/kneel_leg.webp deleted file mode 100644 index 5f08e752..00000000 --- a/game/characters/hermione/body/kneel/kneel_leg.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:327954fec7e5df2ffd75f258463477d0f5cee0508283d7e88e14d8aa5c7bd4ae -size 36194 diff --git a/game/characters/hermione/body/armleft/down.webp b/game/characters/hermione/body/larm_zorder_1.webp similarity index 100% rename from game/characters/hermione/body/armleft/down.webp rename to game/characters/hermione/body/larm_zorder_1.webp diff --git a/game/characters/hermione/body/nbreasts_zorder_2.webp b/game/characters/hermione/body/nbreasts_zorder_2.webp new file mode 100644 index 00000000..89de88c4 --- /dev/null +++ b/game/characters/hermione/body/nbreasts_zorder_2.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a74656fa03d149d2bf90c5d9c28a9d331902539a05b875014527dcf16ed82e8f +size 15466 diff --git a/game/characters/hermione/body/armright/down.webp b/game/characters/hermione/body/rarm_zorder_1.webp similarity index 100% rename from game/characters/hermione/body/armright/down.webp rename to game/characters/hermione/body/rarm_zorder_1.webp diff --git a/game/characters/hermione/clothes/headgear/antlers/0.webp b/game/characters/hermione/clothes/headgear/antlers/default/0.webp similarity index 100% rename from game/characters/hermione/clothes/headgear/antlers/0.webp rename to game/characters/hermione/clothes/headgear/antlers/default/0.webp diff --git a/game/characters/hermione/clothes/headgear/antlers/outline.webp b/game/characters/hermione/clothes/headgear/antlers/default/outline.webp similarity index 100% rename from game/characters/hermione/clothes/headgear/antlers/outline.webp rename to game/characters/hermione/clothes/headgear/antlers/default/outline.webp diff --git a/game/characters/hermione/clothes/headgear/antlers_2/0.webp b/game/characters/hermione/clothes/headgear/antlers_2/default/0.webp similarity index 100% rename from game/characters/hermione/clothes/headgear/antlers_2/0.webp rename to game/characters/hermione/clothes/headgear/antlers_2/default/0.webp diff --git a/game/characters/hermione/clothes/headgear/antlers_2/1.webp b/game/characters/hermione/clothes/headgear/antlers_2/default/1.webp similarity index 100% rename from game/characters/hermione/clothes/headgear/antlers_2/1.webp rename to game/characters/hermione/clothes/headgear/antlers_2/default/1.webp diff --git a/game/characters/hermione/clothes/headgear/antlers_2/2.webp b/game/characters/hermione/clothes/headgear/antlers_2/default/2.webp similarity index 100% rename from game/characters/hermione/clothes/headgear/antlers_2/2.webp rename to game/characters/hermione/clothes/headgear/antlers_2/default/2.webp diff --git a/game/characters/hermione/clothes/headgear/antlers_2/outline.webp b/game/characters/hermione/clothes/headgear/antlers_2/default/outline.webp similarity index 100% rename from game/characters/hermione/clothes/headgear/antlers_2/outline.webp rename to game/characters/hermione/clothes/headgear/antlers_2/default/outline.webp diff --git a/game/characters/hermione/clothes/headgear/bunny_hat_1/0.webp b/game/characters/hermione/clothes/headgear/bunny_hat_1/default/0.webp similarity index 100% rename from game/characters/hermione/clothes/headgear/bunny_hat_1/0.webp rename to game/characters/hermione/clothes/headgear/bunny_hat_1/default/0.webp diff --git a/game/characters/hermione/clothes/headgear/bunny_hat_1/1.webp b/game/characters/hermione/clothes/headgear/bunny_hat_1/default/1.webp similarity index 100% rename from game/characters/hermione/clothes/headgear/bunny_hat_1/1.webp rename to game/characters/hermione/clothes/headgear/bunny_hat_1/default/1.webp diff --git a/game/characters/hermione/clothes/headgear/bunny_hat_1/outline.webp b/game/characters/hermione/clothes/headgear/bunny_hat_1/default/outline.webp similarity index 100% rename from game/characters/hermione/clothes/headgear/bunny_hat_1/outline.webp rename to game/characters/hermione/clothes/headgear/bunny_hat_1/default/outline.webp diff --git a/game/characters/hermione/clothes/headgear/bunny_hat_2/0.webp b/game/characters/hermione/clothes/headgear/bunny_hat_2/default/0.webp similarity index 100% rename from game/characters/hermione/clothes/headgear/bunny_hat_2/0.webp rename to game/characters/hermione/clothes/headgear/bunny_hat_2/default/0.webp diff --git a/game/characters/hermione/clothes/headgear/bunny_hat_2/1.webp b/game/characters/hermione/clothes/headgear/bunny_hat_2/default/1.webp similarity index 100% rename from game/characters/hermione/clothes/headgear/bunny_hat_2/1.webp rename to game/characters/hermione/clothes/headgear/bunny_hat_2/default/1.webp diff --git a/game/characters/hermione/clothes/headgear/bunny_hat_2/2.webp b/game/characters/hermione/clothes/headgear/bunny_hat_2/default/2.webp similarity index 100% rename from game/characters/hermione/clothes/headgear/bunny_hat_2/2.webp rename to game/characters/hermione/clothes/headgear/bunny_hat_2/default/2.webp diff --git a/game/characters/hermione/clothes/headgear/bunny_hat_2/outline.webp b/game/characters/hermione/clothes/headgear/bunny_hat_2/default/outline.webp similarity index 100% rename from game/characters/hermione/clothes/headgear/bunny_hat_2/outline.webp rename to game/characters/hermione/clothes/headgear/bunny_hat_2/default/outline.webp diff --git a/game/characters/hermione/clothes/headgear/cat_ears/0.webp b/game/characters/hermione/clothes/headgear/cat_ears/default/0.webp similarity index 100% rename from game/characters/hermione/clothes/headgear/cat_ears/0.webp rename to game/characters/hermione/clothes/headgear/cat_ears/default/0.webp diff --git a/game/characters/hermione/clothes/headgear/cat_ears/1.webp b/game/characters/hermione/clothes/headgear/cat_ears/default/1.webp similarity index 100% rename from game/characters/hermione/clothes/headgear/cat_ears/1.webp rename to game/characters/hermione/clothes/headgear/cat_ears/default/1.webp diff --git a/game/characters/hermione/clothes/headgear/cat_ears/outline.webp b/game/characters/hermione/clothes/headgear/cat_ears/default/outline.webp similarity index 100% rename from game/characters/hermione/clothes/headgear/cat_ears/outline.webp rename to game/characters/hermione/clothes/headgear/cat_ears/default/outline.webp diff --git a/game/characters/hermione/clothes/headgear/elf/0.webp b/game/characters/hermione/clothes/headgear/elf/default/0.webp similarity index 100% rename from game/characters/hermione/clothes/headgear/elf/0.webp rename to game/characters/hermione/clothes/headgear/elf/default/0.webp diff --git a/game/characters/hermione/clothes/headgear/elf/1.webp b/game/characters/hermione/clothes/headgear/elf/default/1.webp similarity index 100% rename from game/characters/hermione/clothes/headgear/elf/1.webp rename to game/characters/hermione/clothes/headgear/elf/default/1.webp diff --git a/game/characters/hermione/clothes/headgear/elf/extra.webp b/game/characters/hermione/clothes/headgear/elf/default/extra.webp similarity index 100% rename from game/characters/hermione/clothes/headgear/elf/extra.webp rename to game/characters/hermione/clothes/headgear/elf/default/extra.webp diff --git a/game/characters/hermione/clothes/headgear/elf/outline.webp b/game/characters/hermione/clothes/headgear/elf/default/outline.webp similarity index 100% rename from game/characters/hermione/clothes/headgear/elf/outline.webp rename to game/characters/hermione/clothes/headgear/elf/default/outline.webp diff --git a/game/characters/hermione/clothes/headgear/maid_hat_1/0.webp b/game/characters/hermione/clothes/headgear/maid_hat_1/default/0.webp similarity index 100% rename from game/characters/hermione/clothes/headgear/maid_hat_1/0.webp rename to game/characters/hermione/clothes/headgear/maid_hat_1/default/0.webp diff --git a/game/characters/hermione/clothes/headgear/maid_hat_1/outline.webp b/game/characters/hermione/clothes/headgear/maid_hat_1/default/outline.webp similarity index 100% rename from game/characters/hermione/clothes/headgear/maid_hat_1/outline.webp rename to game/characters/hermione/clothes/headgear/maid_hat_1/default/outline.webp diff --git a/game/characters/hermione/clothes/headgear/panties_on_head/0.webp b/game/characters/hermione/clothes/headgear/panties_on_head/default/0.webp similarity index 100% rename from game/characters/hermione/clothes/headgear/panties_on_head/0.webp rename to game/characters/hermione/clothes/headgear/panties_on_head/default/0.webp diff --git a/game/characters/hermione/clothes/headgear/panties_on_head/outline.webp b/game/characters/hermione/clothes/headgear/panties_on_head/default/outline.webp similarity index 100% rename from game/characters/hermione/clothes/headgear/panties_on_head/outline.webp rename to game/characters/hermione/clothes/headgear/panties_on_head/default/outline.webp diff --git a/game/characters/hermione/clothes/headgear/poker_hat_1/0.webp b/game/characters/hermione/clothes/headgear/poker_hat_1/default/0.webp similarity index 100% rename from game/characters/hermione/clothes/headgear/poker_hat_1/0.webp rename to game/characters/hermione/clothes/headgear/poker_hat_1/default/0.webp diff --git a/game/characters/hermione/clothes/headgear/poker_hat_1/1.webp b/game/characters/hermione/clothes/headgear/poker_hat_1/default/1.webp similarity index 100% rename from game/characters/hermione/clothes/headgear/poker_hat_1/1.webp rename to game/characters/hermione/clothes/headgear/poker_hat_1/default/1.webp diff --git a/game/characters/hermione/clothes/headgear/poker_hat_1/2.webp b/game/characters/hermione/clothes/headgear/poker_hat_1/default/2.webp similarity index 100% rename from game/characters/hermione/clothes/headgear/poker_hat_1/2.webp rename to game/characters/hermione/clothes/headgear/poker_hat_1/default/2.webp diff --git a/game/characters/hermione/clothes/headgear/poker_hat_1/extra.webp b/game/characters/hermione/clothes/headgear/poker_hat_1/default/extra.webp similarity index 100% rename from game/characters/hermione/clothes/headgear/poker_hat_1/extra.webp rename to game/characters/hermione/clothes/headgear/poker_hat_1/default/extra.webp diff --git a/game/characters/hermione/clothes/headgear/poker_hat_1/outline.webp b/game/characters/hermione/clothes/headgear/poker_hat_1/default/outline.webp similarity index 100% rename from game/characters/hermione/clothes/headgear/poker_hat_1/outline.webp rename to game/characters/hermione/clothes/headgear/poker_hat_1/default/outline.webp diff --git a/game/characters/hermione/clothes/headgear/poker_hat_1/overlay.webp b/game/characters/hermione/clothes/headgear/poker_hat_1/default/overlay.webp similarity index 100% rename from game/characters/hermione/clothes/headgear/poker_hat_1/overlay.webp rename to game/characters/hermione/clothes/headgear/poker_hat_1/default/overlay.webp diff --git a/game/characters/hermione/clothes/headgear/poker_hat_2/0.webp b/game/characters/hermione/clothes/headgear/poker_hat_2/default/0.webp similarity index 100% rename from game/characters/hermione/clothes/headgear/poker_hat_2/0.webp rename to game/characters/hermione/clothes/headgear/poker_hat_2/default/0.webp diff --git a/game/characters/hermione/clothes/headgear/poker_hat_2/1.webp b/game/characters/hermione/clothes/headgear/poker_hat_2/default/1.webp similarity index 100% rename from game/characters/hermione/clothes/headgear/poker_hat_2/1.webp rename to game/characters/hermione/clothes/headgear/poker_hat_2/default/1.webp diff --git a/game/characters/hermione/clothes/headgear/poker_hat_2/2.webp b/game/characters/hermione/clothes/headgear/poker_hat_2/default/2.webp similarity index 100% rename from game/characters/hermione/clothes/headgear/poker_hat_2/2.webp rename to game/characters/hermione/clothes/headgear/poker_hat_2/default/2.webp diff --git a/game/characters/hermione/clothes/headgear/poker_hat_2/extra.webp b/game/characters/hermione/clothes/headgear/poker_hat_2/default/extra.webp similarity index 100% rename from game/characters/hermione/clothes/headgear/poker_hat_2/extra.webp rename to game/characters/hermione/clothes/headgear/poker_hat_2/default/extra.webp diff --git a/game/characters/hermione/clothes/headgear/poker_hat_2/outline.webp b/game/characters/hermione/clothes/headgear/poker_hat_2/default/outline.webp similarity index 100% rename from game/characters/hermione/clothes/headgear/poker_hat_2/outline.webp rename to game/characters/hermione/clothes/headgear/poker_hat_2/default/outline.webp diff --git a/game/characters/hermione/clothes/headgear/poker_hat_2/overlay.webp b/game/characters/hermione/clothes/headgear/poker_hat_2/default/overlay.webp similarity index 100% rename from game/characters/hermione/clothes/headgear/poker_hat_2/overlay.webp rename to game/characters/hermione/clothes/headgear/poker_hat_2/default/overlay.webp diff --git a/game/characters/hermione/clothes/makeup/lipstick/angry.webp b/game/characters/hermione/clothes/makeup/lipstick/angry/0.webp similarity index 100% rename from game/characters/hermione/clothes/makeup/lipstick/angry.webp rename to game/characters/hermione/clothes/makeup/lipstick/angry/0.webp diff --git a/game/characters/hermione/clothes/makeup/lipstick/annoyed.webp b/game/characters/hermione/clothes/makeup/lipstick/annoyed/0.webp similarity index 100% rename from game/characters/hermione/clothes/makeup/lipstick/annoyed.webp rename to game/characters/hermione/clothes/makeup/lipstick/annoyed/0.webp diff --git a/game/characters/hermione/clothes/makeup/lipstick/base.webp b/game/characters/hermione/clothes/makeup/lipstick/base/0.webp similarity index 100% rename from game/characters/hermione/clothes/makeup/lipstick/base.webp rename to game/characters/hermione/clothes/makeup/lipstick/base/0.webp diff --git a/game/characters/hermione/clothes/makeup/lipstick/clench.webp b/game/characters/hermione/clothes/makeup/lipstick/clench/0.webp similarity index 100% rename from game/characters/hermione/clothes/makeup/lipstick/clench.webp rename to game/characters/hermione/clothes/makeup/lipstick/clench/0.webp diff --git a/game/characters/hermione/clothes/makeup/lipstick/crooked_smile.webp b/game/characters/hermione/clothes/makeup/lipstick/crooked_smile/0.webp similarity index 100% rename from game/characters/hermione/clothes/makeup/lipstick/crooked_smile.webp rename to game/characters/hermione/clothes/makeup/lipstick/crooked_smile/0.webp diff --git a/game/characters/hermione/clothes/makeup/lipstick/cum.webp b/game/characters/hermione/clothes/makeup/lipstick/cum/0.webp similarity index 100% rename from game/characters/hermione/clothes/makeup/lipstick/cum.webp rename to game/characters/hermione/clothes/makeup/lipstick/cum/0.webp diff --git a/game/characters/hermione/clothes/makeup/lipstick/disgust.webp b/game/characters/hermione/clothes/makeup/lipstick/disgust/0.webp similarity index 100% rename from game/characters/hermione/clothes/makeup/lipstick/disgust.webp rename to game/characters/hermione/clothes/makeup/lipstick/disgust/0.webp diff --git a/game/characters/hermione/clothes/makeup/lipstick/full.webp b/game/characters/hermione/clothes/makeup/lipstick/full/0.webp similarity index 100% rename from game/characters/hermione/clothes/makeup/lipstick/full.webp rename to game/characters/hermione/clothes/makeup/lipstick/full/0.webp diff --git a/game/characters/hermione/clothes/makeup/lipstick/full_cum.webp b/game/characters/hermione/clothes/makeup/lipstick/full_cum/0.webp similarity index 100% rename from game/characters/hermione/clothes/makeup/lipstick/full_cum.webp rename to game/characters/hermione/clothes/makeup/lipstick/full_cum/0.webp diff --git a/game/characters/hermione/clothes/makeup/lipstick/full_panties.webp b/game/characters/hermione/clothes/makeup/lipstick/full_panties/0.webp similarity index 100% rename from game/characters/hermione/clothes/makeup/lipstick/full_panties.webp rename to game/characters/hermione/clothes/makeup/lipstick/full_panties/0.webp diff --git a/game/characters/hermione/clothes/makeup/lipstick/grin.webp b/game/characters/hermione/clothes/makeup/lipstick/grin/0.webp similarity index 100% rename from game/characters/hermione/clothes/makeup/lipstick/grin.webp rename to game/characters/hermione/clothes/makeup/lipstick/grin/0.webp diff --git a/game/characters/hermione/clothes/makeup/lipstick/mad.webp b/game/characters/hermione/clothes/makeup/lipstick/mad/0.webp similarity index 100% rename from game/characters/hermione/clothes/makeup/lipstick/mad.webp rename to game/characters/hermione/clothes/makeup/lipstick/mad/0.webp diff --git a/game/characters/hermione/clothes/makeup/lipstick/normal.webp b/game/characters/hermione/clothes/makeup/lipstick/normal/0.webp similarity index 100% rename from game/characters/hermione/clothes/makeup/lipstick/normal.webp rename to game/characters/hermione/clothes/makeup/lipstick/normal/0.webp diff --git a/game/characters/hermione/clothes/makeup/lipstick/open.webp b/game/characters/hermione/clothes/makeup/lipstick/open/0.webp similarity index 100% rename from game/characters/hermione/clothes/makeup/lipstick/open.webp rename to game/characters/hermione/clothes/makeup/lipstick/open/0.webp diff --git a/game/characters/hermione/clothes/makeup/lipstick/open_tongue.webp b/game/characters/hermione/clothes/makeup/lipstick/open_tongue/0.webp similarity index 100% rename from game/characters/hermione/clothes/makeup/lipstick/open_tongue.webp rename to game/characters/hermione/clothes/makeup/lipstick/open_tongue/0.webp diff --git a/game/characters/hermione/clothes/makeup/lipstick/open_wide_tongue.webp b/game/characters/hermione/clothes/makeup/lipstick/open_wide_tongue/0.webp similarity index 100% rename from game/characters/hermione/clothes/makeup/lipstick/open_wide_tongue.webp rename to game/characters/hermione/clothes/makeup/lipstick/open_wide_tongue/0.webp diff --git a/game/characters/hermione/clothes/makeup/lipstick/open_wide_tongue_cum.webp b/game/characters/hermione/clothes/makeup/lipstick/open_wide_tongue_cum/0.webp similarity index 100% rename from game/characters/hermione/clothes/makeup/lipstick/open_wide_tongue_cum.webp rename to game/characters/hermione/clothes/makeup/lipstick/open_wide_tongue_cum/0.webp diff --git a/game/characters/hermione/clothes/makeup/lipstick/open_wide_tongue_panties.webp b/game/characters/hermione/clothes/makeup/lipstick/open_wide_tongue_panties/0.webp similarity index 100% rename from game/characters/hermione/clothes/makeup/lipstick/open_wide_tongue_panties.webp rename to game/characters/hermione/clothes/makeup/lipstick/open_wide_tongue_panties/0.webp diff --git a/game/characters/hermione/clothes/makeup/lipstick/scream.webp b/game/characters/hermione/clothes/makeup/lipstick/scream/0.webp similarity index 100% rename from game/characters/hermione/clothes/makeup/lipstick/scream.webp rename to game/characters/hermione/clothes/makeup/lipstick/scream/0.webp diff --git a/game/characters/hermione/clothes/makeup/lipstick/shock.webp b/game/characters/hermione/clothes/makeup/lipstick/shock/0.webp similarity index 100% rename from game/characters/hermione/clothes/makeup/lipstick/shock.webp rename to game/characters/hermione/clothes/makeup/lipstick/shock/0.webp diff --git a/game/characters/hermione/clothes/makeup/lipstick/silly.webp b/game/characters/hermione/clothes/makeup/lipstick/silly/0.webp similarity index 100% rename from game/characters/hermione/clothes/makeup/lipstick/silly.webp rename to game/characters/hermione/clothes/makeup/lipstick/silly/0.webp diff --git a/game/characters/hermione/clothes/makeup/lipstick/smile.webp b/game/characters/hermione/clothes/makeup/lipstick/smile/0.webp similarity index 100% rename from game/characters/hermione/clothes/makeup/lipstick/smile.webp rename to game/characters/hermione/clothes/makeup/lipstick/smile/0.webp diff --git a/game/characters/hermione/clothes/makeup/lipstick/soft.webp b/game/characters/hermione/clothes/makeup/lipstick/soft/0.webp similarity index 100% rename from game/characters/hermione/clothes/makeup/lipstick/soft.webp rename to game/characters/hermione/clothes/makeup/lipstick/soft/0.webp diff --git a/game/characters/hermione/clothes/makeup/lipstick/upset.webp b/game/characters/hermione/clothes/makeup/lipstick/upset/0.webp similarity index 100% rename from game/characters/hermione/clothes/makeup/lipstick/upset.webp rename to game/characters/hermione/clothes/makeup/lipstick/upset/0.webp diff --git a/game/characters/hermione/cum/body/heavy.webp b/game/characters/hermione/cum/body/heavy/cum.webp similarity index 100% rename from game/characters/hermione/cum/body/heavy.webp rename to game/characters/hermione/cum/body/heavy/cum.webp diff --git a/game/characters/hermione/cum/body/light.webp b/game/characters/hermione/cum/body/light/cum.webp similarity index 100% rename from game/characters/hermione/cum/body/light.webp rename to game/characters/hermione/cum/body/light/cum.webp diff --git a/game/characters/hermione/cum/breasts/heavy.webp b/game/characters/hermione/cum/breasts/heavy/cum.webp similarity index 100% rename from game/characters/hermione/cum/breasts/heavy.webp rename to game/characters/hermione/cum/breasts/heavy/cum.webp diff --git a/game/characters/hermione/cum/breasts/light.webp b/game/characters/hermione/cum/breasts/light/cum.webp similarity index 100% rename from game/characters/hermione/cum/breasts/light.webp rename to game/characters/hermione/cum/breasts/light/cum.webp diff --git a/game/characters/hermione/cum/crotch/heavy.webp b/game/characters/hermione/cum/crotch/heavy/cum.webp similarity index 100% rename from game/characters/hermione/cum/crotch/heavy.webp rename to game/characters/hermione/cum/crotch/heavy/cum.webp diff --git a/game/characters/hermione/cum/crotch/light.webp b/game/characters/hermione/cum/crotch/light/cum.webp similarity index 100% rename from game/characters/hermione/cum/crotch/light.webp rename to game/characters/hermione/cum/crotch/light/cum.webp diff --git a/game/characters/hermione/cum/face/heavy.webp b/game/characters/hermione/cum/face/heavy/cum.webp similarity index 100% rename from game/characters/hermione/cum/face/heavy.webp rename to game/characters/hermione/cum/face/heavy/cum.webp diff --git a/game/characters/hermione/cum/face/light.webp b/game/characters/hermione/cum/face/light/cum.webp similarity index 100% rename from game/characters/hermione/cum/face/light.webp rename to game/characters/hermione/cum/face/light/cum.webp diff --git a/game/characters/hermione/cum/hair/heavy.webp b/game/characters/hermione/cum/hair/heavy/cum.webp similarity index 100% rename from game/characters/hermione/cum/hair/heavy.webp rename to game/characters/hermione/cum/hair/heavy/cum.webp diff --git a/game/characters/hermione/cum/hair/light.webp b/game/characters/hermione/cum/hair/light/cum.webp similarity index 100% rename from game/characters/hermione/cum/hair/light.webp rename to game/characters/hermione/cum/hair/light/cum.webp diff --git a/game/characters/hermione/cum/legs/heavy.webp b/game/characters/hermione/cum/legs/heavy/cum.webp similarity index 100% rename from game/characters/hermione/cum/legs/heavy.webp rename to game/characters/hermione/cum/legs/heavy/cum.webp diff --git a/game/characters/hermione/cum/legs/light.webp b/game/characters/hermione/cum/legs/light/cum.webp similarity index 100% rename from game/characters/hermione/cum/legs/light.webp rename to game/characters/hermione/cum/legs/light/cum.webp diff --git a/game/characters/hermione/cum/pussy/heavy.webp b/game/characters/hermione/cum/pussy/heavy/cum.webp similarity index 100% rename from game/characters/hermione/cum/pussy/heavy.webp rename to game/characters/hermione/cum/pussy/heavy/cum.webp diff --git a/game/characters/hermione/cum/pussy/light.webp b/game/characters/hermione/cum/pussy/light/cum.webp similarity index 100% rename from game/characters/hermione/cum/pussy/light.webp rename to game/characters/hermione/cum/pussy/light/cum.webp diff --git a/game/characters/hermione/cum/pussy/squirt.webp b/game/characters/hermione/cum/pussy/squirt/cum.webp similarity index 100% rename from game/characters/hermione/cum/pussy/squirt.webp rename to game/characters/hermione/cum/pussy/squirt/cum.webp diff --git a/game/characters/hermione/cum/pussy/squirt_post.webp b/game/characters/hermione/cum/pussy/squirt_post/cum.webp similarity index 100% rename from game/characters/hermione/cum/pussy/squirt_post.webp rename to game/characters/hermione/cum/pussy/squirt_post/cum.webp diff --git a/game/characters/hermione/cum/pussy/squirt_transition.webp b/game/characters/hermione/cum/pussy/squirt_transition/cum.webp similarity index 100% rename from game/characters/hermione/cum/pussy/squirt_transition.webp rename to game/characters/hermione/cum/pussy/squirt_transition/cum.webp diff --git a/game/characters/hermione/cum/pussy/underwear_heavy.webp b/game/characters/hermione/cum/pussy/underwear_heavy/cum.webp similarity index 100% rename from game/characters/hermione/cum/pussy/underwear_heavy.webp rename to game/characters/hermione/cum/pussy/underwear_heavy/cum.webp diff --git a/game/characters/hermione/cum/pussy/underwear_light.webp b/game/characters/hermione/cum/pussy/underwear_light/cum.webp similarity index 100% rename from game/characters/hermione/cum/pussy/underwear_light.webp rename to game/characters/hermione/cum/pussy/underwear_light/cum.webp diff --git a/game/characters/hermione/cum/pussy/vibrator_post.webp b/game/characters/hermione/cum/pussy/vibrator_post/cum.webp similarity index 100% rename from game/characters/hermione/cum/pussy/vibrator_post.webp rename to game/characters/hermione/cum/pussy/vibrator_post/cum.webp diff --git a/game/characters/hermione/cum/pussy/vibrator_pre.webp b/game/characters/hermione/cum/pussy/vibrator_pre/cum.webp similarity index 100% rename from game/characters/hermione/cum/pussy/vibrator_pre.webp rename to game/characters/hermione/cum/pussy/vibrator_pre/cum.webp diff --git a/game/characters/hermione/cum/pussy/vibrator_squirt.webp b/game/characters/hermione/cum/pussy/vibrator_squirt/cum.webp similarity index 100% rename from game/characters/hermione/cum/pussy/vibrator_squirt.webp rename to game/characters/hermione/cum/pussy/vibrator_squirt/cum.webp diff --git a/game/characters/hermione/cum/pussy/vibratorp_heavy.webp b/game/characters/hermione/cum/pussy/vibratorp_heavy/cum.webp similarity index 100% rename from game/characters/hermione/cum/pussy/vibratorp_heavy.webp rename to game/characters/hermione/cum/pussy/vibratorp_heavy/cum.webp diff --git a/game/characters/hermione/cum/pussy/vibratorp_light.webp b/game/characters/hermione/cum/pussy/vibratorp_light/cum.webp similarity index 100% rename from game/characters/hermione/cum/pussy/vibratorp_light.webp rename to game/characters/hermione/cum/pussy/vibratorp_light/cum.webp diff --git a/game/characters/hermione/cum/pussy/wet.webp b/game/characters/hermione/cum/pussy/wet/cum.webp similarity index 100% rename from game/characters/hermione/cum/pussy/wet.webp rename to game/characters/hermione/cum/pussy/wet/cum.webp diff --git a/game/characters/hermione/face/cheeks/blush.webp b/game/characters/hermione/face/cheeks/blush/expression.webp similarity index 100% rename from game/characters/hermione/face/cheeks/blush.webp rename to game/characters/hermione/face/cheeks/blush/expression.webp diff --git a/game/characters/hermione/face/eyebrows/angry.webp b/game/characters/hermione/face/eyebrows/angry/expression.webp similarity index 100% rename from game/characters/hermione/face/eyebrows/angry.webp rename to game/characters/hermione/face/eyebrows/angry/expression.webp diff --git a/game/characters/hermione/face/eyebrows/angry_skin.webp b/game/characters/hermione/face/eyebrows/angry/skin.webp similarity index 100% rename from game/characters/hermione/face/eyebrows/angry_skin.webp rename to game/characters/hermione/face/eyebrows/angry/skin.webp diff --git a/game/characters/hermione/face/eyebrows/annoyed.webp b/game/characters/hermione/face/eyebrows/annoyed/expression.webp similarity index 100% rename from game/characters/hermione/face/eyebrows/annoyed.webp rename to game/characters/hermione/face/eyebrows/annoyed/expression.webp diff --git a/game/characters/hermione/face/eyebrows/annoyed_skin.webp b/game/characters/hermione/face/eyebrows/annoyed/skin.webp similarity index 100% rename from game/characters/hermione/face/eyebrows/annoyed_skin.webp rename to game/characters/hermione/face/eyebrows/annoyed/skin.webp diff --git a/game/characters/hermione/face/eyebrows/base.webp b/game/characters/hermione/face/eyebrows/base/expression.webp similarity index 100% rename from game/characters/hermione/face/eyebrows/base.webp rename to game/characters/hermione/face/eyebrows/base/expression.webp diff --git a/game/characters/hermione/face/eyebrows/base_skin.webp b/game/characters/hermione/face/eyebrows/base/skin.webp similarity index 100% rename from game/characters/hermione/face/eyebrows/base_skin.webp rename to game/characters/hermione/face/eyebrows/base/skin.webp diff --git a/game/characters/hermione/face/eyebrows/low.webp b/game/characters/hermione/face/eyebrows/low/expression.webp similarity index 100% rename from game/characters/hermione/face/eyebrows/low.webp rename to game/characters/hermione/face/eyebrows/low/expression.webp diff --git a/game/characters/hermione/face/eyebrows/low_skin.webp b/game/characters/hermione/face/eyebrows/low/skin.webp similarity index 100% rename from game/characters/hermione/face/eyebrows/low_skin.webp rename to game/characters/hermione/face/eyebrows/low/skin.webp diff --git a/game/characters/hermione/face/eyebrows/worried.webp b/game/characters/hermione/face/eyebrows/worried/expression.webp similarity index 100% rename from game/characters/hermione/face/eyebrows/worried.webp rename to game/characters/hermione/face/eyebrows/worried/expression.webp diff --git a/game/characters/hermione/face/eyebrows/worried_skin.webp b/game/characters/hermione/face/eyebrows/worried/skin.webp similarity index 100% rename from game/characters/hermione/face/eyebrows/worried_skin.webp rename to game/characters/hermione/face/eyebrows/worried/skin.webp diff --git a/game/characters/hermione/face/eyes/base.webp b/game/characters/hermione/face/eyes/base/expression.webp similarity index 100% rename from game/characters/hermione/face/eyes/base.webp rename to game/characters/hermione/face/eyes/base/expression.webp diff --git a/game/characters/hermione/face/eyes/base_mask.webp b/game/characters/hermione/face/eyes/base/eyemask.webp similarity index 100% rename from game/characters/hermione/face/eyes/base_mask.webp rename to game/characters/hermione/face/eyes/base/eyemask.webp diff --git a/game/characters/hermione/face/eyes/closed.webp b/game/characters/hermione/face/eyes/closed/expression.webp similarity index 100% rename from game/characters/hermione/face/eyes/closed.webp rename to game/characters/hermione/face/eyes/closed/expression.webp diff --git a/game/characters/hermione/face/eyes/happy.webp b/game/characters/hermione/face/eyes/happy/expression.webp similarity index 100% rename from game/characters/hermione/face/eyes/happy.webp rename to game/characters/hermione/face/eyes/happy/expression.webp diff --git a/game/characters/hermione/face/eyes/happy_mask.webp b/game/characters/hermione/face/eyes/happy/eyemask.webp similarity index 100% rename from game/characters/hermione/face/eyes/happy_mask.webp rename to game/characters/hermione/face/eyes/happy/eyemask.webp diff --git a/game/characters/hermione/face/eyes/happyCl.webp b/game/characters/hermione/face/eyes/happyCl/expression.webp similarity index 100% rename from game/characters/hermione/face/eyes/happyCl.webp rename to game/characters/hermione/face/eyes/happyCl/expression.webp diff --git a/game/characters/hermione/face/eyes/narrow.webp b/game/characters/hermione/face/eyes/narrow/expression.webp similarity index 100% rename from game/characters/hermione/face/eyes/narrow.webp rename to game/characters/hermione/face/eyes/narrow/expression.webp diff --git a/game/characters/hermione/face/eyes/narrow_mask.webp b/game/characters/hermione/face/eyes/narrow/eyemask.webp similarity index 100% rename from game/characters/hermione/face/eyes/narrow_mask.webp rename to game/characters/hermione/face/eyes/narrow/eyemask.webp diff --git a/game/characters/hermione/face/eyes/slit.webp b/game/characters/hermione/face/eyes/slit/expression.webp similarity index 100% rename from game/characters/hermione/face/eyes/slit.webp rename to game/characters/hermione/face/eyes/slit/expression.webp diff --git a/game/characters/hermione/face/eyes/slit_mask.webp b/game/characters/hermione/face/eyes/slit/eyemask.webp similarity index 100% rename from game/characters/hermione/face/eyes/slit_mask.webp rename to game/characters/hermione/face/eyes/slit/eyemask.webp diff --git a/game/characters/hermione/face/eyes/squint.webp b/game/characters/hermione/face/eyes/squint/expression.webp similarity index 100% rename from game/characters/hermione/face/eyes/squint.webp rename to game/characters/hermione/face/eyes/squint/expression.webp diff --git a/game/characters/hermione/face/eyes/squint_mask.webp b/game/characters/hermione/face/eyes/squint/eyemask.webp similarity index 100% rename from game/characters/hermione/face/eyes/squint_mask.webp rename to game/characters/hermione/face/eyes/squint/eyemask.webp diff --git a/game/characters/hermione/face/eyes/wide.webp b/game/characters/hermione/face/eyes/wide/expression.webp similarity index 100% rename from game/characters/hermione/face/eyes/wide.webp rename to game/characters/hermione/face/eyes/wide/expression.webp diff --git a/game/characters/hermione/face/eyes/wide_mask.webp b/game/characters/hermione/face/eyes/wide/eyemask.webp similarity index 100% rename from game/characters/hermione/face/eyes/wide_mask.webp rename to game/characters/hermione/face/eyes/wide/eyemask.webp diff --git a/game/characters/hermione/face/eyes/wink.webp b/game/characters/hermione/face/eyes/wink/expression.webp similarity index 100% rename from game/characters/hermione/face/eyes/wink.webp rename to game/characters/hermione/face/eyes/wink/expression.webp diff --git a/game/characters/hermione/face/eyes/wink_mask.webp b/game/characters/hermione/face/eyes/wink/eyemask.webp similarity index 100% rename from game/characters/hermione/face/eyes/wink_mask.webp rename to game/characters/hermione/face/eyes/wink/eyemask.webp diff --git a/game/characters/hermione/face/mouth/angry.webp b/game/characters/hermione/face/mouth/angry/expression.webp similarity index 100% rename from game/characters/hermione/face/mouth/angry.webp rename to game/characters/hermione/face/mouth/angry/expression.webp diff --git a/game/characters/hermione/face/mouth/annoyed.webp b/game/characters/hermione/face/mouth/annoyed/expression.webp similarity index 100% rename from game/characters/hermione/face/mouth/annoyed.webp rename to game/characters/hermione/face/mouth/annoyed/expression.webp diff --git a/game/characters/hermione/face/mouth/base.webp b/game/characters/hermione/face/mouth/base/expression.webp similarity index 100% rename from game/characters/hermione/face/mouth/base.webp rename to game/characters/hermione/face/mouth/base/expression.webp diff --git a/game/characters/hermione/face/mouth/clench.webp b/game/characters/hermione/face/mouth/clench/expression.webp similarity index 100% rename from game/characters/hermione/face/mouth/clench.webp rename to game/characters/hermione/face/mouth/clench/expression.webp diff --git a/game/characters/hermione/face/mouth/crooked_smile.webp b/game/characters/hermione/face/mouth/crooked_smile/expression.webp similarity index 100% rename from game/characters/hermione/face/mouth/crooked_smile.webp rename to game/characters/hermione/face/mouth/crooked_smile/expression.webp diff --git a/game/characters/hermione/face/mouth/cum.webp b/game/characters/hermione/face/mouth/cum/expression.webp similarity index 100% rename from game/characters/hermione/face/mouth/cum.webp rename to game/characters/hermione/face/mouth/cum/expression.webp diff --git a/game/characters/hermione/face/mouth/disgust.webp b/game/characters/hermione/face/mouth/disgust/expression.webp similarity index 100% rename from game/characters/hermione/face/mouth/disgust.webp rename to game/characters/hermione/face/mouth/disgust/expression.webp diff --git a/game/characters/hermione/face/mouth/full.webp b/game/characters/hermione/face/mouth/full/expression.webp similarity index 100% rename from game/characters/hermione/face/mouth/full.webp rename to game/characters/hermione/face/mouth/full/expression.webp diff --git a/game/characters/hermione/face/mouth/full_cum.webp b/game/characters/hermione/face/mouth/full_cum/expression.webp similarity index 100% rename from game/characters/hermione/face/mouth/full_cum.webp rename to game/characters/hermione/face/mouth/full_cum/expression.webp diff --git a/game/characters/hermione/face/mouth/full_panties.webp b/game/characters/hermione/face/mouth/full_panties/expression.webp similarity index 100% rename from game/characters/hermione/face/mouth/full_panties.webp rename to game/characters/hermione/face/mouth/full_panties/expression.webp diff --git a/game/characters/hermione/face/mouth/grin.webp b/game/characters/hermione/face/mouth/grin/expression.webp similarity index 100% rename from game/characters/hermione/face/mouth/grin.webp rename to game/characters/hermione/face/mouth/grin/expression.webp diff --git a/game/characters/hermione/face/mouth/mad.webp b/game/characters/hermione/face/mouth/mad/expression.webp similarity index 100% rename from game/characters/hermione/face/mouth/mad.webp rename to game/characters/hermione/face/mouth/mad/expression.webp diff --git a/game/characters/hermione/face/mouth/normal.webp b/game/characters/hermione/face/mouth/normal/expression.webp similarity index 100% rename from game/characters/hermione/face/mouth/normal.webp rename to game/characters/hermione/face/mouth/normal/expression.webp diff --git a/game/characters/hermione/face/mouth/open.webp b/game/characters/hermione/face/mouth/open/expression.webp similarity index 100% rename from game/characters/hermione/face/mouth/open.webp rename to game/characters/hermione/face/mouth/open/expression.webp diff --git a/game/characters/hermione/face/mouth/open_tongue.webp b/game/characters/hermione/face/mouth/open_tongue/expression.webp similarity index 100% rename from game/characters/hermione/face/mouth/open_tongue.webp rename to game/characters/hermione/face/mouth/open_tongue/expression.webp diff --git a/game/characters/hermione/face/mouth/open_wide_tongue.webp b/game/characters/hermione/face/mouth/open_wide/expression.webp similarity index 100% rename from game/characters/hermione/face/mouth/open_wide_tongue.webp rename to game/characters/hermione/face/mouth/open_wide/expression.webp diff --git a/game/characters/hermione/face/mouth/open_wide_tongue_cum.webp b/game/characters/hermione/face/mouth/open_wide_tongue_cum.webp deleted file mode 100644 index 68b67d54..00000000 --- a/game/characters/hermione/face/mouth/open_wide_tongue_cum.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:842cdaed8c60a2bb3cc0bfead4fe36cd131100a4250d44be464cafa1cdd35ba6 -size 6938 diff --git a/game/characters/hermione/face/mouth/open_wide_tongue_panties.webp b/game/characters/hermione/face/mouth/open_wide_tongue_panties.webp deleted file mode 100644 index dcc6348b..00000000 --- a/game/characters/hermione/face/mouth/open_wide_tongue_panties.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aa1ee00eb2c69ef538a9e405a78de1917868a55ae999777cd5df8b26283ce984 -size 6480 diff --git a/game/characters/hermione/face/mouth/scream.webp b/game/characters/hermione/face/mouth/scream/expression.webp similarity index 100% rename from game/characters/hermione/face/mouth/scream.webp rename to game/characters/hermione/face/mouth/scream/expression.webp diff --git a/game/characters/hermione/face/mouth/shock.webp b/game/characters/hermione/face/mouth/shock/expression.webp similarity index 100% rename from game/characters/hermione/face/mouth/shock.webp rename to game/characters/hermione/face/mouth/shock/expression.webp diff --git a/game/characters/hermione/face/mouth/silly.webp b/game/characters/hermione/face/mouth/silly/expression.webp similarity index 100% rename from game/characters/hermione/face/mouth/silly.webp rename to game/characters/hermione/face/mouth/silly/expression.webp diff --git a/game/characters/hermione/face/mouth/smile.webp b/game/characters/hermione/face/mouth/smile/expression.webp similarity index 100% rename from game/characters/hermione/face/mouth/smile.webp rename to game/characters/hermione/face/mouth/smile/expression.webp diff --git a/game/characters/hermione/face/mouth/soft.webp b/game/characters/hermione/face/mouth/soft/expression.webp similarity index 100% rename from game/characters/hermione/face/mouth/soft.webp rename to game/characters/hermione/face/mouth/soft/expression.webp diff --git a/game/characters/hermione/face/mouth/upset.webp b/game/characters/hermione/face/mouth/upset/expression.webp similarity index 100% rename from game/characters/hermione/face/mouth/upset.webp rename to game/characters/hermione/face/mouth/upset/expression.webp diff --git a/game/characters/hermione/face/pupils/L.webp b/game/characters/hermione/face/pupils/L/expression.webp similarity index 100% rename from game/characters/hermione/face/pupils/L.webp rename to game/characters/hermione/face/pupils/L/expression.webp diff --git a/game/characters/hermione/face/pupils/L_soft.webp b/game/characters/hermione/face/pupils/L_soft/expression.webp similarity index 100% rename from game/characters/hermione/face/pupils/L_soft.webp rename to game/characters/hermione/face/pupils/L_soft/expression.webp diff --git a/game/characters/hermione/face/pupils/R.webp b/game/characters/hermione/face/pupils/R/expression.webp similarity index 100% rename from game/characters/hermione/face/pupils/R.webp rename to game/characters/hermione/face/pupils/R/expression.webp diff --git a/game/characters/hermione/face/pupils/R_soft.webp b/game/characters/hermione/face/pupils/R_soft/expression.webp similarity index 100% rename from game/characters/hermione/face/pupils/R_soft.webp rename to game/characters/hermione/face/pupils/R_soft/expression.webp diff --git a/game/characters/hermione/face/pupils/ahegao.webp b/game/characters/hermione/face/pupils/ahegao/expression.webp similarity index 100% rename from game/characters/hermione/face/pupils/ahegao.webp rename to game/characters/hermione/face/pupils/ahegao/expression.webp diff --git a/game/characters/hermione/face/pupils/dead.webp b/game/characters/hermione/face/pupils/dead/expression.webp similarity index 100% rename from game/characters/hermione/face/pupils/dead.webp rename to game/characters/hermione/face/pupils/dead/expression.webp diff --git a/game/characters/hermione/face/pupils/down.webp b/game/characters/hermione/face/pupils/down/expression.webp similarity index 100% rename from game/characters/hermione/face/pupils/down.webp rename to game/characters/hermione/face/pupils/down/expression.webp diff --git a/game/characters/hermione/face/pupils/down_soft.webp b/game/characters/hermione/face/pupils/down_soft/expression.webp similarity index 100% rename from game/characters/hermione/face/pupils/down_soft.webp rename to game/characters/hermione/face/pupils/down_soft/expression.webp diff --git a/game/characters/hermione/face/pupils/mid.webp b/game/characters/hermione/face/pupils/mid/expression.webp similarity index 100% rename from game/characters/hermione/face/pupils/mid.webp rename to game/characters/hermione/face/pupils/mid/expression.webp diff --git a/game/characters/hermione/face/pupils/mid_soft.webp b/game/characters/hermione/face/pupils/mid_soft/expression.webp similarity index 100% rename from game/characters/hermione/face/pupils/mid_soft.webp rename to game/characters/hermione/face/pupils/mid_soft/expression.webp diff --git a/game/characters/hermione/face/pupils/shocked.webp b/game/characters/hermione/face/pupils/shocked/expression.webp similarity index 100% rename from game/characters/hermione/face/pupils/shocked.webp rename to game/characters/hermione/face/pupils/shocked/expression.webp diff --git a/game/characters/hermione/face/pupils/squint.webp b/game/characters/hermione/face/pupils/squint/expression.webp similarity index 100% rename from game/characters/hermione/face/pupils/squint.webp rename to game/characters/hermione/face/pupils/squint/expression.webp diff --git a/game/characters/hermione/face/pupils/squint_soft.webp b/game/characters/hermione/face/pupils/squint_soft/expression.webp similarity index 100% rename from game/characters/hermione/face/pupils/squint_soft.webp rename to game/characters/hermione/face/pupils/squint_soft/expression.webp diff --git a/game/characters/hermione/face/pupils/stare.webp b/game/characters/hermione/face/pupils/stare/expression.webp similarity index 100% rename from game/characters/hermione/face/pupils/stare.webp rename to game/characters/hermione/face/pupils/stare/expression.webp diff --git a/game/characters/hermione/face/pupils/stare_soft.webp b/game/characters/hermione/face/pupils/stare_soft/expression.webp similarity index 100% rename from game/characters/hermione/face/pupils/stare_soft.webp rename to game/characters/hermione/face/pupils/stare_soft/expression.webp diff --git a/game/characters/hermione/face/pupils/up.webp b/game/characters/hermione/face/pupils/up/expression.webp similarity index 100% rename from game/characters/hermione/face/pupils/up.webp rename to game/characters/hermione/face/pupils/up/expression.webp diff --git a/game/characters/hermione/face/pupils/up_soft.webp b/game/characters/hermione/face/pupils/up_soft/expression.webp similarity index 100% rename from game/characters/hermione/face/pupils/up_soft.webp rename to game/characters/hermione/face/pupils/up_soft/expression.webp diff --git a/game/characters/hermione/face/tears/crying.webp b/game/characters/hermione/face/tears/crying/expression.webp similarity index 100% rename from game/characters/hermione/face/tears/crying.webp rename to game/characters/hermione/face/tears/crying/expression.webp diff --git a/game/characters/hermione/face/tears/crying_blink.webp b/game/characters/hermione/face/tears/crying_blink/expression.webp similarity index 100% rename from game/characters/hermione/face/tears/crying_blink.webp rename to game/characters/hermione/face/tears/crying_blink/expression.webp diff --git a/game/characters/hermione/face/tears/mascara.webp b/game/characters/hermione/face/tears/mascara/expression.webp similarity index 100% rename from game/characters/hermione/face/tears/mascara.webp rename to game/characters/hermione/face/tears/mascara/expression.webp diff --git a/game/characters/hermione/face/tears/mascara_crying.webp b/game/characters/hermione/face/tears/mascara_cryng/expression.webp similarity index 100% rename from game/characters/hermione/face/tears/mascara_crying.webp rename to game/characters/hermione/face/tears/mascara_cryng/expression.webp diff --git a/game/characters/hermione/face/tears/mascara_soft.webp b/game/characters/hermione/face/tears/mascara_soft/expression.webp similarity index 100% rename from game/characters/hermione/face/tears/mascara_soft.webp rename to game/characters/hermione/face/tears/mascara_soft/expression.webp diff --git a/game/characters/hermione/face/tears/mascara_soft_blink.webp b/game/characters/hermione/face/tears/mascara_soft_blink.webp deleted file mode 100644 index 69567c7d..00000000 --- a/game/characters/hermione/face/tears/mascara_soft_blink.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b6eb4cb10fd98947c34a12dc3be6bd7f98b3cf2b665ff719e52ec6bff62b9e75 -size 9752 diff --git a/game/characters/hermione/face/tears/messy.webp b/game/characters/hermione/face/tears/messy/expression.webp similarity index 100% rename from game/characters/hermione/face/tears/messy.webp rename to game/characters/hermione/face/tears/messy/expression.webp diff --git a/game/characters/hermione/face/tears/soft.webp b/game/characters/hermione/face/tears/soft/expression.webp similarity index 100% rename from game/characters/hermione/face/tears/soft.webp rename to game/characters/hermione/face/tears/soft/expression.webp diff --git a/game/characters/hermione/face/tears/soft_blink.webp b/game/characters/hermione/face/tears/soft_blink/expression.webp similarity index 100% rename from game/characters/hermione/face/tears/soft_blink.webp rename to game/characters/hermione/face/tears/soft_blink/expression.webp diff --git a/game/characters/hermione/face/tears/sweat.webp b/game/characters/hermione/face/tears/sweat/expression.webp similarity index 100% rename from game/characters/hermione/face/tears/sweat.webp rename to game/characters/hermione/face/tears/sweat/expression.webp diff --git a/game/characters/hermione/face/tears/tears_crying_side.webp b/game/characters/hermione/face/tears/tears_crying/expression.webp similarity index 100% rename from game/characters/hermione/face/tears/tears_crying_side.webp rename to game/characters/hermione/face/tears/tears_crying/expression.webp diff --git a/game/characters/hermione/face/tears/tears_down.webp b/game/characters/hermione/face/tears/tears_down/expression.webp similarity index 100% rename from game/characters/hermione/face/tears/tears_down.webp rename to game/characters/hermione/face/tears/tears_down/expression.webp diff --git a/game/characters/hermione/face/tears/tears_mascara_crying_blink.webp b/game/characters/hermione/face/tears/tears_mascara/expression.webp similarity index 100% rename from game/characters/hermione/face/tears/tears_mascara_crying_blink.webp rename to game/characters/hermione/face/tears/tears_mascara/expression.webp diff --git a/game/characters/hermione/face/tears/tears_soft_sweat.webp b/game/characters/hermione/face/tears/tears_soft/expression.webp similarity index 100% rename from game/characters/hermione/face/tears/tears_soft_sweat.webp rename to game/characters/hermione/face/tears/tears_soft/expression.webp diff --git a/game/characters/hooch/body/base/front.webp b/game/characters/hooch/body/front.webp similarity index 100% rename from game/characters/hooch/body/base/front.webp rename to game/characters/hooch/body/front.webp diff --git a/game/characters/hooch/face/cheeks/blush.webp b/game/characters/hooch/face/cheeks/blush/expression.webp similarity index 100% rename from game/characters/hooch/face/cheeks/blush.webp rename to game/characters/hooch/face/cheeks/blush/expression.webp diff --git a/game/characters/hooch/face/cheeks/blush_heavy.webp b/game/characters/hooch/face/cheeks/blush_heavy/expression.webp similarity index 100% rename from game/characters/hooch/face/cheeks/blush_heavy.webp rename to game/characters/hooch/face/cheeks/blush_heavy/expression.webp diff --git a/game/characters/hooch/face/eyebrows/angry.webp b/game/characters/hooch/face/eyebrows/angry/expression.webp similarity index 100% rename from game/characters/hooch/face/eyebrows/angry.webp rename to game/characters/hooch/face/eyebrows/angry/expression.webp diff --git a/game/characters/hooch/face/eyebrows/base.webp b/game/characters/hooch/face/eyebrows/base/expression.webp similarity index 100% rename from game/characters/hooch/face/eyebrows/base.webp rename to game/characters/hooch/face/eyebrows/base/expression.webp diff --git a/game/characters/hooch/face/eyebrows/raised.webp b/game/characters/hooch/face/eyebrows/raised/expression.webp similarity index 100% rename from game/characters/hooch/face/eyebrows/raised.webp rename to game/characters/hooch/face/eyebrows/raised/expression.webp diff --git a/game/characters/hooch/face/eyebrows/shocked.webp b/game/characters/hooch/face/eyebrows/shocked/expression.webp similarity index 100% rename from game/characters/hooch/face/eyebrows/shocked.webp rename to game/characters/hooch/face/eyebrows/shocked/expression.webp diff --git a/game/characters/hooch/face/eyebrows/worried.webp b/game/characters/hooch/face/eyebrows/worried/expression.webp similarity index 100% rename from game/characters/hooch/face/eyebrows/worried.webp rename to game/characters/hooch/face/eyebrows/worried/expression.webp diff --git a/game/characters/hooch/face/eyes/base.webp b/game/characters/hooch/face/eyes/base/expression.webp similarity index 100% rename from game/characters/hooch/face/eyes/base.webp rename to game/characters/hooch/face/eyes/base/expression.webp diff --git a/game/characters/hooch/face/eyes/base_mask.webp b/game/characters/hooch/face/eyes/base/eyemask.webp similarity index 100% rename from game/characters/hooch/face/eyes/base_mask.webp rename to game/characters/hooch/face/eyes/base/eyemask.webp diff --git a/game/characters/hooch/face/eyes/closed.webp b/game/characters/hooch/face/eyes/closed/expression.webp similarity index 100% rename from game/characters/hooch/face/eyes/closed.webp rename to game/characters/hooch/face/eyes/closed/expression.webp diff --git a/game/characters/hooch/face/eyes/narrow.webp b/game/characters/hooch/face/eyes/narrow/expression.webp similarity index 100% rename from game/characters/hooch/face/eyes/narrow.webp rename to game/characters/hooch/face/eyes/narrow/expression.webp diff --git a/game/characters/hooch/face/eyes/narrow_mask.webp b/game/characters/hooch/face/eyes/narrow/eyemask.webp similarity index 100% rename from game/characters/hooch/face/eyes/narrow_mask.webp rename to game/characters/hooch/face/eyes/narrow/eyemask.webp diff --git a/game/characters/hooch/face/eyes/shocked.webp b/game/characters/hooch/face/eyes/shocked/expression.webp similarity index 100% rename from game/characters/hooch/face/eyes/shocked.webp rename to game/characters/hooch/face/eyes/shocked/expression.webp diff --git a/game/characters/hooch/face/eyes/shocked_mask.webp b/game/characters/hooch/face/eyes/shocked/eyemask.webp similarity index 100% rename from game/characters/hooch/face/eyes/shocked_mask.webp rename to game/characters/hooch/face/eyes/shocked/eyemask.webp diff --git a/game/characters/hooch/face/eyes/wink.webp b/game/characters/hooch/face/eyes/wink/expression.webp similarity index 100% rename from game/characters/hooch/face/eyes/wink.webp rename to game/characters/hooch/face/eyes/wink/expression.webp diff --git a/game/characters/hooch/face/eyes/wink_mask.webp b/game/characters/hooch/face/eyes/wink/eyemask.webp similarity index 100% rename from game/characters/hooch/face/eyes/wink_mask.webp rename to game/characters/hooch/face/eyes/wink/eyemask.webp diff --git a/game/characters/hooch/face/mouth/angry.webp b/game/characters/hooch/face/mouth/angry/expression.webp similarity index 100% rename from game/characters/hooch/face/mouth/angry.webp rename to game/characters/hooch/face/mouth/angry/expression.webp diff --git a/game/characters/hooch/face/mouth/base.webp b/game/characters/hooch/face/mouth/base/expression.webp similarity index 100% rename from game/characters/hooch/face/mouth/base.webp rename to game/characters/hooch/face/mouth/base/expression.webp diff --git a/game/characters/hooch/face/mouth/grin.webp b/game/characters/hooch/face/mouth/grin/expression.webp similarity index 100% rename from game/characters/hooch/face/mouth/grin.webp rename to game/characters/hooch/face/mouth/grin/expression.webp diff --git a/game/characters/hooch/face/mouth/normal.webp b/game/characters/hooch/face/mouth/normal/expression.webp similarity index 100% rename from game/characters/hooch/face/mouth/normal.webp rename to game/characters/hooch/face/mouth/normal/expression.webp diff --git a/game/characters/hooch/face/mouth/open.webp b/game/characters/hooch/face/mouth/open/expression.webp similarity index 100% rename from game/characters/hooch/face/mouth/open.webp rename to game/characters/hooch/face/mouth/open/expression.webp diff --git a/game/characters/hooch/face/pupils/L.webp b/game/characters/hooch/face/pupils/L/expression.webp similarity index 100% rename from game/characters/hooch/face/pupils/L.webp rename to game/characters/hooch/face/pupils/L/expression.webp diff --git a/game/characters/hooch/face/pupils/R.webp b/game/characters/hooch/face/pupils/R/expression.webp similarity index 100% rename from game/characters/hooch/face/pupils/R.webp rename to game/characters/hooch/face/pupils/R/expression.webp diff --git a/game/characters/hooch/face/pupils/down.webp b/game/characters/hooch/face/pupils/down/expression.webp similarity index 100% rename from game/characters/hooch/face/pupils/down.webp rename to game/characters/hooch/face/pupils/down/expression.webp diff --git a/game/characters/hooch/face/pupils/downL.webp b/game/characters/hooch/face/pupils/downL/expression.webp similarity index 100% rename from game/characters/hooch/face/pupils/downL.webp rename to game/characters/hooch/face/pupils/downL/expression.webp diff --git a/game/characters/hooch/face/pupils/downR.webp b/game/characters/hooch/face/pupils/downR/expression.webp similarity index 100% rename from game/characters/hooch/face/pupils/downR.webp rename to game/characters/hooch/face/pupils/downR/expression.webp diff --git a/game/characters/hooch/face/pupils/mid.webp b/game/characters/hooch/face/pupils/mid/expression.webp similarity index 100% rename from game/characters/hooch/face/pupils/mid.webp rename to game/characters/hooch/face/pupils/mid/expression.webp diff --git a/game/characters/hooch/face/pupils/stare.webp b/game/characters/hooch/face/pupils/stare/expression.webp similarity index 100% rename from game/characters/hooch/face/pupils/stare.webp rename to game/characters/hooch/face/pupils/stare/expression.webp diff --git a/game/characters/hooch/face/pupils/up.webp b/game/characters/hooch/face/pupils/up/expression.webp similarity index 100% rename from game/characters/hooch/face/pupils/up.webp rename to game/characters/hooch/face/pupils/up/expression.webp diff --git a/game/characters/luna/body/armleft/down.webp b/game/characters/luna/body/armleft/down.webp deleted file mode 100644 index 1d9a8c10..00000000 --- a/game/characters/luna/body/armleft/down.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:38cf7377244e0ccfbc5281f8802bb589e994c671df5293f968e915e6f730b599 -size 9390 diff --git a/game/characters/luna/body/armright/down.webp b/game/characters/luna/body/armright/down.webp deleted file mode 100644 index 0048ed4c..00000000 --- a/game/characters/luna/body/armright/down.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0b0146a1ce81288acd041a95d2d7ad2c33dafe5173f3259b933fe283f8363acc -size 8398 diff --git a/game/characters/luna/body/breasts/normal_tight.webp b/game/characters/luna/body/breasts/normal_tight.webp deleted file mode 100644 index 09e1fabb..00000000 --- a/game/characters/luna/body/breasts/normal_tight.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b6e6de86d903a4e8157190d6fda19b6daaa60c968a81ebaeb39fa8e762cf8170 -size 12508 diff --git a/game/characters/luna/body/base/front.webp b/game/characters/luna/body/front.webp similarity index 100% rename from game/characters/luna/body/base/front.webp rename to game/characters/luna/body/front.webp diff --git a/game/characters/luna/body/armleft/up.webp b/game/characters/luna/body/larm_zorder_2.webp similarity index 100% rename from game/characters/luna/body/armleft/up.webp rename to game/characters/luna/body/larm_zorder_2.webp diff --git a/game/characters/luna/body/breasts/normal.webp b/game/characters/luna/body/nbreasts_zorder_1.webp similarity index 100% rename from game/characters/luna/body/breasts/normal.webp rename to game/characters/luna/body/nbreasts_zorder_1.webp diff --git a/game/characters/luna/body/armright/up.webp b/game/characters/luna/body/rarm_zorder_2.webp similarity index 100% rename from game/characters/luna/body/armright/up.webp rename to game/characters/luna/body/rarm_zorder_2.webp diff --git a/game/characters/luna/clothes/headgear/antlers/0.webp b/game/characters/luna/clothes/headgear/antlers/default/0.webp similarity index 100% rename from game/characters/luna/clothes/headgear/antlers/0.webp rename to game/characters/luna/clothes/headgear/antlers/default/0.webp diff --git a/game/characters/luna/clothes/headgear/antlers/1.webp b/game/characters/luna/clothes/headgear/antlers/default/1.webp similarity index 100% rename from game/characters/luna/clothes/headgear/antlers/1.webp rename to game/characters/luna/clothes/headgear/antlers/default/1.webp diff --git a/game/characters/luna/clothes/headgear/antlers/2.webp b/game/characters/luna/clothes/headgear/antlers/default/2.webp similarity index 100% rename from game/characters/luna/clothes/headgear/antlers/2.webp rename to game/characters/luna/clothes/headgear/antlers/default/2.webp diff --git a/game/characters/luna/clothes/headgear/antlers/extra.webp b/game/characters/luna/clothes/headgear/antlers/default/extra.webp similarity index 100% rename from game/characters/luna/clothes/headgear/antlers/extra.webp rename to game/characters/luna/clothes/headgear/antlers/default/extra.webp diff --git a/game/characters/luna/clothes/headgear/antlers/outline.webp b/game/characters/luna/clothes/headgear/antlers/default/outline.webp similarity index 100% rename from game/characters/luna/clothes/headgear/antlers/outline.webp rename to game/characters/luna/clothes/headgear/antlers/default/outline.webp diff --git a/game/characters/luna/clothes/headgear/bunny_hat_1/0.webp b/game/characters/luna/clothes/headgear/bunny_hat_1/default/0.webp similarity index 100% rename from game/characters/luna/clothes/headgear/bunny_hat_1/0.webp rename to game/characters/luna/clothes/headgear/bunny_hat_1/default/0.webp diff --git a/game/characters/luna/clothes/headgear/bunny_hat_1/1.webp b/game/characters/luna/clothes/headgear/bunny_hat_1/default/1.webp similarity index 100% rename from game/characters/luna/clothes/headgear/bunny_hat_1/1.webp rename to game/characters/luna/clothes/headgear/bunny_hat_1/default/1.webp diff --git a/game/characters/luna/clothes/headgear/bunny_hat_1/outline.webp b/game/characters/luna/clothes/headgear/bunny_hat_1/default/outline.webp similarity index 100% rename from game/characters/luna/clothes/headgear/bunny_hat_1/outline.webp rename to game/characters/luna/clothes/headgear/bunny_hat_1/default/outline.webp diff --git a/game/characters/luna/clothes/headgear/flight_attendant/0.webp b/game/characters/luna/clothes/headgear/flight_attendant/default/0.webp similarity index 100% rename from game/characters/luna/clothes/headgear/flight_attendant/0.webp rename to game/characters/luna/clothes/headgear/flight_attendant/default/0.webp diff --git a/game/characters/luna/clothes/headgear/flight_attendant/outline.webp b/game/characters/luna/clothes/headgear/flight_attendant/default/outline.webp similarity index 100% rename from game/characters/luna/clothes/headgear/flight_attendant/outline.webp rename to game/characters/luna/clothes/headgear/flight_attendant/default/outline.webp diff --git a/game/characters/luna/cum/body/heavy.webp b/game/characters/luna/cum/body/heavy/cum.webp similarity index 100% rename from game/characters/luna/cum/body/heavy.webp rename to game/characters/luna/cum/body/heavy/cum.webp diff --git a/game/characters/luna/cum/body/light.webp b/game/characters/luna/cum/body/light/cum.webp similarity index 100% rename from game/characters/luna/cum/body/light.webp rename to game/characters/luna/cum/body/light/cum.webp diff --git a/game/characters/luna/cum/breasts/heavy.webp b/game/characters/luna/cum/breasts/heavy/cum.webp similarity index 100% rename from game/characters/luna/cum/breasts/heavy.webp rename to game/characters/luna/cum/breasts/heavy/cum.webp diff --git a/game/characters/luna/cum/breasts/light.webp b/game/characters/luna/cum/breasts/light/cum.webp similarity index 100% rename from game/characters/luna/cum/breasts/light.webp rename to game/characters/luna/cum/breasts/light/cum.webp diff --git a/game/characters/luna/cum/crotch/heavy.webp b/game/characters/luna/cum/crotch/heavy/cum.webp similarity index 100% rename from game/characters/luna/cum/crotch/heavy.webp rename to game/characters/luna/cum/crotch/heavy/cum.webp diff --git a/game/characters/luna/cum/crotch/light.webp b/game/characters/luna/cum/crotch/light/cum.webp similarity index 100% rename from game/characters/luna/cum/crotch/light.webp rename to game/characters/luna/cum/crotch/light/cum.webp diff --git a/game/characters/luna/cum/face/heavy.webp b/game/characters/luna/cum/face/heavy/cum.webp similarity index 100% rename from game/characters/luna/cum/face/heavy.webp rename to game/characters/luna/cum/face/heavy/cum.webp diff --git a/game/characters/luna/cum/face/light.webp b/game/characters/luna/cum/face/light/cum.webp similarity index 100% rename from game/characters/luna/cum/face/light.webp rename to game/characters/luna/cum/face/light/cum.webp diff --git a/game/characters/luna/cum/hair/heavy.webp b/game/characters/luna/cum/hair/heavy/cum.webp similarity index 100% rename from game/characters/luna/cum/hair/heavy.webp rename to game/characters/luna/cum/hair/heavy/cum.webp diff --git a/game/characters/luna/cum/hair/light.webp b/game/characters/luna/cum/hair/light/cum.webp similarity index 100% rename from game/characters/luna/cum/hair/light.webp rename to game/characters/luna/cum/hair/light/cum.webp diff --git a/game/characters/luna/cum/legs/heavy.webp b/game/characters/luna/cum/legs/heavy/cum.webp similarity index 100% rename from game/characters/luna/cum/legs/heavy.webp rename to game/characters/luna/cum/legs/heavy/cum.webp diff --git a/game/characters/luna/cum/legs/light.webp b/game/characters/luna/cum/legs/light/cum.webp similarity index 100% rename from game/characters/luna/cum/legs/light.webp rename to game/characters/luna/cum/legs/light/cum.webp diff --git a/game/characters/luna/cum/pussy/heavy.webp b/game/characters/luna/cum/pussy/heavy/cum.webp similarity index 100% rename from game/characters/luna/cum/pussy/heavy.webp rename to game/characters/luna/cum/pussy/heavy/cum.webp diff --git a/game/characters/luna/cum/pussy/light.webp b/game/characters/luna/cum/pussy/light/cum.webp similarity index 100% rename from game/characters/luna/cum/pussy/light.webp rename to game/characters/luna/cum/pussy/light/cum.webp diff --git a/game/characters/luna/cum/pussy/squirt.webp b/game/characters/luna/cum/pussy/squirt/cum.webp similarity index 100% rename from game/characters/luna/cum/pussy/squirt.webp rename to game/characters/luna/cum/pussy/squirt/cum.webp diff --git a/game/characters/luna/cum/pussy/squirt_post.webp b/game/characters/luna/cum/pussy/squirt_post/cum.webp similarity index 100% rename from game/characters/luna/cum/pussy/squirt_post.webp rename to game/characters/luna/cum/pussy/squirt_post/cum.webp diff --git a/game/characters/luna/cum/pussy/wet.webp b/game/characters/luna/cum/pussy/wet/cum.webp similarity index 100% rename from game/characters/luna/cum/pussy/wet.webp rename to game/characters/luna/cum/pussy/wet/cum.webp diff --git a/game/characters/luna/face/cheeks/blush.webp b/game/characters/luna/face/cheeks/blush/expression.webp similarity index 100% rename from game/characters/luna/face/cheeks/blush.webp rename to game/characters/luna/face/cheeks/blush/expression.webp diff --git a/game/characters/luna/face/eyebrows/angry.webp b/game/characters/luna/face/eyebrows/angry/expression.webp similarity index 100% rename from game/characters/luna/face/eyebrows/angry.webp rename to game/characters/luna/face/eyebrows/angry/expression.webp diff --git a/game/characters/luna/face/eyebrows/angry_skin.webp b/game/characters/luna/face/eyebrows/angry/skin.webp similarity index 100% rename from game/characters/luna/face/eyebrows/angry_skin.webp rename to game/characters/luna/face/eyebrows/angry/skin.webp diff --git a/game/characters/luna/face/eyebrows/annoyed.webp b/game/characters/luna/face/eyebrows/annoyed/expression.webp similarity index 100% rename from game/characters/luna/face/eyebrows/annoyed.webp rename to game/characters/luna/face/eyebrows/annoyed/expression.webp diff --git a/game/characters/luna/face/eyebrows/annoyed_skin.webp b/game/characters/luna/face/eyebrows/annoyed/skin.webp similarity index 100% rename from game/characters/luna/face/eyebrows/annoyed_skin.webp rename to game/characters/luna/face/eyebrows/annoyed/skin.webp diff --git a/game/characters/luna/face/eyebrows/base.webp b/game/characters/luna/face/eyebrows/base/expression.webp similarity index 100% rename from game/characters/luna/face/eyebrows/base.webp rename to game/characters/luna/face/eyebrows/base/expression.webp diff --git a/game/characters/luna/face/eyebrows/base_skin.webp b/game/characters/luna/face/eyebrows/base/skin.webp similarity index 100% rename from game/characters/luna/face/eyebrows/base_skin.webp rename to game/characters/luna/face/eyebrows/base/skin.webp diff --git a/game/characters/luna/face/eyebrows/low.webp b/game/characters/luna/face/eyebrows/low/expression.webp similarity index 100% rename from game/characters/luna/face/eyebrows/low.webp rename to game/characters/luna/face/eyebrows/low/expression.webp diff --git a/game/characters/luna/face/eyebrows/low_skin.webp b/game/characters/luna/face/eyebrows/low/skin.webp similarity index 100% rename from game/characters/luna/face/eyebrows/low_skin.webp rename to game/characters/luna/face/eyebrows/low/skin.webp diff --git a/game/characters/luna/face/eyebrows/raised.webp b/game/characters/luna/face/eyebrows/raised/expression.webp similarity index 100% rename from game/characters/luna/face/eyebrows/raised.webp rename to game/characters/luna/face/eyebrows/raised/expression.webp diff --git a/game/characters/luna/face/eyebrows/raised_skin.webp b/game/characters/luna/face/eyebrows/raised/skin.webp similarity index 100% rename from game/characters/luna/face/eyebrows/raised_skin.webp rename to game/characters/luna/face/eyebrows/raised/skin.webp diff --git a/game/characters/luna/face/eyebrows/worried.webp b/game/characters/luna/face/eyebrows/worried/expression.webp similarity index 100% rename from game/characters/luna/face/eyebrows/worried.webp rename to game/characters/luna/face/eyebrows/worried/expression.webp diff --git a/game/characters/luna/face/eyebrows/worried_skin.webp b/game/characters/luna/face/eyebrows/worried/skin.webp similarity index 100% rename from game/characters/luna/face/eyebrows/worried_skin.webp rename to game/characters/luna/face/eyebrows/worried/skin.webp diff --git a/game/characters/luna/face/eyes/base.webp b/game/characters/luna/face/eyes/base/expression.webp similarity index 100% rename from game/characters/luna/face/eyes/base.webp rename to game/characters/luna/face/eyes/base/expression.webp diff --git a/game/characters/luna/face/eyes/base_mask.webp b/game/characters/luna/face/eyes/base/mask.webp similarity index 100% rename from game/characters/luna/face/eyes/base_mask.webp rename to game/characters/luna/face/eyes/base/mask.webp diff --git a/game/characters/luna/face/eyes/base_skin.webp b/game/characters/luna/face/eyes/base/skin.webp similarity index 100% rename from game/characters/luna/face/eyes/base_skin.webp rename to game/characters/luna/face/eyes/base/skin.webp diff --git a/game/characters/luna/face/eyes/closed.webp b/game/characters/luna/face/eyes/closed/expression.webp similarity index 100% rename from game/characters/luna/face/eyes/closed.webp rename to game/characters/luna/face/eyes/closed/expression.webp diff --git a/game/characters/luna/face/eyes/closed_skin.webp b/game/characters/luna/face/eyes/closed/skin.webp similarity index 100% rename from game/characters/luna/face/eyes/closed_skin.webp rename to game/characters/luna/face/eyes/closed/skin.webp diff --git a/game/characters/luna/face/eyes/happyCl.webp b/game/characters/luna/face/eyes/happyCl/expression.webp similarity index 100% rename from game/characters/luna/face/eyes/happyCl.webp rename to game/characters/luna/face/eyes/happyCl/expression.webp diff --git a/game/characters/luna/face/eyes/happyCl_skin.webp b/game/characters/luna/face/eyes/happyCl/skin.webp similarity index 100% rename from game/characters/luna/face/eyes/happyCl_skin.webp rename to game/characters/luna/face/eyes/happyCl/skin.webp diff --git a/game/characters/luna/face/eyes/narrow.webp b/game/characters/luna/face/eyes/narrow/expression.webp similarity index 100% rename from game/characters/luna/face/eyes/narrow.webp rename to game/characters/luna/face/eyes/narrow/expression.webp diff --git a/game/characters/luna/face/eyes/narrow_mask.webp b/game/characters/luna/face/eyes/narrow/mask.webp similarity index 100% rename from game/characters/luna/face/eyes/narrow_mask.webp rename to game/characters/luna/face/eyes/narrow/mask.webp diff --git a/game/characters/luna/face/eyes/narrow_skin.webp b/game/characters/luna/face/eyes/narrow/skin.webp similarity index 100% rename from game/characters/luna/face/eyes/narrow_skin.webp rename to game/characters/luna/face/eyes/narrow/skin.webp diff --git a/game/characters/luna/face/eyes/wide.webp b/game/characters/luna/face/eyes/wide/expression.webp similarity index 100% rename from game/characters/luna/face/eyes/wide.webp rename to game/characters/luna/face/eyes/wide/expression.webp diff --git a/game/characters/luna/face/eyes/wide_mask.webp b/game/characters/luna/face/eyes/wide/mask.webp similarity index 100% rename from game/characters/luna/face/eyes/wide_mask.webp rename to game/characters/luna/face/eyes/wide/mask.webp diff --git a/game/characters/luna/face/eyes/wide_skin.webp b/game/characters/luna/face/eyes/wide/skin.webp similarity index 100% rename from game/characters/luna/face/eyes/wide_skin.webp rename to game/characters/luna/face/eyes/wide/skin.webp diff --git a/game/characters/luna/face/eyes/wink.webp b/game/characters/luna/face/eyes/wink/expression.webp similarity index 100% rename from game/characters/luna/face/eyes/wink.webp rename to game/characters/luna/face/eyes/wink/expression.webp diff --git a/game/characters/luna/face/eyes/wink_mask.webp b/game/characters/luna/face/eyes/wink/mask.webp similarity index 100% rename from game/characters/luna/face/eyes/wink_mask.webp rename to game/characters/luna/face/eyes/wink/mask.webp diff --git a/game/characters/luna/face/eyes/wink_skin.webp b/game/characters/luna/face/eyes/wink/skin.webp similarity index 100% rename from game/characters/luna/face/eyes/wink_skin.webp rename to game/characters/luna/face/eyes/wink/skin.webp diff --git a/game/characters/luna/face/mouth/angry.webp b/game/characters/luna/face/mouth/angry/expression.webp similarity index 100% rename from game/characters/luna/face/mouth/angry.webp rename to game/characters/luna/face/mouth/angry/expression.webp diff --git a/game/characters/luna/face/mouth/annoyed.webp b/game/characters/luna/face/mouth/annoyed/expression.webp similarity index 100% rename from game/characters/luna/face/mouth/annoyed.webp rename to game/characters/luna/face/mouth/annoyed/expression.webp diff --git a/game/characters/luna/face/mouth/base.webp b/game/characters/luna/face/mouth/base/expression.webp similarity index 100% rename from game/characters/luna/face/mouth/base.webp rename to game/characters/luna/face/mouth/base/expression.webp diff --git a/game/characters/luna/face/mouth/clench.webp b/game/characters/luna/face/mouth/clench/expression.webp similarity index 100% rename from game/characters/luna/face/mouth/clench.webp rename to game/characters/luna/face/mouth/clench/expression.webp diff --git a/game/characters/luna/face/mouth/crooked_smile.webp b/game/characters/luna/face/mouth/crooked_smile/expression.webp similarity index 100% rename from game/characters/luna/face/mouth/crooked_smile.webp rename to game/characters/luna/face/mouth/crooked_smile/expression.webp diff --git a/game/characters/luna/face/mouth/disgust.webp b/game/characters/luna/face/mouth/disgust/expression.webp similarity index 100% rename from game/characters/luna/face/mouth/disgust.webp rename to game/characters/luna/face/mouth/disgust/expression.webp diff --git a/game/characters/luna/face/mouth/full.webp b/game/characters/luna/face/mouth/full/expression.webp similarity index 100% rename from game/characters/luna/face/mouth/full.webp rename to game/characters/luna/face/mouth/full/expression.webp diff --git a/game/characters/luna/face/mouth/grin.webp b/game/characters/luna/face/mouth/grin/expression.webp similarity index 100% rename from game/characters/luna/face/mouth/grin.webp rename to game/characters/luna/face/mouth/grin/expression.webp diff --git a/game/characters/luna/face/mouth/mad.webp b/game/characters/luna/face/mouth/mad/expression.webp similarity index 100% rename from game/characters/luna/face/mouth/mad.webp rename to game/characters/luna/face/mouth/mad/expression.webp diff --git a/game/characters/luna/face/mouth/normal.webp b/game/characters/luna/face/mouth/normal/expression.webp similarity index 100% rename from game/characters/luna/face/mouth/normal.webp rename to game/characters/luna/face/mouth/normal/expression.webp diff --git a/game/characters/luna/face/mouth/open.webp b/game/characters/luna/face/mouth/open/expression.webp similarity index 100% rename from game/characters/luna/face/mouth/open.webp rename to game/characters/luna/face/mouth/open/expression.webp diff --git a/game/characters/luna/face/mouth/open_tongue.webp b/game/characters/luna/face/mouth/open_tongue/expression.webp similarity index 100% rename from game/characters/luna/face/mouth/open_tongue.webp rename to game/characters/luna/face/mouth/open_tongue/expression.webp diff --git a/game/characters/luna/face/mouth/open_wide_tongue.webp b/game/characters/luna/face/mouth/open_wide/expression.webp similarity index 100% rename from game/characters/luna/face/mouth/open_wide_tongue.webp rename to game/characters/luna/face/mouth/open_wide/expression.webp diff --git a/game/characters/luna/face/mouth/scream.webp b/game/characters/luna/face/mouth/scream/expression.webp similarity index 100% rename from game/characters/luna/face/mouth/scream.webp rename to game/characters/luna/face/mouth/scream/expression.webp diff --git a/game/characters/luna/face/mouth/shock.webp b/game/characters/luna/face/mouth/shock/expression.webp similarity index 100% rename from game/characters/luna/face/mouth/shock.webp rename to game/characters/luna/face/mouth/shock/expression.webp diff --git a/game/characters/luna/face/mouth/silly.webp b/game/characters/luna/face/mouth/silly/expression.webp similarity index 100% rename from game/characters/luna/face/mouth/silly.webp rename to game/characters/luna/face/mouth/silly/expression.webp diff --git a/game/characters/luna/face/mouth/smile.webp b/game/characters/luna/face/mouth/smile/expression.webp similarity index 100% rename from game/characters/luna/face/mouth/smile.webp rename to game/characters/luna/face/mouth/smile/expression.webp diff --git a/game/characters/luna/face/mouth/soft.webp b/game/characters/luna/face/mouth/soft/expression.webp similarity index 100% rename from game/characters/luna/face/mouth/soft.webp rename to game/characters/luna/face/mouth/soft/expression.webp diff --git a/game/characters/luna/face/mouth/upset.webp b/game/characters/luna/face/mouth/upset/expression.webp similarity index 100% rename from game/characters/luna/face/mouth/upset.webp rename to game/characters/luna/face/mouth/upset/expression.webp diff --git a/game/characters/luna/face/pupils/L.webp b/game/characters/luna/face/pupils/L/expression.webp similarity index 100% rename from game/characters/luna/face/pupils/L.webp rename to game/characters/luna/face/pupils/L/expression.webp diff --git a/game/characters/luna/face/pupils/R.webp b/game/characters/luna/face/pupils/R/expression.webp similarity index 100% rename from game/characters/luna/face/pupils/R.webp rename to game/characters/luna/face/pupils/R/expression.webp diff --git a/game/characters/luna/face/pupils/ahegao.webp b/game/characters/luna/face/pupils/ahegao/expression.webp similarity index 100% rename from game/characters/luna/face/pupils/ahegao.webp rename to game/characters/luna/face/pupils/ahegao/expression.webp diff --git a/game/characters/luna/face/pupils/dead.webp b/game/characters/luna/face/pupils/dead/expression.webp similarity index 100% rename from game/characters/luna/face/pupils/dead.webp rename to game/characters/luna/face/pupils/dead/expression.webp diff --git a/game/characters/luna/face/pupils/down.webp b/game/characters/luna/face/pupils/down/expression.webp similarity index 100% rename from game/characters/luna/face/pupils/down.webp rename to game/characters/luna/face/pupils/down/expression.webp diff --git a/game/characters/luna/face/pupils/downL.webp b/game/characters/luna/face/pupils/downL/expression.webp similarity index 100% rename from game/characters/luna/face/pupils/downL.webp rename to game/characters/luna/face/pupils/downL/expression.webp diff --git a/game/characters/luna/face/pupils/downR.webp b/game/characters/luna/face/pupils/downR/expression.webp similarity index 100% rename from game/characters/luna/face/pupils/downR.webp rename to game/characters/luna/face/pupils/downR/expression.webp diff --git a/game/characters/luna/face/pupils/mid.webp b/game/characters/luna/face/pupils/mid/expression.webp similarity index 100% rename from game/characters/luna/face/pupils/mid.webp rename to game/characters/luna/face/pupils/mid/expression.webp diff --git a/game/characters/luna/face/pupils/squint.webp b/game/characters/luna/face/pupils/squint/expression.webp similarity index 100% rename from game/characters/luna/face/pupils/squint.webp rename to game/characters/luna/face/pupils/squint/expression.webp diff --git a/game/characters/luna/face/pupils/stare.webp b/game/characters/luna/face/pupils/stare/expression.webp similarity index 100% rename from game/characters/luna/face/pupils/stare.webp rename to game/characters/luna/face/pupils/stare/expression.webp diff --git a/game/characters/luna/face/pupils/up.webp b/game/characters/luna/face/pupils/up/expression.webp similarity index 100% rename from game/characters/luna/face/pupils/up.webp rename to game/characters/luna/face/pupils/up/expression.webp diff --git a/game/characters/luna/face/tears/crying.webp b/game/characters/luna/face/tears/crying/expression.webp similarity index 100% rename from game/characters/luna/face/tears/crying.webp rename to game/characters/luna/face/tears/crying/expression.webp diff --git a/game/characters/luna/face/tears/crying_blink.webp b/game/characters/luna/face/tears/crying_blink.webp deleted file mode 100644 index a859d022..00000000 --- a/game/characters/luna/face/tears/crying_blink.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:63c183ac5237fd133b33d0c7e7112a929af4e5952878788616f4938bca8f498f -size 3972 diff --git a/game/characters/cho/poses/broom/face/extras/tears_2.webp b/game/characters/luna/face/tears/crying_blink/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/extras/tears_2.webp rename to game/characters/luna/face/tears/crying_blink/expression.webp diff --git a/game/characters/luna/face/tears/mascara.webp b/game/characters/luna/face/tears/mascara.webp deleted file mode 100644 index 80c5ae6f..00000000 --- a/game/characters/luna/face/tears/mascara.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:99cb1139e120582e7f530ae2ef12b6164a2819afec45be8e1312fb2ea6ce5a4c -size 4834 diff --git a/game/characters/cho/poses/broom/face/extras/tears_3.webp b/game/characters/luna/face/tears/mascara/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/extras/tears_3.webp rename to game/characters/luna/face/tears/mascara/expression.webp diff --git a/game/characters/luna/face/tears/messy.webp b/game/characters/luna/face/tears/messy.webp deleted file mode 100644 index bacdc01e..00000000 --- a/game/characters/luna/face/tears/messy.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:94c5c127f666a62ff4ea6953bf4ac278aadaa1733b1e5ae58cae7479a65a5cdc -size 9028 diff --git a/game/characters/cho/poses/broom/face/extras/tears_4.webp b/game/characters/luna/face/tears/messy/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/extras/tears_4.webp rename to game/characters/luna/face/tears/messy/expression.webp diff --git a/game/characters/luna/face/tears/soft.webp b/game/characters/luna/face/tears/soft.webp deleted file mode 100644 index 0211ad98..00000000 --- a/game/characters/luna/face/tears/soft.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:80e099eaf9a137827bed7ba2407ddbc76fff7ebc3dd5df6e4f1393a6605be0e9 -size 1254 diff --git a/game/characters/cho/poses/broom/face/extras/tears_1.webp b/game/characters/luna/face/tears/soft/expression.webp similarity index 100% rename from game/characters/cho/poses/broom/face/extras/tears_1.webp rename to game/characters/luna/face/tears/soft/expression.webp diff --git a/game/characters/susan/body/base/front.webp b/game/characters/susan/body/front.webp similarity index 100% rename from game/characters/susan/body/base/front.webp rename to game/characters/susan/body/front.webp diff --git a/game/characters/susan/clothes/headgear/priestess_headdress/0.webp b/game/characters/susan/clothes/headgear/priestess_headdress/default/0.webp similarity index 100% rename from game/characters/susan/clothes/headgear/priestess_headdress/0.webp rename to game/characters/susan/clothes/headgear/priestess_headdress/default/0.webp diff --git a/game/characters/susan/clothes/headgear/priestess_headdress/0_back.webp b/game/characters/susan/clothes/headgear/priestess_headdress/default/0_back.webp similarity index 100% rename from game/characters/susan/clothes/headgear/priestess_headdress/0_back.webp rename to game/characters/susan/clothes/headgear/priestess_headdress/default/0_back.webp diff --git a/game/characters/susan/clothes/headgear/priestess_headdress/1.webp b/game/characters/susan/clothes/headgear/priestess_headdress/default/1.webp similarity index 100% rename from game/characters/susan/clothes/headgear/priestess_headdress/1.webp rename to game/characters/susan/clothes/headgear/priestess_headdress/default/1.webp diff --git a/game/characters/susan/clothes/headgear/priestess_headdress/mask.webp b/game/characters/susan/clothes/headgear/priestess_headdress/default/mask.webp similarity index 100% rename from game/characters/susan/clothes/headgear/priestess_headdress/mask.webp rename to game/characters/susan/clothes/headgear/priestess_headdress/default/mask.webp diff --git a/game/characters/susan/clothes/headgear/priestess_headdress/outline.webp b/game/characters/susan/clothes/headgear/priestess_headdress/default/outline.webp similarity index 100% rename from game/characters/susan/clothes/headgear/priestess_headdress/outline.webp rename to game/characters/susan/clothes/headgear/priestess_headdress/default/outline.webp diff --git a/game/characters/susan/clothes/headgear/priestess_headdress/outline_back.webp b/game/characters/susan/clothes/headgear/priestess_headdress/default/outline_back.webp similarity index 100% rename from game/characters/susan/clothes/headgear/priestess_headdress/outline_back.webp rename to game/characters/susan/clothes/headgear/priestess_headdress/default/outline_back.webp diff --git a/game/characters/susan/face/cheeks/blush.webp b/game/characters/susan/face/cheeks/blush/expression.webp similarity index 100% rename from game/characters/susan/face/cheeks/blush.webp rename to game/characters/susan/face/cheeks/blush/expression.webp diff --git a/game/characters/susan/face/eyebrows/angry.webp b/game/characters/susan/face/eyebrows/angry/expression.webp similarity index 100% rename from game/characters/susan/face/eyebrows/angry.webp rename to game/characters/susan/face/eyebrows/angry/expression.webp diff --git a/game/characters/susan/face/eyebrows/angry_skin.webp b/game/characters/susan/face/eyebrows/angry/skin.webp similarity index 100% rename from game/characters/susan/face/eyebrows/angry_skin.webp rename to game/characters/susan/face/eyebrows/angry/skin.webp diff --git a/game/characters/susan/face/eyebrows/annoyed.webp b/game/characters/susan/face/eyebrows/annoyed/expression.webp similarity index 100% rename from game/characters/susan/face/eyebrows/annoyed.webp rename to game/characters/susan/face/eyebrows/annoyed/expression.webp diff --git a/game/characters/susan/face/eyebrows/annoyed_skin.webp b/game/characters/susan/face/eyebrows/annoyed/skin.webp similarity index 100% rename from game/characters/susan/face/eyebrows/annoyed_skin.webp rename to game/characters/susan/face/eyebrows/annoyed/skin.webp diff --git a/game/characters/susan/face/eyebrows/base.webp b/game/characters/susan/face/eyebrows/base/expression.webp similarity index 100% rename from game/characters/susan/face/eyebrows/base.webp rename to game/characters/susan/face/eyebrows/base/expression.webp diff --git a/game/characters/susan/face/eyebrows/base_skin.webp b/game/characters/susan/face/eyebrows/base/skin.webp similarity index 100% rename from game/characters/susan/face/eyebrows/base_skin.webp rename to game/characters/susan/face/eyebrows/base/skin.webp diff --git a/game/characters/susan/face/eyebrows/low.webp b/game/characters/susan/face/eyebrows/low/expression.webp similarity index 100% rename from game/characters/susan/face/eyebrows/low.webp rename to game/characters/susan/face/eyebrows/low/expression.webp diff --git a/game/characters/susan/face/eyebrows/low_skin.webp b/game/characters/susan/face/eyebrows/low/skin.webp similarity index 100% rename from game/characters/susan/face/eyebrows/low_skin.webp rename to game/characters/susan/face/eyebrows/low/skin.webp diff --git a/game/characters/susan/face/eyebrows/raised.webp b/game/characters/susan/face/eyebrows/raised/expression.webp similarity index 100% rename from game/characters/susan/face/eyebrows/raised.webp rename to game/characters/susan/face/eyebrows/raised/expression.webp diff --git a/game/characters/susan/face/eyebrows/raised_skin.webp b/game/characters/susan/face/eyebrows/raised/skin.webp similarity index 100% rename from game/characters/susan/face/eyebrows/raised_skin.webp rename to game/characters/susan/face/eyebrows/raised/skin.webp diff --git a/game/characters/susan/face/eyebrows/sad.webp b/game/characters/susan/face/eyebrows/sad/expression.webp similarity index 100% rename from game/characters/susan/face/eyebrows/sad.webp rename to game/characters/susan/face/eyebrows/sad/expression.webp diff --git a/game/characters/susan/face/eyebrows/sad_skin.webp b/game/characters/susan/face/eyebrows/sad/skin.webp similarity index 100% rename from game/characters/susan/face/eyebrows/sad_skin.webp rename to game/characters/susan/face/eyebrows/sad/skin.webp diff --git a/game/characters/susan/face/eyebrows/shocked.webp b/game/characters/susan/face/eyebrows/shocked/expression.webp similarity index 100% rename from game/characters/susan/face/eyebrows/shocked.webp rename to game/characters/susan/face/eyebrows/shocked/expression.webp diff --git a/game/characters/susan/face/eyebrows/shocked_skin.webp b/game/characters/susan/face/eyebrows/shocked/skin.webp similarity index 100% rename from game/characters/susan/face/eyebrows/shocked_skin.webp rename to game/characters/susan/face/eyebrows/shocked/skin.webp diff --git a/game/characters/susan/face/eyebrows/worried.webp b/game/characters/susan/face/eyebrows/worried/expression.webp similarity index 100% rename from game/characters/susan/face/eyebrows/worried.webp rename to game/characters/susan/face/eyebrows/worried/expression.webp diff --git a/game/characters/susan/face/eyebrows/worried_skin.webp b/game/characters/susan/face/eyebrows/worried/skin.webp similarity index 100% rename from game/characters/susan/face/eyebrows/worried_skin.webp rename to game/characters/susan/face/eyebrows/worried/skin.webp diff --git a/game/characters/susan/face/eyes/base.webp b/game/characters/susan/face/eyes/base/expression.webp similarity index 100% rename from game/characters/susan/face/eyes/base.webp rename to game/characters/susan/face/eyes/base/expression.webp diff --git a/game/characters/susan/face/eyes/base_mask.webp b/game/characters/susan/face/eyes/base/eyemask.webp similarity index 100% rename from game/characters/susan/face/eyes/base_mask.webp rename to game/characters/susan/face/eyes/base/eyemask.webp diff --git a/game/characters/susan/face/eyes/base_skin.webp b/game/characters/susan/face/eyes/base/skin.webp similarity index 100% rename from game/characters/susan/face/eyes/base_skin.webp rename to game/characters/susan/face/eyes/base/skin.webp diff --git a/game/characters/susan/face/eyes/closed.webp b/game/characters/susan/face/eyes/closed/expression.webp similarity index 100% rename from game/characters/susan/face/eyes/closed.webp rename to game/characters/susan/face/eyes/closed/expression.webp diff --git a/game/characters/susan/face/eyes/closed_skin.webp b/game/characters/susan/face/eyes/closed/skin.webp similarity index 100% rename from game/characters/susan/face/eyes/closed_skin.webp rename to game/characters/susan/face/eyes/closed/skin.webp diff --git a/game/characters/susan/face/eyes/happy.webp b/game/characters/susan/face/eyes/happy/expression.webp similarity index 100% rename from game/characters/susan/face/eyes/happy.webp rename to game/characters/susan/face/eyes/happy/expression.webp diff --git a/game/characters/susan/face/eyes/happy_mask.webp b/game/characters/susan/face/eyes/happy/eyemask.webp similarity index 100% rename from game/characters/susan/face/eyes/happy_mask.webp rename to game/characters/susan/face/eyes/happy/eyemask.webp diff --git a/game/characters/susan/face/eyes/happy_skin.webp b/game/characters/susan/face/eyes/happy/skin.webp similarity index 100% rename from game/characters/susan/face/eyes/happy_skin.webp rename to game/characters/susan/face/eyes/happy/skin.webp diff --git a/game/characters/susan/face/eyes/happyCl.webp b/game/characters/susan/face/eyes/happyCl/expression.webp similarity index 100% rename from game/characters/susan/face/eyes/happyCl.webp rename to game/characters/susan/face/eyes/happyCl/expression.webp diff --git a/game/characters/susan/face/eyes/happyCl_skin.webp b/game/characters/susan/face/eyes/happyCl/skin.webp similarity index 100% rename from game/characters/susan/face/eyes/happyCl_skin.webp rename to game/characters/susan/face/eyes/happyCl/skin.webp diff --git a/game/characters/susan/face/eyes/narrow.webp b/game/characters/susan/face/eyes/narrow/expression.webp similarity index 100% rename from game/characters/susan/face/eyes/narrow.webp rename to game/characters/susan/face/eyes/narrow/expression.webp diff --git a/game/characters/susan/face/eyes/narrow_mask.webp b/game/characters/susan/face/eyes/narrow/eyemask.webp similarity index 100% rename from game/characters/susan/face/eyes/narrow_mask.webp rename to game/characters/susan/face/eyes/narrow/eyemask.webp diff --git a/game/characters/susan/face/eyes/narrow_skin.webp b/game/characters/susan/face/eyes/narrow/skin.webp similarity index 100% rename from game/characters/susan/face/eyes/narrow_skin.webp rename to game/characters/susan/face/eyes/narrow/skin.webp diff --git a/game/characters/susan/face/eyes/wide.webp b/game/characters/susan/face/eyes/wide/expression.webp similarity index 100% rename from game/characters/susan/face/eyes/wide.webp rename to game/characters/susan/face/eyes/wide/expression.webp diff --git a/game/characters/susan/face/eyes/wide_mask.webp b/game/characters/susan/face/eyes/wide/eyemask.webp similarity index 100% rename from game/characters/susan/face/eyes/wide_mask.webp rename to game/characters/susan/face/eyes/wide/eyemask.webp diff --git a/game/characters/susan/face/eyes/wide_skin.webp b/game/characters/susan/face/eyes/wide/skin.webp similarity index 100% rename from game/characters/susan/face/eyes/wide_skin.webp rename to game/characters/susan/face/eyes/wide/skin.webp diff --git a/game/characters/susan/face/eyes/wink.webp b/game/characters/susan/face/eyes/wink/expression.webp similarity index 100% rename from game/characters/susan/face/eyes/wink.webp rename to game/characters/susan/face/eyes/wink/expression.webp diff --git a/game/characters/susan/face/eyes/wink_mask.webp b/game/characters/susan/face/eyes/wink/eyemask.webp similarity index 100% rename from game/characters/susan/face/eyes/wink_mask.webp rename to game/characters/susan/face/eyes/wink/eyemask.webp diff --git a/game/characters/susan/face/eyes/wink_skin.webp b/game/characters/susan/face/eyes/wink/skin.webp similarity index 100% rename from game/characters/susan/face/eyes/wink_skin.webp rename to game/characters/susan/face/eyes/wink/skin.webp diff --git a/game/characters/susan/face/mouth/ahegao.webp b/game/characters/susan/face/mouth/ahegao/expression.webp similarity index 100% rename from game/characters/susan/face/mouth/ahegao.webp rename to game/characters/susan/face/mouth/ahegao/expression.webp diff --git a/game/characters/susan/face/mouth/ahegao_drool.webp b/game/characters/susan/face/mouth/ahegao_drool/expression.webp similarity index 100% rename from game/characters/susan/face/mouth/ahegao_drool.webp rename to game/characters/susan/face/mouth/ahegao_drool/expression.webp diff --git a/game/characters/susan/face/mouth/angry.webp b/game/characters/susan/face/mouth/angry/expression.webp similarity index 100% rename from game/characters/susan/face/mouth/angry.webp rename to game/characters/susan/face/mouth/angry/expression.webp diff --git a/game/characters/susan/face/mouth/annoyed.webp b/game/characters/susan/face/mouth/annoyed/expression.webp similarity index 100% rename from game/characters/susan/face/mouth/annoyed.webp rename to game/characters/susan/face/mouth/annoyed/expression.webp diff --git a/game/characters/susan/face/mouth/base.webp b/game/characters/susan/face/mouth/base/expression.webp similarity index 100% rename from game/characters/susan/face/mouth/base.webp rename to game/characters/susan/face/mouth/base/expression.webp diff --git a/game/characters/susan/face/mouth/clench.webp b/game/characters/susan/face/mouth/clench/expression.webp similarity index 100% rename from game/characters/susan/face/mouth/clench.webp rename to game/characters/susan/face/mouth/clench/expression.webp diff --git a/game/characters/susan/face/mouth/disgust.webp b/game/characters/susan/face/mouth/disgust/expression.webp similarity index 100% rename from game/characters/susan/face/mouth/disgust.webp rename to game/characters/susan/face/mouth/disgust/expression.webp diff --git a/game/characters/susan/face/mouth/grin.webp b/game/characters/susan/face/mouth/grin/expression.webp similarity index 100% rename from game/characters/susan/face/mouth/grin.webp rename to game/characters/susan/face/mouth/grin/expression.webp diff --git a/game/characters/susan/face/mouth/horny.webp b/game/characters/susan/face/mouth/horny/expression.webp similarity index 100% rename from game/characters/susan/face/mouth/horny.webp rename to game/characters/susan/face/mouth/horny/expression.webp diff --git a/game/characters/susan/face/mouth/normal.webp b/game/characters/susan/face/mouth/normal/expression.webp similarity index 100% rename from game/characters/susan/face/mouth/normal.webp rename to game/characters/susan/face/mouth/normal/expression.webp diff --git a/game/characters/susan/face/mouth/open.webp b/game/characters/susan/face/mouth/open/expression.webp similarity index 100% rename from game/characters/susan/face/mouth/open.webp rename to game/characters/susan/face/mouth/open/expression.webp diff --git a/game/characters/susan/face/mouth/open_tongue.webp b/game/characters/susan/face/mouth/open_tongue/expression.webp similarity index 100% rename from game/characters/susan/face/mouth/open_tongue.webp rename to game/characters/susan/face/mouth/open_tongue/expression.webp diff --git a/game/characters/susan/face/mouth/open_wide.webp b/game/characters/susan/face/mouth/open_wide/expression.webp similarity index 100% rename from game/characters/susan/face/mouth/open_wide.webp rename to game/characters/susan/face/mouth/open_wide/expression.webp diff --git a/game/characters/susan/face/mouth/open_wide_tongue.webp b/game/characters/susan/face/mouth/open_wide_tongue.webp deleted file mode 100644 index 189cf1f6..00000000 --- a/game/characters/susan/face/mouth/open_wide_tongue.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3bca699c8ff5b0d9b858ea3cddb55d14ae457aafab18a9753d0e68ee2aed149a -size 2550 diff --git a/game/characters/susan/face/mouth/smile.webp b/game/characters/susan/face/mouth/smile/expression.webp similarity index 100% rename from game/characters/susan/face/mouth/smile.webp rename to game/characters/susan/face/mouth/smile/expression.webp diff --git a/game/characters/susan/face/mouth/soft.webp b/game/characters/susan/face/mouth/soft/expression.webp similarity index 100% rename from game/characters/susan/face/mouth/soft.webp rename to game/characters/susan/face/mouth/soft/expression.webp diff --git a/game/characters/susan/face/mouth/upset.webp b/game/characters/susan/face/mouth/upset/expression.webp similarity index 100% rename from game/characters/susan/face/mouth/upset.webp rename to game/characters/susan/face/mouth/upset/expression.webp diff --git a/game/characters/susan/face/pupils/ahegao.webp b/game/characters/susan/face/pupils/ahegao/expression.webp similarity index 100% rename from game/characters/susan/face/pupils/ahegao.webp rename to game/characters/susan/face/pupils/ahegao/expression.webp diff --git a/game/characters/susan/face/pupils/down.webp b/game/characters/susan/face/pupils/down/expression.webp similarity index 100% rename from game/characters/susan/face/pupils/down.webp rename to game/characters/susan/face/pupils/down/expression.webp diff --git a/game/characters/susan/face/pupils/downL.webp b/game/characters/susan/face/pupils/downL/expression.webp similarity index 100% rename from game/characters/susan/face/pupils/downL.webp rename to game/characters/susan/face/pupils/downL/expression.webp diff --git a/game/characters/susan/face/pupils/downR.webp b/game/characters/susan/face/pupils/downR/expression.webp similarity index 100% rename from game/characters/susan/face/pupils/downR.webp rename to game/characters/susan/face/pupils/downR/expression.webp diff --git a/game/characters/susan/face/pupils/left.webp b/game/characters/susan/face/pupils/left/expression.webp similarity index 100% rename from game/characters/susan/face/pupils/left.webp rename to game/characters/susan/face/pupils/left/expression.webp diff --git a/game/characters/susan/face/pupils/mid.webp b/game/characters/susan/face/pupils/mid/expression.webp similarity index 100% rename from game/characters/susan/face/pupils/mid.webp rename to game/characters/susan/face/pupils/mid/expression.webp diff --git a/game/characters/susan/face/pupils/right.webp b/game/characters/susan/face/pupils/right/expression.webp similarity index 100% rename from game/characters/susan/face/pupils/right.webp rename to game/characters/susan/face/pupils/right/expression.webp diff --git a/game/characters/susan/face/pupils/stare.webp b/game/characters/susan/face/pupils/stare/expression.webp similarity index 100% rename from game/characters/susan/face/pupils/stare.webp rename to game/characters/susan/face/pupils/stare/expression.webp diff --git a/game/characters/susan/face/pupils/unfocused.webp b/game/characters/susan/face/pupils/unfocused/expression.webp similarity index 100% rename from game/characters/susan/face/pupils/unfocused.webp rename to game/characters/susan/face/pupils/unfocused/expression.webp diff --git a/game/characters/susan/face/pupils/up.webp b/game/characters/susan/face/pupils/up/expression.webp similarity index 100% rename from game/characters/susan/face/pupils/up.webp rename to game/characters/susan/face/pupils/up/expression.webp diff --git a/game/characters/tonks/body/armleft/on_hips_fix.webp b/game/characters/tonks/body/armleft/on_hips_fix.webp deleted file mode 100644 index b9dd57ac..00000000 --- a/game/characters/tonks/body/armleft/on_hips_fix.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:005157d922a1c5f9c19d4f65ef7d8a6494720340bae7965b9800f3c9df96a460 -size 5880 diff --git a/game/characters/tonks/body/armright/on_hips_fix.webp b/game/characters/tonks/body/armright/on_hips_fix.webp deleted file mode 100644 index 095dd477..00000000 --- a/game/characters/tonks/body/armright/on_hips_fix.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3e70ce7fb313d9d3485c8e43b2a1118fabdf3e17800c647349005fc939ef7ac4 -size 4412 diff --git a/game/characters/tonks/body/base/front.webp b/game/characters/tonks/body/base.webp similarity index 100% rename from game/characters/tonks/body/base/front.webp rename to game/characters/tonks/body/base.webp diff --git a/game/characters/tonks/body/breasts/normal_tight.webp b/game/characters/tonks/body/breasts/normal_tight.webp deleted file mode 100644 index cd2083bb..00000000 --- a/game/characters/tonks/body/breasts/normal_tight.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:18c354881463cc5f40e963451445b9c5170812bce4dd208133b70d5f3e2ebdc9 -size 10150 diff --git a/game/characters/tonks/body/breasts/ribbon.webp b/game/characters/tonks/body/breasts/ribbon.webp deleted file mode 100644 index 4ef7e3ae..00000000 --- a/game/characters/tonks/body/breasts/ribbon.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:43ed03ab11dbb682aeb2d68e09e7db87999727b4c30a4771546a820fff4198e2 -size 12174 diff --git a/game/characters/tonks/body/armleft/on_hips.webp b/game/characters/tonks/body/larm.webp similarity index 100% rename from game/characters/tonks/body/armleft/on_hips.webp rename to game/characters/tonks/body/larm.webp diff --git a/game/characters/tonks/body/breasts/normal.webp b/game/characters/tonks/body/nbreast_zorder_1.webp similarity index 100% rename from game/characters/tonks/body/breasts/normal.webp rename to game/characters/tonks/body/nbreast_zorder_1.webp diff --git a/game/characters/tonks/body/armright/on_hips.webp b/game/characters/tonks/body/rarm.webp similarity index 100% rename from game/characters/tonks/body/armright/on_hips.webp rename to game/characters/tonks/body/rarm.webp diff --git a/game/characters/tonks/clothes/bottom/jeans/armfix.webp b/game/characters/tonks/clothes/bottom/jeans/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/bottom/jeans/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/bottom/latex_leggings/armfix.webp b/game/characters/tonks/clothes/bottom/latex_leggings/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/bottom/latex_leggings/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/bottom/leggings/armfix.webp b/game/characters/tonks/clothes/bottom/leggings/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/bottom/leggings/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/bottom/leggings_hole/armfix.webp b/game/characters/tonks/clothes/bottom/leggings_hole/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/bottom/leggings_hole/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/bottom/mechanic_shorts/armfix.webp b/game/characters/tonks/clothes/bottom/mechanic_shorts/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/bottom/mechanic_shorts/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/bottom/office/armfix.webp b/game/characters/tonks/clothes/bottom/office/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/bottom/office/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/bottom/police/armfix.webp b/game/characters/tonks/clothes/bottom/police/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/bottom/police/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/bottom/school_skirt_1/not_implemented.txt b/game/characters/tonks/clothes/bottom/school_skirt_1/not_implemented.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/game/characters/tonks/clothes/bottom/school_skirt_2/armfix.webp b/game/characters/tonks/clothes/bottom/school_skirt_2/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/bottom/school_skirt_2/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/bottom/school_skirt_3/armfix.webp b/game/characters/tonks/clothes/bottom/school_skirt_3/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/bottom/school_skirt_3/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/bottom/school_skirt_4/armfix.webp b/game/characters/tonks/clothes/bottom/school_skirt_4/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/bottom/school_skirt_4/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/bottom/sweatpants/armfix.webp b/game/characters/tonks/clothes/bottom/sweatpants/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/bottom/sweatpants/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/bottom/xmas/armfix.webp b/game/characters/tonks/clothes/bottom/xmas/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/bottom/xmas/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/gloves/auror_gloves/armfix.webp b/game/characters/tonks/clothes/gloves/auror_gloves/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/gloves/auror_gloves/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/gloves/leather_gloves/armfix.webp b/game/characters/tonks/clothes/gloves/leather_gloves/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/gloves/leather_gloves/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/headgear/antlers/0.webp b/game/characters/tonks/clothes/headgear/antlers/default/0.webp similarity index 100% rename from game/characters/tonks/clothes/headgear/antlers/0.webp rename to game/characters/tonks/clothes/headgear/antlers/default/0.webp diff --git a/game/characters/tonks/clothes/headgear/antlers/outline.webp b/game/characters/tonks/clothes/headgear/antlers/default/outline.webp similarity index 100% rename from game/characters/tonks/clothes/headgear/antlers/outline.webp rename to game/characters/tonks/clothes/headgear/antlers/default/outline.webp diff --git a/game/characters/tonks/clothes/headgear/bunny/base/0.webp b/game/characters/tonks/clothes/headgear/bunny/base/0.webp new file mode 100644 index 00000000..eb29da11 --- /dev/null +++ b/game/characters/tonks/clothes/headgear/bunny/base/0.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:768e286a948ceb6873c880dfbed702a5e979bf7c8ef3df4f2ea3754983e993a2 +size 3624 diff --git a/game/characters/tonks/clothes/headgear/bunny/base/1.webp b/game/characters/tonks/clothes/headgear/bunny/base/1.webp new file mode 100644 index 00000000..d127be63 --- /dev/null +++ b/game/characters/tonks/clothes/headgear/bunny/base/1.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16a3bc0e8f81e376657378f012b49f1a936fa1e8b36b2a64df30a3f29f790930 +size 2224 diff --git a/game/characters/tonks/clothes/headgear/bunny/base/outline.webp b/game/characters/tonks/clothes/headgear/bunny/base/outline.webp new file mode 100644 index 00000000..1cbe0176 --- /dev/null +++ b/game/characters/tonks/clothes/headgear/bunny/base/outline.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:beeebc2e436e65daebe58aba6b145a95a34329f76f3bb84620776a7119fa1dff +size 5558 diff --git a/game/characters/tonks/clothes/headgear/bunny/0.webp b/game/characters/tonks/clothes/headgear/bunny/default/0.webp similarity index 100% rename from game/characters/tonks/clothes/headgear/bunny/0.webp rename to game/characters/tonks/clothes/headgear/bunny/default/0.webp diff --git a/game/characters/tonks/clothes/headgear/bunny/1.webp b/game/characters/tonks/clothes/headgear/bunny/default/1.webp similarity index 100% rename from game/characters/tonks/clothes/headgear/bunny/1.webp rename to game/characters/tonks/clothes/headgear/bunny/default/1.webp diff --git a/game/characters/tonks/clothes/headgear/bunny/outline.webp b/game/characters/tonks/clothes/headgear/bunny/default/outline.webp similarity index 100% rename from game/characters/tonks/clothes/headgear/bunny/outline.webp rename to game/characters/tonks/clothes/headgear/bunny/default/outline.webp diff --git a/game/characters/tonks/clothes/headgear/classy_hat/0.webp b/game/characters/tonks/clothes/headgear/classy_hat/default/0.webp similarity index 100% rename from game/characters/tonks/clothes/headgear/classy_hat/0.webp rename to game/characters/tonks/clothes/headgear/classy_hat/default/0.webp diff --git a/game/characters/tonks/clothes/headgear/classy_hat/0_back.webp b/game/characters/tonks/clothes/headgear/classy_hat/default/0_back.webp similarity index 100% rename from game/characters/tonks/clothes/headgear/classy_hat/0_back.webp rename to game/characters/tonks/clothes/headgear/classy_hat/default/0_back.webp diff --git a/game/characters/tonks/clothes/headgear/classy_hat/0_front.webp b/game/characters/tonks/clothes/headgear/classy_hat/default/0_front.webp similarity index 100% rename from game/characters/tonks/clothes/headgear/classy_hat/0_front.webp rename to game/characters/tonks/clothes/headgear/classy_hat/default/0_front.webp diff --git a/game/characters/tonks/clothes/headgear/classy_hat/extra.webp b/game/characters/tonks/clothes/headgear/classy_hat/default/extra.webp similarity index 100% rename from game/characters/tonks/clothes/headgear/classy_hat/extra.webp rename to game/characters/tonks/clothes/headgear/classy_hat/default/extra.webp diff --git a/game/characters/tonks/clothes/headgear/classy_hat/extra_front.webp b/game/characters/tonks/clothes/headgear/classy_hat/default/extra_front.webp similarity index 100% rename from game/characters/tonks/clothes/headgear/classy_hat/extra_front.webp rename to game/characters/tonks/clothes/headgear/classy_hat/default/extra_front.webp diff --git a/game/characters/tonks/clothes/headgear/classy_hat/outline.webp b/game/characters/tonks/clothes/headgear/classy_hat/default/outline.webp similarity index 100% rename from game/characters/tonks/clothes/headgear/classy_hat/outline.webp rename to game/characters/tonks/clothes/headgear/classy_hat/default/outline.webp diff --git a/game/characters/tonks/clothes/headgear/classy_hat/outline_back.webp b/game/characters/tonks/clothes/headgear/classy_hat/default/outline_back.webp similarity index 100% rename from game/characters/tonks/clothes/headgear/classy_hat/outline_back.webp rename to game/characters/tonks/clothes/headgear/classy_hat/default/outline_back.webp diff --git a/game/characters/tonks/clothes/headgear/classy_hat/outline_front.webp b/game/characters/tonks/clothes/headgear/classy_hat/default/outline_front.webp similarity index 100% rename from game/characters/tonks/clothes/headgear/classy_hat/outline_front.webp rename to game/characters/tonks/clothes/headgear/classy_hat/default/outline_front.webp diff --git a/game/characters/tonks/clothes/headgear/elf/0.webp b/game/characters/tonks/clothes/headgear/elf/default/0.webp similarity index 100% rename from game/characters/tonks/clothes/headgear/elf/0.webp rename to game/characters/tonks/clothes/headgear/elf/default/0.webp diff --git a/game/characters/tonks/clothes/headgear/elf/1.webp b/game/characters/tonks/clothes/headgear/elf/default/1.webp similarity index 100% rename from game/characters/tonks/clothes/headgear/elf/1.webp rename to game/characters/tonks/clothes/headgear/elf/default/1.webp diff --git a/game/characters/tonks/clothes/headgear/elf/extra.webp b/game/characters/tonks/clothes/headgear/elf/default/extra.webp similarity index 100% rename from game/characters/tonks/clothes/headgear/elf/extra.webp rename to game/characters/tonks/clothes/headgear/elf/default/extra.webp diff --git a/game/characters/tonks/clothes/headgear/elf/outline.webp b/game/characters/tonks/clothes/headgear/elf/default/outline.webp similarity index 100% rename from game/characters/tonks/clothes/headgear/elf/outline.webp rename to game/characters/tonks/clothes/headgear/elf/default/outline.webp diff --git a/game/characters/tonks/clothes/headgear/horns/0.webp b/game/characters/tonks/clothes/headgear/horns/default/0.webp similarity index 100% rename from game/characters/tonks/clothes/headgear/horns/0.webp rename to game/characters/tonks/clothes/headgear/horns/default/0.webp diff --git a/game/characters/tonks/clothes/headgear/horns/1.webp b/game/characters/tonks/clothes/headgear/horns/default/1.webp similarity index 100% rename from game/characters/tonks/clothes/headgear/horns/1.webp rename to game/characters/tonks/clothes/headgear/horns/default/1.webp diff --git a/game/characters/tonks/clothes/headgear/horns/outline.webp b/game/characters/tonks/clothes/headgear/horns/default/outline.webp similarity index 100% rename from game/characters/tonks/clothes/headgear/horns/outline.webp rename to game/characters/tonks/clothes/headgear/horns/default/outline.webp diff --git a/game/characters/tonks/clothes/headgear/mechanic_cap/0.webp b/game/characters/tonks/clothes/headgear/mechanic_cap/default/0.webp similarity index 100% rename from game/characters/tonks/clothes/headgear/mechanic_cap/0.webp rename to game/characters/tonks/clothes/headgear/mechanic_cap/default/0.webp diff --git a/game/characters/tonks/clothes/headgear/mechanic_cap/1.webp b/game/characters/tonks/clothes/headgear/mechanic_cap/default/1.webp similarity index 100% rename from game/characters/tonks/clothes/headgear/mechanic_cap/1.webp rename to game/characters/tonks/clothes/headgear/mechanic_cap/default/1.webp diff --git a/game/characters/tonks/clothes/headgear/mechanic_cap/extra.webp b/game/characters/tonks/clothes/headgear/mechanic_cap/default/extra.webp similarity index 100% rename from game/characters/tonks/clothes/headgear/mechanic_cap/extra.webp rename to game/characters/tonks/clothes/headgear/mechanic_cap/default/extra.webp diff --git a/game/characters/tonks/clothes/headgear/mechanic_cap/mask.webp b/game/characters/tonks/clothes/headgear/mechanic_cap/default/mask.webp similarity index 100% rename from game/characters/tonks/clothes/headgear/mechanic_cap/mask.webp rename to game/characters/tonks/clothes/headgear/mechanic_cap/default/mask.webp diff --git a/game/characters/tonks/clothes/headgear/mechanic_cap/outline.webp b/game/characters/tonks/clothes/headgear/mechanic_cap/default/outline.webp similarity index 100% rename from game/characters/tonks/clothes/headgear/mechanic_cap/outline.webp rename to game/characters/tonks/clothes/headgear/mechanic_cap/default/outline.webp diff --git a/game/characters/tonks/clothes/headgear/mechanic_cap/skin.webp b/game/characters/tonks/clothes/headgear/mechanic_cap/default/skin.webp similarity index 100% rename from game/characters/tonks/clothes/headgear/mechanic_cap/skin.webp rename to game/characters/tonks/clothes/headgear/mechanic_cap/default/skin.webp diff --git a/game/characters/tonks/clothes/headgear/police/0.webp b/game/characters/tonks/clothes/headgear/police/default/0.webp similarity index 100% rename from game/characters/tonks/clothes/headgear/police/0.webp rename to game/characters/tonks/clothes/headgear/police/default/0.webp diff --git a/game/characters/tonks/clothes/headgear/police/1.webp b/game/characters/tonks/clothes/headgear/police/default/1.webp similarity index 100% rename from game/characters/tonks/clothes/headgear/police/1.webp rename to game/characters/tonks/clothes/headgear/police/default/1.webp diff --git a/game/characters/tonks/clothes/headgear/police/2.webp b/game/characters/tonks/clothes/headgear/police/default/2.webp similarity index 100% rename from game/characters/tonks/clothes/headgear/police/2.webp rename to game/characters/tonks/clothes/headgear/police/default/2.webp diff --git a/game/characters/tonks/clothes/headgear/police/mask.webp b/game/characters/tonks/clothes/headgear/police/default/mask.webp similarity index 100% rename from game/characters/tonks/clothes/headgear/police/mask.webp rename to game/characters/tonks/clothes/headgear/police/default/mask.webp diff --git a/game/characters/tonks/clothes/headgear/police/outline.webp b/game/characters/tonks/clothes/headgear/police/default/outline.webp similarity index 100% rename from game/characters/tonks/clothes/headgear/police/outline.webp rename to game/characters/tonks/clothes/headgear/police/default/outline.webp diff --git a/game/characters/tonks/clothes/headgear/police/skin.webp b/game/characters/tonks/clothes/headgear/police/default/skin.webp similarity index 100% rename from game/characters/tonks/clothes/headgear/police/skin.webp rename to game/characters/tonks/clothes/headgear/police/default/skin.webp diff --git a/game/characters/tonks/clothes/makeup/elf_ears/0.webp b/game/characters/tonks/clothes/makeup/elf_ears/0.webp deleted file mode 100644 index 9357818b..00000000 --- a/game/characters/tonks/clothes/makeup/elf_ears/0.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:86be52bdb7547413cafb3ed175a806a798c65de98b40849e0b974c47d187de65 -size 34 diff --git a/game/characters/tonks/clothes/makeup/elf_ears/extra.webp b/game/characters/tonks/clothes/makeup/elf_ears/extra.webp deleted file mode 100644 index ac822e9e..00000000 --- a/game/characters/tonks/clothes/makeup/elf_ears/extra.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e6ac24d38601538c1399b1a2fab9c600af21f65aac08217b8a137225adb80d93 -size 3212 diff --git a/game/characters/tonks/clothes/makeup/elf_ears/outline.webp b/game/characters/tonks/clothes/makeup/elf_ears/outline.webp deleted file mode 100644 index c65211ac..00000000 --- a/game/characters/tonks/clothes/makeup/elf_ears/outline.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eed127f1e214087c25bfb4e3a604402af877ed450e84a6d10938021710aaf85d -size 2268 diff --git a/game/characters/tonks/clothes/makeup/elf_ears/skin_zorder_5.webp b/game/characters/tonks/clothes/makeup/elf_ears/skin_zorder_5.webp new file mode 100644 index 00000000..3db71675 --- /dev/null +++ b/game/characters/tonks/clothes/makeup/elf_ears/skin_zorder_5.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:464c485fba0caf4f0cc5d7077e58dd3b202b5d084dddee3887023ace6a58d494 +size 4728 diff --git a/game/characters/tonks/clothes/makeup/lipstick/annoyed.webp b/game/characters/tonks/clothes/makeup/lipstick/annoyed/0.webp similarity index 100% rename from game/characters/tonks/clothes/makeup/lipstick/annoyed.webp rename to game/characters/tonks/clothes/makeup/lipstick/annoyed/0.webp diff --git a/game/characters/tonks/clothes/makeup/lipstick/base.webp b/game/characters/tonks/clothes/makeup/lipstick/base/0.webp similarity index 100% rename from game/characters/tonks/clothes/makeup/lipstick/base.webp rename to game/characters/tonks/clothes/makeup/lipstick/base/0.webp diff --git a/game/characters/tonks/clothes/makeup/lipstick/clench.webp b/game/characters/tonks/clothes/makeup/lipstick/clench/0.webp similarity index 100% rename from game/characters/tonks/clothes/makeup/lipstick/clench.webp rename to game/characters/tonks/clothes/makeup/lipstick/clench/0.webp diff --git a/game/characters/tonks/clothes/makeup/lipstick/crooked_smile.webp b/game/characters/tonks/clothes/makeup/lipstick/crooked_smile/0.webp similarity index 100% rename from game/characters/tonks/clothes/makeup/lipstick/crooked_smile.webp rename to game/characters/tonks/clothes/makeup/lipstick/crooked_smile/0.webp diff --git a/game/characters/tonks/clothes/makeup/lipstick/disgust.webp b/game/characters/tonks/clothes/makeup/lipstick/disgust/0.webp similarity index 100% rename from game/characters/tonks/clothes/makeup/lipstick/disgust.webp rename to game/characters/tonks/clothes/makeup/lipstick/disgust/0.webp diff --git a/game/characters/tonks/clothes/makeup/lipstick/grin.webp b/game/characters/tonks/clothes/makeup/lipstick/grin/0.webp similarity index 100% rename from game/characters/tonks/clothes/makeup/lipstick/grin.webp rename to game/characters/tonks/clothes/makeup/lipstick/grin/0.webp diff --git a/game/characters/tonks/clothes/makeup/lipstick/horny.webp b/game/characters/tonks/clothes/makeup/lipstick/horny/0.webp similarity index 100% rename from game/characters/tonks/clothes/makeup/lipstick/horny.webp rename to game/characters/tonks/clothes/makeup/lipstick/horny/0.webp diff --git a/game/characters/tonks/clothes/makeup/lipstick/mad.webp b/game/characters/tonks/clothes/makeup/lipstick/mad/0.webp similarity index 100% rename from game/characters/tonks/clothes/makeup/lipstick/mad.webp rename to game/characters/tonks/clothes/makeup/lipstick/mad/0.webp diff --git a/game/characters/tonks/clothes/makeup/lipstick/normal.webp b/game/characters/tonks/clothes/makeup/lipstick/normal/0.webp similarity index 100% rename from game/characters/tonks/clothes/makeup/lipstick/normal.webp rename to game/characters/tonks/clothes/makeup/lipstick/normal/0.webp diff --git a/game/characters/tonks/clothes/makeup/lipstick/open.webp b/game/characters/tonks/clothes/makeup/lipstick/open/0.webp similarity index 100% rename from game/characters/tonks/clothes/makeup/lipstick/open.webp rename to game/characters/tonks/clothes/makeup/lipstick/open/0.webp diff --git a/game/characters/tonks/clothes/makeup/lipstick/open_wide.webp b/game/characters/tonks/clothes/makeup/lipstick/open_wide/0.webp similarity index 100% rename from game/characters/tonks/clothes/makeup/lipstick/open_wide.webp rename to game/characters/tonks/clothes/makeup/lipstick/open_wide/0.webp diff --git a/game/characters/tonks/clothes/makeup/lipstick/open_wide_tongue.webp b/game/characters/tonks/clothes/makeup/lipstick/open_wide_tongue/0.webp similarity index 100% rename from game/characters/tonks/clothes/makeup/lipstick/open_wide_tongue.webp rename to game/characters/tonks/clothes/makeup/lipstick/open_wide_tongue/0.webp diff --git a/game/characters/tonks/clothes/makeup/lipstick/open_wide_tongue2.webp b/game/characters/tonks/clothes/makeup/lipstick/open_wide_tongue2/0.webp similarity index 100% rename from game/characters/tonks/clothes/makeup/lipstick/open_wide_tongue2.webp rename to game/characters/tonks/clothes/makeup/lipstick/open_wide_tongue2/0.webp diff --git a/game/characters/tonks/clothes/makeup/lipstick/open_wide_tongue2_cum.webp b/game/characters/tonks/clothes/makeup/lipstick/open_wide_tongue2_cum/0.webp similarity index 100% rename from game/characters/tonks/clothes/makeup/lipstick/open_wide_tongue2_cum.webp rename to game/characters/tonks/clothes/makeup/lipstick/open_wide_tongue2_cum/0.webp diff --git a/game/characters/tonks/clothes/makeup/lipstick/open_wide_tongue_cum.webp b/game/characters/tonks/clothes/makeup/lipstick/open_wide_tongue_cum/0.webp similarity index 100% rename from game/characters/tonks/clothes/makeup/lipstick/open_wide_tongue_cum.webp rename to game/characters/tonks/clothes/makeup/lipstick/open_wide_tongue_cum/0.webp diff --git a/game/characters/tonks/clothes/makeup/lipstick/scream.webp b/game/characters/tonks/clothes/makeup/lipstick/scream/0.webp similarity index 100% rename from game/characters/tonks/clothes/makeup/lipstick/scream.webp rename to game/characters/tonks/clothes/makeup/lipstick/scream/0.webp diff --git a/game/characters/tonks/clothes/makeup/lipstick/silly.webp b/game/characters/tonks/clothes/makeup/lipstick/silly/0.webp similarity index 100% rename from game/characters/tonks/clothes/makeup/lipstick/silly.webp rename to game/characters/tonks/clothes/makeup/lipstick/silly/0.webp diff --git a/game/characters/tonks/clothes/makeup/lipstick/soft.webp b/game/characters/tonks/clothes/makeup/lipstick/soft/0.webp similarity index 100% rename from game/characters/tonks/clothes/makeup/lipstick/soft.webp rename to game/characters/tonks/clothes/makeup/lipstick/soft/0.webp diff --git a/game/characters/tonks/clothes/makeup/lipstick/upset.webp b/game/characters/tonks/clothes/makeup/lipstick/upset/0.webp similarity index 100% rename from game/characters/tonks/clothes/makeup/lipstick/upset.webp rename to game/characters/tonks/clothes/makeup/lipstick/upset/0.webp diff --git a/game/characters/tonks/clothes/panties/base/armfix.webp b/game/characters/tonks/clothes/panties/base/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/panties/base/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/panties/ribbon/armfix.webp b/game/characters/tonks/clothes/panties/ribbon/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/panties/ribbon/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/panties/succubus_panties/armfix.webp b/game/characters/tonks/clothes/panties/succubus_panties/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/panties/succubus_panties/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/robe/auror_coat/armfix.webp b/game/characters/tonks/clothes/robe/auror_coat/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/robe/auror_coat/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/robe/dressing_gown/armfix.webp b/game/characters/tonks/clothes/robe/dressing_gown/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/robe/dressing_gown/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/robe/office/armfix.webp b/game/characters/tonks/clothes/robe/office/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/robe/office/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/robe/silk_robe/armfix.webp b/game/characters/tonks/clothes/robe/silk_robe/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/robe/silk_robe/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/stockings/auror/armfix.webp b/game/characters/tonks/clothes/stockings/auror/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/stockings/auror/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/stockings/bunny_stockings_1/armfix.webp b/game/characters/tonks/clothes/stockings/bunny_stockings_1/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/stockings/bunny_stockings_1/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/stockings/long_basic_1/armfix.webp b/game/characters/tonks/clothes/stockings/long_basic_1/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/stockings/long_basic_1/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/stockings/xmas/armfix.webp b/game/characters/tonks/clothes/stockings/xmas/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/stockings/xmas/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/top/auror/armfix.webp b/game/characters/tonks/clothes/top/auror/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/top/auror/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/top/auror2/armfix.webp b/game/characters/tonks/clothes/top/auror2/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/top/auror2/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/top/cavegirl_dress/armfix.webp b/game/characters/tonks/clothes/top/cavegirl_dress/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/top/cavegirl_dress/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/top/classy_dress/armfix.webp b/game/characters/tonks/clothes/top/classy_dress/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/top/classy_dress/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/top/corset/armfix.webp b/game/characters/tonks/clothes/top/corset/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/top/corset/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/top/elf_dress/armfix.webp b/game/characters/tonks/clothes/top/elf_dress/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/top/elf_dress/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/top/nightie_1/armfix.webp b/game/characters/tonks/clothes/top/nightie_1/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/top/nightie_1/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/top/office/armfix.webp b/game/characters/tonks/clothes/top/office/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/top/office/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/top/police1/armfix.webp b/game/characters/tonks/clothes/top/police1/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/top/police1/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/top/police2/armfix.webp b/game/characters/tonks/clothes/top/police2/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/top/police2/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/top/police3/armfix.webp b/game/characters/tonks/clothes/top/police3/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/top/police3/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/top/pullover/armfix.webp b/game/characters/tonks/clothes/top/pullover/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/top/pullover/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/top/silk_dress/armfix.webp b/game/characters/tonks/clothes/top/silk_dress/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/top/silk_dress/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/top/skimpy_dress/armfix.webp b/game/characters/tonks/clothes/top/skimpy_dress/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/top/skimpy_dress/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/clothes/top/skimpy_dress_2/armfix.webp b/game/characters/tonks/clothes/top/skimpy_dress_2/armfix.webp new file mode 100644 index 00000000..33e7caa2 --- /dev/null +++ b/game/characters/tonks/clothes/top/skimpy_dress_2/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f +size 9642 diff --git a/game/characters/tonks/cum/body/heavy.webp b/game/characters/tonks/cum/body/heavy/cum.webp similarity index 100% rename from game/characters/tonks/cum/body/heavy.webp rename to game/characters/tonks/cum/body/heavy/cum.webp diff --git a/game/characters/tonks/cum/body/heavy_skin.webp b/game/characters/tonks/cum/body/heavy/skin.webp similarity index 100% rename from game/characters/tonks/cum/body/heavy_skin.webp rename to game/characters/tonks/cum/body/heavy/skin.webp diff --git a/game/characters/tonks/cum/body/light.webp b/game/characters/tonks/cum/body/light/cum.webp similarity index 100% rename from game/characters/tonks/cum/body/light.webp rename to game/characters/tonks/cum/body/light/cum.webp diff --git a/game/characters/tonks/cum/body/light_skin.webp b/game/characters/tonks/cum/body/light/skin.webp similarity index 100% rename from game/characters/tonks/cum/body/light_skin.webp rename to game/characters/tonks/cum/body/light/skin.webp diff --git a/game/characters/tonks/cum/breasts/heavy.webp b/game/characters/tonks/cum/breasts/heavy/cum.webp similarity index 100% rename from game/characters/tonks/cum/breasts/heavy.webp rename to game/characters/tonks/cum/breasts/heavy/cum.webp diff --git a/game/characters/tonks/cum/breasts/heavy_skin.webp b/game/characters/tonks/cum/breasts/heavy/skin.webp similarity index 100% rename from game/characters/tonks/cum/breasts/heavy_skin.webp rename to game/characters/tonks/cum/breasts/heavy/skin.webp diff --git a/game/characters/tonks/cum/breasts/light.webp b/game/characters/tonks/cum/breasts/light/cum.webp similarity index 100% rename from game/characters/tonks/cum/breasts/light.webp rename to game/characters/tonks/cum/breasts/light/cum.webp diff --git a/game/characters/tonks/cum/breasts/light_skin.webp b/game/characters/tonks/cum/breasts/light/skin.webp similarity index 100% rename from game/characters/tonks/cum/breasts/light_skin.webp rename to game/characters/tonks/cum/breasts/light/skin.webp diff --git a/game/characters/tonks/cum/crotch/heavy.webp b/game/characters/tonks/cum/crotch/heavy/cum.webp similarity index 100% rename from game/characters/tonks/cum/crotch/heavy.webp rename to game/characters/tonks/cum/crotch/heavy/cum.webp diff --git a/game/characters/tonks/cum/crotch/heavy_skin.webp b/game/characters/tonks/cum/crotch/heavy/skin.webp similarity index 100% rename from game/characters/tonks/cum/crotch/heavy_skin.webp rename to game/characters/tonks/cum/crotch/heavy/skin.webp diff --git a/game/characters/tonks/cum/crotch/light.webp b/game/characters/tonks/cum/crotch/light/cum.webp similarity index 100% rename from game/characters/tonks/cum/crotch/light.webp rename to game/characters/tonks/cum/crotch/light/cum.webp diff --git a/game/characters/tonks/cum/crotch/light_skin.webp b/game/characters/tonks/cum/crotch/light/skin.webp similarity index 100% rename from game/characters/tonks/cum/crotch/light_skin.webp rename to game/characters/tonks/cum/crotch/light/skin.webp diff --git a/game/characters/tonks/cum/face/heavy.webp b/game/characters/tonks/cum/face/heavy/cum.webp similarity index 100% rename from game/characters/tonks/cum/face/heavy.webp rename to game/characters/tonks/cum/face/heavy/cum.webp diff --git a/game/characters/tonks/cum/face/heavy_skin.webp b/game/characters/tonks/cum/face/heavy/skin.webp similarity index 100% rename from game/characters/tonks/cum/face/heavy_skin.webp rename to game/characters/tonks/cum/face/heavy/skin.webp diff --git a/game/characters/tonks/cum/face/light.webp b/game/characters/tonks/cum/face/light/cum.webp similarity index 100% rename from game/characters/tonks/cum/face/light.webp rename to game/characters/tonks/cum/face/light/cum.webp diff --git a/game/characters/tonks/cum/face/light_skin.webp b/game/characters/tonks/cum/face/light/skin.webp similarity index 100% rename from game/characters/tonks/cum/face/light_skin.webp rename to game/characters/tonks/cum/face/light/skin.webp diff --git a/game/characters/tonks/cum/hair/heavy.webp b/game/characters/tonks/cum/hair/heavy/cum.webp similarity index 100% rename from game/characters/tonks/cum/hair/heavy.webp rename to game/characters/tonks/cum/hair/heavy/cum.webp diff --git a/game/characters/tonks/cum/hair/light.webp b/game/characters/tonks/cum/hair/light/cum.webp similarity index 100% rename from game/characters/tonks/cum/hair/light.webp rename to game/characters/tonks/cum/hair/light/cum.webp diff --git a/game/characters/tonks/cum/legs/heavy.webp b/game/characters/tonks/cum/legs/heavy/cum.webp similarity index 100% rename from game/characters/tonks/cum/legs/heavy.webp rename to game/characters/tonks/cum/legs/heavy/cum.webp diff --git a/game/characters/tonks/cum/legs/heavy_skin.webp b/game/characters/tonks/cum/legs/heavy/skin.webp similarity index 100% rename from game/characters/tonks/cum/legs/heavy_skin.webp rename to game/characters/tonks/cum/legs/heavy/skin.webp diff --git a/game/characters/tonks/cum/legs/light.webp b/game/characters/tonks/cum/legs/light/cum.webp similarity index 100% rename from game/characters/tonks/cum/legs/light.webp rename to game/characters/tonks/cum/legs/light/cum.webp diff --git a/game/characters/tonks/cum/legs/light_skin.webp b/game/characters/tonks/cum/legs/light/skin.webp similarity index 100% rename from game/characters/tonks/cum/legs/light_skin.webp rename to game/characters/tonks/cum/legs/light/skin.webp diff --git a/game/characters/tonks/cum/pussy/heavy.webp b/game/characters/tonks/cum/pussy/heavy/cum.webp similarity index 100% rename from game/characters/tonks/cum/pussy/heavy.webp rename to game/characters/tonks/cum/pussy/heavy/cum.webp diff --git a/game/characters/tonks/cum/pussy/light.webp b/game/characters/tonks/cum/pussy/light/cum.webp similarity index 100% rename from game/characters/tonks/cum/pussy/light.webp rename to game/characters/tonks/cum/pussy/light/cum.webp diff --git a/game/characters/tonks/face/cheeks/blush.webp b/game/characters/tonks/face/cheeks/blush/skin.webp similarity index 100% rename from game/characters/tonks/face/cheeks/blush.webp rename to game/characters/tonks/face/cheeks/blush/skin.webp diff --git a/game/characters/tonks/face/cheeks/gloom.webp b/game/characters/tonks/face/cheeks/gloom/expression.webp similarity index 100% rename from game/characters/tonks/face/cheeks/gloom.webp rename to game/characters/tonks/face/cheeks/gloom/expression.webp diff --git a/game/characters/tonks/face/cheeks/heavy_blush.webp b/game/characters/tonks/face/cheeks/heavy_blush/skin.webp similarity index 100% rename from game/characters/tonks/face/cheeks/heavy_blush.webp rename to game/characters/tonks/face/cheeks/heavy_blush/skin.webp diff --git a/game/characters/tonks/face/eyebrows/angry.webp b/game/characters/tonks/face/eyebrows/angry/expression.webp similarity index 100% rename from game/characters/tonks/face/eyebrows/angry.webp rename to game/characters/tonks/face/eyebrows/angry/expression.webp diff --git a/game/characters/tonks/face/eyebrows/angry_skin.webp b/game/characters/tonks/face/eyebrows/angry/skin.webp similarity index 100% rename from game/characters/tonks/face/eyebrows/angry_skin.webp rename to game/characters/tonks/face/eyebrows/angry/skin.webp diff --git a/game/characters/tonks/face/eyebrows/annoyed.webp b/game/characters/tonks/face/eyebrows/annoyed/expression.webp similarity index 100% rename from game/characters/tonks/face/eyebrows/annoyed.webp rename to game/characters/tonks/face/eyebrows/annoyed/expression.webp diff --git a/game/characters/tonks/face/eyebrows/annoyed_skin.webp b/game/characters/tonks/face/eyebrows/annoyed/skin.webp similarity index 100% rename from game/characters/tonks/face/eyebrows/annoyed_skin.webp rename to game/characters/tonks/face/eyebrows/annoyed/skin.webp diff --git a/game/characters/tonks/face/eyebrows/base.webp b/game/characters/tonks/face/eyebrows/base/expression.webp similarity index 100% rename from game/characters/tonks/face/eyebrows/base.webp rename to game/characters/tonks/face/eyebrows/base/expression.webp diff --git a/game/characters/tonks/face/eyebrows/base_skin.webp b/game/characters/tonks/face/eyebrows/base/skin.webp similarity index 100% rename from game/characters/tonks/face/eyebrows/base_skin.webp rename to game/characters/tonks/face/eyebrows/base/skin.webp diff --git a/game/characters/tonks/face/eyebrows/raised.webp b/game/characters/tonks/face/eyebrows/raised/expression.webp similarity index 100% rename from game/characters/tonks/face/eyebrows/raised.webp rename to game/characters/tonks/face/eyebrows/raised/expression.webp diff --git a/game/characters/tonks/face/eyebrows/raised_skin.webp b/game/characters/tonks/face/eyebrows/raised/skin.webp similarity index 100% rename from game/characters/tonks/face/eyebrows/raised_skin.webp rename to game/characters/tonks/face/eyebrows/raised/skin.webp diff --git a/game/characters/tonks/face/eyebrows/shocked.webp b/game/characters/tonks/face/eyebrows/shocked/expression.webp similarity index 100% rename from game/characters/tonks/face/eyebrows/shocked.webp rename to game/characters/tonks/face/eyebrows/shocked/expression.webp diff --git a/game/characters/tonks/face/eyebrows/shocked_skin.webp b/game/characters/tonks/face/eyebrows/shocked/skin.webp similarity index 100% rename from game/characters/tonks/face/eyebrows/shocked_skin.webp rename to game/characters/tonks/face/eyebrows/shocked/skin.webp diff --git a/game/characters/tonks/face/eyebrows/worried.webp b/game/characters/tonks/face/eyebrows/worried/expression.webp similarity index 100% rename from game/characters/tonks/face/eyebrows/worried.webp rename to game/characters/tonks/face/eyebrows/worried/expression.webp diff --git a/game/characters/tonks/face/eyebrows/worried_skin.webp b/game/characters/tonks/face/eyebrows/worried/skin.webp similarity index 100% rename from game/characters/tonks/face/eyebrows/worried_skin.webp rename to game/characters/tonks/face/eyebrows/worried/skin.webp diff --git a/game/characters/tonks/face/eyes/base.webp b/game/characters/tonks/face/eyes/base/expression.webp similarity index 100% rename from game/characters/tonks/face/eyes/base.webp rename to game/characters/tonks/face/eyes/base/expression.webp diff --git a/game/characters/tonks/face/eyes/base_mask.webp b/game/characters/tonks/face/eyes/base/eyemask.webp similarity index 100% rename from game/characters/tonks/face/eyes/base_mask.webp rename to game/characters/tonks/face/eyes/base/eyemask.webp diff --git a/game/characters/tonks/face/eyes/base_skin.webp b/game/characters/tonks/face/eyes/base/skin.webp similarity index 100% rename from game/characters/tonks/face/eyes/base_skin.webp rename to game/characters/tonks/face/eyes/base/skin.webp diff --git a/game/characters/tonks/face/eyes/closed.webp b/game/characters/tonks/face/eyes/closed/expression.webp similarity index 100% rename from game/characters/tonks/face/eyes/closed.webp rename to game/characters/tonks/face/eyes/closed/expression.webp diff --git a/game/characters/tonks/face/eyes/closed_skin.webp b/game/characters/tonks/face/eyes/closed/skin.webp similarity index 100% rename from game/characters/tonks/face/eyes/closed_skin.webp rename to game/characters/tonks/face/eyes/closed/skin.webp diff --git a/game/characters/tonks/face/eyes/happyCl.webp b/game/characters/tonks/face/eyes/happyCl/expression.webp similarity index 100% rename from game/characters/tonks/face/eyes/happyCl.webp rename to game/characters/tonks/face/eyes/happyCl/expression.webp diff --git a/game/characters/tonks/face/eyes/happyCl_skin.webp b/game/characters/tonks/face/eyes/happyCl/skin.webp similarity index 100% rename from game/characters/tonks/face/eyes/happyCl_skin.webp rename to game/characters/tonks/face/eyes/happyCl/skin.webp diff --git a/game/characters/tonks/face/eyes/narrow.webp b/game/characters/tonks/face/eyes/narrow/expression.webp similarity index 100% rename from game/characters/tonks/face/eyes/narrow.webp rename to game/characters/tonks/face/eyes/narrow/expression.webp diff --git a/game/characters/tonks/face/eyes/narrow_mask.webp b/game/characters/tonks/face/eyes/narrow/eyemask.webp similarity index 100% rename from game/characters/tonks/face/eyes/narrow_mask.webp rename to game/characters/tonks/face/eyes/narrow/eyemask.webp diff --git a/game/characters/tonks/face/eyes/narrow_skin.webp b/game/characters/tonks/face/eyes/narrow/skin.webp similarity index 100% rename from game/characters/tonks/face/eyes/narrow_skin.webp rename to game/characters/tonks/face/eyes/narrow/skin.webp diff --git a/game/characters/tonks/face/eyes/shocked.webp b/game/characters/tonks/face/eyes/shocked/expression.webp similarity index 100% rename from game/characters/tonks/face/eyes/shocked.webp rename to game/characters/tonks/face/eyes/shocked/expression.webp diff --git a/game/characters/tonks/face/eyes/shocked_mask.webp b/game/characters/tonks/face/eyes/shocked/eyemask.webp similarity index 100% rename from game/characters/tonks/face/eyes/shocked_mask.webp rename to game/characters/tonks/face/eyes/shocked/eyemask.webp diff --git a/game/characters/tonks/face/eyes/shocked_skin.webp b/game/characters/tonks/face/eyes/shocked/skin.webp similarity index 100% rename from game/characters/tonks/face/eyes/shocked_skin.webp rename to game/characters/tonks/face/eyes/shocked/skin.webp diff --git a/game/characters/tonks/face/eyes/wide.webp b/game/characters/tonks/face/eyes/wide/expression.webp similarity index 100% rename from game/characters/tonks/face/eyes/wide.webp rename to game/characters/tonks/face/eyes/wide/expression.webp diff --git a/game/characters/tonks/face/eyes/wide_mask.webp b/game/characters/tonks/face/eyes/wide/eyemask.webp similarity index 100% rename from game/characters/tonks/face/eyes/wide_mask.webp rename to game/characters/tonks/face/eyes/wide/eyemask.webp diff --git a/game/characters/tonks/face/eyes/wide_skin.webp b/game/characters/tonks/face/eyes/wide/skin.webp similarity index 100% rename from game/characters/tonks/face/eyes/wide_skin.webp rename to game/characters/tonks/face/eyes/wide/skin.webp diff --git a/game/characters/tonks/face/eyes/wink.webp b/game/characters/tonks/face/eyes/wink/expression.webp similarity index 100% rename from game/characters/tonks/face/eyes/wink.webp rename to game/characters/tonks/face/eyes/wink/expression.webp diff --git a/game/characters/tonks/face/eyes/wink_mask.webp b/game/characters/tonks/face/eyes/wink/eyemask.webp similarity index 100% rename from game/characters/tonks/face/eyes/wink_mask.webp rename to game/characters/tonks/face/eyes/wink/eyemask.webp diff --git a/game/characters/tonks/face/eyes/wink_skin.webp b/game/characters/tonks/face/eyes/wink/skin.webp similarity index 100% rename from game/characters/tonks/face/eyes/wink_skin.webp rename to game/characters/tonks/face/eyes/wink/skin.webp diff --git a/game/characters/tonks/face/mouth/angry.webp b/game/characters/tonks/face/mouth/angry/expression.webp similarity index 100% rename from game/characters/tonks/face/mouth/angry.webp rename to game/characters/tonks/face/mouth/angry/expression.webp diff --git a/game/characters/tonks/face/mouth/annoyed.webp b/game/characters/tonks/face/mouth/annoyed/expression.webp similarity index 100% rename from game/characters/tonks/face/mouth/annoyed.webp rename to game/characters/tonks/face/mouth/annoyed/expression.webp diff --git a/game/characters/tonks/face/mouth/annoyed_skin.webp b/game/characters/tonks/face/mouth/annoyed/skin.webp similarity index 100% rename from game/characters/tonks/face/mouth/annoyed_skin.webp rename to game/characters/tonks/face/mouth/annoyed/skin.webp diff --git a/game/characters/tonks/face/mouth/base.webp b/game/characters/tonks/face/mouth/base/expression.webp similarity index 100% rename from game/characters/tonks/face/mouth/base.webp rename to game/characters/tonks/face/mouth/base/expression.webp diff --git a/game/characters/tonks/face/mouth/base_skin.webp b/game/characters/tonks/face/mouth/base/skin.webp similarity index 100% rename from game/characters/tonks/face/mouth/base_skin.webp rename to game/characters/tonks/face/mouth/base/skin.webp diff --git a/game/characters/tonks/face/mouth/clench.webp b/game/characters/tonks/face/mouth/clench/expression.webp similarity index 100% rename from game/characters/tonks/face/mouth/clench.webp rename to game/characters/tonks/face/mouth/clench/expression.webp diff --git a/game/characters/tonks/face/mouth/clench_skin.webp b/game/characters/tonks/face/mouth/clench/skin.webp similarity index 100% rename from game/characters/tonks/face/mouth/clench_skin.webp rename to game/characters/tonks/face/mouth/clench/skin.webp diff --git a/game/characters/tonks/face/mouth/crooked_smile.webp b/game/characters/tonks/face/mouth/crooked_smile/expression.webp similarity index 100% rename from game/characters/tonks/face/mouth/crooked_smile.webp rename to game/characters/tonks/face/mouth/crooked_smile/expression.webp diff --git a/game/characters/tonks/face/mouth/crooked_smile_skin.webp b/game/characters/tonks/face/mouth/crooked_smile/skin.webp similarity index 100% rename from game/characters/tonks/face/mouth/crooked_smile_skin.webp rename to game/characters/tonks/face/mouth/crooked_smile/skin.webp diff --git a/game/characters/tonks/face/mouth/disgust.webp b/game/characters/tonks/face/mouth/disgust/expression.webp similarity index 100% rename from game/characters/tonks/face/mouth/disgust.webp rename to game/characters/tonks/face/mouth/disgust/expression.webp diff --git a/game/characters/tonks/face/mouth/disgust_skin.webp b/game/characters/tonks/face/mouth/disgust/skin.webp similarity index 100% rename from game/characters/tonks/face/mouth/disgust_skin.webp rename to game/characters/tonks/face/mouth/disgust/skin.webp diff --git a/game/characters/tonks/face/mouth/grin.webp b/game/characters/tonks/face/mouth/grin/expression.webp similarity index 100% rename from game/characters/tonks/face/mouth/grin.webp rename to game/characters/tonks/face/mouth/grin/expression.webp diff --git a/game/characters/tonks/face/mouth/grin_skin.webp b/game/characters/tonks/face/mouth/grin/skin.webp similarity index 100% rename from game/characters/tonks/face/mouth/grin_skin.webp rename to game/characters/tonks/face/mouth/grin/skin.webp diff --git a/game/characters/tonks/face/mouth/horny.webp b/game/characters/tonks/face/mouth/horny/expression.webp similarity index 100% rename from game/characters/tonks/face/mouth/horny.webp rename to game/characters/tonks/face/mouth/horny/expression.webp diff --git a/game/characters/tonks/face/mouth/horny_skin.webp b/game/characters/tonks/face/mouth/horny/skin.webp similarity index 100% rename from game/characters/tonks/face/mouth/horny_skin.webp rename to game/characters/tonks/face/mouth/horny/skin.webp diff --git a/game/characters/tonks/face/mouth/mad.webp b/game/characters/tonks/face/mouth/mad/expression.webp similarity index 100% rename from game/characters/tonks/face/mouth/mad.webp rename to game/characters/tonks/face/mouth/mad/expression.webp diff --git a/game/characters/tonks/face/mouth/mad_skin.webp b/game/characters/tonks/face/mouth/mad/skin.webp similarity index 100% rename from game/characters/tonks/face/mouth/mad_skin.webp rename to game/characters/tonks/face/mouth/mad/skin.webp diff --git a/game/characters/tonks/face/mouth/normal.webp b/game/characters/tonks/face/mouth/normal/expression.webp similarity index 100% rename from game/characters/tonks/face/mouth/normal.webp rename to game/characters/tonks/face/mouth/normal/expression.webp diff --git a/game/characters/tonks/face/mouth/normal_skin.webp b/game/characters/tonks/face/mouth/normal/skin.webp similarity index 100% rename from game/characters/tonks/face/mouth/normal_skin.webp rename to game/characters/tonks/face/mouth/normal/skin.webp diff --git a/game/characters/tonks/face/mouth/open.webp b/game/characters/tonks/face/mouth/open/expression.webp similarity index 100% rename from game/characters/tonks/face/mouth/open.webp rename to game/characters/tonks/face/mouth/open/expression.webp diff --git a/game/characters/tonks/face/mouth/open_skin.webp b/game/characters/tonks/face/mouth/open/skin.webp similarity index 100% rename from game/characters/tonks/face/mouth/open_skin.webp rename to game/characters/tonks/face/mouth/open/skin.webp diff --git a/game/characters/tonks/face/mouth/open_wide.webp b/game/characters/tonks/face/mouth/open_wide/expression.webp similarity index 100% rename from game/characters/tonks/face/mouth/open_wide.webp rename to game/characters/tonks/face/mouth/open_wide/expression.webp diff --git a/game/characters/tonks/face/mouth/open_wide_tongue.webp b/game/characters/tonks/face/mouth/open_wide_tongue/expression.webp similarity index 100% rename from game/characters/tonks/face/mouth/open_wide_tongue.webp rename to game/characters/tonks/face/mouth/open_wide_tongue/expression.webp diff --git a/game/characters/tonks/face/mouth/open_wide_tongue2.webp b/game/characters/tonks/face/mouth/open_wide_tongue2/expression.webp similarity index 100% rename from game/characters/tonks/face/mouth/open_wide_tongue2.webp rename to game/characters/tonks/face/mouth/open_wide_tongue2/expression.webp diff --git a/game/characters/tonks/face/mouth/open_wide_tongue2_cum.webp b/game/characters/tonks/face/mouth/open_wide_tongue2_cum/expression.webp similarity index 100% rename from game/characters/tonks/face/mouth/open_wide_tongue2_cum.webp rename to game/characters/tonks/face/mouth/open_wide_tongue2_cum/expression.webp diff --git a/game/characters/tonks/face/mouth/open_wide_tongue_cum.webp b/game/characters/tonks/face/mouth/open_wide_tongue_cum/expression.webp similarity index 100% rename from game/characters/tonks/face/mouth/open_wide_tongue_cum.webp rename to game/characters/tonks/face/mouth/open_wide_tongue_cum/expression.webp diff --git a/game/characters/tonks/face/mouth/scream.webp b/game/characters/tonks/face/mouth/scream/expression.webp similarity index 100% rename from game/characters/tonks/face/mouth/scream.webp rename to game/characters/tonks/face/mouth/scream/expression.webp diff --git a/game/characters/tonks/face/mouth/scream_skin.webp b/game/characters/tonks/face/mouth/scream/skin.webp similarity index 100% rename from game/characters/tonks/face/mouth/scream_skin.webp rename to game/characters/tonks/face/mouth/scream/skin.webp diff --git a/game/characters/tonks/face/mouth/silly.webp b/game/characters/tonks/face/mouth/silly/expression.webp similarity index 100% rename from game/characters/tonks/face/mouth/silly.webp rename to game/characters/tonks/face/mouth/silly/expression.webp diff --git a/game/characters/tonks/face/mouth/silly_skin.webp b/game/characters/tonks/face/mouth/silly/skin.webp similarity index 100% rename from game/characters/tonks/face/mouth/silly_skin.webp rename to game/characters/tonks/face/mouth/silly/skin.webp diff --git a/game/characters/tonks/face/mouth/soft.webp b/game/characters/tonks/face/mouth/soft/expression.webp similarity index 100% rename from game/characters/tonks/face/mouth/soft.webp rename to game/characters/tonks/face/mouth/soft/expression.webp diff --git a/game/characters/tonks/face/mouth/soft_skin.webp b/game/characters/tonks/face/mouth/soft/skin.webp similarity index 100% rename from game/characters/tonks/face/mouth/soft_skin.webp rename to game/characters/tonks/face/mouth/soft/skin.webp diff --git a/game/characters/tonks/face/mouth/upset.webp b/game/characters/tonks/face/mouth/upset/expression.webp similarity index 100% rename from game/characters/tonks/face/mouth/upset.webp rename to game/characters/tonks/face/mouth/upset/expression.webp diff --git a/game/characters/tonks/face/mouth/upset_skin.webp b/game/characters/tonks/face/mouth/upset/skin.webp similarity index 100% rename from game/characters/tonks/face/mouth/upset_skin.webp rename to game/characters/tonks/face/mouth/upset/skin.webp diff --git a/game/characters/tonks/face/pupils/L.webp b/game/characters/tonks/face/pupils/L/overlay.webp similarity index 100% rename from game/characters/tonks/face/pupils/L.webp rename to game/characters/tonks/face/pupils/L/overlay.webp diff --git a/game/characters/tonks/face/pupils/R.webp b/game/characters/tonks/face/pupils/R/overlay.webp similarity index 100% rename from game/characters/tonks/face/pupils/R.webp rename to game/characters/tonks/face/pupils/R/overlay.webp diff --git a/game/characters/tonks/face/pupils/ahegao.webp b/game/characters/tonks/face/pupils/ahegao/overlay.webp similarity index 100% rename from game/characters/tonks/face/pupils/ahegao.webp rename to game/characters/tonks/face/pupils/ahegao/overlay.webp diff --git a/game/characters/tonks/face/pupils/down.webp b/game/characters/tonks/face/pupils/down/overlay.webp similarity index 100% rename from game/characters/tonks/face/pupils/down.webp rename to game/characters/tonks/face/pupils/down/overlay.webp diff --git a/game/characters/tonks/face/pupils/downR.webp b/game/characters/tonks/face/pupils/downR/overlay.webp similarity index 100% rename from game/characters/tonks/face/pupils/downR.webp rename to game/characters/tonks/face/pupils/downR/overlay.webp diff --git a/game/characters/tonks/face/pupils/mid.webp b/game/characters/tonks/face/pupils/mid/overlay.webp similarity index 100% rename from game/characters/tonks/face/pupils/mid.webp rename to game/characters/tonks/face/pupils/mid/overlay.webp diff --git a/game/characters/tonks/face/pupils/stare.webp b/game/characters/tonks/face/pupils/stare/overlay.webp similarity index 100% rename from game/characters/tonks/face/pupils/stare.webp rename to game/characters/tonks/face/pupils/stare/overlay.webp diff --git a/game/characters/tonks/face/pupils/up.webp b/game/characters/tonks/face/pupils/up/overlay.webp similarity index 100% rename from game/characters/tonks/face/pupils/up.webp rename to game/characters/tonks/face/pupils/up/overlay.webp diff --git a/game/characters/tonks/face/tears/tears_mascara.webp b/game/characters/tonks/face/tears/mascara/expression.webp similarity index 100% rename from game/characters/tonks/face/tears/tears_mascara.webp rename to game/characters/tonks/face/tears/mascara/expression.webp diff --git a/game/characters/tonks/face/tears/tears_tears.webp b/game/characters/tonks/face/tears/tears/expression.webp similarity index 100% rename from game/characters/tonks/face/tears/tears_tears.webp rename to game/characters/tonks/face/tears/tears/expression.webp diff --git a/game/scripts/characters/astoria/wardrobe.rpy b/game/scripts/characters/astoria/wardrobe.rpy index 20fbda84..910c50dd 100644 --- a/game/scripts/characters/astoria/wardrobe.rpy +++ b/game/scripts/characters/astoria/wardrobe.rpy @@ -2,52 +2,7 @@ ## Character ## ############### -default astoria = Doll(name="astoria", - clothes={"headgear": [None, 15, True], - "hair": [None, 4, True], - "glasses": [None, 12, True], - "earrings": [None, 14, True], - "neckwear": [None, 11, True], - "robe": [None, 28, True], - "gloves": [None, 21, True], - "top": [None, 15, True], - "bra": [None, 9, True], - "bottom": [None, 8, True], - "garterbelt": [None, 7, True], - "panties": [None, 6, True], - "stockings": [None, 5, True], - "buttplug": [None, -1, True], - "pubes": [None, 3, True], - "tattoo0": [None, 1, True], - "tattoo1": [None, 1, True], - "tattoo2": [None, 1, True], - "tattoo3": [None, 1, True], - "tattoo4": [None, 1, True], - "piercing0": [None, 2, True], - "piercing1": [None, 2, True], - "piercing2": [None, 2, True], - "piercing3": [None, 2, True], - "piercing4": [None, 2, True], - "accessory0": [None, 12, True], - "accessory1": [None, 12, True], - "accessory2": [None, 12, True], - "accessory3": [None, 12, True], - "accessory4": [None, 12, True], - "makeup0": [None, 3, True], - "makeup1": [None, 3, True], - "makeup2": [None, 3, True], - "makeup3": [None, 3, True], - "makeup4": [None, 3, True]}, - face={"tears": [None, 12, True], - "cheeks": [None, 7, True], - "eyebrows": ["base", 11, True], - "eyes": ["base", 8, True], - "pupils": ["mid", 9, True], - "mouth": ["base", 13, True]}, - body={"armleft": ["on_hips", 3], - "armright":["on_hips", 1], - "base": ["front", 0], - "breasts": ["normal", 2]}) +default astoria = Doll(name="astoria") ####################### ## Schoolgirl Outfit ## @@ -56,22 +11,22 @@ default astoria = Doll(name="astoria", default ast_hair_base = DollCloth("astoria", ("head", "hair"), "hair", "base", [[229, 198, 129, 255], [163, 125, 80, 255]], unlocked=True) default ast_hair_short = DollCloth("astoria", ("head", "hair"), "hair", "short", [[229, 198, 129, 255], [163, 125, 80, 255]], unlocked=True) -default ast_top_school1 = DollCloth("astoria", ("upper body", "shirts"), "top", "top_school_1", [[183, 183, 184, 255], [109, 105, 121, 255], [58, 115, 75, 255], [205, 205, 206, 255]], armfix=True, unlocked=True) -default ast_top_school2 = DollCloth("astoria", ("upper body", "shirts"), "top", "top_school_2", [[183, 183, 184, 255], [109, 105, 121, 255], [58, 115, 75, 255], [205, 205, 206, 255]], level=4, armfix=True, unlocked=True) -default ast_top_school3 = DollCloth("astoria", ("upper body", "shirts"), "top", "top_school_3", [[183, 183, 184, 255], [58, 115, 75, 255], [205, 205, 206, 255]], level=8, armfix=True, unlocked=True) -default ast_top_school4 = DollCloth("astoria", ("upper body", "shirts"), "top", "top_school_4", [[183, 183, 184, 255], [58, 115, 75, 255], [205, 205, 206, 255]], level=8, armfix=True, unlocked=True) -default ast_top_school5 = DollCloth("astoria", ("upper body", "shirts"), "top", "top_school_5", [[183, 183, 184, 255], [58, 115, 75, 255], [205, 205, 206, 255]], level=12, armfix=True, unlocked=True) -default ast_top_school6 = DollCloth("astoria", ("upper body", "shirts"), "top", "top_school_6", [[109, 105, 121, 255], [58, 115, 75, 255], [205, 205, 206, 255]], level=12, armfix=True, unlocked=True) +default ast_top_school1 = DollCloth("astoria", ("upper body", "shirts"), "top", "top_school_1", [[183, 183, 184, 255], [109, 105, 121, 255], [58, 115, 75, 255], [205, 205, 206, 255]], unlocked=True) +default ast_top_school2 = DollCloth("astoria", ("upper body", "shirts"), "top", "top_school_2", [[183, 183, 184, 255], [109, 105, 121, 255], [58, 115, 75, 255], [205, 205, 206, 255]], level=4, unlocked=True) +default ast_top_school3 = DollCloth("astoria", ("upper body", "shirts"), "top", "top_school_3", [[183, 183, 184, 255], [58, 115, 75, 255], [205, 205, 206, 255]], level=8, unlocked=True) +default ast_top_school4 = DollCloth("astoria", ("upper body", "shirts"), "top", "top_school_4", [[183, 183, 184, 255], [58, 115, 75, 255], [205, 205, 206, 255]], level=8, unlocked=True) +default ast_top_school5 = DollCloth("astoria", ("upper body", "shirts"), "top", "top_school_5", [[183, 183, 184, 255], [58, 115, 75, 255], [205, 205, 206, 255]], level=12, unlocked=True) +default ast_top_school6 = DollCloth("astoria", ("upper body", "shirts"), "top", "top_school_6", [[109, 105, 121, 255], [58, 115, 75, 255], [205, 205, 206, 255]], level=12, unlocked=True) -default ast_bottom_skirt1 = DollCloth("astoria", ("lower body", "skirts"), "bottom", "school_skirt_1", [[103, 90, 108, 255], [232, 177, 13, 255]], armfix=True, unlocked=True) -default ast_bottom_skirt2 = DollCloth("astoria", ("lower body", "skirts"), "bottom", "school_skirt_2", [[103, 90, 108, 255], [232, 177, 13, 255]], level=4, armfix=True, unlocked=True) -default ast_bottom_skirt3 = DollCloth("astoria", ("lower body", "skirts"), "bottom", "school_skirt_3", [[103, 90, 108, 255], [232, 177, 13, 255]], level=8, armfix=True, unlocked=True) -default ast_bottom_skirt4 = DollCloth("astoria", ("lower body", "skirts"), "bottom", "school_skirt_4", [[103, 90, 108, 255], [232, 177, 13, 255]], level=12, armfix=True, unlocked=True) +default ast_bottom_skirt1 = DollCloth("astoria", ("lower body", "skirts"), "bottom", "school_skirt_1", [[103, 90, 108, 255], [232, 177, 13, 255]], unlocked=True) +default ast_bottom_skirt2 = DollCloth("astoria", ("lower body", "skirts"), "bottom", "school_skirt_2", [[103, 90, 108, 255], [232, 177, 13, 255]], level=4, unlocked=True) +default ast_bottom_skirt3 = DollCloth("astoria", ("lower body", "skirts"), "bottom", "school_skirt_3", [[103, 90, 108, 255], [232, 177, 13, 255]], level=8, unlocked=True) +default ast_bottom_skirt4 = DollCloth("astoria", ("lower body", "skirts"), "bottom", "school_skirt_4", [[103, 90, 108, 255], [232, 177, 13, 255]], level=12, unlocked=True) default ast_bra_basic1 = DollCloth("astoria", ("upper undergarment", "bras"), "bra", "basic_bra_1", [[213, 62, 65, 255], [234, 236, 234, 255]], unlocked=True) default ast_bra_basic2 = DollCloth("astoria", ("upper undergarment", "bras"), "bra", "basic_bra_2", [[213, 62, 65, 255]], unlocked=True) -default ast_panties_basic1 = DollCloth("astoria", ("lower undergarment", "panties"), "panties", "basic_panties_1", [[213, 62, 65, 255], [234, 236, 234, 255]], armfix=True, unlocked=True) -default ast_panties_basic2 = DollCloth("astoria", ("lower undergarment", "panties"), "panties", "basic_panties_2", [[213, 62, 65, 255]], armfix=True, unlocked=True) +default ast_panties_basic1 = DollCloth("astoria", ("lower undergarment", "panties"), "panties", "basic_panties_1", [[213, 62, 65, 255], [234, 236, 234, 255]], unlocked=True) +default ast_panties_basic2 = DollCloth("astoria", ("lower undergarment", "panties"), "panties", "basic_panties_2", [[213, 62, 65, 255]], unlocked=True) default ast_outfit_default = DollOutfit([ast_hair_base, ast_top_school1, ast_bottom_skirt1, ast_bra_basic1, ast_panties_basic1], unlocked=True) default ast_outfit_last = DollOutfit([ast_hair_base], hidden=True) @@ -81,11 +36,11 @@ default ast_outfit_last = DollOutfit([ast_hair_base], hidden=True) ################ default ast_hair_ann = DollCloth("astoria", ("head", "hair"), "hair", "ann_takamaki", [[229, 198, 129, 255], [163, 125, 80, 255], [255, 209, 105, 255]]) -default ast_hat_ann = DollCloth("astoria", ("head", "headgear"), "headgear", "ann_takamaki", [[173, 18, 18, 255], [238, 188, 187, 255]], level=14) -default ast_top_ann = DollCloth("astoria", ("upper body", "other"), "top", "ann_takamaki", [[173, 18, 18, 255], [232, 232, 232, 255], [238, 188, 187, 255]], level=14, blacklist=("bottom", "bra", "garterbelt"), armfix=True) -default ast_stockings_ann = DollCloth("astoria", ("legwear", "stockings"), "stockings", "ann_takamaki", [[99, 42, 42, 255], [181, 135, 135, 255]], level=14, blacklist=["bottom"], armfix=True) +default ast_hat_ann = DollClothDynamic("astoria", ("head", "headgear"), "headgear", "ann_takamaki", [[173, 18, 18, 255], [238, 188, 187, 255]], level=14, tracking="?hair") +default ast_top_ann = DollCloth("astoria", ("upper body", "other"), "top", "ann_takamaki", [[173, 18, 18, 255], [232, 232, 232, 255], [238, 188, 187, 255]], level=14, blacklist=("bottom", "bra", "garterbelt")) +default ast_stockings_ann = DollCloth("astoria", ("legwear", "stockings"), "stockings", "ann_takamaki", [[99, 42, 42, 255], [181, 135, 135, 255]], level=14, blacklist=["bottom"]) default ast_gloves_ann = DollCloth("astoria", ("upper body", "gloves"), "gloves", "ann_takamaki", [[249, 139, 225, 255]]) -default ast_buttplug_ann = DollCloth("astoria", ("misc", "accessory"), "accessory0", "ann_takamaki", [[99, 42, 42, 255], [181, 135, 135, 255]], level=14, zorder=-1) +default ast_buttplug_ann = DollCloth("astoria", ("misc", "accessory"), "accessory", "ann_takamaki", [[99, 42, 42, 255], [181, 135, 135, 255]], level=14, zorder=-1) default ast_outfit_ann = DollOutfit([ast_hair_ann, ast_hat_ann, ast_top_ann, ast_stockings_ann, ast_gloves_ann, ast_buttplug_ann, ast_panties_basic1], price=500, name="Ann Costume", desc="Wearing this will make you look like a different persona.") @@ -93,9 +48,9 @@ default ast_outfit_ann = DollOutfit([ast_hair_ann, ast_hat_ann, ast_top_ann, ast ## Misc ## ########## -default ast_cloth_pants1 = DollCloth("astoria", ("lower body", "trousers"), "bottom", "pants_1", [[180, 180, 180, 255], [213, 161, 13, 255]], armfix=True, unlocked=True) -default ast_cloth_shorts1 = DollCloth("astoria", ("lower body", "shorts"), "bottom", "pants_1_short", [[180, 180, 180, 255], [213, 161, 13, 255]], level=8, armfix=True, unlocked=True) -default ast_cloth_pantyhose1 = DollCloth("astoria", ("legwear", "pantyhose"), "stockings", "pantyhose", [[190, 146, 129, 255]], armfix=True, unlocked=True) +default ast_cloth_pants1 = DollCloth("astoria", ("lower body", "trousers"), "bottom", "pants_1", [[180, 180, 180, 255], [213, 161, 13, 255]], unlocked=True) +default ast_cloth_shorts1 = DollCloth("astoria", ("lower body", "shorts"), "bottom", "pants_1_short", [[180, 180, 180, 255], [213, 161, 13, 255]], level=8, unlocked=True) +default ast_cloth_pantyhose1 = DollCloth("astoria", ("legwear", "pantyhose"), "stockings", "pantyhose", [[190, 146, 129, 255]], unlocked=True) ################ ## Pubic Hair ## @@ -106,5 +61,5 @@ default ast_pubes_beaver = DollCloth("astoria", ("lower undergarment", "pubes"), default ast_pubes_stuble = DollCloth("astoria", ("lower undergarment", "pubes"), "pubes", "stuble", [[139, 107, 69, 255]], unlocked=True) default ast_pubes_unshaved = DollCloth("astoria", ("lower undergarment", "pubes"), "pubes", "unshaved", [[139, 107, 69, 255]], unlocked=True) -# Lipstick (DollLipstick) -default ast_makeup4_lipstick = DollLipstick("astoria", ("head", "makeup"), "makeup4", "lipstick", [[255, 70, 70, 255]], unlocked=True) +# Lipstick +default ast_makeup_lipstick = DollMakeup("astoria", ("head", "makeup"), "makeup", "lipstick", [[255, 70, 70, 255]], unlocked=True, tracking="mouth") diff --git a/game/scripts/characters/cho/wardrobe.rpy b/game/scripts/characters/cho/wardrobe.rpy index a98549aa..8d6c4819 100644 --- a/game/scripts/characters/cho/wardrobe.rpy +++ b/game/scripts/characters/cho/wardrobe.rpy @@ -2,52 +2,7 @@ ## Character ## ############### -default cho = Doll(name="cho", - clothes={"headgear": [None, 15, True], - "hair": [None, 4, True], - "glasses": [None, 12, True], - "earrings": [None, 14, True], - "neckwear": [None, 11, True], - "robe": [None, 28, True], - "gloves": [None, 21, True], - "top": [None, 15, True], - "bra": [None, 9, True], - "bottom": [None, 8, True], - "garterbelt": [None, 7, True], - "panties": [None, 6, True], - "stockings": [None, 5, True], - "buttplug": [None, -1, True], - "pubes": [None, 3, True], - "tattoo0": [None, 1, True], - "tattoo1": [None, 1, True], - "tattoo2": [None, 1, True], - "tattoo3": [None, 1, True], - "tattoo4": [None, 1, True], - "piercing0": [None, 2, True], - "piercing1": [None, 2, True], - "piercing2": [None, 2, True], - "piercing3": [None, 2, True], - "piercing4": [None, 2, True], - "accessory0": [None, 12, True], - "accessory1": [None, 12, True], - "accessory2": [None, 12, True], - "accessory3": [None, 12, True], - "accessory4": [None, 12, True], - "makeup0": [None, 3, True], - "makeup1": [None, 3, True], - "makeup2": [None, 3, True], - "makeup3": [None, 3, True], - "makeup4": [None, 3, True]}, - face={"tears": [None, 12, True], - "cheeks": [None, 7, True], - "eyebrows": ["base", 11, True], - "eyes": ["base", 8, True], - "pupils": ["mid", 9, True], - "mouth": ["base", 13, True]}, - body={"armleft": ["down", 3], - "armright":["down", 1], - "base": ["front", 0], - "breasts": ["normal", 2]}) +default cho = Doll(name="cho") ################ ## Schoolgirl ## @@ -60,10 +15,10 @@ default cho_top_school3 = DollCloth("cho", ("upper body", "shirts"), "top", "top default cho_top_school4 = DollCloth("cho", ("upper body", "shirts"), "top", "top_school_4", [[183, 183, 184, 255], [216, 163, 10, 255], [89, 116, 194, 255]], level=8, unlocked=True) default cho_top_school5 = DollCloth("cho", ("upper body", "shirts"), "top", "top_school_5", [[183, 183, 184, 255], [216, 163, 10, 255], [89, 116, 194, 255]], level=12, unlocked=True) default cho_top_school6 = DollCloth("cho", ("upper body", "shirts"), "top", "top_school_6", [[109, 105, 121, 255], [216, 163, 10, 255], [89, 116, 194, 255]], level=12, unlocked=True) -default cho_bottom_school1 = DollCloth("cho", ("lower body", "skirts"), "bottom", "school_skirt_1", [[103, 90, 108, 255], [232, 177, 13, 255]], armfix=True, unlocked=True) -default cho_bottom_school2 = DollCloth("cho", ("lower body", "skirts"), "bottom", "school_skirt_2", [[103, 90, 108, 255], [232, 177, 13, 255]], level=4, armfix=True, unlocked=True) -default cho_bottom_school3 = DollCloth("cho", ("lower body", "skirts"), "bottom", "school_skirt_3", [[103, 90, 108, 255], [232, 177, 13, 255]], level=8, armfix=True, unlocked=True) -default cho_bottom_school4 = DollCloth("cho", ("lower body", "skirts"), "bottom", "school_skirt_4", [[103, 90, 108, 255], [232, 177, 13, 255]], level=12, armfix=True, unlocked=True) +default cho_bottom_school1 = DollCloth("cho", ("lower body", "skirts"), "bottom", "school_skirt_1", [[103, 90, 108, 255], [232, 177, 13, 255]], unlocked=True) +default cho_bottom_school2 = DollCloth("cho", ("lower body", "skirts"), "bottom", "school_skirt_2", [[103, 90, 108, 255], [232, 177, 13, 255]], level=4, unlocked=True) +default cho_bottom_school3 = DollCloth("cho", ("lower body", "skirts"), "bottom", "school_skirt_3", [[103, 90, 108, 255], [232, 177, 13, 255]], level=8, unlocked=True) +default cho_bottom_school4 = DollCloth("cho", ("lower body", "skirts"), "bottom", "school_skirt_4", [[103, 90, 108, 255], [232, 177, 13, 255]], level=12, unlocked=True) default cho_bra_basic1 = DollCloth("cho", ("upper undergarment", "bras"), "bra", "basic_bra_1", [[230, 230, 231, 255], [89, 116, 194, 255]], unlocked=True) default cho_panties_basic1 = DollCloth("cho", ("lower undergarment", "panties"), "panties", "basic_panties_1", [[230, 230, 231, 255], [89, 116, 194, 255]], unlocked=True) default cho_stockings_house = DollCloth("cho", ("legwear", "socks"), "stockings", "house", [[216, 163, 10, 255], [89, 116, 194, 255]], unlocked=True) @@ -85,26 +40,26 @@ default cho_stockings_quid1 = DollCloth("cho", ("legwear", "socks"), "stockings" default cho_panties_sport2 = DollCloth("cho", ("lower undergarment", "panties"), "panties", "sport_panties_2", [[156, 204, 249, 255]], level=4) default cho_bra_sports1 = DollCloth("cho", ("upper undergarment", "bras"), "bra", "sport_bra_1", [[156, 204, 249, 255]], unlocked=True) default cho_top_quid1 = DollCloth("cho", ("upper body", "shirts"), "top", "top_quid_1", [[64, 84, 141, 255], [213, 161, 13, 255]], level=10) -default cho_bottom_quid1 = DollCloth("cho", ("lower body", "skirts"), "bottom", "quid_skirt_1", [[64, 84, 141, 255], [213, 161, 13, 255]], level=10, armfix=True) -default cho_makeup0_blush = DollCloth("cho", ("makeup", "blush"), "makeup0", "blush", [[238, 113, 196, 255]], level=2) +default cho_bottom_quid1 = DollCloth("cho", ("lower body", "skirts"), "bottom", "quid_skirt_1", [[64, 84, 141, 255], [213, 161, 13, 255]], level=10) +default cho_makeup_blush = DollCloth("cho", ("makeup", "blush"), "makeup", "blush", [[238, 113, 196, 255]], level=2) -default cho_outfit_cheerleader = DollOutfit([cho_hair_ponytail1, cho_earring_snitch, cho_stockings_quid1, cho_panties_sport2, cho_bra_sports1, cho_bottom_quid1, cho_top_quid1, cho_makeup0_blush], price=500, name="Ravenclaw Cheerleader Uniform", desc="Ravenclaw! Ravenclaw!") +default cho_outfit_cheerleader = DollOutfit([cho_hair_ponytail1, cho_earring_snitch, cho_stockings_quid1, cho_panties_sport2, cho_bra_sports1, cho_bottom_quid1, cho_top_quid1, cho_makeup_blush], price=500, name="Ravenclaw Cheerleader Uniform", desc="Ravenclaw! Ravenclaw!") ################## ## Misty Outfit ## ################## default cho_top_shirt1 = DollCloth("cho", ("upper body", "shirts"), "top", "top_shirt_1", [[255, 229, 126, 255]], level=14) -default cho_bottom_shorts3 = DollCloth("cho", ("lower body", "shorts"), "bottom", "pants_short_3", [[47, 150, 136, 255], [175, 220, 191, 255], [247, 152, 38, 255]], level=10, armfix=True) -default cho_accessory3_suspenders = DollCloth("cho", ("misc", "accessory"), "accessory3", "suspenders", [[137, 22, 17, 255], [229, 140, 33, 255]], zorder=16) +default cho_bottom_shorts3 = DollCloth("cho", ("lower body", "shorts"), "bottom", "pants_short_3", [[47, 150, 136, 255], [175, 220, 191, 255], [247, 152, 38, 255]], level=10) +default cho_accessory_suspenders = DollCloth("cho", ("misc", "accessory"), "accessory", "suspenders", [[137, 22, 17, 255], [229, 140, 33, 255]], zorder=16) -default cho_outfit_misty = DollOutfit([cho_hair_ponytail1, cho_accessory3_suspenders, cho_top_shirt1, cho_bottom_shorts3, cho_panties_sport2], price=500, name="Misty Costume", desc="For trainers that want to be the very best! To train them is your cause!") +default cho_outfit_misty = DollOutfit([cho_hair_ponytail1, cho_accessory_suspenders, cho_top_shirt1, cho_bottom_shorts3, cho_panties_sport2], price=500, name="Misty Costume", desc="For trainers that want to be the very best! To train them is your cause!") ################## ## Party Outfit ## ################## -default cho_bottom_skirt2 = DollCloth("cho", ("lower body", "skirts"), "bottom", "skirt_short_2", [[93, 119, 173, 255]], level=16, armfix=True) +default cho_bottom_skirt2 = DollCloth("cho", ("lower body", "skirts"), "bottom", "skirt_short_2", [[93, 119, 173, 255]], level=16) default cho_bra_bikini1 = DollCloth("cho", ("upper undergarment", "bikini bras"), "bra", "bikini_top_1", [[3, 237, 234, 255]], level=10) default cho_outfit_party = DollOutfit([cho_hair_ponytail1, cho_bottom_skirt2, cho_bra_bikini1], price=500, name="Clubslut Outfit", desc="Release your inner slut with this unique club outfit!") @@ -113,10 +68,10 @@ default cho_outfit_party = DollOutfit([cho_hair_ponytail1, cho_bottom_skirt2, ch ## Sailor Outfit ## ################### -default cho_bottom_skirt1 = DollCloth("cho", ("lower body", "skirts"), "bottom", "skirt_short_1", [[89, 116, 194, 255]], level=18, armfix=True) +default cho_bottom_skirt1 = DollCloth("cho", ("lower body", "skirts"), "bottom", "skirt_short_1", [[89, 116, 194, 255]], level=18) default cho_top_sailor1 = DollCloth("cho", ("upper body", "shirts"), "top", "top_sailor_1", [[252, 252, 253, 255], [89, 116, 194, 255]], level=14) -default cho_stockings_sailor1 = DollCloth("cho", ("legwear", "stockings"), "stockings", "sailor", [[232, 232, 233, 255]], armfix=True) -default cho_panties_bikini2 = DollCloth("cho", ("lower undergarment", "bikini panties"), "panties", "bikini_bottom_2", [[213, 161, 13, 255]], level=18, armfix=True) +default cho_stockings_sailor1 = DollCloth("cho", ("legwear", "stockings"), "stockings", "sailor", [[232, 232, 233, 255]]) +default cho_panties_bikini2 = DollCloth("cho", ("lower undergarment", "bikini panties"), "panties", "bikini_bottom_2", [[213, 161, 13, 255]], level=18) default cho_outfit_sailor = DollOutfit([cho_hair_ponytail1, cho_top_sailor1, cho_bottom_skirt1, cho_stockings_sailor1, cho_panties_bikini2], price=500, name="Sailor Outfit", desc="A slutty sailor outfit, perfect for the average cannon swabber.") @@ -124,8 +79,8 @@ default cho_outfit_sailor = DollOutfit([cho_hair_ponytail1, cho_top_sailor1, cho ## Japanese School Outfit ## ############################ -default cho_top_j_school1 = DollCloth("cho", ("upper body", "shirts"), "top", "top_j_school_1", [[255, 248, 223, 255], [95, 110, 142, 255], [161, 161, 164, 255], [253, 254, 250, 255]], level=4, armfix=True) -default cho_bottom_j_skirt1 = DollCloth("cho", ("lower body", "skirts"), "bottom", "j_school_skirt_1", [[161, 161, 164, 255]], level=4, armfix=True) +default cho_top_j_school1 = DollCloth("cho", ("upper body", "shirts"), "top", "top_j_school_1", [[255, 248, 223, 255], [95, 110, 142, 255], [161, 161, 164, 255], [253, 254, 250, 255]], level=4) +default cho_bottom_j_skirt1 = DollCloth("cho", ("lower body", "skirts"), "bottom", "j_school_skirt_1", [[161, 161, 164, 255]], level=4) default cho_stockings_j_kneehigh1 = DollCloth("cho", ("legwear", "socks"), "stockings", "kneehigh", [[253, 254, 250, 255]], level=0) default cho_outfit_j_school = DollOutfit([cho_hair_ponytail1, cho_top_j_school1, cho_bottom_j_skirt1, cho_stockings_j_kneehigh1, cho_panties_basic1, cho_bra_basic1], price=300, name="Japanese School Uniform", desc="A school girl uniform inspired by the land of culture.") @@ -135,7 +90,7 @@ default cho_outfit_j_school = DollOutfit([cho_hair_ponytail1, cho_top_j_school1, ################### default cho_bra_bikini2 = DollCloth("cho", ("upper undergarment", "bikini bras"), "bra", "bikini_top_2", [[89, 116, 194, 255]], level=14) #Red: [138, 22, 17, 255] -default cho_panties_bikini1 = DollCloth("cho", ("lower undergarment", "bikini panties"), "panties", "bikini_bottom_1", [[213, 161, 13, 255]], level=14, armfix=True) +default cho_panties_bikini1 = DollCloth("cho", ("lower undergarment", "bikini panties"), "panties", "bikini_bottom_1", [[213, 161, 13, 255]], level=14) default cho_outfit_bikini = DollOutfit([cho_hair_ponytail1, cho_bra_bikini2, cho_panties_bikini1], price=500, name="Micro Bikini Set", desc="The regular size bikinis are out of stock...") @@ -145,7 +100,7 @@ default cho_outfit_bikini = DollOutfit([cho_hair_ponytail1, cho_bra_bikini2, cho default cho_neckwear_lace1 = DollCloth("cho", ("head", "neckwear"), "neckwear", "choker_lace_1", [[100, 100, 255, 255], [220, 220, 221, 255]]) default cho_garterbelt_lace1 = DollCloth("cho", ("legwear", "garterbelts"), "garterbelt", "lace_garter_1", [[220, 220, 221, 255], [100, 100, 255, 255], [220, 220, 221, 255], [89, 116, 194, 255]], level=12) -default cho_stockings_lace1 = DollCloth("cho", ("legwear", "stockings"), "stockings", "lace_stockings_1", [[100, 100, 255, 255], [220, 220, 221, 255]], armfix=True, level=12) +default cho_stockings_lace1 = DollCloth("cho", ("legwear", "stockings"), "stockings", "lace_stockings_1", [[100, 100, 255, 255], [220, 220, 221, 255]], level=12) default cho_bra_lace1 = DollCloth("cho", ("upper undergarment", "bras"), "bra", "lace_bra_1", [[100, 100, 255, 255], [220, 220, 221, 255], [89, 116, 194, 255]], level=14) default cho_panties_lace1 = DollCloth("cho", ("lower undergarment", "panties"), "panties", "lace_panties_1", [[100, 100, 255, 255], [220, 220, 221, 255], [89, 116, 194, 255]], level=12) default cho_earring_feather = DollCloth("cho", ("head", "earrings"), "earrings", "feather", [[232, 232, 232, 255], [70, 90, 147, 255], [136, 91, 34, 255]]) @@ -156,7 +111,7 @@ default cho_outfit_lacelingerie = DollOutfit([cho_hair_ponytail1, cho_neckwear_l ## Dress Outfit ## ################## -default cho_top_dress1 = DollCloth("cho", ("upper body", "dresses"), "top", "dress_1", [[231, 29, 41, 255], [242, 162, 73, 255]], armfix=True, level=12, blacklist=["bottom"]) +default cho_top_dress1 = DollCloth("cho", ("upper body", "dresses"), "top", "dress_1", [[231, 29, 41, 255], [242, 162, 73, 255]], level=12, blacklist=["bottom"]) default cho_outfit_dress1 = DollOutfit([cho_hair_ponytail1, cho_top_dress1, cho_panties_basic1, cho_bra_basic1], price=500, name="Traditional Chinese Dress", desc="A traditional dress inspired by Chinese culture.") @@ -165,8 +120,8 @@ default cho_outfit_dress1 = DollOutfit([cho_hair_ponytail1, cho_top_dress1, cho_ #################### default cho_top_tank2 = DollCloth("cho", ("upper body", "shirts"), "top", "top_tanktop_2", [[252, 192, 213, 255], [253, 221, 232, 255]], level=10) -default cho_bottom_shorts1 = DollCloth("cho", ("lower body", "shorts"), "bottom", "pants_short_1", [[230, 230, 231, 255]], level=8, armfix=True) -default cho_stockings_pantyhose = DollCloth("cho", ("legwear", "pantyhose"), "stockings", "pantyhose", [[190, 146, 129, 255]], armfix=True) +default cho_bottom_shorts1 = DollCloth("cho", ("lower body", "shorts"), "bottom", "pants_short_1", [[230, 230, 231, 255]], level=8) +default cho_stockings_pantyhose = DollCloth("cho", ("legwear", "pantyhose"), "stockings", "pantyhose", [[190, 146, 129, 255]]) default cho_earring_basic = DollCloth("cho", ("head", "earrings"), "earrings", "basic", [[220, 220, 221, 255]]) default cho_outfit_trainee = DollOutfit([cho_hair_ponytail1, cho_bra_basic1, cho_panties_basic1, cho_bottom_shorts1, cho_top_tank2, cho_stockings_pantyhose, cho_earring_basic], price=500, name="Sporty Outfit", desc="Great for reducing fat.") @@ -175,9 +130,9 @@ default cho_outfit_trainee = DollOutfit([cho_hair_ponytail1, cho_bra_basic1, cho ## Space Jam Outfit ## ###################### -default cho_headgear_toon_band = DollCloth("cho", ("head", "headgear"), "headgear", "toon_band", [[43, 81, 151, 255]], level=4) +default cho_headgear_toon_band = DollClothDynamic("cho", ("head", "headgear"), "headgear", "toon_band", [[43, 81, 151, 255]], level=4, tracking="?hair") default cho_top_toon_shirt = DollCloth("cho", ("upper body", "shirts"), "top", "toon_shirt", [[255, 255, 255, 255]], level=4) -default cho_bottom_toon_shorts = DollCloth("cho", ("lower body", "shorts"), "bottom", "toon_shorts", [[43, 81, 151, 255], [255, 255, 255, 255]], level=4, armfix=True) +default cho_bottom_toon_shorts = DollCloth("cho", ("lower body", "shorts"), "bottom", "toon_shorts", [[43, 81, 151, 255], [255, 255, 255, 255]], level=4) default cho_stockings_toon_socks = DollCloth("cho", ("legwear", "socks"), "stockings", "toon_socks", [[43, 81, 151, 255], [255, 255, 255, 255]], level=4) default cho_outfit_toon = DollOutfit([cho_hair_ponytail1, cho_headgear_toon_band, cho_top_toon_shirt, cho_bottom_toon_shorts, cho_stockings_toon_socks, cho_bra_basic1, cho_panties_basic1], price=500, name="Toonsquad Outfit", desc="\"Don't ever call me a doll!\" - Some Sexy Bunny") @@ -186,23 +141,23 @@ default cho_outfit_toon = DollOutfit([cho_hair_ponytail1, cho_headgear_toon_band ## Chun-Li Outfit ## #################### -default cho_top_chun_li = DollCloth("cho", ("upper body", "dresses"), "top", "chun_li_dress", [[237, 34, 79, 255], [255, 226, 121, 255]], blacklist=["bottom"], level=12, armfix=True) -default cho_accessory_chun_li_wrap = DollCloth("cho", ("misc", "accessory"), "accessory3", "body_wrap", [[255, 251, 222, 255]], level=12, zorder=3) -default cho_accessory_chun_li_shoulders = DollCloth("cho", ("misc", "accessory"), "accessory4", "chun_li_shoulders", [[237, 34, 79, 255], [255, 226, 121, 255]], level=12, zorder=16) -default cho_headgear_chun_li_puffies = DollCloth("cho", ("head", "headgear"), "headgear", "chun_li_puffies", [[255, 251, 222, 255]], level=10) -default cho_tattoo2_chun_li_dragon = DollCloth("cho", ("piercings & tattoos", "tattoos"), "tattoo2", "chun_li_dragon", [[237, 34, 79, 255], [255, 226, 121, 255]]) -default cho_tattoo1_chun_li_mule = DollCloth("cho", ("piercings & tattoos", "tattoos"), "tattoo1", "chun_li_mule", [[0, 0, 0, 255]]) +default cho_top_chun_li = DollCloth("cho", ("upper body", "dresses"), "top", "chun_li_dress", [[237, 34, 79, 255], [255, 226, 121, 255]], blacklist=["bottom"], level=12) +default cho_accessory_chun_li_wrap = DollCloth("cho", ("misc", "accessory"), "accessory", "body_wrap", [[255, 251, 222, 255]], level=12, zorder=3) +default cho_accessory_chun_li_shoulders = DollCloth("cho", ("misc", "accessory"), "accessory", "chun_li_shoulders", [[237, 34, 79, 255], [255, 226, 121, 255]], level=12, zorder=16) +default cho_headgear_chun_li_puffies = DollClothDynamic("cho", ("head", "headgear"), "headgear", "chun_li_puffies", [[255, 251, 222, 255]], level=10, tracking="?hair") +default cho_tattoo_chun_li_dragon = DollCloth("cho", ("piercings & tattoos", "tattoos"), "tattoo", "chun_li_dragon", [[237, 34, 79, 255], [255, 226, 121, 255]]) +default cho_tattoo_chun_li_mule = DollCloth("cho", ("piercings & tattoos", "tattoos"), "tattoo", "chun_li_mule", [[0, 0, 0, 255]]) -default cho_outfit_chun_li = DollOutfit([cho_hair_ponytail1, cho_top_chun_li, cho_accessory_chun_li_wrap, cho_accessory_chun_li_shoulders, cho_headgear_chun_li_puffies, cho_bra_basic1, cho_panties_basic1, cho_tattoo2_chun_li_dragon, cho_tattoo1_chun_li_mule], price=500, name="Chun-Li Outfit", desc="For the strongest woman in the world!") +default cho_outfit_chun_li = DollOutfit([cho_hair_ponytail1, cho_top_chun_li, cho_accessory_chun_li_wrap, cho_accessory_chun_li_shoulders, cho_headgear_chun_li_puffies, cho_bra_basic1, cho_panties_basic1, cho_tattoo_chun_li_dragon, cho_tattoo_chun_li_mule], price=500, name="Chun-Li Outfit", desc="For the strongest woman in the world!") ################## ## Police Woman ## ################## default cho_top_police1 = DollCloth("cho", ("upper body", "shirts"), "top", "police", [[69, 84, 149, 255], [235, 209, 101, 255]], level=9) -default cho_bottom_police_skirt = DollCloth("cho", ("lower body", "skirts"), "bottom", "police_skirt", [[69, 84, 149, 255], [235, 209, 101, 255], [163, 95, 58, 255], [235, 209, 101, 255]], level=10, armfix=True) +default cho_bottom_police_skirt = DollCloth("cho", ("lower body", "skirts"), "bottom", "police_skirt", [[69, 84, 149, 255], [235, 209, 101, 255], [163, 95, 58, 255], [235, 209, 101, 255]], level=10) default cho_glasses_aviators = DollCloth("cho", ("head", "glasses"), "glasses", "aviators", [[183, 199, 216, 255], [243, 217, 84, 255]], level=6) -default cho_headgear_police_cap = DollCloth("cho", ("head", "headgear"), "headgear", "police_cap", [[126, 126, 192, 255], [235, 209, 101, 255], [183, 199, 216, 255], [235, 209, 101, 255]], level=6) +default cho_headgear_police_cap = DollClothDynamic("cho", ("head", "headgear"), "headgear", "police_cap", [[126, 126, 192, 255], [235, 209, 101, 255], [183, 199, 216, 255], [235, 209, 101, 255]], level=6, tracking="?hair") default cho_outfit_police = DollOutfit([cho_hair_ponytail1, cho_top_police1, cho_bottom_police_skirt, cho_bra_basic1, cho_panties_basic1, cho_glasses_aviators, cho_headgear_police_cap]) @@ -211,19 +166,19 @@ default cho_outfit_police = DollOutfit([cho_hair_ponytail1, cho_top_police1, cho ###################### default cho_top_bunny2 = DollCloth("cho", ("upper body", "one-piece suits"), "top", "bunny_top_2", [[132, 34, 11, 255]], blacklist=["panties", "bra"], zorder=7, level=15) -default cho_hat_antlers = DollCloth("cho", ("head", "headgear"), "headgear", "antlers", [[152, 75, 48, 255], [255, 255, 255, 255], [194, 157, 99, 255]], level=12) +default cho_hat_antlers = DollClothDynamic("cho", ("head", "headgear"), "headgear", "antlers", [[152, 75, 48, 255], [255, 255, 255, 255], [194, 157, 99, 255]], level=12, tracking="?hair") default cho_neckwear_reindeer_collar = DollCloth("cho", ("head", "neckwear"), "neckwear", "reindeer_collar", [[126, 68, 34, 255], [196, 171, 95, 255]], level=15) -default cho_accessory3_mistletoe = DollCloth("cho", ("misc", "accessory"), "accessory3", "mistletoe", [[27, 92, 201, 255]], zorder=16, level=7) +default cho_accessory_mistletoe = DollCloth("cho", ("misc", "accessory"), "accessory", "mistletoe", [[27, 92, 201, 255]], zorder=16, level=7) -default cho_outfit_reindeer = DollOutfit([cho_hair_ponytail1, cho_top_bunny2, cho_accessory3_mistletoe, cho_hat_antlers, cho_neckwear_reindeer_collar]) +default cho_outfit_reindeer = DollOutfit([cho_hair_ponytail1, cho_top_bunny2, cho_accessory_mistletoe, cho_hat_antlers, cho_neckwear_reindeer_collar]) ################### ## Bunny Costume ## ################### default cho_top_bunny1 = DollCloth("cho", ("upper body", "one-piece suits"), "top", "bunny_top_1", [[0, 0, 0, 255]], blacklist=["panties", "bra"], zorder=7, level=15) -default cho_stockings_bunny1 = DollCloth("cho", ("legwear", "pantyhose"), "stockings", "bunny_stockings_1", [[81, 81, 81, 255]], armfix=True, level=5) -default cho_hat_bunny1 = DollCloth("cho", ("head", "headgear"), "headgear", "bunny_hat_1", [[43, 42, 50, 255], [87, 83, 112, 255]], level=15) +default cho_stockings_bunny1 = DollCloth("cho", ("legwear", "pantyhose"), "stockings", "bunny_stockings_1", [[81, 81, 81, 255]], level=5) +default cho_hat_bunny1 = DollClothDynamic("cho", ("head", "headgear"), "headgear", "bunny_hat_1", [[43, 42, 50, 255], [87, 83, 112, 255]], level=15, tracking="?hair") default cho_outfit_bunny = DollOutfit([cho_hair_ponytail1, cho_top_bunny1, cho_stockings_bunny1, cho_hat_bunny1], price=250, name="Sexy Bunny Costume", desc="A costume to turn you into the bunny equivalent of a neko.") @@ -239,28 +194,28 @@ default cho_outfit_virgin_killer = DollOutfit([cho_hair_ponytail1, cho_top_virgi ## Other ## ########### -default cho_panties_sport1 = DollCloth("cho", ("lower undergarment", "panties"), "panties", "sport_panties_1", [[156, 204, 249, 255]], unlocked=True, armfix=True) +default cho_panties_sport1 = DollCloth("cho", ("lower undergarment", "panties"), "panties", "sport_panties_1", [[156, 204, 249, 255]], unlocked=True) default cho_pubes_thick = DollCloth("cho", ("lower undergarment", "pubes"), "pubes", "thick", [[52, 59, 80, 255], [70, 90, 147, 255]], unlocked=True) default cho_pubes_heart = DollCloth("cho", ("lower undergarment", "pubes"), "pubes", "heart", [[52, 59, 80, 255], [70, 90, 147, 255]], unlocked=True) -default cho_tattoo0_free = DollCloth("cho", ("piercings & tattoos", "tattoos"), "tattoo0", "pelv_free", [[0, 0, 1, 255]], unlocked=True) -default cho_piercing0_stud = DollCloth("cho", ("piercings & tattoos", "piercings"), "piercing0", "stud", [[220, 220, 221, 255]], unlocked=True) -default cho_tattoo1_slut = DollCloth("cho", ("piercings & tattoos", "tattoos"), "tattoo1", "breasts_slut", [[0, 0, 1, 255]], unlocked=True) -default cho_piercing1_barbell = DollCloth("cho", ("piercings & tattoos", "piercings"), "piercing1", "breast_barbell", [[220, 220, 221, 255]], unlocked=True) -default cho_hat_catears = DollCloth("cho", ("head", "headgear"), "headgear", "catears", [[70, 90, 147, 255]], level=10, unlocked=True) -default cho_hat_witch = DollCloth("cho", ("head", "headgear"), "headgear", "witch", [[71, 51, 102, 255], [215, 170, 98, 255]], unlocked=True) -default cho_accessory4_glasses1 = DollCloth("cho", ("head", "glasses"), "glasses", "glasses1", [[240, 240, 241, 255]], unlocked=True) -default cho_hat_goggles = DollCloth("cho", ("head", "headgear"), "headgear", "goggles", [[137, 150, 193, 255], [165, 165, 166, 255]], unlocked=True) +default cho_tattoo_free = DollCloth("cho", ("piercings & tattoos", "tattoos"), "tattoo", "pelv_free", [[0, 0, 1, 255]], unlocked=True) +default cho_piercing_stud = DollCloth("cho", ("piercings & tattoos", "piercings"), "piercing", "stud", [[220, 220, 221, 255]], unlocked=True) +default cho_tattoo_slut = DollCloth("cho", ("piercings & tattoos", "tattoos"), "tattoo", "breasts_slut", [[0, 0, 1, 255]], unlocked=True) +default cho_piercing_barbell = DollCloth("cho", ("piercings & tattoos", "piercings"), "piercing", "breast_barbell", [[220, 220, 221, 255]], unlocked=True) +default cho_hat_catears = DollClothDynamic("cho", ("head", "headgear"), "headgear", "catears", [[70, 90, 147, 255]], level=10, unlocked=True, tracking="?hair") +default cho_hat_witch = DollClothDynamic("cho", ("head", "headgear"), "headgear", "witch", [[71, 51, 102, 255], [215, 170, 98, 255]], unlocked=True, tracking="?hair") +default cho_accessory_glasses1 = DollCloth("cho", ("head", "glasses"), "glasses", "glasses1", [[240, 240, 241, 255]], unlocked=True) +default cho_hat_goggles = DollClothDynamic("cho", ("head", "headgear"), "headgear", "goggles", [[137, 150, 193, 255], [165, 165, 166, 255]], unlocked=True, tracking="?hair") default cho_neckwear_medallion = DollCloth("cho", ("head", "neckwear"), "neckwear", "choker_medallion", [[25, 25, 26, 255]], unlocked=True) default cho_neckwear_leather1 = DollCloth("cho", ("head", "neckwear"), "neckwear", "collar_leather_1", [[56, 56, 57, 255]], unlocked=True) -default cho_stockings_fishnet = DollCloth("cho", ("legwear", "stockings"), "stockings", "fishnet", [[100, 100, 101, 255], [50, 50, 51, 255]], level=14, armfix=True, unlocked=True) -default cho_top_sweater1 = DollCloth("cho", ("upper body", "sweaters"), "top", "top_sweater_1", [[89, 116, 194, 255], [213, 161, 13, 255]], armfix=True, unlocked=True) +default cho_stockings_fishnet = DollCloth("cho", ("legwear", "stockings"), "stockings", "fishnet", [[100, 100, 101, 255], [50, 50, 51, 255]], level=14, unlocked=True) +default cho_top_sweater1 = DollCloth("cho", ("upper body", "sweaters"), "top", "top_sweater_1", [[89, 116, 194, 255], [213, 161, 13, 255]], unlocked=True) default cho_top_sweater2 = DollCloth("cho", ("upper body", "sweaters"), "top", "top_sweater_2", [[89, 116, 194, 255]], level=6, unlocked=True) default cho_top_tanktop1 = DollCloth("cho", ("upper body", "shirts"), "top", "top_tanktop_1", [[230, 230, 231, 255]], level=14, unlocked=True) -default cho_robe_quidditch1 = DollCloth("cho", ("upper body", "robes"), "robe", "robe_quidditch_1", [[89, 116, 194, 255], [213, 161, 13, 255]], armfix=True, unlocked=True) -default cho_bottom_pants1 = DollCloth("cho", ("lower body", "trousers"), "bottom", "pants_long_1", [[230, 230, 231, 255]], armfix=True, unlocked=True) -default cho_bottom_shorts2 = DollCloth("cho", ("lower body", "shorts"), "bottom", "pants_short_2", [[114, 168, 210, 255], [232, 177, 13, 255]], level=10, armfix=True, unlocked=True) -default cho_bottom_pants2 = DollCloth("cho", ("lower body", "trousers"), "bottom", "pants_long_2", [[109, 105, 121, 255], [213, 161, 13, 255]], armfix=True, unlocked=True) -default cho_bottom_shorts4 = DollCloth("cho", ("lower body", "shorts"), "bottom", "pants_short_4", [[109, 105, 121, 255], [213, 161, 13, 255]], level=8, armfix=True, unlocked=True) +default cho_robe_quidditch1 = DollCloth("cho", ("upper body", "robes"), "robe", "robe_quidditch_1", [[89, 116, 194, 255], [213, 161, 13, 255]], unlocked=True) +default cho_bottom_pants1 = DollCloth("cho", ("lower body", "trousers"), "bottom", "pants_long_1", [[230, 230, 231, 255]], unlocked=True) +default cho_bottom_shorts2 = DollCloth("cho", ("lower body", "shorts"), "bottom", "pants_short_2", [[114, 168, 210, 255], [232, 177, 13, 255]], level=10, unlocked=True) +default cho_bottom_pants2 = DollCloth("cho", ("lower body", "trousers"), "bottom", "pants_long_2", [[109, 105, 121, 255], [213, 161, 13, 255]], unlocked=True) +default cho_bottom_shorts4 = DollCloth("cho", ("lower body", "shorts"), "bottom", "pants_short_4", [[109, 105, 121, 255], [213, 161, 13, 255]], level=8, unlocked=True) # Quidditch separate category default choq_bra_sports1 = DollCloth("cho", ("upper undergarment", "bras"), "bra", "sport_bra_1", [[156, 204, 249, 255]]) @@ -274,10 +229,10 @@ default choq_goggles = DollCloth("cho", ("head", "glasses"), "glasses", "goggles #default choq_goggles_face = DollCloth("cho", ("head", "headgear"), "headgear", "goggles_face", [[137, 150, 193, 255], [165, 165, 166, 255]], unlocked=False) # Not in use default choq_cloth_schoolskirt2 = DollCloth("cho", ("lower body", "skirts"), "bottom", "school_skirt_2", [[103, 90, 108, 255], [232, 177, 13, 255]]) default choq_cloth_schoolskirt3 = DollCloth("cho", ("lower body", "skirts"), "bottom", "school_skirt_3", [[103, 90, 108, 255], [232, 177, 13, 255]]) -default choq_panties_in_hand = DollCloth("cho", ("misc", "accessory"), "accessory2", "panties_in_hand", [[156, 204, 249, 255]]) +default choq_panties_in_hand = DollCloth("cho", ("misc", "accessory"), "accessory", "panties_in_hand", [[156, 204, 249, 255]]) -default choq_accessory_protectors = DollCloth("cho", ("misc", "accessory"), "accessory1", "protectors1", [[0, 0, 0, 255]], zorder=27) -default choq_accessory_protectors2 = DollCloth("cho", ("misc", "accessory"), "accessory1", "protectors2", [[0, 0, 0, 255]], zorder=27) +default choq_accessory_protectors = DollCloth("cho", ("misc", "accessory"), "accessory", "protectors1", [[0, 0, 0, 255]], zorder=27) +default choq_accessory_protectors2 = DollCloth("cho", ("misc", "accessory"), "accessory", "protectors2", [[0, 0, 0, 255]], zorder=27) # Add choq_accessory_protectors2 once drawn for normal pose default cho_outfit_quidditch = DollOutfit([cho_hair_ponytail1, choq_cloth_topsweater1, choq_cloth_pantslong2, choq_cloth_robequidditch1, choq_bra_sports1, choq_panties_sport1], hidden=True) @@ -295,7 +250,7 @@ default cho_pubes_beaver = DollCloth("cho", ("lower undergarment", "pubes"), "pu default cho_pubes_stuble = DollCloth("cho", ("lower undergarment", "pubes"), "pubes", "stuble", [[52, 59, 80, 255]], unlocked=True) default cho_pubes_unshaved = DollCloth("cho", ("lower undergarment", "pubes"), "pubes", "unshaved", [[52, 59, 80, 255]], unlocked=True) -default cho_makeup4_lipstick = DollLipstick("cho", ("head", "makeup"), "makeup4", "lipstick", [[255, 70, 70, 255]], unlocked=True) +default cho_makeup_lipstick = DollMakeup("cho", ("head", "makeup"), "makeup", "lipstick", [[255, 70, 70, 255]], unlocked=True, tracking="mouth") ### Event Specific ### @@ -311,7 +266,7 @@ default cho_outfit_gryf = DollOutfit([cho_hair_ponytail1, cho_top_school1_gryf, default cho_outfit_huff = DollOutfit([cho_hair_ponytail1, cho_top_school1_huff, cho_bottom_school1, cho_bra_basic1, cho_panties_basic1, cho_stockings_huff], hidden=True) default smurfette_hair = DollCloth("cho", ("head", "hair"), "hair", "smurfette", [[255, 221, 71, 255],[255, 237, 158, 255]], level=4) -default smurfette_hat = DollCloth("cho", ("head", "headgear"), "headgear", "smurfette", [[251, 251, 251, 255]], level=4) -default smurfette_top = DollCloth("cho", ("upper body", "dresses"), "top", "smurfette", [[251, 251, 251, 255],[251, 251, 251, 255]], level=4, blacklist=["bottom"], armfix=True) +default smurfette_hat = DollClothDynamic("cho", ("head", "headgear"), "headgear", "smurfette", [[251, 251, 251, 255]], level=4, tracking="?hair") +default smurfette_top = DollCloth("cho", ("upper body", "dresses"), "top", "smurfette", [[251, 251, 251, 255],[251, 251, 251, 255]], level=4, blacklist=["bottom"]) default cho_outfit_smurfette = DollOutfit([smurfette_hair, smurfette_hat, smurfette_top], price=0, name="Smurfette Costume", desc="I'm coming for you, Gargamel.{heart}") diff --git a/game/scripts/characters/hermione/wardrobe.rpy b/game/scripts/characters/hermione/wardrobe.rpy index 0b21acf0..65ccad03 100644 --- a/game/scripts/characters/hermione/wardrobe.rpy +++ b/game/scripts/characters/hermione/wardrobe.rpy @@ -2,54 +2,7 @@ ## Character ## ############### -default hermione = Doll(name="hermione", - clothes={"headgear": [None, 15, True], - "hair": [None, 4, True], - "glasses": [None, 12, True], - "earrings": [None, 14, True], - "neckwear": [None, 16, True], - "robe": [None, 22, True], - "gloves": [None, 14, True], - "top": [None, 15, True], - "bra": [None, 9, True], - "bottom": [None, 8, True], - "garterbelt": [None, 7, True], - "panties": [None, 6, True], - "stockings": [None, 5, True], - "buttplug": [None, -1, True], - "pubes": [None, 3, True], - "tattoo0": [None, 1, True], - "tattoo1": [None, 1, True], - "tattoo2": [None, 1, True], - "tattoo3": [None, 1, True], - "tattoo4": [None, 1, True], - "piercing0": [None, 2, True], - "piercing1": [None, 2, True], - "piercing2": [None, 2, True], - "piercing3": [None, 2, True], - "piercing4": [None, 2, True], - "accessory0": [None, 12, True], - "accessory1": [None, 12, True], - "accessory2": [None, 12, True], - "accessory3": [None, 12, True], - "accessory4": [None, 12, True], - "makeup0": [None, 3, True], - "makeup1": [None, 3, True], - "makeup2": [None, 3, True], - "makeup3": [None, 3, True], - "makeup4": [None, 3, True]}, - face={"tears": [None, 12, True], - "cheeks": [None, 7, True], - "eyebrows": ["base", 11, True], - "eyes": ["base", 8, True], - "pupils": ["mid", 9, True], - "mouth": ["base", 13, True]}, - body={"armleft": ["down", 3], - "armright":["down", -1], - "base": ["front", 0], - "breasts": ["normal", 2], - "backside": [None, 1]} - ) +default hermione = Doll(name="hermione") ############### ## Hair ## @@ -80,9 +33,9 @@ default her_robe_school_2 = DollCloth("hermione", ("upper body", "robes"), "robe default her_robe_school_3 = DollCloth("hermione", ("upper body", "robes"), "robe", "robe_school_3", [[96, 96, 96, 255], [206, 206, 209, 255], [167, 77, 42, 255]], unlocked=True, level=10) default her_robe_school_4 = DollCloth("hermione", ("upper body", "robes"), "robe", "robe_school_4", [[96, 96, 96, 255], [206, 206, 209, 255], [167, 77, 42, 255]], unlocked=True, level=13) -default her_accessory_house_emblem = DollCloth("hermione", ("misc", "accessory"), "accessory0", "house_emblem", [[167, 77, 42, 255], [237, 179, 14, 255]], zorder=16, unlocked=True) -default her_accessory4_reading_glasses = DollCloth("hermione", ("head", "glasses"), "glasses", "reading_glasses", [[240, 240, 241, 255]], unlocked=True) -default her_accessory4_vintage_glasses = DollCloth("hermione", ("head", "glasses"), "glasses", "vintage_glasses", [[255, 255, 255, 50], [36, 36, 36, 255], [116, 116, 116, 255]], unlocked=True, zorder=3) +default her_accessory_house_emblem = DollCloth("hermione", ("misc", "accessory"), "accessory", "house_emblem", [[167, 77, 42, 255], [237, 179, 14, 255]], zorder=16, unlocked=True) +default her_accessory_reading_glasses = DollCloth("hermione", ("head", "glasses"), "glasses", "reading_glasses", [[240, 240, 241, 255]], unlocked=True) +default her_accessory_vintage_glasses = DollCloth("hermione", ("head", "glasses"), "glasses", "vintage_glasses", [[255, 255, 255, 50], [36, 36, 36, 255], [116, 116, 116, 255]], unlocked=True, zorder=3) default her_outfit_default = DollOutfit([her_hair_base, her_top_school1, her_bottom_school1, her_panties_base1, her_bra_base1, her_stockings_base1], unlocked=True) default her_outfit_default_no_vest = DollOutfit([her_hair_base, her_top_school3, her_bottom_school1, her_panties_base1, her_bra_base1, her_stockings_base1], hidden=True) @@ -120,7 +73,7 @@ default her_outfit_bikini3 = DollOutfit([her_hair_base, her_panties_bikini3, her default her_top_maid1 = DollCloth("hermione", ("upper body", "dresses"), "top", "maid_dress_1", [[40, 51, 61, 255], [236, 243, 244, 255], [53, 63, 84, 255]], level=4) default her_stockings_maid1 = DollCloth("hermione", ("legwear", "socks"), "stockings", "maid_stockings_1", [[53, 33, 30, 255]], level=4) -default her_hat_maid1 = DollCloth("hermione", ("head", "headgear"), "headgear", "maid_hat_1", [[236, 243, 244, 255]], level=4) +default her_hat_maid1 = DollClothDynamic("hermione", ("head", "headgear"), "headgear", "maid_hat_1", [[236, 243, 244, 255]], level=4, tracking="?hair") default her_neckwear_maid1 = DollCloth("hermione", ("head", "neckwear"), "neckwear", "maid_choker_1", [[40, 51, 61, 255], [236, 243, 244, 255]], level=4) default her_neckwear_maid2 = DollCloth("hermione", ("head", "neckwear"), "neckwear", "maid_choker_2", [[236, 243, 244, 255]], level=4) default her_gloves_maid1 = DollCloth("hermione", ("upper body", "gloves"), "gloves", "maid_gloves_1", [[40, 51, 61, 255], [236, 243, 244, 255], [53, 63, 84, 255]], level=4) @@ -131,8 +84,8 @@ default her_outfit_maid = DollOutfit([her_hair_base, her_top_maid1, her_stocking ## Poker Outfit ## ################## -default her_hat_poker1 = DollCloth("hermione", ("head", "headgear"), "headgear", "poker_hat_1", [[26, 26, 35, 255], [232, 232, 232, 255], [153, 22, 10, 255]], level=4) -default her_hat_poker2 = DollCloth("hermione", ("head", "headgear"), "headgear", "poker_hat_2", [[26, 26, 35, 255], [232, 232, 232, 255], [153, 22, 10, 255]], level=4) +default her_hat_poker1 = DollClothDynamic("hermione", ("head", "headgear"), "headgear", "poker_hat_1", [[26, 26, 35, 255], [232, 232, 232, 255], [153, 22, 10, 255]], level=4, tracking="?hair") +default her_hat_poker2 = DollClothDynamic("hermione", ("head", "headgear"), "headgear", "poker_hat_2", [[26, 26, 35, 255], [232, 232, 232, 255], [153, 22, 10, 255]], level=4, tracking="?hair") default her_neckwear_poker1 = DollCloth("hermione", ("head", "neckwear"), "neckwear", "poker_bowtie_1", [[232, 232, 232, 255], [153, 22, 10, 255], [255, 179, 3, 255]], level=4) default her_stockings_poker1 = DollCloth("hermione", ("legwear", "stockings"), "stockings", "poker_stockings_1", [[26, 26, 35, 255], [153, 22, 10, 255]], level=13) default her_stockings_poker2 = DollCloth("hermione", ("legwear", "stockings"), "stockings", "poker_stockings_2", [[26, 26, 35, 255], [153, 22, 10, 255]], level=13) @@ -140,10 +93,10 @@ default her_panties_poker1 = DollCloth("hermione", ("lower undergarment", "panti default her_bra_poker1 = DollCloth("hermione", ("upper undergarment", "other"), "bra", "poker_bra_1", [[26, 26, 35, 255], [232, 232, 232, 255], [153, 22, 10, 255], [255, 179, 3, 255]], blacklist=["panties", "top", "bottom"], level=19) default her_gloves_poker1 = DollCloth("hermione", ("upper body", "gloves"), "gloves", "poker_gloves_1", [[232, 232, 232, 255], [255, 179, 3, 255]], level=4) default her_earring_poker1 = DollCloth("hermione", ("head", "earrings"), "earrings", "poker_earring_1", [[255, 179, 3, 255]], level=4) -default her_piercing2_poker1 = DollCloth("hermione", ("piercings & tattoos", "piercings"), "piercing2", "poker_belly_1", [[26, 26, 35, 255], [232, 232, 232, 255], [153, 22, 10, 255], [255, 179, 3, 255]]) +default her_piercing_poker1 = DollCloth("hermione", ("piercings & tattoos", "piercings"), "piercing", "poker_belly_1", [[26, 26, 35, 255], [232, 232, 232, 255], [153, 22, 10, 255], [255, 179, 3, 255]]) # Unlockable with Tokens only -default her_outfit_poker = DollOutfit([her_hair_base, her_hat_poker1, her_hat_poker2, her_neckwear_poker1, her_stockings_poker1, her_stockings_poker2, her_panties_poker1, her_bra_poker1, her_gloves_poker1, her_earring_poker1, her_piercing2_poker1], name="Poke-her-nips Costume", desc="An outfit that doesn't leave much for the mind's desire, perfect for a lewd card loving girl.") +default her_outfit_poker = DollOutfit([her_hair_base, her_hat_poker1, her_hat_poker2, her_neckwear_poker1, her_stockings_poker1, her_stockings_poker2, her_panties_poker1, her_bra_poker1, her_gloves_poker1, her_earring_poker1, her_piercing_poker1], name="Poke-her-nips Costume", desc="An outfit that doesn't leave much for the mind's desire, perfect for a lewd card loving girl.") ################## ## Bunny Outfit ## @@ -152,24 +105,24 @@ default her_outfit_poker = DollOutfit([her_hair_base, her_hat_poker1, her_hat_po default her_top_bunny1 = DollCloth("hermione", ("upper body", "one-piece suits"), "top", "bunny_top_1", [[48, 48, 48, 255]], blacklist=["panties", "bra"], zorder=7, level=19) default her_top_bunny2 = DollCloth("hermione", ("upper body", "one-piece suits"), "top", "bunny_top_2", [[0, 0, 0, 255]], blacklist=["panties", "bra"], zorder=7, level=19) default her_stockings_bunny1 = DollCloth("hermione", ("legwear", "pantyhose"), "stockings", "bunny_stockings_1", [[81, 81, 81, 255]], level=19) -default her_tattoo3_bunny1 = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo3", "bunny_tattoo1", [[0, 0, 1, 255]]) -default her_hat_bunny1 = DollCloth("hermione", ("head", "headgear"), "headgear", "bunny_hat_1", [[48, 48, 48, 255], [232, 232, 232, 255]], level=13) -default her_hat_bunny2 = DollCloth("hermione", ("head", "headgear"), "headgear", "bunny_hat_2", [[183, 168, 115, 255], [219, 161, 140, 255], [253, 253, 253, 255]], level=13) +default her_tattoo_bunny1 = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo", "bunny_tattoo", [[0, 0, 1, 255]]) +default her_hat_bunny1 = DollClothDynamic("hermione", ("head", "headgear"), "headgear", "bunny_hat_1", [[48, 48, 48, 255], [232, 232, 232, 255]], level=13, tracking="?hair") +default her_hat_bunny2 = DollClothDynamic("hermione", ("head", "headgear"), "headgear", "bunny_hat_2", [[183, 168, 115, 255], [219, 161, 140, 255], [253, 253, 253, 255]], level=13, tracking="?hair") default her_gloves_bunny1 = DollCloth("hermione", ("upper body", "gloves"), "gloves", "bunny_gloves_1", [[232, 232, 232, 255]], level=4) default her_neckwear_bunny1 = DollCloth("hermione", ("head", "neckwear"), "neckwear", "bunny_bowtie_1", [[232, 232, 232, 255], [48, 48, 48, 255]], level=4) -default her_outfit_bunny = DollOutfit([her_hair_base, her_top_bunny2, her_stockings_bunny1, her_tattoo3_bunny1, her_hat_bunny2, her_gloves_bunny1, her_neckwear_bunny1], addons=[her_top_bunny1, her_hat_bunny1], price=350, name="Sexy Bunny Costume", desc="What's up doc?") +default her_outfit_bunny = DollOutfit([her_hair_base, her_top_bunny2, her_stockings_bunny1, her_tattoo_bunny1, her_hat_bunny2, her_gloves_bunny1, her_neckwear_bunny1], addons=[her_top_bunny1, her_hat_bunny1], price=350, name="Sexy Bunny Costume", desc="What's up doc?") ###################### ## Reindeer Costume ## ###################### -default her_hat_antlers2 = DollCloth("hermione", ("head", "headgear"), "headgear", "antlers_2", [[153, 76, 48, 255], [255, 255, 255, 255], [198, 159, 101, 255]], level=12) +default her_hat_antlers2 = DollClothDynamic("hermione", ("head", "headgear"), "headgear", "antlers_2", [[153, 76, 48, 255], [255, 255, 255, 255], [198, 159, 101, 255]], level=12, tracking="?hair") default her_neckwear_studded_choker = DollCloth("hermione", ("head", "neckwear"), "neckwear", "studded_choker", [[43, 42, 50, 255], [210, 207, 231, 255]], level=16) default her_top_bunny3 = DollCloth("hermione", ("upper body", "one-piece suits"), "top", "bunny_top_3", [[138, 75, 4, 255]], blacklist=["panties", "bra"], zorder=7, level=19) -default her_accessory3_mistletoe = DollCloth("hermione", ("misc", "accessory"), "accessory3", "mistletoe", [[200, 32, 0, 255]], zorder=16, level=7) +default her_accessory_mistletoe = DollCloth("hermione", ("misc", "accessory"), "accessory", "mistletoe", [[200, 32, 0, 255]], zorder=16, level=7) -default her_outfit_reindeer = DollOutfit([her_hair_base, her_top_bunny3, her_accessory3_mistletoe, her_stockings_bunny1, her_neckwear_studded_choker, her_hat_antlers2]) +default her_outfit_reindeer = DollOutfit([her_hair_base, her_top_bunny3, her_accessory_mistletoe, her_stockings_bunny1, her_neckwear_studded_choker, her_hat_antlers2]) ################ ## Ball Dress ## @@ -179,7 +132,7 @@ default her_hair_updo = DollCloth("hermione", ("head", "hair"), "hair", "updo", default her_top_ball1 = DollCloth("hermione", ("upper body", "dresses"), "top", "ball_dress_1", [[255, 140, 174, 255], [242, 218, 255, 255]], blacklist=["bottom"]) default her_earring_pearls1 = DollCloth("hermione", ("head", "earrings"), "earrings", "pearl_1", [[233, 166, 253, 255]], level=4) default her_neckwear_pearls1 = DollCloth("hermione", ("head", "neckwear"), "neckwear", "ball_pearls_1", [[233, 166, 253, 255]], level=4) -default her_accessory_ball_sash1 = DollCloth("hermione", ("misc", "accessory"), "accessory4", "ball_sash", [[247, 222, 231, 255], [161, 82, 159, 255]], zorder=16, level=4) +default her_accessory_ball_sash1 = DollCloth("hermione", ("misc", "accessory"), "accessory", "ball_sash", [[247, 222, 231, 255], [161, 82, 159, 255]], zorder=16, level=4) default her_outfit_ball = DollOutfit([her_hair_updo, her_neckwear_pearls1, her_top_ball1, her_earring_pearls1, her_accessory_ball_sash1, her_panties_base1], price=0, name="Classy Ball Dress", desc="A fancy dress for a fancy witch.") @@ -190,11 +143,11 @@ default her_outfit_ball = DollOutfit([her_hair_updo, her_neckwear_pearls1, her_t default her_top_yen1 = DollCloth("hermione", ("upper body", "sweaters"), "top", "yen_top", [[9, 32, 47, 255]], level=10) default her_bottom_yen_skirt1 = DollCloth("hermione", ("lower body", "skirts"), "bottom", "yen_skirt", [[26, 26, 26, 255]], level=4) default her_stockings_yen1 = DollCloth("hermione", ("legwear", "stockings"), "stockings", "yen_stockings", [[76, 76, 76, 255]], level=10) -default her_accessory_yen_sash1 = DollCloth("hermione", ("misc", "accessory"), "accessory4", "yen_sash", [[25, 25, 25, 255], [51, 51, 51, 255]], zorder=9, level=10) -default her_accessory_yen_belt1 = DollCloth("hermione", ("misc", "accessory"), "accessory3", "yen_belt", [[52, 37, 31, 255], [146, 142, 137, 255]], zorder=10, level=4) -default her_accessory_yen_feathers1 = DollCloth("hermione", ("misc", "accessory"), "accessory2", "yen_feathers", [[42, 190, 199, 255]], zorder=16, level=4) -default her_accessory_yen_scarf1 = DollCloth("hermione", ("misc", "accessory"), "accessory1", "yen_scarf", [[9, 32, 47, 255]], zorder=17, level=4) -default her_accessory_yen_corset1 = DollCloth("hermione", ("misc", "accessory"), "accessory0", "yen_corset", [[37, 27, 27, 255], [19, 14, 11, 255]], zorder=16, level=10) +default her_accessory_yen_sash1 = DollCloth("hermione", ("misc", "accessory"), "accessory", "yen_sash", [[25, 25, 25, 255], [51, 51, 51, 255]], zorder=9, level=10) +default her_accessory_yen_belt1 = DollCloth("hermione", ("misc", "accessory"), "accessory", "yen_belt", [[52, 37, 31, 255], [146, 142, 137, 255]], zorder=10, level=4) +default her_accessory_yen_feathers1 = DollCloth("hermione", ("misc", "accessory"), "accessory", "yen_feathers", [[42, 190, 199, 255]], zorder=16, level=4) +default her_accessory_yen_scarf1 = DollCloth("hermione", ("misc", "accessory"), "accessory", "yen_scarf", [[9, 32, 47, 255]], zorder=17, level=4) +default her_accessory_yen_corset1 = DollCloth("hermione", ("misc", "accessory"), "accessory", "yen_corset", [[37, 27, 27, 255], [19, 14, 11, 255]], zorder=16, level=10) default her_neckwear_yen_choker1 = DollCloth("hermione", ("head", "neckwear"), "neckwear", "yen_choker", [[30, 29, 28, 255]], level=4) default her_gloves_yen1 = DollCloth("hermione", ("upper body", "gloves"), "gloves", "yen_gloves", [[52, 37, 31, 255]], zorder=16, level=4) @@ -280,8 +233,8 @@ default her_outfit_teddy = DollOutfit([her_hair_base, her_top_teddy], price=350, ################# default her_top_tifa = DollCloth("hermione", ("upper body", "shirts"), "top", "tifa_top", [[232, 232, 232, 255]], level=10) -default her_accessory_tifa_belt = DollCloth("hermione", ("misc", "accessory"), "accessory3", "tifa_belt", [[50, 50, 50, 255], [154, 154, 154, 255]], level=4) -default her_accessory_tifa_suspenders = DollCloth("hermione", ("misc", "accessory"), "accessory4", "tifa_suspenders", [[86, 61, 67, 255], [154, 154, 154, 255]], zorder=16, level=4) +default her_accessory_tifa_belt = DollCloth("hermione", ("misc", "accessory"), "accessory", "tifa_belt", [[50, 50, 50, 255], [154, 154, 154, 255]], level=4) +default her_accessory_tifa_suspenders = DollCloth("hermione", ("misc", "accessory"), "accessory", "tifa_suspenders", [[86, 61, 67, 255], [154, 154, 154, 255]], zorder=16, level=4) default her_gloves_tifa = DollCloth("hermione", ("upper body", "gloves"), "gloves", "tifa_gloves", [[72, 63, 70, 255], [228, 107, 98, 255], [125, 120, 127, 255], [189, 167, 158, 255]], level=4) default her_bottom_tifa = DollCloth("hermione", ("lower body", "skirts"), "bottom", "tifa_skirt", [[72, 63, 70, 255]], level=10) @@ -292,7 +245,7 @@ default her_outfit_tifa = DollOutfit([her_hair_base, her_top_tifa, her_accessory ####################### default her_top_msmarv = DollCloth("hermione", ("upper body", "one-piece suits"), "top", "msmarv_suit", [[64, 70, 99, 255], [123, 136, 181, 255], [255, 236, 134, 255]], zorder=7, blacklist=["panties", "bra"], level=10) -default her_accessory_msmarv_ribbon = DollCloth("hermione", ("misc", "accessory"), "accessory3", "msmarv_ribbon", [[206, 41, 22, 255]], level=4) +default her_accessory_msmarv_ribbon = DollCloth("hermione", ("misc", "accessory"), "accessory", "msmarv_ribbon", [[206, 41, 22, 255]], level=4) default her_gloves_msmarv = DollCloth("hermione", ("upper body", "gloves"), "gloves", "msmarv_gloves", [[64, 70, 99, 255], [123, 136, 181, 255]], level=4) default her_stockings_msmarv = DollCloth("hermione", ("legwear", "stockings"), "stockings", "msmarv_stockings", [[64, 70, 99, 255], [123, 136, 181, 255]], level=10) @@ -319,8 +272,8 @@ default her_outfit_hslut = DollOutfit([her_hair_base, her_top_hslut, her_gloves_ default her_top_croft = DollCloth("hermione", ("upper body", "shirts"), "top", "croft_top", [[163, 201, 152, 255]], level=10) default her_bottom_croft = DollCloth("hermione", ("lower body", "shorts"), "bottom", "croft_shorts", [[147, 114, 61, 255], [137, 136, 120, 255], [252, 192, 4, 255]],level=10) -default her_accessory_croft_belt = DollCloth("hermione", ("misc", "accessory"), "accessory3", "croft_belt", [[111, 86, 66, 255], [116, 123, 114, 255], [252, 192, 4, 255]], level=4) -default her_accessory_croft_suspenders = DollCloth("hermione", ("misc", "accessory"), "accessory4", "croft_suspenders", [[111, 86, 66, 255], [116, 123, 114, 255]], zorder=16, level=4) +default her_accessory_croft_belt = DollCloth("hermione", ("misc", "accessory"), "accessory", "croft_belt", [[111, 86, 66, 255], [116, 123, 114, 255], [252, 192, 4, 255]], level=4) +default her_accessory_croft_suspenders = DollCloth("hermione", ("misc", "accessory"), "accessory", "croft_suspenders", [[111, 86, 66, 255], [116, 123, 114, 255]], zorder=16, level=4) default her_outfit_croft = DollOutfit([her_hair_base, her_top_croft, her_bottom_croft, her_accessory_croft_belt, her_accessory_croft_suspenders, her_panties_base1], price=400, name="Lora Craft Costume", desc="An outfit perfectly suited for exploring deep, dark and moist caverns.\n{size=-4}Disclaimer: This outfit has no association with a character known as Lara Croft. Totally.{/size}") @@ -420,8 +373,8 @@ default her_outfit_cheerleader_2 = DollOutfit([her_hair_base, her_top_cheerleade ## Xmas Stuff ### /%\ ___&__ ### Ho Ho Ho ## ################# /% \ |=I~I=| ################# -default her_hat_antlers = DollCloth("hermione", ("head", "headgear"), "headgear", "antlers", [[234, 187, 170, 255]], level=8) -default her_hat_elf = DollCloth("hermione", ("head", "headgear"), "headgear", "elf", [[229, 0, 10, 255], [255, 239, 248, 255]], level=8) +default her_hat_antlers = DollClothDynamic("hermione", ("head", "headgear"), "headgear", "antlers", [[234, 187, 170, 255]], level=8, tracking="?hair") +default her_hat_elf = DollClothDynamic("hermione", ("head", "headgear"), "headgear", "elf", [[229, 0, 10, 255], [255, 239, 248, 255]], level=8, tracking="?hair") default her_neckwear_choker1 = DollCloth("hermione", ("head", "neckwear"), "neckwear", "choker_1", [[229, 0, 10, 255]], level=4) default her_neckwear_bell1 = DollCloth("hermione", ("head", "neckwear"), "neckwear", "bell_1", [[229, 0, 10, 255], [244, 181, 82, 255]], zorder=16, level=10) @@ -443,7 +396,7 @@ default her_outfit_xmas = DollOutfit([her_hair_base, her_hat_antlers, her_neck default her_robe_wrestling = DollCloth("hermione", ("upper body", "robes"), "robe", "wrestling_robe", [[166, 63, 29, 255], [255, 253, 237, 255]], level=3) default her_bra_sports = DollCloth("hermione", ("upper undergarment", "bras"), "bra", "sports_bra", [[66, 71, 100, 255], [242, 244, 255, 255]], level=3) default her_panties_sports = DollCloth("hermione", ("lower undergarment", "panties"), "panties", "sports_panties", [[66, 71, 100, 255], [242, 244, 255, 255]], level=3) -default her_accessory_belt_wrestling = DollCloth("hermione", ("misc", "accessory"), "accessory0", "wrestling_belt", [[60, 71, 91, 255], [240, 251, 117, 255]], zorder=10, level=3) +default her_accessory_belt_wrestling = DollCloth("hermione", ("misc", "accessory"), "accessory", "wrestling_belt", [[60, 71, 91, 255], [240, 251, 117, 255]], zorder=10, level=3) default her_outfit_wrestling = DollOutfit([her_hair_base, her_robe_wrestling, her_bra_sports, her_panties_sports, her_accessory_belt_wrestling]) @@ -451,7 +404,7 @@ default her_outfit_wrestling = DollOutfit([her_hair_base, her_robe_wrestling, he ## MISC ## ########## -default her_accessory_gift_wrap = DollCloth("hermione", ("misc", "accessory"), "accessory3", "leg_wrap", [[167, 77, 42, 255], [237, 179, 14, 255]], zorder=7, unlocked=True, level=5) +default her_accessory_gift_wrap = DollCloth("hermione", ("misc", "accessory"), "accessory", "leg_wrap", [[167, 77, 42, 255], [237, 179, 14, 255]], zorder=7, unlocked=True, level=5) default her_bra_bandaids = DollCloth("hermione", ("upper undergarment", "other"), "bra", "bandaids", [[233, 187, 149, 255]], unlocked=True, level=19) ############# @@ -459,46 +412,46 @@ default her_bra_bandaids = DollCloth("hermione", ("upper undergarment", "other") ############# # Pelvis/crotch (Slot 0) -default her_tattoo0_10g = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo0", "10g_tattoo", [[0, 0, 0, 255]], unlocked=True) -default her_tattoo0_cockhole = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo0", "cockhole_tattoo", [[0, 0, 0, 255]], unlocked=True) -default her_tattoo0_cumhere = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo0", "cumhere_tattoo2", [[0, 0, 0, 255]], unlocked=True) -default her_tattoo0_cumslut = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo0", "cumslut_tattoo", [[0, 0, 0, 255]], unlocked=True) -default her_tattoo0_cunt = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo0", "cunt_tattoo", [[0, 0, 0, 255]], unlocked=True) -default her_tattoo0_deatheater = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo0", "deatheater_tattoo", [[0, 0, 0, 255]], unlocked=True) -default her_tattoo0_deposit = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo0", "deposit_tattoo", [[0, 0, 0, 255]], unlocked=True) -default her_tattoo0_fuckme = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo0", "fuckme_tattoo", [[0, 0, 0, 255]], unlocked=True) -default her_tattoo0_mudblood = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo0", "mudblood_tattoo", [[0, 0, 0, 255]], unlocked=True) -default her_tattoo0_nocondom = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo0", "nocondom_tattoo", [[0, 0, 0, 255]], unlocked=True) -default her_tattoo0_punkblood = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo0", "punkblood_tattoo", [[192, 84, 58, 255], [68, 188, 64, 255]], unlocked=True) -default her_tattoo0_whore = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo0", "whore_tattoo", [[0, 0, 0, 255]], unlocked=True) -default her_tattoo0_womb = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo0", "womb_tattoo", [[0, 0, 0, 255]], unlocked=True) +default her_tattoo_10g = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo", "10g_tattoo", [[0, 0, 0, 255]], unlocked=True) +default her_tattoo_cockhole = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo", "cockhole_tattoo", [[0, 0, 0, 255]], unlocked=True) +default her_tattoo_cumhere = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo", "cumhere_tattoo", [[0, 0, 0, 255]], unlocked=True) +default her_tattoo_cumslut = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo", "cumslut_tattoo", [[0, 0, 0, 255]], unlocked=True) +default her_tattoo_cunt = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo", "cunt_tattoo", [[0, 0, 0, 255]], unlocked=True) +default her_tattoo_deatheater = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo", "deatheater_tattoo", [[0, 0, 0, 255]], unlocked=True) +default her_tattoo_deposit = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo", "deposit_tattoo", [[0, 0, 0, 255]], unlocked=True) +default her_tattoo_fuckme = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo", "fuckme_tattoo", [[0, 0, 0, 255]], unlocked=True) +default her_tattoo_mudblood = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo", "mudblood_tattoo", [[0, 0, 0, 255]], unlocked=True) +default her_tattoo_nocondom = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo", "nocondom_tattoo", [[0, 0, 0, 255]], unlocked=True) +default her_tattoo_punkblood = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo", "punkblood_tattoo", [[192, 84, 58, 255], [68, 188, 64, 255]], unlocked=True) +default her_tattoo_whore = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo", "whore_tattoo", [[0, 0, 0, 255]], unlocked=True) +default her_tattoo_womb = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo", "womb_tattoo", [[0, 0, 0, 255]], unlocked=True) # Breasts/Nipples (Slot 1) -default her_tattoo1_twist = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo1", "twist_tattoo", [[0, 0, 0, 255]], unlocked=True) +default her_tattoo_twist = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo", "twist_tattoo", [[0, 0, 0, 255]], unlocked=True) # Torso/chest (Slot 2) -default her_tattoo2_cumhere = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo2", "cumhere_tattoo1", [[0, 0, 0, 255]], unlocked=True) +default her_tattoo_cumhere2 = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo", "cumhere_tattoo", [[0, 0, 0, 255]], unlocked=True) # Legs/Thighs (Slot 3) -default her_tattoo3_lockhart = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo3", "lockhart_tattoo", [[70, 70, 70, 255]]) -default her_tattoo3_free = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo3", "free_tattoo", [[0, 0, 0, 255]], unlocked=True) +default her_tattoo_lockhart = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo", "lockhart_tattoo", [[70, 70, 70, 255]]) +default her_tattoo_free = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo", "free_tattoo", [[0, 0, 0, 255]], unlocked=True) ############ ## Makeup ## ############ # Face (Slot 0) -default her_makeup0_freckles = DollCloth("hermione", ("head", "makeup"), "makeup0", "freckles1", [[185, 124, 81, 255]], unlocked=True) -default her_makeup0_freckles_nonose = DollCloth("hermione", ("head", "makeup"), "makeup0", "freckles1_nonose", [[185, 124, 81, 255]], unlocked=True) +default her_makeup_freckles = DollCloth("hermione", ("head", "makeup"), "makeup", "freckles1", [[185, 124, 81, 255]], unlocked=True) +default her_makeup_freckles_nonose = DollCloth("hermione", ("head", "makeup"), "makeup", "freckles1_nonose", [[185, 124, 81, 255]], unlocked=True) # Breasts -default her_makeup1_freckles = DollCloth("hermione", ("head", "makeup"), "makeup1", "freckles2", [[185, 124, 81, 255]], unlocked=True) +default her_makeup_freckles2 = DollCloth("hermione", ("head", "makeup"), "makeup", "freckles2", [[185, 124, 81, 255]], unlocked=True) # Torso -default her_makeup2_freckles = DollCloth("hermione", ("head", "makeup"), "makeup2", "freckles3", [[185, 124, 81, 255]], unlocked=True) +default her_makeup_freckles3 = DollCloth("hermione", ("head", "makeup"), "makeup", "freckles3", [[185, 124, 81, 255]], unlocked=True) -# Lipstick (DollLipstick) -default her_makeup4_lipstick = DollLipstick("hermione", ("head", "makeup"), "makeup4", "lipstick", [[255, 70, 70, 255]], unlocked=True) +# Lipstick +default her_makeup_lipstick = DollMakeup("hermione", ("head", "makeup"), "makeup", "lipstick", [[255, 70, 70, 255]], unlocked=True, tracking="mouth") ################ ## Pubic Hair ## @@ -521,11 +474,11 @@ default her_outfit_s_rain = DollOutfit([her_hair_base, her_robe_school_1, her_to ## Cat-girl potion outfit ## ############################ -default her_cat_ears = DollCloth("hermione", ("head", "headgear"), "headgear", "cat_ears", [[209, 123, 67, 255], [232, 232, 232, 255]]) +default her_cat_ears = DollClothDynamic("hermione", ("head", "headgear"), "headgear", "cat_ears", [[209, 123, 67, 255], [232, 232, 232, 255]], tracking="?hair") default her_cat_legs = DollCloth("hermione", ("legwear", "stockings"), "stockings", "cat_legs",[[209, 123, 67, 255]]) default her_cat_arms = DollCloth("hermione", ("upper body", "gloves"), "gloves", "cat_arms", [[209, 123, 67, 255], [214, 122, 122, 255], [37, 37, 37, 255]]) -default her_cat_tail = DollCloth("hermione", ("misc", "accessory"), "accessory0", "cat_tail", [[209, 123, 67, 255]], zorder=-1) -default her_cat_muzzle = DollCloth("hermione", ("head", "makeup"), "makeup0", "cat_muzzle", [[214, 122, 122, 255]]) +default her_cat_tail = DollCloth("hermione", ("misc", "accessory"), "accessory", "cat_tail", [[209, 123, 67, 255]], zorder=-1) +default her_cat_muzzle = DollCloth("hermione", ("head", "makeup"), "makeup", "cat_muzzle", [[214, 122, 122, 255]]) default her_outfit_cat1 = DollOutfit([her_hair_base, her_cat_ears, her_cat_tail], hidden=True) default her_outfit_cat2 = DollOutfit([her_hair_base, her_cat_ears, her_cat_tail, her_cat_legs, her_cat_arms, her_pubes_beaver], hidden=True) @@ -553,32 +506,32 @@ default her_buttplug_large1 = DollCloth("hermione", ("misc", "accessory"), "butt ## Piercings ## ############### -default her_piercing0_clit_stud = DollCloth("hermione", ("piercings & tattoos", "piercings"), "piercing0", "clit_stud", [[161, 159, 159, 255]], unlocked=True) -default her_piercing1_nipple_stud = DollCloth("hermione", ("piercings & tattoos", "piercings"), "piercing1", "nipple_stud", [[161, 159, 159, 255]], unlocked=True) -default her_piercing1_nipple_rings = DollCloth("hermione", ("piercings & tattoos", "piercings"), "piercing1", "nipple_rings", [[161, 159, 159, 255]], unlocked=True) -default her_piercing1_nipple_rings2 = DollCloth("hermione", ("piercings & tattoos", "piercings"), "piercing1", "nipple_rings2", [[161, 159, 159, 255]], unlocked=True) -default her_piercing1_nipple_rings3 = DollCloth("hermione", ("piercings & tattoos", "piercings"), "piercing1", "nipple_rings3", [[161, 159, 159, 255]], unlocked=True) -default her_piercing1_nipple_bells = DollCloth("hermione", ("piercings & tattoos", "piercings"), "piercing1", "nipple_bells", [[244, 181, 82, 255]]) +default her_piercing_clit_stud = DollCloth("hermione", ("piercings & tattoos", "piercings"), "piercing", "clit_stud", [[161, 159, 159, 255]], unlocked=True) +default her_piercing_nipple_stud = DollCloth("hermione", ("piercings & tattoos", "piercings"), "piercing", "nipple_stud", [[161, 159, 159, 255]], unlocked=True) +default her_piercing_nipple_rings = DollCloth("hermione", ("piercings & tattoos", "piercings"), "piercing", "nipple_rings", [[161, 159, 159, 255]], unlocked=True) +default her_piercing_nipple_rings2 = DollCloth("hermione", ("piercings & tattoos", "piercings"), "piercing", "nipple_rings2", [[161, 159, 159, 255]], unlocked=True) +default her_piercing_nipple_rings3 = DollCloth("hermione", ("piercings & tattoos", "piercings"), "piercing", "nipple_rings3", [[161, 159, 159, 255]], unlocked=True) +default her_piercing_nipple_bells = DollCloth("hermione", ("piercings & tattoos", "piercings"), "piercing", "nipple_bells", [[244, 181, 82, 255]]) -default her_piercing2_belly_stud = DollCloth("hermione", ("piercings & tattoos", "piercings"), "piercing2", "belly_stud", [[161, 159, 159, 255]], unlocked=True) -default her_piercing2_belly_heart = DollCloth("hermione", ("piercings & tattoos", "piercings"), "piercing2", "belly_heart", [[161, 159, 159, 255]], unlocked=True) -default her_piercing2_belly_dick = DollCloth("hermione", ("piercings & tattoos", "piercings"), "piercing2", "belly_dick", [[161, 159, 159, 255]], unlocked=True) +default her_piercing_belly_stud = DollCloth("hermione", ("piercings & tattoos", "piercings"), "piercing", "belly_stud", [[161, 159, 159, 255]], unlocked=True) +default her_piercing_belly_heart = DollCloth("hermione", ("piercings & tattoos", "piercings"), "piercing", "belly_heart", [[161, 159, 159, 255]], unlocked=True) +default her_piercing_belly_dick = DollCloth("hermione", ("piercings & tattoos", "piercings"), "piercing", "belly_dick", [[161, 159, 159, 255]], unlocked=True) ############ ## Events ## ############ -default herq_panties_on_head = DollCloth("hermione", ("head", "headgear"), "headgear", "panties_on_head", [[156, 204, 249, 255]]) +default herq_panties_on_head = DollClothDynamic("hermione", ("head", "headgear"), "headgear", "panties_on_head", [[156, 204, 249, 255]], tracking="?hair") default her_panties_base_vibrators = DollCloth("hermione", ("lower undergarment", "panties"), "panties", "basic_panties_vibrators", [[232, 232, 232, 255], [202, 60, 1, 255]]) default her_bra_base_vibrators = DollCloth("hermione", ("upper undergarment", "bras"), "bra", "basic_bra_vibrators", [[232, 232, 232, 255], [202, 60, 1, 255]]) -default her_nipple_vibrators = DollCloth("hermione", ("misc", "accessory"), "accessory0", "nipple_vibrators", [[234, 142, 97, 255], [252, 217, 135, 255], [255, 118, 96, 255]], zorder=1) -default her_clit_vibrators = DollCloth("hermione", ("misc", "accessory"), "accessory1", "clit_vibrators", [[234, 142, 97, 255], [252, 217, 135, 255], [255, 118, 96, 255]], zorder=1) +default her_nipple_vibrators = DollCloth("hermione", ("misc", "accessory"), "accessory", "nipple_vibrators", [[234, 142, 97, 255], [252, 217, 135, 255], [255, 118, 96, 255]], zorder=1) +default her_clit_vibrators = DollCloth("hermione", ("misc", "accessory"), "accessory", "clit_vibrators", [[234, 142, 97, 255], [252, 217, 135, 255], [255, 118, 96, 255]], zorder=1) default her_outfit_vibrators = DollOutfit([her_hair_base, her_panties_base_vibrators, her_bra_base_vibrators, her_nipple_vibrators, her_clit_vibrators], hidden=True) default her_outfit_vibrators_nude = DollOutfit([her_hair_base, her_nipple_vibrators, her_clit_vibrators], hidden=True) -default her_accessory_bb_tie = DollCloth("hermione", ("misc", "accessory"), "accessory4", "bb_tie", [[177, 51, 159, 255], [246, 40, 0, 255], [255, 247, 0, 255]], zorder=10) -default her_tattoo_bb_tattoo = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo3", "bb_tattoo", [[0, 0, 0, 255], [255, 247, 0, 255], [246, 40, 0, 255]]) +default her_accessory_bb_tie = DollCloth("hermione", ("misc", "accessory"), "accessory", "bb_tie", [[177, 51, 159, 255], [246, 40, 0, 255], [255, 247, 0, 255]], zorder=10) +default her_tattoo_bb_tattoo = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo", "bb_tattoo", [[0, 0, 0, 255], [255, 247, 0, 255], [246, 40, 0, 255]]) default her_outfit_bb = DollOutfit([her_hair_base, her_accessory_bb_tie, her_tattoo_bb_tattoo]) diff --git a/game/scripts/characters/hooch/wardrobe.rpy b/game/scripts/characters/hooch/wardrobe.rpy index 3795f340..5b1fb851 100644 --- a/game/scripts/characters/hooch/wardrobe.rpy +++ b/game/scripts/characters/hooch/wardrobe.rpy @@ -2,52 +2,7 @@ ## Character ## ############### -default hooch = Doll(name="hooch", - clothes={"headgear": [None, 15, True], - "hair": [None, 4, True], - "glasses": [None, 12, True], - "earrings": [None, 14, True], - "neckwear": [None, 16, True], - "robe": [None, 22, True], - "gloves": [None, 14, True], - "top": [None, 15, True], - "bra": [None, 9, True], - "bottom": [None, 8, True], - "garterbelt": [None, 7, True], - "panties": [None, 6, True], - "stockings": [None, 5, True], - "buttplug": [None, -1, True], - "pubes": [None, 3, True], - "tattoo0": [None, 1, True], - "tattoo1": [None, 1, True], - "tattoo2": [None, 1, True], - "tattoo3": [None, 1, True], - "tattoo4": [None, 1, True], - "piercing0": [None, 2, True], - "piercing1": [None, 2, True], - "piercing2": [None, 2, True], - "piercing3": [None, 2, True], - "piercing4": [None, 2, True], - "accessory0": [None, 12, True], - "accessory1": [None, 12, True], - "accessory2": [None, 12, True], - "accessory3": [None, 12, True], - "accessory4": [None, 12, True], - "makeup0": [None, 3, True], - "makeup1": [None, 3, True], - "makeup2": [None, 3, True], - "makeup3": [None, 3, True], - "makeup4": [None, 3, True]}, - face={"tears": [None, 12, True], - "cheeks": [None, 7, True], - "eyebrows": ["base", 11, True], - "eyes": ["base", 8, True], - "pupils": ["mid", 9, True], - "mouth": ["base", 13, True]}, - body={"base": ["front", 0], - "breasts": [None, 2], - "backside": [None, 1]} - ) +default hooch = Doll(name="hooch") ############### ## Hair ## @@ -61,8 +16,8 @@ default hoo_bottom_sport = DollCloth("hooch", ("lower body", "skirts"), "bottom" default hoo_gloves_sport = DollCloth("hooch", ("upper body", "gloves"), "gloves", "sport_gloves", [[78, 72, 115, 255]], unlocked=True) default hoo_robe_sport = DollCloth("hooch", ("upper body", "robes"), "robe", "sport_robe", [[59, 63, 88, 255], [112, 34, 111, 255], [198, 118, 198, 255]], unlocked=True) default hoo_headgear_sport = DollCloth("hooch", ("head", "headgear"), "headgear", "sport_goggles", [[96, 134, 145, 255], [154, 98, 50, 255], [49, 60, 91, 255]], unlocked=True) -default hoo_accessory_broom = DollCloth("hooch", ("misc", "accessory"), "accessory1", "broom", [[144, 83, 64, 255], [121, 87, 71, 255], [163, 159, 112, 255]], unlocked=True, zorder=22) -default hoo_accessory_broom_dildo = DollCloth("hooch", ("misc", "accessory"), "accessory1", "broom_dildo", [[144, 83, 64, 255], [121, 87, 71, 255], [163, 159, 112, 255]], unlocked=True, zorder=22) +default hoo_accessory_broom = DollCloth("hooch", ("misc", "accessory"), "accessory", "broom", [[144, 83, 64, 255], [121, 87, 71, 255], [163, 159, 112, 255]], unlocked=True, zorder=22) +default hoo_accessory_broom_dildo = DollCloth("hooch", ("misc", "accessory"), "accessory", "broom_dildo", [[144, 83, 64, 255], [121, 87, 71, 255], [163, 159, 112, 255]], unlocked=True, zorder=22) default hoo_outfit_default = DollOutfit([hoo_hair_base, hoo_panties_sport, hoo_bra_sport, hoo_top_sport, hoo_bottom_sport, hoo_gloves_sport, hoo_robe_sport, hoo_headgear_sport, hoo_accessory_broom], unlocked=True) default hoo_outfit_last = DollOutfit([hoo_hair_base, hoo_panties_sport, hoo_bra_sport, hoo_top_sport, hoo_bottom_sport, hoo_gloves_sport, hoo_robe_sport, hoo_headgear_sport, hoo_accessory_broom], hidden=True) diff --git a/game/scripts/characters/luna/wardrobe.rpy b/game/scripts/characters/luna/wardrobe.rpy index 60307b42..e2c3c736 100644 --- a/game/scripts/characters/luna/wardrobe.rpy +++ b/game/scripts/characters/luna/wardrobe.rpy @@ -2,52 +2,7 @@ ## Character ## ############### -default luna = Doll(name="luna", - clothes={"headgear": [None, 15, True], - "hair": [None, 4, True], - "glasses": [None, 12, True], - "earrings": [None, 14, True], - "neckwear": [None, 11, True], - "robe": [None, 28, True], - "gloves": [None, 21, True], - "top": [None, 15, True], - "bra": [None, 9, True], - "bottom": [None, 8, True], - "garterbelt": [None, 7, True], - "panties": [None, 6, True], - "stockings": [None, 5, True], - "buttplug": [None, -1, True], - "pubes": [None, 3, True], - "tattoo0": [None, 1, True], - "tattoo1": [None, 1, True], - "tattoo2": [None, 1, True], - "tattoo3": [None, 1, True], - "tattoo4": [None, 1, True], - "piercing0": [None, 2, True], - "piercing1": [None, 2, True], - "piercing2": [None, 2, True], - "piercing3": [None, 2, True], - "piercing4": [None, 2, True], - "accessory0": [None, 12, True], - "accessory1": [None, 12, True], - "accessory2": [None, 12, True], - "accessory3": [None, 12, True], - "accessory4": [None, 12, True], - "makeup0": [None, 3, True], - "makeup1": [None, 3, True], - "makeup2": [None, 3, True], - "makeup3": [None, 3, True], - "makeup4": [None, 3, True]}, - face={"tears": [None, 12, True], - "cheeks": [None, 7, True], - "eyebrows": ["base", 11, True], - "eyes": ["base", 8, True], - "pupils": ["mid", 9, True], - "mouth": ["base", 13, True]}, - body={"armleft": ["up", 3], - "armright":["up", 1], - "base": ["front", 0], - "breasts": ["normal", 2]}) +default luna = Doll(name="luna") ####################### ## Schoolgirl Outfit ## @@ -128,7 +83,7 @@ default lun_bottom_pajama = DollCloth("luna", ("lower body", "trousers"), "botto default lun_glasses_spectrespecs = DollCloth("luna", ("head", "glasses"), "glasses", "spectrespecs", [[227, 102, 130, 255], [61, 110, 140, 255]], unlocked=True) default lun_glasses_hearts = DollCloth("luna", ("head", "glasses"), "glasses", "sunglasses_2", [[240, 120, 255, 255], [0, 158, 255, 255]], unlocked=True) -default lun_accessory_pin_radish = DollCloth("luna", ("misc", "accessory"), "accessory0", "pin_radish", [[182, 23, 16, 255], [232, 190, 188, 255]], zorder=16, unlocked=True) +default lun_accessory_pin_radish = DollCloth("luna", ("misc", "accessory"), "accessory", "pin_radish", [[182, 23, 16, 255], [232, 190, 188, 255]], zorder=16, unlocked=True) default lun_stockings_pantyhose = DollCloth("luna", ("legwear", "pantyhose"), "stockings", "pantyhose_1", [[177, 144, 131, 255]], unlocked=True) default lun_stockings_pantyhose_meshed = DollCloth("luna", ("legwear", "pantyhose"), "stockings", "pantyhose_meshed", [[0, 0, 0, 255]], unlocked=True) @@ -140,7 +95,7 @@ default lun_stockings_pantyhose_meshed = DollCloth("luna", ("legwear", "pantyhos default lun_top_flight_attendant_1 = DollCloth("luna", ("upper body", "dresses"), "top", "flight_attendant_1", [[82, 82, 130, 255], [225, 64, 16, 255]]) default lun_top_flight_attendant_2 = DollCloth("luna", ("upper body", "dresses"), "top", "flight_attendant_2", [[82, 82, 130, 255], [225, 64, 16, 255]], level=6) default lun_neckwear_neckerchief = DollCloth("luna", ("head", "neckwear"), "neckwear", "neckerchief", [[82, 82, 130, 255]]) -default lun_headgear_flight_attendant = DollCloth("luna", ("head", "headgear"), "headgear", "flight_attendant", [[225, 64, 16, 255]]) +default lun_headgear_flight_attendant = DollClothDynamic("luna", ("head", "headgear"), "headgear", "flight_attendant", [[225, 64, 16, 255]], tracking="?hair") default lun_panties_flight_attendant_1 = DollCloth("luna", ("lower undergarment", "bikini panties"), "panties", "flight_attendant_thongs_1", [[225, 64, 16, 255]], level=7) default lun_panties_flight_attendant_2 = DollCloth("luna", ("lower undergarment", "bikini panties"), "panties", "flight_attendant_thongs_2", [[225, 64, 16, 255], [232, 183, 123, 255]], level=9) @@ -160,7 +115,7 @@ default lun_stockings_muggle_knee_socks = DollCloth("luna", ("legwear", "stockin default lun_top_summer_top1 = DollCloth("luna", ("upper body", "shirts"), "top", "summer_top_1", [[255, 154, 205, 255]]) default lun_top_summer_top2 = DollCloth("luna", ("upper body", "shirts"), "top", "summer_top_2", [[255, 154, 205, 255]], level=7) default lun_bottom_summer_shorts = DollCloth("luna", ("lower body", "shorts"), "bottom", "summer_shorts", [[47, 150, 136, 255], [175, 220, 191, 255], [247, 152, 38 , 255]]) -default lun_accessory2_bracelets = DollCloth("luna", ("misc", "accessory"), "accessory2", "bracelets", [[36, 184, 45, 255], [58, 176, 212, 255], [194, 49, 15]], zorder=22) +default lun_accessory_bracelets = DollCloth("luna", ("misc", "accessory"), "accessory", "bracelets", [[36, 184, 45, 255], [58, 176, 212, 255], [194, 49, 15]], zorder=22) ###################### ## Reindeer Costume ## @@ -169,8 +124,8 @@ default lun_accessory2_bracelets = DollCloth("luna", ("misc", "accessory"), "acc default lun_top_bunny2 = DollCloth("luna", ("upper body", "one-piece suits"), "top", "bunny_top_2", [[142, 74, 10, 255]], blacklist=["panties", "bra"], zorder=7, level=7) default lun_neckwear_chocolate_frog = DollCloth("luna", ("misc", "neckwear"), "neckwear", "chocolate_frog", [[255, 255, 255, 255]]) default lun_earring_bauble = DollCloth("luna", ("head", "earrings"), "earrings", "bauble_earring", [[163, 0, 0, 255]], level=4) -default lun_hat_antlers = DollCloth("luna", ("head", "headgear"), "headgear", "antlers", [[142, 74, 10, 255], [255, 255, 255, 255], [219, 192, 149, 255]]) -default lun_accessory3_mistletoe = DollCloth("luna", ("misc", "accessory"), "accessory3", "mistletoe", [[191, 191, 86, 255]], zorder=16, level=7) +default lun_hat_antlers = DollClothDynamic("luna", ("head", "headgear"), "headgear", "antlers", [[142, 74, 10, 255], [255, 255, 255, 255], [219, 192, 149, 255]], tracking="?hair") +default lun_accessory_mistletoe = DollCloth("luna", ("misc", "accessory"), "accessory", "mistletoe", [[191, 191, 86, 255]], zorder=16, level=7) default lun_outfit_reindeer = DollOutfit([lun_hair_base, lun_top_bunny2, lun_neckwear_chocolate_frog, lun_earring_bauble, lun_hat_antlers, lun_stockings_pantyhose_meshed]) @@ -178,7 +133,7 @@ default lun_outfit_reindeer = DollOutfit([lun_hair_base, lun_top_bunny2, lun_nec ## Bunny ## ########### -default lun_hat_bunny1 = DollCloth("luna", ("head", "headgear"), "headgear", "bunny_hat_1", [[219, 161, 140, 255], [253, 227, 171, 255]]) +default lun_hat_bunny1 = DollClothDynamic("luna", ("head", "headgear"), "headgear", "bunny_hat_1", [[219, 161, 140, 255], [253, 227, 171, 255]], tracking="?hair") default lun_top_bunny1 = DollCloth("luna", ("upper body", "one-piece suits"), "top", "bunny_top_1", [[0, 0, 0, 255]], blacklist=["panties", "bra"], zorder=7, level=7) default lun_outfit_bunny = DollOutfit([lun_hair_base, lun_top_bunny1, lun_stockings_pantyhose_meshed, lun_hat_bunny1], price=250, name="Sexy Bunny Costume", desc="A bunny costume for when you're hopping mad.") @@ -189,12 +144,12 @@ default lun_outfit_bunny = DollOutfit([lun_hair_base, lun_top_bunny1, lun_stocki ################# default lun_neckwear_cork = DollCloth("luna", ("head", "neckwear"), "neckwear", "cork", [[255, 255, 255, 255]], unlocked = True, zorder=16) -default lun_accessory3_hair_bug = DollCloth("luna", ("misc", "accessory"), "accessory3", "hair_bug", [[255, 255, 255, 255]], unlocked = True, zorder=16) +default lun_accessory_hair_bug = DollCloth("luna", ("misc", "accessory"), "accessory", "hair_bug", [[255, 255, 255, 255]], unlocked = True, zorder=16) -default lun_accessory4_wand_mouth = DollCloth("luna", ("misc", "accessory"), "accessory4", "wand_mouth", [[255, 255, 255, 255]], unlocked = True, zorder=16) -default lun_accessory4_wand_hand = DollCloth("luna", ("misc", "accessory"), "accessory4", "wand_hand", [[255, 255, 255, 255]], unlocked = True, zorder=16) -default lun_accessory4_wand_breasts = DollCloth("luna", ("misc", "accessory"), "accessory4", "wand_breasts", [[255, 255, 255, 255]], unlocked = True, zorder=16) -default lun_accessory4_wand_pussy = DollCloth("luna", ("misc", "accessory"), "accessory4", "wand_pussy", [[255, 255, 255, 255]], unlocked = True, zorder=7) +default lun_accessory_wand_mouth = DollCloth("luna", ("misc", "accessory"), "accessory", "wand_mouth", [[255, 255, 255, 255]], unlocked = True, zorder=16) +default lun_accessory_wand_hand = DollCloth("luna", ("misc", "accessory"), "accessory", "wand_hand", [[255, 255, 255, 255]], unlocked = True, zorder=16) +default lun_accessory_wand_breasts = DollCloth("luna", ("misc", "accessory"), "accessory", "wand_breasts", [[255, 255, 255, 255]], unlocked = True, zorder=16) +default lun_accessory_wand_pussy = DollCloth("luna", ("misc", "accessory"), "accessory", "wand_pussy", [[255, 255, 255, 255]], unlocked = True, zorder=7) ################# ## Party Dress ## @@ -208,7 +163,7 @@ default lun_top_party_dress = DollCloth("luna", ("upper body", "dresses"), "top" # School Uniforms default lun_outfit_default = DollOutfit([lun_hair_base, lun_top_school1, lun_bottom_school2, lun_bra_base1, lun_panties_base1, lun_stockings_school], unlocked=True) -default lun_outfit_default_quirky = DollOutfit([lun_hair_wand, lun_accessory3_hair_bug, lun_glasses_spectrespecs, lun_accessory_pin_radish, lun_neckwear_tie, lun_top_school3, lun_bottom_school2, lun_bra_base1, lun_panties_base1, lun_stockings_school], unlocked=True) +default lun_outfit_default_quirky = DollOutfit([lun_hair_wand, lun_accessory_hair_bug, lun_glasses_spectrespecs, lun_accessory_pin_radish, lun_neckwear_tie, lun_top_school3, lun_bottom_school2, lun_bra_base1, lun_panties_base1, lun_stockings_school], unlocked=True) default lun_outfit_default_no_vest = DollOutfit([lun_hair_base, lun_top_school4, lun_bottom_school2, lun_bra_base1, lun_panties_base1, lun_stockings_school], hidden=True) default lun_outfit_school_slut = DollOutfit([lun_hair_base, lun_glasses_hearts, lun_top_crop, lun_bottom_school4, lun_panties_lace2, lun_stockings_school])#, hidden=True) @@ -232,7 +187,7 @@ default lun_outfit_flight_attendant = DollOutfit([lun_hair_base, lun_top_flight_ # Sets default lun_outfit_muggle = DollOutfit([lun_hair_base, lun_top_muggle_top, lun_robe_muggle_jacket, lun_bottom_muggle_skirt, lun_stockings_muggle_knee_socks, lun_bra_base1, lun_panties_base1], price=300, name="Muggle Outfit", desc="An outfit that probably at least one muggle somewhere would wear.") default lun_outfit_party = DollOutfit([lun_hair_base, lun_top_party_dress, lun_panties_base1], price=350, name="Party Dress", desc="A weird dress for a weird girl.") -default lun_outfit_summer = DollOutfit([lun_hair_base, lun_top_summer_top1, lun_bottom_summer_shorts, lun_panties_base1, lun_accessory2_bracelets], addons=[lun_top_summer_top2], price=350, name="Summer Set", desc="It's pretty hot.") +default lun_outfit_summer = DollOutfit([lun_hair_base, lun_top_summer_top1, lun_bottom_summer_shorts, lun_panties_base1, lun_accessory_bracelets], addons=[lun_top_summer_top2], price=350, name="Summer Set", desc="It's pretty hot.") default lun_outfit_last = DollOutfit([lun_hair_base], hidden=True) ################ @@ -248,14 +203,14 @@ default lin_pubes_unshaved = DollCloth("luna", ("lower undergarment", "pubes"), ## Tattoos ## ############# -default lun_tattoo0_measure = DollCloth("luna", ("piercings & tattoos", "tattoos"), "tattoo0", "measure", [[0, 0, 0, 255], [219, 73, 44, 255]], unlocked=True) -default lun_tattoo0_spurt_here = DollCloth("luna", ("piercings & tattoos", "tattoos"), "tattoo0", "spurt_here", [[0, 0, 0, 255]], unlocked=True) -default lun_tattoo0_loony = DollCloth("luna", ("piercings & tattoos", "tattoos"), "tattoo0", "loony", [[0, 0, 0, 255]], unlocked=True) -default lun_tattoo0_baby_oven = DollCloth("luna", ("piercings & tattoos", "tattoos"), "tattoo0", "baby_oven", [[0, 0, 0, 255], [219, 73, 44, 255]], unlocked=True) +default lun_tattoo_measure = DollCloth("luna", ("piercings & tattoos", "tattoos"), "tattoo", "measure", [[0, 0, 0, 255], [219, 73, 44, 255]], unlocked=True) +default lun_tattoo_spurt_here = DollCloth("luna", ("piercings & tattoos", "tattoos"), "tattoo", "spurt_here", [[0, 0, 0, 255]], unlocked=True) +default lun_tattoo_loony = DollCloth("luna", ("piercings & tattoos", "tattoos"), "tattoo", "loony", [[0, 0, 0, 255]], unlocked=True) +default lun_tattoo_baby_oven = DollCloth("luna", ("piercings & tattoos", "tattoos"), "tattoo", "baby_oven", [[0, 0, 0, 255], [219, 73, 44, 255]], unlocked=True) -default lun_tattoo1_lab_rat = DollCloth("luna", ("piercings & tattoos", "tattoos"), "tattoo1", "lab_rat", [[0, 0, 0, 255]], unlocked=True) +default lun_tattoo_lab_rat = DollCloth("luna", ("piercings & tattoos", "tattoos"), "tattoo", "lab_rat", [[0, 0, 0, 255]], unlocked=True) -default lun_tattoo3_cumdump = DollCloth("luna", ("piercings & tattoos", "tattoos"), "tattoo3", "cumdump", [[0, 0, 0, 255]], unlocked=True) +default lun_tattoo_cumdump = DollCloth("luna", ("piercings & tattoos", "tattoos"), "tattoo", "cumdump", [[0, 0, 0, 255]], unlocked=True) ########################### ## Police Officer Outfit ## @@ -264,9 +219,9 @@ default lun_tattoo3_cumdump = DollCloth("luna", ("piercings & tattoos", "tattoos default lun_stockings_police = DollCloth("luna", ("legwear", "stockings"), "stockings", "police_thigh_highs", [[43, 43, 85, 255], [142, 142, 179, 255]]) default lun_bottom_police_skirt = DollCloth("luna", ("lower body", "skirts"), "bottom", "police_skirt", [[46, 71, 171, 255]], level=5) default lun_top_police_shirt = DollCloth("luna", ("upper body", "shirts"), "top", "police_shirt", [[46, 71, 171, 255], [187, 187, 210, 255]], level=5) -default lun_accessory_police_belt = DollCloth("luna", ("misc", "accessory"), "accessory2", "police_belt", [[38, 38, 91, 255], [187, 187, 210, 255]]) -default lun_accessory_police_badge = DollCloth("luna", ("misc", "accessory"), "accessory1", "police_badge", [[25, 38, 85, 255],[252, 241, 109, 255]], zorder=16) -default lun_accessory_police_cuffs = DollCloth("luna", ("misc", "accessory"), "accessory2", "police_cuffs", [[187, 187, 210, 255]], zorder=22) +default lun_accessory_police_belt = DollCloth("luna", ("misc", "accessory"), "accessory", "police_belt", [[38, 38, 91, 255], [187, 187, 210, 255]]) +default lun_accessory_police_badge = DollCloth("luna", ("misc", "accessory"), "accessory", "police_badge", [[25, 38, 85, 255],[252, 241, 109, 255]], zorder=16) +default lun_accessory_police_cuffs = DollCloth("luna", ("misc", "accessory"), "accessory", "police_cuffs", [[187, 187, 210, 255]], zorder=22) default lun_outfit_police = DollOutfit([lun_hair_base, lun_stockings_police, lun_bottom_police_skirt, lun_top_police_shirt, lun_panties_base1, lun_accessory_police_badge, lun_accessory_police_belt], addons=[lun_accessory_police_cuffs]) @@ -279,7 +234,7 @@ default lun_pantyhose_harley_quinn = DollCloth("luna", ("legwear", "pantyhose"), default lun_top_harley_quinn = DollCloth("luna", ("upper body", "one-piece suits"), "top", "harley_quinn", [[50, 98, 128, 255], [140, 159, 180, 255], [228, 54, 18, 255], [18, 100, 228, 255]]) default lun_robe_harley_quinn = DollCloth("luna", ("upper body", "robes"), "robe", "harley_quinn", [[216, 252, 255, 255], [140, 159, 180, 255], [88, 213, 50, 255], [228, 78, 20, 255], [234, 72, 192, 255]]) default lun_gloves_harley_quinn = DollCloth("luna", ("upper body", "gloves"), "gloves", "harley_quinn", [[31, 51, 73, 255]]) -default lun_accessory_harley_quinn_strap = DollCloth("luna", ("misc", "accessory"), "accessory1", "harley_quinn_strap", [[31, 51, 73, 255]], zorder=6) +default lun_accessory_harley_quinn_strap = DollCloth("luna", ("misc", "accessory"), "accessory", "harley_quinn_strap", [[31, 51, 73, 255]], zorder=6) default lun_outfit_harley_quinn = DollOutfit([lun_hair_harley_quinn, lun_pantyhose_harley_quinn, lun_top_harley_quinn, lun_robe_harley_quinn, lun_gloves_harley_quinn, lun_accessory_harley_quinn_strap], price=500, name="Harley Quinn Outfit", desc="Attractively crazy.") @@ -289,7 +244,7 @@ default lun_outfit_harley_quinn = DollOutfit([lun_hair_harley_quinn, lun_pantyho default lun_bottom_casual_jeans = DollCloth("luna", ("lower body", "skirts"), "bottom", "casual_jeans", [[128, 39, 191, 255]]) default lun_top_casual_sweater = DollCloth("luna", ("upper body", "shirts"), "top", "casual_sweater", [[56, 32, 136, 255], [56, 32, 136, 255]]) -default lun_accessory_lionhead = DollCloth("luna", ("misc", "accessory"), "accessory1", "lionhead", [[0, 0, 0, 255]], zorder=29) +default lun_accessory_lionhead = DollCloth("luna", ("misc", "accessory"), "accessory", "lionhead", [[0, 0, 0, 255]], zorder=29) default lun_outfit_casual= DollOutfit([lun_hair_base, lun_panties_base1, lun_bra_base1, lun_bottom_casual_jeans, lun_top_casual_sweater], unlocked=True) default lun_outfit_lion_event = DollOutfit([lun_panties_base1, lun_bra_base1, lun_accessory_lionhead, lun_bottom_casual_jeans, lun_top_casual_sweater], hidden=True) diff --git a/game/scripts/characters/susan/wardrobe.rpy b/game/scripts/characters/susan/wardrobe.rpy index cc9e5d83..0c1c090e 100644 --- a/game/scripts/characters/susan/wardrobe.rpy +++ b/game/scripts/characters/susan/wardrobe.rpy @@ -2,50 +2,7 @@ ## Character ## ############### -default susan = Doll(name="susan", - clothes={"headgear": [None, 15, True], - "hair": [None, 4, True], - "glasses": [None, 12, True], - "earrings": [None, 14, True], - "neckwear": [None, 11, True], - "robe": [None, 28, True], - "gloves": [None, 21, True], - "top": [None, 15, True], - "bra": [None, 9, True], - "bottom": [None, 8, True], - "garterbelt": [None, 7, True], - "panties": [None, 6, True], - "stockings": [None, 5, True], - "buttplug": [None, -1, True], - "pubes": [None, 3, True], - "tattoo0": [None, 1, True], - "tattoo1": [None, 1, True], - "tattoo2": [None, 1, True], - "tattoo3": [None, 1, True], - "tattoo4": [None, 1, True], - "piercing0": [None, 2, True], - "piercing1": [None, 2, True], - "piercing2": [None, 2, True], - "piercing3": [None, 2, True], - "piercing4": [None, 2, True], - "accessory0": [None, 12, True], - "accessory1": [None, 12, True], - "accessory2": [None, 12, True], - "accessory3": [None, 12, True], - "accessory4": [None, 12, True], - "makeup0": [None, 3, True], - "makeup1": [None, 3, True], - "makeup2": [None, 3, True], - "makeup3": [None, 3, True], - "makeup4": [None, 3, True]}, - face={"tears": [None, 12, True], - "cheeks": [None, 7, True], - "eyebrows": ["base", 11, True], - "eyes": ["base", 8, True], - "pupils": ["mid", 9, True], - "mouth": ["base", 13, True]}, - body={"base": ["front", 0], - "breasts": [None, 2]}) +default susan = Doll(name="susan") ####################### ## Schoolgirl Outfit ## @@ -102,7 +59,7 @@ default sus_outfit_muggle_casual1 = DollOutfit([sus_hair_base, sus_top_muggle_ca ## Priestess Outfit ## ################ -default sus_headdress_priestess = DollCloth("susan", ("head", "headgear"), "headgear", "priestess_headdress", [[39, 56, 67, 255], [228, 235, 240, 255]]) +default sus_headdress_priestess = DollClothDynamic("susan", ("head", "headgear"), "headgear", "priestess_headdress", [[39, 56, 67, 255], [228, 235, 240, 255]], tracking="?hair") default sus_top_priestess = DollCloth("susan", ("upper body", "dresses"), "top", "priestess_dress", [[39, 56, 67, 255], [228, 235, 240, 255]]) default sus_lace_stockings1 = DollCloth("susan", ("legwear", "stockings"), "stockings", "lace_stockings_1", [[0, 0, 0, 255]]) default sus_hat_necklace =DollCloth("susan", ("head", "neckwear"), "neckwear", "hat_necklace", [[240, 190, 120, 255]], zorder=16) diff --git a/game/scripts/characters/tonks/wardrobe.rpy b/game/scripts/characters/tonks/wardrobe.rpy index 89adc8f9..c00227d5 100644 --- a/game/scripts/characters/tonks/wardrobe.rpy +++ b/game/scripts/characters/tonks/wardrobe.rpy @@ -2,52 +2,7 @@ ## Character ## ############### -default tonks = Doll(name="tonks", - clothes={"headgear": [None, 15, True], - "hair": [None, 4, True], - "glasses": [None, 12, True], - "earrings": [None, 14, True], - "neckwear": [None, 11, True], - "robe": [None, 28, True], - "gloves": [None, 21, True], - "top": [None, 15, True], - "bra": [None, 9, True], - "bottom": [None, 8, True], - "garterbelt": [None, 7, True], - "panties": [None, 6, True], - "stockings": [None, 5, True], - "buttplug": [None, -1, True], - "pubes": [None, 3, True], - "tattoo0": [None, 1, True], - "tattoo1": [None, 1, True], - "tattoo2": [None, 1, True], - "tattoo3": [None, 1, True], - "tattoo4": [None, 1, True], - "piercing0": [None, 2, True], - "piercing1": [None, 2, True], - "piercing2": [None, 2, True], - "piercing3": [None, 2, True], - "piercing4": [None, 2, True], - "accessory0": [None, 12, True], - "accessory1": [None, 12, True], - "accessory2": [None, 12, True], - "accessory3": [None, 12, True], - "accessory4": [None, 12, True], - "makeup0": [None, 3, True], - "makeup1": [None, 3, True], - "makeup2": [None, 3, True], - "makeup3": [None, 3, True], - "makeup4": [None, 3, True]}, - face={"tears": [None, 12, True], - "cheeks": [None, 7, True], - "eyebrows": ["base", 11, True], - "eyes": ["base", 8, True], - "pupils": ["mid", 9, True], - "mouth": ["base", 13, True]}, - body={"armleft": ["on_hips", 3], - "armright":["on_hips", 1], - "base": ["front", 0], - "breasts": ["normal", 2]}) +default tonks = Doll(name="tonks") ################## ## Auror Outfit ## @@ -56,13 +11,13 @@ default tonks = Doll(name="tonks", default ton_hair_base = DollCloth("tonks", ("head", "hair"), "hair", "base", [[255, 146, 185, 255], [254, 218, 238, 255]], unlocked=True) default ton_hair_base_new = DollCloth("tonks", ("head", "hair"), "hair", "new", [[255, 146, 185, 255], [254, 218, 238, 255]], unlocked=True) default ton_neckwear_beads = DollCloth("tonks", ("head", "neckwear"), "neckwear", "choker_beads",[[45, 45, 48, 255], [244, 230, 236, 255]], unlocked=True) -default ton_gloves_auror = DollCloth("tonks", ("upper body", "gloves"), "gloves", "auror_gloves",[[45, 45, 48, 255]], armfix=True, unlocked=True) -default ton_top_auror = DollCloth("tonks", ("upper body", "shirts"), "top", "auror",[[28, 27, 31, 255], [124, 42, 50, 255]], armfix=True, unlocked=True) -default ton_top_auror2 = DollCloth("tonks", ("upper body", "shirts"), "top", "auror2",[[124, 42, 50, 255]], armfix=True, unlocked=True) -default ton_robe_auror = DollCloth("tonks", ("upper body", "robes"), "robe", "auror_coat",[[40, 40, 41, 255], [244, 230, 236, 255]], armfix=True, unlocked=True) -default ton_bottoms_leggings = DollCloth("tonks", ("lower body", "leggings"), "bottom", "leggings",[[45, 45, 48, 255]], armfix=True, unlocked=True) -default ton_bottoms_leggings_hole = DollCloth("tonks", ("lower body", "leggings"), "bottom", "leggings_hole",[[45, 45, 48, 255]], level=60, armfix=True, unlocked=True) -default ton_stockings_auror = DollCloth("tonks", ("legwear", "stockings"), "stockings", "auror",[[45, 45, 48, 255], [177, 168, 172, 255]], armfix=True, unlocked=True) +default ton_gloves_auror = DollCloth("tonks", ("upper body", "gloves"), "gloves", "auror_gloves",[[45, 45, 48, 255]], unlocked=True) +default ton_top_auror = DollCloth("tonks", ("upper body", "shirts"), "top", "auror",[[28, 27, 31, 255], [124, 42, 50, 255]], unlocked=True) +default ton_top_auror2 = DollCloth("tonks", ("upper body", "shirts"), "top", "auror2",[[124, 42, 50, 255]], unlocked=True) +default ton_robe_auror = DollCloth("tonks", ("upper body", "robes"), "robe", "auror_coat",[[40, 40, 41, 255], [244, 230, 236, 255]], unlocked=True) +default ton_bottoms_leggings = DollCloth("tonks", ("lower body", "leggings"), "bottom", "leggings",[[45, 45, 48, 255]], unlocked=True) +default ton_bottoms_leggings_hole = DollCloth("tonks", ("lower body", "leggings"), "bottom", "leggings_hole",[[45, 45, 48, 255]], level=60, unlocked=True) +default ton_stockings_auror = DollCloth("tonks", ("legwear", "stockings"), "stockings", "auror",[[45, 45, 48, 255], [177, 168, 172, 255]], unlocked=True) default ton_outfit_default = DollOutfit([ton_hair_base_new, ton_neckwear_beads, ton_gloves_auror, ton_top_auror, ton_robe_auror, ton_bottoms_leggings, ton_stockings_auror], unlocked=True) default ton_outfit_last = DollOutfit([ton_hair_base_new], hidden=True) @@ -73,9 +28,9 @@ default ton_outfit_last = DollOutfit([ton_hair_base_new], hidden=True) #default ton_bottom_school1 = DollCloth("tonks", ("lower body", "skirts"), "bottom", "school_skirt_1", [[103, 90, 108, 255], [232, 177, 13, 255]], unlocked=True) # Not implemented default ton_top_tied = DollCloth("tonks", ("upper body", "other"), "top", "tied_top",[[183, 183, 184, 255]], blacklist=["bra"]) -default ton_bottom_school2 = DollCloth("tonks", ("lower body", "skirts"), "bottom", "school_skirt_2", [[103, 90, 108, 255], [232, 177, 13, 255]], armfix=True, level=20) -default ton_bottom_school3 = DollCloth("tonks", ("lower body", "skirts"), "bottom", "school_skirt_3", [[103, 90, 108, 255], [232, 177, 13, 255]], armfix=True, level=40) -default ton_bottom_school4 = DollCloth("tonks", ("lower body", "skirts"), "bottom", "school_skirt_4", [[103, 90, 108, 255], [232, 177, 13, 255]], armfix=True, level=60) +default ton_bottom_school2 = DollCloth("tonks", ("lower body", "skirts"), "bottom", "school_skirt_2", [[103, 90, 108, 255], [232, 177, 13, 255]], level=20) +default ton_bottom_school3 = DollCloth("tonks", ("lower body", "skirts"), "bottom", "school_skirt_3", [[103, 90, 108, 255], [232, 177, 13, 255]], level=40) +default ton_bottom_school4 = DollCloth("tonks", ("lower body", "skirts"), "bottom", "school_skirt_4", [[103, 90, 108, 255], [232, 177, 13, 255]], level=60) default ton_outfit_school = DollOutfit([ton_hair_base_new, ton_top_tied, ton_bottom_school2], price=350, name="Oldschool School Uniform", desc="A very tight school outfit back from 1995!") @@ -88,7 +43,7 @@ default ton_stockings_long2 = DollCloth("tonks", ("legwear", "stockings"), "stoc default ton_stockings_long_meshed = DollCloth("tonks", ("legwear", "stockings"), "stockings", "long_meshed",[[0, 0, 0, 255], [0, 0, 0, 255]]) # Referee Outfit - SOON default ton_stockings_long_sports = DollCloth("tonks", ("legwear", "stockings"), "stockings", "long_sports",[[255, 255, 255, 255], [23, 23, 23, 255]], unlocked=True) default ton_stockings_long_striped = DollCloth("tonks", ("legwear", "stockings"), "stockings", "long_striped",[[255, 233, 246, 255], [180, 18, 36, 255]]) # Elf Outfit -default ton_garterbelt_long_basic = DollCloth("tonks", ("legwear", "garterbelts"), "garterbelt", "long_basic_1", [[255, 255, 255, 255]], armfix=True) +default ton_garterbelt_long_basic = DollCloth("tonks", ("legwear", "garterbelts"), "garterbelt", "long_basic_1", [[255, 255, 255, 255]]) ################## ## Flag Bikinis ## @@ -126,7 +81,7 @@ default ton_outfit_swimsuit_3 = DollOutfit([ton_hair_base_new, ton_swimsuit_1_US ################### default ton_top_crop_casual = DollCloth("tonks", ("upper body", "shirts"), "top", "crop_top",[[200, 8, 45, 255]]) -default ton_bottoms_leggings_casual = DollCloth("tonks", ("lower body", "leggings"), "bottom", "latex_leggings",[[32, 32, 32, 255], [25, 24, 24, 255]], armfix=True) +default ton_bottoms_leggings_casual = DollCloth("tonks", ("lower body", "leggings"), "bottom", "latex_leggings",[[32, 32, 32, 255], [25, 24, 24, 255]]) default ton_outfit_casual = DollOutfit([ton_hair_base_new, ton_top_crop_casual, ton_bottoms_leggings_casual], price=350, name="Sexy Casual Outfit", desc="Leggings make squeaky sounds when rubbed together.") @@ -134,7 +89,7 @@ default ton_outfit_casual = DollOutfit([ton_hair_base_new, ton_top_crop_casual, ## Nightie ## ############# -default ton_top_nightie_1 = DollCloth("tonks", ("upper body", "shirts"), "top", "nightie_1", [[153, 38, 96, 255]], armfix=True) +default ton_top_nightie_1 = DollCloth("tonks", ("upper body", "shirts"), "top", "nightie_1", [[153, 38, 96, 255]]) default ton_outfit_nightie = DollOutfit([ton_hair_base_new, ton_top_nightie_1], price=350, name="Nightie", desc="Doesn't leave much for the imagination.") @@ -143,8 +98,8 @@ default ton_outfit_nightie = DollOutfit([ton_hair_base_new, ton_top_nightie_1], ################## default ton_top_bunny1 = DollCloth("tonks", ("upper body", "one-piece suits"), "top", "bunnysuit", [[48, 48, 48, 255]], blacklist=["panties", "bra"], zorder=7, level=40) -default ton_stockings_bunny1 = DollCloth("tonks", ("legwear", "pantyhose"), "stockings", "bunny_stockings_1", [[81, 81, 81, 255]], armfix=True, level=40) -default ton_hat_bunny1 = DollCloth("tonks", ("head", "headgear"), "headgear", "bunny", [[48, 48, 48, 255], [232, 232, 232, 255]], level=20) +default ton_stockings_bunny1 = DollCloth("tonks", ("legwear", "pantyhose"), "stockings", "bunny_stockings_1", [[81, 81, 81, 255]], level=40) +default ton_hat_bunny1 = DollClothDynamic("tonks", ("head", "headgear"), "headgear", "bunny", [[48, 48, 48, 255], [232, 232, 232, 255]], level=20, tracking="?hair") default ton_neckwear_bunny1 = DollCloth("tonks", ("head", "neckwear"), "neckwear", "bunny_bowtie_1", [[232, 232, 232, 255], [48, 48, 48, 255]], level=10) default ton_outfit_bunny = DollOutfit([ton_hair_base_new, ton_top_bunny1, ton_stockings_bunny1, ton_hat_bunny1, ton_neckwear_bunny1], price=350, name="Sexy bunny outfit", desc="Vewy sexy :3") @@ -153,7 +108,7 @@ default ton_outfit_bunny = DollOutfit([ton_hair_base_new, ton_top_bunny1, ton_st ## Dressing Gown ## ################### -default ton_dressing_gown = DollCloth("tonks", ("upper body", "robes"), "robe", "dressing_gown", [[13, 0, 76, 255], [31, 41, 171, 255]], armfix=True) +default ton_dressing_gown = DollCloth("tonks", ("upper body", "robes"), "robe", "dressing_gown", [[13, 0, 76, 255], [31, 41, 171, 255]]) default ton_outfit_dressing_gown = DollOutfit([ton_hair_base_new, ton_dressing_gown]) @@ -161,8 +116,8 @@ default ton_outfit_dressing_gown = DollOutfit([ton_hair_base_new, ton_dressing_g ## Silky Dress ## ################# -default ton_top_silk_dress = DollCloth("tonks", ("upper body", "dresses"), "top", "silk_dress", [[240, 237, 250, 255], [234, 234, 234, 255]], blacklist=["bra", "bottom"], armfix=True) -default ton_robe_silk = DollCloth("tonks", ("upper body", "robes"), "robe", "silk_robe", [[240, 237, 250, 255]], armfix=True) +default ton_top_silk_dress = DollCloth("tonks", ("upper body", "dresses"), "top", "silk_dress", [[240, 237, 250, 255], [234, 234, 234, 255]], blacklist=["bra", "bottom"]) +default ton_robe_silk = DollCloth("tonks", ("upper body", "robes"), "robe", "silk_robe", [[240, 237, 250, 255]]) default ton_outfit_silky = DollOutfit([ton_hair_base_new, ton_top_silk_dress, ton_robe_silk], price=350, name="Silky Dress", desc="{size=-4}Disclaimer: Madam Mafkin isn't responsible for damaged nipples.{/size}") @@ -170,8 +125,8 @@ default ton_outfit_silky = DollOutfit([ton_hair_base_new, ton_top_silk_dress, to ## Skimpy Dress & Club Dress## ############################## -default ton_top_skimpy_dress = DollCloth("tonks", ("upper body", "dresses"), "top", "skimpy_dress", [[147, 1, 1, 255]], blacklist=["bottom"], armfix=True, level=40) -default ton_top_skimpy_dress2 = DollCloth("tonks", ("upper body", "dresses"), "top", "skimpy_dress_2", [[108, 0, 105, 255]], blacklist=["bottom"], armfix=True, level=20) +default ton_top_skimpy_dress = DollCloth("tonks", ("upper body", "dresses"), "top", "skimpy_dress", [[147, 1, 1, 255]], blacklist=["bottom"], level=40) +default ton_top_skimpy_dress2 = DollCloth("tonks", ("upper body", "dresses"), "top", "skimpy_dress_2", [[108, 0, 105, 255]], blacklist=["bottom"], level=20) default ton_outfit_skimpy_dress = DollOutfit([ton_hair_base_new, ton_top_skimpy_dress, ton_stockings_long2], price=300, name="Very Revealing Dress", desc="This dress shows quite a bit of cleavage... All of it in fact.") default ton_outfit_club_dress = DollOutfit([ton_hair_base_new, ton_top_skimpy_dress2, ton_stockings_long_meshed], price=300, name="Club Dress", desc="A sultry muggle dress like this will turn heads at any wizard pub.") @@ -180,18 +135,18 @@ default ton_outfit_club_dress = DollOutfit([ton_hair_base_new, ton_top_skimpy_dr ## Succubus Outfit ## ##################### -default ton_hat_succubus = DollCloth("tonks", ("head", "headgear"), "headgear", "horns", [[62, 51, 57, 255], [106, 63, 67, 255]]) +default ton_hat_succubus = DollClothDynamic("tonks", ("head", "headgear"), "headgear", "horns", [[62, 51, 57, 255], [106, 63, 67, 255]], tracking="?hair") default ton_neckwear_succubus = DollCloth("tonks", ("head", "neckwear"), "neckwear", "succubus_colar", [[62, 51, 57, 255]]) default ton_gloves_succubus = DollCloth("tonks", ("upper body", "gloves"), "gloves", "succubus_gloves", [[62, 51, 57, 255]]) default ton_top_succubus = DollCloth("tonks", ("upper body", "other"), "top", "succubus_corset",[[62, 51, 57, 255], [181, 86, 84, 255], [136, 134, 134, 255]], blacklist=["bra"]) default ton_top_succubus2 = DollCloth("tonks", ("upper body", "other"), "top", "succubus_corset_2",[[62, 51, 57, 255], [181, 86, 84, 255], [136, 134, 134, 255]]) -default ton_panties_succubus = DollCloth("tonks", ("lower undergarment", "bikini panties"), "panties", "succubus_panties", [[62, 51, 57, 255], [136, 134, 134, 255]], armfix=True) +default ton_panties_succubus = DollCloth("tonks", ("lower undergarment", "bikini panties"), "panties", "succubus_panties", [[62, 51, 57, 255], [136, 134, 134, 255]]) -default ton_accessory0_succubus = DollCloth("tonks", ("misc", "accessory"), "accessory0", "succubus_wings", [[62, 51, 57, 255], [181, 86, 84, 255], [136, 134, 134, 255]], zorder=-160, blacklist=["robe"]) -default ton_accessory1_succubus = DollCloth("tonks", ("misc", "accessory"), "accessory1", "succubus_tail", [[62, 51, 57, 255], [181, 86, 84, 255]], zorder=-1) +default ton_accessory1_succubus = DollCloth("tonks", ("misc", "accessory"), "accessory", "succubus_wings", [[62, 51, 57, 255], [181, 86, 84, 255], [136, 134, 134, 255]], zorder=-160) +default ton_accessory2_succubus = DollCloth("tonks", ("misc", "accessory"), "accessory", "succubus_tail", [[62, 51, 57, 255], [181, 86, 84, 255]], zorder=-11) -default ton_outfit_succubus = DollOutfit([ton_hair_base_new, ton_hat_succubus, ton_neckwear_succubus, ton_gloves_succubus, ton_top_succubus, ton_panties_succubus, ton_accessory0_succubus, ton_accessory1_succubus], addons=[ton_top_succubus2], name="Succubus Costume", desc="Hot as hell.") +default ton_outfit_succubus = DollOutfit([ton_hair_base_new, ton_hat_succubus, ton_neckwear_succubus, ton_gloves_succubus, ton_top_succubus, ton_panties_succubus, ton_accessory1_succubus, ton_accessory2_succubus], addons=[ton_top_succubus2], name="Succubus Costume", desc="Hot as hell.") ##################### ## Cavegirl Outfit ## @@ -199,7 +154,7 @@ default ton_outfit_succubus = DollOutfit([ton_hair_base_new, ton_hat_succubus, t default ton_earring_pearls = DollCloth("tonks", ("head", "earrings"), "earrings", "pearls", [[223, 240, 255, 255]]) default ton_neckwear_pearls = DollCloth("tonks", ("head", "neckwear"), "neckwear", "pearls_1", [[223, 240, 255, 255]], zorder=16) -default ton_top_cavegirl = DollCloth("tonks", ("upper body", "dresses"), "top", "cavegirl_dress", [[223, 240, 255, 255]], armfix=True) +default ton_top_cavegirl = DollCloth("tonks", ("upper body", "dresses"), "top", "cavegirl_dress", [[223, 240, 255, 255]]) default ton_outfit_cavegirl = DollOutfit([ton_hair_base_new, ton_top_cavegirl, ton_earring_pearls, ton_neckwear_pearls], price=200, name="Cavegirl Dress", desc="A stone age inspired dress that brings you back to the age of rocking knockers.") @@ -207,7 +162,7 @@ default ton_outfit_cavegirl = DollOutfit([ton_hair_base_new, ton_top_cavegirl, t ## Pullover Outfit ## ##################### -default ton_top_pullover = DollCloth("tonks", ("upper body", "shirts"), "top", "pullover",[[253, 240, 230, 250]], armfix=True) +default ton_top_pullover = DollCloth("tonks", ("upper body", "shirts"), "top", "pullover",[[253, 240, 230, 250]]) default ton_stockings_long_ribbed = DollCloth("tonks", ("legwear", "stockings"), "stockings", "long_ribbed",[[253, 240, 230, 255], [255, 79, 186, 255]]) default ton_outfit_pullover = DollOutfit([ton_hair_base_new, ton_top_pullover, ton_stockings_long_ribbed], price=200, name="Pullover Outfit", desc="An outfit so defined it will make anyone pull over when they spot it.") @@ -217,28 +172,28 @@ default ton_outfit_pullover = DollOutfit([ton_hair_base_new, ton_top_pullover, t ################# /% \ |=I~I=| ################# # Accessories -default ton_makeup3_elf_ears = DollCloth("tonks", ("head", "makeup"), "makeup3", "elf_ears", [[255, 255, 255, 255]], zorder=5) -default ton_hat_antlers = DollCloth("tonks", ("head", "headgear"), "headgear", "antlers", [[234, 187, 170, 255]]) -default ton_hat_elf = DollCloth("tonks", ("head", "headgear"), "headgear", "elf", [[2, 116, 71, 255], [255, 239, 248, 255]]) +default ton_makeup_elf_ears = DollCloth("tonks", ("head", "makeup"), "makeup", "elf_ears", None, zorder=5) +default ton_hat_antlers = DollClothDynamic("tonks", ("head", "headgear"), "headgear", "antlers", [[234, 187, 170, 255]], tracking="?hair") +default ton_hat_elf = DollClothDynamic("tonks", ("head", "headgear"), "headgear", "elf", [[2, 116, 71, 255], [255, 239, 248, 255]], tracking="?hair") default ton_neckwear_choker1 = DollCloth("tonks", ("head", "neckwear"), "neckwear", "choker_1", [[255, 43, 149, 255]]) default ton_neckwear_bell1 = DollCloth("tonks", ("head", "neckwear"), "neckwear", "bell_1", [[2, 116, 71, 255], [244, 181, 82, 255]], zorder=16) -default ton_accessory4_bells = DollCloth("tonks", ("misc", "accessory"), "accessory4", "bells_1", [[244, 181, 82, 255]], zorder=16) -default ton_accessory3_belt1 = DollCloth("tonks", ("misc", "accessory"), "accessory3", "belt_1", [[42, 42, 42, 255], [185, 135, 73, 255]], zorder=16) +default ton_accessory_bells = DollCloth("tonks", ("misc", "accessory"), "accessory", "bells_1", [[244, 181, 82, 255]], zorder=16) +default ton_accessory_belt1 = DollCloth("tonks", ("misc", "accessory"), "accessory", "belt_1", [[42, 42, 42, 255], [185, 135, 73, 255]], zorder=16) default ton_earring_bells = DollCloth("tonks", ("head", "earrings"), "earrings", "bells", [[244, 181, 82, 255]]) -default ton_piercing1_nipple_bells = DollCloth("tonks", ("piercings & tattoos", "piercings"), "piercing1", "nipple_bells", [[244, 181, 82, 255]]) +default ton_piercing_nipple_bells = DollCloth("tonks", ("piercings & tattoos", "piercings"), "piercing", "nipple_bells", [[244, 181, 82, 255]]) # Main Clothing -default ton_top_elf = DollCloth("tonks", ("upper body", "dresses"), "top", "elf_dress",[[2, 116, 71, 255]], armfix=True) -default ton_bra_ribbon = DollCloth("tonks", ("upper undergarment", "other"), "bra", "ribbon", [[255, 43, 149, 255]], blacklist=["top", "piercing1"]) -default ton_panties_ribbon = DollCloth("tonks", ("lower undergarment", "other"), "panties", "ribbon", [[255, 43, 149, 255]], blacklist=["bottom"], armfix=True) +default ton_top_elf = DollCloth("tonks", ("upper body", "dresses"), "top", "elf_dress",[[2, 116, 71, 255]]) +default ton_bra_ribbon = DollCloth("tonks", ("upper undergarment", "other"), "bra", "ribbon", [[255, 43, 149, 255]], blacklist=["top", "piercing"]) +default ton_panties_ribbon = DollCloth("tonks", ("lower undergarment", "other"), "panties", "ribbon", [[255, 43, 149, 255]], blacklist=["bottom"]) default ton_bra_pasties = DollCloth("tonks", ("upper undergarment", "other"), "bra", "pasties_1",[[255, 43, 149, 255]], unlocked=True) default ton_bra_pasties2 = DollCloth("tonks", ("upper undergarment", "other"), "bra", "pasties_2",[[2, 116, 71, 255], [244, 181, 82, 255]]) -default ton_bottom_xmas = DollCloth("tonks", ("lower body", "other"), "bottom", "xmas",[[2, 116, 71, 255], [255, 239, 248, 255]], armfix=True) +default ton_bottom_xmas = DollCloth("tonks", ("lower body", "other"), "bottom", "xmas",[[2, 116, 71, 255], [255, 239, 248, 255]]) default ton_gloves_xmas = DollCloth("tonks", ("upper body", "gloves"), "gloves", "xmas", [[255, 239, 248, 255]]) -default ton_stockings_xmas = DollCloth("tonks", ("legwear", "stockings"), "stockings", "xmas",[[255, 255, 255, 255], [255, 255, 255, 255]], armfix=True) +default ton_stockings_xmas = DollCloth("tonks", ("legwear", "stockings"), "stockings", "xmas",[[255, 255, 255, 255], [255, 255, 255, 255]]) -default ton_outfit_elf = DollOutfit([ton_hair_base_new, ton_makeup3_elf_ears, ton_earring_bells, ton_hat_elf, ton_neckwear_bell1, ton_top_elf, ton_accessory3_belt1, ton_accessory4_bells, ton_garterbelt_long_basic, ton_stockings_long_striped]) +default ton_outfit_elf = DollOutfit([ton_hair_base_new, ton_makeup_elf_ears, ton_earring_bells, ton_hat_elf, ton_neckwear_bell1, ton_top_elf, ton_accessory_belt1, ton_accessory_bells, ton_garterbelt_long_basic, ton_stockings_long_striped]) default ton_outfit_ribbon = DollOutfit([ton_hair_base_new, ton_neckwear_choker1, ton_bra_ribbon, ton_panties_ribbon]) -default ton_outfit_xmas = DollOutfit([ton_hair_base_new, ton_hat_antlers, ton_earring_bells, ton_neckwear_bell1, ton_bra_pasties2, ton_bottom_xmas, ton_gloves_xmas, ton_stockings_xmas], addons=[ton_piercing1_nipple_bells, ton_bra_pasties2]) +default ton_outfit_xmas = DollOutfit([ton_hair_base_new, ton_hat_antlers, ton_earring_bells, ton_neckwear_bell1, ton_bra_pasties2, ton_bottom_xmas, ton_gloves_xmas, ton_stockings_xmas], addons=[ton_piercing_nipple_bells, ton_bra_pasties2]) ################## ## Santa Outfit ## @@ -254,40 +209,40 @@ default ton_outfit_santa = DollOutfit([ton_hair_base_new, ton_panties_santa, ton ## Lady D Outfit ## ################### -default ton_hat_classy = DollCloth("tonks", ("head", "headgear"), "headgear", "classy_hat", [[82, 82, 94, 255]], zorder=3) +default ton_hat_classy = DollClothDynamic("tonks", ("head", "headgear"), "headgear", "classy_hat", [[82, 82, 94, 255]], tracking="?hair") default ton_neckwear_pearls2 = DollCloth("tonks", ("head", "neckwear"), "neckwear", "pearls_2", [[220, 200, 139, 255]]) default ton_earring_pearls2 = DollCloth("tonks", ("head", "earrings"), "earrings", "pearls_2", [[220, 200, 139, 255]]) -default ton_accessory2_flower = DollCloth("tonks", ("misc", "accessory"), "accessory2", "flower", [[92, 92, 92, 255]], zorder=16) -default ton_gloves_leather = DollCloth("tonks", ("upper body", "gloves"), "gloves", "leather_gloves", [[79, 73, 64, 255]], armfix=True) -default ton_top_classy_dress = DollCloth("tonks", ("upper body", "dresses"), "top", "classy_dress",[[203, 201, 184, 255]], armfix=True, blacklist=["bra"]) +default ton_accessory_flower = DollCloth("tonks", ("misc", "accessory"), "accessory", "flower", [[92, 92, 92, 255]], zorder=16) +default ton_gloves_leather = DollCloth("tonks", ("upper body", "gloves"), "gloves", "leather_gloves", [[79, 73, 64, 255]]) +default ton_top_classy_dress = DollCloth("tonks", ("upper body", "dresses"), "top", "classy_dress",[[203, 201, 184, 255]], blacklist=["bra"]) -default ton_outfit_lady_D = DollOutfit([ton_hair_base_new, ton_hat_classy, ton_neckwear_pearls2, ton_earring_pearls2, ton_accessory2_flower, ton_gloves_leather, ton_top_classy_dress], price=400, name="Lady D Costume", desc="This outfit was once worn by a very tall and scary lady.") +default ton_outfit_lady_D = DollOutfit([ton_hair_base_new, ton_hat_classy, ton_neckwear_pearls2, ton_earring_pearls2, ton_accessory_flower, ton_gloves_leather, ton_top_classy_dress], price=400, name="Lady D Costume", desc="This outfit was once worn by a very tall and scary lady.") ################## ## Police Woman ## #Unlocked in not_so_great_escape mirror story ################## -default ton_headgear_police = DollCloth("tonks", ("head", "headgear"), "headgear", "police", [[126, 126, 192, 255], [72, 101, 183, 255], [235, 209, 101, 255]]) +default ton_headgear_police = DollClothDynamic("tonks", ("head", "headgear"), "headgear", "police", [[126, 126, 192, 255], [72, 101, 183, 255], [235, 209, 101, 255]], tracking="?hair") default ton_glasses_police = DollCloth("tonks", ("head", "glasses"), "glasses", "police", [[181, 199, 214, 255], [177, 77, 116, 255]]) -default ton_top_police1 = DollCloth("tonks", ("upper body", "shirts"), "top", "police1", [[126, 126, 192, 255], [72, 101, 183, 255], [235, 209, 101, 255]], armfix=True) -default ton_top_police2 = DollCloth("tonks", ("upper body", "shirts"), "top", "police2", [[72, 101, 183, 255], [235, 209, 101, 255]], armfix=True) -default ton_top_police3 = DollCloth("tonks", ("upper body", "shirts"), "top", "police3", [[126, 126, 192, 255]], armfix=True) -default ton_bottom_police = DollCloth("tonks", ("lower body", "shorts"), "bottom", "police",[[72, 101, 183, 255], [126, 126, 192, 255]], armfix=True) -default ton_accessory0_police = DollCloth("tonks", ("misc", "accessory"), "accessory3", "police_badge", [[238, 209, 101, 255]], zorder=16) +default ton_top_police1 = DollCloth("tonks", ("upper body", "shirts"), "top", "police1", [[126, 126, 192, 255], [72, 101, 183, 255], [235, 209, 101, 255]]) +default ton_top_police2 = DollCloth("tonks", ("upper body", "shirts"), "top", "police2", [[72, 101, 183, 255], [235, 209, 101, 255]]) +default ton_top_police3 = DollCloth("tonks", ("upper body", "shirts"), "top", "police3", [[126, 126, 192, 255]]) +default ton_bottom_police = DollCloth("tonks", ("lower body", "shorts"), "bottom", "police",[[72, 101, 183, 255], [126, 126, 192, 255]]) +default ton_accessory_police = DollCloth("tonks", ("misc", "accessory"), "accessory", "police_badge", [[238, 209, 101, 255]], zorder=16) -default ton_outfit_police = DollOutfit([ton_hair_base_new, ton_headgear_police, ton_accessory0_police, ton_glasses_police, ton_top_police1, ton_bottom_police], addons=[ton_top_police2, ton_top_police3]) +default ton_outfit_police = DollOutfit([ton_hair_base_new, ton_headgear_police, ton_accessory_police, ton_glasses_police, ton_top_police1, ton_bottom_police], addons=[ton_top_police2, ton_top_police3]) ##################### ## Wrestling Coach ## #Unlocked in a_white_christmas mirror story ##################### default ton_neckwear_whistle = DollCloth ("tonks", ("head", "neckwear"), "neckwear", "whistle", [[110, 64, 37, 255], [134, 160, 169, 255]]) default ton_top_sweatshirt = DollCloth("tonks", ("upper body", "shirts"), "top", "sweatshirt", [[243, 240, 216, 255]]) -default ton_bottom_sweatpants = DollCloth("tonks", ("lower body", "trousers"), "bottom", "sweatpants", [[163, 53, 48, 255], [243, 240, 216, 255]], armfix=True) -default ton_accessory0_neck_towel = DollCloth("tonks", ("misc", "accessory"), "accessory0", "neck_towel", [[255, 252, 216, 255]], zorder=16) +default ton_bottom_sweatpants = DollCloth("tonks", ("lower body", "trousers"), "bottom", "sweatpants", [[163, 53, 48, 255], [243, 240, 216, 255]]) +default ton_accessory_neck_towel = DollCloth("tonks", ("misc", "accessory"), "accessory", "neck_towel", [[255, 252, 216, 255]], zorder=16) -default ton_outfit_wrestling_coach = DollOutfit([ton_hair_base_new, ton_neckwear_whistle, ton_top_sweatshirt, ton_bottom_sweatpants, ton_accessory0_neck_towel]) +default ton_outfit_wrestling_coach = DollOutfit([ton_hair_base_new, ton_neckwear_whistle, ton_top_sweatshirt, ton_bottom_sweatpants, ton_accessory_neck_towel]) ### Add badge! @@ -296,9 +251,9 @@ default ton_outfit_wrestling_coach = DollOutfit([ton_hair_base_new, ton_neckwear ## Misc ## ########## -default ton_top_corset = DollCloth("tonks", ("upper body", "other"), "top", "corset",[[247, 206, 146, 255]], blacklist=["bra", "piercing1"], armfix=True, unlocked=True) -default ton_bottoms_jeans = DollCloth("tonks", ("lower body", "trousers"), "bottom", "jeans",[[51, 104, 105, 255]], armfix=True, unlocked=True) -default ton_panties_base = DollCloth("tonks", ("lower undergarment", "bikini panties"), "panties", "base",[[228, 250, 255, 255], [228, 55, 20, 255]], armfix=True, unlocked=True) +default ton_top_corset = DollCloth("tonks", ("upper body", "other"), "top", "corset",[[247, 206, 146, 255]], blacklist=["bra", "piercing"], unlocked=True) +default ton_bottoms_jeans = DollCloth("tonks", ("lower body", "trousers"), "bottom", "jeans",[[51, 104, 105, 255]], unlocked=True) +default ton_panties_base = DollCloth("tonks", ("lower undergarment", "bikini panties"), "panties", "base",[[228, 250, 255, 255], [228, 55, 20, 255]], unlocked=True) default ton_bra_base = DollCloth("tonks", ("upper undergarment", "bikini bras"), "bra", "bikini",[[228, 250, 255, 255], [228, 55, 20, 255]], unlocked=True) default ton_ruffled_top = DollCloth("tonks", ("upper body", "shirts"), "top", "ruffled_top",[[213, 173, 219, 255]], level=25, unlocked=True) @@ -306,15 +261,15 @@ default ton_earring_cartilege = DollCloth("tonks", ("head", "earrings"), "earrin default ton_earring_hoops = DollCloth("tonks", ("head", "earrings"), "earrings", "hoops", [[161, 159, 159, 255]], unlocked=True) default ton_earring_industrial = DollCloth("tonks", ("head", "earrings"), "earrings", "industrial", [[161, 159, 159, 255]], unlocked=True) -default ton_piercing0_clit_stud = DollCloth("tonks", ("piercings & tattoos", "piercings"), "piercing0", "clit_stud", [[161, 159, 159, 255]], unlocked=True) -default ton_piercing1_nipple_stud = DollCloth("tonks", ("piercings & tattoos", "piercings"), "piercing1", "nipple_stud", [[161, 159, 159, 255]], unlocked=True) -default ton_piercing1_nipple_rings = DollCloth("tonks", ("piercings & tattoos", "piercings"), "piercing1", "nipple_rings", [[161, 159, 159, 255]], unlocked=True) -default ton_piercing1_nipple_rings2 = DollCloth("tonks", ("piercings & tattoos", "piercings"), "piercing1", "nipple_rings2", [[161, 159, 159, 255]], unlocked=True) -default ton_piercing1_nipple_rings3 = DollCloth("tonks", ("piercings & tattoos", "piercings"), "piercing1", "nipple_rings3", [[161, 159, 159, 255]], unlocked=True) +default ton_piercing_clit_stud = DollCloth("tonks", ("piercings & tattoos", "piercings"), "piercing", "clit_stud", [[161, 159, 159, 255]], unlocked=True) +default ton_piercing_nipple_stud = DollCloth("tonks", ("piercings & tattoos", "piercings"), "piercing", "nipple_stud", [[161, 159, 159, 255]], unlocked=True) +default ton_piercing_nipple_rings = DollCloth("tonks", ("piercings & tattoos", "piercings"), "piercing", "nipple_rings", [[161, 159, 159, 255]], unlocked=True) +default ton_piercing_nipple_rings2 = DollCloth("tonks", ("piercings & tattoos", "piercings"), "piercing", "nipple_rings2", [[161, 159, 159, 255]], unlocked=True) +default ton_piercing_nipple_rings3 = DollCloth("tonks", ("piercings & tattoos", "piercings"), "piercing", "nipple_rings3", [[161, 159, 159, 255]], unlocked=True) -default ton_piercing2_belly_stud = DollCloth("tonks", ("piercings & tattoos", "piercings"), "piercing2", "belly_stud", [[161, 159, 159, 255]], unlocked=True) -default ton_piercing2_belly_heart = DollCloth("tonks", ("piercings & tattoos", "piercings"), "piercing2", "belly_heart", [[161, 159, 159, 255]], unlocked=True) -default ton_piercing2_belly_dick = DollCloth("tonks", ("piercings & tattoos", "piercings"), "piercing2", "belly_dick", [[161, 159, 159, 255]], unlocked=True) +default ton_piercing_belly_stud = DollCloth("tonks", ("piercings & tattoos", "piercings"), "piercing", "belly_stud", [[161, 159, 159, 255]], unlocked=True) +default ton_piercing_belly_heart = DollCloth("tonks", ("piercings & tattoos", "piercings"), "piercing", "belly_heart", [[161, 159, 159, 255]], unlocked=True) +default ton_piercing_belly_dick = DollCloth("tonks", ("piercings & tattoos", "piercings"), "piercing", "belly_dick", [[161, 159, 159, 255]], unlocked=True) ################ ## Pubic Hair ## @@ -325,18 +280,18 @@ default ton_pubes_beaver = DollCloth("tonks", ("lower undergarment", "pubes"), " default ton_pubes_stuble = DollCloth("tonks", ("lower undergarment", "pubes"), "pubes", "stuble", [[132, 64, 89, 255]], unlocked=True) default ton_pubes_unshaved = DollCloth("tonks", ("lower undergarment", "pubes"), "pubes", "unshaved", [[132, 64, 89, 255]], unlocked=True) -# Lipstick (DollLipstick) -default ton_makeup4_lipstick = DollLipstick("tonks", ("head", "makeup"), "makeup4", "lipstick", [[255, 70, 70, 255]], unlocked=True) +# Lipstick +default ton_makeup_lipstick = DollMakeup("tonks", ("head", "makeup"), "makeup", "lipstick", [[255, 70, 70, 255]], unlocked=True, tracking="mouth") ##################### ## Mechanic Outfit ## ##################### default ton_mechanic_hair = DollCloth("tonks", ("head", "hair"), "hair", "mechanic_hair", [[255, 146, 185, 255], [254, 218, 238, 255]]) -default ton_mechanic_vest = DollCloth("tonks", ("upper body", "other"), "top", "mechanic_vest", [[255, 132, 11, 255], [255, 242, 74, 255], [151, 169, 171, 255]], blacklist=["bra", "piercing1"]) -default ton_mechanic_shorts = DollCloth("tonks", ("lower body", "shorts"), "bottom", "mechanic_shorts", [[104, 145, 206, 255], [122, 67, 53, 255], [151, 169, 171, 255], [182, 203, 233, 255]], armfix=True) +default ton_mechanic_vest = DollCloth("tonks", ("upper body", "other"), "top", "mechanic_vest", [[255, 132, 11, 255], [255, 242, 74, 255], [151, 169, 171, 255]], blacklist=["bra", "piercing"]) +default ton_mechanic_shorts = DollCloth("tonks", ("lower body", "shorts"), "bottom", "mechanic_shorts", [[104, 145, 206, 255], [122, 67, 53, 255], [151, 169, 171, 255], [182, 203, 233, 255]]) default ton_mechanic_gloves = DollCloth("tonks", ("upper body", "gloves"), "gloves", "mechanic_gloves", [[48, 48, 48, 255]]) -default ton_mechanic_cap = DollCloth("tonks", ("head", "headgear"), "headgear", "mechanic_cap", [[255, 132, 11, 255], [255, 242, 74, 255]]) +default ton_mechanic_cap = DollClothDynamic("tonks", ("head", "headgear"), "headgear", "mechanic_cap", [[255, 132, 11, 255], [255, 242, 74, 255]], tracking="?hair") default ton_mechanic_bikini = DollCloth("tonks", ("lower undergarment", "bikini panties"), "panties", "mechanic_bikini", [[255, 132, 11, 255]]) default ton_mechanic_thigh_socks = DollCloth("tonks", ("legwear", "socks"), "stockings", "mechanic_thigh_socks",[[48, 48, 48, 255]]) @@ -346,9 +301,9 @@ default ton_outfit_mechanic = DollOutfit([ton_mechanic_hair, ton_mechanic_vest, ## Tuxedo (Office) ## ##################### -default ton_robe_office = DollCloth("tonks", ("upper body", "robes"), "robe", "office",[[53, 56, 67, 255], [255, 242, 74, 255]], armfix=True) -default ton_top_office = DollCloth("tonks", ("upper body", "shirts"), "top", "office", [[231, 231, 231, 255], [209, 206, 187, 255]], armfix=True) -default ton_bottoms_office = DollCloth("tonks", ("lower body", "trousers"), "bottom", "office",[[53, 56, 67, 255]], armfix=True) -default ton_accessory_office = DollCloth("tonks", ("misc", "accessory"), "accessory0", "office_pin", [[231, 231, 231, 255], [255, 242, 74, 255], [216, 66, 44, 255]], zorder=29) +default ton_robe_office = DollCloth("tonks", ("upper body", "robes"), "robe", "office",[[53, 56, 67, 255], [255, 242, 74, 255]]) +default ton_top_office = DollCloth("tonks", ("upper body", "shirts"), "top", "office", [[231, 231, 231, 255], [209, 206, 187, 255]]) +default ton_bottoms_office = DollCloth("tonks", ("lower body", "trousers"), "bottom", "office",[[53, 56, 67, 255]]) +default ton_accessory_office = DollCloth("tonks", ("misc", "accessory"), "accessory", "office_pin", [[231, 231, 231, 255], [255, 242, 74, 255], [216, 66, 44, 255]], zorder=29) default ton_outfit_office = DollOutfit([ton_hair_base_new, ton_robe_office, ton_top_office, ton_bottoms_office, ton_accessory_office], price=450, name="SECS Outfit", desc="A smart suit for a clever girl.") diff --git a/game/scripts/doll/body.rpy b/game/scripts/doll/body.rpy index f9cf729a..8926b546 100644 --- a/game/scripts/doll/body.rpy +++ b/game/scripts/doll/body.rpy @@ -1,83 +1,82 @@ init python: class DollBody(DollMethods): - zorder_skin = 5 + layer_types = { + # Body class has no use for layer types + } - def __init__(self, obj, body): + layer_modifiers = { + "zorder": None, + } + + def __init__(self, obj): self.char = obj - self.name = self.char.name - self.body = body - self.hue = 0 - self.imagepath = "characters/{}/body/".format(self.name) + self.layers = None + self.hue = HueMatrix(0) + self.zorder = 0 - def build_image(self): + def get_layers(self): + path = os.path.join("characters", self.char.name, self.char.pose, "body") + + extensions = self.extensions + modifiers = self.layer_modifiers + + layers = {} + for f in renpy.list_files(): + fp, fn = os.path.split(f) + fn, ext = os.path.splitext(fn) + + if not fp == path or not ext in extensions: + continue + + _, *tails = fn.rsplit("_") + + zorder = self.zorder + + if tails: + lmodifier, *tails = tails + + if not lmodifier in modifiers: + print("Invalid modifier for file: {}".format(f)) + continue + + zorder_mod = modifiers.get(lmodifier) + zorder = (zorder + int(zorder_mod)) if lmodifier != "zorder" else int(tails[-1]) + + layers.setdefault(fn, [f, zorder]) + + return layers + + @functools.cache + def build_image(self, matrix=None): + self.layers = layers = self.layers or self.get_layers() sprites = [] - # Add body parts and skin layers from clothes, face, cum - sprites.extend(("{}{}/{}.webp".format(self.imagepath, k, v[0]), v[1]) for k, v in self.body.items() if v[0]) # Body parts - sprites.extend((o[0].skin, self.zorder_skin) for o in self.char.clothes.values() if o[0] and o[0].skin and o[2]) # Clothes skin - sprites.extend((x, self.zorder_skin) for x in self.char.face.get_skin()) # Face skin - sprites.extend((x, self.zorder_skin) for x in self.char.cum.get_skin()) # Cum skin + if matrix is None: + matrix = self.hue - sprites.sort(key=itemgetter(1)) + processors = { + "default": lambda file: Transform(Image(file), matrixcolor=matrix), + } - if self.hue: - sprites = tuple(Transform(x[0], matrixcolor=HueMatrix(self.hue)) for x in sprites) - else: - sprites = tuple(x[0] for x in sprites) + for identifier, (file, zorder) in layers.items(): + processor = processors.get(identifier, processors["default"]) + processed_file = processor(file) + sprites.append((identifier, processed_file, zorder)) return sprites - def build_mannequin(self, group=None): - sprites = [] + @property + def image(self): + if not renpy.is_skipping(): + if not self._image_cached: + self._image_cached = True - # Add body parts and skin layers from clothes - sprites.extend(("{}{}/{}.webp".format(self.imagepath, k, v[0]), v[1]) for k, v in self.body.items() if v[0]) - if group: - sprites.extend((o.skin, self.zorder_skin) for o in group if o and o.skin) + sprites = self.build_image(self.hue) + sprites.sort(key=itemgetter(2)) + sprites = [x[1] for x in sprites] - sprites.sort(key=itemgetter(1)) - sprites = tuple(gray_tint(x[0]) for x in sprites) - return sprites + self._image = Fixed(*sprites, fit_first=True) + return self._image - def get_mannequin(self, group=None): - mannequin = self.build_mannequin(group) - return Fixed(*mannequin, fit_first=True) - - def get_part(self, arg): - return self.body[arg][0] - - def set_body(self, **kwargs): - """Takes keyword argument(s) with the string name of body part file(s). Returns True if image is changed.""" - changed = False - - for arg, value in kwargs.items(): - if value != self.body[str(arg)][0]: - self.body[str(arg)][0] = value - changed = True - - if changed: - self.rebuild_image() - - return changed - - def set_pose(self, pose): - if pose is None: - self.imagepath = "characters/{}/body/".format(self.name) - else: - self.imagepath = "characters/{}/poses/{}/body/".format(self.name, pose) - self.rebuild_image() - return - - def set_zorder(self, **kwargs): - """Takes keyword argument(s) with the string name of body type(s) and int value(s). Returns True if image is changed.""" - changed = False - - for arg, value in kwargs.items(): - if value != self.body[str(arg)][1]: - self.body[str(arg)][1] = value - changed = True - - if changed: - self.rebuild_image() - - return changed + def rebuild_image(self): + self._image_cached = False diff --git a/game/scripts/doll/clothes.rpy b/game/scripts/doll/clothes.rpy index f339f7c9..df997dd8 100644 --- a/game/scripts/doll/clothes.rpy +++ b/game/scripts/doll/clothes.rpy @@ -1,132 +1,169 @@ init python: class DollCloth(DollMethods): - def __init__(self, name, categories, type, id, color, zorder=None, unlocked=False, level=0, blacklist=[], parent=None, armfix=False, modpath=None): + layer_types = { + "mask": "-1", + "skin": 0, + "armfix": "+1", + "outline": None, + "extra": None, + "overlay": None, + } + + layer_modifiers = { + "back": "-300", + "front": "+300", + "zorder": None, + } + + def __init__(self, name, categories, type, id, color, zorder=None, unlocked=False, level=0, blacklist=[], modpath=None, parent=None): self.name = name - self.char = eval(name) self.categories = categories self.type = type self.id = id self.color = color - self.color_default = [x[:] for x in color] self.unlocked = unlocked - self.layers = len(color) - self.parent = parent - self.ico = Null() - self.blacklist = blacklist self.level = level + self.blacklist = blacklist self.modpath = posixpath.normpath(modpath) if modpath else "" - self.armfix = armfix - self.back_outline = None - self.front_outline = None + self.parent = parent - # Inherit zorder from character if needed + self.char = eval(name) + self.color_default = [x[:] for x in color] if color else None self.zorder = zorder or self.char.clothes[type][1] - self.seen = self.unlocked - self.cached_icon = False - - self.set_imagepath() - self.set_layers() + self.bounds = None + self.layers = None + self.pose = "" + self._hash = self.generate_hash() # Add to character wardrobe and unordered list if not parent: self.char.wardrobe.setdefault(self.categories[0], {}).setdefault(self.categories[1], []).append(self) self.char.wardrobe_list.append(self) - def set_imagepath(self): - if any(x in self.type for x in self.multislots): - subpath = self.type[:-1] - else: - subpath = self.type + def __repr__(self): + return f"DollCloth(name={self.name}, categories={self.categories}, type={self.type}, id={self.id}, color={self.color}, zorder={self.zorder}, unlocked={self.unlocked}, level={self.level}, blacklist={self.blacklist}, parent={self.parent}, modpath={self.modpath or None})" - path = "{}/characters/{}/clothes/{}/{}/".format(self.modpath, self.name, subpath, self.id) + def __hash__(self): + return self._hash - if renpy.loadable(path + "0.webp"): - self.imagepath = path - return - raise IOError("Couldn't find file \"{}/characters/{}/clothes/{}/{}/0.webp\"".format(self.modpath, self.name, subpath, self.id)) + def generate_hash(self): + salt = str( sorted( [self.name, self.type, self.id, str(self.color)] ) ) + return hash(salt) - def set_layers(self): - for x in self.layers_special: + def get_layers(self): + path = os.path.join(self.modpath, "characters", self.name, self.pose, "clothes", self.type, self.id) - if x == "zorder": - self.__dict__["zlayers"] = [f for f in renpy.list_files() if f.startswith(self.imagepath.lstrip("/")) and "zorder" in f] - else: - path = "{}{}.webp".format(self.imagepath, x) - self.__dict__[x] = path if renpy.loadable(path) else None + extensions = self.extensions + types = self.layer_types + modifiers = self.layer_modifiers - for x in self.layers_additional: - self.__dict__[x] = [] + layers = {} + for f in renpy.list_files(): + fp, fn = os.path.split(f) + fn, ext = os.path.splitext(fn) - for i in range(self.layers): - path = "{}{}_{}.webp".format(self.imagepath, i, x) - if renpy.loadable(path): - self.__dict__[x].append(path) - else: - self.__dict__[x].append(None) + if not fp == path or not ext in extensions: + continue - path = "{}outline_{}.webp".format(self.imagepath, x) - self.__dict__[x+"_outline"] = path if renpy.loadable(path) else None + # For user's sake, simplicty, and compatibility reasons, + # we sort the layers in the code instead. + # + # Each file name part represents the following: + # layertype_subtype*_zorder*_INT* + # + # Parts marked with * are optional and can be inserted out of order, + # with the exception of zorder, which requires an integer appendix. + # + # Example valid file name combinations: + # + # 0.webp + # 0_zorder_15.webp + # 0_front.webp + # outline.webp + # outline_back.webp + # + # If multiple files exist but with different extension, + # only the first file will be added to the dictionary. - def build_image(self): - sprites = [(self.apply_color("{}{}.webp".format(self.imagepath, x), x), x) for x in range(self.layers)] + ltype, *tails = fn.rsplit("_") - # Add extra layers if exist - for n, x in enumerate(self.layers_extra): - path = "{}{}.webp".format(self.imagepath, x) - if renpy.loadable(path): - sprites.append((path, self.layers+n)) + if not ltype.isdigit() and not ltype in types: + print("Invalid layer type for file: {}".format(f)) + continue - sprites.sort(key=itemgetter(1)) - sprites = tuple(x[0] for x in sprites) - return sprites + zorder = z if (z := types.get(ltype)) is not None else self.zorder - def build_mannequin(self): - sprites = [ - self.get_back(), - self.get_mannequin(), - self.get_front(), - (self.get_image(), self.zorder), - self.get_armfix(mannequin=True) - ] + if isinstance(zorder, str): + # Note: Layer uses relative zorder if it's passed as a string + zorder = self.zorder + int(zorder) - sprites.extend(self.get_zlayers()) + if tails: + lmodifier, *tails = tails - sprites.sort(key=itemgetter(1)) - - # Apply Alpha mask - if self.mask: - mask_zorder = self.zorder-1 - - for i, s in enumerate(sprites): - sprite, sprite_zorder = s - - if mask_zorder > sprite_zorder >= 0: + if not lmodifier in modifiers: + print("Invalid modifier for file: {}".format(f)) continue - c = tuple(x[0] for x in sprites[:i] if not isinstance(x[0], Null)) - masked = AlphaMask(Fixed(*c, fit_first=True), self.mask) - sprites = sprites[i:] - sprites.insert(0, (masked, mask_zorder)) - break + zorder_mod = modifiers.get(lmodifier) + zorder = (zorder + int(zorder_mod)) if lmodifier != "zorder" else int(tails[-1]) + layers.setdefault("_".join([ltype, lmodifier]), [f, zorder]) + else: + layers.setdefault(ltype, [f, zorder]) + return layers - bounds = "{}outline.webp".format(self.imagepath) if renpy.loadable("{}outline.webp".format(self.imagepath)) else "{}0.webp".format(self.imagepath) + @functools.cache + def build_image(self, hash, matrix=None): + self.layers = layers = self.layers or self.get_layers() - sprites = tuple(x[0] for x in sprites) - return (sprites, bounds) + if matrix is None: + matrix = self.char.body.hue - def make_icon(self): - thread = DollThread(target=self.build_icon) - thread.daemon = True - thread.start() + processors = { + "skin": lambda file, _: Transform(file, matrixcolor=matrix), + "armfix": lambda file, _: Transform(file, matrixcolor=matrix), + "colored": lambda file, n: self.apply_color(file, int(n)), + "default": lambda file, _: Image(file), + } - sprite = thread.join() + sprites = [] + for identifier, (file, zorder) in layers.items(): - self.ico = DollDisplayable(sprite) + if ((n := identifier.rsplit("_", 1)[0]).isdigit()): + processor = processors["colored"] + else: + processor = processors.get(identifier, processors["default"]) - def build_icon(self): - sprites, bounds = self.build_mannequin() + processed_file = processor(file, n) + sprites.append((identifier, processed_file, zorder)) + + return sprites + + @property + def image(self): + if not renpy.is_skipping(): + if not self._image_cached: + self._image_cached = True + + sprites = self.build_image(self._hash) + sprites.sort(key=itemgetter(2)) + sprites = [x[1] for x in sprites] + + self._image = Fixed(*sprites, fit_first=True) + return self._image + + def rebuild_image(self): + self._hash = self.generate_hash() + self._image_cached = False + + @functools.cache + def build_icon(self, hash): + matrix = SaturationMatrix(0.0) + sprites = [i for i in self.build_image(hash, matrix=matrix) if not i[0] == "mask"] + sprites.extend(self.char.body.build_image(matrix=matrix)) + sprites.sort(key=itemgetter(2)) + self.bounds = bounds = self.bounds or self.layers.get("outline", [sprites[0][1]])[0] wmax, hmax = self.sizes wmin = hmin = 96 @@ -146,73 +183,11 @@ init python: if y+h > hmax: y = hmax-h - return Transform(Fixed(*sprites, fit_first=True), crop=(x, y, w, h)) + return Transform(Fixed(*[i[1] for i in sprites], fit_first=True), crop=(x, y, w, h)) - def rebuild_icon(self): - # Defers rebuild until next time get_image is called - self.cached_icon = False - - def get_zlayers(self): - """Returns a list of zordered layers""" - zlayers = [] - - for i in self.zlayers: - path, filename = os.path.split(i) - filename = os.path.splitext(filename)[0] - - # I.e "0_zorder_35", we don't need the middle control - layertype, _, zorder = filename.split("_") - - if layertype.isdigit(): - zlayers.append((self.apply_color(i, int(layertype)), int(zorder))) - else: - zlayers.append((i, int(zorder))) - - return zlayers - - def get_back(self): - """Returns a list of layers displayed in the back of object/character""" - back_outline = [self.back_outline] if self.back_outline else [] - sprites = [self.apply_color(x, n) for n, x in enumerate(self.back) if x] + back_outline - if sprites: - return (Fixed(*sprites, fit_first=True), -100+self.zorder) - - w, h = self.sizes - return (Null(width=w, height=h), -100+self.zorder) - - def get_front(self): - """Returns a list of layers displayed in the front of object/character""" - front_outline = [self.front_outline] if self.front_outline else [] - sprites = [self.apply_color(x, n) for n, x in enumerate(self.front) if x] + front_outline - if sprites: - return (Fixed(*sprites, fit_first=True), 100+self.zorder) - - w, h = self.sizes - return (Null(width=w, height=h), 100+self.zorder) - - def get_armfix(self, mannequin=False): - if self.armfix: - if mannequin: - armleft = gray_tint("{}armleft/{}_fix.webp".format(self.char.body.imagepath, self.char.body.get_part("armleft"))) - armright = gray_tint("{}armright/{}_fix.webp".format(self.char.body.imagepath, self.char.body.get_part("armright"))) - else: - armleft = Transform("{}armleft/{}_fix.webp".format(self.char.body.imagepath, self.char.body.get_part("armleft")), matrixcolor=HueMatrix(self.char.body.hue)) - armright = Transform("{}armright/{}_fix.webp".format(self.char.body.imagepath, self.char.body.get_part("armright")), matrixcolor=HueMatrix(self.char.body.hue)) - return (Fixed(armleft, armright, fit_first=True), 0.5+self.zorder) - - w, h = self.sizes - return (Null(width=w, height=h), 0.5+self.zorder) - - def get_mannequin(self): - return (self.char.body.get_mannequin(group=[self]), 0) - - def get_icon(self): - """Returns cropped Fixed displayable""" - if not renpy.is_skipping(): - if not self.cached_icon: - self.cached_icon = True - self.make_icon() - return self.ico + @property + def icon(self): + return self.build_icon(self._hash) def apply_color(self, img, n): """Takes image and int layer number. Used internally.""" @@ -258,8 +233,9 @@ init python: elif isinstance(n, list): self.color = [x[:] for x in n] self.rebuild_image() - self.char.rebuild_image() - self.rebuild_icon() + + if self.char.is_equipped_item(self): + self.char.rebuild_image() def reset_color(self, n=None): """Reset cloth color. Takes optional int layer number to reset only specific layer color.""" @@ -269,47 +245,32 @@ init python: self.color = [x[:] for x in self.color_default] self.rebuild_image() self.char.rebuild_image() - self.rebuild_icon() def clone(self): """Creates a clone of this cloth object. Since it requires a parent object it should be used internally only to avoid object depth issue.""" - return DollCloth(self.name, self.categories, self.type, self.id, [x[:] for x in self.color], self.zorder, self.unlocked, self.level, self.blacklist, self, self.armfix, self.modpath) + if self.parent: + return self + return DollCloth(self.name, self.categories, self.type, self.id, [x[:] for x in self.color] if self.color else None, self.zorder, self.unlocked, self.level, self.blacklist, self.modpath, self) def set_pose(self, pose): - compatible = False + # TODO: Might not be needed anymore. + last_pose = self.pose + self.pose = pose + layers = self.get_layers() - for x in (self.categories[0], self.categories[1], self.type): - if pose is None: - path = "{}/characters/{}/clothes/{}/{}/".format(self.modpath, self.name, x, self.id) - if renpy.loadable(path + "0.webp"): - self.imagepath = path - self.char.wear(self.type) - compatible = True - break - else: - path = "{}/characters/{}/poses/{}/clothes/{}/{}/".format(self.modpath, self.name, pose, x, self.id) - if renpy.loadable(path + "0.webp"): - self.imagepath = path - self.char.wear(self.type) - compatible = True - break - - if not compatible: + if not layers: + self.pose = last_pose self.char.strip(self.type) return - self.set_layers() + self.pose = pose + self.char.wear(self.type) + self.layers = layers self.rebuild_image() - return - - def is_compatible(self): - return def is_modded(self): """Returns True if item comes from a mod.""" - if self.modpath: - return True - return False + return bool(self.modpath) def get_modname(self): """Return the name of the mod directory if exists.""" @@ -319,7 +280,7 @@ init python: self.seen = True def is_multislot(self): - return any(x in self.type for x in self.multislots) + return self.type in self.multislots def unlock(self): self.unlocked = True diff --git a/game/scripts/doll/clothes_dynamic.rpy b/game/scripts/doll/clothes_dynamic.rpy new file mode 100644 index 00000000..b13dc65a --- /dev/null +++ b/game/scripts/doll/clothes_dynamic.rpy @@ -0,0 +1,156 @@ +init python: + class DollClothDynamic(DollCloth): + prefixes = ("!", "?") + + def __init__(self, name, categories, type, id, color, zorder=None, unlocked=False, level=0, blacklist=[], modpath=None, tracking=None, parent=None): + self._tracking = tracking + + super().__init__(name, categories, type, id, color, zorder, unlocked, level, blacklist, modpath, parent) + + def __repr__(self): + return f"DollMakeup(name={self.name}, categories={self.categories}, type={self.type}, id={self.id}, color={self.color}, zorder={self.zorder}, unlocked={self.unlocked}, level={self.level}, blacklist={self.blacklist}, modpath={self.modpath or None}, tracking={self._tracking}, parent={self.parent})" + + @property + def tracking(self): + prefixes = "".join(self.prefixes) + return self._tracking.strip(prefixes) + + @property + def tracking_object(self): + tracking = self.tracking + return self.char.clothes.get(tracking)[0] + + def generate_hash(self): + tracking_object = self.tracking_object + tracking_hash = str(tracking_object._hash) if tracking_object else "default" + salt = str( sorted( [self.name, self.type, self.id, str(self.color)] ) ) + tracking_hash + return hash(salt) + + def get_layers(self, _ignore_equipped=False): + path = os.path.join(self.modpath, "characters", self.name, self.pose, "clothes", self.type, self.id) + _tracking = self._tracking + + def _negative_lookahead(tracking): + return None if self.tracking_object else "default" + + def _lookahead(tracking, path): + tracking_object = self.tracking_object + tracking_id = tracking_object.id if tracking_object else None + path = os.path.join(path, tracking_id) + + if not any(fp.startswith(path) for fp in renpy.list_files()): + return "default" + return tracking_id + + def _default(tracking): + tracking_object = self.tracking_object + return tracking_object.id if tracking_object else None + + if _ignore_equipped: + tracking_id = "default" + else: + processors = { + "!": lambda tracking, _: _negative_lookahead(_tracking), + "?": lambda tracking, path: _lookahead(_tracking, path), + None: lambda tracking, _: _default(_tracking) + } + + prefix = next((p for p in self.prefixes if _tracking.startswith(p)), None) + processor = processors[prefix] + tracking_id = processor(_tracking, path) + + if tracking_id is None: + print(f"Invalid tracker for object: {self}") + return {} + + path = os.path.join(path, tracking_id) + + extensions = self.extensions + types = self.layer_types + modifiers = self.layer_modifiers + + layers = {} + for f in renpy.list_files(): + fp, fn = os.path.split(f) + fn, ext = os.path.splitext(fn) + + if not fp == path or not ext in extensions: + continue + + ltype, *tails = fn.rsplit("_") + + if not ltype.isdigit() and not ltype in types: + print(f"Invalid layer type for file: {f}") + continue + + zorder = z if (z := types.get(ltype)) is not None else self.zorder + + if isinstance(zorder, str): + zorder = self.zorder + int(zorder) + + if tails: + lmodifier, *tails = tails + + if not lmodifier in modifiers: + print("Invalid modifier for file: {}".format(f)) + continue + + zorder_mod = modifiers.get(lmodifier) + zorder = (zorder + int(zorder_mod)) if lmodifier != "zorder" else int(tails[-1]) + layers.setdefault("_".join([ltype, lmodifier]), [f, zorder]) + else: + layers.setdefault(ltype, [f, zorder]) + + return layers + + def rebuild_image(self): + self.layers = self.get_layers() + self._hash = self.generate_hash() + self._image_cached = False + + @functools.cache + def build_icon(self, hash): + _tracking = self._tracking + + if _tracking.startswith("!"): + self.layers = self.get_layers(_ignore_equipped=True) + hash = self.generate_hash() + tracking_object = None + else: + tracking_object = self.tracking_object + + matrix = SaturationMatrix(0.0) + sprites = [i for i in self.build_image(hash, matrix=matrix) if not i[0] == "mask"] + + if not tracking_object is None: + sprites.extend([i for i in tracking_object.build_image(tracking_object._hash, matrix=matrix) if not i[0] == "mask"]) + + sprites.extend(self.char.body.build_image(matrix=matrix)) + sprites.sort(key=itemgetter(2)) + self.bounds = bounds = self.bounds or self.layers.get("outline", [sprites[0][1]])[0] + + wmax, hmax = self.sizes + wmin = hmin = 96 + + x, y, w, h = crop_whitespace(bounds) + xoffset, yoffset = w/2, h/2 + + w = h = max(w, h, wmin, hmin) + + w = max(wmin, w + w/2) + h = max(hmin, h + h/2) + + x = clamp( (x - w/2) + xoffset, 0, wmax) + y = clamp( (y - h/2) + yoffset, 0, hmax) + + # Forbid exceeding the image height. + if y+h > hmax: + y = hmax-h + + return Transform(Fixed(*[i[1] for i in sprites], fit_first=True), crop=(x, y, w, h)) + + def clone(self): + """Creates a clone of this cloth object. Since it requires a parent object it should be used internally only to avoid object depth issue.""" + if self.parent: + return self + return DollClothDynamic(self.name, self.categories, self.type, self.id, [x[:] for x in self.color] if self.color else None, self.zorder, self.unlocked, self.level, self.blacklist, self.modpath, self._tracking, self) diff --git a/game/scripts/doll/common.rpy b/game/scripts/doll/common.rpy index 6744c1b7..f7ce08aa 100644 --- a/game/scripts/doll/common.rpy +++ b/game/scripts/doll/common.rpy @@ -70,38 +70,21 @@ init -1 python: class DollMethods(object): """Container class for commonly used methods and attributes""" - sprite = Null() - cached = False - threadlock = False - icon_threadlock = False - - layers_extra = ("extra", "outline", "overlay") - layers_special = ("skin", "mask", "wind_mask", "zorder") - layers_additional = ("back", "front") - + _image = Null() + _image_cached = False blacklist_toggles = ("hair", "glasses", "pubes", "piercing", "makeup", "tattoo", "earrings") blacklist_unequip = ("hair",) multislots = ("makeup", "accessory", "piercing", "tattoo") - + extensions = {".webp", ".png", ".jxl"} sizes = (1010, 1200) # Default sizes used for defining rare cases def rebuild_image(self): - # Defers rebuild until next time get_image is called - self.cached = False + self._image_cached = True - def make_image(self): - thread = DollThread(target=self.build_image) - thread.daemon = True - thread.start() - - sprites = thread.join() - - self.sprite = DollDisplayable(Fixed(*sprites, fit_first=True)) - - def get_image(self): + @property + def image(self): if not renpy.is_skipping(): - if not self.cached: - self.cached = True - - self.make_image() - return self.sprite + if not self._image_cached: + self._image_cached = True + self._image = self.build_image() + return self._image diff --git a/game/scripts/doll/cum.rpy b/game/scripts/doll/cum.rpy index 7ff113d4..07b164f5 100644 --- a/game/scripts/doll/cum.rpy +++ b/game/scripts/doll/cum.rpy @@ -1,45 +1,141 @@ init python: class DollCum(DollMethods): - zorder_cum = 100 + layer_types = { + "skin": 0, + "cum": 100, + } + + layer_modifiers = { + "zorder": None, + } def __init__(self, obj): self.char = obj - self.name = self.char.name - self.imagepath = "characters/{}/cum/".format(self.name) - - self.cum = dict((k, None) for k in {"hair", "face", "breasts", "body", "crotch", "pussy", "legs"}) - - def build_image(self): - sprites = tuple("{}{}/{}.webp".format(self.imagepath, k, v) for k, v in self.cum.items() if v != None) - return sprites - - def get_skin(self): - return ["{}{}/{}_skin.webp".format(self.imagepath, k, v) for k, v in self.cum.items() if renpy.loadable("{}{}/{}_skin.webp".format(self.imagepath, k, v))] + self.layers = None + self._cum = {k: None for k in {"hair", "face", "breasts", "body", "crotch", "pussy", "legs"}} def set_cum(self, *args, **kwargs): - """Takes keyword argument(s) containing string name(s) of cum layers to apply or None. Returns True if image is changed.""" - changed = False - if args: - for k, v in self.cum.items(): - if v != args[0]: - self.cum[k] = args[0] - changed = True + self._cum = {k: args[0] for k in self._cum} - for arg, value in kwargs.items(): - if str(arg) != value: - self.cum[str(arg)] = value - changed = True - - if changed: - self.rebuild_image() - - return changed - - def set_pose(self, pose): - if pose is None: - self.imagepath = "characters/{}/cum/".format(self.name) - else: - self.imagepath = "characters/{}/poses/{}/cum/".format(self.name, pose) + self._cum.update(kwargs) + self.layers = self.get_layers() self.rebuild_image() - return + + def get_layers(self): + cum = self._cum + + extensions = self.extensions + types = self.layer_types + modifiers = self.layer_modifiers + + layers = {} + for part, name in cum.items(): + + if name is None: + continue + + path = os.path.join("characters", self.char.name, self.char.pose, "cum", part, name) + + for f in renpy.list_files(): + fp, fn = os.path.split(f) + fn, ext = os.path.splitext(fn) + + if not fp == path or not ext in extensions: + continue + + ltype, *tails = fn.rsplit("_") + + if not ltype in types: + print("Invalid layer type for file: {}".format(f)) + continue + + zorder = types.get(ltype) + + if tails: + lmodifier, *tails = tails + + if not lmodifier in modifiers: + print("Invalid modifier for file: {}".format(f)) + continue + + zorder_mod = modifiers.get(lmodifier) + zorder = (zorder + int(zorder_mod)) + layers.setdefault(" ".join([part, name, ltype, lmodifier]), [f, zorder]) + else: + layers.setdefault(" ".join([part, name, ltype]), [f, zorder]) + + return layers + + def build_image(self, matrix=None): + self.layers = layers = self.layers or self.get_layers() + + if matrix is None: + matrix = self.char.body.hue + + processors = { + "skin": lambda file: Transform(file, matrixcolor=matrix), + "default": lambda file: Image(file), + } + + sprites = [] + for identifier, (file, zorder) in layers.items(): + + cum_type, name, ltype = identifier.rsplit(" ") + processor = processors.get(identifier, processors["default"]) + + processed_file = processor(file) + sprites.append((identifier, processed_file, zorder)) + + return sprites + + @property + def image(self): + if not renpy.is_skipping(): + if not self._image_cached: + self._image_cached = True + + sprites = self.build_image() + sprites.sort(key=itemgetter(2)) + sprites = [x[1] for x in sprites] + + self._image = Fixed(*sprites, fit_first=True) + return self._image + + def rebuild_image(self): + self._image_cached = False + + # def build_image(self): + # sprites = tuple("{}{}/{}.webp".format(self.imagepath, k, v) for k, v in self.cum.items() if v != None) + # return sprites + + # def get_skin(self): + # return ["{}{}/{}_skin.webp".format(self.imagepath, k, v) for k, v in self.cum.items() if renpy.loadable("{}{}/{}_skin.webp".format(self.imagepath, k, v))] + + # def set_cum(self, *args, **kwargs): + # """Takes keyword argument(s) containing string name(s) of cum layers to apply or None. Returns True if image is changed.""" + # changed = False + + # if args: + # for k, v in self.cum.items(): + # if v != args[0]: + # self.cum[k] = args[0] + # changed = True + + # for arg, value in kwargs.items(): + # if str(arg) != value: + # self.cum[str(arg)] = value + # changed = True + + # if changed: + # self.rebuild_image() + + # return changed + + # def set_pose(self, pose): + # if pose is None: + # self.imagepath = "characters/{}/cum/".format(self.name) + # else: + # self.imagepath = "characters/{}/poses/{}/cum/".format(self.name, pose) + # self.rebuild_image() + # return diff --git a/game/scripts/doll/face.rpy b/game/scripts/doll/face.rpy index dabe4fc2..0592e9dc 100644 --- a/game/scripts/doll/face.rpy +++ b/game/scripts/doll/face.rpy @@ -1,95 +1,130 @@ init python: class DollFace(DollMethods): + layer_types = { + "eyemask": -1, + "skin": 0, + "expression": 1, + "overlay": 2, + } - blacklist_blink = {None, "closed", "happyCl", "wink"} + layer_modifiers = { + "zorder": None, + } - def __init__(self, obj, face): + def __init__(self, obj): self.char = obj - self.name = self.char.name - self.face = face - self.imagepath = "characters/{}/face/".format(self.name) + self.layers = None + self._face = {k: None for k in {"cheeks", "eyebrows", "eyes", "mouth", "pupils", "tears"}} + self._hash = None - def build_image(self): - sprites = [] - ### TODO: This piece of code needs to be simplified. + def set_face(self, *args, **kwargs): + if args: + self._face = {k: args[0] for k in self._face} - # Add facial expressions - for k, v in self.face.items(): - if v[0] and k not in ("eyes", "pupils"): - sprites.append(("{}{}/{}.webp".format(self.imagepath, k, v[0]), v[1])) + self._face.update(kwargs) + self.layers = self.get_layers() + self.rebuild_image() - eyes = self.face["eyes"][0] - pupils = self.face["pupils"][0] + def generate_hash(self): + salt = str( [self.char.name] + sorted( list( self._face.items() ) )) + return hash(salt) - if eyes not in self.blacklist_blink: - blink_path = "{}eyes/closed.webp".format(self.imagepath) - eyes_path = "{}eyes/{}.webp".format(self.imagepath, eyes) - mask_path = "{}eyes/{}_mask.webp".format(self.imagepath, eyes) - pupils_path = "{}pupils/{}.webp".format(self.imagepath, pupils) + def get_layers(self): + face = self._face - if pupils: - if renpy.loadable(blink_path): - normal = Fixed(eyes_path, AlphaMask(pupils_path, mask_path), fit_first=True) - sprites.append( (doll_blink(normal, blink_path), self.face["eyes"][1]) ) + extensions = self.extensions + types = self.layer_types + modifiers = self.layer_modifiers + + layers = {} + for part, name in face.items(): + + if name is None: + continue + + path = os.path.join("characters", self.char.name, self.char.pose, "face", part, name) + + for f in renpy.list_files(): + fp, fn = os.path.split(f) + fn, ext = os.path.splitext(fn) + + if not fp == path or not ext in extensions: + continue + + ltype, *tails = fn.rsplit("_") + + if not ltype in types: + print("Invalid layer type for file: {}".format(f)) + continue + + zorder = types.get(ltype) + + if tails: + lmodifier, *tails = tails + + if not lmodifier in modifiers: + print("Invalid modifier for file: {}".format(f)) + continue + + zorder_mod = modifiers.get(lmodifier) + zorder = (zorder + int(zorder_mod)) + layers.setdefault(" ".join([part, name, ltype, lmodifier]), [f, zorder]) else: - sprites.append((eyes_path, self.face["eyes"][1])) + layers.setdefault(" ".join([part, name, ltype]), [f, zorder]) - if renpy.loadable(mask_path): - sprites.append((AlphaMask(pupils_path, mask_path), self.face["pupils"][1])) - else: - if eyes: - eyes_path = "{}eyes/{}.webp".format(self.imagepath, eyes) - sprites.append((eyes_path, self.face["eyes"][1])) + return layers - mask_path = "{}eyes/{}_mask.webp".format(self.imagepath, eyes) - if renpy.loadable(mask_path): - pupils_path = "{}pupils/{}.webp".format(self.imagepath, pupils) - sprites.append((AlphaMask(pupils_path, mask_path), self.face["pupils"][1])) + @functools.cache + def build_image(self, hash, matrix=None): + self.layers = layers = self.layers or self.get_layers() + + try: + eyemask = layers.pop(next(k for k in layers if "eyemask" in k), [None])[0] + except StopIteration: + eyemask = None + + if matrix is None: + matrix = self.char.body.hue + + processors = { + "skin": lambda file: Transform(file, matrixcolor=matrix), + "pupils": lambda file: AlphaMask(file, eyemask), + "default": lambda file: Image(file), + } + + sprites = [] + for identifier, (file, zorder) in layers.items(): + + expr_type, name, ltype = identifier.rsplit(" ") + + if expr_type == "pupils": + if not eyemask: + continue + processor = processors["pupils"] + else: + processor = processors.get(identifier, processors["default"]) + + processed_file = processor(file) + sprites.append((identifier, processed_file, zorder)) - sprites.sort(key=itemgetter(1)) - sprites = tuple(x[0] for x in sprites) return sprites - def get_skin(self): - for k, v in self.face.items(): - skin_path = "{}{}/{}_skin.webp".format(self.imagepath, k, v[0]) - if renpy.loadable(skin_path): - yield skin_path + @property + def image(self): + if not renpy.is_skipping(): + if not self._image_cached: + self._image_cached = True - def get_face(self): - return dict((k, v[0]) for k, v in self.face.items()) + sprites = self.build_image(self._hash) + sprites.sort(key=itemgetter(2)) + sprites = [x[1] for x in sprites] - def set_face(self, **kwargs): - """Takes keyword argument(s) with the string name of expression file(s). Returns True if image is changed.""" - changed = False - for arg, value in kwargs.items(): - if value not in (self.face[str(arg)][0], False): - self.face[str(arg)][0] = value - changed = True + self._image = Fixed(*sprites, fit_first=True) + return self._image - if changed: - self.rebuild_image() + def rebuild_image(self): + self._hash = self.generate_hash() + self._image_cached = False - return changed - - def set_pose(self, pose): - if pose is None: - self.imagepath = "characters/{}/face/".format(self.name) - else: - self.imagepath = "characters/{}/poses/{}/face/".format(self.name, pose) - - self.rebuild_image() - return - - def set_zorder(self, **kwargs): - """Takes keyword argument(s) with the string name of face type(s) and int value(s). Returns True if image is changed.""" - changed = False - for arg, value in kwargs.items(): - if value != self.face[str(arg)][1]: - self.face[str(arg)][1] = value - changed = True - - if changed: - self.rebuild_image() - - return changed + # def get_face(self): + # return dict((k, v[0]) for k, v in self.face.items()) diff --git a/game/scripts/doll/lipstick.rpy b/game/scripts/doll/lipstick.rpy deleted file mode 100644 index 12b1df47..00000000 --- a/game/scripts/doll/lipstick.rpy +++ /dev/null @@ -1,68 +0,0 @@ -init python: - class DollLipstick(DollCloth): - - def set_imagepath(self): - self.imagepath = "{}/characters/{}/clothes/makeup/lipstick/".format(self.modpath, self.name) - - def set_layers(self): - for x in self.layers_special: - if x == "zorder": - self.__dict__["zlayers"] = [f for f in renpy.list_files() if f.startswith(self.imagepath.lstrip("/")) and "zorder" in f] - else: - self.__dict__[x] = None - - for x in self.layers_additional: - self.__dict__[x] = [] - for i in range(self.layers): - path = "{}{}_{}.webp".format(self.imagepath, i, x) - if renpy.loadable(path): - self.__dict__[x].append(path) - self.__dict__[x+"_outline"] = None - - return - - def build_image(self): - mouth = self.char.face.face["mouth"][0] - sprites = ((self.apply_color("{}{}.webp".format(self.imagepath, mouth), 0)), ) - return sprites - - def build_icon(self): - mouth = "base" #HARDCODED - sprites = (self.char.body.get_mannequin([self]), self.apply_color("{}{}.webp".format(self.imagepath, mouth), 0), ) - bounds = "{}{}.webp".format(self.imagepath, mouth) - - wmax, hmax = self.sizes - wmin = hmin = 96 - - x, y, w, h = crop_whitespace(bounds) - xoffset, yoffset = w/2, h/2 - - w = h = max(w, h, wmin, hmin) - - w = max(wmin, w + w/2) - h = max(hmin, h + h/2) - - x = clamp( (x - w/2) + xoffset, 0, wmax) - y = clamp( (y - h/2) + yoffset, 0, hmax) - - # Forbid exceeding the image height. - if y+h > hmax: - y = hmax-h - - return Transform(Fixed(*sprites, fit_first=True), crop=(x, y, w, h)) - - def set_pose(self, pose): - if pose is None: - path = "{}/characters/{}/clothes/makeup/lipstick/".format(self.modpath, self.name) - self.imagepath = path - else: - path = "{}/characters/{}/poses/{}/clothes/makeup/lipstick/".format(self.modpath, self.name, pose) - if renpy.loadable(path + "base.webp"): - self.imagepath = path - - self.rebuild_image() - return - - def clone(self): - """Creates a clone of this lipstick object. Since it requires a parent object it should be used internally only to avoid object depth issue.""" - return DollLipstick(self.name, self.categories, self.type, self.id, [x[:] for x in self.color], self.zorder, self.unlocked, self.level, self.blacklist, self, self.armfix, self.modpath) diff --git a/game/scripts/doll/main.rpy b/game/scripts/doll/main.rpy index 06422d5f..b2a31edb 100644 --- a/game/scripts/doll/main.rpy +++ b/game/scripts/doll/main.rpy @@ -2,17 +2,39 @@ init python: import asyncio class Doll(DollMethods): - def __init__(self, name, clothes, face, body): + layers = [ + ("buttplug", -11), + ("makeup", 111), # multislot + ("accessory", 121), # multislot + ("piercing", 131), # multislot + ("tattoo", 141), # multislot + ("pubes", 151), + ("stockings", 161), + ("panties", 171), + ("garterbelt", 181), + ("bottom", 191), + ("bra", 201), + ("top", 211), + ("gloves", 221), + ("robe", 231), + ("neckwear", 241), + ("hair", 251), + ("earrings", 261), + ("glasses", 271), + ("headgear", 281) + ] + + def __init__(self, name): self.wardrobe = {} self.wardrobe_list = [] self.blacklist = [] self.outfits = [] self.name = name - self.clothes = clothes - self.face = DollFace(self, face) - self.body = DollBody(self, body) + self.clothes = {layer[0]: [None, layer[1], True] for layer in self.layers} + self.face = DollFace(self) + self.body = DollBody(self) self.cum = DollCum(self) - self.pose = None + self.pose = "" self.emote = Null() # Image properties @@ -39,12 +61,6 @@ init python: o.rebuild_image() self.rebuild_image() - def rebuild_image(self): - self.cached = False - - if renpy.showing(get_character_tag(self.name), layer=self.layer): - self.show() - def show(self): if renpy.get_screen(("wardrobe", "animatedCG", "studio")): return @@ -57,14 +73,11 @@ init python: if animation: at_list.append(animation) - renpy.show(name=self.tag, at_list=at_list, layer=self.layer, what=self.get_image(), zorder=self.zorder) + renpy.show(name=self.tag, at_list=at_list, layer=self.layer, what=self.image, zorder=self.zorder) def hide(self): renpy.hide(name=self.tag, layer=self.layer) - def make_image(self): - asyncio.run(self.build_image()) - async def build_image(self): # Add body, face, cum, clothes, masks @@ -73,41 +86,34 @@ init python: masks = [] for i in clothes.values(): - obj, _, is_worn = i + if i[0] and i[2]: + for identifier, layer, zorder in i[0].build_image(i[0]._hash): + if identifier == "mask": + masks.append((layer, zorder)) + else: + sprites.append((layer, zorder)) - if not obj is None and is_worn: - zorder = obj.zorder - - sprites.extend([ - (obj.get_image(), zorder), - obj.get_back(), - obj.get_front(), - obj.get_armfix(), - ] + obj.get_zlayers()) - - if obj.mask: - masks.append((obj.mask, zorder-1)) return (sprites, masks) async def build_face(): - return (self.face.get_image(), 1) + return (self.face.image, 1) async def build_body(): - return (self.body.get_image(), 0) + return (self.body.image, 0) - async def build_cum(zorder): - return (self.face.get_image(), zorder) + async def build_cum(): + return (self.cum.image, 100) - face, body, cum, (clothes, masks) = await asyncio.gather( - build_cum(self.cum.zorder_cum), + body, face, cum, (clothes, masks) = await asyncio.gather( build_body(), build_face(), + build_cum(), build_clothes(self.clothes), ) sprites = [ - face, body, + face, cum, *clothes, (self.emote, 1000) @@ -140,51 +146,72 @@ init python: break sprites = back_sprites + [x[0] for x in sprites] - self.sprite = DollDisplayable(Fixed(*sprites, fit_first=True)) + self._image = Fixed(*sprites, fit_first=True) return + @property + def image(self): + if not renpy.is_skipping(): + if not self._image_cached: + self._image_cached = True + asyncio.run(self.build_image()) + + return self._image + + def rebuild_image(self): + self._image_cached = False + + if renpy.showing(get_character_tag(self.name), layer=self.layer): + self.show() + def equip(self, obj, remove_old=True): """Takes DollCloth or DollOutfit object to equip.""" if isinstance(obj, DollCloth): - self.clothes[obj.type][0] = obj - self.clothes[obj.type][2] = True - - if self.is_blacklisted(obj.type): - self.unequip(*self.get_blacklister(obj.type)) - - if obj.blacklist: - self.unequip(*obj.blacklist) - - if self.pose: - obj.set_pose(self.pose) + self._equip_cloth(obj) elif isinstance(obj, DollOutfit): if remove_old: self.unequip("all") - - for i in obj.group: - self.clothes[i.type][0] = i.parent - self.clothes[i.type][0].set_color(i.color) - if self.pose: - i.parent.set_pose(self.pose) + for cloth in obj.group: + self._equip_cloth(cloth.parent, color=cloth.color) elif isinstance(obj, (list, tuple)): for cloth in obj: - self.clothes[cloth.type][0] = cloth - self.clothes[cloth.type][2] = True - - if self.is_blacklisted(cloth.type): - self.unequip(*self.get_blacklister(cloth.type)) - - if cloth.blacklist: - self.unequip(*cloth.blacklist) - - if self.pose: - cloth.set_pose(self.pose) + self._equip_cloth(cloth) self.body.rebuild_image() self.rebuild_image() self.rebuild_blacklist() update_chibi(self.name) + def _equip_cloth(self, cloth, color=None): + if cloth.type in self.multislots: + for i in range(100): + multitype = cloth.type + str(i) + if multitype not in self.clothes or self.clothes[multitype][0] is None: + zorder = self.clothes[cloth.type][1] + self.clothes[multitype] = [cloth, zorder, True] + break + else: + zorder = self.clothes[cloth.type][1] + self.clothes[cloth.type] = [cloth, zorder, True] + + if self.is_blacklisted(cloth.type): + self.unequip(*self.get_blacklister(cloth.type)) + + if cloth.blacklist: + self.unequip(*cloth.blacklist) + + if self.pose: + cloth.set_pose(self.pose) + + for tracking in self.get_trackers_list(cloth.type): + tracking.rebuild_image() + + if isinstance(cloth, DollClothDynamic): + cloth.rebuild_image() + + if color: + cloth.set_color(color) + def unequip(self, *args): """Takes argument(s) containing string cloth type(s) to unequip.""" if "all" in args: @@ -195,10 +222,37 @@ init python: v[0], v[2] = None, True else: for arg in args: - if not arg in self.blacklist_unequip: - if self.pose and self.clothes[arg][0]: - self.clothes[arg][0].set_pose(None) - self.clothes[arg][0] = None + if isinstance(arg, DollCloth): + if arg.type in self.multislots: + slot = next((k for k, v in self.clothes.items() if v[0] == arg), None) + + if not slot: + continue + + if self.pose and self.clothes[slot][0]: + self.clothes[slot][0].set_pose(None) + self.clothes[slot][0] = None + else: + if self.pose and self.clothes[arg.type][0]: + self.clothes[arg.type][0].set_pose(None) + self.clothes[arg.type][0] = None + + for tracking in self.get_trackers_list(arg.type): + tracking.rebuild_image() + else: + if arg in self.multislots: + for k, v in self.clothes.items(): + if not k in self.blacklist_unequip and any((x in k) for x in self.multislots): + if self.pose and v[0]: + v[0].set_pose(None) + v[0], v[2] = None, True + else: + if not arg in self.blacklist_unequip: + if self.pose and self.clothes[arg][0]: + self.clothes[arg][0].set_pose(None) + self.clothes[arg][0] = None + + self.body.rebuild_image() self.rebuild_image() @@ -279,6 +333,9 @@ init python: def is_equipped_item(self, item): """Takes DollCloth object or list of objects. Returns True if item is equipped, False otherwise.""" + if item.is_multislot(): + return bool(next((k for k, v in self.clothes.items() if v[0] == item), False)) + return self.get_equipped(item.type) == item def is_worn(self, *args): @@ -309,42 +366,40 @@ init python: return True return False - def set_face(self, **kwargs): - """Takes keyword argument(s) with the string name of expression file(s).""" - if self.face.set_face(**kwargs): - self.body.rebuild_image() + def set_face(self, *args, **kwargs): + self.face.set_face(*args, **kwargs) + makeup = next((v[0] for v in self.clothes.values() if v[0] and v[2] and isinstance(v[0], DollMakeup)), None) - # Rebuild lipstick - lipstick = self.clothes.get("makeup4", [None, 1, True])[0] - if isinstance(lipstick, DollLipstick): - lipstick.rebuild_image() - self.rebuild_image() + if makeup: + makeup.rebuild_image() + self.rebuild_image() def get_face(self): """Returns a dictionary containing currently set facial expressions. Used in character studio.""" return self.face.get_face() - def set_body(self, **kwargs): - """Takes keyword argument(s) with the string name of body part file(s).""" - if self.body.set_body(**kwargs): - self.rebuild_image() + # def set_body(self, **kwargs): + # OBSOLETE! the code in scripts needs to be changed + # """Takes keyword argument(s) with the string name of body part file(s).""" + # if self.body.set_body(**kwargs): + # self.rebuild_image() def set_body_hue(self, arg): """Takes integer between 0 - 359, rotates the character body colour by given amount.""" - self.body.hue = arg + self.body.hue = HueMatrix(arg) self.body.rebuild_image() self.rebuild_image() - def set_body_zorder(self, **kwargs): - """Takes keyword argument(s) with the name(s) of body part(s) and integer value(s)""" - if self.body.set_zorder(**kwargs): - self.rebuild_image() + # def set_body_zorder(self, **kwargs): + # OBSOLETE! the code in scripts needs to be changed + # """Takes keyword argument(s) with the name(s) of body part(s) and integer value(s)""" + # if self.body.set_zorder(**kwargs): + # self.rebuild_image() def set_cum(self, *args, **kwargs): """Takes keyword argument(s) containing string name(s) of cum layers to apply or None.""" - if self.cum.set_cum(*args, **kwargs): - self.body.rebuild_image() - self.rebuild_image() + self.cum.set_cum(*args, **kwargs) + self.rebuild_image() def set_pose(self, pose): if pose is None or renpy.loadable("characters/{}/poses/{}/loadable.webp".format(self.name, pose)): @@ -374,6 +429,10 @@ init python: """Takes string cloth type. Returns a list of clothing types that report incompatibility.""" return [x[0].type for x in self.clothes.values() if x[0] and type in x[0].blacklist] + def get_trackers_list(self, type): + """Takes string cloth type. Returns a list of clothing types that report incompatibility.""" + return [x[0] for x in self.clothes.values() if isinstance(x[0], DollClothDynamic) and type == x[0].tracking] + def create_outfit(self, temp=False): """Creates a copy of the current character clothes and stores it.""" return DollOutfit([x[0] for x in self.clothes.values() if x[0]], True, temp=temp) @@ -458,4 +517,4 @@ init python: else: path = "characters/{}/emote/{}.webp".format(self.name, emote) - self.emote = DollDisplayable(Image(path)) + self.emote = Image(path) diff --git a/game/scripts/doll/makeup.rpy b/game/scripts/doll/makeup.rpy new file mode 100644 index 00000000..42b921b6 --- /dev/null +++ b/game/scripts/doll/makeup.rpy @@ -0,0 +1,65 @@ +init python: + class DollMakeup(DollCloth): + def __init__(self, name, categories, type, id, color, zorder=None, unlocked=False, level=0, blacklist=[], parent=None, modpath=None, tracking=None): + self.tracking = tracking + + super().__init__(name, categories, type, id, color, zorder, unlocked, level, blacklist, parent, modpath) + + def __repr__(self): + return f"DollMakeup(name={self.name}, categories={self.categories}, type={self.type}, id={self.id}, color={self.color}, zorder={self.zorder}, unlocked={self.unlocked}, level={self.level}, blacklist={self.blacklist}, parent={self.parent}, modpath={self.modpath or None}, tracking={self.tracking})" + + def generate_hash(self): + salt = str( sorted( [self.name, self.type, self.id, str(self.color), str(self.char.face._hash)] ) ) + return hash(salt) + + def get_layers(self): + tracking = self.char.face._face.get(self.tracking, None) + + if tracking is None: + print(f"Invalid tracker for object: {self}") + return [] + + path = os.path.join(self.modpath, "characters", self.name, self.pose, "clothes", self.type, self.id, tracking) + + extensions = self.extensions + types = self.layer_types + modifiers = self.layer_modifiers + + layers = {} + for f in renpy.list_files(): + fp, fn = os.path.split(f) + fn, ext = os.path.splitext(fn) + + if not fp == path or not ext in extensions: + continue + + ltype, *tails = fn.rsplit("_") + + if not ltype.isdigit() and not ltype in types: + print(f"Invalid layer type for file: {f}") + continue + + zorder = z if (z := types.get(ltype)) is not None else self.zorder + + if isinstance(zorder, str): + zorder = self.zorder + int(zorder) + + if tails: + lmodifier, *tails = tails + + if not lmodifier in modifiers: + print("Invalid modifier for file: {}".format(f)) + continue + + zorder_mod = modifiers.get(lmodifier) + zorder = (zorder + int(zorder_mod)) if lmodifier != "zorder" else int(tails[-1]) + layers.setdefault("_".join([ltype, lmodifier]), [f, zorder]) + else: + layers.setdefault(ltype, [f, zorder]) + + return layers + + def rebuild_image(self): + self.layers = self.get_layers() + self._hash = self.generate_hash() + self._image_cached = False diff --git a/game/scripts/doll/outfits.rpy b/game/scripts/doll/outfits.rpy index 7f976607..bc0b9de7 100644 --- a/game/scripts/doll/outfits.rpy +++ b/game/scripts/doll/outfits.rpy @@ -10,10 +10,10 @@ init python: self.char = self.group[0].char self.unlocked = unlocked self.schedule = dict(list(self.default_schedule.items()) + list(schedule.items())) - self.hash = self.generate_hash() self.temp = temp self.hidden = hidden self.addons = addons + self._hash = self.generate_hash() if not self.temp: @@ -23,17 +23,13 @@ init python: if not self.hidden and not self in self.char.outfits: self.char.outfits.append(self) - # if config.developer: - # def __del__(self): - # print("Outfit with hash: {} has been garbage collected.".format(self.hash)) - def __hash__(self): - return self.hash + return self._hash def __eq__(self, obj): if not isinstance(obj, DollOutfit): return NotImplemented - return self.hash == obj.hash + return self._hash == obj._hash def generate_hash(self): salt = str( sorted( [sorted([x.name, x.type, x.id, str(x.color)] ) for x in self.group]) ) @@ -43,41 +39,37 @@ init python: if self in self.char.outfits: self.char.outfits.remove(self) - def make_image(self): - asyncio.run(self.build_image()) - + @functools.cache async def build_image(self): # Add body, face, cum, clothes, masks + matrix = SaturationMatrix(0.0) async def build_clothes(group): sprites = [] masks = [] for i in group: - sprites.append([i.get_image(), i.zorder]) - - sprites.extend([ - (i.get_image(), i.zorder), - i.get_back(), - i.get_front(), - i.get_armfix(mannequin=True), - ] + i.get_zlayers()) - - if i.mask: - masks.append((i.mask, i.zorder-1)) + for identifier, layer, zorder in i.build_image(i._hash, matrix): + if identifier == "mask": + masks.append((layer, zorder)) + else: + sprites.append((layer, zorder)) return (sprites, masks) - async def build_mannequin(group): - return (self.char.body.get_mannequin(group), 0) + async def build_mannequin(): + sprites = self.char.body.build_image(matrix) + sprites.sort(key=itemgetter(2)) + sprites = [(x[1], x[2]) for x in sprites] + return sprites mannequin, (clothes, masks) = await asyncio.gather( - build_mannequin(self.group), + build_mannequin(), build_clothes(self.group), ) sprites = [ - mannequin, + *mannequin, *clothes, ] @@ -108,9 +100,18 @@ init python: break sprites = back_sprites + [x[0] for x in sprites] - self.sprite = DollDisplayable(Fixed(*sprites, fit_first=True)) + self._image = Fixed(*sprites, fit_first=True) return + @property + def image(self): + if not renpy.is_skipping(): + if not self._image_cached: + self._image_cached = True + asyncio.run(self.build_image()) + + return self._image + def exists(self): return (self in self.char.outfits) diff --git a/game/scripts/utility/common_screens.rpy b/game/scripts/utility/common_screens.rpy index 19cf00c1..2b1ac2c2 100644 --- a/game/scripts/utility/common_screens.rpy +++ b/game/scripts/utility/common_screens.rpy @@ -39,7 +39,7 @@ screen clothing_unlock(item): on "show" action Play("sound", "sounds/win2.ogg") if isinstance(item, DollCloth): - add item.get_icon() align (0.5, 0.5) zoom 0.5 + add item.icon align (0.5, 0.5) zoom 0.5 elif isinstance(item, DollOutfit): add item.get_image() align (0.5, 0.0) yoffset -50 zoom 0.4 diff --git a/game/scripts/utility/engine.rpy b/game/scripts/utility/engine.rpy index 62c53f32..f341421e 100644 --- a/game/scripts/utility/engine.rpy +++ b/game/scripts/utility/engine.rpy @@ -61,6 +61,7 @@ init python: config.statement_callbacks.append(crashdefender) init python early: + import functools if renpy.windows: # On windows, Renpy does not support backslashes in some of its functions, @@ -78,16 +79,10 @@ init python early: # renpy.list_files does not use cached results, let's fix that. - def _list_files(common=False, quick=True): - cache = "_list_files_common_cache" if common else "_list_files_cache" - files = getattr(renpy.store, cache, []) - - if not quick or not files: - rv = [fn for dir, fn in renpy.loader.listdirfiles(common) if not fn.startswith("saves/")] - rv.sort() - - setattr(renpy.store, cache, rv) - - return files + @functools.cache + def _list_files(common=False): + rv = [fn for dir, fn in renpy.loader.listdirfiles(common) if not fn.startswith("saves/")] + rv.sort() + return rv renpy.list_files = _list_files diff --git a/game/scripts/utility/image_crop.rpy b/game/scripts/utility/image_crop.rpy index d8d1816a..571dbb9e 100644 --- a/game/scripts/utility/image_crop.rpy +++ b/game/scripts/utility/image_crop.rpy @@ -12,7 +12,12 @@ init python: if path in whitespace_dict: box = whitespace_dict[path] else: - surf = Image(path).load() + if isinstance(path, str): + surf = Image(path).load() + elif isinstance(path, im.Image): + surf = path.load() + elif isinstance(path, Transform): + surf = path.child.load() box = tuple(surf.get_bounding_rect()) whitespace_dict[path] = box return box diff --git a/game/scripts/wardrobe/wardrobe.rpy b/game/scripts/wardrobe/wardrobe.rpy index fb638556..2d3b4bc0 100644 --- a/game/scripts/wardrobe/wardrobe.rpy +++ b/game/scripts/wardrobe/wardrobe.rpy @@ -133,7 +133,7 @@ label wardrobe_menu(): # UNEQUIP if wardrobe_check_unequip(_choice[1]): $ wardrobe_react("unequip", _choice[1]) - $ char_active.unequip(_choice[1].type) + $ char_active.unequip(_choice[1]) $ current_item = None else: $ wardrobe_react("unequip_fail", _choice[1]) @@ -152,10 +152,6 @@ label wardrobe_menu(): if wardrobe_fallback_required(_choice[1]): # Has to be called regardless of player preference. $ renpy.call(get_character_response(active_girl, "fallback"), _choice[1]) - - # Lipstick Fix - Synchronize image with the current mouth after equipping. - if isinstance(_choice[1], DollLipstick): - $ _choice[1].rebuild_image() else: $ wardrobe_react("equip_fail", _choice[1]) @@ -361,9 +357,6 @@ label wardrobe_menu(): if rebuild: outfit.rebuild_image() - if isinstance(cloth, DollLipstick): - cloth.rebuild_image() - char_active.equip(cloth) else: char_active.unequip(k) @@ -483,7 +476,7 @@ screen wardrobe_menu(xx, yy): add panel # Character image cut to the size of the wardrobe - add char_active.get_image(): + add char_active.image: yoffset -6 corner1 (184, 218) corner2 (924, 1200) @@ -562,7 +555,7 @@ screen wardrobe_menuitem(xx, yy): text "[current_category]" size 22 xalign 0.5 ypos 65 # Colours - if current_item: + if current_item and current_item.color: hbox: spacing 2 xanchor 1.0 @@ -620,7 +613,7 @@ screen wardrobe_menuitem(xx, yy): gl_pixel_perfect True for item in menu_items: - $ icon = item.get_icon() + $ icon = item.icon $ is_seen = item.seen $ is_equipped = char_active.is_equipped_item(item) $ is_inadequate = bool(get_character_progression(active_girl) < item.level) @@ -641,9 +634,9 @@ screen wardrobe_menuitem(xx, yy): if is_modded: $ warnings.append("Item belongs to a mod:\n{size=-4}{color=#35aae2}" + item.get_modname() + "{/color}{/size}") - if is_multislot: - $ slot = str(int(item.type[-1])+1) - $ warnings.append("Occupies " + item.type[:-1] + " slot number " + slot) + # if is_multislot: + # $ slot = str(int(item.type[-1])+1) + # $ warnings.append("Occupies " + item.type[:-1] + " slot number " + slot) button: focus_mask None @@ -679,9 +672,9 @@ screen wardrobe_menuitem(xx, yy): if not is_seen: text "NEW" style "wardrobe_item_caption" anchor (1.0, 1.0) align (1.0, 1.0) offset (-5, -5) - # Bottom-Left - if is_multislot: - text "[slot]" style "wardrobe_item_caption" anchor (0.0, 1.0) align (0.0, 1.0) offset (5, -5) + # # Bottom-Left + # if is_multislot: + # text "[slot]" style "wardrobe_item_caption" anchor (0.0, 1.0) align (0.0, 1.0) offset (5, -5) screen wardrobe_outfit_menuitem(xx, yy): tag wardrobe_menuitem @@ -764,7 +757,7 @@ screen wardrobe_outfit_menuitem(xx, yy): $ is_modded = False $ is_equipped = False else: - $ icon = Transform(item.get_image(), crop=(220, 0, 680, 1200)) + $ icon = Transform(item.image, crop=(220, 0, 680, 1200)) $ is_modded = item.is_modded() $ is_equipped = bool(current_item == item) $ is_inadequate = (current_subcategory in {"save", "load", "schedule"} and not wardrobe_check_equip_outfit(item))