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

fix some names in ItemCreator

Browse Source
This commit is contained in:
Martin Michelsen
2023-03-30 09:39:21 -07:00
parent dd1c5a2d0c
commit 2ed6427773
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ItemCreator.cc
+4 -4
View File
@@ -328,7 +328,7 @@ ItemData ItemCreator::check_rate_and_create_rare_item(
} }
this->clear_item_if_restricted(item); this->clear_item_if_restricted(item);
this->set_item_unidentified_or_present_flags_if_unsealable(item); this->set_item_kill_count_if_unsealable(item);
return item; return item;
} }
@@ -390,9 +390,9 @@ void ItemCreator::deduplicate_weapon_bonuses(ItemData& item) const {
} }
} }
void ItemCreator::set_item_unidentified_or_present_flags_if_unsealable(ItemData& item) const { void ItemCreator::set_item_kill_count_if_unsealable(ItemData& item) const {
if (this->item_parameter_table->is_unsealable_item(item)) { if (this->item_parameter_table->is_unsealable_item(item)) {
item.set_unidentified_or_present_flag(0); item.set_sealed_item_kill_count(0);
} }
} }
@@ -552,7 +552,7 @@ void ItemCreator::generate_common_item_variances(
} }
this->clear_item_if_restricted(item); this->clear_item_if_restricted(item);
this->set_item_unidentified_or_present_flags_if_unsealable(item); this->set_item_kill_count_if_unsealable(item);
} }
void ItemCreator::generate_common_armor_or_shield_type_and_variances( void ItemCreator::generate_common_armor_or_shield_type_and_variances(
src/ItemCreator.hh
+1 -1
View File
@@ -122,7 +122,7 @@ private:
void generate_rare_weapon_bonuses(ItemData& item, uint32_t random_sample); void generate_rare_weapon_bonuses(ItemData& item, uint32_t random_sample);
void deduplicate_weapon_bonuses(ItemData& item) const; void deduplicate_weapon_bonuses(ItemData& item) const;
void set_item_unidentified_or_present_flags_if_unsealable(ItemData& item) const; void set_item_kill_count_if_unsealable(ItemData& item) const;
void set_item_unidentified_flag_if_challenge(ItemData& item) const; void set_item_unidentified_flag_if_challenge(ItemData& item) const;
void set_tool_item_amount_to_1(ItemData& item) const; void set_tool_item_amount_to_1(ItemData& item) const;
src/ItemData.cc
+1 -1
View File
@@ -104,7 +104,7 @@ void ItemData::clear_mag_stats() {
void ItemData::set_unidentified_or_present_flag(uint16_t v) { void ItemData::set_sealed_item_kill_count(uint16_t v) {
this->data1[10] = (v >> 8) | 0x80; this->data1[10] = (v >> 8) | 0x80;
this->data1[11] = v; this->data1[11] = v;
} }
src/ItemData.hh
+1 -1
View File
@@ -80,7 +80,7 @@ struct ItemData { // 0x14 bytes
void assign_mag_stats(const ItemMagStats& mag); void assign_mag_stats(const ItemMagStats& mag);
void clear_mag_stats(); void clear_mag_stats();
void set_unidentified_or_present_flag(uint16_t v); void set_sealed_item_kill_count(uint16_t v);
uint8_t get_tool_item_amount() const; uint8_t get_tool_item_amount() const;
void set_tool_item_amount(uint8_t amount); void set_tool_item_amount(uint8_t amount);
int16_t get_armor_or_shield_defense_bonus() const; int16_t get_armor_or_shield_defense_bonus() const;