incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

handle DARK_GUNNER_CONTROL properly

Browse Source
This commit is contained in:
Martin Michelsen
2025-03-29 16:32:53 -07:00
parent 1723a4152c
commit e0d1db0363
4 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/EnemyType.cc
+1
View File
@@ -42,6 +42,7 @@ static const vector<EnemyTypeDefinition> type_defs{
{EnemyType::DARK_FALZ_2, EP1, 0x2F, 0x37, "DARK_FALZ_2", "Dark Falz (phase 2)", nullptr}, {EnemyType::DARK_FALZ_2, EP1, 0x2F, 0x37, "DARK_FALZ_2", "Dark Falz (phase 2)", nullptr},
{EnemyType::DARK_FALZ_3, EP1, 0x2F, 0x38, "DARK_FALZ_3", "Dark Falz (phase 3)", nullptr}, {EnemyType::DARK_FALZ_3, EP1, 0x2F, 0x38, "DARK_FALZ_3", "Dark Falz (phase 3)", nullptr},
{EnemyType::DARK_GUNNER, EP1, 0x22, 0x1E, "DARK_GUNNER", "Dark Gunner", nullptr}, {EnemyType::DARK_GUNNER, EP1, 0x22, 0x1E, "DARK_GUNNER", "Dark Gunner", nullptr},
{EnemyType::DARK_GUNNER_CONTROL, EP1, 0xFF, 0xFF, "DARK_GUNNER_CONTROL", "Dark Gunner (control)", nullptr},
{EnemyType::DARVANT, EP1, 0xFF, 0x35, "DARVANT", "Darvant", nullptr}, {EnemyType::DARVANT, EP1, 0xFF, 0x35, "DARVANT", "Darvant", nullptr},
{EnemyType::DARVANT_ULTIMATE, EP1, 0xFF, 0x39, "DARVANT_ULTIMATE", "Darvant (ultimate)", nullptr}, {EnemyType::DARVANT_ULTIMATE, EP1, 0xFF, 0x39, "DARVANT_ULTIMATE", "Darvant (ultimate)", nullptr},
{EnemyType::DE_ROL_LE, EP1, 0x2D, 0x0F, "DE_ROL_LE", "De Rol Le", "Dal Ral Lie"}, {EnemyType::DE_ROL_LE, EP1, 0x2D, 0x0F, "DE_ROL_LE", "De Rol Le", "Dal Ral Lie"},
src/EnemyType.hh
+1
View File
@@ -33,6 +33,7 @@ enum class EnemyType : uint8_t {
DARK_FALZ_2, DARK_FALZ_2,
DARK_FALZ_3, DARK_FALZ_3,
DARK_GUNNER, DARK_GUNNER,
DARK_GUNNER_CONTROL,
DARVANT, DARVANT,
DARVANT_ULTIMATE, DARVANT_ULTIMATE,
DE_ROL_LE, DE_ROL_LE,
src/Map.cc
+1 -1
View File
@@ -4146,7 +4146,7 @@ shared_ptr<SuperMap::Enemy> SuperMap::add_enemy_and_children(
add(EnemyType::DARK_GUNNER); add(EnemyType::DARK_GUNNER);
break; break;
case 0x00A3: // TObjEneDarkGunCenter case 0x00A3: // TObjEneDarkGunCenter
add(EnemyType::DEATH_GUNNER); add(EnemyType::DARK_GUNNER_CONTROL);
break; break;
case 0x00A4: // TObjEneDf2Bringer case 0x00A4: // TObjEneDf2Bringer
add(EnemyType::CHAOS_BRINGER); add(EnemyType::CHAOS_BRINGER);
src/RareItemSet.cc
+1 -1
View File
@@ -472,7 +472,7 @@ string RareItemSet::serialize_html(
EnemyType::DELSABER, EnemyType::DELSABER,
EnemyType::CHAOS_SORCERER, EnemyType::BEE_L, EnemyType::BEE_R, EnemyType::CHAOS_SORCERER, EnemyType::BEE_L, EnemyType::BEE_R,
EnemyType::DARK_BELRA, EnemyType::DARK_BELRA,
EnemyType::DARK_GUNNER, EnemyType::DEATH_GUNNER, EnemyType::DARK_GUNNER, EnemyType::DARK_GUNNER_CONTROL, EnemyType::DEATH_GUNNER,
EnemyType::CHAOS_BRINGER, EnemyType::CHAOS_BRINGER,
EnemyType::DARVANT, EnemyType::DARVANT_ULTIMATE, EnemyType::DARK_FALZ_1, EnemyType::DARK_FALZ_2, EnemyType::DARK_FALZ_3, EnemyType::DARVANT, EnemyType::DARVANT_ULTIMATE, EnemyType::DARK_FALZ_1, EnemyType::DARK_FALZ_2, EnemyType::DARK_FALZ_3,
}}, }},