|
@@ -266,7 +266,7 @@ end
|
|
|
|
|
|
if $ARGS[0] = 'matrix':
|
|
|
*clr & cla
|
|
|
- exer_stam[i] = exer_stam0[i] + exer_stam1[i] + exer_stam2[i] + exer_stam3[i] + exer_stam4[i]
|
|
|
+ exer_stam[i] = exer_stam0[i] + exer_stam1[i] + exer_stam2[i] + exer_stam3[i] + exer_stam4[i] + exer_stam5[i]
|
|
|
|
|
|
act'Confirm': gt 'exercise', 'setup'
|
|
|
|
|
@@ -296,10 +296,11 @@ if $ARGS[0] = 'matrixdata':
|
|
|
end
|
|
|
|
|
|
if dyneval('RESULT = exer_rout<<ARGS[1]>>[<<i>>]') = 1:
|
|
|
+ mult = 15
|
|
|
if ARGS[1] >= 3:
|
|
|
- dynamic 'exer_stam<<ARGS[1]>>[<<i>>] = 10'
|
|
|
+ dynamic 'exer_stam<<ARGS[1]>>[<<i>>] = 5*mult * (10 - sport_clothes_exercise_bonus)'
|
|
|
else
|
|
|
- dynamic 'exer_stam<<ARGS[1]>>[<<i>>] = 15'
|
|
|
+ dynamic 'exer_stam<<ARGS[1]>>[<<i>>] = (15*mult * (10 - sport_clothes_exercise_bonus)) / 2'
|
|
|
end
|
|
|
*p '<TD>Selected</TD>'
|
|
|
else
|
|
@@ -307,10 +308,11 @@ if $ARGS[0] = 'matrixdata':
|
|
|
end
|
|
|
|
|
|
if dyneval('RESULT = exer_rout<<ARGS[1]>>[<<i>>]') = 2:
|
|
|
+ mult = 30
|
|
|
if ARGS[1] >= 3:
|
|
|
- dynamic 'exer_stam<<ARGS[1]>>[<<i>>] = 20'
|
|
|
+ dynamic 'exer_stam<<ARGS[1]>>[<<i>>] = 5*mult * (10 - sport_clothes_exercise_bonus)'
|
|
|
else
|
|
|
- dynamic 'exer_stam<<ARGS[1]>>[<<i>>] = 30'
|
|
|
+ dynamic 'exer_stam<<ARGS[1]>>[<<i>>] = (15*mult * (10 - sport_clothes_exercise_bonus)) / 2'
|
|
|
end
|
|
|
*p '<TD>Selected</TD>'
|
|
|
else
|
|
@@ -318,10 +320,11 @@ if $ARGS[0] = 'matrixdata':
|
|
|
end
|
|
|
|
|
|
if dyneval('RESULT = exer_rout<<ARGS[1]>>[<<i>>]') = 3:
|
|
|
+ mult = 45
|
|
|
if ARGS[1] >= 3:
|
|
|
- dynamic 'exer_stam<<ARGS[1]>>[<<i>>] = 30'
|
|
|
+ dynamic 'exer_stam<<ARGS[1]>>[<<i>>] = 5*mult * (10 - sport_clothes_exercise_bonus)'
|
|
|
else
|
|
|
- dynamic 'exer_stam<<ARGS[1]>>[<<i>>] = 45'
|
|
|
+ dynamic 'exer_stam<<ARGS[1]>>[<<i>>] = (15*mult * (10 - sport_clothes_exercise_bonus)) / 2'
|
|
|
end
|
|
|
*p '<TD>Selected</TD>'
|
|
|
else
|
|
@@ -329,10 +332,11 @@ if $ARGS[0] = 'matrixdata':
|
|
|
end
|
|
|
|
|
|
if dyneval('RESULT = exer_rout<<ARGS[1]>>[<<i>>]') = 4:
|
|
|
+ mult = 60
|
|
|
if ARGS[1] >= 3:
|
|
|
- dynamic 'exer_stam<<ARGS[1]>>[<<i>>] = 40'
|
|
|
+ dynamic 'exer_stam<<ARGS[1]>>[<<i>>] = 5*mult * (10 - sport_clothes_exercise_bonus)'
|
|
|
else
|
|
|
- dynamic 'exer_stam<<ARGS[1]>>[<<i>>] = 60'
|
|
|
+ dynamic 'exer_stam<<ARGS[1]>>[<<i>>] = (15*mult * (10 - sport_clothes_exercise_bonus)) / 2'
|
|
|
end
|
|
|
*p '<TD>Selected</TD>'
|
|
|
else
|