Skip to content

Commit

Permalink
Fix various proximity blip errors
Browse files Browse the repository at this point in the history 
Original game wrong messages, wrong sound file, missing sound file, and bad locations.
  • Loading branch information
@KJeff01
KJeff01 committed Sep 12, 2024
1 parent 76a992f commit 4bfb84d
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 16 deletions.
1 change: 1 addition & 0 deletions data/base/messages/prox1-3.json
View file
Original file line number Diff line number Diff line change
@@ -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 },
Expand Down
2 changes: 1 addition & 1 deletion data/base/messages/prox1-4a.json
View file
Original file line number Diff line number Diff line change
@@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion data/base/messages/prox1-7.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
}
2 changes: 1 addition & 1 deletion data/base/messages/prox1b.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
}
6 changes: 3 additions & 3 deletions data/base/messages/prox1c.json
View file
Original file line number Diff line number Diff line change
@@ -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 },
Expand Down
2 changes: 1 addition & 1 deletion data/base/messages/prox3-4.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
}
4 changes: 2 additions & 2 deletions data/base/messages/prox3b.json
View file
Original file line number Diff line number Diff line change
@@ -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 }
}
10 changes: 5 additions & 5 deletions data/base/messages/prox3c.json
View file
Original file line number Diff line number Diff line change
@@ -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 }
}
2 changes: 1 addition & 1 deletion data/base/script/campaign/cam1-3.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down
2 changes: 1 addition & 1 deletion data/base/script/campaign/cam1b.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
Expand Down

0 comments on commit 4bfb84d

Please sign in to comment.