Ver código fonte

[added] some actions to swamp_yard
[fixed] conditions for action, and return location in swamphouse.

3xpurt 5 anos atrás
pai
commit
14eb8fa9c8
2 arquivos alterados com 9 adições e 5 exclusões
  1. 3 1
      locations/swamp_yard.qsrc
  2. 6 4
      locations/swamphouse.qsrc

+ 3 - 1
locations/swamp_yard.qsrc

@@ -126,7 +126,9 @@ if $ARGS[0] = 'start':
 	if dirty_swamp_yard > 10:act 'Go out in the yard':hunterslut -= 1 & dynamic $dirty_swamp_yard
 
 	act 'Approach the firepit': gt 'swamp_yard', 'campfire'
-	act 'Explore the nearby woods': minut += 10 & gt 'swamp_woods', 'start'
+	act 'Visit the spring': gt 'swampspring'
+	act 'Visit the creek': gt 'backwater'
+	act 'Explore the woods': minut += 10 & gt 'swamp_woods', 'start'
 
 	! Hunters rescued from a swamp GG
 	if hunterhelp = 1:

+ 6 - 4
locations/swamphouse.qsrc

@@ -174,11 +174,11 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if stovefire = 0 or meat_stew = 0 or mushroom_soup = 0 act 'Use the rickety stove': gt 'swamphouse', 'stove'
+	if stovefire = 0 or (meat_stew = 0 and raw_meat > 0) or (mushroom_soup = 0 and boletus > 0): act 'Use the rickety stove': gt 'swamphouse', 'stove'
 	if pcs_energy < 80: act 'Grab something to eat': gs 'swamphouse', 'food'
 	if bucket > 0 and pcs_hydra < 80: act 'Grab a drink of water': gt 'swamphouse', 'bucket'
-	if bucket > 0 or pcs_hairbsh = 0:: act 'Use the wash basin': gt 'swamphouse', 'washstand'
-	if hotwater = 1 and pcs_sweat > 19: act 'Bathe in the old tub': gt 'swamphouse', 'tub'
+	if bucket > 0 and pcs_hairbsh = 0: act 'Use the wash basin': gt 'swamphouse', 'washstand'
+	if hotwater = 1 and $clothingworntype = 'nude' and pcs_sweat > 19: act 'Bathe in the old tub': gt 'swamphouse', 'tub'
 	if dirty_swamphouse > 25:act 'Clean the hut':hunterslut -= 1 & gt 'swamphouse', 'dirty_swamphouse'
 
 	act 'Relax on the couch': gt 'bed', 'start'
@@ -452,7 +452,7 @@ if $ARGS[0] = 'stove':
 			act 'Continue': gt 'swamphouse', 'stove'
 		end
 	end
-	gs 'swamphouse', 'food'
+	act 'Grab something to eat': gs 'swamphouse', 'food'
 end
 
 if $ARGS[0] = 'food':
@@ -528,6 +528,8 @@ end
 if $ARGS[0] = 'washstand':
 	cla
 	*clr
+	$loc = 'swamphouse'
+	$metka = 'washstand'
 	$metkaM = 'washstand'
 	$locM = 'swamphouse'
 	menu_off = 1