diff --git a/assets/item_properties/3_blessed_hammer.png b/assets/item_properties/3_blessed_hammer.png new file mode 100644 index 0000000..39c7c57 Binary files /dev/null and b/assets/item_properties/3_blessed_hammer.png differ diff --git a/assets/item_properties/3_bone_spear.png b/assets/item_properties/3_bone_spear.png new file mode 100644 index 0000000..e7dca39 Binary files /dev/null and b/assets/item_properties/3_bone_spear.png differ diff --git a/assets/item_properties/3_bone_spirit.png b/assets/item_properties/3_bone_spirit.png new file mode 100644 index 0000000..d4ffae1 Binary files /dev/null and b/assets/item_properties/3_bone_spirit.png differ diff --git a/assets/item_properties/3_bow_skills.png b/assets/item_properties/3_bow_skills.png new file mode 100644 index 0000000..b18335f Binary files /dev/null and b/assets/item_properties/3_bow_skills.png differ diff --git a/assets/item_properties/3_chilling_armor.png b/assets/item_properties/3_chilling_armor.png new file mode 100644 index 0000000..5cf5e69 Binary files /dev/null and b/assets/item_properties/3_chilling_armor.png differ diff --git a/assets/item_properties/3_concentration.png b/assets/item_properties/3_concentration.png new file mode 100644 index 0000000..b7c0dcc Binary files /dev/null and b/assets/item_properties/3_concentration.png differ diff --git a/assets/item_properties/3_conviction.png b/assets/item_properties/3_conviction.png new file mode 100644 index 0000000..697a41c Binary files /dev/null and b/assets/item_properties/3_conviction.png differ diff --git a/assets/item_properties/3_energy_shield.png b/assets/item_properties/3_energy_shield.png new file mode 100644 index 0000000..bb95154 Binary files /dev/null and b/assets/item_properties/3_energy_shield.png differ diff --git a/assets/item_properties/3_fanaticism.png b/assets/item_properties/3_fanaticism.png new file mode 100644 index 0000000..b1113f3 Binary files /dev/null and b/assets/item_properties/3_fanaticism.png differ diff --git a/assets/item_properties/3_fist_of_the_heavens.png b/assets/item_properties/3_fist_of_the_heavens.png new file mode 100644 index 0000000..fc13f11 Binary files /dev/null and b/assets/item_properties/3_fist_of_the_heavens.png differ diff --git a/assets/item_properties/3_holy_shield.png b/assets/item_properties/3_holy_shield.png new file mode 100644 index 0000000..7063184 Binary files /dev/null and b/assets/item_properties/3_holy_shield.png differ diff --git a/assets/item_properties/3_lightning_sentry.png b/assets/item_properties/3_lightning_sentry.png new file mode 100644 index 0000000..59eb403 Binary files /dev/null and b/assets/item_properties/3_lightning_sentry.png differ diff --git a/assets/item_properties/3_shiver_armor.png b/assets/item_properties/3_shiver_armor.png new file mode 100644 index 0000000..bd32fe4 Binary files /dev/null and b/assets/item_properties/3_shiver_armor.png differ diff --git a/assets/item_properties/3_thunder_storm.png b/assets/item_properties/3_thunder_storm.png new file mode 100644 index 0000000..17098e1 Binary files /dev/null and b/assets/item_properties/3_thunder_storm.png differ diff --git a/assets/item_properties/3_tornado.png b/assets/item_properties/3_tornado.png new file mode 100644 index 0000000..d6d4cc7 Binary files /dev/null and b/assets/item_properties/3_tornado.png differ diff --git a/assets/item_properties/3_venom.png b/assets/item_properties/3_venom.png new file mode 100644 index 0000000..5528c2a Binary files /dev/null and b/assets/item_properties/3_venom.png differ diff --git a/assets/item_properties/3_warcries.png b/assets/item_properties/3_warcries.png new file mode 100644 index 0000000..0bd35c7 Binary files /dev/null and b/assets/item_properties/3_warcries.png differ diff --git a/assets/item_properties/3_zeal.png b/assets/item_properties/3_zeal.png new file mode 100644 index 0000000..10a5f60 Binary files /dev/null and b/assets/item_properties/3_zeal.png differ diff --git a/assets/item_properties/all_resist.png b/assets/item_properties/all_resist.png new file mode 100644 index 0000000..0b8567e Binary files /dev/null and b/assets/item_properties/all_resist.png differ diff --git a/assets/item_properties/all_resist_45.png b/assets/item_properties/all_resist_45.png new file mode 100644 index 0000000..835b260 Binary files /dev/null and b/assets/item_properties/all_resist_45.png differ diff --git a/assets/item_properties/all_resist_gt40.png b/assets/item_properties/all_resist_gt40.png new file mode 100644 index 0000000..7f899d1 Binary files /dev/null and b/assets/item_properties/all_resist_gt40.png differ diff --git a/assets/item_properties/enhanced_damage.png b/assets/item_properties/enhanced_damage.png new file mode 100644 index 0000000..a737679 Binary files /dev/null and b/assets/item_properties/enhanced_damage.png differ diff --git a/assets/item_properties/enhanced_damage_15.png b/assets/item_properties/enhanced_damage_15.png new file mode 100644 index 0000000..ce7df36 Binary files /dev/null and b/assets/item_properties/enhanced_damage_15.png differ diff --git a/assets/item_properties/enhanced_defense.png b/assets/item_properties/enhanced_defense.png new file mode 100644 index 0000000..33aeabc Binary files /dev/null and b/assets/item_properties/enhanced_defense.png differ diff --git a/assets/item_properties/enhanced_defense_15.png b/assets/item_properties/enhanced_defense_15.png new file mode 100644 index 0000000..88bd7a7 Binary files /dev/null and b/assets/item_properties/enhanced_defense_15.png differ diff --git a/assets/templates/ethereal.png b/assets/item_properties/ethereal.png similarity index 100% rename from assets/templates/ethereal.png rename to assets/item_properties/ethereal.png diff --git a/assets/item_properties/socketed.png b/assets/item_properties/socketed.png new file mode 100644 index 0000000..d6d06fd Binary files /dev/null and b/assets/item_properties/socketed.png differ diff --git a/assets/item_properties/socketed_1.png b/assets/item_properties/socketed_1.png new file mode 100644 index 0000000..79e6580 Binary files /dev/null and b/assets/item_properties/socketed_1.png differ diff --git a/assets/item_properties/socketed_2.png b/assets/item_properties/socketed_2.png new file mode 100644 index 0000000..440121c Binary files /dev/null and b/assets/item_properties/socketed_2.png differ diff --git a/assets/item_properties/socketed_3.png b/assets/item_properties/socketed_3.png new file mode 100644 index 0000000..0f13351 Binary files /dev/null and b/assets/item_properties/socketed_3.png differ diff --git a/assets/item_properties/socketed_4.png b/assets/item_properties/socketed_4.png new file mode 100644 index 0000000..6deda91 Binary files /dev/null and b/assets/item_properties/socketed_4.png differ diff --git a/assets/item_properties/socketed_5.png b/assets/item_properties/socketed_5.png new file mode 100644 index 0000000..1d40168 Binary files /dev/null and b/assets/item_properties/socketed_5.png differ diff --git a/assets/item_properties/socketed_6.png b/assets/item_properties/socketed_6.png new file mode 100644 index 0000000..4d70e65 Binary files /dev/null and b/assets/item_properties/socketed_6.png differ diff --git a/assets/items/eth_superior_archon_plate.png b/assets/items/eth_superior_archon_plate.png deleted file mode 100644 index c63a7bc..0000000 Binary files a/assets/items/eth_superior_archon_plate.png and /dev/null differ diff --git a/assets/items/eth_akaran_rondache.png b/assets/items/gray_akaran_rondache.png similarity index 100% rename from assets/items/eth_akaran_rondache.png rename to assets/items/gray_akaran_rondache.png diff --git a/assets/items/eth_akaran_targe.png b/assets/items/gray_akaran_targe.png similarity index 100% rename from assets/items/eth_akaran_targe.png rename to assets/items/gray_akaran_targe.png diff --git a/assets/items/eth_archon_staff.png b/assets/items/gray_archon_staff.png similarity index 100% rename from assets/items/eth_archon_staff.png rename to assets/items/gray_archon_staff.png diff --git a/assets/items/eth_armor_archon_plate.png b/assets/items/gray_armor_archon_plate.png similarity index 100% rename from assets/items/eth_armor_archon_plate.png rename to assets/items/gray_armor_archon_plate.png diff --git a/assets/items/eth_armor_balrog.png b/assets/items/gray_armor_balrog.png similarity index 100% rename from assets/items/eth_armor_balrog.png rename to assets/items/gray_armor_balrog.png diff --git a/assets/items/eth_armor_boneweave.png b/assets/items/gray_armor_boneweave.png similarity index 100% rename from assets/items/eth_armor_boneweave.png rename to assets/items/gray_armor_boneweave.png diff --git a/assets/items/eth_armor_dusk_shroud.png b/assets/items/gray_armor_dusk_shroud.png similarity index 100% rename from assets/items/eth_armor_dusk_shroud.png rename to assets/items/gray_armor_dusk_shroud.png diff --git a/assets/items/eth_armor_great_hauberk.png b/assets/items/gray_armor_great_hauberk.png similarity index 100% rename from assets/items/eth_armor_great_hauberk.png rename to assets/items/gray_armor_great_hauberk.png diff --git a/assets/items/eth_armor_hellforge.png b/assets/items/gray_armor_hellforge.png similarity index 100% rename from assets/items/eth_armor_hellforge.png rename to assets/items/gray_armor_hellforge.png diff --git a/assets/items/eth_armor_kraken.png b/assets/items/gray_armor_kraken.png similarity index 100% rename from assets/items/eth_armor_kraken.png rename to assets/items/gray_armor_kraken.png diff --git a/assets/items/eth_armor_lacquered_plate.png b/assets/items/gray_armor_lacquered_plate.png similarity index 100% rename from assets/items/eth_armor_lacquered_plate.png rename to assets/items/gray_armor_lacquered_plate.png diff --git a/assets/items/eth_armor_light_plate.png b/assets/items/gray_armor_light_plate.png similarity index 100% rename from assets/items/eth_armor_light_plate.png rename to assets/items/gray_armor_light_plate.png diff --git a/assets/items/eth_armor_mage_plate.png b/assets/items/gray_armor_mage_plate.png similarity index 100% rename from assets/items/eth_armor_mage_plate.png rename to assets/items/gray_armor_mage_plate.png diff --git a/assets/items/eth_armor_sacred_armor.png b/assets/items/gray_armor_sacred_armor.png similarity index 100% rename from assets/items/eth_armor_sacred_armor.png rename to assets/items/gray_armor_sacred_armor.png diff --git a/assets/items/eth_armor_shadow_plate.png b/assets/items/gray_armor_shadow_plate.png similarity index 100% rename from assets/items/eth_armor_shadow_plate.png rename to assets/items/gray_armor_shadow_plate.png diff --git a/assets/items/eth_armor_wyrmhide.png b/assets/items/gray_armor_wyrmhide.png similarity index 100% rename from assets/items/eth_armor_wyrmhide.png rename to assets/items/gray_armor_wyrmhide.png diff --git a/assets/items/eth_caduceus.png b/assets/items/gray_caduceus.png similarity index 100% rename from assets/items/eth_caduceus.png rename to assets/items/gray_caduceus.png diff --git a/assets/items/eth_cedar_staff.png b/assets/items/gray_cedar_staff.png similarity index 100% rename from assets/items/eth_cedar_staff.png rename to assets/items/gray_cedar_staff.png diff --git a/assets/items/eth_divine_scepter.png b/assets/items/gray_divine_scepter.png similarity index 100% rename from assets/items/eth_divine_scepter.png rename to assets/items/gray_divine_scepter.png diff --git a/assets/items/eth_elder_staff.png b/assets/items/gray_elder_staff.png similarity index 100% rename from assets/items/eth_elder_staff.png rename to assets/items/gray_elder_staff.png diff --git a/assets/items/eth_ghost_wand.png b/assets/items/gray_ghost_wand.png similarity index 100% rename from assets/items/eth_ghost_wand.png rename to assets/items/gray_ghost_wand.png diff --git a/assets/items/eth_gothic_staff.png b/assets/items/gray_gothic_staff.png similarity index 100% rename from assets/items/eth_gothic_staff.png rename to assets/items/gray_gothic_staff.png diff --git a/assets/items/eth_helm_bone_visage.png b/assets/items/gray_helm_bone_visage.png similarity index 100% rename from assets/items/eth_helm_bone_visage.png rename to assets/items/gray_helm_bone_visage.png diff --git a/assets/items/eth_helm_corona.png b/assets/items/gray_helm_corona.png similarity index 100% rename from assets/items/eth_helm_corona.png rename to assets/items/gray_helm_corona.png diff --git a/assets/items/gray_helm_demonhead.png b/assets/items/gray_helm_demonhead.png new file mode 100644 index 0000000..9939466 Binary files /dev/null and b/assets/items/gray_helm_demonhead.png differ diff --git a/assets/items/eth_helm_diadem.png b/assets/items/gray_helm_diadem.png similarity index 100% rename from assets/items/eth_helm_diadem.png rename to assets/items/gray_helm_diadem.png diff --git a/assets/items/eth_helm_giant_conch.png b/assets/items/gray_helm_giant_conch.png similarity index 100% rename from assets/items/eth_helm_giant_conch.png rename to assets/items/gray_helm_giant_conch.png diff --git a/assets/items/eth_helm_shako.png b/assets/items/gray_helm_shako.png similarity index 100% rename from assets/items/eth_helm_shako.png rename to assets/items/gray_helm_shako.png diff --git a/assets/items/eth_kurast_shield.png b/assets/items/gray_kurast_shield.png similarity index 100% rename from assets/items/eth_kurast_shield.png rename to assets/items/gray_kurast_shield.png diff --git a/assets/items/eth_lich_wand.png b/assets/items/gray_lich_wand.png similarity index 100% rename from assets/items/eth_lich_wand.png rename to assets/items/gray_lich_wand.png diff --git a/assets/items/eth_polished_wand.png b/assets/items/gray_polished_wand.png similarity index 100% rename from assets/items/eth_polished_wand.png rename to assets/items/gray_polished_wand.png diff --git a/assets/items/eth_royal_shield.png b/assets/items/gray_royal_shield.png similarity index 100% rename from assets/items/eth_royal_shield.png rename to assets/items/gray_royal_shield.png diff --git a/assets/items/eth_rune_staff.png b/assets/items/gray_rune_staff.png similarity index 100% rename from assets/items/eth_rune_staff.png rename to assets/items/gray_rune_staff.png diff --git a/assets/items/eth_sacred_rondache.png b/assets/items/gray_sacred_rondache.png similarity index 100% rename from assets/items/eth_sacred_rondache.png rename to assets/items/gray_sacred_rondache.png diff --git a/assets/items/eth_sacred_targe.png b/assets/items/gray_sacred_targe.png similarity index 100% rename from assets/items/eth_sacred_targe.png rename to assets/items/gray_sacred_targe.png diff --git a/assets/items/eth_shield_monarch.png b/assets/items/gray_shield_monarch.png similarity index 100% rename from assets/items/eth_shield_monarch.png rename to assets/items/gray_shield_monarch.png diff --git a/assets/items/eth_shield_troll_nest.png b/assets/items/gray_shield_troll_nest.png similarity index 100% rename from assets/items/eth_shield_troll_nest.png rename to assets/items/gray_shield_troll_nest.png diff --git a/assets/items/eth_shillelagh.png b/assets/items/gray_shillelagh.png similarity index 100% rename from assets/items/eth_shillelagh.png rename to assets/items/gray_shillelagh.png diff --git a/assets/items/eth_superior_akaran_rondache.png b/assets/items/gray_superior_akaran_rondache.png similarity index 100% rename from assets/items/eth_superior_akaran_rondache.png rename to assets/items/gray_superior_akaran_rondache.png diff --git a/assets/items/eth_superior_akaran_targe.png b/assets/items/gray_superior_akaran_targe.png similarity index 100% rename from assets/items/eth_superior_akaran_targe.png rename to assets/items/gray_superior_akaran_targe.png diff --git a/assets/items/gray_superior_archon_plate.png b/assets/items/gray_superior_archon_plate.png new file mode 100644 index 0000000..fe3cde1 Binary files /dev/null and b/assets/items/gray_superior_archon_plate.png differ diff --git a/assets/items/eth_superior_berserker_axe.png b/assets/items/gray_superior_berserker_axe.png similarity index 100% rename from assets/items/eth_superior_berserker_axe.png rename to assets/items/gray_superior_berserker_axe.png diff --git a/assets/items/eth_superior_boneweave.png b/assets/items/gray_superior_boneweave.png similarity index 100% rename from assets/items/eth_superior_boneweave.png rename to assets/items/gray_superior_boneweave.png diff --git a/assets/items/eth_superior_crystal_sword.png b/assets/items/gray_superior_crystal_sword.png similarity index 100% rename from assets/items/eth_superior_crystal_sword.png rename to assets/items/gray_superior_crystal_sword.png diff --git a/assets/items/eth_superior_dusk_shroud.png b/assets/items/gray_superior_dusk_shroud.png similarity index 100% rename from assets/items/eth_superior_dusk_shroud.png rename to assets/items/gray_superior_dusk_shroud.png diff --git a/assets/items/eth_superior_flail.png b/assets/items/gray_superior_flail.png similarity index 100% rename from assets/items/eth_superior_flail.png rename to assets/items/gray_superior_flail.png diff --git a/assets/items/eth_superior_great_hauberk.png b/assets/items/gray_superior_great_hauberk.png similarity index 100% rename from assets/items/eth_superior_great_hauberk.png rename to assets/items/gray_superior_great_hauberk.png diff --git a/assets/items/eth_superior_kurast_shield.png b/assets/items/gray_superior_kurast_shield.png similarity index 100% rename from assets/items/eth_superior_kurast_shield.png rename to assets/items/gray_superior_kurast_shield.png diff --git a/assets/items/eth_superior_lacquered_plate.png b/assets/items/gray_superior_lacquered_plate.png similarity index 100% rename from assets/items/eth_superior_lacquered_plate.png rename to assets/items/gray_superior_lacquered_plate.png diff --git a/assets/items/eth_superior_light_plate.png b/assets/items/gray_superior_light_plate.png similarity index 100% rename from assets/items/eth_superior_light_plate.png rename to assets/items/gray_superior_light_plate.png diff --git a/assets/items/eth_superior_mage_plate.png b/assets/items/gray_superior_mage_plate.png similarity index 100% rename from assets/items/eth_superior_mage_plate.png rename to assets/items/gray_superior_mage_plate.png diff --git a/assets/items/eth_superior_phase_blade.png b/assets/items/gray_superior_phase_blade.png similarity index 100% rename from assets/items/eth_superior_phase_blade.png rename to assets/items/gray_superior_phase_blade.png diff --git a/assets/items/eth_superior_royal_shield.png b/assets/items/gray_superior_royal_shield.png similarity index 100% rename from assets/items/eth_superior_royal_shield.png rename to assets/items/gray_superior_royal_shield.png diff --git a/assets/items/eth_superior_sacred_armor.png b/assets/items/gray_superior_sacred_armor.png similarity index 100% rename from assets/items/eth_superior_sacred_armor.png rename to assets/items/gray_superior_sacred_armor.png diff --git a/assets/items/eth_superior_sacred_rondache.png b/assets/items/gray_superior_sacred_rondache.png similarity index 100% rename from assets/items/eth_superior_sacred_rondache.png rename to assets/items/gray_superior_sacred_rondache.png diff --git a/assets/items/eth_superior_sacred_targe.png b/assets/items/gray_superior_sacred_targe.png similarity index 100% rename from assets/items/eth_superior_sacred_targe.png rename to assets/items/gray_superior_sacred_targe.png diff --git a/assets/items/eth_superior_shadow_plate.png b/assets/items/gray_superior_shadow_plate.png similarity index 100% rename from assets/items/eth_superior_shadow_plate.png rename to assets/items/gray_superior_shadow_plate.png diff --git a/assets/items/eth_superior_vortex_shield.png b/assets/items/gray_superior_vortex_shield.png similarity index 100% rename from assets/items/eth_superior_vortex_shield.png rename to assets/items/gray_superior_vortex_shield.png diff --git a/assets/items/eth_superior_wyrmhide.png b/assets/items/gray_superior_wyrmhide.png similarity index 100% rename from assets/items/eth_superior_wyrmhide.png rename to assets/items/gray_superior_wyrmhide.png diff --git a/assets/items/eth_superior_zakarum_shield.png b/assets/items/gray_superior_zakarum_shield.png similarity index 100% rename from assets/items/eth_superior_zakarum_shield.png rename to assets/items/gray_superior_zakarum_shield.png diff --git a/assets/items/eth_unearthed_wand.png b/assets/items/gray_unearthed_wand.png similarity index 100% rename from assets/items/eth_unearthed_wand.png rename to assets/items/gray_unearthed_wand.png diff --git a/assets/items/eth_vortex_shield.png b/assets/items/gray_vortex_shield.png similarity index 100% rename from assets/items/eth_vortex_shield.png rename to assets/items/gray_vortex_shield.png diff --git a/assets/items/eth_war_staff.png b/assets/items/gray_war_staff.png similarity index 100% rename from assets/items/eth_war_staff.png rename to assets/items/gray_war_staff.png diff --git a/assets/items/eth_weapon_berserker_axe.png b/assets/items/gray_weapon_berserker_axe.png similarity index 100% rename from assets/items/eth_weapon_berserker_axe.png rename to assets/items/gray_weapon_berserker_axe.png diff --git a/assets/items/eth_weapon_colossus_voulge.png b/assets/items/gray_weapon_colossus_voulge.png similarity index 100% rename from assets/items/eth_weapon_colossus_voulge.png rename to assets/items/gray_weapon_colossus_voulge.png diff --git a/assets/items/eth_weapon_cryptic_axe.png b/assets/items/gray_weapon_cryptic_axe.png similarity index 100% rename from assets/items/eth_weapon_cryptic_axe.png rename to assets/items/gray_weapon_cryptic_axe.png diff --git a/assets/items/eth_weapon_crystal_sword.png b/assets/items/gray_weapon_crystal_sword.png similarity index 100% rename from assets/items/eth_weapon_crystal_sword.png rename to assets/items/gray_weapon_crystal_sword.png diff --git a/assets/items/eth_weapon_flail.png b/assets/items/gray_weapon_flail.png similarity index 100% rename from assets/items/eth_weapon_flail.png rename to assets/items/gray_weapon_flail.png diff --git a/assets/items/eth_weapon_ghost_spear.png b/assets/items/gray_weapon_ghost_spear.png similarity index 100% rename from assets/items/eth_weapon_ghost_spear.png rename to assets/items/gray_weapon_ghost_spear.png diff --git a/assets/items/eth_weapon_giant_thresher.png b/assets/items/gray_weapon_giant_thresher.png similarity index 100% rename from assets/items/eth_weapon_giant_thresher.png rename to assets/items/gray_weapon_giant_thresher.png diff --git a/assets/items/eth_weapon_grand_matron_bow.png b/assets/items/gray_weapon_grand_matron_bow.png similarity index 100% rename from assets/items/eth_weapon_grand_matron_bow.png rename to assets/items/gray_weapon_grand_matron_bow.png diff --git a/assets/items/eth_weapon_great_poleaxe.png b/assets/items/gray_weapon_great_poleaxe.png similarity index 100% rename from assets/items/eth_weapon_great_poleaxe.png rename to assets/items/gray_weapon_great_poleaxe.png diff --git a/assets/items/eth_weapon_phase_blade.png b/assets/items/gray_weapon_phase_blade.png similarity index 100% rename from assets/items/eth_weapon_phase_blade.png rename to assets/items/gray_weapon_phase_blade.png diff --git a/assets/items/eth_weapon_superior_colossus_voulge.png b/assets/items/gray_weapon_superior_colossus_voulge.png similarity index 100% rename from assets/items/eth_weapon_superior_colossus_voulge.png rename to assets/items/gray_weapon_superior_colossus_voulge.png diff --git a/assets/items/eth_weapon_superior_cryptic_axe.png b/assets/items/gray_weapon_superior_cryptic_axe.png similarity index 100% rename from assets/items/eth_weapon_superior_cryptic_axe.png rename to assets/items/gray_weapon_superior_cryptic_axe.png diff --git a/assets/items/eth_weapon_superior_giant_thresher.png b/assets/items/gray_weapon_superior_giant_thresher.png similarity index 100% rename from assets/items/eth_weapon_superior_giant_thresher.png rename to assets/items/gray_weapon_superior_giant_thresher.png diff --git a/assets/items/eth_weapon_superior_grand_matron_bow.png b/assets/items/gray_weapon_superior_grand_matron_bow.png similarity index 100% rename from assets/items/eth_weapon_superior_grand_matron_bow.png rename to assets/items/gray_weapon_superior_grand_matron_bow.png diff --git a/assets/items/eth_weapon_superior_thresher.png b/assets/items/gray_weapon_superior_thresher.png similarity index 100% rename from assets/items/eth_weapon_superior_thresher.png rename to assets/items/gray_weapon_superior_thresher.png diff --git a/assets/items/eth_weapon_thresher.png b/assets/items/gray_weapon_thresher.png similarity index 100% rename from assets/items/eth_weapon_thresher.png rename to assets/items/gray_weapon_thresher.png diff --git a/assets/items/eth_weapon_war_pike.png b/assets/items/gray_weapon_war_pike.png similarity index 100% rename from assets/items/eth_weapon_war_pike.png rename to assets/items/gray_weapon_war_pike.png diff --git a/assets/items/eth_weapon_war_scepter.png b/assets/items/gray_weapon_war_scepter.png similarity index 100% rename from assets/items/eth_weapon_war_scepter.png rename to assets/items/gray_weapon_war_scepter.png diff --git a/assets/items/eth_zakarum_shield.png b/assets/items/gray_zakarum_shield.png similarity index 100% rename from assets/items/eth_zakarum_shield.png rename to assets/items/gray_zakarum_shield.png diff --git a/assets/items/misc_tp_scroll.png b/assets/items/misc_tp_scroll.png deleted file mode 100644 index 0a1e848..0000000 Binary files a/assets/items/misc_tp_scroll.png and /dev/null differ diff --git a/assets/items/rare_ancient_armor.png b/assets/items/rare_ancient_armor.png new file mode 100644 index 0000000..4cb8559 Binary files /dev/null and b/assets/items/rare_ancient_armor.png differ diff --git a/assets/items/rare_ancient_axe.png b/assets/items/rare_ancient_axe.png new file mode 100644 index 0000000..1163b1f Binary files /dev/null and b/assets/items/rare_ancient_axe.png differ diff --git a/assets/items/rare_ancient_sword.png b/assets/items/rare_ancient_sword.png new file mode 100644 index 0000000..27028f3 Binary files /dev/null and b/assets/items/rare_ancient_sword.png differ diff --git a/assets/items/rare_archon_plate.png b/assets/items/rare_archon_plate.png new file mode 100644 index 0000000..70a1715 Binary files /dev/null and b/assets/items/rare_archon_plate.png differ diff --git a/assets/items/rare_ataghan.png b/assets/items/rare_ataghan.png new file mode 100644 index 0000000..0dbfec0 Binary files /dev/null and b/assets/items/rare_ataghan.png differ diff --git a/assets/items/rare_axe.png b/assets/items/rare_axe.png new file mode 100644 index 0000000..620a23f Binary files /dev/null and b/assets/items/rare_axe.png differ diff --git a/assets/items/rare_balanced_axe.png b/assets/items/rare_balanced_axe.png new file mode 100644 index 0000000..73c0eee Binary files /dev/null and b/assets/items/rare_balanced_axe.png differ diff --git a/assets/items/rare_balanced_knife.png b/assets/items/rare_balanced_knife.png new file mode 100644 index 0000000..d3b3096 Binary files /dev/null and b/assets/items/rare_balanced_knife.png differ diff --git a/assets/items/rare_balrog_blade.png b/assets/items/rare_balrog_blade.png new file mode 100644 index 0000000..e1723de Binary files /dev/null and b/assets/items/rare_balrog_blade.png differ diff --git a/assets/items/rare_balrog_skin.png b/assets/items/rare_balrog_skin.png new file mode 100644 index 0000000..f50b2cb Binary files /dev/null and b/assets/items/rare_balrog_skin.png differ diff --git a/assets/items/rare_balrog_spear.png b/assets/items/rare_balrog_spear.png new file mode 100644 index 0000000..e7a2a55 Binary files /dev/null and b/assets/items/rare_balrog_spear.png differ diff --git a/assets/items/rare_barbed_club.png b/assets/items/rare_barbed_club.png new file mode 100644 index 0000000..a251a83 Binary files /dev/null and b/assets/items/rare_barbed_club.png differ diff --git a/assets/items/rare_bardiche.png b/assets/items/rare_bardiche.png new file mode 100644 index 0000000..f2b3be4 Binary files /dev/null and b/assets/items/rare_bardiche.png differ diff --git a/assets/items/rare_bastard_sword.png b/assets/items/rare_bastard_sword.png new file mode 100644 index 0000000..6886e23 Binary files /dev/null and b/assets/items/rare_bastard_sword.png differ diff --git a/assets/items/rare_battle_axe.png b/assets/items/rare_battle_axe.png new file mode 100644 index 0000000..95dd24b Binary files /dev/null and b/assets/items/rare_battle_axe.png differ diff --git a/assets/items/rare_battle_dart.png b/assets/items/rare_battle_dart.png new file mode 100644 index 0000000..38474e4 Binary files /dev/null and b/assets/items/rare_battle_dart.png differ diff --git a/assets/items/rare_battle_hammer.png b/assets/items/rare_battle_hammer.png new file mode 100644 index 0000000..ab01b30 Binary files /dev/null and b/assets/items/rare_battle_hammer.png differ diff --git a/assets/items/rare_battle_scythe.png b/assets/items/rare_battle_scythe.png new file mode 100644 index 0000000..7bdc60c Binary files /dev/null and b/assets/items/rare_battle_scythe.png differ diff --git a/assets/items/rare_battle_sword.png b/assets/items/rare_battle_sword.png new file mode 100644 index 0000000..a76894b Binary files /dev/null and b/assets/items/rare_battle_sword.png differ diff --git a/assets/items/rare_bearded_axe.png b/assets/items/rare_bearded_axe.png new file mode 100644 index 0000000..c4afb82 Binary files /dev/null and b/assets/items/rare_bearded_axe.png differ diff --git a/assets/items/rare_bec_de_corbin.png b/assets/items/rare_bec_de_corbin.png new file mode 100644 index 0000000..3fd7c94 Binary files /dev/null and b/assets/items/rare_bec_de_corbin.png differ diff --git a/assets/items/rare_berserker_axe.png b/assets/items/rare_berserker_axe.png new file mode 100644 index 0000000..8101082 Binary files /dev/null and b/assets/items/rare_berserker_axe.png differ diff --git a/assets/items/rare_bill.png b/assets/items/rare_bill.png new file mode 100644 index 0000000..9eac7de Binary files /dev/null and b/assets/items/rare_bill.png differ diff --git a/assets/items/rare_boneweave.png b/assets/items/rare_boneweave.png new file mode 100644 index 0000000..985d5f4 Binary files /dev/null and b/assets/items/rare_boneweave.png differ diff --git a/assets/items/rare_brandistock.png b/assets/items/rare_brandistock.png new file mode 100644 index 0000000..98688cf Binary files /dev/null and b/assets/items/rare_brandistock.png differ diff --git a/assets/items/rare_breast_plate.png b/assets/items/rare_breast_plate.png new file mode 100644 index 0000000..62e5e10 Binary files /dev/null and b/assets/items/rare_breast_plate.png differ diff --git a/assets/items/rare_broad_axe.png b/assets/items/rare_broad_axe.png new file mode 100644 index 0000000..0b8067f Binary files /dev/null and b/assets/items/rare_broad_axe.png differ diff --git a/assets/items/rare_broad_sword.png b/assets/items/rare_broad_sword.png new file mode 100644 index 0000000..d5be5f7 Binary files /dev/null and b/assets/items/rare_broad_sword.png differ diff --git a/assets/items/rare_ceremonial_pike.png b/assets/items/rare_ceremonial_pike.png new file mode 100644 index 0000000..0718c70 Binary files /dev/null and b/assets/items/rare_ceremonial_pike.png differ diff --git a/assets/items/rare_ceremonial_spear.png b/assets/items/rare_ceremonial_spear.png new file mode 100644 index 0000000..5f6daf9 Binary files /dev/null and b/assets/items/rare_ceremonial_spear.png differ diff --git a/assets/items/rare_chain_mail.png b/assets/items/rare_chain_mail.png new file mode 100644 index 0000000..9550701 Binary files /dev/null and b/assets/items/rare_chain_mail.png differ diff --git a/assets/items/rare_champion_axe.png b/assets/items/rare_champion_axe.png new file mode 100644 index 0000000..249bbf3 Binary files /dev/null and b/assets/items/rare_champion_axe.png differ diff --git a/assets/items/rare_champion_sword.png b/assets/items/rare_champion_sword.png new file mode 100644 index 0000000..d268b2a Binary files /dev/null and b/assets/items/rare_champion_sword.png differ diff --git a/assets/items/rare_chaos_armor.png b/assets/items/rare_chaos_armor.png new file mode 100644 index 0000000..a69ef7f Binary files /dev/null and b/assets/items/rare_chaos_armor.png differ diff --git a/assets/items/rare_claymore.png b/assets/items/rare_claymore.png new file mode 100644 index 0000000..9da9f41 Binary files /dev/null and b/assets/items/rare_claymore.png differ diff --git a/assets/items/rare_cleaver.png b/assets/items/rare_cleaver.png new file mode 100644 index 0000000..381a242 Binary files /dev/null and b/assets/items/rare_cleaver.png differ diff --git a/assets/items/rare_club.png b/assets/items/rare_club.png new file mode 100644 index 0000000..a1ae306 Binary files /dev/null and b/assets/items/rare_club.png differ diff --git a/assets/items/rare_colossus_blade.png b/assets/items/rare_colossus_blade.png new file mode 100644 index 0000000..b377771 Binary files /dev/null and b/assets/items/rare_colossus_blade.png differ diff --git a/assets/items/rare_colossus_sword.png b/assets/items/rare_colossus_sword.png new file mode 100644 index 0000000..ea233a7 Binary files /dev/null and b/assets/items/rare_colossus_sword.png differ diff --git a/assets/items/rare_colossus_voulge.png b/assets/items/rare_colossus_voulge.png new file mode 100644 index 0000000..cad6af4 Binary files /dev/null and b/assets/items/rare_colossus_voulge.png differ diff --git a/assets/items/rare_conquest_sword.png b/assets/items/rare_conquest_sword.png new file mode 100644 index 0000000..b3594da Binary files /dev/null and b/assets/items/rare_conquest_sword.png differ diff --git a/assets/items/rare_crowbill.png b/assets/items/rare_crowbill.png new file mode 100644 index 0000000..d2aa5d0 Binary files /dev/null and b/assets/items/rare_crowbill.png differ diff --git a/assets/items/rare_cryptic_axe.png b/assets/items/rare_cryptic_axe.png new file mode 100644 index 0000000..c232897 Binary files /dev/null and b/assets/items/rare_cryptic_axe.png differ diff --git a/assets/items/rare_cryptic_sword.png b/assets/items/rare_cryptic_sword.png new file mode 100644 index 0000000..7a5ffb2 Binary files /dev/null and b/assets/items/rare_cryptic_sword.png differ diff --git a/assets/items/rare_crystal_sword.png b/assets/items/rare_crystal_sword.png new file mode 100644 index 0000000..7a75637 Binary files /dev/null and b/assets/items/rare_crystal_sword.png differ diff --git a/assets/items/rare_cudgel.png b/assets/items/rare_cudgel.png new file mode 100644 index 0000000..7839ed4 Binary files /dev/null and b/assets/items/rare_cudgel.png differ diff --git a/assets/items/rare_cuirass.png b/assets/items/rare_cuirass.png new file mode 100644 index 0000000..3ba4ba3 Binary files /dev/null and b/assets/items/rare_cuirass.png differ diff --git a/assets/items/rare_cutlass.png b/assets/items/rare_cutlass.png new file mode 100644 index 0000000..3350080 Binary files /dev/null and b/assets/items/rare_cutlass.png differ diff --git a/assets/items/rare_dacian_falx.png b/assets/items/rare_dacian_falx.png new file mode 100644 index 0000000..acf4058 Binary files /dev/null and b/assets/items/rare_dacian_falx.png differ diff --git a/assets/items/rare_decapitator.png b/assets/items/rare_decapitator.png new file mode 100644 index 0000000..faf998c Binary files /dev/null and b/assets/items/rare_decapitator.png differ diff --git a/assets/items/rare_demonhide_armor.png b/assets/items/rare_demonhide_armor.png new file mode 100644 index 0000000..a923834 Binary files /dev/null and b/assets/items/rare_demonhide_armor.png differ diff --git a/assets/items/rare_devil_star.png b/assets/items/rare_devil_star.png new file mode 100644 index 0000000..cf6d74d Binary files /dev/null and b/assets/items/rare_devil_star.png differ diff --git a/assets/items/rare_diamond_mail.png b/assets/items/rare_diamond_mail.png new file mode 100644 index 0000000..fbaa63c Binary files /dev/null and b/assets/items/rare_diamond_mail.png differ diff --git a/assets/items/rare_dimensional_blade.png b/assets/items/rare_dimensional_blade.png new file mode 100644 index 0000000..4078894 Binary files /dev/null and b/assets/items/rare_dimensional_blade.png differ diff --git a/assets/items/rare_double_axe.png b/assets/items/rare_double_axe.png new file mode 100644 index 0000000..4e86180 Binary files /dev/null and b/assets/items/rare_double_axe.png differ diff --git a/assets/items/rare_dusk_shroud.png b/assets/items/rare_dusk_shroud.png new file mode 100644 index 0000000..feac448 Binary files /dev/null and b/assets/items/rare_dusk_shroud.png differ diff --git a/assets/items/rare_elegant_blade.png b/assets/items/rare_elegant_blade.png new file mode 100644 index 0000000..2cb1bfa Binary files /dev/null and b/assets/items/rare_elegant_blade.png differ diff --git a/assets/items/rare_embossed_plate.png b/assets/items/rare_embossed_plate.png new file mode 100644 index 0000000..a174c95 Binary files /dev/null and b/assets/items/rare_embossed_plate.png differ diff --git a/assets/items/rare_espandon.png b/assets/items/rare_espandon.png new file mode 100644 index 0000000..957fb57 Binary files /dev/null and b/assets/items/rare_espandon.png differ diff --git a/assets/items/rare_ettin_axe.png b/assets/items/rare_ettin_axe.png new file mode 100644 index 0000000..8e4c5ae Binary files /dev/null and b/assets/items/rare_ettin_axe.png differ diff --git a/assets/items/rare_executioner_sword.png b/assets/items/rare_executioner_sword.png new file mode 100644 index 0000000..625f114 Binary files /dev/null and b/assets/items/rare_executioner_sword.png differ diff --git a/assets/items/rare_falcata.png b/assets/items/rare_falcata.png new file mode 100644 index 0000000..695f531 Binary files /dev/null and b/assets/items/rare_falcata.png differ diff --git a/assets/items/rare_falchion.png b/assets/items/rare_falchion.png new file mode 100644 index 0000000..579c183 Binary files /dev/null and b/assets/items/rare_falchion.png differ diff --git a/assets/items/rare_feral_axe.png b/assets/items/rare_feral_axe.png new file mode 100644 index 0000000..bc0e915 Binary files /dev/null and b/assets/items/rare_feral_axe.png differ diff --git a/assets/items/rare_field_plate.png b/assets/items/rare_field_plate.png new file mode 100644 index 0000000..b9e5c50 Binary files /dev/null and b/assets/items/rare_field_plate.png differ diff --git a/assets/items/rare_flamberge.png b/assets/items/rare_flamberge.png new file mode 100644 index 0000000..34093fb Binary files /dev/null and b/assets/items/rare_flamberge.png differ diff --git a/assets/items/rare_flanged_mace.png b/assets/items/rare_flanged_mace.png new file mode 100644 index 0000000..bb67a1a Binary files /dev/null and b/assets/items/rare_flanged_mace.png differ diff --git a/assets/items/rare_flying_axe.png b/assets/items/rare_flying_axe.png new file mode 100644 index 0000000..80a33e4 Binary files /dev/null and b/assets/items/rare_flying_axe.png differ diff --git a/assets/items/rare_flying_knife.png b/assets/items/rare_flying_knife.png new file mode 100644 index 0000000..47a0215 Binary files /dev/null and b/assets/items/rare_flying_knife.png differ diff --git a/assets/items/rare_francisca.png b/assets/items/rare_francisca.png new file mode 100644 index 0000000..c4d736f Binary files /dev/null and b/assets/items/rare_francisca.png differ diff --git a/assets/items/rare_full_plate_mail.png b/assets/items/rare_full_plate_mail.png new file mode 100644 index 0000000..c18e515 Binary files /dev/null and b/assets/items/rare_full_plate_mail.png differ diff --git a/assets/items/rare_fuscina.png b/assets/items/rare_fuscina.png new file mode 100644 index 0000000..b213b6d Binary files /dev/null and b/assets/items/rare_fuscina.png differ diff --git a/assets/items/rare_ghost_armor.png b/assets/items/rare_ghost_armor.png new file mode 100644 index 0000000..ead5677 Binary files /dev/null and b/assets/items/rare_ghost_armor.png differ diff --git a/assets/items/rare_ghost_glaive.png b/assets/items/rare_ghost_glaive.png new file mode 100644 index 0000000..604cada Binary files /dev/null and b/assets/items/rare_ghost_glaive.png differ diff --git a/assets/items/rare_ghost_spear.png b/assets/items/rare_ghost_spear.png new file mode 100644 index 0000000..4ed5bf8 Binary files /dev/null and b/assets/items/rare_ghost_spear.png differ diff --git a/assets/items/rare_giant_axe.png b/assets/items/rare_giant_axe.png new file mode 100644 index 0000000..ab8f306 Binary files /dev/null and b/assets/items/rare_giant_axe.png differ diff --git a/assets/items/rare_giant_sword.png b/assets/items/rare_giant_sword.png new file mode 100644 index 0000000..c6282f0 Binary files /dev/null and b/assets/items/rare_giant_sword.png differ diff --git a/assets/items/rare_giant_thresher.png b/assets/items/rare_giant_thresher.png new file mode 100644 index 0000000..26a1e85 Binary files /dev/null and b/assets/items/rare_giant_thresher.png differ diff --git a/assets/items/rare_gladius.png b/assets/items/rare_gladius.png new file mode 100644 index 0000000..72c5ca2 Binary files /dev/null and b/assets/items/rare_gladius.png differ diff --git a/assets/items/rare_glaive.png b/assets/items/rare_glaive.png new file mode 100644 index 0000000..2af38ac Binary files /dev/null and b/assets/items/rare_glaive.png differ diff --git a/assets/items/rare_glorious_axe.png b/assets/items/rare_glorious_axe.png new file mode 100644 index 0000000..e942ddb Binary files /dev/null and b/assets/items/rare_glorious_axe.png differ diff --git a/assets/items/rare_gothic_axe.png b/assets/items/rare_gothic_axe.png new file mode 100644 index 0000000..6e88465 Binary files /dev/null and b/assets/items/rare_gothic_axe.png differ diff --git a/assets/items/rare_gothic_plate.png b/assets/items/rare_gothic_plate.png new file mode 100644 index 0000000..907b264 Binary files /dev/null and b/assets/items/rare_gothic_plate.png differ diff --git a/assets/items/rare_gothic_sword.png b/assets/items/rare_gothic_sword.png new file mode 100644 index 0000000..aeadec3 Binary files /dev/null and b/assets/items/rare_gothic_sword.png differ diff --git a/assets/items/rare_great_axe.png b/assets/items/rare_great_axe.png new file mode 100644 index 0000000..d6d211b Binary files /dev/null and b/assets/items/rare_great_axe.png differ diff --git a/assets/items/rare_great_hauberk.png b/assets/items/rare_great_hauberk.png new file mode 100644 index 0000000..1ae9721 Binary files /dev/null and b/assets/items/rare_great_hauberk.png differ diff --git a/assets/items/rare_great_maul.png b/assets/items/rare_great_maul.png new file mode 100644 index 0000000..b6301dc Binary files /dev/null and b/assets/items/rare_great_maul.png differ diff --git a/assets/items/rare_great_pilum.png b/assets/items/rare_great_pilum.png new file mode 100644 index 0000000..4b82755 Binary files /dev/null and b/assets/items/rare_great_pilum.png differ diff --git a/assets/items/rare_great_poleaxe.png b/assets/items/rare_great_poleaxe.png new file mode 100644 index 0000000..ccdcc97 Binary files /dev/null and b/assets/items/rare_great_poleaxe.png differ diff --git a/assets/items/rare_great_sword.png b/assets/items/rare_great_sword.png new file mode 100644 index 0000000..3774022 Binary files /dev/null and b/assets/items/rare_great_sword.png differ diff --git a/assets/items/rare_grim_scythe.png b/assets/items/rare_grim_scythe.png new file mode 100644 index 0000000..909390f Binary files /dev/null and b/assets/items/rare_grim_scythe.png differ diff --git a/assets/items/rare_halberd.png b/assets/items/rare_halberd.png new file mode 100644 index 0000000..07d79ea Binary files /dev/null and b/assets/items/rare_halberd.png differ diff --git a/assets/items/rare_hand_axe.png b/assets/items/rare_hand_axe.png new file mode 100644 index 0000000..1d1b03c Binary files /dev/null and b/assets/items/rare_hand_axe.png differ diff --git a/assets/items/rare_hard_leather_armor.png b/assets/items/rare_hard_leather_armor.png new file mode 100644 index 0000000..d0afb6f Binary files /dev/null and b/assets/items/rare_hard_leather_armor.png differ diff --git a/assets/items/rare_harpoon.png b/assets/items/rare_harpoon.png new file mode 100644 index 0000000..b6eeb0b Binary files /dev/null and b/assets/items/rare_harpoon.png differ diff --git a/assets/items/rare_hatchet.png b/assets/items/rare_hatchet.png new file mode 100644 index 0000000..2a75a21 Binary files /dev/null and b/assets/items/rare_hatchet.png differ diff --git a/assets/items/rare_hellforge_plate.png b/assets/items/rare_hellforge_plate.png new file mode 100644 index 0000000..cbd61b9 Binary files /dev/null and b/assets/items/rare_hellforge_plate.png differ diff --git a/assets/items/rare_highland_blade.png b/assets/items/rare_highland_blade.png new file mode 100644 index 0000000..02ca5ba Binary files /dev/null and b/assets/items/rare_highland_blade.png differ diff --git a/assets/items/rare_hurlbat.png b/assets/items/rare_hurlbat.png new file mode 100644 index 0000000..7ee54ed Binary files /dev/null and b/assets/items/rare_hurlbat.png differ diff --git a/assets/items/rare_hydra_edge.png b/assets/items/rare_hydra_edge.png new file mode 100644 index 0000000..950388d Binary files /dev/null and b/assets/items/rare_hydra_edge.png differ diff --git a/assets/items/rare_hyperion_spear.png b/assets/items/rare_hyperion_spear.png new file mode 100644 index 0000000..9590e49 Binary files /dev/null and b/assets/items/rare_hyperion_spear.png differ diff --git a/assets/items/rare_jagged_star.png b/assets/items/rare_jagged_star.png new file mode 100644 index 0000000..5f3ced9 Binary files /dev/null and b/assets/items/rare_jagged_star.png differ diff --git a/assets/items/rare_kraken_shell.png b/assets/items/rare_kraken_shell.png new file mode 100644 index 0000000..fbe01ba Binary files /dev/null and b/assets/items/rare_kraken_shell.png differ diff --git a/assets/items/rare_lacquered_plate.png b/assets/items/rare_lacquered_plate.png new file mode 100644 index 0000000..000484c Binary files /dev/null and b/assets/items/rare_lacquered_plate.png differ diff --git a/assets/items/rare_lance.png b/assets/items/rare_lance.png new file mode 100644 index 0000000..61a6ad3 Binary files /dev/null and b/assets/items/rare_lance.png differ diff --git a/assets/items/rare_large_axe.png b/assets/items/rare_large_axe.png new file mode 100644 index 0000000..901e2c5 Binary files /dev/null and b/assets/items/rare_large_axe.png differ diff --git a/assets/items/rare_leather_armor.png b/assets/items/rare_leather_armor.png new file mode 100644 index 0000000..3b5b89b Binary files /dev/null and b/assets/items/rare_leather_armor.png differ diff --git a/assets/items/rare_legend_sword.png b/assets/items/rare_legend_sword.png new file mode 100644 index 0000000..cef721d Binary files /dev/null and b/assets/items/rare_legend_sword.png differ diff --git a/assets/items/rare_legendary_mallet.png b/assets/items/rare_legendary_mallet.png new file mode 100644 index 0000000..3a3e8ae Binary files /dev/null and b/assets/items/rare_legendary_mallet.png differ diff --git a/assets/items/rare_light_plate.png b/assets/items/rare_light_plate.png new file mode 100644 index 0000000..4305d76 Binary files /dev/null and b/assets/items/rare_light_plate.png differ diff --git a/assets/items/rare_linked_mail.png b/assets/items/rare_linked_mail.png new file mode 100644 index 0000000..82534fb Binary files /dev/null and b/assets/items/rare_linked_mail.png differ diff --git a/assets/items/rare_lochaber_axe.png b/assets/items/rare_lochaber_axe.png new file mode 100644 index 0000000..95b1cae Binary files /dev/null and b/assets/items/rare_lochaber_axe.png differ diff --git a/assets/items/rare_long_sword.png b/assets/items/rare_long_sword.png new file mode 100644 index 0000000..ba481d3 Binary files /dev/null and b/assets/items/rare_long_sword.png differ diff --git a/assets/items/rare_loricated_mail.png b/assets/items/rare_loricated_mail.png new file mode 100644 index 0000000..5767aea Binary files /dev/null and b/assets/items/rare_loricated_mail.png differ diff --git a/assets/items/rare_mace.png b/assets/items/rare_mace.png new file mode 100644 index 0000000..bdf549c Binary files /dev/null and b/assets/items/rare_mace.png differ diff --git a/assets/items/rare_mage_plate.png b/assets/items/rare_mage_plate.png new file mode 100644 index 0000000..62d2452 Binary files /dev/null and b/assets/items/rare_mage_plate.png differ diff --git a/assets/items/rare_maiden_pike.png b/assets/items/rare_maiden_pike.png new file mode 100644 index 0000000..b12025a Binary files /dev/null and b/assets/items/rare_maiden_pike.png differ diff --git a/assets/items/rare_maiden_spear.png b/assets/items/rare_maiden_spear.png new file mode 100644 index 0000000..9141766 Binary files /dev/null and b/assets/items/rare_maiden_spear.png differ diff --git a/assets/items/rare_mancatcher.png b/assets/items/rare_mancatcher.png new file mode 100644 index 0000000..5126e59 Binary files /dev/null and b/assets/items/rare_mancatcher.png differ diff --git a/assets/items/rare_martel_de_fer.png b/assets/items/rare_martel_de_fer.png new file mode 100644 index 0000000..f7a58cf Binary files /dev/null and b/assets/items/rare_martel_de_fer.png differ diff --git a/assets/items/rare_matriarchal_pike.png b/assets/items/rare_matriarchal_pike.png new file mode 100644 index 0000000..42d34bb Binary files /dev/null and b/assets/items/rare_matriarchal_pike.png differ diff --git a/assets/items/rare_matriarchal_spear.png b/assets/items/rare_matriarchal_spear.png new file mode 100644 index 0000000..4e5d84e Binary files /dev/null and b/assets/items/rare_matriarchal_spear.png differ diff --git a/assets/items/rare_maul.png b/assets/items/rare_maul.png new file mode 100644 index 0000000..b7fc0bf Binary files /dev/null and b/assets/items/rare_maul.png differ diff --git a/assets/items/rare_mesh_armor.png b/assets/items/rare_mesh_armor.png new file mode 100644 index 0000000..afe9717 Binary files /dev/null and b/assets/items/rare_mesh_armor.png differ diff --git a/assets/items/rare_military_axe.png b/assets/items/rare_military_axe.png new file mode 100644 index 0000000..be9e9aa Binary files /dev/null and b/assets/items/rare_military_axe.png differ diff --git a/assets/items/rare_military_pick.png b/assets/items/rare_military_pick.png new file mode 100644 index 0000000..4b128dc Binary files /dev/null and b/assets/items/rare_military_pick.png differ diff --git a/assets/items/rare_morning_star.png b/assets/items/rare_morning_star.png new file mode 100644 index 0000000..2ac363a Binary files /dev/null and b/assets/items/rare_morning_star.png differ diff --git a/assets/items/rare_mythical_sword.png b/assets/items/rare_mythical_sword.png new file mode 100644 index 0000000..9b80f89 Binary files /dev/null and b/assets/items/rare_mythical_sword.png differ diff --git a/assets/items/rare_naga.png b/assets/items/rare_naga.png new file mode 100644 index 0000000..9577422 Binary files /dev/null and b/assets/items/rare_naga.png differ diff --git a/assets/items/rare_ogre_axe.png b/assets/items/rare_ogre_axe.png new file mode 100644 index 0000000..bf23903 Binary files /dev/null and b/assets/items/rare_ogre_axe.png differ diff --git a/assets/items/rare_ogre_maul.png b/assets/items/rare_ogre_maul.png new file mode 100644 index 0000000..0fe2f8e Binary files /dev/null and b/assets/items/rare_ogre_maul.png differ diff --git a/assets/items/rare_ornate_plate.png b/assets/items/rare_ornate_plate.png new file mode 100644 index 0000000..12e289f Binary files /dev/null and b/assets/items/rare_ornate_plate.png differ diff --git a/assets/items/rare_partizan.png b/assets/items/rare_partizan.png new file mode 100644 index 0000000..1d5f65d Binary files /dev/null and b/assets/items/rare_partizan.png differ diff --git a/assets/items/rare_phase_blade.png b/assets/items/rare_phase_blade.png new file mode 100644 index 0000000..1a1e67c Binary files /dev/null and b/assets/items/rare_phase_blade.png differ diff --git a/assets/items/rare_pike.png b/assets/items/rare_pike.png new file mode 100644 index 0000000..5cd85c7 Binary files /dev/null and b/assets/items/rare_pike.png differ diff --git a/assets/items/rare_pilum.png b/assets/items/rare_pilum.png new file mode 100644 index 0000000..37b64f5 Binary files /dev/null and b/assets/items/rare_pilum.png differ diff --git a/assets/items/rare_plate_mail.png b/assets/items/rare_plate_mail.png new file mode 100644 index 0000000..3e2078e Binary files /dev/null and b/assets/items/rare_plate_mail.png differ diff --git a/assets/items/rare_poleaxe.png b/assets/items/rare_poleaxe.png new file mode 100644 index 0000000..8598a9f Binary files /dev/null and b/assets/items/rare_poleaxe.png differ diff --git a/assets/items/rare_quilted_armor.png b/assets/items/rare_quilted_armor.png new file mode 100644 index 0000000..1d88cb6 Binary files /dev/null and b/assets/items/rare_quilted_armor.png differ diff --git a/assets/items/rare_reinforced_mace.png b/assets/items/rare_reinforced_mace.png new file mode 100644 index 0000000..f8160a8 Binary files /dev/null and b/assets/items/rare_reinforced_mace.png differ diff --git a/assets/items/rare_ring_mail.png b/assets/items/rare_ring_mail.png new file mode 100644 index 0000000..bfa2fdb Binary files /dev/null and b/assets/items/rare_ring_mail.png differ diff --git a/assets/items/rare_rune_sword.png b/assets/items/rare_rune_sword.png new file mode 100644 index 0000000..dc2b0b2 Binary files /dev/null and b/assets/items/rare_rune_sword.png differ diff --git a/assets/items/rare_russet_armor.png b/assets/items/rare_russet_armor.png new file mode 100644 index 0000000..304baf0 Binary files /dev/null and b/assets/items/rare_russet_armor.png differ diff --git a/assets/items/rare_sabre.png b/assets/items/rare_sabre.png new file mode 100644 index 0000000..dc848dc Binary files /dev/null and b/assets/items/rare_sabre.png differ diff --git a/assets/items/rare_sacred_armor.png b/assets/items/rare_sacred_armor.png new file mode 100644 index 0000000..f35e554 Binary files /dev/null and b/assets/items/rare_sacred_armor.png differ diff --git a/assets/items/rare_scale_mail.png b/assets/items/rare_scale_mail.png new file mode 100644 index 0000000..4f3f71f Binary files /dev/null and b/assets/items/rare_scale_mail.png differ diff --git a/assets/items/rare_scarab_husk.png b/assets/items/rare_scarab_husk.png new file mode 100644 index 0000000..7f03067 Binary files /dev/null and b/assets/items/rare_scarab_husk.png differ diff --git a/assets/items/rare_scimitar.png b/assets/items/rare_scimitar.png new file mode 100644 index 0000000..063dfaa Binary files /dev/null and b/assets/items/rare_scimitar.png differ diff --git a/assets/items/rare_scythe.png b/assets/items/rare_scythe.png new file mode 100644 index 0000000..1b6f9f3 Binary files /dev/null and b/assets/items/rare_scythe.png differ diff --git a/assets/items/rare_serpentskin_armor.png b/assets/items/rare_serpentskin_armor.png new file mode 100644 index 0000000..58110a0 Binary files /dev/null and b/assets/items/rare_serpentskin_armor.png differ diff --git a/assets/items/rare_shadow_plate.png b/assets/items/rare_shadow_plate.png new file mode 100644 index 0000000..71e0604 Binary files /dev/null and b/assets/items/rare_shadow_plate.png differ diff --git a/assets/items/rare_shamshir.png b/assets/items/rare_shamshir.png new file mode 100644 index 0000000..8390117 Binary files /dev/null and b/assets/items/rare_shamshir.png differ diff --git a/assets/items/rare_sharktooth_armor.png b/assets/items/rare_sharktooth_armor.png new file mode 100644 index 0000000..f438262 Binary files /dev/null and b/assets/items/rare_sharktooth_armor.png differ diff --git a/assets/items/rare_short_spear.png b/assets/items/rare_short_spear.png new file mode 100644 index 0000000..cc0a3c2 Binary files /dev/null and b/assets/items/rare_short_spear.png differ diff --git a/assets/items/rare_short_sword.png b/assets/items/rare_short_sword.png new file mode 100644 index 0000000..b001e7c Binary files /dev/null and b/assets/items/rare_short_sword.png differ diff --git a/assets/items/rare_silver_edged_axe.png b/assets/items/rare_silver_edged_axe.png new file mode 100644 index 0000000..f847a3c Binary files /dev/null and b/assets/items/rare_silver_edged_axe.png differ diff --git a/assets/items/rare_simbilan.png b/assets/items/rare_simbilan.png new file mode 100644 index 0000000..7f2852f Binary files /dev/null and b/assets/items/rare_simbilan.png differ diff --git a/assets/items/rare_small_crescent.png b/assets/items/rare_small_crescent.png new file mode 100644 index 0000000..79c604c Binary files /dev/null and b/assets/items/rare_small_crescent.png differ diff --git a/assets/items/rare_spear.png b/assets/items/rare_spear.png new file mode 100644 index 0000000..67c5a77 Binary files /dev/null and b/assets/items/rare_spear.png differ diff --git a/assets/items/rare_spetum.png b/assets/items/rare_spetum.png new file mode 100644 index 0000000..de07a4f Binary files /dev/null and b/assets/items/rare_spetum.png differ diff --git a/assets/items/rare_spiculum.png b/assets/items/rare_spiculum.png new file mode 100644 index 0000000..7898d75 Binary files /dev/null and b/assets/items/rare_spiculum.png differ diff --git a/assets/items/rare_spiked_club.png b/assets/items/rare_spiked_club.png new file mode 100644 index 0000000..2328477 Binary files /dev/null and b/assets/items/rare_spiked_club.png differ diff --git a/assets/items/rare_splint_mail.png b/assets/items/rare_splint_mail.png new file mode 100644 index 0000000..d3861f2 Binary files /dev/null and b/assets/items/rare_splint_mail.png differ diff --git a/assets/items/rare_studded_leather.png b/assets/items/rare_studded_leather.png new file mode 100644 index 0000000..dbfcc6f Binary files /dev/null and b/assets/items/rare_studded_leather.png differ diff --git a/assets/items/rare_stygian_pike.png b/assets/items/rare_stygian_pike.png new file mode 100644 index 0000000..7eff299 Binary files /dev/null and b/assets/items/rare_stygian_pike.png differ diff --git a/assets/items/rare_stygian_pilum.png b/assets/items/rare_stygian_pilum.png new file mode 100644 index 0000000..836c9e1 Binary files /dev/null and b/assets/items/rare_stygian_pilum.png differ diff --git a/assets/items/rare_tabar.png b/assets/items/rare_tabar.png new file mode 100644 index 0000000..5a1ef73 Binary files /dev/null and b/assets/items/rare_tabar.png differ diff --git a/assets/items/rare_templar_coat.png b/assets/items/rare_templar_coat.png new file mode 100644 index 0000000..27312d8 Binary files /dev/null and b/assets/items/rare_templar_coat.png differ diff --git a/assets/items/rare_thresher.png b/assets/items/rare_thresher.png new file mode 100644 index 0000000..9832a5f Binary files /dev/null and b/assets/items/rare_thresher.png differ diff --git a/assets/items/rare_throwing_axe.png b/assets/items/rare_throwing_axe.png new file mode 100644 index 0000000..09301e9 Binary files /dev/null and b/assets/items/rare_throwing_axe.png differ diff --git a/assets/items/rare_throwing_knife.png b/assets/items/rare_throwing_knife.png new file mode 100644 index 0000000..9ab16ad Binary files /dev/null and b/assets/items/rare_throwing_knife.png differ diff --git a/assets/items/rare_throwing_spear.png b/assets/items/rare_throwing_spear.png new file mode 100644 index 0000000..7da44e1 Binary files /dev/null and b/assets/items/rare_throwing_spear.png differ diff --git a/assets/items/rare_thunder_maul.png b/assets/items/rare_thunder_maul.png new file mode 100644 index 0000000..af09691 Binary files /dev/null and b/assets/items/rare_thunder_maul.png differ diff --git a/assets/items/rare_tigulated_mail.png b/assets/items/rare_tigulated_mail.png new file mode 100644 index 0000000..1643e86 Binary files /dev/null and b/assets/items/rare_tigulated_mail.png differ diff --git a/assets/items/rare_tomahawk.png b/assets/items/rare_tomahawk.png new file mode 100644 index 0000000..291b170 Binary files /dev/null and b/assets/items/rare_tomahawk.png differ diff --git a/assets/items/rare_trellised_armor.png b/assets/items/rare_trellised_armor.png new file mode 100644 index 0000000..fdaaafd Binary files /dev/null and b/assets/items/rare_trellised_armor.png differ diff --git a/assets/items/rare_trident.png b/assets/items/rare_trident.png new file mode 100644 index 0000000..4fdec33 Binary files /dev/null and b/assets/items/rare_trident.png differ diff --git a/assets/items/rare_truncheon.png b/assets/items/rare_truncheon.png new file mode 100644 index 0000000..93b0318 Binary files /dev/null and b/assets/items/rare_truncheon.png differ diff --git a/assets/items/rare_tulwar.png b/assets/items/rare_tulwar.png new file mode 100644 index 0000000..942ee92 Binary files /dev/null and b/assets/items/rare_tulwar.png differ diff --git a/assets/items/rare_tusk_sword.png b/assets/items/rare_tusk_sword.png new file mode 100644 index 0000000..6304640 Binary files /dev/null and b/assets/items/rare_tusk_sword.png differ diff --git a/assets/items/rare_twin_axe.png b/assets/items/rare_twin_axe.png new file mode 100644 index 0000000..a2506ff Binary files /dev/null and b/assets/items/rare_twin_axe.png differ diff --git a/assets/items/rare_two_handed_sword.png b/assets/items/rare_two_handed_sword.png new file mode 100644 index 0000000..616ce54 Binary files /dev/null and b/assets/items/rare_two_handed_sword.png differ diff --git a/assets/items/rare_tyrant_club.png b/assets/items/rare_tyrant_club.png new file mode 100644 index 0000000..5f7850f Binary files /dev/null and b/assets/items/rare_tyrant_club.png differ diff --git a/assets/items/rare_voulge.png b/assets/items/rare_voulge.png new file mode 100644 index 0000000..effdca8 Binary files /dev/null and b/assets/items/rare_voulge.png differ diff --git a/assets/items/rare_war_axe.png b/assets/items/rare_war_axe.png new file mode 100644 index 0000000..d8470bf Binary files /dev/null and b/assets/items/rare_war_axe.png differ diff --git a/assets/items/rare_war_club.png b/assets/items/rare_war_club.png new file mode 100644 index 0000000..f932b17 Binary files /dev/null and b/assets/items/rare_war_club.png differ diff --git a/assets/items/rare_war_dart.png b/assets/items/rare_war_dart.png new file mode 100644 index 0000000..6fac59d Binary files /dev/null and b/assets/items/rare_war_dart.png differ diff --git a/assets/items/rare_war_fork.png b/assets/items/rare_war_fork.png new file mode 100644 index 0000000..34725d5 Binary files /dev/null and b/assets/items/rare_war_fork.png differ diff --git a/assets/items/rare_war_hammer.png b/assets/items/rare_war_hammer.png new file mode 100644 index 0000000..0d78753 Binary files /dev/null and b/assets/items/rare_war_hammer.png differ diff --git a/assets/items/rare_war_pike.png b/assets/items/rare_war_pike.png new file mode 100644 index 0000000..e94731f Binary files /dev/null and b/assets/items/rare_war_pike.png differ diff --git a/assets/items/rare_war_scythe.png b/assets/items/rare_war_scythe.png new file mode 100644 index 0000000..b658e18 Binary files /dev/null and b/assets/items/rare_war_scythe.png differ diff --git a/assets/items/rare_war_spear.png b/assets/items/rare_war_spear.png new file mode 100644 index 0000000..528df09 Binary files /dev/null and b/assets/items/rare_war_spear.png differ diff --git a/assets/items/rare_war_spike.png b/assets/items/rare_war_spike.png new file mode 100644 index 0000000..1df879d Binary files /dev/null and b/assets/items/rare_war_spike.png differ diff --git a/assets/items/rare_war_sword.png b/assets/items/rare_war_sword.png new file mode 100644 index 0000000..092737f Binary files /dev/null and b/assets/items/rare_war_sword.png differ diff --git a/assets/items/rare_winged_axe.png b/assets/items/rare_winged_axe.png new file mode 100644 index 0000000..c474a8e Binary files /dev/null and b/assets/items/rare_winged_axe.png differ diff --git a/assets/items/rare_winged_harpoon.png b/assets/items/rare_winged_harpoon.png new file mode 100644 index 0000000..104d435 Binary files /dev/null and b/assets/items/rare_winged_harpoon.png differ diff --git a/assets/items/rare_winged_knife.png b/assets/items/rare_winged_knife.png new file mode 100644 index 0000000..694ec51 Binary files /dev/null and b/assets/items/rare_winged_knife.png differ diff --git a/assets/items/rare_wire_fleece.png b/assets/items/rare_wire_fleece.png new file mode 100644 index 0000000..3e1242e Binary files /dev/null and b/assets/items/rare_wire_fleece.png differ diff --git a/assets/items/rare_wyrmhide.png b/assets/items/rare_wyrmhide.png new file mode 100644 index 0000000..b20f31f Binary files /dev/null and b/assets/items/rare_wyrmhide.png differ diff --git a/assets/items/rare_yari.png b/assets/items/rare_yari.png new file mode 100644 index 0000000..e8763e9 Binary files /dev/null and b/assets/items/rare_yari.png differ diff --git a/assets/items/rare_zweihander.png b/assets/items/rare_zweihander.png new file mode 100644 index 0000000..686d9ea Binary files /dev/null and b/assets/items/rare_zweihander.png differ diff --git a/assets/items/white_alpha_helm.png b/assets/items/white_alpha_helm.png new file mode 100644 index 0000000..4188b31 Binary files /dev/null and b/assets/items/white_alpha_helm.png differ diff --git a/assets/items/white_antlers.png b/assets/items/white_antlers.png new file mode 100644 index 0000000..e3f2fc7 Binary files /dev/null and b/assets/items/white_antlers.png differ diff --git a/assets/items/white_assault_helmet.png b/assets/items/white_assault_helmet.png new file mode 100644 index 0000000..e0c2e6a Binary files /dev/null and b/assets/items/white_assault_helmet.png differ diff --git a/assets/items/white_avenger_guard.png b/assets/items/white_avenger_guard.png new file mode 100644 index 0000000..106ce35 Binary files /dev/null and b/assets/items/white_avenger_guard.png differ diff --git a/assets/items/white_blood_spirit.png b/assets/items/white_blood_spirit.png new file mode 100644 index 0000000..40090df Binary files /dev/null and b/assets/items/white_blood_spirit.png differ diff --git a/assets/items/white_bloodlord_skull.png b/assets/items/white_bloodlord_skull.png new file mode 100644 index 0000000..2299bb6 Binary files /dev/null and b/assets/items/white_bloodlord_skull.png differ diff --git a/assets/items/white_carnage_helm.png b/assets/items/white_carnage_helm.png new file mode 100644 index 0000000..f98d73e Binary files /dev/null and b/assets/items/white_carnage_helm.png differ diff --git a/assets/items/white_conqueror_crown.png b/assets/items/white_conqueror_crown.png new file mode 100644 index 0000000..8eb5a42 Binary files /dev/null and b/assets/items/white_conqueror_crown.png differ diff --git a/assets/items/white_demon_head.png b/assets/items/white_demon_head.png new file mode 100644 index 0000000..1475f3c Binary files /dev/null and b/assets/items/white_demon_head.png differ diff --git a/assets/items/white_destroyer_helm.png b/assets/items/white_destroyer_helm.png new file mode 100644 index 0000000..f43f984 Binary files /dev/null and b/assets/items/white_destroyer_helm.png differ diff --git a/assets/items/white_dream_spirit.png b/assets/items/white_dream_spirit.png new file mode 100644 index 0000000..dd7fa27 Binary files /dev/null and b/assets/items/white_dream_spirit.png differ diff --git a/assets/items/white_earth_spirit.png b/assets/items/white_earth_spirit.png new file mode 100644 index 0000000..0c8bce2 Binary files /dev/null and b/assets/items/white_earth_spirit.png differ diff --git a/assets/items/white_falcon_mask.png b/assets/items/white_falcon_mask.png new file mode 100644 index 0000000..d0d120b Binary files /dev/null and b/assets/items/white_falcon_mask.png differ diff --git a/assets/items/white_fanged_helm.png b/assets/items/white_fanged_helm.png new file mode 100644 index 0000000..7829e91 Binary files /dev/null and b/assets/items/white_fanged_helm.png differ diff --git a/assets/items/white_feral_claws.png b/assets/items/white_feral_claws.png new file mode 100644 index 0000000..debc501 Binary files /dev/null and b/assets/items/white_feral_claws.png differ diff --git a/assets/items/white_fury_visor.png b/assets/items/white_fury_visor.png new file mode 100644 index 0000000..3a376fd Binary files /dev/null and b/assets/items/white_fury_visor.png differ diff --git a/assets/items/white_greater_claws.png b/assets/items/white_greater_claws.png new file mode 100644 index 0000000..933e089 Binary files /dev/null and b/assets/items/white_greater_claws.png differ diff --git a/assets/items/white_greater_talons.png b/assets/items/white_greater_talons.png new file mode 100644 index 0000000..e4aa981 Binary files /dev/null and b/assets/items/white_greater_talons.png differ diff --git a/assets/items/white_griffon_headdress.png b/assets/items/white_griffon_headdress.png new file mode 100644 index 0000000..058a03e Binary files /dev/null and b/assets/items/white_griffon_headdress.png differ diff --git a/assets/items/white_guardian_crown.png b/assets/items/white_guardian_crown.png new file mode 100644 index 0000000..0e05f3c Binary files /dev/null and b/assets/items/white_guardian_crown.png differ diff --git a/assets/items/white_hawk_helm.png b/assets/items/white_hawk_helm.png new file mode 100644 index 0000000..249040d Binary files /dev/null and b/assets/items/white_hawk_helm.png differ diff --git a/assets/items/white_hellspawn_skull.png b/assets/items/white_hellspawn_skull.png new file mode 100644 index 0000000..0e0d19c Binary files /dev/null and b/assets/items/white_hellspawn_skull.png differ diff --git a/assets/items/white_helm_demonhead.png b/assets/items/white_helm_demonhead.png new file mode 100644 index 0000000..ea5c8e9 Binary files /dev/null and b/assets/items/white_helm_demonhead.png differ diff --git a/assets/items/white_horned_helm.png b/assets/items/white_horned_helm.png new file mode 100644 index 0000000..8c93dda Binary files /dev/null and b/assets/items/white_horned_helm.png differ diff --git a/assets/items/white_hunters_guise.png b/assets/items/white_hunters_guise.png new file mode 100644 index 0000000..755e692 Binary files /dev/null and b/assets/items/white_hunters_guise.png differ diff --git a/assets/items/white_jawbone_cap.png b/assets/items/white_jawbone_cap.png new file mode 100644 index 0000000..d4897a6 Binary files /dev/null and b/assets/items/white_jawbone_cap.png differ diff --git a/assets/items/white_jawbone_visor.png b/assets/items/white_jawbone_visor.png new file mode 100644 index 0000000..563decc Binary files /dev/null and b/assets/items/white_jawbone_visor.png differ diff --git a/assets/items/white_lion_helm.png b/assets/items/white_lion_helm.png new file mode 100644 index 0000000..ee33e87 Binary files /dev/null and b/assets/items/white_lion_helm.png differ diff --git a/assets/items/white_minion_skull.png b/assets/items/white_minion_skull.png new file mode 100644 index 0000000..1e8ce77 Binary files /dev/null and b/assets/items/white_minion_skull.png differ diff --git a/assets/items/white_overseer_skull.png b/assets/items/white_overseer_skull.png new file mode 100644 index 0000000..5a2f1ee Binary files /dev/null and b/assets/items/white_overseer_skull.png differ diff --git a/assets/items/white_preserved_head.png b/assets/items/white_preserved_head.png new file mode 100644 index 0000000..97d5859 Binary files /dev/null and b/assets/items/white_preserved_head.png differ diff --git a/assets/items/white_rage_mask.png b/assets/items/white_rage_mask.png new file mode 100644 index 0000000..3446da9 Binary files /dev/null and b/assets/items/white_rage_mask.png differ diff --git a/assets/items/white_runic_talons.png b/assets/items/white_runic_talons.png new file mode 100644 index 0000000..301f08c Binary files /dev/null and b/assets/items/white_runic_talons.png differ diff --git a/assets/items/white_sacred_feathers.png b/assets/items/white_sacred_feathers.png new file mode 100644 index 0000000..48372e2 Binary files /dev/null and b/assets/items/white_sacred_feathers.png differ diff --git a/assets/items/white_savage_helmet.png b/assets/items/white_savage_helmet.png new file mode 100644 index 0000000..4d7505b Binary files /dev/null and b/assets/items/white_savage_helmet.png differ diff --git a/assets/items/white_sky_spirit.png b/assets/items/white_sky_spirit.png new file mode 100644 index 0000000..61e3472 Binary files /dev/null and b/assets/items/white_sky_spirit.png differ diff --git a/assets/items/white_slayer_guard.png b/assets/items/white_slayer_guard.png new file mode 100644 index 0000000..31af3ac Binary files /dev/null and b/assets/items/white_slayer_guard.png differ diff --git a/assets/items/white_spirit_mask.png b/assets/items/white_spirit_mask.png new file mode 100644 index 0000000..00be648 Binary files /dev/null and b/assets/items/white_spirit_mask.png differ diff --git a/assets/items/white_succubus_skull.png b/assets/items/white_succubus_skull.png new file mode 100644 index 0000000..fa1dcdb Binary files /dev/null and b/assets/items/white_succubus_skull.png differ diff --git a/assets/items/white_sun_spirit.png b/assets/items/white_sun_spirit.png new file mode 100644 index 0000000..f320f54 Binary files /dev/null and b/assets/items/white_sun_spirit.png differ diff --git a/assets/items/white_suwayyah.png b/assets/items/white_suwayyah.png new file mode 100644 index 0000000..c17af26 Binary files /dev/null and b/assets/items/white_suwayyah.png differ diff --git a/assets/items/white_totemic_mask.png b/assets/items/white_totemic_mask.png new file mode 100644 index 0000000..b4a26a0 Binary files /dev/null and b/assets/items/white_totemic_mask.png differ diff --git a/assets/items/white_wolf_head.png b/assets/items/white_wolf_head.png new file mode 100644 index 0000000..d04014f Binary files /dev/null and b/assets/items/white_wolf_head.png differ diff --git a/assets/items/white_wrist_sword.png b/assets/items/white_wrist_sword.png new file mode 100644 index 0000000..a80a020 Binary files /dev/null and b/assets/items/white_wrist_sword.png differ diff --git a/config/pickit.ini b/config/pickit.ini index dd022c9..90f4b0e 100644 --- a/config/pickit.ini +++ b/config/pickit.ini @@ -1,7 +1,33 @@ -; 0: Item will not be picked up -; 1: Item will be picked up -; 2: Item will be picked up and a message will be sent to you (if message endpoint is set e.g. discord hook) -; 3: Item will be picked up but only stashed if it is ethereal +; format: item_name=pickit_type, (optional list of properties to require), (optional list of properties to discard) + +; pickit_type: +; 0: item will not be picked up +; 1: item will be picked up +; 2: item will be picked up and a message will be sent to you (if message endpoint is set e.g. discord hook) + +; see images in assets/item_properties for current supported properties +; currently only supporting properties that exist prior to identification +; default behavior of grouped properties (a, b) is "OR". You can use and(a, b) for "AND" boolean logic +; everything following item_name= is case insensitive +; nested logic is not supported; i.e. you can't use and(a, or(b, c)) +; magic/rare/set/uniq items do not show # of sockets prior to id but will show eth + +; regarding ethereal items: +; if you want to keep ONLY ethereal, add ethereal after the first comma (not contained within parenthesis) like `item=1, ethereal` +; if you want to discard ethereal, add ethereal after the second comma (not contained within parenthesis) like `item=1,, ethereal` +; if you want both ethereal and non-ethereal items, do not use the ethereal property + +; examples: +; "item_name=pickit_type, required_properties, discarded_properties" *blueprint example* +; "rare_blade_talons=2" will pickup and send a discord message for all rare blade talons +; "uniq_helm_harlequin_crest=1,, ethereal" has no required properties; will discard ethereal +; "gray_berserker_axe=1, (socketed_5, socketed_6)" requires either 5 OR 6-socketed berserker axes +; "gray_thresher=1, and(ethereal, socketed_4)" requires ethereal AND 4-sockets +; "gray_thresher=1, ethereal, (socketed_1, socketed_2, socketed_3)" requires ethereal; +; will discard any with 1-3 sockets. This will pickup non-socketed ethereal's. +; "gray_weapon_grand_matron_bow=1, and(3_bow_skills, enhanced_damage, socketed_4)" will pickup but stash +; only GMB that have 3+ bow skills AND enhanced damage modifier AND 4 sockets + [items] ;==================================================================; @@ -16,8 +42,7 @@ misc_super_mana_potion=1 misc_greater_healing_potion=0 misc_greater_mana_potion=0 -;other -misc_tp_scroll=0 +;misc misc_gold=0 misc_key_of_destruction=1 @@ -25,7 +50,7 @@ misc_key_of_destruction=1 ;================= GEMS ================; ;---------------------------------------; -;chipped +;chipped gems misc_chipped_amethyst=0 misc_chipped_ruby=0 misc_chipped_diamond=0 @@ -34,7 +59,7 @@ misc_chipped_emerald=0 misc_chipped_sapphire=0 misc_chipped_skull=0 -;flawed +;flawed gems misc_flawed_amethyst=0 misc_flawed_ruby=0 misc_flawed_diamond=0 @@ -43,7 +68,7 @@ misc_flawed_emerald=0 misc_flawed_sapphire=0 misc_flawed_skull=0 -;normal +;normal gems misc_amethyst=0 misc_ruby=0 misc_diamond=0 @@ -52,16 +77,15 @@ misc_emerald=0 misc_sapphire=0 misc_skull=0 -;flawless -misc_flawless_amethyst=1 -misc_flawless_ruby=1 +;flawless gems +misc_flawless_amethyst=0 +misc_flawless_ruby=0 misc_flawless_diamond=0 misc_flawless_topaz=0 misc_flawless_emerald=0 misc_flawless_sapphire=0 misc_flawless_skull=0 - ;==================================================================; ;<<<<<<<<<<<<<<<<<<<<<<<<<< RUNES >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>; ;==================================================================; @@ -73,19 +97,19 @@ rune_4_nef=0 rune_5_eth=0 rune_6_ith=0 rune_7_tal=0 -rune_8_ral=1 +rune_8_ral=0 rune_9_ort=0 rune_10_thul=0 rune_11_amn=0 -rune_12_sol=1 +rune_12_sol=0 rune_13_shael=0 rune_14_dol=0 rune_15_hel=0 rune_16_io=0 rune_17_lum=0 rune_18_ko=0 -rune_19_fal=0 -rune_20_lem=0 +rune_19_fal=1 +rune_20_lem=1 rune_21_pul=1 rune_22_um=1 rune_23_mal=2 @@ -100,69 +124,68 @@ rune_31_jah=2 rune_32_cham=2 rune_33_zod=2 - ;==================================================================; ;<<<<<<<<<<<<<<<<<<<<<<<<<< MAGIC ITEMS >>>>>>>>>>>>>>>>>>>>>>>>>>>; ;==================================================================; -;charms +;magic charms magic_grand_charm=1 magic_large_charm=0 magic_small_charm=1 -;jewelry +;magic jewelry magic_jewel=1 magic_amulet=0 -;helmets -magic_circlet=1 -magic_coronet=1 -magic_diadem=1 -magic_tiara=1 +;magic helmets +magic_circlet=0,, ethereal +magic_coronet=0,, ethereal +magic_diadem=0,, ethereal +magic_tiara=0,, ethereal -;shields -magic_monarch=1 +;magic shields +magic_monarch=0,, ethereal -;weapons +;magic weapons magic_gg_club=1 -;elite paladin shields +;magic paladin shields magic_sacred_targe=0 magic_sacred_rondache=0 magic_kurast_shield=0 magic_zakarum_shield=0 magic_vortex_shield=0 -;elite barbarian helmets +;magic barbarian helmets magic_guardian_crown=0 magic_conqueror_crown=0 magic_destroyer_helm=0 -;elite druid pelts +;magic druid pelts magic_dream_spirit=0 magic_sky_spirit=0 magic_earth_spirit=0 magic_sun_spirit=0 magic_blood_spirit=0 -;elite wands +;magic wands magic_polished_wand=0 magic_ghost_wand=0 magic_lich_wand=0 magic_unearthed_wand=0 -;assassin katars +;magic assassin claws magic_greater_claws=0 magic_greater_talons=0 magic_feral_claws=0 magic_runic_talons=0 magic_suwayyah=0 -;javelins +;magic javelins magic_matriarchal_javelin=0 magic_ceremonial_javelin=0 -;armor +;magic armor magic_light_plate=0 magic_mage_plate=0 magic_dusk_shroud=0 @@ -171,213 +194,199 @@ magic_wire_fleece=0 magic_scarab_husk=0 magic_archon_plate=0 -;gloves +;magic gloves magic_bramble_mitts=0 magic_vampirebone_gloves=0 magic_vambraces=0 magic_crusader_gauntlets=0 magic_ogre_gauntlets=0 - ;==================================================================; ;<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< RARES >>>>>>>>>>>>>>>>>>>>>>>>>>>>>; ;==================================================================; -;jewelry +;rare jewelry rare_amulet=1 rare_jewel=1 rare_ring=1 -;circlets +;rare circlets rare_circlet=1 rare_coronet=1 rare_diadem=1 rare_tiara=1 -;helmets +;rare helmets rare_bone_visage=0 rare_demonhead=0 rare_hydraskull=0 rare_armet=0 rare_giant_conch=0 -;shields +;rare shields rare_monarch=0 rare_blade_barrier=0 rare_troll_nest=0 - ;---------------------------------------; ;============== RARE CLAWS =============; ;---------------------------------------; -;normal -rare_blade_talons=1 -rare_cestus=0 -rare_claws=1 - -;exceptional +;exceptional rare claws rare_greater_claws=0 -rare_greater_talons=1 +rare_greater_talons=0 rare_hand_scythe=0 rare_scissors_quhab=0 -;elite +;elite rare claws +rare_feral_claws=0 +rare_runic_talons=0 rare_suwayyah=0 rare_wrist_sword=0 rare_war_fist=0 rare_battle_cestus=0 -rare_feral_claws=1 -rare_runic_talons=1 rare_scissors_suwayyah=0 - ;---------------------------------------; ;============== RARE PELTS =============; ;---------------------------------------; -;normal +;normal rare pelts +rare_antlers=0 rare_spirit_mask=0 rare_falcon_mask=0 -rare_antlers=0 rare_hawk_helm=0 rare_wolf_head=0 -;exceptional +;exceptional rare pelts +rare_hunter_guise=0 rare_totemic_mask=0 rare_sacred_feathers=0 -rare_hunter_guise=0 rare_griffon_headdress=0 rare_alpha_helm=0 -;elite +;elite rare pelts rare_earth_spirit=0 rare_dream_spirit=0 rare_sky_spirit=0 rare_sun_spirit=0 rare_blood_spirit=0 - ;---------------------------------------; ;============== RARE BOWS ==============; ;---------------------------------------; -;normal +;normal rare bows rare_stag_bow=0 rare_ashwood_bow=0 rare_matriarchal_bow=0 rare_grand_matron_bow=0 -;exceptional +;exceptional rare bows rare_rune_bow=0 rare_double_bow=0 rare_razor_bow=0 -;elite +;elite rare bows rare_ward_bow=0 rare_shadow_bow=0 rare_diamond_bow=0 rare_great_bow=0 rare_blade_bow=0 - ;---------------------------------------; ;============== RARE BELTS =============; ;---------------------------------------; -;exceptional -rare_demonhide_sash=0 -rare_sharkskin_belt=0 -rare_mesh_belt=0 -rare_battle_belt=0 -rare_war_belt=0 - -;elite -rare_spiderweb_sash=0 -rare_vampirefang_belt=0 -rare_mithril_coil=0 -rare_troll_belt=0 -rare_colossus_girdle=0 +;exceptional rare belts +rare_demonhide_sash=0,, ethereal +rare_sharkskin_belt=0,, ethereal +rare_mesh_belt=0,, ethereal +rare_battle_belt=0,, ethereal +rare_war_belt=0,, ethereal +;elite rare belts +rare_spiderweb_sash=0,, ethereal +rare_vampirefang_belt=0,, ethereal +rare_mithril_coil=0,, ethereal +rare_troll_belt=0,, ethereal +rare_colossus_girdle=0,, ethereal ;---------------------------------------; ;============== RARE BOOTS =============; ;---------------------------------------; -;normal -rare_greaves=0 -rare_boots=0 -rare_chain_boots=0 -rare_light_plated_boots=0 -rare_heavy_boots=0 +;normal rare boots +rare_greaves=0,, ethereal +rare_boots=0,, ethereal +rare_chain_boots=0,, ethereal +rare_light_plated_boots=0,, ethereal +rare_heavy_boots=0,, ethereal -;exceptional -rare_war_boots=0 -rare_battle_boots=0 -rare_mesh_boots=0 -rare_sharkskin_boots=0 -rare_demonhide_boots=0 - -;elite -rare_myrmidon_greaves=0 -rare_mirrored_boots=0 -rare_boneweave_boots=0 -rare_scarabshell_boots=0 -rare_wyrmhide_boots=0 +;exceptional rare boots +rare_war_boots=0,, ethereal +rare_battle_boots=0,, ethereal +rare_mesh_boots=0,, ethereal +rare_sharkskin_boots=0,, ethereal +rare_demonhide_boots=0,, ethereal +;elite rare boots +rare_myrmidon_greaves=0,, ethereal +rare_mirrored_boots=0,, ethereal +rare_boneweave_boots=0,, ethereal +rare_scarabshell_boots=0,, ethereal +rare_wyrmhide_boots=0,, ethereal ;---------------------------------------; ;============= RARE GLOVES =============; ;---------------------------------------; -;normal -rare_leather_gloves=0 -rare_heavy_gloves=0 -rare_chain_gloves=0 -rare_light_gauntlets=0 -rare_gauntlets=0 +;normal rare gloves +rare_leather_gloves=0,, ethereal +rare_heavy_gloves=0,, ethereal +rare_chain_gloves=0,, ethereal +rare_light_gauntlets=0,, ethereal +rare_gauntlets=0,, ethereal -;exceptional -rare_demonhide_gloves=0 -rare_sharkskin_gloves=0 -rare_heavy_bracers=0 -rare_battle_gauntlets=0 -rare_war_gauntlets=0 - -;elite -rare_bramble_mitts=0 -rare_vampirebone_gloves=0 -rare_vambraces=0 -rare_crusader_gauntlets=0 -rare_ogre_gauntlets=0 +;exceptional rare gloves +rare_demonhide_gloves=0,, ethereal +rare_sharkskin_gloves=0,, ethereal +rare_heavy_bracers=0,, ethereal +rare_battle_gauntlets=0,, ethereal +rare_war_gauntlets=0,, ethereal +;elite rare gloves +rare_bramble_mitts=0,, ethereal +rare_vampirebone_gloves=0,, ethereal +rare_vambraces=0,, ethereal +rare_crusader_gauntlets=0,, ethereal +rare_ogre_gauntlets=0,, ethereal ;---------------------------------------; ;======= RARE BARBARIAN HELMETS ========; ;---------------------------------------; -;normal +;normal rare barb helms rare_avenger_guard=0 rare_assault_helm=0 rare_horned_helm=0 rare_fanged_helm=0 rare_jawbone_cap=0 -;exceptional +;exceptional rare barb helms rare_slayer_guard=0 rare_savage_helmet=0 rare_rage_mask=0 rare_lion_helm=0 rare_jawbone_visor=0 -;elite +;elite barb helms rare_guardian_crown=0 rare_conqueror_crown=0 rare_destroyer_helm=0 rare_fury_visor=0 rare_carnage_helm=0 - ;---------------------------------------; ;========= RARE SORCERESS ORBS =========; ;---------------------------------------; @@ -387,313 +396,414 @@ rare_eagle_orb=0 rare_sacred_globe=0 rare_smoked_sphere=0 rare_clasped_orb=0 -rare_jareds_stone=0 +rare_jareds_stone=1 ;exceptional rare_glowing_orb=0 rare_crystalline_globe=0 rare_cloudy_sphere=0 rare_sparkling_ball=0 -rare_swirling_crystal=0 +rare_swirling_crystal=1 ;elite rare_heavenly_stone=0 rare_eldritch_orb=0 rare_demon_heart=0 rare_vortex_orb=0 -rare_dimensional_shard=0 - +rare_dimensional_shard=1 ;---------------------------------------; ;============ RARE JAVELINS ============; ;---------------------------------------; rare_hyperion_javelin=0 -rare_ceremonial_javelin=0 -rare_maiden_javelin=0 - +rare_ceremonial_javelin=1 +rare_maiden_javelin=1 ;==================================================================; -;<<<<<<<<<<<<<<<<<< WHITE-ETHERAL-SOCKETED ARMOR >>>>>>>>>>>>>>>>>>; +;<<<<<<<<<<<<<<<<<< WHITE/ETHERAL/SOCKETED ARMOR >>>>>>>>>>>>>>>>>>; ;==================================================================; ;---------------------------------------; -;==== WHITE-ETHEREAL-SOCKETED ARMOR ====; +;==== WHITE/SUPERIOR ARMOR ====; ;---------------------------------------; -;white +;white armor white_archon_plate=0 white_dusk_shroud=0 -white_light_plate=0 white_mage_plate=0 white_great_hauberk=0 white_wire_fleece=0 white_scarab_husk=0 white_wyrmhide=0 +white_light_plate=0 -;superior white -white_superior_archon_plate=0 -white_superior_dusk_shroud=0 -white_superior_light_plate=0 -white_superior_mage_plate=0 -white_superior_great_hauberk=0 -white_superior_wire_fleece=0 -white_superior_scarab_husk=0 -white_superior_wyrmhide=0 - -;ethereal-socketed -eth_armor_archon_plate=0 -eth_armor_dusk_shroud=0 -eth_armor_lacquered_plate=0 -eth_armor_light_plate=0 -eth_armor_mage_plate=0 -eth_armor_sacred_armor=0 -eth_armor_shadow_plate=0 -eth_armor_great_hauberk=0 -eth_armor_wyrmhide=0 -eth_armor_balrog=0 -eth_armor_boneweave=0 -eth_armor_hellforge=0 -eth_armor_kraken=0 - -;superior ethereal-socketed -eth_superior_archon_plate=1 -eth_superior_dusk_shroud=1 -eth_superior_lacquered_plate=3 -eth_superior_light_plate=0 -eth_superior_mage_plate=1 -eth_superior_sacred_armor=3 -eth_superior_shadow_plate=3 -eth_superior_great_hauberk=0 -eth_superior_wyrmhide=0 -eth_superior_boneweave=0 - +;white/superior armor +white_superior_archon_plate=1, enhanced_defense +white_superior_dusk_shroud=1, enhanced_defense +white_superior_mage_plate=1, enhanced_defense +white_superior_wire_fleece=1, enhanced_defense +white_superior_scarab_husk=1, enhanced_defense +white_superior_wyrmhide=1, enhanced_defense +white_superior_great_hauberk=0, enhanced_defense +white_superior_light_plate=0, enhanced_defense ;---------------------------------------; -;====== ETHEREAL-SOCKETED HELMETS ======; +;======= WHITE SOCKETED ARMORS ========; ;---------------------------------------; -;ethereal -eth_helm_bone_visage=0 -eth_helm_corona=0 -eth_helm_diadem=0 -eth_helm_giant_conch=0 -eth_helm_shako=0 +;white/socketed armor +gray_armor_archon_plate=1, (socketed_3, socketed_4) +gray_armor_dusk_shroud=1, (socketed_3, socketed_4), ethereal +gray_armor_mage_plate=1, (socketed_3, socketed_4), ethereal +gray_armor_light_plate=0, (socketed_3, socketed_4), ethereal +gray_armor_great_hauberk=0, (socketed_3, socketed_4), ethereal +gray_armor_wyrmhide=0, (socketed_3, socketed_4), ethereal +gray_armor_boneweave=0, (socketed_3, socketed_4), ethereal +;white/superior/socketed armor +gray_superior_archon_plate=1, and(enhanced_defense, socketed), (socketed_1, socketed_2) +gray_superior_dusk_shroud=1, and(enhanced_defense, socketed), (ethereal, socketed_1, socketed_2) +gray_superior_mage_plate=1, and(enhanced_defense, socketed), (ethereal, socketed_1, socketed_2) +gray_superior_light_plate=0, and(enhanced_defense, socketed), (ethereal, socketed_1, socketed_2) +gray_superior_wyrmhide=0, and(enhanced_defense, socketed), (ethereal, socketed_1, socketed_2) +gray_superior_boneweave=0, and(enhanced_defense, socketed), (ethereal, socketed_1, socketed_2) +gray_superior_great_hauberk=0, and(enhanced_defense, socketed), (ethereal, socketed_1, socketed_2) + +;---------------------------------------; +;===== ETHEREAL SOCKETED ARMOR =====; +;---------------------------------------; + +;ethereal+socketed armor +gray_armor_sacred_armor=1, ethereal, (socketed_1, socketed_2) +gray_armor_shadow_plate=0, ethereal, (socketed_1, socketed_2) +gray_armor_balrog=0, ethereal, (socketed_1, socketed_2) +gray_armor_lacquered_plate=1, ethereal, (socketed_1, socketed_2) +gray_armor_hellforge=0, ethereal, (socketed_1, socketed_2) +gray_armor_kraken=0, ethereal, (socketed_1, socketed_2) + +;ethereal+superior+socketed armor +gray_superior_sacred_armor=1, and(ethereal, enhanced_defense), (socketed_1, socketed_2) +gray_superior_shadow_plate=1, and(ethereal, enhanced_defense), (socketed_1, socketed_2) +gray_superior_lacquered_plate=1, and(ethereal, enhanced_defense), (socketed_1, socketed_2) + +;---------------------------------------; +;==== ETH/NON ETH SOCKETED HELMETS ====; +;---------------------------------------; + +;both eth/non eth socketed helmets +gray_helm_bone_visage=1, and(socketed_3, enhanced_defense) +gray_helm_demonhead=1, and(socketed_3, enhanced_defense) +gray_helm_corona=0, and(socketed_3, enhanced_defense) +gray_helm_diadem=1, and(socketed_3, enhanced_defense) +gray_helm_giant_conch=0, and(socketed_3, enhanced_defense) ;----------------------------------------; ;==== WHITE-ETHERAL-SOCKETED SHIELDS ====; ;----------------------------------------; -;white +;white shields white_monarch=0 -;superior white -white_superior_crown_shield=0 -white_superior_monarch=0 - -;ethereal -eth_shield_monarch=0 -eth_shield_troll_nest=0 +;superior white shields +white_superior_monarch=1, enhanced_defense +;non eth socketed shields +gray_shield_monarch=1, socketed_4, ethereal +gray_shield_troll_nest=0,, (ethereal, socketed_1, socketed_2, socketed_3) ;----------------------------------------------; -;=== WHITE-ETHERAL-SOCKETED PALADIN SHIELDS ===; +;=== WHITE PALADIN SHIELDS ===; ;----------------------------------------------; -;white -white_crown_shield=0 -white_vortex_shield=0 -white_royal_shield=0 -white_sacred_targe=1 -white_sacred_rondache=0 -white_kurast_shield=0 -white_zakarum_shield=0 -white_akaran_targe=0 -white_akaran_rondache=0 +;white paladin shields +white_royal_shield=1, all_resist_45 +white_sacred_rondache=1, all_resist_45 +white_kurast_shield=1, all_resist_45 +white_zakarum_shield=1, all_resist_45 +white_sacred_targe=1, all_resist_gt40 +white_vortex_shield=1, all_resist_45 -;superior white -white_superior_vortex_shield=0 -white_superior_royal_shield=0 -white_superior_sacred_targe=1 -white_superior_sacred_rondache=0 -white_superior_kurast_shield=0 -white_superior_zakarum_shield=0 -white_superior_akaran_targe=0 -white_superior_akaran_rondache=0 +;lld white paladin shields +white_crown_shield=0, all_resist_45 +white_akaran_targe=0, all_resist_45 +white_akaran_rondache=0, all_resist_45 -;ethereal-socketed -eth_sacred_targe=1 -eth_sacred_rondache=0 -eth_kurast_shield=0 -eth_zakarum_shield=0 -eth_vortex_shield=0 -eth_akaran_targe=0 -eth_akaran_rondache=0 -eth_royal_shield=0 -;superior ethereal-socketed -eth_superior_vortex_shield=1 -eth_superior_royal_shield=0 -eth_superior_sacred_targe=1 -eth_superior_sacred_rondache=1 -eth_superior_kurast_shield=0 -eth_superior_zakarum_shield=0 -eth_superior_akaran_targe=0 -eth_superior_akaran_rondache=0 +;white superior paladin shields +white_superior_royal_shield=1, and(all_resist_gt40, enhanced_defense) +white_superior_sacred_rondache=1, and(all_resist_gt40, enhanced_defense) +white_superior_kurast_shield=1, and(all_resist_gt40, enhanced_defense) +white_superior_zakarum_shield=1, and(all_resist_gt40, enhanced_defense) +white_superior_sacred_targe=1, and(all_resist_gt40, enhanced_defense) +white_superior_vortex_shield=1, and(all_resist_gt40, enhanced_defense) +;lld white superior paladin shields +white_superior_akaran_targe=0, and(all_resist_gt40, enhanced_defense) +white_superior_akaran_rondache=0, and(all_resist_gt40, enhanced_defense) +white_superior_crown_shield=0, and(all_resist_gt40, enhanced_defense) + +;---------------------------------------; +;=== ETH/SOCKETED PALADIN SHIELD =======; +;---------------------------------------; + +;both eth/non eth socketed paladin shield +gray_royal_shield=1, all_resist_45, (socketed_1, socketed_2) +gray_sacred_rondache=1, all_resist_45, (socketed_1, socketed_2) +gray_kurast_shield=1, all_resist_45, (socketed_1, socketed_2) +gray_zakarum_shield=1, all_resist_45, (socketed_1, socketed_2) +gray_sacred_targe=1, all_resist_gt40, (socketed_1, socketed_2) +gray_vortex_shield=1, all_resist_45, (socketed_1, socketed_2) + +;lld both eth/non eth socketed shields +gray_akaran_targe=0, (socketed_1, socketed_2) +gray_akaran_rondache=0, (socketed_1, socketed_2) + +;both eth/non eth superior socketed shields. +gray_superior_vortex_shield=1, and(all_resist_gt40, enhanced_defense), (socketed_1, socketed_2) +gray_superior_royal_shield=1, and(all_resist_gt40, enhanced_defense), (socketed_1, socketed_2) +gray_superior_sacred_targe=1, and(all_resist_gt40, enhanced_defense), (socketed_1, socketed_2) +gray_superior_sacred_rondache=1, and(all_resist_gt40, enhanced_defense), (socketed_1, socketed_2) +gray_superior_kurast_shield=1, and(all_resist_gt40, enhanced_defense), (socketed_1, socketed_2) +gray_superior_zakarum_shield=1, and(all_resist_gt40, enhanced_defense), (socketed_1, socketed_2) +gray_superior_akaran_targe=1, and(all_resist_gt40, enhanced_defense), (socketed_1, socketed_2) +gray_superior_akaran_rondache=1, and(all_resist_gt40, enhanced_defense), (socketed_1, socketed_2) + +;----------------------------------------------; +;============ WHITE BARBARIAN HELMS ===========; +;----------------------------------------------; + +;normal white barb helms +white_fanged_helm=1, 3_warcries +white_jawbone_cap=1, 3_warcries +white_horned_helm=1, 3_warcries +white_assault_helmet=1, 3_warcries +white_avenger_guard=1, 3_warcries + +;exceptional white barb helms +white_lion_helm=1, 3_warcries +white_rage_mask=1, 3_warcries +white_jawbone_visor=1, 3_warcries +white_savage_helmet=1, 3_warcries +white_slayer_guard=1, 3_warcries + +;elite white barb helms +white_destroyer_helm=1, 3_warcries +white_fury_visor=1, 3_warcries +white_carnage_helm=1, 3_warcries +white_conqueror_crown=1, 3_warcries +white_guardian_crown=1, 3_warcries + +;----------------------------------------------; +;=============== WHITE DRUID PELTS ============; +;----------------------------------------------; + +;normal white druid pelts +white_antlers=1, 3_tornado +white_wolf_head=1, 3_tornado +white_hawk_helm=1, 3_tornado +white_spirit_mask=1, 3_tornado +white_falcon_mask=1, 3_tornado + +;exceptional white druid pelts +white_hunters_guise=1, 3_tornado +white_sacred_feathers=1, 3_tornado +white_alpha_helm=1, 3_tornado +white_griffon_headdress=1, 3_tornado +white_totemic_mask=1, 3_tornado + +;elite white druid pelts +white_earth_spirit=1, 3_tornado +white_blood_spirit=1, 3_tornado +white_dream_spirit=1, 3_tornado +white_sky_spirit=1, 3_tornado +white_sun_spirit=1, 3_tornado + +;----------------------------------------------; +;========= WHITE NECROMANCER SHIELDS =+========; +;----------------------------------------------; + +;white necromancers shields +white_preserved_head=1, and(3_bone_spear, 3_bone_spirit), socketed_1 +white_overseer_skull=1, and(3_bone_spear, 3_bone_spirit), socketed_1 +white_succubus_skull=1, and(3_bone_spear, 3_bone_spirit), socketed_1 +white_demon_head=1, and(3_bone_spear, 3_bone_spirit), socketed_1 +white_hellspawn_skull=1, and(3_bone_spear, 3_bone_spirit), socketed_1 +white_bloodlord_skull=1, and(3_bone_spear, 3_bone_spirit), socketed_1 +white_minion_skull=1, and(3_bone_spear, 3_bone_spirit), socketed_1 ;==================================================================; ;<<<<<<<<<<<<<<< WHITE-ETHEREAL-SOCKETED WEAPONS >>>>>>>>>>>>>>>>>>; ;==================================================================; ;-----------------------------------------; -;=== WHITE-ETHERAL-SOCKETED 1H WEAPONS ===; +;=========== WHITE 1H WEAPONS ==========; ;-----------------------------------------; -;white +;white weapons white_berserker_axe=0 white_crystal_sword=0 white_flail=0 white_phase_blade=0 -white_war_scepter=0 -white_divine_scepter=0 -white_caduceus=0 +white_war_scepter=1, (3_blessed_hammer, 3_conviction, 3_zeal, 3_concentration, 3_fist_of_the_heavens, 3_holy_shield, 3_fanaticism) +white_divine_scepter=1, (3_blessed_hammer, 3_conviction, 3_zeal, 3_concentration, 3_fist_of_the_heavens, 3_holy_shield, 3_fanaticism) +white_caduceus=1, (3_blessed_hammer, 3_conviction, 3_zeal, 3_concentration, 3_fist_of_the_heavens, 3_holy_shield, 3_fanaticism) -;white superior -white_superior_berserker_axe=1 -white_superior_crystal_sword=0 -white_superior_flail=0 +;white superior weapons +white_superior_berserker_axe=0 +white_superior_crystal_sword=1,enhanced_damage_15 +white_superior_flail=1,enhanced_damage_15 white_superior_phase_blade=0 -;ethereal -eth_weapon_berserker_axe=1 -eth_weapon_crystal_sword=0 -eth_weapon_flail=0 -eth_weapon_phase_blade=0 -eth_weapon_war_scepter=1 -eth_weapon_war_pike=0 -eth_divine_scepter=0 -eth_caduceus=0 +;-----------------------------------------; +;===== WHITE/ETH/SOCKETED 1H WEAPONS =====; +;-----------------------------------------; + +;eth/non eth/socketed weapons +gray_weapon_berserker_axe=0, (socketed_1, socketed_2, socketed_3, socketed_4) +gray_weapon_crystal_sword=0,, (ethereal, socketed_1, socketed_2, socketed_3) +gray_weapon_flail=0,, (ethereal, socketed_1, socketed_2, socketed_3) +gray_weapon_phase_blade=0,, (ethereal, socketed_1, socketed_2, socketed_3, socketed_4, socketed_6) +gray_weapon_war_scepter=1,, (ethereal, socketed_1, socketed_2, socketed_3, socketed_4) +gray_divine_scepter=1,, (ethereal, socketed_1, socketed_2, socketed_3, socketed_4) +gray_caduceus=1,, (ethereal, socketed_1, socketed_2, socketed_3, socketed_4) +gray_weapon_war_pike=0, (socketed_1, socketed_2, socketed_3, socketed_4, socketed_5) ;superior ethereal -eth_superior_berserker_axe=1 -eth_superior_crystal_sword=0 -eth_superior_flail=0 -eth_superior_phase_blade=1 +gray_superior_berserker_axe=1, enhanced_damage, (socketed_1, socketed_2, socketed_3, socketed_4) +gray_superior_crystal_sword=1, and(enhanced_damage, socketed_4), ethereal +gray_superior_flail=1, enhanced_damage, (ethereal, socketed_1, socketed_2, socketed_3) +gray_superior_phase_blade=1, enhanced_damage, (ethereal, socketed_1, socketed_2, socketed_3, socketed_4) +;-----------------------------------------; +;==== WHITE ASSASSIN CLAWS ====; +;-----------------------------------------; + +; white assassin claws +white_feral_claws=1, (3_venom, 3_lightning_sentry) +white_greater_claws=1, (3_venom, 3_lightning_sentry) +white_greater_talons=1, (3_venom, 3_lightning_sentry) +white_runic_talons=1, (3_venom, 3_lightning_sentry) +white_suwayyah=1, (3_venom, 3_lightning_sentry) +white_wrist_sword=1, (3_venom, 3_lightning_sentry) + +;to-do: include gray assassin claws ;-----------------------------------------; ;==== WHITE-ETHERAL-SOCKETED POLEARMS ====; ;-----------------------------------------; -;ethereal -eth_weapon_colossus_voulge=3 -eth_weapon_thresher=3 -eth_weapon_giant_thresher=3 -eth_weapon_cryptic_axe=3 -eth_weapon_great_poleaxe=3 -eth_weapon_ghost_spear=3 +;ethereal polearms +gray_weapon_colossus_voulge=1, and(ethereal, socketed_4) +gray_weapon_thresher=1, ethereal, (socketed_1, socketed_2, socketed_3) +gray_weapon_giant_thresher=1, ethereal, (socketed_1, socketed_2, socketed_3) +gray_weapon_cryptic_axe=1, ethereal, (socketed_1, socketed_2, socketed_3) +gray_weapon_great_poleaxe=0, ethereal, (socketed_1, socketed_2, socketed_3) +gray_weapon_ghost_spear=0, ethereal, (socketed_1, socketed_2, socketed_3, socketed_5) ;superior ethereal -eth_weapon_superior_colossus_voulge=3 -eth_weapon_superior_cryptic_axe=3 -eth_weapon_superior_thresher=3 -eth_weapon_superior_giant_thresher=3 - +gray_weapon_superior_colossus_voulge=1, ethereal, (socketed_1, socketed_2, socketed_3) +gray_weapon_superior_cryptic_axe=1, ethereal, (socketed_1, socketed_2, socketed_3) +gray_weapon_superior_thresher=1, ethereal, (socketed_1, socketed_2, socketed_3) +gray_weapon_superior_giant_thresher=1, ethereal, (socketed_1, socketed_2, socketed_3) ;-----------------------------------------; ;==== WHITE-ETHEREAL-SOCKETED STAVES =====; ;-----------------------------------------; -;white 6 sockets +;white battle staff (cta) white_archon_staff=0 white_war_staff=0 white_rune_staff=0 -;white 4 sockets +;white staff (memory) white_shillelagh=0 white_elder_staff=0 white_gothic_staff=0 white_cedar_staff=0 -;ethereal-socketed 6 sockets -eth_archon_staff=0 -eth_war_staff=0 -eth_rune_staff=0 - -;ethereal-socketed 4 sockets -eth_shillelagh=0 -eth_elder_staff=0 -eth_gothic_staff=0 -eth_cedar_staff=0 +;socketed staff (cta) +gray_archon_staff=1, (socketed_5, 3_energy_shield) +gray_war_staff=1, (socketed_5, 3_energy_shield) +gray_rune_staff=1, (socketed_5, 3_energy_shield) +;socketed staff (memory) +gray_shillelagh=1, (3_energy_shield, 3_shiver_armor, 3_chilling_armor, 3_thunder_storm), (socketed_1, socketed_2, socketed_3) +gray_elder_staff=1, (3_energy_shield, 3_shiver_armor, 3_chilling_armor, 3_thunder_storm), (socketed_1, socketed_2, socketed_3) +gray_gothic_staff=1, (3_energy_shield, 3_shiver_armor, 3_chilling_armor 3_thunder_storm), (socketed_1, socketed_2, socketed_3) +gray_cedar_staff=1, (3_energy_shield, 3_shiver_armor, 3_chilling_armor, 3_thunder_storm), (socketed_1, socketed_2, socketed_3) ;-----------------------------------------; ;===== WHITE-ETHEREAL-SOCKETED WANDS =====; ;-----------------------------------------; ;white -white_polished_wand=0 -white_ghost_wand=0 -white_lich_wand=0 -white_unearthed_wand=0 +white_polished_wand=1, (3_bone_spear, 3_bone_spirit), socketed_1 +white_ghost_wand=1, (3_bone_spear, 3_bone_spirit), socketed_1 +white_lich_wand=1, (3_bone_spear, 3_bone_spirit), socketed_1 +white_unearthed_wand=1, (3_bone_spear, 3_bone_spirit), socketed_1 ;ethereal-socketed -eth_polished_wand=0 -eth_ghost_wand=0 -eth_lich_wand=0 -eth_unearthed_wand=0 - +gray_polished_wand=1, (3_bone_spear, 3_bone_spirit), socketed_1 +gray_ghost_wand=1, (3_bone_spear, 3_bone_spirit), socketed_1 +gray_lich_wand=1, (3_bone_spear, 3_bone_spirit), socketed_1 +gray_unearthed_wand=1, (3_bone_spear, 3_bone_spirit), socketed_1 ;-----------------------------------------; -;======== ETHEREAL-SOCKETED BOWS =========; +;============ SOCKETED BOWS ==============; ;-----------------------------------------; +;to-do: include white bows + ;ethereal -eth_weapon_grand_matron_bow=0 -eth_weapon_superior_grand_matron_bow=1 - +gray_weapon_grand_matron_bow=1, and(3_bow_skills, enhanced_damage, socketed_4) +gray_weapon_superior_grand_matron_bow=1, and(3_bow_skills, enhanced_damage, socketed_4) ;==================================================================; ;<<<<<<<<<<<<<<<<<<<<<<<<<<< SETS >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>; ;==================================================================; ;------------------------------; -;====== Amulets / Rings =======; +;====== AMULETS / RINGS =======; ;------------------------------; + set_misc_amulets=2 set_ring=0 ;------------------------------; -;===== Aldur's Watchtower =====; +;===== ALDUR'S WATCHTOWER =====; ;------------------------------; + set_aldur_advance=0 set_aldurs_pelt=0 set_aldurs_armor=0 ;------------------------------; -;==== Bul-Kathos' Children ====; +;==== BUL-KATHOS' CHILDREN ====; ;------------------------------; + set_bul_kathos_sword=0 ;------------------------------; -;====== Griswold's Legacy =====; +;====== GRISWOLD'S LEGACY =====; ;------------------------------; + set_griswold_valor=0 set_griswolds_scepter=0 set_griswolds_shield=0 set_griswolds_armor=0 ;------------------------------; -;======== Orphan's Call =======; +;======== ORPHAN'S CALL =======; ;------------------------------; + set_guillaume_face=0 set_whistans_guard=0 ;------------------------------; -;======== Immortal King =======; +;======== IMMORTAL KING =======; ;------------------------------; + set_immortal_king_soul_cage=0 set_immortal_king_will=0 set_immortal_king_gauntlets=0 @@ -702,13 +812,15 @@ set_immortal_king_maul=0 set_immortal_king_belt=0 ;------------------------------; -;======== The Disciple ========; +;======== THE DISCIPLE ========; ;------------------------------; + set_laying_of_hands=0 ;------------------------------; -;=== M'avina's Battle Hymn ====; +;=== M'AVINA'S BATTLE HYMN ====; ;------------------------------; + set_mavinas_caster=0 set_mavinas_true_sight=0 set_mavinas_armor=0 @@ -716,24 +828,27 @@ set_mavinas_gauntlets=0 set_mavinas_belt=0 ;------------------------------; -;======= Natalya's Odium ======; +;======= NATALYA'S ODIUM ======; ;------------------------------; + set_natalya_soul=0 set_natalya_armor=0 set_natalya_scissors=0 set_natalya_helm=0 ;------------------------------; -;==== Tal Rasha's Wrappings ===; +;==== TAL RASHA'S WRAPPINGS ===; ;------------------------------; + set_tal_rasha_lidless_eye=1 set_tal_rasha_fine-spun_cloth=1 set_tal_rasha_guardianship=2 set_tal_rasha_horadric_crest=0 ;------------------------------; -;===== Trang-Oul's Avatar =====; +;===== TRANG-OUL'S AVATAR =====; ;------------------------------; + set_trang-oul_claws=0 set_trang-oul_girth=0 set_trang-oul_shield=0 @@ -741,24 +856,28 @@ set_trang_oul_helm=0 set_trang_oul_armor=0 ;------------------------------; -;======= Cleglaw's Brace ======; +;======= CLEGLAW'S BRACE ======; ;------------------------------; + set_cleglaws_pincers=0 ;------------------------------; -;====== Death's Disguise ======; +;====== DEATH'S DISGUISE ======; ;------------------------------; + set_deaths_gloves=0 set_deaths_belt=0 ;------------------------------; -;===== Milabrega's Regalia ====; +;===== MILABREGA'S REGALIA ====; ;------------------------------; + set_milabregas_shield=0 ;------------------------------; -;=== Sigon's Complete Steel ===; +;=== SIGON'S COMPLETE STEEL ===; ;------------------------------; + set_sigon_helm=0 set_sigon_armor=0 set_sigon_boots=0 @@ -773,68 +892,72 @@ set_sigon_gloves=0 ;------------------------------; ;===== UNIQUE BODY ARMOR ======; ;------------------------------; -uniq_twitchthroe=0 -uniq_silks_of_victor=0 -uniq_spirit_shroud=0 -uniq_que_hagens_wisdom=0 -uniq_corpsemourn=0 -uniq_the_gladiators_bane=0 -uniq_leviathan=0 -uniq_arkaines_valor=0 -uniq_tyraels_might=0 -uniq_armor_duriel_shell=0 -uniq_armor_guardian_angel=0 -uniq_armor_ormus_robes=1 -uniq_armor_shaftstop=0 -uniq_armor_skin_of_the_vipermagi=0 -uniq_armor_skullder_ire=0 -uniq_armor_toothrow=0 -uniq_armor_atmas_wail=0 + uniq_armor_crow_caw=0 uniq_armor_steel_carapace=0 uniq_armor_iron_pelt=0 uniq_armor_skin_of_the_flayed_one=0 uniq_armor_spirit_forge=0 uniq_armor_black_hades=0 +uniq_twitchthroe=0 +uniq_silks_of_victor=0 +uniq_spirit_shroud=0 +uniq_que_hagens_wisdom=0 +uniq_corpsemourn=0 +uniq_the_gladiators_bane=1, ethereal +uniq_leviathan=1, ethereal +uniq_arkaines_valor=1, ethereal +uniq_tyraels_might=1 +uniq_armor_duriel_shell=1, ethereal +uniq_armor_guardian_angel=1, ethereal +uniq_armor_ormus_robes=1,, ethereal +uniq_armor_shaftstop=1, ethereal +uniq_armor_skin_of_the_vipermagi=0 +uniq_armor_skullder_ire=1, ethereal +uniq_armor_toothrow=0 +uniq_armor_atmas_wail=0 ;------------------------------; ;======== UNIQUE BELTS ========; ;------------------------------; + uniq_lenymo=0 uniq_nightsmoke=0 uniq_glooms_trap=0 -uniq_belt_arachnid_mesh=2 -uniq_belt_goldwrap=1 +uniq_belt_nosferatus_coil=0 +uniq_belt_goldwrap=0 uniq_belt_razortail=0 uniq_belt_snowclash=0 uniq_belt_string_of_ears=0 uniq_belt_thundergod_vigor=0 -uniq_belt_verdungo_hearty_cord=1 -uniq_belt_nosferatus_coil=0 +uniq_belt_arachnid_mesh=2,, ethereal +uniq_belt_verdungo_hearty_cord=1,, ethereal ;------------------------------; ;======== UNIQUE BOOTS ========; ;------------------------------; -uniq_hotspur=0 -uniq_infernostride=0 -uniq_boots_goblin_toe=0 -uniq_boots_gore_rider=0 -uniq_boots_marrowwalk=0 -uniq_boots_sandstorm_trek=1 -uniq_boots_shadow_dancer=0 -uniq_boots_silkweave=0 -uniq_boots_war_traveler=2 -uniq_boots_waterwalk=0 + +uniq_infernostride=0,, ethereal +uniq_boots_goblin_toe=0,, ethereal +uniq_boots_marrowwalk=0,, ethereal +uniq_boots_silkweave=0,, ethereal +uniq_boots_waterwalk=0,, ethereal +uniq_boots_shadow_dancer=1,, ethereal +uniq_boots_gore_rider=1,, ethereal +uniq_boots_war_traveler=2,, ethereal +uniq_boots_sandstorm_trek=2 +uniq_hotspur=0,, ethereal ;------------------------------; ;======= UNIQUE GLOVES ========; ;------------------------------; + uniq_bloodfist=0 -uniq_gloves_chance_guards=1 -uniq_gloves_dracul_grasp=1 +uniq_gloves_chance_guards=1,, ethereal +uniq_gloves_dracul_grasp=1,, ethereal uniq_gloves_frostburn=0 uniq_gloves_magefist=0 -uniq_gloves_steelrend=1 +uniq_gloves_steelrend=1,, ethereal uniq_soul_drainer=0 uniq_gloves_venom_grip=0 uniq_gloves_gravepalm=0 @@ -845,16 +968,17 @@ uniq_gloves_hellmouth=0 ;------------------------------; ;======= UNIQUE HELMETS =======; ;------------------------------; -uniq_tarnhelm=0 -uniq_peasant_crown=0 -uniq_crown_of_thieves=0 + +uniq_tarnhelm=0,, ethereal +uniq_peasant_crown=1,, ethereal +uniq_crown_of_thieves=1, ethereal +uniq_helm_giant_skull=1, ethereal +uniq_helm_nightwing_veil=2,, ethereal uniq_helm_andariel_visage=2 uniq_helm_crown_of_ages=2 -uniq_helm_giant_skull=0 uniq_helm_griffon_eye=2 -uniq_helm_harlequin_crest=2 +uniq_helm_harlequin_crest=2,, ethereal uniq_helm_kira_guardian=0 -uniq_helm_nightwing_veil=2 uniq_helm_stealskull=0 uniq_helm_vampire_gaze=1 uniq_helm_valkyrie_wing=1 @@ -866,37 +990,42 @@ uniq_helm_rockstopper=0 ;------------------------------; ;== UNIQUE BARBARIAN HELMETS ==; ;------------------------------; -uniq_helm_arreat_face=2 -uniq_wolfhowl=0 -uniq_demonhorns_edge=0 -uniq_halaberds_reign=0 + +uniq_helm_arreat_face=1 +uniq_wolfhowl=0,, ethereal +uniq_demonhorns_edge=0,, ethereal +uniq_halaberds_reign=0,, ethereal ;------------------------------; ;===== UNIQUE DRUID PELTS =====; ;------------------------------; -uniq_helm_cerebus_bite=1 -uniq_helm_jalal_mane=1 -uniq_spirit_keeper=0 -uniq_ravenlore=1 + +uniq_helm_cerebus_bite=0,, ethereal +uniq_helm_jalal_mane=1,, ethereal +uniq_spirit_keeper=0,, ethereal +uniq_ravenlore=1,, ethereal ;------------------------------; ;== UNIQUE JEWELRY - CHARMS ===; ;------------------------------; + uniq_misc_amulets=2 uniq_misc_rings=2 uniq_misc_rainbow_facet=2 -uniq_gheeds_fortune=0 +uniq_gheeds_fortune=1 ;------------------------------; ;= UNIQUE NECROMANCER SHIELDS =; ;------------------------------; -uniq_offhand_boneflame=0 -uniq_offhand_darkforce_spawn=1 -uniq_offhand_homunculus=1 + +uniq_offhand_boneflame=0,, ethereal +uniq_offhand_darkforce_spawn=0,, ethereal +uniq_offhand_homunculus=1,, ethereal ;------------------------------; ;== UNIQUE NECROMANCER WANDS ==; ;------------------------------; + uniq_umes_lament=0 uniq_arm_of_king_leoric=0 uniq_suicide_branch=0 @@ -906,11 +1035,12 @@ uniq_weapon_death_web=2 ;------------------------------; ;======= UNIQUE SHIELDS =======; ;------------------------------; + uniq_pelta_lunata=0 uniq_visceratuant=0 uniq_mosers_blessed_circle=0 uniq_lidless_wall=0 -uniq_offhand_head_hunter_glory=0 +uniq_offhand_head_hunter_glory=1, ethereal uniq_offhand_stormshield=0 uniq_offhand_blackoak_shield=0 uniq_offhand_lance_guard=0 @@ -924,47 +1054,51 @@ uniq_offhand_spirit_ward=0 ;------------------------------; ;=== UNIQUE PALADIN SHIELDS ===; ;------------------------------; -uniq_dragonscale=0 -uniq_alma_negra=0 + +uniq_dragonscale=0,, ethereal +uniq_alma_negra=1, ethereal uniq_herald_of_zakarum=2 ;------------------------------; ;======= UNIQUE WEAPONS =======; ;------------------------------; -uniq_weapon_blade_of_ali_baba=0 -uniq_weapon_bonehew=0 -uniq_weapon_lacerator=0 -uniq_weapon_lightsabre=0 +uniq_weapon_lacerator=0,, ethereal +uniq_weapon_warshrike=0, ethereal +uniq_weapon_gimmershred=0,, ethereal +uniq_weapon_stormlash=0, ethereal +uniq_weapon_wizardspike=0,, ethereal +uniq_gul_dagger=0,, ethereal +uniq_weapon_the_cranium_basher=1, ethereal +uniq_weapon_schaefer_hammer=1, ethereal +uniq_weapon_blade_of_ali_baba=0,, ethereal +uniq_weapon_lightsabre=1,, ethereal uniq_weapon_ondal_wisdom=1 -uniq_weapon_ribcracker=0 -uniq_weapon_schaefer_hammer=0 -uniq_weapon_stormlash=0 -uniq_weapon_the_cranium_basher=0 -uniq_weapon_wizardspike=0 -uniq_rune_master=0 -uniq_gul_dagger=0 -uniq_hand_of_blessed_light=0 -uniq_heavens_light=0 -uniq_weapon_warshrike=0 -uniq_weapon_gimmershred=0 +uniq_weapon_ribcracker=1, ethereal +uniq_hand_of_blessed_light=1,, ethereal +uniq_heavens_light=1,, ethereal +uniq_rune_master=1, ethereal ;------------------------------; ;=== UNIQUE SORCERESS ORBS ====; ;------------------------------; + uniq_weapon_death_fathom=2 uniq_weapon_eschuta_temper=2 -uniq_weapon_the_oculus=0 +uniq_weapon_the_oculus=1 ;------------------------------; ;====== UNIQUE POLEARMS =======; ;------------------------------; -uniq_weapon_the_reaper_toll=1 -uniq_weapon_tomb_reaver=1 + +uniq_weapon_the_reaper_toll=1, ethereal +uniq_weapon_tomb_reaver=1, ethereal +uniq_weapon_bonehew=1, ethereal ;------------------------------; ;=== UNIQUE AMAZON WEAPONS ====; ;------------------------------; -uniq_weapon_thunderstroke=0 + +uniq_weapon_thunderstroke=0,, ethereal uniq_weapon_titan_revenge=1 uniq_weapon_windforce=2 uniq_weapon_lycanders_aim=0 @@ -973,7 +1107,221 @@ uniq_weapon_blood_ravens_charge=0 ;------------------------------; ;=== UNIQUE ASSASSIN WEAPONS ==; ;------------------------------; + uniq_shadow_killer=0 -uniq_bartucs_talons=0 +uniq_bartucs_talons=1 uniq_jade_talon=0 uniq_firelizards_talons=0 + +;==================================================================; +;<<<<<<<<<<<<<<<<<<<<<<<< RARE ETHEREALS >>>>>>>>>>>>>>>>>>>>>>>>>; +;==================================================================; + +;armors +rare_ancient_armor=0, ethereal +rare_archon_plate=0, ethereal +rare_breast_plate=0, ethereal +rare_boneweave=0, ethereal +rare_chain_mail=0, ethereal +rare_chaos_armor=0, ethereal +rare_cuirass=0, ethereal +rare_demonhide_armor=0, ethereal +rare_diamond_mail=0, ethereal +rare_dusk_shroud=0, ethereal +rare_embossed_plate=0, ethereal +rare_full_plate_mail=0, ethereal +rare_ghost_armor=0, ethereal +rare_gothic_plate=0, ethereal +rare_great_hauberk=0, ethereal +rare_field_plate=0, ethereal +rare_hard_leather_armor=0, ethereal +rare_kraken_shell=0, ethereal +rare_lacquered_plate=0, ethereal +rare_light_plate=0, ethereal +rare_linked_mail=0, ethereal +rare_leather_armor=0, ethereal +rare_loricated_mail=0, ethereal +rare_mage_plate=0, ethereal +rare_mesh_armor=0, ethereal +rare_ornate_plate=0, ethereal +rare_plate_mail=0, ethereal +rare_quilted_armor=0, ethereal +rare_sacred_armor=0, ethereal +rare_scale_mail=0, ethereal +rare_scarab_husk=0, ethereal +rare_ring_mail=0, ethereal +rare_russet_armor=0, ethereal +rare_hellforge_plate=0, ethereal +rare_serpentskin_armor=0, ethereal +rare_shadow_plate=0, ethereal +rare_sharktooth_armor=0, ethereal +rare_splint_mail=0, ethereal +rare_studded_leather=0, ethereal +rare_tigulated_mail=0, ethereal +rare_trellised_armor=0, ethereal +rare_wyrmhide=0, ethereal +rare_balrog_skin=0, ethereal +rare_templar_coat=0, ethereal +rare_wire_fleece=0, ethereal + +;axes +rare_ancient_axe=0, ethereal +rare_ettin_axe=0, ethereal +rare_axe=0, ethereal +rare_battle_axe=0, ethereal +rare_bearded_axe=0, ethereal +rare_berserker_axe=0, ethereal +rare_lochaber_axe=0, ethereal +rare_broad_axe=0, ethereal +rare_decapitator=0, ethereal +rare_double_axe=0, ethereal +rare_feral_axe=0, ethereal +rare_giant_axe=0, ethereal +rare_great_axe=0, ethereal +rare_hand_axe=0, ethereal +rare_military_axe=0, ethereal +rare_war_axe=0, ethereal +rare_twin_axe=0, ethereal +rare_champion_axe=0, ethereal +rare_cleaver=0, ethereal +rare_crowbill=0, ethereal +rare_glorious_axe=0, ethereal +rare_gothic_axe=0, ethereal +rare_hatchet=0, ethereal +rare_large_axe=0, ethereal +rare_military_pick=0, ethereal +rare_naga=0, ethereal +rare_silver_edged_axe=0, ethereal +rare_tabar=0, ethereal +rare_tomahawk=0, ethereal + +;swords +rare_ancient_sword=0, ethereal +rare_ataghan=0, ethereal +rare_balrog_blade=0, ethereal +rare_bastard_sword=0, ethereal +rare_battle_sword=0, ethereal +rare_broad_sword=0, ethereal +rare_champion_sword=0, ethereal +rare_claymore=0, ethereal +rare_colossus_blade=0, ethereal +rare_colossus_sword=0, ethereal +rare_conquest_sword=0, ethereal +rare_cutlass=0, ethereal +rare_dacian_falx=0, ethereal +rare_cryptic_sword=0, ethereal +rare_crystal_sword=0, ethereal +rare_dimensional_blade=0, ethereal +rare_elegant_blade=0, ethereal +rare_espandon=0, ethereal +rare_executioner_sword=0, ethereal +rare_falcata=0, ethereal +rare_falchion=0, ethereal +rare_flamberge=0, ethereal +rare_francisca=0, ethereal +rare_giant_sword=0, ethereal +rare_gladius=0, ethereal +rare_gothic_sword=0, ethereal +rare_great_sword=0, ethereal +rare_highland_blade=0, ethereal +rare_hydra_edge=0, ethereal +rare_legend_sword=0, ethereal +rare_long_sword=0, ethereal +rare_mythical_sword=0, ethereal +rare_phase_blade=0, ethereal +rare_rune_sword=0, ethereal +rare_sabre=0, ethereal +rare_scimitar=0, ethereal +rare_shamshir=0, ethereal +rare_short_sword=0, ethereal +rare_tulwar=0, ethereal +rare_tusk_sword=0, ethereal +rare_two_handed_sword=0, ethereal +rare_zweihander=0, ethereal +rare_war_sword=0, ethereal + +;polearm/spears +rare_bardiche=0, ethereal +rare_bec_de_corbin=0, ethereal +rare_bill=0, ethereal +rare_brandistock=0, ethereal +rare_ceremonial_spear=0, ethereall +rare_battle_scythe=0, ethereal +rare_colossus_voulge=0, ethereal +rare_giant_thresher=0, ethereal +rare_cryptic_axe=0, ethereal +rare_great_poleaxe=0, ethereal +rare_grim_scythe=0, ethereal +rare_halberd=0, ethereal +rare_hyperion_spear=0, ethereal +rare_lance=0, ethereal +rare_maiden_pike=0, ethereal +rare_maiden_spear=0, ethereal +rare_mancatcher=0, ethereal +rare_matriarchal_pike=0, ethereal +rare_partizan=0, ethereal +rare_spear=0, ethereal +rare_pike=0, ethereal +rare_poleaxe=0, ethereal +rare_scythe=0, ethereal +rare_spetum=0, ethereal +rare_stygian_pike=0, ethereal +rare_trident=0, ethereal +rare_thresher=0, ethereal +rare_voulge=0, ethereal +rare_war_fork=0, ethereal +rare_war_pike=0, ethereal +rare_war_scythe=0, ethereal +rare_war_spear=0, ethereal +rare_war_spike=0, ethereal +rare_yari=0, ethereal +rare_fuscina=0, ethereal + +;throwing +rare_balanced_knife=0, ethereal +rare_flying_axe=0, ethereal +rare_battle_dart=0, ethereal +rare_flying_knife=0, ethereal +rare_balanced_axe=0, ethereal +rare_great_pilum=0, ethereal +rare_glaive=0, ethereal +rare_ghost_glaive=0, ethereal +rare_ghost_spear=0, ethereal +rare_harpoon=0, ethereal +rare_hurlbat=0, ethereal +rare_pilum=0, ethereal +rare_simbilan=0, ethereal +rare_small_crescent=0, ethereal +rare_short_spear=0, ethereal +rare_spiculum=0, ethereal +rare_throwing_axe=0, ethereal +rare_throwing_knife=0, ethereal +rare_throwing_spear=0, ethereal +rare_war_dart=0, ethereal +rare_winged_axe=0, ethereal +rare_winged_harpoon=0, ethereal +rare_winged_knife=0, ethereal + +;mace/clubs/mauls +rare_club=0, ethereal +rare_cudgel=0, ethereal +rare_devil_star=0, ethereal +rare_battle_hammer=0, ethereal +rare_barbed_club=0, ethereal +rare_flanged_mace=0, ethereal +rare_great_maul=0, ethereal +rare_jagged_star=0, ethereal +rare_legendary_mallet=0, ethereal +rare_mace=0, ethereal +rare_martel_de_fer=0, ethereal +rare_maul=0, ethereal +rare_morning_star=0, ethereal +rare_ogre_axe=0, ethereal +rare_ogre_maul=0, ethereal +rare_reinforced_mace=0, ethereal +rare_spiked_club=0, ethereal +rare_thunder_maul=0, ethereal +rare_truncheon=0, ethereal +rare_tyrant_club=0, ethereal +rare_war_club=0, ethereal +rare_war_hammer=0, ethereal diff --git a/src/bot.py b/src/bot.py index 48d046d..b5f2239 100644 --- a/src/bot.py +++ b/src/bot.py @@ -54,7 +54,7 @@ class Bot: elif self._config.char["type"] == "trapsin": self._char: IChar = Trapsin(self._config.trapsin, self._config.char, self._screen, self._template_finder, self._ui_manager, self._pather) elif self._config.char["type"] == "barbarian": - self._char: IChar = Barbarian(self._config.barbarian, self._config.char, self._screen, self._template_finder, self._ui_manager, self._pather) + self._char: IChar = Barbarian(self._config.barbarian, self._config.char, self._screen, self._template_finder, self._ui_manager, self._pather) else: Logger.error(f'{self._config.char["type"]} is not supported! Closing down bot.') os._exit(1) @@ -181,7 +181,7 @@ class Bot: os._exit(1) else: Logger.info(f"Please Enter the region ip and hot ip on config to use") - + # Run /nopickup command to avoid picking up stuff on accident if not self._ran_no_pickup: self._ran_no_pickup = True diff --git a/src/config.py b/src/config.py index 2ecf7bb..d73f581 100644 --- a/src/config.py +++ b/src/config.py @@ -1,7 +1,17 @@ import configparser import numpy as np import os +import re +from dataclasses import dataclass +from logger import Logger +@dataclass +class ItemProps: + pickit_type: int = 0 + include: list[str] = None + exclude: list[str] = None + include_type: str = "OR" + exclude_type: str = "OR" class Config: def _select_val(self, section: str, key: str = None): @@ -113,7 +123,7 @@ class Config: self.trapsin = self._config["trapsin"] if "trapsin" in self._custom: self.trapsin.update(self._custom["trapsin"]) - + self.barbarian = self._config["barbarian"] if "barbarian" in self._custom: self.barbarian.update(self._custom["barbarian"]) @@ -127,8 +137,8 @@ class Config: self.items = {} for key in self._pickit_config["items"]: - self.items[key] = int(self._select_val("items", key)) - if self.items[key] and not os.path.exists(f"./assets/items/{key}.png") and self._print_warnings: + self.items[key] = self.parse_item_config_string(key) + if self.items[key].pickit_type and not os.path.exists(f"./assets/items/{key}.png") and self._print_warnings: print(f"Warning: You activated {key} in pickit, but there is no img available in assets/items") self.colors = {} @@ -156,6 +166,28 @@ class Config: "melee_min_score": int(self._select_val("claws", "melee_min_score")), } + def parse_item_config_string(self, key: str = None) -> ItemProps: + item_props = ItemProps() + # split string by commas NOT contained within parentheses + item_string_as_list = re.split(r',\s*(?![^()]*\))', self._select_val("items", key).upper()) + trim_strs=["AND(", "OR(", "(", ")", " "] + clean_string = [re.sub(r'|'.join(map(re.escape, trim_strs)), '', x).strip() for x in item_string_as_list] + item_props.pickit_type = int(clean_string[0]) + try: + item_props.include = clean_string[1].split(',') if clean_string[1] else None + item_props.include_type = "AND" if "AND" in item_string_as_list[1] else "OR" + except IndexError as error: + pass + except Exception as exception: + Logger.error(f"Item parsing error: {exception}") + try: + item_props.exclude = clean_string[2].split(',') if clean_string[2] else None + item_props.exclude_type = "AND" if "AND" in item_string_as_list[2] else "OR" + except IndexError as error: + pass + except Exception as exception: + Logger.error(f"Item parsing error: {exception}") + return item_props if __name__ == "__main__": config = Config(print_warnings=True) diff --git a/src/item/item_finder.py b/src/item/item_finder.py index 1a603f0..0a85d04 100644 --- a/src/item/item_finder.py +++ b/src/item/item_finder.py @@ -52,7 +52,7 @@ class ItemFinder: blacklist_item = item_name.startswith("bl__") # these items will be searched for regardless of pickit setting (e.g. for runes to avoid mixup) force_search = item_name.startswith("rune_") - if blacklist_item or ((item_name in config.items and config.items[item_name]) or force_search): + if blacklist_item or ((item_name in config.items and config.items[item_name].pickit_type) or force_search): data = cv2.imread(f"assets/{self._folder_name}/" + filename) filtered_template = np.zeros(data.shape, np.uint8) for key in self._template_color_ranges: @@ -120,7 +120,7 @@ class ItemFinder: item.roi = [max_loc[0] + x, max_loc[1] + y, template.data.shape[1], template.data.shape[0]] center_abs = (item.center[0] - (inp_img.shape[1] // 2), item.center[1] - (inp_img.shape[0] // 2)) item.dist = math.dist(center_abs, (0, 0)) - if item is not None and self._items_to_pick[item.name]: + if item is not None and self._items_to_pick[item.name].pickit_type: item_list.append(item) elapsed = time.time() - start # print(f"Item Search: {elapsed}") diff --git a/src/item/pickit.py b/src/item/pickit.py index 719165d..6730b9b 100644 --- a/src/item/pickit.py +++ b/src/item/pickit.py @@ -130,7 +130,7 @@ class PickIt: # send log to discord if found_items and closest_item.name not in picked_up_items: Logger.info(f"Picking up: {closest_item.name} ({closest_item.score*100:.1f}% confidence)") - self._game_stats.log_item_pickup(closest_item.name, self._config.items[closest_item.name] == 2) + self._game_stats.log_item_pickup(closest_item.name, self._config.items[closest_item.name].pickit_type == 2) picked_up_items.append(closest_item.name) else: char.pre_move() diff --git a/src/messenger.py b/src/messenger.py index 9bbe52c..066f2a3 100644 --- a/src/messenger.py +++ b/src/messenger.py @@ -18,7 +18,7 @@ class Messenger: elif " uniq_" in msg or "rare" in msg: # TODO: It is more gold than yellow, find a better yellow highlight msg = f"```fix\\n- {msg} \\n```" - elif " eth_" in msg: + elif " gray_" in msg: msg = f"```python\\n# {msg} \\n```" else: msg = f"```\\n{msg} \\n```" diff --git a/src/template_finder.py b/src/template_finder.py index 0699e12..642d90f 100644 --- a/src/template_finder.py +++ b/src/template_finder.py @@ -22,7 +22,7 @@ class TemplateFinder: Loads images from assets/templates and assets/npc and provides search functions to find these assets within another image """ - def __init__(self, screen: Screen, template_pathes: list[str] = ["assets\\templates", "assets\\npc"]): + def __init__(self, screen: Screen, template_pathes: list[str] = ["assets\\templates", "assets\\npc", "assets\\item_properties"]): self._screen = screen self._config = Config() self.last_res = None diff --git a/src/ui/ui_manager.py b/src/ui/ui_manager.py index 7bb488f..f9049d8 100644 --- a/src/ui/ui_manager.py +++ b/src/ui/ui_manager.py @@ -271,10 +271,66 @@ class UiManager(): wait(0.2, 0.3) _, w, _ = img.shape img = img[:, (w//2):,:] - item_list = item_finder.search(img) - item_list = [x for x in item_list if "potion" not in x.name and not \ - (self._config.items[x.name] == 3 and not self._template_finder.search("ETHEREAL", img).valid)] - return len(item_list) > 0 + original_list = item_finder.search(img) + filtered_list = [] + for x in original_list: + if ("potion" in x.name) or (self._config.items[x.name].pickit_type == 0): continue + include_props = self._config.items[x.name].include + exclude_props = self._config.items[x.name].exclude + if not (include_props or exclude_props): + Logger.debug(f"{x.name}: Stashing") + filtered_list.append(x) + continue + include = True + include_logic_type = self._config.items[x.name].include_type + if include_props: + include = False + found_props=[] + for prop in include_props: + try: + template_match = self._template_finder.search(prop, img, threshold=0.95) + except: + Logger.error(f"{x.name}: can't find template file for required {prop}, ignore just in case") + template_match = lambda: None; template_match.valid = True + if template_match.valid: + if include_logic_type == "AND": + found_props.append(True) + else: + include = True + break + else: + found_props.append(False) + if include_logic_type == "AND" and len(found_props) > 0 and all(found_props): + include = True + if not include: + Logger.debug(f"{x.name}: Discarding. Required {include_logic_type}({include_props})={include}") + continue + exclude = False + exclude_logic_type = self._config.items[x.name].exclude_type + if exclude_props: + found_props=[] + for prop in exclude_props: + try: + template_match = self._template_finder.search(prop, img, threshold=0.97) + except: + Logger.error(f"{x.name}: can't find template file for exclusion {prop}, ignore just in case") + template_match = lambda: None; template_match.valid = False + if template_match.valid: + if exclude_logic_type == "AND": + found_props.append(True) + else: + exclude = True + break + else: + found_props.append(False) + if exclude_logic_type == "AND" and len(exclude_props) > 0 and all(found_props): + exclude = True + break + if include and not exclude: + Logger.debug(f"{x.name}: Stashing. Required {include_logic_type}({include_props})={include}, exclude {exclude_logic_type}({exclude_props})={exclude}") + filtered_list.append(x) + + return len(filtered_list) > 0 def _move_to_stash_tab(self, stash_idx: int): """Move to a specifc tab in the stash