From 4bfb84d23836cdb5bdcc402e57747dcf319941ee Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Wed, 11 Sep 2024 12:08:11 -0500 Subject: [PATCH] Fix various proximity blip errors Original game wrong messages, wrong sound file, missing sound file, and bad locations. --- data/base/messages/prox1-3.json | 1 + data/base/messages/prox1-4a.json | 2 +- data/base/messages/prox1-7.json | 2 +- data/base/messages/prox1b.json | 2 +- data/base/messages/prox1c.json | 6 +++--- data/base/messages/prox3-4.json | 2 +- data/base/messages/prox3b.json | 4 ++-- data/base/messages/prox3c.json | 10 +++++----- data/base/script/campaign/cam1-3.js | 2 +- data/base/script/campaign/cam1b.js | 2 +- 10 files changed, 17 insertions(+), 16 deletions(-) diff --git a/data/base/messages/prox1-3.json b/data/base/messages/prox1-3.json index 9919c4fb71d..566f3107881 100644 --- a/data/base/messages/prox1-3.json +++ b/data/base/messages/prox1-3.json @@ -1,6 +1,7 @@ { "C1-3_BASE1": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 5376, "y": 4544, "z": 0 }, "C1-3_BASE2": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 6592, "y": 1856, "z": 0 }, + "C1-3_BASE3": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 7168, "y": 7296, "z": 0 }, "C1-3_LZ": { "audio": "pcv427.ogg", "message": "LZ_MSG", "type": 2, "x": 704, "y": 704, "z": 0 }, "C1-3_OBJ1": { "audio": "pcv448.ogg", "message": "RUINS_MSG", "type": 0, "x": 448, "y": 6592, "z": 0 }, "C1-3_OBJ2": { "audio": "pcv448.ogg", "message": "RUINS_MSG", "type": 0, "x": 7616, "y": 7744, "z": 0 }, diff --git a/data/base/messages/prox1-4a.json b/data/base/messages/prox1-4a.json index 60a705f0517..fd82bcccfdd 100644 --- a/data/base/messages/prox1-4a.json +++ b/data/base/messages/prox1-4a.json @@ -1,6 +1,6 @@ { "C1-4_BASE1": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 2624, "y": 7488, "z": 0 }, - "C1-4_BASE2": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 3648, "y": 2240, "z": 0 }, + "C1-4_BASE2": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 3648, "y": 2240, "z": 0 }, "C1-4_BASE3": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 7104, "y": 2496, "z": 0 }, "C1-4_LZ": { "audio": "pcv398.ogg", "message": "LZ_MSG", "type": 2, "x": 7488, "y": 4672, "z": 0 }, "C1-4_OBJ1": { "audio": "pcv448.ogg", "message": "RUINS_MSG", "type": 0, "x": 4160, "y": 3904, "z": 0 } diff --git a/data/base/messages/prox1-7.json b/data/base/messages/prox1-7.json index de66f817c75..01928e89f9d 100644 --- a/data/base/messages/prox1-7.json +++ b/data/base/messages/prox1-7.json @@ -3,6 +3,6 @@ "C1-7_BASE2": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 7232, "y": 7104, "z": 0 }, "C1-7_BASE3": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 7616, "y": 576, "z": 0 }, "C1-7_LZ": { "audio": "pcv427.ogg", "message": "LZ_MSG", "type": 2, "x": 960, "y": 7232, "z": 0 }, - "C1-7_LZ2": { "audio": 0, "message": "LZ_MSG", "type": 2, "x": 1728, "y": 1472, "z": 0 }, + "C1-7_LZ2": { "audio": "pcv396.ogg", "message": "LZ_MSG3", "type": 2, "x": 1728, "y": 1472, "z": 0 }, "C1-7_OBJ1": { "audio": "pcv448.ogg", "message": "RUINS_MSG", "type": 0, "x": 3136, "y": 3904, "z": 0 } } diff --git a/data/base/messages/prox1b.json b/data/base/messages/prox1b.json index c45f2c6839a..800f56c19fd 100644 --- a/data/base/messages/prox1b.json +++ b/data/base/messages/prox1b.json @@ -2,5 +2,5 @@ "C1B_BASE0": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 2112, "y": 9280, "z": 0 }, "C1B_BASE1": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 4370, "y": 9872, "z": 0 }, "C1B_BASE2": { "audio": "pcv448.ogg", "message": "POWSURGE_MSG", "type": 0, "x": 3193, "y": 13806, "z": 0 }, - "C1B_OBJ1": { "audio": "pcv390.ogg", "message": "RUINS_MSG", "type": 0, "x": 3776, "y": 11328, "z": 0 } + "C1B_BASE3": { "audio": "pcv390.ogg", "message": "BARBASE_MSG", "type": 0, "x": 3776, "y": 11328, "z": 0 } } diff --git a/data/base/messages/prox1c.json b/data/base/messages/prox1c.json index 0d06358fdf1..a1f70c151b1 100644 --- a/data/base/messages/prox1c.json +++ b/data/base/messages/prox1c.json @@ -1,10 +1,10 @@ { - "C1C_BASE1": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 10304, "y": 15424, "z": 0 }, + "C1C_BASE1": { "audio": "pcv390.ogg", "message": "BARBASE_MSG", "type": 0, "x": 10304, "y": 15424, "z": 0 }, "C1C_BASE2": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 12736, "y": 14016, "z": 0 }, "C1C_BASE3": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 8512, "y": 704, "z": 0 }, - "C1C_BASE4": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 9024, "y": 3648, "z": 0 }, + "C1C_BASE4": { "audio": "pcv390.ogg", "message": "BARBASE_MSG", "type": 0, "x": 9024, "y": 3648, "z": 0 }, "C1C_BASE5": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 8512, "y": 6976, "z": 0 }, - "C1C_BASE6": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 13376, "y": 13504, "z": 0 }, + "C1C_BASE6": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 13376, "y": 13504, "z": 0 }, "C1C_BASE7": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 11840, "y": 9792, "z": 0 }, "C1C_BASE8": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 14272, "y": 3264, "z": 0 }, "C1C_BASE9": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 11712, "y": 2752, "z": 0 }, diff --git a/data/base/messages/prox3-4.json b/data/base/messages/prox3-4.json index bd5a75c3014..41c547056ef 100644 --- a/data/base/messages/prox3-4.json +++ b/data/base/messages/prox3-4.json @@ -5,7 +5,7 @@ "CM34_BASEB": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 8768, "y": 4032, "z": 0 }, "CM34_BASEC": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 8256, "y": 1344, "z": 0 }, "CM34_BASED": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 10816, "y": 10816, "z": 0 }, - "CM34_BASEE": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 6976, "y": 10560, "z": 0 }, + "CM34_BASEE": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 6976, "y": 10624, "z": 0 }, "CM34_BASEF": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 2880, "y": 9408, "z": 0 }, "CM34_BASEG": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 11328, "y": 7360, "z": 0 } } diff --git a/data/base/messages/prox3b.json b/data/base/messages/prox3b.json index 9c15909ef6a..d76ea090b82 100644 --- a/data/base/messages/prox3b.json +++ b/data/base/messages/prox3b.json @@ -1,7 +1,7 @@ { "CM3B_BASE4": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 6592, "y": 6720, "z": 0 }, "CM3B_BASE6": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 1024, "y": 6528, "z": 0 }, - "CM3B_TRANS1": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 6208, "y": 6592, "z": 0 }, - "CM3B_TRANS2": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 1088, "y": 6848, "z": 0 }, + "CM3B_TRANS1": { "audio": "pcv396.ogg", "message": "LZ_MSG3", "type": 0, "x": 6208, "y": 6592, "z": 0 }, + "CM3B_TRANS2": { "audio": "pcv396.ogg", "message": "LZ_MSG3", "type": 0, "x": 1088, "y": 6848, "z": 0 }, "CM3B_GAMMABASE": { "audio": "pcv448.ogg", "message": "RUINS_MSG", "type": 2, "x": 1728, "y": 1728, "z": 200 } } diff --git a/data/base/messages/prox3c.json b/data/base/messages/prox3c.json index 327f6d54b7c..d174cf694e7 100644 --- a/data/base/messages/prox3c.json +++ b/data/base/messages/prox3c.json @@ -1,7 +1,7 @@ { - "CM3C_BETATEAM": { "audio": 0, "message": "ENEMYBASE_MSG", "type": 2, "x": 960, "y": 17344, "z": 0 }, - "CM3C_GAMMABASE": { "audio": 0, "message": "ENEMYBASE_MSG", "type": 2, "x": 1600, "y": 23104, "z": 0 }, - "CM3C_BASE1": { "audio": 0, "message": "ENEMYBASE_MSG", "type": 0, "x": 3776, "y": 17344, "z": 0 }, - "CM3C_BASE2": { "audio": 0, "message": "ENEMYBASE_MSG", "type": 0, "x": 4800, "y": 21568, "z": 0 }, - "CM3C_BASE3": { "audio": 0, "message": "ENEMYBASE_MSG", "type": 0, "x": 6592, "y": 22592, "z": 0 } + "CM3C_BETATEAM": { "audio": "pcv448.ogg", "message": "RUINS_MSG", "type": 2, "x": 960, "y": 17344, "z": 0 }, + "CM3C_GAMMABASE": { "audio": "pcv448.ogg", "message": "RUINS_MSG", "type": 2, "x": 1600, "y": 23104, "z": 0 }, + "CM3C_BASE1": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 3776, "y": 17344, "z": 0 }, + "CM3C_BASE2": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 4800, "y": 21568, "z": 0 }, + "CM3C_BASE3": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 6592, "y": 22592, "z": 0 } } diff --git a/data/base/script/campaign/cam1-3.js b/data/base/script/campaign/cam1-3.js index 9e295720522..4272782616c 100644 --- a/data/base/script/campaign/cam1-3.js +++ b/data/base/script/campaign/cam1-3.js @@ -313,7 +313,7 @@ function eventStartLevel() }, "ScavBaseGroupSouth": { cleanup: "SouthScavBase", - detectMsg: "C1-3_OBJ2", + detectMsg: "C1-3_BASE3", detectSnd: cam_sounds.baseDetection.scavengerBaseDetected, eliminateSnd: cam_sounds.baseElimination.scavengerBaseEradicated }, diff --git a/data/base/script/campaign/cam1b.js b/data/base/script/campaign/cam1b.js index 7c1785d0a8b..64eacc01670 100644 --- a/data/base/script/campaign/cam1b.js +++ b/data/base/script/campaign/cam1b.js @@ -134,7 +134,7 @@ function eventStartLevel() }, "base3group": { cleanup: "enemybase3", - detectMsg: "C1B_OBJ1", + detectMsg: "C1B_BASE3", detectSnd: cam_sounds.baseDetection.scavengerOutpostDetected, eliminateSnd: cam_sounds.baseElimination.scavengerOutpostEradicated, },