warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Updates races to properly support gargoyle equipment. (#744)

Browse source 
* Adds `RaceFlag` to the `Race` object. This is `1 << RaceIndex`
* Replaces `RequiredRace`  with `RequiredRaces` for items.
* Adds convenience flags for `RequiredRaces`
  ```cs
  
  public const int AllowAllRaces = 0x7;      // Race.Human.RaceFlag | Race.Elf.RaceFlag | Race.Gargoyle.RaceFlag
  public const int AllowHumanOrElves = 0x3;  // Race.Human.RaceFlag | Race.Elf.RaceFlag
  public const int AllowElvesOnly = 0x2;     // Race.Elf.RaceFlag
  public const int AllowGargoylesOnly = 0x4; // Race.Gargoyle.RaceFlag
  ```
* Example usage on an item:
  ```cs
  public override int RequiredRaces => Race.AllowHumanOrElves;
  ```
* Adds Wood and Stone armor material types
* Updates Woodland armor to Wood
* Adds proper messaging for race restrictions
* Adds gargoyle only for object properties
* Adds `CheckRace` functions for validating if a race or mobile can use the item:
  ```cs
  bool CheckRace(Race race);
  bool CheckRace(Mobile from, bool message = true);
  ```
This commit is contained in:
Kamron Batman 2021-08-29 00:43:55 -07:00 • committed by GitHub
parent bf20800382
commit 8ffd5a5bd0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
58 changed files with 147 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Projects/UOContent/Items/Armor/Studded/GargishStuddedArmsType1.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
[Constructible]
public GargishStuddedArmsType1() : base(0x284) => Weight = 10.0;
public override Race RequiredRace => Race.Gargoyle;
public override int RequiredRaces => Race.AllowGargoylesOnly;
public override int BasePhysicalResistance => 6;
public override int BaseFireResistance => 6;
public override int BaseColdResistance => 4;

2
Projects/UOContent/Items/Armor/Studded/GargishStuddedArmsType2.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
[Constructible]
public GargishStuddedArmsType2() : base(0x283) => Weight = 10.0;
public override Race RequiredRace => Race.Gargoyle;
public override int RequiredRaces => Race.AllowGargoylesOnly;
public override int BasePhysicalResistance => 6;
public override int BaseFireResistance => 6;
public override int BaseColdResistance => 4;

2
Projects/UOContent/Items/Armor/Studded/GargishStuddedChestType1.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
[Constructible]
public GargishStuddedChestType1() : base(0x286) => Weight = 15.0;
public override Race RequiredRace => Race.Gargoyle;
public override int RequiredRaces => Race.AllowGargoylesOnly;
public override int BasePhysicalResistance => 6;
public override int BaseFireResistance => 6;
public override int BaseColdResistance => 4;

2
Projects/UOContent/Items/Armor/Studded/GargishStuddedChestType2.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
[Constructible]
public GargishStuddedChestType2() : base(0x285) => Weight = 15.0;
public override Race RequiredRace => Race.Gargoyle;
public override int RequiredRaces => Race.AllowGargoylesOnly;
public override int BasePhysicalResistance => 6;
public override int BaseFireResistance => 6;
public override int BaseColdResistance => 4;

2
Projects/UOContent/Items/Armor/Studded/GargishStuddedKiltType1.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
[Constructible]
public GargishStuddedKiltType1() : base(0x288) => Weight = 10.0;
public override Race RequiredRace => Race.Gargoyle;
public override int RequiredRaces => Race.AllowGargoylesOnly;
public override int BasePhysicalResistance => 6;
public override int BaseFireResistance => 6;
public override int BaseColdResistance => 4;

2
Projects/UOContent/Items/Armor/Studded/GargishStuddedKiltType2.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
[Constructible]
public GargishStuddedKiltType2() : base(0x287) => Weight = 10.0;
public override Race RequiredRace => Race.Gargoyle;
public override int RequiredRaces => Race.AllowGargoylesOnly;
public override int BasePhysicalResistance => 6;
public override int BaseFireResistance => 6;
public override int BaseColdResistance => 4;

2
Projects/UOContent/Items/Armor/Studded/GargishStuddedLegsType1.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
[Constructible]
public GargishStuddedLegsType1() : base(0x28A) => Weight = 15.0;
public override Race RequiredRace => Race.Gargoyle;
public override int RequiredRaces => Race.AllowGargoylesOnly;
public override int BasePhysicalResistance => 6;
public override int BaseFireResistance => 6;
public override int BaseColdResistance => 4;

2
Projects/UOContent/Items/Armor/Studded/GargishStuddedLegsType2.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
[Constructible]
public GargishStuddedLegsType2() : base(0x289) => Weight = 15.0;
public override Race RequiredRace => Race.Gargoyle;
public override int RequiredRaces => Race.AllowGargoylesOnly;
public override int BasePhysicalResistance => 6;
public override int BaseFireResistance => 6;
public override int BaseColdResistance => 4;

2
Projects/UOContent/Items/Armor/Studded/HideChest.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
[Constructible]
public HideChest() : base(0x2B74) => Weight = 6.0;
public override Race RequiredRace => Race.Elf;
public override int RequiredRaces => Race.AllowElvesOnly;
public override int BasePhysicalResistance => 3;
public override int BaseFireResistance => 3;

2
Projects/UOContent/Items/Armor/Studded/HideFemaleChest.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
[Constructible]
public HideFemaleChest() : base(0x2B79) => Weight = 6.0;
public override Race RequiredRace => Race.Elf;
public override int RequiredRaces => Race.AllowElvesOnly;
public override int BasePhysicalResistance => 3;
public override int BaseFireResistance => 3;

2
Projects/UOContent/Items/Armor/Studded/HideGloves.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
[Constructible]
public HideGloves() : base(0x2B75) => Weight = 2.0;
public override Race RequiredRace => Race.Elf;
public override int RequiredRaces => Race.AllowElvesOnly;
public override int BasePhysicalResistance => 3;
public override int BaseFireResistance => 3;

2
Projects/UOContent/Items/Armor/Studded/HideGorget.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
[Constructible]
public HideGorget() : base(0x2B76) => Weight = 3.0;
public override Race RequiredRace => Race.Elf;
public override int RequiredRaces => Race.AllowElvesOnly;
public override int BasePhysicalResistance => 3;
public override int BaseFireResistance => 3;

2
Projects/UOContent/Items/Armor/Studded/HidePants.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
[Constructible]
public HidePants() : base(0x2B78) => Weight = 5.0;
public override Race RequiredRace => Race.Elf;
public override int RequiredRaces => Race.AllowElvesOnly;
public override int BasePhysicalResistance => 3;
public override int BaseFireResistance => 3;

2
Projects/UOContent/Items/Armor/Studded/HidePauldrons.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
[Constructible]
public HidePauldrons() : base(0x2B77) => Weight = 4.0;
public override Race RequiredRace => Race.Elf;
public override int RequiredRaces => Race.AllowElvesOnly;
public override int BasePhysicalResistance => 3;
public override int BaseFireResistance => 3;