[Scummvm-git-logs] scummvm master -> 425023374369a38cf8141f92373c6312197a962c

[neuromancer]

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

Summary:
fa4e199ba5 HYPNO: fixed typo in the parsing of H1/H2 segments
007a91f305 HYPNO: implemented segments for c30 in wet
4250233743 HYPNO: added hardcoded targets in level c30 in wet


Commit: fa4e199ba53a3a9fbeb4c6cba0f70aa67d2788ae
    https://github.com/scummvm/scummvm/commit/fa4e199ba53a3a9fbeb4c6cba0f70aa67d2788ae
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-02-26T09:01:58+01:00

Commit Message:
HYPNO: fixed typo in the parsing of H1/H2 segments

Changed paths:
    engines/hypno/grammar_arc.cpp
    engines/hypno/grammar_arc.y


diff --git a/engines/hypno/grammar_arc.cpp b/engines/hypno/grammar_arc.cpp
index c27435382c4..fe229f6247c 100644
--- a/engines/hypno/grammar_arc.cpp
+++ b/engines/hypno/grammar_arc.cpp
@@ -1549,7 +1549,7 @@ yyreduce:
   case 37: /* hline: H12TOK BYTE NUM NUM  */
 #line 240 "engines/hypno/grammar_arc.y"
                               {
-		Segment segment('P', (yyvsp[0].i), (yyvsp[-1].i));
+		Segment segment((yyvsp[-2].i), (yyvsp[0].i), (yyvsp[-1].i));
 		g_parsedArc->segments.push_back(segment);
 		debugC(1, kHypnoDebugParser, "HN %x %d %d", (yyvsp[-2].i), (yyvsp[-1].i), (yyvsp[0].i)); 
 	}
diff --git a/engines/hypno/grammar_arc.y b/engines/hypno/grammar_arc.y
index 85e8973b62f..c25af572f3f 100644
--- a/engines/hypno/grammar_arc.y
+++ b/engines/hypno/grammar_arc.y
@@ -238,7 +238,7 @@ hline: 	CTOK NUM {
 		debugC(1, kHypnoDebugParser, "H P %d %d", $3, $4); 
 	}
 	| H12TOK BYTE NUM NUM {
-		Segment segment('P', $4, $3);
+		Segment segment($2, $4, $3);
 		g_parsedArc->segments.push_back(segment);
 		debugC(1, kHypnoDebugParser, "HN %x %d %d", $2, $3, $4); 
 	}


Commit: 007a91f305f821112f340edfc27a30030c669621
    https://github.com/scummvm/scummvm/commit/007a91f305f821112f340edfc27a30030c669621
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-02-26T09:01:58+01:00

Commit Message:
HYPNO: implemented segments for c30 in wet

Changed paths:
    engines/hypno/wet/arcade.cpp


diff --git a/engines/hypno/wet/arcade.cpp b/engines/hypno/wet/arcade.cpp
index c3eddc4d779..c8ead1b99fd 100644
--- a/engines/hypno/wet/arcade.cpp
+++ b/engines/hypno/wet/arcade.cpp
@@ -30,7 +30,10 @@ namespace Hypno {
 void WetEngine::initSegment(ArcadeShooting *arc) {
 	if (_arcadeMode == "Y1") {
 		_segmentShootSequenceOffset = 0;
-		_segmentShootSequenceMax = 3;
+		_segmentShootSequenceMax = 7;
+	} else if (_arcadeMode == "Y3") {
+		_segmentShootSequenceOffset = 0;
+		_segmentShootSequenceMax = 7;
 	} else if (_arcadeMode == "Y5") {
 		_segmentShootSequenceOffset = 1;
 		_segmentShootSequenceMax = 9;
@@ -117,6 +120,11 @@ void WetEngine::findNextSegment(ArcadeShooting *arc) {
 				_segmentIdx = _segmentIdx + 1;
 			else 
 				_segmentIdx = _segmentIdx + 2;
+		} else if (segments[_segmentIdx].type == 'Y') {
+			if (mousePos.x <= 160)
+				_segmentIdx = _segmentIdx + 2;
+			else 
+				_segmentIdx = _segmentIdx + 1;
 		} else {
 
 			// Objective checking
@@ -135,6 +143,16 @@ void WetEngine::findNextSegment(ArcadeShooting *arc) {
 					}
 				}
 			}
+			if (segments[_segmentIdx].type == 0xc9) {
+				_segmentOffset = _segmentIdx + 1;
+				_segmentShootSequenceOffset = 8;
+				_segmentShootSequenceMax = 7;
+			} else if (segments[_segmentIdx].type == 0xbb) {
+				_segmentOffset = 0;
+				_segmentShootSequenceOffset = 0;
+				_segmentShootSequenceMax = 7;
+			}
+
 			_segmentIdx = _segmentOffset;
 			// select a new shoot sequence
 			uint32 randomSegmentShootSequence = _segmentShootSequenceOffset + _rnd->getRandomNumber(_segmentShootSequenceMax);


Commit: 425023374369a38cf8141f92373c6312197a962c
    https://github.com/scummvm/scummvm/commit/425023374369a38cf8141f92373c6312197a962c
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-02-26T09:01:58+01:00

Commit Message:
HYPNO: added hardcoded targets in level c30 in wet

Changed paths:
    engines/hypno/wet/arcade.cpp


diff --git a/engines/hypno/wet/arcade.cpp b/engines/hypno/wet/arcade.cpp
index c8ead1b99fd..89c3ce54019 100644
--- a/engines/hypno/wet/arcade.cpp
+++ b/engines/hypno/wet/arcade.cpp
@@ -50,6 +50,13 @@ void WetEngine::initSegment(ArcadeShooting *arc) {
 	_segmentRepetition = 0;
 	_segmentOffset = 0;
 	_segmentIdx = _segmentOffset;
+
+	if (_arcadeMode == "Y3") {
+		ShootInfo si;
+		si.name = "SP_CBREAKER_L";
+		si.timestamp = 30 * (_segmentRepetitionMax + 1) - 3; 
+		_shootSequence.push_back(si);
+	}
 }
 
 void WetEngine::findNextSegment(ArcadeShooting *arc) {
@@ -160,6 +167,17 @@ void WetEngine::findNextSegment(ArcadeShooting *arc) {
 			SegmentShoots segmentShoots = arc->shootSequence[randomSegmentShootSequence];
 			_shootSequence = segmentShoots.shootSequence;
 			_segmentRepetitionMax = segmentShoots.segmentRepetition; // Usually one
+
+			if (_arcadeMode == "Y3") {
+				ShootInfo si;
+				if (_segmentOffset == 0)
+					si.name = "SP_CBREAKER_L";
+				else 
+					si.name = "SP_CBREAKER_U";
+
+				si.timestamp = 30 * (_segmentRepetitionMax + 1) - 3; 
+				_shootSequence.push_back(si);
+			}
 		}
 	}
 }