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

fix: Stages faction code for serialization conversion (#1835)

Browse source
This commit is contained in:
Kamron Batman 2024-06-16 11:53:15 -07:00 • committed by GitHub
parent 20596e52fa
commit 221312be4c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
43 changed files with 6234 additions and 6364 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Projects/UOContent/Engines/Factions/Instances/Factions/CouncilOfMages.cs
View file

@ -39,15 +39,13 @@ public class CouncilOfMages : Faction
1005189, // Members of the Council of Mages will now be beaten with a stick.
// Moonglow
new StrongholdDefinition(
new[]
{
[
new Rectangle2D(4463, 1487, 15, 35),
new Rectangle2D(4450, 1522, 35, 48)
},
],
new Point3D(4469, 1486, 0),
new Point3D(4457, 1544, 0),
new[]
{
[
new Point3D(4464, 1534, 21),
new Point3D(4470, 1536, 21),
new Point3D(4468, 1534, 21),
@ -56,7 +54,7 @@ public class CouncilOfMages : Faction
new Point3D(4466, 1534, 21),
new Point3D(4466, 1536, 21),
new Point3D(4464, 1536, 21)
}
]
),
// Magincia
/* new StrongholdDefinition(
@ -80,8 +78,7 @@ public class CouncilOfMages : Faction
new Point3D( 3797, 2249, 20 ),
new Point3D( 3797, 2246, 20 )
} ), */
new[]
{
[
new RankDefinition(10, 991, 8, 1060789), // Inquisitor of the Council
new RankDefinition(9, 950, 7, 1060788), // Archon of Principle
new RankDefinition(8, 900, 6, 1060787), // Luminary
@ -92,9 +89,8 @@ public class CouncilOfMages : Faction
new RankDefinition(3, 400, 4, 1060785), // Mystic
new RankDefinition(2, 200, 4, 1060785), // Mystic
new RankDefinition(1, 0, 4, 1060785) // Mystic
},
new[]
{
],
[
new GuardDefinition(
typeof(FactionHenchman),
0x1403,
@ -131,7 +127,7 @@ public class CouncilOfMages : Faction
1011508, // ELDER WIZARD
1011502 // Hire Elder Wizard
)
}
]
);
}

20
Projects/UOContent/Engines/Factions/Instances/Factions/Minax.cs
View file

@ -39,14 +39,12 @@ public class Minax : Faction
1005191, // Followers of Minax will now be told to go away.
1005192, // Followers of Minax will now be hanged by their toes.
new StrongholdDefinition(
new[]
{
[
new Rectangle2D(1097, 2570, 70, 50)
},
],
new Point3D(1172, 2593, 0),
new Point3D(1117, 2587, 18),
new[]
{
[
new Point3D(1113, 2601, 18),
new Point3D(1113, 2598, 18),
new Point3D(1113, 2595, 18),
@ -55,10 +53,9 @@ public class Minax : Faction
new Point3D(1116, 2598, 18),
new Point3D(1116, 2595, 18),
new Point3D(1116, 2592, 18)
}
]
),
new[]
{
[
new RankDefinition(10, 991, 8, 1060784), // Avenger of Mondain
new RankDefinition(9, 950, 7, 1060783), // Dread Knight
new RankDefinition(8, 900, 6, 1060782), // Warlord
@ -69,9 +66,8 @@ public class Minax : Faction
new RankDefinition(3, 400, 4, 1060780), // Defiler
new RankDefinition(2, 200, 4, 1060780), // Defiler
new RankDefinition(1, 0, 4, 1060780) // Defiler
},
new[]
{
],
[
new GuardDefinition(
typeof(FactionHenchman),
0x1403,
@ -108,7 +104,7 @@ public class Minax : Faction
1011506, // DRAGOON
1011500 // Hire Dragoon
)
}
]
);
}

20
Projects/UOContent/Engines/Factions/Instances/Factions/Shadowlords.cs
View file

@ -38,15 +38,13 @@ public class Shadowlords : Faction
1005185, // Minions of the Shadowlords will now be warned of their impending deaths.
1005186, // Minions of the Shadowlords will now be attacked at will.
new StrongholdDefinition(
new[]
{
[
new Rectangle2D(960, 688, 8, 9),
new Rectangle2D(944, 697, 24, 23)
},
],
new Point3D(969, 768, 0),
new Point3D(947, 713, 0),
new[]
{
[
new Point3D(953, 713, 20),
new Point3D(953, 709, 20),
new Point3D(953, 705, 20),
@ -55,10 +53,9 @@ public class Shadowlords : Faction
new Point3D(957, 709, 20),
new Point3D(957, 705, 20),
new Point3D(957, 701, 20)
}
]
),
new[]
{
[
new RankDefinition(10, 991, 8, 1060799), // Purveyor of Darkness
new RankDefinition(9, 950, 7, 1060798), // Agent of Evil
new RankDefinition(8, 900, 6, 1060797), // Bringer of Sorrow
@ -69,9 +66,8 @@ public class Shadowlords : Faction
new RankDefinition(3, 400, 4, 1060795), // Servant
new RankDefinition(2, 200, 4, 1060795), // Servant
new RankDefinition(1, 0, 4, 1060795) // Servant
},
new[]
{
],
[
new GuardDefinition(
typeof(FactionHenchman),
0x1403,
@ -108,7 +104,7 @@ public class Shadowlords : Faction
1011513, // SHADOW MAGE
1011504 // Hire Shadow Mage
)
}
]
);
}

22
Projects/UOContent/Engines/Factions/Instances/Factions/TrueBritannians.cs
View file

@ -38,8 +38,7 @@ public class TrueBritannians : Faction
1005182, // Followers of Lord British will now be warned of their impending doom.
1005183, // Followers of Lord British will now be attacked on sight.
new StrongholdDefinition(
new[]
{
[
new Rectangle2D(1292, 1556, 25, 25),
new Rectangle2D(1292, 1676, 120, 25),
new Rectangle2D(1388, 1556, 25, 25),
@ -47,11 +46,10 @@ public class TrueBritannians : Faction
new Rectangle2D(1300, 1581, 105, 95),
new Rectangle2D(1405, 1612, 12, 21),
new Rectangle2D(1405, 1633, 11, 5)
},
],
new Point3D(1419, 1622, 20),
new Point3D(1330, 1621, 50),
new[]
{
[
new Point3D(1328, 1627, 50),
new Point3D(1328, 1621, 50),
new Point3D(1334, 1627, 50),
@ -60,10 +58,9 @@ public class TrueBritannians : Faction
new Point3D(1340, 1621, 50),
new Point3D(1345, 1621, 50),
new Point3D(1345, 1627, 50)
}
]
),
new[]
{
[
new RankDefinition(10, 991, 8, 1060794), // Knight of the Codex
new RankDefinition(9, 950, 7, 1060793), // Knight of Virtue
new RankDefinition(8, 900, 6, 1060792), // Crusader
@ -73,10 +70,9 @@ public class TrueBritannians : Faction
new RankDefinition(4, 500, 5, 1060791), // Sentinel
new RankDefinition(3, 400, 4, 1060790), // Defender
new RankDefinition(2, 200, 4, 1060790), // Defender
new RankDefinition(1, 0, 4, 1060790), // Defender
},
new[]
{
new RankDefinition(1, 0, 4, 1060790) // Defender
],
[
new GuardDefinition(
typeof(FactionHenchman),
0x1403,
@ -113,7 +109,7 @@ public class TrueBritannians : Faction
1011529, // PALADIN
1011498 // Hire Paladin
)
}
]
);
}