Shops & Weapon Icons

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

View file

@ -304,6 +304,27 @@ public class DatabaseInspector : EditorWindow
else if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(List<>))
{
var listType = field.FieldType.GenericTypeArguments[0];
// if (listType.IsEnum)
// {
// Space();
// using (new VerticalScope(GUI.skin.box))
// {
// var list = (IList) field.GetValue(obj);
// if (list == null)
// {
// list = (IList) Activator.CreateInstance(type);
// field.SetValue(obj, list);
// GUI.changed = true;
// }
// var isflags = type.GetCustomAttributes<FlagsAttribute>().Any();
// var names = Enum.GetNames(field.FieldType);
//
// for (var i = 0; i < list.Count; i++)
// {
// list[i] = Inspect(field.Name.SplitCamelCase(), (int) list[i], isflags ? names.Skip(1).ToArray() : names, isflags);
// }
// }
// }
if (listType.GetCustomAttribute<InspectableFieldAttribute>() != null)
{
Space();
@ -365,23 +386,6 @@ public class DatabaseInspector : EditorWindow
_listItemFoldouts.Add(o.GetHashCode());
else
_listItemFoldouts.Remove(o.GetHashCode());
// using (var h = new HorizontalScope())
// {
// if (GUI.Button(h.rect, GUIContent.none, GUIStyle.none))
// {
// if(_listItemFoldouts.Contains(o.GetHashCode()))
// _listItemFoldouts.Remove(o.GetHashCode());
// else
// _listItemFoldouts.Add(o.GetHashCode());
// }
// var foldoutRect = GetControlRect(false, GUILayout.Width(EditorGUIUtility.singleLineHeight));
// if (Event.current.type == EventType.Repaint)
// {
// var controlId = GUIUtility.GetControlID(1337, FocusType.Keyboard, position);
// EditorStyles.foldout.Draw(foldoutRect, GUIContent.none, controlId, !_listItemFoldouts.Contains(o.GetHashCode()));
// }
// GUILayout.Label(o.ToString(), EditorStyles.boldLabel, GUILayout.Height(EditorGUIUtility.singleLineHeight), GUILayout.ExpandWidth(true));
// }
var rect = GetControlRect(false,
GUILayout.Width(EditorGUIUtility.singleLineHeight));

View file

@ -237,14 +237,8 @@ public class DatabaseListView : EditorWindow
itemGroups = typedItems.GroupBy(item => Enum.GetName(typeof(SimpleCommodityCategory), (item as SimpleCommodityData).Category));
else if(_itemTypes[i] == typeof(CompoundCommodityData))
itemGroups = typedItems.GroupBy(item => Enum.GetName(typeof(CompoundCommodityCategory), (item as CompoundCommodityData).Category));
else if(_itemTypes[i] == typeof(GearData))
itemGroups = typedItems.GroupBy(item =>
{
var hp = Enum.GetName(typeof(HardpointType), (item as GearData).Hardpoint);
if (hp == null)
hp = "Invalid Hardpoint";
return hp;
});
else if(_itemTypes[i] == typeof(GearData) || _itemTypes[i] == typeof(WeaponItemData))
itemGroups = typedItems.GroupBy(item => Enum.GetName(typeof(HardpointType), (item as GearData).Hardpoint) ?? "Invalid Hardpoint");
else if (_itemTypes[i] == typeof(HullData))
itemGroups = typedItems.GroupBy(item => Enum.GetName(typeof(HullType), (item as HullData).HullType));
else itemGroups = typedItems.GroupBy(item => "All");

View file

@ -12,6 +12,11 @@ using UnityEngine;
public class GameSettingsEditor : Editor
{
private bool _showIcons;
private bool _showWeaponTypeIcons;
private bool _showWeaponModifierIcons;
private bool _showWeaponFiringTypeIcons;
private bool _showWeaponCaliberIcons;
private bool _showWeaponRangeIcons;
private bool _showProperties;
private bool _showDatabase;
@ -36,6 +41,61 @@ public class GameSettingsEditor : Editor
for (var i = 0; i < data.ItemIcons.Length; i++)
data.ItemIcons[i] = (Sprite) EditorGUILayout.ObjectField(hardpointNames[i], data.ItemIcons[i], typeof(Sprite), false);
var modifierNames = Enum.GetNames(typeof(WeaponModifiers));
if(data.WeaponModifierIcons.Length!=modifierNames.Length)
Array.Resize(ref data.WeaponModifierIcons, modifierNames.Length);
if (GUILayout.Button("Weapon Modifier Icons", EditorStyles.toolbarButton))
_showWeaponModifierIcons = !_showWeaponModifierIcons;
if(_showWeaponModifierIcons)
for (var i = 0; i < data.WeaponModifierIcons.Length; i++)
data.WeaponModifierIcons[i] = (Sprite) EditorGUILayout.ObjectField(modifierNames[i], data.WeaponModifierIcons[i], typeof(Sprite), false);
var weaponTypeNames = Enum.GetNames(typeof(WeaponType));
if(data.WeaponTypeIcons.Length!=weaponTypeNames.Length)
Array.Resize(ref data.WeaponTypeIcons, weaponTypeNames.Length);
if (GUILayout.Button("Weapon Type Icons", EditorStyles.toolbarButton))
_showWeaponTypeIcons = !_showWeaponTypeIcons;
if(_showWeaponTypeIcons)
for (var i = 0; i < data.WeaponTypeIcons.Length; i++)
data.WeaponTypeIcons[i] = (Sprite) EditorGUILayout.ObjectField(weaponTypeNames[i], data.WeaponTypeIcons[i], typeof(Sprite), false);
var weaponCaliberNames = Enum.GetNames(typeof(WeaponCaliber));
if(data.WeaponCaliberIcons.Length!=weaponCaliberNames.Length)
Array.Resize(ref data.WeaponCaliberIcons, weaponCaliberNames.Length);
if (GUILayout.Button("Weapon Caliber Icons", EditorStyles.toolbarButton))
_showWeaponCaliberIcons = !_showWeaponCaliberIcons;
if(_showWeaponCaliberIcons)
for (var i = 0; i < data.WeaponCaliberIcons.Length; i++)
data.WeaponCaliberIcons[i] = (Sprite) EditorGUILayout.ObjectField(weaponCaliberNames[i], data.WeaponCaliberIcons[i], typeof(Sprite), false);
var weaponFireTypeNames = Enum.GetNames(typeof(WeaponFireType));
if(data.WeaponFireTypeIcons.Length!=weaponFireTypeNames.Length)
Array.Resize(ref data.WeaponFireTypeIcons, weaponFireTypeNames.Length);
if (GUILayout.Button("Weapon Type Icons", EditorStyles.toolbarButton))
_showWeaponFiringTypeIcons = !_showWeaponFiringTypeIcons;
if(_showWeaponFiringTypeIcons)
for (var i = 0; i < data.WeaponFireTypeIcons.Length; i++)
data.WeaponFireTypeIcons[i] = (Sprite) EditorGUILayout.ObjectField(weaponFireTypeNames[i], data.WeaponFireTypeIcons[i], typeof(Sprite), false);
var weaponRangeNames = Enum.GetNames(typeof(WeaponRange));
if(data.WeaponRangeIcons.Length!=weaponRangeNames.Length)
Array.Resize(ref data.WeaponRangeIcons, weaponRangeNames.Length);
if (GUILayout.Button("Weapon Range Icons", EditorStyles.toolbarButton))
_showWeaponRangeIcons = !_showWeaponRangeIcons;
if(_showWeaponRangeIcons)
for (var i = 0; i < data.WeaponRangeIcons.Length; i++)
data.WeaponRangeIcons[i] = (Sprite) EditorGUILayout.ObjectField(weaponRangeNames[i], data.WeaponRangeIcons[i], typeof(Sprite), false);
serializedObject.ApplyModifiedProperties();
}
}