Revert "Fixes -- Syntax and logic issues."

This reverts commit 70d07c78657df699d0c20674ade32a44fd754afd.

locations/swamp_yard.qsrc

@@ -20,23 +20,23 @@ huntslutsexrand = rand(1,3)
 ! to remember were cowards or not
 !if lost_girl = 0:lost_girl += rand(40,60)
 if StoryLine = 1 and lost_girl = 0 and forest_lostday > 0: lost_girl=daystart+2
-dirty = 1
+if $ARGS[0] = 1: dirty = 1:
 
 swiss_army_random_number = rand(1,10)
 
+! What are these ???
+$npc_usedname['A172'] = 'Andrei'
+$npc_usedname['A173'] = 'Igor'
+$npc_usedname['A174'] = 'Sergei'
+
 !Code blocks for leaf events (events not calling other dynamic events)
 
 $yard_cleanup = {
 	cla
 	*clr
-
-	if dirty_swamp_yard < 10:
-		minut += 60 & pcs_sweat += 10
-	elseif dirty_swamp_yard < 20:
-		minut += 120 & pcs_sweat += 20
-	else 
-		minut += 180 & pcs_sweat += 30
-	end
+	if dirty_swamp_yard < 10:minut += 60 & pcs_sweat += 10
+	elseif dirty_swamp_yard < 20:minut += 120 & pcs_sweat += 20
+	else minut += 180 & pcs_sweat += 30
 
 	if huntersAndreiQw < 15:huntersAndreiQw += 1
 	if huntersIgorQw < 15:huntersIgorQw += 1
@@ -61,7 +61,8 @@ $swamp_escape = {
 				gt 'swamp'
 			else
 				gt 'gadforestswamp','2'
-			end		
+			end
+		
 		else
 			*clr & cla
 			gs 'stat'
@@ -83,6 +84,7 @@ $swamp_escape = {
 				end
 			end
 		end
+	
 	else
 		minut += 5
 
@@ -110,14 +112,10 @@ $rescued_from_swamp = {
 	
 	if $clothingworntype = 'nude':
 		if huntersKnow = 0:
-			if pcs_apprnc >= 100:
-			'"Are you... a mermaid?" You hear one of the men blurt out before blushing'
-			else 
-			'What the hell happened to you? Are you alright?'
-			end
-		end	
-		if huntersKnow = 1 and huntersKnowSlut = 0:'"<<$pcs_nickname>>, what happened to you? Where are your clothes?" Andrei said concernedly.'
-		if huntersKnow = 1 and huntersKnowSlut = 1:'Well isn''t this our favorite damsel in distress. And she''s even naked and ready for us so we can jump straight to the happy ending! Andrei grinned.'
+			if pcs_apprnc >= 100:'"Are you... a mermaid?" You hear one of the men blurt out before blushing'
+			else 'What the hell happened to you? Are you alright?'
+		if huntersKnow = 1 and huntersKnowSlut = 0:'"<<$pcs_nickname>>, what happened to you? Where are your clothes? Andrei said concernedly.'
+		if huntersKnow = 1 and huntersKnowSlut = 1:'- Well isn't this our favorite damsel in distress. And she''s even naked and ready for us so we can jump straight to the happy ending! Andrei grinned.'
 	end
 	
 	if huntersKnow = 0:
@@ -143,9 +141,8 @@ $meet_hunters_after_rescue = {
 	!huntersAndreiQw += 1
 	!huntersIgorQw += 1
 	!huntersSergeiQw += 1
-
-!!julzor: Why did you comment out the gs 'stat'? If you change something in the stat window like the time you should call gs 'stat' to update the stat window	
-	gs 'stat'
+	
+	!gs 'stat'
 
 	'You see the three men talking to each other. They stop and approach you after noticing you have calmed down.'
 	if $clothingworntype = 'nude':
@@ -169,7 +166,7 @@ $meet_hunters_after_rescue = {
 		
 	'"I''m Andrei," he replied, "and these are my friends, from the city, Igor and Sergei."'
 	'"Is your lastname possibly <<$pcs_lastname>>?" You look at him surprised for a moment before nodding.'
-	'"You look a lot like your mother that''s how I knew. I am also from Gadukino."'
+	'"You look a lot like your mother that's how I knew. I am also from Gadukino."'
 	
 	if pcs_sweat > 2 or dirty = 1:
 		'You become aware of the dirty clothes sticking on your body, making you uncomfortable.'
@@ -186,13 +183,12 @@ $meet_hunters_after_rescue = {
 
 !Assorted sex scenes for the yard
 $andrei_quick_fuck = {
-	cla & *clr
 	!TODO: bunch of images needed here
-	!if hunter_collective_opinion > 45:
-	if hunter_collective_opinion < 25:
-	!elseif hunter_collective_opinion > 25:
+	if hunter_collective_opinion > 45:
 
-	!else
+	elseif hunter_collective_opinion > 25:
+
+	else
 		'Andrei walks up to you without saying another word and forcefully pulls you closer by your nipples.'
 		gs 'pain', 10, 'pinch', 'nipples'
 		'You yelp but it is cut short when he shoves his tongue down your throat, roughly fondling you all over'
@@ -202,27 +198,17 @@ $andrei_quick_fuck = {
 			!TODO: Yes, images
 			'He definitely feels it too as he keeps shoving his fingers in and out. Satisfied, he turns you around by the shoulders and forcefully bends you over'
 			'You close your eyes anticipating what is coming. He wastes no time unzipping his pants and shoves his rock hard cock all the way in your ready pussy, eliciting a loud moan from you.'
-			'He starts fucking you rough and hard, not caring what you are getting out of it. You are merely a cocksleeve for him.'
+			'He starts fucking you rough and hard, not caring what you are getting out of it. You are merely a cocksleeve for him.
 			gs 'arousal', 'vaginal_finger', '15', 'sub'
 			gs 'arousal', 'vaginal', '30', 'sub', 'rough'
-!!julzor: I removed the gs 'end' (also it was missing the 'arousal' part)			
 			act '...':
 				cla & *clr
 				!TODO: Image here
-				'After a few minutes he grabs you by the shoulders and unceremoniously shoves you on the ground on your back.'
-				'You watch him furiously jerk standing over you. You realize you have been playing with yourself for some time when he starts shooting his load all over your tits and belly'
-				
+				'After a few minutes he graps you by the shoulders and unceremoniously shoves you on the ground on your back.'
+				'You watch him furiously jerk standing over you. You realize you have been playing ith yourself for some time when he starts shooting his load all over your tits and belly'
 				gs 'arousal', 'masturbate', 15
-!!julzor: added the gs 'arousal', 'end' here, because it should be after all other arousal calls
-				gs 'arousal', 'end'
-				gs 'cum_call', 'breasts', 'A172', 1
-!!julzor: the number 1 indicates that the boy is known ... a 2 makes no sense, changed it into a 1
-!!you can check the files arousal, cum_call and so on ... there should be always a explanation at the top
-				gs 'cum_call', 'stomach', 'A172', 1
-!!julzor: added missing gs 'stat'
-				gs 'stat'
-				
-				act 'Further': gt 'swamp_yard'
+				gs 'cum_call', 'breasts', 'Andrei', 1
+				gs 'cum_call', 'stomach', 'Andrei', 2
 			end 
 		end
 	end
@@ -232,60 +218,40 @@ $igor_demonstration = {
 	!TODO: Image here
 	'Seeing Igor staring at your naked body like a deer in the headlights gives you an idea.'
 	act 'Show him it is no big deal':
-		cla & *clr
 		hunter_sexual_comfort += 3
 		hunter_collective_opinion += 7
 							
-		!TODO: Gif here 
-!!julzor: we don''t use gifs, only mp4
+		!TODO: Gif here
 		'You smile at Igor as you start swaying slowly, getting into something resembling a rhythm'
 		'"The clothes just get in the way when I do this. Why not join me for a dance?" you say.'
 		'He starts awkwardly swaying to match you as you two get into it, with you acting like you are not dancing completely naked in front of the men.'
 		'As he starts getting into the rythm, the other men take notice and join in too. Sergei puts on some music as you all spend some time dancing like you are at a disco.'
 							
-		gs 'arousal', 'flash', 25, 'dom', 'exhibitionism'
-!!julzor: added missing gs 'stat' and arousal end
-		gs 'arousal', 'end'
-		gs 'stat'
-
-		act 'Further': gt 'swamp_yard'   
+		gs 'arousal', 'flash', 25, 'dom', 'exhibitionism'   
 	end
-!!julzor: missing : after the end						
-	act 'Give him a hands on demonstration':
-		cla & *clr
-		hunter_sexual_comfort += 5
+						
+	act 'Give him a hands on demonstration'
+		hunter_sexual_comfort += 7
 		hunter_collective_opinion += 1
 
+
 		!TODO: Gif and images here as well as the rest of the scene
 		'You smile at Igor as you approach him and grab his hand'
-		'"It is no big deal to me, why are you the one that''s embarrassed?" you say as you put his hand on your breasts'
-		'He starts blushing to his ears as you lead him to play with your tits. He starts kneading your breasts lightly after a minute but does not go further.'
-		'After a minute he stops and starts going away but not before you notice the satisfied smirk on his face.'
-
-		gs 'arousal', 'breasts', 5, 'dom', 'exhibitionism'
-!!julzor: added missing gs 'stat' and arousal end
-		gs 'arousal', 'end'
-		gs 'stat'
-
-		act 'Further': gt 'swamp_yard'
+		'"It is no big deal to me, why are you the one that's embarrassed?" you say as you put his hand on your breasts'
 	end
 }
 
 $skirt_breeze = {
 	*clr & cla
 	hunter_sexual_comfort += 2
-	
+	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/no_tanga.jpg"></center>'
 	'You walk across the yard, when suddenly the wind lifts you skirt.'
 	'"I forgot to put on panties...," you realize this seeing your bare pussy.'
 	'You nervously started looking around if anyone caught a glimpse of your little wardrobe malfunction...'
 	'You hoped that the men missed the opportunity seeing you exposed, however, Igor''s face had turned red and you see Andrei grinning, you realize quite quickly that your little show did not pass unappreciated.'
-!!julzor: The arousal call was missing the time (I put in one minute, you have to change it to something appropriate for the scene)
-	gs 'arousal', 'flashlite', 1
-!!julzor: gs 'stat' should be at the end after all stat window changing things happen (arousal changes arousal and time)
-	gs 'arousal', 'end'
-	gs 'stat'
+	gs 'arousal', 'flashlite'
 	
 	act 'Further':gt 'swamp_yard'
 }
@@ -293,7 +259,11 @@ $skirt_breeze = {
 !Code blocks for branch events (events calling other dynamic events)
 !TODO: Return here to expand more.
 $naked_encounter = {
-	if huntersKnowSlut = 0 and $clothingworntype = 'nude':
+	cla
+	*clr
+	gs 'stat'
+	
+	if huntersKnowSlut = 0:
 		cla
 		*clr
 		gs 'stat'
@@ -328,8 +298,6 @@ $naked_encounter = {
 		act'Remain naked':
 			*clr & cla
 			gs 'arousal', 'flash', 5, 'exhibitionism'
-!!julzor: added missing arousal end
-			gs 'arousal', 'end'
 			hunterknowday = daystart
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampdvornude2.jpg"></center>'
@@ -338,23 +306,20 @@ $naked_encounter = {
 			!Nudity reactions. Might need to split into more dynamic events if it gets too massive
 			if hunter_sexual_comfort < 40:
 				if hunter_collective_opinion > 45:
-					hunter_sexual_comfort += 7
+					hunter_sexual_comfort += 5
 					'"<<$pcs_nickname>>, why are you not wearing clothes?" says Sergei'
 					'"Leave the girl alone Sergei. It is just us around. In fact, we should go naked too!" says Andrei and starts unzippping his jacket'
 					'"Okay, okay, you made your point. You do not have to do a striptease, <<$pcs_nickname>> can do whatever she is comfortable with." says Sergei'
-					act 'Further': gt 'swamp_yard'
 				elseif hunter_collective_opinion > 25:
-					hunter_sexual_comfort += 5
+					hunter_sexual_comfort += 3
 					hunter_collective_opinion -= 2
 					'"Well well, we have ourselves a free spirit here!" says Andrei'
 					'"<<$pcs_nickname>>, please cover up. This is not very appropriate." says Sergei'
-					act 'Further': gt 'swamp_yard'
 				else
-					hunter_sexual_comfort += 3
+					hunter_sexual_comfort += 1
 					hunter_collective_opinion -= 4
 					'"What in the hell are you doing you dumb girl, put something on" says Sergei'
-					'"Seriously <<$pcs_nickname>>. You are not a toddler, you can''t just run around naked like one." says Igor'
-					act 'Further': gt 'swamp_yard'
+					'"Seriously <<$pcs_nickname>>. Stop acting like a kid.'
 				end
 			else
 				if hunter_collective_opinion > 45:
@@ -364,47 +329,33 @@ $naked_encounter = {
 					gs 'arousal', 'fondling'
 					
 					!TODO: Find an image for here, preferably gif
-					'"You sure do look good, <<$pcs_nickname>>" says Igor before pulling you in for a kiss.'
-					
+					'"You sure do look good, <<$pcs_nickname>>" says Igor before pulling you in for a kiss.
 					act 'Return the kiss':
 						*clr & cla
 						!TODO: find image that fits here
 						'You happily return the kiss, not caring if you are making out completely naked outside with the other men watching you'
 						!TODO: find image that fits here
-						'Igor''s fingers explore your body, fondling your tits and ass before slipping in your pussy. You start grinding against his fingers before he pulls back out and gives you a smirk before walking back, leaving you aching for more.'
-						
+						'Igor's fingers explore your body, fondling your tits and ass before slipping in your pussy. You start grinding against his fingers before he pulls back out and gives you a smirk before walking back, leaving you aching for more.'
 						gs 'arousal', 'kiss', 5, 'exhibitionism'
 						gs 'arousal', 'vaginal_fingering', 5, 'sub'
-!!julzor: added missing arousal end and missing gs 'stat'
-						gs 'arousal', 'end'
-						gs 'stat'
-
-
-						act 'Further': gt 'swamp_yard'
 					end
-
 					act 'Lightly push him away':
 						hunter_sexual_comfort -= 3
 						hunter_collective_opinion += 3
-						
-						'"Whoa there guy! Getting ahead of ourselves aren''t we?" you say before giving Igor a slap on the ass.'
+						'"Whoa there guy! Getting ahead of ourselves aren't we?" you say before giving Igor a slap on the ass.'
 						'He looks at you with a mix of confusion and amusement'
-						
 						gs 'arousal', 'fondling', 5, 'dom'
-!!julzor: added missing arousal end and missing gs 'stat'
-						gs 'arousal', 'end'
-						gs 'stat'
-
-						act 'Further': gt 'swamp_yard'
 					end	
 
 				elseif hunter_collective_opinion > 25:
 					hunter_sexual_comfort += 3
 					hunter_collective_opinion += 3
 				
-					'"That''s the spirit <<$pcs_nickname>>. You have got nothing to hide so why hide it?" says Andrei'
+					'"That's the spirit <<$pcs_nickname>>. You have got nothing to hide so why hide it?" says Andrei'
 					'"I...uh...wow." stammers Igor. "Still not used to you prancing around like that"'
-					act 'Help him get more used to it':	dynamic $igor_demonstration
+					act 'Help him get more used to it':
+						dynamic $igor_demonstration
+					end
 				else
 					hunter_sexual_comfort += 3
 					hunter_collective_opinion += 1
@@ -415,8 +366,7 @@ $naked_encounter = {
 					dynamic $andrei_quick_fuck
 				end
 			act'Keep moving':gt 'swamp_yard'
-			end
-		end	
+		end
 	end
 }
 
@@ -426,19 +376,14 @@ $hunter_cleanup_request = {
 		*clr & cla
 		swiss_army_random_number = rand(1,3)
 		minut += 5
-!!julzor: Changed the three if conditions into one if/elseif and moved the pictures there so I was able to delete the second set of three if conditions
-		if swiss_army_random_number = 1:
-			gs 'boyStat', 'A172'
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andreihanter.jpg"></center>'
-		elseif swiss_army_random_number = 2:
-			gs 'boyStat', 'A174'
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/sergeihanter.jpg"></center>'
-		elseif swiss_army_random_number = 3:
-			gs 'boyStat', 'A173'
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/igorhanter.jpg"></center>'
-		end
+		if swiss_army_random_number = 1:gs 'boyStat', 'A172'
+		if swiss_army_random_number = 2:gs 'boyStat', 'A174'
+		if swiss_army_random_number = 3:gs 'boyStat', 'A173'
 		gs 'stat'
 
+		if swiss_army_random_number = 1:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andreihanter.jpg"></center>'
+		if swiss_army_random_number = 2:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/sergeihanter.jpg"></center>'
+		if swiss_army_random_number = 3:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/igorhanter.jpg"></center>'
 		'<<$boydesc>> approaches you. "Hey I need your help with something"'
 		
 		act 'Sure what is it?':
@@ -454,10 +399,9 @@ $hunter_cleanup_request = {
 				if hunter_collective_opinion >= 15:'"Actually, nevermind. I got this, thanks though."'
 				if hunter_collective_opinion < 15:'"Actually, nevermind. You are kinda useless for what I need"'
 				act 'O...kay':hunter_collective_opinion += 1 & gt 'swamp_yard'
-			end	
 		end
 	
-		act '"I''ll help later, busy right now"':
+		act '"I'll help later, busy right now"':
 			*clr & cla
 			minut += 5
 			hunter_collective_opinion -= 3
@@ -473,8 +417,6 @@ $hunter_cleanup_request = {
 			hunter_collective_opinion -= 10
 			gt 'swamp_yard'
 		end
-!!julzor: missing end
-	end
 }
 
 !TODO: Clean this up, divvy into leaf events, add additional checks and events for opinion and sexual comfort, and a random no check for the conversations to trigger instead of hunters being omniscient
@@ -562,11 +504,9 @@ $hunter_convo_sexworker = {
 }
 
 $daytime_flavor_events = {
-	!TODO: Move the conditionals inside the child events. Let''s keep this only foor rng rolls and event calls and no more
-	if CloSkirtShortness > 1 and $pantyworntype = 'none' and rand(1,20) = 1: dynamic $skirt_breeze
-	if rand(1,12) = 1 : dynamic $hunter_cleanup_request
-	if rand(1,20) = 1: dynamic $hunter_convo_sexworker
-	if rand(1,10) = 1: dynamic $naked_encounter
+	if CloSkirtShortness > 1 and $pantyworntype = 'none' and RAND(1,20) = 1: dynamic $skirt_breeze
+	if RAND(1,12) = 1 : dynamic $hunter_cleanup_request
+	if RAND(1,20) = 1: dynamic $hunter_convo_sexworker
 }
 
 $nighttime_flavor_events = {
@@ -601,18 +541,14 @@ if dirty_swamp_yard > 10:act 'Clean up the trash outside': dynamic $yard_cleanup
 if collective_hunter_opinion < 10: act '<b>Escape to the swamp</b>': dynamic $swamp_escape
 
 ! TODO: Figure how to remove the sneaky gotos if not tied to other locations
-if hunterhelp = 1: 
-	dynamic $rescued_from_swamp
-end
+if hunterhelp = 1: dynamic $rescued_from_swamp
+if hunterhelp = 2 and huntersKnow = 0: dynamic $meet_hunters_after_rescue
 
-if hunterhelp = 2 and huntersKnow = 0:
-	dynamic $meet_hunters_after_rescue
-end
 
 if hour >= 8 and hour < 20: 
 	dynamic $daytime_flavor_events
 
-	!TODO: Get rid of all this below here and move the dialogue to other events after revamping the other locs	
+!TODO: Get rid of all this below here and move the dialogue to other events after revamping the other locs	
 	!the conversation after a drunken Striptease and fuck GG hunters
 	if huntdanceslut = 1:
 		cla
@@ -630,9 +566,8 @@ if hour >= 8 and hour < 20:
 		'You look at Andrei, completely stunned by what you just heard.'
 		'"And what are sluts best at?" he continues. "That''s right, to pleasure men. Don''t you agree?"'
 
-!!julzor: I put the refuse option at the top ... we always try to put refuse/decline/leave options at the top
-		if pcs_dom > 0 and alko < 8:act'Refuse':huntdanceslut = 3 & gt 'hunters', 'start'
 		act'Agree':huntdanceslut = 2 & gt 'hunters', 'start'
+		if pcs_dom > 0 and alko < 8:act'Refuse':huntdanceslut = 3 & gt 'hunters', 'start'
 	end
 	!the conversation after the rape GG hunters
 	if huntersRape = 4:
@@ -812,6 +747,7 @@ if hour >= 8 and hour < 20:
 
 		act 'Go':gt 'hunters', 'start'
 	end
+
 		
 	! trio if GG whore
 	if hunters > 0 and huntersRape = 5 and huntslutsexrand = 2 and huntslutsex = 0:
@@ -822,22 +758,12 @@ if hour >= 8 and hour < 20:
 		gs 'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterswork1.2.jpg"></center>'
-!!julzor: Changed the three if''s into one if/elseif structure
-		if temphunt = 1:
-			'You see Andrei talking with Sergei in the yard. They notice you, and start moving towards you. "Come with us <<$pcs_nickname>>," without uttering another word Andrei grabs you by the arm and leads you to the nearest tree.... Sergei follows after.'
-		elseif temphunt = 2:
-			'Andrei and Igor notice you enter the yard, they call you over. "Come with us <<$pcs_nickname>>, you need to help us out with our itch," said Andrei pulling you in the direction of the nearest thicket. Igor follows behind.'
-		elseif temphunt = 3:
-			'You notice Igor and Sergei standing in the yard whispering something to each other. Igor approaches you and says "<<$pcs_nickname>>, "<<$pcs_nickname>>, I need you to help me with this bulge," he says pointing at his groin. He calls Sergei over and they start leading you away from the yard...'
-		end
-!!julzor: Changed the three if''s into one if/elseif structure
-		if pcs_horny < 40: 
-			'You obediently follow along, well knowing the reason they wanted you to tag along.'
-		elseif pcs_horny >= 40 and pcs_horny < 70:
-			'"I need you to take me..." is all you manage to say while they''re leading you away.'
-		elseif pcs_horny >= 70:
-			'"I was hoping this would happened," you think to yourself, feeling your wet pussy pulsating with desire. You jump onto one of them, taking charge, leaving the other one stunned about who wants it more, they or you.'
-		end
+		if temphunt = 1:'You see Andrei talking with Sergei in the yard. They notice you, and start moving towards you. "Come with us <<$pcs_nickname>>," without uttering another word Andrei grabs you by the arm and leads you to the nearest tree.... Sergei follows after.'
+		if temphunt = 2:'Andrei and Igor notice you enter the yard, they call you over. "Come with us <<$pcs_nickname>>, you need to help us out with our itch," said Andrei pulling you in the direction of the nearest thicket. Igor follows behind.'
+		if temphunt = 3:'You notice Igor and Sergei standing in the yard whispering something to each other. Igor approaches you and says "<<$pcs_nickname>>, "<<$pcs_nickname>>, I need you to help me with this bulge," he says pointing at his groin. He calls Sergei over and they start leading you away from the yard...'
+		if pcs_horny < 40:' You obediently follow along, well knowing the reason they wanted you to tag along.'
+		if pcs_horny >= 40 and pcs_horny < 70:'"I need you to take me..." is all you manage to say while they''re leading you away.'
+		if pcs_horny >= 70:'"I was hoping this would happened," you think to yourself, feeling your wet pussy pulsating with desire. You jump onto one of them, taking charge, leaving the other one stunned about who wants it more, they or you.'
 
 		act 'Go with the guys':
 			*clr & cla