cassidy/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-04-02 19:42:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Levels are now loaded in from the database, and "mainSkillLevel" properties are also correctly set.

Browse Source
This commit is contained in:
Filip Maj 2016-03-19 19:21:16 -04:00
parent 1f60bcf4fc
commit 335ec414d6
3 changed files with 51 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
FFXIVClassic Map Server/Database.cs
View File

@ -376,15 +376,32 @@ namespace FFXIVClassic_Lobby_Server
player.playTime = reader.GetUInt32(20); player.playTime = reader.GetUInt32(20);
} }
} }
//Get class levels
/*
//Get level of our class
//Load appearance
query = @" query = @"
SELECT SELECT
baseId pug,
FROM characters_appearance WHERE characterId = @charId"; gla,
mrd,
arc,
lnc,
thm,
cnj,
crp,
bsm,
arm,
gsm,
ltw,
wvr,
alc,
cul,
min,
btn,
fsh
FROM characters_class_levels WHERE characterId = @charId";
cmd = new MySqlCommand(query, conn); cmd = new MySqlCommand(query, conn);
cmd.Parameters.AddWithValue("@charId", player.actorId); cmd.Parameters.AddWithValue("@charId", player.actorId);
@ -392,22 +409,38 @@ namespace FFXIVClassic_Lobby_Server
{ {
if (reader.Read()) if (reader.Read())
{ {
player.charaWork.battleSave.skillLevel[Player.CLASSID_PUG-1] = reader.GetInt16("pug");
} player.charaWork.battleSave.skillLevel[Player.CLASSID_GLA - 1] = reader.GetInt16("gla");
player.charaWork.battleSave.skillLevel[Player.CLASSID_MRD - 1] = reader.GetInt16("mrd");
player.charaWork.battleSave.skillLevel[Player.CLASSID_ARC - 1] = reader.GetInt16("arc");
player.charaWork.battleSave.skillLevel[Player.CLASSID_LNC - 1] = reader.GetInt16("lnc");
player.charaWork.battleSave.skillLevel[Player.CLASSID_THM - 1] = reader.GetInt16("thm");
player.charaWork.battleSave.skillLevel[Player.CLASSID_CNJ - 1] = reader.GetInt16("cnj");
player.charaWork.battleSave.skillLevel[Player.CLASSID_CRP - 1] = reader.GetInt16("crp");
player.charaWork.battleSave.skillLevel[Player.CLASSID_BSM - 1] = reader.GetInt16("bsm");
player.charaWork.battleSave.skillLevel[Player.CLASSID_ARM - 1] = reader.GetInt16("arm");
player.charaWork.battleSave.skillLevel[Player.CLASSID_GSM - 1] = reader.GetInt16("gsm");
player.charaWork.battleSave.skillLevel[Player.CLASSID_LTW - 1] = reader.GetInt16("ltw");
player.charaWork.battleSave.skillLevel[Player.CLASSID_WVR - 1] = reader.GetInt16("wvr");
player.charaWork.battleSave.skillLevel[Player.CLASSID_ALC - 1] = reader.GetInt16("alc");
player.charaWork.battleSave.skillLevel[Player.CLASSID_CUL - 1] = reader.GetInt16("cul");
player.charaWork.battleSave.skillLevel[Player.CLASSID_MIN - 1] = reader.GetInt16("min");
player.charaWork.battleSave.skillLevel[Player.CLASSID_BTN - 1] = reader.GetInt16("btn");
player.charaWork.battleSave.skillLevel[Player.CLASSID_FSH - 1] = reader.GetInt16("fsh");
}
} }
*/
//Load Saved Parameters
//Get level of our class
//Load appearance
query = @" query = @"
SELECT SELECT
hp, hp,
hpMax, hpMax,
mp, mp,
mpMax, mpMax,
mainSkill, mainSkill
mainSkillLevel
FROM characters_parametersave WHERE characterId = @charId"; FROM characters_parametersave WHERE characterId = @charId";
cmd = new MySqlCommand(query, conn); cmd = new MySqlCommand(query, conn);
@ -422,7 +455,7 @@ namespace FFXIVClassic_Lobby_Server
player.charaWork.parameterSave.mpMax = reader.GetInt16(3); player.charaWork.parameterSave.mpMax = reader.GetInt16(3);
player.charaWork.parameterSave.state_mainSkill[0] = reader.GetByte(4); player.charaWork.parameterSave.state_mainSkill[0] = reader.GetByte(4);
player.charaWork.parameterSave.state_mainSkillLevel = reader.GetUInt16(5); player.charaWork.parameterSave.state_mainSkillLevel = player.charaWork.battleSave.skillLevel[reader.GetByte(4) - 1];
} }
} }

2
FFXIVClassic Map Server/actors/chara/ParameterSave.cs
View File

@ -14,7 +14,7 @@ namespace FFXIVClassic_Map_Server.Actors.Chara
public short mpMax; public short mpMax;
public byte[] state_mainSkill = new byte[4]; public byte[] state_mainSkill = new byte[4];
public ushort state_mainSkillLevel; public short state_mainSkillLevel;
public byte[] state_boostPointForSkill = new byte[4]; public byte[] state_boostPointForSkill = new byte[4];

6
FFXIVClassic Map Server/actors/chara/player/Player.cs
View File

@ -166,11 +166,6 @@ namespace FFXIVClassic_Map_Server.Actors
} }
charaWork.battleSave.skillLevel[CLASSID_GLA - 1] = 32;
charaWork.battleSave.skillLevel[CLASSID_PUG - 1] = 50;
charaWork.battleSave.skillLevel[CLASSID_THM - 1] = 5;
charaWork.battleSave.skillLevel[CLASSID_MRD - 1] = 42;
charaWork.property[0] = 1; charaWork.property[0] = 1;
charaWork.property[1] = 1; charaWork.property[1] = 1;
charaWork.property[2] = 1; charaWork.property[2] = 1;
@ -876,6 +871,7 @@ namespace FFXIVClassic_Map_Server.Actors
//Set rested EXP //Set rested EXP
charaWork.parameterSave.state_mainSkill[0] = classId; charaWork.parameterSave.state_mainSkill[0] = classId;
charaWork.parameterSave.state_mainSkillLevel = charaWork.battleSave.skillLevel[classId-1];
playerWork.restBonusExpRate = 0.0f; playerWork.restBonusExpRate = 0.0f;