1
0

6 Commits 31345adfd2 ... e246208127

Autor SHA1 Mensagem Data
  Lusticon e246208127 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife há 5 meses atrás
  Lusticon 6482567e11 [changed] more secure int ARGS set há 5 meses atrás
  bgkjdgbizgblzdgbr a0d0ca49f8 [fixed] Missing *clr & cla and wrong file extension for images. há 5 meses atrás
  bgkjdgbizgblzdgbr 67323651a3 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife há 5 meses atrás
  bgkjdgbizgblzdgbr dcafe54806 [text edit] Made the sentece better. I hope. há 5 meses atrás
  Kevin_Smarts 4c2f87bc9b [fixed] Shirt and skirt labelled as a dress há 5 meses atrás

+ 0 - 1
locations/_attributes_cats_dress.qsrc

@@ -679,7 +679,6 @@ elseif ARGS[1] = 99:
 	CloThinness = 5
 	CloTopCut = 1
 	CloSkirtShortness = 4
-	CloDress = 1
 	
 elseif ARGS[1] = 100:
 	CloQuality = 5

+ 2 - 6
locations/boyStat.qsrc

@@ -9,11 +9,7 @@
 !! If ARGS[1] is not set it defaults to zero, so you can use the variables it sets with or without [0] e.g. dick or dick[0] are equivalent 
 
 if ($ARGS[0] = '' and ARGS[0] > 0) or (isnum(mid($ARGS[0],1,1)) and val(mid($ARGS[0],1,1)) < 10):
-	if ARGS[0] > 0:
-		npclastcalledn = ARGS[0]
-	else
-		npclastcalledn = val($ARGS[0])
-	end
+	npclastcalledn = iif(isnum($ARGS[0]),val($ARGS[0]),ARGS[0])
 	$npcboytemp = 'A' + npclastcalledn
 else
 	$npcboytemp = $ARGS[0]
@@ -103,7 +99,7 @@ elseif $ARGS[1] = 'f':
 	$dick_girth6 = $bstemp[3]
 	silavag6 = bstemp[4]
 else
-	boyStat_i = max(ARGS[1], val($ARGS[1]))
+	boyStat_i = iif(isnum($ARGS[1]),val($ARGS[1]),ARGS[1])
 	$boy[boyStat_i] = $npclastcalled
 	$boydesc[boyStat_i] = $bstemp[1]
 	dick[boyStat_i] = bstemp[2]

+ 2 - 2
locations/katja_chat.qsrc

@@ -573,13 +573,13 @@ if $ARGS[0] = 'coffee_hole_event':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/Coffe_hole2.jpg"></center>'
 			if katjaQW['know_dandd'] = 0:
 				'"Have you heard that the nerds from our high school meet here every week?" Katja asks. But before you can answer, she continues, "They are playing some kind of game, dragons and elves or something like that. Julia tried to explain it to me, but I didn''t really get what it was about."'
-				'"Apparently, they used to play at the library in Pavlovsk, but it seems like they have gotten braver and don''t think they need to hide themselves anymore. Which is really good, just because they''re doing something we don''t understand, doesn''t mean that they should be ashamed about it. Luckily, the days where the stupid jocks or girls like Stasya would try to act important by bullying others for doing things they don''t understand are over."'
+				'"Apparently, they used to play at the library in Pavlovsk, but it seems like they have gotten braver and don''t think they need to hide themselves anymore. Which is really good, just because they''re doing something we don''t understand, doesn''t mean that they should be ashamed about it. Luckily, the days, when the stupid jocks or girls like Stasya would try to act important by bullying others for doing things they don''t understand, are over."'
 				if nerd_game['stage'] > 0:
 					act 'Tell Katja that you play with them':
 						*clr & cla
 						katjaQW['know_dandd'] = 1
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/Coffe_hole2.jpg"></center>'
-						'"It''s ''Dungeons and Dragons is what the game''," you tell Katja, who looks at you a little surprised. "I''m part of their group, it''s a lot of fun," you says.'
+						'"It''s called ''Dungeons and Dragons'' the game we play" you tell Katja, who looks at you a little surprised. "I''m part of their group, it''s a lot of fun," you says.'
 						'"I didn''t know that. How does it work, Julia told me you are taking on roles like in a fantasy movie. Do you dress up? How is that even a game?" Katja asks, and you spend time trying to explain how the game works.' 
 						act 'Continue to drink your coffee': gt 'katja_chat', 'coffee_hole_hangout'
 					end

+ 4 - 2
locations/katja_nightclub_sex.qsrc

@@ -1352,7 +1352,7 @@ if $ARGS[0] = 'private_booth_FFFF':
 		gs 'arousal', 'foreplay_give', 2, 'group', 'lesbian'
 		gs 'arousal', 'kiss', -2, 'group', 'lesbian'
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/two_girls_private2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/two_girls_private2.png"></center>'
 		'You walk over to Katja and <<$npc_nickname[$boy2]>> as <<$npc_nickname[$boy1]>> gets down on her knees and removes Katja''s head from <<$npc_nickname[$boy2]>>''s breast and starts to kiss her.'
 		'You follow and bend down to make out with <<$npc_nickname[$boy2]>> and fondle her breast.'
 		act 'Get into it':
@@ -1517,7 +1517,7 @@ if $ARGS[0] = 'private_booth_FFFF_you':
 						*clr & cla		
 						katjaQw['horny'] += rand(5,15)
 						gs 'boystat', 'D5', 'd'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/two_girls_private10.jpg"></center>'	
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/two_girls_private10.png"></center>'	
 						'<<$npc_nickname[$boy2]>> moves away, but Katja quickly moves in and starts kissing you. You hear <<$npc_nickname[$boy2]>> say "Here it is," before you feel something hard getting stuffed into your pussy. "It''s better if you do this yourself <<$pcs_nickname>>," <<$npc_nickname[$boy1]>> says and you feel your right hand being moved to grasp what you imagine is a dildo in your pussy.'
 						'It takes a few tries to get into the rhythm of using the dildo, but you soon feel the nice sensation of having the dildos in your pussy and ass moving in and out of you, alternating which is deepest.'
 						*nl
@@ -1574,6 +1574,7 @@ if $ARGS[0] = 'private_booth_FFFF_girls':
 	'<<$npc_nickname[$boy2]>> is clearly very excited and it don''t take you long to get her off. She cums with a huge yell, which makes you wonder if they can hear her on the dance floor.'
 	'After <<$npc_nickname[$boy2]>> get her breath back, she get up. "Okay whore, now it''s your turn so get down on all fours," she says to <<$npc_nickname[$boy1]>>.'
 	act 'See what happens':
+		*clr & cla
 		katjaQw['horny'] += rand(0,5)
 		gs 'arousal', 'vaginal_dildo_give', 4, 'group', 'lesbian'
 		gs 'stat'
@@ -1585,6 +1586,7 @@ if $ARGS[0] = 'private_booth_FFFF_girls':
 		'You use the dildo on <<$npc_nickname[$boy1]>> while <<$npc_nickname[$boy2]>> keeps her foot on her head, saying one humiliating thing after the other about her or her body.'
 		'<<$npc_nickname[$boy1]>> soon cums with a powerful, squirting orgasm.'
 		act 'After sex':
+			*clr & cla
 			gs 'arousal', 'kiss', 2, 'group', 'lesbian'
 			gs 'arousal', 'clit_finger_give', -1, 'group', 'lesbian'
 			minut += 4

+ 1 - 1
locations/spell.qsrc

@@ -15,7 +15,7 @@
 !	 ARGS[3] = Target party member number
 !	 ARGS[4] = Caster party member number
 
-SuccessValue = max(val($ARGS[1]), ARGS[1])
+SuccessValue = iif(isnum($ARGS[1]),val($ARGS[1]),ARGS[1])
 $SplTxtColGood = 'green'
 $SplTxtColBad = 'red'