[Scummvm-git-logs] scummvm master -> f4d53008c9c1e45e1a0cee250e5f8a6f5b5cc73d

[AndywinXp]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f4d53008c9 SCUMM: HE: Edit Baseball2001 Online Mode Balance


Commit: f4d53008c9c1e45e1a0cee250e5f8a6f5b5cc73d
    https://github.com/scummvm/scummvm/commit/f4d53008c9c1e45e1a0cee250e5f8a6f5b5cc73d
Author: Vissery (102843293+Vissery at users.noreply.github.com)
Date: 2024-06-29T11:21:41+02:00

Commit Message:
SCUMM: HE: Edit Baseball2001 Online Mode Balance

Changed paths:
    engines/scumm/script_v6.cpp


diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp
index 68a243acb20..b4918bd5259 100644
--- a/engines/scumm/script_v6.cpp
+++ b/engines/scumm/script_v6.cpp
@@ -506,21 +506,21 @@ void ScummEngine_v6::o6_pushWordVar() {
 			int sprintGain = vm.localvar[_currentScript][4];
 			int playerSpeed = vm.localvar[_currentScript][5];
 			if (offset == 42273) {
-				if (sprintCounter >= 11) {
-					if (playerSpeed == 12 || playerSpeed == 11 || playerSpeed == 10) {
+				if (sprintCounter >= 21) {
+					if (playerSpeed >= 8) {
 						sprintGain = 2;
-					} else if (playerSpeed == 9) {
+					} else if (playerSpeed == 6 || playerSpeed == 7) {
 						sprintGain = 3;
 					} else {
 						sprintGain = 4;
 					}
-				} else if (sprintCounter >= 9) {
-					if (playerSpeed == 12 || playerSpeed == 11 || playerSpeed == 10) {
+				} else if (sprintCounter >= 15) {
+					if (playerSpeed >= 6) {
 						sprintGain = 2;
 					} else {
 						sprintGain = 3;
 					}
-				} else if (sprintCounter >= 7) {
+				} else if (sprintCounter >= 9) {
 						sprintGain = 2;
 				} else {
 					sprintGain = 1;
@@ -539,18 +539,18 @@ void ScummEngine_v6::o6_pushWordVar() {
 			if (offset == 102789 && (readVar(387) == 1||readVar(387) == 2)) {
 				// Checks if the current pitch type is the same as that of the "remembered" pitch type
 				if (readArray(346, 0, 0) == readArray(346, 1, 0)) {
-					// Checks if the current pitch is either a Heat or a Fireball. The reason it adds less than the other pitches
-					// is because in the actual calculation it adds 5 to these two anyway, so this should also balance them out.
+					// Checks if the current pitch is either a Heat or a Fireball. The reason it adds 0 instead of 5 is because
+					// in the actual calculation it adds 5 to these two anyway, so this should help balance them out.
 					if (pitchSelected == 14 || pitchSelected == 21) {
-						powerAdjustment = powerAdjustment + 15;
+						powerAdjustment = powerAdjustment + 0;
 					} else {
-						powerAdjustment = powerAdjustment + 20;
+						powerAdjustment = powerAdjustment + 5;
 					}
 				}
 				// Checks if the zone location is the same as that of the previous one. This should slightly reduce the amount of pitching to the exact same location.
 				// Can also be adjusted later if necessary.
 				if (readArray(346, 0, 1) == readArray(346, 1, 1)) {
-					powerAdjustment = powerAdjustment + 20;
+					powerAdjustment = powerAdjustment + 15;
 				}
 				// write the power adjustment to the result
 				writeVar(0x4000 + 4, powerAdjustment);