Browse Source

added: default sports outfit setting for all starts and quick switch where appropriate

Mona Lisa 5 years ago
parent
commit
45c3f31214
5 changed files with 172 additions and 3 deletions
  1. 1 0
      locations/exercise.qsrc
  2. 1 0
      locations/fit.qsrc
  3. 2 0
      locations/gdksport.qsrc
  4. 20 0
      locations/preCUST.qsrc
  5. 148 3
      locations/wardrobe.qsrc

+ 1 - 0
locations/exercise.qsrc

@@ -49,6 +49,7 @@ if $ARGS[0] = 'workout':
 		if $sportloc = 'Meadow': gs 'underwear', 'wear'
 		act 'Leave': gt $loc, $metka
 	end
+	gs 'wardrobe', 'sports_outfit_option', 'workout'
 	act 'Manual': gt 'exercise', 'manual'
 	if exer_stam[1] ! 0 and pcs_stam > exer_stam[1]: act '<<$excer_name[1]>> - (<<exer_stam[1]>> stamina)': exercisex = 1 & gt 'exercise', 'auto'
 	if exer_stam[2] ! 0 and pcs_stam > exer_stam[2]: act '<<$excer_name[2]>> - (<<exer_stam[2]>> stamina)': exercisex = 2 & gt 'exercise', 'auto'

+ 1 - 0
locations/fit.qsrc

@@ -108,6 +108,7 @@ if $ARGS[0] = 'dressing room':
 		gt 'mirror', 'start'
 	end
 
+	gs 'wardrobe', 'sports_outfit_option'
 	act 'Change outfit':
 		cla
 		gt 'wardrobe', 'start'

+ 2 - 0
locations/gdksport.qsrc

@@ -79,6 +79,8 @@ if $ARGS[0] = 'start':
 		gt 'wardrobe', 'start'
 	end
 
+	gs 'wardrobe', 'sports_outfit_option'
+
 	if albinaQWdance > 0 or gsAboDance > 0 or gsAboBeg > 0 or gsAboVolley > 0:
 		if $clothingworntype ! 'exercise':'You are not dressed in sports clothes.'
 		if $shoeworntype ! 'trainers':'You are not wearing training shoes.'

+ 20 - 0
locations/preCUST.qsrc

@@ -390,6 +390,7 @@ if $ARGS[0] = 'Done':
 		cheapB[161] = pcs_hips
 		exercise[29] = 1
 		exerciseH[29] = 100
+		sportsclothingnumber = 29
 		cheap[370] = 1
 		cheapH[370] = 100
 		cheapB[370] = pcs_hips
@@ -403,6 +404,7 @@ if $ARGS[0] = 'Done':
 		cheapB[15] = pcs_hips
 		exercise[4] = 1
 		exerciseH[4] = 100
+		sportsclothingnumber = 4
 		cheap[36] = 1
 		cheapH[36] = 100
 		cheapB[36] = pcs_hips
@@ -413,6 +415,7 @@ if $ARGS[0] = 'Done':
 		cheapB[48] = pcs_hips
 		exercise[4] = 1
 		exerciseH[4] = 100
+		sportsclothingnumber = 4
 		cheap[83] = 1
 		cheapH[83] = 100
 		cheapB[83] = pcs_hips
@@ -423,6 +426,7 @@ if $ARGS[0] = 'Done':
 		cheapB[49] = pcs_hips
 		exercise[4] = 1
 		exerciseH[4] = 100
+		sportsclothingnumber = 4
 		cheap[70] = 1
 		cheapH[70] = 100
 		cheapB[70] = pcs_hips
@@ -433,6 +437,7 @@ if $ARGS[0] = 'Done':
 		cheapB[32] = pcs_hips
 		exercise[4] = 1
 		exerciseH[4] = 100
+		sportsclothingnumber = 4
 		cheap[62] = 1
 		cheapH[62] = 100
 		cheapB[62] = pcs_hips
@@ -443,6 +448,7 @@ if $ARGS[0] = 'Done':
 		cheapB[4] = pcs_hips
 		exercise[4] = 1
 		exerciseH[4] = 100
+		sportsclothingnumber = 4
 		cheap[41] = 1
 		cheapH[41] = 100
 		cheapB[41] = pcs_hips
@@ -453,6 +459,7 @@ if $ARGS[0] = 'Done':
 		cheapB[50] = pcs_hips
 		exercise[4] = 1
 		exerciseH[4] = 100
+		sportsclothingnumber = 4
 		cheap[81] = 1
 		cheapH[81] = 100
 		cheapB[81] = pcs_hips
@@ -463,6 +470,7 @@ if $ARGS[0] = 'Done':
 		cheapB[82] = pcs_hips
 		exercise[4] = 1
 		exerciseH[4] = 100
+		sportsclothingnumber = 4
 		cheap[43] = 1
 		cheapH[43] = 100
 		cheapB[43] = pcs_hips
@@ -473,6 +481,7 @@ if $ARGS[0] = 'Done':
 		cheapB[43] = pcs_hips
 		exercise[4] = 1
 		exerciseH[4] = 100
+		sportsclothingnumber = 4
 		cheap[73] = 1
 		cheapH[73] = 100
 		cheapB[73] = pcs_hips
@@ -494,6 +503,17 @@ if $ARGS[0] = 'Done':
 		swimwearH[69] = 60
 		swimwearB[69] = pcs_hips
 	end
+	
+!!setting default exercise outfit
+	$sportsbratype = 'cheap'
+	sportsbranumber = 11
+	$sportspantytype = 'cheap'
+	sportspantynumber = 37
+	sportsshoenumber = 21
+	sportscoat = 5
+	$sportspursetype = $currentpursetype
+	sportspursenumber = currentpursenumber
+
 	killvar 'swim_start'
 		
 !!	**********

+ 148 - 3
locations/wardrobe.qsrc

@@ -111,9 +111,9 @@ end
 
 if $ARGS[0] = 'default':
 	gs 'stat'
-	if ARRSIZE('defclothingnumber') = 0:
-		'You have no default outfits set.'
-	else
+	'Default sports outfit <a href="exec:gs ''wardrobe'', ''sports_entry_wear''">Wear this default outfit</a>'
+		
+	if ARRSIZE('defclothingnumber') > 0:
 		i = 0
 		:loopdefclothing
 		'<<$def_clothing_name[i]>> <a href="exec:gs ''wardrobe'', ''default_entry_wear'', <<i>>">Wear this default outfit</a> <a href="exec:gs ''wardrobe'', ''default_entry_delete'', <<i>>">Delete this default outfit</a>'
@@ -237,6 +237,7 @@ end
 
 if $ARGS[0] = 'default_set':
 	gs 'stat'
+	'sports outfit <a href="exec:gs ''wardrobe'', ''sports_entry_set'', <<i>>">Overwrite this</a>'
 	if ARRSIZE('defclothingnumber') ! 0:
 		i = 0
 		:loopdefclothing_set
@@ -286,5 +287,149 @@ if $ARGS[0] = 'default_entry_delete':
 	gt 'wardrobe', 'default_set'
 end
 
+!!-- sports outfit stuff
+
+if $ARGS[0] = 'sports_entry_wear':
+
+	gs 'wardrobe', 'prev_entry_set'
+
+	gs 'clothing_attributes', 'exercise', sportsclothingnumber
+	gs 'clothing', 'wear', 'exercise', sportsclothingnumber
+
+	if dyneval('RESULT = <<$sportsbratype>>_bras[<<sportsbranumber>>]') = 0: $sportsbratype = 'none' & sportsbranumber = 0
+	gs 'bras', 'wear', $sportsbratype, sportsbranumber
+
+	if dyneval('RESULT = <<$sportspantytype>>_panties[<<sportspantynumber>>]') = 0: $sportspantytype = 'none' & sportspantynumber = 0
+	gs 'panties', 'wear', $sportspantytype, sportspantynumber
+
+	gs 'shoes', 'wear', 'trainers', sportsshoenumber
+
+
+	if $sportspursetype = '' AND sportspursenumber = 0:
+		$sportspursetype = 'none' & sportspursenumber = 0
+	elseif dyneval('RESULT = <<$sportspursetype>>_purses[<<sportspursenumber>>]') = 0:
+		$sportspursetype = 'none' & sportspursenumber = 0
+	end
+	$currentpursetype = $sportspursetype
+	currentpursenumber = sportspursenumber
+	if $currentpursetype = 'none':
+		bag = 0
+	else
+		bag = 1
+	end
+
+	if dyneval('RESULT = coat[<<sportscoat>>]') = 0: sportscoat = 0
+	defaultcoat = sportscoat
+	gs 'stat'
+
+	!! do not own this clothing anymore
+	if dyneval('RESULT = exercise[<<sportsclothingnumber>>]') = 0:
+		cls
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/strip/strip2.jpg"></center>'
+		'As you go to pull your sports outfit out of your wardrobe you remember you don''t own that piece of clothing anymore. Maybe you should buy it again? Guess you will have to find something else to wear.'
+		gs 'wardrobe', 'prev_entry_set'
+	!! strength of clothing is less than or equal to 0
+	elseif dyneval('RESULT = exerciseH[<<sportsclothingnumber>>]') <= 0:
+		cls
+		'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/vicky/event/vika_game_strip16.mp4"></video></center>'
+		'Your sports outfit has worn out and can''t be used anymore. Guess you will have to find something else to wear.'
+		gs 'wardrobe', 'prev_entry_set'
+	!! clothing exhibition is greater than player exhibition
+	elseif CloInhibit > pcs_inhib:
+		cls
+		'<center><video autoplay loop src="images/locations/pavlovsk/trainstation/bimbo.strip6.mp4"></video></center>'
+		'You don''t feel daring enough to wear your sports outfit. Maybe you will be confident enough in the future? Guess you will have to find something else to wear.'
+		gs 'wardrobe', 'prev_entry_set'
+	!! clothing ok to wear without needing hip check and passing all other checks
+	else
+		cls
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/dress.mp4"></video></center>'
+		'You put on your sports outfit without any problems.'
+	end
+	act 'Return': 
+		if $wloc = 'wardrobe':
+			gt 'wardrobe', 'start'
+		elseif $wloc = 'workout':
+			gt 'exercise', 'workout'
+		else 
+			gt $loc, $metka
+		end
+	end
+end
+
+if $ARGS[0] = 'sports_entry_set':
+	if $clothingworntype ! 'exercise' OR $shoeworntype ! 'trainers':
+		MSG 'The sports outfit needs to include exercise clothes and training shoes'
+		act 'Return to wardrobe': gt 'wardrobe', 'start'
+	else 
+		gs 'stat'
+		sportsclothingnumber = clothingwornnumber
+		$sportsbratype = $braworntype
+		sportsbranumber = brawornnumber
+		$sportspantytype = $pantyworntype
+		sportspantynumber = pantywornnumber
+		sportsshoenumber = shoewornnumber
+		$sportspursetype = $currentpursetype
+		sportspursenumber = currentpursenumber
+		sportscoat = defaultcoat
+
+		gt 'wardrobe', 'default_set'
+	end
+end
+
+if $ARGS[0] = 'prev_entry_set':
+	$prevsportsclothingtype = $clothingworntype
+	prevsportsclothingnumber = clothingwornnumber
+	$prevsportsbratype = $braworntype
+	prevsportsbranumber = brawornnumber
+	$prevsportspantytype = $pantyworntype
+	prevsportspantynumber = pantywornnumber
+	$prevsportsshoetype = $shoeworntype
+	prevsportsshoenumber = shoewornnumber
+	$prevsportspursetype = $currentpursetype
+	prevsportspursenumber = currentpursenumber
+	prevsportscoat = defaultcoat
+end
+
+if $ARGS[0] = 'prev_entry_wear':
+	cls
+	'<center><video autoplay loop src="images/locations/city/citycenter/photo/dress.mp4"></video></center>'
+	'You take off your sports outfit and put on the previous clothes'
+	$clothingworntype = $prevsportsclothingtype 
+	clothingwornnumber = prevsportsclothingnumber 
+	$braworntype = $prevsportsbratype 
+	brawornnumber = prevsportsbranumber 
+	$pantyworntype = $prevsportspantytype 
+	pantywornnumber = prevsportspantynumber 
+	$shoeworntype = $prevsportsshoetype 
+	shoewornnumber = prevsportsshoenumber 
+	$currentpursetype = $prevsportspursetype 
+	currentpursenumber = prevsportspursenumber 
+	defaultcoat = prevsportscoat 
+	gs 'stat'
+	act 'Return': 
+		if $wloc = 'wardrobe':
+			gt 'wardrobe', 'start'
+		elseif $wloc = 'workout':
+			gt 'exercise', 'workout'
+		else 
+			gt $loc, $metka
+		end
+	end
+end
+
+if $ARGS[0] = 'sports_outfit_option':
+	if $ARGS[1] = 'workout': 
+		$wloc = 'workout'
+	else
+		killvar '$wloc'
+	end
+
+	if $clothingworntype = 'exercise' AND $shoeworntype = 'trainers' AND sportsclothingnumber = clothingwornnumber AND $sportsbratype = $braworntype AND sportsbranumber = brawornnumber AND $sportspantytype = $pantyworntype AND sportspantynumber = pantywornnumber AND sportsshoenumber = shoewornnumber:
+		act 'Wear previous outfit': gs 'wardrobe', 'prev_entry_wear'
+	else
+		act 'Wear sports outfit': gs 'wardrobe', 'sports_entry_wear'
+	end
+end
 --- wardrobe ---------------------------------