Browse Source

repeated the changes to the upgraded rooms and added an alarm clock to the bedroom

julzor 6 years ago
parent
commit
2039de2bb1
2 changed files with 5 additions and 10 deletions
  1. 2 4
      locations/bedr2x
  2. 3 6
      locations/sitr2x

+ 2 - 4
locations/bedr2x

@@ -26,7 +26,8 @@ else
 end
 '<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/bedr2.jpg"></center>'
 if pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0:gt'tobiQW','start'
-	'Bright and beautiful bedroom, with modern and stylish furniture. The room is dominated by <a href="exec:GT ''bed'',''start''">full sized bed</a>. Near the entrance stands a modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">organize your clothes</a>). Against the wall is a table with a <a href="exec:GT ''mirror'',''start''">mirror</a> above it.'
+'Bright and beautiful bedroom, with modern and stylish furniture. The room is dominated by <a href="exec:GT ''bed'',''start''">full sized bed</a> with an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a>.' 
+'Near the entrance stands a modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">organize your clothes</a>). Against the wall is a table with a <a href="exec:GT ''mirror'',''start''">mirror</a> above it.'
 if komp = 1:'On the bedside table is your <a href="exec:GT ''Komp'',''start''">notebook</a>.'
 if husbandrinkday = daystart:
 	if husbanstrapon = 1:'Your husband is still passed out drunk, after you used a anal plug on him.'
@@ -173,9 +174,6 @@ if husbandrink = 10 and hour > 20 and hour < 23 and husbanstrapon = 0:
 	end
 end
 
-dynamic $wearpan
-dynamic $removepan
-
 if sick >= 1:
 	act 'Go to bed rest (disease)':
 		cla

+ 3 - 6
locations/sitr2x

@@ -35,8 +35,6 @@ end
 
 'modern <a href="exec:GT ''stol'',''start''">curbstones</a>'
 
-
-
 if obruch > 0:'In the corner stands a hoop.'
 if skak > 0:'On a shelf is a jump rope.'
 if bookYog > 0:'The cabinet has a book on yoga and a yoga mat'
@@ -68,7 +66,6 @@ end
 
 gs'subkid'
 
-
 if student > 0 and kursovik < 100:
 	act 'Write kursovik 1 h':
 		cla
@@ -85,9 +82,7 @@ if student > 0 and kursovik < 100:
 	end
 end
 
-gs 'events', 'read'
-
-act 'Go out to the balcony': gt 'balkon','start'
+act 'Go out on the balcony': gt 'balkon','start'
 if zoo >= 6 and sobaka ! 0:
 	if husband > 0 and husbandrink ! 10:
 		if week > 5 or week < 6 and hour > 17:
@@ -302,6 +297,8 @@ if zoo >= 6 and sobaka ! 0:
 	end
 end
 
+gs 'events', 'read'
+
 if dildo > 0 and pcs_horny >= 50:
 	act 'Masturbate':
 		cla