Skip to content
Snippets Groups Projects
Commit 6ca8c610 authored by Stadler76's avatar Stadler76 Committed by Vrelnir
Browse files

Demon harpy chimera fixes

parent c1bb2956
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
game/base-clothing/canvasmodel-img.twee
+ 1
− 0
View file @ 6ca8c610
......@@ -394,6 +394,7 @@ $worn.under_upper.type.includes("naked") and $worn.under_lower.type.includes("na
<!-- Demon-harpy wings -->
<<if isPartEnabled(_modeloptions.demon_wings_type) and isPartEnabled(_modeloptions.bird_wings_type) and isChimeraEnabled("demonharpy", "wings")>>
<<set _modeloptions.bird_wings_type to 'default-demon'>>
<<set _modeloptions.demon_wings_type to 'hidden'>>
<</if>>
<!-- Demon-cow horns -->
<<if isPartEnabled(_modeloptions.cow_horns_type) and isPartEnabled(_modeloptions.demon_horns_type) and isChimeraEnabled("demoncow", "horns")>>
......
game/base-system/images.twee
+ 8
− 8
View file @ 6ca8c610
......@@ -328,7 +328,7 @@
<</if>>
<<if !_disabled.includes($_bird.wings)>>
<<set $_demon to $transformationParts.demon>>
<<if isPartEnabled($_demon.wings) && isPartEnabled($_bird.wings)>>
<<if isChimeraEnabled('demonharpy', 'wings')>>
<img class="layer-sexaboveclothes colour-hair anim-idle-2f" @src="'img/sex/doggy/active/transformations/bird/wings/default-demon.png'">
<<else>>
<img class="layer-sexaboveclothes colour-hair anim-idle-2f" @src="'img/sex/doggy/active/transformations/bird/wings/'+$transformationParts.bird.wings+'.png'">
......@@ -355,7 +355,7 @@
<</if>>
<<if !_disabled.includes($_bird.wings)>>
<<set $_demon to $transformationParts.demon>>
<<if isPartEnabled($_demon.wings) && isPartEnabled($_bird.wings)>>
<<if isChimeraEnabled('demonharpy', 'wings')>>
<img @class="'layer-sexaboveclothes colour-hair anim-doggy-4f-'+_animspeed" @src="'img/sex/doggy/active/transformations/bird/wings/default-demon.png'">
<<else>>
<img @class="'layer-sexaboveclothes colour-hair anim-doggy-4f-'+_animspeed" @src="'img/sex/doggy/active/transformations/bird/wings/'+$transformationParts.bird.wings+'.png'">
......@@ -382,7 +382,7 @@
<</if>>
<<if !_disabled.includes($_bird.wings)>>
<<set $_demon to $transformationParts.demon>>
<<if isPartEnabled($_demon.wings) && isPartEnabled($_bird.wings)>>
<<if isChimeraEnabled('demonharpy', 'wings')>>
<img class="layer-sexwings colour-hair anim-idle-2f" @src="'img/sex/missionary/active/transformations/bird/wings/default-demon.png'">
<<else>>
<img class="layer-sexwings colour-hair anim-idle-2f" @src="'img/sex/missionary/active/transformations/bird/wings/'+$transformationParts.bird.wings+'.png'">
......@@ -409,7 +409,7 @@
<</if>>
<<if !_disabled.includes($_bird.wings)>>
<<set $_demon to $transformationParts.demon>>
<<if isPartEnabled($_demon.wings) && isPartEnabled($_bird.wings)>>
<<if isChimeraEnabled('demonharpy', 'wings')>>
<img @class="'layer-sexwings colour-hair anim-doggy-4f-'+_animspeed" @src="'img/sex/missionary/active/transformations/bird/wings/default-demon.png'">
<<else>>
<img @class="'layer-sexwings colour-hair anim-doggy-4f-'+_animspeed" @src="'img/sex/missionary/active/transformations/bird/wings/'+$transformationParts.bird.wings+'.png'">
......@@ -514,7 +514,7 @@
<<set $_tailType to isPartEnabled($transformationParts.cat.tail) and isChimeraEnabled('demoncat', 'tail') ? 'default-cat' : $_demon.tail>>
<img class="layer-sexwings anim-idle-2f" @src="'img/sex/doggy/active/transformations/demon/tail/'+$_tailType+'.png'" @style="'filter: ' + $_filter">
<</if>>
<<if isPartEnabled($_demon.wings)>>
<<if isPartEnabled($_demon.wings) and not isChimeraEnabled('demonharpy', 'wings')>>
<<set $_filter to ColourUtils.partToFilter($_demon.wings_colour, Transformations.defaults.demon.colour)>>
<img class="layer-halo-front anim-idle-2f" @src="'img/sex/doggy/active/transformations/demon/wings/'+$_demon.wings+'.png'" @style="'filter: ' + $_filter">
<</if>>
......@@ -536,7 +536,7 @@
<img @class="'layer-sexlashes anim-doggy-4f-'+_animspeed" @src="'img/sex/doggy/active/transformations/demon/tail/'+$_tailType+'.png'" @style="'filter: ' + $_filter">
<</if>>
<</if>>
<<if isPartEnabled($_demon.wings)>>
<<if isPartEnabled($_demon.wings) and not isChimeraEnabled('demonharpy', 'wings')>>
<<set $_filter to ColourUtils.partToFilter($_demon.wings_colour, Transformations.defaults.demon.colour)>>
<img @class="'layer-halo-front anim-doggy-4f-'+_animspeed" @src="'img/sex/doggy/active/transformations/demon/wings/'+$_demon.wings+'.png'" @style="'filter: ' + $_filter">
<</if>>
......@@ -553,7 +553,7 @@
<<set $_tailType to isPartEnabled($transformationParts.cat.tail) and isChimeraEnabled('demoncat', 'tail') ? 'default-cat' : $_demon.tail>>
<img class="layer-sexwings anim-idle-2f" @src="'img/sex/missionary/active/transformations/demon/tail/'+$_tailType+'.png'" @style="'filter: ' + $_filter">
<</if>>
<<if isPartEnabled($_demon.wings)>>
<<if isPartEnabled($_demon.wings) and not isChimeraEnabled('demonharpy', 'wings')>>
<<set $_filter to ColourUtils.partToFilter($_demon.wings_colour, Transformations.defaults.demon.colour)>>
<img class="layer-halo-front anim-idle-2f" @src="'img/sex/missionary/active/transformations/demon/wings/'+$_demon.wings+'.png'" @style="'filter: ' + $_filter">
<</if>>
......@@ -570,7 +570,7 @@
<<set $_tailType to isPartEnabled($transformationParts.cat.tail) and isChimeraEnabled('demoncat', 'tail') ? 'default-cat' : $_demon.tail>>
<img @class="'layer-sexwings anim-doggy-4f-' + _animspeed" @src="'img/sex/missionary/active/transformations/demon/tail/' + $_tailType + '.png'" @style="'filter: ' + $_filter">
<</if>>
<<if isPartEnabled($_demon.wings)>>
<<if isPartEnabled($_demon.wings) and not isChimeraEnabled('demonharpy', 'wings')>>
<<set $_filter to ColourUtils.partToFilter($_demon.wings_colour, Transformations.defaults.demon.colour)>>
<img @class="'layer-halo-front anim-doggy-4f-'+_animspeed" @src="'img/sex/missionary/active/transformations/demon/wings/'+$_demon.wings+'.png'" @style="'filter: ' + $_filter">
<</if>>
......
game/base-system/mirror.twee
+ 12
− 1
View file @ 6ca8c610
......@@ -1888,7 +1888,8 @@ If your Trauma gets too high, you will be unable to hide.
<</if>>
</div>
<<set $_chimeraOptions to {
"demoncat_tail" : !["disabled", "hidden"].includesAny(_demon.tail, _cat.tail)
"demoncat_tail" : !["disabled", "hidden"].includesAny(_demon.tail, _cat.tail),
"demonharpy_wings" : !["disabled", "hidden"].includesAny(_demon.wings, _bird.wings)
}>>
<<set $_chimeraEnabled to Object.values($_chimeraOptions).some(o => o) ? "" : " hide">>
<div @class="'chimera' + $_chimeraEnabled">
......@@ -1903,6 +1904,16 @@ If your Trauma gets too high, you will be unable to hide.
<</listbox>>
</div>
<</if>>
<<if $_chimeraOptions.demonharpy_wings>>
/* Using demon harpy chimera wings. */
<div class='tf-part-item'>
Demon harpy wings:
<<listbox "$chimera.demonharpy.wings" autoselect>>
<<option "Show" true>>
<<option "Hide" false>>
<</listbox>>
</div>
<</if>>
</div>
</div>
<<if _isMenuEnabled>>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment