diff --git a/src/App.js b/src/App.js index 2a6f97c..74a573a 100644 --- a/src/App.js +++ b/src/App.js @@ -94,27 +94,27 @@ function EditableBox(p) { } const CLASSES = { - HUNTER:{ + Hunter:{ name:"Hunter", icon:process.env.PUBLIC_URL+"/icons/UINGSClassHu.png" }, - FIGHTER:{ + Fighter:{ name:"Fighter", icon:process.env.PUBLIC_URL+"/icons/UINGSClassFi.png" }, - RANGER:{ + Ranger:{ name:"Ranger", icon:process.env.PUBLIC_URL+"/icons/UINGSClassRa.png" }, - GUNNER:{ + Gunner:{ name:"Gunner", icon:process.env.PUBLIC_URL+"/icons/UINGSClassGu.png" }, - FORCE:{ + Force:{ name:"Force", icon:process.env.PUBLIC_URL+"/icons/UINGSClassFo.png" }, - TECHTER:{ + Techter:{ name:"Techter", icon:process.env.PUBLIC_URL+"/icons/UINGSClassTe.png" } @@ -561,14 +561,29 @@ function TableEditor(p) { function DatabaseEditor(p) { const [loading,setLoading] = useState(false) + const [message,setMessage] = useState() return <> {!loading?<> -

+





: } + {message} } @@ -755,11 +770,11 @@ function DamageCalculator(p) { const [weaponTotalAtk,setWeaponTotalAtk] = useState(100) const [weaponBaseAtk,setWeaponBaseAtk] = useState(1) - const [weaponEnhanceLvl,setWeaponEnhanceLvl] = useState(1) + const [weaponEnhanceLv,setweaponEnhanceLv] = useState(1) useEffect(()=>{ - setWeaponTotalAtk(Number(weaponBaseAtk)+Number(weaponEnhanceLvl)) - },[weaponBaseAtk,weaponEnhanceLvl]) + setWeaponTotalAtk(Number(weaponBaseAtk)+Number(weaponEnhanceLv)) + },[weaponBaseAtk,weaponEnhanceLv]) const [dmgVariance,setDmgVariance] = useState(1) @@ -809,7 +824,7 @@ function DamageCalculator(p) { Weapon Total Atk:{setWeaponTotalAtk(val)}}/>


Damage Variance:{setDmgVariance(val)}}/> @@ -857,6 +872,9 @@ function App() { const [buildName,setBuildName] = useState("Fatimah") const [className,setClassName] = useState("Ranger") const [secondaryClassName,setSecondaryClassName] = useState("Force") + const [classLv,setClassLv] = useState(20) + const [secondaryClassLv,setSecondaryClassLv] = useState(15) + const [bp,setBP] = useState(1330) const [hp,setHP] = useState(388) @@ -944,7 +962,9 @@ function App() { author={author} buildName={buildName} className={className} - secondaryClassName={secondaryClassName} + secondaryClassName={secondaryClassName} + classLv={classLv} + secondaryClassLv={secondaryClassLv} bp={bp} hp={hp} pp={pp} diff --git a/src/TestPanel.js b/src/TestPanel.js index 3dcecfc..3aa47a8 100644 --- a/src/TestPanel.js +++ b/src/TestPanel.js @@ -43,7 +43,7 @@ useEffect(()=>{ } },[p.bp]) -console.log(p.GetData("class",p.className,"icon")) +//console.log(p.GetData("class",p.className,"icon")) return ( //Futasuke is a genius
@@ -66,12 +66,12 @@ console.log(p.GetData("class",p.className,"icon")) Class - {p.className}
- Force + {p.className}
+ {p.secondaryClassName} - Lv.20
- Lv.15 + Lv.{p.classLv}
+ Lv.{p.secondaryClassLv} @@ -168,43 +168,46 @@ console.log(p.GetData("class",p.className,"icon")) 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)}% +  +{(p.weaponUp1*100).toFixed(1)}%
+  +{(p.weaponUp3*100).toFixed(1)}% +  +{(p.weaponUp2*100).toFixed(1)}% +   Ailment Resist. {p.damageResist}   +   Damage Resist. {p.damageResist}   +  
diff --git a/src/style.css b/src/style.css index 60cd5fd..326432c 100644 --- a/src/style.css +++ b/src/style.css @@ -196,30 +196,17 @@ em { } .statsInfo { table-layout:fixed; + width: 100%; + line-height: 23px; } .statsInfo td:nth-child(2) { text-align: right; } -.statsInfo td:last-child { - min-width: 55%; +.statsInfo td:nth-child(3) { + width: 50%; } .statsInfo span { -} -.statsMelWeaponUp:before { - content: url("./icons/mel.png"); - margin-right: 5px; - vertical-align: middle; -} -.statsRngWeaponUp:before { - content: url("./icons/rng.png"); - margin-right: 5px; - vertical-align: middle; -} -.statsTecWeaponUp:before { - content: url("./icons/tec.png"); - margin-right: 5px; - vertical-align: middle; } .boxTitleBar { /* background-color: #495a61; */ @@ -273,6 +260,9 @@ em { .da span:hover { background: linear-gradient(45deg,rgba(76,113,126,0.66),rgba(113,169,189,00.66)); } +.basicInfo { + line-height: 23px; +} .basicInfo tr:hover { background: linear-gradient(45deg,rgba(76,113,126,0.66),rgba(113,169,189,00.66)); }