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

locations/Miroslava.qsrc

@@ -1093,6 +1093,7 @@ if $ARGS[0] = 'miratalk':
 	elseif npc_QW['A60'] = 4 and Mira4day ! daystart:
 
 		act 'Remind her that she has not atoned for bringing Mitka to the meadow':
+			cla
 			'You remind Mira that you are still not satified with her atonement and she asks you what you want her to do.'
 
 			act 'Tell her that you want to watch as Mitka fucks her in the ass':

locations/cikl.qsrc

@@ -1279,30 +1279,30 @@ if storyline = 1:
 				old_grupvalue[3] = grupvalue[3]
 				old_grupvalue[4] = grupvalue[4]
 			else
-				if old_grupvalue[1] + 6 < grupvalue[1]: grupvalue[1] = old_grupvalue[1] + 6
-				if old_grupvalue[2] + 6 < grupvalue[2]: grupvalue[2] = old_grupvalue[2] + 6
-				if old_grupvalue[3] + 6 < grupvalue[3]: grupvalue[3] = old_grupvalue[3] + 6
-				if old_grupvalue[4] + 6 < grupvalue[4]: grupvalue[4] = old_grupvalue[4] + 6
+				if old_grupvalue[1] + 8 < grupvalue[1]: grupvalue[1] = old_grupvalue[1] + 8
+				if old_grupvalue[2] + 8 < grupvalue[2]: grupvalue[2] = old_grupvalue[2] + 8
+				if old_grupvalue[3] + 8 < grupvalue[3]: grupvalue[3] = old_grupvalue[3] + 8
+				if old_grupvalue[4] + 8 < grupvalue[4]: grupvalue[4] = old_grupvalue[4] + 8
 			end
 
 			!!Decay for the school groups
 			if grupvalue[1] > 0:
-				grupvalue[1] -= 1
+				grupvalue[1] -= rand(0,1)
 			else
 				grupvalue[1] = 0
 			end
 			if grupvalue[2] > 0:
-				grupvalue[2] -= 1
+				grupvalue[2] -= rand(0,1)
 			else
 				grupvalue[2] = 0
 			end
 			if grupvalue[3] > 0:
-				grupvalue[3] -= 1
+				grupvalue[3] -= rand(0,1)
 			else
 				grupvalue[3] = 0
 			end
 			if grupvalue[4] > 0:
-				grupvalue[4] -= 1
+				grupvalue[4] -= rand(0,1)
 			else
 				grupvalue[4] = 0
 			end

locations/fit.qsrc

@@ -51,12 +51,16 @@ if $ARGS[0] = 'start':
 
 	if abonement > 0:
 		act 'Go to the dressing room': gt 'fit', 'dressing room'
-	else
-		act 'Use the pool (100 <b>₽</b>)': gt 'fit', 'dressing room'
+	elseif money > 100:
+		act 'Use the pool (100 <b>₽</b>)':
+			money -= 100
+			gs 'stat'
+			gt 'fit', 'dressing room'
+		end
 	end
 
 	if money >= 3000:
-		act 'Buy 30 classes (3,000 <b>₽</b>)':
+		act ''+iif(abonement > 0, 'Buy an extra','Buy')+' 30 classes (3,000 <b>₽</b>)':
 			cla
 			menu_off = 1
 			money -= 3000
@@ -68,7 +72,7 @@ if $ARGS[0] = 'start':
 	end
 
 	if money >= 2250:
-		act 'Buy 20 classes (2,250 <b>₽</b>)':
+		act ''+iif(abonement > 0, 'Buy an extra','Buy ')+' 20 classes (2,250 <b>₽</b>)':
 			cla
 			menu_off = 1
 			money -= 2250
@@ -80,7 +84,7 @@ if $ARGS[0] = 'start':
 	end
 
 	if money >= 1500:
-		act 'Buy 10 classes (1,500 <b>₽</b>)':
+		act ''+iif(abonement > 0, 'Buy an extra','Buy ')+' 10 classes (1,500 <b>₽</b>)':
 			cla
 			menu_off = 1
 			money -= 1500

locations/swamp_yard.qsrc

@@ -126,7 +126,9 @@ if $ARGS[0] = 'start':
 	if dirty_swamp_yard > 10:act 'Go out in the yard':hunterslut -= 1 & dynamic $dirty_swamp_yard
 
 	act 'Approach the firepit': gt 'swamp_yard', 'campfire'
-	act 'Explore the nearby woods': minut += 10 & gt 'swamp_woods', 'start'
+	act 'Visit the spring': gt 'swampspring'
+	act 'Visit the creek': gt 'backwater'
+	act 'Explore the woods': minut += 10 & gt 'swamp_woods', 'start'
 
 	! Hunters rescued from a swamp GG
 	if hunterhelp = 1:

locations/swamphouse.qsrc

@@ -174,11 +174,11 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if stovefire = 0 or meat_stew = 0 or mushroom_soup = 0 act 'Use the rickety stove': gt 'swamphouse', 'stove'
+	if stovefire = 0 or (meat_stew = 0 and raw_meat > 0) or (mushroom_soup = 0 and boletus > 0): act 'Use the rickety stove': gt 'swamphouse', 'stove'
 	if pcs_energy < 80: act 'Grab something to eat': gs 'swamphouse', 'food'
 	if bucket > 0 and pcs_hydra < 80: act 'Grab a drink of water': gt 'swamphouse', 'bucket'
-	if bucket > 0 or pcs_hairbsh = 0:: act 'Use the wash basin': gt 'swamphouse', 'washstand'
-	if hotwater = 1 and pcs_sweat > 19: act 'Bathe in the old tub': gt 'swamphouse', 'tub'
+	if bucket > 0 and pcs_hairbsh = 0: act 'Use the wash basin': gt 'swamphouse', 'washstand'
+	if hotwater = 1 and $clothingworntype = 'nude' and pcs_sweat > 19: act 'Bathe in the old tub': gt 'swamphouse', 'tub'
 	if dirty_swamphouse > 25:act 'Clean the hut':hunterslut -= 1 & gt 'swamphouse', 'dirty_swamphouse'
 
 	act 'Relax on the couch': gt 'bed', 'start'
@@ -452,7 +452,7 @@ if $ARGS[0] = 'stove':
 			act 'Continue': gt 'swamphouse', 'stove'
 		end
 	end
-	gs 'swamphouse', 'food'
+	act 'Grab something to eat': gs 'swamphouse', 'food'
 end
 
 if $ARGS[0] = 'food':
@@ -528,6 +528,8 @@ end
 if $ARGS[0] = 'washstand':
 	cla
 	*clr
+	$loc = 'swamphouse'
+	$metka = 'washstand'
 	$metkaM = 'washstand'
 	$locM = 'swamphouse'
 	menu_off = 1