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

fix identified item flag during item generation

Browse Source
This commit is contained in:
Martin Michelsen
2023-10-21 20:05:32 -07:00
parent 713e8ff7c1
commit 7b035d311f
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ItemCreator.cc
+4 -4
View File
@@ -315,7 +315,7 @@ ItemData ItemCreator::check_rate_and_create_rare_item(
switch (item.data1[0]) { switch (item.data1[0]) {
case 0: case 0:
this->generate_rare_weapon_bonuses(item, this->rand_int(10)); this->generate_rare_weapon_bonuses(item, this->rand_int(10));
this->set_item_unidentified_flag_if_challenge(item); this->set_item_unidentified_flag_if_not_challenge(item);
break; break;
case 1: case 1:
this->generate_common_armor_slots_and_bonuses(item); this->generate_common_armor_slots_and_bonuses(item);
@@ -402,8 +402,8 @@ void ItemCreator::set_item_kill_count_if_unsealable(ItemData& item) const {
} }
} }
void ItemCreator::set_item_unidentified_flag_if_challenge(ItemData& item) const { void ItemCreator::set_item_unidentified_flag_if_not_challenge(ItemData& item) const {
if ((this->mode == GameMode::CHALLENGE) && if ((this->mode != GameMode::CHALLENGE) &&
(item.data1[0] == 0x00) && (item.data1[0] == 0x00) &&
(this->item_parameter_table->is_item_rare(item) || (item.data1[4] != 0))) { (this->item_parameter_table->is_item_rare(item) || (item.data1[4] != 0))) {
item.data1[4] |= 0x80; item.data1[4] |= 0x80;
@@ -665,7 +665,7 @@ void ItemCreator::generate_common_weapon_variances(uint8_t area_norm, ItemData&
} }
this->generate_common_weapon_bonuses(item, area_norm); this->generate_common_weapon_bonuses(item, area_norm);
this->generate_common_weapon_special(item, area_norm); this->generate_common_weapon_special(item, area_norm);
this->set_item_unidentified_flag_if_challenge(item); this->set_item_unidentified_flag_if_not_challenge(item);
} }
} }
src/ItemCreator.hh
+1 -1
View File
@@ -90,7 +90,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_kill_count_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_not_challenge(ItemData& item) const;
void set_tool_item_amount_to_1(ItemData& item) const; void set_tool_item_amount_to_1(ItemData& item) const;
void generate_common_item_variances(uint32_t norm_area, ItemData& item); void generate_common_item_variances(uint32_t norm_area, ItemData& item);