Browse Source

[fixed] schedule for hunters being in two places at once in swamp_yard and swamphouse.
[cahnged] getting undressed in backwater, when hunters are asleep
[changed] mushroom soup and stew stats in food.
[changed] time for chatting with hunters in hunter_interactions.
[added] old razors and hair brushing to cabin.

3xpurt 4 years ago
parent
commit
6c57e67c2c

+ 1 - 1
locations/backwater.qsrc

@@ -145,7 +145,7 @@ if $ARGS[0] = '':
 		if $clothingworntype ! 'nude' and temper >= 15:
 			act'Get undressed':
 				menu_off = 1
-				if (huntersKnowSlut > 0 and hunters_here = 1) or (hour >= 8 and hour < 20 and hunters_here =0) or (pcs_inhib >= 25 or exhibitionist_lvl > 1):
+				if (huntersKnowSlut > 0 and hunters_here = 1) or (hour < 7 or hour > 22) or (hour >= 8 and hour < 20 and hunters_here =0) or (pcs_inhib >= 25 or exhibitionist_lvl > 1):
 					cla
 					*clr
 					minut+=5

+ 5 - 22
locations/food.qsrc

@@ -757,11 +757,7 @@ if $ARGS[0] = 'jerky':
 	pcs_health += 10
 	fat += 1
 	pcs_hydra -= 15
-	if pcs_energy >= 85:
-		pcs_energy += 20
-	else
-		pcs_energy += 30
-	end
+	pcs_energy += 20
 	cumspclnt = 2
 	gs 'cum_cleanup'
 	pcs_breath = 0
@@ -784,15 +780,8 @@ if $ARGS[0] = 'meat_stew':
 	minut += 30
 	money -= val($_eat['<<args[1]>>,price'])
 	pcs_health += 10
-	if pcs_energy >= 100:
-		fat += 5
-	elseif pcs_energy >= 80:
-		fat += 3
-		pcs_energy += 60
-	else
-		fat += 1
-		pcs_energy += 50
-	end
+	fat += 3
+	pcs_energy += 50
 	if pcs_hydra >= 100:
 		pcs_hydra += 10
 	else
@@ -821,14 +810,8 @@ if $ARGS[0] = 'mush_soup':
 	minut += 30
 	money -= val($_eat['<<args[1]>>,price'])
 	pcs_health += 10
-	if pcs_energy >= 100:
-		fat += 3
-	elseif pcs_energy >= 80:
-		fat += 1
-		pcs_energy += 40
-	else
-		pcs_energy += 30
-	end
+	fat += 3
+	pcs_energy += 40
 	if pcs_hydra >= 100:
 		pcs_hydra += 20
 	else

+ 10 - 0
locations/hunter_interactions.qsrc

@@ -421,6 +421,8 @@ end
 
 if $ARGS[0] = 'join_drinking':
 	*clr & cla
+	minut += 5
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/fireside_drink.jpg"></center>'
 	'You approach the hunters and ask if you can join them drinking.'
 	!Friendly enough to score free booze
@@ -529,7 +531,9 @@ if $ARGS[0] = 'booze_dare':
 	if $ARGS[1] = '' or $ARGS[1] = 'pick':
 		act 'Walk away': gt 'swamphouse', 'start'
 		if $ARGS[2] = 'innocent':
+			minut += 5
 			gs 'willpower', 'voyeur', 'exhib'
+			gs 'stat'
 			if $clothingworntype ! 'nude':
 				'"How about you show us your panties" says Andrei. "Wondering what color your underwear is, just scientific curiosity that''s all"'
 				if $pantyworntype ! 'none':
@@ -558,7 +562,9 @@ if $ARGS[0] = 'booze_dare':
 		end
 
 		if $ARGS[2] = 'strip':
+			minut += 5
 			gs 'willpower', 'voyeur', 'exhib'
+			gs 'stat'
 			if $clothingworntype ! 'nude':
 				'"I can barely understand you over all those clothes" says Andrei. Noticing your confused stare, Sergei says "He means we want you to take your clothes off"'
 				if will_cost <= pcs_willpwr:
@@ -583,7 +589,9 @@ if $ARGS[0] = 'booze_dare':
 		end
 
 		if $ARGS[2] = 'softcore':
+			minut += 5
 			gs 'willpower', 'voyeur', 'humiliation'
+			gs 'stat'
 			if $clothingworntype ! 'nude' or $pantyworntype ! 'none':
 				gt 'hunter_interactions', 'booze_dare', 'pick', 'strip'
 			else
@@ -607,6 +615,8 @@ if $ARGS[0] = 'booze_dare':
 		end
 
 		if $ARGS[2] = 'hardcore':
+			minut += 5
+			gs 'stat'
 			if $clothingworntype ! 'nude':
 				gs 'willpower', 'bj', 'exhib'
 				'"I want you to suck my dick if you want some booze" says Sergei. "You get two free drinks eh?" quips Andrei behind him'

+ 2 - 2
locations/swamp_yard.qsrc

@@ -63,11 +63,11 @@ if $ARGS[0] = 'start':
 		*nl
 		'On the side of the hut is an old <a href="exec:gt ''bicycle'',''swamp''">bike</a>.'
 	end
-	if hunters_here > 0 and huntersKnow = 0 and hunters_busy = 0 and sunWeather = 1:
+	if (hour > 7 and hour < 19) and hunters_here > 0 and huntersKnow = 0 and sunWeather = 1 and hunters_off = 1:
 		*nl
 		'You spot some unfamiliar <a href="exec: gt ''hunters'', ''start'' ">people</a> standing in front of the hut.'
 	end
-	if hunters_here > 0 and huntersKnow > 0 and hunters_busy = 0 and sunWeather = 1:
+	if (hour > 7 and hour < 19) and hunters_here > 0 and huntersKnow > 0 and sunWeather = 1 and hunters_off = 1:
 		*nl
 		'You notice the <a href="exec: gt ''hunters'', ''start'' ">hunters</a> standing in the front yard.'
 	end

+ 9 - 2
locations/swamphouse.qsrc

@@ -550,12 +550,15 @@ end
 if $ARGS[0] = 'washstand':
 	cla
 	*clr
+	$metkaM = 'washstand'
+	$locM = 'swamphouse'
 	menu_off = 1
 	minut += 1
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/washstand.jpg"></center>'
-	'An old washstand. You can use the basin to clean yourself, if necessary.'
+	*nl
+	'An old washstand. You can use the basin to clean yourself, if necessary. There is also an old polished, but rusty metal mirror resting on the basin, which you can use to ' +iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
 
 	if bucket > 0:
 		!use current by illume
@@ -567,6 +570,8 @@ end
 if $ARGS[0] = 'tub':
 	cla
 	*clr
+	$loc = 'swamphouse'
+	$metka = 'tub'
 	minut += 1
 	menu_off = 1
 	gs 'stat'
@@ -574,7 +579,9 @@ if $ARGS[0] = 'tub':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/basin.jpg"></center>'
 	*nl
 	'An old tub, that you can use to bathe yourself. It''s a lot warmer than using the spring! You just need to warm some water, and get undressed first.'
-
+	'If you are desperate enough, you found a handful of well used '+iif(stanok < 1,'<a href="exec: stanok += 5 & gt ''swamphouse'', ''tub''">razors</a>','razors')+' on a shelf, that you can use to shave with. '+iif(stanok > 0, '<a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>','')+''
+	dynamic $brit
+		
 	if hotwater = 1 and ($clothingworntype = 'nude' or $clothingworntype = 'swimwear'):
 		act 'Bathe in the tub (0:30)':
 			cla