diff --git a/public/icons/status/blind.png b/public/icons/status/blind.png new file mode 100644 index 0000000..1e0beb0 Binary files /dev/null and b/public/icons/status/blind.png differ diff --git a/public/icons/status/burn.png b/public/icons/status/burn.png new file mode 100644 index 0000000..6e7402c Binary files /dev/null and b/public/icons/status/burn.png differ diff --git a/public/icons/status/freeze.png b/public/icons/status/freeze.png new file mode 100644 index 0000000..e272e23 Binary files /dev/null and b/public/icons/status/freeze.png differ diff --git a/public/icons/status/panic.png b/public/icons/status/panic.png new file mode 100644 index 0000000..951ff70 Binary files /dev/null and b/public/icons/status/panic.png differ diff --git a/public/icons/status/poison.png b/public/icons/status/poison.png new file mode 100644 index 0000000..ba5d01a Binary files /dev/null and b/public/icons/status/poison.png differ diff --git a/public/icons/status/shock.png b/public/icons/status/shock.png new file mode 100644 index 0000000..86ae31e Binary files /dev/null and b/public/icons/status/shock.png differ diff --git a/public/icons/status/stun.png b/public/icons/status/stun.png new file mode 100644 index 0000000..daad187 Binary files /dev/null and b/public/icons/status/stun.png differ diff --git a/src/App.js b/src/App.js index 39a878a..4fd5bb5 100644 --- a/src/App.js +++ b/src/App.js @@ -965,6 +965,13 @@ function App() { const [weaponUp2,setWeaponUp2] = useState(0.241) const [weaponUp3,setWeaponUp3] = useState(0.241) const [damageResist,setDamageResist] = useState(0.18) + const [burnResist,setburnResist] = useState(0) + const [shockResist,setshockResist] = useState(0) + const [panicResist,setpanicResist] = useState(0) + const [stunResist,setstunResist] = useState(0) + const [freezeResist,setfreezeResist] = useState(0) + const [blindResist,setblindResist] = useState(0) + const [poisonResist,setpoisonResist] = useState(0) const [effectList,setEffectList] = useState([ "Food Boost Effect", @@ -1051,7 +1058,14 @@ function App() { weaponUp1={weaponUp1} weaponUp2={weaponUp2} weaponUp3={weaponUp3} - damageResist={damageResist} + damageResist={damageResist} + burnResist={burnResist} + shockResist={shockResist} + panicResist={panicResist} + stunResist={stunResist} + freezeResist={freezeResist} + blindResist={blindResist} + poisonResist={poisonResist} statDisplayAtk={statDisplayAtk} GetData={GetData} /> diff --git a/src/TestPanel.js b/src/TestPanel.js index 44157db..33d93a2 100644 --- a/src/TestPanel.js +++ b/src/TestPanel.js @@ -213,230 +213,216 @@ useEffect(()=>{ return (<>
-
-
-
-

Basic Information

+
+
+
+

Basic Information

- - - - - - - - - - - - - - - - - - - -
Author
Build Name
{setClassSelectWindowOpen(true)}} >Class - - - -
Sub-Class - - - -
-
-
-
-

Current Effects

- -

Effect Name

-
    - { - effectPage===1?<>
  • Food Boost Effect -
      -
    •  [Meat] Potency +10.0%
      • -
    •  [Crisp] Potency to Weak Point +5.0%
      • -
    -
    • -
  • Shifta / Deband -
      -
    •  Potency +5.0%
      • -
    •  Damage Resistance +10.0%
      • -
    -
    • -
  • Region Mag Boost -
      -
    •  Potency +5.0%
      • + + + + + + + + + + + + + + + + + + + +
      Author
      Build Name
      {setClassSelectWindowOpen(true)}} >Class + + + +
      Sub-Class + + + +
      +
+
+
+

Current Effects

+ +

Effect Name

+
    + { + effectPage===1?<>
  • Food Boost Effect +
      +
    •  [Meat] Potency +10.0%
      • +
    •  [Crisp] Potency to Weak Point +5.0%
      • +
    +
    • +
  • Shifta / Deband +
      +
    •  Potency +5.0%
      • +
    •  Damage Resistance +10.0%
      • +
    +
    • +
  • Region Mag Boost +
      +
    •  Potency +5.0%
      • +
    +
    • :<> + }
- :<> - } - -
-
-
-
-
-

Equip

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

Weapons

1
-

Armor 1

-

Armor 2

-

Armor 3

-
-
-
-
-

Equipped Weapon

-

Resurgir Rifle+40

- -
-
-

Abilitiy Details

-{weaponPage===1? -
    -
  • } tooltip={<>Potency +20%/
    Critical Hit Rage +15% for 30 seconds after a successful sidestep}/>Dynamo Unit Lv.3
    • -
  • } tooltip={<>Potency +4%}/>Fixa Attack Lv.3
    • -
  • } tooltip={<>PP +5
    Ranged Weapon Potency +2.0%}/>Pettas Soul II
    • -
  • } tooltip={<>HP -10, Potency +1.5%,
    Potency Floor Increase +1.5%
    Damage Resistance -1.5%}/>Alts Secreta II
    • -
  • } tooltip={<>HP +10
    Ranged Weapon Potency +2.0%}/>Gigas Precision II
    • -
  • } tooltip={<>Ranged Weapon Potency +2.0%}/>Precision III
    • -
    • -
-: -
    -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
-} -
-
-

Properties

-{weaponPage===1? -
    -
  • Enhancement Lv. +35
    • -
  • Multi-Weapon -
    • -
  • Element -
    • -
: -
    -
  • Enhancement Lv. -
    • -
  • Multi-Weapon -
    • -
  • Element -
    • -
-} -
-
-
-
-
-
-
-

Basic Stats

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Battle Power{p.bp}
 
HP{p.hp}
 
PP{p.pp}
 
Attack{p.statDisplayAtk}
 
Defense{p.def}
 
Weapon Up +{(p.weaponUp1*100).toFixed(1)}%
-  +{(p.weaponUp3*100).toFixed(1)}%		 +{(p.weaponUp2*100).toFixed(1)}% 
Ailment Resist.{p.damageResist}  
Damage Resist.{p.damageResist}  
-
-
-
-

Damage Stats

- - - {statPage===1?<> - - - - - - - - - - - - - - - - - - - - - :<> - - - - - - - - - - - - - - - - - - - - - - } -
Critical Hit Rate5%
Critical Multiplier120%
Midrange126
Critcal152
Effective127
Critical Hit Rate-
Critical Multiplier-
Midrange-
Critcal-
Effective-
-
-
+
+
+
+
+
+

Equip

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

Weapons

1
+

Armor 1

+

Armor 2

+

Armor 3

+
+
+ +
+
+

Equipped Weapon

+

Resurgir Rifle+40

+ +
+
+ {weaponPage===1? +
    +
  • } tooltip={<>Potency +20%/
    Critical Hit Rage +15% for 30 seconds after a successful sidestep}/>Dynamo Unit Lv.3
    • +
  • } tooltip={<>Potency +4%}/>Fixa Attack Lv.3
    • +
  • } tooltip={<>PP +5
    Ranged Weapon Potency +2.0%}/>Pettas Soul II
    • +
  • } tooltip={<>HP -10, Potency +1.5%,
    Potency Floor Increase +1.5%
    Damage Resistance -1.5%}/>Alts Secreta II
    • +
  • } tooltip={<>HP +10
    Ranged Weapon Potency +2.0%}/>Gigas Precision II
    • +
  • } tooltip={<>Ranged Weapon Potency +2.0%}/>Precision III
    • +
    • +
+ : + <>hi + } +
+
+
+
+
+
+
+

Basic Stats

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Battle Power{p.bp}
 
HP{p.hp}
 
PP{p.pp}
 
Attack{p.statDisplayAtk}
 
Defense{p.def}
 
Weapon Up +{(p.weaponUp1*100).toFixed(1)}%
+  +{(p.weaponUp3*100).toFixed(1)}%		 +{(p.weaponUp2*100).toFixed(1)}% 
Ailment Resist. + {(p.burnResist*100).toFixed(1)}%
+ {(p.shockResist*100).toFixed(1)}%
+ {(p.panicResist*100).toFixed(1)}%
+ {(p.stunResist*100).toFixed(1)}%
+ 		+ {(p.freezeResist*100).toFixed(1)}%
+ {(p.blindResist*100).toFixed(1)}%
+ {(p.poisonResist*100).toFixed(1)}%
+ 		 
Damage Resist.{(p.damageResist*100).toFixed(1)}%  
+
+
+
+

Damage Stats

+ + + {statPage===1?<> + + + + + + + + + + + + + + + + + + + + + :<> + + + + + + + + + + + + + + + + + + + + + + } +
Critical Hit Rate5%
Critical Multiplier120%
Midrange126
Critcal152
Effective127
Critical Hit Rate-
Critical Multiplier-
Midrange-
Critcal-
Effective-
+
+
ez pz @@ -451,7 +437,14 @@ useEffect(()=>{ var weapon_type=p.GetData("weapon_type",we.weapon_type_id,undefined,true) var weapon=p.GetData("weapon",we.weapon_id,undefined,true) var potential=p.GetData("potential",weapon.potential_id,undefined,true) - return [weapon_type,weapon,potential] + var potential_all=p.GetData("potential_data") + var potential_tooltip=[] + for (var pot in potential_all) { + if (pot.includes(potential.name)) { + potential_tooltip.push(p.GetData("potential_data",pot)) + } + } + return [weapon_type,weapon,potential,potential_tooltip] }):[] }} filterFunction={(page,item)=>{ @@ -471,7 +464,9 @@ useEffect(()=>{ default:return 0 } }} - displayFunction={(item)=>
  • {item[1].name} {item[0].name}
    {item[1].atk} {item[2].name}Lv.4: Potency +24%/
    20% chance of Restasigne not being consumed on use. Effect starts 10 sec after equip
    • } + displayFunction={(item)=>{ + return
  • {item[1].name} {item[0].name}
    {item[1].atk} {item[2].name} {item[3].map((pot,i)=><>{(i!==0)&&
    }{pot.name}: {pot.description.replace("\\n","\n")})}
    • }} + /> diff --git a/src/style.css b/src/style.css index 4bac3e1..4c3c537 100644 --- a/src/style.css +++ b/src/style.css @@ -970,37 +970,30 @@ button{ background: linear-gradient(rgba(0,0,0,0.5),rgba(0,0,0,0.8)); display: grid; justify-items: stretch; - justify-content: stretch; + align-items: center; grid-template-columns: minmax(10px, 1fr) minmax(200px, 580px) minmax(10px, 1fr); grid-template-rows: 10px minmax(0, 1fr) 10px; - animation: fadeIn 0.15s; } - @keyframes fadeIn { - 0% {opacity:0;top:-30px;} - 100% {opacity:1;top:0;} - } .modal { outline: 0; grid-column: 2; grid-row: 2; + } .boxModal { + animation: fadeIn 0.15s; max-width: 580px; margin: 0 auto; box-shadow: 0 10px 16px 0 rgba(0,0,0,0.5), 0 6px 20px 0 rgba(0,0,0,0.5) !important; outline: 1px solid rgba(54,255,255,1); } +@keyframes fadeIn { + 0% {opacity:0;margin-bottom:30px;} + 100% {opacity:1;margin-bottom:0;} + } .boxModal .boxTitleBar { background: linear-gradient(45deg, rgba(47,153,193,1),rgba(46,94,137,1) 30%,rgba(46,94,137,1) 70%, rgba(47,153,193,1)); } -/* box hover, save bcuz i will use this in popup menu -.box:hover { - outline: 1px solid rgba(54,255,255,1); -} -.box:hover .boxTitleBar { - background: linear-gradient(45deg, rgba(47,153,193,1),rgba(46,94,137,1) 30%,rgba(46,94,137,1) 70%, rgba(47,153,193,1)); -} -*/ .modalItemListContainer { overflow-y: auto; overflow-x: hidden;