8000 Battle Event : Fix song of destruction wrongly enabled on non Ex battle by Xele02 · Pull Request #364 · Xele02/UMO · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Battle Event : Fix song of destruction wrongly enabled on non Ex battle #364

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Unity/Assets/UMAssets/Scripts/CMMKCEPBIHI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,9 @@ public static void AECDJDIJJKD_ApplySkills(ref EDMIONMCICN HBODCMLFDOB, FFHPBEPO
}
}
}
if(KDOLMBEAGCI_EnemyData != null && KDOLMBEAGCI_EnemyData.PDHCABLLJPB_SkillId != 0)
if(KDOLMBEAGCI_EnemyData != null && KDOLMBEAGCI_EnemyData.PDHCABLLJPB_CenterSkillId != 0)
{
skillInfo.EDEDFDDIOKO_Set(KDOLMBEAGCI_EnemyData.PDHCABLLJPB_SkillId, 1, 0);
skillInfo.EDEDFDDIOKO_Set(KDOLMBEAGCI_EnemyData.PDHCABLLJPB_CenterSkillId, 1, 0);
AECDJDIJJKD_ApplySkillForDiva(ref HBODCMLFDOB, DGCJCAHIAPP_DivaInfo, AHEFHIMGIBI_PlayerData.OPIBAPEGCLA_Scenes, KKHIDFKKFJE_MusicData, JNKEEAOKNCI_Skill.MKGJHBAKMBD_SkillType.AIFGINAKBMA_EnemySkill, ref skillInfo, divaIdx, MLAFAACKKBG_Team);
}
HBODCMLFDOB.ELFAIDEBLJB.Div(100);
Expand Down Expand Up @@ -296,9 +296,9 @@ public static void NIPJMNDBCNF(ref EDMIONMCICN HBODCMLFDOB, JLKEOGLJNOD_TeamInfo
}
}
}
if(KDOLMBEAGCI_EnemyData != null && KDOLMBEAGCI_EnemyData.PDHCABLLJPB_SkillId != 0)
if(KDOLMBEAGCI_EnemyData != null && KDOLMBEAGCI_EnemyData.PDHCABLLJPB_CenterSkillId != 0)
{
data.EDEDFDDIOKO_Set(KDOLMBEAGCI_EnemyData.PDHCABLLJPB_SkillId, 1, 0);
data.EDEDFDDIOKO_Set(KDOLMBEAGCI_EnemyData.PDHCABLLJPB_CenterSkillId, 1, 0);
AECDJDIJJKD_ApplySkillForDivaAndScenes(ref HBODCMLFDOB, PCEGKKLKFNO_FriendData.JIGONEMPPNP_Diva, PCEGKKLKFNO_FriendData.KHGKPKDBMOH_GetAssistScene(), PCEGKKLKFNO_FriendData.HDJOHAJPGBA_SubScene[0], PCEGKKLKFNO_FriendData.HDJOHAJPGBA_SubScene[1], KKHIDFKKFJE_MusicData, JNKEEAOKNCI_Skill.MKGJHBAKMBD_SkillType.AIFGINAKBMA_EnemySkill, ref data, -1, MLAFAACKKBG_Team);
}
HBODCMLFDOB.ELFAIDEBLJB.Div(100);
Expand Down Expand Up @@ -886,9 +886,9 @@ public static void NJNBELLEGCN(ref CFHDKAFLNEP HBODCMLFDOB, int[,] EDAJDLJHBKP,
c |= d > 0;
}
bool g = false;
if(KDOLMBEAGCI != null && KDOLMBEAGCI.PDHCABLLJPB_SkillId != 0)
if(KDOLMBEAGCI != null && KDOLMBEAGCI.PDHCABLLJPB_CenterSkillId != 0)
{
HBDCPGLAPHH h = IMMAOANGPNK.HHCJCDFCLOB.NKEBMCIMJND_Database.FOFADHAENKC_Skill.FFCFHFOIKGB_CenterSkillEnemy[KDOLMBEAGCI.PDHCABLLJPB_SkillId - 1];
HBDCPGLAPHH h = IMMAOANGPNK.HHCJCDFCLOB.NKEBMCIMJND_Database.FOFADHAENKC_Skill.FFCFHFOIKGB_CenterSkillEnemy[KDOLMBEAGCI.PDHCABLLJPB_CenterSkillId - 1];
int aa = 0;
for(int l = 0; l < 2; l++)
{
10000 Expand Down
48 changes: 24 additions & 24 deletions Unity/Assets/UMAssets/Scripts/EJKBKMBJMGL.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,24 @@ public class EJKBKMBJMGL_EnemyData
public int EAHPLCJMPHD_Pic = 0; // 0x14
public int EELBHDJJJHH_Plt = 1; // 0x18
public int JMEGLFEKEBD_LiveSkill = 1; // 0x1C
public int MOMCFBMJJKB_CS = 1; // 0x20
public int MOMCFBMJJKB_CenterSkill = 1; // 0x20
public string OPFGFINHFCE_Name; // 0x24
public string KLMPFGOCBHC_Desc; // 0x28
public string NDPPEMCHKHA_SkillName; // 0x2C
public string PFHJFIHGCKP_CenterName; // 0x30
public int DCOALMMJDJK_CenterSkill; // 0x34
public int KKPLDFNDFDE_LiveSkill; // 0x38
public int DCOALMMJDJK_OverrideCenterSkill; // 0x34
public int KKPLDFNDFDE_OverrideLiveSkill; // 0x38

public int LMJFFFOEPLE { get { return KKPLDFNDFDE_LiveSkill < 1 ? JMEGLFEKEBD_LiveSkill : KKPLDFNDFDE_LiveSkill; } } //0x12F3790 CGIJHCKFOKG
public int PDHCABLLJPB_SkillId { get { return DCOALMMJDJK_CenterSkill < 1 ? MOMCFBMJJKB_CS : DCOALMMJDJK_CenterSkill; } } //0x12F37A4 LJKILMHFCCK
public int LMJFFFOEPLE_LiveSkillId { get { return KKPLDFNDFDE_OverrideLiveSkill < 1 ? JMEGLFEKEBD_LiveSkill : KKPLDFNDFDE_OverrideLiveSkill; } } //0x12F3790 CGIJHCKFOKG
public int PDHCABLLJPB_CenterSkillId { get { return DCOALMMJDJK_OverrideCenterSkill < 1 ? MOMCFBMJJKB_CenterSkill : DCOALMMJDJK_OverrideCenterSkill; } } //0x12F37A4 LJKILMHFCCK
public bool CDEFLIHHNAB_HasSkills { get {
int i = KKPLDFNDFDE_LiveSkill;
int i = KKPLDFNDFDE_OverrideLiveSkill;
if (i < 1)
i = JMEGLFEKEBD_LiveSkill;
if (i < 1)
i = DCOALMMJDJK_CenterSkill;
i = DCOALMMJDJK_OverrideCenterSkill;
if (i < 1)
i = MOMCFBMJJKB_CS;
i = MOMCFBMJJKB_CenterSkill;
return i > 0;
} } //0x12F37B8 NKOCPFCGNOG

Expand All @@ -41,53 +41,53 @@ public void KHEKNNFCAOI(int EJNIMIAPJFJ, int IHKNHNKMGAD)
EAHPLCJMPHD_Pic = dbEnnemy.EAHPLCJMPHD_Pic;
EELBHDJJJHH_Plt = dbEnnemy.EELBHDJJJHH_Plt;
JMEGLFEKEBD_LiveSkill = dbEnnemy.EDLACELKJIK_LiveSkill;
MOMCFBMJJKB_CS = dbEnnemy.NJOPIPNGANO_CS;
MOMCFBMJJKB_CenterSkill = dbEnnemy.NJOPIPNGANO_CS;
ADMMEMNGKEN_Avo = dbEnnemy.ADMMEMNGKEN_Avo;
OPFGFINHFCE_Name = MessageManager.Instance.GetBank("master").GetMessageByLabel("e_nm_" + EJNIMIAPJFJ.ToString("D4"));
KLMPFGOCBHC_Desc = MessageManager.Instance.GetBank("master").GetMessageByLabel("e_dsc_" + EJNIMIAPJFJ.ToString("D4"));
NDPPEMCHKHA_SkillName = "";
if(KKPLDFNDFDE_LiveSkill > 0)
if(KKPLDFNDFDE_OverrideLiveSkill > 0)
{
NDPPEMCHKHA_SkillName = MessageManager.Instance.GetBank("master").GetMessageByLabel("el_nm_" + KKPLDFNDFDE_LiveSkill.ToString("D4"));
NDPPEMCHKHA_SkillName = MessageManager.Instance.GetBank("master").GetMessageByLabel("el_nm_" + KKPLDFNDFDE_OverrideLiveSkill.ToString("D4"));
}
else if (JMEGLFEKEBD_LiveSkill != 0)
{
NDPPEMCHKHA_SkillName = MessageManager.Instance.GetBank("master").GetMessageByLabel("el_nm_" + JMEGLFEKEBD_LiveSkill.ToString("D4"));
}
PFHJFIHGCKP_CenterName = "";
if (DCOALMMJDJK_CenterSkill > 0)
if (DCOALMMJDJK_OverrideCenterSkill > 0)
{
PFHJFIHGCKP_CenterName = MessageManager.Instance.GetBank("master").GetMessageByLabel("ec_nm_" + DCOALMMJDJK_CenterSkill.ToString("D4"));
PFHJFIHGCKP_CenterName = MessageManager.Instance.GetBank("master").GetMessageByLabel("ec_nm_" + DCOALMMJDJK_OverrideCenterSkill.ToString("D4"));
}
else if (MOMCFBMJJKB_CS != 0)
else if (MOMCFBMJJKB_CenterSkill != 0)
{
PFHJFIHGCKP_CenterName = MessageManager.Instance.GetBank("master").GetMessageByLabel("ec_nm_" + MOMCFBMJJKB_CS.ToString("D4"));
PFHJFIHGCKP_CenterName = MessageManager.Instance.GetBank("master").GetMessageByLabel("ec_nm_" + MOMCFBMJJKB_CenterSkill.ToString("D4"));
}
}

//// RVA: 0x12F3BD0 Offset: 0x12F3BD0 VA: 0x12F3BD0
public void NPEKPHAFMGE(int DCOALMMJDJK, int KKPLDFNDFDE)
public void NPEKPHAFMGE_OverrideSkill(int DCOALMMJDJK_OverrideCenterSkill, int _KKPLDFNDFDE_OverrideLiveSkill)
{
this.KKPLDFNDFDE_LiveSkill = KKPLDFNDFDE;
this.DCOALMMJDJK_CenterSkill = DCOALMMJDJK;
this.KKPLDFNDFDE_OverrideLiveSkill = _KKPLDFNDFDE_OverrideLiveSkill;
this.DCOALMMJDJK_OverrideCenterSkill = DCOALMMJDJK_OverrideCenterSkill;
PFHJFIHGCKP_CenterName = "";
NDPPEMCHKHA_SkillName = "";
MessageBank bk = MessageManager.Instance.GetBank("master");
if(KKPLDFNDFDE > 0)
if(_KKPLDFNDFDE_OverrideLiveSkill > 0)
{
NDPPEMCHKHA_SkillName = bk.GetMessageByLabel("el_nm_" + KKPLDFNDFDE.ToString("D4"));
NDPPEMCHKHA_SkillName = bk.GetMessageByLabel("el_nm_" + _KKPLDFNDFDE_OverrideLiveSkill.ToString("D4"));
}
else if (JMEGLFEKEBD_LiveSkill != 0)
{
NDPPEMCHKHA_SkillName = bk.GetMessageByLabel("el_nm_" + JMEGLFEKEBD_LiveSkill.ToString("D4"));
}
if(DCOALMMJDJK > 0)
if(DCOALMMJDJK_OverrideCenterSkill > 0)
{
PFHJFIHGCKP_CenterName = bk.GetMessageByLabel("ec_nm_" + DCOALMMJDJK.ToString("D4"));
PFHJFIHGCKP_CenterName = bk.GetMessageByLabel("ec_nm_" + DCOALMMJDJK_OverrideCenterSkill.ToString("D4"));
}
else if(MOMCFBMJJKB_CS != 0)
else if(MOMCFBMJJKB_CenterSkill != 0)
{
PFHJFIHGCKP_CenterName = bk.GetMessageByLabel("ec_nm_" + MOMCFBMJJKB_CS.ToString("D4"));
PFHJFIHGCKP_CenterName = bk.GetMessageByLabel("ec_nm_" + MOMCFBMJJKB_CenterSkill.ToString("D4"));
}
}

Expand Down
2 changes: 1 addition & 1 deletion Unity/Assets/UMAssets/Scripts/HAEDCCLHEMN.cs
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ public void KHEKNNFCAOI(int BHCIFFILAKJ_Str_, BLHNHKMMPAD IDLHJIOMJBK, int IPPNC
PALEGNNHIKH_Leaf = IDLHJIOMJBK.PALEGNNHIKH_Leaf;
CPBFAMJEODF_CSkill = 0;
MGHPJNNDCIG_LSkill = 0;
if(BHCIFFILAKJ_Str > 2)
if(BHCIFFILAKJ_Str_ > 2)
{
DCAKKIJODME data = new DCAKKIJODME();
data.KHEKNNFCAOI(false);
Expand Down
2 changes: 1 addition & 1 deletion Unity/Assets/UMAssets/Scripts/IBJAKJJICBC.cs
Original file line number Diff line number Diff line change
Expand Up @@ -784,7 +784,7 @@ private void NPEKPHAFMGE_SetupEnemies(int CPBFAMJEODF, int MGHPJNNDCIG)
{
for(int i = 0; i < MGJKEJHEBPO_DiffInfos.Count; i++)
{
MGJKEJHEBPO_DiffInfos[i].HPBPDHPIBGN_EnemyData.NPEKPHAFMGE(CPBFAMJEODF, MGHPJNNDCIG);
MGJKEJHEBPO_DiffInfos[i].HPBPDHPIBGN_EnemyData.NPEKPHAFMGE_OverrideSkill(CPBFAMJEODF, MGHPJNNDCIG);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@ private void InitTex()
public void SetEnemy(EJKBKMBJMGL_EnemyData data)
{
int skillNum = 0;
if(data.PDHCABLLJPB_SkillId > 0)
if(data.PDHCABLLJPB_CenterSkillId > 0)
{
m_sp[0].text = data.PFHJFIHGCKP_CenterName;
skillNum = 1;
}
if(data.LMJFFFOEPLE > 0)
if(data.LMJFFFOEPLE_LiveSkillId > 0)
{
m_sp[1].text = data.NDPPEMCHKHA_SkillName;
skillNum++;
9E7A Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,8 @@ protected override bool IsEndExitAnimation()
// RVA: 0xF0FD14 Offset: 0xF0FD14 VA: 0xF0FD14 Slot: 51
protected override void OnDecideCurrentMusic()
{
m_overrideEnemyCenterSkill = selectMusicData.MGJKEJHEBPO_DiffInfos[(int)diff].HPBPDHPIBGN_EnemyData.DCOALMMJDJK_CenterSkill;
m_overrideEnemyLiveSkill = selectMusicData.MGJKEJHEBPO_DiffInfos[(int)diff].HPBPDHPIBGN_EnemyData.KKPLDFNDFDE_LiveSkill;
m_overrideEnemyCenterSkill = selectMusicData.MGJKEJHEBPO_DiffInfos[(int)diff].HPBPDHPIBGN_EnemyData.DCOALMMJDJK_OverrideCenterSkill;
m_overrideEnemyLiveSkill = selectMusicData.MGJKEJHEBPO_DiffInfos[(int)diff].HPBPDHPIBGN_EnemyData.KKPLDFNDFDE_OverrideLiveSkill;
base.OnDecideCurrentMusic();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -970,8 +970,8 @@ protected void DecideCurrentMusic()
m_musicDecideInfo = MusicDecideInfo.Empty;
if(selectMusicData.OEILJHENAHN_PlayEventType == 10)
{
m_musicDecideInfo.overrideEnemyCenterSkill = selectMusicData.MGJKEJHEBPO_DiffInfos[(int)diff].HPBPDHPIBGN_EnemyData.DCOALMMJDJK_CenterSkill;
m_musicDecideInfo.overrideEnemyLiveSkill = selectMusicData.MGJKEJHEBPO_DiffInfos[(int)diff].HPBPDHPIBGN_EnemyData.KKPLDFNDFDE_LiveSkill;
m_musicDecideInfo.overrideEnemyCenterSkill = selectMusicData.MGJKEJHEBPO_DiffInfos[(int)diff].HPBPDHPIBGN_EnemyData.DCOALMMJDJK_OverrideCenterSkill;
m_musicDecideInfo.overrideEnemyLiveSkill = selectMusicData.MGJKEJHEBPO_DiffInfos[(int)diff].HPBPDHPIBGN_EnemyData.KKPLDFNDFDE_OverrideLiveSkill;
m_eventCtrl = JEPBIIJDGEF_EventInfo.HHCJCDFCLOB.OIKOHACJPCB_GetEventById(selectMusicData.EKANGPODCEP_EventId);
}
OnDecideCurrentMusic(ref m_musicDecideInfo);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,9 @@ private SizeType GetEnemyPopupWindowSize(EJKBKMBJMGL_EnemyData enemyData)
{
if(enemyData.CDEFLIHHNAB_HasSkills)
{
if(enemyData.LMJFFFOEPLE > 0)
if(enemyData.LMJFFFOEPLE_LiveSkillId > 0)
{
if (enemyData.PDHCABLLJPB_SkillId > 0)
if (enemyData.PDHCABLLJPB_CenterSkillId > 0)
return SizeType.Large;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1508,8 +1508,8 @@ private void DecideCurrentMusic()
{
if(selectMusicData.OEILJHENAHN_PlayEventType == 10)
{
m_overrideEnemyCenterSkill = selectMusicData.MGJKEJHEBPO_DiffInfos[(int)diff].HPBPDHPIBGN_EnemyData.DCOALMMJDJK_CenterSkill;
m_overrideEnemyLiveSkill = selectMusicData.MGJKEJHEBPO_DiffInfos[(int)diff].HPBPDHPIBGN_EnemyData.KKPLDFNDFDE_LiveSkill;
m_overrideEnemyCenterSkill = selectMusicData.MGJKEJHEBPO_DiffInfos[(int)diff].HPBPDHPIBGN_EnemyData.DCOALMMJDJK_OverrideCenterSkill;
m_overrideEnemyLiveSkill = selectMusicData.MGJKEJHEBPO_DiffInfos[(int)diff].HPBPDHPIBGN_EnemyData.KKPLDFNDFDE_OverrideLiveSkill;
m_eventCtrl = JEPBIIJDGEF_EventInfo.HHCJCDFCLOB.OIKOHACJPCB_GetEventById(selectMusicData.EKANGPODCEP_EventId);
}
OnDecideCurrentMusic();
Expand Down
2 cha 10000 nges: 1 addition & 1 deletion Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/TeamSelectSceneUnit5.cs
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ protected override void OnPreSetCanvas()
}
m_viewMusicData = Database.Instance.selectedMusic.GetSelectedMusicData();
m_viewEnemyData = Database.Instance.selectedMusic.GetEnemyData(Database.Instance.gameSetup.musicInfo.difficultyType);
m_viewEnemyData.NPEKPHAFMGE(Database.Instance.gameSetup.musicInfo.enemyInfo.NJOPIPNGANO_CS, Database.Instance.gameSetup.musicInfo.enemyInfo.EDLACELKJIK_LiveSkill);
m_viewEnemyData.NPEKPHAFMGE_OverrideSkill(Database.Instance.gameSetup.musicInfo.enemyInfo.NJOPIPNGANO_CS, Database.Instance.gameSetup.musicInfo.enemyInfo.EDLACELKJIK_LiveSkill);
UpdatePrismData(m_viewMusicData.DLAEJOBELBH_MusicId, Database.Instance.gameSetup.musicInfo);
m_isRaidEvent = Database.Instance.gameSetup.musicInfo.gameEventType == OHCAABOMEOF.KGOGMKMBCPP_EventType.CADKONMJEDA_EventRaid;
if(TutorialProc.CanUnit5Help(Database.Instance.gameSetup.musicInfo))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -678,8 +678,8 @@ private void DecideCurrentMusic(bool isSimulation)
m_musicDecideInfo = MusicDecideInfo.Empty;
if(selectMusicData.OEILJHENAHN_PlayEventType == 10 || selectMusicData.OEILJHENAHN_PlayEventType == 4)
{
m_musicDecideInfo.overrideEnemyCenterSkill = selectMusicData.MGJKEJHEBPO_DiffInfos[(int)diff].HPBPDHPIBGN_EnemyData.DCOALMMJDJK_CenterSkill;
m_musicDecideInfo.overrideEnemyLiveSkill = selectMusicData.MGJKEJHEBPO_DiffInfos[(int)diff].HPBPDHPIBGN_EnemyData.KKPLDFNDFDE_LiveSkill;
m_musicDecideInfo.overrideEnemyCenterSkill = selectMusicData.MGJKEJHEBPO_DiffInfos[(int)diff].HPBPDHPIBGN_EnemyData.DCOALMMJDJK_OverrideCenterSkill;
m_musicDecideInfo.overrideEnemyLiveSkill = selectMusicData.MGJKEJHEBPO_DiffInfos[(int)diff].HPBPDHPIBGN_EnemyData.KKPLDFNDFDE_OverrideLiveSkill;
m_eventCtrl = JEPBIIJDGEF_EventInfo.HHCJCDFCLOB.OIKOHACJPCB_GetEventById(selectMusicData.EKANGPODCEP_EventId);
}
OnDecideCurrentMusic(ref m_musicDecideInfo);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ private static void ClaimAchievements(EDOHBJAPLPF_JsonData msgData, EDOHBJAPLPF_
UnityEngine.Debug.LogError("Missing reward for "+(string)msgData["keys"][i]+", key does no match event prefix "+dbSection.NGHKJOEDLIP.OCDMGOGMHGE_AchievementIdPrefix);
}
}
if(dbSectionGoDiva != null)
else if(dbSectionGoDiva != null)
{
if(key.StartsWith(dbSectionGoDiva.NGHKJOEDLIP.OCDMGOGMHGE_AchievementIdPrefix))
{
Expand Down
0