GameCult/Aetheria
Watch
9
0
Fork
You've already forked Aetheria
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Shops & Weapon Icons

Browse source 
Added stations to loadout generator
Overhauled Trade menu to sell station inventory contents
Placing stations in ZoneGenerator
Moved weapons to new item type: WeaponItemData
Implemented icon sets for weapon functionality
Renamed MegaCorporation to Faction
Implemented quality-dependent item pricing
Added unoccupied space helper function for entity
Moved sector generation settings to settings file
This commit is contained in:
Reinier Vens 2021-03-20 04:20:17 +00:00
commit fd81bf267e
33 changed files with 1640 additions and 1077 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Assets/Scripts/UI/PropertiesPanel.cs
View file

@ -362,7 +362,7 @@ public class PropertiesPanel : MonoBehaviour
{
var data = Context.ItemData.Get<ItemData>(item.Data);
AddProperty(data.Description);//.Label.fontStyle = FontStyles.Normal;
var manufacturer = Context.ItemData.Get<MegaCorporation>(data.Manufacturer);
var manufacturer = Context.ItemData.Get<Faction>(data.Manufacturer);
if (manufacturer != null)
{
AddProperty("Manufacturer", () => manufacturer.Name);
@ -450,21 +450,6 @@ public class PropertiesPanel : MonoBehaviour
{
var data = Context.ItemData.Get<ItemData>(item.Data);
AddItemDataProperties(data);
// if (item is CraftedItemInstance craftedItemInstance)
// {
// var sourceEntity = Context.ItemData.Get<Entity>(craftedItemInstance.SourceEntity);
// if (sourceEntity != null)
// {
// var corporation = Context.ItemData.Get<Corporation>(sourceEntity.Corporation);
// AddProperty("Manufacturer", () => corporation.Name);
// }
// else
// {
// AddProperty("Manufacturer", () => "GameCult");
// }
// }
// if (item is SimpleCommodity simpleCommodity)
// AddProperty("Quantity", () => simpleCommodity.Quantity.ToString());
AddProperty("Mass", () => Context.GetMass(item).SignificantDigits(Context.GameplaySettings.SignificantDigits));
AddProperty("Thermal Mass", () => Context.GetThermalMass(item).SignificantDigits(Context.GameplaySettings.SignificantDigits));
if (item is EquippableItem gear)