Merge branch 'organ-farm-fix' into 'pregmod-master'

Fix organ progress updates

See merge request pregmodfan/fc-pregmod!4015

src/uncategorized/endWeek.tw

@@ -59,13 +59,13 @@
 
 <<if $incubatorOrgans.length > 0>>
 <<run $incubatorOrgans.forEach(function(io) {
-	if ($incubatorOrgans[io].weeksToCompletion > 0) {
+	if (io.weeksToCompletion > 0) {
 		if ($organFarmUpgrade == 3) {
-			$incubatorOrgans[io].weeksToCompletion -= 4;
+			io.weeksToCompletion -= 4;
 		} else if ($organFarmUpgrade == 2) {
-			$incubatorOrgans[io].weeksToCompletion -= 2;
+			io.weeksToCompletion -= 2;
 		} else {
-			$incubatorOrgans[io].weeksToCompletion--;
+			io.weeksToCompletion--;
 		}
 	}
 })>>
@@ -74,13 +74,13 @@
 /* for potential future use
 <<if $nurseryOrgans.length > 0>>
 <<run $nurseryOrgans.forEach(function(no) {
-	if ($nurseryOrgans[no].weeksToCompletion > 0) {
+	if (no.weeksToCompletion > 0) {
 		if ($organFarmUpgrade == 3) {
-			$nurseryOrgans[no].weeksToCompletion -= 4;
+			no.weeksToCompletion -= 4;
 		} else if ($organFarmUpgrade == 2) {
-			$nurseryOrgans[no].weeksToCompletion -= 2;
+			no.weeksToCompletion -= 2;
 		} else {
-			$nurseryOrgans[no].weeksToCompletion--;
+			no.weeksToCompletion--;
 		}
 	}
 })>>
@@ -89,10 +89,10 @@
 
 <<if $limbs.length > 0>>
 <<run $limbs.forEach(function(l) {
-	if ($limbs[l].weeksToCompletion > 0) {
-		$limbs[l].weeksToCompletion--;
+	if (l.weeksToCompletion > 0) {
+		l.weeksToCompletion--;
 	}
-	if ($limbs[l].weeksToCompletion == 0) {
+	if (l.weeksToCompletion == 0) {
 		$limbsCompleted++;
 	}
 })>>