Browse Source

Merge remote-tracking branch 'pfffbft_-_Mantequila/phase_1'

KevinSmarts 5 years ago
parent
commit
7c2f7932f3
2 changed files with 5 additions and 9 deletions
  1. 5 2
      locations/hunter_interactions.qsrc
  2. 0 7
      locations/swamphouse.qsrc

+ 5 - 2
locations/hunter_interactions.qsrc

@@ -630,8 +630,11 @@ if $ARGS[0] = 'andrei_quick_fuck':
                 minut -= 10
                 
                 act 'Further':
-                    if $loc = 'swamp_yard': gt 'swamp_yard'
-                    if $loc = 'swamp_woods': gt 'swamp_woods', 'shooting_practice', 'practice'    
+                    if $loc = 'swamp_woods':
+                        gt 'swamp_woods', 'shooting_practice', 'practice'    
+                    else
+                        if $loc = 'swamp_yard': gt 'swamp_yard'
+                    end    
                 end
             end 
 		end

+ 0 - 7
locations/swamphouse.qsrc

@@ -46,13 +46,6 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		'The hunters aren''t here right now'
 	end
 
-	if hour >= 8 and hour < 20: 
-		gs 'swamp_yard', 'daytime_flavor_events'
-	else
-		gs 'swamp_yard', 'nighttime_flavor_events'
-	end
-
-
 	*nl
 	
 	act 'Go outside':