Orphan starts with home

sugarcube/src/PassageFooter.tw

@@ -22,6 +22,12 @@
 		<<if !_tags.includes('dynamicHousing') && $dynamicHousingRoom>>
 			<<unset $dynamicHousingRoom>>
 		<</if>>
+
+		<<set _dynamicConnections = $housing.connectionsByFromPassage(_thisMainPassage)>>
+		<<for _dynamicConnection range _dynamicConnections>>
+			<<set _dynamicConnectionFlags = setup.mergeDeep({capture:['_dynamicConnection']},_dynamicConnection.flags??{})>>
+			<<ConnectedLocation _dynamicConnection.label _dynamicConnection.toPassage _dynamicConnection.passageArg _dynamicConnection.image _dynamicConnection.time _dynamicConnectionFlags>>
+		<</for>>
 	<<elseif _tags.includes('quest')>>
 		<!-- This should be able to be returned to -->
 		<<set _menuDeactivated = false>>
@@ -38,8 +44,8 @@
 	<<if _tags.includes('bathroom')>>
 		<<include 'din_van'>>
 	<</if>>
-	<<if _tags.includes('bedroomPlayer')>>
-		<<include 'bedroomPlayer'>>
+	<<if _tags.includes('bedroom')>>
+		<<include 'bedroom'>>
 	<</if>>
 	<<if _tags.includes('kitchen')>>
 		<<include 'kitchen_generic'>>

sugarcube/src/Reference.tw

@@ -111,7 +111,7 @@
 							<li>shampooProvided: you can use the tub and/or the shower without having to use your own shampoo.</li>
 						</ul>
 					</li>
-					<li>bedroomPlayer: A place where the player finds a bed to sleep.</li>
+					<li>bedroom: A place where the player finds a bed to sleep.</li>
 					<li>bedroomNpc: A bedroom where the player can't sleep.</li>
 					<li>kitchen: One can at least find some water here.</li>
 					<li>livingroom:</li>

sugarcube/src/housing/dynamicHousing.tw

@@ -1,7 +1,9 @@
 :: dynamicHousing[include]
+	<<set _housingData = $location_var[$here][0]>>
+
 	<<set _currentRoom ??= ($dynamicHousingRoom ?? _housingData.entry)>>
 	<<set $dynamicHousingRoom = _currentRoom>>
-	<<set _currentRoomData = _housingData.rooms[_currentRoom]>>
+	<<set _currentRoomData = _housingData.room(_currentRoom)>>
 
 	<h2>_currentRoomData.title</h2>
 	<<image _currentRoomData.image>>
@@ -9,10 +11,19 @@
 
 	<<for _connection range _currentRoomData.connections ?? []>>
 		<<if typeof _connection === 'string'>>
-			<<set _destination = _housingData.rooms[_connection]>>
-			<<ConnectedLocation _destination.title _housingData.passage `_connection+''` _destination.image 1>>
+			<<if _connection.first() == '#'>>
+				<<set _connection = _housingData.connections[_connection.substring(1)]>>
+				<<set _flags = setup.mergeDeep({capture:['_connection']},_connection.flags??{})>>
+				<<ConnectedLocation _connection.label _connection.destination '' _connection.image _connection.time _flags>>
+			<<elseif _housingData.roomExists(_connection)>>
+				<<set _destination = _housingData.room(_connection)>>
+				<<ConnectedLocationCode _destination.title _destination.image 1 `{capture:['_connection']}`>>
+					<<set $dynamicHousingRoom = _connection>>
+					<<gt _housingData.passage>>
+				<</ConnectedLocationCode>>
+			<</if>>
 		<<else>>
-			<<ConnectedLocation _connection.label _connection.destination '' _connection.image _connection.time>>
+			<<ConnectedLocation _connection.label _connection.destination '' _connection.image _connection.time _connection.flags>>
 		<</if>>
 	<</for>>
 
@@ -22,4 +33,16 @@
 
 	<<if _currentRoomData.passage>>
 		<<gs _currentRoomData.passage>>
-	<</if>>
+	<</if>>
+
+:: dynamicHousingWidgets[widget]
+	<<widget 'dynamicHousing'>>
+		/*
+			Args
+				0 Data (Object: use the object, string: look up data in $housing)
+		 */
+
+		<<set _housingData = $housing.house(_args[0])>>
+
+		<<gs 'dynamicHousing' _housingData>>
+	<</widget>>

sugarcube/src/housing/housing.js

@@ -1,3 +1,5 @@
+setup.houses ??= {};
+
 class Housing{
 
     _access = [];
@@ -22,16 +24,74 @@ class Housing{
         return this._access.includes(houseId);
     }
 
-    houseData(houseId){
-        let data = func('homes_properties_attr','get_property_attr',houseId);
-        return data;
+    house(houseId){
+		if(typeof houseId == "object"){
+			let houseData = houseId;
+			if(houseData.id)
+				houseData = setup.mergeDeep({},houseData,this.houseData(houseId));
+			return new setup.House(houseData);
+		}
+			
+
+		
+		return new setup.House(this.houseData(houseId));
     }
 
+	houseData(houseId){
+		return setup.mergeDeep(
+			{},
+			this.houseData_static(houseId),
+			this.houseData_dynamic(houseId),
+		);
+	}
+
+	houseData_static(houseId){
+		return setup.houses[houseId] ?? {};
+	}
+
     isHome(houseId){
         return (this.home == houseId);
     }
 
 
+	// ----- Dynamic House Data -----
+	_houses = {};
+
+	houseData_dynamic(houseId){
+		return (this._houses[houseId] ?? {});
+	}
+
+	register(houseId,data={}){
+		this.set(houseId,data,true);
+	}
+
+	set(houseId,data={},replace=false){
+		if(replace)
+			this._houses[houseId] = clone(data);
+		else
+			this._houses[houseId] = setup.mergeDeep({},this.houseData_dynamic(houseId),data);
+	}
+
+	// ----- Connections -----
+	_connections = {};
+
+	connectionsByFromPassage(fromPassage){
+		return Object.values(this._connections).filter((connection) => connection.fromPassage == fromPassage);
+	}
+
+	registerConnection(id,fromPassage,toPassage,passageArg,label,time,image,flags={}){
+		this._connections[id] = {
+			id: id,
+			fromPassage:fromPassage,
+			toPassage:toPassage,
+			passageArg:passageArg,
+			label:label,
+			time:time,
+			image:image,
+			flags:flags
+		}
+	}
+
     constructor(){}
 
     _init(housing){
@@ -57,3 +117,34 @@ class Housing{
 }
 
 setup.Housing = Housing;
+
+class House{
+
+	room(roomId){
+		let roomData = this.rooms[roomId] ?? {};
+		if(roomData.template){
+			roomData = setup.mergeDeep(
+				{},
+				roomData,
+				this.roomTemplateData(roomData.template),
+			);
+		}
+		return roomData;
+	}
+
+	roomExists(roomId){
+		return !(!this.rooms[roomId]);
+	}
+
+	roomTemplateData(roomTemplateId){
+		return setup.rooms[roomTemplateId] ?? {};
+	}
+
+	constructor(house){
+		Object.keys(house).forEach(function (pn) {
+			this[pn] = clone(house[pn]);
+		}, this);
+	}
+}
+
+setup.House = House;

sugarcube/src/housing/rooms/hallway.js

@@ -0,0 +1,11 @@
+setup.rooms ??= {}
+setup.rooms.hallway_2_0 = {
+    title: 'Entrance hall',
+    image: 'locations/dynhouse/hallway/2(0).jpg',
+	connections:[
+        '#leave',
+        'bed',
+        'bath',
+        'kitchen',
+    ]
+}

sugarcube/src/locations/city/apartment/deprecated/korr.tw

@@ -1,11 +1,4 @@
 :: korr
-<<set $here = 'korr'>>
-<<set $ARGS = $location_var[$here]>>
-<!-- !! 2021/04/20-->
-<<set $music_loop = 0>>
-<<set $menu_off = 0>>
-<<gs 'shortgs' 'setloc' 'korr' $location_var[$here][0]>>
-<<set $location_type = 'private'>>
 
 <<set $locclass to null>>
 <<set $popolaini = 0>>
@@ -19,8 +12,7 @@
 	<<setinit $ml_performance['max_perform_minutes'] = $pc.skillLevel("playInstrument") + $pc.skillLevel("singing")>>
 
 <</if>>
-<<if getvar("$sound") == 0>>
-<</if>>
+
 <<if $courtletter_date <= $time.daystart and getvar("$courtletter_date") != 0>>
 	<<gt 'sentence' 'letter'>>
 

sugarcube/src/locations/city/apartment/dynamic.tw

@@ -0,0 +1,47 @@
+:: city_apartment_dynamic[indoors private dynamicHousing cityResidentialApartment]
+	<<set _housingData = {
+		passage: 'city_apartment_dynamic',
+		entry: 'hallway',
+		connections:{
+			leave:{
+				label: 'Leave',
+				destination: 'city_residential',
+				time: 5,
+				image: 'locations/city/residential/street.jpg',
+				flags:{indecencyBlocked:true}
+			}
+		},
+		rooms: {
+			hallway:{
+				template: 'hallway_2_0'
+			},
+			bed:{
+				title: 'Bedroom',
+				image:'locations/dynhouse/bed/1(0).jpg',
+				description: '',
+				connections:[
+					'hallway'
+				],
+				tags: ['bedroom'],
+			},
+			bath:{
+				title: 'Bathroom',
+				image: 'locations/pavlovsk/resident/apartment/artemhome/bathroom.jpg',
+				connections:[
+					'hallway'
+				],
+				tags: ['bathroom'],
+				description: "The first thing you notice are the god awful green tiles with matching sink in the bathroom. You don't know who picked it, but they obviously don't have good taste. Other than that, it's a fairly typical bathroom. You can do your hair and makeup in the mirror above the sink."
+			},
+			kitchen:{
+				title: 'Kitchen',
+				image: 'locations/pavlovsk/resident/apartment/artemhome/kitchen.jpg',
+				connections:[
+					'hallway'
+				],
+				tags: ['kitchen']
+			}
+		}
+	}>>
+
+	<<dynamicHousing _housingData>>

sugarcube/src/locations/generic/bedroomPlayer.tw

@@ -1,5 +1,5 @@
-:: bedroomPlayer
-<<if _tags.includes('isHome')>>
+:: bedroom[include]
+<<if $location.isHome>>
     <<act "Open wardrobe">><<gt 'wardrobe' 'start'>><</act>>
     <<act 'Relax on your bed'>><<gt 'bed' 'start'>><</act>>
     <<act "Alarm Clock Settings">><<gt 'budilnik' 'start'>><</act>>

sugarcube/src/locations/home_parents/bedroomPlayer.tw

@@ -1,4 +1,4 @@
-:: bedrPar[hasEvents indoors private bedroomPlayer homeParents computer guitar book]
+:: bedrPar[hasEvents indoors private bedroom homeParents computer guitar book]
 
 	<!-- !!day check so mom doesn''t think you have been out all night if you get up very early-->
 	/*<<setinit $motherworry[1] = $time.daystart>>*/

sugarcube/src/locations/home_parents/hallway.tw

@@ -33,7 +33,7 @@
 
 <</if>>*/
 <<ConnectedLocationCode 'Stairwell' 'locations/pavlovsk/resident/apartment/stairs/etaj2.jpg' 1  `{priority:0,indecencyBlocked:true}`>>
-	<<if $wardrobe.clothingworntype != 'nude'>>
+	<<if !$wardrobe.clothingIsNude>>
 		<<gt 'parents_stairwell_level2'>>
 	<<else>>
 		<<msg '<b><font color = red>You need to get dressed.</font></b>'>>

sugarcube/src/macros/0macros.twee-config.json

@@ -392,7 +392,8 @@
 			"piercingImage":{},"tattooImage":{},
 			"npcInfoContainerAdd":{},
 			"npcInfoContainerRemove,":{},
-			"characterSelect":{"description":"Adds options to select a starting character. P0: top category, P1: final passage","parameter":"text &+ passage"}
+			"characterSelect":{"description":"Adds options to select a starting character. P0: top category, P1: final passage","parameter":"text &+ passage"},
+			"dynamicHousing":{}
         }
     }
 }

sugarcube/src/playerCharacter/PlayerCharacter.js

@@ -2524,6 +2524,14 @@ class PlayerCharacter{
 		if(this.cyclePhase == 'menses' && !this.cycleProductsUsed)
 			result.push('menses_blood');
 
+		if(State.variables.wardrobe.clothingIsNude){
+			if(!State.variables.wardrobe.isWearingBra)
+				result.push('naked_breast');
+			if(!State.variables.wardrobe.isWearingPanties)
+				result.push('naked_pussy');
+			
+		}
+
 		return result;
 	}
 

sugarcube/src/sidebar/Sidebar.tw

@@ -88,6 +88,12 @@
 			<<imageWithTooltip "system/icons/icon_info_night.png">>
 				<p><<negative 2>>Your current appearance is deemed indecend! You try to avoid any attention until you have this problem fixed. Most social interactions are blocked.<</negative>></p>
 				<<set _indecencies = $pc.indecencies>>
+				<<if _indecencies.includes('naked_breast')>>
+					<p>Your breasts are completely exposed. You should either wear a bra or some clothes.</p>
+				<</if>>
+				<<if _indecencies.includes('naked_pussy')>>
+					<p>Your privates are completely exposed. You should either wear panties or some clothes.</p>
+				<</if>>
 				<<if _indecencies.includes('menses_blood')>>
 					<p>Your clothes are stained by your own menstrual blood running down your legs. You need to get to a toilet to use a tampon or a sanpad and to clean up your clothes.</p>
 				<</if>>
@@ -548,214 +554,220 @@
 <</widget>>
 
 <<widget 'stat_clothes_icon'>>
-	<<if $wardrobe.clothingworntype == 'danilovich_outfits'>>
-		<<if $wardrobe.PCloBimbo == 1 and $cheatBimbo == 0>>
-			<<set _stat_clothes_text = '<BR><font color = #FF00FF>You are wearing a bimbo outfit</font>'>>
-			<<set _stat_clothes_msg = 'You are wearing a gym outfit a bimbo would wear'>>
-			<<set _stat_clothes_tooltip = 'Bimbo gym outfit.'>>
-			<<set _stat_clothes_icon = 'exercise_b'>>
-		<<elseif $wardrobe.PCloInhibit >= 30>>
-			<<set _stat_clothes_msg = 'You`re wearing a revealing gym outfit.'>>
-			<<set _stat_clothes_tooltip = 'Revealing gym outfit.'>>
-			<<set _stat_clothes_icon = 'exercise_s'>>
-		<<elseif $wardrobe.PCloInhibit >= 20>>
-			<<set _stat_clothes_msg = 'You`re wearing a slightly revealing gym outfit.'>>
-			<<set _stat_clothes_tooltip = 'Slightly revealing gym outfit.'>>
-			<<set _stat_clothes_icon = 'exercise_s'>>
-		<<else>>
-			<<set _stat_clothes_msg = 'You`re wearing a normal gym outfit.'>>
-			<<set _stat_clothes_tooltip = 'Normal gym outfit.'>>
-			<<set _stat_clothes_icon = 'exercise'>>
-		<</if>>
-	<<elseif $wardrobe.PCloswimwear == 1>>
-		<<if ($wardrobe.PCloInhibit >= 50 or $wardrobe.PCloThinness == 6) and $wardrobe.PCloBimbo == 1 and $cheatBimbo == 0>>
-			<<set _stat_clothes_text = '<BR><font color = #FF00FF>You are wearing a bimbo outfit</font>'>>
-			<<set _stat_clothes_msg = 'You`re wearing an exhibitionist swimsuit a bimbo would wear.'>>
-			<<set _stat_clothes_tooltip = 'Exhibitionist/Bimbo swimsuit.'>>
-			<<set _stat_clothes_icon = 'swimsuit_eb'>>
-		<<elseif ($wardrobe.PCloInhibit >= 50 or $wardrobe.PCloThinness == 6) and ($wardrobe.PCloBimbo == 0 or getvar("$cheatBimbo") == 1)>>
-			<<set _stat_clothes_msg = 'You are wearing an exhibitionist swimsuit.'>>
-			<<set _stat_clothes_tooltip = 'Exhibitionist swimsuit.'>>
-			<<set _stat_clothes_icon = 'swimsuit_e'>>
-		<<elseif $wardrobe.PCloBimbo == 1 and $cheatBimbo == 0>>
-			<<set _stat_clothes_text = '<BR><font color = #FF00FF>You are wearing a bimbo outfit</font>'>>
-			<<set _stat_clothes_msg = 'You are wearing a swimsuit a bimbo would wear.'>>
-			<<set _stat_clothes_tooltip = 'Bimbo swimsuit.'>>
-			<<set _stat_clothes_icon = 'swimsuit_b'>>
-		<<elseif $wardrobe.PCloInhibit >= 40>>
-			<<set _stat_clothes_msg = 'You`re wearing a very revealing swimsuit.'>>
-			<<set _stat_clothes_tooltip = 'Very revealing swimsuit.'>>
-			<<set _stat_clothes_icon = 'swimsuit_s'>>
-		<<elseif $wardrobe.PCloInhibit >= 30>>
-			<<set _stat_clothes_msg = 'You`re wearing a revealing swimsuit.'>>
-			<<set _stat_clothes_tooltip = 'Revealing swimsuit.'>>
-			<<set _stat_clothes_icon = 'swimsuit_s'>>
-		<<elseif $wardrobe.PCloInhibit >= 25>>
-			<<set _stat_clothes_msg = 'You`re wearing a slightly revealing swimsuit.'>>
-			<<set _stat_clothes_tooltip = 'Slightly revealing swimsuit.'>>
-			<<set _stat_clothes_icon = 'swimsuit_s'>>
-		<<else>>
-			<<set _stat_clothes_msg = 'You`re wearing a normal swimsuit.'>>
-			<<set _stat_clothes_tooltip = 'Normal swimsuit.'>>
-			<<set _stat_clothes_icon = 'swimsuit'>>
-		<</if>>
-	<<elseif $wardrobe.clothingworntype == 'gm_office'>>
-		<<if $wardrobe.PCloStyle == 4 and $wardrobe.PCloBimbo == 1 and $cheatBimbo == 0>>
-			<<set _stat_clothes_text = '<BR><font color = #FF00FF>You are wearing a bimbo outfit</font>'>>
-			<<set _stat_clothes_msg = 'You`re wearing an office dress a bimbo or a prostitute would wear'>>
-			<<set _stat_clothes_tooltip = 'Prostitute/Bimbo office dress.'>>
-			<<set _stat_clothes_icon = 'office_pb'>>
-		<<elseif $wardrobe.PCloStyle == 4 and ($wardrobe.PCloBimbo == 0 or getvar("$cheatBimbo") == 1)>>
-			<<set _stat_clothes_msg = 'You`re wearing an office dress a prostitute would wear.'>>
-			<<set _stat_clothes_tooltip = 'Prostitute office dress.'>>
-			<<set _stat_clothes_icon = 'office_p'>>
-		<<elseif ($wardrobe.PCloInhibit >= 40 or $wardrobe.PCloThinness == 6) and $wardrobe.PCloBimbo == 1 and $cheatBimbo == 0>>
-			<<set _stat_clothes_text = '<BR><font color = #FF00FF>You are wearing a bimbo outfit</font>'>>
-			<<set _stat_clothes_msg = 'You`re wearing an exhibitionist office dress a bimbo would wear'>>
-			<<set _stat_clothes_tooltip = 'Exhibitionist/Bimbo office office dress.'>>
-			<<set _stat_clothes_icon = 'office_eb'>>
-		<<elseif ($wardrobe.PCloInhibit >= 40 or $wardrobe.PCloThinness == 6) and ($wardrobe.PCloBimbo == 0 or getvar("$cheatBimbo") == 1)>>
-			<<set _stat_clothes_msg = 'You are wearing an exhibitionist office dress.'>>
-			<<set _stat_clothes_tooltip = 'Exhibitionist office dress.'>>
-			<<set _stat_clothes_icon = 'office_e'>>
-		<<elseif $wardrobe.PCloBimbo == 1 and $cheatBimbo == 0>>
-			<<set _stat_clothes_text = '<BR><font color = #FF00FF>You are wearing a bimbo outfit</font>'>>
-			<<set _stat_clothes_msg = 'You are wearing an office dress a bimbo would wear'>>
-			<<set _stat_clothes_tooltip = 'Bimbo office dress.'>>
-			<<set _stat_clothes_icon = 'office_b'>>
-		<<elseif $wardrobe.PCloInhibit >= 30>>
-			<<set _stat_clothes_msg = 'You`re wearing a very revealing office dress.'>>
-			<<set _stat_clothes_tooltip = 'Very revealing office dress.'>>
-			<<set _stat_clothes_icon = 'office_s'>>
-		<<elseif $wardrobe.PCloInhibit >= 25>>
-			<<set _stat_clothes_msg = 'You`re wearing a revealing office dress.'>>
-			<<set _stat_clothes_tooltip = 'Revealing office dress.'>>
-			<<set _stat_clothes_icon = 'office_s'>>
-		<<elseif $wardrobe.PCloInhibit >= 20>>
-			<<set _stat_clothes_msg = 'You`re wearing a slightly revealing office dress.'>>
-			<<set _stat_clothes_tooltip = 'Slightly revealing office dress.'>>
-			<<set _stat_clothes_icon = 'office_s'>>
-		<<else>>
-			<<set _stat_clothes_msg = 'You`re wearing a normal office dress.'>>
-			<<set _stat_clothes_tooltip = 'Normal office dress.'>>
-			<<set _stat_clothes_icon = 'office'>>
-		<</if>>
-	<<elseif $q.school?.func('isWearingSchoolUniform')>>
-		<<if $wardrobe.PCloStyle == 4 and $wardrobe.PCloBimbo == 1 and $cheatBimbo == 0>>
-			<<set _stat_clothes_text = '<BR><font color = #FF00FF>You are wearing a bimbo outfit</font>'>>
-			<<set _stat_clothes_msg = 'You`re wearing a school uniform a prostitute or bimbo would wear.'>>
-			<<set _stat_clothes_tooltip = 'Prostitute/Bimbo school uniform'>>
-			<<set _stat_clothes_icon = 'uniform_pb'>>
-		<<elseif $wardrobe.PCloStyle == 4 and ($wardrobe.PCloBimbo == 0 or getvar("$cheatBimbo") == 1)>>
-			<<set _stat_clothes_msg = 'You`re wearing a school uniform a prostitute would wear.'>>
-			<<set _stat_clothes_tooltip = 'Prostitute school uniform.'>>
-			<<set _stat_clothes_icon = 'uniform_p'>>
-		<<elseif $wardrobe.PCloBimbo == 1 and $cheatBimbo == 0>>
-			<<set _stat_clothes_text = '<BR><font color = #FF00FF>You are wearing a bimbo outfit</font>'>>
-			<<set _stat_clothes_msg = 'You`re wearing a school uniform a bimbo would wear.'>>
-			<<set _stat_clothes_tooltip = 'Bimbo school uniform.'>>
-			<<set _stat_clothes_icon = 'uniform_b'>>
-		<<elseif $wardrobe.PCloInhibit >= 30>>
-			<<set _stat_clothes_msg = 'You`re wearing a very revealing school uniform.'>>
-			<<set _stat_clothes_tooltip = 'Very revealing school uniform.'>>
-			<<set _stat_clothes_icon = 'uniform_s'>>
-		<<elseif $wardrobe.PCloInhibit >= 25>>
-			<<set _stat_clothes_msg = 'You`re wearing a revealing school uniform.'>>
-			<<set _stat_clothes_tooltip = 'Revealing school uniform.'>>
-			<<set _stat_clothes_icon = 'uniform_s'>>
-		<<elseif $wardrobe.PCloInhibit >= 20>>
-			<<set _stat_clothes_msg = 'You`re wearing a slightly revealing school uniform.'>>
-			<<set _stat_clothes_tooltip = 'Slightly revealing school uniform.'>>
-			<<set _stat_clothes_icon = 'uniform_s'>>
+	<<if $wardrobe.clothingIsNude>>
+		<<imageWithTooltip `'system/icons/status/body_writing.png'`>>
+			You are not wearing clothes.
+		<</imageWithTooltip>>
+	<<else>>
+		<<if $wardrobe.clothingworntype == 'danilovich_outfit'>>
+			<<if $wardrobe.PCloBimbo == 1 and $cheatBimbo == 0>>
+				<<set _stat_clothes_text = '<BR><font color = #FF00FF>You are wearing a bimbo outfit</font>'>>
+				<<set _stat_clothes_msg = 'You are wearing a gym outfit a bimbo would wear'>>
+				<<set _stat_clothes_tooltip = 'Bimbo gym outfit.'>>
+				<<set _stat_clothes_icon = 'exercise_b'>>
+			<<elseif $wardrobe.PCloInhibit >= 30>>
+				<<set _stat_clothes_msg = 'You`re wearing a revealing gym outfit.'>>
+				<<set _stat_clothes_tooltip = 'Revealing gym outfit.'>>
+				<<set _stat_clothes_icon = 'exercise_s'>>
+			<<elseif $wardrobe.PCloInhibit >= 20>>
+				<<set _stat_clothes_msg = 'You`re wearing a slightly revealing gym outfit.'>>
+				<<set _stat_clothes_tooltip = 'Slightly revealing gym outfit.'>>
+				<<set _stat_clothes_icon = 'exercise_s'>>
+			<<else>>
+				<<set _stat_clothes_msg = 'You`re wearing a normal gym outfit.'>>
+				<<set _stat_clothes_tooltip = 'Normal gym outfit.'>>
+				<<set _stat_clothes_icon = 'exercise'>>
+			<</if>>
+		<<elseif $wardrobe.PCloswimwear == 1>>
+			<<if ($wardrobe.PCloInhibit >= 50 or $wardrobe.PCloThinness == 6) and $wardrobe.PCloBimbo == 1 and $cheatBimbo == 0>>
+				<<set _stat_clothes_text = '<BR><font color = #FF00FF>You are wearing a bimbo outfit</font>'>>
+				<<set _stat_clothes_msg = 'You`re wearing an exhibitionist swimsuit a bimbo would wear.'>>
+				<<set _stat_clothes_tooltip = 'Exhibitionist/Bimbo swimsuit.'>>
+				<<set _stat_clothes_icon = 'swimsuit_eb'>>
+			<<elseif ($wardrobe.PCloInhibit >= 50 or $wardrobe.PCloThinness == 6) and ($wardrobe.PCloBimbo == 0 or getvar("$cheatBimbo") == 1)>>
+				<<set _stat_clothes_msg = 'You are wearing an exhibitionist swimsuit.'>>
+				<<set _stat_clothes_tooltip = 'Exhibitionist swimsuit.'>>
+				<<set _stat_clothes_icon = 'swimsuit_e'>>
+			<<elseif $wardrobe.PCloBimbo == 1 and $cheatBimbo == 0>>
+				<<set _stat_clothes_text = '<BR><font color = #FF00FF>You are wearing a bimbo outfit</font>'>>
+				<<set _stat_clothes_msg = 'You are wearing a swimsuit a bimbo would wear.'>>
+				<<set _stat_clothes_tooltip = 'Bimbo swimsuit.'>>
+				<<set _stat_clothes_icon = 'swimsuit_b'>>
+			<<elseif $wardrobe.PCloInhibit >= 40>>
+				<<set _stat_clothes_msg = 'You`re wearing a very revealing swimsuit.'>>
+				<<set _stat_clothes_tooltip = 'Very revealing swimsuit.'>>
+				<<set _stat_clothes_icon = 'swimsuit_s'>>
+			<<elseif $wardrobe.PCloInhibit >= 30>>
+				<<set _stat_clothes_msg = 'You`re wearing a revealing swimsuit.'>>
+				<<set _stat_clothes_tooltip = 'Revealing swimsuit.'>>
+				<<set _stat_clothes_icon = 'swimsuit_s'>>
+			<<elseif $wardrobe.PCloInhibit >= 25>>
+				<<set _stat_clothes_msg = 'You`re wearing a slightly revealing swimsuit.'>>
+				<<set _stat_clothes_tooltip = 'Slightly revealing swimsuit.'>>
+				<<set _stat_clothes_icon = 'swimsuit_s'>>
+			<<else>>
+				<<set _stat_clothes_msg = 'You`re wearing a normal swimsuit.'>>
+				<<set _stat_clothes_tooltip = 'Normal swimsuit.'>>
+				<<set _stat_clothes_icon = 'swimsuit'>>
+			<</if>>
+		<<elseif $wardrobe.clothingworntype == 'gm_office'>>
+			<<if $wardrobe.PCloStyle == 4 and $wardrobe.PCloBimbo == 1 and $cheatBimbo == 0>>
+				<<set _stat_clothes_text = '<BR><font color = #FF00FF>You are wearing a bimbo outfit</font>'>>
+				<<set _stat_clothes_msg = 'You`re wearing an office dress a bimbo or a prostitute would wear'>>
+				<<set _stat_clothes_tooltip = 'Prostitute/Bimbo office dress.'>>
+				<<set _stat_clothes_icon = 'office_pb'>>
+			<<elseif $wardrobe.PCloStyle == 4 and ($wardrobe.PCloBimbo == 0 or getvar("$cheatBimbo") == 1)>>
+				<<set _stat_clothes_msg = 'You`re wearing an office dress a prostitute would wear.'>>
+				<<set _stat_clothes_tooltip = 'Prostitute office dress.'>>
+				<<set _stat_clothes_icon = 'office_p'>>
+			<<elseif ($wardrobe.PCloInhibit >= 40 or $wardrobe.PCloThinness == 6) and $wardrobe.PCloBimbo == 1 and $cheatBimbo == 0>>
+				<<set _stat_clothes_text = '<BR><font color = #FF00FF>You are wearing a bimbo outfit</font>'>>
+				<<set _stat_clothes_msg = 'You`re wearing an exhibitionist office dress a bimbo would wear'>>
+				<<set _stat_clothes_tooltip = 'Exhibitionist/Bimbo office office dress.'>>
+				<<set _stat_clothes_icon = 'office_eb'>>
+			<<elseif ($wardrobe.PCloInhibit >= 40 or $wardrobe.PCloThinness == 6) and ($wardrobe.PCloBimbo == 0 or getvar("$cheatBimbo") == 1)>>
+				<<set _stat_clothes_msg = 'You are wearing an exhibitionist office dress.'>>
+				<<set _stat_clothes_tooltip = 'Exhibitionist office dress.'>>
+				<<set _stat_clothes_icon = 'office_e'>>
+			<<elseif $wardrobe.PCloBimbo == 1 and $cheatBimbo == 0>>
+				<<set _stat_clothes_text = '<BR><font color = #FF00FF>You are wearing a bimbo outfit</font>'>>
+				<<set _stat_clothes_msg = 'You are wearing an office dress a bimbo would wear'>>
+				<<set _stat_clothes_tooltip = 'Bimbo office dress.'>>
+				<<set _stat_clothes_icon = 'office_b'>>
+			<<elseif $wardrobe.PCloInhibit >= 30>>
+				<<set _stat_clothes_msg = 'You`re wearing a very revealing office dress.'>>
+				<<set _stat_clothes_tooltip = 'Very revealing office dress.'>>
+				<<set _stat_clothes_icon = 'office_s'>>
+			<<elseif $wardrobe.PCloInhibit >= 25>>
+				<<set _stat_clothes_msg = 'You`re wearing a revealing office dress.'>>
+				<<set _stat_clothes_tooltip = 'Revealing office dress.'>>
+				<<set _stat_clothes_icon = 'office_s'>>
+			<<elseif $wardrobe.PCloInhibit >= 20>>
+				<<set _stat_clothes_msg = 'You`re wearing a slightly revealing office dress.'>>
+				<<set _stat_clothes_tooltip = 'Slightly revealing office dress.'>>
+				<<set _stat_clothes_icon = 'office_s'>>
+			<<else>>
+				<<set _stat_clothes_msg = 'You`re wearing a normal office dress.'>>
+				<<set _stat_clothes_tooltip = 'Normal office dress.'>>
+				<<set _stat_clothes_icon = 'office'>>
+			<</if>>
+		<<elseif $q.school?.func('isWearingSchoolUniform')>>
+			<<if $wardrobe.PCloStyle == 4 and $wardrobe.PCloBimbo == 1 and $cheatBimbo == 0>>
+				<<set _stat_clothes_text = '<BR><font color = #FF00FF>You are wearing a bimbo outfit</font>'>>
+				<<set _stat_clothes_msg = 'You`re wearing a school uniform a prostitute or bimbo would wear.'>>
+				<<set _stat_clothes_tooltip = 'Prostitute/Bimbo school uniform'>>
+				<<set _stat_clothes_icon = 'uniform_pb'>>
+			<<elseif $wardrobe.PCloStyle == 4 and ($wardrobe.PCloBimbo == 0 or getvar("$cheatBimbo") == 1)>>
+				<<set _stat_clothes_msg = 'You`re wearing a school uniform a prostitute would wear.'>>
+				<<set _stat_clothes_tooltip = 'Prostitute school uniform.'>>
+				<<set _stat_clothes_icon = 'uniform_p'>>
+			<<elseif $wardrobe.PCloBimbo == 1 and $cheatBimbo == 0>>
+				<<set _stat_clothes_text = '<BR><font color = #FF00FF>You are wearing a bimbo outfit</font>'>>
+				<<set _stat_clothes_msg = 'You`re wearing a school uniform a bimbo would wear.'>>
+				<<set _stat_clothes_tooltip = 'Bimbo school uniform.'>>
+				<<set _stat_clothes_icon = 'uniform_b'>>
+			<<elseif $wardrobe.PCloInhibit >= 30>>
+				<<set _stat_clothes_msg = 'You`re wearing a very revealing school uniform.'>>
+				<<set _stat_clothes_tooltip = 'Very revealing school uniform.'>>
+				<<set _stat_clothes_icon = 'uniform_s'>>
+			<<elseif $wardrobe.PCloInhibit >= 25>>
+				<<set _stat_clothes_msg = 'You`re wearing a revealing school uniform.'>>
+				<<set _stat_clothes_tooltip = 'Revealing school uniform.'>>
+				<<set _stat_clothes_icon = 'uniform_s'>>
+			<<elseif $wardrobe.PCloInhibit >= 20>>
+				<<set _stat_clothes_msg = 'You`re wearing a slightly revealing school uniform.'>>
+				<<set _stat_clothes_tooltip = 'Slightly revealing school uniform.'>>
+				<<set _stat_clothes_icon = 'uniform_s'>>
+			<<else>>
+				<<set _stat_clothes_msg = 'You`re wearing a normal school uniform.'>>
+				<<set _stat_clothes_tooltip = 'Normal school uniform.'>>
+				<<set _stat_clothes_icon = 'uniform'>>
+			<</if>>
+		<<elseif $wardrobe.clothingworntype == 'misc_outfits' and $wardrobe.clothingwornnumber == '1'>>
+			<<set _stat_clothes_text = '<BR><b><font color = "yellow">You are wearing an old hessian sack the hunters gave you.</font></b>'>>
+			<<set _stat_clothes_tooltip = 'You`re wearing a hessian sack.'>>
+			<<set _stat_clothes_msg = 'You are wearing an old hessian sack the hunters gave you.'>>
+			<<set _stat_clothes_icon = 'clothes'>>
 		<<else>>
-			<<set _stat_clothes_msg = 'You`re wearing a normal school uniform.'>>
-			<<set _stat_clothes_tooltip = 'Normal school uniform.'>>
-			<<set _stat_clothes_icon = 'uniform'>>
+			<<if $wardrobe.PCloStyle == 4 and $wardrobe.PCloBimbo == 1 and $cheatBimbo == 0>>
+				<<set _stat_clothes_text = '<BR><font color = #FF00FF>You are wearing a bimbo, prostitute outfit</font>'>>
+				<<set _stat_clothes_msg = 'You`re wearing an outfit a bimbo, prostitute would wear.'>>
+				<<set _stat_clothes_tooltip = 'Prostitute/Bimbo outfit.'>>
+				<<set _stat_clothes_icon = 'clothes_pb'>>
+			<<elseif $wardrobe.PCloStyle == 4>>
+				<<set _stat_clothes_msg = 'You`re wearing an outfit a prostitute would wear.'>>
+				<<set _stat_clothes_tooltip = 'Prostitute outfit.'>>
+				<<set _stat_clothes_icon = 'clothes_p'>>
+			<<elseif ($wardrobe.PCloInhibit >= 40 or $wardrobe.PCloThinness == 6) and $wardrobe.PCloBimbo == 1 and $cheatBimbo == 0>>
+				<<set _stat_clothes_text = '<BR><font color = #FF00FF>You are wearing a bimbo, exhibitionist outfit</font>'>>
+				<<set _stat_clothes_msg = 'You`re wearing exhibitionist clothes a bimbo would wear.'>>
+				<<set _stat_clothes_tooltip = 'Exhibitionist/Bimbo outfit.'>>
+				<<set _stat_clothes_icon = 'clothes_eb'>>
+			<<elseif ($wardrobe.PCloInhibit >= 40 or $wardrobe.PCloThinness == 6)>>
+				<<set _stat_clothes_msg = 'You are wearing exhibitionist clothes.'>>
+				<<set _stat_clothes_tooltip = 'Exhibitionist outfit.'>>
+				<<set _stat_clothes_icon = 'clothes_e'>>
+			<<elseif $wardrobe.PCloBimbo == 1 and $cheatBimbo == 0>>
+				<<set _stat_clothes_text = '<BR><font color = #FF00FF>You are wearing a bimbo outfit</font>'>>
+				<<set _stat_clothes_msg = 'You are wearing bimbo clothes.'>>
+				<<set _stat_clothes_tooltip = 'Bimbo outfit.'>>
+				<<set _stat_clothes_icon = 'clothes_b'>>
+			<<elseif $wardrobe.PCloInhibit >= 30>>
+				<<set _stat_clothes_msg = 'You`re wearing very revealing clothes.'>>
+				<<set _stat_clothes_tooltip = 'Very revealing outfit.'>>
+				<<set _stat_clothes_icon = 'clothes_s'>>
+			<<elseif $wardrobe.PCloInhibit >= 25>>
+				<<set _stat_clothes_msg = 'You`re wearing revealing clothes.'>>
+				<<set _stat_clothes_tooltip = 'Revealing outfit.'>>
+				<<set _stat_clothes_icon = 'clothes_s'>>
+			<<elseif $wardrobe.PCloInhibit >= 20>>
+				<<set _stat_clothes_msg = 'You`re wearing slightly revealing clothes.'>>
+				<<set _stat_clothes_tooltip = 'Slightly revealing outfit.'>>
+				<<set _stat_clothes_icon = 'clothes_s'>>
+			<<else>>
+				<<set _stat_clothes_msg = "You're wearing normal clothes.">>
+				<<set _stat_clothes_tooltip = 'Normal outfit.'>>
+				<<set _stat_clothes_icon = 'clothes'>>
+			<</if>>
 		<</if>>
-	<<elseif $wardrobe.clothingworntype == 'misc_outfits' and $wardrobe.clothingwornnumber == '1'>>
-		<<set _stat_clothes_text = '<BR><b><font color = "yellow">You are wearing an old hessian sack the hunters gave you.</font></b>'>>
-		<<set _stat_clothes_tooltip = 'You`re wearing a hessian sack.'>>
-		<<set _stat_clothes_msg = 'You are wearing an old hessian sack the hunters gave you.'>>
-		<<set _stat_clothes_icon = 'clothes'>>
-	<<else>>
-		<<if $wardrobe.PCloStyle == 4 and $wardrobe.PCloBimbo == 1 and $cheatBimbo == 0>>
-			<<set _stat_clothes_text = '<BR><font color = #FF00FF>You are wearing a bimbo, prostitute outfit</font>'>>
-			<<set _stat_clothes_msg = 'You`re wearing an outfit a bimbo, prostitute would wear.'>>
-			<<set _stat_clothes_tooltip = 'Prostitute/Bimbo outfit.'>>
-			<<set _stat_clothes_icon = 'clothes_pb'>>
-		<<elseif $wardrobe.PCloStyle == 4>>
-			<<set _stat_clothes_msg = 'You`re wearing an outfit a prostitute would wear.'>>
-			<<set _stat_clothes_tooltip = 'Prostitute outfit.'>>
-			<<set _stat_clothes_icon = 'clothes_p'>>
-		<<elseif ($wardrobe.PCloInhibit >= 40 or $wardrobe.PCloThinness == 6) and $wardrobe.PCloBimbo == 1 and $cheatBimbo == 0>>
-			<<set _stat_clothes_text = '<BR><font color = #FF00FF>You are wearing a bimbo, exhibitionist outfit</font>'>>
-			<<set _stat_clothes_msg = 'You`re wearing exhibitionist clothes a bimbo would wear.'>>
-			<<set _stat_clothes_tooltip = 'Exhibitionist/Bimbo outfit.'>>
-			<<set _stat_clothes_icon = 'clothes_eb'>>
-		<<elseif ($wardrobe.PCloInhibit >= 40 or $wardrobe.PCloThinness == 6)>>
-			<<set _stat_clothes_msg = 'You are wearing exhibitionist clothes.'>>
-			<<set _stat_clothes_tooltip = 'Exhibitionist outfit.'>>
-			<<set _stat_clothes_icon = 'clothes_e'>>
-		<<elseif $wardrobe.PCloBimbo == 1 and $cheatBimbo == 0>>
-			<<set _stat_clothes_text = '<BR><font color = #FF00FF>You are wearing a bimbo outfit</font>'>>
-			<<set _stat_clothes_msg = 'You are wearing bimbo clothes.'>>
-			<<set _stat_clothes_tooltip = 'Bimbo outfit.'>>
-			<<set _stat_clothes_icon = 'clothes_b'>>
-		<<elseif $wardrobe.PCloInhibit >= 30>>
-			<<set _stat_clothes_msg = 'You`re wearing very revealing clothes.'>>
-			<<set _stat_clothes_tooltip = 'Very revealing outfit.'>>
-			<<set _stat_clothes_icon = 'clothes_s'>>
-		<<elseif $wardrobe.PCloInhibit >= 25>>
-			<<set _stat_clothes_msg = 'You`re wearing revealing clothes.'>>
-			<<set _stat_clothes_tooltip = 'Revealing outfit.'>>
-			<<set _stat_clothes_icon = 'clothes_s'>>
-		<<elseif $wardrobe.PCloInhibit >= 20>>
-			<<set _stat_clothes_msg = 'You`re wearing slightly revealing clothes.'>>
-			<<set _stat_clothes_tooltip = 'Slightly revealing outfit.'>>
-			<<set _stat_clothes_icon = 'clothes_s'>>
+
+		<<set _stat_clothes_msg = 'You are wearing a '+func('itemDescriptionFunctions','qualityString',$wardrobe.outfitQuality)+' quality '>>
+		<<switch $wardrobe.outfitIndecency>>
+			<<case 0>>
+				<<set _stat_clothes_msg += 'conservative '>>
+			<<case 1>>
+				<<set _stat_clothes_msg += 'attractive '>>
+			<<case 2>>
+				<<set _stat_clothes_msg += 'sexy '>>
+			<<case 3>>
+				<<set _stat_clothes_msg += 'slutty '>>
+			<<case 4>>
+				<<set _stat_clothes_msg += 'whorish '>>
+		<</switch>>
+		<<if $wardrobe.isSchoolOutfit>>
+			<<set _stat_clothes_msg += 'school outfit.'>>
+		<<elseif $wardrobe.isSportsOutfit>>
+			<<set _stat_clothes_msg += 'gym outfit.'>>
+			<<if $wardrobe.PShoHeels > 1>>
+				<<set _stat_clothes_msg += " <<negative>>You can't do sports while wearing heels.<</negative>>">>
+			<</if>>
+		<<elseif $wardrobe.isMaidOutfit>>
+			<<set _stat_clothes_msg += 'maid outfit.'>>
+		<<elseif $wardrobe.PCloswimwear == 1>>
+			<<set _stat_clothes_msg += 'swimming outfit.'>>
 		<<else>>
-			<<set _stat_clothes_msg = "You're wearing normal clothes.">>
-			<<set _stat_clothes_tooltip = 'Normal outfit.'>>
-			<<set _stat_clothes_icon = 'clothes'>>
+			<<set _stat_clothes_msg += 'outfit.'>>
 		<</if>>
-	<</if>>
 
-	<<set _stat_clothes_msg = 'You are wearing a '+func('itemDescriptionFunctions','qualityString',$wardrobe.outfitQuality)+' quality '>>
-	<<switch $wardrobe.outfitIndecency>>
-		<<case 0>>
-			<<set _stat_clothes_msg += 'conservative '>>
-		<<case 1>>
-			<<set _stat_clothes_msg += 'attractive '>>
-		<<case 2>>
-			<<set _stat_clothes_msg += 'sexy '>>
-		<<case 3>>
-			<<set _stat_clothes_msg += 'slutty '>>
-		<<case 4>>
-			<<set _stat_clothes_msg += 'whorish '>>
-	<</switch>>
-	<<if $wardrobe.isSchoolOutfit>>
-		<<set _stat_clothes_msg += 'school outfit.'>>
-	<<elseif $wardrobe.isSportsOutfit>>
-		<<set _stat_clothes_msg += 'gym outfit.'>>
-		<<if $wardrobe.PShoHeels > 1>>
-			<<set _stat_clothes_msg += " <<negative>>You can't do sports while wearing heels.<</negative>>">>
+		<<if !$wardrobe.isWearingShoes>>
+			<<set _stat_clothes_msg += " You are currently not wearing your shoes.">>
 		<</if>>
-	<<elseif $wardrobe.isMaidOutfit>>
-		<<set _stat_clothes_msg += 'maid outfit.'>>
-	<<elseif $wardrobe.PCloswimwear == 1>>
-		<<set _stat_clothes_msg += 'swimming outfit.'>>
-	<<else>>
-		<<set _stat_clothes_msg += 'outfit.'>>
-	<</if>>
+		<<set _stat_clothes_msg += "<div class='outfitMiniPreview'><<image `func('$pc.body_image','clothes')`>><<image `func('$pc.body_image','shoes')`>></div>">>
 
-	<<if !$wardrobe.isWearingShoes>>
-		<<set _stat_clothes_msg += " You are currently not wearing your shoes.">>
+		<<imageWithTooltip `'system/icons/status/'+_stat_clothes_icon+'.png'`>>
+			_stat_clothes_msg
+		<</imageWithTooltip>>
 	<</if>>
-	<<set _stat_clothes_msg += "<div class='outfitMiniPreview'><<image `func('$pc.body_image','clothes')`>><<image `func('$pc.body_image','shoes')`>></div>">>
-
-	<<imageWithTooltip `'system/icons/status/'+_stat_clothes_icon+'.png'`>>
-		_stat_clothes_msg
-	<</imageWithTooltip>>
 
 <</widget>>
 

sugarcube/src/start/characterSelect.tw

@@ -101,6 +101,18 @@ setup.getStartingCharactersByFilter = function(filters,shallow = true){
 	<<set $pc.avatar = _optionData.image>>
 
 	<<set $housing.home = _optionData.housing.home>>
+	<<for _connectionId, _connectionData range (_optionData.housing.connect ?? {})>>
+		<<run $housing.registerConnection(
+			_connectionId,
+			_connectionData.fromPassage,
+			_connectionData.toPassage,
+			_connectionData.passageArg ?? "",
+			_connectionData.label,
+			_connectionData.time,
+			_connectionData.image,
+			_connectionData.flags ?? {},
+		)>>
+	<</for>>
 
 	<<if _optionData.time>>
 		<<if _optionData.time.start>>

sugarcube/src/start/city/intro_city.tw

@@ -5,7 +5,19 @@ setup.startingCharacters ??= {};
 setup.startingCharacters.city_starting_category = {
 	parent: 'default',
 	housing:{
-		home: 'city_residential_apartment'
+		home: 'cityResidentialApartment',
+		connect:{
+			city_apartment_dynamic:{
+				fromPassage: 'city_residential',
+				toPassage: 'city_apartment_dynamic',
+				label: 'Your Apartment',
+				time: 5,
+				image: 'locations/city/residential/street.jpg',
+				flags:{
+					priority: 5000
+				}
+			}
+		}
 	},
 	quests:{
 	},
@@ -75,10 +87,10 @@ setup.startingCharacters.city_orphan_average = {
 	<<gs 'init_post_intro'>>
 	<<image 'system/1_openings/5_city/city_start.jpg'>>
 	<p>Welcome to the City version! Your setup is done, you are ready to begin your new life in the city now.</p>
-	<<actCLA 'Begin'>>
+	<<act 'Begin'>>
 		<<run $pc.init_final()>>
-		<<gt 'korr'>>
-	<</actCLA>>
+		<<gt 'city_apartment_dynamic'>>
+	<</act>>
 
 
 :: intro_city_old[deprecated]

sugarcube/src/wardrobe/wardrobe.js

@@ -226,6 +226,11 @@ class Wardrobe{
 
 
 	// ----- Bra -----
+
+	get isWearingBra(){
+		return (!(!this._wornItems.bra));
+	}
+
 	get braworntype(){
 		if(!this._wornItems.bra)
 			return 'none';