Town aggregation #383

bwrsandman · 2022-04-21T13:05:18Z

Needed for the GO_HOME states as the villager needs to be assigned a town and the town must assign itself to abodes.

bwrsandman · 2022-04-21T13:12:12Z

Move these commits out of #285 because they're related to other states that aren't implemented and they're half finished.

src/Common/Spiral.cpp

src/Common/Spiral.h

src/ECS/Components/Town.cpp

github-actions

clang-tidy made some suggestions

github-actions · 2023-07-21T22:47:29Z

src/ECS/Components/Field.h

@@ -14,7 +14,9 @@ namespace openblack::ecs::components

 struct Field
 {
- int town;
+ static constexpr float radius2D = 5.0f;


warning: invalid case style for global constant 'radius2D' [readability-identifier-naming]

Suggested change

static constexpr float radius2D = 5.0f;

static constexpr float k_Radius2D = 5.0f;

github-actions · 2023-07-21T22:47:29Z

src/ECS/Components/Town.cpp

+ {
+ [[maybe_unused]] const bool any = registry.AnyOf<Fixed, Mobile>(entity);
+ assert(any);
+ assert(false); // TODO


warning: missing username/bug in TODO [google-readability-todo]

Suggested change

assert(false); // TODO

assert(false); // TODO(unknown):

github-actions · 2023-07-21T22:47:30Z

src/ECS/Components/Town.cpp

+
+ const auto& registry = Locator::entitiesRegistry::value();
+
+ bool checkPlanned = false; // TODO: rename to searchMore


warning: missing username/bug in TODO [google-readability-todo]

Suggested change

bool checkPlanned = false; // TODO: rename to searchMore

bool checkPlanned = false; // TODO(unknown): rename to searchMore

github-actions · 2023-07-21T22:47:30Z

src/ECS/Components/Town.cpp

+ });
+
+ std::array<entt::entity, 100> fieldsAndPlanned;
+ uint32_t fieldsAndPlannedCount = 0; // TODO: rename to something about circular buffer


warning: missing username/bug in TODO [google-readability-todo]

Suggested change

uint32_t fieldsAndPlannedCount = 0; // TODO: rename to something about circular buffer

uint32_t fieldsAndPlannedCount = 0; // TODO(unknown): rename to something about circular buffer

github-actions · 2023-07-21T22:47:30Z

src/ECS/Components/Town.cpp

+
+ std::array<entt::entity, 100> fieldsAndPlanned;
+ uint32_t fieldsAndPlannedCount = 0; // TODO: rename to something about circular buffer
+ uint32_t abodeCount = 0; // TODO: Rename to fieldsAndPlannedTotal


warning: missing username/bug in TODO [google-readability-todo]

Suggested change

uint32_t abodeCount = 0; // TODO: Rename to fieldsAndPlannedTotal

uint32_t abodeCount = 0; // TODO(unknown): Rename to fieldsAndPlannedTotal

github-actions · 2023-07-21T22:47:30Z

src/ECS/Components/Town.cpp

+ }
+ }
+
+ // TODO: If there aren't enough, throw planned structures into the mix


warning: missing username/bug in TODO [google-readability-todo]

Suggested change

// TODO: If there aren't enough, throw planned structures into the mix

// TODO(unknown): If there aren't enough, throw planned structures into the mix

github-actions · 2023-07-21T22:47:49Z

Uploaded images

Map	Debug	Release
Land1.txt
Land2.txt
Land3.txt
Land4.txt
Land5.txt
LandT.txt
TwoGods.txt
ThreeGods.txt
FourGods.txt
construct.txt	TODO	TODO

github-actions · 2024-03-27T03:51:16Z

src/Common/Spiral.cpp

@@ -0,0 +1,62 @@
+/******************************************************************************
+ * Copyright (c) 2018-2023 openblack developers


[license_checker] _{reported by reviewdog 🐶}

Suggested change

* Copyright (c) 2018-2023 openblack developers

/******************************************************************************

* Copyright (c) 2018-2024 openblack developers

*

* For a complete list of all authors, please refer to contributors.md

* Interested in contributing? Visit https://github.com/openblack/openblack

*

* openblack is licensed under the GNU General Public License version 3.

*******************************************************************************/

* Copyright (c) 2018-2023 openblack developers

github-actions · 2024-03-27T03:51:16Z

src/Common/Spiral.h

@@ -0,0 +1,22 @@
+/******************************************************************************
+ * Copyright (c) 2018-2023 openblack developers


[license_checker] _{reported by reviewdog 🐶}

Suggested change

* Copyright (c) 2018-2023 openblack developers

/******************************************************************************

* Copyright (c) 2018-2024 openblack developers

*

* For a complete list of all authors, please refer to contributors.md

* Interested in contributing? Visit https://github.com/openblack/openblack

*

* openblack is licensed under the GNU General Public License version 3.

*******************************************************************************/

* Copyright (c) 2018-2023 openblack developers

github-actions · 2024-03-27T03:51:16Z

src/ECS/Components/Town.cpp

@@ -0,0 +1,272 @@
+/******************************************************************************
+ * Copyright (c) 2018-2023 openblack developers


[license_checker] _{reported by reviewdog 🐶}

Suggested change

* Copyright (c) 2018-2023 openblack developers

/******************************************************************************

* Copyright (c) 2018-2024 openblack developers

*

* For a complete list of all authors, please refer to contributors.md

* Interested in contributing? Visit https://github.com/openblack/openblack

*

* openblack is licensed under the GNU General Public License version 3.

*******************************************************************************/

* Copyright (c) 2018-2023 openblack developers

github-actions

clang-tidy made some suggestions

github-actions · 2024-03-27T04:04:57Z

src/ECS/Components/Town.cpp

+ {
+ [[maybe_unused]] const bool any = registry.AnyOf<Fixed, Mobile>(entity);
+ assert(any);
+ assert(false); // TODO


warning: missing username/bug in TODO [google-readability-todo]

Suggested change

assert(false); // TODO

assert(false); // TODO(bwrsandman):

github-actions · 2024-03-27T04:04:57Z

src/ECS/Components/Town.cpp

+
+ const auto& registry = Locator::entitiesRegistry::value();
+
+ bool checkPlanned = false; // TODO: rename to searchMore


warning: missing username/bug in TODO [google-readability-todo]

Suggested change

bool checkPlanned = false; // TODO: rename to searchMore

bool checkPlanned = false; // TODO(bwrsandman): rename to searchMore

github-actions · 2024-03-27T04:04:58Z

src/ECS/Components/Town.cpp

+ });
+
+ std::array<entt::entity, 100> fieldsAndPlanned;
+ uint32_t fieldsAndPlannedCount = 0; // TODO: rename to something about circular buffer


warning: missing username/bug in TODO [google-readability-todo]

Suggested change

uint32_t fieldsAndPlannedCount = 0; // TODO: rename to something about circular buffer

uint32_t fieldsAndPlannedCount = 0; // TODO(bwrsandman): rename to something about circular buffer

github-actions · 2024-03-27T04:04:58Z

src/ECS/Components/Town.cpp

+
+ std::array<entt::entity, 100> fieldsAndPlanned;
+ uint32_t fieldsAndPlannedCount = 0; // TODO: rename to something about circular buffer
+ uint32_t abodeCount = 0; // TODO: Rename to fieldsAndPlannedTotal


warning: missing username/bug in TODO [google-readability-todo]

Suggested change

uint32_t abodeCount = 0; // TODO: Rename to fieldsAndPlannedTotal

uint32_t abodeCount = 0; // TODO(bwrsandman): Rename to fieldsAndPlannedTotal

github-actions · 2024-03-27T04:04:58Z

src/ECS/Components/Town.cpp

+ }
+ }
+
+ // TODO: If there aren't enough, throw planned structures into the mix


warning: missing username/bug in TODO [google-readability-todo]

Suggested change

// TODO: If there aren't enough, throw planned structures into the mix

// TODO(bwrsandman): If there aren't enough, throw planned structures into the mix

github-actions bot added the merge-conflicts PR cannot be merged until it is rebased label May 29, 2022

bwrsandman force-pushed the town-aggregation branch from 024f082 to 939871e Compare June 4, 2022 14:55

bwrsandman removed the merge-conflicts PR cannot be merged until it is rebased label Jun 4, 2022

github-actions bot added the merge-conflicts PR cannot be merged until it is rebased label Jun 26, 2022

bwrsandman force-pushed the master branch from fbdfe39 to b7e2c89 Compare January 15, 2023 23:56

bwrsandman force-pushed the town-aggregation branch from 939871e to c121c8f Compare July 7, 2023 16:44

github-actions bot reviewed Jul 7, 2023

View reviewed changes

src/Common/Spiral.cpp Outdated Show resolved Hide resolved

src/Common/Spiral.h Outdated Show resolved Hide resolved

src/ECS/Components/Town.cpp Outdated Show resolved Hide resolved

github-actions bot removed the merge-conflicts PR cannot be merged until it is rebased label Jul 7, 2023

bwrsandman force-pushed the town-aggregation branch from c121c8f to 299a5c2 Compare July 7, 2023 18:14

github-actions bot added the merge-conflicts PR cannot be merged until it is rebased label Jul 12, 2023

bwrsandman force-pushed the town-aggregation branch from 299a5c2 to f45abd3 Compare July 13, 2023 01:04

github-actions bot removed the merge-conflicts PR cannot be merged until it is rebased label Jul 13, 2023

bwrsandman force-pushed the town-aggregation branch 2 times, most recently from f8b2c5c to f9730ba Compare July 21, 2023 22:10

bwrsandman marked this pull request as ready for review July 21, 2023 22:11

bwrsandman requested review from raffclar and handsomematt as code owners July 21, 2023 22:11

bwrsandman force-pushed the town-aggregation branch from f9730ba to 71fb700 Compare July 21, 2023 22:24

github-actions bot reviewed Jul 21, 2023

View reviewed changes

bwrsandman added 2 commits March 26, 2024 23:46

Town field: Remove town id which is in abode

4496fcd

Town: Add congregation position

8a6fd6e

bwrsandman force-pushed the town-aggregation branch from 71fb700 to 8a6fd6e Compare March 27, 2024 03:46

bwrsandman requested a review from a team as a code owner March 27, 2024 03:46

github-actions bot reviewed Mar 27, 2024

View reviewed changes

bwrsandman removed request for handsomematt and raffclar May 17, 2024 18:46

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Town aggregation #383

Town aggregation #383

bwrsandman commented Apr 21, 2022 •

edited

bwrsandman commented Apr 21, 2022

github-actions bot left a comment

github-actions bot Jul 21, 2023

github-actions bot Jul 21, 2023

github-actions bot Jul 21, 2023

github-actions bot Jul 21, 2023

github-actions bot Jul 21, 2023

github-actions bot Jul 21, 2023

github-actions bot commented Jul 21, 2023 •

edited

github-actions bot Mar 27, 2024

github-actions bot Mar 27, 2024

github-actions bot Mar 27, 2024

github-actions bot left a comment

github-actions bot Mar 27, 2024

github-actions bot Mar 27, 2024

github-actions bot Mar 27, 2024

github-actions bot Mar 27, 2024

github-actions bot Mar 27, 2024

	static constexpr float radius2D = 5.0f;
	static constexpr float k_Radius2D = 5.0f;


		const auto& registry = Locator::entitiesRegistry::value();

		bool checkPlanned = false; // TODO: rename to searchMore

	bool checkPlanned = false; // TODO: rename to searchMore
	bool checkPlanned = false; // TODO(unknown): rename to searchMore

	uint32_t fieldsAndPlannedCount = 0; // TODO: rename to something about circular buffer
	uint32_t fieldsAndPlannedCount = 0; // TODO(unknown): rename to something about circular buffer

	uint32_t abodeCount = 0; // TODO: Rename to fieldsAndPlannedTotal
	uint32_t abodeCount = 0; // TODO(unknown): Rename to fieldsAndPlannedTotal

	// TODO: If there aren't enough, throw planned structures into the mix
	// TODO(unknown): If there aren't enough, throw planned structures into the mix

		@@ -0,0 +1,62 @@
		/******************************************************************************
		* Copyright (c) 2018-2023 openblack developers

- * Copyright (c) 2018-2023 openblack developers
+/******************************************************************************
+ * Copyright (c) 2018-2024 openblack developers
+ *
+ * For a complete list of all authors, please refer to contributors.md
+ * Interested in contributing? Visit https://github.com/openblack/openblack
+ *
+ * openblack is licensed under the GNU General Public License version 3.
+ *******************************************************************************/
+ * Copyright (c) 2018-2023 openblack developers

		@@ -0,0 +1,22 @@
		/******************************************************************************
		* Copyright (c) 2018-2023 openblack developers

		@@ -0,0 +1,272 @@
		/******************************************************************************
		* Copyright (c) 2018-2023 openblack developers

	bool checkPlanned = false; // TODO: rename to searchMore
	bool checkPlanned = false; // TODO(bwrsandman): rename to searchMore

	uint32_t abodeCount = 0; // TODO: Rename to fieldsAndPlannedTotal
	uint32_t abodeCount = 0; // TODO(bwrsandman): Rename to fieldsAndPlannedTotal

	// TODO: If there aren't enough, throw planned structures into the mix
	// TODO(bwrsandman): If there aren't enough, throw planned structures into the mix

Town aggregation #383

Are you sure you want to change the base?

Town aggregation #383

Conversation

bwrsandman commented Apr 21, 2022 • edited

bwrsandman commented Apr 21, 2022

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot Jul 21, 2023

Choose a reason for hiding this comment

github-actions bot Jul 21, 2023

Choose a reason for hiding this comment

github-actions bot Jul 21, 2023

Choose a reason for hiding this comment

github-actions bot Jul 21, 2023

Choose a reason for hiding this comment

github-actions bot Jul 21, 2023

Choose a reason for hiding this comment

github-actions bot Jul 21, 2023

Choose a reason for hiding this comment

github-actions bot commented Jul 21, 2023 • edited

Uploaded images

github-actions bot Mar 27, 2024

Choose a reason for hiding this comment

github-actions bot Mar 27, 2024

Choose a reason for hiding this comment

github-actions bot Mar 27, 2024

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot Mar 27, 2024

Choose a reason for hiding this comment

github-actions bot Mar 27, 2024

Choose a reason for hiding this comment

github-actions bot Mar 27, 2024

Choose a reason for hiding this comment

github-actions bot Mar 27, 2024

Choose a reason for hiding this comment

github-actions bot Mar 27, 2024

Choose a reason for hiding this comment

bwrsandman commented Apr 21, 2022 •

edited

github-actions bot commented Jul 21, 2023 •

edited