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

locations/abduction.qsrc

@@ -1,6 +1,6 @@
 # abduction
 
-$location_type = private
+$location_type = 'private'
 $metka = 'start'
 $loc = 'abduction'
 
@@ -590,7 +590,7 @@ if $ARGS[0] = 'abdFood':
 	act 'Eat dried food (0:10)':
 		*clr & cla
 		menu_off = 1
-		minut += 15
+		minut += 10
 		frost = 0
 		pcs_health += 10
 		pcs_mood += 10

locations/backwater.qsrc

@@ -60,8 +60,7 @@ end
 			body_write = 0
 			minut += 30
 			pcs_mood += 10
-			! Seems appropriate. Reducing it, but leaving it in. Potentially worth revisiting
-			pcs_willpwr += 1
+			if willday_bath ! daystart: willday_bath = daystart & pcs_willpwr += 1
 			inhib_exp += rand(1,3)
 			if huntersRape = 1: huntersRape = 2
 

locations/din_van.qsrc

@@ -184,6 +184,7 @@ $bath = {
 		if bath_daystart ! daystart:
 			bath_daystart = daystart
 			pcs_skin += rand(1,2)
+			pcs_willpwr += 1
 		end
 
 		gs 'stat'

locations/drugs.qsrc

@@ -83,7 +83,7 @@ elseif $ARGS[0] = 'cocaine':
 	end
 	dur -= 1
 	pcs_health = pcs_vital * 10 + pcs_stren * 5
-	pcs_willpwr += 10
+	if willday_cocaine ! daystart: willday_cocaine = daystart & pcs_willpwr += 10
 	pcs_mood = 100
 	pcs_horny = 100
 	nark += 10

locations/exercise.qsrc

@@ -366,11 +366,12 @@ if $ARGS[0] = 'hula':
 end
 
 if $ARGS[0] = 'yoga':
-	cla
-	*clr
+	*clr & cla
 	loopcount = 1
 	:timeloopyoga
-	gs 'exercise', 'tier2', 0, 'sprt_exp', 'agil_exp', 'pcs_willpwr'
+	if willday_yoga ! daystart: willday_yoga = daystart & yoga_counter = 0	
+	gs 'exercise', 'tier2', 0, 'sprt_exp', 'agil_exp', iif(yoga_counter < 4, 'pcs_willpwr', '')	
+	yoga_counter += 1
 	if loopcount < timemult: loopcount += 1 & jump 'timeloopyoga'
 	loopcount = 0
 	timemult = 0

locations/gLakeNude.qsrc

@@ -169,7 +169,7 @@ if temper >= 15 and month >= 5 and month <= 9:
 			minut = minut + 30
 			pcs_mood += 5
 			! Seems appropriate. Potentially worth revisiting
-			pcs_willpwr += 1
+			if willday_swim ! daystart: willday_swim = daystart & pcs_willpwr += 1
 			if $clothingworntype = 'swimwear':
 				if pcs_inhib < 50:inhib_exp += rand(1,2)
 			elseif $clothingworntype = 'nude':
@@ -359,10 +359,6 @@ if $ARGS[0] = 'sauna':
 			*clr & cla
 			menu_off = 1
 			minut += 2
-			if sauna_daystart ! daystart:
-				sauna_daystart = daystart
-				pcs_skin += rand(2,4)
-			end
 			gs 'stat'
 			if hour < 8 or hour > 22:
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/saunaempty.jpg"></center>'
@@ -385,6 +381,11 @@ if $ARGS[0] = 'sauna':
 				*clr & cla
 				minut +=30
 				pcs_mood += 10
+				if sauna_daystart ! daystart:
+					sauna_daystart = daystart
+					pcs_skin += rand(2,4)
+					pcs_willpwr += 3
+				end
 				if $clothingworntype = 'swimwear':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/saunabikini.jpg"></center>'
 					if pcs_inhib < 40: inhib_exp += rand(0,1)
@@ -403,39 +404,42 @@ if $ARGS[0] = 'sauna':
 			*clr & cla
 			menu_off = 1
 			minut += 2
-			if sauna_daystart ! daystart:
-				sauna_daystart = daystart
-				pcs_skin += rand(2,4)
-			end
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/saunaempty.jpg"></center>'
 			'It appears to be empty at the moment.'
 			act 'Leave': gt 'gLakeNude', 'sauna'
-			act 'Use the sauna':
-				*clr & cla
-				minut += 30
-				pcs_mood += 10
-				if $clothingworntype = 'swimwear':
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/saunabikini.jpg"></center>'
-					if pcs_inhib < 40: inhib_exp += rand(0,1)
-				else
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/saunanude.jpg"></center>'
-					if pcs_inhib < 60: inhib_exp += rand(1,2)
+			gs 'willpower', 'exhib', 'self', 'hard'
+			if saunarand < 4 or $clothingworntype = 'swimwear': will_cost = 3
+			if will_cost <= pcs_willpwr:
+				act 'Use the sauna (<<will_cost>> Willpower)':
+					*clr & cla
+					minut += 30
+					pcs_mood += 10
+					if sauna_daystart ! daystart:
+						sauna_daystart = daystart
+						pcs_skin += rand(2,4)
+						pcs_willpwr += 3
+					end
+					if $clothingworntype = 'swimwear':
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/saunabikini.jpg"></center>'
+						if pcs_inhib < 40: inhib_exp += rand(0,1)
+					else
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/saunanude.jpg"></center>'
+						if pcs_inhib < 60: inhib_exp += rand(1,2)
+					end
+					'You spend 30 minutes relaxing in the sauna.'
+					
+					act 'Leave': gt 'gLakeNude', 'sauna'
+					if month = 12 or month < 3: gs 'gLakeNude', 'ice_plunge'
 				end
-				'You spend 30 minutes relaxing in the sauna.'
-				
-				act 'Leave': gt 'gLakeNude', 'sauna'
-				if month = 12 or month < 3: gs 'gLakeNude', 'ice_plunge'
+			else
+				act 'Use the sauna (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		end
 		act 'Go to the co-ed section':
 			*clr & cla
 			menu_off = 1
 			minut += 2
-			if sauna_daystart ! daystart:
-				sauna_daystart = daystart
-				pcs_skin += rand(2,4)
-			end
 			gs 'stat'			
 			if hour < 8 or hour > 22:
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/saunaempty.jpg"></center>'
@@ -461,6 +465,11 @@ if $ARGS[0] = 'sauna':
 					gs 'willpower', 'pay', 'self'
 					minut += 30
 					pcs_mood += 10
+					if sauna_daystart ! daystart:
+						sauna_daystart = daystart
+						pcs_skin += rand(2,4)
+						pcs_willpwr += 3
+					end
 					if $clothingworntype = 'swimwear':
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/saunabikini.jpg"></center>'
 						if pcs_inhib < 40: inhib_exp += rand(0,1)

locations/gadfield.qsrc

@@ -354,8 +354,7 @@ if $ARGS[0] = 'cow2':
 					cumspclnt = 4 & gs 'cum_cleanup'
 					pcs_sweat = 10 + rand(0,4)
 					pcs_mood += 5
-					! Leaving it in for now as it seems sort of appropriate. Potentially worth revisiting
-					pcs_willpwr += 5
+					if willday_swim ! daystart: willday_swim = daystart & pcs_willpwr += 1
 					if pcs_stren < 30:stren_exp += 1
 					gs 'stat'
 

locations/gadforestrelax.qsrc

@@ -183,8 +183,6 @@ if bilberry > 0:
 	    pcs_energy += 15
 	    pcs_hydra += 40
 	    bilberry -= 1
-	    ! Commenting it out for now, but potentially worth revisiting
-		!pcs_willpwr += 5
 	    pcs_health += 5
 	    pcs_mood += 10
 	    gs'stat'

locations/gadriver.qsrc

@@ -512,8 +512,6 @@ if $ARGS[0] = 'gadbitch':
 						minut += 30
 						pcs_sweat = 10 + rand(0,4)
 						pcs_mood += 5
-						! Commented out for now, but potentially worth revisiting
-						!pcs_willpwr += 5
 						if pcs_inhib < 50 or $clothingworntype = 'nude': inhib_exp += rand(1,3)
 						hndiwrk_exp += rand(1,3)
 						grandmahelp += 1
@@ -544,8 +542,6 @@ if $ARGS[0] = 'gadbitch':
 							npc_rel['A60'] += 1
 							pcs_sweat = 10 + rand(0,4)
 							pcs_mood += 5
-							! Commented out for now, but potentially worth revisiting
-							!pcs_willpwr += 5
 							if pcs_inhib < 50 or $clothingworntype = 'nude': inhib_exp += rand(1,3)
 							hndiwrk_exp += rand(1,3)
 							grandmahelp += 1

locations/obj_din.qsrc

@@ -1897,8 +1897,15 @@ if $ARGS[0] = 'body':
 !!	This displays the body image; $bodimgsets[x9] is the folder name
 	!some in-game script may call this to display image, so leave it be
 	$img_temp = FUNC('$body_image','body')
+	if $modApi_body_image ! '':
+		$img_temp = $modApi_body_image
+	end
 	'<center><img <<$set_imgh>> src="<<$img_temp>>"></a></center>'
-	'<<$body_image_msg>>'
+	if $modApi_body_image_msg = '':
+		'<<$body_image_msg>>'
+	else 
+		'<<$modApi_body_image_msg>>'
+	end
 	killvar 'img_temp'
 	killvar 'body_image_msg'
 	'</td></tr></table></center>'
@@ -1913,13 +1920,27 @@ if $ARGS[0] = 'clothes':
 	!move image define to $body_image
 	!display cloth
 	$img_temp = FUNC('$body_image','clothes')
+	if $modApi_clothes_image ! '':
+		$img_temp = $modApi_clothes_image
+	end
 	'<center><img <<$set_imgh>> src="<<$img_temp>>"></a></center>'
-	'<<$body_image_msg>>'
+	if $modApi_clothes_image_msg = '':
+		'<<$body_image_msg>>'
+	else
+		`<<$modApi_clothes_image_msg>>`
+	end
 	'</td><td width="50%" cellpadding="20" valign="top">'
 	!display coat
 	$img_temp = FUNC('$body_image','coat')
+	if $modApi_coat_image ! '':
+		$img_temp = $modApi_coat_image
+	end
 	'<center><img <<$set_imgh>> src="<<$img_temp>>"></a></center>'
-	'<<$body_image_msg>>'
+	if $modApi_coat_image_msg = '':
+		'<<$body_image_msg>>'
+	else
+		`<<$modApi_coat_image_msg>>`
+	end
 	'</td></tr>'
 	'</table></center>'
 
@@ -1935,8 +1956,16 @@ if $ARGS[0] = 'panties':
 	'<center><table width="90%" cellspacing="0" cellpadding="20" valign="top"><tr>'
 	'<td cellspacing="0" cellpadding="0" valign="top">'
 	$img_temp = FUNC('$body_image','panties')
+	if $modApi_panties_image ! '':
+		$img_temp = $modApi_panties_image
+	end
+	
 	'<center><img <<$set_imgh>> src="<<$img_temp>>"></a></center>'
-	'<<$body_image_msg>>'
+	if $modApi_panties_image_msg = '':
+		'<<$body_image_msg>>'
+	else
+		`<<$modApi_panties_image_msg>>`
+	end
 	killvar 'img_temp'
 	killvar 'body_image_msg'
 	'</td></tr></table></center>'
@@ -1949,8 +1978,15 @@ if $ARGS[0] = 'bra':
 	'<center><table width="90%" cellspacing="0" cellpadding="20" valign="top"><tr>'
 	'<td cellspacing="0" cellpadding="0" valign="top">'
 	$img_temp = FUNC('$body_image','bra')
+	if $modApi_bra_image ! '':
+		$img_temp = $modApi_bra_image
+	end
 	'<center><img <<$set_imgh>> src="<<$img_temp>>"></a></center>'
-	'<<$body_image_msg>>'
+	if $modApi_bra_image_msg = '':
+		'<<$body_image_msg>>'
+	else
+		`<<$modApi_bra_image_msg>>`
+	end
 	killvar 'img_temp'
 	killvar 'body_image_msg'
 	'</td></tr></table></center>'
@@ -1973,8 +2009,15 @@ if $ARGS[0] = 'shoes':
 	'<center><table width="90%" cellspacing="0" cellpadding="20" valign="top"><tr>'
 	'<td cellspacing="0" cellpadding="0" valign="top">'
 	$img_temp = FUNC('$body_image','shoes')
+	if $modApi_shoes_image ! '':
+		$img_temp = $modApi_shoes_image
+	end
 	'<center><img <<$set_imgh>> src="<<$img_temp>>"></a></center>'
-	'<<$body_image_msg>>'
+	if $modApi_shoes_image_msg = '':
+		'<<$body_image_msg>>'
+	else
+		`<<$modApi_shoes_image_msg>>`
+	end
 	killvar 'img_temp'
 	killvar 'body_image_msg'
 	'</td></tr></table></center>'

locations/rolanbath.qsrc

@@ -82,8 +82,6 @@ if $ARGS[0] = 'start':
 					*nl
 					'The warm water feels amazing against you. You forget for a moment that Rolan could enter the bathroom at any moment. The shower is so relaxing that you begin to sing under the water, imagining that you''re a famous rockstar performing for your thousands of fans.'
 					pcs_mood += 10
-					! Seems appropriate. Reducing it, but leaving it in. Potentially worth revisiting
-					pcs_willpwr += 1
 					if hypnoAddict ! 0:
 						'You unconsciously avoid spraying water into your vagina.'
 					else
@@ -278,8 +276,6 @@ if $ARGS[0] = 'start':
 					*nl
 					'The warm water feels amazing against you. You forget for a moment that Rolan could enter the bathroom at any moment. The shower is so relaxing that you begin to sing under the water, imagining that you''re a famous rockstar performing for your thousands of fans.'
 					pcs_mood += 10
-					! Seems appropriate. Reducing it, but leaving it in. Potentially worth revisiting
-					pcs_willpwr += 1
 					act 'Dry off': gt 'rolanbath','dryOff'
 				end
 			elseif rand(0,3) = 1:
@@ -596,8 +592,6 @@ if $ARGS[0] = 'pervshower':
 					*nl
 					'The warm water feels amazing against you. As you relax you begin to sing under the water completely forgetting that Rolan is there and can hear you. You imagine that you''re a famous rockstar performing for your thousands of fans.'
 					pcs_mood += 10
-					! Seems appropriate. Reducing it, but leaving it in. Potentially worth revisiting
-					pcs_willpwr += 1
 					if hypnoAddict ! 0:
 						'You unconsciously avoid spraying water into your vagina.'
 					else

locations/sauna.qsrc

@@ -68,8 +68,11 @@ if $ARGS[0] = 'sauna2':
 			if pcs_horny < 0: pcs_horny = 0
 			pcs_health += healthmax/5
 			pcs_stam = stammax
-			! Seems appropriate. Reducing it, but leaving it in. Potentially worth revisiting
-			pcs_willpwr += 5
+			if sauna_daystart ! daystart:
+				sauna_daystart = daystart
+				pcs_skin += rand(2,4)
+				pcs_willpwr += 5
+			end
 			pcs_mana = (pcs_intel*pcs_magik) + pcs_magik*100 + pcs_vital*10 + rikudo
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/shared/sauna/sau.jpg"></center>'
@@ -93,10 +96,6 @@ if $ARGS[0] = 'saunaroom':
 	menu_off = 0
 	$location_type = 'private'
 	saunaYouRoom = 1
-	if sauna_daystart ! daystart:
-		sauna_daystart = daystart
-		pcs_skin += rand(2,4)
-	end
 	gs 'stat'
 	gs 'kit_din'
 	'<center><b><font color="maroon">Room</font></b></center>'

locations/sitr.qsrc

@@ -95,14 +95,11 @@ gs 'events', 'read'
 
 if dildo > 0 and pcs_horny >= 50:
 	act 'Masturbate':
-		cla
-		*clr
+		*clr & cla
 		minut += 30
 		stat['mast'] += 1
 		if pcs_inhib < 30:inhib_exp += rand(1,3)
-		pcs_willpwr += 15
 		pcs_vag += 1
-
 		if husband > 0 and husbandrink ! 10:
 			if week > 5 or week < 6 and hour > 16:
 				cla

locations/stat_sklattrib.qsrc

@@ -86,6 +86,7 @@ $skl_name[33] = 'inhib'
 $skl_name[34] = 'perform'
 $skl_name[35] = 'bushcraft'
 $skl_name[36] = 'cleaning'
+$skl_name[37] = 'bkbll'
 
 !!Trait Section
 !!This is where Traits that will affect attribute or skill advancement or degradation have those aspects defined.

locations/stat_sklattrib_lvlset.qsrc

@@ -126,6 +126,10 @@ wrstlng[1] = 0 & wrstlng[2] = 1 & wrstlng[3] = 2 & wrstlng[4] = -1
 pcs_ftbll = (ftbll_lvl + (pcs_vital + pcs_agil + pcs_stren) / 3) / 2
 ftbll[1] = 0 & ftbll[2] = 1 & ftbll[3] = 2 & ftbll[4] = -1
 
+!!Basketball; Should be self-explanatory
+pcs_bkbll = (bkbll_lvl + (pcs_vital + pcs_agil + pcs_react) / 3) / 2
+bkbll[1] = 0 & bkbll[2] = 1 & bkbll[3] = 2 & bkbll[4] = -1
+
 !!Spell Casting; The ability to Successfully cast spells
 pcs_splcstng = (splcstng_lvl + (pcs_intel + pcs_react) / 2) / 2
 splcstng[1] = 3 & splcstng[2] = 4 & splcstng[3] = -1

locations/ybass.qsrc

@@ -19,8 +19,7 @@ act 'Swim (1:00)':
 	minut += 60
 	pcs_sweat = 10 + rand(0,4)
 	pcs_mood += 5
-	! Seems appropriate. Reducing it, but leaving it in. Potentially worth revisiting
-	pcs_willpwr += 1
+	if willday_swim ! daystart: willday_swim = daystart & pcs_willpwr += 1
 	if pcs_stren < 40:stren_exp += 1
 
 	'<center><img <<$set_imgh>> src="images/locations/shared/lake/swim.jpg"></center>'