浏览代码

Merge remote-tracking branch 'slanon/master'

KevinSmarts 3 年之前
父节点
当前提交
aad424818e

+ 10 - 10
locations/alexandriaEv.qsrc

@@ -160,7 +160,7 @@ if $ARGS[0] = 'interview2':
 				'"Well... basically she told me that your magic was somewhat altered on your quest for the Talisman''s power and that a simple scare turned your hair white, but if you ask me, it suits your style, I can''t blame the photographer for thinking that you... were... a model?"'
 				'Is like looking a train wreck, as Alexandria''s face goes darker at your dialogue. Finally, you shut up as she grit her teeth and with words full of contempt.'
 				'"I can assure you, that I have total control over my magic, hmpf... More importantly than that, my hair didn''t turned white because like some simpleton, I was scared by a toad in the dark. I''m a natural blonde, and I take good care of my hair, it''s one of the few things that Rikudo''s curse hasn''t altered, because... surprise! that trickster seemed to have forgotten to say you something important... I am a man!'
-			end if
+			end
 			minut += 2
 			gs 'stat'
 
@@ -202,7 +202,7 @@ if $ARGS[0] = 'interview2':
 			act '"A man?"':gt'alexandriaEv','interview3'
 		end
 	end
-end if
+end
 
 if $ARGS[0] = 'interview3':
 	'<center><b><font color="maroon">Aleksei?</font></b></center>'
@@ -217,8 +217,8 @@ if $ARGS[0] = 'interview3':
 			'"Yes Mr. Ivanov... I am another victim of Rikudo''s games, that is the reason for my interest in you."'
 		else
 			'"Yes... Cursed by Rikudo, the being that created The Talisman of Power, and the reason for my interest in you."'
-		end if
-	end if
+		end
+	end
 	'After this little revelation, he exhales a big puff of smoke, and continue with his explanation.'
 	'"As I remember telling you the last time we meet, my name is Aleksei, and the hows and whys of my curse it''s better to leave them for another time, suffice is to say, that is my understanding, that you and your relation with the powers that have been transferred to your persona, holds the key to break my current predicament. As you can see from our early confrontation, the powers that be, wanted the monopoly over your attention, so I looked for an alternative, that is the reason after the... convoluted way we meet in Aphrodite, hm... as an afterthought, if you want to know, I took care of that little parasite, banishing it."'
 	'As he gives you this explanation, the pieces of the puzzle click in your head, and begin to explain his conduct, but there is a thing to explain.'
@@ -292,7 +292,7 @@ if $ARGS[0] = 'interview3':
 					'"<<$pcs_lastname>>, is that your answer? Do you question my decision without knowing if it was the only solution?" He exhales another puff and you can see how he clenches his teeth "let''s be clear <<$pcs_lastname>>, Reinhold and I did oaths to protect the inhabitants of this world from beings like <i>It</i>, and at-risk to offend your morality, this was necessary."'
 					'Aleksei say this as a matter of fact, before tilting his head like he was hearing something.'
 					'"Hm... Interesting. <<$pcs_lastname>> we have company."'
-				end if
+				end
 				minut += 2
 				gs 'stat'
 
@@ -312,9 +312,9 @@ if $ARGS[0] = 'interview3':
 
 				act 'End the interview':gt'alexandriaEv','interview4'
 			end
-		end if
-	end if
-end if
+		end
+	end
+end
 
 if $ARGS[0] = 'interview4':
 	AlexandriaQW = 7
@@ -339,7 +339,7 @@ if $ARGS[0] = 'interview4':
 		'"I must admit, that this has ended better than I expected <<$pcs_lastname>>, is my impression that you have the potential to master the high arts, and... even taking into consideration, my personal interest on you, I''m tempted to offer you something."'
 		'Aleksei put out the cigarette in an ashtray, the next words exiting somewhat excited from his mouth.'
 		'"I offer you the possibility of an apprenticeship under my wing. This will protect you, partially from The Council and Reinhold interests, but, I expect respect and diligence, so... until the next time and remember, my door is open only on daily hours."'
-	end if
+	end
 	minut += 4
 	gs 'stat'
 
@@ -359,7 +359,7 @@ if $ARGS[0] = 'interview4':
 
 		act 'Continue':gt'psiklin','start'
 	end
-end if
+end
 
 --- alexandriaEv ---------------------------------
 

+ 8 - 8
locations/andreihunter.qsrc

@@ -133,7 +133,7 @@ else
 
 										act'Continue':gt $loc, $loc_arg
 									end
-								end if
+								end
 							end
 							act 'Push away':
 								*clr & cla
@@ -147,7 +147,7 @@ else
 								act'Leave':gt $loc, $loc_arg
 							end
 						end
-					end if
+					end
 					act'Leave':gt $loc, $loc_arg
 				end
 			else
@@ -178,7 +178,7 @@ else
 
 						act 'Go':gt 'hunterLoveSex','Andrei'
 					end
-				end if
+				end
 				if rand(0,9) = 0:
 					act 'Break up with Andrei':
 						*clr & cla
@@ -191,11 +191,11 @@ else
 
 						act 'Leave':gt $loc, $loc_arg
 					end
-				end if
-			end if
-		end if
+				end
+			end
+		end
 		act'Leave':gt $loc, $loc_arg
-	end if
-end if
+	end
+end
 
 --- andreihunter ---------------------------------

+ 2 - 2
locations/andrey.qsrc

@@ -362,7 +362,7 @@ if $ARGS[0] = 'beg':
 			!!if it is possible Sveta never even gave the manager a blowjob previously
 			if young_shop_fired <= 1:
 				'"That''s not fair! You know how much I need this job, just let me give you a blowjob or something like that." You say trying to convince Mr. Sobulyagin to let you have your job back without doing this.'
-			else:
+			else
 				'"That''s not fair! You know how much I need this job, just let me give you a blowjob like usual." You say trying to convince Mr. Sobulyagin to let you have your job back without doing this.'
 			end
 			'"Listen I''m doing you a favor here. It''s well within my rights not to hire back someone who missed work, but I''m not a bad guy. I can see you really want this job," he says while standing up from his chair. "So I''m willing to help you, but you need to prove to me how much you want this job."'
@@ -376,7 +376,7 @@ if $ARGS[0] = 'beg':
 				*nl
 				if young_shop_fired <= 6:
 					'Your face immediately turns beet-red as you try to comprehend what you''ve just heard. "You want me to give you a blowjob... then have anal sex?" You don''t understand what the hell he''s thinking. "There''s no way I''ll do that!"'
-				else:
+				else
 					'"I know I let you do that when I worked for you before" you tell him, "but I''m not going to start doing that again.'
 				end
 				'"Fine then there''s the door," Mr. Sobulyagin snaps clearly upset with your answer.'

+ 2 - 2
locations/backwater.qsrc

@@ -22,8 +22,8 @@ if $ARGS[0] = '':
 		act 'Further':gt 'hunters', 'start'
 	else
 		if $clothingworntype = 'nude' and igor_away = 'no' or (hunters_outside = 1 and hunters_available = 1) and rand(1,10) = 1: gt 'backwater','hunter' else gt 'backwater','alone'
-	end if
-end if
+	end
+end
 
 if $ARGS[0] = 'alone':
 	'<center><B>Backwater</B></center>'

+ 1 - 1
locations/fame.qsrc

@@ -184,7 +184,7 @@ else
         $gnikname = 'whore'
     elseif pav_slut < 300 :
         $gnikname = 'town bicycle'
-    else :
+    else
         $gnikname = 'cum dumpster'
 	end
 end

+ 5 - 5
locations/gadforest_event.qsrc

@@ -268,16 +268,16 @@ if $ARGS[0] = 'mushroom_pickers3':
 						else
 							'"Pretty well today." you answer happily, showing him your full basket.'
 							'You spend ten minutes talking about the forest and the best places to find mushrooms and berries, before getting up to continue on with your day.'
-						end if
-					end if
+						end
+					end
 					act 'Leave':gt 'gadforest','forest_outskirts'
 				end
 				gs 'stat'
 
 				act 'Leave':gt $loc, $loc_arg
-			end if
+			end
 		end
-	end if
+	end
 	gs 'stat'
 
 	act 'Leave them be':gt 'gadforest','forest_outskirts'
@@ -378,7 +378,7 @@ if $ARGS[0] = 'basket':
 		else
 			'Unfortunately your basket is already full and you cannot carry any more berries.'
 		end
-	end if
+	end
 	gs 'stat'
 
 	act 'Leave the basket alone':gt 'gadforest','forest_center'

+ 36 - 36
locations/gschool_cheerleading.qsrc

@@ -224,10 +224,10 @@ if $ARGS[0] = 'afterschool_practice':
 		end
 	else
 		act 'Skip practice (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-	end if
+	end
 	if cheerleadingQW['skipped'] > 1:
 		act 'Quit cheerleading squad': gt 'gschool_cheerleading', 'Quit'
-	end if
+	end
 end
 
 if $ARGS[0] = 'afterschool_game':
@@ -303,11 +303,11 @@ if $ARGS[0] = 'practice':
 						cheerleadingQW['quest_stage'] = 3
 					else 
 						'The squad is already out practicing when you arrive at the locker room and change. You don''t have the privelege of owning a uniform and instead train in your sports clothing.'
-					end if
-				end if
+					end
+				end
 			else
 				'Heading into the locker room, you see Albina and the rest of the squad have already arrived and are in various states of changing into their outfits while chatting to each other. You head to your locker and and strip down. You pull your uniform out and start getting dressed. You just finish tying your shoes when Albina gives the order to head out into the PE hall.'
-			end if
+			end
 		end
 
 		act 'Follow the others into the hall':
@@ -337,7 +337,7 @@ if $ARGS[0] = 'practice':
 					'Albina heads over to you and cheerfully greets you. "Don''t you just look delightful!" She then explains what your role in the squad will be and leads you over to the group.'
 					'"It''s all really simple. Just follow our lead and you''ll be fine. From the top girls!"'
 					'You take your place and Albina begins. You practice tumbling and flips and manage not only to impress Albina, but the rest of the squad too. "Not bad for your first time <<$pcs_nickname>>. I expect great things from you."'
-				end if
+				end
 			else
 				if cheerleadingQW['quest_stage'] = 2:
 					!! Backup variant
@@ -351,7 +351,7 @@ if $ARGS[0] = 'practice':
 							'You finish practicing the last of your moves as Albina heads your way. "<<$pcs_firstname>>, one of the girls has just gone and busted her ankle. I need you to stand in for her at the game tomorrow. Don''t get ahead of yourself, you''re only serving your purpose. So be here tomorrow after school."'
 							'Albina walks away, but your excited eagerness is suddenly shattered when she turns and glares directly at you. "Don''t make me regret choosing you!"'
 							'You are left with a slight feeling of dread within you.'
-						end if
+						end
 					elseif rand(0,8) = 0:
 						if cheerleadingQW['practice_count'] > 4 and week = 4:
 							*nl
@@ -360,7 +360,7 @@ if $ARGS[0] = 'practice':
 							You stare at her and she quickly reassures you. "Don''t worry, this isn''t a prank. I have... other things that need my attention tomorrow and Albina is fine with you covering for me. It''s your job after all!" she giggles.
 							You laugh and agree. She smiles and thanks you before whispering in your ear. "I''m going out with Vanya tomorrow, but Albina wouldn''t like that, so I told her I had to go to the doctor."
 							She then taps her nose at you, silently asking you to keep her secret, before she cheerfully bounces off to get changed.'
-						end if
+						end
 					elseif rand(0,7) = 0: 
 						if (cheerleadingQW['backup_game'] ! 1) and (npc_grupTipe['A18'] ! 5):
 							*clr & cla
@@ -368,7 +368,7 @@ if $ARGS[0] = 'practice':
 							gs 'stat'
 							
 							act 'Go take a shower': gt 'gschool_cheerleading', 'shower'
-						end if 
+						end
 					elseif rand(0,6) = 0:
 						*nl
 						'As you are practicing in the corner, you notice a boy with a phone run up to one of the girls and pull her skirt up to take a panty shot. He and his group of friends flee before anyone can stop them. After fixing her clothing, the girl assures everyone she is fine and the session continues.'
@@ -389,8 +389,8 @@ if $ARGS[0] = 'practice':
 						if npc_grupTipe['A18'] ! 5:
 							*nl
 							'As Lina practices a move that involves holding another girl, Christina decides to amuse herself and pulls Lina''s skirt up, causing her to squeal as her panties are exposed to everyone. She is blushing heavily, forced to endure the humilation since she can''t let go of the girl. Christina eventually lets her skirt go and Albina chews her out for being so reckless and childish while praising Lina for not losing her focus. Christina just laughs and calls her for being a bossy spoilsport while giving a mocking smirk to Lina. Christina just laughs and mocks Albina, comparing her to a yapping little dog.'
-						end if
-					end if
+						end
+					end
 				else
 					!! Regular variant
 					if pcs_cheer < 20:
@@ -411,14 +411,14 @@ if $ARGS[0] = 'practice':
 					else
 						gs 'npc_relationship', 'modify', 'A23', 'love'
 						'Once in the hall, you take your place as Albina explains what you will be practicing and has you begin. Your skill having drastically improved, Albina now considers you one of her best girls and uses you as an example to the others.'
-					end if
+					end
 
 					if rand(0,9) = 0:
 						if npc_grupTipe['A18'] ! 5:
 							*nl
 							'As you are practicing, Lariska goes over on her ankle and falls to the ground. Albina has the group stop and she and Vicky go to check on her. She meekly insists that she is fine, but Albina disagrees and has her stay on the ground as Vicky checks her over. Christina then walks over and chimes in, a worried looking Lina silently standing behind her. "She said she''s fine, so stop fussing and get back to bossing us around!" Albina narrows her gaze. "Does she look fine to you? No, she''s going to sit this one out and we''ll see how ''fine'' she is later!" In response, Lariska tries to get back on her feet, but whimpers slightly in pain. "Stop faking it and get off your lazy ass!" Christina shouts. Lariska looks at her meekly and tries to stand, but Vicky has her sit back down.' 
 							'"She isn''t in any shape to continue. <<$pcs_nickname>>, help Vicky take her over there to sit out and rest. We''ll have to make do without her for the rest of the session." Christina doesn''t seem happy, but doesn''t stop you and Vicky from carrying Lariska over to the benches to rest her injured foot. Albina then has the group finish the practice session without her. When you finish, Lariska seems well enough to walk to the changing room with a slight limp, which annoys Christina and causes her to again accuse her of faking it.'
-						end if
+						end
 					elseif rand(0,8) = 0:
 						*nl
 						'As you practice, you notice a group of boys watching you and whispering among themselves, one of them holding a phone in his hand. You ignore them and continue practicing when, in the corner of your eye, you see the boy with the phone run up to you. Before you can react, he pulls your skirt up and holds the phone underneath you. You hear the click of the camera before he lets go and the group flees before anyone can stop them. You fix your clothing and assure everyone that you''re fine before the session continues.'
@@ -441,10 +441,10 @@ if $ARGS[0] = 'practice':
 						if npc_grupTipe['A18'] ! 5:
 							*nl
 							'As Lina practices a move that involves holding another girl, Christina decides to amuse herself and pulls Lina''s skirt up, causing her to squeal as her panties are exposed to everyone. She is blushing heavily, forced to endure the humilation since she can''t let go of the girl. Christina eventually lets her skirt go and Albina chews her out for being so reckless and childish while praising Lina for not losing her focus. Christina just laughs and calls her for being a bossy spoilsport while giving a mocking smirk to Lina. Christina just laughs and mocks Albina, comparing her to a yapping little dog.'
-						end if
-					end if
-				end if
-			end if
+						end
+					end
+				end
+			end
 			gs 'stat'
 			
 			act 'Go take a shower': gt 'gschool_cheerleading', 'shower'
@@ -470,26 +470,26 @@ if $ARGS[0] = 'game':
 			'<center><video autoplay loop src="images/locations/pavlovsk/school/afterschool/cheerleading/opening.mp4"></video></center>'
 			!! double cheer_exp so it progresses faster given that Sveta cant get it anywhere else
 			!! the events could differ according to the season
-			if month =>10:
+			if month >= 10:
 				if first_time_outside_in_cold_weather=0:
 					'There is a chill in the air and you shudder as you step outside in your thin outfit that does little to protect you from the elements. Despite the girls'' pleas, the football teams prefer the outdoor field to playing indoors and you are forced to perform outside, even during cold weather. Thankfully, performing your routine and then cheering from the sidelines helps keep you somewhat warm as you persevere with the vicious cold.'
 					first_time_outside_in_cold_weather=1
 				else
 					'The cold chill in the air stings with a bitter fury as you step outside. For whatever reason, a few of your fellow cheerleaders have chosen not to wear a bra and their solid nipples are poking through the thin fabric of their outfits. You soldier through the biting cold and perform your routine before cheering from the sidelines for the rest of the game, which helps keep you somewhat warm.'
-				end if
+				end
 			elseif month <=3:
 				if first_time_doing_basketball=0:
 					'Thankfully, the football team is now on its winter break and you are now safely in the warm indoors performing for the basketball team. While performing your opening routine, you notice some of the players and spectators checking you and the other girls out. Some of them are just appreciating the show while others are hungrily undressing you with their eyes. They continue eying you up for the rest of the game as you cheer from the sidelines. You ignore them as best as you can, thankful that you are indoors and warm at least.'
 					first_time_doing_basketball=1
 				else
 					'You head out into the hall and perform your opening routine for the crowd before the game starts and you cheer from the sidelines. You notice a few guys checking you and the other girls out, some of them undressing you with their eyes. You try your best to ignore them as the game continues.'
-				end if
+				end
 			elseif month = 4:
 				if first_time_spring_football_match=0:
 					'Football has started back up and you''re thankful that the weather has improved somewhat. You are no longer chilled to the bone, but the temperature picking up means you sweat a little more doing your routines. You''re grateful for the bottles of refreshing cold water being passed out and relish as you quench your thirst.'
 					first_time_spring_football_match=1
-				end if
-			end if
+				end
+			end
 
 			gs 'exercise', 'tier2', 0, 'agil_exp', 'vital_exp', 'cheer_exp', 'cheer_exp', 'danc_exp'
 			'Out on the field, you and the girls perform your opening routine flawlessly under Albina''s direction and spend the rest of the game chanting and cheering your team. You see some guys in the crowd appreciating the view of your ass as you are performing right in front of them.'
@@ -505,7 +505,7 @@ if $ARGS[0] = 'game':
 					'You let out a sigh of relief when the game ends and after performing your closing routine, you all huddle together and make a dash for the warmth of the locker room.'
 				else
 					'The game ends and you perform your closing routine to the crowd as the players leave the field. You soon join them in returning to the locker room.'
-				end if
+				end
 				'Once in the locker room, you strip from your uniform and head into the showers.'
 
 				!! Resets the flag letting backups attend games
@@ -609,7 +609,7 @@ if $ARGS[0] = 'shower':
 					end
 				end
 			end
-		end if
+		end
 	elseif rand(0,4) = 0:
 		if (cheerleadingQW['practice_count'] < 3) and (npc_grupTipe['A18'] ! 5):
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/cheerleading/events/christina_ambush.jpg"></center>'
@@ -648,7 +648,7 @@ if $ARGS[0] = 'shower':
 					gs 'stat'
 
 					act 'Leave school': gt 'gschool_grounds', 'main'
-				end if
+				end
 			end
 
 			act 'Refuse':
@@ -683,9 +683,9 @@ if $ARGS[0] = 'shower':
 					gs 'stat'
 
 					act 'Leave school': gt 'gschool_grounds', 'main'
-				end if
+				end
 			end
-		end if
+		end
 	elseif rand(0,4) = 0 and cheerleadingQW['quest_stage'] = 3 :
 		if First_time_3some_with_Lazar = 0:
 			First_time_3some_with_Lazar = 1
@@ -867,8 +867,8 @@ if $ARGS[0] = 'shower':
 					end
 				end
 			end
-		end if
-	end if
+		end
+	end
 	if $CURACTS = '':
 		'You get dressed, place your uniform back in your locker and get ready to leave.'
 		gs 'stat'
@@ -877,8 +877,8 @@ if $ARGS[0] = 'shower':
 			if rand(0,5) = 0: gt 'gschool_cheerleading', 'Bella'
 			gt 'gschool_grounds', 'main'
 		end
-	end if
-end if
+	end
+end
 
 if $ARGS[0] = 'Bella':
 	*clr & cla
@@ -979,7 +979,7 @@ if $ARGS[0] = 'Bella':
 
 				act 'Leave':gt 'gschool_grounds', 'main'
 			end
-		end if
+		end
 	elseif bellawatch = 2:
 		'As you walk past the boys'' locker room, you can hear Bella and her friend going at it again.'
 		gs 'stat'
@@ -1050,7 +1050,7 @@ if $ARGS[0] = 'Bella':
 						gs 'stat'
 
 						act 'Leave':gt 'gschool_grounds', 'main'
-					end if
+					end
 				end
 			end
 
@@ -1062,8 +1062,8 @@ if $ARGS[0] = 'Bella':
 				act 'Leave':gt 'gschool_grounds', 'main'
 			end
 		end
-	end if
-end if
+	end
+end
 
 
 
@@ -1151,7 +1151,7 @@ if $ARGS[0] = 'Quit':
 	else
 		!!IF cheerleader- 
 		'Albina gives you an even bigger puzzled stare. "What? Why? Never mind. If you want to leave, then I won''t stop you. Just know that I thought you had some real potential here <<$pcs_nickname>>. And thanks for telling me and not just disappearing like <i>some other people</i> have." she adds. You breathe a sigh of relief as she gathers the girls and leaves, letting you go on your way.'
-	end if
+	end
 	minut += 2
 	gs 'stat'
 

+ 1 - 1
locations/hunter_ambient.qsrc

@@ -295,7 +295,7 @@ if $ARGS[0] = 'bring_food':
 		act 'Further': gt 'swamp_yard', 'start'
 	else
 		gt 'swamp_yard', 'start'
-	end if
+	end
 end
 
 

+ 2 - 2
locations/hunter_favors.qsrc

@@ -86,7 +86,7 @@ if $ARGS[0] = 'housekeeping_request':
 		end
 	else
 		gt 'swamp_yard', 'start'
-	end if
+	end
 end
 
 if $ARGS[0] = 'yard_cleanup':
@@ -126,7 +126,7 @@ if $ARGS[0] = 'dirty_swamphouse':
 	else
 		minut += 180
 		gs 'sweat', 'add', 30
-	end if
+	end
 	if huntersAndreiQw < 15:huntersAndreiQw += 1
 	if huntersIgorQw < 15:huntersIgorQw += 1
 	if huntersSergeiQw < 15:huntersSergeiQw += 1

+ 13 - 13
locations/hunter_interactions.qsrc

@@ -92,7 +92,7 @@ if $ARGS[0] = 'smoke_with_hunters':
 
 								act 'Return to the table': gs 'swamphouse', 'meal_table'
 							end
-						end if
+						end
 					else
 						'<center><img <<$set_imgh>> src="images/characters/shared/photos/big172.jpg"></center>'
 						*nl
@@ -120,8 +120,8 @@ if $ARGS[0] = 'smoke_with_hunters':
 
 								act 'Return to the table': gs 'swamphouse', 'meal_table'
 							end
-						end if
-					end if
+						end
+					end
 				else
 					'<center><img <<$set_imgh>> src="images/characters/shared/photos/big172.jpg"></center>'
 					*nl
@@ -132,8 +132,8 @@ if $ARGS[0] = 'smoke_with_hunters':
 					gs 'stat'
 
 					act 'Go': gs 'swamphouse', 'huntersmokBJ'
-				end if
-			end if
+				end
+			end
 		end
 	elseif temp_sh = 3:
 		'<center><img <<$set_imgh>> src="images/characters/shared/photos/big174.jpg"></center>'
@@ -170,7 +170,7 @@ if $ARGS[0] = 'smoke_with_hunters':
 
 			act 'Return to the table': gs 'swamphouse', 'meal_table'
 		end
-	end if
+	end
 	act 'Refuse': gs 'swamphouse', 'meal_table'
 end
 
@@ -192,7 +192,7 @@ if $ARGS[0] = 'chat_with_hunters':
 		end
 	end
 
-end if
+end
 
 if $ARGS[0] = 'chat_with_hunters_theme':
 	*clr & cla
@@ -218,7 +218,7 @@ if $ARGS[0] = 'chat_with_hunters_theme':
 		else
 			hunter_collective_opinion -= 2
 			hunter_sexual_comfort += 5
-		end if
+		end
 		gs 'arousal', -5, 'flashlite'
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -249,11 +249,11 @@ if $ARGS[0] = 'chat_with_hunters_theme':
 					end
 				else
 					act 'Maybe another time boys (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-				end if
+				end
 				gs 'stat'
 
 				act 'Approach the hunters to find out': gt 'hunter_favors', 'nighttime_entertainment'
-			end if
+			end
 		end
 		act 'No, not really':
 			cla
@@ -289,7 +289,7 @@ if $ARGS[0] = 'chat_with_hunters_theme':
 				!if hunter_collective_opinion > 30 and alko < 4: act 'Maybe another time boys, not feeling it now': gt 'swamp_yard', 'start'
 				!act 'You get up and start getting into rhythm with some imaginary music': gt 'hunter_interactions', 'dance_show', 'nude'
 				act 'Maybe another time boys, not feeling it now': gt 'swamp_yard', 'start'
-			end if
+			end
 		end
 		act 'Uhh... kinda...':
 			cla
@@ -306,7 +306,7 @@ if $ARGS[0] = 'chat_with_hunters_theme':
 				!end
 
 				!act 'You oblige, feeling your pussy already getting wet': gs 'hunter_interactions', 'nighttime_entertainment'
-			end if
+			end
 		end
 	elseif $ARGS[1] = 'nude':
 		*clr & cla
@@ -1429,7 +1429,7 @@ if $ARGS[0] = 'naked_encounter':
 		end
 	else
 		gt 'swamp_yard', 'start'
-	end if
+	end
 end
 
 ! if $ARGS[0] = 'dance_show':

+ 12 - 12
locations/igorhunter.qsrc

@@ -133,7 +133,7 @@ else
 
 						act'Further':gt $loc, $loc_arg
 					end
-				end if
+				end
 			end
 			act 'No':
 				*clr & cla
@@ -171,8 +171,8 @@ else
 					'<<$boydesc>> is your boyfriend.'
 				else
 					'<<$boydesc>> is your husband.'
-				end if
-			end if
+				end
+			end
 			gs 'stat'
 
 			act 'Chat (0:30)':
@@ -240,7 +240,7 @@ else
 
 											act'Continue':gt $loc, $loc_arg
 										end
-									end if
+									end
 								end
 								act 'To remove the face':
 									*clr & cla
@@ -253,7 +253,7 @@ else
 									act'Leave':gt $loc, $loc_arg
 								end
 							end
-						end if
+						end
 						act'Leave':gt $loc, $loc_arg
 					end
 				else
@@ -287,7 +287,7 @@ else
 
 							act 'Go':gt 'hunterLoveSex','Igor'
 						end
-					end if
+					end
 					if rand(0,6) = 0:
 						act 'Break up with Igor':
 							*clr & cla
@@ -302,13 +302,13 @@ else
 
 							act 'Leave':gt $loc, $loc_arg
 						end
-					end if
-				end if
-			end if
+					end
+				end
+			end
 			act'Depart':gt $loc, $loc_arg
-		end if
-	end if
-end if
+		end
+	end
+end
 
 --- igorhunter ---------------------------------
 

+ 2 - 2
locations/podval_rape.qsrc

@@ -100,8 +100,8 @@ elseif podvalrape = 1:
 
 				act 'Find your way back to the main streets':podvalrape = 0 & dormrape = 0 & gt'pav_residential'
 			end  	
-		end if 
-	end if
+		end
+	end
 end
 
 --- podval_rape ---------------------------------

+ 4 - 4
locations/psiklin.qsrc

@@ -27,7 +27,7 @@ if $ARGS[0]='start':
 	else
 		'One of the most impressive buildings is your newly built mansion.'
 		act 'Visit your mansion': gt 'youplace'
-	end if
+	end
 	act 'View the insane asylum': minut += 2 & gt 'psiklin', 'ps1'
 	act 'View the creepy old building': minut += 2 & gt 'psiklin', 'ps2'
 
@@ -42,9 +42,9 @@ if $ARGS[0]='start':
 			end
 		else
 			act 'Look for Alexandria''s direction (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end if
-	end if
-end if
+		end
+	end
+end
 
 if $ARGS[0]='ps1':
 	cla

+ 10 - 10
locations/sergeihunter.qsrc

@@ -53,7 +53,7 @@ if huntersSergeiLove = 0 or (huntersSergeiQw >= 10 and huntersSergeiQw <= 50):
 			'You have a mutual crush on each other.'
 		else
 			if huntersSergeiLove = 1:'You two love each other.' else 'You have an unrequited love for him.'
-		end if
+		end
 		gs 'stat'
 
 		act 'Chat (0:30)':
@@ -121,7 +121,7 @@ if huntersSergeiLove = 0 or (huntersSergeiQw >= 10 and huntersSergeiQw <= 50):
 
 										act'Continue':gt $loc, $loc_arg
 									end
-								end if
+								end
 							end
 							act 'Move away':
 								*clr & cla
@@ -134,7 +134,7 @@ if huntersSergeiLove = 0 or (huntersSergeiQw >= 10 and huntersSergeiQw <= 50):
 								act'Leave':gt $loc, $loc_arg
 							end
 						end
-					end if
+					end
 					act'Leave':gt $loc, $loc_arg
 				end
 			else
@@ -165,7 +165,7 @@ if huntersSergeiLove = 0 or (huntersSergeiQw >= 10 and huntersSergeiQw <= 50):
 
 						act 'Go':gt 'hunterLoveSex','Sergei'
 					end
-				end if
+				end
 				if rand(0,6) = 0:
 					act 'Break up with Sergei':
 						*clr & cla
@@ -178,11 +178,11 @@ if huntersSergeiLove = 0 or (huntersSergeiQw >= 10 and huntersSergeiQw <= 50):
 
 						act 'Leave':gt $loc, $loc_arg
 					end
-				end if
-			end if
-		end if
+				end
+			end
+		end
 		act'Depart':gt $loc, $loc_arg
-	end if
+	end
 else
 	if huntersSergeiQw < 10:
 		*clr & cla
@@ -210,8 +210,8 @@ else
 		gs 'stat'
 
 		act 'Leave':gt $loc, $loc_arg
-	end if
-end if
+	end
+end
 
 --- sergeihunter ---------------------------------
 

+ 1 - 1
locations/soniadisco.qsrc

@@ -1466,7 +1466,7 @@ if $ARGS[0] = 'followsonia':
 			'She gives you a look of disbelief. "NO, I''m not ok. You saw what happened, everyone is going to think I''m a slut now, hell I am a slut." She says between sobs.'
 			'You nod a bit. "I know, but I tried to help you and I wish I could have done more." You tell her.'
 			'She nods a bit. "I know, god I was so stupid." She says before she start sobbing harder.'
-		elseif soniaencourage > 0 and npc_rel['A25'] => 50:
+		elseif soniaencourage > 0 and npc_rel['A25'] >= 50:
 			npc_rel['A25'] -= 10
 			'As you walk up she turns and sees you. "I thought you were my friend, why would you do that to me?"'
 		elseif soniaencourage > 0:

+ 7 - 7
locations/swamp_woods.qsrc

@@ -34,7 +34,7 @@ if $ARGS[0] = 'start':
 				'You have <<firewood>> pieces of firewood, and should probably grab some more to keep the fire going.'
 			else
 				'You have <<firewood>> pieces of firewood, and should have enough firewood to get a fire going.'
-			end if
+			end
 			minut += 15
 			gs 'stat'
 
@@ -42,7 +42,7 @@ if $ARGS[0] = 'start':
 		end
 	else
 		'You think about picking up some firewood before you remember you have plenty back at the yard.'
-	end if
+	end
 
 	act 'Try to circle around the swamp':
 		!no one likes to be trapped. Need to update gadfrestswamp with pcs_bushcraft method, but there should always be an option to try, no matter how low the skill.
@@ -90,7 +90,7 @@ if $ARGS[0] = 'start':
 					'You can see some broken branches and prints near ahead of you, marking the direction you initially started walking towards'
 
 					act 'That''s interesting...': bushcraft_exp += 2 & gt 'swamp_woods', 'start'
-				end if
+				end
 			end
 		else
 			minut += 90
@@ -147,8 +147,8 @@ if $ARGS[0] = 'shooting_practice':
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andrei_shooting.jpg"></center>'
 					'You try to get Andrei''s attention but he kind of ignores you. When you keep on trying he waves his hand in a gesture for you to go away.'
 					act 'Further': gt 'swamp_woods', 'start'
-				end if
-			end if
+				end
+			end
 		end
 
 		act 'Walk away': gt 'swamp_woods', 'start'
@@ -234,8 +234,8 @@ if $ARGS[0] = 'shooting_practice':
 
 					act 'Further': gt 'swamp_woods', 'shooting_practice', 'practice'
 				end
-			end if
-		end if
+			end
+		end
 
 		act 'Walk away': gt 'swamp_woods', 'start'
 	end

+ 10 - 10
locations/swamp_yard.qsrc

@@ -35,7 +35,7 @@ if $ARGS[0] = 'start':
 		if hunters_were_met = 0:
 			if hunters_outside = 1:
 				'You spot some unfamiliar <a href="exec: gt ''hunters'', ''start'' ">people</a> standing in front of the hut.'
-			end if
+			end
 		else
 			if hunters_outside = 1:
 				if hunters_evening = 1:
@@ -46,23 +46,23 @@ if $ARGS[0] = 'start':
 						'You see hunters are sitting by the <a href="exec: gt ''swamp_yard'', ''campfire''">campfire</a>'
 					else
 						'You notice the <a href="exec: gt ''hunters'', ''start'' ">hunters</a> standing in the front yard.'
-					end if
-				end if
+					end
+				end
 			else
 				'The camp is quiet, but you can hear the hunters'' voices from the hut.'
-			end if
-		end if
+			end
+		end
 	else
 		if hunters_were_met = 0:
 			'The camp is quiet. There''s nobody here right now, but the camp looks like it is likely in use and not abandoned.'
 		else
 			if hunters_hunting = 1:
 				'The hunters are most likely out hunting for a couple hours. You have the camp to yourself!'
-			else:
+			else
 				'The camp is quiet. The hunters are asleep in the hut.'
-			end if
-		end if
-	end if
+			end
+		end
+	end
 
 
 
@@ -131,7 +131,7 @@ if $ARGS[0] = 'campfire':
 					else
 						minut += 20
 						'The hunters do not even bother to answer you. You simply sit in awkward silence for twenty minutes before getting to to other business'
-					end if
+					end
 				end
 
 				act 'Further': gt 'swamp_yard', 'campfire'

+ 5 - 5
locations/swamphouse.qsrc

@@ -53,8 +53,8 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 				'The <a href="exec: gs ''swamphouse'', ''hunterstable''">hunters</a> are sitting around the table.'
 			else
 				'You see the <a href="exec: gs ''swamphouse'', ''huntersrelax''">hunters</a> hanging out in the hut.'
-			end if
-		end if
+			end
+		end
 	else
 		if hunters_inside = 1:
 			if hunters_drink = 1:
@@ -65,11 +65,11 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 				'You can see three hunters sitting around the table talking.'
 			else
 				'You can see three hunters resting at the table talking.'
-			end if
+			end
 		else
 		   'There''s nobody here right now'
-		end if
-	end if
+		end
+	end
 
 
 	act 'Go outside': minut += 1 & hunter_refuse = 0 & gt 'swamp_yard', 'start'

+ 5 - 5
locations/tatiana_lab.qsrc

@@ -671,7 +671,7 @@ if $ARGS[0] = 'Tatiana':
 						'However, at that moment, to everyone''s surprise, Gustav sneaks up to your side and grabs your hand, placing a roll of bills on it. "Take this, <<$pcs_nickname>>. You succeeded in beating Tatiana''s double, and if not for Alex, the film would be here."'
 						'Gustav just stands there staring at a flabbergasted Tatiana who, after a beat, simply shrugs. "Okay, Gustav, don''t suggest that I am scrimpy or anything... Jeez. I was going to speak to some of the people in the agency on her behalf, but now... . Okay, fine. <<$pcs_nickname>>, I will do it anyway."'
 						gs 'fame', 'city', 'modelling', 10
-					end if
+					end
 				else
 					if pfilmNO = 1:
 						'Tatiana gives you a half-smile, and you understand that she isn''t going to pay you for the Aphrodite job.'
@@ -683,8 +683,8 @@ if $ARGS[0] = 'Tatiana':
 						'"<<$pcs_nickname>>, you''ve failed to bring me the film. Instead, it has ended up in the hands of a powerful magician, who may be planning to use it against us."'
 						'You open your mouth to protest that it isn''t your fault, but before you can, Tatiana raises her hands consolingly.'
 						'"Don''t worry, <<$pcs_nickname>>, you''re not going to leave empty-handed. I''m going to speak to some of the people in the agency on your behalf. It''ll be good for your modelling career."'
-					end if
-				end if
+					end
+				end
 				AlexandriaQW = 6
 				minut +=5
 				gs 'stat'
@@ -698,8 +698,8 @@ if $ARGS[0] = 'Tatiana':
 				act 'Continue':gt 'tatiana_lab', 'Tatiana'
 			end
 		end
-	end if
-end if
+	end
+end
 
 
 if $ARGS[0] = 'Tatianasuctalk':

+ 1 - 1
locations/tatiana_missions.qsrc

@@ -585,7 +585,7 @@ if $ARGS[0] = 'mission2C':
 			act '"I am..."':gt'tatiana_missions','mission2D'
 		end
 	end
-end	if
+end
 
 if $ARGS[0] = 'mission2D':
 	menu_off = 1

+ 1 - 1
locations/yesgorslut.qsrc

@@ -71,7 +71,7 @@ if pav_slut >= 250:
 			if numnpc = 9:
 				!!Vitek
 				'You try to talk with <<$npc_nickname[''A<<numnpc>>'']>>, but he immediately cuts you off: "I don''t talk to sluts, <<$pcs_nickname>>. Fuck off."'
-			else:
+			else
 				'<<$npc_firstname[''A<<numnpc>>'']>> laughs at you when you try to talk to him: "Haha, what''s wrong <<$gnikname>>? Looking for more cocks to suck?"'
 			end
 		else

+ 1 - 1
locations/zsoft_gopskverGorSlut.qsrc

@@ -882,7 +882,7 @@ if $ARGS[0] = 'cumpussy':
 	'<center><video autoplay loop src="images/locations/pavlovsk/park/gop/sex/oral/cum/gif/cump'+rand(1,2)+'.mp4"></video></center>'
 	if $ARGS[1] = 'wanted':
 		'After several minutes of hard fucking, his thrusts grow shorter and more intense. He then slams his cock inside you all the way to the balls, and you feel his warm load being shot inside you.'
-	else:
+	else
 		'Despite your request, he does not pull out and comes inside your quivering snatch. When he pulls out, his load slowly drips out of you while he gives you an indifferent shrug.'
 		'You sigh in frustration. Nevertheless... there''s not a whole lot you can do about it now, and getting angry over it will probably just cause trouble with the guys.'
 	end