From b42b48ad0b818ab614f36e4f1c881d9139b112b1 Mon Sep 17 00:00:00 2001 From: Joshua Sigona Date: Wed, 11 Aug 2021 00:09:14 +0900 Subject: [PATCH] Armor Panel done --- src/DEFAULTS.js | 2 +- src/TestPanel.js | 44 +++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/src/DEFAULTS.js b/src/DEFAULTS.js index c54589b..aee0955 100644 --- a/src/DEFAULTS.js +++ b/src/DEFAULTS.js @@ -1,7 +1,7 @@ const NICONICONII = process.env.PUBLIC_URL+"/icons/nicodotpng.png.png" function DisplayIcon(icon) { - console.log(icon) + //console.log(icon) return icon?process.env.PUBLIC_URL+icon:NICONICONII } diff --git a/src/TestPanel.js b/src/TestPanel.js index afc9220..28232a9 100644 --- a/src/TestPanel.js +++ b/src/TestPanel.js @@ -195,11 +195,16 @@ const [statPage,setStatPage] = useState(1) const [classSelectWindowOpen,setClassSelectWindowOpen] = useState(false) const [weaponSelectWindowOpen,setWeaponSelectWindowOpen] = useState(false) +const [armorSelectWindowOpen,setArmorSelectWindowOpen] = useState(false) //Helper variables for Weapon selector with structure: [weapon_type,weapon,potential,potential_tooltip,weapon_existence_data] const WEAPON_WEAPONTYPE=0;const WEAPON_WEAPON=1;const WEAPON_POTENTIAL=2;const WEAPON_POTENTIAL_TOOLTIP=3;const WEAPON_EXISTENCE_DATA=4; const [selectedWeapon,setSelectedWeapon] = useState([]) +const [selectedArmor1,setSelectedArmor1] = useState([]) +const [selectedArmor2,setSelectedArmor2] = useState([]) +const [selectedArmor3,setSelectedArmor3] = useState([]) +const [armorSlotSelection,setArmorSlotSelection] = useState(1) useEffect(()=>{ if (p.bp>1000) { @@ -291,9 +296,9 @@ useEffect(()=>{

Equip

{setWeaponSelectWindowOpen(true)}} className="equipPaletteSlot">

Weapons

1
-

Armor 1

-

Armor 2

-

Armor 3

+
{setArmorSlotSelection(1);setArmorSelectWindowOpen(true)}} className="equipPaletteSlot">

Armor 1

+
{setArmorSlotSelection(2);setArmorSelectWindowOpen(true)}} className="equipPaletteSlot">

Armor 2

+
{setArmorSlotSelection(3);setArmorSelectWindowOpen(true)}} className="equipPaletteSlot">

Armor 3

@@ -543,6 +548,39 @@ useEffect(()=>{ {item[WEAPON_POTENTIAL].name} }} /> + +{ + var dat1=p.GetData("armor") + return typeof dat1==="object"&&dat1!==null?Object.keys(dat1).map((armor)=>{ + return dat1[armor] + }):[] + }} + filterFunction={(page,item)=>true} + searchFieldFunction={(searchText,item)=>searchText.length>0?item.name.toLowerCase().includes(searchText.toLowerCase()):true} + sortOrderFunction={(sort,itemA,itemB)=>{ + switch (sort) { + case "Rarity":return itemB.rarity-itemA.rarity + case "HP":return itemB.hp-itemA.hp + case "PP":return itemB.pp-itemA.pp + case "Melee Potency":return itemB.mel_dmg-itemA.mel_dmg + case "Range Potency":return itemB.rng_dmg-itemA.rng_dmg + case "Tech Potency":return itemB.tec_dmg-itemA.tec_dmg + default:return 0 + } + }} + displayFunction={(item)=>{ + return
  • { + switch(armorSlotSelection) { + case 1:{setSelectedArmor1(item)}break; + case 2:{setSelectedArmor2(item)}break; + case 3:{setSelectedArmor3(item)}break; + } + setArmorSelectWindowOpen(false)}}>
    {item.name}

    {item.def}
  • }} + /> )