From ed24691719884a5e741b28bb84fad9eff832ab9c Mon Sep 17 00:00:00 2001 From: Akbar Yahya <11765082+akbaryahya@users.noreply.github.com> Date: Thu, 10 Nov 2022 23:24:11 +0800 Subject: [PATCH] add dup name --- PacketOpcodes.java | 1 - cmdid_gc_update.json | 4 ---- op.js | 29 ++++++++++++++++++++++++++--- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/PacketOpcodes.java b/PacketOpcodes.java index 22b1bc6e..e980d6a5 100644 --- a/PacketOpcodes.java +++ b/PacketOpcodes.java @@ -1686,7 +1686,6 @@ public class PacketOpcodes { public static final int GachaActivityNextStageReq = 8257; public static final int LaunchFireworksRsp = 6057; public static final int FireworksLaunchDataNotify = 5928; - public static final int DungeonReviseLevelNotify = 933; public static final int SpiceActivityGivingRecordNotify = 8407; public static final int IrodoriScanEntityReq = 8767; public static final int IrodoriMasterGallerySettleNotify = 8340; diff --git a/cmdid_gc_update.json b/cmdid_gc_update.json index f1aa4e44..dda86f0a 100644 --- a/cmdid_gc_update.json +++ b/cmdid_gc_update.json @@ -6719,10 +6719,6 @@ "name": "FireworksLaunchDataNotify", "id": 5928 }, - { - "name": "DungeonReviseLevelNotify", - "id": 933 - }, { "name": "SpiceActivityGivingRecordNotify", "id": 8407 diff --git a/op.js b/op.js index 953dc876..aaf833d9 100644 --- a/op.js +++ b/op.js @@ -115,7 +115,7 @@ function update_cmdid_gc() { const json_cmdid_old = JSON.parse(cmd_old); json_cmdid_old.forEach(function (s, index) { var id = s.id; - var name = s.name; + var name = s.name.trim(); var found_id = json_cmdid_last.find((j) => j.id == id); if (found_id) { @@ -155,12 +155,33 @@ function update_cmdid_gc() { } }); + check_dunp_id = []; // clear + // I don't know why this happened but make sure to check again + var check_dunp_name = []; json_cmdid_old.forEach(function (s, index) { var id = s.id; - var name = s.name; + var name = s.name.trim(); + + var found_name = check_dunp_name.find((j) => j.name === name); + if (found_name) { + console.log( + "Wow dup -> ID: " + + id + + " (ADD " + + found_name.id + + ") | Name Remove: " + + name + + " (ADD " + + found_name.name + + ")" + ); + // remove bad + json_cmdid_old.splice(index, 1); + } else { + check_dunp_name.push(s); + } - // maybe need || j.name == name var found_id = json_cmdid_last.find((j) => j.id == id); if (found_id) { if (name != found_id.name) { @@ -172,6 +193,8 @@ function update_cmdid_gc() { } }); + check_dunp_name = []; // clear + console.log( "found " + found_cmdid_new +