diff --git a/game/02-CSS/base.css b/game/02-CSS/base.css index 68db9ffa4cb227ab6c79426be042e87cfbd64bf2..5ba05d21fa6ca3c95f795ff7340d21f8290fd4b0 100644 --- a/game/02-CSS/base.css +++ b/game/02-CSS/base.css @@ -1202,6 +1202,9 @@ removed unused: .layer-brow { z-index: 138; } +.layer-horns { + z-index: 140; +} .layer-face { z-index: 145; } diff --git a/game/base-clothing/clothing-under.twee b/game/base-clothing/clothing-under.twee index 4b8bb38d476dccbb9d7b07ea27df621804052714..2ef2c5b1220d4e69c5c00bb57c19b2ebea97365b 100644 --- a/game/base-clothing/clothing-under.twee +++ b/game/base-clothing/clothing-under.twee @@ -980,7 +980,7 @@ state_base: "waist", plural: 1, colour: 0, - colour_options: ["black", "blue", "brown", "green", "pink", "purple", "red", "pale-tangerine", "teal", "pale-white", "pale-yellow", "custom"], + colour_options: ["black", "blue", "brown", "green", "pink", "purple", "red", "tangerine", "teal", "white", "pale-yellow", "custom"], colour_sidebar: 1, exposed: 0, exposed_base: 0, @@ -1064,7 +1064,7 @@ state_base: "waist", plural: 1, colour: 0, - colour_options: ["black", "blue", "brown", "green", "pink", "purple", "red", "pale-tangerine", "teal", "pale-white", "pale-yellow", "custom"], + colour_options: ["black", "blue", "brown", "green", "pink", "purple", "red", "tangerine", "teal", "white", "pale-yellow", "custom"], colour_sidebar: 1, exposed: 0, exposed_base: 0, @@ -1106,7 +1106,7 @@ state_base: "waist", plural: 1, colour: 0, - colour_options: ["black", "blue", "brown", "green", "pink", "purple", "red", "pale-tangerine", "teal", "pale-white", "pale-yellow", "custom"], + colour_options: ["black", "blue", "brown", "green", "pink", "purple", "red", "tangerine", "teal", "white", "pale-yellow", "custom"], colour_sidebar: 1, exposed: 0, exposed_base: 0, diff --git a/game/base-clothing/images.twee b/game/base-clothing/images.twee index 6c1726ca15ec8107fb904be808f8b397fa4225d9..10c2420f7196f624a9e2a1e1f3a2a8a51ce62ae6 100644 --- a/game/base-clothing/images.twee +++ b/game/base-clothing/images.twee @@ -403,16 +403,16 @@ <</if>> <<if !_disabled.includes($transformationParts.demon.horns)>> - <img class="layer-neck anim-idle-2f" @src="'img/transformations/demon/horns/'+$transformationParts.demon.horns+'.png'"> + <img class="layer-horns anim-idle-2f" @src="'img/transformations/demon/horns/'+$transformationParts.demon.horns+'.png'"> /*<img class="layer-face colour-hair anim-idle-2f" src="img/transformations/demon/hair_overlay.png">*/ <</if>> <<if !_disabled.includes($transformationParts.cow.horns)>> - <img class="layer-neck anim-idle-2f" @src="'img/transformations/cow/horns/'+$transformationParts.cow.horns+'.png'"> + <img class="layer-horns anim-idle-2f" @src="'img/transformations/cow/horns/'+$transformationParts.cow.horns+'.png'"> <</if>> <<if !_disabled.includes($transformationParts.cow.ears)>> - <img class="layer-neck anim-idle-2f" @src="'img/transformations/cow/ears/'+$transformationParts.cow.ears+'.png'"> + <img class="layer-horns anim-idle-2f" @src="'img/transformations/cow/ears/'+$transformationParts.cow.ears+'.png'"> <img class="layer-face anim-idle-2f" src="img/transformations/cow/tag.png"> <</if>> diff --git a/game/base-combat/end.twee b/game/base-combat/end.twee index a9b2149af730d6ea49abb5cdc8a59692ed42475d..ecc208268f4e4b42f0533a6c3a6da26cff32d6f9 100644 --- a/game/base-combat/end.twee +++ b/game/base-combat/end.twee @@ -57,7 +57,7 @@ <<set $submissive += ($assertive / 10)>> <<if $enemytype is "beast">> <<if $NPCList[0].type is "wolf">> - <<set _plural_beast_type to "wolves"> + <<set _plural_beast_type to "wolves">> <<else>> <<set _plural_beast_type to $NPCList[0].type + "s">> <</if>> diff --git a/game/base-debug/clothesTesting.twee b/game/base-debug/clothesTesting.twee index d039d7f929c0d0d77f57efa99451acb5dd6f49e4..a35f36b6c3923429a3b747f2683034909fceafbe 100644 --- a/game/base-debug/clothesTesting.twee +++ b/game/base-debug/clothesTesting.twee @@ -262,7 +262,7 @@ <</if>> <<if $debugBodyState.demonHorns isnot "hidden">> - <img class="layer-neck anim-idle-2f" @src="'img/transformations/demon/horns/'+$debugBodyState.demonHorns+'.png'"> + <img class="layer-horns anim-idle-2f" @src="'img/transformations/demon/horns/'+$debugBodyState.demonHorns+'.png'"> <</if>> <<if $debugBodyState.demonTail isnot "hidden">> diff --git a/game/base-system/images.twee b/game/base-system/images.twee index 45d9209f50075b237d40e38616b960b3281897b2..b96d33112c60e61e50b8bc0441535f6241e54969 100644 --- a/game/base-system/images.twee +++ b/game/base-system/images.twee @@ -216,10 +216,10 @@ <<widget "img_tf_cow_doggy_idle">><<nobr>> <<if !_disabled.includes($transformationParts.cow.horns)>> - <img class="layer-neck anim-idle-2f" @src="'img/sex/doggy/active/transformations/cow/horns/'+$transformationParts.cow.horns+'.png'"> + <img class="layer-horns anim-idle-2f" @src="'img/sex/doggy/active/transformations/cow/horns/'+$transformationParts.cow.horns+'.png'"> <</if>> <<if !_disabled.includes($transformationParts.cow.ears)>> - <img class="layer-neck anim-idle-2f" @src="'img/sex/doggy/active/transformations/cow/ears/'+$transformationParts.cow.ears+'.png'"> + <img class="layer-horns anim-idle-2f" @src="'img/sex/doggy/active/transformations/cow/ears/'+$transformationParts.cow.ears+'.png'"> <</if>> <<if !_disabled.includes($transformationParts.cow.tail)>> <img class="layer-sexlashes anim-idle-2f" @src="'img/sex/doggy/active/transformations/cow/tail/'+$transformationParts.cow.tail+'.png'"> @@ -240,10 +240,10 @@ <<widget "img_tf_cow_miss_idle">><<nobr>> <<if !_disabled.includes($transformationParts.cow.horns)>> - <img class="layer-neck anim-idle-2f" @src="'img/sex/missionary/active/transformations/cow/horns/'+$transformationParts.cow.horns+'.png'"> + <img class="layer-horns anim-idle-2f" @src="'img/sex/missionary/active/transformations/cow/horns/'+$transformationParts.cow.horns+'.png'"> <</if>> <<if !_disabled.includes($transformationParts.cow.ears)>> - <img class="layer-neck anim-idle-2f" @src="'img/sex/missionary/active/transformations/cow/ears/'+$transformationParts.cow.ears+'.png'"> + <img class="layer-horns anim-idle-2f" @src="'img/sex/missionary/active/transformations/cow/ears/'+$transformationParts.cow.ears+'.png'"> <img class="layer-face anim-idle-2f" src="img/sex/missionary/active/transformations/cow/tag.png"> <</if>> <<if !_disabled.includes($transformationParts.cow.tail)>> @@ -253,10 +253,10 @@ <<widget "img_tf_cow_miss_active">><<nobr>> <<if !_disabled.includes($transformationParts.cow.horns)>> - <img @class="'layer-neck anim-doggy-4f-'+_animspeed" @src="'img/sex/missionary/active/transformations/cow/horns/'+$transformationParts.cow.horns+'.png'"> + <img @class="'layer-horns anim-doggy-4f-'+_animspeed" @src="'img/sex/missionary/active/transformations/cow/horns/'+$transformationParts.cow.horns+'.png'"> <</if>> <<if !_disabled.includes($transformationParts.cow.ears)>> - <img @class="'layer-neck anim-doggy-4f-'+_animspeed" @src="'img/sex/missionary/active/transformations/cow/ears/'+$transformationParts.cow.ears+'.png'"> + <img @class="'layer-horns anim-doggy-4f-'+_animspeed" @src="'img/sex/missionary/active/transformations/cow/ears/'+$transformationParts.cow.ears+'.png'"> <img @class="'layer-face anim-doggy-4f-'+_animspeed" src="img/sex/missionary/active/transformations/cow/tag.png"> <</if>> <<if !_disabled.includes($transformationParts.cow.tail)>> diff --git a/game/overworld-town/loc-docks/widgets.twee b/game/overworld-town/loc-docks/widgets.twee index a9c490dd8d4c262ec958b9810f0b972d966c25f0..d0ee2a4d5c4baa9036f253354ba198b2a8a2b190 100644 --- a/game/overworld-town/loc-docks/widgets.twee +++ b/game/overworld-town/loc-docks/widgets.twee @@ -481,19 +481,19 @@ is lovemaking, which prompts a bawdy cheer. Your colleagues insist this will be <<link [[Sneak aboard the anchored ship (0:05)|Docks Sneak]]>><<pass 5>><<set $bus to "N">><</link>><<skul_dock_state N>><br> <</if>> <<if $bus is "E">> - <<link [[Sneak to the warehouse (0:05)|Docks Sneak]]<<pass 5>><<set $bus to "NE">><</link>><<skul_dock_state NE>><br> + <<link [[Sneak to the warehouse (0:05)|Docks Sneak]]>><<pass 5>><<set $bus to "NE">><</link>><<skul_dock_state NE>><br> <</if>> <<if $bus is "SW" or $bus is "NW">> <<link [[Sneak to the cranes (0:05)|Docks Sneak]]>><<pass 5>><<set $bus to "W">><</link>><<skul_dock_state W>><br> <</if>> <<if $bus is "E">> - <<link [[Sneak to the tallest stacks of cargo containers|Docks Sneak]]<<pass 5>><<set $bus to "M">><</link>><<skul_dock_state M>><br> + <<link [[Sneak to the tallest stacks of cargo containers|Docks Sneak]]>><<pass 5>><<set $bus to "M">><</link>><<skul_dock_state M>><br> <</if>> <<if $bus is "SE" or $bus is "M" or $bus is "NE">> <<link [[Sneak to the office (0:05)|Docks Sneak]]>><<pass 5>><<set $bus to "E">><</link>><<skul_dock_state E>><br> <</if>> <<if $bus is "W" or $bus is "S">> - <<link [[Sneak to the lorry unloading area (0:05)|Docks Sneak]]<<pass 5>><<set $bus to "SW">><</link>><<skul_dock_state SW>><br> + <<link [[Sneak to the lorry unloading area (0:05)|Docks Sneak]]>><<pass 5>><<set $bus to "SW">><</link>><<skul_dock_state SW>><br> <</if>> <<if $bus is "SE" or $bus is "SW">> <<link [[Sneak to the gate (0:05)|Docks Sneak]]>><<pass 5>><<set $bus to "S">><</link>><<skul_dock_state S>><br> diff --git a/game/overworld-town/special-avery/main.twee b/game/overworld-town/special-avery/main.twee index 1c42b1d0cc020bbb034b7a7046354fa8978d0f14..7e7b8d9b7fb2005cd54b86163b9e8381479774e2 100644 --- a/game/overworld-town/special-avery/main.twee +++ b/game/overworld-town/special-avery/main.twee @@ -629,15 +629,15 @@ When the two of you finish eating, <<person1>><<he>> raises the bottle with a sm <br><br> -<<link [[Accept|Avery Hotel Drink]]>><<set $phase to 0>><<set $drunk += 160>><<set $drugged += 220>><<npcincr Avery love 1>><</link>><<glove>><<garousal>> +<<link [[Accept|Avery Hotel Drink]]>><<endevent>><<set $phase to 0>><<set $drunk += 160>><<set $drugged += 220>><<npcincr Avery love 1>><</link>><<glove>><<garousal>> <br> -<<link [[Decline|Avery Hotel Drink]]>><<set $phase to 1>><</link>> +<<link [[Decline|Avery Hotel Drink]]>><<endevent>><<set $phase to 1>><</link>> <br> <br><br> :: Avery Hotel Drink [nobr] <<effects>><<pass 30>> -<<endevent>><<npc Avery>><<person1>> +<<npc Avery>><<person1>> <<if $phase is 0>> <<if $submissive gte 1150>> "It looks expensive. Is it really okay?" @@ -1156,7 +1156,7 @@ You put on the babydoll lingerie. <br><br> You sit down and <<he>> turns towards you, eyes glancing down your body before <<he>> pins you down against the sheets. "Is it cocky to admit that I wanted that on you just to take it off?" <br><br> - <<link [[Kiss|Avery Hotel Sex]]>><<set $endear += 10>><<set $sexstart to 1>><</link>><<promiscuous1>><<gendear>> + <<link [[Kiss|Avery Hotel Sex]]>><<set $phase to 0>><<set $sexstart to 1>><<set $endear += 10>><</link>><<promiscuous1>><<gendear>> <br> <<link [[Roll Over|Avery Hotel No No No No Sex]]>><<npcincr Avery love -1>><<npcincr Avery rage 3>><</link>><<llove>><<garage>> <br>