Browse Source

committing updates to repo

hornguy6 2 years ago
parent
commit
bf9e06cd82
1 changed files with 10 additions and 23 deletions
  1. 10 23
      locations/albinahome.qsrc

+ 10 - 23
locations/albinahome.qsrc

@@ -62,23 +62,17 @@ if $ARGS[0] = 'hallway':
 	elseif AlbinaQW['visiting'] = 0:
 		!! Entering the house and getting random chances for events/being met by random household member
 		AlbinaQW['visiting'] = 1
-		AlbinaQW['event'] = 1
 		temp = iif((month < 9) and (month > 5) and (week = 3 or week = 6), rand(1, 12), rand(1,10)) 
-		if temp < 5 or temp > 10: AlbinaQW['event'] = 1
+		if temp < 3 or temp > 10: AlbinaQW['event'] = 1
 		if temp = 1:
-			!! Random House Events
-			gt 'albina_house_events', 'start'
-		elseif temp = 2:
-			!! Random House Events
-			gt 'albina_house_events', 'start1'
-		elseif temp = 3:
 			!! Lazar Sex Event
 			gt 'albina_lazar_sex', 'lazar_start'
-		elseif temp = 4:
+		elseif temp = 2:
 			!! hot tub
 			gt 'albina_house_events', 'hot_tub1'
-		elseif temp = 5 and temper < 10:
+		elseif temp = 3 and temper < 10:
 			!! swim winter
+			AlbinaQW['event'] = 1
 			gt 'albina_house_events', 'swim_winter2'
 		elseif temp = 11:
 			!! Mom Event
@@ -87,7 +81,6 @@ if $ARGS[0] = 'hallway':
 			!! Mom Albina Event
 			gt 'albina_mother_events', 'Sunbathing with Albina'
 		else
-			AlbinaQW['event'] = 0
 			!! Greeted by maid(Wed or Sat) or Mother(Zoya) or Albina
 			if week = 3 or week = 6:
 				!! maid greeting sveta at front door
@@ -174,18 +167,12 @@ if $ARGS[0] = 'bedroom':
 	if AlbinaQW['event'] = 0:
 		AlbinaQW['event'] = 1
 
-		AlbinaQW['activities'] = rand(1,3)
-		if AlbinaQW['activities'] = 1:
-			if month >=11 and month <= 12 or month >=1 and month <=3:
-	!!			if rand(1,2) = 1:
-					gt'albina_house_events','swim_winter1'
-	!!			else
-	!!				gt'albina_house_events','swim_winter2'
-	!!			end
-			else
-				gt'albina_house_events','swim_summer1'
-			end
-		end
+		if month >=11 or month <=3:
+            AlbinaQW['activities'] = rand(1,3)
+            if AlbinaQW['activities'] = 1:
+                gt'albina_house_events','swim_winter1'
+            end
+        end
 		if AlbinaQW['extra'] ! daystart: 
 			if rand(0,10) = 0: 
 				gt 'albina_house_events','dancing'