Browse Source

moving pieces of mother-file around

Stephan Fuchs 5 months ago
parent
commit
0367965ac5
1 changed files with 44 additions and 32 deletions
  1. 44 32
      sugarcube/src/npcs/family/mother/mother.tw

+ 44 - 32
sugarcube/src/npcs/family/mother/mother.tw

@@ -6,47 +6,59 @@
 <!-- !! Saturday gone a couple of hours in the day to do laundry again, no scene just a time she won''t be home.-->
 <!-- !! Sunday after noon, gone to church for a couple of hours. I will write a scene where Sveta can run into her at the church.-->
 <!-- !! plus need to set the times where she goes to visit Sergey-->
-<<set $delin_beh ??= 0>> <!-- Counter for being send away over summer -->
+<!--<<set $delin_beh ??= 0>> <!-- Counter for being send away over summer -->
 
 <<set _motherAge = $npc($npc_mother).age>>
 <<set _motherRel = $npc('A29').rel>>
+<<set _location_mum = $npcs.location('A29')>>
 
 <h2>Your mother, <<=$npc('A29').firstname>> <<=$npc('A29').lastname>></h2>
-<<image "characters/pavlovsk/resident/mom/mother.jpg">>
-<p>Your mother <<=$npc('A29').firstname>> is still quite young and attractive. She's only _motherAge years. She works at the station cafe.</p>
-
-/*<p>
-	<<if _motherRel < 20>>
-		<<negative 2>>Your relationship with your mother is terrible.<</negative>>
-	<<elseif _motherRel < 40>>
-		<<negative>>Your relationship with your mother is tense.<</negative>>
-	<<elseif _motherRel < 60>>
-		You have a normal relationship with your mother.
-	<<elseif _motherRel < 80>>
-		<<positive>>You have a good relationship with your mother.<</positive>>
-	<<else>>
-		<<positive 2>>You have a great relationship with your mother.<</positive>>
-	<</if>>
-</p>*/
-<<act 'Chat' undefined `{time:15}`>>
-	<<gt 'mother_chat'>>
-<</act>>
-<<act 'Offer to help around the house' undefined `{time:60,mood:50}`>>
-	<<gt 'mother_help_in_house'>>
-<</act>>
-<<if $pc.isSchoolStudent>>
-	<<actCLA 'Ask for some money'>>
-		<<gt 'mother_ask_money'>>
-	<</actCLA>>
-	<<if $time.hour < 19>>
-		<<actCLA 'Ask to go shopping for some new clothes'>>
-			<<gt 'mother_ask_new_clothes'>>
-		<</actCLA>>
+
+<<if _location_mum.activity.includes('breakfast') and  _location_mum.activity.includes('prepare')>>
+	<<image "characters/pavlovsk/resident/mom/cooking.jpg">>
+	<p>
+		Your mother <<=$npc('A29').firstname>> is preparing breakfast. "Sorry, $pc.name_nick, I have no time to talk with you right now."
+	</p>
+<<else>>
+
+	<<image "characters/pavlovsk/resident/mom/mother.jpg">>
+	<p>Your mother <<=$npc('A29').firstname>> is still quite young and attractive. She's only _motherAge years. She works at the station cafe.</p>
+
+	/*<p>
+		<<if _motherRel < 20>>
+			<<negative 2>>Your relationship with your mother is terrible.<</negative>>
+		<<elseif _motherRel < 40>>
+			<<negative>>Your relationship with your mother is tense.<</negative>>
+		<<elseif _motherRel < 60>>
+			You have a normal relationship with your mother.
+		<<elseif _motherRel < 80>>
+			<<positive>>You have a good relationship with your mother.<</positive>>
+		<<else>>
+			<<positive 2>>You have a great relationship with your mother.<</positive>>
+		<</if>>
+	</p>*/
+	<<act 'Chat' undefined `{time:15}`>>
+		<<gt 'mother_chat'>>
+	<</act>>
+
+	<<if _location_mum.location == "home">>
+		<<act 'Offer to help around the house' undefined `{time:60,mood:50}`>>
+			<<gt 'mother_help_in_house'>>
+		<</act>>
+		<<if $pc.isSchoolStudent>>
+			<<actCLA 'Ask for some money'>>
+				<<gt 'mother_ask_money'>>
+			<</actCLA>>
+			<<if $time.hour < 19>>
+				<<actCLA 'Ask to go shopping for some new clothes'>>
+					<<gt 'mother_ask_new_clothes'>>
+				<</actCLA>>
+			<</if>>
+		<</if>>
 	<</if>>
 <</if>>
 
 
-
 <<ret>>
 
 :: mother_old