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

fix: Codegens camps (#1628)

Browse source
This commit is contained in:
Kamron Batman 2023-12-04 09:11:52 -08:00 • committed by GitHub
parent b7882df136
commit f35af0de2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 776 additions and 992 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Projects/UOContent/Migrations/Server.Multis.BankerCamp.v0.json generated Normal file
View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Multis.BankerCamp"
}

4
Projects/UOContent/Migrations/Server.Multis.BrigandCamp.v0.json generated Normal file
View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Multis.BrigandCamp"
}

4
Projects/UOContent/Migrations/Server.Multis.HealerCamp.v0.json generated Normal file
View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Multis.HealerCamp"
}

4
Projects/UOContent/Migrations/Server.Multis.LizardmenCamp.v0.json generated Normal file
View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Multis.LizardmenCamp"
}

4
Projects/UOContent/Migrations/Server.Multis.LockableBarrel.v0.json generated Normal file
View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Multis.LockableBarrel"
}

4
Projects/UOContent/Migrations/Server.Multis.MageCamp.v0.json generated Normal file
View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Multis.MageCamp"
}

4
Projects/UOContent/Migrations/Server.Multis.OrcCamp.v0.json generated Normal file
View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Multis.OrcCamp"
}

4
Projects/UOContent/Migrations/Server.Multis.RatCamp.v0.json generated Normal file
View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Multis.RatCamp"
}

55
Projects/UOContent/Multis/Camps/BankerCamp.cs
View file

@ -1,47 +1,34 @@
using ModernUO.Serialization;
using Server.Items; using Server.Items;
using Server.Mobiles; using Server.Mobiles;
namespace Server.Multis namespace Server.Multis;
[SerializationGenerator(0, false)]
public partial class BankerCamp : BaseCamp
{ {
public class BankerCamp : BaseCamp [Constructible]
public BankerCamp() : base(0x1F6)
{ {
[Constructible] }
public BankerCamp() : base(0x1F6)
{
}
public BankerCamp(Serial serial) : base(serial) public BankerCamp(Serial serial) : base(serial)
{ {
} }
public override void AddComponents() public override void AddComponents()
{ {
BaseDoor west, east; BaseDoor west, east;
AddItem(west = new LightWoodGate(DoorFacing.WestCW), -4, 4, 7); AddItem(west = new LightWoodGate(DoorFacing.WestCW), -4, 4, 7);
AddItem(east = new LightWoodGate(DoorFacing.EastCCW), -3, 4, 7); AddItem(east = new LightWoodGate(DoorFacing.EastCCW), -3, 4, 7);
west.Link = east; west.Link = east;
east.Link = west; east.Link = west;
AddItem(new Sign(SignType.Bank, SignFacing.West), -5, 5, -4); AddItem(new Sign(SignType.Bank, SignFacing.West), -5, 5, -4);
AddMobile(new Banker(), 4, -4, 3, 7); AddMobile(new Banker(), 4, -4, 3, 7);
AddMobile(new Banker(), 5, 4, -2, 0); AddMobile(new Banker(), 5, 4, -2, 0);
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
} }
} }

351
Projects/UOContent/Multis/Camps/BaseCamp.cs
View file

@ -1,224 +1,183 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using ModernUO.Serialization;
using Server.Items; using Server.Items;
using Server.Mobiles; using Server.Mobiles;
namespace Server.Multis namespace Server.Multis;
[SerializationGenerator(1, false)]
public abstract partial class BaseCamp : BaseMulti
{ {
public abstract class BaseCamp : BaseMulti [Tidy]
[SerializableField(0, setter: "private")]
private List<Item> _items;
[Tidy]
[SerializableField(1, setter: "private")]
private List<Mobile> _mobiles;
[DeltaDateTime]
[SerializableField(2, setter: "private")]
private DateTime _decayTime;
private TimeSpan m_DecayDelay;
private Timer _decayTimer;
public BaseCamp(int multiID) : base(multiID)
{ {
private TimeSpan m_DecayDelay; _items = new List<Item>();
private DateTime m_DecayTime; _mobiles = new List<Mobile>();
private Timer _decayTimer; m_DecayDelay = TimeSpan.FromMinutes(30.0);
private List<Item> m_Items; RefreshDecay(true);
private List<Mobile> m_Mobiles;
public BaseCamp(int multiID) : base(multiID) Timer.StartTimer(CheckAddComponents);
}
public virtual int EventRange => 10;
public virtual TimeSpan DecayDelay
{
get => m_DecayDelay;
set
{ {
m_Items = new List<Item>(); m_DecayDelay = value;
m_Mobiles = new List<Mobile>();
m_DecayDelay = TimeSpan.FromMinutes(30.0);
RefreshDecay(true); RefreshDecay(true);
Timer.StartTimer(CheckAddComponents);
}
public BaseCamp(Serial serial) : base(serial)
{
}
public virtual int EventRange => 10;
public virtual TimeSpan DecayDelay
{
get => m_DecayDelay;
set
{
m_DecayDelay = value;
RefreshDecay(true);
}
}
public override bool HandlesOnMovement => true;
public void CheckAddComponents()
{
if (Deleted)
{
return;
}
AddComponents();
}
public virtual void AddComponents()
{
}
public override void OnDelete()
{
_decayTimer?.Stop();
_decayTimer = null;
}
public virtual void RefreshDecay(bool setDecayTime)
{
if (Deleted)
{
return;
}
if (setDecayTime)
{
m_DecayTime = Core.Now + DecayDelay;
}
_decayTimer?.Stop();
_decayTimer = Timer.DelayCall(DecayDelay, Delete);
}
public virtual void AddItem(Item item, int xOffset, int yOffset, int zOffset)
{
m_Items.Add(item);
var zavg = Map.GetAverageZ(X + xOffset, Y + yOffset);
item.MoveToWorld(new Point3D(X + xOffset, Y + yOffset, zavg + zOffset), Map);
}
public virtual void AddMobile(Mobile m, int wanderRange, int xOffset, int yOffset, int zOffset)
{
m_Mobiles.Add(m);
var zavg = Map.GetAverageZ(X + xOffset, Y + yOffset);
var loc = new Point3D(X + xOffset, Y + yOffset, zavg + zOffset);
if (m is BaseCreature bc)
{
bc.RangeHome = wanderRange;
bc.Home = loc;
}
if (m is BaseVendor)
{
m.Direction = Direction.South;
}
m.MoveToWorld(loc, Map);
}
public virtual void OnEnter(Mobile m)
{
RefreshDecay(true);
}
public virtual void OnExit(Mobile m)
{
RefreshDecay(true);
}
public override void OnMovement(Mobile m, Point3D oldLocation)
{
var inOldRange = Utility.InRange(oldLocation, Location, EventRange);
var inNewRange = Utility.InRange(m.Location, Location, EventRange);
if (inNewRange && !inOldRange)
{
OnEnter(m);
}
else if (inOldRange && !inNewRange)
{
OnExit(m);
}
}
public override void OnAfterDelete()
{
base.OnAfterDelete();
for (var i = 0; i < m_Items.Count; ++i)
{
m_Items[i].Delete();
}
for (var i = 0; i < m_Mobiles.Count; ++i)
{
var bc = (BaseCreature)m_Mobiles[i];
if (bc.IsPrisoner == false)
{
m_Mobiles[i].Delete();
}
else if (m_Mobiles[i].CantWalk)
{
m_Mobiles[i].Delete();
}
}
m_Items.Clear();
m_Mobiles.Clear();
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
m_Items.Tidy();
writer.Write(m_Items);
m_Mobiles.Tidy();
writer.Write(m_Mobiles);
writer.WriteDeltaTime(m_DecayTime);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
switch (version)
{
case 0:
{
m_Items = reader.ReadEntityList<Item>();
m_Mobiles = reader.ReadEntityList<Mobile>();
m_DecayTime = reader.ReadDeltaTime();
RefreshDecay(false);
break;
}
}
} }
} }
public class LockableBarrel : LockableContainer public override bool HandlesOnMovement => true;
public void CheckAddComponents()
{ {
[Constructible] if (Deleted)
public LockableBarrel() : base(0xE77) => Weight = 1.0;
public LockableBarrel(Serial serial) : base(serial)
{ {
return;
} }
public override void Serialize(IGenericWriter writer) AddComponents();
{ }
base.Serialize(writer);
writer.Write(0); // version public virtual void AddComponents()
{
}
public override void OnDelete()
{
_decayTimer?.Stop();
_decayTimer = null;
}
public virtual void RefreshDecay(bool setDecayTime)
{
if (Deleted)
{
return;
} }
public override void Deserialize(IGenericReader reader) if (setDecayTime)
{ {
base.Deserialize(reader); _decayTime = Core.Now + DecayDelay;
}
var version = reader.ReadInt(); _decayTimer?.Stop();
_decayTimer = Timer.DelayCall(DecayDelay, Delete);
}
if (Weight == 8.0) public virtual void AddItem(Item item, int xOffset, int yOffset, int zOffset)
{
AddToItems(item);
var zavg = Map.GetAverageZ(X + xOffset, Y + yOffset);
item.MoveToWorld(new Point3D(X + xOffset, Y + yOffset, zavg + zOffset), Map);
}
public virtual void AddMobile(Mobile m, int wanderRange, int xOffset, int yOffset, int zOffset)
{
AddToMobiles(m);
var zavg = Map.GetAverageZ(X + xOffset, Y + yOffset);
var loc = new Point3D(X + xOffset, Y + yOffset, zavg + zOffset);
if (m is BaseCreature bc)
{
bc.RangeHome = wanderRange;
bc.Home = loc;
}
if (m is BaseVendor)
{
m.Direction = Direction.South;
}
m.MoveToWorld(loc, Map);
}
public virtual void OnEnter(Mobile m)
{
RefreshDecay(true);
}
public virtual void OnExit(Mobile m)
{
RefreshDecay(true);
}
public override void OnMovement(Mobile m, Point3D oldLocation)
{
var inOldRange = Utility.InRange(oldLocation, Location, EventRange);
var inNewRange = Utility.InRange(m.Location, Location, EventRange);
if (inNewRange && !inOldRange)
{
OnEnter(m);
}
else if (inOldRange && !inNewRange)
{
OnExit(m);
}
}
public override void OnAfterDelete()
{
base.OnAfterDelete();
for (var i = 0; i < _items.Count; ++i)
{
_items[i].Delete();
}
for (var i = 0; i < _mobiles.Count; ++i)
{
var mob = _mobiles[i];
if (mob.CantWalk || (mob as BaseCreature)?.IsPrisoner == false)
{ {
Weight = 1.0; _mobiles[i].Delete();
} }
} }
ClearItems();
ClearMobiles();
}
private void Deserialize(IGenericReader reader, int version)
{
_items = reader.ReadEntityList<Item>();
_mobiles = reader.ReadEntityList<Mobile>();
_decayTime = reader.ReadDeltaTime();
}
[AfterDeserialization]
private void AfterDeserialization()
{
RefreshDecay(false);
} }
} }
[SerializationGenerator(0, false)]
public partial class LockableBarrel : LockableContainer
{
[Constructible]
public LockableBarrel() : base(0xE77) => Weight = 1.0;
}

290
Projects/UOContent/Multis/Camps/BrigandCamp.cs
View file

@ -1,185 +1,157 @@
using System; using System;
using ModernUO.Serialization;
using Server.Items; using Server.Items;
using Server.Mobiles; using Server.Mobiles;
namespace Server.Multis namespace Server.Multis;
[SerializationGenerator(0, false)]
public partial class BrigandCamp : BaseCamp
{ {
public class BrigandCamp : BaseCamp private Mobile _prisoner;
[Constructible]
public BrigandCamp() : base(0x10EE) // dummy garbage at center
{ {
private Mobile m_Prisoner; }
[Constructible] public virtual Mobile Brigands => new Brigand();
public BrigandCamp() : base(0x10EE) // dummy garbage at center public virtual Mobile Executioners => new Executioner();
public override void AddComponents()
{
Visible = false;
DecayDelay = TimeSpan.FromMinutes(5.0);
AddItem(new Static(0x10ee), 0, 0, 0);
AddItem(new Static(0xfac), 0, 7, 0);
switch (Utility.Random(3))
{ {
} case 0:
public BrigandCamp(Serial serial) : base(serial)
{
}
public virtual Mobile Brigands => new Brigand();
public virtual Mobile Executioners => new Executioner();
public override void AddComponents()
{
Visible = false;
DecayDelay = TimeSpan.FromMinutes(5.0);
AddItem(new Static(0x10ee), 0, 0, 0);
AddItem(new Static(0xfac), 0, 7, 0);
switch (Utility.Random(3))
{
case 0:
{
AddItem(new Item(0xDE3), 0, 7, 0); // Campfire
AddItem(new Item(0x974), 0, 7, 1); // Cauldron
break;
}
case 1:
{
AddItem(new Item(0x1E95), 0, 7, 1); // Rabbit on a spit
break;
}
default:
{
AddItem(new Item(0x1E94), 0, 7, 1); // Chicken on a spit
break;
}
}
AddCampChests();
for (var i = 0; i < 4; i++)
{
AddMobile(Brigands, 6, Utility.RandomMinMax(-7, 7), Utility.RandomMinMax(-7, 7), 0);
}
BaseCreature bc = Utility.Random(2) switch
{
0 => new Noble(),
_ => new SeekerOfAdventure()
};
bc.IsPrisoner = true;
bc.CantWalk = true;
m_Prisoner = bc;
m_Prisoner.YellHue = Utility.RandomList(0x57, 0x67, 0x77, 0x87, 0x117);
AddMobile(m_Prisoner, 2, Utility.RandomMinMax(-2, 2), Utility.RandomMinMax(-2, 2), 0);
}
private void AddCampChests()
{
LockableContainer chest = Utility.Random(3) switch
{
0 => new MetalChest(),
1 => new MetalGoldenChest(),
_ => new WoodenChest()
};
chest.LiftOverride = true;
TreasureMapChest.Fill(chest, 1);
AddItem(chest, -2, -2, 0);
LockableContainer crates = Utility.Random(4) switch
{
0 => new SmallCrate(),
1 => new MediumCrate(),
2 => new LargeCrate(),
_ => new LockableBarrel()
};
crates.TrapType = TrapType.ExplosionTrap;
crates.TrapPower = Utility.RandomMinMax(30, 40);
crates.TrapLevel = 2;
crates.RequiredSkill = 76;
crates.LockLevel = 66;
crates.MaxLockLevel = 116;
crates.Locked = true;
crates.DropItem(new Gold(Utility.RandomMinMax(100, 400)));
crates.DropItem(new Arrow(10));
crates.DropItem(new Bolt(10));
crates.LiftOverride = true;
crates.DropItem(
Utility.Random(5) switch
{ {
0 => new LesserCurePotion(), AddItem(new Item(0xDE3), 0, 7, 0); // Campfire
1 => new LesserExplosionPotion(), AddItem(new Item(0x974), 0, 7, 1); // Cauldron
2 => new LesserHealPotion(), break;
3 => new LesserPoisonPotion(),
_ => null // 4
} }
); case 1:
AddItem(crates, 2, 2, 0);
}
// Don't refresh decay timer
public override void OnEnter(Mobile m)
{
if (m.Player && m_Prisoner?.CantWalk == true)
{
var number = Utility.Random(8) switch
{ {
0 => 502261, AddItem(new Item(0x1E95), 0, 7, 1); // Rabbit on a spit
1 => 502262, break;
2 => 502263, }
3 => 502264, default:
4 => 502265, {
5 => 502266, AddItem(new Item(0x1E94), 0, 7, 1); // Chicken on a spit
6 => 502267, break;
_ => 502268 }
};
m_Prisoner.Yell(number);
}
} }
// Don't refresh decay timer AddCampChests();
public override void OnExit(Mobile m)
for (var i = 0; i < 4; i++)
{ {
AddMobile(Brigands, 6, Utility.RandomMinMax(-7, 7), Utility.RandomMinMax(-7, 7), 0);
} }
public override void AddItem(Item item, int xOffset, int yOffset, int zOffset) BaseCreature bc = Utility.Random(2) switch
{ {
if (item != null) 0 => new Noble(),
_ => new SeekerOfAdventure()
};
bc.IsPrisoner = true;
bc.CantWalk = true;
_prisoner = bc;
_prisoner.YellHue = Utility.RandomList(0x57, 0x67, 0x77, 0x87, 0x117);
AddMobile(_prisoner, 2, Utility.RandomMinMax(-2, 2), Utility.RandomMinMax(-2, 2), 0);
}
private void AddCampChests()
{
LockableContainer chest = Utility.Random(3) switch
{
0 => new MetalChest(),
1 => new MetalGoldenChest(),
_ => new WoodenChest()
};
chest.LiftOverride = true;
TreasureMapChest.Fill(chest, 1);
AddItem(chest, -2, -2, 0);
LockableContainer crates = Utility.Random(4) switch
{
0 => new SmallCrate(),
1 => new MediumCrate(),
2 => new LargeCrate(),
_ => new LockableBarrel()
};
crates.TrapType = TrapType.ExplosionTrap;
crates.TrapPower = Utility.RandomMinMax(30, 40);
crates.TrapLevel = 2;
crates.RequiredSkill = 76;
crates.LockLevel = 66;
crates.MaxLockLevel = 116;
crates.Locked = true;
crates.DropItem(new Gold(Utility.RandomMinMax(100, 400)));
crates.DropItem(new Arrow(10));
crates.DropItem(new Bolt(10));
crates.LiftOverride = true;
crates.DropItem(
Utility.Random(5) switch
{ {
item.Movable = false; 0 => new LesserCurePotion(),
1 => new LesserExplosionPotion(),
2 => new LesserHealPotion(),
3 => new LesserPoisonPotion(),
_ => null // 4
} }
);
base.AddItem(item, xOffset, yOffset, zOffset); AddItem(crates, 2, 2, 0);
} }
public override void Serialize(IGenericWriter writer) // Don't refresh decay timer
public override void OnEnter(Mobile m)
{
if (m.Player && _prisoner?.CantWalk == true)
{ {
base.Serialize(writer); var number = Utility.Random(8) switch
writer.Write(0); // version
writer.Write(m_Prisoner);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
switch (version)
{ {
case 0: 0 => 502261,
{ 1 => 502262,
m_Prisoner = reader.ReadEntity<Mobile>(); 2 => 502263,
break; 3 => 502264,
} 4 => 502265,
} 5 => 502266,
6 => 502267,
_ => 502268
};
_prisoner.Yell(number);
} }
} }
// Don't refresh decay timer
public override void OnExit(Mobile m)
{
}
public override void AddItem(Item item, int xOffset, int yOffset, int zOffset)
{
if (item != null)
{
item.Movable = false;
}
base.AddItem(item, xOffset, yOffset, zOffset);
}
} }

53
Projects/UOContent/Multis/Camps/HealerCamp.cs
View file

@ -1,47 +1,30 @@
using ModernUO.Serialization;
using Server.Items; using Server.Items;
using Server.Mobiles; using Server.Mobiles;
namespace Server.Multis namespace Server.Multis;
[SerializationGenerator(0, false)]
public partial class HealerCamp : BaseCamp
{ {
public class HealerCamp : BaseCamp [Constructible]
public HealerCamp() : base(0x1F4)
{ {
[Constructible] }
public HealerCamp() : base(0x1F4)
{
}
public HealerCamp(Serial serial) : base(serial) public override void AddComponents()
{ {
} BaseDoor west, east;
public override void AddComponents() AddItem(west = new LightWoodGate(DoorFacing.WestCW), -4, 4, 7);
{ AddItem(east = new LightWoodGate(DoorFacing.EastCCW), -3, 4, 7);
BaseDoor west, east;
AddItem(west = new LightWoodGate(DoorFacing.WestCW), -4, 4, 7); west.Link = east;
AddItem(east = new LightWoodGate(DoorFacing.EastCCW), -3, 4, 7); east.Link = west;
west.Link = east; AddItem(new Sign(SignType.Healer, SignFacing.West), -5, 5, -4);
east.Link = west;
AddItem(new Sign(SignType.Healer, SignFacing.West), -5, 5, -4); AddMobile(new Healer(), 4, -4, 3, 7);
AddMobile(new Healer(), 5, 4, -2, 0);
AddMobile(new Healer(), 4, -4, 3, 7);
AddMobile(new Healer(), 5, 4, -2, 0);
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
} }
} }

306
Projects/UOContent/Multis/Camps/LizardmenCamp.cs
View file

@ -1,199 +1,159 @@
using System; using System;
using ModernUO.Serialization;
using Server.Items; using Server.Items;
using Server.Mobiles; using Server.Mobiles;
namespace Server.Multis namespace Server.Multis;
[SerializationGenerator(0, false)]
public partial class LizardmenCamp : BaseCamp
{ {
public class LizardmenCamp : BaseCamp private Mobile _prisoner;
[Constructible]
public LizardmenCamp() : base(0x10EE) // dummy garbage at center
{ {
private Mobile m_Prisoner; }
[Constructible] public virtual Mobile Lizardmen => new Lizardman();
public LizardmenCamp() : base(0x10EE) // dummy garbage at center
public override void AddComponents()
{
Visible = false;
DecayDelay = TimeSpan.FromMinutes(5.0);
AddItem(new Static(0x10ee), 0, 0, 0);
AddItem(new Static(0xfac), 0, 7, 0);
switch (Utility.Random(3))
{ {
} case 0:
public LizardmenCamp(Serial serial) : base(serial)
{
}
public virtual Mobile Lizardmen => new Lizardman();
public override void AddComponents()
{
BaseCreature bc;
// BaseEscortable be;
Visible = false;
DecayDelay = TimeSpan.FromMinutes(5.0);
AddItem(new Static(0x10ee), 0, 0, 0);
AddItem(new Static(0xfac), 0, 7, 0);
switch (Utility.Random(3))
{
case 0:
{
AddItem(new Item(0xDE3), 0, 7, 0); // Campfire
AddItem(new Item(0x974), 0, 7, 1); // Cauldron
break;
}
case 1:
{
AddItem(new Item(0x1E95), 0, 7, 1); // Rabbit on a spit
break;
}
default:
{
AddItem(new Item(0x1E94), 0, 7, 1); // Chicken on a spit
break;
}
}
AddItem(new Item(0x41F), 4, 4, 0); // Gruesome Standart South
AddCampChests();
for (var i = 0; i < 4; i++)
{
AddMobile(Lizardmen, 6, Utility.RandomMinMax(-7, 7), Utility.RandomMinMax(-7, 7), 0);
}
m_Prisoner = Utility.Random(2) switch
{
0 => new Noble(),
_ => new SeekerOfAdventure()
};
// be = (BaseEscortable)m_Prisoner;
// be.m_Captive = true;
bc = (BaseCreature)m_Prisoner;
bc.IsPrisoner = true;
bc.CantWalk = true;
m_Prisoner.YellHue = Utility.RandomList(0x57, 0x67, 0x77, 0x87, 0x117);
AddMobile(m_Prisoner, 2, Utility.RandomMinMax(-2, 2), Utility.RandomMinMax(-2, 2), 0);
}
private void AddCampChests()
{
var chest = Utility.Random(3) switch
{
0 => (LockableContainer)new MetalChest(),
1 => new MetalGoldenChest(),
_ => new WoodenChest()
};
chest.LiftOverride = true;
TreasureMapChest.Fill(chest, 1);
AddItem(chest, 2, -2, 0);
var crates = Utility.Random(4) switch
{
0 => (LockableContainer)new SmallCrate(),
1 => new MediumCrate(),
2 => new LargeCrate(),
_ => new LockableBarrel()
};
crates.TrapType = TrapType.ExplosionTrap;
crates.TrapPower = Utility.RandomMinMax(30, 40);
crates.TrapLevel = 2;
crates.RequiredSkill = 76;
crates.LockLevel = 66;
crates.MaxLockLevel = 116;
crates.Locked = true;
crates.DropItem(new Gold(Utility.RandomMinMax(100, 400)));
crates.DropItem(new Arrow(10));
crates.DropItem(new Bolt(10));
crates.LiftOverride = true;
if (Utility.RandomDouble() < 0.8)
{
switch (Utility.Random(4))
{ {
case 0: AddItem(new Item(0xDE3), 0, 7, 0); // Campfire
crates.DropItem(new LesserCurePotion()); AddItem(new Item(0x974), 0, 7, 1); // Cauldron
break; break;
case 1:
crates.DropItem(new LesserExplosionPotion());
break;
case 2:
crates.DropItem(new LesserHealPotion());
break;
default:
crates.DropItem(new LesserPoisonPotion());
break;
} }
} case 1:
AddItem(crates, -2, 2, 0);
}
// Don't refresh decay timer
public override void OnEnter(Mobile m)
{
if (m.Player && m_Prisoner?.CantWalk == true)
{
var number = Utility.Random(8) switch
{ {
0 => 502261, AddItem(new Item(0x1E95), 0, 7, 1); // Rabbit on a spit
1 => 502262, break;
2 => 502263, }
3 => 502264, default:
4 => 502265, {
5 => 502266, AddItem(new Item(0x1E94), 0, 7, 1); // Chicken on a spit
6 => 502267, break;
_ => 502268 }
};
m_Prisoner.Yell(number);
}
} }
// Don't refresh decay timer AddItem(new Item(0x41F), 4, 4, 0); // Gruesome Standart South
public override void OnExit(Mobile m)
AddCampChests();
for (var i = 0; i < 4; i++)
{ {
AddMobile(Lizardmen, 6, Utility.RandomMinMax(-7, 7), Utility.RandomMinMax(-7, 7), 0);
} }
public override void AddItem(Item item, int xOffset, int yOffset, int zOffset) _prisoner = Utility.Random(2) switch
{ {
if (item != null) 0 => new Noble(),
_ => new SeekerOfAdventure()
};
var bc = (BaseCreature)_prisoner;
bc.IsPrisoner = true;
bc.CantWalk = true;
_prisoner.YellHue = Utility.RandomList(0x57, 0x67, 0x77, 0x87, 0x117);
AddMobile(_prisoner, 2, Utility.RandomMinMax(-2, 2), Utility.RandomMinMax(-2, 2), 0);
}
private void AddCampChests()
{
var chest = Utility.Random(3) switch
{
0 => (LockableContainer)new MetalChest(),
1 => new MetalGoldenChest(),
_ => new WoodenChest()
};
chest.LiftOverride = true;
TreasureMapChest.Fill(chest, 1);
AddItem(chest, 2, -2, 0);
var crates = Utility.Random(4) switch
{
0 => (LockableContainer)new SmallCrate(),
1 => new MediumCrate(),
2 => new LargeCrate(),
_ => new LockableBarrel()
};
crates.TrapType = TrapType.ExplosionTrap;
crates.TrapPower = Utility.RandomMinMax(30, 40);
crates.TrapLevel = 2;
crates.RequiredSkill = 76;
crates.LockLevel = 66;
crates.MaxLockLevel = 116;
crates.Locked = true;
crates.DropItem(new Gold(Utility.RandomMinMax(100, 400)));
crates.DropItem(new Arrow(10));
crates.DropItem(new Bolt(10));
crates.LiftOverride = true;
if (Utility.RandomDouble() < 0.8)
{
Item item = Utility.Random(4) switch
{ {
item.Movable = false; 0 => new LesserCurePotion(),
} 1 => new LesserExplosionPotion(),
2 => new LesserHealPotion(),
_ => new LesserPoisonPotion()
};
base.AddItem(item, xOffset, yOffset, zOffset); crates.DropItem(item);
} }
public override void Serialize(IGenericWriter writer) AddItem(crates, -2, 2, 0);
}
// Don't refresh decay timer
public override void OnEnter(Mobile m)
{
if (m.Player && _prisoner?.CantWalk == true)
{ {
base.Serialize(writer); var number = Utility.Random(8) switch
writer.Write(0); // version
writer.Write(m_Prisoner);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
switch (version)
{ {
case 0: 0 => 502261,
{ 1 => 502262,
m_Prisoner = reader.ReadEntity<Mobile>(); 2 => 502263,
break; 3 => 502264,
} 4 => 502265,
} 5 => 502266,
6 => 502267,
_ => 502268
};
_prisoner.Yell(number);
} }
} }
// Don't refresh decay timer
public override void OnExit(Mobile m)
{
}
public override void AddItem(Item item, int xOffset, int yOffset, int zOffset)
{
if (item != null)
{
item.Movable = false;
}
base.AddItem(item, xOffset, yOffset, zOffset);
}
} }

53
Projects/UOContent/Multis/Camps/MageCamp.cs
View file

@ -1,47 +1,30 @@
using ModernUO.Serialization;
using Server.Items; using Server.Items;
using Server.Mobiles; using Server.Mobiles;
namespace Server.Multis namespace Server.Multis;
[SerializationGenerator(0, false)]
public partial class MageCamp : BaseCamp
{ {
public class MageCamp : BaseCamp [Constructible]
public MageCamp() : base(0x1F5)
{ {
[Constructible] }
public MageCamp() : base(0x1F5)
{
}
public MageCamp(Serial serial) : base(serial) public override void AddComponents()
{ {
} BaseDoor west, east;
public override void AddComponents() AddItem(west = new LightWoodGate(DoorFacing.WestCW), -4, 4, 7);
{ AddItem(east = new LightWoodGate(DoorFacing.EastCCW), -3, 4, 7);
BaseDoor west, east;
AddItem(west = new LightWoodGate(DoorFacing.WestCW), -4, 4, 7); west.Link = east;
AddItem(east = new LightWoodGate(DoorFacing.EastCCW), -3, 4, 7); east.Link = west;
west.Link = east; AddItem(new Sign(SignType.Mage, SignFacing.West), -5, 5, -4);
east.Link = west;
AddItem(new Sign(SignType.Mage, SignFacing.West), -5, 5, -4); AddMobile(new Mage(), 4, -4, 3, 7);
AddMobile(new Mage(), 5, 4, -2, 0);
AddMobile(new Mage(), 4, -4, 3, 7);
AddMobile(new Mage(), 5, 4, -2, 0);
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
} }
} }

316
Projects/UOContent/Multis/Camps/OrcCamp.cs
View file

@ -1,207 +1,161 @@
using System; using System;
using ModernUO.Serialization;
using Server.Items; using Server.Items;
using Server.Mobiles; using Server.Mobiles;
namespace Server.Multis namespace Server.Multis;
[SerializationGenerator(0, false)]
public partial class OrcCamp : BaseCamp
{ {
public class OrcCamp : BaseCamp private Mobile _prisoner;
[Constructible]
public OrcCamp() : base(0x10EE) // dummy garbage at center
{ {
private Mobile m_Prisoner; }
[Constructible] public virtual Mobile Orcs => new Orc();
public OrcCamp() : base(0x10EE) // dummy garbage at center
public override void AddComponents()
{
Visible = false;
DecayDelay = TimeSpan.FromMinutes(5.0);
AddItem(new Static(0x10ee), 0, 0, 0);
AddItem(new Static(0xfac), 0, 7, 0);
switch (Utility.Random(3))
{ {
} case 0:
public OrcCamp(Serial serial) : base(serial)
{
}
public virtual Mobile Orcs => new Orc();
public override void AddComponents()
{
BaseCreature bc;
// BaseEscortable be;
Visible = false;
DecayDelay = TimeSpan.FromMinutes(5.0);
AddItem(new Static(0x10ee), 0, 0, 0);
AddItem(new Static(0xfac), 0, 7, 0);
switch (Utility.Random(3))
{
case 0:
{
AddItem(new Item(0xDE3), 0, 7, 0); // Campfire
AddItem(new Item(0x974), 0, 7, 1); // Cauldron
break;
}
case 1:
{
AddItem(new Item(0x1E95), 0, 7, 1); // Rabbit on a spit
break;
}
default:
{
AddItem(new Item(0x1E94), 0, 7, 1); // Chicken on a spit
break;
}
}
AddItem(new Item(0x428), -5, -4, 0); // Gruesome Standart West
AddCampChests();
for (var i = 0; i < 3; i++)
{
AddMobile(Orcs, 6, Utility.RandomMinMax(-7, 7), Utility.RandomMinMax(-7, 7), 0);
}
AddMobile(new OrcCaptain(), 2, Utility.RandomMinMax(-7, 7), Utility.RandomMinMax(-7, 7), 0);
m_Prisoner = Utility.Random(2) switch
{
0 => new Noble(),
_ => new SeekerOfAdventure()
};
// be = (BaseEscortable)m_Prisoner;
// be.m_Captive = true;
bc = (BaseCreature)m_Prisoner;
bc.IsPrisoner = true;
bc.CantWalk = true;
m_Prisoner.YellHue = Utility.RandomList(0x57, 0x67, 0x77, 0x87, 0x117);
AddMobile(m_Prisoner, 2, Utility.RandomMinMax(-2, 2), Utility.RandomMinMax(-2, 2), 0);
}
private void AddCampChests()
{
var chest = Utility.Random(3) switch
{
0 => (LockableContainer)new MetalChest(),
1 => new MetalGoldenChest(),
_ => new WoodenChest()
};
chest.LiftOverride = true;
TreasureMapChest.Fill(chest, 1);
AddItem(chest, -2, 2, 0);
var crates = Utility.Random(4) switch
{
0 => (LockableContainer)new SmallCrate(),
1 => new MediumCrate(),
2 => new LargeCrate(),
_ => new LockableBarrel()
};
crates.TrapType = TrapType.ExplosionTrap;
crates.TrapPower = Utility.RandomMinMax(30, 40);
crates.TrapLevel = 2;
crates.RequiredSkill = 76;
crates.LockLevel = 66;
crates.MaxLockLevel = 116;
crates.Locked = true;
crates.DropItem(new Gold(Utility.RandomMinMax(100, 400)));
crates.DropItem(new Arrow(10));
crates.DropItem(new Bolt(10));
crates.LiftOverride = true;
if (Utility.RandomDouble() < 0.8)
{
switch (Utility.Random(4))
{ {
case 0: AddItem(new Item(0xDE3), 0, 7, 0); // Campfire
crates.DropItem(new LesserCurePotion()); AddItem(new Item(0x974), 0, 7, 1); // Cauldron
break; break;
case 1:
crates.DropItem(new LesserExplosionPotion());
break;
case 2:
crates.DropItem(new LesserHealPotion());
break;
default:
crates.DropItem(new LesserPoisonPotion());
break;
} }
} case 1:
AddItem(crates, 2, -2, 0);
}
// Don't refresh decay timer
public override void OnEnter(Mobile m)
{
if (m.Player && m_Prisoner?.CantWalk == true)
{
var number = Utility.Random(8) switch
{ {
0 => 502261, AddItem(new Item(0x1E95), 0, 7, 1); // Rabbit on a spit
1 => 502262, break;
2 => 502263, }
3 => 502264, default:
4 => 502265, {
5 => 502266, AddItem(new Item(0x1E94), 0, 7, 1); // Chicken on a spit
6 => 502267, break;
_ => 502268 }
};
m_Prisoner.Yell(number);
}
} }
// Don't refresh decay timer AddItem(new Item(0x428), -5, -4, 0); // Gruesome Standart West
public override void OnExit(Mobile m)
AddCampChests();
for (var i = 0; i < 3; i++)
{ {
AddMobile(Orcs, 6, Utility.RandomMinMax(-7, 7), Utility.RandomMinMax(-7, 7), 0);
} }
public override void AddItem(Item item, int xOffset, int yOffset, int zOffset) AddMobile(new OrcCaptain(), 2, Utility.RandomMinMax(-7, 7), Utility.RandomMinMax(-7, 7), 0);
_prisoner = Utility.Random(2) switch
{ {
if (item != null) 0 => new Noble(),
_ => new SeekerOfAdventure()
};
var bc = (BaseCreature)_prisoner;
bc.IsPrisoner = true;
bc.CantWalk = true;
_prisoner.YellHue = Utility.RandomList(0x57, 0x67, 0x77, 0x87, 0x117);
AddMobile(_prisoner, 2, Utility.RandomMinMax(-2, 2), Utility.RandomMinMax(-2, 2), 0);
}
private void AddCampChests()
{
var chest = Utility.Random(3) switch
{
0 => (LockableContainer)new MetalChest(),
1 => new MetalGoldenChest(),
_ => new WoodenChest()
};
chest.LiftOverride = true;
TreasureMapChest.Fill(chest, 1);
AddItem(chest, -2, 2, 0);
var crates = Utility.Random(4) switch
{
0 => (LockableContainer)new SmallCrate(),
1 => new MediumCrate(),
2 => new LargeCrate(),
_ => new LockableBarrel()
};
crates.TrapType = TrapType.ExplosionTrap;
crates.TrapPower = Utility.RandomMinMax(30, 40);
crates.TrapLevel = 2;
crates.RequiredSkill = 76;
crates.LockLevel = 66;
crates.MaxLockLevel = 116;
crates.Locked = true;
crates.DropItem(new Gold(Utility.RandomMinMax(100, 400)));
crates.DropItem(new Arrow(10));
crates.DropItem(new Bolt(10));
crates.LiftOverride = true;
if (Utility.RandomDouble() < 0.8)
{
Item item = Utility.Random(4) switch
{ {
item.Movable = false; 0 => new LesserCurePotion(),
} 1 => new LesserExplosionPotion(),
2 => new LesserHealPotion(),
_ => new LesserPoisonPotion()
};
base.AddItem(item, xOffset, yOffset, zOffset); crates.DropItem(item);
} }
public override void Serialize(IGenericWriter writer) AddItem(crates, 2, -2, 0);
}
// Don't refresh decay timer
public override void OnEnter(Mobile m)
{
if (m.Player && _prisoner?.CantWalk == true)
{ {
base.Serialize(writer); var number = Utility.Random(8) switch
writer.Write(1); // version
writer.Write(m_Prisoner);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
switch (version)
{ {
case 1: 0 => 502261,
{ 1 => 502262,
m_Prisoner = reader.ReadEntity<Mobile>(); 2 => 502263,
break; 3 => 502264,
} 4 => 502265,
case 0: 5 => 502266,
{ 6 => 502267,
m_Prisoner = reader.ReadEntity<Mobile>(); _ => 502268
reader.ReadEntity<Item>(); };
break;
} _prisoner.Yell(number);
}
} }
} }
// Don't refresh decay timer
public override void OnExit(Mobile m)
{
}
public override void AddItem(Item item, int xOffset, int yOffset, int zOffset)
{
if (item != null)
{
item.Movable = false;
}
base.AddItem(item, xOffset, yOffset, zOffset);
}
} }

312
Projects/UOContent/Multis/Camps/RatCamp.cs
View file

@ -1,205 +1,159 @@
using System; using System;
using ModernUO.Serialization;
using Server.Items; using Server.Items;
using Server.Mobiles; using Server.Mobiles;
namespace Server.Multis namespace Server.Multis;
[SerializationGenerator(0, false)]
public partial class RatCamp : BaseCamp
{ {
public class RatCamp : BaseCamp private Mobile _prisoner;
[Constructible]
public RatCamp() : base(0x10EE) // dummy garbage at center
{ {
private Mobile m_Prisoner; }
[Constructible] public virtual Mobile Ratmen => new Ratman();
public RatCamp() : base(0x10EE) // dummy garbage at center
public override void AddComponents()
{
Visible = false;
DecayDelay = TimeSpan.FromMinutes(5.0);
AddItem(new Static(0x10ee), 0, 0, 0);
AddItem(new Static(0xfac), 0, 6, 0);
switch (Utility.Random(3))
{ {
} case 0:
public RatCamp(Serial serial) : base(serial)
{
}
public virtual Mobile Ratmen => new Ratman();
public override void AddComponents()
{
BaseCreature bc;
// BaseEscortable be;
Visible = false;
DecayDelay = TimeSpan.FromMinutes(5.0);
AddItem(new Static(0x10ee), 0, 0, 0);
AddItem(new Static(0xfac), 0, 6, 0);
switch (Utility.Random(3))
{
case 0:
{
AddItem(new Item(0xDE3), 0, 6, 0); // Campfire
AddItem(new Item(0x974), 0, 6, 1); // Cauldron
break;
}
case 1:
{
AddItem(new Item(0x1E95), 0, 6, 1); // Rabbit on a spit
break;
}
default:
{
AddItem(new Item(0x1E94), 0, 6, 1); // Chicken on a spit
break;
}
}
AddItem(new Item(0x41F), 5, 5, 0); // Gruesome Standart South
AddCampChests();
for (var i = 0; i < 4; i++)
{
AddMobile(Ratmen, 6, Utility.RandomMinMax(-7, 7), Utility.RandomMinMax(-7, 7), 0);
}
m_Prisoner = Utility.Random(2) switch
{
0 => new Noble(),
_ => new SeekerOfAdventure()
};
// be = (BaseEscortable)m_Prisoner;
// be.m_Captive = true;
bc = (BaseCreature)m_Prisoner;
bc.IsPrisoner = true;
bc.CantWalk = true;
m_Prisoner.YellHue = Utility.RandomList(0x57, 0x67, 0x77, 0x87, 0x117);
AddMobile(m_Prisoner, 2, Utility.RandomMinMax(-2, 2), Utility.RandomMinMax(-2, 2), 0);
}
private void AddCampChests()
{
var chest = Utility.Random(3) switch
{
0 => (LockableContainer)new MetalChest(),
1 => new MetalGoldenChest(),
_ => new WoodenChest()
};
chest.LiftOverride = true;
TreasureMapChest.Fill(chest, 1);
AddItem(chest, -2, -2, 0);
var crates = Utility.Random(4) switch
{
0 => (LockableContainer)new SmallCrate(),
1 => new MediumCrate(),
2 => new LargeCrate(),
_ => new LockableBarrel()
};
crates.TrapType = TrapType.ExplosionTrap;
crates.TrapPower = Utility.RandomMinMax(30, 40);
crates.TrapLevel = 2;
crates.RequiredSkill = 76;
crates.LockLevel = 66;
crates.MaxLockLevel = 116;
crates.Locked = true;
crates.DropItem(new Gold(Utility.RandomMinMax(100, 400)));
crates.DropItem(new Arrow(10));
crates.DropItem(new Bolt(10));
crates.LiftOverride = true;
if (Utility.RandomDouble() < 0.8)
{
switch (Utility.Random(4))
{ {
case 0: AddItem(new Item(0xDE3), 0, 6, 0); // Campfire
crates.DropItem(new LesserCurePotion()); AddItem(new Item(0x974), 0, 6, 1); // Cauldron
break; break;
case 1:
crates.DropItem(new LesserExplosionPotion());
break;
case 2:
crates.DropItem(new LesserHealPotion());
break;
default:
crates.DropItem(new LesserPoisonPotion());
break;
} }
} case 1:
AddItem(crates, 2, 2, 0);
}
// Don't refresh decay timer
public override void OnEnter(Mobile m)
{
if (m.Player && m_Prisoner?.CantWalk == true)
{
var number = Utility.Random(8) switch
{ {
0 => 502261, AddItem(new Item(0x1E95), 0, 6, 1); // Rabbit on a spit
1 => 502262, break;
2 => 502263, }
3 => 502264, default:
4 => 502265, {
5 => 502266, AddItem(new Item(0x1E94), 0, 6, 1); // Chicken on a spit
6 => 502267, break;
_ => 502268 }
};
m_Prisoner.Yell(number);
}
} }
// Don't refresh decay timer AddItem(new Item(0x41F), 5, 5, 0); // Gruesome Standart South
public override void OnExit(Mobile m)
AddCampChests();
for (var i = 0; i < 4; i++)
{ {
AddMobile(Ratmen, 6, Utility.RandomMinMax(-7, 7), Utility.RandomMinMax(-7, 7), 0);
} }
public override void AddItem(Item item, int xOffset, int yOffset, int zOffset) _prisoner = Utility.Random(2) switch
{ {
if (item != null) 0 => new Noble(),
_ => new SeekerOfAdventure()
};
var bc = (BaseCreature)_prisoner;
bc.IsPrisoner = true;
bc.CantWalk = true;
_prisoner.YellHue = Utility.RandomList(0x57, 0x67, 0x77, 0x87, 0x117);
AddMobile(_prisoner, 2, Utility.RandomMinMax(-2, 2), Utility.RandomMinMax(-2, 2), 0);
}
private void AddCampChests()
{
var chest = Utility.Random(3) switch
{
0 => (LockableContainer)new MetalChest(),
1 => new MetalGoldenChest(),
_ => new WoodenChest()
};
chest.LiftOverride = true;
TreasureMapChest.Fill(chest, 1);
AddItem(chest, -2, -2, 0);
var crates = Utility.Random(4) switch
{
0 => (LockableContainer)new SmallCrate(),
1 => new MediumCrate(),
2 => new LargeCrate(),
_ => new LockableBarrel()
};
crates.TrapType = TrapType.ExplosionTrap;
crates.TrapPower = Utility.RandomMinMax(30, 40);
crates.TrapLevel = 2;
crates.RequiredSkill = 76;
crates.LockLevel = 66;
crates.MaxLockLevel = 116;
crates.Locked = true;
crates.DropItem(new Gold(Utility.RandomMinMax(100, 400)));
crates.DropItem(new Arrow(10));
crates.DropItem(new Bolt(10));
crates.LiftOverride = true;
if (Utility.RandomDouble() < 0.8)
{
Item item = Utility.Random(4) switch
{ {
item.Movable = false; 0 => new LesserCurePotion(),
} 1 => new LesserExplosionPotion(),
2 => new LesserHealPotion(),
_ => new LesserPoisonPotion()
};
base.AddItem(item, xOffset, yOffset, zOffset); crates.DropItem(item);
} }
public override void Serialize(IGenericWriter writer) AddItem(crates, 2, 2, 0);
}
// Don't refresh decay timer
public override void OnEnter(Mobile m)
{
if (m.Player && _prisoner?.CantWalk == true)
{ {
base.Serialize(writer); var number = Utility.Random(8) switch
writer.Write(1); // version
writer.Write(m_Prisoner);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
switch (version)
{ {
case 1: 0 => 502261,
{ 1 => 502262,
m_Prisoner = reader.ReadEntity<Mobile>(); 2 => 502263,
break; 3 => 502264,
} 4 => 502265,
case 0: 5 => 502266,
{ 6 => 502267,
m_Prisoner = reader.ReadEntity<Mobile>(); _ => 502268
reader.ReadEntity<Item>(); };
break;
} _prisoner.Yell(number);
}
} }
} }
// Don't refresh decay timer
public override void OnExit(Mobile m)
{
}
public override void AddItem(Item item, int xOffset, int yOffset, int zOffset)
{
if (item != null)
{
item.Movable = false;
}
base.AddItem(item, xOffset, yOffset, zOffset);
}
} }