4 Commits

Author SHA1 Message Date
JonathanMcCaffrey 39706d2394 ... 2026-06-12 20:50:11 -04:00
JonathanMcCaffrey 8eaae3033c Exp note 2026-06-12 20:48:52 -04:00
6d486f49 74840d32c1 ... 2026-06-12 17:31:35 -04:00
6d486f49 d6ee42b66d Day 3 vibes 2026-06-12 17:27:40 -04:00
6 changed files with 127 additions and 43 deletions
+60 -2
View File
@@ -17,7 +17,7 @@
} }
else else
{ {
<div class="simulation-layout"> <div class="simulation-layout" tabindex="0" @onkeydown="HandleKeyDown" @ref="layoutDiv">
<div class="sim-controls d-flex align-items-center justify-content-between mb-3 flex-wrap gap-2"> <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"> <div class="d-flex align-items-center gap-2">
<button class="btn btn-outline-light btn-sm" @onclick="PrevTurn" disabled="@(SimService.Data.CurrentTurn <= 0)"> <button class="btn btn-outline-light btn-sm" @onclick="PrevTurn" disabled="@(SimService.Data.CurrentTurn <= 0)">
@@ -99,7 +99,7 @@ else
stroke="rgba(255,255,255,0.12)" stroke-width="2" stroke-linecap="round"/> stroke="rgba(255,255,255,0.12)" stroke-width="2" stroke-linecap="round"/>
} }
@foreach (var region in currentRegions) @foreach (var region in currentRegions)
{ {
var isActivated = activatedRegionNames.Contains(region.Name); var isActivated = activatedRegionNames.Contains(region.Name);
var terrainColor = GetTerrainColor(region.Terrain); var terrainColor = GetTerrainColor(region.Terrain);
@@ -109,12 +109,57 @@ else
var dr = prev != null ? region.PreyMeeples - prev.PreyMeeples : 0; var dr = prev != null ? region.PreyMeeples - prev.PreyMeeples : 0;
var df = prev != null ? region.FloraMeeples - prev.FloraMeeples : 0; var df = prev != null ? region.FloraMeeples - prev.FloraMeeples : 0;
var hasDelta = dp != 0 || dr != 0 || df != 0; var hasDelta = dp != 0 || dr != 0 || df != 0;
// Meeple dot counts (max 3 visible per type)
var pdots = Math.Min(region.PredatorMeeples, 3);
var rdots = Math.Min(region.PreyMeeples, 3);
var fdots = Math.Min(region.FloraMeeples, 3);
var dotR = 3;
var dotGap = 7;
<g class="sim-region @(isActivated ? "sim-active" : "")"> <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="34" fill="url(#sg-@region.Terrain)"/>
<circle cx="@region.X" cy="@region.Y" r="18" <circle cx="@region.X" cy="@region.Y" r="18"
fill="@(terrainColor)cc" fill="@(terrainColor)cc"
stroke="@(isActivated ? "#ffd700" : "rgba(255,255,255,0.5)")" stroke="@(isActivated ? "#ffd700" : "rgba(255,255,255,0.5)")"
stroke-width="@(isActivated ? 3 : 2)"/> stroke-width="@(isActivated ? 3 : 2)"/>
@* Predator dots (red, top row) *@
@for (int d = 0; d < pdots; d++)
{
var dx = region.X + (d - (pdots - 1) * 0.5) * dotGap;
var dy = region.Y - 7;
<circle cx="@dx" cy="@dy" r="@dotR" fill="#e76f51" stroke="rgba(0,0,0,0.4)" stroke-width="0.5"/>
}
@if (region.PredatorMeeples > 3)
{
@((MarkupString)$"<text x=\"{region.X + 2 * dotGap + 2}\" y=\"{region.Y - 4}\" fill=\"#e76f51\" font-size=\"7\" font-weight=\"600\">+{region.PredatorMeeples - 3}</text>")
}
@* Prey dots (yellow, middle row) *@
@for (int d = 0; d < rdots; d++)
{
var dx = region.X + (d - (rdots - 1) * 0.5) * dotGap;
var dy = region.Y;
<circle cx="@dx" cy="@dy" r="@dotR" fill="#e9c46a" stroke="rgba(0,0,0,0.4)" stroke-width="0.5"/>
}
@if (region.PreyMeeples > 3)
{
@((MarkupString)$"<text x=\"{region.X + 2 * dotGap + 2}\" y=\"{region.Y + 3}\" fill=\"#e9c46a\" font-size=\"7\" font-weight=\"600\">+{region.PreyMeeples - 3}</text>")
}
@* Flora dots (green, bottom row) *@
@for (int d = 0; d < fdots; d++)
{
var dx = region.X + (d - (fdots - 1) * 0.5) * dotGap;
var dy = region.Y + 7;
<circle cx="@dx" cy="@dy" r="@dotR" fill="#4caf50" stroke="rgba(0,0,0,0.4)" stroke-width="0.5"/>
}
@if (region.FloraMeeples > 3)
{
@((MarkupString)$"<text x=\"{region.X + 2 * dotGap + 2}\" y=\"{region.Y + 10}\" fill=\"#4caf50\" font-size=\"7\" font-weight=\"600\">+{region.FloraMeeples - 3}</text>")
}
<text x="@labelX" y="@(region.Y + 4)" fill="rgba(255,255,255,0.9)" <text x="@labelX" y="@(region.Y + 4)" fill="rgba(255,255,255,0.9)"
font-family="system-ui,sans-serif" font-size="11" font-weight="600"> font-family="system-ui,sans-serif" font-size="11" font-weight="600">
@region.Name @region.Name
@@ -218,6 +263,7 @@ else
@code { @code {
private ElementReference layoutDiv;
private TurnEvent? CurrentEvent => SimService.Data.CurrentTurn > 0 && SimService.Data.CurrentTurn <= SimService.Data.Events.Count private TurnEvent? CurrentEvent => SimService.Data.CurrentTurn > 0 && SimService.Data.CurrentTurn <= SimService.Data.Events.Count
? SimService.Data.Events[SimService.Data.CurrentTurn - 1] ? SimService.Data.Events[SimService.Data.CurrentTurn - 1]
: null; : null;
@@ -252,6 +298,18 @@ else
SimService.Data.CurrentTurn++; SimService.Data.CurrentTurn++;
} }
private void HandleKeyDown(KeyboardEventArgs e)
{
if (e.Key == "ArrowLeft") PrevTurn();
else if (e.Key == "ArrowRight") NextTurn();
}
protected override async Task OnAfterRenderAsync(bool firstRender)
{
if (firstRender)
await layoutDiv.FocusAsync();
}
private void RandomizeEvents() private void RandomizeEvents()
{ {
SimService.RandomizeEvents(); SimService.RandomizeEvents();
+40 -30
View File
@@ -76,12 +76,7 @@ public class GameSimulationService
public void RandomizeEvents() public void RandomizeEvents()
{ {
var initialRegions = Data.InitialRegions; RunSimulation();
Data = new SimulationData();
Data.Regions = initialRegions.Select(r => r.Clone()).ToList();
Data.InitialRegions = initialRegions;
GenerateAndApplyEvents();
Data.IsInitialized = true;
} }
public List<RegionState> GetCurrentState() public List<RegionState> GetCurrentState()
@@ -181,22 +176,25 @@ public class GameSimulationService
if (region.PredatorMeeples <= 0) if (region.PredatorMeeples <= 0)
return; return;
if (region.PreyMeeples > 0) int total = region.PredatorMeeples;
int canEat = Math.Min(total, region.PreyMeeples);
int mustTravel = total - canEat;
if (canEat > 0)
{ {
int eaten = Math.Min(region.PredatorMeeples, region.PreyMeeples); region.PreyMeeples -= canEat;
region.PreyMeeples -= eaten; region.PredatorMeeples += canEat;
region.PredatorMeeples += eaten; details.Add($"{region.Name}: {canEat} predators ate prey, +{canEat} new predators");
details.Add($"{region.Name}: Predators ate {eaten} prey, now {region.PredatorMeeples}P / {region.PreyMeeples}R");
} }
else
if (mustTravel > 0)
{ {
var target = FindBestTravelTarget(region, r => r.PreyMeeples); var target = FindBestTravelTarget(region, r => r.PreyMeeples);
if (target != null) if (target != null)
{ {
int traveling = region.PredatorMeeples; region.PredatorMeeples -= mustTravel;
target.PredatorMeeples += traveling; target.PredatorMeeples += mustTravel;
region.PredatorMeeples = 0; details.Add($"{region.Name}: {mustTravel} predators traveled to {target.Name}");
details.Add($"{region.Name}: {traveling} predators traveled to {target.Name}");
} }
} }
} }
@@ -206,22 +204,25 @@ public class GameSimulationService
if (region.PreyMeeples <= 0) if (region.PreyMeeples <= 0)
return; return;
if (region.FloraMeeples > 0) int total = region.PreyMeeples;
int canEat = Math.Min(total, region.FloraMeeples);
int mustTravel = total - canEat;
if (canEat > 0)
{ {
int consumed = Math.Min(region.PreyMeeples, region.FloraMeeples); region.FloraMeeples -= canEat;
region.FloraMeeples -= consumed; region.PreyMeeples += canEat;
region.PreyMeeples += consumed; details.Add($"{region.Name}: {canEat} prey ate flora, +{canEat} new prey");
details.Add($"{region.Name}: Prey consumed {consumed} flora, now {region.PreyMeeples}R / {region.FloraMeeples}F");
} }
else
if (mustTravel > 0)
{ {
var target = FindBestTravelTarget(region, r => r.FloraMeeples); var target = FindBestTravelTarget(region, r => r.FloraMeeples);
if (target != null) if (target != null)
{ {
int traveling = region.PreyMeeples; region.PreyMeeples -= mustTravel;
target.PreyMeeples += traveling; target.PreyMeeples += mustTravel;
region.PreyMeeples = 0; details.Add($"{region.Name}: {mustTravel} prey traveled to {target.Name}");
details.Add($"{region.Name}: {traveling} prey traveled to {target.Name}");
} }
} }
} }
@@ -314,14 +315,23 @@ public class GameSimulationService
} }
} }
} }
var excluded = new HashSet<string>
{
"Grass 1", "Grass 2", "Wasteland 1",
"Mountain 1", "Mountain 2", "Mountain 3", "Mountain 4", "Mountain 5"
};
var shuffled = combos.OrderBy(_ => _rng.Next()).ToList(); var shuffled = combos.OrderBy(_ => _rng.Next()).ToList();
for (int i = 0; i < Data.Regions.Count; i++) for (int i = 0; i < Data.Regions.Count; i++)
{ {
var (p, r, f) = shuffled[i % shuffled.Count]; if (!excluded.Contains(Data.Regions[i].Name))
Data.Regions[i].PredatorMeeples = p; {
Data.Regions[i].PreyMeeples = r; var (p, r, f) = shuffled[i % shuffled.Count];
Data.Regions[i].FloraMeeples = f; Data.Regions[i].PredatorMeeples = p;
Data.Regions[i].PreyMeeples = r;
Data.Regions[i].FloraMeeples += f;
}
} }
} }
+4
View File
@@ -222,6 +222,10 @@
"slug": "injury-cards", "slug": "injury-cards",
"title": "Injury Cards" "title": "Injury Cards"
}, },
{
"slug": "level-up",
"title": "Level Up"
},
{ {
"slug": "losing-the-game", "slug": "losing-the-game",
"title": "Losing the Game" "title": "Losing the Game"
+6
View File
@@ -0,0 +1,6 @@
Spend exp up to current amount in a stat + 1 to get an extra stat in it.
Spend 4 exp to go veteran (probably)
Can store a max of 4 exp.
+11 -11
View File
@@ -13,12 +13,12 @@
"state": { "state": {
"type": "markdown", "type": "markdown",
"state": { "state": {
"file": "Notes/Region Types.md", "file": "Notes/Level Up.md",
"mode": "source", "mode": "source",
"source": false "source": false
}, },
"icon": "lucide-file", "icon": "lucide-file",
"title": "Region Types" "title": "Level Up"
} }
} }
] ]
@@ -183,12 +183,18 @@
"bases:Create new base": false "bases:Create new base": false
} }
}, },
"active": "e8ba8e9287dfab25", "active": "a4348c23136fecb0",
"lastOpenFiles": [ "lastOpenFiles": [
"Notes/Mountain Regions.md",
"Notes/Level Up.md",
"Tasks/Add Crisis Logic.md",
"Overview.md",
"Tasks/Sub out all the starter Event Cards.md",
"Tasks/Stub out all the starter Terrain Cards.md",
"Tasks/_Tasks.base",
"Notes/Region Types.md",
"Tasks/Simulate the game state.md", "Tasks/Simulate the game state.md",
"Notes/Terrain Deck.md", "Notes/Terrain Deck.md",
"Notes/Region Types.md",
"Mountain Regions.md",
"Notes/Activate Prey Ecology.md", "Notes/Activate Prey Ecology.md",
"Notes/Activate Flora Ecology.md", "Notes/Activate Flora Ecology.md",
"Notes/End Turn.md", "Notes/End Turn.md",
@@ -197,11 +203,9 @@
"Notes/Water Regions.md", "Notes/Water Regions.md",
"Rules.md", "Rules.md",
"Notes/Grass Regions.md", "Notes/Grass Regions.md",
"Tasks/_Tasks.base",
"Untitled", "Untitled",
"Notes/Supply.md", "Notes/Supply.md",
"Images/Pasted image 20260609163414.png", "Images/Pasted image 20260609163414.png",
"Overview.md",
"Tasks/Generate overview page.md", "Tasks/Generate overview page.md",
"Notes/Event Type.md", "Notes/Event Type.md",
"Notes/Turn Start.md", "Notes/Turn Start.md",
@@ -211,8 +215,6 @@
"Notes/Companion Cards.md", "Notes/Companion Cards.md",
"Notes/Sun.md", "Notes/Sun.md",
"Notes/Mountain.md", "Notes/Mountain.md",
"Notes/Crest.md",
"Notes/Terrain Cards.md",
"Images/Pasted image 20260609163839.png", "Images/Pasted image 20260609163839.png",
"Images/Pasted image 20260609163625.png", "Images/Pasted image 20260609163625.png",
"Images/Pasted image 20260609211711.png", "Images/Pasted image 20260609211711.png",
@@ -220,12 +222,10 @@
"Images/Pasted image 20260609170252.png", "Images/Pasted image 20260609170252.png",
"Images/Pasted image 20260609170321.png", "Images/Pasted image 20260609170321.png",
"Images/Market Example.png", "Images/Market Example.png",
"Notes/Trader.md",
"Bases/_Roles.base", "Bases/_Roles.base",
"Bases/Regions.base", "Bases/Regions.base",
"Images/Map.png", "Images/Map.png",
"_Tasks.base", "_Tasks.base",
"_Overview.md",
"Bases/_Gear.base", "Bases/_Gear.base",
"Tasks", "Tasks",
"Bases/Terrain.base", "Bases/Terrain.base",
+6
View File
@@ -0,0 +1,6 @@
Spend exp up to current amount in a stat + 1 to get an extra stat in it.
Spend 4 exp to go veteran (probably)
Can store a max of 4 exp.