Merge branch 'BugFixes' into 'master'

Bug fixes

See merge request Vrelnir/degrees-of-lewdity!599

game/base-clothing/widgets.twee

@@ -160,7 +160,12 @@
 <<if $args[2] and $wardrobe[$args[0]].last().colour_options.length isnot 0>>
 	<<set $wardrobe[$args[0]].last().colour to $args[2]>>
 	<<if $wardrobe[$args[0]].last().colour is "custom">>
-		<<set $wardrobe[$args[0]].last().colourCustom to customColor($customColors.color.primary, $customColors.saturation.primary, $customColors.brightness.primary, $customColors.contrast.primary, $customColors.sepia.primary)>>
+		<<if _colourCustom isnot undefined>>
+			<<set $wardrobe[$args[0]].last().colourCustom to _colourCustom>>
+			<<unset _colourCustom>>
+		<<else>>
+			<<set $wardrobe[$args[0]].last().colourCustom to customColor($customColors.color.primary, $customColors.saturation.primary, $customColors.brightness.primary, $customColors.contrast.primary, $customColors.sepia.primary)>>
+		<</if>>
 	<</if>>
 <<elseif $wardrobe[$args[0]].last().colour_options.length gt 0>>
 	<<set $wardrobe[$args[0]].last().colour to clone($wardrobe[$args[0]].last().colour_options.random())>>
@@ -168,7 +173,12 @@
 <<if $args[3] and $wardrobe[$args[0]].last().accessory is 1 and $wardrobe[$args[0]].last().accessory_colour_options.length isnot 0>>
 	<<set $wardrobe[$args[0]].last().accessory_colour to $args[3]>>
 	<<if $wardrobe[$args[0]].last().accessory_colour is "custom">>
-		<<set $wardrobe[$args[0]].last().accessory_colourCustom to customColor($customColors.color.secondary, $customColors.saturation.secondary, $customColors.brightness.secondary, $customColors.contrast.secondary, $customColors.sepia.secondary)>>
+		<<if _accessory_colourCustom isnot undefined>>
+			<<set $wardrobe[$args[0]].last().accessory_colourCustom to _accessory_colourCustom>>
+			<<unset _accessory_colourCustom>>
+		<<else>>
+			<<set $wardrobe[$args[0]].last().accessory_colourCustom to customColor($customColors.color.secondary, $customColors.saturation.secondary, $customColors.brightness.secondary, $customColors.contrast.secondary, $customColors.sepia.secondary)>>
+		<</if>>
 	<</if>>
 <<elseif $wardrobe[$args[0]].last().accessory_colour_options.length gt 0 and $wardrobe[$args[0]].last().accessory is 1>>
 	<<set $wardrobe[$args[0]].last().accessory_colour to clone($wardrobe[$args[0]].last().accessory_colour_options.random())>>
@@ -436,6 +446,8 @@
 					<<set $effectsmessage to 1>><<run $rebuy_failure.push(clone($carried[$args[0]].name))>>
 				<</if>>
 			<<elseif $clothingrebuy is 1 and $worn[$args[0]].one_piece isnot "broken" and $worn[$args[0]].shop.length gt 0>>
+				<<if $worn[$args[0]].colourCustom isnot undefined>><<set _colourCustom to $worn[$args[0]].colourCustom>><</if>>
+				<<if $worn[$args[0]].accessory_colourCustom isnot undefined>><<set _accessory_colourCustom to $worn[$args[0]].accessory_colourCustom>><</if>>
 				<<if $worn[$args[0]].outfitSecondary isnot undefined>>
 					<<if $args[0] is "lower">>
 						<<if $money gte Math.trunc($worn["upper"].cost * 1.5)>>
@@ -1270,7 +1282,7 @@
 		<<if $wardrobe[_slot][_j].accessory_colour isnot "custom">>
 			<<set _matched++>>
 		<<elseif _item.accessory_colourCustom isnot undefined and $wardrobe[_slot][_j].accessory_colourCustom isnot undefined>>
-			<<if _item.accessory_colourCustom is $wardrobe[_lab_slotelWW][_j].accessory_colourCustom>>
+			<<if _item.accessory_colourCustom is $wardrobe[_slot][_j].accessory_colourCustom>>
 				<<set _matched++>>
 			<</if>>
 		<</if>>

game/overworld-town/loc-market/widgets.twee

@@ -62,12 +62,12 @@ Inventory:
 		<span class="gold"><<print $plants[_plant_keys[_t]].amount>></span> <<print $plants[_plant_keys[_t]].plural>> (£<<print Math.trunc(_plant_value / 100)>>.<<if _plant_value % 100 lte 9>>0<</if>><<print _plant_value % 100>> each) |
 		<<set _inventory_found to 1>>
 		<<set $plant_inventory.push($plants[_plant_keys[_t]].name)>>
-		<<if $plants[$stall_expensive].amount lte 0>>
-			<<unset $stall_expensive>>
-		<</if>>
 		<<if $stall_expensive is undefined>>
 			<<set $stall_expensive to clone(setup.plants[$plants[_plant_keys[_t]].name].name)>>
 		<</if>>
+		<<if $plants[$stall_expensive].amount lte 0>>
+			<<set $stall_expensive to clone(setup.plants[$plants[_plant_keys[_t]].name].name)>>
+		<</if>>
 		<<if setup.plants[$plants[_plant_keys[_t]].name].plant_cost gte setup.plants[$stall_expensive].plant_cost>>
 			<<set $stall_expensive to clone(setup.plants[$plants[_plant_keys[_t]].name].name)>>
 		<</if>>