[fixes] Clean up and variable name fixes for shoes and purses. Purses for custom start now re-done with full range of options and fixed broken images

locations/_shoe_description.qsrc

@@ -2,8 +2,6 @@
 
 if $ARGS[0] = 'moncheri':
 	$RESULT = 'Mon Chéri shoe number '
-elseif $ARGS[0] = 'cats':
-	$RESULT = 'Pussy-Cats shoe number '
 elseif $ARGS[0] = 'bomba':
 	$RESULT = 'Tsar Bomba shoe number '
 elseif $ARGS[0] = 'dolls':

locations/_shoe_image.qsrc

@@ -13,7 +13,7 @@ elseif $ARGS[0] = 'fetish':
 	$RESULT = 'images/pc/shoes/fetish/<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'gandm':
 	$RESULT = 'images/pc/items/gm/shoes/<<ARGS[1]>>.jpg'
-elseif $ARGS[0] = 'trainers':
+elseif $ARGS[0] = 'danilovich':
 	$RESULT = 'images/pc/items/danilovich/shoes/<<ARGS[1]>>.jpg'
 end
 

locations/budgetclothes.qsrc

@@ -391,13 +391,13 @@ if $ARGS[0] = 'shoes':
 		gt 'budgetclothes', 'start'
 	end
 
-	:loopgandm_shoes
-		if sgandm[i] = 0:*p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''budget_shoes''"><img src="images/pc/shoes/g&m/<<i>>.jpg" height="250" /></a>'
+	:loopgm_shoes
+		if sgm[i] = 0:*p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''budget_shoes''"><img src="images/pc/shoes/g&m/<<i>>.jpg" height="250" /></a>'
 		i += 1
-	if i <= 40:jump 'loopgandm_shoes'
+	if i <= 40:jump 'loopgm_shoes'
 end
 
-if $ARGS[0] = 'budget_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'gandm',i, 700
+if $ARGS[0] = 'budget_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'gm',i, 700
 
 if $ARGS[0] = 'danilovich':
 	$loc_arg = 'danilovich'

locations/city_park.qsrc

@@ -116,7 +116,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if $clothingworntype = 'exercise' and $shoeworntype = 'trainers' and hour > 5 and hour < 23 and parkrunday ! daystart:
+	if $clothingworntype = 'exercise' and $shoeworntype = 'danilovich' and hour > 5 and hour < 23 and parkrunday ! daystart:
 		act 'Go for a run in the park (1:00)':
 			*clr & cla
 			menu_off = 1
@@ -176,7 +176,7 @@ if $ARGS[0] = 'start':
 				end
 			end
 		end
-	elseif ($clothingworntype ! 'exercise' or $shoeworntype = 'trainers') and hour > 5 and hour < 23 and parkrunday ! daystart:
+	elseif ($clothingworntype ! 'exercise' or $shoeworntype = 'danilovich') and hour > 5 and hour < 23 and parkrunday ! daystart:
 		'You could go for a run in the park if you were wearing sports clothes and shoes.'
 	end
 

locations/exercise.qsrc

@@ -656,7 +656,7 @@ if $ARGS[0] = 'get_sport_clothes_exercise_bonus':
 	if $clothingworntype = 'exercise':
 		sport_clothes_exercise_bonus = sport_clothes_exercise_bonus + 1
 	end
-	if $shoeworntype = 'trainers':
+	if $shoeworntype = 'danilovich':
 		sport_clothes_exercise_bonus = sport_clothes_exercise_bonus + 1
 	end
 end

locations/fit.qsrc

@@ -157,7 +157,7 @@ if $ARGS[0] = 'dressing room':
 	gs 'wardrobe', 'sports_outfit'
 
 	if abonement > 0:
-		if $clothingworntype = 'exercise' and $shoeworntype = 'trainers' and pcs_stam >= 40:
+		if $clothingworntype = 'exercise' and $shoeworntype = 'danilovich' and pcs_stam >= 40:
 			act 'Go to the gym':
 				cla
 				gt 'fit', 'gym'
@@ -184,7 +184,7 @@ if $ARGS[0] = 'dressing room':
 
 				act 'Leave':gt 'fit', 'dressing room'
 			end
-		elseif $clothingworntype = 'exercise' and $shoeworntype = 'trainers' and pcs_stam >= 40:
+		elseif $clothingworntype = 'exercise' and $shoeworntype = 'danilovich' and pcs_stam >= 40:
 			act 'Go to team practice':gt 'beg', 'start'
 			if week = 6 and pcs_run >= 20 and run_comp_day ! daystart:
 				act '<b>Enter competition race</b>':run_comp_day = daystart & gt 'beg1', 'start'

locations/gadroad.qsrc

@@ -63,7 +63,7 @@ if $ARGS[0] = '':
 	act 'Walk down to the river (0:10)':minut += 10 & gt 'gadriver', 'start'
 	act 'Go into the woods (0:15)':minut += 15 & gt'gadforest','forest_edge'
 	act 'Go to the fields (0:10)':minut += 10 & gt'gadfield','field'
-	if $clothingworntype = 'exercise' and $shoeworntype = 'trainers' and hour >= 6 and hour < 22 and gadrunday ! daystart:
+	if $clothingworntype = 'exercise' and $shoeworntype = 'danilovich' and hour >= 6 and hour < 22 and gadrunday ! daystart:
 		act 'Go for a run (1:00)':
 			*clr & cla
 			menu_off = 1
@@ -89,7 +89,7 @@ if $ARGS[0] = '':
 
 			act 'Finish':gt'gadroad'
 		end
-	elseif ($clothingworntype ! 'exercise' or $shoeworntype ! 'trainers') and hour >= 6 and hour < 22 and gadrunday ! daystart:
+	elseif ($clothingworntype ! 'exercise' or $shoeworntype ! 'danilovich') and hour >= 6 and hour < 22 and gadrunday ! daystart:
 		'You could go for a run here if you were wearing sports clothes and shoes.'
 	end
 end

locations/gdksport.qsrc

@@ -40,7 +40,7 @@ if $ARGS[0] = 'start':
 
 	*nl
 	if $clothingworntype ! 'exercise': 'You are not dressed in sports clothes.'
-	if $shoeworntype ! 'trainers': 'You are not wearing training shoes.'
+	if $shoeworntype ! 'danilovich': 'You are not wearing training shoes.'
 
 	act 'Go outside':
 		if $clothingworntype = 'nude':
@@ -87,7 +87,7 @@ if $ARGS[0] = 'start':
 
 	*nl
 
-	if pcs_stam > 20 and $clothingworntype = 'exercise' and $shoeworntype = 'trainers' and hour < 18:
+	if pcs_stam > 20 and $clothingworntype = 'exercise' and $shoeworntype = 'danilovich' and hour < 18:
 		if gsAboBeg > 0 and npc_pregtalk['A131'] = 0:
 			act 'Take a track lesson. You have <<gsAboBeg>> lessons remaining': gt 'gdksport', 'racing2'
 		end

locations/gschool_grounds.qsrc

@@ -349,7 +349,7 @@ if $ARGS[0] = 'sports':
 
 	act 'Leave the sports field': minut += 1 & gt 'gschool_grounds', 'main'
 
-	if schoolrunday ! daystart and $clothingworntype = 'exercise' and $shoeworntype = 'trainers':
+	if schoolrunday ! daystart and $clothingworntype = 'exercise' and $shoeworntype = 'danilovich':
 		act 'Go for a run (1 hour)':
 			*clr & cla
 			menu_off = 1
@@ -368,7 +368,7 @@ if $ARGS[0] = 'sports':
 
 			act 'Continue': gt 'gschool_grounds', 'sports'
 		end
-	elseif schoolrunday ! daystart and ($clothingworntype ! 'exercise' or $shoeworntype ! 'trainers'):
+	elseif schoolrunday ! daystart and ($clothingworntype ! 'exercise' or $shoeworntype ! 'danilovich'):
 		'You could go for a run here if you were wearing sports clothes and shoes.'
 	end
 
@@ -377,7 +377,7 @@ if $ARGS[0] = 'sports':
 	if week = 6 and gm_school_sorev = 2 and hour = 10 and SchoolBlock = 0:
 		*nl
 		'Athletic students of your school and other schools in the area have gathered at the athletics track near your school. Everyone is getting ready for the running competition.'
-		if $clothingworntype = 'exercise' and $shoeworntype = 'trainers':
+		if $clothingworntype = 'exercise' and $shoeworntype = 'danilovich':
 			act 'Participate in the 400m sprint event': gt 'gschool_grounds', 'SchoolRun2'
 		else
 			'You need to wear exercise clothes to participate.'
@@ -388,7 +388,7 @@ if $ARGS[0] = 'sports':
 		*nl
 		'Athletic students of your school and other schools in the area have gathered at the athletics track near your school. Everyone is getting ready for the running competition.'
 
-		if $clothingworntype = 'exercise' and $shoeworntype = 'trainers':
+		if $clothingworntype = 'exercise' and $shoeworntype = 'danilovich':
 			act 'Participate in the 400m sprint race': gt 'gschool_grounds', 'SchoolRun'
 		else
 			'You need to wear exercise clothes to participate.'

locations/park_walkevents.qsrc

@@ -833,7 +833,7 @@ if $ARGS[0] = '9':
 end
 
 if $ARGS[0] = 'run':
-	if $clothingworntype = 'exercise' and $shoeworntype = 'trainers' and hour > 5 and hour < 23 and daybegskver ! daystart:
+	if $clothingworntype = 'exercise' and $shoeworntype = 'danilovich' and hour > 5 and hour < 23 and daybegskver ! daystart:
 		act 'Go for a run in the park (1:00)':
 			*clr & cla
 			menu_off = 1
@@ -865,7 +865,7 @@ if $ARGS[0] = 'run':
 				end
 			end
 		end
-	elseif ($clothingworntype ! 'exercise' or $shoeworntype ! 'trainers') and hour > 5 and hour < 23 and daybegskver ! daystart:
+	elseif ($clothingworntype ! 'exercise' or $shoeworntype ! 'danilovich') and hour > 5 and hour < 23 and daybegskver ! daystart:
 		'You could go for a run in the park if you were wearing sports clothes and shoes.'
 	end
 end

locations/preCUST.qsrc

@@ -377,9 +377,9 @@ if $ARGS[0] = 'Done':
 		pantywornnumber = 37
 		$braworntype = 'cheap'
 		brawornnumber = 11
-		sgandm[6] = 1
-		strainers[21] = 1
-		$shoeworntype = 'gandm'
+		sgm[6] = 1
+		sdanilovich[21] = 1
+		$shoeworntype = 'gm'
 		shoewornnumber = 6
 	end
 	
@@ -407,10 +407,10 @@ if $ARGS[0] = 'Done':
 		brawornnumber = 28
 		exercise[45] = 1
 		exercise_h[45] = 100
-		strainers[21] = 1
-		sgandm[43] = 1
-		shoewornnumber = 43
-		$shoeworntype = 'gandm'
+		sdanilovich[21] = 1
+		sgm[9] = 1
+		shoewornnumber = 9
+		$shoeworntype = 'gm'
 		bomba_outfits[16] = 1
 		bomba_outfits_h[16] = 100
 		bomba_outfits_b[16] = pcs_hips
@@ -428,10 +428,10 @@ if $ARGS[0] = 'Done':
 		brawornnumber = 12
 		exercise[4] = 1
 		exercise_h[4] = 100
-		strainers[21] = 1
-		sgandm[43] = 1
-		shoewornnumber = 43
-		$shoeworntype = 'gandm'
+		sdanilovich[21] = 1
+		sgm[9] = 1
+		shoewornnumber = 9
+		$shoeworntype = 'gm'
 		gm_outfits[7] = 1
 		gm_outfits_h[7] = 100
 		gm_outfits_b[7] = pcs_hips
@@ -634,8 +634,8 @@ if $ARGS[0] = 'Done':
 			exercise[32] = 1
 			exercise_h[32] = 100			
 			sportsclothingnumber = 32
-			strainers[17] = 1
-			strainers[21] = 0
+			sdanilovich[17] = 1
+			sdanilovich[21] = 0
 			sport_bras[1] = 1
 			sport_brasS[1] = 0
 			$sportsbratype = 'sport'
@@ -647,7 +647,7 @@ if $ARGS[0] = 'Done':
 		end
 		killvar 'school_clothing'
 	end
-	if strainers[17] = 1:
+	if sdanilovich[17] = 1:
 		sportsshoenumber = 17
 	else
 		sportsshoenumber = 21

locations/preSYS.qsrc

@@ -1357,7 +1357,7 @@ if $ARGS[0] = 'goodgirl':
 		money += 1000
 		shampoo = 10
 		pcs_skin = 30
-		$currentpursetype = 'cheap'
+		$currentpursetype = 'gm'
 		currentpursenumber = 6
 		dolls_purses[6] = 1
 		bag = 1
@@ -1399,7 +1399,7 @@ if $ARGS[0] = 'slut':
 		genbsize = 32
 		kosmetica = 30
 		falselashesplain = 20
-		$currentpursetype = 'kats'
+		$currentpursetype = 'cats'
 		currentpursenumber = 10
 		cats_purses[10] = 1
 		bag = 1

locations/preSYS2.qsrc

@@ -250,58 +250,81 @@ if $ARGS[0] = 'modpur':
 		'You do not own a purse.'
 	else
 		bag = 1
-		if $currentpursetype ! 'boutique':
-			'<center><img <<$set_imgh>> src="images/pc/purses/<<$currentpursetype>>/<<currentpursenumber>>.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/pc/purses/moncheri/<<currentpursenumber>>.jpg"></center>'
-		end
+		'<center><img <<$set_imgh>> src="images/pc/items/<<$currentpursetype>>/purses/<<currentpursenumber>>.jpg"></center>'
 		'Your current purse is <<$currentpursetype>>_<<currentpursenumber>>.'
 	end
 	act 'Return': gt'preSYS2','start'
-	act 'Get cheap':
+	act 'Get G&M':
 		*clr & cla
 		'<center><img src="images/locations/city/citycenter/mall/gm.png"></center>'
 		i = 1
-		:loopcheappurses
-		*p '<a href="exec:gt ''preSYS2'', ''modpur'', ''cheap'', <<i>>"><img src="images/pc/items/gm/purses/<<i>>.jpg" 	height="300" /></a>'
+		:loopgmpurses
+		*p '<a href="exec:gt ''preSYS2'', ''modpur'', ''gm'', <<i>>"><img src="images/pc/items/gm/purses/<<i>>.jpg" 	height="300" /></a>'
 		i += 1
-		if i <= 14:jump 'loopcheappurses'
+		if i <= 20:jump 'loopgmpurses'
 	end	
-	act 'Get dolls':
+	act 'Get Danilovich':
+		*clr & cla
+		'<center><img src="images/locations/city/citycenter/mall/sports.png"></center>'
+		i = 1
+		:loopdanilovichpurses
+		*p '<a href="exec:gt ''preSYS2'', ''modpur'', ''danilovich'', <<i>>"><img src="images/pc/items/danilovich/purses/<<i>>.jpg" 	height="300" /></a>'
+		i += 1
+		if i <= 20:jump 'loopdanilovichpurses'
+	end	
+	act 'Get Dolls':
 		*clr & cla
 		'<center><img src="images/locations/city/island/dolls.png"></center>'
 		i = 1
 		:loopdollspurses
 		*p '<a href="exec:gt ''preSYS2'', ''modpur'', ''dolls'', <<i>>"><img src="images/pc/items/dolls/purses/<<i>>.jpg" 	height="300" /></a>'
 		i += 1
-		if i <= 22:jump 'loopdollspurses'
+		if i <= 20:jump 'loopdollspurses'
+	end
+	act 'Get Bomba':
+		*clr & cla
+		'<center><img src="images/locations/oldtown/bomba/shaop_name.png"></center>'
+		i = 1
+		:loopbombapurses
+		*p '<a href="exec:gt ''preSYS2'', ''modpur'', ''bomba'', <<i>>"><img src="images/pc/items/bomba/purses/<<i>>.jpg" 	height="300" /></a>'
+		i += 1
+		if i <= 20:jump 'loopbombapurses'
 	end
-	act 'Get fashionista':
+	act 'Get Fashionista':
 		*clr & cla
 		'<center><img src="images/locations/city/citycenter/mall/fashionista.png"></center>'
 		i = 1
 		:loopfashionistapurses
 		*p '<a href="exec:gt ''preSYS2'', ''modpur'', ''fashionista'', <<i>>"><img src="images/pc/items/fashionista/purses/<<i>>.jpg" 	height="300" /></a>'
 		i += 1
-		if i <= 15:jump 'loopfashionistapurses'
+		if i <= 20:jump 'loopfashionistapurses'
 	end
-	act 'Get kats':
+	act 'Get Pussy_Cats':
 		*clr & cla
 		'<center><img src="images/locations/city/citycenter/mall/pussycat.png"></center>'
 		i = 1
 		:loopkatspurses
 		*p '<a href="exec:gt ''preSYS2'', ''modpur'', ''kats'', <<i>>"><img src="images/pc/items/cats/purses/<<i>>.jpg" 	height="300" /></a>'
 		i += 1
-		if i <= 14:jump 'loopkatspurses'
+		if i <= 20:jump 'loopkatspurses'
+	end
+	act 'Get Flamingos':
+		*clr & cla
+		'<center><img src="images/locations/city/island/flamingos/shop_name.png"></center>'
+		i = 1
+		:loopflamingospurses
+		*p '<a href="exec:gt ''preSYS2'', ''modpur'', ''flamingos'', <<i>>"><img src="images/pc/items/flamingos/purses/<<i>>.jpg" 	height="300" /></a>'
+		i += 1
+		if i <= 20:jump 'loopflamingospurses'
 	end
-	act 'Get moncheri':
+	act 'Get Mon Chéri':
 		*clr & cla
 		'<center><img src="images/locations/city/citycenter/mall/moncheri.png"></center>'
 		i = 1
-		:loopboutiquepurses
-		*p '<a href="exec:gt ''preSYS2'', ''modpur'', ''boutique'', <<i>>"><img src="images/pc/items/moncheri/purses/<<i>>.jpg" 	height="300" /></a>'
+		:loopmoncheripurses
+		*p '<a href="exec:gt ''preSYS2'', ''modpur'', ''moncheri'', <<i>>"><img src="images/pc/items/moncheri/purses/<<i>>.jpg" 	height="300" /></a>'
 		i += 1
-		if i <= 17:jump 'loopboutiquepurses'
+		if i <= 20:jump 'loopmoncheripurses'
 	end
 	act 'I do not want a purse':
 		bag = 0

locations/shoe_attributes.qsrc

@@ -1,7 +1,7 @@
 # shoe_attributes
 
 !! **Shoe Organization
-!! Shoe Categories: boutique, Cats, Dolls, fetish, G&M, Trainers
+!! Shoe Categories: moncheri, bomba, dolls, fetish, gm, danilovich
 !!
 !! ShoExhibit: 0-100 Exhibitionism value required to wear the outfit
 !!
@@ -38,8 +38,6 @@ ShoCut = 0
 
 if $ARGS[0] = 'moncheri':
 	*P FUNC('$attributes_moncheri_shoes', $ARGS[0], ARGS[1])
-elseif $ARGS[0] = 'pussy':
-	*P FUNC('$attributes_cats_shoes', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'bomba':
 	*P FUNC('$attributes_bomba_shoes', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'dolls':

locations/shoe_description2.qsrc

@@ -17,7 +17,7 @@ elseif ShoQuality = 7:
    $description = 'This is a beautifully made '
 end
 
-if $ARGS[0] = 'trainers':
+if $ARGS[0] = 'danilovich':
 	$description += 'training shoe.'
 else
 	if ShoHeels = 1:

locations/street_event.qsrc

@@ -97,24 +97,24 @@ else
 	streetev_bf = 90
 end
 
-if $currentpursetype = 'dolls' or $currentpursetype = 'kats':
-	if streetev_rob > streetev_hijack:
-		streetev_rob += 1
-	else
-		streetev_hijack += 1
-	end
-elseif $currentpursetype = 'fashionista':
+if $currentpursetype = 'fashionista':
 	if streetev_rob > streetev_hijack:
 		streetev_rob += 2
 	else
 		streetev_hijack += 2
 	end
-elseif $currentpursetype = 'boutique':
+elseif $currentpursetype = 'moncheri':
 	if streetev_rob > streetev_hijack:
 		streetev_rob += 3
 	else
 		streetev_hijack += 3
 	end
+else
+	if streetev_rob > streetev_hijack:
+		streetev_rob += 1
+	else
+		streetev_hijack += 1
+	end
 end
 
 if money >= 2500:

locations/wardrobe.qsrc

@@ -441,7 +441,7 @@ end
 
 if $ARGS[0] = 'sports_entry_set':
 	gs 'stat'
-	if $clothingworntype ! 'exercise' OR $shoeworntype ! 'trainers':
+	if $clothingworntype ! 'exercise' OR $shoeworntype ! 'danilovich':
 		MSG 'The sports outfit needs to include exercise clothes and training shoes'
 		gt 'wardrobe', 'start'
 	else
@@ -488,7 +488,7 @@ if $ARGS[0] = 'sports_entry_wear':
 	if dyneval('RESULT = <<$sportspantytype>>_panties[<<sportspantynumber>>]') = 0: $sportspantytype = 'none' & sportspantynumber = 0
 	gs 'panties', 'wear', $sportspantytype, sportspantynumber
 
-	gs 'shoes', 'wear', 'trainers', sportsshoenumber
+	gs 'shoes', 'wear', 'danilovich', sportsshoenumber
 
 	minut += 2
 	gs 'stat'
@@ -536,7 +536,7 @@ end
 
 if $ARGS[0] = 'sports_outfit':
 	gs 'stat'
-	if $clothingworntype ! 'exercise' or $shoeworntype ! 'trainers':
+	if $clothingworntype ! 'exercise' or $shoeworntype ! 'danilovich':
 		act 'Change into: <<$sports_clothing_name>>': gs 'wardrobe', 'sports_entry_wear'
 	end
 end