Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

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/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 ---------------------------------