Browse Source

[fixed] masseuse payment issues

hornguy6 3 years ago
parent
commit
59de918088
3 changed files with 7 additions and 1 deletions
  1. 4 0
      locations/cikl.qsrc
  2. 1 0
      locations/masseuse_work.qsrc
  3. 2 1
      locations/salon.qsrc

+ 4 - 0
locations/cikl.qsrc

@@ -9,6 +9,10 @@ if masseuse['jobtype'] < 1:
 	masseuse['<<week>>_shift_3'] = 0
 end
 
+if masseuse['jobtype'] > 0 and week = 5 and masseuse['paycheck'] > 0:
+	masseuse['payday'] = 1
+end
+
 if masseuse['<<week>>_shift_1'] ! 0 or masseuse['<<week>>_shift_2'] ! 0 or masseuse['<<week>>_shift_3'] ! 0:
 	masseuse['missed_shift2'] = 1
 end

+ 1 - 0
locations/masseuse_work.qsrc

@@ -23,6 +23,7 @@ if $ARGS[0] = 'shift_start':
 		masseuse['<<week>>_shift_3'] = 2
 	end
 	if masseuse['late'] = 1:
+		masseuse['late'] = 0
 		masseuse['weeks_pay'] += 3
 	else
 		masseuse['weeks_pay'] += 4

+ 2 - 1
locations/salon.qsrc

@@ -92,7 +92,7 @@ if $ARGS[0] = 'receptionist':
 		act'Can I set my schedule for the week?':gt'masseuse_schedule','start'
 		act'I want to change jobs':gt'salon','job_change'
 		act'I''d like to quit':gt'salon','resignation'
-		if masseuse['paycheck'] > 0:
+		if masseuse['payday'] > 0:
 			act'I''m here for my paycheck':gt'salon','payday'
 		end
 	end
@@ -852,6 +852,7 @@ if $ARGS[0] = 'payday':
 	elseif masseuse['jobtype'] > 2:
 		masseuse['sex_money_earned'] += masseuse['paycheck']
 	end
+	masseuse['payday'] = 0
 	masseuse['weeks_pay'] = 0
 	masseuse['paycheck'] = 0
 	act'Leave':gt'salon','start'