Преглед на файлове

[Added] all kitchens in the apartments have the same options in the same order.

Alaratt преди 3 години
родител
ревизия
5e830ed30c
променени са 3 файла, в които са добавени 19 реда и са изтрити 14 реда
  1. 8 7
      locations/kuhr.qsrc
  2. 8 6
      locations/kuhr2x.qsrc
  3. 3 1
      locations/pav_shared_apt.qsrc

+ 8 - 7
locations/kuhr.qsrc

@@ -73,13 +73,6 @@ if husband > 0 and husbandrink ! 10:
 	if hour = 7 or hour = 17:'<a href="exec:gt ''husb'', ''start''">Your husband is eating at the table.</a>'
 end
 
-dynamic $fill_bottle
-dynamic $edaD
-dynamic $pranik
-dynamic $fatdel
-dynamic $driwater
-
-
 if husband > 0 and husbanday > 0 and huseatday ! daystart and eda >= 2:
 	act 'Cook a meal for your husband and yourself, 2 servings (1:00)':
 		cla
@@ -96,6 +89,14 @@ if husband > 0 and husbanday > 0 and huseatday ! daystart and eda >= 2:
 	end
 end
 
+dynamic $edasnack
+dynamic $sandwich
+dynamic $driwater
+dynamic $dritea
+dynamic $fill_bottle
+dynamic $edaD
+dynamic $pranik
+dynamic $fatdel
 dynamic $lekarstvo
 dynamic $vitamin
 

+ 8 - 6
locations/kuhr2x.qsrc

@@ -77,12 +77,6 @@ if husband > 0 and husbandrink ! 10:
 	end
 end
 
-dynamic $fill_bottle
-dynamic $edaD
-dynamic $pranik
-dynamic $fatdel
-dynamic $driwater
-
 if husband > 0 and husbanday > 0 and huseatday ! daystart and eda >= 2:
 	act 'Cook meal for your husband and yourself (1hr, 2 potions of food)':
 		cla
@@ -103,6 +97,14 @@ if husband > 0 and husbanday > 0 and huseatday ! daystart and eda >= 2:
 	end
 end
 
+dynamic $edasnack
+dynamic $sandwich
+dynamic $driwater
+dynamic $dritea
+dynamic $fill_bottle
+dynamic $edaD
+dynamic $pranik
+dynamic $fatdel
 dynamic $lekarstvo
 dynamic $vitamin
 

+ 3 - 1
locations/pav_shared_apt.qsrc

@@ -641,13 +641,15 @@ if $ARGS[0] = 'kitchen':
 	if hour = 6 or hour = 18:'<a href="exec: gt ''pav_shared_apt'', ''cookForGuys''">Cook meals for the guys (1:30)</a>'
 	
 	dynamic $edasnack
+	dynamic $sandwich
 	dynamic $driwater
 	dynamic $dritea
 	dynamic $fill_bottle
-	dynamic $pranik
 	dynamic $edaD
+	dynamic $pranik
 	dynamic $fatdel
 	dynamic $lekarstvo
+	dynamic $vitamin
 
 	act 'Leave':gt 'pav_shared_apt', 'start'
 end