Browse Source

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

silentdark 5 years ago
parent
commit
dc00b82e4c

+ 0 - 48
README.md

@@ -1,48 +0,0 @@
-# Girl Life (ЭТО) [English Community Version] - github edition
-
-## Formatting comments when posting commits
-Please use one of the following terms:
-* fixed
-* changed
-* added
-* removed
-* text edit
-Added and removed are for files being added or removed, fixed is for bug/code fixes, changed is for when events are changed and text edit is for changes to the text that'll appear on screen.
-These are for searching to aid those working on the files.
-Can you also include filenames (unless its a large number of files) and include any description you feel will help.
-If adding content that is disabled (due to being WIP) can you comment in the file that its disabled and include your name so that it doesn't get activated in error.
-
-## Quick start (for Unixy machines)
-* clone/fork the repo
-* make edits to the files in `locations`
-* run `./txtmerge.py locations glife.txt`
-* run `wine txt2gam.exe glife.txt glife.qsp`
-* test that it works
-* commit your changes
-* push and/or send a pull request
-
-## Quick start (for Windows machines)
-* Double click the MakeQSP.bat
-* Enjoy :)
-
-## What exactly is all this?
-In an effort to make editing the text of Girl Life easier, I set up this repo. This is based on the english community version. There are two branches: `master` and `releases`. On the `master` branch I will keep my version of the game as I make edits, merge pull requests, etc. while the `releases` is where you'd get things that you expect to actually work.
-
-## Where are the images?
-Not here. Shouldn't you know this already?
-
-## What is `glife.txt`?
-It turns out that `glife.qsp` is not the friendliest format for this game, but if you use `qgen` you can export the game in what they call `TXT2GAM` format. This is how `glife.txt` is obtained. Note that this is a large text file encoded in UTF-16, so git still has some trouble with it.
-
-## What are the python scripts?
-Since `glife.txt` is large and in UTF-16, I wrote two scripts, one that splits this file into one file per location, and puts them in `locations` after turning them to UTF-8, another that takes the UTF-8 files from `locations` and generates a UTF-16 file in `TXT2GAM` format.
-
-## I modified something in `locations`, ran the `txtmerge.py` script, now what?
-Assuming you ran something like
-    ./txtmerge.py locations glife.txt
-you now need to turn `glife.txt` into a `qsp` file. On my system, I use `wine` to run `txt2gam.exe`, works quite well:
-    wine txt2gam.exe glife.txt glife.qsp
-
-## Where do I get `qgen` and `txt2gam.exe`?
-* [qgen](http://qsp.su/index.php?option=com_content&task=view&id=46&Itemid=56)
-* [txt2gam](http://qsp.su/index.php?option=com_content&task=view&id=52&Itemid=56)

+ 1 - 0
glife.qproj

@@ -182,6 +182,7 @@
 		<Location name="npcpreservec"/>
 		<Location name="npcrnamefile"/>
 		<Location name="npcbreeder"/>
+		<Location name="npcstaticdefaults"/>
 		<Location name="npcstatic1"/>
 		<Location name="npcstatic2"/>
 		<Location name="npcstatic3"/>

+ 12 - 21
locations/brosh.qsrc

@@ -27,12 +27,11 @@ if evgentipe = 0:
 
 			act 'Suck':
 				cls
-				spafinloc = 12
-				gs 'cum_manage'
+				gs 'cum_call', 'mouth', 'Zhendos', 1
 				swallow += 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum50.jpg"></center>'
-				'Zhendos did not last long and fills you mouth with sperm, you quickly swallow it down.'
+				'Zhendos doesn''t last long and fills you mouth with sperm, you quickly swallow it down.'
 
 				gs 'arousal', 'bj', 10, 'sub'
 				gs 'arousal', 'end'
@@ -45,7 +44,7 @@ if evgentipe = 0:
 
 	exit
 elseif evgentipe = 1:
-	'During the break you are greeted by Mishan, a friend of your brother "<<$pcs_nickname>>! Let''s meet up school, I have sweetie for you."'
+	'During the break you are greeted by Mishan, a friend of your brother "<<$pcs_nickname>>! Let''s meet up after school, I have a treat for you."'
 
 	act 'After school "meeting"':
 		cls
@@ -65,12 +64,11 @@ elseif evgentipe = 1:
 
 			act 'Suck':
 				cls
-				spafinloc = 12
-				gs 'cum_manage'
+				gs 'cum_call', 'mouth', 'Mishan', 1
 				swallow += 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/sex/bscum'+rand(1,2)+'.jpg"></center>'
-				'Mishan did not last long and fills you mouth with sperm, you quickly swallow it down.'
+				'Mishan doesn''t last long and fills you mouth with sperm, you quickly swallow it down.'
 
 				gs 'arousal', 'bj', 10, 'sub'
 				gs 'arousal', 'end'
@@ -103,13 +101,12 @@ elseif evgentipe = 2:
 
 			act 'Suck':
 				cls
-				spafinloc = 12
-				gs 'cum_manage'
+				gs 'cum_call', 'mouth', 'Kolka', 1
 				swallow += 1
 				gs 'stat'
 
 				'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum43.jpg"></center>'
-				'Kolka did not last long and fills you mouth with sperm, you make a show of swallowing it.'
+				'Kolka doesn''t last long and fills you mouth with sperm, you make a show of swallowing it.'
 
 				gs 'arousal', 'bj', 10, 'sub', 'incest'
 				gs 'arousal', 'end'
@@ -119,7 +116,7 @@ elseif evgentipe = 2:
 			end
 		end
 		if brotherSex > 6:
-			act 'Bend':
+			act 'Bend over':
 				cls
 				pose = 1
 				brosh_rand1 = rand(0,100)
@@ -156,19 +153,13 @@ elseif evgentipe = 3:
 
 		act 'Suck Guys':
 			cls
-			gs 'boyStat', 'A58'
-			spafinloc = 12
-			sexpartkno = 1
-			gs 'cum_manage'
-			gs 'boyStat', 'A59'
-			spafinloc = 12
-			sexpartkno = 1
-			gs 'cum_manage'
-			swallow += 1
+			gs 'cum_call', 'mouth', 'Zhendos', 1
+			gs 'cum_call', 'mouth', 'Mishan', 1
+			swallow += 2
 			gs'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/sex/bs2.jpg"></center>'
-			'You crouch down in front of the guys as they pull out their cocks, you take turns stroking and suck each of them. The guys don''t last long and take turns finishing in your mouth, you swallow their seed hungrily.'
+			'You crouch down in front of the guys as they pull out their cocks, you take turns stroking and sucking each of them. The guys don''t last long and take turns finishing in your mouth, you swallow their seed hungrily.'
 
 			gs 'arousal', 'bj', 10, 'sub', 'group'
 			gs 'arousal', 'end'

+ 6 - 6
locations/club.qsrc

@@ -254,7 +254,7 @@ if $ARGS[0] = 'dance':
 	gs 'stat'
 	'<center><b><font color="maroon">The dance floor</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club9.jpg"></center>'
-	'The club is filled to the brink with people. Most of which are dancing on the dancefloor.'
+	'The club is filled to the brink with people. Most of whom are on the dance floor having a great time.'
 	
 	act 'Leave the dance floor':gt 'club', 'inside'
 	
@@ -272,7 +272,7 @@ if $ARGS[0] = 'dance':
 			pcs_willpwr += 10
 			clrand = rand(0, 400)
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club4.jpg"></center>'
-			'On the dance floor very closely, you can put a hand on his shoulder one guy to make a couple of steps and pressed her chest already to another, and in the dance, how much one can do in dance.'
+			'The dance floor is packed and everyone is dancing very closely, you could put your hand on the shoulder of the guy in front of you but you when you turn around your chest is right up against another. You don''t let it bother you as everyone is forced to dance this close.'
 
 			if pcs_apprnc >= clrand:
 				pcs_horny += 1
@@ -284,7 +284,7 @@ if $ARGS[0] = 'dance':
 				act 'Dance with him':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club8.jpg"></center>'
-					'You continue to dance with the guy on the dancefloor, but he doesn''t stop touching your. It somehow gets you excited, when a random guy is touching you in public.'
+					'You continue to dance with the guy on the dance floor, but he doesn''t stop touching your butt. It gets you quite excited having a random guy feeling you up in public.'
 
 					gs 'arousal', 'foreplay', 30, 'sub'
 					gs 'stat'
@@ -299,7 +299,7 @@ if $ARGS[0] = 'dance':
 						dansexclub = rand(0, 1)
 
 						if dansexclub = 1:
-							'You''re passionately kissing the guy, while he''s continously groping you, always dedicating one of his hands to either your tits or your ass. "Why don''t we go to the VIP-Area. There we''ll have a bit more privacy.", he says inbetween kisses.'
+							'You''re passionately kissing the guy, while he''s continuously groping you, always dedicating one of his hands to either your tits or your ass. "Why don''t we go to the VIP-Area. There we''ll have a bit more privacy.", he says inbetween kisses.'
 
 							gs 'arousal', 'kiss', 15, 'sub'
 							gs 'stat'
@@ -308,7 +308,7 @@ if $ARGS[0] = 'dance':
 							if pcs_horny < 70: act 'Go to the dance floor':gt 'club', 'dance'
 							act 'Go to Vip-room with the guy':$sexloc = 'vipclub' & xgt 'sex', 'var'
 						elseif dansexclub = 0:
-							'You''re passionately kissing the guy, while he''s continously groping you, always dedicating one of his hands to either your tits or your ass. "Let''s go to the toilet.", he says with a smile.'
+							'You''re passionately kissing the guy, while he''s continuously groping you, always dedicating one of his hands to either your tits or your ass. "Let''s go to the toilet.", he says with a smile.'
 
 							gs 'arousal', 'kiss', 15, 'sub'
 							gs 'stat'
@@ -322,7 +322,7 @@ if $ARGS[0] = 'dance':
 				if clrand > 85:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/dancelezb.jpg"></center>'
-					'While you''re dancing you a hand groping your ass. You turn around to see who touched your, but you''re surprised to see women smiling at you, she seems to be biting her lips.'
+					'While you''re dancing you a hand groping your ass. You turn around to see who touched your butt, but you''re surprised to see a woman smiling at you, she is seductively biting her lip.'
 					dansexclub = rand(0, 1)
 
 					act 'Stop dancing':gt 'club', 'inside'

+ 0 - 1
locations/gadforest.qsrc

@@ -205,7 +205,6 @@ if $ARGS[0] = '1':
 			menu_off = 1
 			minut += 60
 			pcs_mood += 20
-			pcs_willpwr += willpowermax/5
 			if $clothingworntype = 'nude':
 				pcs_health += healthmax/5 & pcs_horny += 5
 				inhib_exp += rand(1,5)

+ 189 - 55
locations/hunter_favors.qsrc

@@ -414,14 +414,14 @@ end
 
 if $ARGS[0] = 'yard_bondage':
 	if $ARGS[1] = '':
-		yard_bound_temprand = rand(1,10)
+		yard_bound_temprand = rand(1,9)
 
 		if hour >= 22 or hour < 5:
 			gs 'arousal', 'end'
 
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/released_from_bondage.jpg"></center>'
-			'Finally with the hour getting so late Igor comes to free you from your bounds. You are so drained you almost stumble down as you feel blood rushing back to your hands.'
+			'Finally with the hour getting so late, Igor comes to free you from your bounds. You are so drained you almost stumble down as you feel blood rushing back to your hands.'
 			'Even though you are glad to be able to move around again, part of you aches to be tied back and used as a naked and ready sex toy'
 
 			act 'Further': gt 'swamp_yard'
@@ -431,14 +431,15 @@ if $ARGS[0] = 'yard_bondage':
 
 		hunter_sexual_comfort  += 1
 
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bound_outdoors_4.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bound_outdoors4.jpg"></center>'
 		'You are bound completely naked to some trees by the yard. Just the thought of being so helpless and exposed makes you feel butterflies in your stomach'
-	    'Anyone could do anything they wanted with your body right now. Maybe shove their dick in your available ass or pussy and have their way, or fuck your mouth as if you are a blow-up doll...'
+	    'Anyone could do anything they wanted with your body right now. You are especially aware of the nakedness of your most intimate areas, and how they are available for the hunters to do anything they might want.'
 
-		gs 'arousal', 'flash', 2, 'bound', 'exhibitionism', 'sub'
+		gs 'arousal', 'flash', 5, 'bound', 'exhibitionism', 'sub'
 		gs 'arousal', 'end'
 
-		minut += 3
+		minut += 5
+		gs 'stat'
 
 		hunter_selector_temprand = rand(1,3)
 		if hunter_selector_temprand = 1:
@@ -450,22 +451,20 @@ if $ARGS[0] = 'yard_bondage':
 		end	
 
 		if yard_bound_temprand = 4:
-			act 'Further': gs 'hunter_favors', 'yard_bondage', 'passing_bj'
+			act 'Further': gt 'hunter_favors', 'yard_bondage', 'passing_bj'
 		elseif yard_bound_temprand = 5:
-			act 'Further': gs 'hunter_favors', 'yard_bondage', 'passing_fuck'
+			act 'Further': gt 'hunter_favors', 'yard_bondage', 'passing_fuck'
 		elseif yard_bound_temprand = 6:
-			act 'Further': gs 'hunter_favors', 'yard_bondage', 'clamp_fuck'
-		elseif yard_bound_temprand = 7:
-			act 'Further': gs 'hunter_favors', 'yard_bondage', 'quick_fuck'
+			act 'Further': gt 'hunter_favors', 'yard_bondage', 'clamp_fuck'
 		elseif yard_bound_temprand = 8:
-			act 'Further': gs 'hunter_favors', 'yard_bondage', 'unbound_fuck'
-		elseif yard_bound_temprand = 9:
-			act 'Further': gs 'hunter_favors', 'yard_bondage', 'unbound_gangbang'
-		elseif yard_bound_temprand = 10:
-			act 'Further': gs 'hunter_favors', 'yard_bondage', 'bound_gangbang'						
+			act 'Further': gt 'hunter_favors', 'yard_bondage', 'unbound_fuck'
+		!elseif yard_bound_temprand = 9:
+			!act 'Further': gs 'hunter_favors', 'yard_bondage', 'unbound_gangbang'
+		!elseif yard_bound_temprand = 10:
+			!act 'Further': gs 'hunter_favors', 'yard_bondage', 'bound_gangbang'	
+		else
+			act 'Wait': gt 'hunter_favors', 'yard_bondage'						
 		end	
-
-		act 'Wait': gt 'hunter_favors', 'yard_bondage'
 	end
 
 	if $ARGS[1] = 'lost_bet':
@@ -478,21 +477,21 @@ if $ARGS[0] = 'yard_bondage':
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bound_outdoors2.jpg"></center>'
 		'You let Andrei bind you right by the yard. After he is done, he leaves you hanging there to take care of something'
-		'You are completely helpless and feel your pussy starten to moisten as you feel the breeze on your bare skin.'
+		'You are completely helpless and feel your nipples start to harden as you feel the breeze on your bare skin.'
 
 		act 'Wait for him to come back': gt 'hunter_favors', 'yard_bondage'
 	end	
 	
 	!TODO: Add variety per hunter as opposed to the same event for all
 	if $ARGS[1] = 'passing_bj':
-
+		cla & *clr 
 		hunter_sexual_comfort += 6
 		hunter_collective_opinion -= 3
 		gs 'arousal', 'bj', 10, 'sub', 'bound', 'deepthroat'
 		gs 'arousal', 'end'
 			
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bound_fucked_mouth1.jpg"></center>'
-		'You notice <<$boy>> walking towards you. Without saying a word, he slackens your ties and pushes you down to your knees before tightening them back.'
+		'You notice <<$boydesc>> walking towards you. Without saying a word, he slackens your ties and pushes you down to your knees before tightening them back.'
 		'He does not waste too much time unzipping his cock and pushing it on your face. You comply and start sucking his dick.'
 		'After a minute grabs your head and starts fucking your mouth. You struggle between trying to breathe and trying not to puke as his cock rams in and out of your throat'
 			
@@ -546,12 +545,13 @@ if $ARGS[0] = 'yard_bondage':
 	end	
 	
 	if $ARGS[1] = 'passing_fuck':
+		cla & *clr
 		hunter_sexual_comfort += 10
 		hunter_collective_opinion -= 5
 			
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bound_fucked2.jpg"></center>'
-		'You notice <<$boy>> walking towards you. Without saying a word, he unzips and bends you over.'
-		'He rubs the tip of his dick against your already wet pussy lips a few times before pushing all the way in. You cannot help but gasp as <<$boy>>''s cock fills your pussy'
+		'You notice <<$boydesc>> walking towards you. Without saying a word, he unzips and bends you over.'
+		'He rubs the tip of his dick against your already wet pussy lips a few times before pushing all the way in. You cannot help but gasp as <<$boydesc>>''s cock fills your pussy'
 		'After letting you settle in to the sensation for a second he slowly starts pumping your pussy. In a minute you are screaming and moaning as he picks his pace up.'
 			
 		gs 'dinsex', 'vaginal_sex', 10, 'sub', 'bound'
@@ -570,12 +570,12 @@ if $ARGS[0] = 'yard_bondage':
 			gs 'stat'
 
 			'<center><video autoplay loop src="images/locations/gadukino/sex/hunter/bound_fucked.mp4"></video></center>'
-			'You cannot get enough of the sensation of <<$boy>>''s cock sliding inside you. You start pumping your hips to get more of his cock.'
+			'You cannot get enough of the sensation of <<$boydesc>>''s cock sliding inside you. You start pumping your hips to get more of his cock.'
 			
 			*nl
-			'<<$boy>> starts fucking you even harder before he buries his cock all the way to the hilt inside you.'
+			'<<$boydesc>> starts fucking you even harder before he buries his cock all the way to the hilt inside you.'
 			gs 'dinsex', 'sexcum'
-			'After catching his breath, <<$boy>> gives your ass a fondle before walking away, leaving you hanging.'
+			'After catching his breath, <<$boydesc>> gives your ass a fondle before walking away, leaving you hanging.'
 
 			act 'Further': gt 'hunter_favors', 'yard_bondage'
 		end
@@ -593,65 +593,199 @@ if $ARGS[0] = 'yard_bondage':
 				gs 'stat'
 
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bound_fucked1.jpg"></center>'
-				'You are pretty much overwhelmed by <<$boy>> pumping your pussy while you are bound helpless and naked like this.'
-				'You decide to give in to the sensations and enjoy being fucked like an absolute whore.'
+				'You are pretty much overwhelmed by <<$boydesc>> pumping your pussy while you are bound helpless and naked like this.'
+				'You decide to give in and enjoy the sensation of being casually fucked like a blow-up doll.'
+				*nl
 				'He roughly grabs your ass to brace himself as he picks his pace even further, pounding your pussy with near fury.'
 				'Sounds of his hips rhythmically slamming against your ass fills your surrondings, mixed with the lewd smacking sounds of his cock pumping in your pussy and your loud moans and screams' 
 
 				*nl
 				'Just as you start feeling his cock throbbing in your pussy, he pulls out and blows his load all over your ass and pussy.'
-				'Without saying anything, <<$boy>> zips up and walks away, leaving you with cum running down your legs.'
+				'Without saying anything, <<$boydesc>> zips up and walks away, leaving you with cum running down your legs.'
 
 				act 'Further': gt 'hunter_favors', 'yard_bondage'
 		end
 	end	
 	
 	if $ARGS[1] = 'clamp_fuck':
+		cla & *clr
+		hunter_sexual_comfort += 15
+		hunter_collective_opinion -= 10
 		gs 'boyStat', 'A172'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bondage_clamps1.jpg"></center>'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bound_clamps_fuck.jpg"></center>'
+		gs 'pain', 6, 'pinch', 'nipples'
+		gs 'pain', 3, 'pinch', 'breasts'
 
-	end	
+		gs 'arousal', 'breasts', 5, 'rough', 'masochism', 'sub'
+		gs 'arousal', 'end'
+		gs 'stat'
 
-	if $ARGS[1] = 'quick_fuck':
-		gs 'boyStat', 'A174'
-		'<center><video autoplay loop src="images/locations/gadukino/sex/hunter/bound_fucked.mp4"></video></center>'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bondage_clamps3.jpg"></center>'
+		'You are so proccupied with thinking how you are tied up to some tree completely naked and exposed, you do not hear Andrei approaching from behind.'
+		'Not missing the opportunity, he yanks you by the nipple, making you yelp loudly.'
+		'"Hey now, don''t fall asleep just yet. I have something special for you." he says before showing you a piece of leather strap and a clamp with a weight attached.'
+		'"Hope you are into a bit of fun. Or, at least we will find out." he says. You do not object, having already agreed to ''anything'''
+		
+		act 'Further':
+			cla & *clr
+			gs 'pain', 3, 'spank', 'nipples'
+			gs 'arousal', 'breasts', 5, 'rough', 'masochism', 'sub'
+			gs 'arousal', 'end'
 
-	end	
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bondage_clamps2.jpg"></center>'
+			'Andrei does not lose time starting to pay some special attention to your nipples.'
+			'The leather strip really stings and you cannot help but yelp with each hit. But you somehow actually enjoy the sensation.'
 
-	if $ARGS[1] = 'unbound_fuck':
-		gs 'boyStat', 'A173'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/unbound_fuck2.jpg"></center>'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/unbound_fuck1.jpg"></center>'
+			act 'Further':
+				cla & *clr
+				gs 'pain', 10, 'pinch', 'nipples'
+				gs 'arousal', 'breasts', 10, 'rough', 'masochism', 'sub'
+				minut -= 5
+				gs 'arousal', 'end'
 
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bondage_clamps1.jpg"></center>'
+				'Satisfied with the ''warm-up'', Andrei picks up the clamps and attaches them to your nipples'
+				'The mix of pain and pleasure from the clamps biting on your nipples is almost unbearable.'
+				'It really hurts and you want to shake them off, but yet you feel your pussy throbbing and getting wet the more you think about the pain.'
+				*nl
+				'"Please, I can''t take it anymore!" you plead.'
+				'"''Please'' what, little princess?" Andrei asks'
+				
+				act 'Seriousy, please let me go!':
+					cla & *clr
+					hunter_collective_opinion += 10
+					hunter_sexual_comfort -= 15
+
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/released_from_bondage.jpg"></center>'
+					'"Well, alright, you are no fun" says Andrei before releasing you from your bonds.'
+					'You rub your sore breasts for a few seconds before shooing away Andrei staring at you giving him a last show.'
+					act 'Further': gt 'swamp_yard'
+				end
+				act 'Please fuck me!':
+					cla & *clr
+					hunter_collective_opinion -= 5
+					hunter_sexual_comfort += 25
+
+					gs 'dinsex', 'vaginal_sex', 10, 'sub', 'bound', 'masochism', 'humiliation'
+					gs 'arousal', 'vaginal', 5, 'sub', 'bound', 'masochism', 'humiliation'
+				
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bound_clamps_fuck.jpg"></center>'
+					'"You really like this don''t you now." says Andrei before roughly penetrating you.'
+					'You let out a loud moan from the relief of finally having your aching pussy filled. It does not take Andrei long to cum with you pumping your hips and doing most of the fucking,'
+					
+					gs 'arousal', 'end'
+					spafinloc = 0
+					pose = 3
+					gs 'cum_manage'
+					gs 'stat'
 
+					gs 'dinsex', 'sexcum'
+					
+					*nl
+					'After catching his breath, Andrei releases you from your bonds. "We should do this again" he says, before walking away.'
+					act 'Further': gt 'swamp_yard'
+				end
+			end		
+		end	
 	end	
 
-	if $ARGS[1] = 'unbound_gangbang':
-	end
+	if $ARGS[1] = 'unbound_fuck':
+		cla & *clr
+		hunter_sexual_comfort += 15
+		hunter_collective_opinion += 15
 
-	if $ARGS[1] = 'bound_gangbang':
-	end
+		gs 'boyStat', 'A173'
 
-		
-		gs 'arousal', 'bj', 20, 'sub', 'rough', 'group'
-		gs 'arousal', 'vaginal', 20, 'sub', 'rough', 'group'
+		gs 'arousal', 'foreplay', 5, 'sub', 'exhibitionism'
+		gs 'arousal', 'kiss', 5, 'sub', 'exhibitionism'
 		gs 'arousal', 'end'
 		gs 'stat'
-			
-		gs 'dinsex','vaginal_sex',10,'sub'
 
-		gs 'arousal', 'bj', 240, 'sub', 'gangbang', 'humiliation'
-		gs 'arousal', 'hj', 240, 'sub', 'gangbang', 'humiliation'
-		gs 'arousal', 'vaginal', 240, 'sub', 'gangbang', 'humiliation'
-		gs 'arousal', 'anal', 240, 'sub', 'gangbang', 'humiliation' 
-		minut -= 720
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/unbound_fucked2.jpg"></center>'
+		'You do not notice Igor approaching you from behind before he starts stroking your body as he rubs his cock over your pussy lips.'
+		'"You are driving me crazy, <<$pcs_nickname>>" he says. "I cannot help it any longer, I need to have you."'
+		'You turn your head to give him a kiss as he undoes the last of the ropes'
+
+		act 'Further':
+			cla & *clr
+			gs 'arousal', 'vaginal', 5, 'sub', 'exhibitionism'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/unbound_fucked1.jpg"></center>'
+			'Igor settles on the ground and you settle on his crotch, mounting him.'
+			'You start bouncing up and down, gasping from the feeling of his cock pumping inside you'
+			gs 'dinsex', 'vaginal_sex', 10, 'sub', 'exhibitonism'
+
+			act 'Further':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/unbound_fucked1.jpg"></center>'
+				'After some minutes, Igor pushes you on your hands and starts fucking you from behind.'
+				'He really picks up the pace as you start moaning and screaming like a wanton whore, getting fucked like that right out in the open.'
+
+				gs 'dinsex', 'vaginal_sex', 10, 'sub', 'exhibitonism', 'rough', 'humiliation'
+				spafinloc = 4
+				gs 'cum_manage'
+				spafinloc = 8
+				gs 'cum_manage'
+				gs 'stat'
 
+				*nl 'After a few more minutes of railing your pussy, you feel Ifor pulling out and cumming all over your ass and back'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/unbound_fuck1.jpg"></center>'
+
+				act 'Further':
+					cla & *clr
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/unbound_nude.jpg"></center>'
+					'After a couple of seconds catching your breath, you both get up. Before you walk away, Igor asks:'
+					'"Sveta, can I ask you for a favor? All of us have rather gotten used to seeing you in the nude."'
+					'"So," he says "Can you just walk around like that all the time?"'
+					'"You mean, never wear clothes around and stay naked the whole time?" you ask, surprised'
+					'"Yes, at least while it is only us around." he says. "So what do you say?"'
+
+					act 'Agree':
+						cla
+						*nl
+						hunter_collective_opinion += 20
+						hunter_sexual_comfort += 10
+						forced_naked_day = 999999999999999
+						gs 'stat'
+
+						'"Well," you respond. "At this point we are well past the point of being shy about a bit of nudity. So sure, why not?" you reply.'
+						'"Thanks <<$pcs_nickname>>" he says, before walking away'
+						act 'Further': gt 'swamp_yard'
+					end
+					act 'Refuse':
+						cla
+						*nl
+						hunter_collective_opinion -= 5
+						hunter_sexual_comfort += 15
+						gs 'stat'
+
+						'"Well," you respond. "Do I look like some sex toy to you?" you reply. "What is next, you just randomly fuck me whenever?"'
+						'"You are not exactly all pure and innocent, <<$pcs_nickname>>" he says. "I think you are just being a bitchy cocktease" and walks away'
+						act 'Further': gt 'swamp_yard'
+					end
+				end			
+			end
+		end
 	end
-end	
 
+	!if $ARGS[1] = 'unbound_gangbang':
+	!end
 
+	!if $ARGS[1] = 'bound_gangbang':
+	!end
 
+		
+		!gs 'arousal', 'bj', 20, 'sub', 'rough', 'group'
+		!gs 'arousal', 'vaginal', 20, 'sub', 'rough', 'group'
+		!gs 'arousal', 'end'
+		!gs 'stat'
+			
+		!gs 'dinsex','vaginal_sex',10,'sub'
 
+		!gs 'arousal', 'bj', 240, 'sub', 'gangbang', 'humiliation'
+		!gs 'arousal', 'hj', 240, 'sub', 'gangbang', 'humiliation'
+		!gs 'arousal', 'vaginal', 240, 'sub', 'gangbang', 'humiliation'
+		!gs 'arousal', 'anal', 240, 'sub', 'gangbang', 'humiliation' 
+		!minut -= 720
+end	
 
 --- hunter_favors ---------------------------------

+ 11 - 4
locations/hunter_interactions.qsrc

@@ -510,6 +510,13 @@ if $ARGS[0] = 'shooting_bet':
     end
 
     if $ARGS[1] = 'win':
+        cla & *clr
+        !TODO: Make this part have mroe stuff
+        '"Hah!" you exclaim. "I win!", before looking back.'
+        'Andrei is nowhere to be seen. That bastard ran away!'
+        
+        hunter_collective_opinion += 15
+        act 'Further': gt 'swamp_woods'
     end    
 
     if $ARGS[1] = 'lose':
@@ -561,12 +568,12 @@ if $ARGS[0] = 'shooting_bet':
                 act 'Refuse':
                     cla 
 
-                    hunter_collective_opinion -= 10
+                    hunter_collective_opinion += 5
                     hunter_sexual_comfort -= 15
 
                     '"I am not sure..." you respond. "I would be prancing around completely naked for three men I barely know, that''s just too much"'
-                    '"Three men you barely know? <<$pcs_nickname>>, I thought we were your friends. It is nothing more than just being silly together" he responds.'
-                    '"Besides, it is not fair to just back down from a bet liek that." he adds.'
+                    '"Three men you barely know? <<$pcs_nickname>>, I thought we were your friends. It is nothing more than just having some silly fun together" he responds.'
+                    '"Besides, it is not fair to just back down from a bet like that." he adds.'
                     '"Sorry, but I will not just prance around naked for your viewing pleasure." you firmly respond.'
                     act 'Walk away': gt 'swamp_woods'
                 end
@@ -795,7 +802,7 @@ if $ARGS[0] = 'naked_encounter':
 					'"What in the hell are you doing you dumb girl, put something on" says Sergei'
 					'"Leave her Sergei, she is not useful for anything else anyway. Might as well be eye candy and easy acccess for a quick fuck." says Andrei'
 					'"In fact, let me demonstrate" he says before looking at you, grinning wolfishly"'
-					gs 'hunter_interactions', 'andrei_quick_fuck'
+					gt 'hunter_interactions', 'andrei_quick_fuck'
 				end
 			end
 		end	

File diff suppressed because it is too large
+ 48 - 718
locations/npcstatic1.qsrc


File diff suppressed because it is too large
+ 12 - 839
locations/npcstatic2.qsrc


File diff suppressed because it is too large
+ 12 - 844
locations/npcstatic3.qsrc


File diff suppressed because it is too large
+ 11 - 748
locations/npcstatic4.qsrc


File diff suppressed because it is too large
+ 21 - 606
locations/npcstatic5.qsrc


+ 25 - 0
locations/npcstaticdefaults.qsrc

@@ -0,0 +1,25 @@
+# npcstaticdefaults
+
+if $ARGS[0] = 'defaults':
+	npc_run['A<<npctemp>>'] = rand(1,10)
+	npc_vball['A<<npctemp>>'] = rand(1,10)
+	npc_shoot['A<<npctemp>>'] = rand(1,10)
+	npc_sewing['A<<npctemp>>'] = rand(1,10)
+	npc_serving['A<<npctemp>>'] = rand(1,10)
+	npc_chess['A<<npctemp>>'] = rand(1,10)
+	npc_dance['A<<npctemp>>'] = rand(1,10)
+	npc_danceero['A<<npctemp>>'] = rand(1,10)
+	npc_jab['A<<npctemp>>'] = rand(1,10)
+	npc_punch['A<<npctemp>>'] = rand(1,10)
+	npc_kick['A<<npctemp>>'] = rand(1,10)
+	npc_def['A<<npctemp>>'] = rand(1,10)
+	npc_vokal['A<<npctemp>>'] = rand(1,10)
+	npc_teach['A<<npctemp>>'] = rand(1,10)
+	$npc_dad['A<<npctemp>>'] = 'U'
+	$npc_mom['A<<npctemp>>'] = 'U'
+	$npc_pic['A<<npctemp>>'] = 'xPICx'
+	$npc_PersType['A<<npctemp>>'] = 'XXXX'
+end
+
+--- npcstaticdefaults ---------------------------------
+

+ 1 - 1
locations/stat_display.qsrc

@@ -1283,7 +1283,7 @@ if hour < 17 and week < 5 and workSec >= 1 or hour < 17 and week < 5 and workSec
 if hour < 17 and week < 5 and PersSecWork = 1:$stat_msg += '<BR><b><font color="red">Today you have a shift as a secretary at Diner Bystroeshka from 9:00 to 17:00</font></b>'
 if hour < 20 and week => 1 and week <= 5 and age < 18 and workFabrika = 1:$stat_msg += '<BR><b><font color = red>Today you have work in the garment factory in Pavlovsk. Shift starts at 16:00.</font></b>'
 if hour < 16 and week => 1 and week <= 5 and age >= 18 and workFabrika = 1:$stat_msg += '<BR><b><font color = red>Today you have work in the garment factory in Pavlovsk. Shift starts at 8:00.</font></b>'
-if hour < 16 and week > 1 and week <= 5 and workhosp = 1:$stat_msg += '<BR><b><font color="red">You work as a nurse in the Pavlovsk clinic. Your shift starts at 8:00.</font></b>'
+if hour < 16 and week > 1 and week <= 5 and workhosp = 1:$stat_msg += '<BR><b><font color="red">You work as a nurse in the city residential area clinic. Your shift starts at 8:00.</font></b>'
 if hour < 10 and worksalon = 1 and (week = 1 or week = 3 or week = 5):$stat_msg += '<BR><b><font color = red>Today you have work as masseuse in beauty salon. Shift starts at 9:00.</font></b>'
 !if leonidVisit = 1 and hour < 21 and hour > 6: $stat_msg += '<br><b>You have to serve Leonid at 20:00 in his Pavlovsk office!</b>'
 

+ 1 - 1
locations/stwork.qsrc

@@ -15,7 +15,7 @@ if $ARGS[0] = 'start':
 	gs 'stat'
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">Dressing room for strippers</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/striprazd.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/backstage' + rand(1,7) + '.jpg"></center>'
 	''
 	'There are several <a href="exec:gt ''mirror'', ''start''">mirrors</a> hanging on the wall, where you can <a href="exec:gt ''mirror'', ''brush''">brush</a> your hair, and a selection of <a href="exec:gt ''wardrobe'', ''start''">clothes</a> hanging on rails for the girls to dress in.'
 	'There are some stairs leading to the <a href="exec:gt ''stwork'', ''stripgirl''">stage</a> where you can head out to perform.'

Some files were not shown because too many files changed in this diff