Bigger Sectors & Various Bugfixes

Minimap works again
Stardust density is now proportional to gravity depth
Generated zones are double the size and better distributed
Orbital hierarchy actually working now (!)
Station start position actually orbits something now
Max gravity strength remapped to infinity (zone boundary is properly impassable now)
This commit is contained in:
Reinier Vens 2020-12-23 22:38:30 +00:00
commit 9e88fcda95
21 changed files with 245 additions and 214 deletions

View file

@ -138,10 +138,10 @@ public class ActionGameManager : MonoBehaviour
var stationType = ItemData.GetAll<HullData>().First(x=>x.HullType==HullType.Station);
var stationHull = ItemManager.CreateInstance(stationType, 0, 1) as EquippableItem;
var stationParent = Zone.PlanetInstances.Values.OrderByDescending(p => p.BodyData.Mass.Value).ElementAt(2);
var stationParent = Zone.PlanetInstances.Values.OrderByDescending(p => p.BodyData.Mass.Value).ElementAt(3);
var parentOrbit = stationParent.Orbit.Data.ID;
var stationPos = Zone.GetOrbitPosition(parentOrbit) +
normalize(ItemManager.Random.NextFloat2() - float2(.5f, .5f)) * ItemManager.Random.NextFloat() * stationParent.GravityWellRadius.Value * .75f;
var parentPos = Zone.GetOrbitPosition(parentOrbit);
var stationPos = parentPos + ItemManager.Random.NextFloat2Direction() * stationParent.GravityWellRadius.Value * .1f;
var stationOrbit = Zone.CreateOrbit(parentOrbit, stationPos);
var station = new OrbitalEntity(ItemManager, Zone, stationHull, stationOrbit.ID);
Zone.Entities.Add(station);

View file

@ -376,7 +376,12 @@ public class SectorRenderer : MonoBehaviour
ship.Value.Transform.position = new Vector3(ship.Key.Position.x,h + hullData.GridOffset,ship.Key.Position.y);
var normal = _zone.GetNormal(ship.Key.Position);
var f = new float2(normal.x, normal.z);
ship.Key.Velocity += f * Settings.PlanetSettings.GravityStrength;// * lengthsq(f);
var fl = lengthsq(f);
if(fl > .001)
{
var fa = 1 / (1 - fl) - 1;
ship.Key.Velocity += normalize(f) * Settings.PlanetSettings.GravityStrength * fa;
}
//Debug.Log($"Normal: {normal}");
var shipRight = ship.Key.Direction.Rotate(ItemRotation.Clockwise);
var forward = Vector3.Cross(new Vector3(shipRight.x,0,shipRight.y), normal);

View file

@ -203,6 +203,9 @@ public abstract class ItemData : DatabaseEntry, INamedEntry
[InspectableField, JsonProperty("specificHeat"), Key(5)]
public float SpecificHeat;
// [InspectableField, JsonProperty("conductivity"), Key(6)]
// public float Conductivity;
[IgnoreMember] public string EntryName
{
get => Name;

View file

@ -69,7 +69,7 @@ public class Zone
return new ZonePack
{
Data = Data,
Entities = Entities.ToList(),
//Entities = Entities.ToList(),
Orbits = Orbits.Values.Select(o=>o.Data).ToList(),
Planets = Planets.Values.ToList()
};
@ -126,8 +126,8 @@ public class Zone
}
}
Orbits[orbitID].Position = GetOrbitPosition(orbit.Data.Parent) + pos;
_updatedOrbits.Add(orbitID);
return GetOrbitPosition(orbit.Data.Parent) + pos;
}
return Orbits[orbitID].Position;
@ -219,6 +219,7 @@ public class Zone
var orbit = new OrbitData
{
ID = Guid.NewGuid(),
Distance = new ReactiveProperty<float>(distance),
Parent = parent,
Phase = storedPhase

View file

@ -130,7 +130,7 @@ public abstract class BodyData : DatabaseEntry, INamedEntry
public ReactiveProperty<float> GravityDepthMultiplier = new ReactiveProperty<float>(1);
[JsonProperty("depthExp")] [Key(8)]
public ReactiveProperty<float> GravityDepthExponent = new ReactiveProperty<float>(8);
public ReactiveProperty<float> GravityDepthExponent = new ReactiveProperty<float>(16);
[IgnoreMember] public string EntryName
{

View file

@ -262,8 +262,8 @@ public class ZoneGenerator
root.ExpandSolar(
ref random,
count: random.NextInt(5, 15),
massMulMin: 0.5f,
massMulMax: 2.0f,
massMulMin: 0.75f,
massMulMax: 2.5f,
distMulMin: 1.1f,
distMulMax: 1.25f,
jupiterJump: random.NextFloat() * random.NextFloat() * 10 + 1,