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

Asteroids

Browse source 
Added asteroids to zone generation
This commit is contained in:
hyperion51 2020-03-30 17:54:54 +01:00
commit b0556d3900
22 changed files with 4872 additions and 4891 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Assets/Scripts/ServerShared/GlobalData.cs
View file

@ -22,6 +22,15 @@ public class GlobalData : DatabaseEntry
[InspectableField] [JsonProperty("heatRadiationMultiplier")] [Key(3)]
public float HeatRadiationMultiplier = 1;
[InspectableField] [JsonProperty("galaxyArms")] [Key(13)]
public int Arms = 4;
[InspectableField] [JsonProperty("galaxyTwist")] [Key(14)]
public float Twist = 10;
[InspectableField] [JsonProperty("galaxyTwistPower")] [Key(15)]
public float TwistPower = 2;
[InspectableField] [JsonProperty("radiusPower")] [Key(4)]
public float RadiusPower = 1.75f;
@ -50,15 +59,6 @@ public class GlobalData : DatabaseEntry
[InspectableField] [JsonProperty("rosetteProbability")] [Key(12)]
public float RosetteProbability = .25f;
[InspectableField] [JsonProperty("galaxyArms")] [Key(13)]
public int Arms = 4;
[InspectableField] [JsonProperty("galaxyTwist")] [Key(14)]
public float Twist = 10;
[InspectableField] [JsonProperty("galaxyTwistPower")] [Key(15)]
public float TwistPower = 2;
[InspectableField] [JsonProperty("mapLayers")] [Key(16)]
public Dictionary<string, Guid> MapLayers = new Dictionary<string, Guid>();
@ -86,6 +86,15 @@ public class GlobalData : DatabaseEntry
[InspectableField] [JsonProperty("gravityRadiusMultiplier")] [Key(24)]
public float GravityRadiusMultiplier = 1f;
[InspectableField] [JsonProperty("beltProbability")] [Key(25)]
public float BeltProbability = .05f;
[InspectableField] [JsonProperty("beltMassCeiling")] [Key(25)]
public float BeltMassCeiling = 500f;
[InspectableField] [JsonProperty("beltMassRatio")] [Key(26)]
public float BeltMassRatio = 100f;
public float PlanetRadius(float mass)
{
return pow(mass, 1 / RadiusPower);

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

@ -93,6 +93,9 @@ public class PlanetData : DatabaseEntry, INamedEntry
[JsonProperty("zone")] [Key(4)]
public Guid Zone;
[JsonProperty("belt")] [Key(5)]
public bool Belt;
// [JsonProperty("radius")] [Key(5)]
// public float GravityRadius;

32
Assets/Scripts/ServerShared/ZoneGenerator.cs
View file

@ -5,7 +5,7 @@ using System.Globalization;
using System.Linq;
using MessagePack;
using Unity.Mathematics;
using UnityEngine;
//using UnityEngine;
// TODO: USE THIS EVERYWHERE
using static Unity.Mathematics.math;
using Random = Unity.Mathematics.Random;
@ -32,7 +32,7 @@ public class ZoneGenerator
var zoneMass = lerp(global.MinimumZoneMass, global.MaximumZoneMass, mass.Evaluate(zone.Position, global));
Debug.Log($"Generating zone at position {zone.Position} with radius {zoneRadius} and mass {zoneMass}");
//Debug.Log($"Generating zone at position {zone.Position} with radius {zoneRadius} and mass {zoneMass}");
var planets = GenerateEntities(global, zone, zoneMass, zoneRadius);
@ -69,7 +69,8 @@ public class ZoneGenerator
Mass = planet.Mass,
ID = Guid.NewGuid(),
Orbit = orbitMap[planet].ID,
Zone = zone.ID
Zone = zone.ID,
Belt = planet.Belt
};
planetDatum.Name = planetDatum.ID.ToString().Substring(0, 8);
return planetDatum;
@ -144,17 +145,21 @@ public class ZoneGenerator
// Get all children that are above the satellite creation mass floor and not rosette members
var satelliteCandidates = rosette
? root.AllPlanets().Where(p => p.Parent != root && p.Mass > global.SatelliteCreationMassFloor)
: root.AllPlanets().Where(p => p.Mass > global.SatelliteCreationMassFloor);
? root.AllPlanets().Where(p => p != root && p.Parent != root && p.Mass > global.SatelliteCreationMassFloor)
: root.AllPlanets().Where(p => p != root && p.Mass > global.SatelliteCreationMassFloor);
var binaries = new List<Planet>();
foreach (var planet in satelliteCandidates)
{
// There's a chance of generating satellites for each qualified planet
if (random.NextFloat() < global.SatelliteCreationProbability)
{
// Sometimes the satellite is so massive that it forms a binary system (like Earth!)
if(random.NextFloat() < global.BinaryCreationProbability)
if (random.NextFloat() < global.BinaryCreationProbability)
{
planet.ExpandRosette(2);
binaries.AddRange(planet.Children);
}
// Otherwise, terrestrial planets get a couple satellites while gas giants get many
else planet.ExpandSolar(
count: planet.Mass < global.GasGiantMass ? random.NextInt(1,3) : random.NextInt(4,10),
@ -167,6 +172,14 @@ public class ZoneGenerator
}
}
// Get all children that are below the belt creation mass floor and not rosette members, also exclude binaries
var beltCandidates = rosette
? root.AllPlanets().Where(p => p != root && p.Parent != root && p.Mass < global.BeltMassCeiling && !binaries.Contains(p))
: root.AllPlanets().Where(p => p != root && p.Mass < global.BeltMassCeiling && !binaries.Contains(p));
foreach(var planet in beltCandidates)
if (random.NextFloat() < global.BeltProbability)
planet.Belt = true;
return root.AllPlanets().ToArray();
}
}
@ -185,6 +198,7 @@ public class Planet
public float ChildDistanceMinimum;
public float ChildDistanceMaximum;
public bool Empty = false;
public bool Belt = false;
public List<Planet> Children = new List<Planet>(); // Planets orbiting this one are referred to as children
public Planet Parent;
@ -198,7 +212,7 @@ public class Planet
// https://en.wikipedia.org/wiki/Klemperer_rosette
public void ExpandRosette(int vertices)
{
Debug.Log("Expanding Rosette");
//Debug.Log("Expanding Rosette");
// Rosette children replace the parent, parent orbital node is left empty
Empty = true;
@ -245,7 +259,7 @@ public class Planet
// Create children that mimic the distribution of planetary masses in the solar system
public void ExpandSolar(int count, float massMulMin, float massMulMax, float distMulMin, float distMulMax, float jupiterJump, float massFraction)
{
Debug.Log("Expanding Solar");
//Debug.Log("Expanding Solar");
// Expansion is impossible when child space is full
if (count == 0 || ChildDistanceMaximum < ChildDistanceMinimum)
return;