Browse Source

Revert "[added] Meal table at swamp hut so that Sveta can eat like civilized people"

This reverts commit b7d3233b412f8cb1a33968419562879458868064.
3xpurt 5 years ago
parent
commit
7ca3ceaee3
1 changed files with 68 additions and 78 deletions
  1. 68 78
      locations/swamphouse.qsrc

+ 68 - 78
locations/swamphouse.qsrc

@@ -49,11 +49,76 @@ 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
 	
-	if huntersdrink = 0:
-		act 'Sit on the table': gt 'swamphouse', 'meal_table'
-	end
+		'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'
+			cla
+			*clr
+			edahot -= 1
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/soup.jpg"></center>'
+			*nl
+
+			if pcs_energy >= 100:
+				fat += 3
+				'After having a healthy serving of mushroom soup, you feel stuffed.'
+			elseif pcs_energy >= 80:
+				fat += 1
+				pcs_energy += 30
+				'You force yourself to have another sip of the mushroom soup.'
+			else
+				pcs_energy += 20
+				'You''re enjoing some warm mushroom soup. Just what you needed.'
+			end
+			if pcs_hydra >= 100:
+				pcs_hydra += 20
+			else
+				pcs_hydra += 40
+			end
+			*nl
+			if edahot > 0:
+				'There''s <<edahot>> '+iif(edahot > 1, 'servings','serving')+' of soup left in the pot'
+			else
+				'You have finished the last of the soup, the pot is empty.'
+			end
+			gs 'stat'
+			act 'Get up from the table': gt 'swamphouse', 'start'
+		end
+	end
+	if bilberry > 0:
+		act 'Eat berries':
+			cla
+			*clr
+			minut += 20
+			pcs_energy += 10
+			pcs_hydra += 10
+			bilberry -= 1
+			pcs_willpwr += 5
+			pcs_health += 5
+			pcs_mood += 10
+			gs 'stat'
+			'<center><img src="images/locations/gadukino/forest/bilberry.jpg"></center>'
+			'You ate a few berries.'
+			act 'Continue': gt 'swamphouse', 'start'
+		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:
@@ -1780,81 +1845,6 @@ if $ARGS[0] = 'hunterstable':
 
 end
 
-if $ARGS[0] = 'meal_table':
-	cla & *clr
-	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'
-			cla
-			*clr
-			edahot -= 1
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/soup.jpg"></center>'
-			*nl
-
-			if pcs_energy >= 100:
-				fat += 3
-				'After having a healthy serving of mushroom soup, you feel stuffed.'
-			elseif pcs_energy >= 80:
-				fat += 1
-				pcs_energy += 30
-				'You force yourself to have another sip of the mushroom soup.'
-			else
-				pcs_energy += 20
-				'You''re enjoing some warm mushroom soup. Just what you needed.'
-			end
-			if pcs_hydra >= 100:
-				pcs_hydra += 20
-			else
-				pcs_hydra += 40
-			end
-			*nl
-			if edahot > 0:
-				'There''s <<edahot>> '+iif(edahot > 1, 'servings','serving')+' of soup left in the pot'
-			else
-				'You have finished the last of the soup, the pot is empty.'
-			end
-			gs 'stat'
-			act 'Get up from the table': gt 'swamphouse', 'start'
-		end
-	end
-	if bilberry > 0:
-		act 'Eat berries':
-			cla
-			*clr
-			minut += 20
-			pcs_energy += 10
-			pcs_hydra += 10
-			bilberry -= 1
-			pcs_willpwr += 5
-			pcs_health += 5
-			pcs_mood += 10
-			gs 'stat'
-			'<center><img src="images/locations/gadukino/forest/bilberry.jpg"></center>'
-			'You ate a few berries.'
-			act 'Continue': gt 'swamphouse', 'start'
-		end
-	end
-	act 'Get off the table': gt 'swamphouse', 'start'
-end
-
 if $ARGS[0] = 'huntersrelax':
 	cla
 	*clr