Merge remote-tracking branch 'Rin_the_Trap/master'

locations/nichChore.qsrc

@@ -27,9 +27,9 @@ if $ARGS[0] = 'inspect':
 		$nichChoreLoc = 'hallway'
 		$nichChoreActCaption = 'Inspect Hallway'
 		
-		nichTimeBQuick		= 10
-		nichTimeBNormal		= 20
-		nichTimeBDiligent	= 30
+		nichTimeBQuick		= (10*(200-pcs_cleaning))/200
+		nichTimeBNormal		= (20*(200-pcs_cleaning))/200
+		nichTimeBDiligent	= (30*(200-pcs_cleaning))/200
 		
 		if nichChoreState[nichChoreID] = 0:
 			$nichTempPic = 'images/locations/city/citycenter/nichApartment/hallway.jpg'
@@ -56,9 +56,9 @@ if $ARGS[0] = 'inspect':
 		$nichChoreLoc = 'hallway'
 		$nichChoreActCaption = 'Inspect Room'
 		
-		nichTimeBQuick		= 10
-		nichTimeBNormal		= 20
-		nichTimeBDiligent	= 30
+		nichTimeBQuick		= (10*(200-pcs_cleaning))/200
+		nichTimeBNormal		= (20*(200-pcs_cleaning))/200
+		nichTimeBDiligent	= (30*(200-pcs_cleaning))/200
 		
 		if nichChoreState[nichChoreID] = 0:
 			$nichTempPic = 'images/locations/city/citycenter/nichApartment/bathroomGuest.jpg'
@@ -85,8 +85,8 @@ if $ARGS[0] = 'inspect':
 		$nichChoreLoc = 'servant'
 		$nichChoreActCaption = 'Inspect Room'
 		
-		nichTimeBQuick		= 5
-		nichTimeBNormal		= 10
+		nichTimeBQuick		= (5*(200-pcs_cleaning))/200
+		nichTimeBNormal		= (10*(200-pcs_cleaning))/200
 		nichTimeBDiligent	= -1
 		
 		if nichChoreState[nichChoreID] = 0:
@@ -114,8 +114,8 @@ if $ARGS[0] = 'inspect':
 		$nichChoreLoc = 'bathServant'
 		$nichChoreActCaption = 'Inspect Room'
 		
-		nichTimeBQuick		= 10
-		nichTimeBNormal		= 20
+		nichTimeBQuick		= (10*(200-pcs_cleaning))/200
+		nichTimeBNormal		= (20*(200-pcs_cleaning))/200
 		nichTimeBDiligent	= -1
 		
 		if nichChoreState[nichChoreID] = 0:
@@ -143,9 +143,9 @@ if $ARGS[0] = 'inspect':
 		$nichChoreLoc = 'bathServant'
 		$nichChoreActCaption = 'Inspect Laundry'
 		
-		nichTimeBQuick		= 60
-		nichTimeBNormal		= 120
-		nichTimeBDiligent	= 240
+		nichTimeBQuick		= (45*(200-pcs_cleaning))/200
+		nichTimeBNormal		= (90*(200-pcs_cleaning))/200
+		nichTimeBDiligent	= (180*(200-pcs_cleaning))/200
 		
 		if nichChoreState[nichChoreID] = 0:
 			$nichTempPic = 'images/locations/city/citycenter/nichApartment/laundry0.jpg'
@@ -174,8 +174,8 @@ if $ARGS[0] = 'inspect':
 		$nichChoreLoc = 'tanya'
 		$nichChoreActCaption = 'Inspect Room'
 		
-		nichTimeBQuick		= 5
-		nichTimeBNormal		= 10
+		nichTimeBQuick		= (5*(200-pcs_cleaning))/200
+		nichTimeBNormal		= (10*(200-pcs_cleaning))/200
 		nichTimeBDiligent	= -1
 		
 		if nichChoreState[nichChoreID] = 0:
@@ -203,9 +203,9 @@ if $ARGS[0] = 'inspect':
 		$nichChoreLoc = 'masterbath'
 		$nichChoreActCaption = 'Inspect Room'
 		
-		nichTimeBQuick		= 20
-		nichTimeBNormal		= 40
-		nichTimeBDiligent	= 60
+		nichTimeBQuick		= (20*(200-pcs_cleaning))/200
+		nichTimeBNormal		= (40*(200-pcs_cleaning))/200
+		nichTimeBDiligent	= (60*(200-pcs_cleaning))/200
 		
 		if nichChoreState[nichChoreID] = 0:
 			$nichTempPic = 'images/locations/city/citycenter/nichApartment/bathroomMaster.jpg'
@@ -231,8 +231,8 @@ if $ARGS[0] = 'inspect':
 		$nichChoreLoc = 'master'
 		$nichChoreActCaption = 'Inspect Room'
 		
-		nichTimeBQuick		= 5
-		nichTimeBNormal		= 10
+		nichTimeBQuick		= (5*(200-pcs_cleaning))/200
+		nichTimeBNormal		= (10*(200-pcs_cleaning))/200
 		nichTimeBDiligent	= -1
 		
 		if nichChoreState[nichChoreID] = 0:
@@ -260,9 +260,9 @@ if $ARGS[0] = 'inspect':
 		$nichChoreLoc = 'living'
 		$nichChoreActCaption = 'Inspect Room'
 		
-		nichTimeBQuick		= 30
-		nichTimeBNormal		= 60
-		nichTimeBDiligent	= 120
+		nichTimeBQuick		= (30*(200-pcs_cleaning))/200
+		nichTimeBNormal		= (60*(200-pcs_cleaning))/200
+		nichTimeBDiligent	= (120*(200-pcs_cleaning))/200
 		
 		if nichChoreState[nichChoreID] = 0:
 			$nichTempPic = 'images/locations/city/citycenter/nichApartment/living.jpg'
@@ -288,9 +288,9 @@ if $ARGS[0] = 'inspect':
 		$nichChoreLoc = 'kitchen'
 		$nichChoreActCaption = 'Inspect Room'
 		
-		nichTimeBQuick		= 30
-		nichTimeBNormal		= 60
-		nichTimeBDiligent	= 120
+		nichTimeBQuick		= (30*(200-pcs_cleaning))/200
+		nichTimeBNormal		= (60*(200-pcs_cleaning))/200
+		nichTimeBDiligent	= (120*(200-pcs_cleaning))/200
 		
 		if nichChoreState[nichChoreID] = 0:
 			$nichTempPic = 'images/locations/city/citycenter/nichApartment/kitchen.jpg'
@@ -316,9 +316,9 @@ if $ARGS[0] = 'inspect':
 		$nichChoreLoc = 'study'
 		$nichChoreActCaption = 'Inspect Room'
 		
-		nichTimeBQuick		= 15
-		nichTimeBNormal		= 30
-		nichTimeBDiligent	= 60
+		nichTimeBQuick		= (15*(200-pcs_cleaning))/200
+		nichTimeBNormal		= (30*(200-pcs_cleaning))/200
+		nichTimeBDiligent	= (60*(200-pcs_cleaning))/200
 		
 		if nichChoreState[nichChoreID] = 0:
 			$nichTempPic = 'images/locations/city/citycenter/nichApartment/study.jpg'