Browse Source

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

KevinSmarts 5 years ago
parent
commit
d34b0ee0d7
2 changed files with 13 additions and 8 deletions
  1. 1 1
      locations/kuhrPar.qsrc
  2. 12 7
      locations/mey_home.qsrc

+ 1 - 1
locations/kuhrPar.qsrc

@@ -52,10 +52,10 @@ act 'Drink some water (0:05)':gs 'beverage', 'bev_wat'
 
 act 'Have a cup of tea (0:05)':
 	cls
-	minut += 5
 	if pcs_hydra >= 100:
 		'You don''t need any more tea.'
 	else
+		minut += 5
 		pcs_hydra += 80
 		cumspclnt = 2
 		gs 'cum_cleanup'

+ 12 - 7
locations/mey_home.qsrc

@@ -168,13 +168,18 @@ if $ARGS[0] = '1':
 
 	act 'Have a cup of tea (0:05)':
 		cls
-		minut += 5
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		pcs_breath = 0
-		pcs_mood += rand(1, 3)
-		'You make a refreshing cup of tea and everything seems a little better.'
-
+		if pcs_hydra >= 100:
+			'You don''t need any more tea.'
+		else
+			minut += 5
+			pcs_hydra += 80
+			cumspclnt = 2
+			gs 'cum_cleanup'
+			pcs_breath = 0
+			pcs_mood += rand(3, 6)
+			'You make a refreshing cup of tea and everything seems a little better.'
+		end
+	
 		gs 'stat'
 
 		act 'Get up from the table':gt 'mey_home', '1'