diff --git a/src/CommonItemSet.cc b/src/CommonItemSet.cc index 21cc74c7..b8618f99 100644 --- a/src/CommonItemSet.cc +++ b/src/CommonItemSet.cc @@ -134,67 +134,57 @@ CommonItemSet::Table::Table(std::shared_ptr prev_table, const phosg parse_field("UnitMaxStarsTable", this->unit_max_stars_table, prev_table ? &prev_table->unit_max_stars_table : nullptr); parse_field("BoxItemClassProbTable", this->box_item_class_prob_table, prev_table ? &prev_table->box_item_class_prob_table : nullptr); - const auto* enemy_meseta_ranges_json = json.count("EnemyMesetaRanges") ? &json.at("EnemyMesetaRanges").as_dict() : nullptr; - const auto* enemy_type_drop_probs_json = json.count("EnemyTypeDropProbs") ? &json.at("EnemyTypeDropProbs").as_dict() : nullptr; - const auto* enemy_item_classes_json = json.count("EnemyItemClasses") ? &json.at("EnemyItemClasses").as_dict() : nullptr; - if (enemy_item_classes_json) { - // Unspecified is 0xFF, not 0, unlike the other enemy-indexed arrays (except for [0], apparently... sigh) - this->enemy_item_classes[0] = 0; - this->enemy_item_classes.clear_after(1, 0xFF); + if (json.count("EnemyMesetaRanges")) { + const auto& dict = json.at("EnemyMesetaRanges").as_dict(); + for (auto enemy_type : phosg::EnumRange()) { + try { + from_json_into(*dict.at(phosg::name_for_enum(enemy_type)), this->enemy_type_meseta_ranges[enemy_type]); + } catch (const out_of_range&) { + } + } + } else { + this->enemy_type_meseta_ranges = prev_table->enemy_type_meseta_ranges; } - for (size_t z = 0; z < NUM_RT_INDEXES_V4; z++) { - auto types = enemy_types_for_rare_table_index(this->episode, z); - vector names; - if (types.empty()) { - names.emplace_back(std::format("!{:02X}", z)); - } else { - for (auto type : types) { - names.emplace_back(phosg::name_for_enum(type)); + + if (json.count("EnemyTypeDropProbs")) { + const auto& dict = json.at("EnemyTypeDropProbs").as_dict(); + for (auto enemy_type : phosg::EnumRange()) { + try { + this->enemy_type_drop_probs[enemy_type] = dict.at(phosg::name_for_enum(enemy_type))->as_int(); + } catch (const out_of_range&) { } } - for (const auto& name : names) { - if (enemy_meseta_ranges_json) { - try { - from_json_into(*enemy_meseta_ranges_json->at(name), this->enemy_meseta_ranges[z]); - } catch (const out_of_range&) { - } - } else if (prev_table) { - this->enemy_meseta_ranges = prev_table->enemy_meseta_ranges; - } - if (enemy_type_drop_probs_json) { - try { - this->enemy_type_drop_probs[z] = enemy_type_drop_probs_json->at(name)->as_int(); - } catch (const out_of_range&) { - } - } else if (prev_table) { - this->enemy_type_drop_probs = prev_table->enemy_type_drop_probs; - } - if (enemy_item_classes_json) { - try { - this->enemy_item_classes[z] = enemy_item_classes_json->at(name)->as_int(); - } catch (const out_of_range&) { - } - } else if (prev_table) { - this->enemy_item_classes = prev_table->enemy_item_classes; + } else { + this->enemy_type_drop_probs = prev_table->enemy_type_drop_probs; + } + + if (json.count("EnemyItemClasses")) { + const auto& dict = json.at("EnemyItemClasses").as_dict(); + for (auto enemy_type : phosg::EnumRange()) { + try { + this->enemy_type_item_classes[enemy_type] = dict.at(phosg::name_for_enum(enemy_type))->as_int(); + } catch (const out_of_range&) { } } + } else { + this->enemy_type_item_classes = prev_table->enemy_type_item_classes; } } static const char* name_for_common_item_class(uint8_t item_class) { switch (item_class) { case 0x00: - return "WEAPON "; + return "WEAPON"; case 0x01: - return "ARMOR "; + return "ARMOR"; case 0x02: - return "SHIELD "; + return "SHIELD"; case 0x03: - return "UNIT "; + return "UNIT"; case 0x04: - return "TOOL "; + return "TOOL"; case 0x05: - return "MESETA "; + return "MESETA"; case 0x06: return "NOTHING"; default: @@ -203,42 +193,29 @@ static const char* name_for_common_item_class(uint8_t item_class) { } void CommonItemSet::Table::print(FILE* stream) const { - const auto& meseta_ranges = this->enemy_meseta_ranges; + const auto& meseta_ranges = this->enemy_type_meseta_ranges; const auto& drop_probs = this->enemy_type_drop_probs; - const auto& item_classes = this->enemy_item_classes; + const auto& item_classes = this->enemy_type_item_classes; phosg::fwrite_fmt(stream, "Enemy tables:\n"); - phosg::fwrite_fmt(stream, " ## $LOW $HIGH DAR% ITEM ENEMIES\n"); - for (size_t z = 0; z < NUM_RT_INDEXES_V4; z++) { - string enemies_str; - for (EnemyType enemy_type : enemy_types_for_rare_table_index(this->episode, z)) { - if (!enemies_str.empty()) { - enemies_str += ", "; - } - enemies_str += phosg::name_for_enum(enemy_type); - } - if (drop_probs[z] || !enemies_str.empty()) { - phosg::fwrite_fmt(stream, " {:02X} {:5} {:5} {:3}% {:02X}:{} {}\n", - z, meseta_ranges[z].min, meseta_ranges[z].max, drop_probs[z], item_classes[z], - name_for_common_item_class(item_classes[z]), enemies_str); - } else { - phosg::fwrite_fmt(stream, " {:02X} ----- ----- 0% --\n", z); + phosg::fwrite_fmt(stream, " ##:ENEMY $LOW $HIGH DAR% ITEM\n"); + for (auto enemy_type : phosg::EnumRange()) { + const auto& def = type_definition_for_enemy(enemy_type); + try { + const auto& meseta_range = meseta_ranges.at(enemy_type); + const auto& drop_prob = drop_probs.at(enemy_type); + const auto& item_class = item_classes.at(enemy_type); + phosg::fwrite_fmt(stream, " {:02X}:{:<23} {:5} {:5} {:3}% {:02X}:{:<7}\n", + def.rt_index, phosg::name_for_enum(enemy_type), + meseta_range.min, meseta_range.max, drop_prob, item_class, + name_for_common_item_class(item_class)); + } catch (const out_of_range&) { + phosg::fwrite_fmt(stream, " {:02X}:{:<23} ----- ----- ---- --:-------\n", + def.rt_index, phosg::name_for_enum(enemy_type)); } } static const array base_weapon_type_names = { - "SABER ", - "SWORD ", - "DAGGER ", - "PARTISAN", - "SLICER ", - "HANDGUN ", - "RIFLE ", - "MECHGUN ", - "SHOT ", - "CANE ", - "ROD ", - "WAND ", - }; + "SABER", "SWORD", "DAGGER", "PARTISAN", "SLICER", "HANDGUN", "RIFLE", "MECHGUN", "SHOT", "CANE", "ROD", "WAND"}; phosg::fwrite_fmt(stream, "Base weapon config:\n"); phosg::fwrite_fmt(stream, " TYPE PROB [SB AL] FLOORS\n"); for (size_t z = 0; z < 12; z++) { @@ -256,7 +233,7 @@ void CommonItemSet::Table::print(FILE* stream) const { floor_to_class[x] = this->subtype_base_table[z] + (x / this->subtype_area_length_table[z]); } } - phosg::fwrite_fmt(stream, " {:02X}:{} {:3}% [{:02X} {:02X}] {:02X} {:02X} {:02X} {:02X} {:02X} {:02X} {:02X} {:02X} {:02X} {:02X}\n", + phosg::fwrite_fmt(stream, " {:02X}:{:<8} {:3}% [{:02X} {:02X}] {:02X} {:02X} {:02X} {:02X} {:02X} {:02X} {:02X} {:02X} {:02X} {:02X}\n", z, base_weapon_type_names[z], this->base_weapon_type_prob_table[z], this->subtype_base_table[z], this->subtype_area_length_table[z], floor_to_class[0], floor_to_class[1], floor_to_class[2], floor_to_class[3], floor_to_class[4], @@ -413,20 +390,50 @@ void CommonItemSet::Table::print_diff(FILE* stream, const Table& other) const { phosg::format_data_string(&this->armor_slot_count_prob_table, sizeof(this->armor_slot_count_prob_table)), phosg::format_data_string(&other.armor_slot_count_prob_table, sizeof(other.armor_slot_count_prob_table))); } - if (this->enemy_meseta_ranges != other.enemy_meseta_ranges) { - phosg::fwrite_fmt(stream, "> enemy_meseta_ranges: {} -> {}\n", - phosg::format_data_string(&this->enemy_meseta_ranges, sizeof(this->enemy_meseta_ranges)), - phosg::format_data_string(&other.enemy_meseta_ranges, sizeof(other.enemy_meseta_ranges))); + + auto format_enemy_range_table = [&](const std::unordered_map>& table) -> std::string { + string ret = ""; + for (auto enemy_type : phosg::EnumRange()) { + try { + const auto& range = table.at(enemy_type); + if (!ret.empty()) { + ret += ","; + } + ret += std::format("{}=[{},{}]", phosg::name_for_enum(enemy_type), range.min, range.max); + } catch (const out_of_range&) { + } + } + return ret; + }; + auto format_enemy_u8_table = [&](const std::unordered_map& table) -> std::string { + string ret = ""; + for (auto enemy_type : phosg::EnumRange()) { + try { + uint8_t value = table.at(enemy_type); + if (!ret.empty()) { + ret += ","; + } + ret += std::format("{}={}", phosg::name_for_enum(enemy_type), value); + } catch (const out_of_range&) { + } + } + return ret; + }; + + if (this->enemy_type_meseta_ranges != other.enemy_type_meseta_ranges) { + phosg::fwrite_fmt(stream, "> enemy_type_meseta_ranges: {} -> {}\n", + format_enemy_range_table(this->enemy_type_meseta_ranges), + format_enemy_range_table(other.enemy_type_meseta_ranges)); } if (this->enemy_type_drop_probs != other.enemy_type_drop_probs) { phosg::fwrite_fmt(stream, "> enemy_type_drop_probs: {} -> {}\n", - phosg::format_data_string(&this->enemy_type_drop_probs, sizeof(this->enemy_type_drop_probs)), - phosg::format_data_string(&other.enemy_type_drop_probs, sizeof(other.enemy_type_drop_probs))); + format_enemy_u8_table(this->enemy_type_drop_probs), + format_enemy_u8_table(other.enemy_type_drop_probs)); } - if (this->enemy_item_classes != other.enemy_item_classes) { - phosg::fwrite_fmt(stream, "> enemy_item_classes: {} -> {}\n", - phosg::format_data_string(&this->enemy_item_classes, sizeof(this->enemy_item_classes)), - phosg::format_data_string(&other.enemy_item_classes, sizeof(other.enemy_item_classes))); + if (this->enemy_type_item_classes != other.enemy_type_item_classes) { + phosg::fwrite_fmt(stream, "> enemy_type_item_classes: {} -> {}\n", + format_enemy_u8_table(this->enemy_type_item_classes), + format_enemy_u8_table(other.enemy_type_item_classes)); } if (this->box_meseta_ranges != other.box_meseta_ranges) { phosg::fwrite_fmt(stream, "> box_meseta_ranges: {} -> {}\n", @@ -517,44 +524,45 @@ phosg::JSON CommonItemSet::Table::json(std::shared_ptr prev_table) ret.emplace("ArmorSlotCountProbTable", to_json(this->armor_slot_count_prob_table)); } - bool needs_enemy_meseta_ranges = (!prev_table || (this->enemy_meseta_ranges != prev_table->enemy_meseta_ranges)); - bool needs_enemy_type_drop_probs = (!prev_table || (this->enemy_type_drop_probs != prev_table->enemy_type_drop_probs)); - bool needs_enemy_item_classes = (!prev_table || (this->enemy_item_classes != prev_table->enemy_item_classes)); - if (needs_enemy_meseta_ranges || needs_enemy_type_drop_probs || needs_enemy_item_classes) { - phosg::JSON enemy_meseta_ranges_json = phosg::JSON::dict(); + bool needs_enemy_type_meseta_ranges = (!prev_table || + (this->enemy_type_meseta_ranges != prev_table->enemy_type_meseta_ranges)); + bool needs_enemy_type_drop_probs = (!prev_table || + (this->enemy_type_drop_probs != prev_table->enemy_type_drop_probs)); + bool needs_enemy_type_item_classes = (!prev_table || + (this->enemy_type_item_classes != prev_table->enemy_type_item_classes)); + if (needs_enemy_type_meseta_ranges || needs_enemy_type_drop_probs || needs_enemy_type_item_classes) { + phosg::JSON enemy_type_meseta_ranges_json = phosg::JSON::dict(); phosg::JSON enemy_type_drop_probs_json = phosg::JSON::dict(); - phosg::JSON enemy_item_classes_json = phosg::JSON::dict(); - for (size_t z = 0; z < NUM_RT_INDEXES_V4; z++) { - auto types = enemy_types_for_rare_table_index(this->episode, z); - vector names; - if (types.empty()) { - names.emplace_back(std::format("!{:02X}", z)); - } else { - for (auto type : types) { - names.emplace_back(phosg::name_for_enum(type)); + phosg::JSON enemy_type_item_classes_json = phosg::JSON::dict(); + for (auto enemy_type : phosg::EnumRange()) { + auto name = phosg::name_for_enum(enemy_type); + if (needs_enemy_type_meseta_ranges) { + try { + enemy_type_meseta_ranges_json.emplace(name, to_json(this->enemy_type_meseta_ranges.at(enemy_type))); + } catch (const std::out_of_range&) { } } - for (const auto& name : names) { - if (needs_enemy_meseta_ranges && (!types.empty() || !this->enemy_meseta_ranges[z].empty())) { - enemy_meseta_ranges_json.emplace(name, to_json(this->enemy_meseta_ranges[z])); + if (needs_enemy_type_drop_probs) { + try { + enemy_type_drop_probs_json.emplace(name, this->enemy_type_drop_probs.at(enemy_type)); + } catch (const std::out_of_range&) { } - if (needs_enemy_type_drop_probs && (!types.empty() || this->enemy_type_drop_probs[z])) { - enemy_type_drop_probs_json.emplace(name, this->enemy_type_drop_probs[z]); - } - if (needs_enemy_item_classes && (!types.empty() || (this->enemy_item_classes[z] != ((z == 0) ? 0x00 : 0xFF)))) { - enemy_item_classes_json.emplace(name, this->enemy_item_classes[z]); + } + if (needs_enemy_type_item_classes) { + try { + enemy_type_item_classes_json.emplace(name, this->enemy_type_item_classes.at(enemy_type)); + } catch (const std::out_of_range&) { } } } - - if (needs_enemy_meseta_ranges) { - ret.emplace("EnemyMesetaRanges", std::move(enemy_meseta_ranges_json)); + if (needs_enemy_type_meseta_ranges) { + ret.emplace("EnemyMesetaRanges", std::move(enemy_type_meseta_ranges_json)); } if (needs_enemy_type_drop_probs) { ret.emplace("EnemyTypeDropProbs", std::move(enemy_type_drop_probs_json)); } - if (needs_enemy_item_classes) { - ret.emplace("EnemyItemClasses", std::move(enemy_item_classes_json)); + if (needs_enemy_type_item_classes) { + ret.emplace("EnemyItemClasses", std::move(enemy_type_item_classes_json)); } } @@ -705,13 +713,27 @@ void CommonItemSet::Table::parse_itempt_t(const phosg::StringReader& r, bool is_ this->grind_prob_table = r.pget, 9>>(offsets.grind_prob_table_offset); this->armor_shield_type_index_prob_table = r.pget>(offsets.armor_shield_type_index_prob_table_offset); this->armor_slot_count_prob_table = r.pget>(offsets.armor_slot_count_prob_table_offset); - const auto& data = r.pget>, NUM_RT_INDEXES_V3>>(offsets.enemy_meseta_ranges_offset); - for (size_t z = 0; z < data.size(); z++) { - this->enemy_meseta_ranges[z] = Range{data[z].min, data[z].max}; + const auto& enemy_rt_index_meseta_ranges = r.pget>, NUM_RT_INDEXES_V3>>( + offsets.enemy_rt_index_meseta_ranges_offset); + const auto& enemy_rt_index_drop_probs = r.pget>( + offsets.enemy_rt_index_drop_probs_offset); + const auto& enemy_rt_index_item_classes = r.pget>( + offsets.enemy_rt_index_item_classes_offset); + for (auto enemy_type : phosg::EnumRange()) { + const auto& def = type_definition_for_enemy(enemy_type); + if (def.valid_in_episode(this->episode) && (def.rt_index < enemy_rt_index_meseta_ranges.size())) { + const auto& meseta_range = enemy_rt_index_meseta_ranges[def.rt_index]; + if (meseta_range.max > 0) { + this->enemy_type_meseta_ranges.emplace(enemy_type, Range{meseta_range.min, meseta_range.max}); + } + if (enemy_rt_index_drop_probs[def.rt_index] > 0) { + this->enemy_type_drop_probs.emplace(enemy_type, enemy_rt_index_drop_probs[def.rt_index]); + } + if (enemy_rt_index_item_classes[def.rt_index] != 0xFF) { + this->enemy_type_item_classes.emplace(enemy_type, enemy_rt_index_item_classes[def.rt_index]); + } + } } - this->enemy_type_drop_probs = r.pget>(offsets.enemy_type_drop_probs_offset); - this->enemy_item_classes = r.pget>(offsets.enemy_item_classes_offset); - this->enemy_item_classes.clear_after(NUM_RT_INDEXES_V3, 0xFF); { const auto& data = r.pget>, 0x0A>>(offsets.box_meseta_ranges_offset); for (size_t z = 0; z < data.size(); z++) { @@ -873,7 +895,7 @@ GSLV3V4CommonItemSet::GSLV3V4CommonItemSet(std::shared_ptr gs section_id); }; - for (Episode episode : ALL_EPISODES_V4) { + for (Episode episode : ALL_EPISODES_V3) { for (Difficulty difficulty : ALL_DIFFICULTIES_V234) { for (size_t section_id = 0; section_id < 10; section_id++) { phosg::StringReader r; @@ -898,17 +920,15 @@ GSLV3V4CommonItemSet::GSLV3V4CommonItemSet(std::shared_ptr gs } } - if (episode != Episode::EP4) { - for (Difficulty difficulty : ALL_DIFFICULTIES_V234) { - try { - auto r = gsl.get_reader(filename_for_table(episode, difficulty, 0, true)); - auto table = make_shared(r, is_big_endian, true, episode); - for (size_t section_id = 0; section_id < 10; section_id++) { - this->tables.emplace(this->key_for_table(episode, GameMode::CHALLENGE, difficulty, section_id), table); - } - } catch (const out_of_range&) { - // GC NTE doesn't have Ep2 challenge; just skip adding the table + for (Difficulty difficulty : ALL_DIFFICULTIES_V234) { + try { + auto r = gsl.get_reader(filename_for_table(episode, difficulty, 0, true)); + auto table = make_shared
(r, is_big_endian, true, episode); + for (size_t section_id = 0; section_id < 10; section_id++) { + this->tables.emplace(this->key_for_table(episode, GameMode::CHALLENGE, difficulty, section_id), table); } + } catch (const out_of_range&) { + // GC NTE doesn't have Ep2 challenge; just skip adding the table } } } diff --git a/src/CommonItemSet.hh b/src/CommonItemSet.hh index b160e82d..85a4fe82 100644 --- a/src/CommonItemSet.hh +++ b/src/CommonItemSet.hh @@ -42,9 +42,10 @@ public: parray, 9> grind_prob_table; parray armor_shield_type_index_prob_table; parray armor_slot_count_prob_table; - parray, NUM_RT_INDEXES_V4> enemy_meseta_ranges; - parray enemy_type_drop_probs; - parray enemy_item_classes; + // Note: PSO originally uses arrays indexed by rt_index here, but we index enemies by the EnemyType enum instead + std::unordered_map> enemy_type_meseta_ranges; + std::unordered_map enemy_type_drop_probs; + std::unordered_map enemy_type_item_classes; parray, 0x0A> box_meseta_ranges; bool has_rare_bonus_value_prob_table; parray, 0x17> bonus_value_prob_table; @@ -126,17 +127,17 @@ public: // V2/V3: -> parray /* 14 */ U32T armor_slot_count_prob_table_offset; - // This array (indexed by enemy_type) specifies the range of meseta values that each enemy can drop. + // This array (indexed by rt_index) specifies the range of meseta values that each enemy can drop. // V2/V3: -> parray, NUM_RT_INDEXES_V3> - /* 18 */ U32T enemy_meseta_ranges_offset; + /* 18 */ U32T enemy_rt_index_meseta_ranges_offset; - // Each byte in this table (indexed by enemy_type) represents the percent chance that the enemy drops anything at + // Each byte in this table (indexed by rt_index) represents the percent chance that the enemy drops anything at // all. (This check is done before the rare drop check, so the chance of getting a rare item from an enemy is // essentially this probability multiplied by the rare drop rate.) // V2/V3: -> parray - /* 1C */ U32T enemy_type_drop_probs_offset; + /* 1C */ U32T enemy_rt_index_drop_probs_offset; - // Each byte in this table (indexed by enemy_type) represents the class of item that can drop. The values are: + // Each byte in this table (indexed by rt_index) represents the class of item that can drop. The values are: // 00 = weapon // 01 = armor // 02 = shield @@ -145,7 +146,7 @@ public: // 05 = meseta // Anything else = no item // V2/V3: -> parray - /* 20 */ U32T enemy_item_classes_offset; + /* 20 */ U32T enemy_rt_index_item_classes_offset; // This table (indexed by area - 1) specifies the ranges of meseta values that can drop from boxes. // V2/V3: -> parray, 0x0A> @@ -229,7 +230,7 @@ public: // This index probability table determines which type of items drop from boxes. The table is indexed as // [item_class][area - 1], with item_class as the result value (that is, in the example below, the game looks at // a single column and sums the values going down, then the chosen item class is one of the row indexes based on - // the weight values in the column.) The resulting value has the same meaning as in enemy_item_classes above. + // the weight values in the column.) The resulting value has the same meaning as in enemy_rt_index_item_classes. // For example, this array might look like the following: // [07 07 08 08 06 07 08 09 09 0A] // Chances per area of a weapon drop // [02 02 02 02 03 02 02 02 03 03] // Chances per area of an armor drop diff --git a/src/EnemyType.hh b/src/EnemyType.hh index 285d4314..1e94340f 100644 --- a/src/EnemyType.hh +++ b/src/EnemyType.hh @@ -13,6 +13,7 @@ static constexpr size_t NUM_RT_INDEXES_V3 = 0x64; static constexpr size_t NUM_RT_INDEXES_V4 = 0x70; enum class EnemyType : uint8_t { + MIN_VALUE = 0, UNKNOWN = 0, NONE, NON_ENEMY_NPC, @@ -146,7 +147,7 @@ enum class EnemyType : uint8_t { ZOL_GIBBON, ZU_CRATER, ZU_DESERT, - MAX_ENEMY_TYPE, + MAX_VALUE, }; struct EnemyTypeDefinition { diff --git a/src/ItemCreator.cc b/src/ItemCreator.cc index 6ed6c9b0..58bee51b 100644 --- a/src/ItemCreator.cc +++ b/src/ItemCreator.cc @@ -188,17 +188,23 @@ ItemCreator::DropResult ItemCreator::on_box_item_drop(uint8_t area) { } } -ItemCreator::DropResult ItemCreator::on_monster_item_drop(uint32_t enemy_type, uint8_t area) { +ItemCreator::DropResult ItemCreator::on_monster_item_drop(EnemyType enemy_type, uint8_t area) { try { - // Note: The original GC implementation uses (enemy_type > 0x58) here; we extend it to the full array size for BB - if (enemy_type >= NUM_RT_INDEXES_V4) { - this->log.warning_f("Invalid enemy type: {:X}", enemy_type); - return DropResult(); - } - this->log.info_f("Enemy type: {:X}", enemy_type); + // Note: The original implementation has a bounds check for enemy_type here, because it uses rt_index instead + // if (enemy_type >= NUM_RT_INDEXES_V4) { + // this->log.warning_f("Invalid enemy type: {:X}", enemy_type); + // return DropResult(); + // } + this->log.info_f("Enemy type: {}", phosg::name_for_enum(enemy_type)); auto pt = this->pt(area); - uint8_t type_drop_prob = pt->enemy_type_drop_probs.at(enemy_type); + uint8_t type_drop_prob = 0; + try { + type_drop_prob = pt->enemy_type_drop_probs.at(enemy_type); + } catch (const std::out_of_range&) { + this->log.info_f("No drop probability is set for this enemy type"); + return DropResult(); + } uint8_t drop_sample = this->rand_int(100); if (drop_sample >= type_drop_prob) { this->log.info_f("Drop not chosen ({} >= {})", drop_sample, type_drop_prob); @@ -212,10 +218,8 @@ ItemCreator::DropResult ItemCreator::on_monster_item_drop(uint32_t enemy_type, u if (!res.item.empty()) { res.is_from_rare_table = true; } else { - uint32_t item_class_determinant = - this->should_allow_meseta_drops() ? this->rand_int(3) : (this->rand_int(2) + 1); - - uint32_t item_class; + uint8_t item_class_determinant = this->should_allow_meseta_drops() ? this->rand_int(3) : (this->rand_int(2) + 1); + uint8_t item_class; switch (item_class_determinant) { case 0: item_class = 5; @@ -224,7 +228,12 @@ ItemCreator::DropResult ItemCreator::on_monster_item_drop(uint32_t enemy_type, u item_class = 4; break; case 2: - item_class = pt->enemy_item_classes.at(enemy_type); + try { + item_class = pt->enemy_type_item_classes.at(enemy_type); + } catch (const out_of_range&) { + this->log.info_f("Item class is not set for this enemy type"); + item_class = 0xFF; + } break; default: throw logic_error("invalid item class determinant"); @@ -251,7 +260,12 @@ ItemCreator::DropResult ItemCreator::on_monster_item_drop(uint32_t enemy_type, u break; case 5: // Meseta res.item.data1[0] = 0x04; - res.item.data2d = this->choose_meseta_amount(pt->enemy_meseta_ranges, enemy_type) & 0xFFFF; + try { + res.item.data2d = this->choose_meseta_amount(pt->enemy_type_meseta_ranges.at(enemy_type)) & 0xFFFF; + } catch (const out_of_range&) { + this->log.info_f("Meseta range is not set for this enemy type"); + return DropResult(); + } break; default: return res; @@ -305,24 +319,18 @@ float ItemCreator::rand_float_0_1_from_crypt() { return (static_cast(this->rand_crypt->next() >> 16) / 65536.0); } -template -uint32_t ItemCreator::choose_meseta_amount( - const parray, NumRanges> ranges, - size_t table_index) { - uint16_t min = ranges[table_index].min; - uint16_t max = ranges[table_index].max; - +uint32_t ItemCreator::choose_meseta_amount(const CommonItemSet::Table::Range& range) { // Note: The original code returns 0xFF here if either limit is equal to 0xFF (despite them being 16-bit integers!) uint16_t ret; - if (min == max) { - ret = min; - } else if (max < min) { - ret = this->rand_int((min - max) + 1) + max; + if (range.min == range.max) { + ret = range.min; + } else if (range.max < range.min) { + ret = this->rand_int((range.min - range.max) + 1) + range.max; } else { - ret = this->rand_int((max - min) + 1) + min; + ret = this->rand_int((range.max - range.min) + 1) + range.min; } - this->log.info_f("Chose {} Meseta from range [{}, {}]", ret, min, max); + this->log.info_f("Chose {} Meseta from range [{}, {}]", ret, range.min, range.max); return ret; } @@ -330,28 +338,32 @@ bool ItemCreator::should_allow_meseta_drops() const { return (this->mode != GameMode::CHALLENGE); } -ItemData ItemCreator::check_rare_spec_and_create_rare_enemy_item(uint32_t enemy_type, uint8_t area) { +ItemData ItemCreator::check_rare_spec_and_create_rare_enemy_item(EnemyType enemy_type, uint8_t area) { + // Note: The original implementation has a bounds check for enemy_type here, since it uses rt_index instead. + // if ((enemy_type <= 0) || (enemy_type >= NUM_RT_INDEXES_V4)) return ItemData{}; + if (!this->are_rare_drops_allowed()) { + return ItemData{}; + } + + // Note: In the original implementation, enemies can only have one possible rare drop. In our implementation, they + // can have multiple rare drops if JSONRareItemSet is used (the other RareItemSet implementations never return + // multiple drops for an enemy type). + Episode episode = episode_for_area(area); + auto rare_specs = this->rare_item_set->get_enemy_specs( + this->mode, episode, this->difficulty, this->section_id, enemy_type); ItemData item; - if (this->are_rare_drops_allowed() && (enemy_type > 0) && (enemy_type < NUM_RT_INDEXES_V4)) { - // Note: In the original implementation, enemies can only have one possible rare drop. In our implementation, they - // can have multiple rare drops if JSONRareItemSet is used (the other RareItemSet implementations never return - // multiple drops for an enemy type). - Episode episode = episode_for_area(area); - auto rare_specs = this->rare_item_set->get_enemy_specs( - this->mode, episode, this->difficulty, this->section_id, enemy_type); - for (const auto& spec : rare_specs) { - item = this->check_rate_and_create_rare_item(spec, area); - if (!item.empty()) { - if (this->log.should_log(phosg::LogLevel::L_INFO)) { - auto hex = spec.data.hex(); - this->log.info_f("Enemy spec {:08X} produced item {}", spec.probability, hex); - } - break; - } + for (const auto& spec : rare_specs) { + item = this->check_rate_and_create_rare_item(spec, area); + if (!item.empty()) { if (this->log.should_log(phosg::LogLevel::L_INFO)) { auto hex = spec.data.hex(); - this->log.info_f("Enemy spec {:08X} did not produce item {}", spec.probability, hex); + this->log.info_f("Enemy spec {:08X} produced item {}", spec.probability, hex); } + break; + } + if (this->log.should_log(phosg::LogLevel::L_INFO)) { + auto hex = spec.data.hex(); + this->log.info_f("Enemy spec {:08X} did not produce item {}", spec.probability, hex); } } return item; @@ -617,9 +629,11 @@ void ItemCreator::generate_common_item_variances(ItemData& item, uint8_t area) { case 3: this->generate_common_tool_variances(item, area); break; - case 4: - item.data2d = this->choose_meseta_amount(this->pt(area)->box_meseta_ranges, this->table_index_for_area(area)) & 0xFFFF; + case 4: { + const auto& range = this->pt(area)->box_meseta_ranges.at(this->table_index_for_area(area)); + item.data2d = this->choose_meseta_amount(range) & 0xFFFF; break; + } default: // Note: The original code does the following here: // item.clear(); diff --git a/src/ItemCreator.hh b/src/ItemCreator.hh index 034c2d05..bc621f5e 100644 --- a/src/ItemCreator.hh +++ b/src/ItemCreator.hh @@ -37,7 +37,7 @@ public: bool is_from_rare_table = false; }; - DropResult on_monster_item_drop(uint32_t enemy_type, uint8_t area); + DropResult on_monster_item_drop(EnemyType enemy_type, uint8_t area); DropResult on_box_item_drop(uint8_t area); // Note: param3-6 refer to the corresponding fields of the object definition DropResult on_specialized_box_item_drop(uint8_t area, float param3, uint32_t param4, uint32_t param5, uint32_t param6); @@ -116,12 +116,11 @@ private: uint32_t rand_int(uint64_t max); float rand_float_0_1_from_crypt(); - template - uint32_t choose_meseta_amount(const parray, NumRanges> ranges, size_t table_index); + uint32_t choose_meseta_amount(const CommonItemSet::Table::Range& range); bool should_allow_meseta_drops() const; - ItemData check_rare_spec_and_create_rare_enemy_item(uint32_t enemy_type, uint8_t area); + ItemData check_rare_spec_and_create_rare_enemy_item(EnemyType enemy_type, uint8_t area); ItemData check_rare_specs_and_create_rare_box_item(uint8_t area); ItemData check_rate_and_create_rare_item(const RareItemSet::ExpandedDrop& drop, uint8_t area); diff --git a/src/Main.cc b/src/Main.cc index 5437b267..aee51e97 100644 --- a/src/Main.cc +++ b/src/Main.cc @@ -1922,8 +1922,7 @@ Action a_extract_ppk("extract-ppk", "\ PC/BB format. For PPK archives, the --password= option is required.\n", a_extract_archive_fn); -Action a_encode_sjis( - "transcode-text", nullptr, +[](phosg::Arguments& args) { +Action a_transcode_text("transcode-text", nullptr, +[](phosg::Arguments& args) { TextTranscoder* tt_from = nullptr; { std::string from_name = args.get("from"); @@ -1963,8 +1962,7 @@ Action a_encode_sjis( if (tt_to) { data = (*tt_to)(data); } - write_output_data(args, data.data(), data.size(), "txt"); - }); + write_output_data(args, data.data(), data.size(), "txt"); }); Action a_decode_text_archive( "decode-text-archive", "\ @@ -2204,6 +2202,25 @@ Action a_download_files( io_context->run(); }); +std::shared_ptr load_rare_item_set( + const std::string& filename, bool is_v1, std::shared_ptr v4_item_name_index) { + string filename_lower = phosg::tolower(filename); + auto data = make_shared(phosg::load_file(filename)); + if (filename_lower.ends_with(".json")) { + return make_shared(phosg::JSON::parse(*data), v4_item_name_index); + } else if (filename_lower.ends_with(".gsl")) { + return make_shared(GSLArchive(data, false), false); + } else if (filename_lower.ends_with(".gslb")) { + return make_shared(GSLArchive(data, true), true); + } else if (filename_lower.ends_with(".afs")) { + return make_shared(AFSArchive(data), is_v1); + } else if (filename_lower.ends_with(".rel")) { + return make_shared(*data, true); + } else { + throw runtime_error("cannot determine input format; use a filename ending with .json, .gsl, .gslb, .afs, or .rel"); + } +} + Action a_convert_rare_item_set( "convert-rare-item-set", "\ convert-rare-item-set INPUT-FILENAME [OUTPUT-FILENAME] [OPTIONS]\n\ @@ -2233,24 +2250,8 @@ Action a_convert_rare_item_set( if (input_filename.empty() || (input_filename == "-")) { throw runtime_error("input filename must be given"); } - - string input_filename_lower = phosg::tolower(input_filename); - auto data = make_shared(read_input_data(args)); - shared_ptr rs; - if (input_filename_lower.ends_with(".json")) { - rs = make_shared(phosg::JSON::parse(*data), s->item_name_index_opt(get_cli_version(args, Version::BB_V4))); - } else if (input_filename_lower.ends_with(".gsl")) { - rs = make_shared(GSLArchive(data, false), false); - } else if (input_filename_lower.ends_with(".gslb")) { - rs = make_shared(GSLArchive(data, true), true); - } else if (input_filename_lower.ends_with(".afs")) { - rs = make_shared(AFSArchive(data), is_v1(get_cli_version(args, Version::DC_V2))); - } else if (input_filename_lower.ends_with(".rel")) { - rs = make_shared(*data, true); - } else { - throw runtime_error("cannot determine input format; use a filename ending with .json, .gsl, .gslb, .afs, or .rel"); - } - + auto rs = load_rare_item_set( + input_filename, is_v1(get_cli_version(args, Version::BB_V4)), s->item_name_index(Version::BB_V4)); if (rate_factor != 1.0) { rs->multiply_all_rates(rate_factor); } @@ -2294,6 +2295,32 @@ Action a_convert_rare_item_set( throw runtime_error("cannot determine output format; use a filename ending with .json, .gsl, .gslb, or .afs"); } }); +Action a_compare_rare_item_set( + "compare-rare-item-set", nullptr, + +[](phosg::Arguments& args) { + string input_filename1 = args.get(1, false); + if (input_filename1.empty() || (input_filename1 == "-")) { + throw runtime_error("two input filenames must be given"); + } + string input_filename2 = args.get(2, false); + if (input_filename2.empty() || (input_filename2 == "-")) { + throw runtime_error("two input filenames must be given"); + } + + auto s = make_shared(get_config_filename(args)); + s->load_config_early(); + s->load_patch_indexes(); + s->load_text_index(); + s->load_item_definitions(); + s->load_item_name_indexes(); + s->load_drop_tables(); + + bool is_v1 = ::is_v1(get_cli_version(args, Version::BB_V4)); + auto rs1 = load_rare_item_set(input_filename1, is_v1, s->item_name_index(Version::BB_V4)); + auto rs2 = load_rare_item_set(input_filename2, is_v1, s->item_name_index(Version::BB_V4)); + + rs1->print_diff(stdout, *rs2); + }); static shared_ptr load_common_item_set( const std::string& filename, const std::string& ct_filename, bool big_endian) { @@ -3098,8 +3125,7 @@ Action a_check_supermaps( auto f = phosg::fopen_unique(filename, "wt"); phosg::fwrite_fmt(f.get(), "QUEST {} ({})\n", it.first, it.second->meta.name); phosg::fwrite_fmt(f.get(), "ENEMY--------------- DCNTE 11/2K DC-V1 DC-V2 PCNTE PC-V2 GCNTE GC-V3 XB-V3 BB-V4\n"); - for (size_t type_ss = 0; type_ss < static_cast(EnemyType::MAX_ENEMY_TYPE); type_ss++) { - EnemyType type = static_cast(type_ss); + for (auto type : phosg::EnumRange()) { bool any_count_nonzero = false; array counts; for (Version v : ALL_NON_PATCH_VERSIONS) { diff --git a/src/ProxyCommands.cc b/src/ProxyCommands.cc index c95966c6..a6ecc76c 100644 --- a/src/ProxyCommands.cc +++ b/src/ProxyCommands.cc @@ -970,7 +970,7 @@ static asio::awaitable SC_6x60_6xA2(shared_ptr c, Channel } } else { c->log.info_f("Creating item from enemy {:04X} (area {:02X})", cmd.entity_index, cmd.effective_area); - res = c->proxy_session->item_creator->on_monster_item_drop(rec.effective_rt_index, cmd.effective_area); + res = c->proxy_session->item_creator->on_monster_item_drop(rec.effective_enemy_type, cmd.effective_area); } if (res.item.empty()) { diff --git a/src/RareItemSet.cc b/src/RareItemSet.cc index d16d9c52..b3378ff1 100644 --- a/src/RareItemSet.cc +++ b/src/RareItemSet.cc @@ -177,23 +177,31 @@ RareItemSet::ParsedRELData::ParsedRELData(phosg::StringReader r, bool big_endian } RareItemSet::ParsedRELData::ParsedRELData(const SpecCollection& collection) { - for (const auto& specs : collection.rt_index_to_specs) { - ExpandedDrop effective_spec; + this->monster_rares.resize(NUM_RT_INDEXES_V4); + + for (const auto& [enemy_type, specs] : collection.enemy_specs) { + const auto& def = type_definition_for_enemy(enemy_type); + if (def.rt_index == 0xFF) { + throw runtime_error(std::format( + "monster spec for {} has no rt_index and cannot be converted to ItemRT format", def.enum_name)); + } + + auto& dest_spec = this->monster_rares.at(def.rt_index); for (const auto& spec : specs) { - if (effective_spec.data.empty()) { - effective_spec = spec; - } else if ((effective_spec.probability != spec.probability) || (effective_spec.data != spec.data)) { - throw runtime_error("monster spec cannot be converted to ItemRT format"); + if (dest_spec.data.empty()) { + dest_spec = spec; + } else if ((dest_spec.probability != spec.probability) || (dest_spec.data != spec.data)) { + throw runtime_error(std::format( + "monster spec for {} contains multiple drops and cannot be converted to ItemRT format", def.enum_name)); } } - this->monster_rares.emplace_back(specs.empty() ? ExpandedDrop() : specs[0]); } - if (collection.box_area_norm_to_specs.size() > 0xFF) { + if (collection.box_specs.size() > 0xFF) { throw runtime_error("area_norm value too high"); } - for (uint8_t area_norm = 0; area_norm < collection.box_area_norm_to_specs.size(); area_norm++) { - for (const auto& spec : collection.box_area_norm_to_specs[area_norm]) { + for (uint8_t area_norm = 0; area_norm < collection.box_specs.size(); area_norm++) { + for (const auto& spec : collection.box_specs[area_norm]) { uint8_t area_norm_plus_1 = area_norm + 1; this->box_rares.emplace_back(BoxRare{.area_norm_plus_1 = area_norm_plus_1, .drop = spec}); } @@ -208,27 +216,26 @@ std::string RareItemSet::ParsedRELData::serialize(bool big_endian, bool is_v1) c } } -RareItemSet::SpecCollection RareItemSet::ParsedRELData::as_collection() const { +RareItemSet::SpecCollection RareItemSet::ParsedRELData::as_collection(Episode episode) const { SpecCollection ret; - for (size_t z = 0; z < this->monster_rares.size(); z++) { - const auto& drop = this->monster_rares[z]; + for (size_t rt_index = 0; rt_index < this->monster_rares.size(); rt_index++) { + const auto& drop = this->monster_rares[rt_index]; if (drop.data.empty()) { continue; } - if (z >= ret.rt_index_to_specs.size()) { - ret.rt_index_to_specs.resize(z + 1); + for (auto enemy_type : enemy_types_for_rare_table_index(episode, rt_index)) { + ret.enemy_specs[enemy_type].emplace_back(drop); } - ret.rt_index_to_specs[z].emplace_back(drop); } for (const auto& drop : this->box_rares) { if ((drop.area_norm_plus_1 == 0) || drop.drop.data.empty()) { continue; } uint8_t area_norm = drop.area_norm_plus_1 - 1; - if (area_norm >= ret.box_area_norm_to_specs.size()) { - ret.box_area_norm_to_specs.resize(area_norm + 1); + if (area_norm >= ret.box_specs.size()) { + ret.box_specs.resize(area_norm + 1); } - ret.box_area_norm_to_specs[area_norm].emplace_back(drop.drop); + ret.box_specs[area_norm].emplace_back(drop.drop); } return ret; } @@ -241,8 +248,7 @@ RareItemSet::RareItemSet(const AFSArchive& afs, bool is_v1) { size_t index = static_cast(difficulty) * 10 + section_id; ParsedRELData rel(afs.get_reader(index), false, is_v1); this->collections.emplace( - this->key_for_params(mode, Episode::EP1, difficulty, section_id), - rel.as_collection()); + this->key_for_params(mode, Episode::EP1, difficulty, section_id), rel.as_collection(Episode::EP1)); } catch (const out_of_range&) { } } @@ -250,7 +256,8 @@ RareItemSet::RareItemSet(const AFSArchive& afs, bool is_v1) { } } -string RareItemSet::gsl_entry_name_for_table(GameMode mode, Episode episode, Difficulty difficulty, uint8_t section_id) { +string RareItemSet::gsl_entry_name_for_table( + GameMode mode, Episode episode, Difficulty difficulty, uint8_t section_id) { return std::format("ItemRT{}{}{}{}.rel", ((mode == GameMode::CHALLENGE) ? "c" : ""), ((episode == Episode::EP2) ? "l" : ""), @@ -259,7 +266,7 @@ string RareItemSet::gsl_entry_name_for_table(GameMode mode, Episode episode, Dif } RareItemSet::RareItemSet(const GSLArchive& gsl, bool is_big_endian) { - for (GameMode mode : ALL_GAME_MODES_V23) { + for (GameMode mode : {GameMode::NORMAL, GameMode::CHALLENGE}) { for (Episode episode : ALL_EPISODES_V3) { for (Difficulty difficulty : ALL_DIFFICULTIES_V234) { for (size_t section_id = 0; section_id < 10; section_id++) { @@ -267,7 +274,7 @@ RareItemSet::RareItemSet(const GSLArchive& gsl, bool is_big_endian) { string filename = this->gsl_entry_name_for_table(mode, episode, difficulty, section_id); ParsedRELData rel(gsl.get_reader(filename), is_big_endian, false); this->collections.emplace( - this->key_for_params(mode, episode, difficulty, section_id), rel.as_collection()); + this->key_for_params(mode, episode, difficulty, section_id), rel.as_collection(episode)); } catch (const out_of_range&) { } } @@ -287,7 +294,7 @@ RareItemSet::RareItemSet(const string& rel_data, bool is_big_endian) { size_t index = (ep_index * 40) + static_cast(difficulty) * 10 + section_id; ParsedRELData rel(r.sub(0x280 * index, 0x280), is_big_endian, false); this->collections.emplace( - this->key_for_params(GameMode::NORMAL, episode, difficulty, section_id), rel.as_collection()); + this->key_for_params(GameMode::NORMAL, episode, difficulty, section_id), rel.as_collection(episode)); } catch (const out_of_range&) { } } @@ -315,26 +322,19 @@ RareItemSet::RareItemSet(const phosg::JSON& json, shared_ptrcollections[this->key_for_params(mode, episode, difficulty, section_id)]; - for (const auto& item_it : section_id_it.second->as_dict()) { + for (const auto& [enemy_type_name, specs_json] : section_id_it.second->as_dict()) { vector* target; - if (item_it.first.starts_with("Box-")) { - uint8_t area_norm = FloorDefinition::get(episode, item_it.first.substr(4)).drop_area_norm; - if (collection.box_area_norm_to_specs.size() <= area_norm) { - collection.box_area_norm_to_specs.resize(area_norm + 1); + if (enemy_type_name.starts_with("Box-")) { + uint8_t area_norm = FloorDefinition::get(episode, enemy_type_name.substr(4)).drop_area_norm; + if (collection.box_specs.size() <= area_norm) { + collection.box_specs.resize(area_norm + 1); } - target = &collection.box_area_norm_to_specs[area_norm]; + target = &collection.box_specs[area_norm]; } else { - size_t rt_index = type_definition_for_enemy(phosg::enum_for_name(item_it.first)).rt_index; - if (rt_index == 0xFF) { - throw runtime_error("enemy type " + item_it.first + " does not have an rt_index"); - } - if (collection.rt_index_to_specs.size() <= rt_index) { - collection.rt_index_to_specs.resize(rt_index + 1); - } - target = &collection.rt_index_to_specs[rt_index]; + target = &collection.enemy_specs[phosg::enum_for_name(enemy_type_name)]; } - for (const auto& spec_json : item_it.second->as_list()) { + for (const auto& spec_json : specs_json->as_list()) { auto& d = target->emplace_back(); auto prob_desc = spec_json->at(0); @@ -702,7 +702,7 @@ string RareItemSet::serialize_html( std::string exact_token = std::format("Exact rate: {} / {}", frac.first, frac.second); if (common_item_set && type_def && type_def->rt_index != 0xFF) { auto table = common_item_set->get_table(episode, mode, difficulty, section_id); - uint8_t dar = table->enemy_type_drop_probs.at(type_def->rt_index); + uint8_t dar = table->enemy_type_drop_probs.at(type_def->type); exact_token += std::format(" (DAR: {}%)", dar); frac.first *= dar; frac.second *= 100; @@ -747,13 +747,9 @@ string RareItemSet::serialize_html( for (const auto& zone_type : zone_types) { add_location_header(zone_type.name); for (EnemyType type : zone_type.types) { - uint8_t rt_index = type_definition_for_enemy(type).rt_index; - if (rt_index == 0xFF) { - continue; - } array, 10> specs_lists; for (uint8_t section_id = 0; section_id < 10; section_id++) { - specs_lists[section_id] = this->get_enemy_specs(mode, episode, difficulty, section_id, rt_index); + specs_lists[section_id] = this->get_enemy_specs(mode, episode, difficulty, section_id, type); } const auto& type_def = type_definition_for_enemy(type); const char* name = (difficulty == Difficulty::ULTIMATE && type_def.ultimate_name) ? type_def.ultimate_name : type_def.in_game_name; @@ -787,13 +783,9 @@ phosg::JSON RareItemSet::json(shared_ptr name_index) const auto section_id_dict = phosg::JSON::dict(); for (uint8_t section_id = 0; section_id < 10; section_id++) { auto collection_dict = phosg::JSON::dict(); - for (size_t rt_index = 0; rt_index < 0x80; rt_index++) { - const auto& enemy_types = enemy_types_for_rare_table_index(episode, rt_index); - if (enemy_types.empty()) { - continue; - } - - for (const auto& spec : this->get_enemy_specs(GameMode::NORMAL, episode, difficulty, section_id, rt_index)) { + for (auto enemy_type : phosg::EnumRange()) { + const auto& specs = this->get_enemy_specs(GameMode::NORMAL, episode, difficulty, section_id, enemy_type); + for (const auto& spec : specs) { if (spec.data.empty()) { continue; } @@ -807,12 +799,8 @@ phosg::JSON RareItemSet::json(shared_ptr name_index) const if (name_index) { spec_json.emplace_back(name_index->describe_item(spec.data)); } - for (const auto& enemy_type : enemy_types) { - if (type_definition_for_enemy(enemy_type).valid_in_episode(episode)) { - phosg::JSON this_spec_json = spec_json; - collection_dict.emplace(phosg::name_for_enum(enemy_type), phosg::JSON::list()).first->second->emplace_back(std::move(this_spec_json)); - } - } + auto list_emplace_ret = collection_dict.emplace(phosg::name_for_enum(enemy_type), phosg::JSON::list()); + list_emplace_ret.first->second->emplace_back(std::move(spec_json)); } } @@ -858,17 +846,17 @@ phosg::JSON RareItemSet::json(shared_ptr name_index) const } void RareItemSet::multiply_all_rates(double factor) { - auto multiply_rates_vec = +[](vector>& vec, double factor) -> void { - for (auto& vec_it : vec) { - for (auto& z_it : vec_it) { - uint64_t new_probability = z_it.probability * factor; - z_it.probability = min(new_probability, 0xFFFFFFFF); + for (auto& [_, collection] : this->collections) { + for (auto& [_, specs] : collection.enemy_specs) { + for (auto& spec : specs) { + spec.probability = min(spec.probability * factor, 0xFFFFFFFF); + } + } + for (auto& specs : collection.box_specs) { + for (auto& spec : specs) { + spec.probability = min(spec.probability * factor, 0xFFFFFFFF); } } - }; - for (auto& coll_it : this->collections) { - multiply_rates_vec(coll_it.second.rt_index_to_specs, factor); - multiply_rates_vec(coll_it.second.box_area_norm_to_specs, factor); } } @@ -893,28 +881,22 @@ void RareItemSet::print_collection( name_for_section_id(section_id)); phosg::fwrite_fmt(stream, " Monster rares:\n"); - for (size_t z = 0; z < collection->rt_index_to_specs.size(); z++) { - string enemy_types_str; - const auto& enemy_types = enemy_types_for_rare_table_index(episode, z); - for (EnemyType enemy_type : enemy_types) { - enemy_types_str += phosg::name_for_enum(enemy_type); - enemy_types_str.push_back(','); - } - if (!enemy_types_str.empty()) { - enemy_types_str.resize(enemy_types_str.size() - 1); - } - - for (const auto& spec : collection->rt_index_to_specs[z]) { - string s = name_index ? spec.str(name_index) : spec.str(); - phosg::fwrite_fmt(stream, " {:02X}: {} ({})\n", z, s, enemy_types_str); + for (auto enemy_type : phosg::EnumRange()) { + try { + const auto& def = type_definition_for_enemy(enemy_type); + for (const auto& spec : collection->enemy_specs.at(enemy_type)) { + string s = name_index ? spec.str(name_index) : spec.str(); + phosg::fwrite_fmt(stream, " {:<23} {}\n", def.enum_name, s); + } + } catch (const out_of_range&) { } } phosg::fwrite_fmt(stream, " Box rares:\n"); - for (size_t area_norm = 0; area_norm < collection->box_area_norm_to_specs.size(); area_norm++) { - for (const auto& spec : collection->box_area_norm_to_specs[area_norm]) { + for (size_t area_norm = 0; area_norm < collection->box_specs.size(); area_norm++) { + for (const auto& spec : collection->box_specs[area_norm]) { string s = name_index ? spec.str(name_index) : spec.str(); - phosg::fwrite_fmt(stream, " (area-norm {:02X}) {}\n", area_norm, s); + phosg::fwrite_fmt(stream, " (area-norm {:02X}) {}\n", area_norm, s); } } } @@ -934,10 +916,100 @@ void RareItemSet::print_all_collections(FILE* stream, std::shared_ptr& specs) -> std::string { + std::string ret; + for (const auto& spec : specs) { + if (!ret.empty()) { + ret += ","; + } + ret += std::format("{:08X}:{}", spec.probability, spec.data.short_hex()); + } + return ret; + }; + + const std::vector empty_specs{}; + for (auto enemy_type : phosg::EnumRange()) { + const std::vector* this_specs = &empty_specs; + const std::vector* other_specs = &empty_specs; + try { + this_specs = &this->enemy_specs.at(enemy_type); + } catch (const out_of_range&) { + } + try { + other_specs = &other.enemy_specs.at(enemy_type); + } catch (const out_of_range&) { + } + if (*this_specs != *other_specs) { + phosg::fwrite_fmt(stream, " {}: {} -> {}\n", + phosg::name_for_enum(enemy_type), format_specs(*this_specs), format_specs(*other_specs)); + } + } + for (size_t area_norm = 0; area_norm < 10; area_norm++) { + const auto& this_specs = (area_norm < this->box_specs.size()) ? this->box_specs[area_norm] : empty_specs; + const auto& other_specs = (area_norm < other.box_specs.size()) ? other.box_specs[area_norm] : empty_specs; + if (this_specs != other_specs) { + phosg::fwrite_fmt(stream, " Box (area_norm {}): {} -> {}\n", + area_norm, format_specs(this_specs), format_specs(other_specs)); + } + } +} + +void RareItemSet::print_diff(FILE* stream, const RareItemSet& other) const { + bool any_difference_found = false; + for (const auto& episode : ALL_EPISODES_V4) { + for (const auto& mode : ALL_GAME_MODES_V4) { + for (const auto& difficulty : ALL_DIFFICULTIES_V234) { + for (uint8_t section_id = 0; section_id < 10; section_id++) { + const SpecCollection* this_coll = nullptr; + const SpecCollection* other_coll = nullptr; + try { + this_coll = &this->get_collection(mode, episode, difficulty, section_id); + } catch (const out_of_range&) { + } + try { + other_coll = &other.get_collection(mode, episode, difficulty, section_id); + } catch (const out_of_range&) { + } + + if (!this_coll && !other_coll) { + continue; + } else if (!this_coll) { + any_difference_found = true; + phosg::fwrite_fmt(stream, "> Collection present in other but not this: {} {} {} {}\n", + name_for_episode(episode), + name_for_mode(mode), + name_for_difficulty(difficulty), + name_for_section_id(section_id)); + } else if (!other_coll) { + any_difference_found = true; + phosg::fwrite_fmt(stream, "> Collection present in this but not other: {} {} {} {}\n", + name_for_episode(episode), + name_for_mode(mode), + name_for_difficulty(difficulty), + name_for_section_id(section_id)); + } else if (*this_coll != *other_coll) { + any_difference_found = true; + phosg::fwrite_fmt(stream, "> Collections do not match: {} {} {} {}\n", + name_for_episode(episode), + name_for_mode(mode), + name_for_difficulty(difficulty), + name_for_section_id(section_id)); + this_coll->print_diff(stream, *other_coll); + } + } + } + } + } + if (!any_difference_found) { + phosg::fwrite_fmt(stream, "> These rare item sets are identical\n"); + } +} + std::vector RareItemSet::get_enemy_specs( - GameMode mode, Episode episode, Difficulty difficulty, uint8_t secid, uint8_t rt_index) const { + GameMode mode, Episode episode, Difficulty difficulty, uint8_t secid, EnemyType enemy_type) const { try { - return this->get_collection(mode, episode, difficulty, secid).rt_index_to_specs.at(rt_index); + return this->get_collection(mode, episode, difficulty, secid).enemy_specs.at(enemy_type); } catch (const out_of_range&) { static const std::vector empty_vector; return empty_vector; @@ -947,7 +1019,7 @@ std::vector RareItemSet::get_enemy_specs( std::vector RareItemSet::get_box_specs( GameMode mode, Episode episode, Difficulty difficulty, uint8_t secid, uint8_t area_norm) const { try { - return this->get_collection(mode, episode, difficulty, secid).box_area_norm_to_specs.at(area_norm); + return this->get_collection(mode, episode, difficulty, secid).box_specs.at(area_norm); } catch (const out_of_range&) { static const std::vector empty_vector; return empty_vector; @@ -965,7 +1037,14 @@ bool RareItemSet::has_entries_for_game_config(GameMode mode, Episode episode, Di const RareItemSet::SpecCollection& RareItemSet::get_collection( GameMode mode, Episode episode, Difficulty difficulty, uint8_t secid) const { - return this->collections.at(this->key_for_params(mode, episode, difficulty, secid)); + try { + return this->collections.at(this->key_for_params(mode, episode, difficulty, secid)); + } catch (const out_of_range&) { + if (mode == GameMode::BATTLE || mode == GameMode::SOLO) { + return this->collections.at(this->key_for_params(GameMode::NORMAL, episode, difficulty, secid)); + } + throw; + } } uint16_t RareItemSet::key_for_params(GameMode mode, Episode episode, Difficulty difficulty, uint8_t secid) { diff --git a/src/RareItemSet.hh b/src/RareItemSet.hh index e04df69c..b5d26a8f 100644 --- a/src/RareItemSet.hh +++ b/src/RareItemSet.hh @@ -22,6 +22,9 @@ public: uint32_t probability = 0; ItemData data; + bool operator==(const ExpandedDrop& other) const = default; + bool operator!=(const ExpandedDrop& other) const = default; + std::string str() const; std::string str(std::shared_ptr name_index) const; }; @@ -34,7 +37,7 @@ public: ~RareItemSet() = default; std::vector get_enemy_specs( - GameMode mode, Episode episode, Difficulty difficulty, uint8_t secid, uint8_t rt_index) const; + GameMode mode, Episode episode, Difficulty difficulty, uint8_t secid, EnemyType enemy_type) const; std::vector get_box_specs( GameMode mode, Episode episode, Difficulty difficulty, uint8_t secid, uint8_t area_norm) const; @@ -60,11 +63,17 @@ public: uint8_t section_id, std::shared_ptr name_index = nullptr) const; void print_all_collections(FILE* stream, std::shared_ptr name_index = nullptr) const; + void print_diff(FILE* stream, const RareItemSet& other) const; protected: struct SpecCollection { - std::vector> rt_index_to_specs; - std::vector> box_area_norm_to_specs; + std::unordered_map> enemy_specs; + std::vector> box_specs; // Indexed by area_norm + + bool operator==(const SpecCollection& other) const = default; + bool operator!=(const SpecCollection& other) const = default; + + void print_diff(FILE* stream, const SpecCollection& other) const; }; struct ParsedRELData { @@ -95,8 +104,8 @@ protected: ExpandedDrop drop; }; - std::vector monster_rares; - std::vector box_rares; + std::vector monster_rares; // Indexed by rt_index + std::vector box_rares; // Not indexed (area_norm + 1 is in the struct) ParsedRELData() = default; ParsedRELData(phosg::StringReader r, bool big_endian, bool is_v1); @@ -108,7 +117,7 @@ protected: template std::string serialize_t(bool is_v1) const; - SpecCollection as_collection() const; + SpecCollection as_collection(Episode episode) const; }; std::unordered_map collections; diff --git a/src/ReceiveSubcommands.cc b/src/ReceiveSubcommands.cc index a857c11c..a234f509 100644 --- a/src/ReceiveSubcommands.cc +++ b/src/ReceiveSubcommands.cc @@ -2810,7 +2810,7 @@ DropReconcileResult reconcile_drop_request_with_map( bool is_box = (cmd.rt_index == 0x30); DropReconcileResult res; - res.effective_rt_index = 0xFF; + res.effective_enemy_type = EnemyType::UNKNOWN; res.should_drop = true; res.ignore_def = (cmd.ignore_def != 0); if (!map) { @@ -2856,22 +2856,22 @@ DropReconcileResult reconcile_drop_request_with_map( res.ref_ene_st = map->enemy_state_for_index(version, cmd.floor, cmd.entity_index); res.target_ene_st = res.ref_ene_st->alias_target_ene_st ? res.ref_ene_st->alias_target_ene_st : res.ref_ene_st; uint8_t area = map->floor_to_area.at(res.target_ene_st->super_ene->floor); - EnemyType type = res.target_ene_st->type(version, area, difficulty, event); + res.effective_enemy_type = res.target_ene_st->type(version, area, difficulty, event); c->log.info_f("Drop check for E-{:03X} (target E-{:03X}, type {})", - res.ref_ene_st->e_id, res.target_ene_st->e_id, phosg::name_for_enum(type)); - res.effective_rt_index = type_definition_for_enemy(type).rt_index; + res.ref_ene_st->e_id, res.target_ene_st->e_id, phosg::name_for_enum(res.effective_enemy_type)); + uint8_t expected_rt_index = type_definition_for_enemy(res.effective_enemy_type).rt_index; bool mismatched_rt_index = false; - if (cmd.rt_index != res.effective_rt_index) { + if (cmd.rt_index != expected_rt_index) { // Special cases: BULCLAW => BULK and DARK_GUNNER => DEATH_GUNNER - if (cmd.rt_index == 0x27 && type == EnemyType::BULCLAW) { + if ((cmd.rt_index == 0x27) && (res.effective_enemy_type == EnemyType::BULCLAW)) { c->log.info_f("E-{:03X} killed as BULK instead of BULCLAW", res.target_ene_st->e_id); - res.effective_rt_index = 0x27; - } else if (cmd.rt_index == 0x23 && type == EnemyType::DARK_GUNNER) { + res.effective_enemy_type = EnemyType::BULK; + } else if ((cmd.rt_index == 0x23) && (res.effective_enemy_type == EnemyType::DARK_GUNNER)) { c->log.info_f("E-{:03X} killed as DEATH_GUNNER instead of DARK_GUNNER", res.target_ene_st->e_id); - res.effective_rt_index = 0x23; + res.effective_enemy_type = EnemyType::DEATH_GUNNER; } else { c->log.warning_f("rt_index {:02X} from command does not match entity\'s expected index {:02X}", - cmd.rt_index, res.effective_rt_index); + cmd.rt_index, expected_rt_index); mismatched_rt_index = true; } } @@ -2881,9 +2881,10 @@ DropReconcileResult reconcile_drop_request_with_map( } if (c->check_flag(Client::Flag::DEBUG_ENABLED)) { std::string rt_index_str = mismatched_rt_index - ? std::format(" $C4{:02X}->{:02X}$C5", cmd.rt_index, res.effective_rt_index) - : std::format(" {:02X}", res.effective_rt_index); - send_text_message_fmt(c, "$C5E-{:03X}{} {}", res.target_ene_st->e_id, rt_index_str, phosg::name_for_enum(type)); + ? std::format(" $C4{:02X}->{:02X}$C5", cmd.rt_index, expected_rt_index) + : std::format(" {:02X}", expected_rt_index); + send_text_message_fmt(c, "$C5E-{:03X}{} {}", + res.target_ene_st->e_id, rt_index_str, phosg::name_for_enum(res.effective_enemy_type)); } } @@ -2963,7 +2964,7 @@ static asio::awaitable on_entity_drop_item_request(shared_ptr c, S } else if (rec.target_ene_st) { l->log.info_f("Creating item from enemy {:04X} => E-{:03X} (area {:02X})", cmd.entity_index, rec.target_ene_st->e_id, cmd.effective_area); - return l->item_creator->on_monster_item_drop(rec.effective_rt_index, cmd.effective_area); + return l->item_creator->on_monster_item_drop(rec.effective_enemy_type, cmd.effective_area); } else { throw runtime_error("neither object nor enemy were present"); } diff --git a/src/ReceiveSubcommands.hh b/src/ReceiveSubcommands.hh index a004a272..c4fad357 100644 --- a/src/ReceiveSubcommands.hh +++ b/src/ReceiveSubcommands.hh @@ -23,7 +23,7 @@ struct DropReconcileResult { // for drop computation (which may be the result of following an alias from the ref ene_st) std::shared_ptr ref_ene_st; std::shared_ptr target_ene_st; - uint8_t effective_rt_index; + EnemyType effective_enemy_type; bool should_drop; bool ignore_def; }; diff --git a/system/item-tables/ItemCT-dc-v2.afs b/system/item-tables/ItemCT-dc-v2.afs deleted file mode 120000 index e8a6fc3e..00000000 --- a/system/item-tables/ItemCT-dc-v2.afs +++ /dev/null @@ -1 +0,0 @@ -ItemCT-pc-v2.afs \ No newline at end of file diff --git a/system/item-tables/ItemCT-pc-v2.afs b/system/item-tables/ItemCT-pc-v2.afs deleted file mode 100644 index eb1718aa..00000000 Binary files a/system/item-tables/ItemCT-pc-v2.afs and /dev/null differ diff --git a/system/item-tables/ItemPT-dc-11-2000.afs b/system/item-tables/ItemPT-dc-11-2000.afs deleted file mode 100644 index 4c3590d8..00000000 Binary files a/system/item-tables/ItemPT-dc-11-2000.afs and /dev/null differ diff --git a/system/item-tables/ItemPT-dc-nte.afs b/system/item-tables/ItemPT-dc-nte.afs deleted file mode 100644 index 2c041c47..00000000 Binary files a/system/item-tables/ItemPT-dc-nte.afs and /dev/null differ diff --git a/system/item-tables/ItemPT-dc-v1.afs b/system/item-tables/ItemPT-dc-v1.afs deleted file mode 100644 index d5b2c018..00000000 Binary files a/system/item-tables/ItemPT-dc-v1.afs and /dev/null differ diff --git a/system/item-tables/ItemPT-dc-v2.afs b/system/item-tables/ItemPT-dc-v2.afs deleted file mode 120000 index a021351d..00000000 --- a/system/item-tables/ItemPT-dc-v2.afs +++ /dev/null @@ -1 +0,0 @@ -ItemPT-pc-v2.afs \ No newline at end of file diff --git a/system/item-tables/ItemPT-gc-nte.gslb b/system/item-tables/ItemPT-gc-nte.gslb deleted file mode 100644 index 7b3432d0..00000000 Binary files a/system/item-tables/ItemPT-gc-nte.gslb and /dev/null differ diff --git a/system/item-tables/ItemPT-gc-v3.gslb b/system/item-tables/ItemPT-gc-v3.gslb deleted file mode 100644 index 35d9b16c..00000000 Binary files a/system/item-tables/ItemPT-gc-v3.gslb and /dev/null differ diff --git a/system/item-tables/ItemPT-pc-nte.afs b/system/item-tables/ItemPT-pc-nte.afs deleted file mode 120000 index a021351d..00000000 --- a/system/item-tables/ItemPT-pc-nte.afs +++ /dev/null @@ -1 +0,0 @@ -ItemPT-pc-v2.afs \ No newline at end of file diff --git a/system/item-tables/ItemPT-pc-v2.afs b/system/item-tables/ItemPT-pc-v2.afs deleted file mode 100644 index 47a15b0a..00000000 Binary files a/system/item-tables/ItemPT-pc-v2.afs and /dev/null differ diff --git a/system/item-tables/ItemPT-xb-v3.gsl b/system/item-tables/ItemPT-xb-v3.gsl deleted file mode 100644 index 93aa5756..00000000 Binary files a/system/item-tables/ItemPT-xb-v3.gsl and /dev/null differ diff --git a/system/item-tables/ItemRT-bb-v4.rel b/system/item-tables/ItemRT-bb-v4.rel deleted file mode 100644 index db986b81..00000000 Binary files a/system/item-tables/ItemRT-bb-v4.rel and /dev/null differ diff --git a/system/item-tables/ItemRT-dc-11-2000.afs b/system/item-tables/ItemRT-dc-11-2000.afs deleted file mode 100644 index adcdf19f..00000000 Binary files a/system/item-tables/ItemRT-dc-11-2000.afs and /dev/null differ diff --git a/system/item-tables/ItemRT-dc-nte.afs b/system/item-tables/ItemRT-dc-nte.afs deleted file mode 100644 index 1e76474d..00000000 Binary files a/system/item-tables/ItemRT-dc-nte.afs and /dev/null differ diff --git a/system/item-tables/ItemRT-dc-v1.afs b/system/item-tables/ItemRT-dc-v1.afs deleted file mode 100644 index 748ded74..00000000 Binary files a/system/item-tables/ItemRT-dc-v1.afs and /dev/null differ diff --git a/system/item-tables/ItemRT-dc-v2.afs b/system/item-tables/ItemRT-dc-v2.afs deleted file mode 120000 index c861dbff..00000000 --- a/system/item-tables/ItemRT-dc-v2.afs +++ /dev/null @@ -1 +0,0 @@ -ItemRT-pc-v2.afs \ No newline at end of file diff --git a/system/item-tables/ItemRT-gc-nte.gslb b/system/item-tables/ItemRT-gc-nte.gslb deleted file mode 100644 index 62fd37cf..00000000 Binary files a/system/item-tables/ItemRT-gc-nte.gslb and /dev/null differ diff --git a/system/item-tables/ItemRT-pc-v2.afs b/system/item-tables/ItemRT-pc-v2.afs deleted file mode 100644 index ca640453..00000000 Binary files a/system/item-tables/ItemRT-pc-v2.afs and /dev/null differ diff --git a/system/item-tables/ItemRT-xb-v3.gsl b/system/item-tables/ItemRT-xb-v3.gsl deleted file mode 100644 index c024c995..00000000 Binary files a/system/item-tables/ItemRT-xb-v3.gsl and /dev/null differ diff --git a/system/item-tables/common-table-v3-v4.json b/system/item-tables/common-table-v3-v4.json index 7ad94d01..a41239e5 100644 --- a/system/item-tables/common-table-v3-v4.json +++ b/system/item-tables/common-table-v3-v4.json @@ -122,8 +122,6 @@ "CHAOS_SORCERER": [145, 200], "CLAW": [95, 145], "DARK_BELRA": [50, 80], - "DARK_FALZ_2": 0, - "DARK_FALZ_3": 0, "DARK_GUNNER": [100, 122], "DEATH_GUNNER": [100, 122], "DELSABER": [150, 165], @@ -143,7 +141,6 @@ "HILDEBLUE": [1000, 1500], "LA_DIMENIAN": [115, 165], "MIGIUM": [50, 85], - "MONEST": 0, "MOTHMANT": [80, 90], "NANO_DRAGON": [50, 170], "NAR_LILY": [1000, 2000], @@ -159,7 +156,7 @@ "SO_DIMENIAN": [135, 180], "VOL_OPT_2": 2000 }, - "EnemyTypeDropProbs": {"AL_RAPPY": 100, "BARBAROUS_WOLF": 45, "BOOMA": 28, "BULCLAW": 40, "BULK": 30, "CANADINE": 31, "CANADINE_GROUP": 31, "CANANE": 31, "CHAOS_BRINGER": 85, "CHAOS_SORCERER": 40, "CLAW": 28, "DARK_BELRA": 40, "DARK_FALZ_2": 0, "DARK_FALZ_3": 0, "DARK_GUNNER": 30, "DEATH_GUNNER": 30, "DELSABER": 35, "DE_ROL_LE": 100, "DIMENIAN": 28, "DRAGON": 100, "DUBCHIC": 28, "EVIL_SHARK": 28, "GARANZ": 80, "GIGOBOOMA": 35, "GILLCHIC": 28, "GOBOOMA": 32, "GRASS_ASSASSIN": 50, "GUIL_SHARK": 15, "HIDOOM": 40, "HILDEBEAR": 80, "HILDEBLUE": 100, "LA_DIMENIAN": 31, "MIGIUM": 40, "MONEST": 0, "MOTHMANT": 25, "NANO_DRAGON": 50, "NAR_LILY": 100, "PAL_SHARK": 32, "PAN_ARMS": 90, "POFUILLY_SLIME": 27, "POISON_LILY": 25, "POUILLY_SLIME": 100, "RAG_RAPPY": 100, "SAVAGE_WOLF": 30, "SINOW_BEAT": 50, "SINOW_GOLD": 50, "SO_DIMENIAN": 33, "VOL_OPT_2": 100}, + "EnemyTypeDropProbs": {"AL_RAPPY": 100, "BARBAROUS_WOLF": 45, "BOOMA": 28, "BULCLAW": 40, "BULK": 30, "CANADINE": 31, "CANADINE_GROUP": 31, "CANANE": 31, "CHAOS_BRINGER": 85, "CHAOS_SORCERER": 40, "CLAW": 28, "DARK_BELRA": 40, "DARK_GUNNER": 30, "DEATH_GUNNER": 30, "DELSABER": 35, "DE_ROL_LE": 100, "DIMENIAN": 28, "DRAGON": 100, "DUBCHIC": 28, "EVIL_SHARK": 28, "GARANZ": 80, "GIGOBOOMA": 35, "GILLCHIC": 28, "GOBOOMA": 32, "GRASS_ASSASSIN": 50, "GUIL_SHARK": 15, "HIDOOM": 40, "HILDEBEAR": 80, "HILDEBLUE": 100, "LA_DIMENIAN": 31, "MIGIUM": 40, "MOTHMANT": 25, "NANO_DRAGON": 50, "NAR_LILY": 100, "PAL_SHARK": 32, "PAN_ARMS": 90, "POFUILLY_SLIME": 27, "POISON_LILY": 25, "POUILLY_SLIME": 100, "RAG_RAPPY": 100, "SAVAGE_WOLF": 30, "SINOW_BEAT": 50, "SINOW_GOLD": 50, "SO_DIMENIAN": 33, "VOL_OPT_2": 100}, "GrindProbTable": [ [100, 30, 25, 20], [0, 30, 23, 15], @@ -485,8 +482,6 @@ "CHAOS_SORCERER": [145, 200], "CLAW": [95, 145], "DARK_BELRA": [50, 80], - "DARK_FALZ_2": 0, - "DARK_FALZ_3": 0, "DARK_GUNNER": [100, 122], "DEATH_GUNNER": [100, 122], "DELSABER": [150, 165], @@ -506,7 +501,6 @@ "HILDEBLUE": [1000, 1500], "LA_DIMENIAN": [115, 165], "MIGIUM": [50, 85], - "MONEST": 0, "MOTHMANT": [80, 90], "NANO_DRAGON": [50, 170], "NAR_LILY": [1000, 2000], @@ -579,8 +573,6 @@ "CHAOS_SORCERER": [145, 210], "CLAW": [95, 155], "DARK_BELRA": [50, 90], - "DARK_FALZ_2": 0, - "DARK_FALZ_3": 0, "DARK_GUNNER": [100, 132], "DEATH_GUNNER": [100, 132], "DELSABER": [150, 175], @@ -600,7 +592,6 @@ "HILDEBLUE": [1000, 1500], "LA_DIMENIAN": [115, 175], "MIGIUM": [50, 95], - "MONEST": 0, "MOTHMANT": [80, 100], "NANO_DRAGON": [50, 180], "NAR_LILY": [1000, 2000], @@ -748,8 +739,6 @@ "CHAOS_SORCERER": [115, 135], "CLAW": [45, 75], "DARK_BELRA": 10, - "DARK_FALZ_2": 0, - "DARK_FALZ_3": 0, "DARK_GUNNER": [110, 125], "DEATH_GUNNER": [110, 125], "DELSABER": [95, 100], @@ -769,7 +758,6 @@ "HILDEBLUE": [500, 1000], "LA_DIMENIAN": [100, 120], "MIGIUM": [15, 20], - "MONEST": 0, "MOTHMANT": [3, 6], "NANO_DRAGON": [60, 70], "NAR_LILY": [500, 1200], @@ -847,8 +835,6 @@ "CHAOS_SORCERER": [120, 135], "CLAW": [50, 75], "DARK_BELRA": 10, - "DARK_FALZ_2": 0, - "DARK_FALZ_3": 0, "DARK_GUNNER": [105, 130], "DEATH_GUNNER": [105, 130], "DELSABER": [95, 100], @@ -868,7 +854,6 @@ "HILDEBLUE": [500, 1000], "LA_DIMENIAN": [105, 120], "MIGIUM": [17, 20], - "MONEST": 0, "MOTHMANT": [5, 6], "NANO_DRAGON": [65, 70], "NAR_LILY": [500, 1200], @@ -922,8 +907,6 @@ "CHAOS_SORCERER": [200, 400], "CLAW": [135, 245], "DARK_BELRA": [100, 130], - "DARK_FALZ_2": 0, - "DARK_FALZ_3": 0, "DARK_GUNNER": [150, 250], "DEATH_GUNNER": [150, 250], "DELSABER": [150, 300], @@ -943,7 +926,6 @@ "HILDEBLUE": [1500, 2000], "LA_DIMENIAN": [165, 275], "MIGIUM": [55, 135], - "MONEST": 0, "MOTHMANT": [120, 140], "NANO_DRAGON": [80, 310], "NAR_LILY": [2000, 2500], @@ -1357,8 +1339,6 @@ "CHAOS_SORCERER": [200, 400], "CLAW": [135, 245], "DARK_BELRA": [100, 130], - "DARK_FALZ_2": 0, - "DARK_FALZ_3": 0, "DARK_GUNNER": [150, 250], "DEATH_GUNNER": [150, 250], "DELSABER": [150, 300], @@ -1378,7 +1358,6 @@ "HILDEBLUE": [1500, 2000], "LA_DIMENIAN": [165, 275], "MIGIUM": [55, 135], - "MONEST": 0, "MOTHMANT": [120, 140], "NANO_DRAGON": [80, 310], "NAR_LILY": [2000, 2500], @@ -1441,8 +1420,6 @@ "CHAOS_SORCERER": [200, 425], "CLAW": [155, 335], "DARK_BELRA": [100, 160], - "DARK_FALZ_2": 0, - "DARK_FALZ_3": 0, "DARK_GUNNER": [150, 285], "DEATH_GUNNER": [150, 275], "DELSABER": [150, 330], @@ -1462,7 +1439,6 @@ "HILDEBLUE": [1500, 2000], "LA_DIMENIAN": [165, 275], "MIGIUM": [55, 165], - "MONEST": 0, "MOTHMANT": [120, 170], "NANO_DRAGON": [80, 340], "NAR_LILY": [2000, 2500], @@ -1499,8 +1475,6 @@ "CHAOS_SORCERER": [200, 400], "CLAW": [135, 245], "DARK_BELRA": [100, 130], - "DARK_FALZ_2": 0, - "DARK_FALZ_3": 0, "DARK_GUNNER": [150, 250], "DEATH_GUNNER": [150, 250], "DELSABER": [150, 300], @@ -1520,7 +1494,6 @@ "HILDEBLUE": [1500, 2000], "LA_DIMENIAN": [165, 275], "MIGIUM": [55, 135], - "MONEST": 0, "MOTHMANT": [120, 140], "NANO_DRAGON": [80, 310], "NAR_LILY": [2000, 2500], @@ -1602,7 +1575,7 @@ [56, 140], [58, 145] ], - "EnemyItemClasses": {"AL_RAPPY": 2, "BARBAROUS_WOLF": 2, "BOOMA": 0, "BULCLAW": 3, "BULK": 0, "CANADINE": 2, "CANADINE_GROUP": 2, "CANANE": 1, "CHAOS_BRINGER": 3, "CHAOS_SORCERER": 3, "CLAW": 0, "DARK_BELRA": 1, "DARK_FALZ_2": 255, "DARK_FALZ_3": 255, "DARK_GUNNER": 2, "DEATH_GUNNER": 2, "DELSABER": 1, "DE_ROL_LE": 255, "DIMENIAN": 0, "DRAGON": 255, "DUBCHIC": 0, "EVIL_SHARK": 0, "GARANZ": 2, "GIGOBOOMA": 3, "GILLCHIC": 0, "GOBOOMA": 0, "GRASS_ASSASSIN": 0, "GUIL_SHARK": 3, "HIDOOM": 1, "HILDEBEAR": 0, "HILDEBLUE": 0, "LA_DIMENIAN": 0, "MIGIUM": 3, "MONEST": 255, "MOTHMANT": 0, "NANO_DRAGON": 2, "NAR_LILY": 3, "PAL_SHARK": 0, "PAN_ARMS": 2, "POFUILLY_SLIME": 1, "POISON_LILY": 1, "POUILLY_SLIME": 3, "RAG_RAPPY": 2, "SAVAGE_WOLF": 1, "SINOW_BEAT": 0, "SINOW_GOLD": 3, "SO_DIMENIAN": 1, "VOL_OPT_2": 255}, + "EnemyItemClasses": {"AL_RAPPY": 2, "BARBAROUS_WOLF": 2, "BOOMA": 0, "BULCLAW": 3, "BULK": 0, "CANADINE": 2, "CANADINE_GROUP": 2, "CANANE": 1, "CHAOS_BRINGER": 3, "CHAOS_SORCERER": 3, "CLAW": 0, "DARK_BELRA": 1, "DARK_GUNNER": 2, "DEATH_GUNNER": 2, "DELSABER": 1, "DIMENIAN": 0, "DUBCHIC": 0, "EVIL_SHARK": 0, "GARANZ": 2, "GIGOBOOMA": 3, "GILLCHIC": 0, "GOBOOMA": 0, "GRASS_ASSASSIN": 0, "GUIL_SHARK": 3, "HIDOOM": 1, "HILDEBEAR": 0, "HILDEBLUE": 0, "LA_DIMENIAN": 0, "MIGIUM": 3, "MOTHMANT": 0, "NANO_DRAGON": 2, "NAR_LILY": 3, "PAL_SHARK": 0, "PAN_ARMS": 2, "POFUILLY_SLIME": 1, "POISON_LILY": 1, "POUILLY_SLIME": 3, "RAG_RAPPY": 2, "SAVAGE_WOLF": 1, "SINOW_BEAT": 0, "SINOW_GOLD": 3, "SO_DIMENIAN": 1}, "EnemyMesetaRanges": { "AL_RAPPY": [1500, 2000], "BARBAROUS_WOLF": [120, 164], @@ -1616,8 +1589,6 @@ "CHAOS_SORCERER": [200, 400], "CLAW": [135, 245], "DARK_BELRA": [100, 130], - "DARK_FALZ_2": 0, - "DARK_FALZ_3": 0, "DARK_GUNNER": [150, 250], "DEATH_GUNNER": [150, 250], "DELSABER": [150, 300], @@ -1637,7 +1608,6 @@ "HILDEBLUE": [1500, 2000], "LA_DIMENIAN": [165, 275], "MIGIUM": [55, 135], - "MONEST": 0, "MOTHMANT": [120, 140], "NANO_DRAGON": [80, 310], "NAR_LILY": [2000, 2500], @@ -1653,7 +1623,7 @@ "SO_DIMENIAN": [185, 295], "VOL_OPT_2": 3500 }, - "EnemyTypeDropProbs": {"AL_RAPPY": 100, "BARBAROUS_WOLF": 45, "BOOMA": 30, "BULCLAW": 45, "BULK": 35, "CANADINE": 35, "CANADINE_GROUP": 35, "CANANE": 35, "CHAOS_BRINGER": 88, "CHAOS_SORCERER": 35, "CLAW": 30, "DARK_BELRA": 45, "DARK_FALZ_2": 0, "DARK_FALZ_3": 0, "DARK_GUNNER": 45, "DEATH_GUNNER": 45, "DELSABER": 45, "DE_ROL_LE": 100, "DIMENIAN": 30, "DRAGON": 100, "DUBCHIC": 30, "EVIL_SHARK": 30, "GARANZ": 85, "GIGOBOOMA": 35, "GILLCHIC": 30, "GOBOOMA": 38, "GRASS_ASSASSIN": 55, "GUIL_SHARK": 15, "HIDOOM": 45, "HILDEBEAR": 85, "HILDEBLUE": 100, "LA_DIMENIAN": 35, "MIGIUM": 45, "MONEST": 0, "MOTHMANT": 25, "NANO_DRAGON": 55, "NAR_LILY": 100, "PAL_SHARK": 35, "PAN_ARMS": 90, "POFUILLY_SLIME": 27, "POISON_LILY": 25, "POUILLY_SLIME": 100, "RAG_RAPPY": 100, "SAVAGE_WOLF": 30, "SINOW_BEAT": 60, "SINOW_GOLD": 55, "SO_DIMENIAN": 35, "VOL_OPT_2": 100}, + "EnemyTypeDropProbs": {"AL_RAPPY": 100, "BARBAROUS_WOLF": 45, "BOOMA": 30, "BULCLAW": 45, "BULK": 35, "CANADINE": 35, "CANADINE_GROUP": 35, "CANANE": 35, "CHAOS_BRINGER": 88, "CHAOS_SORCERER": 35, "CLAW": 30, "DARK_BELRA": 45, "DARK_GUNNER": 45, "DEATH_GUNNER": 45, "DELSABER": 45, "DE_ROL_LE": 100, "DIMENIAN": 30, "DRAGON": 100, "DUBCHIC": 30, "EVIL_SHARK": 30, "GARANZ": 85, "GIGOBOOMA": 35, "GILLCHIC": 30, "GOBOOMA": 38, "GRASS_ASSASSIN": 55, "GUIL_SHARK": 15, "HIDOOM": 45, "HILDEBEAR": 85, "HILDEBLUE": 100, "LA_DIMENIAN": 35, "MIGIUM": 45, "MOTHMANT": 25, "NANO_DRAGON": 55, "NAR_LILY": 100, "PAL_SHARK": 35, "PAN_ARMS": 90, "POFUILLY_SLIME": 27, "POISON_LILY": 25, "POUILLY_SLIME": 100, "RAG_RAPPY": 100, "SAVAGE_WOLF": 30, "SINOW_BEAT": 60, "SINOW_GOLD": 55, "SO_DIMENIAN": 35, "VOL_OPT_2": 100}, "GrindProbTable": [ [100, 30, 25, 20], [0, 35, 23, 14], @@ -1979,8 +1949,6 @@ "CHAOS_SORCERER": [200, 400], "CLAW": [135, 245], "DARK_BELRA": [100, 130], - "DARK_FALZ_2": 0, - "DARK_FALZ_3": 0, "DARK_GUNNER": [150, 250], "DEATH_GUNNER": [150, 250], "DELSABER": [150, 300], @@ -2000,7 +1968,6 @@ "HILDEBLUE": [1500, 2000], "LA_DIMENIAN": [165, 275], "MIGIUM": [55, 135], - "MONEST": 0, "MOTHMANT": [120, 140], "NANO_DRAGON": [80, 310], "NAR_LILY": [2000, 2500], @@ -2063,8 +2030,6 @@ "CHAOS_SORCERER": [200, 425], "CLAW": [155, 335], "DARK_BELRA": [100, 160], - "DARK_FALZ_2": 0, - "DARK_FALZ_3": 0, "DARK_GUNNER": [150, 285], "DEATH_GUNNER": [150, 275], "DELSABER": [150, 330], @@ -2084,7 +2049,6 @@ "HILDEBLUE": [1500, 2000], "LA_DIMENIAN": [165, 275], "MIGIUM": [55, 165], - "MONEST": 0, "MOTHMANT": [120, 140], "NANO_DRAGON": [80, 310], "NAR_LILY": [2000, 2500], @@ -2135,7 +2099,7 @@ [210, 275], [220, 285] ], - "EnemyTypeDropProbs": {"AL_RAPPY": 100, "BARBAROUS_WOLF": 2, "BOOMA": 7, "BULCLAW": 4, "BULK": 7, "CANADINE": 2, "CANADINE_GROUP": 2, "CANANE": 2, "CHAOS_BRINGER": 4, "CHAOS_SORCERER": 4, "CLAW": 7, "DARK_BELRA": 2, "DARK_FALZ_2": 0, "DARK_FALZ_3": 0, "DARK_GUNNER": 2, "DEATH_GUNNER": 2, "DELSABER": 2, "DE_ROL_LE": 0, "DIMENIAN": 7, "DRAGON": 0, "DUBCHIC": 7, "EVIL_SHARK": 7, "GARANZ": 4, "GIGOBOOMA": 2, "GILLCHIC": 7, "GOBOOMA": 7, "GRASS_ASSASSIN": 10, "GUIL_SHARK": 7, "HIDOOM": 2, "HILDEBEAR": 10, "HILDEBLUE": 100, "LA_DIMENIAN": 7, "MIGIUM": 4, "MONEST": 0, "MOTHMANT": 7, "NANO_DRAGON": 2, "NAR_LILY": 100, "PAL_SHARK": 7, "PAN_ARMS": 2, "POFUILLY_SLIME": 2, "POISON_LILY": 2, "POUILLY_SLIME": 100, "RAG_RAPPY": 2, "SAVAGE_WOLF": 2, "SINOW_BEAT": 7, "SINOW_GOLD": 4, "SO_DIMENIAN": 2, "VOL_OPT_2": 0}, + "EnemyTypeDropProbs": {"AL_RAPPY": 100, "BARBAROUS_WOLF": 2, "BOOMA": 7, "BULCLAW": 4, "BULK": 7, "CANADINE": 2, "CANADINE_GROUP": 2, "CANANE": 2, "CHAOS_BRINGER": 4, "CHAOS_SORCERER": 4, "CLAW": 7, "DARK_BELRA": 2, "DARK_GUNNER": 2, "DEATH_GUNNER": 2, "DELSABER": 2, "DIMENIAN": 7, "DUBCHIC": 7, "EVIL_SHARK": 7, "GARANZ": 4, "GIGOBOOMA": 2, "GILLCHIC": 7, "GOBOOMA": 7, "GRASS_ASSASSIN": 10, "GUIL_SHARK": 7, "HIDOOM": 2, "HILDEBEAR": 10, "HILDEBLUE": 100, "LA_DIMENIAN": 7, "MIGIUM": 4, "MOTHMANT": 7, "NANO_DRAGON": 2, "NAR_LILY": 100, "PAL_SHARK": 7, "PAN_ARMS": 2, "POFUILLY_SLIME": 2, "POISON_LILY": 2, "POUILLY_SLIME": 100, "RAG_RAPPY": 2, "SAVAGE_WOLF": 2, "SINOW_BEAT": 7, "SINOW_GOLD": 4, "SO_DIMENIAN": 2}, "GrindProbTable": [ [100, 30, 25, 20], [0, 30, 23, 15], @@ -2483,8 +2447,8 @@ [130, 165], [135, 175] ], - "EnemyMesetaRanges": {"AL_RAPPY": 0, "BARBAROUS_WOLF": 0, "BOOMA": 0, "BULCLAW": 0, "BULK": 0, "CANADINE": 0, "CANADINE_GROUP": 0, "CANANE": 0, "CHAOS_BRINGER": 0, "CHAOS_SORCERER": 0, "CLAW": 0, "DARK_BELRA": 0, "DARK_FALZ_2": 0, "DARK_FALZ_3": 0, "DARK_GUNNER": 0, "DEATH_GUNNER": 0, "DELSABER": 0, "DE_ROL_LE": 0, "DIMENIAN": 0, "DRAGON": 0, "DUBCHIC": 0, "EVIL_SHARK": 0, "GARANZ": 0, "GIGOBOOMA": 0, "GILLCHIC": 0, "GOBOOMA": 0, "GRASS_ASSASSIN": 0, "GUIL_SHARK": 0, "HIDOOM": 0, "HILDEBEAR": 0, "HILDEBLUE": 0, "LA_DIMENIAN": 0, "MIGIUM": 0, "MONEST": 0, "MOTHMANT": 0, "NANO_DRAGON": 0, "NAR_LILY": 0, "PAL_SHARK": 0, "PAN_ARMS": 0, "POFUILLY_SLIME": 0, "POISON_LILY": 0, "POUILLY_SLIME": 0, "RAG_RAPPY": 0, "SAVAGE_WOLF": 0, "SINOW_BEAT": 0, "SINOW_GOLD": 0, "SO_DIMENIAN": 0, "VOL_OPT_2": 0}, - "EnemyTypeDropProbs": {"AL_RAPPY": 100, "BARBAROUS_WOLF": 12, "BOOMA": 20, "BULCLAW": 20, "BULK": 20, "CANADINE": 12, "CANADINE_GROUP": 12, "CANANE": 20, "CHAOS_BRINGER": 40, "CHAOS_SORCERER": 30, "CLAW": 20, "DARK_BELRA": 30, "DARK_FALZ_2": 0, "DARK_FALZ_3": 0, "DARK_GUNNER": 12, "DEATH_GUNNER": 12, "DELSABER": 25, "DE_ROL_LE": 0, "DIMENIAN": 21, "DRAGON": 0, "DUBCHIC": 20, "EVIL_SHARK": 20, "GARANZ": 25, "GIGOBOOMA": 12, "GILLCHIC": 20, "GOBOOMA": 20, "GRASS_ASSASSIN": 20, "GUIL_SHARK": 12, "HIDOOM": 30, "HILDEBEAR": 30, "HILDEBLUE": 100, "LA_DIMENIAN": 23, "MIGIUM": 30, "MONEST": 0, "MOTHMANT": 20, "NANO_DRAGON": 20, "NAR_LILY": 100, "PAL_SHARK": 20, "PAN_ARMS": 30, "POFUILLY_SLIME": 12, "POISON_LILY": 12, "POUILLY_SLIME": 100, "RAG_RAPPY": 12, "SAVAGE_WOLF": 12, "SINOW_BEAT": 12, "SINOW_GOLD": 20, "SO_DIMENIAN": 25, "VOL_OPT_2": 0}, + "EnemyMesetaRanges": {}, + "EnemyTypeDropProbs": {"AL_RAPPY": 100, "BARBAROUS_WOLF": 12, "BOOMA": 20, "BULCLAW": 20, "BULK": 20, "CANADINE": 12, "CANADINE_GROUP": 12, "CANANE": 20, "CHAOS_BRINGER": 40, "CHAOS_SORCERER": 30, "CLAW": 20, "DARK_BELRA": 30, "DARK_GUNNER": 12, "DEATH_GUNNER": 12, "DELSABER": 25, "DIMENIAN": 21, "DUBCHIC": 20, "EVIL_SHARK": 20, "GARANZ": 25, "GIGOBOOMA": 12, "GILLCHIC": 20, "GOBOOMA": 20, "GRASS_ASSASSIN": 20, "GUIL_SHARK": 12, "HIDOOM": 30, "HILDEBEAR": 30, "HILDEBLUE": 100, "LA_DIMENIAN": 23, "MIGIUM": 30, "MOTHMANT": 20, "NANO_DRAGON": 20, "NAR_LILY": 100, "PAL_SHARK": 20, "PAN_ARMS": 30, "POFUILLY_SLIME": 12, "POISON_LILY": 12, "POUILLY_SLIME": 100, "RAG_RAPPY": 12, "SAVAGE_WOLF": 12, "SINOW_BEAT": 12, "SINOW_GOLD": 20, "SO_DIMENIAN": 25}, "NonRareBonusProbSpec": [ [0, 0, 0, 1, 1, 1, 2, 2, 2, 3], [255, 255, 0, 0, 0, 1, 1, 1, 2, 2], @@ -2773,8 +2737,8 @@ [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [44, 43, 42, 42, 41, 41, 41, 39, 38, 38] ], - "EnemyMesetaRanges": {"AL_RAPPY": 0, "BARBAROUS_WOLF": 0, "BOOMA": 0, "BULCLAW": 0, "BULK": 0, "CANADINE": 0, "CANADINE_GROUP": 0, "CANANE": 0, "CHAOS_BRINGER": 0, "CHAOS_SORCERER": 0, "CLAW": 0, "DARK_BELRA": 0, "DARK_FALZ_2": 0, "DARK_FALZ_3": 0, "DARK_GUNNER": 0, "DEATH_GUNNER": 0, "DELSABER": 0, "DE_ROL_LE": 0, "DIMENIAN": 0, "DRAGON": 0, "DUBCHIC": 0, "EVIL_SHARK": 0, "GARANZ": 0, "GIGOBOOMA": 0, "GILLCHIC": 0, "GOBOOMA": 0, "GRASS_ASSASSIN": 0, "GUIL_SHARK": 0, "HIDOOM": 0, "HILDEBEAR": 0, "HILDEBLUE": 0, "LA_DIMENIAN": 0, "MIGIUM": 0, "MONEST": 0, "MOTHMANT": 0, "NANO_DRAGON": 0, "NAR_LILY": 0, "PAL_SHARK": 0, "PAN_ARMS": 0, "POFUILLY_SLIME": 0, "POISON_LILY": 0, "POUILLY_SLIME": 0, "RAG_RAPPY": 0, "SAVAGE_WOLF": 0, "SINOW_BEAT": 0, "SINOW_GOLD": 0, "SO_DIMENIAN": 0, "VOL_OPT_2": 0}, - "EnemyTypeDropProbs": {"AL_RAPPY": 100, "BARBAROUS_WOLF": 2, "BOOMA": 7, "BULCLAW": 4, "BULK": 7, "CANADINE": 2, "CANADINE_GROUP": 2, "CANANE": 2, "CHAOS_BRINGER": 4, "CHAOS_SORCERER": 4, "CLAW": 7, "DARK_BELRA": 2, "DARK_FALZ_2": 0, "DARK_FALZ_3": 0, "DARK_GUNNER": 2, "DEATH_GUNNER": 2, "DELSABER": 2, "DE_ROL_LE": 0, "DIMENIAN": 7, "DRAGON": 0, "DUBCHIC": 7, "EVIL_SHARK": 7, "GARANZ": 4, "GIGOBOOMA": 2, "GILLCHIC": 7, "GOBOOMA": 7, "GRASS_ASSASSIN": 10, "GUIL_SHARK": 7, "HIDOOM": 2, "HILDEBEAR": 10, "HILDEBLUE": 100, "LA_DIMENIAN": 7, "MIGIUM": 4, "MONEST": 0, "MOTHMANT": 7, "NANO_DRAGON": 2, "NAR_LILY": 100, "PAL_SHARK": 7, "PAN_ARMS": 2, "POFUILLY_SLIME": 2, "POISON_LILY": 2, "POUILLY_SLIME": 100, "RAG_RAPPY": 2, "SAVAGE_WOLF": 2, "SINOW_BEAT": 7, "SINOW_GOLD": 4, "SO_DIMENIAN": 2, "VOL_OPT_2": 0}, + "EnemyMesetaRanges": {}, + "EnemyTypeDropProbs": {"AL_RAPPY": 100, "BARBAROUS_WOLF": 2, "BOOMA": 7, "BULCLAW": 4, "BULK": 7, "CANADINE": 2, "CANADINE_GROUP": 2, "CANANE": 2, "CHAOS_BRINGER": 4, "CHAOS_SORCERER": 4, "CLAW": 7, "DARK_BELRA": 2, "DARK_GUNNER": 2, "DEATH_GUNNER": 2, "DELSABER": 2, "DIMENIAN": 7, "DUBCHIC": 7, "EVIL_SHARK": 7, "GARANZ": 4, "GIGOBOOMA": 2, "GILLCHIC": 7, "GOBOOMA": 7, "GRASS_ASSASSIN": 10, "GUIL_SHARK": 7, "HIDOOM": 2, "HILDEBEAR": 10, "HILDEBLUE": 100, "LA_DIMENIAN": 7, "MIGIUM": 4, "MOTHMANT": 7, "NANO_DRAGON": 2, "NAR_LILY": 100, "PAL_SHARK": 7, "PAN_ARMS": 2, "POFUILLY_SLIME": 2, "POISON_LILY": 2, "POUILLY_SLIME": 100, "RAG_RAPPY": 2, "SAVAGE_WOLF": 2, "SINOW_BEAT": 7, "SINOW_GOLD": 4, "SO_DIMENIAN": 2}, "TechniqueIndexProbTable": [ [108, 108, 108, 108, 109, 108, 110, 109, 120, 125], [80, 80, 80, 80, 84, 85, 84, 100, 104, 112], @@ -3039,7 +3003,7 @@ [380, 430], [400, 440] ], - "EnemyItemClasses": {"AL_RAPPY": 2, "BARBAROUS_WOLF": 2, "BOOMA": 0, "BULCLAW": 3, "BULK": 0, "CANADINE": 2, "CANADINE_GROUP": 2, "CANANE": 1, "CHAOS_BRINGER": 3, "CHAOS_SORCERER": 3, "CLAW": 0, "DARK_BELRA": 1, "DARK_FALZ_2": 255, "DARK_FALZ_3": 255, "DARK_GUNNER": 2, "DEATH_GUNNER": 2, "DELSABER": 1, "DE_ROL_LE": 255, "DIMENIAN": 0, "DRAGON": 255, "DUBCHIC": 0, "EVIL_SHARK": 0, "GARANZ": 2, "GIGOBOOMA": 3, "GILLCHIC": 0, "GOBOOMA": 0, "GRASS_ASSASSIN": 0, "GUIL_SHARK": 3, "HIDOOM": 1, "HILDEBEAR": 0, "HILDEBLUE": 0, "LA_DIMENIAN": 0, "MIGIUM": 3, "MONEST": 255, "MOTHMANT": 0, "NANO_DRAGON": 2, "NAR_LILY": 3, "PAL_SHARK": 0, "PAN_ARMS": 2, "POFUILLY_SLIME": 1, "POISON_LILY": 1, "POUILLY_SLIME": 3, "RAG_RAPPY": 2, "SAVAGE_WOLF": 1, "SINOW_BEAT": 0, "SINOW_GOLD": 3, "SO_DIMENIAN": 1, "VOL_OPT_2": 255}, + "EnemyItemClasses": {"AL_RAPPY": 2, "BARBAROUS_WOLF": 2, "BOOMA": 0, "BULCLAW": 3, "BULK": 0, "CANADINE": 2, "CANADINE_GROUP": 2, "CANANE": 1, "CHAOS_BRINGER": 3, "CHAOS_SORCERER": 3, "CLAW": 0, "DARK_BELRA": 1, "DARK_GUNNER": 2, "DEATH_GUNNER": 2, "DELSABER": 1, "DIMENIAN": 0, "DUBCHIC": 0, "EVIL_SHARK": 0, "GARANZ": 2, "GIGOBOOMA": 3, "GILLCHIC": 0, "GOBOOMA": 0, "GRASS_ASSASSIN": 0, "GUIL_SHARK": 3, "HIDOOM": 1, "HILDEBEAR": 0, "HILDEBLUE": 0, "LA_DIMENIAN": 0, "MIGIUM": 3, "MOTHMANT": 0, "NANO_DRAGON": 2, "NAR_LILY": 3, "PAL_SHARK": 0, "PAN_ARMS": 2, "POFUILLY_SLIME": 1, "POISON_LILY": 1, "POUILLY_SLIME": 3, "RAG_RAPPY": 2, "SAVAGE_WOLF": 1, "SINOW_BEAT": 0, "SINOW_GOLD": 3, "SO_DIMENIAN": 1}, "EnemyMesetaRanges": { "AL_RAPPY": [1500, 2000], "BARBAROUS_WOLF": [120, 164], @@ -3053,8 +3017,6 @@ "CHAOS_SORCERER": [200, 400], "CLAW": [135, 245], "DARK_BELRA": [100, 130], - "DARK_FALZ_2": 0, - "DARK_FALZ_3": 0, "DARK_GUNNER": [150, 250], "DEATH_GUNNER": [150, 250], "DELSABER": [150, 300], @@ -3074,7 +3036,6 @@ "HILDEBLUE": [1500, 2000], "LA_DIMENIAN": [165, 275], "MIGIUM": [55, 135], - "MONEST": 0, "MOTHMANT": [120, 140], "NANO_DRAGON": [80, 310], "NAR_LILY": [2000, 2500], @@ -3090,7 +3051,7 @@ "SO_DIMENIAN": [185, 295], "VOL_OPT_2": 3500 }, - "EnemyTypeDropProbs": {"AL_RAPPY": 100, "BARBAROUS_WOLF": 45, "BOOMA": 30, "BULCLAW": 45, "BULK": 35, "CANADINE": 35, "CANADINE_GROUP": 35, "CANANE": 35, "CHAOS_BRINGER": 88, "CHAOS_SORCERER": 35, "CLAW": 30, "DARK_BELRA": 45, "DARK_FALZ_2": 0, "DARK_FALZ_3": 0, "DARK_GUNNER": 45, "DEATH_GUNNER": 45, "DELSABER": 45, "DE_ROL_LE": 100, "DIMENIAN": 30, "DRAGON": 100, "DUBCHIC": 30, "EVIL_SHARK": 30, "GARANZ": 85, "GIGOBOOMA": 35, "GILLCHIC": 30, "GOBOOMA": 38, "GRASS_ASSASSIN": 55, "GUIL_SHARK": 15, "HIDOOM": 45, "HILDEBEAR": 85, "HILDEBLUE": 100, "LA_DIMENIAN": 35, "MIGIUM": 45, "MONEST": 0, "MOTHMANT": 25, "NANO_DRAGON": 55, "NAR_LILY": 100, "PAL_SHARK": 35, "PAN_ARMS": 90, "POFUILLY_SLIME": 27, "POISON_LILY": 25, "POUILLY_SLIME": 100, "RAG_RAPPY": 100, "SAVAGE_WOLF": 30, "SINOW_BEAT": 60, "SINOW_GOLD": 55, "SO_DIMENIAN": 35, "VOL_OPT_2": 100}, + "EnemyTypeDropProbs": {"AL_RAPPY": 100, "BARBAROUS_WOLF": 45, "BOOMA": 30, "BULCLAW": 45, "BULK": 35, "CANADINE": 35, "CANADINE_GROUP": 35, "CANANE": 35, "CHAOS_BRINGER": 88, "CHAOS_SORCERER": 35, "CLAW": 30, "DARK_BELRA": 45, "DARK_GUNNER": 45, "DEATH_GUNNER": 45, "DELSABER": 45, "DE_ROL_LE": 100, "DIMENIAN": 30, "DRAGON": 100, "DUBCHIC": 30, "EVIL_SHARK": 30, "GARANZ": 85, "GIGOBOOMA": 35, "GILLCHIC": 30, "GOBOOMA": 38, "GRASS_ASSASSIN": 55, "GUIL_SHARK": 15, "HIDOOM": 45, "HILDEBEAR": 85, "HILDEBLUE": 100, "LA_DIMENIAN": 35, "MIGIUM": 45, "MOTHMANT": 25, "NANO_DRAGON": 55, "NAR_LILY": 100, "PAL_SHARK": 35, "PAN_ARMS": 90, "POFUILLY_SLIME": 27, "POISON_LILY": 25, "POUILLY_SLIME": 100, "RAG_RAPPY": 100, "SAVAGE_WOLF": 30, "SINOW_BEAT": 60, "SINOW_GOLD": 55, "SO_DIMENIAN": 35, "VOL_OPT_2": 100}, "GrindProbTable": [ [100, 30, 25, 20], [0, 35, 23, 14], @@ -3480,8 +3441,6 @@ "CHAOS_SORCERER": [145, 200], "CLAW": [95, 145], "DARK_BELRA": [50, 80], - "DARK_FALZ_2": 0, - "DARK_FALZ_3": 0, "DARK_GUNNER": [100, 122], "DEATH_GUNNER": [100, 122], "DELSABER": [150, 165], @@ -3501,7 +3460,6 @@ "HILDEBLUE": [1000, 1500], "LA_DIMENIAN": [115, 165], "MIGIUM": [50, 85], - "MONEST": 0, "MOTHMANT": [80, 90], "NANO_DRAGON": [50, 170], "NAR_LILY": [1000, 2000], @@ -3517,7 +3475,7 @@ "SO_DIMENIAN": [135, 180], "VOL_OPT_2": 2000 }, - "EnemyTypeDropProbs": {"AL_RAPPY": 100, "BARBAROUS_WOLF": 45, "BOOMA": 28, "BULCLAW": 40, "BULK": 30, "CANADINE": 31, "CANADINE_GROUP": 31, "CANANE": 31, "CHAOS_BRINGER": 85, "CHAOS_SORCERER": 40, "CLAW": 28, "DARK_BELRA": 40, "DARK_FALZ_2": 0, "DARK_FALZ_3": 0, "DARK_GUNNER": 30, "DEATH_GUNNER": 30, "DELSABER": 35, "DE_ROL_LE": 100, "DIMENIAN": 28, "DRAGON": 100, "DUBCHIC": 28, "EVIL_SHARK": 28, "GARANZ": 80, "GIGOBOOMA": 35, "GILLCHIC": 28, "GOBOOMA": 32, "GRASS_ASSASSIN": 50, "GUIL_SHARK": 15, "HIDOOM": 40, "HILDEBEAR": 80, "HILDEBLUE": 100, "LA_DIMENIAN": 31, "MIGIUM": 40, "MONEST": 0, "MOTHMANT": 25, "NANO_DRAGON": 50, "NAR_LILY": 100, "PAL_SHARK": 32, "PAN_ARMS": 90, "POFUILLY_SLIME": 27, "POISON_LILY": 25, "POUILLY_SLIME": 100, "RAG_RAPPY": 100, "SAVAGE_WOLF": 30, "SINOW_BEAT": 50, "SINOW_GOLD": 50, "SO_DIMENIAN": 33, "VOL_OPT_2": 100}, + "EnemyTypeDropProbs": {"AL_RAPPY": 100, "BARBAROUS_WOLF": 45, "BOOMA": 28, "BULCLAW": 40, "BULK": 30, "CANADINE": 31, "CANADINE_GROUP": 31, "CANANE": 31, "CHAOS_BRINGER": 85, "CHAOS_SORCERER": 40, "CLAW": 28, "DARK_BELRA": 40, "DARK_GUNNER": 30, "DEATH_GUNNER": 30, "DELSABER": 35, "DE_ROL_LE": 100, "DIMENIAN": 28, "DRAGON": 100, "DUBCHIC": 28, "EVIL_SHARK": 28, "GARANZ": 80, "GIGOBOOMA": 35, "GILLCHIC": 28, "GOBOOMA": 32, "GRASS_ASSASSIN": 50, "GUIL_SHARK": 15, "HIDOOM": 40, "HILDEBEAR": 80, "HILDEBLUE": 100, "LA_DIMENIAN": 31, "MIGIUM": 40, "MOTHMANT": 25, "NANO_DRAGON": 50, "NAR_LILY": 100, "PAL_SHARK": 32, "PAN_ARMS": 90, "POFUILLY_SLIME": 27, "POISON_LILY": 25, "POUILLY_SLIME": 100, "RAG_RAPPY": 100, "SAVAGE_WOLF": 30, "SINOW_BEAT": 50, "SINOW_GOLD": 50, "SO_DIMENIAN": 33, "VOL_OPT_2": 100}, "GrindProbTable": [ [100, 30, 25, 20], [0, 30, 23, 15], @@ -3843,8 +3801,6 @@ "CHAOS_SORCERER": [145, 200], "CLAW": [95, 145], "DARK_BELRA": [50, 80], - "DARK_FALZ_2": 0, - "DARK_FALZ_3": 0, "DARK_GUNNER": [100, 122], "DEATH_GUNNER": [100, 122], "DELSABER": [150, 165], @@ -3864,7 +3820,6 @@ "HILDEBLUE": [1000, 1500], "LA_DIMENIAN": [115, 165], "MIGIUM": [50, 85], - "MONEST": 0, "MOTHMANT": [80, 90], "NANO_DRAGON": [50, 170], "NAR_LILY": [1000, 2000], @@ -3937,8 +3892,6 @@ "CHAOS_SORCERER": [145, 210], "CLAW": [95, 155], "DARK_BELRA": [50, 90], - "DARK_FALZ_2": 0, - "DARK_FALZ_3": 0, "DARK_GUNNER": [100, 132], "DEATH_GUNNER": [100, 132], "DELSABER": [150, 175], @@ -3958,7 +3911,6 @@ "HILDEBLUE": [1000, 1500], "LA_DIMENIAN": [115, 175], "MIGIUM": [50, 95], - "MONEST": 0, "MOTHMANT": [80, 100], "NANO_DRAGON": [50, 180], "NAR_LILY": [1000, 2000], @@ -4120,7 +4072,7 @@ [19, 50], [21, 55] ], - "EnemyItemClasses": {"AL_RAPPY": 2, "BARBAROUS_WOLF": 0, "BOOMA": 0, "BULCLAW": 3, "BULK": 0, "CANADINE": 2, "CANADINE_GROUP": 2, "CANANE": 1, "CHAOS_BRINGER": 3, "CHAOS_SORCERER": 3, "CLAW": 0, "DARK_BELRA": 1, "DARK_FALZ_2": 255, "DARK_FALZ_3": 255, "DARK_GUNNER": 2, "DEATH_GUNNER": 2, "DELSABER": 1, "DE_ROL_LE": 255, "DIMENIAN": 0, "DRAGON": 255, "DUBCHIC": 0, "EVIL_SHARK": 0, "GARANZ": 2, "GIGOBOOMA": 2, "GILLCHIC": 0, "GOBOOMA": 0, "GRASS_ASSASSIN": 0, "GUIL_SHARK": 3, "HIDOOM": 1, "HILDEBEAR": 0, "HILDEBLUE": 0, "LA_DIMENIAN": 0, "MIGIUM": 3, "MONEST": 255, "MOTHMANT": 0, "NANO_DRAGON": 2, "NAR_LILY": 3, "PAL_SHARK": 0, "PAN_ARMS": 2, "POFUILLY_SLIME": 1, "POISON_LILY": 1, "POUILLY_SLIME": 3, "RAG_RAPPY": 1, "SAVAGE_WOLF": 1, "SINOW_BEAT": 0, "SINOW_GOLD": 3, "SO_DIMENIAN": 1, "VOL_OPT_2": 255}, + "EnemyItemClasses": {"AL_RAPPY": 2, "BARBAROUS_WOLF": 0, "BOOMA": 0, "BULCLAW": 3, "BULK": 0, "CANADINE": 2, "CANADINE_GROUP": 2, "CANANE": 1, "CHAOS_BRINGER": 3, "CHAOS_SORCERER": 3, "CLAW": 0, "DARK_BELRA": 1, "DARK_GUNNER": 2, "DEATH_GUNNER": 2, "DELSABER": 1, "DIMENIAN": 0, "DUBCHIC": 0, "EVIL_SHARK": 0, "GARANZ": 2, "GIGOBOOMA": 2, "GILLCHIC": 0, "GOBOOMA": 0, "GRASS_ASSASSIN": 0, "GUIL_SHARK": 3, "HIDOOM": 1, "HILDEBEAR": 0, "HILDEBLUE": 0, "LA_DIMENIAN": 0, "MIGIUM": 3, "MOTHMANT": 0, "NANO_DRAGON": 2, "NAR_LILY": 3, "PAL_SHARK": 0, "PAN_ARMS": 2, "POFUILLY_SLIME": 1, "POISON_LILY": 1, "POUILLY_SLIME": 3, "RAG_RAPPY": 1, "SAVAGE_WOLF": 1, "SINOW_BEAT": 0, "SINOW_GOLD": 3, "SO_DIMENIAN": 1}, "EnemyMesetaRanges": { "AL_RAPPY": [500, 1000], "BARBAROUS_WOLF": [15, 30], @@ -4134,8 +4086,6 @@ "CHAOS_SORCERER": [115, 135], "CLAW": [45, 75], "DARK_BELRA": 10, - "DARK_FALZ_2": 0, - "DARK_FALZ_3": 0, "DARK_GUNNER": [110, 125], "DEATH_GUNNER": [110, 125], "DELSABER": [95, 100], @@ -4155,7 +4105,6 @@ "HILDEBLUE": [500, 1000], "LA_DIMENIAN": [100, 120], "MIGIUM": [15, 20], - "MONEST": 0, "MOTHMANT": [3, 6], "NANO_DRAGON": [60, 70], "NAR_LILY": [500, 1200], @@ -4171,7 +4120,7 @@ "SO_DIMENIAN": [120, 145], "VOL_OPT_2": 900 }, - "EnemyTypeDropProbs": {"AL_RAPPY": 100, "BARBAROUS_WOLF": 45, "BOOMA": 28, "BULCLAW": 40, "BULK": 30, "CANADINE": 33, "CANADINE_GROUP": 33, "CANANE": 33, "CHAOS_BRINGER": 85, "CHAOS_SORCERER": 30, "CLAW": 28, "DARK_BELRA": 40, "DARK_FALZ_2": 0, "DARK_FALZ_3": 0, "DARK_GUNNER": 40, "DEATH_GUNNER": 40, "DELSABER": 40, "DE_ROL_LE": 100, "DIMENIAN": 28, "DRAGON": 100, "DUBCHIC": 28, "EVIL_SHARK": 28, "GARANZ": 80, "GIGOBOOMA": 35, "GILLCHIC": 28, "GOBOOMA": 32, "GRASS_ASSASSIN": 50, "GUIL_SHARK": 15, "HIDOOM": 40, "HILDEBEAR": 80, "HILDEBLUE": 100, "LA_DIMENIAN": 31, "MIGIUM": 40, "MONEST": 0, "MOTHMANT": 25, "NANO_DRAGON": 50, "NAR_LILY": 100, "PAL_SHARK": 32, "PAN_ARMS": 90, "POFUILLY_SLIME": 27, "POISON_LILY": 25, "POUILLY_SLIME": 100, "RAG_RAPPY": 100, "SAVAGE_WOLF": 30, "SINOW_BEAT": 55, "SINOW_GOLD": 50, "SO_DIMENIAN": 33, "VOL_OPT_2": 100}, + "EnemyTypeDropProbs": {"AL_RAPPY": 100, "BARBAROUS_WOLF": 45, "BOOMA": 28, "BULCLAW": 40, "BULK": 30, "CANADINE": 33, "CANADINE_GROUP": 33, "CANANE": 33, "CHAOS_BRINGER": 85, "CHAOS_SORCERER": 30, "CLAW": 28, "DARK_BELRA": 40, "DARK_GUNNER": 40, "DEATH_GUNNER": 40, "DELSABER": 40, "DE_ROL_LE": 100, "DIMENIAN": 28, "DRAGON": 100, "DUBCHIC": 28, "EVIL_SHARK": 28, "GARANZ": 80, "GIGOBOOMA": 35, "GILLCHIC": 28, "GOBOOMA": 32, "GRASS_ASSASSIN": 50, "GUIL_SHARK": 15, "HIDOOM": 40, "HILDEBEAR": 80, "HILDEBLUE": 100, "LA_DIMENIAN": 31, "MIGIUM": 40, "MOTHMANT": 25, "NANO_DRAGON": 50, "NAR_LILY": 100, "PAL_SHARK": 32, "PAN_ARMS": 90, "POFUILLY_SLIME": 27, "POISON_LILY": 25, "POUILLY_SLIME": 100, "RAG_RAPPY": 100, "SAVAGE_WOLF": 30, "SINOW_BEAT": 55, "SINOW_GOLD": 50, "SO_DIMENIAN": 33, "VOL_OPT_2": 100}, "GrindProbTable": [ [100, 35, 30, 25], [0, 25, 20, 15], @@ -4498,8 +4447,6 @@ "CHAOS_SORCERER": [115, 135], "CLAW": [45, 75], "DARK_BELRA": 10, - "DARK_FALZ_2": 0, - "DARK_FALZ_3": 0, "DARK_GUNNER": [110, 125], "DEATH_GUNNER": [110, 125], "DELSABER": [95, 100], @@ -4519,7 +4466,6 @@ "HILDEBLUE": [500, 1000], "LA_DIMENIAN": [100, 120], "MIGIUM": [15, 20], - "MONEST": 0, "MOTHMANT": [3, 6], "NANO_DRAGON": [60, 70], "NAR_LILY": [500, 1200], @@ -4597,8 +4543,6 @@ "CHAOS_SORCERER": [120, 135], "CLAW": [50, 75], "DARK_BELRA": 10, - "DARK_FALZ_2": 0, - "DARK_FALZ_3": 0, "DARK_GUNNER": [105, 130], "DEATH_GUNNER": [105, 130], "DELSABER": [95, 100], @@ -4618,7 +4562,6 @@ "HILDEBLUE": [500, 1000], "LA_DIMENIAN": [105, 120], "MIGIUM": [17, 20], - "MONEST": 0, "MOTHMANT": [5, 6], "NANO_DRAGON": [65, 70], "NAR_LILY": [500, 1200], @@ -4672,8 +4615,6 @@ "CHAOS_SORCERER": [200, 400], "CLAW": [135, 245], "DARK_BELRA": [100, 130], - "DARK_FALZ_2": 0, - "DARK_FALZ_3": 0, "DARK_GUNNER": [150, 250], "DEATH_GUNNER": [150, 250], "DELSABER": [150, 300], @@ -4693,7 +4634,6 @@ "HILDEBLUE": [1500, 2000], "LA_DIMENIAN": [165, 275], "MIGIUM": [55, 135], - "MONEST": 0, "MOTHMANT": [120, 140], "NANO_DRAGON": [80, 310], "NAR_LILY": [2000, 2500], @@ -5107,8 +5047,6 @@ "CHAOS_SORCERER": [200, 400], "CLAW": [135, 245], "DARK_BELRA": [100, 130], - "DARK_FALZ_2": 0, - "DARK_FALZ_3": 0, "DARK_GUNNER": [150, 250], "DEATH_GUNNER": [150, 250], "DELSABER": [150, 300], @@ -5128,7 +5066,6 @@ "HILDEBLUE": [1500, 2000], "LA_DIMENIAN": [165, 275], "MIGIUM": [55, 135], - "MONEST": 0, "MOTHMANT": [120, 140], "NANO_DRAGON": [80, 310], "NAR_LILY": [2000, 2500], @@ -5191,8 +5128,6 @@ "CHAOS_SORCERER": [200, 425], "CLAW": [155, 335], "DARK_BELRA": [100, 160], - "DARK_FALZ_2": 0, - "DARK_FALZ_3": 0, "DARK_GUNNER": [150, 285], "DEATH_GUNNER": [150, 275], "DELSABER": [150, 330], @@ -5212,7 +5147,6 @@ "HILDEBLUE": [1500, 2000], "LA_DIMENIAN": [165, 275], "MIGIUM": [55, 165], - "MONEST": 0, "MOTHMANT": [120, 170], "NANO_DRAGON": [80, 340], "NAR_LILY": [2000, 2500], @@ -5249,8 +5183,6 @@ "CHAOS_SORCERER": [200, 400], "CLAW": [135, 245], "DARK_BELRA": [100, 130], - "DARK_FALZ_2": 0, - "DARK_FALZ_3": 0, "DARK_GUNNER": [150, 250], "DEATH_GUNNER": [150, 250], "DELSABER": [150, 300], @@ -5270,7 +5202,6 @@ "HILDEBLUE": [1500, 2000], "LA_DIMENIAN": [165, 275], "MIGIUM": [55, 135], - "MONEST": 0, "MOTHMANT": [120, 140], "NANO_DRAGON": [80, 310], "NAR_LILY": [2000, 2500], @@ -5352,7 +5283,7 @@ [56, 140], [58, 145] ], - "EnemyItemClasses": {"AL_RAPPY": 2, "BARBAROUS_WOLF": 2, "BOOMA": 0, "BULCLAW": 3, "BULK": 0, "CANADINE": 2, "CANADINE_GROUP": 2, "CANANE": 1, "CHAOS_BRINGER": 3, "CHAOS_SORCERER": 3, "CLAW": 0, "DARK_BELRA": 1, "DARK_FALZ_2": 255, "DARK_FALZ_3": 255, "DARK_GUNNER": 2, "DEATH_GUNNER": 2, "DELSABER": 1, "DE_ROL_LE": 255, "DIMENIAN": 0, "DRAGON": 255, "DUBCHIC": 0, "EVIL_SHARK": 0, "GARANZ": 2, "GIGOBOOMA": 3, "GILLCHIC": 0, "GOBOOMA": 0, "GRASS_ASSASSIN": 0, "GUIL_SHARK": 3, "HIDOOM": 1, "HILDEBEAR": 0, "HILDEBLUE": 0, "LA_DIMENIAN": 0, "MIGIUM": 3, "MONEST": 255, "MOTHMANT": 0, "NANO_DRAGON": 2, "NAR_LILY": 3, "PAL_SHARK": 0, "PAN_ARMS": 2, "POFUILLY_SLIME": 1, "POISON_LILY": 1, "POUILLY_SLIME": 3, "RAG_RAPPY": 2, "SAVAGE_WOLF": 1, "SINOW_BEAT": 0, "SINOW_GOLD": 3, "SO_DIMENIAN": 1, "VOL_OPT_2": 255}, + "EnemyItemClasses": {"AL_RAPPY": 2, "BARBAROUS_WOLF": 2, "BOOMA": 0, "BULCLAW": 3, "BULK": 0, "CANADINE": 2, "CANADINE_GROUP": 2, "CANANE": 1, "CHAOS_BRINGER": 3, "CHAOS_SORCERER": 3, "CLAW": 0, "DARK_BELRA": 1, "DARK_GUNNER": 2, "DEATH_GUNNER": 2, "DELSABER": 1, "DIMENIAN": 0, "DUBCHIC": 0, "EVIL_SHARK": 0, "GARANZ": 2, "GIGOBOOMA": 3, "GILLCHIC": 0, "GOBOOMA": 0, "GRASS_ASSASSIN": 0, "GUIL_SHARK": 3, "HIDOOM": 1, "HILDEBEAR": 0, "HILDEBLUE": 0, "LA_DIMENIAN": 0, "MIGIUM": 3, "MOTHMANT": 0, "NANO_DRAGON": 2, "NAR_LILY": 3, "PAL_SHARK": 0, "PAN_ARMS": 2, "POFUILLY_SLIME": 1, "POISON_LILY": 1, "POUILLY_SLIME": 3, "RAG_RAPPY": 2, "SAVAGE_WOLF": 1, "SINOW_BEAT": 0, "SINOW_GOLD": 3, "SO_DIMENIAN": 1}, "EnemyMesetaRanges": { "AL_RAPPY": [1500, 2000], "BARBAROUS_WOLF": [120, 164], @@ -5366,8 +5297,6 @@ "CHAOS_SORCERER": [200, 400], "CLAW": [135, 245], "DARK_BELRA": [100, 130], - "DARK_FALZ_2": 0, - "DARK_FALZ_3": 0, "DARK_GUNNER": [150, 250], "DEATH_GUNNER": [150, 250], "DELSABER": [150, 300], @@ -5387,7 +5316,6 @@ "HILDEBLUE": [1500, 2000], "LA_DIMENIAN": [165, 275], "MIGIUM": [55, 135], - "MONEST": 0, "MOTHMANT": [120, 140], "NANO_DRAGON": [80, 310], "NAR_LILY": [2000, 2500], @@ -5403,7 +5331,7 @@ "SO_DIMENIAN": [185, 295], "VOL_OPT_2": 3500 }, - "EnemyTypeDropProbs": {"AL_RAPPY": 100, "BARBAROUS_WOLF": 45, "BOOMA": 30, "BULCLAW": 45, "BULK": 35, "CANADINE": 35, "CANADINE_GROUP": 35, "CANANE": 35, "CHAOS_BRINGER": 88, "CHAOS_SORCERER": 35, "CLAW": 30, "DARK_BELRA": 45, "DARK_FALZ_2": 0, "DARK_FALZ_3": 0, "DARK_GUNNER": 45, "DEATH_GUNNER": 45, "DELSABER": 45, "DE_ROL_LE": 100, "DIMENIAN": 30, "DRAGON": 100, "DUBCHIC": 30, "EVIL_SHARK": 30, "GARANZ": 85, "GIGOBOOMA": 35, "GILLCHIC": 30, "GOBOOMA": 38, "GRASS_ASSASSIN": 55, "GUIL_SHARK": 15, "HIDOOM": 45, "HILDEBEAR": 85, "HILDEBLUE": 100, "LA_DIMENIAN": 35, "MIGIUM": 45, "MONEST": 0, "MOTHMANT": 25, "NANO_DRAGON": 55, "NAR_LILY": 100, "PAL_SHARK": 35, "PAN_ARMS": 90, "POFUILLY_SLIME": 27, "POISON_LILY": 25, "POUILLY_SLIME": 100, "RAG_RAPPY": 100, "SAVAGE_WOLF": 30, "SINOW_BEAT": 60, "SINOW_GOLD": 55, "SO_DIMENIAN": 35, "VOL_OPT_2": 100}, + "EnemyTypeDropProbs": {"AL_RAPPY": 100, "BARBAROUS_WOLF": 45, "BOOMA": 30, "BULCLAW": 45, "BULK": 35, "CANADINE": 35, "CANADINE_GROUP": 35, "CANANE": 35, "CHAOS_BRINGER": 88, "CHAOS_SORCERER": 35, "CLAW": 30, "DARK_BELRA": 45, "DARK_GUNNER": 45, "DEATH_GUNNER": 45, "DELSABER": 45, "DE_ROL_LE": 100, "DIMENIAN": 30, "DRAGON": 100, "DUBCHIC": 30, "EVIL_SHARK": 30, "GARANZ": 85, "GIGOBOOMA": 35, "GILLCHIC": 30, "GOBOOMA": 38, "GRASS_ASSASSIN": 55, "GUIL_SHARK": 15, "HIDOOM": 45, "HILDEBEAR": 85, "HILDEBLUE": 100, "LA_DIMENIAN": 35, "MIGIUM": 45, "MOTHMANT": 25, "NANO_DRAGON": 55, "NAR_LILY": 100, "PAL_SHARK": 35, "PAN_ARMS": 90, "POFUILLY_SLIME": 27, "POISON_LILY": 25, "POUILLY_SLIME": 100, "RAG_RAPPY": 100, "SAVAGE_WOLF": 30, "SINOW_BEAT": 60, "SINOW_GOLD": 55, "SO_DIMENIAN": 35, "VOL_OPT_2": 100}, "GrindProbTable": [ [100, 30, 25, 20], [0, 35, 23, 14], @@ -5729,8 +5657,6 @@ "CHAOS_SORCERER": [200, 400], "CLAW": [135, 245], "DARK_BELRA": [100, 130], - "DARK_FALZ_2": 0, - "DARK_FALZ_3": 0, "DARK_GUNNER": [150, 250], "DEATH_GUNNER": [150, 250], "DELSABER": [150, 300], @@ -5750,7 +5676,6 @@ "HILDEBLUE": [1500, 2000], "LA_DIMENIAN": [165, 275], "MIGIUM": [55, 135], - "MONEST": 0, "MOTHMANT": [120, 140], "NANO_DRAGON": [80, 310], "NAR_LILY": [2000, 2500], @@ -5813,8 +5738,6 @@ "CHAOS_SORCERER": [200, 425], "CLAW": [155, 335], "DARK_BELRA": [100, 160], - "DARK_FALZ_2": 0, - "DARK_FALZ_3": 0, "DARK_GUNNER": [150, 285], "DEATH_GUNNER": [150, 275], "DELSABER": [150, 330], @@ -5834,7 +5757,6 @@ "HILDEBLUE": [1500, 2000], "LA_DIMENIAN": [165, 275], "MIGIUM": [55, 165], - "MONEST": 0, "MOTHMANT": [120, 140], "NANO_DRAGON": [80, 310], "NAR_LILY": [2000, 2500], @@ -5958,8 +5880,6 @@ "CHAOS_SORCERER": [145, 200], "CLAW": [95, 145], "DARK_BELRA": [50, 80], - "DARK_FALZ_2": 0, - "DARK_FALZ_3": 0, "DARK_GUNNER": [100, 122], "DEATH_GUNNER": [100, 122], "DELSABER": [150, 165], @@ -5979,7 +5899,6 @@ "HILDEBLUE": [1000, 1500], "LA_DIMENIAN": [115, 165], "MIGIUM": [50, 85], - "MONEST": 0, "MOTHMANT": [80, 90], "NANO_DRAGON": [50, 170], "NAR_LILY": [1000, 2000], @@ -5995,7 +5914,7 @@ "SO_DIMENIAN": [135, 180], "VOL_OPT_2": 2000 }, - "EnemyTypeDropProbs": {"AL_RAPPY": 100, "BARBAROUS_WOLF": 45, "BOOMA": 28, "BULCLAW": 40, "BULK": 30, "CANADINE": 31, "CANADINE_GROUP": 31, "CANANE": 31, "CHAOS_BRINGER": 85, "CHAOS_SORCERER": 40, "CLAW": 28, "DARK_BELRA": 40, "DARK_FALZ_2": 0, "DARK_FALZ_3": 0, "DARK_GUNNER": 30, "DEATH_GUNNER": 30, "DELSABER": 35, "DE_ROL_LE": 100, "DIMENIAN": 28, "DRAGON": 100, "DUBCHIC": 28, "EVIL_SHARK": 28, "GARANZ": 80, "GIGOBOOMA": 35, "GILLCHIC": 28, "GOBOOMA": 32, "GRASS_ASSASSIN": 50, "GUIL_SHARK": 15, "HIDOOM": 40, "HILDEBEAR": 80, "HILDEBLUE": 100, "LA_DIMENIAN": 31, "MIGIUM": 40, "MONEST": 0, "MOTHMANT": 25, "NANO_DRAGON": 50, "NAR_LILY": 100, "PAL_SHARK": 32, "PAN_ARMS": 90, "POFUILLY_SLIME": 27, "POISON_LILY": 25, "POUILLY_SLIME": 100, "RAG_RAPPY": 100, "SAVAGE_WOLF": 30, "SINOW_BEAT": 50, "SINOW_GOLD": 50, "SO_DIMENIAN": 33, "VOL_OPT_2": 100}, + "EnemyTypeDropProbs": {"AL_RAPPY": 100, "BARBAROUS_WOLF": 45, "BOOMA": 28, "BULCLAW": 40, "BULK": 30, "CANADINE": 31, "CANADINE_GROUP": 31, "CANANE": 31, "CHAOS_BRINGER": 85, "CHAOS_SORCERER": 40, "CLAW": 28, "DARK_BELRA": 40, "DARK_GUNNER": 30, "DEATH_GUNNER": 30, "DELSABER": 35, "DE_ROL_LE": 100, "DIMENIAN": 28, "DRAGON": 100, "DUBCHIC": 28, "EVIL_SHARK": 28, "GARANZ": 80, "GIGOBOOMA": 35, "GILLCHIC": 28, "GOBOOMA": 32, "GRASS_ASSASSIN": 50, "GUIL_SHARK": 15, "HIDOOM": 40, "HILDEBEAR": 80, "HILDEBLUE": 100, "LA_DIMENIAN": 31, "MIGIUM": 40, "MOTHMANT": 25, "NANO_DRAGON": 50, "NAR_LILY": 100, "PAL_SHARK": 32, "PAN_ARMS": 90, "POFUILLY_SLIME": 27, "POISON_LILY": 25, "POUILLY_SLIME": 100, "RAG_RAPPY": 100, "SAVAGE_WOLF": 30, "SINOW_BEAT": 50, "SINOW_GOLD": 50, "SO_DIMENIAN": 33, "VOL_OPT_2": 100}, "GrindProbTable": [ [100, 30, 25, 20], [0, 30, 23, 15], @@ -6321,8 +6240,6 @@ "CHAOS_SORCERER": [145, 200], "CLAW": [95, 145], "DARK_BELRA": [50, 80], - "DARK_FALZ_2": 0, - "DARK_FALZ_3": 0, "DARK_GUNNER": [100, 122], "DEATH_GUNNER": [100, 122], "DELSABER": [150, 165], @@ -6342,7 +6259,6 @@ "HILDEBLUE": [1000, 1500], "LA_DIMENIAN": [115, 165], "MIGIUM": [50, 85], - "MONEST": 0, "MOTHMANT": [80, 90], "NANO_DRAGON": [50, 170], "NAR_LILY": [1000, 2000], @@ -6415,8 +6331,6 @@ "CHAOS_SORCERER": [145, 210], "CLAW": [95, 155], "DARK_BELRA": [50, 90], - "DARK_FALZ_2": 0, - "DARK_FALZ_3": 0, "DARK_GUNNER": [100, 132], "DEATH_GUNNER": [100, 132], "DELSABER": [150, 175], @@ -6436,7 +6350,6 @@ "HILDEBLUE": [1000, 1500], "LA_DIMENIAN": [115, 175], "MIGIUM": [50, 95], - "MONEST": 0, "MOTHMANT": [80, 100], "NANO_DRAGON": [50, 180], "NAR_LILY": [1000, 2000], @@ -6584,8 +6497,6 @@ "CHAOS_SORCERER": [115, 135], "CLAW": [45, 75], "DARK_BELRA": 10, - "DARK_FALZ_2": 0, - "DARK_FALZ_3": 0, "DARK_GUNNER": [110, 125], "DEATH_GUNNER": [110, 125], "DELSABER": [95, 100], @@ -6605,7 +6516,6 @@ "HILDEBLUE": [500, 1000], "LA_DIMENIAN": [100, 120], "MIGIUM": [15, 20], - "MONEST": 0, "MOTHMANT": [3, 6], "NANO_DRAGON": [60, 70], "NAR_LILY": [500, 1200], @@ -6683,8 +6593,6 @@ "CHAOS_SORCERER": [120, 135], "CLAW": [50, 75], "DARK_BELRA": 10, - "DARK_FALZ_2": 0, - "DARK_FALZ_3": 0, "DARK_GUNNER": [105, 130], "DEATH_GUNNER": [105, 130], "DELSABER": [95, 100], @@ -6704,7 +6612,6 @@ "HILDEBLUE": [500, 1000], "LA_DIMENIAN": [105, 120], "MIGIUM": [17, 20], - "MONEST": 0, "MOTHMANT": [5, 6], "NANO_DRAGON": [65, 70], "NAR_LILY": [500, 1200], @@ -6758,8 +6665,6 @@ "CHAOS_SORCERER": [200, 400], "CLAW": [135, 245], "DARK_BELRA": [100, 130], - "DARK_FALZ_2": 0, - "DARK_FALZ_3": 0, "DARK_GUNNER": [150, 250], "DEATH_GUNNER": [150, 250], "DELSABER": [150, 300], @@ -6779,7 +6684,6 @@ "HILDEBLUE": [1500, 2000], "LA_DIMENIAN": [165, 275], "MIGIUM": [55, 135], - "MONEST": 0, "MOTHMANT": [120, 140], "NANO_DRAGON": [80, 310], "NAR_LILY": [2000, 2500], @@ -7193,8 +7097,6 @@ "CHAOS_SORCERER": [200, 400], "CLAW": [135, 245], "DARK_BELRA": [100, 130], - "DARK_FALZ_2": 0, - "DARK_FALZ_3": 0, "DARK_GUNNER": [150, 250], "DEATH_GUNNER": [150, 250], "DELSABER": [150, 300], @@ -7214,7 +7116,6 @@ "HILDEBLUE": [1500, 2000], "LA_DIMENIAN": [165, 275], "MIGIUM": [55, 135], - "MONEST": 0, "MOTHMANT": [120, 140], "NANO_DRAGON": [80, 310], "NAR_LILY": [2000, 2500], @@ -7277,8 +7178,6 @@ "CHAOS_SORCERER": [200, 425], "CLAW": [155, 335], "DARK_BELRA": [100, 160], - "DARK_FALZ_2": 0, - "DARK_FALZ_3": 0, "DARK_GUNNER": [150, 285], "DEATH_GUNNER": [150, 275], "DELSABER": [150, 330], @@ -7298,7 +7197,6 @@ "HILDEBLUE": [1500, 2000], "LA_DIMENIAN": [165, 275], "MIGIUM": [55, 165], - "MONEST": 0, "MOTHMANT": [120, 170], "NANO_DRAGON": [80, 340], "NAR_LILY": [2000, 2500], @@ -7335,8 +7233,6 @@ "CHAOS_SORCERER": [200, 400], "CLAW": [135, 245], "DARK_BELRA": [100, 130], - "DARK_FALZ_2": 0, - "DARK_FALZ_3": 0, "DARK_GUNNER": [150, 250], "DEATH_GUNNER": [150, 250], "DELSABER": [150, 300], @@ -7356,7 +7252,6 @@ "HILDEBLUE": [1500, 2000], "LA_DIMENIAN": [165, 275], "MIGIUM": [55, 135], - "MONEST": 0, "MOTHMANT": [120, 140], "NANO_DRAGON": [80, 310], "NAR_LILY": [2000, 2500], @@ -7438,7 +7333,7 @@ [56, 140], [58, 145] ], - "EnemyItemClasses": {"AL_RAPPY": 2, "BARBAROUS_WOLF": 2, "BOOMA": 0, "BULCLAW": 3, "BULK": 0, "CANADINE": 2, "CANADINE_GROUP": 2, "CANANE": 1, "CHAOS_BRINGER": 3, "CHAOS_SORCERER": 3, "CLAW": 0, "DARK_BELRA": 1, "DARK_FALZ_2": 255, "DARK_FALZ_3": 255, "DARK_GUNNER": 2, "DEATH_GUNNER": 2, "DELSABER": 1, "DE_ROL_LE": 255, "DIMENIAN": 0, "DRAGON": 255, "DUBCHIC": 0, "EVIL_SHARK": 0, "GARANZ": 2, "GIGOBOOMA": 3, "GILLCHIC": 0, "GOBOOMA": 0, "GRASS_ASSASSIN": 0, "GUIL_SHARK": 3, "HIDOOM": 1, "HILDEBEAR": 0, "HILDEBLUE": 0, "LA_DIMENIAN": 0, "MIGIUM": 3, "MONEST": 255, "MOTHMANT": 0, "NANO_DRAGON": 2, "NAR_LILY": 3, "PAL_SHARK": 0, "PAN_ARMS": 2, "POFUILLY_SLIME": 1, "POISON_LILY": 1, "POUILLY_SLIME": 3, "RAG_RAPPY": 2, "SAVAGE_WOLF": 1, "SINOW_BEAT": 0, "SINOW_GOLD": 3, "SO_DIMENIAN": 1, "VOL_OPT_2": 255}, + "EnemyItemClasses": {"AL_RAPPY": 2, "BARBAROUS_WOLF": 2, "BOOMA": 0, "BULCLAW": 3, "BULK": 0, "CANADINE": 2, "CANADINE_GROUP": 2, "CANANE": 1, "CHAOS_BRINGER": 3, "CHAOS_SORCERER": 3, "CLAW": 0, "DARK_BELRA": 1, "DARK_GUNNER": 2, "DEATH_GUNNER": 2, "DELSABER": 1, "DIMENIAN": 0, "DUBCHIC": 0, "EVIL_SHARK": 0, "GARANZ": 2, "GIGOBOOMA": 3, "GILLCHIC": 0, "GOBOOMA": 0, "GRASS_ASSASSIN": 0, "GUIL_SHARK": 3, "HIDOOM": 1, "HILDEBEAR": 0, "HILDEBLUE": 0, "LA_DIMENIAN": 0, "MIGIUM": 3, "MOTHMANT": 0, "NANO_DRAGON": 2, "NAR_LILY": 3, "PAL_SHARK": 0, "PAN_ARMS": 2, "POFUILLY_SLIME": 1, "POISON_LILY": 1, "POUILLY_SLIME": 3, "RAG_RAPPY": 2, "SAVAGE_WOLF": 1, "SINOW_BEAT": 0, "SINOW_GOLD": 3, "SO_DIMENIAN": 1}, "EnemyMesetaRanges": { "AL_RAPPY": [1500, 2000], "BARBAROUS_WOLF": [120, 164], @@ -7452,8 +7347,6 @@ "CHAOS_SORCERER": [200, 400], "CLAW": [135, 245], "DARK_BELRA": [100, 130], - "DARK_FALZ_2": 0, - "DARK_FALZ_3": 0, "DARK_GUNNER": [150, 250], "DEATH_GUNNER": [150, 250], "DELSABER": [150, 300], @@ -7473,7 +7366,6 @@ "HILDEBLUE": [1500, 2000], "LA_DIMENIAN": [165, 275], "MIGIUM": [55, 135], - "MONEST": 0, "MOTHMANT": [120, 140], "NANO_DRAGON": [80, 310], "NAR_LILY": [2000, 2500], @@ -7489,7 +7381,7 @@ "SO_DIMENIAN": [185, 295], "VOL_OPT_2": 3500 }, - "EnemyTypeDropProbs": {"AL_RAPPY": 100, "BARBAROUS_WOLF": 45, "BOOMA": 30, "BULCLAW": 45, "BULK": 35, "CANADINE": 35, "CANADINE_GROUP": 35, "CANANE": 35, "CHAOS_BRINGER": 88, "CHAOS_SORCERER": 35, "CLAW": 30, "DARK_BELRA": 45, "DARK_FALZ_2": 0, "DARK_FALZ_3": 0, "DARK_GUNNER": 45, "DEATH_GUNNER": 45, "DELSABER": 45, "DE_ROL_LE": 100, "DIMENIAN": 30, "DRAGON": 100, "DUBCHIC": 30, "EVIL_SHARK": 30, "GARANZ": 85, "GIGOBOOMA": 35, "GILLCHIC": 30, "GOBOOMA": 38, "GRASS_ASSASSIN": 55, "GUIL_SHARK": 15, "HIDOOM": 45, "HILDEBEAR": 85, "HILDEBLUE": 100, "LA_DIMENIAN": 35, "MIGIUM": 45, "MONEST": 0, "MOTHMANT": 25, "NANO_DRAGON": 55, "NAR_LILY": 100, "PAL_SHARK": 35, "PAN_ARMS": 90, "POFUILLY_SLIME": 27, "POISON_LILY": 25, "POUILLY_SLIME": 100, "RAG_RAPPY": 100, "SAVAGE_WOLF": 30, "SINOW_BEAT": 60, "SINOW_GOLD": 55, "SO_DIMENIAN": 35, "VOL_OPT_2": 100}, + "EnemyTypeDropProbs": {"AL_RAPPY": 100, "BARBAROUS_WOLF": 45, "BOOMA": 30, "BULCLAW": 45, "BULK": 35, "CANADINE": 35, "CANADINE_GROUP": 35, "CANANE": 35, "CHAOS_BRINGER": 88, "CHAOS_SORCERER": 35, "CLAW": 30, "DARK_BELRA": 45, "DARK_GUNNER": 45, "DEATH_GUNNER": 45, "DELSABER": 45, "DE_ROL_LE": 100, "DIMENIAN": 30, "DRAGON": 100, "DUBCHIC": 30, "EVIL_SHARK": 30, "GARANZ": 85, "GIGOBOOMA": 35, "GILLCHIC": 30, "GOBOOMA": 38, "GRASS_ASSASSIN": 55, "GUIL_SHARK": 15, "HIDOOM": 45, "HILDEBEAR": 85, "HILDEBLUE": 100, "LA_DIMENIAN": 35, "MIGIUM": 45, "MOTHMANT": 25, "NANO_DRAGON": 55, "NAR_LILY": 100, "PAL_SHARK": 35, "PAN_ARMS": 90, "POFUILLY_SLIME": 27, "POISON_LILY": 25, "POUILLY_SLIME": 100, "RAG_RAPPY": 100, "SAVAGE_WOLF": 30, "SINOW_BEAT": 60, "SINOW_GOLD": 55, "SO_DIMENIAN": 35, "VOL_OPT_2": 100}, "GrindProbTable": [ [100, 30, 25, 20], [0, 35, 23, 14], @@ -7815,8 +7707,6 @@ "CHAOS_SORCERER": [200, 400], "CLAW": [135, 245], "DARK_BELRA": [100, 130], - "DARK_FALZ_2": 0, - "DARK_FALZ_3": 0, "DARK_GUNNER": [150, 250], "DEATH_GUNNER": [150, 250], "DELSABER": [150, 300], @@ -7836,7 +7726,6 @@ "HILDEBLUE": [1500, 2000], "LA_DIMENIAN": [165, 275], "MIGIUM": [55, 135], - "MONEST": 0, "MOTHMANT": [120, 140], "NANO_DRAGON": [80, 310], "NAR_LILY": [2000, 2500], @@ -7899,8 +7788,6 @@ "CHAOS_SORCERER": [200, 425], "CLAW": [155, 335], "DARK_BELRA": [100, 160], - "DARK_FALZ_2": 0, - "DARK_FALZ_3": 0, "DARK_GUNNER": [150, 285], "DEATH_GUNNER": [150, 275], "DELSABER": [150, 330], @@ -7920,7 +7807,6 @@ "HILDEBLUE": [1500, 2000], "LA_DIMENIAN": [165, 275], "MIGIUM": [55, 165], - "MONEST": 0, "MOTHMANT": [120, 140], "NANO_DRAGON": [80, 310], "NAR_LILY": [2000, 2500], @@ -8029,7 +7915,7 @@ [44, 110], [46, 115] ], - "EnemyItemClasses": {"BARBAROUS_WOLF": 0, "BARBA_RAY": 255, "BARBA_RAY_JOINT": 255, "CHAOS_SORCERER": 3, "DARK_BELRA": 1, "DELBITER": 0, "DELDEPTH": 2, "DELSABER": 1, "DEL_LILY": 2, "DIMENIAN": 0, "DOLMDARL": 0, "DOLMOLM": 0, "DUBCHIC": 0, "EGG_RAPPY": 255, "EPSILON": 3, "GAL_GRYPHON": 255, "GARANZ": 2, "GEE": 0, "GIBBLES": 3, "GILLCHIC": 0, "GI_GUE": 2, "GOL_DRAGON": 255, "GRASS_ASSASSIN": 0, "HALLO_RAPPY": 255, "HIDOOM": 1, "HILDEBEAR": 0, "HILDEBLUE": 0, "ILL_GILL": 0, "LA_DIMENIAN": 0, "LOVE_RAPPY": 2, "MERICARAND": 3, "MERICAROL": 3, "MERICUS": 2, "MERIKLE": 1, "MERILLIA": 0, "MERILTAS": 0, "MIGIUM": 3, "MONEST": 255, "MORFOS": 0, "MOTHMANT": 0, "NAR_LILY": 3, "OLGA_FLOW_2": 255, "PAN_ARMS": 2, "POISON_LILY": 1, "RAG_RAPPY": 1, "RECOBOX": 3, "RECON": 0, "SAINT_RAPPY": 255, "SAVAGE_WOLF": 1, "SINOW_BERILL": 0, "SINOW_SPIGELL": 1, "SINOW_ZELE": 1, "SINOW_ZOA": 0, "SO_DIMENIAN": 1, "UL_GIBBON": 0, "ZOL_GIBBON": 2}, + "EnemyItemClasses": {"BARBAROUS_WOLF": 0, "CHAOS_SORCERER": 3, "DARK_BELRA": 1, "DELBITER": 0, "DELDEPTH": 2, "DELSABER": 1, "DEL_LILY": 2, "DIMENIAN": 0, "DOLMDARL": 0, "DOLMOLM": 0, "DUBCHIC": 0, "EPSILON": 3, "GARANZ": 2, "GEE": 0, "GIBBLES": 3, "GILLCHIC": 0, "GI_GUE": 2, "GRASS_ASSASSIN": 0, "HIDOOM": 1, "HILDEBEAR": 0, "HILDEBLUE": 0, "ILL_GILL": 0, "LA_DIMENIAN": 0, "LOVE_RAPPY": 2, "MERICARAND": 3, "MERICAROL": 3, "MERICUS": 2, "MERIKLE": 1, "MERILLIA": 0, "MERILTAS": 0, "MIGIUM": 3, "MORFOS": 0, "MOTHMANT": 0, "NAR_LILY": 3, "PAN_ARMS": 2, "POISON_LILY": 1, "RAG_RAPPY": 1, "RECOBOX": 3, "RECON": 0, "SAVAGE_WOLF": 1, "SINOW_BERILL": 0, "SINOW_SPIGELL": 1, "SINOW_ZELE": 1, "SINOW_ZOA": 0, "SO_DIMENIAN": 1, "UL_GIBBON": 0, "ZOL_GIBBON": 2}, "EnemyMesetaRanges": { "BARBAROUS_WOLF": [100, 180], "BARBA_RAY": 1300, @@ -8068,11 +7954,9 @@ "MERILLIA": [60, 65], "MERILTAS": [70, 85], "MIGIUM": [120, 185], - "MONEST": 0, "MORFOS": [50, 80], "MOTHMANT": [80, 90], "NAR_LILY": [1000, 2000], - "OLGA_FLOW_2": 0, "PAN_ARMS": [50, 85], "POISON_LILY": [60, 65], "RAG_RAPPY": [85, 100], @@ -9127,7 +9011,7 @@ [64, 160], [66, 165] ], - "EnemyItemClasses": {"BARBAROUS_WOLF": 2, "BARBA_RAY": 255, "BARBA_RAY_JOINT": 255, "CHAOS_SORCERER": 3, "DARK_BELRA": 1, "DELBITER": 0, "DELDEPTH": 2, "DELSABER": 1, "DEL_LILY": 1, "DIMENIAN": 0, "DOLMDARL": 0, "DOLMOLM": 0, "DUBCHIC": 0, "EGG_RAPPY": 255, "EPSILON": 3, "GAL_GRYPHON": 255, "GARANZ": 2, "GEE": 0, "GIBBLES": 3, "GILLCHIC": 0, "GI_GUE": 2, "GOL_DRAGON": 255, "GRASS_ASSASSIN": 0, "HALLO_RAPPY": 255, "HIDOOM": 1, "HILDEBEAR": 0, "HILDEBLUE": 0, "ILL_GILL": 0, "LA_DIMENIAN": 0, "LOVE_RAPPY": 2, "MERICARAND": 3, "MERICAROL": 3, "MERICUS": 2, "MERIKLE": 1, "MERILLIA": 0, "MERILTAS": 0, "MIGIUM": 3, "MONEST": 255, "MORFOS": 0, "MOTHMANT": 0, "NAR_LILY": 3, "OLGA_FLOW_2": 255, "PAN_ARMS": 2, "POISON_LILY": 1, "RAG_RAPPY": 2, "RECOBOX": 3, "RECON": 0, "SAINT_RAPPY": 255, "SAVAGE_WOLF": 1, "SINOW_BERILL": 0, "SINOW_SPIGELL": 1, "SINOW_ZELE": 1, "SINOW_ZOA": 0, "SO_DIMENIAN": 1, "UL_GIBBON": 0, "ZOL_GIBBON": 2}, + "EnemyItemClasses": {"BARBAROUS_WOLF": 2, "CHAOS_SORCERER": 3, "DARK_BELRA": 1, "DELBITER": 0, "DELDEPTH": 2, "DELSABER": 1, "DEL_LILY": 1, "DIMENIAN": 0, "DOLMDARL": 0, "DOLMOLM": 0, "DUBCHIC": 0, "EPSILON": 3, "GARANZ": 2, "GEE": 0, "GIBBLES": 3, "GILLCHIC": 0, "GI_GUE": 2, "GRASS_ASSASSIN": 0, "HIDOOM": 1, "HILDEBEAR": 0, "HILDEBLUE": 0, "ILL_GILL": 0, "LA_DIMENIAN": 0, "LOVE_RAPPY": 2, "MERICARAND": 3, "MERICAROL": 3, "MERICUS": 2, "MERIKLE": 1, "MERILLIA": 0, "MERILTAS": 0, "MIGIUM": 3, "MORFOS": 0, "MOTHMANT": 0, "NAR_LILY": 3, "PAN_ARMS": 2, "POISON_LILY": 1, "RAG_RAPPY": 2, "RECOBOX": 3, "RECON": 0, "SAVAGE_WOLF": 1, "SINOW_BERILL": 0, "SINOW_SPIGELL": 1, "SINOW_ZELE": 1, "SINOW_ZOA": 0, "SO_DIMENIAN": 1, "UL_GIBBON": 0, "ZOL_GIBBON": 2}, "EnemyMesetaRanges": { "BARBAROUS_WOLF": [150, 260], "BARBA_RAY": 2800, @@ -9166,11 +9050,9 @@ "MERILLIA": [90, 110], "MERILTAS": [100, 135], "MIGIUM": [55, 135], - "MONEST": 0, "MORFOS": [151, 171], "MOTHMANT": [120, 140], "NAR_LILY": [2000, 2500], - "OLGA_FLOW_2": 0, "PAN_ARMS": [165, 265], "POISON_LILY": [90, 110], "RAG_RAPPY": [85, 150], @@ -9567,8 +9449,8 @@ [210, 275], [220, 285] ], - "EnemyItemClasses": {"BARBAROUS_WOLF": 0, "BARBA_RAY": 255, "BARBA_RAY_JOINT": 255, "CHAOS_SORCERER": 3, "DARK_BELRA": 1, "DELBITER": 0, "DELDEPTH": 2, "DELSABER": 1, "DEL_LILY": 2, "DIMENIAN": 0, "DOLMDARL": 0, "DOLMOLM": 0, "DUBCHIC": 0, "EGG_RAPPY": 255, "EPSILON": 3, "GAL_GRYPHON": 255, "GARANZ": 2, "GEE": 0, "GIBBLES": 3, "GILLCHIC": 0, "GI_GUE": 2, "GOL_DRAGON": 255, "GRASS_ASSASSIN": 0, "HALLO_RAPPY": 255, "HIDOOM": 1, "HILDEBEAR": 0, "HILDEBLUE": 0, "ILL_GILL": 0, "LA_DIMENIAN": 0, "LOVE_RAPPY": 2, "MERICARAND": 3, "MERICAROL": 3, "MERICUS": 2, "MERIKLE": 1, "MERILLIA": 0, "MERILTAS": 0, "MIGIUM": 3, "MONEST": 255, "MORFOS": 0, "MOTHMANT": 0, "NAR_LILY": 3, "OLGA_FLOW_2": 255, "PAN_ARMS": 2, "POISON_LILY": 1, "RAG_RAPPY": 1, "RECOBOX": 3, "RECON": 0, "SAINT_RAPPY": 255, "SAVAGE_WOLF": 1, "SINOW_BERILL": 0, "SINOW_SPIGELL": 1, "SINOW_ZELE": 1, "SINOW_ZOA": 0, "SO_DIMENIAN": 1, "UL_GIBBON": 0, "ZOL_GIBBON": 2}, - "EnemyTypeDropProbs": {"BARBAROUS_WOLF": 2, "BARBA_RAY": 100, "BARBA_RAY_JOINT": 100, "CHAOS_SORCERER": 7, "DARK_BELRA": 7, "DELBITER": 7, "DELDEPTH": 4, "DELSABER": 4, "DEL_LILY": 7, "DIMENIAN": 2, "DOLMDARL": 4, "DOLMOLM": 2, "DUBCHIC": 7, "EGG_RAPPY": 100, "EPSILON": 7, "GAL_GRYPHON": 100, "GARANZ": 7, "GEE": 2, "GIBBLES": 10, "GILLCHIC": 2, "GI_GUE": 10, "GOL_DRAGON": 100, "GRASS_ASSASSIN": 4, "HALLO_RAPPY": 100, "HIDOOM": 10, "HILDEBEAR": 10, "HILDEBLUE": 100, "ILL_GILL": 7, "LA_DIMENIAN": 4, "LOVE_RAPPY": 100, "MERICARAND": 10, "MERICAROL": 10, "MERICUS": 10, "MERIKLE": 10, "MERILLIA": 2, "MERILTAS": 4, "MIGIUM": 10, "MONEST": 0, "MORFOS": 4, "MOTHMANT": 1, "NAR_LILY": 100, "OLGA_FLOW_2": 0, "PAN_ARMS": 10, "POISON_LILY": 2, "RAG_RAPPY": 2, "RECOBOX": 2, "RECON": 1, "SAINT_RAPPY": 100, "SAVAGE_WOLF": 2, "SINOW_BERILL": 2, "SINOW_SPIGELL": 4, "SINOW_ZELE": 4, "SINOW_ZOA": 2, "SO_DIMENIAN": 4, "UL_GIBBON": 2, "ZOL_GIBBON": 4}, + "EnemyItemClasses": {"BARBAROUS_WOLF": 0, "CHAOS_SORCERER": 3, "DARK_BELRA": 1, "DELBITER": 0, "DELDEPTH": 2, "DELSABER": 1, "DEL_LILY": 2, "DIMENIAN": 0, "DOLMDARL": 0, "DOLMOLM": 0, "DUBCHIC": 0, "EPSILON": 3, "GARANZ": 2, "GEE": 0, "GIBBLES": 3, "GILLCHIC": 0, "GI_GUE": 2, "GRASS_ASSASSIN": 0, "HIDOOM": 1, "HILDEBEAR": 0, "HILDEBLUE": 0, "ILL_GILL": 0, "LA_DIMENIAN": 0, "LOVE_RAPPY": 2, "MERICARAND": 3, "MERICAROL": 3, "MERICUS": 2, "MERIKLE": 1, "MERILLIA": 0, "MERILTAS": 0, "MIGIUM": 3, "MORFOS": 0, "MOTHMANT": 0, "NAR_LILY": 3, "PAN_ARMS": 2, "POISON_LILY": 1, "RAG_RAPPY": 1, "RECOBOX": 3, "RECON": 0, "SAVAGE_WOLF": 1, "SINOW_BERILL": 0, "SINOW_SPIGELL": 1, "SINOW_ZELE": 1, "SINOW_ZOA": 0, "SO_DIMENIAN": 1, "UL_GIBBON": 0, "ZOL_GIBBON": 2}, + "EnemyTypeDropProbs": {"BARBAROUS_WOLF": 2, "BARBA_RAY": 100, "BARBA_RAY_JOINT": 100, "CHAOS_SORCERER": 7, "DARK_BELRA": 7, "DELBITER": 7, "DELDEPTH": 4, "DELSABER": 4, "DEL_LILY": 7, "DIMENIAN": 2, "DOLMDARL": 4, "DOLMOLM": 2, "DUBCHIC": 7, "EGG_RAPPY": 100, "EPSILON": 7, "GAL_GRYPHON": 100, "GARANZ": 7, "GEE": 2, "GIBBLES": 10, "GILLCHIC": 2, "GI_GUE": 10, "GOL_DRAGON": 100, "GRASS_ASSASSIN": 4, "HALLO_RAPPY": 100, "HIDOOM": 10, "HILDEBEAR": 10, "HILDEBLUE": 100, "ILL_GILL": 7, "LA_DIMENIAN": 4, "LOVE_RAPPY": 100, "MERICARAND": 10, "MERICAROL": 10, "MERICUS": 10, "MERIKLE": 10, "MERILLIA": 2, "MERILTAS": 4, "MIGIUM": 10, "MORFOS": 4, "MOTHMANT": 1, "NAR_LILY": 100, "PAN_ARMS": 10, "POISON_LILY": 2, "RAG_RAPPY": 2, "RECOBOX": 2, "RECON": 1, "SAINT_RAPPY": 100, "SAVAGE_WOLF": 2, "SINOW_BERILL": 2, "SINOW_SPIGELL": 4, "SINOW_ZELE": 4, "SINOW_ZOA": 2, "SO_DIMENIAN": 4, "UL_GIBBON": 2, "ZOL_GIBBON": 4}, "GrindProbTable": [ [100, 30, 25, 20], [0, 30, 23, 15], @@ -9916,8 +9798,8 @@ [130, 165], [135, 175] ], - "EnemyMesetaRanges": {"BARBAROUS_WOLF": 0, "BARBA_RAY": 0, "BARBA_RAY_JOINT": 0, "CHAOS_SORCERER": 0, "DARK_BELRA": 0, "DELBITER": 0, "DELDEPTH": 0, "DELSABER": 0, "DEL_LILY": 0, "DIMENIAN": 0, "DOLMDARL": 0, "DOLMOLM": 0, "DUBCHIC": 0, "EGG_RAPPY": 0, "EPSILON": 0, "GAL_GRYPHON": 0, "GARANZ": 0, "GEE": 0, "GIBBLES": 0, "GILLCHIC": 0, "GI_GUE": 0, "GOL_DRAGON": 0, "GRASS_ASSASSIN": 0, "HALLO_RAPPY": 0, "HIDOOM": 0, "HILDEBEAR": 0, "HILDEBLUE": 0, "ILL_GILL": 0, "LA_DIMENIAN": 0, "LOVE_RAPPY": 0, "MERICARAND": 0, "MERICAROL": 0, "MERICUS": 0, "MERIKLE": 0, "MERILLIA": 0, "MERILTAS": 0, "MIGIUM": 0, "MONEST": 0, "MORFOS": 0, "MOTHMANT": 0, "NAR_LILY": 0, "OLGA_FLOW_2": 0, "PAN_ARMS": 0, "POISON_LILY": 0, "RAG_RAPPY": 0, "RECOBOX": 0, "RECON": 0, "SAINT_RAPPY": 0, "SAVAGE_WOLF": 0, "SINOW_BERILL": 0, "SINOW_SPIGELL": 0, "SINOW_ZELE": 0, "SINOW_ZOA": 0, "SO_DIMENIAN": 0, "UL_GIBBON": 0, "ZOL_GIBBON": 0}, - "EnemyTypeDropProbs": {"BARBAROUS_WOLF": 20, "BARBA_RAY": 100, "BARBA_RAY_JOINT": 100, "CHAOS_SORCERER": 30, "DARK_BELRA": 30, "DELBITER": 30, "DELDEPTH": 25, "DELSABER": 20, "DEL_LILY": 20, "DIMENIAN": 12, "DOLMDARL": 20, "DOLMOLM": 12, "DUBCHIC": 20, "EGG_RAPPY": 100, "EPSILON": 20, "GAL_GRYPHON": 100, "GARANZ": 30, "GEE": 12, "GIBBLES": 40, "GILLCHIC": 12, "GI_GUE": 40, "GOL_DRAGON": 100, "GRASS_ASSASSIN": 20, "HALLO_RAPPY": 100, "HIDOOM": 40, "HILDEBEAR": 40, "HILDEBLUE": 100, "ILL_GILL": 20, "LA_DIMENIAN": 20, "LOVE_RAPPY": 100, "MERICARAND": 40, "MERICAROL": 40, "MERICUS": 40, "MERIKLE": 40, "MERILLIA": 12, "MERILTAS": 20, "MIGIUM": 40, "MONEST": 0, "MORFOS": 30, "MOTHMANT": 5, "NAR_LILY": 100, "OLGA_FLOW_2": 0, "PAN_ARMS": 40, "POISON_LILY": 12, "RAG_RAPPY": 12, "RECOBOX": 12, "RECON": 5, "SAINT_RAPPY": 100, "SAVAGE_WOLF": 12, "SINOW_BERILL": 20, "SINOW_SPIGELL": 25, "SINOW_ZELE": 20, "SINOW_ZOA": 15, "SO_DIMENIAN": 25, "UL_GIBBON": 12, "ZOL_GIBBON": 20}, + "EnemyMesetaRanges": {}, + "EnemyTypeDropProbs": {"BARBAROUS_WOLF": 20, "BARBA_RAY": 100, "BARBA_RAY_JOINT": 100, "CHAOS_SORCERER": 30, "DARK_BELRA": 30, "DELBITER": 30, "DELDEPTH": 25, "DELSABER": 20, "DEL_LILY": 20, "DIMENIAN": 12, "DOLMDARL": 20, "DOLMOLM": 12, "DUBCHIC": 20, "EGG_RAPPY": 100, "EPSILON": 20, "GAL_GRYPHON": 100, "GARANZ": 30, "GEE": 12, "GIBBLES": 40, "GILLCHIC": 12, "GI_GUE": 40, "GOL_DRAGON": 100, "GRASS_ASSASSIN": 20, "HALLO_RAPPY": 100, "HIDOOM": 40, "HILDEBEAR": 40, "HILDEBLUE": 100, "ILL_GILL": 20, "LA_DIMENIAN": 20, "LOVE_RAPPY": 100, "MERICARAND": 40, "MERICAROL": 40, "MERICUS": 40, "MERIKLE": 40, "MERILLIA": 12, "MERILTAS": 20, "MIGIUM": 40, "MORFOS": 30, "MOTHMANT": 5, "NAR_LILY": 100, "PAN_ARMS": 40, "POISON_LILY": 12, "RAG_RAPPY": 12, "RECOBOX": 12, "RECON": 5, "SAINT_RAPPY": 100, "SAVAGE_WOLF": 12, "SINOW_BERILL": 20, "SINOW_SPIGELL": 25, "SINOW_ZELE": 20, "SINOW_ZOA": 15, "SO_DIMENIAN": 25, "UL_GIBBON": 12, "ZOL_GIBBON": 20}, "NonRareBonusProbSpec": [ [0, 0, 0, 1, 1, 1, 2, 2, 2, 3], [255, 255, 0, 0, 0, 1, 1, 1, 2, 2], @@ -10845,7 +10727,7 @@ [44, 110], [46, 115] ], - "EnemyItemClasses": {"BARBAROUS_WOLF": 0, "BARBA_RAY": 255, "BARBA_RAY_JOINT": 255, "CHAOS_SORCERER": 3, "DARK_BELRA": 1, "DELBITER": 0, "DELDEPTH": 2, "DELSABER": 1, "DEL_LILY": 2, "DIMENIAN": 0, "DOLMDARL": 0, "DOLMOLM": 0, "DUBCHIC": 0, "EGG_RAPPY": 255, "EPSILON": 3, "GAL_GRYPHON": 255, "GARANZ": 2, "GEE": 0, "GIBBLES": 3, "GILLCHIC": 0, "GI_GUE": 2, "GOL_DRAGON": 255, "GRASS_ASSASSIN": 0, "HALLO_RAPPY": 255, "HIDOOM": 1, "HILDEBEAR": 0, "HILDEBLUE": 0, "ILL_GILL": 0, "LA_DIMENIAN": 0, "LOVE_RAPPY": 2, "MERICARAND": 3, "MERICAROL": 3, "MERICUS": 2, "MERIKLE": 1, "MERILLIA": 0, "MERILTAS": 0, "MIGIUM": 3, "MONEST": 255, "MORFOS": 0, "MOTHMANT": 0, "NAR_LILY": 3, "OLGA_FLOW_2": 255, "PAN_ARMS": 2, "POISON_LILY": 1, "RAG_RAPPY": 1, "RECOBOX": 3, "RECON": 0, "SAINT_RAPPY": 255, "SAVAGE_WOLF": 1, "SINOW_BERILL": 0, "SINOW_SPIGELL": 1, "SINOW_ZELE": 1, "SINOW_ZOA": 0, "SO_DIMENIAN": 1, "UL_GIBBON": 0, "ZOL_GIBBON": 2}, + "EnemyItemClasses": {"BARBAROUS_WOLF": 0, "CHAOS_SORCERER": 3, "DARK_BELRA": 1, "DELBITER": 0, "DELDEPTH": 2, "DELSABER": 1, "DEL_LILY": 2, "DIMENIAN": 0, "DOLMDARL": 0, "DOLMOLM": 0, "DUBCHIC": 0, "EPSILON": 3, "GARANZ": 2, "GEE": 0, "GIBBLES": 3, "GILLCHIC": 0, "GI_GUE": 2, "GRASS_ASSASSIN": 0, "HIDOOM": 1, "HILDEBEAR": 0, "HILDEBLUE": 0, "ILL_GILL": 0, "LA_DIMENIAN": 0, "LOVE_RAPPY": 2, "MERICARAND": 3, "MERICAROL": 3, "MERICUS": 2, "MERIKLE": 1, "MERILLIA": 0, "MERILTAS": 0, "MIGIUM": 3, "MORFOS": 0, "MOTHMANT": 0, "NAR_LILY": 3, "PAN_ARMS": 2, "POISON_LILY": 1, "RAG_RAPPY": 1, "RECOBOX": 3, "RECON": 0, "SAVAGE_WOLF": 1, "SINOW_BERILL": 0, "SINOW_SPIGELL": 1, "SINOW_ZELE": 1, "SINOW_ZOA": 0, "SO_DIMENIAN": 1, "UL_GIBBON": 0, "ZOL_GIBBON": 2}, "EnemyMesetaRanges": { "BARBAROUS_WOLF": [100, 180], "BARBA_RAY": 1300, @@ -10884,11 +10766,9 @@ "MERILLIA": [60, 65], "MERILTAS": [70, 85], "MIGIUM": [120, 185], - "MONEST": 0, "MORFOS": [50, 80], "MOTHMANT": [80, 90], "NAR_LILY": [1000, 2000], - "OLGA_FLOW_2": 0, "PAN_ARMS": [50, 85], "POISON_LILY": [60, 65], "RAG_RAPPY": [85, 100], @@ -11416,7 +11296,7 @@ [24, 60], [26, 65] ], - "EnemyItemClasses": {"BARBAROUS_WOLF": 0, "BARBA_RAY": 255, "BARBA_RAY_JOINT": 255, "CHAOS_SORCERER": 3, "DARK_BELRA": 1, "DELBITER": 0, "DELDEPTH": 2, "DELSABER": 1, "DEL_LILY": 1, "DIMENIAN": 0, "DOLMDARL": 0, "DOLMOLM": 0, "DUBCHIC": 0, "EGG_RAPPY": 255, "EPSILON": 3, "GAL_GRYPHON": 255, "GARANZ": 2, "GEE": 0, "GIBBLES": 3, "GILLCHIC": 0, "GI_GUE": 2, "GOL_DRAGON": 255, "GRASS_ASSASSIN": 0, "HALLO_RAPPY": 255, "HIDOOM": 1, "HILDEBEAR": 0, "HILDEBLUE": 0, "ILL_GILL": 0, "LA_DIMENIAN": 0, "LOVE_RAPPY": 2, "MERICARAND": 3, "MERICAROL": 3, "MERICUS": 2, "MERIKLE": 1, "MERILLIA": 0, "MERILTAS": 0, "MIGIUM": 3, "MONEST": 255, "MORFOS": 0, "MOTHMANT": 0, "NAR_LILY": 3, "OLGA_FLOW_2": 255, "PAN_ARMS": 2, "POISON_LILY": 1, "RAG_RAPPY": 1, "RECOBOX": 3, "RECON": 0, "SAINT_RAPPY": 255, "SAVAGE_WOLF": 1, "SINOW_BERILL": 0, "SINOW_SPIGELL": 1, "SINOW_ZELE": 1, "SINOW_ZOA": 0, "SO_DIMENIAN": 2, "UL_GIBBON": 0, "ZOL_GIBBON": 2}, + "EnemyItemClasses": {"BARBAROUS_WOLF": 0, "CHAOS_SORCERER": 3, "DARK_BELRA": 1, "DELBITER": 0, "DELDEPTH": 2, "DELSABER": 1, "DEL_LILY": 1, "DIMENIAN": 0, "DOLMDARL": 0, "DOLMOLM": 0, "DUBCHIC": 0, "EPSILON": 3, "GARANZ": 2, "GEE": 0, "GIBBLES": 3, "GILLCHIC": 0, "GI_GUE": 2, "GRASS_ASSASSIN": 0, "HIDOOM": 1, "HILDEBEAR": 0, "HILDEBLUE": 0, "ILL_GILL": 0, "LA_DIMENIAN": 0, "LOVE_RAPPY": 2, "MERICARAND": 3, "MERICAROL": 3, "MERICUS": 2, "MERIKLE": 1, "MERILLIA": 0, "MERILTAS": 0, "MIGIUM": 3, "MORFOS": 0, "MOTHMANT": 0, "NAR_LILY": 3, "PAN_ARMS": 2, "POISON_LILY": 1, "RAG_RAPPY": 1, "RECOBOX": 3, "RECON": 0, "SAVAGE_WOLF": 1, "SINOW_BERILL": 0, "SINOW_SPIGELL": 1, "SINOW_ZELE": 1, "SINOW_ZOA": 0, "SO_DIMENIAN": 2, "UL_GIBBON": 0, "ZOL_GIBBON": 2}, "EnemyMesetaRanges": { "BARBAROUS_WOLF": [30, 45], "BARBA_RAY": 400, @@ -11455,11 +11335,9 @@ "MERILLIA": [40, 50], "MERILTAS": [45, 60], "MIGIUM": [45, 65], - "MONEST": 0, "MORFOS": [100, 130], "MOTHMANT": [3, 6], "NAR_LILY": [500, 1200], - "OLGA_FLOW_2": 0, "PAN_ARMS": [24, 44], "POISON_LILY": [4, 10], "RAG_RAPPY": [18, 20], @@ -11475,7 +11353,7 @@ "UL_GIBBON": [37, 55], "ZOL_GIBBON": [45, 60] }, - "EnemyTypeDropProbs": {"BARBAROUS_WOLF": 30, "BARBA_RAY": 100, "BARBA_RAY_JOINT": 100, "CHAOS_SORCERER": 25, "DARK_BELRA": 35, "DELBITER": 80, "DELDEPTH": 40, "DELSABER": 25, "DEL_LILY": 35, "DIMENIAN": 30, "DOLMDARL": 35, "DOLMOLM": 30, "DUBCHIC": 30, "EGG_RAPPY": 100, "EPSILON": 30, "GAL_GRYPHON": 100, "GARANZ": 50, "GEE": 30, "GIBBLES": 80, "GILLCHIC": 30, "GI_GUE": 80, "GOL_DRAGON": 100, "GRASS_ASSASSIN": 40, "HALLO_RAPPY": 100, "HIDOOM": 45, "HILDEBEAR": 80, "HILDEBLUE": 100, "ILL_GILL": 40, "LA_DIMENIAN": 31, "LOVE_RAPPY": 100, "MERICARAND": 80, "MERICAROL": 80, "MERICUS": 80, "MERIKLE": 80, "MERILLIA": 30, "MERILTAS": 35, "MIGIUM": 45, "MONEST": 0, "MORFOS": 40, "MOTHMANT": 20, "NAR_LILY": 100, "OLGA_FLOW_2": 0, "PAN_ARMS": 50, "POISON_LILY": 30, "RAG_RAPPY": 100, "RECOBOX": 35, "RECON": 10, "SAINT_RAPPY": 100, "SAVAGE_WOLF": 30, "SINOW_BERILL": 40, "SINOW_SPIGELL": 45, "SINOW_ZELE": 35, "SINOW_ZOA": 30, "SO_DIMENIAN": 30, "UL_GIBBON": 30, "ZOL_GIBBON": 35}, + "EnemyTypeDropProbs": {"BARBAROUS_WOLF": 30, "BARBA_RAY": 100, "BARBA_RAY_JOINT": 100, "CHAOS_SORCERER": 25, "DARK_BELRA": 35, "DELBITER": 80, "DELDEPTH": 40, "DELSABER": 25, "DEL_LILY": 35, "DIMENIAN": 30, "DOLMDARL": 35, "DOLMOLM": 30, "DUBCHIC": 30, "EGG_RAPPY": 100, "EPSILON": 30, "GAL_GRYPHON": 100, "GARANZ": 50, "GEE": 30, "GIBBLES": 80, "GILLCHIC": 30, "GI_GUE": 80, "GOL_DRAGON": 100, "GRASS_ASSASSIN": 40, "HALLO_RAPPY": 100, "HIDOOM": 45, "HILDEBEAR": 80, "HILDEBLUE": 100, "ILL_GILL": 40, "LA_DIMENIAN": 31, "LOVE_RAPPY": 100, "MERICARAND": 80, "MERICAROL": 80, "MERICUS": 80, "MERIKLE": 80, "MERILLIA": 30, "MERILTAS": 35, "MIGIUM": 45, "MORFOS": 40, "MOTHMANT": 20, "NAR_LILY": 100, "PAN_ARMS": 50, "POISON_LILY": 30, "RAG_RAPPY": 100, "RECOBOX": 35, "RECON": 10, "SAINT_RAPPY": 100, "SAVAGE_WOLF": 30, "SINOW_BERILL": 40, "SINOW_SPIGELL": 45, "SINOW_ZELE": 35, "SINOW_ZOA": 30, "SO_DIMENIAN": 30, "UL_GIBBON": 30, "ZOL_GIBBON": 35}, "GrindProbTable": [ [100, 35, 30, 25], [0, 25, 20, 15], @@ -12343,7 +12221,7 @@ [64, 160], [66, 165] ], - "EnemyItemClasses": {"BARBAROUS_WOLF": 2, "BARBA_RAY": 255, "BARBA_RAY_JOINT": 255, "CHAOS_SORCERER": 3, "DARK_BELRA": 1, "DELBITER": 0, "DELDEPTH": 2, "DELSABER": 1, "DEL_LILY": 1, "DIMENIAN": 0, "DOLMDARL": 0, "DOLMOLM": 0, "DUBCHIC": 0, "EGG_RAPPY": 255, "EPSILON": 3, "GAL_GRYPHON": 255, "GARANZ": 2, "GEE": 0, "GIBBLES": 3, "GILLCHIC": 0, "GI_GUE": 2, "GOL_DRAGON": 255, "GRASS_ASSASSIN": 0, "HALLO_RAPPY": 255, "HIDOOM": 1, "HILDEBEAR": 0, "HILDEBLUE": 0, "ILL_GILL": 0, "LA_DIMENIAN": 0, "LOVE_RAPPY": 2, "MERICARAND": 3, "MERICAROL": 3, "MERICUS": 2, "MERIKLE": 1, "MERILLIA": 0, "MERILTAS": 0, "MIGIUM": 3, "MONEST": 255, "MORFOS": 0, "MOTHMANT": 0, "NAR_LILY": 3, "OLGA_FLOW_2": 255, "PAN_ARMS": 2, "POISON_LILY": 1, "RAG_RAPPY": 2, "RECOBOX": 3, "RECON": 0, "SAINT_RAPPY": 255, "SAVAGE_WOLF": 1, "SINOW_BERILL": 0, "SINOW_SPIGELL": 1, "SINOW_ZELE": 1, "SINOW_ZOA": 0, "SO_DIMENIAN": 1, "UL_GIBBON": 0, "ZOL_GIBBON": 2}, + "EnemyItemClasses": {"BARBAROUS_WOLF": 2, "CHAOS_SORCERER": 3, "DARK_BELRA": 1, "DELBITER": 0, "DELDEPTH": 2, "DELSABER": 1, "DEL_LILY": 1, "DIMENIAN": 0, "DOLMDARL": 0, "DOLMOLM": 0, "DUBCHIC": 0, "EPSILON": 3, "GARANZ": 2, "GEE": 0, "GIBBLES": 3, "GILLCHIC": 0, "GI_GUE": 2, "GRASS_ASSASSIN": 0, "HIDOOM": 1, "HILDEBEAR": 0, "HILDEBLUE": 0, "ILL_GILL": 0, "LA_DIMENIAN": 0, "LOVE_RAPPY": 2, "MERICARAND": 3, "MERICAROL": 3, "MERICUS": 2, "MERIKLE": 1, "MERILLIA": 0, "MERILTAS": 0, "MIGIUM": 3, "MORFOS": 0, "MOTHMANT": 0, "NAR_LILY": 3, "PAN_ARMS": 2, "POISON_LILY": 1, "RAG_RAPPY": 2, "RECOBOX": 3, "RECON": 0, "SAVAGE_WOLF": 1, "SINOW_BERILL": 0, "SINOW_SPIGELL": 1, "SINOW_ZELE": 1, "SINOW_ZOA": 0, "SO_DIMENIAN": 1, "UL_GIBBON": 0, "ZOL_GIBBON": 2}, "EnemyMesetaRanges": { "BARBAROUS_WOLF": [150, 260], "BARBA_RAY": 2800, @@ -12382,11 +12260,9 @@ "MERILLIA": [90, 110], "MERILTAS": [100, 135], "MIGIUM": [55, 135], - "MONEST": 0, "MORFOS": [151, 171], "MOTHMANT": [120, 140], "NAR_LILY": [2000, 2500], - "OLGA_FLOW_2": 0, "PAN_ARMS": [165, 265], "POISON_LILY": [90, 110], "RAG_RAPPY": [85, 150], @@ -12841,7 +12717,7 @@ [44, 110], [46, 115] ], - "EnemyItemClasses": {"BARBAROUS_WOLF": 0, "BARBA_RAY": 255, "BARBA_RAY_JOINT": 255, "CHAOS_SORCERER": 3, "DARK_BELRA": 1, "DELBITER": 0, "DELDEPTH": 2, "DELSABER": 1, "DEL_LILY": 2, "DIMENIAN": 0, "DOLMDARL": 0, "DOLMOLM": 0, "DUBCHIC": 0, "EGG_RAPPY": 255, "EPSILON": 3, "GAL_GRYPHON": 255, "GARANZ": 2, "GEE": 0, "GIBBLES": 3, "GILLCHIC": 0, "GI_GUE": 2, "GOL_DRAGON": 255, "GRASS_ASSASSIN": 0, "HALLO_RAPPY": 255, "HIDOOM": 1, "HILDEBEAR": 0, "HILDEBLUE": 0, "ILL_GILL": 0, "LA_DIMENIAN": 0, "LOVE_RAPPY": 2, "MERICARAND": 3, "MERICAROL": 3, "MERICUS": 2, "MERIKLE": 1, "MERILLIA": 0, "MERILTAS": 0, "MIGIUM": 3, "MONEST": 255, "MORFOS": 0, "MOTHMANT": 0, "NAR_LILY": 3, "OLGA_FLOW_2": 255, "PAN_ARMS": 2, "POISON_LILY": 1, "RAG_RAPPY": 1, "RECOBOX": 3, "RECON": 0, "SAINT_RAPPY": 255, "SAVAGE_WOLF": 1, "SINOW_BERILL": 0, "SINOW_SPIGELL": 1, "SINOW_ZELE": 1, "SINOW_ZOA": 0, "SO_DIMENIAN": 1, "UL_GIBBON": 0, "ZOL_GIBBON": 2}, + "EnemyItemClasses": {"BARBAROUS_WOLF": 0, "CHAOS_SORCERER": 3, "DARK_BELRA": 1, "DELBITER": 0, "DELDEPTH": 2, "DELSABER": 1, "DEL_LILY": 2, "DIMENIAN": 0, "DOLMDARL": 0, "DOLMOLM": 0, "DUBCHIC": 0, "EPSILON": 3, "GARANZ": 2, "GEE": 0, "GIBBLES": 3, "GILLCHIC": 0, "GI_GUE": 2, "GRASS_ASSASSIN": 0, "HIDOOM": 1, "HILDEBEAR": 0, "HILDEBLUE": 0, "ILL_GILL": 0, "LA_DIMENIAN": 0, "LOVE_RAPPY": 2, "MERICARAND": 3, "MERICAROL": 3, "MERICUS": 2, "MERIKLE": 1, "MERILLIA": 0, "MERILTAS": 0, "MIGIUM": 3, "MORFOS": 0, "MOTHMANT": 0, "NAR_LILY": 3, "PAN_ARMS": 2, "POISON_LILY": 1, "RAG_RAPPY": 1, "RECOBOX": 3, "RECON": 0, "SAVAGE_WOLF": 1, "SINOW_BERILL": 0, "SINOW_SPIGELL": 1, "SINOW_ZELE": 1, "SINOW_ZOA": 0, "SO_DIMENIAN": 1, "UL_GIBBON": 0, "ZOL_GIBBON": 2}, "EnemyMesetaRanges": { "BARBAROUS_WOLF": [100, 180], "BARBA_RAY": 1300, @@ -12880,11 +12756,9 @@ "MERILLIA": [60, 65], "MERILTAS": [70, 85], "MIGIUM": [120, 185], - "MONEST": 0, "MORFOS": [50, 80], "MOTHMANT": [80, 90], "NAR_LILY": [1000, 2000], - "OLGA_FLOW_2": 0, "PAN_ARMS": [50, 85], "POISON_LILY": [60, 65], "RAG_RAPPY": [85, 100], @@ -13939,7 +13813,7 @@ [64, 160], [66, 165] ], - "EnemyItemClasses": {"BARBAROUS_WOLF": 2, "BARBA_RAY": 255, "BARBA_RAY_JOINT": 255, "CHAOS_SORCERER": 3, "DARK_BELRA": 1, "DELBITER": 0, "DELDEPTH": 2, "DELSABER": 1, "DEL_LILY": 1, "DIMENIAN": 0, "DOLMDARL": 0, "DOLMOLM": 0, "DUBCHIC": 0, "EGG_RAPPY": 255, "EPSILON": 3, "GAL_GRYPHON": 255, "GARANZ": 2, "GEE": 0, "GIBBLES": 3, "GILLCHIC": 0, "GI_GUE": 2, "GOL_DRAGON": 255, "GRASS_ASSASSIN": 0, "HALLO_RAPPY": 255, "HIDOOM": 1, "HILDEBEAR": 0, "HILDEBLUE": 0, "ILL_GILL": 0, "LA_DIMENIAN": 0, "LOVE_RAPPY": 2, "MERICARAND": 3, "MERICAROL": 3, "MERICUS": 2, "MERIKLE": 1, "MERILLIA": 0, "MERILTAS": 0, "MIGIUM": 3, "MONEST": 255, "MORFOS": 0, "MOTHMANT": 0, "NAR_LILY": 3, "OLGA_FLOW_2": 255, "PAN_ARMS": 2, "POISON_LILY": 1, "RAG_RAPPY": 2, "RECOBOX": 3, "RECON": 0, "SAINT_RAPPY": 255, "SAVAGE_WOLF": 1, "SINOW_BERILL": 0, "SINOW_SPIGELL": 1, "SINOW_ZELE": 1, "SINOW_ZOA": 0, "SO_DIMENIAN": 1, "UL_GIBBON": 0, "ZOL_GIBBON": 2}, + "EnemyItemClasses": {"BARBAROUS_WOLF": 2, "CHAOS_SORCERER": 3, "DARK_BELRA": 1, "DELBITER": 0, "DELDEPTH": 2, "DELSABER": 1, "DEL_LILY": 1, "DIMENIAN": 0, "DOLMDARL": 0, "DOLMOLM": 0, "DUBCHIC": 0, "EPSILON": 3, "GARANZ": 2, "GEE": 0, "GIBBLES": 3, "GILLCHIC": 0, "GI_GUE": 2, "GRASS_ASSASSIN": 0, "HIDOOM": 1, "HILDEBEAR": 0, "HILDEBLUE": 0, "ILL_GILL": 0, "LA_DIMENIAN": 0, "LOVE_RAPPY": 2, "MERICARAND": 3, "MERICAROL": 3, "MERICUS": 2, "MERIKLE": 1, "MERILLIA": 0, "MERILTAS": 0, "MIGIUM": 3, "MORFOS": 0, "MOTHMANT": 0, "NAR_LILY": 3, "PAN_ARMS": 2, "POISON_LILY": 1, "RAG_RAPPY": 2, "RECOBOX": 3, "RECON": 0, "SAVAGE_WOLF": 1, "SINOW_BERILL": 0, "SINOW_SPIGELL": 1, "SINOW_ZELE": 1, "SINOW_ZOA": 0, "SO_DIMENIAN": 1, "UL_GIBBON": 0, "ZOL_GIBBON": 2}, "EnemyMesetaRanges": { "BARBAROUS_WOLF": [150, 260], "BARBA_RAY": 2800, @@ -13978,11 +13852,9 @@ "MERILLIA": [90, 110], "MERILTAS": [100, 135], "MIGIUM": [55, 135], - "MONEST": 0, "MORFOS": [151, 171], "MOTHMANT": [120, 140], "NAR_LILY": [2000, 2500], - "OLGA_FLOW_2": 0, "PAN_ARMS": [165, 265], "POISON_LILY": [90, 110], "RAG_RAPPY": [85, 150], diff --git a/system/item-tables/rare-table-v3.json b/system/item-tables/rare-table-v3.json index e2279a2e..91aac3f0 100644 --- a/system/item-tables/rare-table-v3.json +++ b/system/item-tables/rare-table-v3.json @@ -49,7 +49,7 @@ ["13/4096", 0x000B03] ], "CANADINE": [["1/128", 0x000A04]], - "CANADINE_GROUP": [], + "CANADINE_GROUP": [["1/128", 0x000A04]], "CANANE": [["7/256", 0x000B04]], "CHAOS_BRINGER": [["1/64", 0x002C00]], "CHAOS_SORCERER": [["7/256", 0x000B04]], @@ -125,7 +125,7 @@ ["7/8192", 0x030E18] ], "CANADINE": [["1/128", 0x000605]], - "CANADINE_GROUP": [], + "CANADINE_GROUP": [["1/128", 0x000605]], "CANANE": [["7/256", 0x000705]], "CHAOS_BRINGER": [["1/64", 0x002C00]], "CHAOS_SORCERER": [["7/256", 0x000705]], @@ -212,7 +212,7 @@ ["7/8192", 0x030E18] ], "CANADINE": [["1/128", 0x000A04]], - "CANADINE_GROUP": [], + "CANADINE_GROUP": [["1/128", 0x000A04]], "CANANE": [["7/256", 0x000305]], "CHAOS_BRINGER": [["1/64", 0x002C00]], "CHAOS_SORCERER": [["7/256", 0x000305]], @@ -304,7 +304,7 @@ ["3/2048", 0x030E24] ], "CANADINE": [["1/128", 0x000A04]], - "CANADINE_GROUP": [], + "CANADINE_GROUP": [["1/128", 0x000A04]], "CANANE": [["7/256", 0x000C04]], "CHAOS_BRINGER": [["1/64", 0x002C00]], "CHAOS_SORCERER": [["7/256", 0x000C04]], @@ -385,7 +385,7 @@ ["7/8192", 0x030E18] ], "CANADINE": [["1/128", 0x000A04]], - "CANADINE_GROUP": [], + "CANADINE_GROUP": [["1/128", 0x000A04]], "CANANE": [["7/256", 0x000805]], "CHAOS_BRINGER": [["1/64", 0x002C00]], "CHAOS_SORCERER": [["7/256", 0x000305]], @@ -471,7 +471,7 @@ ["7/8192", 0x01024B] ], "CANADINE": [["1/128", 0x000605]], - "CANADINE_GROUP": [], + "CANADINE_GROUP": [["1/128", 0x000605]], "CANANE": [["7/256", 0x000505]], "CHAOS_BRINGER": [["1/64", 0x000506]], "CHAOS_SORCERER": [["7/256", 0x000905]], @@ -551,7 +551,7 @@ ["7/8192", 0x01024B] ], "CANADINE": [["1/128", 0x000105]], - "CANADINE_GROUP": [], + "CANADINE_GROUP": [["1/128", 0x000105]], "CANANE": [["7/256", 0x000705]], "CHAOS_BRINGER": [["1/64", 0x000F00]], "CHAOS_SORCERER": [["7/256", 0x000205]], @@ -594,43 +594,18 @@ "BARBAROUS_WOLF": [["1/128", 0x000605]], "BOOMA": [["1/128", 0x030D0F]], "BULCLAW": [["1/128", 0x000905]], - "Box-Cave1": [ - ["9/536870912", 0x030E1C], - ["13/134217728", 0x030E16], - ["5/134217728", 0x01024A] - ], - "Box-Cave3": [ - ["7/1073741824", 0x020000], - ["7/1073741824", 0x000404], - ["3/536870912", 0x000404], - ["13/2147483648", 0x030E1B], - ["13/2147483648", 0x030E1D], - ["13/2147483648", 0x030E1F], - ["7/1073741824", 0x030E17], - ["7/1073741824", 0x01024B] - ], - "Box-DarkFalz": [["1/268435456", 0x01024C]], - "Box-Lobby": [["1/268435456", 0x01024D]], - "Box-Mine1": [["3/536870912", 0x020000]], - "Box-Pioneer2": [ - ["7/2147483648", 0x000904], - ["7/2147483648", 0x000904] - ], - "Box-Ruins1": [ - ["3/536870912", 0x030E1E], - ["13/2147483648", 0x030E18], - ["13/2147483648", 0x030E19] - ], - "Box-VolOpt": [ - ["5/1073741824", 0x000905], - ["7/2147483648", 0x000405], - ["7/1073741824", 0x01024C], - ["7/2147483648", 0x01024C], - ["1/268435456", 0x030F00], - ["13/2147483648", 0x030E1A] - ], + "Box-Forest1": [[0x00380000, 0x030E1D]], + "Box-Forest2": [[0x00380000, 0x030E1A], [0x00380000, 0x030E18]], + "Box-Cave1": [[0x00380000, 0x030E16]], + "Box-Cave2": [[0x00380000, 0x030F00], [0x00380000, 0x01024D]], + "Box-Cave3": [[0x00900000, 0x000904], [0x00900000, 0x000404], [0x00380000, 0x030E1B]], + "Box-Mine1": [[0x02400000, 0x020000], [0x00240000, 0x01024C], [0x00380000, 0x030E1E]], + "Box-Mine2": [[0x01000000, 0x020000], [0x00B00000, 0x000904], [0x00B00000, 0x000404], [0x00240000, 0x01024C], [0x00380000, 0x030E1F], [0x00380000, 0x01024A]], + "Box-Ruins1": [[0x00380000, 0x030E1C], [0x00380000, 0x030E19]], + "Box-Ruins2": [[0x00380000, 0x01024C], [0x00380000, 0x030E17]], + "Box-Ruins3": [[0x00D00000, 0x000905], [0x00D00000, 0x000405], [0x00380000, 0x01024B]], "CANADINE": [["1/128", 0x000605]], - "CANADINE_GROUP": [], + "CANADINE_GROUP": [["1/128", 0x000605]], "CANANE": [["7/256", 0x000405]], "CHAOS_BRINGER": [["1/64", 0x001003]], "CHAOS_SORCERER": [["7/256", 0x000905]], @@ -715,7 +690,7 @@ ["7/8192", 0x01024B] ], "CANADINE": [["1/128", 0x000605]], - "CANADINE_GROUP": [], + "CANADINE_GROUP": [["1/128", 0x000605]], "CANANE": [["7/256", 0x030A00]], "CHAOS_BRINGER": [["1/64", 0x000506]], "CHAOS_SORCERER": [["7/256", 0x000505]], @@ -793,7 +768,7 @@ ], "Box-Ruins3": [["7/8192", 0x030E24]], "CANADINE": [["1/128", 0x000A04]], - "CANADINE_GROUP": [], + "CANADINE_GROUP": [["1/128", 0x000A04]], "CANANE": [["7/256", 0x000C04]], "CHAOS_BRINGER": [["1/64", 0x006800]], "CHAOS_SORCERER": [["7/256", 0x000905]], @@ -860,7 +835,7 @@ ["13/16384", 0x000B02] ], "CANADINE": [["9/16384", 0x01024E]], - "CANADINE_GROUP": [], + "CANADINE_GROUP": [["9/16384", 0x01024E]], "CANANE": [["9/16", 0x030002]], "CHAOS_BRINGER": [["9/16", 0x030002]], "CHAOS_SORCERER": [["9/16", 0x030300]], @@ -922,7 +897,7 @@ ["7/8192", 0x030E24] ], "CANADINE": [["9/16384", 0x01024D]], - "CANADINE_GROUP": [], + "CANADINE_GROUP": [["9/16384", 0x01024D]], "CANANE": [["11/8192", 0x030A00]], "CHAOS_BRINGER": [["9/16", 0x030002]], "CHAOS_SORCERER": [["7/8", 0x030B02]], @@ -990,7 +965,7 @@ ["7/8192", 0x030E24] ], "CANADINE": [["9/16384", 0x01024E]], - "CANADINE_GROUP": [], + "CANADINE_GROUP": [["9/16384", 0x01024E]], "CANANE": [["9/16", 0x030300]], "CHAOS_BRINGER": [["9/16", 0x030002]], "CHAOS_SORCERER": [["9/16", 0x030002]], @@ -1064,7 +1039,7 @@ ["7/8192", 0x030E24] ], "CANADINE": [["9/16384", 0x01024E]], - "CANADINE_GROUP": [], + "CANADINE_GROUP": [["9/16384", 0x01024E]], "CANANE": [["9/16", 0x030300]], "CHAOS_BRINGER": [["9/16", 0x030002]], "CHAOS_SORCERER": [["9/16", 0x030002]], @@ -1129,7 +1104,7 @@ ["13/16384", 0x000303] ], "CANADINE": [["9/16384", 0x01024E]], - "CANADINE_GROUP": [], + "CANADINE_GROUP": [["9/16384", 0x01024E]], "CANANE": [["9/16", 0x030300]], "CHAOS_BRINGER": [["9/16", 0x030300]], "CHAOS_SORCERER": [["9/16", 0x030002]], @@ -1193,7 +1168,7 @@ ["7/8192", 0x030E24] ], "CANADINE": [["9/16384", 0x01024E]], - "CANADINE_GROUP": [], + "CANADINE_GROUP": [["9/16384", 0x01024E]], "CANANE": [["9/16", 0x030300]], "CHAOS_BRINGER": [["9/16", 0x030002]], "CHAOS_SORCERER": [["9/16", 0x030002]], @@ -1316,7 +1291,7 @@ ["13/16384", 0x000403] ], "CANADINE": [["9/16384", 0x01024C]], - "CANADINE_GROUP": [], + "CANADINE_GROUP": [["9/16384", 0x01024C]], "CANANE": [["9/16", 0x030002]], "CHAOS_BRINGER": [["9/16", 0x030002]], "CHAOS_SORCERER": [["9/16", 0x030B01]], @@ -1429,7 +1404,7 @@ "Box-Ruins2": [["7/8192", 0x030E25]], "Box-Ruins3": [["7/8192", 0x030E24]], "CANADINE": [["9/16384", 0x01024E]], - "CANADINE_GROUP": [], + "CANADINE_GROUP": [["9/16384", 0x01024E]], "CANANE": [["9/16", 0x030300]], "CHAOS_BRINGER": [["9/16", 0x030002]], "CHAOS_SORCERER": [["9/16", 0x030002]], @@ -1515,14 +1490,14 @@ ["11/4096", 0x000A06] ], "CANADINE": [["1/64", 0x000B06]], - "CANADINE_GROUP": [], + "CANADINE_GROUP": [["1/64", 0x000B06]], "CANANE": [["1/1024", 0x010216]], "CHAOS_BRINGER": [["1/1024", 0x010134]], "CHAOS_SORCERER": [["13/4096", 0x030D00]], "CLAW": [["1/64", 0x000407]], "DARK_BELRA": [["13/131072", 0x030E0A]], "DARK_FALZ_2": [["1/64", 0x010232]], - "DARK_FALZ_3": [], + "DARK_FALZ_3": [["1/64", 0x010232]], "DARK_GUNNER": [["13/4096", 0x004100]], "DELSABER": [["13/4096", 0x009400]], "DE_ROL_LE": [["13/64", 0x000B06]], @@ -1606,14 +1581,14 @@ ["7/8192", 0x030E24] ], "CANADINE": [["1/64", 0x000707]], - "CANADINE_GROUP": [], + "CANADINE_GROUP": [["1/64", 0x000707]], "CANANE": [["1/1024", 0x01022B]], "CHAOS_BRINGER": [["13/4096", 0x030D04]], "CHAOS_SORCERER": [["5/524288", 0x001D00]], "CLAW": [["1/64", 0x000307]], "DARK_BELRA": [["13/4096", 0x030D0B]], "DARK_FALZ_2": [["1/64", 0x010231]], - "DARK_FALZ_3": [], + "DARK_FALZ_3": [["1/64", 0x010231]], "DARK_GUNNER": [["13/4096", 0x004C00]], "DELSABER": [["13/131072", 0x001001]], "DE_ROL_LE": [["7/256", 0x001300]], @@ -1697,14 +1672,14 @@ ["11/4096", 0x000A06] ], "CANADINE": [["1/64", 0x000207]], - "CANADINE_GROUP": [], + "CANADINE_GROUP": [["1/64", 0x000207]], "CANANE": [["13/4096", 0x008902]], "CHAOS_BRINGER": [["13/131072", 0x005A00]], "CHAOS_SORCERER": [["13/4096", 0x030D00]], "CLAW": [["1/64", 0x000D01]], "DARK_BELRA": [["13/4096", 0x009200]], "DARK_FALZ_2": [["1/64", 0x010231]], - "DARK_FALZ_3": [], + "DARK_FALZ_3": [["1/64", 0x010231]], "DARK_GUNNER": [["13/4096", 0x009400]], "DELSABER": [["5/1024", 0x030D05]], "DE_ROL_LE": [["13/64", 0x000207]], @@ -1794,14 +1769,14 @@ ["11/4096", 0x000A06] ], "CANADINE": [["1/64", 0x000C06]], - "CANADINE_GROUP": [], + "CANADINE_GROUP": [["1/64", 0x000C06]], "CANANE": [["1/1024", 0x010134]], "CHAOS_BRINGER": [["13/4096", 0x030D04]], "CHAOS_SORCERER": [["13/4096", 0x030D00]], "CLAW": [["13/4096", 0x000D01]], "DARK_BELRA": [["13/4096", 0x009200]], "DARK_FALZ_2": [["1/64", 0x010231]], - "DARK_FALZ_3": [], + "DARK_FALZ_3": [["1/64", 0x010231]], "DARK_GUNNER": [["13/4096", 0x009400]], "DELSABER": [["5/1024", 0x030D05]], "DE_ROL_LE": [["7/256", 0x001300]], @@ -1883,14 +1858,14 @@ ["11/4096", 0x000A06] ], "CANADINE": [["1/1024", 0x01022B]], - "CANADINE_GROUP": [], + "CANADINE_GROUP": [["1/1024", 0x01022B]], "CANANE": [["13/4096", 0x006C00]], "CHAOS_BRINGER": [["13/4096", 0x030D04]], "CHAOS_SORCERER": [["13/131072", 0x030E0A]], "CLAW": [["1/64", 0x008C01]], "DARK_BELRA": [["13/4096", 0x030D0B]], "DARK_FALZ_2": [["1/64", 0x010232]], - "DARK_FALZ_3": [], + "DARK_FALZ_3": [["1/64", 0x010232]], "DARK_GUNNER": [["1/1024", 0x010216]], "DELSABER": [["5/1024", 0x030D05]], "DE_ROL_LE": [["13/64", 0x000307]], @@ -1978,14 +1953,14 @@ ["7/8192", 0x030E24] ], "CANADINE": [["1/64", 0x009005]], - "CANADINE_GROUP": [], + "CANADINE_GROUP": [["1/64", 0x009005]], "CANANE": [["13/4096", 0x030E08]], "CHAOS_BRINGER": [["13/4096", 0x001200]], "CHAOS_SORCERER": [["5/524288", 0x001D00]], "CLAW": [["13/4096", 0x010117]], "DARK_BELRA": [["13/4096", 0x002E00]], "DARK_FALZ_2": [["1/64", 0x010227]], - "DARK_FALZ_3": [], + "DARK_FALZ_3": [["1/64", 0x010227]], "DARK_GUNNER": [["1/512", 0x010134]], "DELSABER": [["5/1024", 0x030D05]], "DE_ROL_LE": [["13/64", 0x000507]], @@ -2069,14 +2044,14 @@ ["11/4096", 0x000A06] ], "CANADINE": [["1/64", 0x000207]], - "CANADINE_GROUP": [], + "CANADINE_GROUP": [["1/64", 0x000207]], "CANANE": [["13/4096", 0x008902]], "CHAOS_BRINGER": [["13/4096", 0x002E00]], "CHAOS_SORCERER": [["5/524288", 0x001D00]], "CLAW": [["1/64", 0x000D01]], "DARK_BELRA": [["1/1024", 0x010133]], "DARK_FALZ_2": [["1/64", 0x010227]], - "DARK_FALZ_3": [], + "DARK_FALZ_3": [["1/64", 0x010227]], "DARK_GUNNER": [["13/131072", 0x009302]], "DELSABER": [["5/1024", 0x030D05]], "DE_ROL_LE": [["13/64", 0x000207]], @@ -2158,14 +2133,14 @@ ["11/4096", 0x000A06] ], "CANADINE": [["13/131072", 0x009300]], - "CANADINE_GROUP": [], + "CANADINE_GROUP": [["13/131072", 0x009300]], "CANANE": [["5/1024", 0x010226]], "CHAOS_BRINGER": [["13/4096", 0x030D04]], "CHAOS_SORCERER": [["13/131072", 0x001F00]], "CLAW": [["1/64", 0x000D01]], "DARK_BELRA": [["13/4096", 0x030D0B]], "DARK_FALZ_2": [["1/64", 0x010227]], - "DARK_FALZ_3": [], + "DARK_FALZ_3": [["1/64", 0x010227]], "DARK_GUNNER": [["1/1024", 0x01012B]], "DELSABER": [["5/1024", 0x030D05]], "DE_ROL_LE": [["13/64", 0x000407]], @@ -2245,14 +2220,14 @@ ["11/4096", 0x000A06] ], "CANADINE": [["13/131072", 0x009309]], - "CANADINE_GROUP": [], + "CANADINE_GROUP": [["13/131072", 0x009309]], "CANANE": [["13/4096", 0x008902]], "CHAOS_BRINGER": [["1/512", 0x010232]], "CHAOS_SORCERER": [["13/131072", 0x004200]], "CLAW": [["1/512", 0x010332]], "DARK_BELRA": [["13/4096", 0x030D0B]], "DARK_FALZ_2": [["7/256", 0x010227]], - "DARK_FALZ_3": [], + "DARK_FALZ_3": [["7/256", 0x010227]], "DARK_GUNNER": [["13/4096", 0x004100]], "DELSABER": [["13/4096", 0x009400]], "DE_ROL_LE": [["13/64", 0x000507]], @@ -2335,14 +2310,14 @@ ["7/8192", 0x030E24] ], "CANADINE": [["13/131072", 0x008D00]], - "CANADINE_GROUP": [], + "CANADINE_GROUP": [["13/131072", 0x008D00]], "CANANE": [["13/4096", 0x030E08]], "CHAOS_BRINGER": [["13/4096", 0x030D04]], "CHAOS_SORCERER": [["13/4096", 0x030D00]], "CLAW": [["1/64", 0x009007]], "DARK_BELRA": [["13/4096", 0x030D0B]], "DARK_FALZ_2": [["1/64", 0x010232]], - "DARK_FALZ_3": [], + "DARK_FALZ_3": [["1/64", 0x010232]], "DARK_GUNNER": [["13/4096", 0x009200]], "DELSABER": [["1/64", 0x030D03]], "DE_ROL_LE": [["7/256", 0x001300]], @@ -2428,7 +2403,7 @@ ["7/8192", 0x01024B] ], "CANADINE": [["1/128", 0x000B05]], - "CANADINE_GROUP": [], + "CANADINE_GROUP": [["1/128", 0x000B05]], "CANANE": [["1/128", 0x010223]], "CHAOS_BRINGER": [["7/256", 0x000407]], "CHAOS_SORCERER": [["7/256", 0x008C01]], @@ -2514,7 +2489,7 @@ ["7/8192", 0x030F00] ], "CANADINE": [["1/128", 0x000706]], - "CANADINE_GROUP": [], + "CANADINE_GROUP": [["1/128", 0x000706]], "CANANE": [["1/128", 0x010223]], "CHAOS_BRINGER": [["7/256", 0x030500]], "CHAOS_SORCERER": [["7/256", 0x008C00]], @@ -2602,7 +2577,7 @@ ["13/4096", 0x000A05] ], "CANADINE": [["1/128", 0x000306]], - "CANADINE_GROUP": [], + "CANADINE_GROUP": [["1/128", 0x000306]], "CANANE": [["1/128", 0x010223]], "CHAOS_BRINGER": [["7/256", 0x000307]], "CHAOS_SORCERER": [["7/256", 0x008C01]], @@ -2688,7 +2663,7 @@ ["13/4096", 0x000606] ], "CANADINE": [["1/128", 0x000C05]], - "CANADINE_GROUP": [], + "CANADINE_GROUP": [["1/128", 0x000C05]], "CANANE": [["1/128", 0x010223]], "CHAOS_BRINGER": [["7/256", 0x000C06]], "CHAOS_SORCERER": [["7/256", 0x008C01]], @@ -2774,7 +2749,7 @@ ["13/4096", 0x000A05] ], "CANADINE": [["1/128", 0x000806]], - "CANADINE_GROUP": [], + "CANADINE_GROUP": [["1/128", 0x000806]], "CANANE": [["1/128", 0x010223]], "CHAOS_BRINGER": [["7/256", 0x000807]], "CHAOS_SORCERER": [["7/256", 0x008C00]], @@ -2860,7 +2835,7 @@ ["7/8192", 0x030E25] ], "CANADINE": [["1/128", 0x000506]], - "CANADINE_GROUP": [], + "CANADINE_GROUP": [["1/128", 0x000506]], "CANANE": [["1/128", 0x010223]], "CHAOS_BRINGER": [["7/256", 0x000506]], "CHAOS_SORCERER": [["7/256", 0x008C00]], @@ -2944,7 +2919,7 @@ ["7/8192", 0x030F00] ], "CANADINE": [["1/128", 0x000705]], - "CANADINE_GROUP": [], + "CANADINE_GROUP": [["1/128", 0x000705]], "CANANE": [["1/128", 0x010226]], "CHAOS_BRINGER": [["7/256", 0x000207]], "CHAOS_SORCERER": [["7/256", 0x008C00]], @@ -3030,7 +3005,7 @@ ["13/4096", 0x000A05] ], "CANADINE": [["1/128", 0x000405]], - "CANADINE_GROUP": [], + "CANADINE_GROUP": [["1/128", 0x000405]], "CANANE": [["1/1024", 0x010134]], "CHAOS_BRINGER": [["7/256", 0x000907]], "CHAOS_SORCERER": [["7/256", 0x008C00]], @@ -3116,7 +3091,7 @@ ["7/8192", 0x01024B] ], "CANADINE": [["1/128", 0x000506]], - "CANADINE_GROUP": [], + "CANADINE_GROUP": [["1/128", 0x000506]], "CANANE": [["1/128", 0x010221]], "CHAOS_BRINGER": [["7/256", 0x000506]], "CHAOS_SORCERER": [["7/256", 0x008C00]], @@ -3208,7 +3183,7 @@ ["13/4096", 0x000505] ], "CANADINE": [["1/128", 0x000806]], - "CANADINE_GROUP": [], + "CANADINE_GROUP": [["1/128", 0x000806]], "CANANE": [["1/128", 0x010223]], "CHAOS_BRINGER": [["7/256", 0x000B05]], "CHAOS_SORCERER": [["7/256", 0x008C00]], @@ -3253,6 +3228,7 @@ "Bluefull": { "BARBAROUS_WOLF": [["1/128", 0x000B04]], "BARBA_RAY": [["1/16", 0x000E00]], + "BARBA_RAY_JOINT": [["1/16", 0x000E00]], "Box-JungleNorth": [ ["9/4096", 0x000404], ["9/4096", 0x000B02], @@ -3310,6 +3286,7 @@ "LA_DIMENIAN": [["1/128", 0x000105]], "LOVE_RAPPY": [["7/8", 0x002600]], "MERICAROL": [["7/256", 0x000406]], + "MERICARAND": [["7/256", 0x000406]], "MERICUS": [["7/256", 0x000406]], "MERIKLE": [["7/256", 0x000406]], "MERILLIA": [["1/128", 0x000105]], @@ -3333,6 +3310,7 @@ "Greennill": { "BARBAROUS_WOLF": [["1/128", 0x000305]], "BARBA_RAY": [["1/16", 0x000E00]], + "BARBA_RAY_JOINT": [["1/16", 0x000E00]], "Box-JungleNorth": [ ["9/4096", 0x000704], ["9/4096", 0x000304] @@ -3387,6 +3365,7 @@ "LA_DIMENIAN": [["1/128", 0x000605]], "LOVE_RAPPY": [["7/8", 0x002300]], "MERICAROL": [["7/256", 0x000706]], + "MERICARAND": [["7/256", 0x000706]], "MERICUS": [["7/256", 0x000706]], "MERIKLE": [["7/256", 0x000706]], "MERILLIA": [["1/128", 0x000606]], @@ -3410,6 +3389,7 @@ "Oran": { "BARBAROUS_WOLF": [["1/128", 0x000205]], "BARBA_RAY": [["1/16", 0x000E00]], + "BARBA_RAY_JOINT": [["1/16", 0x000E00]], "Box-JungleNorth": [ ["9/4096", 0x000304], ["9/4096", 0x000204], @@ -3479,6 +3459,7 @@ "LA_DIMENIAN": [["1/128", 0x000105]], "LOVE_RAPPY": [["7/8", 0x002300]], "MERICAROL": [["7/256", 0x000306]], + "MERICARAND": [["7/256", 0x000306]], "MERICUS": [["7/256", 0x000306]], "MERIKLE": [["7/256", 0x000306]], "MERILLIA": [["1/128", 0x000105]], @@ -3502,6 +3483,7 @@ "Pinkal": { "BARBAROUS_WOLF": [["1/128", 0x000405]], "BARBA_RAY": [["1/16", 0x000E00]], + "BARBA_RAY_JOINT": [["1/16", 0x000E00]], "Box-JungleNorth": [ ["9/4096", 0x000C03], ["9/4096", 0x000404], @@ -3572,6 +3554,7 @@ "LA_DIMENIAN": [["1/128", 0x000A04]], "LOVE_RAPPY": [["7/8", 0x002300]], "MERICAROL": [["7/256", 0x000C05]], + "MERICARAND": [["7/256", 0x000C05]], "MERICUS": [["7/256", 0x000C05]], "MERIKLE": [["7/256", 0x000C05]], "MERILLIA": [["1/128", 0x000A04]], @@ -3595,6 +3578,7 @@ "Purplenum": { "BARBAROUS_WOLF": [["1/128", 0x000305]], "BARBA_RAY": [["1/16", 0x000E00]], + "BARBA_RAY_JOINT": [["1/16", 0x000E00]], "Box-JungleNorth": [ ["9/4096", 0x000804], ["9/4096", 0x000304], @@ -3656,6 +3640,7 @@ "LA_DIMENIAN": [["1/128", 0x000605]], "LOVE_RAPPY": [["7/8", 0x004900]], "MERICAROL": [["7/256", 0x000806]], + "MERICARAND": [["7/256", 0x000806]], "MERICUS": [["7/256", 0x000806]], "MERIKLE": [["7/256", 0x000806]], "MERILLIA": [["1/128", 0x000605]], @@ -3679,6 +3664,7 @@ "Redria": { "BARBAROUS_WOLF": [["1/128", 0x000905]], "BARBA_RAY": [["1/16", 0x000E00]], + "BARBA_RAY_JOINT": [["1/16", 0x000E00]], "Box-JungleNorth": [ ["9/4096", 0x000504], ["9/4096", 0x000904], @@ -3751,6 +3737,7 @@ "LA_DIMENIAN": [["1/128", 0x000A04]], "LOVE_RAPPY": [["7/8", 0x002600]], "MERICAROL": [["7/256", 0x000506]], + "MERICARAND": [["7/256", 0x000506]], "MERICUS": [["7/256", 0x000506]], "MERIKLE": [["7/256", 0x000506]], "MERILLIA": [["1/128", 0x000105]], @@ -3774,6 +3761,7 @@ "Skyly": { "BARBAROUS_WOLF": [["1/128", 0x000705]], "BARBA_RAY": [["1/16", 0x000E00]], + "BARBA_RAY_JOINT": [["1/16", 0x000E00]], "Box-JungleNorth": [ ["9/4096", 0x000204], ["9/4096", 0x000704], @@ -3830,6 +3818,7 @@ "LA_DIMENIAN": [["1/128", 0x000105]], "LOVE_RAPPY": [["7/8", 0x002300]], "MERICAROL": [["7/256", 0x000206]], + "MERICARAND": [["7/256", 0x000206]], "MERICUS": [["7/256", 0x000206]], "MERIKLE": [["7/256", 0x000206]], "MERILLIA": [["1/128", 0x000105]], @@ -3853,6 +3842,7 @@ "Viridia": { "BARBAROUS_WOLF": [["1/128", 0x000405]], "BARBA_RAY": [["1/16", 0x000E00]], + "BARBA_RAY_JOINT": [["1/16", 0x000E00]], "Box-JungleNorth": [ ["9/4096", 0x000904], ["9/4096", 0x000404], @@ -3914,6 +3904,7 @@ "LA_DIMENIAN": [["1/128", 0x000105]], "LOVE_RAPPY": [["7/8", 0x002000]], "MERICAROL": [["7/256", 0x000906]], + "MERICARAND": [["7/256", 0x000906]], "MERICUS": [["7/256", 0x000906]], "MERIKLE": [["7/256", 0x000906]], "MERILLIA": [["1/128", 0x000105]], @@ -3937,6 +3928,7 @@ "Whitill": { "BARBAROUS_WOLF": [["1/128", 0x000805]], "BARBA_RAY": [["1/16", 0x000E00]], + "BARBA_RAY_JOINT": [["1/16", 0x000E00]], "Box-JungleNorth": [ ["9/4096", 0x000504], ["9/4096", 0x000804], @@ -4002,6 +3994,7 @@ "LA_DIMENIAN": [["1/128", 0x000605]], "LOVE_RAPPY": [["7/8", 0x01031C]], "MERICAROL": [["7/256", 0x000506]], + "MERICARAND": [["7/256", 0x000506]], "MERICUS": [["7/256", 0x000506]], "MERIKLE": [["7/256", 0x000506]], "MERILLIA": [["1/128", 0x000605]], @@ -4025,6 +4018,7 @@ "Yellowboze": { "BARBAROUS_WOLF": [["1/128", 0x000205]], "BARBA_RAY": [["1/16", 0x000E00]], + "BARBA_RAY_JOINT": [["1/16", 0x000E00]], "Box-JungleNorth": [["7/8192", 0x01024C]], "Box-Mountain": [["1/256", 0x020000]], "Box-JungleEast": [ @@ -4073,6 +4067,7 @@ "LA_DIMENIAN": [["1/128", 0x000605]], "LOVE_RAPPY": [["7/8", 0x01031C]], "MERICAROL": [["7/256", 0x000506]], + "MERICARAND": [["7/256", 0x000506]], "MERICUS": [["7/256", 0x000306]], "MERIKLE": [["7/256", 0x000406]], "MERILLIA": [["1/128", 0x000105]], @@ -4098,6 +4093,7 @@ "Bluefull": { "BARBAROUS_WOLF": [["9/16384", 0x030A00]], "BARBA_RAY": [["7/8", 0x030500]], + "BARBA_RAY_JOINT": [["7/8", 0x030500]], "Box-JungleNorth": [ ["9/16384", 0x000402], ["9/16384", 0x000B01], @@ -4150,6 +4146,7 @@ "LA_DIMENIAN": [["9/16384", 0x030A00]], "LOVE_RAPPY": [["7/8", 0x01031C]], "MERICAROL": [["7/8", 0x030500]], + "MERICARAND": [["7/8", 0x030500]], "MERICUS": [["7/8", 0x030500]], "MERIKLE": [["7/8", 0x030500]], "MERILLIA": [["9/16384", 0x030A00]], @@ -4169,6 +4166,7 @@ "Greennill": { "BARBAROUS_WOLF": [["3/8192", 0x030F00]], "BARBA_RAY": [["7/8", 0x030500]], + "BARBA_RAY_JOINT": [["7/8", 0x030500]], "Box-JungleNorth": [ ["9/16384", 0x000702], ["9/16384", 0x000302] @@ -4219,6 +4217,7 @@ "LA_DIMENIAN": [["9/16384", 0x030B06]], "LOVE_RAPPY": [["7/8", 0x01031C]], "MERICAROL": [["7/8", 0x030500]], + "MERICARAND": [["7/8", 0x030500]], "MERICUS": [["7/8", 0x030500]], "MERIKLE": [["7/8", 0x030500]], "MERILTAS": [["9/16384", 0x030A00]], @@ -4238,6 +4237,7 @@ "Oran": { "BARBAROUS_WOLF": [["9/16384", 0x030A00]], "BARBA_RAY": [["7/8", 0x030500]], + "BARBA_RAY_JOINT": [["7/8", 0x030500]], "Box-JungleNorth": [ ["9/16384", 0x000302], ["9/16384", 0x000202], @@ -4288,6 +4288,7 @@ "LA_DIMENIAN": [["11/8192", 0x030B05]], "LOVE_RAPPY": [["7/8", 0x01031C]], "MERICAROL": [["7/8", 0x030500]], + "MERICARAND": [["7/8", 0x030500]], "MERICUS": [["7/8", 0x030500]], "MERIKLE": [["7/8", 0x030500]], "MERILLIA": [["11/8192", 0x030B00]], @@ -4309,6 +4310,7 @@ "Pinkal": { "BARBAROUS_WOLF": [["11/8192", 0x030B01]], "BARBA_RAY": [["7/8", 0x030500]], + "BARBA_RAY_JOINT": [["7/8", 0x030500]], "Box-JungleNorth": [ ["9/16384", 0x000C01], ["9/16384", 0x000402], @@ -4372,6 +4374,7 @@ "LA_DIMENIAN": [["11/8192", 0x030B01]], "LOVE_RAPPY": [["7/8", 0x01031C]], "MERICAROL": [["7/8", 0x030500]], + "MERICARAND": [["7/8", 0x030500]], "MERICUS": [["7/8", 0x030500]], "MERIKLE": [["7/8", 0x030500]], "MERILLIA": [["11/8192", 0x030B00]], @@ -4393,6 +4396,7 @@ }, "Purplenum": { "BARBA_RAY": [["7/8", 0x030500]], + "BARBA_RAY_JOINT": [["7/8", 0x030500]], "Box-JungleNorth": [ ["9/16384", 0x000802], ["9/16384", 0x000302], @@ -4447,6 +4451,7 @@ "LA_DIMENIAN": [["9/16384", 0x030A00]], "LOVE_RAPPY": [["7/8", 0x01031C]], "MERICAROL": [["7/8", 0x030500]], + "MERICARAND": [["7/8", 0x030500]], "MERICUS": [["7/8", 0x030500]], "MERIKLE": [["7/8", 0x030500]], "MERILLIA": [["11/8192", 0x030B03]], @@ -4466,6 +4471,7 @@ "Redria": { "BARBAROUS_WOLF": [["11/8192", 0x030B01]], "BARBA_RAY": [["7/8", 0x030500]], + "BARBA_RAY_JOINT": [["7/8", 0x030500]], "Box-JungleNorth": [ ["9/16384", 0x000502], ["9/16384", 0x000902], @@ -4523,6 +4529,7 @@ "LA_DIMENIAN": [["11/8192", 0x030B01]], "LOVE_RAPPY": [["7/8", 0x01031C]], "MERICAROL": [["7/8", 0x030500]], + "MERICARAND": [["7/8", 0x030500]], "MERICUS": [["7/8", 0x030500]], "MERIKLE": [["7/8", 0x030500]], "MERILTAS": [["11/8192", 0x030B03]], @@ -4538,6 +4545,7 @@ "Skyly": { "BARBAROUS_WOLF": [["9/16384", 0x030B06]], "BARBA_RAY": [["7/8", 0x030500]], + "BARBA_RAY_JOINT": [["7/8", 0x030500]], "Box-JungleNorth": [ ["9/16384", 0x000202], ["9/16384", 0x000702], @@ -4591,6 +4599,7 @@ "LA_DIMENIAN": [["9/16384", 0x030A00]], "LOVE_RAPPY": [["7/8", 0x01031C]], "MERICAROL": [["7/8", 0x030500]], + "MERICARAND": [["7/8", 0x030500]], "MERICUS": [["7/8", 0x030500]], "MERIKLE": [["7/8", 0x030500]], "MERILTAS": [["9/16384", 0x030A00]], @@ -4612,6 +4621,7 @@ "Viridia": { "BARBAROUS_WOLF": [["11/8192", 0x030B00]], "BARBA_RAY": [["7/8", 0x030500]], + "BARBA_RAY_JOINT": [["7/8", 0x030500]], "Box-JungleNorth": [ ["9/16384", 0x000902], ["9/16384", 0x000402], @@ -4667,6 +4677,7 @@ "LA_DIMENIAN": [["11/8192", 0x030B01]], "LOVE_RAPPY": [["7/8", 0x01031C]], "MERICAROL": [["7/8", 0x030500]], + "MERICARAND": [["7/8", 0x030500]], "MERICUS": [["7/8", 0x030500]], "MERIKLE": [["7/8", 0x030500]], "MERILLIA": [["9/16384", 0x030A00]], @@ -4687,6 +4698,7 @@ }, "Whitill": { "BARBA_RAY": [["7/8", 0x030500]], + "BARBA_RAY_JOINT": [["7/8", 0x030500]], "Box-JungleNorth": [ ["9/16384", 0x000502], ["9/16384", 0x000802], @@ -4739,6 +4751,7 @@ "ILL_GILL": [["7/32768", 0x010309]], "LOVE_RAPPY": [["7/8", 0x01031C]], "MERICAROL": [["7/8", 0x030500]], + "MERICARAND": [["7/8", 0x030500]], "MERICUS": [["7/8", 0x030500]], "MERIKLE": [["7/8", 0x030500]], "MERILLIA": [["11/8192", 0x030B03]], @@ -4760,6 +4773,7 @@ "Yellowboze": { "BARBAROUS_WOLF": [["11/8192", 0x030300]], "BARBA_RAY": [["7/8", 0x030500]], + "BARBA_RAY_JOINT": [["7/8", 0x030500]], "Box-JungleNorth": [ ["7/8192", 0x030F00], ["7/8192", 0x01024C] @@ -4807,6 +4821,7 @@ "ILL_GILL": [["7/32768", 0x01030D]], "LOVE_RAPPY": [["7/8", 0x01031C]], "MERICAROL": [["7/8", 0x030500]], + "MERICARAND": [["7/8", 0x030500]], "MERICUS": [["7/8", 0x030500]], "MERIKLE": [["7/8", 0x030500]], "MERILLIA": [["11/8192", 0x030B00]], @@ -4830,6 +4845,7 @@ "Bluefull": { "BARBAROUS_WOLF": [["13/4096", 0x002600]], "BARBA_RAY": [["13/64", 0x000407]], + "BARBA_RAY_JOINT": [["13/64", 0x000407]], "Box-JungleNorth": [ ["13/8192", 0x000407], ["7/4096", 0x000B05], @@ -4902,6 +4918,7 @@ "LA_DIMENIAN": [["1/512", 0x010317]], "LOVE_RAPPY": [["1/2", 0x005500]], "MERICAROL": [["13/4096", 0x005B00]], + "MERICARAND": [["13/4096", 0x005B00]], "MERICUS": [["13/4096", 0x003D00]], "MERIKLE": [["13/4096", 0x009500]], "MERILLIA": [["1/64", 0x000407]], @@ -4928,6 +4945,7 @@ "Greennill": { "BARBAROUS_WOLF": [["1/512", 0x010335]], "BARBA_RAY": [["13/64", 0x000E01]], + "BARBA_RAY_JOINT": [["13/64", 0x000E01]], "Box-JungleNorth": [ ["13/8192", 0x000707], ["7/4096", 0x000306], @@ -4998,6 +5016,7 @@ "LA_DIMENIAN": [["1/1024", 0x010229]], "LOVE_RAPPY": [["7/8", 0x01031D]], "MERICAROL": [["13/4096", 0x005600]], + "MERICARAND": [["13/4096", 0x005600]], "MERICUS": [["13/4096", 0x008B02]], "MERIKLE": [["13/4096", 0x003D00]], "MERILLIA": [["1/64", 0x000707]], @@ -5024,6 +5043,7 @@ "Oran": { "BARBAROUS_WOLF": [["13/4096", 0x002700]], "BARBA_RAY": [["13/64", 0x008B02]], + "BARBA_RAY_JOINT": [["13/64", 0x008B02]], "Box-JungleNorth": [ ["13/8192", 0x000307], ["7/4096", 0x000206], @@ -5096,6 +5116,7 @@ "LA_DIMENIAN": [["1/512", 0x010313]], "LOVE_RAPPY": [["1/2", 0x005B00]], "MERICAROL": [["13/4096", 0x008902]], + "MERICARAND": [["13/4096", 0x008902]], "MERICUS": [["13/4096", 0x008B02]], "MERIKLE": [["13/4096", 0x010346]], "MERILLIA": [["1/64", 0x000307]], @@ -5121,6 +5142,7 @@ "Pinkal": { "BARBAROUS_WOLF": [["1/512", 0x010320]], "BARBA_RAY": [["13/64", 0x008902]], + "BARBA_RAY_JOINT": [["13/64", 0x008902]], "Box-JungleNorth": [ ["13/8192", 0x000C06], ["7/4096", 0x000406], @@ -5199,6 +5221,7 @@ "LA_DIMENIAN": [["1/64", 0x000C06]], "LOVE_RAPPY": [["1/2", 0x005500]], "MERICAROL": [["13/4096", 0x008902]], + "MERICARAND": [["13/4096", 0x008902]], "MERICUS": [["13/4096", 0x008B02]], "MERIKLE": [["13/4096", 0x005B00]], "MERILLIA": [["13/131072", 0x009305]], @@ -5225,6 +5248,7 @@ "Purplenum": { "BARBAROUS_WOLF": [["1/512", 0x01030F]], "BARBA_RAY": [["13/64", 0x000807]], + "BARBA_RAY_JOINT": [["13/64", 0x000807]], "Box-JungleNorth": [ ["13/8192", 0x000807], ["7/4096", 0x000306], @@ -5295,6 +5319,7 @@ "LA_DIMENIAN": [["13/4096", 0x004600]], "LOVE_RAPPY": [["1/2", 0x01031D]], "MERICAROL": [["13/131072", 0x001E00]], + "MERICARAND": [["13/131072", 0x001E00]], "MERICUS": [["1/1024", 0x001001]], "MERIKLE": [["13/4096", 0x009500]], "MERILLIA": [["1/64", 0x000307]], @@ -5321,6 +5346,7 @@ "Redria": { "BARBAROUS_WOLF": [["13/4096", 0x001006]], "BARBA_RAY": [["7/256", 0x000E02]], + "BARBA_RAY_JOINT": [["7/256", 0x000E02]], "Box-JungleNorth": [ ["13/8192", 0x000507], ["7/4096", 0x000107], @@ -5393,6 +5419,7 @@ "LA_DIMENIAN": [["13/4096", 0x01030F]], "LOVE_RAPPY": [["7/8", 0x01031D]], "MERICAROL": [["13/4096", 0x008902]], + "MERICARAND": [["13/4096", 0x008902]], "MERICUS": [["13/4096", 0x008B02]], "MERIKLE": [["13/4096", 0x005E00]], "MERILLIA": [["13/4096", 0x001004]], @@ -5418,6 +5445,7 @@ "Skyly": { "BARBAROUS_WOLF": [["13/4096", 0x002000]], "BARBA_RAY": [["13/64", 0x000E02]], + "BARBA_RAY_JOINT": [["13/64", 0x000E02]], "Box-JungleNorth": [ ["13/8192", 0x000207], ["7/4096", 0x000706], @@ -5490,6 +5518,7 @@ "LA_DIMENIAN": [["13/4096", 0x010224]], "LOVE_RAPPY": [["1/2", 0x006900]], "MERICAROL": [["13/4096", 0x002F00]], + "MERICARAND": [["13/4096", 0x002F00]], "MERICUS": [["13/4096", 0x006B00]], "MERIKLE": [["13/4096", 0x003D00]], "MERILLIA": [["1/64", 0x000E01]], @@ -5516,6 +5545,7 @@ "Viridia": { "BARBAROUS_WOLF": [["13/4096", 0x010224]], "BARBA_RAY": [["13/64", 0x000907]], + "BARBA_RAY_JOINT": [["13/64", 0x000907]], "Box-JungleNorth": [ ["13/8192", 0x000907], ["7/4096", 0x000406], @@ -5594,6 +5624,7 @@ "LA_DIMENIAN": [["13/4096", 0x002000]], "LOVE_RAPPY": [["1/2", 0x001006]], "MERICAROL": [["13/4096", 0x003B00]], + "MERICARAND": [["13/4096", 0x003B00]], "MERICUS": [["13/4096", 0x004600]], "MERIKLE": [["13/4096", 0x001101]], "MERILLIA": [["1/512", 0x01011D]], @@ -5620,6 +5651,7 @@ "Whitill": { "BARBAROUS_WOLF": [["1/64", 0x000807]], "BARBA_RAY": [["13/64", 0x000507]], + "BARBA_RAY_JOINT": [["13/64", 0x000507]], "Box-JungleNorth": [ ["13/8192", 0x000507], ["7/4096", 0x000806], @@ -5690,6 +5722,7 @@ "LA_DIMENIAN": [["1/64", 0x000D01]], "LOVE_RAPPY": [["1/2", 0x010132]], "MERICAROL": [["1/64", 0x008902]], + "MERICARAND": [["1/64", 0x008902]], "MERICUS": [["1/64", 0x008B02]], "MERIKLE": [["13/4096", 0x002F00]], "MERILLIA": [["1/64", 0x000807]], @@ -5716,6 +5749,7 @@ "Yellowboze": { "BARBAROUS_WOLF": [["1/512", 0x01030F]], "BARBA_RAY": [["7/256", 0x000F02]], + "BARBA_RAY_JOINT": [["7/256", 0x000F02]], "Box-JungleNorth": [ ["1/1024", 0x000107], ["1/1024", 0x000607], @@ -5785,6 +5819,7 @@ "LA_DIMENIAN": [["13/4096", 0x010225]], "LOVE_RAPPY": [["1/2", 0x005B00]], "MERICAROL": [["13/4096", 0x008902]], + "MERICARAND": [["13/4096", 0x008902]], "MERICUS": [["13/4096", 0x002F00]], "MERIKLE": [["13/4096", 0x005E00]], "MERILLIA": [["1/64", 0x000C06]], @@ -5813,6 +5848,7 @@ "Bluefull": { "BARBAROUS_WOLF": [["1/128", 0x000406]], "BARBA_RAY": [["3/32", 0x008901]], + "BARBA_RAY_JOINT": [["3/32", 0x008901]], "Box-JungleNorth": [ ["9/4096", 0x000405], ["9/4096", 0x000B03], @@ -5881,6 +5917,7 @@ "LA_DIMENIAN": [["1/128", 0x000B05]], "LOVE_RAPPY": [["7/8", 0x000407]], "MERICAROL": [["7/256", 0x008901]], + "MERICARAND": [["7/256", 0x008901]], "MERICUS": [["7/256", 0x008B01]], "MERIKLE": [["7/256", 0x010125]], "MERILLIA": [["1/128", 0x000406]], @@ -5904,6 +5941,7 @@ "Greennill": { "BARBAROUS_WOLF": [["1/128", 0x000706]], "BARBA_RAY": [["3/32", 0x008901]], + "BARBA_RAY_JOINT": [["3/32", 0x008901]], "Box-JungleNorth": [ ["9/4096", 0x000705], ["9/4096", 0x000304], @@ -5972,6 +6010,7 @@ "LA_DIMENIAN": [["1/128", 0x000706]], "LOVE_RAPPY": [["7/8", 0x000707]], "MERICAROL": [["7/256", 0x005600]], + "MERICARAND": [["7/256", 0x005600]], "MERICUS": [["7/256", 0x008C01]], "MERIKLE": [["7/256", 0x000707]], "MERILLIA": [["1/128", 0x000706]], @@ -5995,6 +6034,7 @@ "Oran": { "BARBAROUS_WOLF": [["1/128", 0x000306]], "BARBA_RAY": [["3/32", 0x008901]], + "BARBA_RAY_JOINT": [["3/32", 0x008901]], "Box-JungleNorth": [ ["9/4096", 0x000305], ["9/4096", 0x000204], @@ -6065,6 +6105,7 @@ "LA_DIMENIAN": [["1/128", 0x000306]], "LOVE_RAPPY": [["7/8", 0x010219]], "MERICAROL": [["7/256", 0x008901]], + "MERICARAND": [["7/256", 0x008901]], "MERICUS": [["7/256", 0x008B01]], "MERIKLE": [["7/256", 0x000307]], "MERILLIA": [["1/128", 0x000306]], @@ -6088,6 +6129,7 @@ "Pinkal": { "BARBAROUS_WOLF": [["1/128", 0x000C05]], "BARBA_RAY": [["3/32", 0x008901]], + "BARBA_RAY_JOINT": [["3/32", 0x008901]], "Box-JungleNorth": [ ["9/4096", 0x000C04], ["9/4096", 0x000404], @@ -6162,6 +6204,7 @@ "LA_DIMENIAN": [["1/128", 0x000C05]], "LOVE_RAPPY": [["7/8", 0x002300]], "MERICAROL": [["7/256", 0x008901]], + "MERICARAND": [["7/256", 0x008901]], "MERICUS": [["7/256", 0x008B01]], "MERIKLE": [["7/256", 0x005600]], "MERILLIA": [["1/128", 0x000406]], @@ -6185,6 +6228,7 @@ "Purplenum": { "BARBAROUS_WOLF": [["1/128", 0x000806]], "BARBA_RAY": [["3/32", 0x008901]], + "BARBA_RAY_JOINT": [["3/32", 0x008901]], "Box-JungleNorth": [ ["9/4096", 0x000805], ["9/4096", 0x000304], @@ -6255,6 +6299,7 @@ "LA_DIMENIAN": [["1/128", 0x000E00]], "LOVE_RAPPY": [["7/8", 0x000807]], "MERICAROL": [["7/256", 0x008901]], + "MERICARAND": [["7/256", 0x008901]], "MERICUS": [["7/256", 0x008B01]], "MERIKLE": [["7/256", 0x000307]], "MERILLIA": [["1/128", 0x000306]], @@ -6278,6 +6323,7 @@ "Redria": { "BARBAROUS_WOLF": [["1/128", 0x000906]], "BARBA_RAY": [["3/32", 0x000E01]], + "BARBA_RAY_JOINT": [["3/32", 0x000E01]], "Box-JungleNorth": [ ["9/4096", 0x000504], ["9/4096", 0x000904], @@ -6346,6 +6392,7 @@ "LA_DIMENIAN": [["1/128", 0x000906]], "LOVE_RAPPY": [["7/8", 0x01031D]], "MERICAROL": [["7/256", 0x008901]], + "MERICARAND": [["7/256", 0x008901]], "MERICUS": [["7/256", 0x000F01]], "MERIKLE": [["7/256", 0x001004]], "MERILLIA": [["1/128", 0x000506]], @@ -6369,6 +6416,7 @@ "Skyly": { "BARBAROUS_WOLF": [["1/128", 0x000206]], "BARBA_RAY": [["3/32", 0x000E01]], + "BARBA_RAY_JOINT": [["3/32", 0x000E01]], "Box-JungleNorth": [ ["9/4096", 0x000205], ["9/4096", 0x000704], @@ -6439,6 +6487,7 @@ "LA_DIMENIAN": [["1/128", 0x000206]], "LOVE_RAPPY": [["7/8", 0x000207]], "MERICAROL": [["7/256", 0x005601]], + "MERICARAND": [["7/256", 0x005601]], "MERICUS": [["7/256", 0x008B01]], "MERIKLE": [["7/256", 0x000207]], "MERILLIA": [["1/128", 0x000205]], @@ -6462,6 +6511,7 @@ "Viridia": { "BARBAROUS_WOLF": [["1/128", 0x010219]], "BARBA_RAY": [["3/32", 0x008901]], + "BARBA_RAY_JOINT": [["3/32", 0x008901]], "Box-JungleNorth": [ ["9/4096", 0x000905], ["9/4096", 0x000404], @@ -6532,6 +6582,7 @@ "LA_DIMENIAN": [["1/64", 0x000406]], "LOVE_RAPPY": [["7/8", 0x000907]], "MERICAROL": [["7/256", 0x008901]], + "MERICARAND": [["7/256", 0x008901]], "MERICUS": [["7/256", 0x008B01]], "MERIKLE": [["7/256", 0x000407]], "MERILLIA": [["1/128", 0x000906]], @@ -6555,6 +6606,7 @@ "Whitill": { "BARBAROUS_WOLF": [["1/128", 0x000506]], "BARBA_RAY": [["3/32", 0x008901]], + "BARBA_RAY_JOINT": [["3/32", 0x008901]], "Box-JungleNorth": [ ["9/4096", 0x000505], ["9/4096", 0x000804], @@ -6627,6 +6679,7 @@ "LA_DIMENIAN": [["1/128", 0x000806]], "LOVE_RAPPY": [["7/8", 0x010222]], "MERICAROL": [["7/256", 0x000506]], + "MERICARAND": [["7/256", 0x000506]], "MERICUS": [["7/256", 0x005601]], "MERIKLE": [["7/256", 0x008901]], "MERILLIA": [["1/128", 0x000506]], @@ -6650,6 +6703,7 @@ "Yellowboze": { "BARBAROUS_WOLF": [["1/128", 0x000806]], "BARBA_RAY": [["3/32", 0x000F01]], + "BARBA_RAY_JOINT": [["3/32", 0x000F01]], "Box-JungleNorth": [ ["9/4096", 0x000105], ["9/4096", 0x000605], @@ -6722,6 +6776,7 @@ "LA_DIMENIAN": [["1/128", 0x010225]], "LOVE_RAPPY": [["7/8", 0x000906]], "MERICAROL": [["7/256", 0x003B00]], + "MERICARAND": [["7/256", 0x003B00]], "MERICUS": [["7/256", 0x010125]], "MERIKLE": [["7/256", 0x008B01]], "MERILLIA": [["1/128", 0x000106]], diff --git a/system/item-tables/rare-table-v4.json b/system/item-tables/rare-table-v4.json index e479b098..cd8ce6d6 100644 --- a/system/item-tables/rare-table-v4.json +++ b/system/item-tables/rare-table-v4.json @@ -610,41 +610,16 @@ "BARBAROUS_WOLF": [["1/128", 0x000605]], "BOOMA": [["1/128", 0x030D0F]], "BULCLAW": [["1/128", 0x000905]], - "Box-Cave1": [ - ["9/536870912", 0x030E1C], - ["13/134217728", 0x030E16], - ["5/134217728", 0x01024A] - ], - "Box-Cave3": [ - ["7/1073741824", 0x020000], - ["7/1073741824", 0x000404], - ["3/536870912", 0x000404], - ["13/2147483648", 0x030E1B], - ["13/2147483648", 0x030E1D], - ["13/2147483648", 0x030E1F], - ["7/1073741824", 0x030E17], - ["7/1073741824", 0x01024B] - ], - "Box-DarkFalz": [["1/268435456", 0x01024C]], - "Box-Lobby": [["1/268435456", 0x01024D]], - "Box-Mine1": [["3/536870912", 0x020000]], - "Box-Pioneer2": [ - ["7/2147483648", 0x000904], - ["7/2147483648", 0x000904] - ], - "Box-Ruins1": [ - ["3/536870912", 0x030E1E], - ["13/2147483648", 0x030E18], - ["13/2147483648", 0x030E19] - ], - "Box-VolOpt": [ - ["5/1073741824", 0x000905], - ["7/2147483648", 0x000405], - ["7/1073741824", 0x01024C], - ["7/2147483648", 0x01024C], - ["1/268435456", 0x030F00], - ["13/2147483648", 0x030E1A] - ], + "Box-Forest1": [[0x00380000, 0x030E1D]], + "Box-Forest2": [[0x00380000, 0x030E1A], [0x00380000, 0x030E18]], + "Box-Cave1": [[0x00380000, 0x030E16]], + "Box-Cave2": [[0x00380000, 0x030F00], [0x00380000, 0x01024D]], + "Box-Cave3": [[0x00900000, 0x000904], [0x00900000, 0x000404], [0x00380000, 0x030E1B]], + "Box-Mine1": [[0x02400000, 0x020000], [0x00240000, 0x01024C], [0x00380000, 0x030E1E]], + "Box-Mine2": [[0x01000000, 0x020000], [0x00B00000, 0x000904], [0x00B00000, 0x000404], [0x00240000, 0x01024C], [0x00380000, 0x030E1F], [0x00380000, 0x01024A]], + "Box-Ruins1": [[0x00380000, 0x030E1C], [0x00380000, 0x030E19]], + "Box-Ruins2": [[0x00380000, 0x01024C], [0x00380000, 0x030E17]], + "Box-Ruins3": [[0x00D00000, 0x000905], [0x00D00000, 0x000405], [0x00380000, 0x01024B]], "CANADINE": [["1/128", 0x000605]], "CANADINE_GROUP": [["1/128", 0x000605]], "CANANE": [["7/256", 0x000405]], @@ -3269,6 +3244,7 @@ "Bluefull": { "BARBAROUS_WOLF": [["1/128", 0x000B04]], "BARBA_RAY": [["1/16", 0x000E00]], + "BARBA_RAY_JOINT": [["1/16", 0x000E00]], "Box-JungleNorth": [ ["9/4096", 0x000404], ["9/4096", 0x000B02], @@ -3326,6 +3302,7 @@ "LA_DIMENIAN": [["1/128", 0x000105]], "LOVE_RAPPY": [["7/8", 0x002600]], "MERICAROL": [["7/256", 0x000406]], + "MERICARAND": [["7/256", 0x000406]], "MERICUS": [["7/256", 0x000406]], "MERIKLE": [["7/256", 0x000406]], "MERILLIA": [["1/128", 0x000105]], @@ -3349,6 +3326,7 @@ "Greennill": { "BARBAROUS_WOLF": [["1/128", 0x000305]], "BARBA_RAY": [["1/16", 0x000E00]], + "BARBA_RAY_JOINT": [["1/16", 0x000E00]], "Box-JungleNorth": [ ["9/4096", 0x000704], ["9/4096", 0x000304] @@ -3403,6 +3381,7 @@ "LA_DIMENIAN": [["1/128", 0x000605]], "LOVE_RAPPY": [["7/8", 0x002300]], "MERICAROL": [["7/256", 0x000706]], + "MERICARAND": [["7/256", 0x000706]], "MERICUS": [["7/256", 0x000706]], "MERIKLE": [["7/256", 0x000706]], "MERILLIA": [["1/128", 0x000606]], @@ -3426,6 +3405,7 @@ "Oran": { "BARBAROUS_WOLF": [["1/128", 0x000205]], "BARBA_RAY": [["1/16", 0x000E00]], + "BARBA_RAY_JOINT": [["1/16", 0x000E00]], "Box-JungleNorth": [ ["9/4096", 0x000304], ["9/4096", 0x000204], @@ -3495,6 +3475,7 @@ "LA_DIMENIAN": [["1/128", 0x000105]], "LOVE_RAPPY": [["7/8", 0x002300]], "MERICAROL": [["7/256", 0x000306]], + "MERICARAND": [["7/256", 0x000306]], "MERICUS": [["7/256", 0x000306]], "MERIKLE": [["7/256", 0x000306]], "MERILLIA": [["1/128", 0x000105]], @@ -3518,6 +3499,7 @@ "Pinkal": { "BARBAROUS_WOLF": [["1/128", 0x000405]], "BARBA_RAY": [["1/16", 0x000E00]], + "BARBA_RAY_JOINT": [["1/16", 0x000E00]], "Box-JungleNorth": [ ["9/4096", 0x000C03], ["9/4096", 0x000404], @@ -3588,6 +3570,7 @@ "LA_DIMENIAN": [["1/128", 0x000A04]], "LOVE_RAPPY": [["7/8", 0x002300]], "MERICAROL": [["7/256", 0x000C05]], + "MERICARAND": [["7/256", 0x000C05]], "MERICUS": [["7/256", 0x000C05]], "MERIKLE": [["7/256", 0x000C05]], "MERILLIA": [["1/128", 0x000A04]], @@ -3611,6 +3594,7 @@ "Purplenum": { "BARBAROUS_WOLF": [["1/128", 0x000305]], "BARBA_RAY": [["1/16", 0x000E00]], + "BARBA_RAY_JOINT": [["1/16", 0x000E00]], "Box-JungleNorth": [ ["9/4096", 0x000804], ["9/4096", 0x000304], @@ -3672,6 +3656,7 @@ "LA_DIMENIAN": [["1/128", 0x000605]], "LOVE_RAPPY": [["7/8", 0x004900]], "MERICAROL": [["7/256", 0x000806]], + "MERICARAND": [["7/256", 0x000806]], "MERICUS": [["7/256", 0x000806]], "MERIKLE": [["7/256", 0x000806]], "MERILLIA": [["1/128", 0x000605]], @@ -3695,6 +3680,7 @@ "Redria": { "BARBAROUS_WOLF": [["1/128", 0x000905]], "BARBA_RAY": [["1/16", 0x000E00]], + "BARBA_RAY_JOINT": [["1/16", 0x000E00]], "Box-JungleNorth": [ ["9/4096", 0x000504], ["9/4096", 0x000904], @@ -3767,6 +3753,7 @@ "LA_DIMENIAN": [["1/128", 0x000A04]], "LOVE_RAPPY": [["7/8", 0x002600]], "MERICAROL": [["7/256", 0x000506]], + "MERICARAND": [["7/256", 0x000506]], "MERICUS": [["7/256", 0x000506]], "MERIKLE": [["7/256", 0x000506]], "MERILLIA": [["1/128", 0x000105]], @@ -3790,6 +3777,7 @@ "Skyly": { "BARBAROUS_WOLF": [["1/128", 0x000705]], "BARBA_RAY": [["1/16", 0x000E00]], + "BARBA_RAY_JOINT": [["1/16", 0x000E00]], "Box-JungleNorth": [ ["9/4096", 0x000204], ["9/4096", 0x000704], @@ -3846,6 +3834,7 @@ "LA_DIMENIAN": [["1/128", 0x000105]], "LOVE_RAPPY": [["7/8", 0x002300]], "MERICAROL": [["7/256", 0x000206]], + "MERICARAND": [["7/256", 0x000206]], "MERICUS": [["7/256", 0x000206]], "MERIKLE": [["7/256", 0x000206]], "MERILLIA": [["1/128", 0x000105]], @@ -3869,6 +3858,7 @@ "Viridia": { "BARBAROUS_WOLF": [["1/128", 0x000405]], "BARBA_RAY": [["1/16", 0x000E00]], + "BARBA_RAY_JOINT": [["1/16", 0x000E00]], "Box-JungleNorth": [ ["9/4096", 0x000904], ["9/4096", 0x000404], @@ -3930,6 +3920,7 @@ "LA_DIMENIAN": [["1/128", 0x000105]], "LOVE_RAPPY": [["7/8", 0x002000]], "MERICAROL": [["7/256", 0x000906]], + "MERICARAND": [["7/256", 0x000906]], "MERICUS": [["7/256", 0x000906]], "MERIKLE": [["7/256", 0x000906]], "MERILLIA": [["1/128", 0x000105]], @@ -3953,6 +3944,7 @@ "Whitill": { "BARBAROUS_WOLF": [["1/128", 0x000805]], "BARBA_RAY": [["1/16", 0x000E00]], + "BARBA_RAY_JOINT": [["1/16", 0x000E00]], "Box-JungleNorth": [ ["9/4096", 0x000504], ["9/4096", 0x000804], @@ -4018,6 +4010,7 @@ "LA_DIMENIAN": [["1/128", 0x000605]], "LOVE_RAPPY": [["7/8", 0x01031C]], "MERICAROL": [["7/256", 0x000506]], + "MERICARAND": [["7/256", 0x000506]], "MERICUS": [["7/256", 0x000506]], "MERIKLE": [["7/256", 0x000506]], "MERILLIA": [["1/128", 0x000605]], @@ -4041,6 +4034,7 @@ "Yellowboze": { "BARBAROUS_WOLF": [["1/128", 0x000205]], "BARBA_RAY": [["1/16", 0x000E00]], + "BARBA_RAY_JOINT": [["1/16", 0x000E00]], "Box-JungleNorth": [["7/8192", 0x01024C]], "Box-Mountain": [["1/256", 0x020000]], "Box-JungleEast": [ @@ -4089,6 +4083,7 @@ "LA_DIMENIAN": [["1/128", 0x000605]], "LOVE_RAPPY": [["7/8", 0x01031C]], "MERICAROL": [["7/256", 0x000506]], + "MERICARAND": [["7/256", 0x000506]], "MERICUS": [["7/256", 0x000306]], "MERIKLE": [["7/256", 0x000406]], "MERILLIA": [["1/128", 0x000105]], @@ -4114,6 +4109,7 @@ "Bluefull": { "BARBAROUS_WOLF": [["9/16384", 0x030A00]], "BARBA_RAY": [["7/8", 0x030500]], + "BARBA_RAY_JOINT": [["7/8", 0x030500]], "Box-JungleNorth": [ ["9/16384", 0x000402], ["9/16384", 0x000B01], @@ -4166,6 +4162,7 @@ "LA_DIMENIAN": [["9/16384", 0x030A00]], "LOVE_RAPPY": [["7/8", 0x01031C]], "MERICAROL": [["7/8", 0x030500]], + "MERICARAND": [["7/8", 0x030500]], "MERICUS": [["7/8", 0x030500]], "MERIKLE": [["7/8", 0x030500]], "MERILLIA": [["9/16384", 0x030A00]], @@ -4185,6 +4182,7 @@ "Greennill": { "BARBAROUS_WOLF": [["3/8192", 0x030F00]], "BARBA_RAY": [["7/8", 0x030500]], + "BARBA_RAY_JOINT": [["7/8", 0x030500]], "Box-JungleNorth": [ ["9/16384", 0x000702], ["9/16384", 0x000302] @@ -4235,6 +4233,7 @@ "LA_DIMENIAN": [["9/16384", 0x030B06]], "LOVE_RAPPY": [["7/8", 0x01031C]], "MERICAROL": [["7/8", 0x030500]], + "MERICARAND": [["7/8", 0x030500]], "MERICUS": [["7/8", 0x030500]], "MERIKLE": [["7/8", 0x030500]], "MERILTAS": [["9/16384", 0x030A00]], @@ -4254,6 +4253,7 @@ "Oran": { "BARBAROUS_WOLF": [["9/16384", 0x030A00]], "BARBA_RAY": [["7/8", 0x030500]], + "BARBA_RAY_JOINT": [["7/8", 0x030500]], "Box-JungleNorth": [ ["9/16384", 0x000302], ["9/16384", 0x000202], @@ -4304,6 +4304,7 @@ "LA_DIMENIAN": [["11/8192", 0x030B05]], "LOVE_RAPPY": [["7/8", 0x01031C]], "MERICAROL": [["7/8", 0x030500]], + "MERICARAND": [["7/8", 0x030500]], "MERICUS": [["7/8", 0x030500]], "MERIKLE": [["7/8", 0x030500]], "MERILLIA": [["11/8192", 0x030B00]], @@ -4325,6 +4326,7 @@ "Pinkal": { "BARBAROUS_WOLF": [["11/8192", 0x030B01]], "BARBA_RAY": [["7/8", 0x030500]], + "BARBA_RAY_JOINT": [["7/8", 0x030500]], "Box-JungleNorth": [ ["9/16384", 0x000C01], ["9/16384", 0x000402], @@ -4388,6 +4390,7 @@ "LA_DIMENIAN": [["11/8192", 0x030B01]], "LOVE_RAPPY": [["7/8", 0x01031C]], "MERICAROL": [["7/8", 0x030500]], + "MERICARAND": [["7/8", 0x030500]], "MERICUS": [["7/8", 0x030500]], "MERIKLE": [["7/8", 0x030500]], "MERILLIA": [["11/8192", 0x030B00]], @@ -4409,6 +4412,7 @@ }, "Purplenum": { "BARBA_RAY": [["7/8", 0x030500]], + "BARBA_RAY_JOINT": [["7/8", 0x030500]], "Box-JungleNorth": [ ["9/16384", 0x000802], ["9/16384", 0x000302], @@ -4463,6 +4467,7 @@ "LA_DIMENIAN": [["9/16384", 0x030A00]], "LOVE_RAPPY": [["7/8", 0x01031C]], "MERICAROL": [["7/8", 0x030500]], + "MERICARAND": [["7/8", 0x030500]], "MERICUS": [["7/8", 0x030500]], "MERIKLE": [["7/8", 0x030500]], "MERILLIA": [["11/8192", 0x030B03]], @@ -4482,6 +4487,7 @@ "Redria": { "BARBAROUS_WOLF": [["11/8192", 0x030B01]], "BARBA_RAY": [["7/8", 0x030500]], + "BARBA_RAY_JOINT": [["7/8", 0x030500]], "Box-JungleNorth": [ ["9/16384", 0x000502], ["9/16384", 0x000902], @@ -4539,6 +4545,7 @@ "LA_DIMENIAN": [["11/8192", 0x030B01]], "LOVE_RAPPY": [["7/8", 0x01031C]], "MERICAROL": [["7/8", 0x030500]], + "MERICARAND": [["7/8", 0x030500]], "MERICUS": [["7/8", 0x030500]], "MERIKLE": [["7/8", 0x030500]], "MERILTAS": [["11/8192", 0x030B03]], @@ -4554,6 +4561,7 @@ "Skyly": { "BARBAROUS_WOLF": [["9/16384", 0x030B06]], "BARBA_RAY": [["7/8", 0x030500]], + "BARBA_RAY_JOINT": [["7/8", 0x030500]], "Box-JungleNorth": [ ["9/16384", 0x000202], ["9/16384", 0x000702], @@ -4607,6 +4615,7 @@ "LA_DIMENIAN": [["9/16384", 0x030A00]], "LOVE_RAPPY": [["7/8", 0x01031C]], "MERICAROL": [["7/8", 0x030500]], + "MERICARAND": [["7/8", 0x030500]], "MERICUS": [["7/8", 0x030500]], "MERIKLE": [["7/8", 0x030500]], "MERILTAS": [["9/16384", 0x030A00]], @@ -4628,6 +4637,7 @@ "Viridia": { "BARBAROUS_WOLF": [["11/8192", 0x030B00]], "BARBA_RAY": [["7/8", 0x030500]], + "BARBA_RAY_JOINT": [["7/8", 0x030500]], "Box-JungleNorth": [ ["9/16384", 0x000902], ["9/16384", 0x000402], @@ -4683,6 +4693,7 @@ "LA_DIMENIAN": [["11/8192", 0x030B01]], "LOVE_RAPPY": [["7/8", 0x01031C]], "MERICAROL": [["7/8", 0x030500]], + "MERICARAND": [["7/8", 0x030500]], "MERICUS": [["7/8", 0x030500]], "MERIKLE": [["7/8", 0x030500]], "MERILLIA": [["9/16384", 0x030A00]], @@ -4703,6 +4714,7 @@ }, "Whitill": { "BARBA_RAY": [["7/8", 0x030500]], + "BARBA_RAY_JOINT": [["7/8", 0x030500]], "Box-JungleNorth": [ ["9/16384", 0x000502], ["9/16384", 0x000802], @@ -4755,6 +4767,7 @@ "ILL_GILL": [["7/32768", 0x010309]], "LOVE_RAPPY": [["7/8", 0x01031C]], "MERICAROL": [["7/8", 0x030500]], + "MERICARAND": [["7/8", 0x030500]], "MERICUS": [["7/8", 0x030500]], "MERIKLE": [["7/8", 0x030500]], "MERILLIA": [["11/8192", 0x030B03]], @@ -4776,6 +4789,7 @@ "Yellowboze": { "BARBAROUS_WOLF": [["11/8192", 0x030300]], "BARBA_RAY": [["7/8", 0x030500]], + "BARBA_RAY_JOINT": [["7/8", 0x030500]], "Box-JungleNorth": [ ["7/8192", 0x030F00], ["7/8192", 0x01024C] @@ -4823,6 +4837,7 @@ "ILL_GILL": [["7/32768", 0x01030D]], "LOVE_RAPPY": [["7/8", 0x01031C]], "MERICAROL": [["7/8", 0x030500]], + "MERICARAND": [["7/8", 0x030500]], "MERICUS": [["7/8", 0x030500]], "MERIKLE": [["7/8", 0x030500]], "MERILLIA": [["11/8192", 0x030B00]], @@ -4846,6 +4861,7 @@ "Bluefull": { "BARBAROUS_WOLF": [["13/4096", 0x002600]], "BARBA_RAY": [["7/256", 0x030D15]], + "BARBA_RAY_JOINT": [["7/256", 0x030D15]], "Box-JungleNorth": [ ["13/8192", 0x000407], ["7/4096", 0x000B05], @@ -4918,6 +4934,7 @@ "LA_DIMENIAN": [["1/512", 0x010317]], "LOVE_RAPPY": [["1/2", 0x005500]], "MERICAROL": [["13/4096", 0x005B00]], + "MERICARAND": [["13/4096", 0x005B00]], "MERICUS": [["13/4096", 0x003D00]], "MERIKLE": [["13/4096", 0x009500]], "MERILLIA": [["1/64", 0x000407]], @@ -4944,6 +4961,7 @@ "Greennill": { "BARBAROUS_WOLF": [["1/512", 0x010335]], "BARBA_RAY": [["7/256", 0x01035F]], + "BARBA_RAY_JOINT": [["7/256", 0x01035F]], "Box-JungleNorth": [ ["13/8192", 0x000707], ["7/4096", 0x000306], @@ -5014,6 +5032,7 @@ "LA_DIMENIAN": [["1/1024", 0x010229]], "LOVE_RAPPY": [["7/8", 0x01031D]], "MERICAROL": [["13/4096", 0x005600]], + "MERICARAND": [["13/4096", 0x005600]], "MERICUS": [["13/4096", 0x008B02]], "MERIKLE": [["13/4096", 0x003D00]], "MERILLIA": [["1/64", 0x000707]], @@ -5040,6 +5059,7 @@ "Oran": { "BARBAROUS_WOLF": [["13/4096", 0x002700]], "BARBA_RAY": [["7/256", 0x01035E]], + "BARBA_RAY_JOINT": [["7/256", 0x01035E]], "Box-JungleNorth": [ ["13/8192", 0x000307], ["7/4096", 0x000206], @@ -5112,6 +5132,7 @@ "LA_DIMENIAN": [["1/512", 0x010313]], "LOVE_RAPPY": [["1/2", 0x005B00]], "MERICAROL": [["13/4096", 0x008902]], + "MERICARAND": [["13/4096", 0x008902]], "MERICUS": [["13/4096", 0x008B02]], "MERIKLE": [["13/4096", 0x010346]], "MERILLIA": [["1/64", 0x000307]], @@ -5137,6 +5158,7 @@ "Pinkal": { "BARBAROUS_WOLF": [["1/512", 0x010320]], "BARBA_RAY": [["7/256", 0x030D15]], + "BARBA_RAY_JOINT": [["7/256", 0x030D15]], "Box-JungleNorth": [ ["13/8192", 0x000C06], ["7/4096", 0x000406], @@ -5215,6 +5237,7 @@ "LA_DIMENIAN": [["1/64", 0x000C06]], "LOVE_RAPPY": [["1/2", 0x005500]], "MERICAROL": [["13/4096", 0x008902]], + "MERICARAND": [["13/4096", 0x008902]], "MERICUS": [["13/4096", 0x008B02]], "MERIKLE": [["13/4096", 0x005B00]], "MERILLIA": [["13/131072", 0x009305]], @@ -5241,6 +5264,7 @@ "Purplenum": { "BARBAROUS_WOLF": [["1/512", 0x01030F]], "BARBA_RAY": [["7/256", 0x01035E]], + "BARBA_RAY_JOINT": [["7/256", 0x01035E]], "Box-JungleNorth": [ ["13/8192", 0x000807], ["7/4096", 0x000306], @@ -5311,6 +5335,7 @@ "LA_DIMENIAN": [["13/4096", 0x004600]], "LOVE_RAPPY": [["1/2", 0x01031D]], "MERICAROL": [["13/131072", 0x001E00]], + "MERICARAND": [["13/131072", 0x001E00]], "MERICUS": [["1/1024", 0x001001]], "MERIKLE": [["13/4096", 0x009500]], "MERILLIA": [["1/64", 0x000307]], @@ -5337,6 +5362,7 @@ "Redria": { "BARBAROUS_WOLF": [["13/4096", 0x001006]], "BARBA_RAY": [["7/256", 0x000E02]], + "BARBA_RAY_JOINT": [["7/256", 0x000E02]], "Box-JungleNorth": [ ["13/8192", 0x000507], ["7/4096", 0x000107], @@ -5409,6 +5435,7 @@ "LA_DIMENIAN": [["13/4096", 0x01030F]], "LOVE_RAPPY": [["7/8", 0x01031D]], "MERICAROL": [["13/4096", 0x008902]], + "MERICARAND": [["13/4096", 0x008902]], "MERICUS": [["13/4096", 0x008B02]], "MERIKLE": [["13/4096", 0x005E00]], "MERILLIA": [["13/4096", 0x001004]], @@ -5434,6 +5461,7 @@ "Skyly": { "BARBAROUS_WOLF": [["13/4096", 0x002000]], "BARBA_RAY": [["11/256", 0x000E02]], + "BARBA_RAY_JOINT": [["11/256", 0x000E02]], "Box-JungleNorth": [ ["13/8192", 0x000207], ["7/4096", 0x000706], @@ -5506,6 +5534,7 @@ "LA_DIMENIAN": [["13/4096", 0x010224]], "LOVE_RAPPY": [["1/2", 0x006900]], "MERICAROL": [["13/4096", 0x002F00]], + "MERICARAND": [["13/4096", 0x002F00]], "MERICUS": [["13/4096", 0x006B00]], "MERIKLE": [["13/4096", 0x003D00]], "MERILLIA": [["1/64", 0x000E01]], @@ -5532,6 +5561,7 @@ "Viridia": { "BARBAROUS_WOLF": [["13/4096", 0x010224]], "BARBA_RAY": [["7/256", 0x001402]], + "BARBA_RAY_JOINT": [["7/256", 0x001402]], "Box-JungleNorth": [ ["13/8192", 0x000907], ["7/4096", 0x000406], @@ -5610,6 +5640,7 @@ "LA_DIMENIAN": [["13/4096", 0x002000]], "LOVE_RAPPY": [["1/2", 0x001006]], "MERICAROL": [["13/4096", 0x003B00]], + "MERICARAND": [["13/4096", 0x003B00]], "MERICUS": [["13/4096", 0x004600]], "MERIKLE": [["13/4096", 0x001101]], "MERILLIA": [["1/512", 0x01011D]], @@ -5636,6 +5667,7 @@ "Whitill": { "BARBAROUS_WOLF": [["1/64", 0x000807]], "BARBA_RAY": [["13/512", 0x01035E]], // Schtserv's original table has ["7/256", 0x01035D]] (Heavenly/HP) here + "BARBA_RAY_JOINT": [["13/512", 0x01035E]], // Schtserv's original table has ["7/256", 0x01035D]] (Heavenly/HP) here "Box-JungleNorth": [ ["13/8192", 0x000507], ["7/4096", 0x000806], @@ -5706,6 +5738,7 @@ "LA_DIMENIAN": [["1/64", 0x000D01]], "LOVE_RAPPY": [["1/2", 0x010132]], "MERICAROL": [["1/64", 0x008902]], + "MERICARAND": [["1/64", 0x008902]], "MERICUS": [["1/64", 0x008B02]], "MERIKLE": [["13/4096", 0x002F00]], "MERILLIA": [["1/64", 0x000807]], @@ -5732,6 +5765,7 @@ "Yellowboze": { "BARBAROUS_WOLF": [["1/512", 0x01030F]], "BARBA_RAY": [["7/256", 0x000F02]], + "BARBA_RAY_JOINT": [["7/256", 0x000F02]], "Box-JungleNorth": [ ["1/1024", 0x000107], ["1/1024", 0x000607], @@ -5801,6 +5835,7 @@ "LA_DIMENIAN": [["13/4096", 0x010225]], "LOVE_RAPPY": [["1/2", 0x005B00]], "MERICAROL": [["13/4096", 0x008902]], + "MERICARAND": [["13/4096", 0x008902]], "MERICUS": [["13/4096", 0x002F00]], "MERIKLE": [["13/4096", 0x005E00]], "MERILLIA": [["1/64", 0x000C06]], @@ -5829,6 +5864,7 @@ "Bluefull": { "BARBAROUS_WOLF": [["1/128", 0x000406]], "BARBA_RAY": [["3/32", 0x008901]], + "BARBA_RAY_JOINT": [["3/32", 0x008901]], "Box-JungleNorth": [ ["9/4096", 0x000405], ["9/4096", 0x000B03], @@ -5897,6 +5933,7 @@ "LA_DIMENIAN": [["1/128", 0x000B05]], "LOVE_RAPPY": [["7/8", 0x000407]], "MERICAROL": [["7/256", 0x008901]], + "MERICARAND": [["7/256", 0x008901]], "MERICUS": [["7/256", 0x008B01]], "MERIKLE": [["7/256", 0x010125]], "MERILLIA": [["1/128", 0x000406]], @@ -5920,6 +5957,7 @@ "Greennill": { "BARBAROUS_WOLF": [["1/128", 0x000706]], "BARBA_RAY": [["3/32", 0x008901]], + "BARBA_RAY_JOINT": [["3/32", 0x008901]], "Box-JungleNorth": [ ["9/4096", 0x000705], ["9/4096", 0x000304], @@ -5988,6 +6026,7 @@ "LA_DIMENIAN": [["1/128", 0x000706]], "LOVE_RAPPY": [["7/8", 0x000707]], "MERICAROL": [["7/256", 0x005600]], + "MERICARAND": [["7/256", 0x005600]], "MERICUS": [["7/256", 0x008C01]], "MERIKLE": [["7/256", 0x000707]], "MERILLIA": [["1/128", 0x000706]], @@ -6011,6 +6050,7 @@ "Oran": { "BARBAROUS_WOLF": [["1/128", 0x000306]], "BARBA_RAY": [["3/32", 0x008901]], + "BARBA_RAY_JOINT": [["3/32", 0x008901]], "Box-JungleNorth": [ ["9/4096", 0x000305], ["9/4096", 0x000204], @@ -6081,6 +6121,7 @@ "LA_DIMENIAN": [["1/128", 0x000306]], "LOVE_RAPPY": [["7/8", 0x010219]], "MERICAROL": [["7/256", 0x008901]], + "MERICARAND": [["7/256", 0x008901]], "MERICUS": [["7/256", 0x008B01]], "MERIKLE": [["7/256", 0x000307]], "MERILLIA": [["1/128", 0x000306]], @@ -6104,6 +6145,7 @@ "Pinkal": { "BARBAROUS_WOLF": [["1/128", 0x000C05]], "BARBA_RAY": [["3/32", 0x008901]], + "BARBA_RAY_JOINT": [["3/32", 0x008901]], "Box-JungleNorth": [ ["9/4096", 0x000C04], ["9/4096", 0x000404], @@ -6178,6 +6220,7 @@ "LA_DIMENIAN": [["1/128", 0x000C05]], "LOVE_RAPPY": [["7/8", 0x002300]], "MERICAROL": [["7/256", 0x008901]], + "MERICARAND": [["7/256", 0x008901]], "MERICUS": [["7/256", 0x008B01]], "MERIKLE": [["7/256", 0x005600]], "MERILLIA": [["1/128", 0x000406]], @@ -6201,6 +6244,7 @@ "Purplenum": { "BARBAROUS_WOLF": [["1/128", 0x000806]], "BARBA_RAY": [["3/32", 0x008901]], + "BARBA_RAY_JOINT": [["3/32", 0x008901]], "Box-JungleNorth": [ ["9/4096", 0x000805], ["9/4096", 0x000304], @@ -6271,6 +6315,7 @@ "LA_DIMENIAN": [["1/128", 0x000E00]], "LOVE_RAPPY": [["7/8", 0x000807]], "MERICAROL": [["7/256", 0x008901]], + "MERICARAND": [["7/256", 0x008901]], "MERICUS": [["7/256", 0x008B01]], "MERIKLE": [["7/256", 0x000307]], "MERILLIA": [["1/128", 0x000306]], @@ -6294,6 +6339,7 @@ "Redria": { "BARBAROUS_WOLF": [["1/128", 0x000906]], "BARBA_RAY": [["3/32", 0x000E01]], + "BARBA_RAY_JOINT": [["3/32", 0x000E01]], "Box-JungleNorth": [ ["9/4096", 0x000504], ["9/4096", 0x000904], @@ -6362,6 +6408,7 @@ "LA_DIMENIAN": [["1/128", 0x000906]], "LOVE_RAPPY": [["7/8", 0x01031D]], "MERICAROL": [["7/256", 0x008901]], + "MERICARAND": [["7/256", 0x008901]], "MERICUS": [["7/256", 0x000F01]], "MERIKLE": [["7/256", 0x001004]], "MERILLIA": [["1/128", 0x000506]], @@ -6385,6 +6432,7 @@ "Skyly": { "BARBAROUS_WOLF": [["1/128", 0x000206]], "BARBA_RAY": [["3/32", 0x000E01]], + "BARBA_RAY_JOINT": [["3/32", 0x000E01]], "Box-JungleNorth": [ ["9/4096", 0x000205], ["9/4096", 0x000704], @@ -6455,6 +6503,7 @@ "LA_DIMENIAN": [["1/128", 0x000206]], "LOVE_RAPPY": [["7/8", 0x000207]], "MERICAROL": [["7/256", 0x005601]], + "MERICARAND": [["7/256", 0x005601]], "MERICUS": [["7/256", 0x008B01]], "MERIKLE": [["7/256", 0x000207]], "MERILLIA": [["1/128", 0x000205]], @@ -6478,6 +6527,7 @@ "Viridia": { "BARBAROUS_WOLF": [["1/128", 0x010219]], "BARBA_RAY": [["3/32", 0x008901]], + "BARBA_RAY_JOINT": [["3/32", 0x008901]], "Box-JungleNorth": [ ["9/4096", 0x000905], ["9/4096", 0x000404], @@ -6548,6 +6598,7 @@ "LA_DIMENIAN": [["1/64", 0x000406]], "LOVE_RAPPY": [["7/8", 0x000907]], "MERICAROL": [["7/256", 0x008901]], + "MERICARAND": [["7/256", 0x008901]], "MERICUS": [["7/256", 0x008B01]], "MERIKLE": [["7/256", 0x000407]], "MERILLIA": [["1/128", 0x000906]], @@ -6571,6 +6622,7 @@ "Whitill": { "BARBAROUS_WOLF": [["1/128", 0x000506]], "BARBA_RAY": [["3/32", 0x008901]], + "BARBA_RAY_JOINT": [["3/32", 0x008901]], "Box-JungleNorth": [ ["9/4096", 0x000505], ["9/4096", 0x000804], @@ -6643,6 +6695,7 @@ "LA_DIMENIAN": [["1/128", 0x000806]], "LOVE_RAPPY": [["7/8", 0x010222]], "MERICAROL": [["7/256", 0x000506]], + "MERICARAND": [["7/256", 0x000506]], "MERICUS": [["7/256", 0x005601]], "MERIKLE": [["7/256", 0x008901]], "MERILLIA": [["1/128", 0x000506]], @@ -6666,6 +6719,7 @@ "Yellowboze": { "BARBAROUS_WOLF": [["1/128", 0x000806]], "BARBA_RAY": [["3/32", 0x000F01]], + "BARBA_RAY_JOINT": [["3/32", 0x000F01]], "Box-JungleNorth": [ ["9/4096", 0x000105], ["9/4096", 0x000605], @@ -6738,6 +6792,7 @@ "LA_DIMENIAN": [["1/128", 0x010225]], "LOVE_RAPPY": [["7/8", 0x000906]], "MERICAROL": [["7/256", 0x003B00]], + "MERICARAND": [["7/256", 0x003B00]], "MERICUS": [["7/256", 0x010125]], "MERIKLE": [["7/256", 0x008B01]], "MERILLIA": [["1/128", 0x000106]],