Skip to content

Allow creation of random custom items #2764

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
TwelveEyes wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Allow creation of random custom items #2764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 31 additions & 52 deletions Assets/Scripts/Game/Items/ItemBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,27 @@ public static DaggerfallUnityItem CreateItem(ItemGroups itemGroup, int templateI
return newItem;
}

/// <summary>
/// Creates a random item from group index.
/// </summary>
/// <param name="itemGroup">Item group.</param>
/// <returns>DaggerfallUnityItem.</returns>
public static DaggerfallUnityItem CreateRandomItem(ItemGroups itemGroup)
{
ItemHelper itemHelper = DaggerfallUnity.Instance.ItemHelper;
Array enumArray = itemHelper.GetEnumArray(itemGroup);
int[] customItemTemplates = itemHelper.GetCustomItemsForGroup(itemGroup);

int groupIndex = UnityEngine.Random.Range(0, enumArray.Length + customItemTemplates.Length);
DaggerfallUnityItem newItem;
if (groupIndex < enumArray.Length)
newItem = new DaggerfallUnityItem(itemGroup, groupIndex);
else
newItem = CreateItem(itemGroup, customItemTemplates[groupIndex - enumArray.Length]);

return newItem;
}

/// <summary>
/// Generates men's clothing.
/// </summary>
Expand Down Expand Up @@ -186,16 +207,7 @@ public static DaggerfallUnityItem CreateRandomClothing(Genders gender, Races rac
// Create random clothing by gender, including any custom items registered as clothes
ItemGroups genderClothingGroup = (gender == Genders.Male) ? ItemGroups.MensClothing : ItemGroups.WomensClothing;

ItemHelper itemHelper = DaggerfallUnity.Instance.ItemHelper;
Array enumArray = itemHelper.GetEnumArray(genderClothingGroup);
int[] customItemTemplates = itemHelper.GetCustomItemsForGroup(genderClothingGroup);

int groupIndex = UnityEngine.Random.Range(0, enumArray.Length + customItemTemplates.Length);
DaggerfallUnityItem newItem;
if (groupIndex < enumArray.Length)
newItem = new DaggerfallUnityItem(genderClothingGroup, groupIndex);
else
newItem = CreateItem(genderClothingGroup, customItemTemplates[groupIndex - enumArray.Length]);
DaggerfallUnityItem newItem = CreateRandomItem(genderClothingGroup);

SetRace(newItem, race);

Expand Down Expand Up @@ -256,8 +268,7 @@ public static DaggerfallUnityItem CreateBook(int id)
/// <returns>DaggerfallUnityItem.</returns>
public static DaggerfallUnityItem CreateRandomBook()
{
Array enumArray = DaggerfallUnity.Instance.ItemHelper.GetEnumArray(ItemGroups.Books);
DaggerfallUnityItem book = new DaggerfallUnityItem(ItemGroups.Books, Array.IndexOf(enumArray, Books.Book0));
DaggerfallUnityItem book = CreateRandomItem(ItemGroups.Books);
book.message = DaggerfallUnity.Instance.ItemHelper.GetRandomBookID();
book.CurrentVariant = UnityEngine.Random.Range(0, book.TotalVariants);
// Update item value for this book.
Expand All @@ -275,9 +286,7 @@ public static DaggerfallUnityItem CreateRandomBook()
/// <returns>DaggerfallUnityItem.</returns>
public static DaggerfallUnityItem CreateRandomReligiousItem()
{
Array enumArray = DaggerfallUnity.Instance.ItemHelper.GetEnumArray(ItemGroups.ReligiousItems);
int groupIndex = UnityEngine.Random.Range(0, enumArray.Length);
DaggerfallUnityItem newItem = new DaggerfallUnityItem(ItemGroups.ReligiousItems, groupIndex);
DaggerfallUnityItem newItem = CreateRandomItem(ItemGroups.ReligiousItems);

return newItem;
}
Expand Down Expand Up @@ -311,9 +320,7 @@ public static DaggerfallUnityItem CreateRandomlyFilledSoulTrap()
/// <returns>DaggerfallUnityItem.</returns>
public static DaggerfallUnityItem CreateRandomGem()
{
Array enumArray = DaggerfallUnity.Instance.ItemHelper.GetEnumArray(ItemGroups.Gems);
int groupIndex = UnityEngine.Random.Range(0, enumArray.Length);
DaggerfallUnityItem newItem = new DaggerfallUnityItem(ItemGroups.Gems, groupIndex);
DaggerfallUnityItem newItem = CreateRandomItem(ItemGroups.Gems);

return newItem;
}
Expand All @@ -324,9 +331,7 @@ public static DaggerfallUnityItem CreateRandomGem()
/// <returns>DaggerfallUnityItem.</returns>
public static DaggerfallUnityItem CreateRandomJewellery()
{
Array enumArray = DaggerfallUnity.Instance.ItemHelper.GetEnumArray(ItemGroups.Jewellery);
int groupIndex = UnityEngine.Random.Range(0, enumArray.Length);
DaggerfallUnityItem newItem = new DaggerfallUnityItem(ItemGroups.Jewellery, groupIndex);
DaggerfallUnityItem newItem = CreateRandomItem(ItemGroups.Jewellery);

return newItem;
}
Expand All @@ -337,9 +342,7 @@ public static DaggerfallUnityItem CreateRandomJewellery()
/// <returns>DaggerfallUnityItem.</returns>
public static DaggerfallUnityItem CreateRandomDrug()
{
Array enumArray = DaggerfallUnity.Instance.ItemHelper.GetEnumArray(ItemGroups.Drugs);
int groupIndex = UnityEngine.Random.Range(0, enumArray.Length);
DaggerfallUnityItem newItem = new DaggerfallUnityItem(ItemGroups.Drugs, groupIndex);
DaggerfallUnityItem newItem = CreateRandomItem(ItemGroups.Drugs);

return newItem;
}
Expand Down Expand Up @@ -377,16 +380,7 @@ public static DaggerfallUnityItem CreateWeapon(Weapons weapon, WeaponMaterialTyp
public static DaggerfallUnityItem CreateRandomWeapon(int playerLevel)
{
// Create a random weapon type, including any custom items registered as weapons
ItemHelper itemHelper = DaggerfallUnity.Instance.ItemHelper;
Array enumArray = itemHelper.GetEnumArray(ItemGroups.Weapons);
int[] customItemTemplates = itemHelper.GetCustomItemsForGroup(ItemGroups.Weapons);

int groupIndex = UnityEngine.Random.Range(0, enumArray.Length + customItemTemplates.Length);
DaggerfallUnityItem newItem;
if (groupIndex < enumArray.Length)
newItem = new DaggerfallUnityItem(ItemGroups.Weapons, groupIndex);
else
newItem = CreateItem(ItemGroups.Weapons, customItemTemplates[groupIndex - enumArray.Length]);
DaggerfallUnityItem newItem = CreateRandomItem(ItemGroups.Weapons);

// Random weapon material
WeaponMaterialTypes material = FormulaHelper.RandomMaterial(playerLevel);
Expand Down Expand Up @@ -446,16 +440,7 @@ public static DaggerfallUnityItem CreateArmor(Genders gender, Races race, Armor
public static DaggerfallUnityItem CreateRandomArmor(int playerLevel, Genders gender, Races race)
{
// Create a random armor type, including any custom items registered as armor
ItemHelper itemHelper = DaggerfallUnity.Instance.ItemHelper;
Array enumArray = itemHelper.GetEnumArray(ItemGroups.Armor);
int[] customItemTemplates = itemHelper.GetCustomItemsForGroup(ItemGroups.Armor);

int groupIndex = UnityEngine.Random.Range(0, enumArray.Length + customItemTemplates.Length);
DaggerfallUnityItem newItem;
if (groupIndex < enumArray.Length)
newItem = new DaggerfallUnityItem(ItemGroups.Armor, groupIndex);
else
newItem = CreateItem(ItemGroups.Armor, customItemTemplates[groupIndex - enumArray.Length]);
DaggerfallUnityItem newItem = CreateRandomItem(ItemGroups.Armor);

ApplyArmorSettings(newItem, gender, race, FormulaHelper.RandomArmorMaterial(playerLevel));

Expand Down Expand Up @@ -677,15 +662,13 @@ public static DaggerfallUnityItem CreateRandomIngredient(ItemGroups ingredientGr
case ItemGroups.MiscellaneousIngredients2:
case ItemGroups.PlantIngredients1:
case ItemGroups.PlantIngredients2:
enumArray = DaggerfallUnity.Instance.ItemHelper.GetEnumArray(ingredientGroup);
groupIndex = UnityEngine.Random.Range(0, enumArray.Length);
break;
default:
return null;
}

// Create item
DaggerfallUnityItem newItem = new DaggerfallUnityItem(ingredientGroup, groupIndex);
DaggerfallUnityItem newItem = CreateRandomItem(ingredientGroup);

return newItem;
}
Expand Down Expand Up @@ -730,12 +713,8 @@ public static DaggerfallUnityItem CreateRandomIngredient()
return null;
}

// Randomise ingredient within group
enumArray = DaggerfallUnity.Instance.ItemHelper.GetEnumArray(itemGroup);
int groupIndex = UnityEngine.Random.Range(0, enumArray.Length);

// Create item
DaggerfallUnityItem newItem = new DaggerfallUnityItem(itemGroup, groupIndex);
DaggerfallUnityItem newItem = CreateRandomItem(itemGroup);

return newItem;
}
Expand Down
14 changes: 13 additions & 1 deletion Assets/Scripts/Internal/DaggerfallLoot.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,18 @@ public void StockShopShelf(PlayerGPS.DiscoveredBuilding buildingData)
ArmorMaterialTypes material = FormulaHelper.RandomArmorMaterial(playerEntity.Level);
ItemBuilder.ApplyArmorSettings(item, playerEntity.Gender, playerEntity.Race, material);
}
else if (itemGroup == ItemGroups.MensClothing)
{
item.dyeColor = ItemBuilder.RandomClothingDye();
ItemBuilder.SetRace(item, playerEntity.Race);
ItemBuilder.SetVariant(item, UnityEngine.Random.Range(0, item.TotalVariants));
}
else if (itemGroup == ItemGroups.WomensClothing)
{
item.dyeColor = ItemBuilder.RandomClothingDye();
ItemBuilder.SetRace(item, playerEntity.Race);
ItemBuilder.SetVariant(item, UnityEngine.Random.Range(0, item.TotalVariants));
}

items.AddItem(item);
}
Expand Down Expand Up @@ -374,4 +386,4 @@ public void StockHouseContainer(PlayerGPS.DiscoveredBuilding buildingData)
}
}
}
}
}