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

Finished Map Tab

Browse source
This commit is contained in:
Reinier Vens 2020-12-18 13:48:03 +00:00
commit 615cc4e936
43 changed files with 8383 additions and 920 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Assets/Scripts/ServerShared/DatabaseEntry.cs
View file

@ -43,6 +43,8 @@ public interface INamedEntry
Union(26, typeof(GasGiantData)),
Union(27, typeof(SunData)),
Union(28, typeof(PlanetData)),
Union(29, typeof(CargoBayData)),
Union(30, typeof(DockingBayData)),
JsonObject(MemberSerialization.OptIn), JsonConverter(typeof(JsonKnownTypesConverter<DatabaseEntry>))]
//[Union(21, typeof(ContractData))]
//[Union(22, typeof(Station))]

3
Assets/Scripts/ServerShared/Entity.cs
View file

@ -41,8 +41,7 @@ public abstract class Entity
public readonly Dictionary<object, float> VisibilitySources = new Dictionary<object, float>();
private List<IPopulationAssignment> PopulationAssignments = new List<IPopulationAssignment>();
private bool _active;
public EquippedItem[,] GearOccupancy;
public EquippedItem[,] ThermalOccupancy;

13
Assets/Scripts/ServerShared/ItemData.cs
View file

@ -142,6 +142,8 @@ public class Shape
Union(1, typeof(CompoundCommodityData)),
Union(2, typeof(GearData)),
Union(3, typeof(HullData)),
Union(4, typeof(CargoBayData)),
Union(5, typeof(DockingBayData)),
JsonObject(MemberSerialization.OptIn), JsonConverter(typeof(JsonKnownTypesConverter<ItemData>))]
public abstract class ItemData : DatabaseEntry, INamedEntry
{
@ -265,6 +267,14 @@ public class CargoBayData : EquippableItemData
[IgnoreMember] public override HardpointType HardpointType => HardpointType.Tool;
}
[RethinkTable("Items"), Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn)]
public class DockingBayData : CargoBayData
{
[InspectableField, JsonProperty("maxSize"), Key(13)]
public int2 MaxSize;
[IgnoreMember] public override HardpointType HardpointType => HardpointType.Tool;
}
[RethinkTable("Items"), Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn)]
public class HullData : EquippableItemData
{
@ -277,6 +287,9 @@ public class HullData : EquippableItemData
[InspectableField, JsonProperty("hullType"), Key(15)]
public HullType HullType;
[InspectableField, JsonProperty("gridOffset"), Key(16)]
public float GridOffset;
[IgnoreMember]
public Shape InteriorCells
{