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

[bluegr]

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

Summary:
c13266aeeb DEVTOOLS: Fix missing dialog options in Nancy10 and regen nancy.dat


Commit: c13266aeeb68ab26613494037d0decafdf19feb8
    https://github.com/scummvm/scummvm/commit/c13266aeeb68ab26613494037d0decafdf19feb8
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-07-09T23:30:52+03:00

Commit Message:
DEVTOOLS: Fix missing dialog options in Nancy10 and regen nancy.dat

There were two bugs related to OR statements that were not properly
extracted - one with Charleena Purcell and one with Bess & George.
Both are fixed now.

Fix #16941

Changed paths:
    devtools/create_nancy/nancy10_data.h
    dists/engine-data/nancy.dat


diff --git a/devtools/create_nancy/nancy10_data.h b/devtools/create_nancy/nancy10_data.h
index c5bc8d91995..7c2a7c5eff0 100644
--- a/devtools/create_nancy/nancy10_data.h
+++ b/devtools/create_nancy/nancy10_data.h
@@ -200,7 +200,9 @@ const Common::Array<Common::Array<ConditionalDialogue>> _nancy10ConditionalDialo
 	{   0, 1888, "NCP88",
 		{ { kEv, 451, true }, { kEv, 143, false } } },
 	{   0, 1889, "NCP89",
-		{ { kEv, 164, true }, { kEv, 355, false }, { kEv, 147, false }, { kIn, 32, true }, { kIn, 35, true } } },
+		{ { kEv, 164, true }, { kEv, 355, false }, { kEv, 147, false }, { kIn, 32, true } } },
+	{   0, 1889, "NCP89",
+		{ { kEv, 164, true }, { kEv, 355, false }, { kEv, 147, false }, { kIn, 35, true } } },
 },
 {	// Bet Rawley, 7 responses
 	{   0, 1550, "NRP50",
@@ -246,9 +248,11 @@ const Common::Array<Common::Array<ConditionalDialogue>> _nancy10ConditionalDialo
 },
 {	// Bess & George, 44 responses
 	{   0, 1660, "NBG60",
-		{ { kEv, 168, true }, { kEv, 322, true }, { kEv, 444, false }, { kEv, 108, false } } },
+		{ { kEv, 168, true }, { kEv, 444, false }, { kEv, 108, false } } },
+	{   0, 1660, "NBG60",
+		{ { kEv, 607, true }, { kEv, 444, false }, { kEv, 108, false } } },
 	{   0, 1660, "NBG60",
-		{ { kEv, 607, true }, { kEv, 322, true }, { kEv, 444, false }, { kEv, 108, false } } },
+		{ { kEv, 322, true }, { kEv, 444, false }, { kEv, 108, false } } },
 	{   0, 1661, "NBG61",
 		{ { kEv, 322, true }, { kEv, 444, false }, { kEv, 108, true }, { kEv, 120, false } } },
 	{   0, 1662, "NBG62",
diff --git a/dists/engine-data/nancy.dat b/dists/engine-data/nancy.dat
index 8383f1d36c0..8136f8f01f7 100644
Binary files a/dists/engine-data/nancy.dat and b/dists/engine-data/nancy.dat differ