From 55b55beb468e32e9505cac4286ebc2e3836c2673 Mon Sep 17 00:00:00 2001 From: Reinier Vens Date: Sat, 19 Jul 2025 05:42:57 +0100 Subject: [PATCH] Sector Map Entity Count Bugfix + Updated Readme Quick fix to accurately display entity counts for visited sectors Updated readme to rewrite the introduction and move the Discord link closer to the top --- Assets/Scripts/UI/Menu/SectorRenderer.cs | 4 +- README.md | 16 +++---- .../Layouts/CurrentMaximizeLayout.dwlt | 46 +++++++++---------- Vault/Aetheria/.obsidian/workspace.json | 6 +-- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/Assets/Scripts/UI/Menu/SectorRenderer.cs b/Assets/Scripts/UI/Menu/SectorRenderer.cs index e6c6b2190..ad27b9a8d 100644 --- a/Assets/Scripts/UI/Menu/SectorRenderer.cs +++ b/Assets/Scripts/UI/Menu/SectorRenderer.cs @@ -90,12 +90,12 @@ public class SectorRenderer : MonoBehaviour, IBeginDragHandler, IDragHandler, IS Properties.AddProperty("Stars", () => starCount); var stationCount = zone.PackedContents.Entities - .Count(entity => ((HullData) entity.Hull.Data.Value).HullType == HullType.Ship) + .Count(entity => ((HullData) entity.Hull.Data.Value).HullType == HullType.Station) .ToString(); Properties.AddProperty("Stations", () => stationCount); var turretCount = zone.PackedContents.Entities - .Count(entity => ((HullData) entity.Hull.Data.Value).HullType == HullType.Ship) + .Count(entity => ((HullData) entity.Hull.Data.Value).HullType == HullType.Turret) .ToString(); Properties.AddProperty("Turrets", () => turretCount); diff --git a/README.md b/README.md index 715c41930..6ae3c06c4 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,15 @@ # Aetheria -This repository is the home of Aetheria, a futuristic space game with a surreal story and visual style. We're planning two distinct gameplay modes, which we are initially releasing as individual titles and later combining into a single persistent world. +Aetheria is an ambitious (AA quality) open source tactical action role-playing game with a sprawling sci-fi setting that combines stunning visuals with unprecedented simulation depth while maintaining accessibility. -In the ARPG mode you control a single ship, engaging in combat, mining, trade and participating in a branching interactive storyline. The game loop for our initial ARPG release is structured as an open world rogue-lite, with a new procedurally generated universe to explore during every run. +All mechanics are developed to be engine-agnostic, while Unity was chosen as a renderer and editor environment for its accessibility and extensibility. Many custom features have been developed, such as a database frontend with configurable backing store for managing game content, a novel visual input rebinding system, and a volumetric cloud renderer with groundbreaking fidelity, any of which can easily add value to other open source gamedev projects. We'd love to see other teams building on our foundation to deliver their own vision and contribute to the ecosystem we're creating. -In the RTS mode you control the production, research, supply chains and actions of a corporation tasked with colonizing an alien galaxy. Control over your minions is indirect, like in Rimworld, and gameplay takes place over months as your production and tasks continue acting on the world even when you're offline. +It is our ambition to forge a new paradigm of open source game development, as to our knowledge there are no other open source projects of this scope building up a foundation from scratch. Game development is notoriously averse to this model and nobody wants to share their shiny toys for fear of losing their competitive advantage. By building and sharing immersive and compelling experiences like this, we hope to change that. -### Trailer +## Contact Us + +If you want to chat, please join [our Discord server](https://discord.gg/trbteNj) for detailed development updates and discussions about the game design, narrative, art direction, and general topics. Shitposting welcome! + +### Trailer (outdated) [![Trailer](https://img.youtube.com/vi/6hg1w2vcwDc/0.jpg)](https://www.youtube.com/watch?v=6hg1w2vcwDc) ### Screenshots @@ -151,7 +155,3 @@ After generating stars, you can generate the links between them, which performs ## License The majority of this repository is under the Mozilla Public License and therefore available for anyone to use. Note that the MPL is per-file and therefore the license only applies to files which contain the MPL header. If you believe a file has been created by us and is missing the header, please let us know (we do forget sometimes). - -## Contact Us - -If you want to chat, please join [our Discord server](https://discord.gg/trbteNj). You can also join me as I stream development daily on [Mixer](https://mixer.com/PixelBro). diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 1fccff192..0563d6531 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -25,7 +25,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 25402 + controlID: 26906 draggingID: 0 --- !u!114 &2 MonoBehaviour: @@ -153,7 +153,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 25379 + controlID: 26732 draggingID: 0 --- !u!114 &4 MonoBehaviour: @@ -179,7 +179,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 25342 + controlID: 26755 draggingID: 0 --- !u!114 &5 MonoBehaviour: @@ -198,10 +198,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 947 + width: 948 height: 664 - m_MinSize: {x: 201, y: 226} - m_MaxSize: {x: 4001, y: 4026} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 6} m_Panes: - {fileID: 6} @@ -232,7 +232,7 @@ MonoBehaviour: serializedVersion: 2 x: 71 y: 79 - width: 946 + width: 947 height: 638 m_SerializedDataModeController: m_DataMode: 0 @@ -756,9 +756,9 @@ MonoBehaviour: speed: 2 m_Value: {x: -0.013152969, y: 0.07374061, z: 0.0009911377, w: 0.99719024} m_Size: - m_Target: 213.5131 + m_Target: 165.53023 speed: 2 - m_Value: 213.5131 + m_Value: 165.53023 m_Ortho: m_Target: 0 speed: 2 @@ -1824,12 +1824,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 947 + x: 948 y: 0 - width: 555 + width: 554 height: 664 - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 102, y: 126} + m_MaxSize: {x: 4002, y: 4026} m_ActualView: {fileID: 9} m_Panes: - {fileID: 9} @@ -1857,9 +1857,9 @@ MonoBehaviour: m_TextWithWhitespace: "Console\u200B" m_Pos: serializedVersion: 2 - x: 1018 + x: 1019 y: 79 - width: 553 + width: 552 height: 638 m_SerializedDataModeController: m_DataMode: 0 @@ -1922,7 +1922,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 25403 + controlID: 26845 draggingID: 0 --- !u!114 &12 MonoBehaviour: @@ -1943,8 +1943,8 @@ MonoBehaviour: y: 0 width: 451 height: 726 - m_MinSize: {x: 202, y: 226} - m_MaxSize: {x: 4002, y: 4026} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} @@ -1992,7 +1992,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: be17f6ffd617f6ffda21f6ff8e23f6ff8c94f6ff78e3f6ff3e8df7ff6ac4f8ff265af9ff68e4fcff1a06fdff146bfdff4c20feffbe05ffff4a1fffffcefe0000ecff000046040100a4040100780501005e1b010030240100be4801002e6e0100f86e0100147201008cbf0100e4bf0100fec301007c7802009a8a020060d502009aec020012f00200d8f1020058f5020092f5020008f902004cfb020054fb0200 + m_ExpandedIDs: 1a82f4ffbe17f6ffd617f6ffda21f6ff8e23f6ff8c94f6ff78e3f6ff3e8df7ff6ac4f8ff265af9ff68e4fcff1a06fdff146bfdff4c20feffbe05ffff4a1fffffcefe0000ecff000046040100a4040100780501005e1b010030240100be4801002e6e0100f86e0100147201008cbf0100e4bf0100fec301007c7802009a8a020060d502009aec020012f00200d8f1020058f5020092f5020008f902004cfb020054fb0200ee360400 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -2036,8 +2036,8 @@ MonoBehaviour: y: 726 width: 451 height: 615 - m_MinSize: {x: 232, y: 276} - m_MaxSize: {x: 10002, y: 10026} + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} m_ActualView: {fileID: 15} m_Panes: - {fileID: 15} @@ -2216,8 +2216,8 @@ MonoBehaviour: y: 0 width: 536 height: 1341 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 276, y: 76} + m_MaxSize: {x: 4001, y: 4026} m_ActualView: {fileID: 17} m_Panes: - {fileID: 17} diff --git a/Vault/Aetheria/.obsidian/workspace.json b/Vault/Aetheria/.obsidian/workspace.json index d40c8a434..8b0113cac 100644 --- a/Vault/Aetheria/.obsidian/workspace.json +++ b/Vault/Aetheria/.obsidian/workspace.json @@ -37,7 +37,7 @@ "state": { "type": "markdown", "state": { - "file": "Aetheria/Worldbuilding/Post-Elysium/Species/Ratfolk.md", + "file": "Aetheria/Introduction.md", "mode": "source", "source": false, "backlinks": true, @@ -52,7 +52,7 @@ } }, "icon": "lucide-file", - "title": "Ratfolk" + "title": "Introduction" } } ], @@ -216,11 +216,11 @@ }, "active": "4b777a3c9c524d60", "lastOpenFiles": [ + "Aetheria/Worldbuilding/Post-Elysium/Species/Ratfolk.md", "Aetheria/Worldbuilding/Post-Elysium/Technology/Aethernet.md", "Aetheria/Worldbuilding/Post-Elysium/Species", "Aetheria/Worldbuilding/Post-Elysium/Concepts", "Aetheria/Worldbuilding/Post-Elysium/Technology/Aetheric Drive.md", - "Aetheria/Worldbuilding/Post-Elysium/Species/Ratfolk.md", "Aetheria/Worldbuilding/Post-Elysium/Technology", "Aetheria/Worldbuilding/Pre-Elysium/Technology/Advanced Superconductors.md", "Aetheria/Worldbuilding/Pre-Elysium/Factions/Powers/Minor/Cryonix.md",