Merge branch 'Edited-TW' into SC-Master

sugarcube/src/PassageFooter.tw

@@ -36,6 +36,14 @@
 				<<gt _jobData.workPassage>>
 			<</act>>
 		<</for>>
+
+		<<if _tags.includes('outdoors') and _tags.includes('public')>>>>
+			<<actCLA 'Wait'>>
+				<<gs 'wait'>>
+			<</actCLA>>
+		<</if>>
+		
+
 	<<elseif _tags.includes('quest')>>
 		<!-- This should be able to be returned to -->
 		<<set _menuDeactivated = false>>

sugarcube/src/actions/actions.css

@@ -21,7 +21,9 @@
 }
 
 #actions a,
-#npcActions a {
+#npcActions a,
+.button a,
+.buttonRadio span{
     display: block;
     color: black;
     padding: 1em;
@@ -33,7 +35,9 @@
 }
 
 #actions a:hover ,
-#npcActions a:hover{
+#npcActions a:hover,
+.button a:hover,
+.buttonRadio>input:checked+span{
     background: #aaa;
 }
 
@@ -43,6 +47,14 @@
     color: black;
 }
 
+.buttonRadio > input{
+    display: none;
+}
+
+.buttonRadio>input:checked+span {
+    font-weight: bold;
+}
+
 
 
 @media(max-width: 1699px){

sugarcube/src/activities/wait.tw

@@ -0,0 +1,13 @@
+:: wait[include]
+	<<set $waitTime ??= 15>>
+	<p>
+		How many minutes would you like to wait? <<numberbox "$waitTime" $waitTime>> (maximum 120 minutes, leave blank to wait 15 minutes)
+		<<button "Wait">>
+			<<if $waitTime > 120 or $waitTime <= 0>>
+				<<msg "You need to enter a integer between 1 and 120." "info">>
+			<<else>>
+				<<addtime $waitTime>>
+				<<gt $location>>
+			<</if>>
+		<</button>>
+	</p>

sugarcube/src/autogenerated/unsorted/divan.tw

@@ -7,7 +7,7 @@
 	<<image "shared/home/divan.jpg">>
 	You lie down on the sofa.
 	<<actCLA 'wait'>>
-		<<gs 'obj_din_wait'>>
+		<<gs 'wait'>>
 	<</actCLA>>
 	<<if getvar("$TV") > 0 and $loc != 'dachain'>>
 		<<actCLA 'Watch TV'>>

sugarcube/src/autogenerated/unsorted/gas_station_gp_117.tw

@@ -59,7 +59,7 @@
 
 	<</if>>
 	<<actCLA 'Wait'>>
-		<<gs 'obj_din_wait'>>
+		<<gs 'wait'>>
 	<</actCLA>>
 	<<set $dressed_as_a_prostitute to null>>
 <</if>>

sugarcube/src/autogenerated/unsorted/liames.tw

@@ -65,9 +65,6 @@
 <</actCLA>>
 
 <</if>>
-<<actCLA 'wait'>>
-	<<gs 'obj_din_wait'>>
-<</actCLA>>
 <<if $housing.home == 'old_town_apartment'>>
 	<<if $vladimirday == $time.daystart and getvar("$vladimirQW") == 30 and $time.hour >= 16 and $time.weekday == 6>>
 		<<link "There''s an Audi parked in front of your apartment, and standing beside it, you notice Vladimir">><<gt 'qwmeet' '2'>><</link>>.

sugarcube/src/autogenerated/unsorted/mey_home.tw

@@ -299,7 +299,7 @@
 		<<gt 'bed' 'start'>>
 	<</actCLA>>
 	<<actCLA 'Wait'>>
-		<<gs 'obj_din_wait'>>
+		<<gs 'wait'>>
 	<</actCLA>>
 	<<gs 'prostitution_functions' 'prostitute_outfit_at_home'>>
 	<!-- !!if rand(0,2) ! 0:gs 'din_bad' & dynamic $mobile_check-->

sugarcube/src/locations/city/city_center.tw

@@ -30,9 +30,6 @@ setup.locations.city_center = {label: 'City Center',image: 'locations/city/cityc
 
 
 	<<gs 'music_actions' 'music_icon'>>*/
-	<<actCLA 'Wait'>>
-		<<gs 'obj_din_wait'>>
-	<</actCLA>>
 	<<gs 'taxi'>>
 
 	<p>

sugarcube/src/locations/city/city_industrial.tw

@@ -31,9 +31,7 @@
 		<!-- !! We've got an event today, check it's location:-->
 		<<gs 'emp_functions' 'disp_evt' 3>>
 	<</if>>*/
-	<<actCLA 'Wait'>>
-		<<gs 'obj_din_wait'>>
-	<</actCLA>>
+
 	/*<<gs 'taxi'>>
 	<<if getvar("$car") > 0>>
 		<<if getvar("$wrek") == 0 and ((cardrive == 7 and func('autoservisF', 'is_open') == 0) or (cardrive == 9 and func('autotraidF', 'is_open') == 0))>>

sugarcube/src/locations/city/city_island.tw

@@ -23,9 +23,7 @@ The university and shops and clubs that cater to the students dominate this area
 		<<gt 'metro_city_island' 'start'>>
 	<</actCLA>>
 <</if>>
-<<actCLA 'Wait'>>
-	<<gs 'obj_din_wait'>>
-<</actCLA>>
+
 <<gs 'taxi'>>
 <<gs 'camera' 'check_location'>>
 <<if $time.hour >= 8 and $time.hour <= 22>>

sugarcube/src/locations/city/city_redlight.tw

@@ -38,9 +38,6 @@
 	<<else>>
 		The Hookah Lounge is currently closed and will reopen at 19:00.
 	<</if>>
-	<<actCLA 'Wait'>>
-		<<gs 'obj_din_wait'>>
-	<</actCLA>>
 	<<gs 'taxi'>>
 	<<if getvar("$car") > 0>>
 		<<if getvar("$wrek") == 0 and ((cardrive == 7 and func('autoservisF', 'is_open') == 0) or (cardrive == 9 and func('autotraidF', 'is_open') == 0))>>

sugarcube/src/locations/city/city_residential.tw

@@ -49,9 +49,6 @@ setup.locations.city_residential = {label: 'Residential Area',image: 'locations/
 	<!-- !! We've got an event today, check it's location:-->
 	<<gs 'emp_functions' 'disp_evt' 3>>
 <</if>>
-<<actCLA 'Wait'>>
-	<<gs 'obj_din_wait'>>
-<</actCLA>>
 <<gs 'taxi'>>*/
 
 <<if $time.hour >= 8 and $time.hour <= 22>>

sugarcube/src/locations/pavlov/hotel/pav_hotel.tw

@@ -235,9 +235,6 @@ setup.npcs["pav_hotel_receptionist"] = {
 		<</if>>
 	<</actCLA>>
 <</if>>
-<<actCLA 'Kill some time in the hotel lobby'>>
-	<<gs 'obj_din_wait'>>
-<</actCLA>>
 <<if $location_var[$here][0] == 'Pavlin'>>
 	<<set $menu_off = 1>>
 	<<image "characters/pavlovsk/pavlin/pavlin.jpg">>

sugarcube/src/locations/pavlov/pav_commcenter.tw

@@ -89,9 +89,6 @@
 		<</actCLA>>
 
 	<</if>>
-	<<actCLA 'Wait'>>
-		<<gs 'obj_din_wait'>>
-	<</actCLA>>
 	<<if getvar("$locat['Anya']") == 10>>
 		Your sister <<link "Anya">><<gt 'sister' 'pav_commcenter'>><</link>> is sitting with a group of boys and girls, drinking beer.
 

sugarcube/src/locations/pavlov/pav_commercial.tw

@@ -145,9 +145,6 @@
 <<ConnectedLocation 'Highway' 'road' 20 'locations/highway/road.jpg' 15>>
 
 /*<<gs 'music_actions' 'music_icon'>>*/
-<<actCLA 'Wait'>>
-	<<gs 'obj_din_wait'>>
-<</actCLA>>
 /*<!-- !!if rand(0,2) ! 0:gs 'din_bad' & dynamic $mobile_check-->
 
 <!-- !-- Random prostitution solicitation check -------------------------->

sugarcube/src/locations/pavlov/pav_industrial.tw

@@ -64,9 +64,6 @@ Opening hours are Monday through Friday:
 <<else>>
 	<br>The tailor is closed right now.
 <</if>>
-<<actCLA 'Wait'>>
-	<<gs 'obj_din_wait'>>
-<</actCLA>>
 /*<!-- !!if rand(0,2) ! 0:gs 'din_bad' & dynamic $mobile_check-->
 <<if $npcs.get('A113','QW') == 1 and $time.daybelisex != $time.daystart and $time.hour >= 9 and $time.hour <= 23 and $time.weekday == 7>>
 	<<set $menu_off = 1>>

sugarcube/src/locations/pavlov/pav_train_hall.tw

@@ -127,9 +127,6 @@
 
 		<</if>>
 	<</if>>*/
-	<<actCLA 'Wait'>>
-		<<gs 'obj_din_wait'>>
-	<</actCLA>>
 /* :: pav_train_platforms[public outdoors]
 	<h2>Pavlovsk station platforms</h2>
 	<<image "locations/shared/train/pavplat.jpg">>

sugarcube/src/locations/pavlov/residential/pav_residential.tw

@@ -194,9 +194,7 @@
 <<ConnectedLocation 'Train Station' 'pav_train_hall' '' 'locations/pavlovsk/trainstation/pavtrainstation_day.jpg' 15>>
 <<ConnectedLocation 'Pushkin' 'liam' '' 'locations/pushkin/liam.jpg' 30>>
 
-<<actCLA 'Wait'>>
-	<<gs 'obj_din_wait'>>
-<</actCLA>>
+
 	<!-- Succubus-Stuff
 	<<if ($time.hour > 20 or $time.hour < 4) and getvar("$succubusQW") == 5 and $suchuntday != $time.daystart>>
 		<<actCLA 'Go hunting near the community center (this can take a lot of time)'>>

sugarcube/src/locations/pushkin/liam.tw

@@ -64,9 +64,6 @@
 		<</actCLA>>
 	<</actCLA>>
 <</if>>*/
-<<actCLA 'Wait'>>
-	<<gs 'obj_din_wait'>>
-<</actCLA>>
 <!-- !-- Random prostitution solicitation check -------------------------->
 <!--<<if getvar("$prostitute['blocked']") == 0>>
 	<<gs 'prostitution_functions' 'check_solicitation_event'>>

sugarcube/src/menu/characterOverview.tw

@@ -4213,21 +4213,6 @@
 		<</if>>
 	<</if>>
 <</if>>*/
-:: obj_din_wait
-	<<set $waitTime ??= 15>>
-	<p>
-		How many minutes would you like to wait? <<numberbox "$waitTime" $waitTime>> (maximum 120 minutes, leave blank to wait 15 minutes)
-		<<button "Wait">>
-			<<if $waitTime > 120 or $waitTime <= 0>>
-				<<msg "You need to enter a integer between 1 and 120." "info">>
-			<<else>>
-				<<addtime $waitTime>>
-				<<gt $location>>
-			<</if>>
-		<</button>>
-	</p>
-
-
 
 :: obj_din_rest
 	<<set $waiting = input ("How long would you like to rest?<br>(Default 15 minutes, maximum 120 minutes)")>>

sugarcube/src/wardrobe/wardrobe.css

@@ -231,49 +231,85 @@
     grid-row: 2/3;
 }
 
-.rightSidebar{
-    background: #222;
-    border: #444;
-    position: fixed;
-    width: 15em;
-    max-height: 90%;
-    right: 1em;
-    top: 5%;
-    box-sizing: border-box;
-    padding: 1em;
-    overflow: auto;
-}
-
-#outfitSetsSidebar > a{
-    display: block;
+.outfitSet, #addOutfitField{
+	border: 2px black solid;
+	margin: 0.1em;
+	border-radius: 0.4em;
+	padding: 0.1em 1em;
+	background: white;
+	color: black;
 }
 
-#outfitSets{
-    display: grid;
-    grid-template-columns: 1fr auto auto repeat(6,5em);
-    grid-auto-rows: 5em;
-    grid-gap: 0.2em 0.2em;
+#addOutfitField input{
+	color: black;
 }
 
-#outfitSets > .outfitSet{
-    display: contents;
+.outfitSet{
+	display: grid;
+	grid-template-columns: 1fr repeat(4, 5em) repeat(4, auto);
+	grid-template-rows: 5em;
+	grid-auto-rows: auto;
 }
 
-#outfitSets>.outfitSet>.label{
-    display: block;
-    grid-column: 1;
+.outfitSet>.itemPreview{
+	grid-row: 1;
+}
+
+.outfitSet>.itemPreview.clothes{
+	grid-column: 2;
+}
+.outfitSet>.itemPreview.shoes {
+	grid-column: 3;
+}
+.outfitSet>.itemPreview.bra {
+	grid-column: 4;
+}
+.outfitSet>.itemPreview.panties {
+	grid-column: 5;
+}
+
+.outfitSet > .button{
+	margin-top: auto;
+	margin-bottom: auto;
+}
+
+.outfitSet > .buttonWear{
+	grid-column: 6;
 }
 
-#outfitSets>.outfitSet>.itemPreview{
+.outfitSet>.buttonManage{
+		grid-column: 7;
+	}
+
+.outfitSet>.itemPreview{
     position: relative;
 }
 
-#outfitSets>.outfitSet>.itemPreview>img{
+.outfitSet>.outfitManagement {
+	display: none;
+}
+
+.outfitSet>.outfitManagement.visible{
+	display: block;
+	grid-column: 1/-1;
+	grid-row: 2;
+	
+}
+
+
+
+.outfitSet>.itemPreview>img{
     width: 100%;
     height: 100%;
     object-fit: cover;
 }
 
+.outfitSet > .buttonRadio{
+	display: none;
+}
+
+
+
 #wardrobe_type_overview_filter{
     display: grid;
     grid-template-columns: auto 1fr;

sugarcube/src/wardrobe/wardrobe.tw

@@ -81,40 +81,18 @@
 		<</if>>
 		</div>
 
-	<<actCLA 'Strip all clothing'>>
+	<div class="button">
+	<<link 'Strip all clothing'>>
 		<<run $wardrobe.strip('bra')>>
 		<<run $wardrobe.strip('clothes')>>
 		<<run $wardrobe.strip('panties')>>
 		<<run $wardrobe.strip('shoes')>>
 		<<gt 'wardrobe'>>
-	<</actCLA>>
-
-	<div id="outfitSetsSidebar" class="rightSidebar optional">
-		<<for _outfitKey, _outfitData range $wardrobe.outfits>>
-			<<capture _outfitKey>>
-				<<if $wardrobe.outfitIsWearable(_outfitKey)>>
-					<<link _outfitKey>>
-						<<run $wardrobe.wearOutfit(_outfitKey)>>
-						<<gt 'wardrobe'>>
-					<</link>>
-				<<else>>
-					<span>_outfitKey</span>
-				<</if>>
-			<</capture>>
-		<</for>>
-		<<textbox "$newOutfitName" "OutfitSetName">> <<button "Save">>
-			<<run $wardrobe.outfitAdd($newOutfitName)>>
-			<<gt 'wardrobe'>>
-		<</button>>
+	<</link>>
 	</div>
 
 	<h3>Outfit Sets</h3>
-	<div id="outfitSets">
-		<<if Object.keys($wardrobe.outfits).length > 0>>
-			<div>Name</div>
-			<div style="grid-column: 8">Sports</div>
-			<div style="grid-column: 9">School</div>
-		<</if>>
+	<div>
 		<<for _outfitKey, _outfitData range $wardrobe.outfits>>
 			<div class="outfitSet">
 				<<set _wearable_clothes = $wardrobe.wearable(_outfitData.clothes)>>
@@ -123,9 +101,12 @@
 				<<set _wearable_panties = $wardrobe.wearable(_outfitData.panties)>>
 				<<set _wearable = $wardrobe.outfitIsWearable(_outfitKey)>>
 				<<capture _outfitKey>>
-					<div class="label">
+					<h4 class="label">
+						_outfitKey
+					</h4>
+					<div class="button buttonWear">
 						<<if _wearable == true>>
-							<<actCLA _outfitKey 1>>
+							<<actCLA 'Wear' 1>>
 								<<run $wardrobe.wearOutfit(_outfitKey)>>
 								<<addtime 5>>
 								<<video "pc/activities/misc/dress_1.mp4">>
@@ -139,19 +120,10 @@
 							<</textWithTooltip>>
 						<</if>>
 					</div>
-					<div class="overwriteOption">
-						<<act 'Overwrite' 1>>
-							<<run $wardrobe.outfitAdd(_outfitKey)>>
-							<<gt 'wardrobe'>>
-						<</act>>
-					</div>
-					<div class="deleteOption">
-						<<linkreplace 'Delete'>>
-							<<link "Confirm">>
-								<<run $wardrobe.deleteOutfit(_outfitKey)>>
-								<<gt 'wardrobe'>>
-							<</link>>
-						<</linkreplace>>
+					<div class="button buttonManage">
+						<<link 'Manage'>>
+							<<toggleclass `'#outfitManagement_'+_outfitKey` "visible">>
+						<</link>>
 					</div>
 				<</capture>>
 
@@ -211,12 +183,55 @@
 					<</if>>
 				</div>
 
-				<div class="sportsOutfitRadio">
+				<label class="sportsOutfitRadio buttonRadio">
 					<<radiobutton "$wardrobe.outfitSports" _outfitKey autocheck>>
-				</div>
-				<div class="schoolOutfitRadio">
+					<span>Sport</span>
+				</label>
+				<label class="schoolOutfitRadio buttonRadio">
 					<<radiobutton "$wardrobe.outfitSchool" _outfitKey autocheck>>
+					<span>School</span>
+				</label>
+
+				<div @id='"outfitManagement_"+_outfitKey' class="outfitManagement">
+					<label class="sportsOutfitRadio buttonRadio">
+						<<radiobutton "$wardrobe.outfitSports" _outfitKey autocheck>>
+						<span>Sport</span>
+					</label>
+					<span class="description">Mark this as your default outfit for doing sports.</span>
+					<label class="schoolOutfitRadio buttonRadio">
+						<<radiobutton "$wardrobe.outfitSchool" _outfitKey autocheck>>
+						<span>School</span>
+					</label>
+					<span class="description">Mark this as your default outfit for going to school.</span>
+
+					<div class="overwriteOption button">
+						<<link 'Overwrite'>>
+							<<run $wardrobe.outfitAdd(_outfitKey)>>
+							<<gt 'wardrobe'>>
+						<</link>>
+					</div>
+					<span class="description">Overwrite the outfit with what you are currently wearing.</span>
+					<div class="deleteOption button">
+						<<linkreplace 'Delete'>>
+							<<link "Confirm">>
+								<<run $wardrobe.deleteOutfit(_outfitKey)>>
+								<<gt 'wardrobe'>>
+							<</link>>
+						<</linkreplace>>
+					</div>
+					<span class="description">Deletes this outfit. The clothes remain in your wardrobe.</span>
 				</div>
 			</div>
 		<</for>>
+		<div id="addOutfitField">
+			<h4>Add outfit</h4>
+			<span class="description">Add what you are currently wearing as a new outfit. If you type in an existing name, the existing outfit will be replaced instead.<br/>Name: </span>
+			<<textbox "_newOutfitName" "OutfitSetName">>
+			<div class="button">
+				<<link "Save">>
+					<<run $wardrobe.outfitAdd(_newOutfitName)>>
+					<<gt 'wardrobe'>>
+				<</link>>
+			</div>
+		</div>
 	</div>