1
0
Pārlūkot izejas kodu

Revert "[added] Constantly available food in the swamp hut"

This reverts commit 4a4a4c47a2b443d7243edd02d906d5b8a99efcec.
3xpurt 5 gadi atpakaļ
vecāks
revīzija
eed7b1f127
2 mainītis faili ar 68 papildinājumiem un 52 dzēšanām
  1. 68 30
      locations/swamp_yard.qsrc
  2. 0 22
      locations/swamphouse.qsrc

+ 68 - 30
locations/swamp_yard.qsrc

@@ -129,29 +129,6 @@ $rescued_from_swamp = {
 	end
 }
 
-!TODO: Redo the events here after working on the other locations
-$confronted_after_drunken_gangbang = {
-	if huntdanceslut = 1:
-		cla
-		*clr
-		minut+=5
-		gs 'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andreihanter.jpg"></center>'
-		'As soon as you walk into the yard, you immediately walk up to Andrei.'
-		'"I need to talk to you, <<$pcs_nickname>>," he said. "Can you recall what happened last night?"'
-		'"Well... uh... Yes, I think I can..." you reply, blushing, staring down at the ground.'
-		'"I used to say that you look just like your mother," said Andrei looking at you. "After your little show yesterday, as it turns out, the resemblance doesn''t stop at just the looks."'
-		'Andrei paused looking at you while you try to collect your thoughts to understand what he''s trying to imply.'
-		'"To be frank, you''re as slutty as your mother was in her youth, the apple doesn''t fall far away from the tree as they say..." he chuckles. "Take it as a compliment."'
-		'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?"'
-
-		if pcs_dom > 0 and alko < 8:act'Refuse':huntdanceslut = 3 & gt 'hunters', 'start'
-		act'Agree':huntdanceslut = 2 & gt 'hunters', 'start'
-	end
-}
-
 $meet_hunters_after_rescue = {
 	*clr & cla
 	minut += 5
@@ -167,6 +144,7 @@ $meet_hunters_after_rescue = {
 	!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'
 
 	'You see the three men talking to each other. They stop and approach you after noticing you have calmed down.'
@@ -227,6 +205,7 @@ $andrei_quick_fuck = {
 			'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
@@ -234,9 +213,13 @@ $andrei_quick_fuck = {
 				'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'
 				
 				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'
@@ -253,19 +236,21 @@ $igor_demonstration = {
 		hunter_sexual_comfort += 3
 		hunter_collective_opinion += 7
 							
-		!TODO: Mp4 here 
+		!TODO: Gif here 
+!!julzor: we don''t use gifs, only mp4
 		'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'   
 	end
-
+!!julzor: missing : after the end						
 	act 'Give him a hands on demonstration':
 		cla & *clr
 		hunter_sexual_comfort += 5
@@ -278,6 +263,7 @@ $igor_demonstration = {
 		'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'
 
@@ -295,7 +281,9 @@ $skirt_breeze = {
 	'"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'
 	
@@ -340,6 +328,7 @@ $naked_encounter = {
 		act'Remain naked':
 			*clr & cla
 			gs 'arousal', 'flash', 5, 'exhibitionism'
+!!julzor: added missing arousal end
 			gs 'arousal', 'end'
 			hunterknowday = daystart
 			gs 'stat'
@@ -382,11 +371,11 @@ $naked_encounter = {
 						!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'
 
@@ -395,7 +384,6 @@ $naked_encounter = {
 					end
 
 					act 'Lightly push him away':
-						*clr & cla
 						hunter_sexual_comfort -= 3
 						hunter_collective_opinion += 3
 						
@@ -403,6 +391,7 @@ $naked_encounter = {
 						'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'
 
@@ -437,6 +426,7 @@ $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>'
@@ -483,13 +473,13 @@ $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
 $hunter_convo_sexworker = {
 	if huntersKnow = 1 and hunters_check = 0:
-		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterstalk.jpg"></center>'
 		'While walking around the yard you hear the hunters discussing something excitedly.'
 		
@@ -497,6 +487,7 @@ $hunter_convo_sexworker = {
 		
 		!TODO: They do not just shut up when they notice Sveta, there is an opinion or comfort check
 		if fame_sexind > 10 and city_modelling > 30 and huntersknowfoto = 0 and convo_rng_roll = 1:
+			*clr & cla
 			minut += 5
 			hunters_check = 1
 			huntersknowfoto = 1
@@ -511,6 +502,7 @@ $hunter_convo_sexworker = {
 			act 'Further':gt 'swamp_yard'
 		
 		elseif stripdancesum > 0 and huntersknowstrip = 0 and convo_rng_roll = 2:
+			*clr & cla
 			minut += 5
 			hunters_check = 1
 			huntersknowstrip = 1
@@ -528,6 +520,7 @@ $hunter_convo_sexworker = {
 			act 'Further':gt 'swamp_yard'
 
 		elseif film > 0 and huntersknowfilm = 0 and convo_rng_roll = 3:
+			*clr & cla
 			minut += 5
 			hunters_check = 1
 			huntersknowfilm = 1
@@ -542,6 +535,7 @@ $hunter_convo_sexworker = {
 			act 'Further':gt 'swamp_yard'
 		
 		elseif gadriver_gang > 0 and convo_rng_roll > 45:
+			*clr & cla
 			minut += 5
 			huntersRape = 1
 			hunters_check = 1
@@ -553,6 +547,7 @@ $hunter_convo_sexworker = {
 
 			act 'Further':gt 'swamp_yard'
 		else
+			*clr & cla
 			minut += 5
 
 			'"I swear, it was a large orangutan standing by the trees watching us! I also saw those massive prints the other day!" you overhear Andrei'
@@ -618,7 +613,48 @@ 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	
-	
+	!the conversation after a drunken Striptease and fuck GG hunters
+	if huntdanceslut = 1:
+		cla
+		*clr
+		minut+=5
+		gs 'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andreihanter.jpg"></center>'
+		'As soon as you walk into the yard, you immediately walk up to Andrei.'
+		'"I need to talk to you, <<$pcs_nickname>>," he said. "Can you recall what happened last night?"'
+		'"Well... uh... Yes, I think I can..." you reply, blushing, staring down at the ground.'
+		'"I used to say that you look just like your mother," said Andrei looking at you. "After your little show yesterday, as it turns out, the resemblance doesn''t stop at just the looks."'
+		'Andrei paused looking at you while you try to collect your thoughts to understand what he''s trying to imply.'
+		'"To be frank, you''re as slutty as your mother was in her youth, the apple doesn''t fall far away from the tree as they say..." he chuckles. "Take it as a compliment."'
+		'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'
+	end
+	!the conversation after the rape GG hunters
+	if huntersRape = 4:
+		cla
+		*clr
+		minut+=5
+		huntersKnowSlut = 2
+		huntersRape = 5
+		gs 'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andreihanter.jpg"></center>'
+		'As soon as you walk into the yard, you immediately walk up to Andrei.'
+		'"I need to talk to you, <<$pcs_nickname>>," he said. "Do you understand what happened yesterday and that you should keep quiet about it?"'
+		'You shamelessly nodded.'
+		'"What happened to you is no one others fault but your own, you wanted to get fucked," said Andrei looking sternly at you. "Don''t pull off anything stupid like that anymore."'
+		'"I wouldn''t advise you to call the police," he adds. "Sergei will cover for me. In fact, we''ll just cover for each other, and no one will believe your lying pretty ass. Understand?"'
+		'You''re too afraid to look straight at Andrei, you just nod.'
+		'"Perfect," said Andrei, moving away from you.'
+
+		act 'Go':gt 'swamp_yard'
+	end
+
 	!sex with Igor
 	if hunters > 0 and huntersIgorLove > 0 and huntersIgorQw >= 10 and swiss_army_random_number = 4 and huntersIgorsex = 0:
 		*clr & cla
@@ -786,6 +822,7 @@ 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:
@@ -793,6 +830,7 @@ if hour >= 8 and hour < 20:
 		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:

+ 0 - 22
locations/swamphouse.qsrc

@@ -49,24 +49,6 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	*nl
 	
 	act 'Go outside':hunter_refuse = 0 & minut += 5 & gt 'swamp_yard'
-	act 'Eat dried meat and crackers':
-		gs 'food', 'm_meal'
-		cla & *clr
-		!!TODO: Add image here
-	
-		'You munch on some dried meat and salted crackers. Not a full hot meal by any means but it's better than nothing'
-		pcs_hydra -= 10
-
-		if pcs_energy >= 80:
-				fat += 1
-				pcs_energy += 10
-		else
-			pcs_energy += 15
-		end
-
-		gs 'stat'
-		act 'Get up from the table': gt 'swamphouse', 'start'
-		
 	if edahot > 0:
 		act 'Eat mushroom soup':
 			gs 'food', 'm_meal'
@@ -120,7 +102,6 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		end
 	end
 	!re-arrange it, there should be no logic error now by illume
-	!TODO: Rearrange again, add sexual comfort triggers and stuff
 	if $clothingworntype ! 'nude' and clothesAtLocation = 0:
 		!have cloth, or rag on
 		act 'Get undressed':
@@ -185,7 +166,6 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		end
 	end
 
-	!TODO: Add more masturbation mechanics
 	if pcs_horny >= 50 and hunters = 0 or pcs_horny >= 50 and hunters = 1 and hour >= 8 and hour < 20:
 		act 'Masturbate':
 			gt 'selfplay', 'start'
@@ -216,8 +196,6 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			gt 'lact_bp', 'bp_milking'
 		end
 	end
-
-	!TODO: Change up this event or at least the pic it's silly
 	if klismaday ! daystart and swamp_enema = 1 and analplugin = 0 and hour >= 8 and hour < 20 and hunters = 1 or klismaday ! daystart and swamp_enema = 1 and analplugin = 0 and hunters = 0:
 		act 'Perform an enema':
 			cla