Răsfoiți Sursa

updated NPC-code in `bedrPar2`

Stephan Fuchs 5 luni în urmă
părinte
comite
3234a5da4c
1 a modificat fișierele cu 21 adăugiri și 31 ștergeri
  1. 21 31
      sugarcube/src/locations/home_parents/bedroomParents.tw

+ 21 - 31
sugarcube/src/locations/home_parents/bedroomParents.tw

@@ -6,50 +6,40 @@
 		Their large bed, wardrobe and other closets take up most of the space.
 	</p>
 
-	<<set _sleepingNPCs = {}>>
-	<<set _locationNPCs = ['A28','A29']>>
+	<p>
+		<<set _sleepingNPCs = {}>>
+		<<set _locationNPCs = ['A28','A29']>>
+		<<set _locationData = {}>>
+		<<set _presentNPCCount = 0>>
 
-	<<for _locationNPC range _locationNPCs>>
-		<<set _locationData = $npcs.location(_locationNPC)>>
-		<<if _locationData.location == 'home' and  _locationData.activity.includes('asleep')>>
-			<<set _sleepingNPCs[_locationNPC] = {}>>
-		<</if>>
-	<</for>>
-	<<npcList _sleepingNPCs "# is sleeping on the bed." "# are sleeping on the bed.">>
+		<<for _locationNPC range _locationNPCs>>
+			<<set _locationData[_locationNPC] = $npcs.location(_locationNPC)>>
+			<<if _locationData[_locationNPC].location == 'home' and  _locationData[_locationNPC].activity.includes('asleep')>>
+				<<set _sleepingNPCs[_locationNPC] = {}>>
+				<<set _presentNPCCount += 1>>
+			<</if>>
+		<</for>>
+		<<npcList _sleepingNPCs "# is sleeping on the bed." "# are sleeping on the bed.">>
 
+		<<if _locationData['A28']>>
+			<<set _presentNPCCount += 1>>
+			<<npc 'A28'>><<gt 'father'>><</npc>> is busy putting on his clothes.
+		<</if>>
+	</p>
 
 
 	<<ConnectedLocationCode 'Hallway' 'locations/pavlovsk/resident/apartment/home/korrPar.webp' 1>>
 		<<gt 'korrPar'>>
 	<</ConnectedLocationCode>>
-	<<if Object.keys(_sleepingNPCs).length == 0>>
+
+
+	<<if _presentNPCCount == 0>>
 		You notice a book laying on the bed.
 		<<act "Open Book">><<gt 'parents_kamasutra'>><</act>>
 		<<act 'Open Wardrobe'>><<gt 'parents_wardrobe'>><</act>>
 		<<act 'Steal condoms' undefined `{repeatReset:{days:4}}`>>
 			<<gt 'parents_steal_condoms'>>
 		<</act>>
-		/*<<if $prezikday != $time.daystart>>
-			<<if getvar("$prezikProver") >= 3>>
-				<!--TODO: Redo Logic -->
-				<<set $prezikday = $time.daystart - 4>>
-				<<actCLA 'Steal condoms from your parents` stash'>>
-					<<set $menu_off = 1>>
-					<<set $time.minutes += rand(5,7)>>
-					<<if getvar("$preziktype") == 0>>
-
-
-					<</if>>
-					<<if getvar("$preziktype") == 1 or getvar("$preziktype") == 2>>
-						<<set $prezikcount += rand(1,3)>>
-
-					<</if>>
-					<<set $prezikday = $time.daystart>>
-					<<set $prezikProver = 0>>
-
-				<</actCLA>>
-			<</if>>
-		<</if>>*/
 	<</if>>
 :: parents_steal_condoms[event]
 	<<set _count = rand(1,3)>>