diff --git a/CODING_RULES.md b/CODING_RULES.md index 1281939..5c0cba8 100644 --- a/CODING_RULES.md +++ b/CODING_RULES.md @@ -199,6 +199,13 @@ Do not substitute `__FILE__` or `__LINE__` merely to follow a different project' invent diagnostic literals. Distinguish compiler-generated diagnostics from application arguments using the original instructions. +### Korean string literals + +Sources are UTF-8; `compile.json` passes `/source-charset:utf-8 /execution-charset:.949`, so write Korean +literals as Hangul (`"유저인터페이스\\item\\%s.bmp"`), not CP949 escapes. Keep `\x` escapes for bytes +that are not CP949 Hangul: other code pages (Shift-JIS, GBK, Big5 font names), byte-order marks and key codes. +Never use `/utf-8`, and never save sources as CP949/EUC-KR. + ## 7. Platform and build scope - This target is Windows x86. Keep code in its assigned existing translation unit and subsystem headers. diff --git a/Source/Client/Input/TraditionalKeyInput.cpp b/Source/Client/Input/TraditionalKeyInput.cpp index 9ba242a..71a0318 100644 --- a/Source/Client/Input/TraditionalKeyInput.cpp +++ b/Source/Client/Input/TraditionalKeyInput.cpp @@ -7,13 +7,15 @@ void TraditionalKeyInput::InitializeMappings() { // STATIC: 0x011594E0 // GLOBAL: gl_13427 - static constexpr std::uint8_t bytes[] = {0xA3, 0x74, 0xA3, 0x78, 0xA3, 0xBE, 0xA3, 0xBF, 0xA3, 0xA4, 0xA3, 0xBD, 0xA3, 0xBB, 0xA3, 0xAB, 0xA3, - 0xAF, 0xA3, 0xB3, 0xA3, 0x76, 0xA3, 0xA7, 0xA3, 0x74, 0xA3, 0x74, 0xA3, 0x74, 0xA3, 0xA2, 0xA3, 0xA6, - 0xA3, 0xA9, 0xA3, 0xAC, 0xA3, 0xB9, 0xA3, 0xAD, 0xA3, 0xB1, 0xA3, 0xAA, 0xA3, 0xBA, 0xA3, 0xB0, 0xA3, - 0xB4, 0xA3, 0x75, 0xA3, 0xA1, 0xA3, 0x7A, 0xA3, 0xA5, 0xA3, 0x74, 0xA3, 0xA3, 0xA3, 0x79, 0xA3, 0x74, - 0xA3, 0xA8, 0xA3, 0x77, 0xA3, 0xB7, 0xA3, 0xB5, 0xA3, 0xAE, 0xA3, 0xB2, 0xA3, 0xB6}; + static constexpr std::uint8_t zhuyinBig5[] = {0xA3, 0x74, 0xA3, 0x78, 0xA3, 0xBE, 0xA3, 0xBF, 0xA3, 0xA4, 0xA3, 0xBD, 0xA3, 0xBB, 0xA3, 0xAB, 0xA3, + 0xAF, 0xA3, 0xB3, 0xA3, 0x76, 0xA3, 0xA7, 0xA3, 0x74, 0xA3, 0x74, 0xA3, 0x74, 0xA3, 0xA2, 0xA3, 0xA6, + 0xA3, 0xA9, 0xA3, 0xAC, 0xA3, 0xB9, 0xA3, 0xAD, 0xA3, 0xB1, 0xA3, 0xAA, 0xA3, 0xBA, 0xA3, 0xB0, 0xA3, + 0xB4, 0xA3, 0x75, 0xA3, 0xA1, 0xA3, 0x7A, 0xA3, 0xA5, 0xA3, 0x74, 0xA3, 0xA3, 0xA3, 0x79, 0xA3, 0x74, + 0xA3, 0xA8, 0xA3, 0x77, 0xA3, 0xB7, 0xA3, 0xB5, 0xA3, 0xAE, 0xA3, 0xB2, 0xA3, 0xB6}; static constexpr char categories[] = "11441443331111111132331233111121111133333"; - static constexpr unsigned char keys[] = "1234567890ABCDEFGHIJKLNMOPQRSTUVWXYZ\xBD\xBA\xBC\xBE\xBF"; + static constexpr unsigned char keys[] = {'1', '2', '3', '4', '5', '6', '7', '8', '9', '0', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', + 'I', 'J', 'K', 'L', 'N', 'M', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', + VK_OEM_MINUS, VK_OEM_1, VK_OEM_COMMA, VK_OEM_PERIOD, VK_OEM_2, 0}; this->unknown04C1 = 0; @@ -23,8 +25,8 @@ void TraditionalKeyInput::InitializeMappings() { for (unsigned index = 0; index < 41; ++index) { auto& mapping = this->mappings[keys[index]]; - mapping.bytes[0] = bytes[2 * index]; - mapping.bytes[1] = bytes[2 * index + 1]; + mapping.bytes[0] = zhuyinBig5[2 * index]; + mapping.bytes[1] = zhuyinBig5[2 * index + 1]; mapping.bytes[2] = 0; mapping.category = static_cast(categories[index] - '1'); } diff --git a/Source/Contents/Camera/CameraState.h b/Source/Contents/Camera/CameraState.h index c02839c..a279d16 100644 --- a/Source/Contents/Camera/CameraState.h +++ b/Source/Contents/Camera/CameraState.h @@ -4,14 +4,14 @@ struct ServiceOptions; struct CameraState { - float target[3]; - float pitch; - float yaw; - float distance; - float desiredTarget[3]; - float desiredPitch; - float desiredYaw; - float desiredDistance; + /* 0020 */ float target[3]; + /* 002C */ float pitch; + /* 0030 */ float yaw; + /* 0034 */ float distance; + /* 0038 */ float desiredTarget[3]; + /* 0044 */ float desiredPitch; + /* 0048 */ float desiredYaw; + /* 004C */ float desiredDistance; void Reset(); void AddDistance(float delta); @@ -30,13 +30,13 @@ struct CameraProjectionOutputs { }; struct CameraShake { - float horizontal; - float distance; - float pitch; - unsigned unknown_0010; - int enabled; - unsigned start; - unsigned duration; + /* 0004 */ float horizontal; + /* 0008 */ float distance; + /* 000C */ float pitch; + /* 0010 */ unsigned unknown_0010; + /* 0014 */ int enabled; + /* 0018 */ unsigned start; + /* 001C */ unsigned duration; void Apply(CameraState& camera, int& frameLatch); void Start(int enabled, unsigned duration, float horizontal, float distance, float pitch); @@ -44,5 +44,6 @@ struct CameraShake { }; static_assert(sizeof(CameraState) == 48); +static_assert(sizeof(CameraShake) == 28); #endif diff --git a/Source/Contents/Effects/EffectTypes.cpp b/Source/Contents/Effects/EffectTypes.cpp index 0210493..9b2dbc7 100644 --- a/Source/Contents/Effects/EffectTypes.cpp +++ b/Source/Contents/Effects/EffectTypes.cpp @@ -1105,26 +1105,26 @@ namespace { {EF_SPRITEMABLE, 1096}, {EF_TUNAPARTY, 1097}, {EF_FRESHSHRIMP, 1098}, - {1099, 1099}, - {1100, 1100}, + {EF_UNK_1099, 1099}, + {EF_UNK_1100, 1100}, {EF_SU_SV_STEMSPEAR, 1101}, {EF_SU_TUNABELLY, 1102}, {EF_SU_SCRATCH, 1103}, - {1104, 1104}, + {EF_UNK_1104, 1104}, {EF_SU_BITE, 1105}, - {1106, 1106}, + {EF_UNK_1106, 1106}, {EF_SU_SCAROFTAROU, 1107}, {EF_SU_ARCLOUSEDASH, 1108}, {EF_SU_PICKYPECK, 1109}, - {1110, 9999}, - {1111, 1111}, - {1112, 1112}, - {1113, 100}, - {1114, 1114}, + {EF_UNK_1110, 9999}, + {EF_UNK_1111, 1111}, + {EF_UNK_1112, 1112}, + {EF_UNK_1113, 100}, + {EF_UNK_1114, 1114}, {EF_SU_CN_METEOR, 99999999}, {EF_SU_BUNCHOFSHRIMP, 1116}, - {1117, 1117}, - {1118, 1118}, + {EF_UNK_1117, 1117}, + {EF_UNK_1118, 1118}, {EF_BITE_SCAR, 1119}, {EF_SU_LUNATIC_CARROT_BEAT, 1120}, {EF_WIDE_CRITICAL_WOUND, 1121}, @@ -1134,9 +1134,9 @@ namespace { {EF_SU_LOPE, 1125}, {EF_SU_HISS, 1126}, {EF_SU_POWEROFFLOCK, 1127}, - {1128, 1128}, + {EF_UNK_1128, 1128}, {EF_SU_SVG_SPIRIT, 1129}, - {1130, 1130}, + {EF_UNK_1130, 1130}, {EF_SU_SPIRIT_OF_LIFE, 99}, {EF_SU_STOOP, 99999999}, {EF_FIREDANCE, 1133}, @@ -1149,65 +1149,65 @@ namespace { {EF_FALLEN_ANGEL, 1140}, {EF_WE_ONEFOREVER, 1141}, {EF_WE_CHEERUP, 1142}, - {1143, 100}, - {1144, 100}, + {EF_UNK_1143, 100}, + {EF_UNK_1144, 100}, {EF_RL_HAMMER_OF_GOD, 99999999}, - {1146, 1146}, - {1147, 99999999}, + {EF_UNK_1146, 1146}, + {EF_UNK_1147, 99999999}, {EF_RL_R_TRIP, 9999999}, {EF_IMMUNE_PROPERTY, 99999}, {EF_MOVE_COORDINATE, 300}, - {1151, 1151}, - {1152, 1152}, - {1153, 1153}, - {1154, 1154}, - {1155, 1155}, - {1156, 1156}, - {1157, 1157}, - {1158, 1158}, - {1159, 1159}, - {1160, 1160}, + {EF_UNK_1151, 1151}, + {EF_UNK_1152, 1152}, + {EF_UNK_1153, 1153}, + {EF_UNK_1154, 1154}, + {EF_UNK_1155, 1155}, + {EF_UNK_1156, 1156}, + {EF_UNK_1157, 1157}, + {EF_UNK_1158, 1158}, + {EF_UNK_1159, 1159}, + {EF_UNK_1160, 1160}, {EF_QUAGMIRE_VISUAL, 150}, {EF_LORD_OF_VERMILLION_VISUAL, 9999}, {EF_METEOR_STORM_VISUAL, 9999}, - {1164, 99999999}, - {1165, 99999999}, - {1166, 99999999}, - {1167, 99999999}, - {1168, 99999999}, - {1169, 99999999}, - {1170, 99999999}, - {1171, 99999999}, - {1172, 99999999}, - {1173, 99999999}, - {1174, 99999999}, - {1175, 99999999}, - {1176, 99999999}, - {1177, 99999999}, - {1178, 99999999}, - {1179, 99999999}, - {1180, 99999999}, - {1181, 99999999}, - {1182, 99999999}, - {1183, 99999999}, - {1184, 1184}, + {EF_UNK_1164, 99999999}, + {EF_UNK_1165, 99999999}, + {EF_UNK_1166, 99999999}, + {EF_UNK_1167, 99999999}, + {EF_UNK_1168, 99999999}, + {EF_UNK_1169, 99999999}, + {EF_UNK_1170, 99999999}, + {EF_UNK_1171, 99999999}, + {EF_UNK_1172, 99999999}, + {EF_UNK_1173, 99999999}, + {EF_UNK_1174, 99999999}, + {EF_UNK_1175, 99999999}, + {EF_UNK_1176, 99999999}, + {EF_UNK_1177, 99999999}, + {EF_UNK_1178, 99999999}, + {EF_UNK_1179, 99999999}, + {EF_UNK_1180, 99999999}, + {EF_UNK_1181, 99999999}, + {EF_UNK_1182, 99999999}, + {EF_UNK_1183, 99999999}, + {EF_UNK_1184, 1184}, {EF_WARPZONE3, 99999999}, - {1186, 1186}, - {1187, 1187}, - {1188, 1188}, - {1189, 1189}, - {1190, 1190}, - {1191, 1191}, - {1192, 1192}, - {1193, 1193}, - {1194, 1194}, + {EF_UNK_1186, 1186}, + {EF_UNK_1187, 1187}, + {EF_UNK_1188, 1188}, + {EF_UNK_1189, 1189}, + {EF_UNK_1190, 1190}, + {EF_UNK_1191, 1191}, + {EF_UNK_1192, 1192}, + {EF_UNK_1193, 1193}, + {EF_UNK_1194, 1194}, {EF_AUTOSHADOWSPELL_ACTIVE, 1195}, - {1196, 1196}, + {EF_UNK_1196, 1196}, {EF_LIGHTSPHERE_SUN, 1197}, {EF_LIGHTSPHERE_MOON, 1198}, {EF_LIGHTSPHERE_STAR, 1199}, - {1200, 1200}, - {1201, 1201}, + {EF_UNK_1200, 1200}, + {EF_UNK_1201, 1201}, {EF_NOVAEXPLOSING, 1202}, {EF_STAR_EMPEROR, 1203}, {EF_SMA_BLACK, 100}, @@ -1217,37 +1217,37 @@ namespace { {EF_ENERGYDRAIN_BLACK, 200}, {EF_BLINK_BODY, 100}, {EF_LINELINK5, 200}, - {1211, 1211}, - {1212, 1212}, - {1213, 1213}, - {1214, 1214}, - {1215, 1215}, - {1216, 1216}, - {1217, 1217}, + {EF_UNK_1211, 1211}, + {EF_UNK_1212, 1212}, + {EF_UNK_1213, 1213}, + {EF_UNK_1214, 1214}, + {EF_UNK_1215, 1215}, + {EF_UNK_1216, 1216}, + {EF_UNK_1217, 1217}, {EF_SOLARBURST, 1218}, {EF_SJ_DOCUMENT, 1219}, {EF_FALLING_STAR, 1220}, {EF_FLASH_KICK, 1221}, - {1222, 1222}, + {EF_UNK_1222, 1222}, {EF_STORMKICK8, 1223}, {EF_SOLAR_EXPLOSION, 50}, - {1225, 1225}, - {1226, 1226}, - {1227, 1227}, + {EF_UNK_1225, 1225}, + {EF_UNK_1226, 1226}, + {EF_UNK_1227, 1227}, {EF_SOUL_GOLEM, 1228}, {EF_NEWMOON_KICK, 1229}, {EF_FULLMOON_KICK, 1230}, {EF_BOOK_OF_DIMENSION, 1231}, - {1232, 1232}, + {EF_UNK_1232, 1232}, {EF_CURSE_EXPLOSION, 1233}, {EF_SOUL_REAPER, 1234}, - {1235, 1235}, - {1236, 1236}, - {1237, 1237}, + {EF_UNK_1235, 1235}, + {EF_UNK_1236, 1236}, + {EF_UNK_1237, 1237}, {EF_SOUL_CURSE, 1238}, {EF_PROMINENCE_KICK, 1239}, {EF_SOUL_REAPER_COLLECT, 1240}, - {1241, 1241}, + {EF_UNK_1241, 1241}, {EF_SOUL_EXPLOSION, 1242}, {EF_SOUL_REVOLVE, 1243}, {EF_TEST_EFFECT_00, 1244}, @@ -1262,8 +1262,8 @@ namespace { {EF_TEST_EFFECT_09, 1253}, {EF_NEW_METEORSTORM, 1254}, {EF_NEW_METEORSTORM_BOTTOM, 1255}, - {1256, 1256}, - {1257, 1257}, + {EF_UNK_1256, 1256}, + {EF_UNK_1257, 1257}, {EF_NEW_ADORAMUS, 1258}, {EF_NEW_ADORAMUS_BOTTOM, 1259}, {EF_TETRA_VORTEX_CAST, 1260}, @@ -1282,7 +1282,7 @@ namespace { {EF_TETRA_VORTEX_EARTH_GROUND, 1273}, {EF_NEW_CRIMSONROCK, 1274}, {EF_NEW_CRIMSONROCK_BOTTOM, 1275}, - {1276, 1276}, + {EF_UNK_1276, 1276}, {EF_TETRA_VORTEX_CORE_GROUND, 1277}, {EF_TETRA_VORTEX_FIRE_SUB, 1278}, {EF_TETRA_VORTEX_WATER_SUB, 1279}, @@ -1297,8 +1297,8 @@ namespace { {EF_NEW_PSYCHICWAVE, 1288}, {EF_NEW_PSYCHICWAVE_BOTTOM, 1289}, {EF_NEW_PSYCHICWAVE_CAST, 1290}, - {1291, 99999999}, - {1292, 99999999}, + {EF_UNK_1291, 99999999}, + {EF_UNK_1292, 99999999}, {EF_NEW_ARROWSTORM_00, 1293}, {EF_NEW_ARROWSTORM_01, 1294}, {EF_NEW_SECRAMENT_AURA, 1295}, @@ -1330,29 +1330,29 @@ namespace { {EF_NEW_CROSSRIPPERSLASHER_09, 1321}, {EF_NEW_CROSSRIPPERSLASHER_11, 1322}, {EF_NEW_TIGERCANNON, 1323}, - {1324, 1324}, - {1325, 99999999}, - {1326, 99999999}, - {1327, 99999999}, - {1328, 99999999}, - {1329, 99999999}, - {1330, 99999999}, - {1331, 99999999}, - {1332, 99999999}, - {1333, 99999999}, - {1334, 99999999}, - {1335, 99999999}, - {1336, 99999999}, - {1337, 99999999}, - {1338, 99999999}, - {1339, 99999999}, - {1340, 99999999}, - {1341, 99999999}, - {1342, 99999999}, - {1343, 99999999}, - {1344, 99999999}, - {1345, 99999999}, - {1346, 99999999}, + {EF_UNK_1324, 1324}, + {EF_UNK_1325, 99999999}, + {EF_UNK_1326, 99999999}, + {EF_UNK_1327, 99999999}, + {EF_UNK_1328, 99999999}, + {EF_UNK_1329, 99999999}, + {EF_UNK_1330, 99999999}, + {EF_UNK_1331, 99999999}, + {EF_UNK_1332, 99999999}, + {EF_UNK_1333, 99999999}, + {EF_UNK_1334, 99999999}, + {EF_UNK_1335, 99999999}, + {EF_UNK_1336, 99999999}, + {EF_UNK_1337, 99999999}, + {EF_UNK_1338, 99999999}, + {EF_UNK_1339, 99999999}, + {EF_UNK_1340, 99999999}, + {EF_UNK_1341, 99999999}, + {EF_UNK_1342, 99999999}, + {EF_UNK_1343, 99999999}, + {EF_UNK_1344, 99999999}, + {EF_UNK_1345, 99999999}, + {EF_UNK_1346, 99999999}, {EF_NEW_ARMSCANNON_01_UP, 1347}, {EF_NEW_ARMSCANNON_01_DOWN, 1348}, {EF_NEW_ARMSCANNON_05_UP, 1349}, @@ -1363,7 +1363,7 @@ namespace { {EF_NEW_ARMSCANNON_11_DOWN, 1354}, {EF_NEW_ARMSCANNON_EXPLOSION, 1355}, {EF_NEW_ARMSCANNON_EXPLOSION_BOTTOM, 1356}, - {1357, 1357}, + {EF_UNK_1357, 1357}, {EF_NEW_CART_CANNON_EXPLOSION, 1358}, {EF_NEW_CART_CANNON_EXPLOSION_BOTTOM, 1359}, {EF_NEW_CART_CANNON_FIRE, 1360}, @@ -1383,7 +1383,7 @@ namespace { {EF_NEW_BANISHINGPOINT_05, 1374}, {EF_NEW_BANISHINGPOINT_07, 1375}, {EF_NEW_BANISHINGPOINT_11, 1376}, - {1377, 99999999}, + {EF_UNK_1377, 99999999}, {EF_NEW_DRAGONBREATH_BOMB, 1378}, {EF_NEW_DRAGONBREATH_BOMB_BOTTOM, 1379}, {EF_NEW_DRAGONBREATH_01, 1380}, @@ -1404,7 +1404,7 @@ namespace { {EF_NEW_FATAL_MENACE_BOTTOM, 1395}, {EF_NEW_FATAL_MENACE_CAST, 1396}, {EF_NEW_FATAL_MENACE_CAST_BOTTOM, 1397}, - {1398, 99999999}, + {EF_UNK_1398, 99999999}, {EF_NEW_HEAVENS_DRIVE, 75}, {EF_NEW_CANNON_SPEAR_12, 1400}, {EF_NEW_CANNON_SPEAR_01, 1401}, @@ -1425,7 +1425,7 @@ namespace { {EF_NEW_COMET_SUB_EXP, 1416}, {EF_NEW_COMET_SUB_EXP_BOTTOM, 1417}, {EF_NEW_MOON_SLASH, 1418}, - {1419, 1419}, + {EF_UNK_1419, 1419}, {EF_NEW_GRANDCROSS, 99999999}, {EF_NEW_COMET_CAST, 1421}, {EF_NEW_CART_CANNON_CAST, 1422}, @@ -1561,7 +1561,7 @@ namespace { {EF_NEW_HELLINFERNO_CAST_BOTTOM, 1552}, {EF_NEW_HELLINFERNO_SUB, 1553}, {EF_NEW_HELLINFERNO_SUB_BOTTOM, 1554}, - {1555, 1555}, + {EF_UNK_1555, 1555}, {EF_NEW_HEAL_BLUE, 60}, {EF_NEW_CLEARANCE, 1557}, {EF_NEW_CLEARANCE_BOTTOM, 1558}, @@ -1623,9 +1623,9 @@ namespace { {EF_RED_WAVE_1, 1614}, {EF_RED_WAVE_2, 1615}, {EF_RED_WAVE_3, 1616}, - {1617, 1617}, - {1618, 1618}, - {1619, 1619}, + {EF_UNK_1617, 1617}, + {EF_UNK_1618, 1618}, + {EF_UNK_1619, 1619}, {EF_NEW_WALLOFTHORN_CAST, 1620}, {EF_NEW_WALLOFTHORN_CAST_BOTTOM, 1621}, {EF_NEW_EARTHGRAVE_BOTTOM, 1622}, @@ -1663,24 +1663,24 @@ namespace { {EF_NEW_EPICLESIS, 1654}, {EF_NEW_EPICLESIS_AURA, 99999999}, {EF_NEW_EPICLESIS_CAST, 100}, - {1657, 1657}, + {EF_UNK_1657, 1657}, {EF_NEW_AXEBOOMERANG_CAST, 1658}, {EF_NEW_AXEBOOMERANG_CAST_BOTTOM, 1659}, {EF_NEW_AXEBOOMERANG_HIT, 1660}, - {1661, 1661}, - {1662, 1662}, - {1663, 1663}, + {EF_UNK_1661, 1661}, + {EF_UNK_1662, 1662}, + {EF_UNK_1663, 1663}, {EF_NEW_SANCTUARY, 100}, {EF_NEW_SPELLFIST_FIRE, 1665}, {EF_NEW_SPELLFIST_FIRE_BOTTOM, 1666}, {EF_NEW_SPELLFIST_WATER, 1667}, {EF_NEW_SPELLFIST_WATER_BOTTOM, 1668}, {EF_NEW_SPELLFIST_WIND, 1669}, - {1670, 1670}, - {1671, 1671}, - {1672, 1672}, - {1673, 1673}, - {1674, 1674}, + {EF_UNK_1670, 1670}, + {EF_UNK_1671, 1671}, + {EF_UNK_1672, 1672}, + {EF_UNK_1673, 1673}, + {EF_UNK_1674, 1674}, {EF_NEW_CARTBOOST, 1675}, {EF_NEW_CARTBOOST_BOTTOM, 1676}, {EF_NEW_SAFETYWALL, 60}, @@ -1700,10 +1700,10 @@ namespace { {EF_NEW_WINDCUTTER_BOTTOM_01, 1691}, {EF_NEW_WINDCUTTER_BOTTOM_05, 1692}, {EF_NEW_WINDCUTTER_TARGET, 1693}, - {1694, 1694}, - {1695, 1695}, - {1696, 1696}, - {1697, 1697}, + {EF_UNK_1694, 1694}, + {EF_UNK_1695, 1695}, + {EF_UNK_1696, 1696}, + {EF_UNK_1697, 1697}, {EF_NEW_POWERSWING_01, 1698}, {EF_NEW_POWERSWING_05, 1699}, {EF_NEW_POWERSWING_07, 1700}, @@ -1716,26 +1716,26 @@ namespace { {EF_NEW_EARTHDRIVE_BOTTOM, 1707}, {EF_NEW_EARTHDRIVE_TARGET, 1708}, {EF_NEW_EARTHDRIVE_CAST, 40}, - {1710, 1710}, - {1711, 1711}, - {1712, 1712}, - {1713, 1713}, - {1714, 1714}, - {1715, 1715}, - {1716, 1716}, - {1717, 1717}, - {1718, 1718}, - {1719, 1719}, - {1720, 1720}, - {1721, 1721}, + {EF_UNK_1710, 1710}, + {EF_UNK_1711, 1711}, + {EF_UNK_1712, 1712}, + {EF_UNK_1713, 1713}, + {EF_UNK_1714, 1714}, + {EF_UNK_1715, 1715}, + {EF_UNK_1716, 1716}, + {EF_UNK_1717, 1717}, + {EF_UNK_1718, 1718}, + {EF_UNK_1719, 1719}, + {EF_UNK_1720, 1720}, + {EF_UNK_1721, 1721}, {EF_DRAGONIC_AURA, 1722}, {EF_DRAGONIC_AURA_BOTTOM, 1723}, {EF_DRAGONIC_AURA_HIT, 1724}, {EF_DRAGONIC_AURA_HIT_BOTTOM, 1725}, {EF_DRAGONIC_AURA_BUFF, 1726}, {EF_DRAGONIC_AURA_BUFF_BOTTOM, 1727}, - {1728, 1728}, - {1729, 1729}, + {EF_UNK_1728, 1728}, + {EF_UNK_1729, 1729}, {EF_NEW_AUTOSHADOWSPELL, 1730}, {EF_NEW_AUTOSHADOWSPELL_BOTTOM, 1731}, {EF_DESTRUCTIVE_HURRICANE, 1732}, @@ -1756,25 +1756,25 @@ namespace { {EF_ROCKDOWN_CAST, 1747}, {EF_ROCKDOWN_CAST_BOTTOM, 1748}, {EF_ROCKDOWN_HIT, 1749}, - {1750, 1750}, - {1751, 1751}, - {1752, 1752}, + {EF_UNK_1750, 1750}, + {EF_UNK_1751, 1751}, + {EF_UNK_1752, 1752}, {EF_RAIN_OF_CRYSTAL, 1753}, {EF_RAIN_OF_CRYSTAL_BOTTOM, 1754}, - {1755, 1755}, - {1756, 1756}, + {EF_UNK_1755, 1755}, + {EF_UNK_1756, 1756}, {EF_CRIMSON_ARROW_CAST, 1757}, {EF_CRIMSON_ARROW_CAST_BOTTOM, 1758}, {EF_CRIMSON_ARROW_HIT, 1759}, - {1760, 1760}, + {EF_UNK_1760, 1760}, {EF_VIOLENT_QUAKE_CAST, 1761}, {EF_VIOLENT_QUAKE_CAST_BOTTOM, 1762}, {EF_VIOLENT_QUAKE_HIT, 1763}, - {1764, 1764}, - {1765, 1765}, - {1766, 1766}, - {1767, 1767}, - {1768, 1768}, + {EF_UNK_1764, 1764}, + {EF_UNK_1765, 1765}, + {EF_UNK_1766, 1766}, + {EF_UNK_1767, 1767}, + {EF_UNK_1768, 1768}, {EF_ASTRAL_STRIKE_CAST, 1769}, {EF_ASTRAL_STRIKE_CAST_BOTTOM, 1770}, {EF_MYSTERY_ILLUSION, 1771}, @@ -1804,13 +1804,13 @@ namespace { {EF_ALL_BLOOM_BOTTOM, 1795}, {EF_ALL_BLOOM_CAST, 1796}, {EF_ALL_BLOOM_CAST_BOTTOM, 1797}, - {1798, 1798}, + {EF_UNK_1798, 1798}, {EF_ALL_BLOOM_HIT, 1799}, - {1800, 1800}, + {EF_UNK_1800, 1800}, {EF_CLIMAX_LIGHT, 1801}, {EF_CLIMAX_CAST, 1802}, {EF_CLIMAX_CAST_LOOP, 1803}, - {1804, 1804}, + {EF_UNK_1804, 1804}, {EF_FLORAL_FLARE_ROAD_CAST, 1805}, {EF_FLORAL_FLARE_ROAD_CAST_BOTTOM, 1806}, {EF_FLORAL_FLARE_ROAD_HIT, 1807}, @@ -1833,31 +1833,31 @@ namespace { {EF_ARBITRIUM, 1824}, {EF_ARBITRIUM_BOTTOM, 1825}, {EF_ARBITRIUM_HIT, 1826}, - {1827, 1827}, - {1828, 1828}, - {1829, 1829}, - {1830, 1830}, + {EF_UNK_1827, 1827}, + {EF_UNK_1828, 1828}, + {EF_UNK_1829, 1829}, + {EF_UNK_1830, 1830}, {EF_NEW_REPARATIO_CAST, 1831}, {EF_NEW_REPARATIO_CAST_BOTTOM, 1832}, {EF_NEW_REPARATIO, 1833}, {EF_NEW_REPARATIO_BOTTOM, 1834}, {EF_NEW_REPARATIO_TARGET, 1835}, {EF_NEW_REPARATIO_TARGET_BOTTOM, 1836}, - {1837, 1837}, + {EF_UNK_1837, 1837}, {EF_ETERNAL_SLASH_HIT_1, 1838}, - {1839, 1839}, + {EF_UNK_1839, 1839}, {EF_A_MACHINE_CAST, 1840}, - {1841, 1841}, + {EF_UNK_1841, 1841}, {EF_A_MACHINE_HIT, 1842}, - {1843, 1843}, - {1844, 1844}, - {1845, 1845}, + {EF_UNK_1843, 1843}, + {EF_UNK_1844, 1844}, + {EF_UNK_1845, 1845}, {EF_EFFLIGO, 1846}, {EF_EFFLIGO_BOTTOM, 1847}, {EF_EFFLIGO_HIT, 1848}, {EF_COMPETENTIA, 1849}, {EF_COMPETENTIA_BOTTOM, 1850}, - {1851, 1851}, + {EF_UNK_1851, 1851}, {EF_COMPETENTIA_LOOP, 1852}, {EF_COMPETENTIA_LOOP_BOTTOM, 1853}, {EF_CRYSTAL_IMPACT, 1854}, @@ -1868,16 +1868,16 @@ namespace { {EF_CRYSTAL_IMPACT_BUFF, 1859}, {EF_RELIGIO, 1860}, {EF_RELIGIO_CAST, 1861}, - {1862, 1862}, - {1863, 1863}, + {EF_UNK_1862, 1862}, + {EF_UNK_1863, 1863}, {EF_FATAL_SHADOW_CROW, 1864}, {EF_FATAL_SHADOW_CROW_BOTTOM, 1865}, {EF_FATAL_SHADOW_CROW_HIT, 1866}, - {1867, 1867}, - {1868, 1868}, - {1869, 1869}, - {1870, 1870}, - {1871, 1871}, + {EF_UNK_1867, 1867}, + {EF_UNK_1868, 1868}, + {EF_UNK_1869, 1869}, + {EF_UNK_1870, 1870}, + {EF_UNK_1871, 1871}, {EF_NEW_PNEUMA, 1872}, {EF_DEEP_BLIND_TRAP_CAST, 1873}, {EF_DEEP_BLIND_TRAP, 1874}, @@ -1901,10 +1901,10 @@ namespace { {EF_STRATUM_TREMOR_HIT, 1892}, {EF_STRATUM_TREMOR, 1893}, {EF_STRATUM_TREMOR_BOTTOM, 1894}, - {1895, 1895}, - {1896, 1896}, - {1897, 1897}, - {1898, 1898}, + {EF_UNK_1895, 1895}, + {EF_UNK_1896, 1896}, + {EF_UNK_1897, 1897}, + {EF_UNK_1898, 1898}, {EF_WIND_SIGN, 1899}, {EF_WIND_SIGN_LOOP, 1900}, {EF_ABR_MOTHER_CAST, 1901}, @@ -1917,16 +1917,16 @@ namespace { {EF_ABR_INFINITY_CAST, 1908}, {EF_ABR_INFINITY_HIT, 1909}, {EF_ABR_INFINITY_RING, 1910}, - {1911, 1911}, - {1912, 1912}, - {1913, 1913}, + {EF_UNK_1911, 1911}, + {EF_UNK_1912, 1912}, + {EF_UNK_1913, 1913}, {EF_ETERNAL_SLASH_HIT_2, 1914}, {EF_NEW_D_CANNON, 1915}, {EF_NEW_D_CANNON_CAST, 1916}, {EF_NEW_D_CANNON_HIT, 1917}, {EF_NEW_D_CANNON_ENTITY, 1918}, {EF_FLAME_TRAP, 1919}, - {1920, 1920}, + {EF_UNK_1920, 1920}, {EF_FLAME_TRAP_CAST, 1921}, {EF_FLAME_TRAP_HIT, 1922}, {EF_FLAME_TRAP_RING, 1923}, @@ -1956,30 +1956,30 @@ namespace { {EF_NEW_AXE_STOMP_08, 1947}, {EF_NEW_AXE_STOMP_09, 1948}, {EF_NEW_AXE_STOMP_11, 1949}, - {1950, 1950}, - {1951, 1951}, - {1952, 1952}, - {1953, 1953}, - {1954, 1954}, - {1955, 1955}, - {1956, 1956}, - {1957, 1957}, + {EF_UNK_1950, 1950}, + {EF_UNK_1951, 1951}, + {EF_UNK_1952, 1952}, + {EF_UNK_1953, 1953}, + {EF_UNK_1954, 1954}, + {EF_UNK_1955, 1955}, + {EF_UNK_1956, 1956}, + {EF_UNK_1957, 1957}, {EF_PNEUMATICUS_PROCELLA_CAST, 1958}, {EF_PNEUMATICUS_PROCELLA_RING, 1959}, - {1960, 1960}, - {1961, 1961}, - {1962, 1962}, + {EF_UNK_1960, 1960}, + {EF_UNK_1961, 1961}, + {EF_UNK_1962, 1962}, {EF_SINCERE_FAITH_RING, 1963}, {EF_SINCERE_FAITH, 1964}, {EF_SINCERE_FAITH_BOTTOM, 1965}, {EF_ABYSS_DAGGER, 1966}, {EF_ABYSS_DAGGER_HIT, 1967}, - {1968, 1968}, + {EF_UNK_1968, 1968}, {EF_HAWK_BOOMERANG_CAST, 1969}, {EF_HAWK_BOOMERANG_HIT, 1970}, {EF_HAWK_BOOMERANG_START, 1971}, {EF_GALE_STORM_CAST, 1972}, - {1973, 120}, + {EF_UNK_1973, 120}, {EF_GALE_STORM_HIT, 1974}, {EF_FIRST_FAITH_POWER, 1975}, {EF_FIRST_FAITH_POWER_CAST, 1976}, @@ -2006,15 +2006,15 @@ namespace { {EF_EXPLOSION_BLASTER_HIT, 1997}, {EF_FIRM_FAITH_RING, 1998}, {EF_FIRM_FAITH, 1999}, - {2000, 2000}, - {2001, 2001}, - {2002, 2002}, + {EF_UNK_2000, 2000}, + {EF_UNK_2001, 2001}, + {EF_UNK_2002, 2002}, {EF_ACTIVITY_BURN, 2003}, {EF_ACTIVITY_BURN_CAST, 2004}, {EF_ACTIVITY_BURN_CAST_BOTTOM, 2005}, - {2006, 2006}, - {2007, 2007}, - {2008, 2008}, + {EF_UNK_2006, 2006}, + {EF_UNK_2007, 2007}, + {EF_UNK_2008, 2008}, {EF_SERPENS_BOTTOM, 2009}, {EF_SERPENS_CAST, 2010}, {EF_SERPENS_CAST_BOTTOM, 2011}, @@ -2032,7 +2032,7 @@ namespace { {EF_DILUVIO_HIT, 2023}, {EF_DILUVIO_ARMOR, 2024}, {EF_SPELL_ENCHANTING, 2025}, - {2026, 60}, + {EF_UNK_2026, 60}, {EF_DIAMOND_STORM_BOTTOM, 60}, {EF_DIAMOND_STORM_CAST, 2028}, {EF_DIAMOND_STORM_CAST_BOTTOM, 2029}, @@ -2052,11 +2052,11 @@ namespace { {EF_LIGHTNING_LAND_CAST, 2043}, {EF_LIGHTNING_LAND_CAST_BOTTOM, 2044}, {EF_LIGHTNING_LAND_HIT, 2045}, - {2046, 2046}, - {2047, 2047}, - {2048, 2048}, - {2049, 2049}, - {2050, 2050}, + {EF_UNK_2046, 2046}, + {EF_UNK_2047, 2047}, + {EF_UNK_2048, 2048}, + {EF_UNK_2049, 2049}, + {EF_UNK_2050, 2050}, {EF_FIRST_BRAND, 2051}, {EF_FIRST_BRAND_AURA, 2052}, {EF_FIRST_BRAND_HIT, 2053}, @@ -2071,24 +2071,24 @@ namespace { {EF_SOUND_BLEND_CAST_BOTTOM, 2062}, {EF_SOUND_BLEND_RED, 2063}, {EF_METALLIC_FURY, 2064}, - {2065, 2065}, - {2066, 2066}, - {2067, 2067}, - {2068, 2068}, - {2069, 2069}, - {2070, 2070}, - {2071, 2071}, - {2072, 2072}, - {2073, 2073}, - {2074, 2074}, + {EF_UNK_2065, 2065}, + {EF_UNK_2066, 2066}, + {EF_UNK_2067, 2067}, + {EF_UNK_2068, 2068}, + {EF_UNK_2069, 2069}, + {EF_UNK_2070, 2070}, + {EF_UNK_2071, 2071}, + {EF_UNK_2072, 2072}, + {EF_UNK_2073, 2073}, + {EF_UNK_2074, 2074}, {EF_NIFLHEIM, 2075}, {EF_NIFLHEIM_CAST, 2076}, - {2077, 2077}, + {EF_UNK_2077, 2077}, {EF_SECOND_FAITH, 2078}, {EF_SECOND_FAITH_AURA, 2079}, - {2080, 2080}, + {EF_UNK_2080, 2080}, {EF_SECOND_FAITH_START, 2081}, - {2082, 2082}, + {EF_UNK_2082, 2082}, {EF_SECOND_FLAME, 2083}, {EF_SECOND_FLAME_BOTTOM, 2084}, {EF_THIRD_FLAME_BOMB, 2085}, @@ -2115,23 +2115,23 @@ namespace { {EF_TERREMOTUS_CAST_BOTTOM, 2106}, {EF_TERREMOTUS_HIT, 2107}, {EF_TERREMOTUS_PROTECT, 2108}, - {2109, 2109}, + {EF_UNK_2109, 2109}, {EF_FROM_THE_ABYSS, 2110}, {EF_ABYSS_STRIKE_HIT_2, 2111}, {EF_THIRD_PUNISH, 2095}, {EF_THIRD_PUNISH_BOTTOM, 2096}, - {2114, 2114}, + {EF_UNK_2114, 2114}, {EF_FRENZY_SHOT_HIT, 2115}, - {2116, 2116}, - {2117, 2117}, - {2118, 2118}, - {2119, 2119}, - {2120, 2120}, - {2121, 2121}, + {EF_UNK_2116, 2116}, + {EF_UNK_2117, 2117}, + {EF_UNK_2118, 2118}, + {EF_UNK_2119, 2119}, + {EF_UNK_2120, 2120}, + {EF_UNK_2121, 2121}, {EF_MUSICAL_INTERLUDE, 2122}, {EF_MUSICAL_INTERLUDE_CAST, 2123}, - {2124, 2124}, - {2125, 2125}, + {EF_UNK_2124, 2124}, + {EF_UNK_2125, 2125}, {EF_ABYSS_SLAYER, 2126}, {EF_ABYSS_SLAYER_CAST, 2127}, {EF_ABYSS_SLAYER_CAST_BOTTOM, 2128}, @@ -2160,59 +2160,59 @@ namespace { {EF_ELEMENTAL_BUSTER_WIND, 2151}, {EF_ELEMENTAL_BUSTER_WIND_BOTTOM, 2152}, {EF_ELEMENTAL_BUSTER_WIND_HIT, 2153}, - {2154, 2154}, + {EF_UNK_2154, 2154}, {EF_UNLUCKY_RUSH_CAST, 2155}, {EF_ABYSS_DAGGER_HIT_3, 2156}, - {2157, 2157}, - {2158, 2158}, - {2159, 2159}, - {2160, 2160}, + {EF_UNK_2157, 2157}, + {EF_UNK_2158, 2158}, + {EF_UNK_2159, 2159}, + {EF_UNK_2160, 2160}, {EF_ADVANCED_PROTECTION, 2161}, {EF_ADVANCED_PROTECTION_BOTTOM, 2162}, {EF_ADVANCED_PROTECTION_CAST, 2163}, {EF_ADVANCED_PROTECTION_CAST_BOTTOM, 2164}, - {2165, 2165}, - {2166, 2166}, - {2167, 2167}, - {2168, 2168}, - {2169, 2169}, - {2170, 2170}, - {2171, 2171}, - {2172, 2172}, - {2173, 2173}, - {2174, 2174}, - {2175, 2175}, - {2176, 2176}, - {2177, 2177}, - {2178, 2178}, - {2179, 2179}, - {2180, 2180}, - {2181, 2181}, - {2182, 2182}, - {2183, 2183}, + {EF_UNK_2165, 2165}, + {EF_UNK_2166, 2166}, + {EF_UNK_2167, 2167}, + {EF_UNK_2168, 2168}, + {EF_UNK_2169, 2169}, + {EF_UNK_2170, 2170}, + {EF_UNK_2171, 2171}, + {EF_UNK_2172, 2172}, + {EF_UNK_2173, 2173}, + {EF_UNK_2174, 2174}, + {EF_UNK_2175, 2175}, + {EF_UNK_2176, 2176}, + {EF_UNK_2177, 2177}, + {EF_UNK_2178, 2178}, + {EF_UNK_2179, 2179}, + {EF_UNK_2180, 2180}, + {EF_UNK_2181, 2181}, + {EF_UNK_2182, 2182}, + {EF_UNK_2183, 2183}, {EF_SHIELD_SHOOTING_CAST, 2184}, {EF_SHIELD_SHOOTING_HIT, 2185}, {EF_THE_W_PROTECTION, 2186}, {EF_THE_W_PROTECTION_CAST, 2187}, - {2188, 2188}, - {2189, 2189}, - {2190, 2190}, - {2191, 2191}, - {2192, 2192}, - {2193, 2193}, - {2194, 2194}, - {2195, 2195}, - {2196, 2196}, - {2197, 2197}, - {2198, 2198}, - {2199, 2199}, - {2200, 2200}, - {2201, 2201}, - {2202, 2202}, - {2203, 2203}, + {EF_UNK_2188, 2188}, + {EF_UNK_2189, 2189}, + {EF_UNK_2190, 2190}, + {EF_UNK_2191, 2191}, + {EF_UNK_2192, 2192}, + {EF_UNK_2193, 2193}, + {EF_UNK_2194, 2194}, + {EF_UNK_2195, 2195}, + {EF_UNK_2196, 2196}, + {EF_UNK_2197, 2197}, + {EF_UNK_2198, 2198}, + {EF_UNK_2199, 2199}, + {EF_UNK_2200, 2200}, + {EF_UNK_2201, 2201}, + {EF_UNK_2202, 2202}, + {EF_UNK_2203, 2203}, {EF_ACIDIFIED_ZONE_FIRE_CAST, 2204}, {EF_ACIDIFIED_ZONE_FIRE_CAST_BOTTOM, 2205}, - {2206, 2206}, + {EF_UNK_2206, 2206}, {EF_ACIDIFIED_ZONE_FIRE_HIT, 2207}, {EF_ACIDIFIED_ZONE_FIRE_START, 2208}, {EF_ACIDIFIED_ZONE_FIRE_START_BOTTOM, 2209}, @@ -2220,7 +2220,7 @@ namespace { {EF_ACIDIFIED_ZONE_FIRE_LOOP_BOTTOM, 2211}, {EF_ACIDIFIED_ZONE_WATER_CAST, 2212}, {EF_ACIDIFIED_ZONE_WATER_CAST_BOTTOM, 2213}, - {2214, 2214}, + {EF_UNK_2214, 2214}, {EF_ACIDIFIED_ZONE_WATER_HIT, 2215}, {EF_ACIDIFIED_ZONE_WATER_START, 2216}, {EF_ACIDIFIED_ZONE_WATER_START_BOTTOM, 2217}, @@ -2228,7 +2228,7 @@ namespace { {EF_ACIDIFIED_ZONE_WATER_LOOP_BOTTOM, 2219}, {EF_ACIDIFIED_ZONE_WIND_CAST, 2220}, {EF_ACIDIFIED_ZONE_WIND_CAST_BOTTOM, 2221}, - {2222, 2222}, + {EF_UNK_2222, 2222}, {EF_ACIDIFIED_ZONE_WIND_HIT, 2223}, {EF_ACIDIFIED_ZONE_WIND_START, 2224}, {EF_ACIDIFIED_ZONE_WIND_START_BOTTOM, 2225}, @@ -2236,7 +2236,7 @@ namespace { {EF_ACIDIFIED_ZONE_WIND_LOOP_BOTTOM, 2227}, {EF_ACIDIFIED_ZONE_GROUND_CAST, 2228}, {EF_ACIDIFIED_ZONE_GROUND_CAST_BOTTOM, 2229}, - {2230, 2230}, + {EF_UNK_2230, 2230}, {EF_ACIDIFIED_ZONE_GROUND_HIT, 2231}, {EF_ACIDIFIED_ZONE_GROUND_START, 2232}, {EF_ACIDIFIED_ZONE_GROUND_START_BOTTOM, 2233}, @@ -2278,22 +2278,22 @@ namespace { {EF_STATE_CONFLAGRATION, 2269}, {EF_STATE_FROSTBITE, 2270}, {EF_STATE_FROSTBITE_FINISH, 2271}, - {2272, 2272}, + {EF_UNK_2272, 2272}, {EF_STATE_CRYSTALLIZATION, 2273}, {EF_STATE_DEADLYPOISON, 2274}, - {2275, 2275}, - {2276, 2276}, - {2277, 99999}, - {2278, 99999}, + {EF_UNK_2275, 2275}, + {EF_UNK_2276, 2276}, + {EF_UNK_2277, 99999}, + {EF_UNK_2278, 99999}, {EF_THIRD_CONSECRATION_BOTTOM, 2279}, - {2280, 2280}, - {2281, 2281}, - {2282, 2281}, - {2283, 2282}, - {2284, 2283}, - {2285, 2284}, - {2286, 2285}, - {2287, 2286}, + {EF_UNK_2280, 2280}, + {EF_UNK_2281, 2281}, + {EF_UNK_2282, 2281}, + {EF_UNK_2283, 2282}, + {EF_UNK_2284, 2283}, + {EF_UNK_2285, 2284}, + {EF_UNK_2286, 2285}, + {EF_UNK_2287, 2286}, {EF_STATUS_CRATE_UP, 100}, {EF_STATUS_CRATE_DOWN, 100}, {EF_STATUS_HPLUS_UP, 100}, @@ -2307,16 +2307,16 @@ namespace { {EF_STATUS_SMATK_UP, 100}, {EF_STATUS_SMATK_DOWN, 100}, {EF_STATUS_PATK_SMATK_UP, 100}, - {2301, 2301}, + {EF_UNK_2301, 2301}, {EF_NPC_KILLING_AURA, 2302}, {EF_NPC_KILLING_AURA_END, 2303}, {EF_NPC_KILLING_AURA_HIT, 2304}, - {2305, 2305}, - {2306, 2306}, - {2307, 2307}, + {EF_UNK_2305, 2305}, + {EF_UNK_2306, 2306}, + {EF_UNK_2307, 2307}, {EF_NPC_CANE_OF_EVIL_EYE, 2308}, - {2309, 99999999}, - {2310, 99999999}, + {EF_UNK_2309, 99999999}, + {EF_UNK_2310, 99999999}, {EF_UI_ENCHANT_INTRO_YELLOW, 2311}, {EF_UI_ENCHANT_SUCCESS, 2312}, {EF_UI_ENCHANT_FAIL, 2313}, @@ -2347,21 +2347,21 @@ namespace { {EF_THE_ONE_FIGHTER_RISES, 70}, {EF_THE_ONE_FIGHTER_RISES_BOTTOM, 2339}, {EF_TEMPERING, 2340}, - {2341, 2341}, + {EF_UNK_2341, 2341}, {EF_BLAST_FORGE_HIT, 2342}, - {2343, 2343}, - {2344, 2344}, - {2345, 2345}, + {EF_UNK_2343, 2343}, + {EF_UNK_2344, 2344}, + {EF_UNK_2345, 2345}, {EF_POK_94, 99999999}, {EF_POK_95, 99999999}, - {2348, 2348}, - {2349, 2349}, - {2350, 2350}, - {2351, 2351}, - {2352, 2352}, - {2353, 2353}, - {2354, 2354}, - {2355, 2355}, + {EF_UNK_2348, 2348}, + {EF_UNK_2349, 2349}, + {EF_UNK_2350, 2350}, + {EF_UNK_2351, 2351}, + {EF_UNK_2352, 2352}, + {EF_UNK_2353, 2353}, + {EF_UNK_2354, 2354}, + {EF_UNK_2355, 2355}, {EF_POK_96, 99999999}, {EF_POK_97, 99999999}, {EF_POK_98, 99999999}, @@ -2372,16 +2372,16 @@ namespace { {EF_POK_103, 99999999}, {EF_POK_104, 99999999}, {EF_POK_105, 99999999}, - {2366, 2366}, + {EF_UNK_2366, 2366}, {EF_UNKNOWN_RING_YELLOW, 40}, {EF_UNKNOWN_SPELL, 100}, {EF_UNKNOWN_RING_WHITE, 40}, - {2370, 2370}, + {EF_UNK_2370, 2370}, {EF_TETRA_VORTEX_WATER_SUB_2, 2371}, {EF_TETRA_VORTEX_EARTH_SUB_2, 2372}, {EF_VOLCANO_BLACK, 300}, {EF_CHANGE_SIZE, 99999999}, - {2375, 99999999}, + {EF_UNK_2375, 99999999}, {EF_NPC_20TH_CRYSTAL_S, 2376}, {EF_NPC_20TH_CRYSTAL_M, 2377}, {EF_NPC_20TH_CRYSTAL_L, 2378}, @@ -2396,11 +2396,11 @@ namespace { {EF_NPC_GATE_PURPLE_3, 2387}, {EF_NPC_GATE_RED_3, 2388}, {EF_NPC_GATE_SKYBLUE, 2389}, - {2390, 999999}, - {2391, 999999}, - {2392, 999999}, - {2393, 999999}, - {2394, 2394}, + {EF_UNK_2390, 999999}, + {EF_UNK_2391, 999999}, + {EF_UNK_2392, 999999}, + {EF_UNK_2393, 999999}, + {EF_UNK_2394, 2394}, {EF_RUNE_ACTIVE_FINISH, 2395}, {EF_RUNESET_ACTIVE, 2396}, {EF_RUNESET_UPGRADE_SUCCESS, 2397}, @@ -2408,63 +2408,63 @@ namespace { {EF_RUNE_BROKEN, 2399}, {EF_ALPHA_DOWN_ANIM, 2415}, {EF_GLOW_BLACK, 99999999}, - {2413, 99999999}, - {2414, 99999999}, - {2415, 99999999}, + {EF_UNK_2413, 99999999}, + {EF_UNK_2414, 99999999}, + {EF_UNK_2415, 99999999}, {EF_ABC_CHASING_LINE, 300}, {EF_ABC_CROSSIMPACT_LINE, 300}, - {2418, 2418}, - {2419, 2419}, + {EF_UNK_2418, 2418}, + {EF_UNK_2419, 2419}, {EF_RUNE_SLOT_SMALL, 2421}, {EF_RUNE_SLOT_BIG, 2422}, - {2423, 2423}, + {EF_UNK_2423, 2423}, {EF_WH_WILD_WALK, 250}, {EF_FORCE_ANIM_27, 100}, {EF_HEAL_BLUE_2, 100}, - {2432, 2432}, - {2433, 2433}, - {2434, 2434}, - {2435, 300}, + {EF_UNK_2432, 2432}, + {EF_UNK_2433, 2433}, + {EF_UNK_2434, 2434}, + {EF_UNK_2435, 300}, {EF_RG_COIN_BLUE, 3000}, {EF_RG_COIN_BLUE_2, 3000}, - {2438, 2438}, - {2439, 300}, - {2440, 99999999}, - {2441, 300}, - {2442, 300}, - {2443, 99999999}, - {2444, 500}, - {2445, 2435}, - {2446, 2436}, - {2447, 40}, - {2448, 40}, - {2449, 2438}, - {2450, 40}, - {2451, 9999}, - {2452, 999}, - {2453, 2000}, - {2454, 40}, - {2455, 499}, - {2456, 9999}, - {2457, 40}, - {2463, 100}, - {2464, 100}, - {2465, 100}, - {2466, 1000}, - {2468, 300}, - {2469, 40}, - {2470, 250}, - {2471, 29999}, - {2472, 9999}, - {2473, 9999}, - {2474, 100}, - {2477, 250}, - {2478, 100}, - {2479, 999}, - {2480, 499}, - {2481, 200}, - {2482, 99999999}, - {2483, 99999999}, + {EF_UNK_2438, 2438}, + {EF_UNK_2439, 300}, + {EF_UNK_2440, 99999999}, + {EF_UNK_2441, 300}, + {EF_UNK_2442, 300}, + {EF_UNK_2443, 99999999}, + {EF_UNK_2444, 500}, + {EF_UNK_2445, 2435}, + {EF_UNK_2446, 2436}, + {EF_UNK_2447, 40}, + {EF_UNK_2448, 40}, + {EF_UNK_2449, 2438}, + {EF_UNK_2450, 40}, + {EF_UNK_2451, 9999}, + {EF_UNK_2452, 999}, + {EF_UNK_2453, 2000}, + {EF_UNK_2454, 40}, + {EF_UNK_2455, 499}, + {EF_UNK_2456, 9999}, + {EF_UNK_2457, 40}, + {EF_UNK_2463, 100}, + {EF_UNK_2464, 100}, + {EF_UNK_2465, 100}, + {EF_UNK_2466, 1000}, + {EF_UNK_2468, 300}, + {EF_UNK_2469, 40}, + {EF_UNK_2470, 250}, + {EF_UNK_2471, 29999}, + {EF_UNK_2472, 9999}, + {EF_UNK_2473, 9999}, + {EF_UNK_2474, 100}, + {EF_UNK_2477, 250}, + {EF_UNK_2478, 100}, + {EF_UNK_2479, 999}, + {EF_UNK_2480, 499}, + {EF_UNK_2481, 200}, + {EF_UNK_2482, 99999999}, + {EF_UNK_2483, 99999999}, }; } diff --git a/Source/Contents/Effects/EffectTypes.h b/Source/Contents/Effects/EffectTypes.h index fac794d..2f9a4a8 100644 --- a/Source/Contents/Effects/EffectTypes.h +++ b/Source/Contents/Effects/EffectTypes.h @@ -1104,58 +1104,150 @@ enum RagEffectID : std::int32_t { EF_SPRITEMABLE = 1096, EF_TUNAPARTY = 1097, EF_FRESHSHRIMP = 1098, + EF_UNK_1099 = 1099, + EF_UNK_1100 = 1100, + EF_SU_SV_STEMSPEAR = 1101, + EF_SU_TUNABELLY = 1102, + EF_SU_SCRATCH = 1103, + EF_UNK_1104 = 1104, + EF_SU_BITE = 1105, + EF_UNK_1106 = 1106, + EF_SU_SCAROFTAROU = 1107, + EF_SU_ARCLOUSEDASH = 1108, + EF_SU_PICKYPECK = 1109, + EF_UNK_1110 = 1110, + EF_UNK_1111 = 1111, + EF_UNK_1112 = 1112, + EF_UNK_1113 = 1113, + EF_UNK_1114 = 1114, + EF_SU_CN_METEOR = 1115, + EF_SU_BUNCHOFSHRIMP = 1116, + EF_UNK_1117 = 1117, + EF_UNK_1118 = 1118, + EF_BITE_SCAR = 1119, + EF_SU_LUNATIC_CARROT_BEAT = 1120, + EF_WIDE_CRITICAL_WOUND = 1121, + EF_SU_SOUL_ATTACK = 1122, EF_SU_GROOMING = 1123, EF_SU_CHATTERING = 1124, + EF_SU_LOPE = 1125, + EF_SU_HISS = 1126, + EF_SU_POWEROFFLOCK = 1127, + EF_UNK_1128 = 1128, + EF_SU_SVG_SPIRIT = 1129, + EF_UNK_1130 = 1130, + EF_SU_SPIRIT_OF_LIFE = 1131, + EF_SU_STOOP = 1132, EF_FIREDANCE = 1133, EF_RICHS_COIN_A = 1134, + EF_RL_B_TRAP = 1135, + EF_RL_ANTI_MATERIAL_BLAST = 1136, EF_E_CHAIN = 1137, EF_HEAT_BARREL = 1138, EF_H_MINE = 1139, EF_FALLEN_ANGEL = 1140, - EF_IMMUNE_PROPERTY = 1149, - EF_MOVE_COORDINATE = 1150, - EF_LIGHTSPHERE_SUN = 1197, - EF_LIGHTSPHERE_MOON = 1198, - EF_LIGHTSPHERE_STAR = 1199, - EF_NOVAEXPLOSING = 1202, - EF_STAR_EMPEROR = 1203, - EF_SMA_BLACK = 1204, - EF_ENERGYDRAIN_BLACK = 1208, - EF_BLINK_BODY = 1209, - EF_SOLARBURST = 1218, - EF_SJ_DOCUMENT = 1219, - EF_FALLING_STAR = 1220, - EF_STORMKICK8 = 1223, - EF_NEWMOON_KICK = 1229, - EF_FULLMOON_KICK = 1230, - EF_BOOK_OF_DIMENSION = 1231, - EF_CURSE_EXPLOSION = 1233, - EF_SOUL_REAPER = 1234, - EF_SOUL_EXPLOSION = 1242, - EF_SU_SV_STEMSPEAR = 1101, - EF_SU_TUNABELLY = 1102, - EF_SU_SCRATCH = 1103, - EF_SU_BITE = 1105, - EF_SU_SCAROFTAROU = 1107, - EF_SU_ARCLOUSEDASH = 1108, - EF_SU_PICKYPECK = 1109, - EF_SU_BUNCHOFSHRIMP = 1116, - EF_BITE_SCAR = 1119, - EF_WIDE_CRITICAL_WOUND = 1121, - EF_SU_LOPE = 1125, - EF_SU_HISS = 1126, - EF_SU_POWEROFFLOCK = 1127, - EF_SU_SVG_SPIRIT = 1129, - EF_RL_ANTI_MATERIAL_BLAST = 1136, EF_WE_ONEFOREVER = 1141, EF_WE_CHEERUP = 1142, + EF_UNK_1143 = 1143, + EF_UNK_1144 = 1144, + EF_RL_HAMMER_OF_GOD = 1145, + EF_UNK_1146 = 1146, + EF_UNK_1147 = 1147, + EF_RL_R_TRIP = 1148, + EF_IMMUNE_PROPERTY = 1149, + EF_MOVE_COORDINATE = 1150, + EF_UNK_1151 = 1151, + EF_UNK_1152 = 1152, + EF_UNK_1153 = 1153, + EF_UNK_1154 = 1154, + EF_UNK_1155 = 1155, + EF_UNK_1156 = 1156, + EF_UNK_1157 = 1157, + EF_UNK_1158 = 1158, + EF_UNK_1159 = 1159, + EF_UNK_1160 = 1160, EF_QUAGMIRE_VISUAL = 1161, EF_LORD_OF_VERMILLION_VISUAL = 1162, EF_METEOR_STORM_VISUAL = 1163, + EF_UNK_1164 = 1164, + EF_UNK_1165 = 1165, + EF_UNK_1166 = 1166, + EF_UNK_1167 = 1167, + EF_UNK_1168 = 1168, + EF_UNK_1169 = 1169, + EF_UNK_1170 = 1170, + EF_UNK_1171 = 1171, + EF_UNK_1172 = 1172, + EF_UNK_1173 = 1173, + EF_UNK_1174 = 1174, + EF_UNK_1175 = 1175, + EF_UNK_1176 = 1176, + EF_UNK_1177 = 1177, + EF_UNK_1178 = 1178, + EF_UNK_1179 = 1179, + EF_UNK_1180 = 1180, + EF_UNK_1181 = 1181, + EF_UNK_1182 = 1182, + EF_UNK_1183 = 1183, + EF_UNK_1184 = 1184, + EF_WARPZONE3 = 1185, + EF_UNK_1186 = 1186, + EF_UNK_1187 = 1187, + EF_UNK_1188 = 1188, + EF_UNK_1189 = 1189, + EF_UNK_1190 = 1190, + EF_UNK_1191 = 1191, + EF_UNK_1192 = 1192, + EF_UNK_1193 = 1193, + EF_UNK_1194 = 1194, + EF_AUTOSHADOWSPELL_ACTIVE = 1195, + EF_UNK_1196 = 1196, + EF_LIGHTSPHERE_SUN = 1197, + EF_LIGHTSPHERE_MOON = 1198, + EF_LIGHTSPHERE_STAR = 1199, + EF_UNK_1200 = 1200, + EF_UNK_1201 = 1201, + EF_NOVAEXPLOSING = 1202, + EF_STAR_EMPEROR = 1203, + EF_SMA_BLACK = 1204, + EF_SMA_BLACK2 = 1205, + EF_STIN_BLACK = 1206, + EF_PEONG_BLACK = 1207, + EF_ENERGYDRAIN_BLACK = 1208, + EF_BLINK_BODY = 1209, + EF_LINELINK5 = 1210, + EF_UNK_1211 = 1211, + EF_UNK_1212 = 1212, + EF_UNK_1213 = 1213, + EF_UNK_1214 = 1214, + EF_UNK_1215 = 1215, + EF_UNK_1216 = 1216, + EF_UNK_1217 = 1217, + EF_SOLARBURST = 1218, + EF_SJ_DOCUMENT = 1219, + EF_FALLING_STAR = 1220, EF_FLASH_KICK = 1221, + EF_UNK_1222 = 1222, + EF_STORMKICK8 = 1223, + EF_SOLAR_EXPLOSION = 1224, + EF_UNK_1225 = 1225, + EF_UNK_1226 = 1226, + EF_UNK_1227 = 1227, EF_SOUL_GOLEM = 1228, + EF_NEWMOON_KICK = 1229, + EF_FULLMOON_KICK = 1230, + EF_BOOK_OF_DIMENSION = 1231, + EF_UNK_1232 = 1232, + EF_CURSE_EXPLOSION = 1233, + EF_SOUL_REAPER = 1234, + EF_UNK_1235 = 1235, + EF_UNK_1236 = 1236, + EF_UNK_1237 = 1237, EF_SOUL_CURSE = 1238, EF_PROMINENCE_KICK = 1239, + EF_SOUL_REAPER_COLLECT = 1240, + EF_UNK_1241 = 1241, + EF_SOUL_EXPLOSION = 1242, EF_SOUL_REVOLVE = 1243, EF_TEST_EFFECT_00 = 1244, EF_TEST_EFFECT_01 = 1245, @@ -1169,6 +1261,8 @@ enum RagEffectID : std::int32_t { EF_TEST_EFFECT_09 = 1253, EF_NEW_METEORSTORM = 1254, EF_NEW_METEORSTORM_BOTTOM = 1255, + EF_UNK_1256 = 1256, + EF_UNK_1257 = 1257, EF_NEW_ADORAMUS = 1258, EF_NEW_ADORAMUS_BOTTOM = 1259, EF_TETRA_VORTEX_CAST = 1260, @@ -1187,6 +1281,7 @@ enum RagEffectID : std::int32_t { EF_TETRA_VORTEX_EARTH_GROUND = 1273, EF_NEW_CRIMSONROCK = 1274, EF_NEW_CRIMSONROCK_BOTTOM = 1275, + EF_UNK_1276 = 1276, EF_TETRA_VORTEX_CORE_GROUND = 1277, EF_TETRA_VORTEX_FIRE_SUB = 1278, EF_TETRA_VORTEX_WATER_SUB = 1279, @@ -1196,10 +1291,13 @@ enum RagEffectID : std::int32_t { EF_NEW_DIAMONDDUST_BOTTOM = 1283, EF_NEW_DIAMONDDUST_CAST = 1284, EF_NEW_SEVERERAINSTORM_CAST = 1285, + EF_NEW_SEVERERAINSTORM_HIT = 1286, EF_NEW_SECRAMENT = 1287, EF_NEW_PSYCHICWAVE = 1288, EF_NEW_PSYCHICWAVE_BOTTOM = 1289, EF_NEW_PSYCHICWAVE_CAST = 1290, + EF_UNK_1291 = 1291, + EF_UNK_1292 = 1292, EF_NEW_ARROWSTORM_00 = 1293, EF_NEW_ARROWSTORM_01 = 1294, EF_NEW_SECRAMENT_AURA = 1295, @@ -1231,6 +1329,29 @@ enum RagEffectID : std::int32_t { EF_NEW_CROSSRIPPERSLASHER_09 = 1321, EF_NEW_CROSSRIPPERSLASHER_11 = 1322, EF_NEW_TIGERCANNON = 1323, + EF_UNK_1324 = 1324, + EF_UNK_1325 = 1325, + EF_UNK_1326 = 1326, + EF_UNK_1327 = 1327, + EF_UNK_1328 = 1328, + EF_UNK_1329 = 1329, + EF_UNK_1330 = 1330, + EF_UNK_1331 = 1331, + EF_UNK_1332 = 1332, + EF_UNK_1333 = 1333, + EF_UNK_1334 = 1334, + EF_UNK_1335 = 1335, + EF_UNK_1336 = 1336, + EF_UNK_1337 = 1337, + EF_UNK_1338 = 1338, + EF_UNK_1339 = 1339, + EF_UNK_1340 = 1340, + EF_UNK_1341 = 1341, + EF_UNK_1342 = 1342, + EF_UNK_1343 = 1343, + EF_UNK_1344 = 1344, + EF_UNK_1345 = 1345, + EF_UNK_1346 = 1346, EF_NEW_ARMSCANNON_01_UP = 1347, EF_NEW_ARMSCANNON_01_DOWN = 1348, EF_NEW_ARMSCANNON_05_UP = 1349, @@ -1241,6 +1362,7 @@ enum RagEffectID : std::int32_t { EF_NEW_ARMSCANNON_11_DOWN = 1354, EF_NEW_ARMSCANNON_EXPLOSION = 1355, EF_NEW_ARMSCANNON_EXPLOSION_BOTTOM = 1356, + EF_UNK_1357 = 1357, EF_NEW_CART_CANNON_EXPLOSION = 1358, EF_NEW_CART_CANNON_EXPLOSION_BOTTOM = 1359, EF_NEW_CART_CANNON_FIRE = 1360, @@ -1260,6 +1382,7 @@ enum RagEffectID : std::int32_t { EF_NEW_BANISHINGPOINT_05 = 1374, EF_NEW_BANISHINGPOINT_07 = 1375, EF_NEW_BANISHINGPOINT_11 = 1376, + EF_UNK_1377 = 1377, EF_NEW_DRAGONBREATH_BOMB = 1378, EF_NEW_DRAGONBREATH_BOMB_BOTTOM = 1379, EF_NEW_DRAGONBREATH_01 = 1380, @@ -1280,6 +1403,8 @@ enum RagEffectID : std::int32_t { EF_NEW_FATAL_MENACE_BOTTOM = 1395, EF_NEW_FATAL_MENACE_CAST = 1396, EF_NEW_FATAL_MENACE_CAST_BOTTOM = 1397, + EF_UNK_1398 = 1398, + EF_NEW_HEAVENS_DRIVE = 1399, EF_NEW_CANNON_SPEAR_12 = 1400, EF_NEW_CANNON_SPEAR_01 = 1401, EF_NEW_CANNON_SPEAR_03 = 1402, @@ -1289,6 +1414,7 @@ enum RagEffectID : std::int32_t { EF_NEW_CANNON_SPEAR_09 = 1406, EF_NEW_CANNON_SPEAR_11 = 1407, EF_NEW_CANNON_SPEAR_BOTTOM = 1408, + EF_NEW_TRIPLEATTACK = 1409, EF_NEW_BASICATTACK = 1410, EF_NEW_CRITICALATTACK = 1411, EF_NEW_RANGEDATTACK = 1412, @@ -1297,6 +1423,9 @@ enum RagEffectID : std::int32_t { EF_NEW_COMET_CAST_BOTTOM = 1415, EF_NEW_COMET_SUB_EXP = 1416, EF_NEW_COMET_SUB_EXP_BOTTOM = 1417, + EF_NEW_MOON_SLASH = 1418, + EF_UNK_1419 = 1419, + EF_NEW_GRANDCROSS = 1420, EF_NEW_COMET_CAST = 1421, EF_NEW_CART_CANNON_CAST = 1422, EF_NEW_CART_CANNON_CAST_BOTTOM = 1423, @@ -1324,6 +1453,8 @@ enum RagEffectID : std::int32_t { EF_NEW_JACKFROST_02 = 1445, EF_NEW_JACKFROST_CAST = 1446, EF_NEW_JACKFROST_RUNE = 1447, + EF_NEW_JACKFROST_ART = 1448, + EF_NEW_FROSTMISTY = 1449, EF_MINEFFECT_DIAMONDDUST = 1450, EF_MINEFFECT_DIAMONDDUST_BOTTOM = 1451, EF_MINEFFECT_DIAMONDDUST_CAST = 1452, @@ -1399,11 +1530,13 @@ enum RagEffectID : std::int32_t { EF_MINEFFECT_DRAGONBREATH_05 = 1522, EF_MINEFFECT_DRAGONBREATH_07 = 1523, EF_MINEFFECT_DRAGONBREATH_11 = 1524, + EF_WHITEIMPRISON_STATE = 1525, EF_MINEFFECT_DRAGONBREATH_WATER_BOMB = 1526, EF_MINEFFECT_DRAGONBREATH_WATER_01 = 1527, EF_MINEFFECT_DRAGONBREATH_WATER_05 = 1528, EF_MINEFFECT_DRAGONBREATH_WATER_07 = 1529, EF_MINEFFECT_DRAGONBREATH_WATER_11 = 1530, + EF_POK_THUNDER = 1531, EF_MINEFFECT_TIGERCANNON = 1532, EF_MINEFFECT_SEVERERAINSTORM_CAST = 1533, EF_MINEFFECT_COMET = 1534, @@ -1417,6 +1550,7 @@ enum RagEffectID : std::int32_t { EF_MINEFFECT_JACKFROST_02 = 1542, EF_MINEFFECT_JACKFROST_CAST = 1543, EF_MINEFFECT_JACKFROST_RUNE = 1544, + EF_NEW_MAGNUM_BREAK = 1545, EF_NEW_POISONSMOKE_1 = 1546, EF_NEW_POISONSMOKE_2 = 1547, EF_NEW_POISONSMOKE_CAST = 1548, @@ -1426,20 +1560,27 @@ enum RagEffectID : std::int32_t { EF_NEW_HELLINFERNO_CAST_BOTTOM = 1552, EF_NEW_HELLINFERNO_SUB = 1553, EF_NEW_HELLINFERNO_SUB_BOTTOM = 1554, + EF_UNK_1555 = 1555, + EF_NEW_HEAL_BLUE = 1556, EF_NEW_CLEARANCE = 1557, EF_NEW_CLEARANCE_BOTTOM = 1558, EF_NEW_CLEARANCE_CAST = 1559, + EF_NEW_HEAL_WHITE = 1560, EF_NEW_VARETYRSPEAR = 1561, EF_NEW_VARETYRSPEAR_BOTTOM = 1562, EF_NEW_VARETYRSPEAR_CAST = 1563, EF_NEW_VARETYRSPEAR_CAST_BOTTOM = 1564, + EF_NEW_HEAL_YELLOW = 1565, EF_NEW_CROSSIMPACT = 1566, EF_NEW_CROSSIMPACT_TARGET = 1567, + EF_NEW_CROSSIMPACT_HIT = 1568, + EF_NEW_REVERBERATION = 1569, EF_NEW_FALLENEMPIRE = 1570, EF_NEW_FALLENEMPIRE_BOTTOM = 1571, EF_NEW_FALLENEMPIRE_HIT = 1572, EF_NEW_GATEOFHELL_CAST = 1573, EF_NEW_GATEOFHELL_TARGET = 1574, + EF_NEW_GATEOFHELL = 1575, EF_NEW_HOWLINGOFLION = 1576, EF_NEW_HOWLINGOFLION_BOTTOM = 1577, EF_NEW_HOWLINGOFLION_CAST = 1578, @@ -1448,6 +1589,7 @@ enum RagEffectID : std::int32_t { EF_NEW_METALLICSOUND = 1581, EF_NEW_METALLICSOUND_BOTTOM = 1582, EF_NEW_METALLICSOUND_HIT = 1583, + EF_NEW_METALLICSOUND_LINE = 1584, EF_NEW_REPRODUCE = 1585, EF_NEW_REPRODUCE_BOTTOM = 1586, EF_NEW_SOULEXPANSION_CAST = 1587, @@ -1457,20 +1599,32 @@ enum RagEffectID : std::int32_t { EF_NEW_SOULEXPANSION_HIT = 1591, EF_NEW_SOULEXPANSION_HIT_BOTTOM = 1592, EF_NEW_REVERBERATION_HIT = 1593, + EF_NEW_REVERBERATION_NOTE = 1594, EF_NEW_AROMAOIL = 1595, EF_NEW_AROMAOIL_BOTTOM = 1596, EF_NEW_BATHFOAM = 1597, EF_NEW_BATHFOAM_BOTTOM = 1598, EF_TETRA_VORTEX_CORE_REUSE = 1599, + EF_GUARD5 = 1600, + EF_MAGIC_CIRCLE_1 = 1601, + EF_BIO5_PLANT_GREEN = 1602, + EF_BIO5_PLANT_BLUE = 1603, + EF_BIO5_PLANT_YELLOW = 1604, + EF_BIO5_PLANT_WHITE = 1605, + EF_BIO5_PLANT_RED = 1606, EF_GRADE_ENCHANT_INTRO = 1607, EF_GRADE_ENCHANT_SUCCESS = 1608, EF_GRADE_ENCHANT_FAILED = 1609, + EF_POK_MAGIC = 1610, EF_BLUE_WAVE_1 = 1611, EF_BLUE_WAVE_2 = 1612, EF_BLUE_WAVE_3 = 1613, EF_RED_WAVE_1 = 1614, EF_RED_WAVE_2 = 1615, EF_RED_WAVE_3 = 1616, + EF_UNK_1617 = 1617, + EF_UNK_1618 = 1618, + EF_UNK_1619 = 1619, EF_NEW_WALLOFTHORN_CAST = 1620, EF_NEW_WALLOFTHORN_CAST_BOTTOM = 1621, EF_NEW_EARTHGRAVE_BOTTOM = 1622, @@ -1506,16 +1660,30 @@ enum RagEffectID : std::int32_t { EF_NEW_UNLIMIT = 1652, EF_NEW_UNLIMIT_BOTTOM = 1653, EF_NEW_EPICLESIS = 1654, + EF_NEW_EPICLESIS_AURA = 1655, + EF_NEW_EPICLESIS_CAST = 1656, + EF_UNK_1657 = 1657, EF_NEW_AXEBOOMERANG_CAST = 1658, EF_NEW_AXEBOOMERANG_CAST_BOTTOM = 1659, EF_NEW_AXEBOOMERANG_HIT = 1660, + EF_UNK_1661 = 1661, + EF_UNK_1662 = 1662, + EF_UNK_1663 = 1663, + EF_NEW_SANCTUARY = 1664, EF_NEW_SPELLFIST_FIRE = 1665, EF_NEW_SPELLFIST_FIRE_BOTTOM = 1666, EF_NEW_SPELLFIST_WATER = 1667, EF_NEW_SPELLFIST_WATER_BOTTOM = 1668, EF_NEW_SPELLFIST_WIND = 1669, + EF_UNK_1670 = 1670, + EF_UNK_1671 = 1671, + EF_UNK_1672 = 1672, + EF_UNK_1673 = 1673, + EF_UNK_1674 = 1674, EF_NEW_CARTBOOST = 1675, EF_NEW_CARTBOOST_BOTTOM = 1676, + EF_NEW_SAFETYWALL = 1677, + EF_NEW_SONICWAVE = 1678, EF_NEW_OVERBRAND_01 = 1679, EF_NEW_OVERBRAND_03 = 1680, EF_NEW_OVERBRAND_05 = 1681, @@ -1531,6 +1699,10 @@ enum RagEffectID : std::int32_t { EF_NEW_WINDCUTTER_BOTTOM_01 = 1691, EF_NEW_WINDCUTTER_BOTTOM_05 = 1692, EF_NEW_WINDCUTTER_TARGET = 1693, + EF_UNK_1694 = 1694, + EF_UNK_1695 = 1695, + EF_UNK_1696 = 1696, + EF_UNK_1697 = 1697, EF_NEW_POWERSWING_01 = 1698, EF_NEW_POWERSWING_05 = 1699, EF_NEW_POWERSWING_07 = 1700, @@ -1542,12 +1714,27 @@ enum RagEffectID : std::int32_t { EF_NEW_EARTHDRIVE = 1706, EF_NEW_EARTHDRIVE_BOTTOM = 1707, EF_NEW_EARTHDRIVE_TARGET = 1708, + EF_NEW_EARTHDRIVE_CAST = 1709, + EF_UNK_1710 = 1710, + EF_UNK_1711 = 1711, + EF_UNK_1712 = 1712, + EF_UNK_1713 = 1713, + EF_UNK_1714 = 1714, + EF_UNK_1715 = 1715, + EF_UNK_1716 = 1716, + EF_UNK_1717 = 1717, + EF_UNK_1718 = 1718, + EF_UNK_1719 = 1719, + EF_UNK_1720 = 1720, + EF_UNK_1721 = 1721, EF_DRAGONIC_AURA = 1722, EF_DRAGONIC_AURA_BOTTOM = 1723, EF_DRAGONIC_AURA_HIT = 1724, EF_DRAGONIC_AURA_HIT_BOTTOM = 1725, EF_DRAGONIC_AURA_BUFF = 1726, EF_DRAGONIC_AURA_BUFF_BOTTOM = 1727, + EF_UNK_1728 = 1728, + EF_UNK_1729 = 1729, EF_NEW_AUTOSHADOWSPELL = 1730, EF_NEW_AUTOSHADOWSPELL_BOTTOM = 1731, EF_DESTRUCTIVE_HURRICANE = 1732, @@ -1568,14 +1755,25 @@ enum RagEffectID : std::int32_t { EF_ROCKDOWN_CAST = 1747, EF_ROCKDOWN_CAST_BOTTOM = 1748, EF_ROCKDOWN_HIT = 1749, + EF_UNK_1750 = 1750, + EF_UNK_1751 = 1751, + EF_UNK_1752 = 1752, EF_RAIN_OF_CRYSTAL = 1753, EF_RAIN_OF_CRYSTAL_BOTTOM = 1754, + EF_UNK_1755 = 1755, + EF_UNK_1756 = 1756, EF_CRIMSON_ARROW_CAST = 1757, EF_CRIMSON_ARROW_CAST_BOTTOM = 1758, EF_CRIMSON_ARROW_HIT = 1759, + EF_UNK_1760 = 1760, EF_VIOLENT_QUAKE_CAST = 1761, EF_VIOLENT_QUAKE_CAST_BOTTOM = 1762, EF_VIOLENT_QUAKE_HIT = 1763, + EF_UNK_1764 = 1764, + EF_UNK_1765 = 1765, + EF_UNK_1766 = 1766, + EF_UNK_1767 = 1767, + EF_UNK_1768 = 1768, EF_ASTRAL_STRIKE_CAST = 1769, EF_ASTRAL_STRIKE_CAST_BOTTOM = 1770, EF_MYSTERY_ILLUSION = 1771, @@ -1605,10 +1803,13 @@ enum RagEffectID : std::int32_t { EF_ALL_BLOOM_BOTTOM = 1795, EF_ALL_BLOOM_CAST = 1796, EF_ALL_BLOOM_CAST_BOTTOM = 1797, + EF_UNK_1798 = 1798, EF_ALL_BLOOM_HIT = 1799, + EF_UNK_1800 = 1800, EF_CLIMAX_LIGHT = 1801, EF_CLIMAX_CAST = 1802, EF_CLIMAX_CAST_LOOP = 1803, + EF_UNK_1804 = 1804, EF_FLORAL_FLARE_ROAD_CAST = 1805, EF_FLORAL_FLARE_ROAD_CAST_BOTTOM = 1806, EF_FLORAL_FLARE_ROAD_HIT = 1807, @@ -1631,20 +1832,31 @@ enum RagEffectID : std::int32_t { EF_ARBITRIUM = 1824, EF_ARBITRIUM_BOTTOM = 1825, EF_ARBITRIUM_HIT = 1826, + EF_UNK_1827 = 1827, + EF_UNK_1828 = 1828, + EF_UNK_1829 = 1829, + EF_UNK_1830 = 1830, EF_NEW_REPARATIO_CAST = 1831, EF_NEW_REPARATIO_CAST_BOTTOM = 1832, EF_NEW_REPARATIO = 1833, EF_NEW_REPARATIO_BOTTOM = 1834, EF_NEW_REPARATIO_TARGET = 1835, EF_NEW_REPARATIO_TARGET_BOTTOM = 1836, + EF_UNK_1837 = 1837, EF_ETERNAL_SLASH_HIT_1 = 1838, + EF_UNK_1839 = 1839, EF_A_MACHINE_CAST = 1840, + EF_UNK_1841 = 1841, EF_A_MACHINE_HIT = 1842, + EF_UNK_1843 = 1843, + EF_UNK_1844 = 1844, + EF_UNK_1845 = 1845, EF_EFFLIGO = 1846, EF_EFFLIGO_BOTTOM = 1847, EF_EFFLIGO_HIT = 1848, EF_COMPETENTIA = 1849, EF_COMPETENTIA_BOTTOM = 1850, + EF_UNK_1851 = 1851, EF_COMPETENTIA_LOOP = 1852, EF_COMPETENTIA_LOOP_BOTTOM = 1853, EF_CRYSTAL_IMPACT = 1854, @@ -1655,12 +1867,21 @@ enum RagEffectID : std::int32_t { EF_CRYSTAL_IMPACT_BUFF = 1859, EF_RELIGIO = 1860, EF_RELIGIO_CAST = 1861, + EF_UNK_1862 = 1862, + EF_UNK_1863 = 1863, EF_FATAL_SHADOW_CROW = 1864, EF_FATAL_SHADOW_CROW_BOTTOM = 1865, EF_FATAL_SHADOW_CROW_HIT = 1866, + EF_UNK_1867 = 1867, + EF_UNK_1868 = 1868, + EF_UNK_1869 = 1869, + EF_UNK_1870 = 1870, + EF_UNK_1871 = 1871, + EF_NEW_PNEUMA = 1872, EF_DEEP_BLIND_TRAP_CAST = 1873, EF_DEEP_BLIND_TRAP = 1874, EF_DEEP_BLIND_TRAP_HIT = 1875, + EF_NEW_SW_CAST = 1876, EF_SWIFT_TRAP_CAST = 1877, EF_SWIFT_TRAP = 1878, EF_SWIFT_TRAP_HIT = 1879, @@ -1679,9 +1900,14 @@ enum RagEffectID : std::int32_t { EF_STRATUM_TREMOR_HIT = 1892, EF_STRATUM_TREMOR = 1893, EF_STRATUM_TREMOR_BOTTOM = 1894, + EF_UNK_1895 = 1895, + EF_UNK_1896 = 1896, + EF_UNK_1897 = 1897, + EF_UNK_1898 = 1898, EF_WIND_SIGN = 1899, EF_WIND_SIGN_LOOP = 1900, EF_ABR_MOTHER_CAST = 1901, + EF_ABR_MOTHER = 1902, EF_ABR_MOTHER_01 = 1903, EF_ABR_MOTHER_02 = 1904, EF_HAWK_RUSH = 1905, @@ -1689,13 +1915,20 @@ enum RagEffectID : std::int32_t { EF_ABR_INFINITY_BOTTOM = 1907, EF_ABR_INFINITY_CAST = 1908, EF_ABR_INFINITY_HIT = 1909, + EF_ABR_INFINITY_RING = 1910, + EF_UNK_1911 = 1911, + EF_UNK_1912 = 1912, + EF_UNK_1913 = 1913, EF_ETERNAL_SLASH_HIT_2 = 1914, EF_NEW_D_CANNON = 1915, EF_NEW_D_CANNON_CAST = 1916, EF_NEW_D_CANNON_HIT = 1917, + EF_NEW_D_CANNON_ENTITY = 1918, EF_FLAME_TRAP = 1919, + EF_UNK_1920 = 1920, EF_FLAME_TRAP_CAST = 1921, EF_FLAME_TRAP_HIT = 1922, + EF_FLAME_TRAP_RING = 1923, EF_NEW_DILECTIO_HEAL = 1924, EF_NEW_DILECTIO_HEAL_CAST = 1925, EF_NEW_DILECTIO_HEAL_CAST_BOTTOM = 1926, @@ -1704,11 +1937,13 @@ enum RagEffectID : std::int32_t { EF_NEW_PRAMEN_BOTTOM = 1929, EF_NEW_PRAMEN_CAST = 1930, EF_NEW_PRAMEN = 1931, + EF_NEW_PRAMEN_RING = 1932, EF_NEW_POTENT_VENOM = 1933, EF_NEW_BATTLE_W = 1934, EF_NEW_BATTLE_W_CAST = 1935, EF_NEW_BATTLE_W_BOTTOM = 1936, EF_NEW_BATTLE_W_HIT = 1937, + EF_NEW_BATTLE_W_ENTITY = 1938, EF_NEW_AXE_STOMP_HIT = 1939, EF_NEW_AXE_STOMP_BOTTOM = 1940, EF_NEW_AXE_STOMP = 1941, @@ -1720,15 +1955,30 @@ enum RagEffectID : std::int32_t { EF_NEW_AXE_STOMP_08 = 1947, EF_NEW_AXE_STOMP_09 = 1948, EF_NEW_AXE_STOMP_11 = 1949, + EF_UNK_1950 = 1950, + EF_UNK_1951 = 1951, + EF_UNK_1952 = 1952, + EF_UNK_1953 = 1953, + EF_UNK_1954 = 1954, + EF_UNK_1955 = 1955, + EF_UNK_1956 = 1956, + EF_UNK_1957 = 1957, EF_PNEUMATICUS_PROCELLA_CAST = 1958, + EF_PNEUMATICUS_PROCELLA_RING = 1959, + EF_UNK_1960 = 1960, + EF_UNK_1961 = 1961, + EF_UNK_1962 = 1962, + EF_SINCERE_FAITH_RING = 1963, EF_SINCERE_FAITH = 1964, EF_SINCERE_FAITH_BOTTOM = 1965, EF_ABYSS_DAGGER = 1966, EF_ABYSS_DAGGER_HIT = 1967, + EF_UNK_1968 = 1968, EF_HAWK_BOOMERANG_CAST = 1969, EF_HAWK_BOOMERANG_HIT = 1970, EF_HAWK_BOOMERANG_START = 1971, EF_GALE_STORM_CAST = 1972, + EF_UNK_1973 = 1973, EF_GALE_STORM_HIT = 1974, EF_FIRST_FAITH_POWER = 1975, EF_FIRST_FAITH_POWER_CAST = 1976, @@ -1741,6 +1991,7 @@ enum RagEffectID : std::int32_t { EF_THIRD_EXOR_FLAME_CAST = 1983, EF_THIRD_EXOR_FLAME_START = 1984, EF_THIRD_EXOR_FLAME_AURA = 1985, + EF_POWERFUL_FAITH_RING = 1986, EF_POWERFUL_FAITH = 1987, EF_OLEUM_SANCTUM = 1988, EF_OLEUM_SANCTUM_BOTTOM = 1989, @@ -1752,10 +2003,17 @@ enum RagEffectID : std::int32_t { EF_EXPLOSION_BLASTER = 1995, EF_EXPLOSION_BLASTER_BOTTOM = 1996, EF_EXPLOSION_BLASTER_HIT = 1997, + EF_FIRM_FAITH_RING = 1998, EF_FIRM_FAITH = 1999, + EF_UNK_2000 = 2000, + EF_UNK_2001 = 2001, + EF_UNK_2002 = 2002, EF_ACTIVITY_BURN = 2003, EF_ACTIVITY_BURN_CAST = 2004, EF_ACTIVITY_BURN_CAST_BOTTOM = 2005, + EF_UNK_2006 = 2006, + EF_UNK_2007 = 2007, + EF_UNK_2008 = 2008, EF_SERPENS_BOTTOM = 2009, EF_SERPENS_CAST = 2010, EF_SERPENS_CAST_BOTTOM = 2011, @@ -1773,6 +2031,7 @@ enum RagEffectID : std::int32_t { EF_DILUVIO_HIT = 2023, EF_DILUVIO_ARMOR = 2024, EF_SPELL_ENCHANTING = 2025, + EF_UNK_2026 = 2026, EF_DIAMOND_STORM_BOTTOM = 2027, EF_DIAMOND_STORM_CAST = 2028, EF_DIAMOND_STORM_CAST_BOTTOM = 2029, @@ -1792,6 +2051,11 @@ enum RagEffectID : std::int32_t { EF_LIGHTNING_LAND_CAST = 2043, EF_LIGHTNING_LAND_CAST_BOTTOM = 2044, EF_LIGHTNING_LAND_HIT = 2045, + EF_UNK_2046 = 2046, + EF_UNK_2047 = 2047, + EF_UNK_2048 = 2048, + EF_UNK_2049 = 2049, + EF_UNK_2050 = 2050, EF_FIRST_BRAND = 2051, EF_FIRST_BRAND_AURA = 2052, EF_FIRST_BRAND_HIT = 2053, @@ -1806,11 +2070,24 @@ enum RagEffectID : std::int32_t { EF_SOUND_BLEND_CAST_BOTTOM = 2062, EF_SOUND_BLEND_RED = 2063, EF_METALLIC_FURY = 2064, + EF_UNK_2065 = 2065, + EF_UNK_2066 = 2066, + EF_UNK_2067 = 2067, + EF_UNK_2068 = 2068, + EF_UNK_2069 = 2069, + EF_UNK_2070 = 2070, + EF_UNK_2071 = 2071, + EF_UNK_2072 = 2072, + EF_UNK_2073 = 2073, + EF_UNK_2074 = 2074, EF_NIFLHEIM = 2075, EF_NIFLHEIM_CAST = 2076, + EF_UNK_2077 = 2077, EF_SECOND_FAITH = 2078, EF_SECOND_FAITH_AURA = 2079, + EF_UNK_2080 = 2080, EF_SECOND_FAITH_START = 2081, + EF_UNK_2082 = 2082, EF_SECOND_FLAME = 2083, EF_SECOND_FLAME_BOTTOM = 2084, EF_THIRD_FLAME_BOMB = 2085, @@ -1837,13 +2114,23 @@ enum RagEffectID : std::int32_t { EF_TERREMOTUS_CAST_BOTTOM = 2106, EF_TERREMOTUS_HIT = 2107, EF_TERREMOTUS_PROTECT = 2108, + EF_UNK_2109 = 2109, EF_FROM_THE_ABYSS = 2110, EF_ABYSS_STRIKE_HIT_2 = 2111, EF_THIRD_PUNISH = 2112, EF_THIRD_PUNISH_BOTTOM = 2113, + EF_UNK_2114 = 2114, EF_FRENZY_SHOT_HIT = 2115, + EF_UNK_2116 = 2116, + EF_UNK_2117 = 2117, + EF_UNK_2118 = 2118, + EF_UNK_2119 = 2119, + EF_UNK_2120 = 2120, + EF_UNK_2121 = 2121, EF_MUSICAL_INTERLUDE = 2122, EF_MUSICAL_INTERLUDE_CAST = 2123, + EF_UNK_2124 = 2124, + EF_UNK_2125 = 2125, EF_ABYSS_SLAYER = 2126, EF_ABYSS_SLAYER_CAST = 2127, EF_ABYSS_SLAYER_CAST_BOTTOM = 2128, @@ -1872,18 +2159,59 @@ enum RagEffectID : std::int32_t { EF_ELEMENTAL_BUSTER_WIND = 2151, EF_ELEMENTAL_BUSTER_WIND_BOTTOM = 2152, EF_ELEMENTAL_BUSTER_WIND_HIT = 2153, + EF_UNK_2154 = 2154, EF_UNLUCKY_RUSH_CAST = 2155, EF_ABYSS_DAGGER_HIT_3 = 2156, + EF_UNK_2157 = 2157, + EF_UNK_2158 = 2158, + EF_UNK_2159 = 2159, + EF_UNK_2160 = 2160, EF_ADVANCED_PROTECTION = 2161, EF_ADVANCED_PROTECTION_BOTTOM = 2162, EF_ADVANCED_PROTECTION_CAST = 2163, EF_ADVANCED_PROTECTION_CAST_BOTTOM = 2164, + EF_UNK_2165 = 2165, + EF_UNK_2166 = 2166, + EF_UNK_2167 = 2167, + EF_UNK_2168 = 2168, + EF_UNK_2169 = 2169, + EF_UNK_2170 = 2170, + EF_UNK_2171 = 2171, + EF_UNK_2172 = 2172, + EF_UNK_2173 = 2173, + EF_UNK_2174 = 2174, + EF_UNK_2175 = 2175, + EF_UNK_2176 = 2176, + EF_UNK_2177 = 2177, + EF_UNK_2178 = 2178, + EF_UNK_2179 = 2179, + EF_UNK_2180 = 2180, + EF_UNK_2181 = 2181, + EF_UNK_2182 = 2182, + EF_UNK_2183 = 2183, EF_SHIELD_SHOOTING_CAST = 2184, EF_SHIELD_SHOOTING_HIT = 2185, EF_THE_W_PROTECTION = 2186, EF_THE_W_PROTECTION_CAST = 2187, + EF_UNK_2188 = 2188, + EF_UNK_2189 = 2189, + EF_UNK_2190 = 2190, + EF_UNK_2191 = 2191, + EF_UNK_2192 = 2192, + EF_UNK_2193 = 2193, + EF_UNK_2194 = 2194, + EF_UNK_2195 = 2195, + EF_UNK_2196 = 2196, + EF_UNK_2197 = 2197, + EF_UNK_2198 = 2198, + EF_UNK_2199 = 2199, + EF_UNK_2200 = 2200, + EF_UNK_2201 = 2201, + EF_UNK_2202 = 2202, + EF_UNK_2203 = 2203, EF_ACIDIFIED_ZONE_FIRE_CAST = 2204, EF_ACIDIFIED_ZONE_FIRE_CAST_BOTTOM = 2205, + EF_UNK_2206 = 2206, EF_ACIDIFIED_ZONE_FIRE_HIT = 2207, EF_ACIDIFIED_ZONE_FIRE_START = 2208, EF_ACIDIFIED_ZONE_FIRE_START_BOTTOM = 2209, @@ -1891,6 +2219,7 @@ enum RagEffectID : std::int32_t { EF_ACIDIFIED_ZONE_FIRE_LOOP_BOTTOM = 2211, EF_ACIDIFIED_ZONE_WATER_CAST = 2212, EF_ACIDIFIED_ZONE_WATER_CAST_BOTTOM = 2213, + EF_UNK_2214 = 2214, EF_ACIDIFIED_ZONE_WATER_HIT = 2215, EF_ACIDIFIED_ZONE_WATER_START = 2216, EF_ACIDIFIED_ZONE_WATER_START_BOTTOM = 2217, @@ -1898,6 +2227,7 @@ enum RagEffectID : std::int32_t { EF_ACIDIFIED_ZONE_WATER_LOOP_BOTTOM = 2219, EF_ACIDIFIED_ZONE_WIND_CAST = 2220, EF_ACIDIFIED_ZONE_WIND_CAST_BOTTOM = 2221, + EF_UNK_2222 = 2222, EF_ACIDIFIED_ZONE_WIND_HIT = 2223, EF_ACIDIFIED_ZONE_WIND_START = 2224, EF_ACIDIFIED_ZONE_WIND_START_BOTTOM = 2225, @@ -1905,6 +2235,7 @@ enum RagEffectID : std::int32_t { EF_ACIDIFIED_ZONE_WIND_LOOP_BOTTOM = 2227, EF_ACIDIFIED_ZONE_GROUND_CAST = 2228, EF_ACIDIFIED_ZONE_GROUND_CAST_BOTTOM = 2229, + EF_UNK_2230 = 2230, EF_ACIDIFIED_ZONE_GROUND_HIT = 2231, EF_ACIDIFIED_ZONE_GROUND_START = 2232, EF_ACIDIFIED_ZONE_GROUND_START_BOTTOM = 2233, @@ -1914,6 +2245,7 @@ enum RagEffectID : std::int32_t { EF_HELLTREE_CAST_BOTTOM = 2237, EF_HELLTREE_DUSTY = 2238, EF_HELLTREE_HOWLING = 2239, + EF_RESEARCH_REPORT_RING = 2240, EF_RESEARCH_REPORT = 2241, EF_RESEARCH_REPORT_CAST = 2242, EF_RESEARCH_REPORT_CAST_BOTTOM = 2243, @@ -1922,11 +2254,13 @@ enum RagEffectID : std::int32_t { EF_STATE_HOLYFLAME = 2246, EF_WOODEN_WARRIOR_CAST = 2247, EF_WOODEN_WARRIOR_CAST_BOTTOM = 2248, + EF_WOODEN_WARRIOR_RING = 2249, EF_WOODEN_WARRIOR_ATTACK = 2250, EF_WOODEN_WARRIOR_ATTACK_HIT = 2251, EF_WOODEN_WARRIOR_THROWROCK = 2252, EF_WOODEN_WARRIOR_THROWROCK_HIT = 2253, EF_WOODEN_FAIRY_CAST = 2254, + EF_WOODEN_FAIRY_RING = 2255, EF_WOODEN_FAIRY_CAST_BOTTOM = 2256, EF_WOODEN_FAIRY_DUSTY = 2257, EF_SERPENS_DEEP_POISONING = 2258, @@ -1943,13 +2277,45 @@ enum RagEffectID : std::int32_t { EF_STATE_CONFLAGRATION = 2269, EF_STATE_FROSTBITE = 2270, EF_STATE_FROSTBITE_FINISH = 2271, + EF_UNK_2272 = 2272, EF_STATE_CRYSTALLIZATION = 2273, EF_STATE_DEADLYPOISON = 2274, + EF_UNK_2275 = 2275, + EF_UNK_2276 = 2276, + EF_UNK_2277 = 2277, + EF_UNK_2278 = 2278, EF_THIRD_CONSECRATION_BOTTOM = 2279, + EF_UNK_2280 = 2280, + EF_UNK_2281 = 2281, + EF_UNK_2282 = 2282, + EF_UNK_2283 = 2283, + EF_UNK_2284 = 2284, + EF_UNK_2285 = 2285, + EF_UNK_2286 = 2286, + EF_UNK_2287 = 2287, + EF_STATUS_CRATE_UP = 2288, + EF_STATUS_CRATE_DOWN = 2289, + EF_STATUS_HPLUS_UP = 2290, + EF_STATUS_HPLUS_DOWN = 2291, + EF_STATUS_MRES_UP = 2292, + EF_STATUS_MRES_DOWN = 2293, + EF_STATUS_PATK_UP = 2294, + EF_STATUS_PATK_DOWN = 2295, + EF_STATUS_RES_UP = 2296, + EF_STATUS_RES_DOWN = 2297, + EF_STATUS_SMATK_UP = 2298, + EF_STATUS_SMATK_DOWN = 2299, + EF_STATUS_PATK_SMATK_UP = 2300, + EF_UNK_2301 = 2301, EF_NPC_KILLING_AURA = 2302, EF_NPC_KILLING_AURA_END = 2303, EF_NPC_KILLING_AURA_HIT = 2304, + EF_UNK_2305 = 2305, + EF_UNK_2306 = 2306, + EF_UNK_2307 = 2307, EF_NPC_CANE_OF_EVIL_EYE = 2308, + EF_UNK_2309 = 2309, + EF_UNK_2310 = 2310, EF_UI_ENCHANT_INTRO_YELLOW = 2311, EF_UI_ENCHANT_SUCCESS = 2312, EF_UI_ENCHANT_FAIL = 2313, @@ -1977,12 +2343,44 @@ enum RagEffectID : std::int32_t { EF_GLANZEN_SPIES = 2335, EF_GLANZEN_SPIES_HIT = 2336, EF_BLAZING_AND_FURIOUS = 2337, + EF_THE_ONE_FIGHTER_RISES = 2338, EF_THE_ONE_FIGHTER_RISES_BOTTOM = 2339, EF_TEMPERING = 2340, + EF_UNK_2341 = 2341, EF_BLAST_FORGE_HIT = 2342, EF_UNK_2343 = 2343, + EF_UNK_2344 = 2344, + EF_UNK_2345 = 2345, + EF_POK_94 = 2346, + EF_POK_95 = 2347, + EF_UNK_2348 = 2348, + EF_UNK_2349 = 2349, + EF_UNK_2350 = 2350, + EF_UNK_2351 = 2351, + EF_UNK_2352 = 2352, + EF_UNK_2353 = 2353, + EF_UNK_2354 = 2354, + EF_UNK_2355 = 2355, + EF_POK_96 = 2356, + EF_POK_97 = 2357, + EF_POK_98 = 2358, + EF_POK_99 = 2359, + EF_POK_100 = 2360, + EF_POK_101 = 2361, + EF_POK_102 = 2362, + EF_POK_103 = 2363, + EF_POK_104 = 2364, + EF_POK_105 = 2365, + EF_UNK_2366 = 2366, + EF_UNKNOWN_RING_YELLOW = 2367, + EF_UNKNOWN_SPELL = 2368, + EF_UNKNOWN_RING_WHITE = 2369, + EF_UNK_2370 = 2370, EF_TETRA_VORTEX_WATER_SUB_2 = 2371, EF_TETRA_VORTEX_EARTH_SUB_2 = 2372, + EF_VOLCANO_BLACK = 2373, + EF_CHANGE_SIZE = 2374, + EF_UNK_2375 = 2375, EF_NPC_20TH_CRYSTAL_S = 2376, EF_NPC_20TH_CRYSTAL_M = 2377, EF_NPC_20TH_CRYSTAL_L = 2378, @@ -1997,11 +2395,18 @@ enum RagEffectID : std::int32_t { EF_NPC_GATE_PURPLE_3 = 2387, EF_NPC_GATE_RED_3 = 2388, EF_NPC_GATE_SKYBLUE = 2389, + EF_UNK_2390 = 2390, + EF_UNK_2391 = 2391, + EF_UNK_2392 = 2392, + EF_UNK_2393 = 2393, + EF_UNK_2394 = 2394, EF_RUNE_ACTIVE_FINISH = 2395, EF_RUNESET_ACTIVE = 2396, EF_RUNESET_UPGRADE_SUCCESS = 2397, EF_RUNESET_UPGRADE_FAIL = 2398, EF_RUNE_BROKEN = 2399, + EF_ALPHA_DOWN_ANIM = 2401, + EF_GLOW_BLACK = 2402, EF_NEW_BATTLE_W_HIT_2 = 2403, EF_NEW_PRAMEN_REUSE = 2405, EF_THE_W_PROTECTION_REUSE = 2406, @@ -2009,122 +2414,64 @@ enum RagEffectID : std::int32_t { EF_DESTRUCTIVE_HURRICANE_BOTTOM_REUSE = 2408, EF_CRYSTAL_IMPACT_BOTTOM_REUSE = 2409, EF_NEW_JUDEX_TARGET_REUSE = 2410, - EF_RUNE_SLOT_SMALL = 2421, - EF_RUNE_SLOT_BIG = 2422, - - EF_SU_CN_METEOR = 1115, - EF_SU_LUNATIC_CARROT_BEAT = 1120, - EF_SU_SOUL_ATTACK = 1122, - EF_SU_SPIRIT_OF_LIFE = 1131, - EF_SU_STOOP = 1132, - - EF_RL_B_TRAP = 1135, - EF_RL_HAMMER_OF_GOD = 1145, - EF_RL_R_TRIP = 1148, - - EF_WARPZONE3 = 1185, - EF_AUTOSHADOWSPELL_ACTIVE = 1195, - EF_SMA_BLACK2 = 1205, - EF_STIN_BLACK = 1206, - EF_PEONG_BLACK = 1207, - EF_LINELINK5 = 1210, - EF_SOLAR_EXPLOSION = 1224, - EF_SOUL_REAPER_COLLECT = 1240, - EF_NEW_SEVERERAINSTORM_HIT = 1286, - EF_NEW_HEAVENS_DRIVE = 1399, - EF_NEW_TRIPLEATTACK = 1409, - - EF_NEW_MOON_SLASH = 1418, - EF_NEW_GRANDCROSS = 1420, - EF_NEW_JACKFROST_ART = 1448, - EF_NEW_FROSTMISTY = 1449, - EF_WHITEIMPRISON_STATE = 1525, - EF_POK_THUNDER = 1531, - EF_NEW_MAGNUM_BREAK = 1545, - EF_NEW_HEAL_BLUE = 1556, - EF_NEW_HEAL_WHITE = 1560, - EF_NEW_HEAL_YELLOW = 1565, - EF_NEW_CROSSIMPACT_HIT = 1568, - EF_NEW_REVERBERATION = 1569, - EF_NEW_GATEOFHELL = 1575, - EF_NEW_METALLICSOUND_LINE = 1584, - EF_NEW_REVERBERATION_NOTE = 1594, - EF_GUARD5 = 1600, - - EF_MAGIC_CIRCLE_1 = 1601, - EF_BIO5_PLANT_GREEN = 1602, - EF_BIO5_PLANT_BLUE = 1603, - EF_BIO5_PLANT_YELLOW = 1604, - EF_BIO5_PLANT_WHITE = 1605, - EF_BIO5_PLANT_RED = 1606, - EF_POK_MAGIC = 1610, - - EF_NEW_EPICLESIS_AURA = 1655, - EF_NEW_EPICLESIS_CAST = 1656, - EF_NEW_SANCTUARY = 1664, - EF_NEW_SAFETYWALL = 1677, - EF_NEW_SONICWAVE = 1678, - EF_NEW_EARTHDRIVE_CAST = 1709, - EF_NEW_PNEUMA = 1872, - EF_NEW_SW_CAST = 1876, - - EF_ABR_MOTHER = 1902, - EF_ABR_INFINITY_RING = 1910, - EF_NEW_D_CANNON_ENTITY = 1918, - EF_FLAME_TRAP_RING = 1923, - EF_NEW_PRAMEN_RING = 1932, - EF_NEW_BATTLE_W_ENTITY = 1938, - EF_PNEUMATICUS_PROCELLA_RING = 1959, - EF_SINCERE_FAITH_RING = 1963, - EF_POWERFUL_FAITH_RING = 1986, - EF_FIRM_FAITH_RING = 1998, - EF_RESEARCH_REPORT_RING = 2240, - EF_WOODEN_WARRIOR_RING = 2249, - EF_WOODEN_FAIRY_RING = 2255, - - EF_STATUS_CRATE_UP = 2288, - EF_STATUS_CRATE_DOWN = 2289, - EF_STATUS_HPLUS_UP = 2290, - EF_STATUS_HPLUS_DOWN = 2291, - EF_STATUS_MRES_UP = 2292, - EF_STATUS_MRES_DOWN = 2293, - EF_STATUS_PATK_UP = 2294, - EF_STATUS_PATK_DOWN = 2295, - EF_STATUS_RES_UP = 2296, - EF_STATUS_RES_DOWN = 2297, - EF_STATUS_SMATK_UP = 2298, - EF_STATUS_SMATK_DOWN = 2299, - EF_STATUS_PATK_SMATK_UP = 2300, - - EF_THE_ONE_FIGHTER_RISES = 2338, - EF_POK_94 = 2346, - EF_POK_95 = 2347, - EF_POK_96 = 2356, - EF_POK_97 = 2357, - EF_POK_98 = 2358, - EF_POK_99 = 2359, - EF_POK_100 = 2360, - EF_POK_101 = 2361, - EF_POK_102 = 2362, - EF_POK_103 = 2363, - EF_POK_104 = 2364, - EF_POK_105 = 2365, - - EF_UNKNOWN_RING_YELLOW = 2367, - EF_UNKNOWN_SPELL = 2368, - EF_UNKNOWN_RING_WHITE = 2369, - EF_VOLCANO_BLACK = 2373, - EF_CHANGE_SIZE = 2374, - - EF_ALPHA_DOWN_ANIM = 2401, - EF_GLOW_BLACK = 2402, + EF_UNK_2413 = 2413, + EF_UNK_2414 = 2414, + EF_UNK_2415 = 2415, EF_ABC_CHASING_LINE = 2416, EF_ABC_CROSSIMPACT_LINE = 2417, + EF_UNK_2418 = 2418, + EF_UNK_2419 = 2419, + EF_RUNE_SLOT_SMALL = 2421, + EF_RUNE_SLOT_BIG = 2422, + EF_UNK_2423 = 2423, EF_WH_WILD_WALK = 2425, EF_FORCE_ANIM_27 = 2426, EF_HEAL_BLUE_2 = 2427, + EF_UNK_2432 = 2432, + EF_UNK_2433 = 2433, + EF_UNK_2434 = 2434, + EF_UNK_2435 = 2435, EF_RG_COIN_BLUE = 2436, EF_RG_COIN_BLUE_2 = 2437, + EF_UNK_2438 = 2438, + EF_UNK_2439 = 2439, + EF_UNK_2440 = 2440, + EF_UNK_2441 = 2441, + EF_UNK_2442 = 2442, + EF_UNK_2443 = 2443, + EF_UNK_2444 = 2444, + EF_UNK_2445 = 2445, + EF_UNK_2446 = 2446, + EF_UNK_2447 = 2447, + EF_UNK_2448 = 2448, + EF_UNK_2449 = 2449, + EF_UNK_2450 = 2450, + EF_UNK_2451 = 2451, + EF_UNK_2452 = 2452, + EF_UNK_2453 = 2453, + EF_UNK_2454 = 2454, + EF_UNK_2455 = 2455, + EF_UNK_2456 = 2456, + EF_UNK_2457 = 2457, + EF_UNK_2463 = 2463, + EF_UNK_2464 = 2464, + EF_UNK_2465 = 2465, + EF_UNK_2466 = 2466, + EF_UNK_2468 = 2468, + EF_UNK_2469 = 2469, + EF_UNK_2470 = 2470, + EF_UNK_2471 = 2471, + EF_UNK_2472 = 2472, + EF_UNK_2473 = 2473, + EF_UNK_2474 = 2474, + EF_UNK_2477 = 2477, + EF_UNK_2478 = 2478, + EF_UNK_2479 = 2479, + EF_UNK_2480 = 2480, + EF_UNK_2481 = 2481, + EF_UNK_2482 = 2482, + EF_UNK_2483 = 2483, + }; enum efst_type : std::int16_t { diff --git a/Source/Contents/Effects/RagEffectInitialization.cpp b/Source/Contents/Effects/RagEffectInitialization.cpp index e2d0458..26bd8df 100644 --- a/Source/Contents/Effects/RagEffectInitialization.cpp +++ b/Source/Contents/Effects/RagEffectInitialization.cpp @@ -303,22 +303,22 @@ static void SelectRagEffectResource(RagEffectState& effect, ServiceOptions& opti std::sprintf(name, "Pong%d.str", std::rand() % 3 + 1); break; case 204: - std::sprintf(name, "\273\241\260\243\306\367\274\307.str"); + std::sprintf(name, "빨간포션.str"); break; case 205: - std::sprintf(name, "\301\326\310\253\306\367\274\307.str"); + std::sprintf(name, "주홍포션.str"); break; case 206: - std::sprintf(name, "\263\353\266\365\306\367\274\307.str"); + std::sprintf(name, "노란포션.str"); break; case 207: - std::sprintf(name, "\307\317\276\341\306\367\274\307.str"); + std::sprintf(name, "하얀포션.str"); break; case 208: - std::sprintf(name, "\306\304\266\365\306\367\274\307.str"); + std::sprintf(name, "파란포션.str"); break; case 209: - std::sprintf(name, "\303\312\267\317\306\367\274\307.str"); + std::sprintf(name, "초록포션.str"); break; case 210: std::sprintf(name, "fruit.str"); @@ -333,23 +333,23 @@ static void SelectRagEffectResource(RagEffectState& effect, ServiceOptions& opti std::sprintf(name, "Keeping.str"); break; case 218: - std::sprintf(name, "\301\375\301\337.str"); + std::sprintf(name, "집중.str"); break; case 219: - std::sprintf(name, "\260\242\274\272.str"); + std::sprintf(name, "각성.str"); break; case 220: case 756: - std::sprintf(name, "\271\366\274\255\305\251.str"); + std::sprintf(name, "버서크.str"); break; case 234: std::sprintf(name, "spell.str"); break; case 235: - std::sprintf(name, "\265\360\275\272\306\347.str"); + std::sprintf(name, "디스펠.str"); break; case 244: - std::sprintf(name, "\270\305\301\367\267\316\265\345.str"); + std::sprintf(name, "매직로드.str"); break; case 245: std::sprintf(name, "holy_cross.str"); @@ -391,7 +391,7 @@ static void SelectRagEffectResource(RagEffectState& effect, ServiceOptions& opti std::sprintf(name, "strip_helm.str"); break; case 273: - std::sprintf(name, "\277\254\310\257.str"); + std::sprintf(name, "연환.str"); break; case 305: std::sprintf(name, "p_success.str"); @@ -419,16 +419,16 @@ static void SelectRagEffectResource(RagEffectState& effect, ServiceOptions& opti std::sprintf(name, "sword.str"); break; case 406: - std::sprintf(name, "\274\322\277\357\271\370.str"); + std::sprintf(name, "소울번.str"); break; case 407: - std::sprintf(name, "\273\347\266\367\310\277\260\372.str"); + std::sprintf(name, "사람효과.str"); break; case 440: std::sprintf(name, "asum.str"); break; case 491: - std::sprintf(name, "\302\375\275\322\266\261.str"); + std::sprintf(name, "찹쌀떡.str"); break; case 492: std::sprintf(name, "ramadan.str"); @@ -486,10 +486,10 @@ static void SelectRagEffectResource(RagEffectState& effect, ServiceOptions& opti std::sprintf(name, "icy.str"); break; case 646: - std::sprintf(name, "\306\256\267\242\305\267.str"); + std::sprintf(name, "트랙킹.str"); break; case 649: - std::sprintf(name, "\272\322\275\272\276\306\300\314.str"); + std::sprintf(name, "불스아이.str"); break; case 668: case 670: @@ -523,7 +523,7 @@ static void SelectRagEffectResource(RagEffectState& effect, ServiceOptions& opti std::sprintf(name, "ado.str"); break; case 722: - std::sprintf(name, "\300\314\261\327\264\317\274\307\272\352\267\271\300\314\305\251.str"); + std::sprintf(name, "이그니션브레이크.str"); break; case 727: std::sprintf(name, "crimson_r.str"); diff --git a/Source/Contents/Emblems/EmblemDataDownloadAsyncWork.cpp b/Source/Contents/Emblems/EmblemDataDownloadAsyncWork.cpp index fab276d..3a51894 100644 --- a/Source/Contents/Emblems/EmblemDataDownloadAsyncWork.cpp +++ b/Source/Contents/Emblems/EmblemDataDownloadAsyncWork.cpp @@ -3,7 +3,7 @@ #include "Network/Http/CURLPostHander.h" #include "Network/TextEncoding.h" -#include +#include #include #include diff --git a/Source/Contents/Ground/GroundWaterState.cpp b/Source/Contents/Ground/GroundWaterState.cpp index 4f53150..bc0a58c 100644 --- a/Source/Contents/Ground/GroundWaterState.cpp +++ b/Source/Contents/Ground/GroundWaterState.cpp @@ -69,7 +69,7 @@ float GroundWaterState::Level(int width, int height, int column, int row) const // FUNCTION: fn_17581 void GroundWaterState::Update(TextureCache& textures) { // STATIC: 0x01159248 - constexpr char format[] = "\xBF\xF6\xC5\xCD\\water%d%02d.jpg"; + constexpr char format[] = "워터\\water%d%02d.jpg"; char name[32]{}; for (GroundWaterSurface& surface : this->surfaces) { diff --git a/Source/Contents/Items/ItemDescription.cpp b/Source/Contents/Items/ItemDescription.cpp index fa417a0..eb31133 100644 --- a/Source/Contents/Items/ItemDescription.cpp +++ b/Source/Contents/Items/ItemDescription.cpp @@ -89,7 +89,7 @@ ITEM_DESC& ItemDescriptions::Ensure(int id) { void ItemDescriptions::IconPath(char* output, const char* id, int identified) { const ITEM_DESC& value = this->Find(std::atoi(id)); const char* resource = identified != 0 ? value.identifiedResource : value.unidentifiedResource; - std::sprintf(output, "\xC0\xAF\xC0\xFA\xC0\xCE\xC5\xCD\xC6\xE4\xC0\xCC\xBD\xBA\\item\\%s.bmp", resource); + std::sprintf(output, "유저인터페이스\\item\\%s.bmp", resource); } // OFFSET: 0x006D5730 diff --git a/Source/Contents/Items/ItemResources.cpp b/Source/Contents/Items/ItemResources.cpp index df21eac..86adf84 100644 --- a/Source/Contents/Items/ItemResources.cpp +++ b/Source/Contents/Items/ItemResources.cpp @@ -9,10 +9,10 @@ // FUNCTION: fn_23391 const char* ItemDragResource(ItemDescriptions& descriptions, const char* id, int identified) { static std::string resource; - resource = "\xBE\xC6\xC0\xCC\xC5\xDB\\"; + resource = "아이템\\"; const ITEM_DESC& value = descriptions.Find(std::atoi(id)); const char* name = identified != 0 ? value.identifiedResource : value.unidentifiedResource; - resource += name ? name : "\xBB\xE7\xB0\xFA"; + resource += name ? name : "사과"; return resource.c_str(); } @@ -21,11 +21,11 @@ const char* ItemDragResource(ItemDescriptions& descriptions, const char* id, int // FUNCTION: fn_23392 const char* SkillDragResource(ResourceMgr& resources, const char* name) { static std::string resource; - resource = "\xBE\xC6\xC0\xCC\xC5\xDB\\"; + resource = "아이템\\"; resource += name; if (!resources.Exists((resource + ".act").c_str())) { - resource = "\xBE\xC6\xC0\xCC\xC5\xDB\\am_berserkpitcher"; + resource = "아이템\\am_berserkpitcher"; } return resource.c_str(); diff --git a/Source/Contents/Jobs/JobNameInitialization.cpp b/Source/Contents/Jobs/JobNameInitialization.cpp index 079c95f..284390d 100644 --- a/Source/Contents/Jobs/JobNameInitialization.cpp +++ b/Source/Contents/Jobs/JobNameInitialization.cpp @@ -56,15 +56,15 @@ void JobNames::Initialize(JobNameInitialization& context) { this->names[JT_MER_SERA] = "MER_SERA"; for (unsigned id = JT_MER_ARCHER01; id <= JT_MER_ARCHER10; ++id) { - this->names[id] = "\xBF\xA9\\\xC8\xB0\xBF\xEB\xBA\xB4"; + this->names[id] = "여\\활용병"; } for (unsigned id = JT_MER_LANCER01; id <= JT_MER_LANCER10; ++id) { - this->names[id] = "\xB3\xB2\\\xC3\xA2\xBF\xEB\xBA\xB4"; + this->names[id] = "남\\창용병"; } for (unsigned id = JT_MER_SWORDMAN01; id <= JT_MER_SWORDMAN10; ++id) { - this->names[id] = "\xB3\xB2\\\xB0\xCB\xBF\xEB\xBA\xB4"; + this->names[id] = "남\\검용병"; } context.sexLabels.resize(2, "F"); diff --git a/Source/Contents/Sound/SoundMgr.cpp b/Source/Contents/Sound/SoundMgr.cpp index 99fd358..4e3da1d 100644 --- a/Source/Contents/Sound/SoundMgr.cpp +++ b/Source/Contents/Sound/SoundMgr.cpp @@ -552,7 +552,7 @@ void CSoundMgr::PlayWave(const char* name, float x, float y, float z, int maximu return; } - static constexpr char permittedName[] = "\xB9\xF6\xC6\xB0\xBC\xD2\xB8\xAE.wav"; + static constexpr char permittedName[] = "버튼소리.wav"; if (this->unknown != 0 && std::strcmp(name, permittedName) != 0) { return; diff --git a/Source/Resource/Models/ModelResource.cpp b/Source/Resource/Models/ModelResource.cpp index d784e97..d7a6cf0 100644 --- a/Source/Resource/Models/ModelResource.cpp +++ b/Source/Resource/Models/ModelResource.cpp @@ -205,8 +205,8 @@ bool C3dModelResV1::Load(const char* name) { input.Read(magic, 4); if (std::strcmp(magic, "GRSM") != 0) { - constexpr char message[] = "\xB8\xF0\xB5\xA8\xC6\xC4\xC0\xCF\xC0\xCC \xBE\xC6\xB4\xD5\xB4\xCF\xB4\xD9. \xC7\xFC\xBD\xC4\xC0\xBB " - "\xB4\xD9\xBD\xC3\xC7\xD1\xB9\xF8 \xC8\xAE\xC0\xCE\xC7\xD8\xC1\xD6\xBC\xBC\xBF\xE4."; + constexpr char message[] = "모델파일이 아닙니다. 형식을 " + "다시한번 확인해주세요."; ShowErrorDialog(this->m_context->renderSystem, message, 0); file.Close(); @@ -220,8 +220,8 @@ bool C3dModelResV1::Load(const char* name) { input.Read(&minor, 1); if (major != 1 || minor > 5) { - constexpr char message[] = "\xC1\xF6\xBF\xF8\xB5\xC7\xC1\xF6 \xBE\xCA\xB4\xC2 \xB9\xF6\xC1\xAF\xC0\xD4\xB4\xCF\xB4\xD9. " - "\xB3\xBB\xBF\xEB\xB9\xB0\xC0\xCC \xB1\xFA\xC1\xAE\xC0\xD6\xC0\xBB \xBC\xF6 \xC0\xD6\xBD\xC0\xB4\xCF\xB4\xD9"; + constexpr char message[] = "지원되지 않는 버젼입니다. " + "내용물이 깨져있을 수 있습니다"; ShowErrorDialog(this->m_context->renderSystem, message, 0); file.Close(); diff --git a/Source/Resource/Models/ModelResourceV2.cpp b/Source/Resource/Models/ModelResourceV2.cpp index e3f4ed0..45daf08 100644 --- a/Source/Resource/Models/ModelResourceV2.cpp +++ b/Source/Resource/Models/ModelResourceV2.cpp @@ -65,8 +65,7 @@ bool C3dModelResV2::Load(const char* name) { input.Read(magic, 4); if (std::strcmp(magic, "GRSM") != 0) { - constexpr char message[] = "\xB8\xF0\xB5\xA8\xC6\xC4\xC0\xCF\xC0\xCC \xBE\xC6\xB4\xD5\xB4\xCF\xB4\xD9. \xC7\xFC\xBD\xC4\xC0\xBB " - "\xB4\xD9\xBD\xC3\xC7\xD1\xB9\xF8 \xC8\xAE\xC0\xCE\xC7\xD8\xC1\xD6\xBC\xBC\xBF\xE4."; + constexpr char message[] = "모델파일이 아닙니다. 형식을 다시한번 확인해주세요."; ShowErrorDialog(this->m_context->renderSystem, message, 0); file.Close(); diff --git a/Source/Resource/TextureNames.cpp b/Source/Resource/TextureNames.cpp index 22622b2..e560b4b 100644 --- a/Source/Resource/TextureNames.cpp +++ b/Source/Resource/TextureNames.cpp @@ -30,7 +30,7 @@ const char* TextureNames::Resolve(const char* name) { } const std::string original(name); - constexpr char marker[] = "\xC0\xAF\xC0\xFA\xC0\xCE\xC5\xCD\xC6\xE4\xC0\xCC\xBD\xBA"; + constexpr char marker[] = "유저인터페이스"; if (original.find(marker, 0, 14) == std::string::npos) { return name; diff --git a/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp b/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp index d02159a..0192af7 100644 --- a/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp +++ b/Source/UI/Acceptance/UIChooseSellBuyWnd.cpp @@ -10,7 +10,7 @@ #include namespace { - constexpr char prefix[] = "\xC0\xAF\xC0\xFA\xC0\xCE\xC5\xCD\xC6\xE4\xC0\xCC\xBD\xBA\\"; + constexpr char prefix[] = "유저인터페이스\\"; } // OFFSET: 0x008C73C0 diff --git a/Source/UI/Buttons/UIBasicButton.cpp b/Source/UI/Buttons/UIBasicButton.cpp index c7846a3..497f6e1 100644 --- a/Source/UI/Buttons/UIBasicButton.cpp +++ b/Source/UI/Buttons/UIBasicButton.cpp @@ -40,7 +40,7 @@ void UIBasicButton::Paint() { if (this->m_disabled == 1 || this->geometry.unknown_0030 <= 2) { static constexpr const char* skins[] = {"out", "over", "press", "disable"}; - const std::string prefix = std::string("\xC0\xAF\xC0\xFA\xC0\xCE\xC5\xCD\xC6\xE4\xC0\xCC\xBD\xBA\\basic_interface\\btn_") + skins[state]; + const std::string prefix = std::string("유저인터페이스\\basic_interface\\btn_") + skins[state]; const auto drawBitmap = [&](const char* suffix, int x) { auto* bitmap = static_cast(this->m_buttonContext->resources.Load((prefix + suffix).c_str())); this->DrawBitmap(x, 0, bitmap ? &bitmap->image : nullptr, false); diff --git a/Source/UI/Buttons/UIButton.cpp b/Source/UI/Buttons/UIButton.cpp index d449f30..07e03ab 100644 --- a/Source/UI/Buttons/UIButton.cpp +++ b/Source/UI/Buttons/UIButton.cpp @@ -28,9 +28,9 @@ void UIButton::Paint() { } static const char* const backgrounds[] = { - "\xC0\xAF\xC0\xFA\xC0\xCE\xC5\xCD\xC6\xE4\xC0\xCC\xBD\xBA\\sml_button_up.bmp", - "\xC0\xAF\xC0\xFA\xC0\xCE\xC5\xCD\xC6\xE4\xC0\xCC\xBD\xBA\\sml_button_act.bmp", - "\xC0\xAF\xC0\xFA\xC0\xCE\xC5\xCD\xC6\xE4\xC0\xCC\xBD\xBA\\sml_button_down.bmp" + "유저인터페이스\\sml_button_up.bmp", + "유저인터페이스\\sml_button_act.bmp", + "유저인터페이스\\sml_button_down.bmp" }; CBitmapRes* bitmap; diff --git a/Source/UI/Lists/UIComboBoxDefWnd.cpp b/Source/UI/Lists/UIComboBoxDefWnd.cpp index aaafac2..dfcbf78 100644 --- a/Source/UI/Lists/UIComboBoxDefWnd.cpp +++ b/Source/UI/Lists/UIComboBoxDefWnd.cpp @@ -6,7 +6,7 @@ #include "UI/Window/WindowPolicy.h" namespace { - constexpr char prefix[] = "\xC0\xAF\xC0\xFA\xC0\xCE\xC5\xCD\xC6\xE4\xC0\xCC\xBD\xBA\\"; + constexpr char prefix[] = "유저인터페이스\\"; } // OFFSET: 0x0086CC20 diff --git a/Source/UI/Lists/UIComboBoxEx.cpp b/Source/UI/Lists/UIComboBoxEx.cpp index a1f08e6..9c596a9 100644 --- a/Source/UI/Lists/UIComboBoxEx.cpp +++ b/Source/UI/Lists/UIComboBoxEx.cpp @@ -11,7 +11,7 @@ namespace { unsigned Palette(ResourceMgr& resources, int column, int row) { - constexpr char path[] = "\xC0\xAF\xC0\xFA\xC0\xCE\xC5\xCD\xC6\xE4\xC0\xCC\xBD\xBA\\colorchip.bmp"; + constexpr char path[] = "유저인터페이스\\colorchip.bmp"; auto* chip = static_cast(resources.Load(path)); const int x = column * 4 + 2; const int y = row * 4 + 2; @@ -233,7 +233,7 @@ void UIComboBoxEx::Paint() { auto& resources = this->m_listContext->resources; this->geometry.surface->Fill(nullptr, Palette(resources, 6, 6)); this->FillRegion(1, 1, (this->geometry.width - 2), (this->geometry.height - 2), Palette(resources, 2, 2)); - constexpr char prefix[] = "\xC0\xAF\xC0\xFA\xC0\xCE\xC5\xCD\xC6\xE4\xC0\xCC\xBD\xBA\\basic_interface\\"; + constexpr char prefix[] = "유저인터페이스\\basic_interface\\"; const char* names[] = {"sysboxs_lu.bmp", "sysboxs_ld.bmp", "sysboxs_ru.bmp", "sysboxs_rd.bmp"}; for (int corner = 0; corner < 4; ++corner) { diff --git a/Source/UI/Lists/UIListBox.cpp b/Source/UI/Lists/UIListBox.cpp index 615259a..99f3afc 100644 --- a/Source/UI/Lists/UIListBox.cpp +++ b/Source/UI/Lists/UIListBox.cpp @@ -18,7 +18,7 @@ UIListBox::UIListBox(UIWindowContext& windows, UIListBoxContext& list) : UIWindow(windows, 0), backgroundRed(255), backgroundGreen(255), backgroundBlue(255), selected(0), topLine(0), horizontalOffset(0), contentWidth(0), verticalOverflow(0), bottomMargin(0), verticalBar(nullptr), horizontalBar(nullptr), transparent(0), lineHeight(16), selectable(1), textColor(0), centerVertically(0), textInset(3), m_listContext(&list) { - constexpr char path[] = "\xC0\xAF\xC0\xFA\xC0\xCE\xC5\xCD\xC6\xE4\xC0\xCC\xBD\xBA\\colorchip.bmp"; + constexpr char path[] = "유저인터페이스\\colorchip.bmp"; const auto* chip = static_cast(list.resources.Load(path)); this->selectionColor = 0; diff --git a/Source/UI/Lists/UIListBoxEx.cpp b/Source/UI/Lists/UIListBoxEx.cpp index 89b8173..7846483 100644 --- a/Source/UI/Lists/UIListBoxEx.cpp +++ b/Source/UI/Lists/UIListBoxEx.cpp @@ -14,7 +14,7 @@ UIListBoxEx::UIListBoxEx(UIWindowContext& windows, UIListBoxContext& list) : UIWindow(windows, 0), backgroundRed(255), backgroundGreen(255), backgroundBlue(255), selected(0), topLine(0), horizontalOffset(0), contentWidth(0), verticalOverflow(0), bottomMargin(0), verticalBar(nullptr), horizontalBar(nullptr), transparent(0), lineHeight(16), selectionColor(0), m_listContext(&list) { - constexpr char path[] = "\xC0\xAF\xC0\xFA\xC0\xCE\xC5\xCD\xC6\xE4\xC0\xCC\xBD\xBA\\colorchip.bmp"; + constexpr char path[] = "유저인터페이스\\colorchip.bmp"; const auto* chip = static_cast(list.resources.Load(path)); if (chip) { diff --git a/Source/UI/Lists/UIScrollBar.cpp b/Source/UI/Lists/UIScrollBar.cpp index b7b1264..7bccf21 100644 --- a/Source/UI/Lists/UIScrollBar.cpp +++ b/Source/UI/Lists/UIScrollBar.cpp @@ -248,7 +248,7 @@ void UIScrollBar::Paint() { return; } - constexpr char prefix[] = "\xC0\xAF\xC0\xFA\xC0\xCE\xC5\xCD\xC6\xE4\xC0\xCC\xBD\xBA\\"; + constexpr char prefix[] = "유저인터페이스\\"; const bool vertical = this->vertical == 1; const int length = vertical ? this->geometry.height : this->geometry.width; const auto draw = [&](const char* name, int coordinate, bool transparent) { diff --git a/Source/UI/Lists/UIScrollBarNavi.cpp b/Source/UI/Lists/UIScrollBarNavi.cpp index 420381e..885e0d9 100644 --- a/Source/UI/Lists/UIScrollBarNavi.cpp +++ b/Source/UI/Lists/UIScrollBarNavi.cpp @@ -23,7 +23,7 @@ void UIScrollBar_Navi::Paint() { } if (this->vertical == 1) { - constexpr char prefix[] = "\xC0\xAF\xC0\xFA\xC0\xCE\xC5\xCD\xC6\xE4\xC0\xCC\xBD\xBA\\navigation_interface3\\"; + constexpr char prefix[] = "유저인터페이스\\navigation_interface3\\"; const auto load = [&](const char* name) { return static_cast(this->m_resources->Load((std::string(prefix) + name).c_str())); }; const auto draw = [&](CBitmapRes* image, int y, bool transparent) { this->DrawBitmap(0, y, image ? &image->image : nullptr, transparent); }; auto* up = load("Navi_scroll_up.bmp"); diff --git a/Source/UI/Party/UIAdvenPartyBoardWnd.cpp b/Source/UI/Party/UIAdvenPartyBoardWnd.cpp index f2bea6d..bac60a9 100644 --- a/Source/UI/Party/UIAdvenPartyBoardWnd.cpp +++ b/Source/UI/Party/UIAdvenPartyBoardWnd.cpp @@ -24,7 +24,7 @@ #include namespace { - constexpr char prefix[] = "\xC0\xAF\xC0\xFA\xC0\xCE\xC5\xCD\xC6\xE4\xC0\xCC\xBD\xBA\\UIadventurerAgency\\"; + constexpr char prefix[] = "유저인터페이스\\UIadventurerAgency\\"; } // OFFSET: 0x007BAC40 @@ -221,7 +221,7 @@ void UIAdvenPartyBoardWnd::Slot15(int, int) { this->stop->Enable(0); auto* titleClose = new UIBitmapButton(*this->m_context, controls); - const std::string basic = std::string("\xC0\xAF\xC0\xFA\xC0\xCE\xC5\xCD\xC6\xE4\xC0\xCC\xBD\xBA\\basic_interface\\"); + const std::string basic = std::string("유저인터페이스\\basic_interface\\"); titleClose->SetBitmap((basic + "sys_close_off.bmp").c_str(), 0, 0); titleClose->SetBitmap((basic + "sys_close_on.bmp").c_str(), 1, 0); titleClose->SetBitmap((basic + "sys_close_on.bmp").c_str(), 2, 0); @@ -561,7 +561,7 @@ void UIAdvenPartyBoardWnd::Paint() { const auto load = [&](const char* path) { return static_cast(controls.resources.Load(path)); }; auto* background = load((std::string(prefix) + "bg_agencyList.bmp").c_str()); this->DrawBitmap(0, 0, background ? &background->image : nullptr, false); - constexpr char basic[] = "\xC0\xAF\xC0\xFA\xC0\xCE\xC5\xCD\xC6\xE4\xC0\xCC\xBD\xBA\\basic_interface\\"; + constexpr char basic[] = "유저인터페이스\\basic_interface\\"; const auto skin = [&](const char* name) { return load((std::string(basic) + name).c_str()); }; int left = 0; int right = 0; diff --git a/Source/UI/Party/UIApplyForPartyWnd.cpp b/Source/UI/Party/UIApplyForPartyWnd.cpp index 40e7c34..8f74d02 100644 --- a/Source/UI/Party/UIApplyForPartyWnd.cpp +++ b/Source/UI/Party/UIApplyForPartyWnd.cpp @@ -16,7 +16,7 @@ #include namespace { - constexpr char prefix[] = "\xC0\xAF\xC0\xFA\xC0\xCE\xC5\xCD\xC6\xE4\xC0\xCC\xBD\xBA\\"; + constexpr char prefix[] = "유저인터페이스\\"; } // OFFSET: 0x007BAD00 diff --git a/Source/UI/Party/UIPartyInfoWnd.cpp b/Source/UI/Party/UIPartyInfoWnd.cpp index 6ec0c9b..2a2556c 100644 --- a/Source/UI/Party/UIPartyInfoWnd.cpp +++ b/Source/UI/Party/UIPartyInfoWnd.cpp @@ -85,7 +85,7 @@ void UIPartyInfoWnd::Paint() { const auto text = [&](int x, const char* value, int bytes = 0) { this->DrawTextAt(controls.fonts, controls.locale, x, 5, value, bytes, 0, 12, 0, 0, 0); }; text(11, this->levels.c_str()); text(64, TypeName(this->type, controls.services)); - constexpr char prefix[] = "\xC0\xAF\xC0\xFA\xC0\xCE\xC5\xCD\xC6\xE4\xC0\xCC\xBD\xBA\\UIadventurerAgency\\"; + constexpr char prefix[] = "유저인터페이스\\UIadventurerAgency\\"; const char* jobs[] = {"def", "heal", "atk", "buf"}; const bool flags[] = {this->info.tanker, this->info.healer, this->info.dealer, this->info.assist}; diff --git a/Source/UI/Party/UIRegisterPartyWnd.cpp b/Source/UI/Party/UIRegisterPartyWnd.cpp index 4e2fe40..1fb9236 100644 --- a/Source/UI/Party/UIRegisterPartyWnd.cpp +++ b/Source/UI/Party/UIRegisterPartyWnd.cpp @@ -26,7 +26,7 @@ #include namespace { - constexpr char prefix[] = "\xC0\xAF\xC0\xFA\xC0\xCE\xC5\xCD\xC6\xE4\xC0\xCC\xBD\xBA\\"; + constexpr char prefix[] = "유저인터페이스\\"; // OFFSET: 0x007BBFC0 // FUNCTION: fn_09295 diff --git a/Source/UI/Party/UIRequestJoinPartyWnd.cpp b/Source/UI/Party/UIRequestJoinPartyWnd.cpp index d8b17b9..3a31dc8 100644 --- a/Source/UI/Party/UIRequestJoinPartyWnd.cpp +++ b/Source/UI/Party/UIRequestJoinPartyWnd.cpp @@ -16,7 +16,7 @@ #include namespace { - constexpr char prefix[] = "\xC0\xAF\xC0\xFA\xC0\xCE\xC5\xCD\xC6\xE4\xC0\xCC\xBD\xBA\\"; + constexpr char prefix[] = "유저인터페이스\\"; } // OFFSET: 0x007BB030 diff --git a/Source/UI/Shortcuts/ShortcutControls.cpp b/Source/UI/Shortcuts/ShortcutControls.cpp index edeacaa..76f0e03 100644 --- a/Source/UI/Shortcuts/ShortcutControls.cpp +++ b/Source/UI/Shortcuts/ShortcutControls.cpp @@ -5,7 +5,7 @@ #include -#define SHORTCUT_RESOURCE "\xC0\xAF\xC0\xFA\xC0\xCE\xC5\xCD\xC6\xE4\xC0\xCC\xBD\xBA" +#define SHORTCUT_RESOURCE "유저인터페이스" // OFFSET: 0x0092A190 // FUNCTION: fn_12654 @@ -22,8 +22,8 @@ ShortcutControls ShortcutControls::Create( result.bank = new (std::nothrow) UICheckBox(windows, buttons); result.bank->SetSize(10, 26); result.bank->SetImages( - "\xC0\xAF\xC0\xFA\xC0\xCE\xC5\xCD\xC6\xE4\xC0\xCC\xBD\xBA\\shortcut_2_bts.bmp", - "\xC0\xAF\xC0\xFA\xC0\xCE\xC5\xCD\xC6\xE4\xC0\xCC\xBD\xBA\\shortcut_1_bts.bmp", "" + "유저인터페이스\\shortcut_2_bts.bmp", + "유저인터페이스\\shortcut_1_bts.bmp", "" ); result.bank->SetId(549); result.bank->Move(3, 4); diff --git a/Source/UI/Shortcuts/ShortcutPainting.cpp b/Source/UI/Shortcuts/ShortcutPainting.cpp index 86870b4..2b9c26e 100644 --- a/Source/UI/Shortcuts/ShortcutPainting.cpp +++ b/Source/UI/Shortcuts/ShortcutPainting.cpp @@ -9,7 +9,7 @@ #include namespace { - constexpr char prefix[] = "\xC0\xAF\xC0\xFA\xC0\xCE\xC5\xCD\xC6\xE4\xC0\xCC\xBD\xBA"; + constexpr char prefix[] = "유저인터페이스"; // INLINED CBitmapRes* Load(ResourceMgr& resources, const char* tail) { diff --git a/Source/UI/Text/UITextViewer.cpp b/Source/UI/Text/UITextViewer.cpp index becefdb..053f93e 100644 --- a/Source/UI/Text/UITextViewer.cpp +++ b/Source/UI/Text/UITextViewer.cpp @@ -56,7 +56,7 @@ namespace { UITextViewer::UITextViewer(UIWindowContext& windows, UITextViewerContext& text) : UIListBox(windows, text.list), splitTipLinks(0), outline(0), bold(0), m_text(&text) { this->lineHeight = 18; - constexpr char path[] = "\xC0\xAF\xC0\xFA\xC0\xCE\xC5\xCD\xC6\xE4\xC0\xCC\xBD\xBA\\colorchip.bmp"; + constexpr char path[] = "유저인터페이스\\colorchip.bmp"; const auto* chip = static_cast(text.list.resources.Load(path)); const auto& image = chip->image; const std::uint32_t pixel = image.width > 18 && image.height > 2 ? image.pixels[18 + 2 * image.width] : 0x00FF0000u; diff --git a/Source/UI/Window/UIFrameWnd.cpp b/Source/UI/Window/UIFrameWnd.cpp index b4d0f88..aff5cfc 100644 --- a/Source/UI/Window/UIFrameWnd.cpp +++ b/Source/UI/Window/UIFrameWnd.cpp @@ -189,9 +189,9 @@ UIBitmapButton* UIFrameWnd::AddCloseButton(UIButtonContext& controls, const char } UIBitmapButton* button = new UIBitmapButton(*this->m_context, controls); - button->SetBitmap("\xC0\xAF\xC0\xFA\xC0\xCE\xC5\xCD\xC6\xE4\xC0\xCC\xBD\xBA\\basic_interface\\sys_close_off.bmp", 0, 0); - button->SetBitmap("\xC0\xAF\xC0\xFA\xC0\xCE\xC5\xCD\xC6\xE4\xC0\xCC\xBD\xBA\\basic_interface\\sys_close_on.bmp", 1, 0); - button->SetBitmap("\xC0\xAF\xC0\xFA\xC0\xCE\xC5\xCD\xC6\xE4\xC0\xCC\xBD\xBA\\basic_interface\\sys_close_on.bmp", 2, 0); + button->SetBitmap("유저인터페이스\\basic_interface\\sys_close_off.bmp", 0, 0); + button->SetBitmap("유저인터페이스\\basic_interface\\sys_close_on.bmp", 1, 0); + button->SetBitmap("유저인터페이스\\basic_interface\\sys_close_on.bmp", 2, 0); button->SetSize(button->BitmapWidth(), button->BitmapHeight()); button->Move(width - 14, 3); button->SetId(201); diff --git a/Source/UI/Window/UIMessageBox.cpp b/Source/UI/Window/UIMessageBox.cpp index 112cedb..0f75d27 100644 --- a/Source/UI/Window/UIMessageBox.cpp +++ b/Source/UI/Window/UIMessageBox.cpp @@ -15,7 +15,7 @@ #include namespace { - constexpr char prefix[] = "\xC0\xAF\xC0\xFA\xC0\xCE\xC5\xCD\xC6\xE4\xC0\xCC\xBD\xBA\\"; + constexpr char prefix[] = "유저인터페이스\\"; std::uint32_t Palette(ResourceMgr& resources, int x, int y) { const auto* resource = static_cast(resources.Load((std::string(prefix) + "colorchip.bmp").c_str())); diff --git a/Source/Utility/Math/ScalarConversion.h b/Source/Utility/Math/ScalarConversion.h index a5d474c..75a6273 100644 --- a/Source/Utility/Math/ScalarConversion.h +++ b/Source/Utility/Math/ScalarConversion.h @@ -3,6 +3,7 @@ #include +// INLINED inline int TruncateToInt(double value) { return value > -2147483649.0 && value < 2147483648.0 ? static_cast(value) : std::numeric_limits::min(); } diff --git a/compile.json b/compile.json index 2dd2226..8ec9252 100644 --- a/compile.json +++ b/compile.json @@ -20,6 +20,8 @@ "-std:c++20", "-MD", "/FS", + "/source-charset:utf-8", + "/execution-charset:.949", "-c" ], [ @@ -40,6 +42,8 @@ "-std:c++20", "-MD", "/FS", + "/source-charset:utf-8", + "/execution-charset:.949", "-c" ], [ @@ -64,6 +68,8 @@ "-std:c++20", "-MD", "/FS", + "/source-charset:utf-8", + "/execution-charset:.949", "-c" ], [ @@ -85,6 +91,8 @@ "-std:c++20", "-MD", "/FS", + "/source-charset:utf-8", + "/execution-charset:.949", "-c" ], [ @@ -109,6 +117,8 @@ "-std:c++20", "-MD", "/FS", + "/source-charset:utf-8", + "/execution-charset:.949", "-c" ], [ @@ -128,6 +138,8 @@ "-std:c++20", "-MD", "/FS", + "/source-charset:utf-8", + "/execution-charset:.949", "-c" ], [ @@ -141,6 +153,8 @@ "/DNDEBUG", "-MD", "/FS", + "/source-charset:utf-8", + "/execution-charset:.949", "-c" ], [ @@ -156,6 +170,8 @@ "/DNDEBUG", "-MD", "/FS", + "/source-charset:utf-8", + "/execution-charset:.949", "-c" ], [ @@ -175,6 +191,8 @@ "-std:c++20", "-MD", "/FS", + "/source-charset:utf-8", + "/execution-charset:.949", "-c" ], [ @@ -188,6 +206,8 @@ "/DNDEBUG", "-MD", "/FS", + "/source-charset:utf-8", + "/execution-charset:.949", "-c" ] ],