zydronium/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-06-08 21:44:35 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'ai-open' into develop

Browse source 
# Conflicts:
#	FFXIVClassic Lobby Server/Database.cs
#	FFXIVClassic Map Server/Database.cs
#	FFXIVClassic Map Server/FFXIVClassic Map Server.csproj
#	FFXIVClassic Map Server/actors/chara/player/Inventory.cs
#	FFXIVClassic Map Server/actors/chara/player/Player.cs
#	FFXIVClassic Map Server/dataobjects/Session.cs
#	FFXIVClassic World Server/Server.cs
This commit is contained in:
Filip Maj 2019-05-04 20:13:29 -04:00
commit 1e4a1cf263
402 changed files with 20078 additions and 1348 deletions
Download patch file Download diff file Expand all files Collapse all files

6
FFXIVClassic Map Server/dataobjects/ItemData.cs
View file

@ -481,7 +481,7 @@ namespace FFXIVClassic_Map_Server.dataobjects
public readonly short craftMagicProcessing;
public readonly short harvestPotency;
public readonly short harvestLimit;
public readonly byte frequency;
public readonly byte frequency; // hit count, 2 for h2h weapons
public readonly short rate;
public readonly short magicRate;
public readonly short craftProcessControl;
@ -490,7 +490,7 @@ namespace FFXIVClassic_Map_Server.dataobjects
public readonly short magicCritical;
public readonly short parry;
public readonly int damageAttributeType1;
public readonly int damageAttributeType1; // 1 slashing, 2 piercing, 3 blunt, 4 projectile
public readonly float damageAttributeValue1;
public readonly int damageAttributeType2;
public readonly float damageAttributeValue2;
@ -500,6 +500,7 @@ namespace FFXIVClassic_Map_Server.dataobjects
public readonly short damagePower;
public readonly float damageInterval;
public readonly short ammoVirtualDamagePower;
public readonly float dps;
public WeaponItem(MySqlDataReader reader)
: base(reader)
@ -536,6 +537,7 @@ namespace FFXIVClassic_Map_Server.dataobjects
damagePower = reader.GetInt16("damagePower");
damageInterval = reader.GetFloat("damageInterval");
ammoVirtualDamagePower = reader.GetInt16("ammoVirtualDamagePower");
dps = (damagePower + ammoVirtualDamagePower) / damageInterval;
}
}