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

fix: Fix spawners missing parameters/properties (#1155)

Browse source
This commit is contained in:
Mink80 2022-09-01 21:55:23 +02:00 • committed by GitHub
parent 1e50ff9966
commit c34bcbc515
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Projects/UOContent/Engines/Spawners/BaseSpawner.cs
View file

@ -98,7 +98,7 @@ public abstract class BaseSpawner : Item, ISpawner
foreach (var entry in entries)
{
AddEntry(entry.SpawnedName, entry.SpawnedProbability, entry.SpawnedMaxCount, false);
AddEntry(entry.SpawnedName, entry.SpawnedProbability, entry.SpawnedMaxCount, false, entry.Properties, entry.Parameters);
}
}
@ -320,15 +320,24 @@ public abstract class BaseSpawner : Item, ISpawner
Entries[i].SpawnedName,
Entries[i].SpawnedProbability,
Entries[i].SpawnedMaxCount,
false
false,
Entries[i].Properties,
Entries[i].Parameters
);
}
}
}
public SpawnerEntry AddEntry(string creaturename, int probability = 100, int amount = 1, bool dotimer = true)
public SpawnerEntry AddEntry(
string creaturename,
int probability = 100,
int amount = 1,
bool dotimer = true,
string properties = null,
string parameters = null
)
{
var entry = new SpawnerEntry(creaturename, probability, amount);
var entry = new SpawnerEntry(creaturename, probability, amount, properties, parameters);
Entries.Add(entry);
if (dotimer)
{

10
Projects/UOContent/Engines/Spawners/SpawnerEntry.cs
View file

@ -8,11 +8,19 @@ namespace Server.Engines.Spawners
{
public SpawnerEntry() => Spawned = new List<ISpawnable>();
public SpawnerEntry(string name, int probability, int maxcount) : this()
public SpawnerEntry(
string name,
int probability,
int maxcount,
string properties = null,
string parameters = null
) : this()
{
SpawnedName = name;
SpawnedProbability = probability;
SpawnedMaxCount = maxcount;
Properties = properties;
Parameters = parameters;
}
public SpawnerEntry(BaseSpawner parent, IGenericReader reader)