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

Removes UOAM vendors. (#241)

Browse source
This commit is contained in:
Kamron Batman 2020-09-12 11:56:52 -07:00 • committed by GitHub
parent 7dbfa086bc
commit c29ad3729b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 1236 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Projects/UOContent/Misc/VendorGenerator.cs
View file

@ -5,7 +5,7 @@ using Server.Engines.Spawners;
namespace Server
{
public class VendorGenerator
public static class VendorGenerator
{
private static readonly Rectangle2D[] m_BritRegions =
{

52
Projects/UOContent/Misc/WelcomeTimer.cs
View file

@ -7,32 +7,38 @@ namespace Server.Misc
/// </summary>
public class WelcomeTimer : Timer
{
private static readonly string[] m_Messages = TestCenter.Enabled
? new[]
{
"Welcome to this test shard. You are able to customize your character's stats and skills at anytime to anything you wish. To see the commands to do this just say 'help'.",
"You will find a bank check worth 1,000,000 gold in your bank!",
"A spellbook and a bag of reagents has been placed into your bank box.",
"Various tools have been placed into your bank.",
"Various raw materials like ingots, logs, feathers, hides, bottles, etc, have been placed into your bank.",
"5 unmarked recall runes, 5 Felucca moonstones and 5 Trammel moonstones have been placed into your bank box.",
"One of each level of treasure map has been placed in your bank box.",
"You will find 9000 silver pieces deposited into your bank box. Spend it as you see fit and enjoy yourself!",
"You will find 9000 gold pieces deposited into your bank box. Spend it as you see fit and enjoy yourself!",
"A bag of PowerScrolls has been placed in your bank box."
}
: new[]
{
// Yes, this message is a pathetic message, It's suggested that you change it.
"Welcome to this shard.",
"Please enjoy your stay."
};
private static string[] m_Messages;
private readonly int m_Count;
private readonly Mobile m_Mobile;
private int m_State;
public static void Initialize()
{
m_Messages = TestCenter.Enabled
? new[]
{
$"Welcome to {ServerList.ServerName}.",
"You are able to customize your character's stats and skills at anytime to anything you wish.",
"To see the commands to do this just say 'help'.",
"You will find a bank check worth 1,000,000 gold in your bank!",
"A spellbook and a bag of reagents has been placed into your bank box.",
"Various tools have been placed into your bank.",
"Various raw materials like ingots, logs, feathers, hides, bottles, etc, have been placed into your bank.",
"5 unmarked recall runes, 5 Felucca moonstones and 5 Trammel moonstones have been placed into your bank box.",
"One of each level of treasure map has been placed in your bank box.",
"You will find 9000 silver pieces deposited into your bank box. Spend it as you see fit and enjoy yourself!",
"You will find 9000 gold pieces deposited into your bank box. Spend it as you see fit and enjoy yourself!",
"A bag of PowerScrolls has been placed in your bank box."
}
: new[]
{
$"Welcome to {ServerList.ServerName}.",
"Please enjoy your stay."
};
}
public WelcomeTimer(Mobile m) : this(m, m_Messages.Length)
{
}
@ -46,10 +52,12 @@ namespace Server.Misc
protected override void OnTick()
{
if (m_State < m_Count)
{
m_Mobile.SendMessage(0x35, m_Messages[m_State++]);
return;
}
if (m_State == m_Count)
Stop();
Stop();
}
}
}

349
Projects/UOContent/Misc/uoamVendors.cs
View file

@ -1,349 +0,0 @@
using System;
using System.Collections.Generic;
using System.IO;
using Server.Engines.Spawners;
namespace Server
{
public class UOAMVendorGenerator
{
// configuration
private const int
NPCCount = 2; // 2 npcs per type (so a mage spawner will spawn 2 npcs, a alchemist and herbalist spawner will spawn 4 npcs total)
private const int HomeRange = 5; // How far should they wander?
private const bool TotalRespawn = true; // Should we spawn them up right away?
private const int Team = 0; // "team" the npcs are on
private static int m_Count;
private static readonly TimeSpan MinTime = TimeSpan.FromMinutes(2.5); // min spawn time
private static readonly TimeSpan MaxTime = TimeSpan.FromMinutes(10.0); // max spawn time
public static void Initialize()
{
CommandSystem.Register("UOAMVendors", AccessLevel.Administrator, Generate_OnCommand);
}
[Usage("UOAMVendors")]
[Description("Generates vendor spawners from Data/Common.MAP (taken from UOAutoMap)")]
private static void Generate_OnCommand(CommandEventArgs e)
{
Parse(e.Mobile);
}
public static void Parse(Mobile from)
{
var vendor_path = Path.Combine(Core.BaseDirectory, "Data/Common.map");
m_Count = 0;
if (!File.Exists(vendor_path))
{
from.SendMessage("{0} not found!", vendor_path);
return;
}
from.SendMessage("Generating Vendors...");
using (var ip = new StreamReader(vendor_path))
{
string line;
while ((line = ip.ReadLine()) != null)
{
var indexOf = line.IndexOf(':');
if (indexOf == -1)
continue;
var type = line.Substring(0, ++indexOf).Trim();
var sub = line.Substring(indexOf).Trim();
var split = sub.Split(' ');
if (split.Length < 3)
continue;
split = new[] { type, split[0], split[1], split[2] };
switch (split[0].ToLower())
{
case "-healer:":
PlaceNPC(split[1], split[2], split[3], "Healer", "HealerGuildmaster");
break;
case "-baker:":
PlaceNPC(split[1], split[2], split[3], "Baker");
break;
case "-vet:":
PlaceNPC(split[1], split[2], split[3], "Veterinarian");
break;
case "-gypsymaiden:":
PlaceNPC(split[1], split[2], split[3], "GypsyMaiden");
break;
case "-gypsybank:":
PlaceNPC(split[1], split[2], split[3], "GypsyBanker");
break;
case "-bank:":
PlaceNPC(split[1], split[2], split[3], "Banker", "Minter");
break;
case "-inn:":
PlaceNPC(split[1], split[2], split[3], "Innkeeper");
break;
case "-provisioner:":
PlaceNPC(split[1], split[2], split[3], "Provisioner", "Cobbler");
break;
case "-tailor:":
PlaceNPC(split[1], split[2], split[3], "Tailor", "Weaver", "TailorGuildmaster");
break;
case "-tavern:":
PlaceNPC(split[1], split[2], split[3], "Tavernkeeper", "Waiter", "Cook", "Barkeeper");
break;
case "-reagents:":
PlaceNPC(split[1], split[2], split[3], "Herbalist", "Alchemist", "CustomHairstylist");
break;
case "-fortuneteller:":
PlaceNPC(split[1], split[2], split[3], "FortuneTeller");
break;
case "-holymage:":
PlaceNPC(split[1], split[2], split[3], "HolyMage");
break;
case "-chivalrykeeper:":
PlaceNPC(split[1], split[2], split[3], "KeeperOfChivalry");
break;
case "-mage:":
PlaceNPC(split[1], split[2], split[3], "Mage", "Alchemist", "MageGuildmaster");
break;
case "-arms:":
PlaceNPC(split[1], split[2], split[3], "Armorer", "Weaponsmith");
break;
case "-tinker:":
PlaceNPC(split[1], split[2], split[3], "Tinker", "TinkerGuildmaster");
break;
case "-gypsystable:":
PlaceNPC(split[1], split[2], split[3], "GypsyAnimalTrainer");
break;
case "-stable:":
PlaceNPC(split[1], split[2], split[3], "AnimalTrainer");
break;
case "-blacksmith:":
PlaceNPC(split[1], split[2], split[3], "Blacksmith", "BlacksmithGuildmaster");
break;
case "-bowyer:":
case "-fletcher:":
PlaceNPC(split[1], split[2], split[3], "Bowyer");
break;
case "-carpenter:":
PlaceNPC(split[1], split[2], split[3], "Carpenter", "Architect", "RealEstateBroker");
break;
case "-butcher:":
PlaceNPC(split[1], split[2], split[3], "Butcher");
break;
case "-jeweler:":
PlaceNPC(split[1], split[2], split[3], "Jeweler");
break;
case "-tanner:":
PlaceNPC(split[1], split[2], split[3], "Tanner", "Furtrader");
break;
case "-bard:":
PlaceNPC(split[1], split[2], split[3], "Bard", "BardGuildmaster");
break;
case "-market:":
PlaceNPC(split[1], split[2], split[3], "Butcher", "Farmer");
break;
case "-library:":
PlaceNPC(split[1], split[2], split[3], "Scribe");
break;
case "-shipwright:":
PlaceNPC(split[1], split[2], split[3], "Shipwright", "Mapmaker");
break;
case "-docks:":
PlaceNPC(split[1], split[2], split[3], "Fisherman");
break;
case "-beekeeper:":
PlaceNPC(split[1], split[2], split[3], "Beekeeper");
break;
// Guilds & Misc
case "-tinkers guild:":
PlaceNPC(split[1], split[2], split[3], "TinkerGuildmaster");
break;
case "-blacksmiths guild:":
PlaceNPC(split[1], split[2], split[3], "BlacksmithGuildmaster");
break;
case "-sorcerors guild:":
PlaceNPC(split[1], split[2], split[3], "MageGuildmaster");
break;
case "-customs:": break;
case "-painter:": break;
case "-theater:": break;
case "-warriors guild:":
PlaceNPC(split[1], split[2], split[3], "WarriorGuildmaster");
break;
case "-archers guild:":
PlaceNPC(split[1], split[2], split[3], "RangerGuildmaster");
break;
case "-thieves guild:":
PlaceNPC(split[1], split[2], split[3], "ThiefGuildmaster");
break;
case "-miners guild:":
PlaceNPC(split[1], split[2], split[3], "MinerGuildmaster");
break;
case "-fishermans guild:":
PlaceNPC(split[1], split[2], split[3], "FisherGuildmaster");
break;
case "-merchants guild:":
PlaceNPC(split[1], split[2], split[3], "MerchantGuildmaster");
break;
case "-illusionists guild:": break;
case "-armourers guild:": break;
case "-sorcerers guild:": break;
case "-mages guild:":
PlaceNPC(split[1], split[2], split[3], "MageGuildmaster");
break;
case "-weapons guild:": break;
case "-bardic guild:":
PlaceNPC(split[1], split[2], split[3], "BardGuildmaster");
break;
case "-rogues guild:":
break;
// Skip
case "+landmark:":
case "-point of interest:":
case "+shrine:":
case "+moongate:":
case "+dungeon:":
case "+scenic:":
case "-gate:":
case "+Body of Water:":
case "+ruins:":
case "+teleporter:":
case "+Terrain:":
case "-exit:":
case "-bridge:":
case "-other:":
case "+champion:":
case "-stairs:":
case "-guild:":
case "+graveyard:":
case "+Island:":
case "+town:":
break;
/*default:
Console.WriteLine(split[0]);
break;*/
}
}
}
from.SendMessage("Done, added {0} spawners", m_Count);
}
public static void PlaceNPC(string sx, string sy, string sm, params string[] types)
{
if (types.Length == 0)
return;
var x = Utility.ToInt32(sx);
var y = Utility.ToInt32(sy);
var map = Utility.ToInt32(sm);
switch (map)
{
case 0: // Trammel and Felucca
MakeSpawner(types, x, y, Map.Felucca);
MakeSpawner(types, x, y, Map.Trammel);
break;
case 1: // Felucca
MakeSpawner(types, x, y, Map.Felucca);
break;
case 2:
MakeSpawner(types, x, y, Map.Trammel);
break;
case 3:
MakeSpawner(types, x, y, Map.Ilshenar);
break;
case 4:
MakeSpawner(types, x, y, Map.Malas);
break;
default:
Console.WriteLine("UOAM Vendor Parser: Warning, unknown map {0}", map);
break;
}
}
public static int GetSpawnerZ(int x, int y, Map map)
{
var z = map.GetAverageZ(x, y);
if (map.CanFit(x, y, z, 16, false, false))
return z;
for (var i = 1; i <= 5; ++i)
{
if (map.CanFit(x, y, z + i, 16, false, false))
return z + i;
if (map.CanFit(x, y, z - i, 16, false, false))
return z - i;
}
return z;
}
public static void ClearSpawners(int x, int y, int z, Map map)
{
var eable = map.GetItemsInRange<Spawner>(new Point3D(x, y, z), 0);
var m_ToDelete = new Queue<Spawner>();
foreach (var item in eable)
if (item.Z == z)
m_ToDelete.Enqueue(item);
eable.Free();
while (m_ToDelete.Count > 0)
m_ToDelete.Dequeue().Delete();
}
private static void MakeSpawner(string[] types, int x, int y, Map map)
{
if (types.Length == 0)
return;
var z = GetSpawnerZ(x, y, map);
ClearSpawners(x, y, z, map);
var sp = new Spawner
{
MinDelay = MinTime,
MaxDelay = MaxTime,
Team = Team,
HomeRange = HomeRange
};
var count = 0;
for (var i = 0; i < types.Length; ++i)
{
var isGuildMaster = types[i].EndsWith("Guildmaster");
count += isGuildMaster ? 1 : NPCCount;
if (isGuildMaster)
count++;
sp.AddEntry(types[i], 100, isGuildMaster ? 1 : NPCCount);
}
sp.Count = count;
sp.MoveToWorld(new Point3D(x, y, z), map);
if (TotalRespawn)
{
sp.Respawn();
sp.BringToHome();
}
m_Count += types.Length;
}
}
}