diff --git a/Status.java b/Status.java index 90e8c60..b719bb1 100644 --- a/Status.java +++ b/Status.java @@ -1,31 +1,88 @@ package org.poopki.duckdns.user_db; public class Status { - int m_HP; - int m_MP; - int m_Level; + int m_BASE_HP; + int m_BASE_MP; + int m_BASE_STR; + int m_BASE_DEX; + int m_BASE_INT; + int m_BASE_LUK; + + int m_BASE_PATK; + int m_BASE_PDEF; + int m_BASE_MATK; + int m_BASE_MDEF; + + int m_EQ_HP; + int m_EQ_MP; - int m_STR; - int m_DEX; - int m_INT; - int m_LUK; + int m_EQ_STR; + int m_EQ_DEX; + int m_EQ_INT; + int m_EQ_LUK; - int m_PATK; - int m_PDEF; - int m_MATK; - int m_MDEF; + int m_EQ_PATK; + int m_EQ_PDEF; + int m_EQ_MATK; + int m_EQ_MDEF; + + int m_EXP; + int m_MAX_EXP; + int m_Level; //방어율 = (방어력 / (100 + 방어력) //Add Equipment Class instance public Status(int HP, int MP, int Level, int STR, int DEX, int INT, int LUK){ - m_HP = HP; - m_MP = MP; + m_BASE_HP = HP; + m_BASE_MP = MP; m_Level = Level; - m_STR = STR; - m_DEX = DEX; - m_INT = INT; - m_LUK = LUK; + m_BASE_STR = STR; + m_BASE_DEX = DEX; + m_BASE_INT = INT; + m_BASE_LUK = LUK; } - public int GetHP(){return m_HP;} + public int GetBaseHP(){return m_BASE_HP;} + public int GetBaseMP(){return m_BASE_MP;} + public int GetBaseSTR(){return m_BASE_STR;} + public int GetBaseDEX(){return m_BASE_DEX;} + public int GetBaseINT(){return m_BASE_INT;} + public int GetBaseLUK(){return m_BASE_LUK;} + public int GetEXP(){return m_EXP;} + public int GetMaxEXP(){return m_MAX_EXP;} + public int GetLevel(){return m_Level;} + + public int SetBaseHP(HP){m_BASE_HP=HP;} + public int SetBaseMP(MP){m_BASE_MP=MP;} + public int SetBaseSTR(STR){m_BASE_STR=STR;} + public int SetBaseDEX(DEX){m_BASE_DEX=DEX;} + public int SetBaseINT(INT){m_BASE_INT=INT;} + public int SetBaseLUK(LUK){m_BASE_LUK=LUK;} + public int SetEXP(EXP){m_EXP=EXP;} + public int SetMaxEXP(EXP){m_MAX_EXP=EXP;} + public int SetLevel(Level){m_Level=Level;} + + public int GetBasePATK(){return m_BASE_PATK;} + public int GetBasePDEF(){return m_BASE_PDEF;} + public int GetBaseMATK(){return m_BASE_MATK;} + public int GetBaseMDEF(){return m_BASE_MDEF;} + + public int GetEqHP(){return m_EQ_HP;} + public int GetEqMP(){return m_EQ_MP;} + public int GetEqSTR(){return m_EQ_STR;} + public int GetEqDEX(){return m_EQ_DEX;} + public int GetEqINT(){return m_EQ_INT;} + public int GetEqLUK(){return m_EQ_LUK;} + + public int SetEqHP(HP){m_EQ_HP=HP;} + public int SetEqMP(MP){m_EQ_MP=MP;} + public int SetEqSTR(STR){m_EQ_STR=STR;} + public int SetEqDEX(DEX){m_EQ_DEX=DEX;} + public int SetEqINT(INT){m_EQ_INT=INT;} + public int SetEqLUK(LUK){m_EQ_LUK=LUK;} + + public int GetEqPATK(){return m_EQ_PATK;} + public int GetEqPDEF(){return m_EQ_PDEF;} + public int GetEqMATK(){return m_EQ_MATK;} + public int GetEqMDEF(){return m_EQ_MDEF;} } diff --git a/UserInfo.java b/UserInfo.java index e1e8abc..cafdcf3 100644 --- a/UserInfo.java +++ b/UserInfo.java @@ -7,15 +7,15 @@ public class UserInfo extends Status { private String m_Name; private static Map m_GroupUUID = new HashMap(); - public UserInfo(UUID uuid, String Name, UUID Nation, UUID Squad, UUID Farm, UUID Party){ //UserInfo 초기화 - super(100,100,1,10,10,10,10); + public UserInfo(UUID uuid, String Name){ //UserInfo 초기화 + super(100,100,1,10,10,10,10); //HP, MP, LEV, STR, DEX, INT, LUK m_UUID = uuid; m_Name = Name; - m_GroupUUID.put("Nation", Nation); - m_GroupUUID.put("Squad", Squad); - m_GroupUUID.put("Farm", Farm); - m_GroupUUID.put("Party", Party); + m_GroupUUID.put("Nation", 0); + m_GroupUUID.put("Squad", 0); + m_GroupUUID.put("Farm", 0); + m_GroupUUID.put("Party", 0); } public void SetGroupUUID(String GroupType, UUID m_UUID){ m_GroupUUID.put(GroupType, m_UUID); } @@ -23,7 +23,6 @@ public class UserInfo extends Status { public String getUserName(){ return m_Name; } - public UUID getUserUUID(){ return m_UUID; } } diff --git a/UserInfoArray.java b/UserInfoArray.java index bcbd0fa..fa2be12 100644 --- a/UserInfoArray.java +++ b/UserInfoArray.java @@ -18,12 +18,12 @@ public class UserInfoArray { return m_UserInfoArray.keySet(); } - public UUID getUserPartyUUID(UUID PlayerUUID, String GroupType){ + public UUID getUserGroupUUID(UUID PlayerUUID, String GroupType){ return m_UserInfoArray.get(PlayerUUID).GetGroupUUID(GroupType); } - public void setUserPartyUUID(String GroupType, UUID PlayerUUID, UUID PartyUUID){ - m_UserInfoArray.get(PlayerUUID).SetGroupUUID(GroupType,PartyUUID); + public void setUserGroupUUID(String GroupType, UUID PlayerUUID, UUID GroupUUID){ + m_UserInfoArray.get(PlayerUUID).SetGroupUUID(GroupType,GroupUUID); } public void putUserInfo(UUID uuid,String Name, UUID Nation, UUID Squad, UUID Farm, UUID Party) { // UserInfoArray entry 입력