From 7d872a8741f5105308fdfe6c7f2959c29558228c Mon Sep 17 00:00:00 2001
From: Joshua Sigona <sigonasr2@gmail.com>
Date: Wed, 18 Aug 2021 19:17:32 +0900
Subject: [PATCH] Fix skill tree alignment coordinate display

---
 src/TestPanel.js                 | 16 ++++++++++------
 src/skilltree/skillTreeEditor.js | 11 +++++++++++
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/TestPanel.js b/src/TestPanel.js
index 93d6f0a..a512534 100644
--- a/src/TestPanel.js
+++ b/src/TestPanel.js
@@ -173,16 +173,20 @@ function GetSpecialWeaponName(item) {
   return item[WEAPON_EXISTENCE_DATA]!==undefined?(item[WEAPON_EXISTENCE_DATA].special_name?.length>0)?item[WEAPON_EXISTENCE_DATA].special_name:(item[WEAPON_WEAPON].name+" "+item[WEAPON_WEAPONTYPE].name):""
 }
 
-function SkillTreeBoxes(p) {
+function ConvertCoordinate(x,y) {
+    return (String.fromCharCode(Number(x)+'a'.charCodeAt(0)))+(y+1);
+}
 
-  function ConvertCoordinate(x,y) {
-      return (x+'a')+(y+1);
-  }
+function SkillBox(p) {
+    return <div style={{ gridArea: ConvertCoordinate(Number(p.skill[0]),Number(p.skill[1])) }}><img className="skillIcon" alt="" src="./icons/class_skills/ra/Bad_Condition_Ward.png" /><span className="skillAllocated">0/10</span><em className="skillName">{typeof p.GetData("class_skill",p.skill[2],"name",true)==="string"&&p.GetData("class_skill",p.skill[2],"name",true)}</em><div className="skillButtons"><LeftButton /><RightButton /></div></div>
+}
+
+function SkillTreeBoxes(p) {
 
   return <>
     {p.skillTreeSkillData&&p.skillTreeSkillData.map((skill)=>{
       var splitter = skill.split(",")
-      return <div style={{ gridArea: ConvertCoordinate(Number(splitter[0]),Number(splitter[1])) }}><img className="skillIcon" alt="" src="./icons/class_skills/ra/Bad_Condition_Ward.png" /><span className="skillAllocated">0/10</span><em className="skillName">Bad Condition Ward</em><div className="skillButtons"><LeftButton /><RightButton /></div></div>
+      return splitter[0]!==""&&splitter[1]!==""&&splitter[2]!==""&&<SkillBox GetData={p.GetData} skill={splitter.map((numb)=>Number(numb))}/>
     })}
     {/*<div className="skillActive" style={{ gridArea: "a1" }}><img className="skillIcon" alt="" src="./icons/class_skills/ra/Blight_Rounds.png" /><span className="skillAllocated">1/5</span><em className="skillName">Blight Rounds</em><div className="skillButtons"><LeftButton /><RightButton /></div></div>
     <div className="skillMaxed" style={{ gridArea: "a2" }}><span className="skillTreeReqUnlock">&nbsp;</span><img className="skillIcon" alt="" src="./icons/class_skills/ra/Blight_Rounds_Reinforce.png" /><span className="skillAllocated">1/1</span><em className="skillName">Blight Rounds Reinforce</em><div className="skillButtons"><LeftButton /><RightButton /></div></div>
@@ -590,7 +594,7 @@ AUGMENT
                   skillLines={skillTreeData} halflineheight={halflineheight}
                 />}
                 <div className="skillTreeGrid">
-                  <SkillTreeBoxes skillTreeSkillData={skillTreeSkillData}/>
+                  <SkillTreeBoxes GetData={p.GetData} skillTreeSkillData={skillTreeSkillData}/>
                 </div>
               </div>
             </div></> : <></>}
diff --git a/src/skilltree/skillTreeEditor.js b/src/skilltree/skillTreeEditor.js
index 84f08b4..2cabfcb 100644
--- a/src/skilltree/skillTreeEditor.js
+++ b/src/skilltree/skillTreeEditor.js
@@ -131,7 +131,18 @@ function SkillTreeEditor(p) {
                     controls.push(<SkillTreeSelector GetData={p.GetData} cl={Number(cl)} defaultValue={skillLines[y][x]} callback={(char,x,y)=>{
                             var string = [...skillLines]
                             var stringLine = string[y].split('')
+                            var newSkillData = [...skillData]
                             stringLine[x] = char
+                            if (char!=="□") {
+                                for (var s in newSkillData) {
+                                    var split = newSkillData[s].split(',')
+                                    if (Number(split[0])===Number(x)&&Number(split[1])===Number(y)) {
+                                        newSkillData[s]=""
+                                        setSkillData(newSkillData)
+                                        break;
+                                    }
+                                }
+                            }
                             string[y] = stringLine.join('')
                             setSkillLines(string)
                         }