Merge remote-tracking branch 'Anya/master'

locations/dachain.qsrc

@@ -1,21 +1,18 @@
 # dachain
 
-$loc = 'dachain'
-$locM = 'dachain'
-$menu_loc = 'dachain'
-
-gs 'stat'
-gs 'themes', 'indoors'
-
-if $args[0] = '':
+if $args[0] = 'start':
 	$location_type = 'private'
-	$loc_arg = ''
-	$locM_arg = ''
-	$menu_arg = ''
+	$loc = 'dachain'
+	$loc_arg = 'start'
+	$locM = 'dachain'
+	$locM_arg = 'start'
+	$menu_loc = 'dachain'
+	$menu_arg = 'start'
 	menu_off = 0
 	internetS = internet
 
 	killvar '$locclass'
+	gs 'themes', 'indoors'
 	*clr & cla
 	gs 'stat'
 	'<center><b><font color="maroon">Cottage</font></b></center>'
@@ -41,6 +38,20 @@ if $args[0] = '':
 	if hour >= 6 and hour <= 20 and etoexhib = 12:'Leave in <a href="exec:gt ''etoexhib'', ''pos11''">garden in lingerie and robe.</a>'
 	if hour >= 6 and hour <= 20 and etoexhib = 13 and temp ! daystart:'I wonder how to <a href="exec:gt ''etoexhib'', ''pos12''">garden</a>'
 
+	act 'Go outside':
+		if $clothingworntype ! 'nude':
+			minut += 5 & gt 'dachamy'
+		else
+			msg'<b><font color = red>You can''t leave the house naked! You need to get dressed first.</font></b>'
+			gt 'dachain', 'start'
+		end
+	end
+
+	act 'Go to the Bathroom':  gt 'dachain', 'dachabath'
+	act 'Go to the kitchen alcove': gt 'dachain', 'dachakit'
+	act 'Get in the bed': gt 'bed', 'start'
+	act 'Lie on the couch': gt 'divan', 'start'
+
 !!-------------------------------------------------------------------------------------------------------------------------------------
 !!------------------------------------------------------- Music related actions come here ---------------------------------------------
 !!-------------------------------------------------------------------------------------------------------------------------------------
@@ -50,13 +61,13 @@ if $args[0] = '':
 		act 'Place the guitar next to your desk': 
 			ml_guitar['carried'] = 0
 			$ml_guitar['location'] = $curloc
-			gt 'dachain', ''
+			gt 'dachain', 'start'
 		end
 	elseif ml_guitar['hasguitar'] and ml_guitar['carried'] = 0:
 		act 'Pick up the guitar':
 			ml_guitar['carried'] = 1
 			$ml_guitar['location'] = ''
-			gt 'dachain', ''
+			gt 'dachain', 'start'
 		end
 	end
 
@@ -144,7 +155,6 @@ if $args[0] = '':
 		end
 	end
 
-
 	!!Uploading recorded music if there are any not uploaded yet
 	if ml_uploadablemusic > 0 and internet > 0 and ml_online['account'] = 1:
 		if pcs_inhib < 30:
@@ -167,29 +177,18 @@ if $args[0] = '':
 		act 'Upload music': gt 'music_onlinemusic', 'uploadallmusic'
 	end
 
-	act 'Lie on the couch': gt 'divan', 'start'
-	act 'Go to the kitchen alcove': gt 'dachain', 'dachakit'
-	act 'Go to the Bathroom':  gt 'dachain', 'dachavann'
-	act 'Get in the bed': gt 'bed', 'start'
-
-	act 'Go outside':
-		if $clothingworntype ! 'nude':
-			minut += 5 & gt 'dachamy'
-		else
-			msg'<b><font color = red>You can''t leave the house naked! You need to get dressed first.</font></b>'
-			gt 'dachain'
-		end
-	end
-
 	if curr_home ! 3:
-		act 'Set this cottage as your main home':gs 'set_home', 3 & gt 'dachain'
+		act 'Set this cottage as your main home':gs 'set_home', 3 & gt 'dachain', 'start'
 	end
 end
 
 if $args[0] = 'dachakit':
 	$location_type = 'private'
+	$loc = 'dachain'
 	$loc_arg = 'dachakit'
+	$locM = 'dachain'
 	$locM_arg = 'dachakit'
+	$menu_loc = 'dachain'
 	$menu_arg = 'dachakit'
 	menu_off = 0
 	$locclass = 'kitr'
@@ -203,7 +202,7 @@ if $args[0] = 'dachakit':
 		'<center><img <<$set_imgh>> src="images/locations/suburban/cottage/dachakit1.jpg"></center>'
 	end
 	
-	act 'Go into the main room': gt 'dachain', ''
+	act 'Go into the main room': gt 'dachain', 'start'
 
 	if cltarelka > 0:
 		'<b><<cltarelka>></b> clean plates are stored in the cupboard.'
@@ -263,14 +262,17 @@ if $args[0] = 'dachakit':
 
 end
 
-if $args[0] = 'dachavann':
-	$loc_arg = 'dachavann'
-	$locM_arg = 'dachavann'
-	$menu_arg = 'dachavann'
+if $args[0] = 'dachabath':
+	$loc = 'dachain'
+	$loc_arg = 'dachabath'
+	$locM = 'dachain'
+	$locM_arg = 'dachabath'
+	$menu_loc = 'dachain'
+	$menu_arg = 'dachabath'
 	menu_off = 0
 	$location_type = 'bathroom'
 	$bathtype = 'bathtub shower'
-	killvar '$locclass'
+
 	*clr & cla
 	gs 'stat'
 	'<center><b><font color="maroon">Cottage Bathroom</font></b></center>'
@@ -279,9 +281,11 @@ if $args[0] = 'dachavann':
 	else
 		'<center><img <<$set_imgh>> src="images/locations/suburban/cottage/dachavan1.jpg"></center>'
 	end
+
+	act 'Go into the main room': gt 'dachain', 'start'
+
 	gs'selfplay','suction_dildo'
 	gs 'din_van', 'private'
-	act 'Go into the main room': gt 'dachain', ''
 end
 
 --- dachain ---------------------------------

locations/dachamy.qsrc

@@ -17,7 +17,7 @@ gs 'stat'
 
 act 'Exit the alley':minut += 15 & gt 'dachi'
 
-act 'Go into the house':gt 'dachain'
+act 'Go into the house':gt 'dachain', 'start'
 
 if sunWeather = 1:
 	if pcs_stam >=15 or (pcs_stam >= 10 and bookYog + obruch > 0):

locations/etoexhib.qsrc

@@ -437,7 +437,7 @@ if $ARGS[0] = 'pos13':
 
 			'When it was over, you picked your clothes up, put them on and went back into the house.'
 
-			act 'Next':gt 'dachain'
+			act 'Next':gt 'dachain', 'start'
 		end
 	end
 end
@@ -484,7 +484,7 @@ if $ARGS[0] = 'pos14':
 
 			'When it was over, you picked your clothes up, put them on and ran into the house.'
 
-			act 'Next':gt 'dachain'
+			act 'Next':gt 'dachain', 'start'
 		end
 	end
 end

locations/music_actions.qsrc

@@ -19,8 +19,6 @@ if ARGS[0] = 'start':
         end
         if $ARGS[0] = 'sitr':
 			gt 'sitr'
-        elseif ARGS[0] = 'dachain':
-			gt 'dachain'
         else
 			gt ARGS[0], 'start'
 		end

locations/music_bedroompractice.qsrc

@@ -34,7 +34,7 @@ if $ARGS[0] = 'guitar':
 	if $loc = 'sitr':
 		act 'Finish practice': gt $loc
 	else
-		act 'Finish practice': gt $loc, 'start'
+		act 'Finish practice': gt $loc, $loc_arg
 	end
 end
 
@@ -68,7 +68,7 @@ if $ARGS[0] = 'rehearsing':
 	ml_performance['set_quality'] += rand(1,(pcs_instrmusic + pcs_vokal + pcs_perform)/10)
 	ml_performance['set_lastpracticeday'] = daystart 
 		
-	act 'Finish practice': gt $loc, 'start'
+	act 'Finish practice': gt $loc, $loc_arg
 end
 
 

locations/npcstatic2.qsrc

@@ -86,7 +86,9 @@ npc_dick['A<<npctemp>>'] = 17
 npctemp = 57
 $npc_dna['A<<npctemp>>'] = '1173276062 1427985989 1736266892 1028816280 1824359669 1132882533 1134471109'
 $npc_firstname['A<<npctemp>>'] = 'Rex'
+$npc_lastname['A<<npctemp>>'] = 'Borisyuk'
 $npc_usedname['A<<npctemp>>'] = 'Rex'
+$npc_notes['A<<npctemp>>'] = 'A good friend of your older sister, he throws parties almost every weekend.'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'friends'

locations/npcstatic5.qsrc

@@ -818,6 +818,22 @@ npc_sexskill['A<<npctemp>>'] = 2
 npc_spermpot['A<<npctemp>>'] = 11000
 npc_haircol['A<<npctemp>>'] = 1
 
+npctemp = 253
+$npc_dna['A<<npctemp>>'] = '0'
+$npc_firstname['A<<npctemp>>'] = 'Diane'
+$npc_nickname['A<<npctemp>>'] = 'Diane'
+$npc_lastname['A<<npctemp>>'] = 'Borisyuk'
+$npc_usedname['A<<npctemp>>'] = 'Diane'
+$npc_notes['A<<npctemp>>'] = 'Diane is Rex''s older sister. She is going to University to be a teacher. She is the studious type and can often be found in the university library, despite a more wild past than one would think when meeting her.'
+npc_dob['A<<npctemp>>'] = 19961031
+npc_gender['A<<npctemp>>'] = 1
+gs 'npcstaticdefaults', 'defaults'
+npc_bust['A<<npctemp>>'] = 20
+hotcat_rating['A<<npctemp>>'] = 8
+npc_intel['A<<npctemp>>'] = 82
+!!$npc_body['A<<npctemp>>'] = 's3' - not a clue what this is for
+!!hair = undecided length and brown
+!!pubic hair = undecided
 
 !! {Keep this at the end of file of the npcstatics.}
 aarraynumber = npctemp