From 1363c8c83584c6beef83ac2a4609312e45f68d98 Mon Sep 17 00:00:00 2001 From: Joshua Sigona Date: Mon, 9 Aug 2021 21:02:22 +0900 Subject: [PATCH] Add stuff Co-authored-by: dudleycu --- public/icons/status/blind.png | Bin 0 -> 853 bytes public/icons/status/burn.png | Bin 0 -> 807 bytes public/icons/status/freeze.png | Bin 0 -> 784 bytes public/icons/status/panic.png | Bin 0 -> 791 bytes public/icons/status/poison.png | Bin 0 -> 824 bytes public/icons/status/shock.png | Bin 0 -> 756 bytes public/icons/status/stun.png | Bin 0 -> 805 bytes src/App.js | 16 +- src/TestPanel.js | 443 ++++++++++++++++----------------- src/style.css | 21 +- 10 files changed, 241 insertions(+), 239 deletions(-) create mode 100644 public/icons/status/blind.png create mode 100644 public/icons/status/burn.png create mode 100644 public/icons/status/freeze.png create mode 100644 public/icons/status/panic.png create mode 100644 public/icons/status/poison.png create mode 100644 public/icons/status/shock.png create mode 100644 public/icons/status/stun.png diff --git a/public/icons/status/blind.png b/public/icons/status/blind.png new file mode 100644 index 0000000000000000000000000000000000000000..1e0beb05fe9f7ba013557f21d20224e887b99ce7 GIT binary patch literal 853 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 literal 0 HcmV?d00001 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;