5 Commits 4d46b72c64 ... 24d1721b09

Author SHA1 Message Date
  LinaHirata 24d1721b09 [fixed] typo 4 months ago
  Kevin_Smarts bd0313cd44 Merge remote-tracking branch 'Lusticon/master' 4 months ago
  Lusticon 8e4651e68a Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 4 months ago
  Lusticon a6f61b7478 [fixed] negative minut 4 months ago
  Lusticon 70b6434a63 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 4 months ago

+ 6 - 6
locations/ballet_secrets.qsrc

@@ -18,7 +18,7 @@ if $ARGS[0] = 'init':
   gs 'themes', 'indoors'
   gs 'core_library', 'stage_title'
   minut += 5
-  gs 'stats'
+  gs 'stat'
   if week < 7 and hour >= 9 and hour <= 17:
     'You enter the shop and greeted by a riot of displays showcasing ballet and other dance equipment. A woman is sewing something in the corner and glances at you before continuing.'
     if balletqw['ballet_secrets'] = 1:
@@ -47,7 +47,7 @@ if $ARGS[0] = 'first_visit':
   $setloc['StageImage'] =  '<<$default_img_path>>ballet_secrets_fitting_1'
   minut += 60
   gs 'core_library', 'stage_title'
-  gs 'stats'
+  gs 'stat'
 
   'You are greeted by a middle aged woman. "Hello, how may I help you?" She askes politely.'
   '"Hello, I am <<$pcs_firstname>> <<$pcs_lastname>>. I am part of the ballet school intake." you give her a smile and hand over the schools letter as proof.'
@@ -77,7 +77,7 @@ if $ARGS[0] = 'reception':
   gs 'themes', 'indoors'
   gs 'core_library', 'stage_title'
   minut += 5
-  gs 'stats'
+  gs 'stat'
   'As you enter you are greeted warmly by the gym staff. The gym has an industrial feel reflecting the buildng being converted from an old factory.'
 
   'There is a <a href="exec: gt ''food'', ''watercooler''">drinking fountain</a> near the doors to the gym hall to refill your water bottle.'
@@ -109,7 +109,7 @@ if $ARGS[0]= 'enrol':
 	$epayments['banner']= 'locations/<<$default_img_path>>reception.jpg'
   gs 'core_library', 'stage_title'
   minut += 30
-  gs 'stats'
+  gs 'stat'
 
   if balletqw['membership'] = 0:
     'You approach the reception to discuss membership to the gym.'
@@ -137,7 +137,7 @@ if $ARGS[0] = 'changing_room':
 	$locclass = 'changingroom'
   gs 'themes', 'indoors'
   minut += 5
-  gs 'stats'
+  gs 'stat'
   '<center><h2>Changing Room</h2></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/locker.jpg"></center>'
 
@@ -244,7 +244,7 @@ if $ARGS[0] = 'yoga_courses':
   gs 'themes', 'indoors'
   gs 'core_library', 'stage_title'
   minut += 5
-  gs 'stats'
+  gs 'stat'
   if balletqw['yoga_session'] ! daystart:
     act 'Attend Yoga Class':
       cla

+ 2 - 3
locations/dinSex2.qsrc

@@ -191,7 +191,6 @@ end
 
 if $ARGS[0] = 'doublepenetration':
 	frost = 0
-	minut -= ARGS[1]
 	TotPain = 0
 	if pcs_vag > 0:
 		if (vgrdif + vltdif) >= 30: TotPain +=4 & 'You groan in pain when <<$boydesc1>> penetrates you, tears flow from your eyes and it feels like someone drove a red-hot rod into your vagina.'
@@ -251,8 +250,8 @@ if $ARGS[0] = 'doublepenetration':
 		if pcs_makeup > 1:pcs_makeup = 0
 		'Squeals and tears stream pouring out of your eyes from the terrible pain, your entire abdomen and genitals feel a sharp pain while <<$boydesc1>> fucks your vagina with <<$xyr1>> <<dick1>> centimeter dick and <<$boydesc2>> almost tearing your <<$anustipe>> with <<$xyr2>> <<dick2>> centimeter instrument.'
 	end
-	gs 'arousal','vaginal',ARGS[1],'dick1',$ARGS[2],$ARGS[3],$ARGS[4],$ARGS[5],$ARGS[6],$ARGS[7]
-	gs 'arousal','anal',ARGS[1],'dick2',$ARGS[2],$ARGS[3],$ARGS[4],$ARGS[5],$ARGS[6],$ARGS[7]
+	gs 'arousal','vaginal',ARGS[1]/2,'dick1',$ARGS[2],$ARGS[3],$ARGS[4],$ARGS[5],$ARGS[6],$ARGS[7]
+	gs 'arousal','anal',ARGS[1]/2,'dick2',$ARGS[2],$ARGS[3],$ARGS[4],$ARGS[5],$ARGS[6],$ARGS[7]
 end
 
 

+ 3 - 3
locations/katjaEv.qsrc

@@ -722,10 +722,10 @@ if $ARGS[0] = 'kathan19':
 			'You stand there trying to process what exactly was said. Nothing special? At your stunned expression, Katja rolls her eyes, grabs your hand and takes you away. Just pray that this doesn''t hurt you, but for the moment, it is time to look for something else to do.'
 
 			if hour >= 20:
-				act 'It''s too late, accompany Katja to her home':grupvalue[1] -= 5 & grupvalue[2] -= 5 & grupvalue[3] -= 5 & grupvalue[3] -= 5 & minut -= 5 & npc_rel['A140'] += 1 & minut += 5 & gt		 'pav_residential'
+				act 'It''s too late, accompany Katja to her home':grupvalue[1] -= 5 & grupvalue[2] -= 5 & grupvalue[3] -= 5 & grupvalue[3] -= 5 & minut += 5 & npc_rel['A140'] += 1 & gt 'pav_residential'
 			else
-				act 'Continue walking and talking':grupvalue[1] -= 5 & grupvalue[2] -= 5 & grupvalue[3] -= 5 & grupvalue[3] -= 5 & minut -= 5 & npc_rel['A140'] += 1 & gt 'katjaEv','kathan16'
-				act 'Look for something else to do':grupvalue[1] -= 5 & grupvalue[2] -= 5 & grupvalue[3] -= 5 & grupvalue[3] -= 5 & minut -= 5 & npc_rel['A140'] += 1 & gt 'katjaEv','kathan'
+				act 'Continue walking and talking':grupvalue[1] -= 5 & grupvalue[2] -= 5 & grupvalue[3] -= 5 & grupvalue[3] -= 5 & minut += 5 & npc_rel['A140'] += 1 & gt 'katjaEv','kathan16'
+				act 'Look for something else to do':grupvalue[1] -= 5 & grupvalue[2] -= 5 & grupvalue[3] -= 5 & grupvalue[3] -= 5 & minut += 5 & npc_rel['A140'] += 1 & gt 'katjaEv','kathan'
 			end
 		elseif rand(20,90) < pcs_persuas:
 			gs 'exp_gain', 'humint', rand(1,2)

+ 2 - 2
locations/mey_home.qsrc

@@ -496,8 +496,8 @@ if $ARGS[0] = 'garden':
 			minut += 60
 			pcs_mood += 50
 			if pcs_sweat > 10: pcs_sweat = 10 + rand(0,4)
-			if pcs_stren < 40: gs 'exp_gain', 'stren', 1 & minut -= 1
-			if pcs_vital < 40: gs 'exp_gain', 'vital', 1 & minut -= 1
+			if pcs_stren < 40: gs 'exp_gain', 'stren', 1
+			if pcs_vital < 40: gs 'exp_gain', 'vital', 1
 			fat -= 1
 			gs 'stat'
 

+ 2 - 2
locations/pav_lake_nude.qsrc

@@ -173,8 +173,8 @@ if temper >= 15 and month >= 5 and month <= 9 and hour >= 6 and hour <= 20:
 					inhib_exp += rand(1,3)
 				end
 				if pcs_sweat > 10: pcs_sweat = 10 + rand(0,4)
-				if pcs_stren < 30: gs 'exp_gain', 'stren', 1 & minut -= 1
-				if pcs_vital < 30: gs 'exp_gain', 'vital', 1 & minut -= 1
+				if pcs_stren < 30: gs 'exp_gain', 'stren', 1
+				if pcs_vital < 30: gs 'exp_gain', 'vital', 1
 				fat -= 1
 				pcs_makeup = 1
 				gs 'stat'