glife.qproj

@@ -141,12 +141,12 @@
 	</Folder>
 	<Folder name="coats">
 		<Location name="cloakroom"/>
-		<Location name="attributes_bomba_coats"/>
-		<Location name="attributes_cats_coats"/>
-		<Location name="attributes_danilovich_coats"/>
-		<Location name="attributes_dolls_coats"/>
-		<Location name="attributes_gm_coats"/>
-		<Location name="attributes_moncheri_coats"/>
+		<Location name="$attributes_bomba_coats"/>
+		<Location name="$attributes_cats_coats"/>
+		<Location name="$attributes_danilovich_coats"/>
+		<Location name="$attributes_dolls_coats"/>
+		<Location name="$attributes_gm_coats"/>
+		<Location name="$attributes_moncheri_coats"/>
 	</Folder>
 	<Folder name="underwear">
 		<Location name="underwear"/>

locations/Voltrener.qsrc

@@ -421,7 +421,7 @@ if $ARGS[0] = 'trener_speak':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenerspeak20.jpg"></center>'
 			'"<<$pcs_lastname>>, I will not be drawn into talking about the championship. And no, coaches don''t get paid a lot. I spend my Sunday mornings training rich women in the fitness center. One lesson there pays more than a month working as a coach in our town."'
-			+$OpenInnerThought+'"Didn''t get anything out of him there, <<$pcs_lastname>>. Although, the classes in the fitness center should be worth investigating."'+$CloseInnerThought+
+			+$OpenInnerThought+'"Didn''t get anything out of him there, <<$pcs_lastname>>. Although, the classes in the fitness center should be worth investigating."'+$CloseInnerThought 
 			npc_rel['A69'] += 3
 			'Seeing Mikhail a little upset by your questions, you decide to cheer him up.'
 			!! the flag on the emergence of Turner in the centre

locations/_attributes_cats_coats.qsrc

@@ -1,4 +1,4 @@
-# $attributes_dolls_coats
+# $attributes_cats_coats
 !2020/12/28
 !Price ranges from 2 to 4, please avoid adding too many 5s
 
@@ -104,5 +104,5 @@ elseif ARGS[1] = 20:
 	
 end
 
---- $attributes_dolls_coats ---------------------------------
+--- $attributes_cats_coats ---------------------------------
 

locations/_attributes_danilovich_coats.qsrc

@@ -85,7 +85,7 @@ elseif ARGS[1] = 16:
 elseif ARGS[1] = 17:
 	CloQuality = 3
     CloWarm = 1
-	$coat_description = 'Low: A multicolor runner's sports coat.'
+	$coat_description = 'Low: A multicolor runner''s sports coat.'
 	
 elseif ARGS[1] = 18:
 	CloQuality = 4

locations/gschool_girls_bathroom.qsrc

@@ -327,7 +327,7 @@ if $ARGS[0] = 'girl3':
 	elseif grupTipe = 2:
 	  !!Lead to an event during break where Sveta is confronted by Vitek, but is defended by the other jocks?
 	    act 'Fuck off':
-		  *clr and cla
+		  *clr & cla
 		  npc_rel['A20'] -= 5
 		  npc_rel['A21'] -= 5
 		  grupvalue[4] -= 3

locations/lact_bp.qsrc

@@ -56,6 +56,26 @@
 !!	umbc_i
 !!	usbc_i
 !!	vmb_i
+!!	bpID_arr['index'] : breast pump id. Starts at 0, with every purchased breast pump the id will be added
+!!	bpType_arr['index'] : breast pump type. 0 = 'manual_single', 1 = 'electric_single', 2 ='electric_dual'
+!!	bpLocID_arr['index'] : 0 = lost, 1 = in svetas hand... same as bottle locations
+!!	bpbID1_arr['index'] : index of milk bottle array.
+!!	bpbID2_arr['index'] : only used for dual pump, index for milk bottle array. cannot be the same like breastpump_arr['bottle_id_1'].
+
+!!	when ever sveta buys a new breastpump, it has to be added to the breast pump array.
+if $ARGS[0] = 'build_bp':
+	!!	ARGS[1] = type
+	!!	ARGS[2] = location_id
+	!!	usage func('lact_bp', 'build_bp', 'breast pump type', 'location id')
+	!!	returns the new bottle ID
+	bp_i = arrsize('bpID_arr')
+	bpID_arr[bp_i] = bp_i
+	bpType_arr[bp_i] = ARGS[1]
+	bpLocID_arr[bp_i] = ARGS[2]
+	bpbID1_arr[bp_i] = ''
+	bpbID2_arr[bp_i] = ''
+	result = bp_i
+end
 
 !!	view milk bottles function
 if $ARGS[0] = 'view_milk_bottles':
@@ -292,7 +312,7 @@ if $ARGS[0] = 'useable_mbottle_count':
 end
 
 !!	bp_milking - breast pump milking
-!!	use href="exec:gt ''lact_bp'',''bp_milking''"
+!!	use href="exec:gt ''lact_bp'',''bp_milking''" or gt 'lact_bp','bp_milking'
 
 if $ARGS[0] = 'bp_milking':
 	pumptime = 0

locations/pav_pharmacy.qsrc

@@ -95,23 +95,15 @@ if $ARGS[0] = 'start' or $message ! '':
 		*P FUNC ('$stock_item', 30, 'Lip balm', 127, 'lipbalm', 'pav_pharmacy', 'start')
 		*P FUNC ('$stock_item', 12, 'Weight loss pill', 248, 'fatdel', 'pav_pharmacy', 'start')
 		*P FUNC ('$stock_item', 20, 'Tampons', 200, 'tampon', 'pav_pharmacy', 'start')
-			*P FUNC ('$stock_item', 20, 'Sanitary napkins', 100, 'sanpad', 'pav_pharmacy', 'start')
-		if klisma > 0:
-			*P FUNC ('$single_stock_item', 1, 'Enema kit', 1250, 'klisma', 'pav_pharmacy', 'start')
-		else
-			*P FUNC ('$single_stock_item', 1, 'Enema kit', 1250, 'klisma', 'pav_pharmacy', 'start')
-		end
-		if breastpump > 0:
-			*P FUNC ('$single_stock_item', 1, 'Breast pump', 2500, 'breastpump', 'pav_pharmacy', 'start')
-		else
-			*P FUNC ('$single_stock_item', 1, 'Breast pump', 2500, 'breastpump', 'pav_pharmacy', 'start')
-		end
+		*P FUNC ('$stock_item', 20, 'Sanitary napkins', 100, 'sanpad', 'pav_pharmacy', 'start')
+		*P FUNC ('$single_stock_item', 1, 'Enema kit', 1250, 'klisma', 'pav_pharmacy', 'start')
+		*P FUNC ('$single_stock_item', 1, 'Breast pump', 2500, 'breastpump', 'pav_pharmacy', 'start')
 		*P FUNC ('$stock_item', 3, 'Breastmilk bottle S', 930, 'bpbottles', 'pav_pharmacy', 'start')
 		*P FUNC ('$stock_item', 2, 'Breastmilk bottle M', 930, 'bpbottlem', 'pav_pharmacy', 'start')
 		if pcs_knows_nipplecream = 1:
 			*P FUNC ('$stock_item', 20, 'Nipplebalm', 600, 'bpnipplebalm', 'pav_pharmacy', 'start')
 		end
-		if KandidNapr = 1: *P FUNC ('$single_stock_item', 1, 'Antifungal medication', 1050, 'Kandidoz', 'pav_pharmacy', 'start')
+		*P FUNC ('$single_stock_item', 1, 'Antifungal medication', 1050, 'Kandidoz', 'pav_pharmacy', 'start')
 		*P '</table></center>'
 	end
 end

locations/shoe_attributes.qsrc

@@ -37,17 +37,17 @@ ShoHeels = 0
 ShoCut = 0
 
 if $ARGS[0] = 'boutique':
-	*P FUNC('$attrib_shoe_boutique', $ARGS[0], ARGS[1])
+	*P FUNC('$attributes_moncheri_shoes', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'pussy':
-	*P FUNC('$attrib_shoe_pussy', $ARGS[0], ARGS[1])
+	*P FUNC('$attributes_cats_shoes', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'dolls':
-	*P FUNC('$attrib_shoe_dolls', $ARGS[0], ARGS[1])
+	*P FUNC('$attributes_dolls_shoes', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'fetish':
 	*P FUNC('$attrib_shoe_fetish', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'gandm':
-	*P FUNC('$attrib_shoe_gandm', $ARGS[0], ARGS[1])
+	*P FUNC('$attributes_gm_shoes', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'trainers':
-	*P FUNC('$attrib_shoe_trainers', $ARGS[0], ARGS[1])
+	*P FUNC('$attributes_danilovich_shoes', $ARGS[0], ARGS[1])
 end
 
 --- shoe_attributes ---------------------------------