Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tier 1 loot #582

Closed
wants to merge 1 commit into from
Closed

Tier 1 loot #582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
288 changes: 280 additions & 8 deletions Source/ACE.Entity/AceObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ public uint Self
get { return GetDataIdProperty(PropertyDataId.CombatTable); }
set { SetDataIdProperty(PropertyDataId.CombatTable, value); }
}

[JsonIgnore]
public int? PhysicsState
{
Expand Down Expand Up @@ -293,6 +293,13 @@ public uint Self
get { return GetDataIdProperty(PropertyDataId.Icon); }
set { SetDataIdProperty(PropertyDataId.Icon, value); }
}

[JsonIgnore]
public uint? Spell
{
get { return GetDataIdProperty(PropertyDataId.Spell); }
set { SetDataIdProperty(PropertyDataId.Spell, value); }
}

[JsonIgnore]
public string Name
Expand Down Expand Up @@ -329,13 +336,104 @@ public string PluralName
set { SetIntProperty(PropertyInt.AmmoType, (int)value); }
}

[JsonIgnore]
public int? ElementalDamageBonus
{
get { return GetIntProperty(PropertyInt.ElementalDamageBonus); }
set { SetIntProperty(PropertyInt.ElementalDamageBonus, (int)value); }
}

[JsonIgnore]
public int? Value
{
get { return GetIntProperty(PropertyInt.Value); }
set { SetIntProperty(PropertyInt.Value, value); }
}

[JsonIgnore]
public int? ArmorLevel
{
get { return GetIntProperty(PropertyInt.ArmorLevel); }
set { SetIntProperty(PropertyInt.ArmorLevel, value); }
}

[JsonIgnore]
public int? WeaponType
{
get { return GetIntProperty(PropertyInt.WeaponType); }
set { SetIntProperty(PropertyInt.WeaponType, value); }
}

[JsonIgnore]
public int? ItemSpellcraft
{
get { return GetIntProperty(PropertyInt.ItemSpellcraft); }
set { SetIntProperty(PropertyInt.ItemSpellcraft, value); }
}

[JsonIgnore]
public int? ItemDifficulty
{
get { return GetIntProperty(PropertyInt.ItemDifficulty); }
set { SetIntProperty(PropertyInt.ItemDifficulty, value); }
}

[JsonIgnore]
public int? ItemAllegianceRankLimit
{
get { return GetIntProperty(PropertyInt.ItemAllegianceRankLimit); }
set { SetIntProperty(PropertyInt.ItemAllegianceRankLimit, value); }
}

[JsonIgnore]
public int? ItemSkillLevelLimit
{
get { return GetIntProperty(PropertyInt.ItemSkillLevelLimit); }
set { SetIntProperty(PropertyInt.ItemSkillLevelLimit, value); }
}

[JsonIgnore]
public int? MaterialType
{
get { return GetIntProperty(PropertyInt.MaterialType); }
set { SetIntProperty(PropertyInt.MaterialType, value); }
}

[JsonIgnore]
public int? WieldRequirements
{
get { return GetIntProperty(PropertyInt.WieldRequirements); }
set { SetIntProperty(PropertyInt.WieldRequirements, value); }
}

[JsonIgnore]
public int? WieldSkilltype
{
get { return GetIntProperty(PropertyInt.WieldSkilltype); }
set { SetIntProperty(PropertyInt.WieldSkilltype, value); }
}

[JsonIgnore]
public int? WieldDifficulty
{
get { return GetIntProperty(PropertyInt.WieldDifficulty); }
set { SetIntProperty(PropertyInt.WieldDifficulty, value); }
}

[JsonIgnore]
public int? EquipmentSetId
{
get { return GetIntProperty(PropertyInt.EquipmentSetId); }
set { SetIntProperty(PropertyInt.EquipmentSetId, value); }
}

[JsonIgnore]
public int? StackUnitValue
{
get { return GetIntProperty(PropertyInt.StackUnitValue); }
set { SetIntProperty(PropertyInt.StackUnitValue, value); }
}

[JsonIgnore]
public int? UseCreateContractId
{
Expand Down Expand Up @@ -535,13 +633,6 @@ public string PluralName
set { SetDataIdProperty(PropertyDataId.IconUnderlay, value); }
}

[JsonIgnore]
public byte? MaterialType
{
get { return (byte?)GetIntProperty(PropertyInt.MaterialType); }
set { SetIntProperty(PropertyInt.MaterialType, (byte?)value); }
}

[JsonIgnore]
public int? SharedCooldown
{
Expand Down Expand Up @@ -661,6 +752,12 @@ public string PluralName
get { return GetBoolProperty(PropertyBool.IsDeleted); }
set { SetBoolProperty(PropertyBool.IsDeleted, value); }
}

public bool? IsDyable
{
get { return GetBoolProperty(PropertyBool.IsDyable); }
set { SetBoolProperty(PropertyBool.IsDyable, value); }
}

[JsonIgnore]
public ulong? DeleteTime
Expand Down Expand Up @@ -727,6 +824,20 @@ public string DateOfBirth

[JsonIgnore]
public int? VitaeCpPool
{
get { return GetIntProperty(PropertyInt.VitaeCpPool); }
set { SetIntProperty(PropertyInt.VitaeCpPool, value); }
}

[JsonIgnore]
public int? AppraisalLongDescDecoration
{
get { return GetIntProperty(PropertyInt.AppraisalLongDescDecoration); }
set { SetIntProperty(PropertyInt.AppraisalLongDescDecoration, value); }
}

[JsonIgnore]
public int? SpellID
{
get { return GetIntProperty(PropertyInt.VitaeCpPool); }
set { SetIntProperty(PropertyInt.VitaeCpPool, value); }
Expand Down Expand Up @@ -1561,13 +1672,167 @@ public string ScribeAccount
get { return GetIntProperty(PropertyInt.BoosterEnum); }
set { SetIntProperty(PropertyInt.BoosterEnum, value); }
}

[JsonIgnore]
public int? WeaponTime
{
get { return GetIntProperty(PropertyInt.WeaponTime); }
set { SetIntProperty(PropertyInt.WeaponTime, value); }
}

[JsonIgnore]
public int? GemCount
{
get { return GetIntProperty(PropertyInt.GemCount); }
set { SetIntProperty(PropertyInt.GemCount, value); }
}

[JsonIgnore]
public int? GemType
{
get { return GetIntProperty(PropertyInt.GemType); }
set { SetIntProperty(PropertyInt.GemType, value); }
}

[JsonIgnore]
public int? WeaponSkill
{
get { return GetIntProperty(PropertyInt.GemType); }
set { SetIntProperty(PropertyInt.GemType, value); }
}

[JsonIgnore]
public double? HealkitMod
{
get { return GetDoubleProperty(PropertyDouble.HealkitMod); }
set { SetDoubleProperty(PropertyDouble.HealkitMod, value); }
}

[JsonIgnore]
public double? ManaRate
{
get { return GetDoubleProperty(PropertyDouble.ManaRate ); }
set { SetDoubleProperty(PropertyDouble.ManaRate , value); }
}

[JsonIgnore]
public double? ManaConversionMod
{
get { return GetDoubleProperty(PropertyDouble.ManaConversionMod); }
set { SetDoubleProperty(PropertyDouble.ManaConversionMod, value); }
}

[JsonIgnore]
public double? ArmorModVsSlash
{
get { return GetDoubleProperty(PropertyDouble.ArmorModVsSlash); }
set { SetDoubleProperty(PropertyDouble.ArmorModVsSlash, value); }
}

[JsonIgnore]
public double? ArmorModVsPierce
{
get { return GetDoubleProperty(PropertyDouble.ArmorModVsPierce); }
set { SetDoubleProperty(PropertyDouble.ArmorModVsPierce, value); }
}

[JsonIgnore]
public double? ArmorModVsBludgeon
{
get { return GetDoubleProperty(PropertyDouble.ArmorModVsBludgeon); }
set { SetDoubleProperty(PropertyDouble.ArmorModVsBludgeon, value); }
}

[JsonIgnore]
public double? ArmorModVsCold
{
get { return GetDoubleProperty(PropertyDouble.ArmorModVsCold); }
set { SetDoubleProperty(PropertyDouble.ArmorModVsCold, value); }
}

[JsonIgnore]
public double? ArmorModVsFire
{
get { return GetDoubleProperty(PropertyDouble.ArmorModVsFire); }
set { SetDoubleProperty(PropertyDouble.ArmorModVsFire, value); }
}

[JsonIgnore]
public double? ArmorModVsAcid
{
get { return GetDoubleProperty(PropertyDouble.ArmorModVsAcid); }
set { SetDoubleProperty(PropertyDouble.ArmorModVsAcid, value); }
}

[JsonIgnore]
public double? ArmorModVsElectric
{
get { return GetDoubleProperty(PropertyDouble.ArmorModVsElectric); }
set { SetDoubleProperty(PropertyDouble.ArmorModVsElectric, value); }
}

[JsonIgnore]
public double? ArmorModVsNether
{
get { return GetDoubleProperty(PropertyDouble.ArmorModVsNether); }
set { SetDoubleProperty(PropertyDouble.ArmorModVsNether, value); }
}

[JsonIgnore]
public double? WeaponLength
{
get { return GetDoubleProperty(PropertyDouble.WeaponLength); }
set { SetDoubleProperty(PropertyDouble.WeaponLength, value); }
}

[JsonIgnore]
public double? DamageVariance
{
get { return GetDoubleProperty(PropertyDouble.DamageVariance); }
set { SetDoubleProperty(PropertyDouble.DamageVariance, value); }
}

[JsonIgnore]
public double? MaximumVelocity
{
get { return GetDoubleProperty(PropertyDouble.MaximumVelocity); }
set { SetDoubleProperty(PropertyDouble.MaximumVelocity, value); }
}

[JsonIgnore]
public double? WeaponDefense
{
get { return GetDoubleProperty(PropertyDouble.WeaponDefense); }
set { SetDoubleProperty(PropertyDouble.WeaponDefense, value); }
}

[JsonIgnore]
public double? WeaponOffense
{
get { return GetDoubleProperty(PropertyDouble.WeaponOffense); }
set { SetDoubleProperty(PropertyDouble.WeaponOffense, value); }
}

[JsonIgnore]
public double? DamageMod
{
get { return GetDoubleProperty(PropertyDouble.DamageMod); }
set { SetDoubleProperty(PropertyDouble.DamageMod, value); }
}

[JsonIgnore]
public int? Damage
{
get { return GetIntProperty(PropertyInt.Damage); }
set { SetIntProperty(PropertyInt.Damage, (int)value); }
}

[JsonIgnore]
public int? DamageType
{
get { return GetIntProperty(PropertyInt.DamageType); }
set { SetIntProperty(PropertyInt.DamageType, (int)value); }
}

[JsonIgnore]
public int? CoinValue
Expand Down Expand Up @@ -1796,6 +2061,13 @@ public Position TeleportedCharacter
set { SetDataIdProperty(PropertyDataId.AlternateCurrency, value); }
}

[JsonIgnore]
public uint? Setup
{
get { return GetDataIdProperty(PropertyDataId.Setup); }
set { SetDataIdProperty(PropertyDataId.Setup, value); }
}

#region Chess
[JsonIgnore]
public int? ChessGamesLost
Expand Down
3 changes: 2 additions & 1 deletion Source/ACE.Entity/Enum/Properties/PropertyBool.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,8 @@ public enum PropertyBool : ushort
NoOlthoiTalk = 129,
AutowieldLeft = 130,
[ServerOnly]
IsDeleted = 9001
IsDeleted = 9001,
IsDyable = 9002
}

public static class PropertyBoolExtensions
Expand Down
4 changes: 2 additions & 2 deletions Source/ACE.Entity/ObjectGuid.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace ACE.Entity
namespace ACE.Entity
{
public enum GuidType
{
Expand Down Expand Up @@ -33,7 +33,7 @@ public struct ObjectGuid

// FIXME(ddevec): Currently
public static uint NonStaticMin { get; } = 0x001E8480; // 2,000,000
public static uint NonStaticMax { get; } = 0x4FFFFFFF;
public static uint NonStaticMax { get; } = 0x50000000;

public static uint PlayerMin { get; } = 0x50000001;
public static uint PlayerMax { get; } = 0x5FFFFFFF;
Expand Down
Loading