JonathanMcCaffrey/EarthborneTrailerblazer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
6d486f49
2026-06-12 14:55:34 -04:00
parent 96e72df0da
commit 61bfb188f6
3 changed files with 162 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ET/Web/Pages/Simulation.razor
+95 -12
View File
@@ -20,23 +20,33 @@ else
<div class="simulation-layout">
<div class="sim-controls d-flex align-items-center justify-content-between mb-3 flex-wrap gap-2">
<div class="d-flex align-items-center gap-2">
<button class="btn btn-outline-light btn-sm" @onclick="PrevTurn" disabled="@(SimService.Data.CurrentTurn <= 1)">
<button class="btn btn-outline-light btn-sm" @onclick="PrevTurn" disabled="@(SimService.Data.CurrentTurn <= 0)">
&#9664; Prev
</button>
<span class="turn-label">
Turn <strong>@SimService.Data.CurrentTurn</strong> / 20
@if (SimService.Data.CurrentTurn == 0)
{
<span>Initial Setup</span>
}
else
{
<span>After Turn <strong>@SimService.Data.CurrentTurn</strong> / 20</span>
}
</span>
<button class="btn btn-outline-light btn-sm" @onclick="NextTurn" disabled="@(SimService.Data.CurrentTurn >= 20)">
Next &#9654;
</button>
</div>
<div class="d-flex align-items-center gap-2">
<span class="event-badge badge bg-@EventBadgeClass">
@CurrentEvent?.MeepleType Ecology
</span>
<span class="text-muted small">
in @string.Join(", ", CurrentEvent?.RegionTypes ?? new())
</span>
<div class="d-flex align-items-center gap-2 flex-wrap">
@if (CurrentEvent != null)
{
@foreach (var act in CurrentEvent.Activations)
{
<span class="event-badge badge bg-@BadgeClass(act.MeepleType)">
@act.MeepleType in @act.RegionType
</span>
}
}
<button class="btn btn-secondary btn-sm" @onclick="RandomizeEvents">&#8635; Randomize Events</button>
</div>
</div>
@@ -70,11 +80,14 @@ else
@{
var currentRegions = SimService.GetCurrentState();
var prevRegions = SimService.GetPreviousState();
var prevLookup = prevRegions.ToDictionary(r => r.Name);
var activatedRegionNames = new HashSet<string>();
if (CurrentEvent != null)
{
var activatedTerrain = CurrentEvent.Activations.Select(a => a.RegionType).ToHashSet();
activatedRegionNames = currentRegions
.Where(r => CurrentEvent.RegionTypes.Contains(r.Terrain))
.Where(r => activatedTerrain.Contains(r.Terrain))
.Select(r => r.Name)
.ToHashSet();
}
@@ -91,6 +104,11 @@ else
var isActivated = activatedRegionNames.Contains(region.Name);
var terrainColor = GetTerrainColor(region.Terrain);
var labelX = region.X + 24;
var prev = prevLookup.GetValueOrDefault(region.Name);
var dp = prev != null ? region.PredatorMeeples - prev.PredatorMeeples : 0;
var dr = prev != null ? region.PreyMeeples - prev.PreyMeeples : 0;
var df = prev != null ? region.FloraMeeples - prev.FloraMeeples : 0;
var hasDelta = dp != 0 || dr != 0 || df != 0;
<g class="sim-region @(isActivated ? "sim-active" : "")">
<circle cx="@region.X" cy="@region.Y" r="34" fill="url(#sg-@region.Terrain)"/>
<circle cx="@region.X" cy="@region.Y" r="18"
@@ -105,6 +123,16 @@ else
font-family="system-ui,sans-serif" font-size="10">
P:@region.PredatorMeeples R:@region.PreyMeeples F:@region.FloraMeeples
</text>
@if (hasDelta && SimService.Data.CurrentTurn > 0)
{
var dy = region.Y + 34;
var parts = new List<string>();
if (dp != 0) parts.Add($"<tspan fill=\"{(dp > 0 ? "#4caf50" : "#e76f51")}\">{(dp > 0 ? "+" : "")}{dp}P</tspan>");
if (dr != 0) parts.Add($"<tspan fill=\"{(dr > 0 ? "#4caf50" : "#e76f51")}\">{(dr > 0 ? "+" : "")}{dr}R</tspan>");
if (df != 0) parts.Add($"<tspan fill=\"{(df > 0 ? "#4caf50" : "#e76f51")}\">{(df > 0 ? "+" : "")}{df}F</tspan>");
var deltaHtml = $"<text x=\"{labelX}\" y=\"{dy}\" font-family=\"system-ui,sans-serif\" font-size=\"9\">{string.Join(" ", parts)}</text>";
@((MarkupString)deltaHtml)
}
</g>
}
</svg>
@@ -131,15 +159,70 @@ else
<div class="total-prey"><span class="total-dot" style="background:#e9c46a"></span> Prey: @totals.Sum(r => r.PreyMeeples)</div>
<div class="total-flora"><span class="total-dot" style="background:#4caf50"></span> Flora: @totals.Sum(r => r.FloraMeeples)</div>
</div>
<div class="sim-chart mt-3">
<h5 class="text-muted mb-2">Population Trend</h5>
<svg viewBox="0 0 720 160" class="sim-chart-svg">
@{
var history = SimService.GetPopulationHistory();
var maxPop = Math.Max(history.Max(h => h.predators + h.prey + h.flora), 10);
var chartW = 700d;
var chartH = 120d;
var chartY = 20d;
var stepX = history.Length > 1 ? chartW / (history.Length - 1) : chartW;
string MakePath(Func<int, int> getVal, string color)
{
var pts = history.Select((h, i) =>
{
var x = i * stepX;
var y = chartY + chartH - (getVal(i) / (double)maxPop) * chartH;
return $"{x:F1},{y:F1}";
});
var d = "M" + string.Join(" L", pts);
return $"<path d=\"{d}\" fill=\"none\" stroke=\"{color}\" stroke-width=\"2\" stroke-linecap=\"round\" stroke-linejoin=\"round\"/>";
}
// Y axis labels
@((MarkupString)$"<text x=\"0\" y=\"{chartY + 10}\" fill=\"rgba(255,255,255,0.3)\" font-size=\"9\">{maxPop}</text>")
@((MarkupString)$"<text x=\"0\" y=\"{chartY + chartH}\" fill=\"rgba(255,255,255,0.3)\" font-size=\"9\">0</text>")
// Grid lines
<line x1="0" y1="@(chartY + chartH)" x2="@chartW" y2="@(chartY + chartH)" stroke="rgba(255,255,255,0.06)" stroke-width="1"/>
<line x1="0" y1="@chartY" x2="@chartW" y2="@chartY" stroke="rgba(255,255,255,0.06)" stroke-width="1"/>
// Current turn marker
var markerX = SimService.Data.CurrentTurn * stepX;
<line x1="@markerX" y1="@chartY" x2="@markerX" y2="@(chartY + chartH)" stroke="rgba(255,255,255,0.25)" stroke-width="1" stroke-dasharray="3,3"/>
@((MarkupString)MakePath(i => history[i].predators, "#e76f51"))
@((MarkupString)MakePath(i => history[i].prey, "#e9c46a"))
@((MarkupString)MakePath(i => history[i].flora, "#4caf50"))
// Turn markers on x-axis
@for (int i = 0; i < history.Length; i += 5)
{
var x = i * stepX;
@((MarkupString)$"<text x=\"{x}\" y=\"{chartY + chartH + 14}\" fill=\"rgba(255,255,255,0.25)\" font-size=\"8\" text-anchor=\"middle\">{i}</text>")
}
}
</svg>
<div class="sim-chart-legend d-flex gap-3 justify-content-center mt-1">
<span class="small"><span class="total-dot" style="background:#e76f51"></span> Predators</span>
<span class="small"><span class="total-dot" style="background:#e9c46a"></span> Prey</span>
<span class="small"><span class="total-dot" style="background:#4caf50"></span> Flora</span>
</div>
</div>
</div>
}
@code {
private TurnEvent? CurrentEvent => SimService.Data.CurrentTurn > 0 && SimService.Data.CurrentTurn <= SimService.Data.Events.Count
? SimService.Data.Events[SimService.Data.CurrentTurn - 1]
: null;
private string EventBadgeClass => CurrentEvent?.MeepleType switch
private static string BadgeClass(string meepleType) => meepleType switch
{
"Predator" => "danger",
"Prey" => "warning",
@@ -159,7 +242,7 @@ else
private void PrevTurn()
{
if (SimService.Data.CurrentTurn > 1)
if (SimService.Data.CurrentTurn > 0)
SimService.Data.CurrentTurn--;
}
ET/Web/Services/GameSimulationService.cs
+48 -23
View File
@@ -33,11 +33,16 @@ public class RegionState
}
}
public class TerrainActivation
{
public string MeepleType { get; set; } = "";
public string RegionType { get; set; } = "";
}
public class TurnEvent
{
public int TurnNumber { get; set; }
public string MeepleType { get; set; } = "";
public List<string> RegionTypes { get; set; } = new();
public List<TerrainActivation> Activations { get; set; } = new();
public List<string> Details { get; set; } = new();
}
@@ -86,7 +91,24 @@ public class GameSimulationService
public TurnEvent? GetCurrentEvent()
{
return Data.Events.ElementAtOrDefault(Data.CurrentTurn - 1);
return Data.CurrentTurn > 0
? Data.Events.ElementAtOrDefault(Data.CurrentTurn - 1)
: null;
}
public List<RegionState> GetPreviousState()
{
var prev = Data.CurrentTurn > 0 ? Data.CurrentTurn - 1 : 0;
return Data.Timeline[prev].Select(r => r.Clone()).ToList();
}
public (int predators, int prey, int flora)[] GetPopulationHistory()
{
return Data.Timeline.Select(t => (
t.Sum(r => r.PredatorMeeples),
t.Sum(r => r.PreyMeeples),
t.Sum(r => r.FloraMeeples)
)).ToArray();
}
private void GenerateAndApplyEvents()
@@ -101,23 +123,26 @@ public class GameSimulationService
Data.Timeline.Add(Data.Regions.Select(r => r.Clone()).ToList());
}
Data.CurrentTurn = 1;
Data.CurrentTurn = 0;
}
private TurnEvent GenerateTurnEvent(int turnNumber)
{
string[] meepleTypes = { "Predator", "Prey", "Flora" };
var meepleType = meepleTypes[_rng.Next(3)];
string[] regionTypes = { "Grass", "Forest", "Mountain", "Water", "Wasteland" };
var numTypes = _rng.Next(1, 4);
var selectedTypes = regionTypes.OrderBy(_ => _rng.Next()).Take(numTypes).ToList();
var activations = selectedTypes.Select(rt => new TerrainActivation
{
RegionType = rt,
MeepleType = meepleTypes[_rng.Next(3)]
}).ToList();
return new TurnEvent
{
TurnNumber = turnNumber,
MeepleType = meepleType,
RegionTypes = selectedTypes,
Activations = activations,
Details = new List<string>()
};
}
@@ -126,25 +151,25 @@ public class GameSimulationService
{
var details = new List<string>();
foreach (var region in Data.Regions)
foreach (var activation in turnEvent.Activations)
{
if (!turnEvent.RegionTypes.Contains(region.Terrain))
continue;
switch (turnEvent.MeepleType)
foreach (var region in Data.Regions.Where(r => r.Terrain == activation.RegionType))
{
case "Flora":
region.FloraMeeples++;
details.Add($"{region.Name}: +1 Flora");
break;
switch (activation.MeepleType)
{
case "Flora":
region.FloraMeeples++;
details.Add($"{region.Name}: +1 Flora");
break;
case "Predator":
ApplyPredatorActivation(region, details);
break;
case "Predator":
ApplyPredatorActivation(region, details);
break;
case "Prey":
ApplyPreyActivation(region, details);
break;
case "Prey":
ApplyPreyActivation(region, details);
break;
}
}
}
ET/Web/wwwroot/css/app.css
+19
View File
@@ -801,3 +801,22 @@ table.frontmatter td.fm-key {
.bg-success {
background-color: #4caf50 !important;
}
/* Simulation Chart */
.sim-chart {
background: var(--bg-sidebar);
border: 1px solid var(--border-color);
border-radius: 12px;
padding: 1rem 1.25rem;
}
.sim-chart-svg {
width: 100%;
height: auto;
display: block;
}
.sim-chart-legend {
font-size: 0.85rem;
color: var(--text-muted);
}