Browse Source

[fixed] Grade contribution from homework not added because I am stupid.

bgkjdgbizgblzdgbr 2 years ago
parent
commit
8c1c00d1dd
2 changed files with 3 additions and 5 deletions
  1. 2 4
      locations/grades.qsrc
  2. 1 1
      locations/gschool_lessonsev3.qsrc

+ 2 - 4
locations/grades.qsrc

@@ -193,18 +193,16 @@ if $ARGS[0] = 'homework':
 	i=0
 	:homework_loop
 		if $class_list_institution[i] = $ARGS[1]:
-			!!$i = dyneval ('RESULT = $<<$ARGS[1]>>_classes[i]')
 			if dyneval ('RESULT = class[''<<$ARGS[1]>>_<<$class_list_name[i]>>_homework'']') = 1:
 				if $ARGS[2] = 'no':
-					dynamic 'class[''<<$ARGS[1]>>_<<$class_list_name[i]>>_weekly_grade_gain''] += ARGS[3]*((2-class[''<<$ARGS[1]>>_<<$class_list_name[i]>>_use_computer''])*5*(50+modifier))/100'
+					dynamic 'class[''<<$ARGS[1]>>_<<$class_list_name[i]>>_weekly_grade_gain''] += <<ARGS[3]>>*(((2-class[''<<$ARGS[1]>>_<<$class_list_name[i]>>_use_computer''])*5*(50+modifier))/100)'
 				else
-					dynamic 'class[''<<$ARGS[1]>>_<<$class_list_name[i]>>_weekly_grade_gain''] += ARGS[3]*(10*(50+modifier))/100'
+					dynamic 'class[''<<$ARGS[1]>>_<<$class_list_name[i]>>_weekly_grade_gain''] += <<ARGS[3]>>*((10*(50+modifier))/100)'
 				end
 			end
 		end
 		i +=1
 	if ARRSIZE('class_list_institution') >= i: jump 'homework_loop'
-	!! if dyneval ('RESULT = ARRSIZE(''<<$ARGS[1]>>_classes'')') >= i: jump 'homework_loop'
 	
 	killvar 'modifier'
 end

+ 1 - 1
locations/gschool_lessonsev3.qsrc

@@ -241,7 +241,7 @@ end
 if $ARGS[0] = 'reading':
 	*clr & cla
 	menu_off = 1
-	gs 'grades', 'class_activity_attributes', 'school', 'eng', pcs_prcptn
+	gs 'grades', 'class_activity_attributes', 'school', 'lit', pcs_prcptn
 	prcptn_exp += rand(0,1)
 	grupvalue[3] +=3
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/ask.jpg"></center>'