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

locations/Snpc

@@ -75,6 +75,11 @@ if grupTipe[numnpc] = 4:
 					minut += 5
 					npc_rel[$static_num] += 5
 					alko += 1
+					if pcs_hydra >= 100:
+						pcs_hydra += 5
+					else
+						pcs_hydra += 10
+					end
 					cumspclnt = 2
 					gs 'cum_cleanup'
 					pcs_breath = 0

locations/beverage

@@ -3,7 +3,7 @@
 if $ARGS[0] = 'bev_kva':
 	*clr & cla
 	frost = 1
-	minut += 15
+	minut += 10
 	fat += 2
 	money -= val($_drink['<<args[1]>>,price'])
 	pcs_health += 5
@@ -30,7 +30,7 @@ if $ARGS[0] = 'bev_jui':
 	*clr & cla
 	frost = 1
 	alko -= 1
-	minut += 15
+	minut += 10
 	fat += 3
 	money -= val($_drink['<<args[1]>>,price'])
 	pcs_health += 8
@@ -56,7 +56,7 @@ end
 if $ARGS[0] = 'bev_mil':
 	*clr & cla
 	frost = 1
-	minut += 15
+	minut += 10
 	fat += 6
 	money -= val($_drink['<<args[1]>>,price'])
 	pcs_health += 5
@@ -83,7 +83,7 @@ if $ARGS[0] = 'bev_wat':
 	*clr & cla
 	frost = 1
 	alko -= 1
-	minut += 15
+	minut += 10
 	money -= val($_drink['<<args[1]>>,price'])
 	pcs_health += 10
 	pcs_energy += 4
@@ -108,7 +108,7 @@ if $ARGS[0] = 'bev_cof':
 	*clr & cla
 	frost = 0
 	alko -= 1
-	minut += 15
+	minut += 10
 	money -= val($_drink['<<args[1]>>,price'])
 	pcs_health += 5
 	pcs_mood += 20
@@ -134,7 +134,7 @@ if $ARGS[0] = 'bev_tea':
 	*clr & cla
 	frost = 0
 	alko -= 1
-	minut += 15
+	minut += 10
 	money -= val($_drink['<<args[1]>>,price'])
 	pcs_health += 10
 	pcs_mood += 20

locations/food

@@ -10,7 +10,7 @@
 if $ARGS[0] = 'pirosh':
 	*clr & cla
 	frost = 0
-	minut += 25
+	minut += 15
 	money -= val($_eat['<<args[1]>>,price'])
 	pcs_health += 5
 	mood += 5
@@ -36,7 +36,7 @@ end
 if $ARGS[0] = 'golub':
 	*clr & cla
 	frost = 0
-	minut += 30
+	minut += 20
 	money -= val($_eat['<<args[1]>>,price'])
 	pcs_health += 10
 	mood += 5
@@ -62,7 +62,7 @@ end
 if $ARGS[0] = 'pozhar':
 	*clr & cla
 	frost = 0
-	minut += 30
+	minut += 20
 	money -= val($_eat['<<args[1]>>,price'])
 	pcs_health += 15
 	mood += 10
@@ -88,7 +88,7 @@ end
 if $ARGS[0] = 'reuben':
 	*clr & cla
 	frost = 0
-	minut += 35
+	minut += 25
 	money -= val($_eat['<<args[1]>>,price'])
 	pcs_health += 20
 	mood += 25
@@ -165,7 +165,7 @@ end
 if $ARGS[0] = 'salfan':
 	*clr & cla
 	frost = 0
-	minut += 35
+	minut += 40
 	money -= val($_eat['<<args[1]>>,price'])
 	pcs_health += 20
 	mood += 20
@@ -191,7 +191,7 @@ end
 if $ARGS[0] = 'strofan':
 	*clr & cla
 	frost = 0
-	minut += 30
+	minut += 35
 	money -= val($_eat['<<args[1]>>,price'])
 	pcs_health += 20
 	mood += 30
@@ -243,7 +243,7 @@ end
 if $ARGS[0] = 'blifan':
 	*clr & cla
 	frost = 0
-	minut += 15
+	minut += 20
 	money -= val($_eat['<<args[1]>>,price'])
 	pcs_health += 30
 	mood += 40
@@ -269,7 +269,7 @@ end
 if $ARGS[0] = 'ryesna':
 	*clr & cla
 	frost = 0
-	minut += 15
+	minut += 10
 	money -= val($_eat['<<args[1]>>,price'])
 	pcs_health += 5
 	mood += 10
@@ -295,7 +295,7 @@ end
 if $ARGS[0] = 'crisps':
 	*clr & cla
 	frost = 0
-	minut += 15
+	minut += 10
 	money -= val($_eat['<<args[1]>>,price'])
 	pcs_health += 5
 	mood += 20
@@ -321,7 +321,7 @@ end
 if $ARGS[0] = 'onring':
 	*clr & cla
 	frost = 0
-	minut += 15
+	minut += 10
 	money -= val($_eat['<<args[1]>>,price'])
 	pcs_health += 10
 	mood += 5
@@ -347,7 +347,7 @@ end
 if $ARGS[0] = 'vegburg':
 	*clr & cla
 	frost = 0
-	minut += 30
+	minut += 20
 	money -= val($_eat['<<args[1]>>,price'])
 	pcs_health += 20
 	mood += 10
@@ -373,7 +373,7 @@ end
 if $ARGS[0] = 'turburg':
 	*clr & cla
 	frost = 0
-	minut += 30
+	minut += 20
 	money -= val($_eat['<<args[1]>>,price'])
 	pcs_health += 10
 	mood += 10
@@ -399,7 +399,7 @@ end
 if $ARGS[0] = 'batfish':
 	*clr & cla
 	frost = 0
-	minut += 30
+	minut += 20
 	money -= val($_eat['<<args[1]>>,price'])
 	pcs_health += 15
 	mood += 15
@@ -425,7 +425,7 @@ end
 if $ARGS[0] = 'cheburg':
 	*clr & cla
 	frost = 0
-	minut += 30
+	minut += 25
 	money -= val($_eat['<<args[1]>>,price'])
 	pcs_health += 20
 	mood += 20

locations/hanters

@@ -50,7 +50,7 @@ if hantersKnow = 0:
 		$npc_usedname['A172'] = 'Andrei'
 		$npc_usedname['A173'] = 'Igor'
 		$npc_usedname['A174'] = 'Sergei'
-		act 'Sit down': gt 'hanters'
+		act 'Sit down': gt 'hanters', 'start'
 		act 'Move away': gt 'swamp_yard'
 	end
 elseif hour = 8 or hour = 14 or hour = 19:
@@ -255,7 +255,7 @@ elseif hour = 8 or hour = 14 or hour = 19:
 				'You approach the hunters sitting in the meadow. "Guys, let me shoot the rifle," you look at them with your puppy eyes.'
 				'"<<$pcs_nickname>>, come closer," replied Andrei. "If you want to shoot you need to repay us somehow."'
 
-				act'Approach':gt 'hanters'
+				act'Approach':gt 'hanters', 'start'
 			else
 				*clr & cla
 				minut += 5

locations/stat

@@ -501,11 +501,15 @@ if minut >= 60:
 
 	if mosol >= 30 and pain['pubic'] < 80: gs 'pain', 1, 'pubic', 'ache'
 
-	if pcs_energy > 100:
+	if pcs_energy > 100: 
 		fat += (pcs_energy - 100) / 4
 		pcs_energy = 100
 	end
-
+	
+	if pcs_sleep > 100: pcs_sleep = 100
+		
+	if pcs_hydra > 200: pcs_hydra = 200
+	
 	if mosol > 0:
 		if $pantyworntype ! 'none' or $clothingworntype = 'nude' or PCloPanties = 1:mosol -= rand(0,1)
 	end
@@ -852,8 +856,8 @@ end
 
 if pcs_hydra <= 0:
 	pcs_hydra = 0
-	health -= 10
-	willpower -= 1
+	pcs_health -= 5
+	pcs_willpwr -= 1
 end
 
 if pcs_mood <= 0:

locations/stat_display

@@ -78,9 +78,6 @@ gs 'stat_sklattrib_lvlset'
 !!!Beginning Description!!!
 !!!!!!!!!!!!!!!!!!!!!
 
-if pcs_sleep > 100: pcs_sleep = 100
-if pcs_hydra > 200: pcs_hydra = 200
-
 !!----------------image Extra messages, start--------------------------
 $stat_imgtool_msg=''
 $stat_imgextra_msg=''