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

glife.qproj

@@ -131,6 +131,7 @@
 		<Location name="$attributes_exercise"/>
 		<Location name="$attributes_danilovich_outfits"/>
 		<Location name="$attributes_danilovich_swim_one"/>
+		<Location name="$attributes_coat"/>
 		<Location name="$attributes_misc_outfits"/>
 		<Location name="lost_clothes_here"/>
 		<Location name="portnoi"/>

locations/cloakroom.qsrc

@@ -117,7 +117,7 @@ if $ARGS[0] = 'view_coat_item':
 	cla
 	'<center><img src="<<FUNC(''$coat_image'',  $ARGS[2], ARGS[3])>>"></center>'
 	'coat no.<<ARGS[1]>>'
-	FUNC('$attributes_coat', coat, ARGS[1])
+	FUNC('$attributes_coat', 'coat', ARGS[1])
 
 	$coat_description
 

locations/enderKik.qsrc

@@ -178,7 +178,7 @@ elseif kickbox['amateur'] = 1:
 			kickbox['amateurWinKO'] += 1
 			kickbox['advancement'] += 1
 			kickbox['amateur'] = 0
-			money += 500 + kikbox['money']
+			money += 500 + kickbox['money']
 			rikudo += 10
 			'You are awarded a cash prize of <<500 + kickbox[''money'']>> <b>₽</b>.'
 			gs 'razrKik'

locations/wardrobe.qsrc

@@ -202,7 +202,7 @@ if $ARGS[0] = 'default_entry_wear':
 	if dyneval('RESULT = <<$defcoattype[default_entry]>>[<<defcoatnumber[default_entry]>>]') = 0:
 		$defcoattype[default_entry] = 'none' & defcoatnumber[default_entry] = 0
 	else
-		gs 'coat', 'wear', $defcoattype[default_entry], defcoatnumber[default_entry]
+		gs 'coats', 'wear', $defcoattype[default_entry], defcoatnumber[default_entry]
 	end
 
 	!! default school girl uniform is always allowed to be worn if still in school