Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement enough of the city screen to show and modify tile assignments #541

Open
TomWerner opened this issue Feb 9, 2025 · 0 comments
Open

Implement enough of the city screen to show and modify tile assignments #541

TomWerner opened this issue Feb 9, 2025 · 0 comments
Assignees
@TomWerner

Comments

@TomWerner
Copy link
Contributor

This is a pretty core part of the early game, where making worker improvements and assigning citizens to those worked tiles is key to maximizing production.
@TomWerner TomWerner self-assigned this Feb 9, 2025
This was referenced Feb 9, 2025
Merged
Merged
Merged
TomWerner added a commit that referenced this issue Feb 9, 2025
@TomWerner
Allow modifying tile assignments in the city screen
eacd79b 
This currently only allows moving the "worst" citizen as well as resetting tile assignments by clicking on the city center, but it's a good start. Implementing entertainers (which is necessary to support fancier moves) will be a separate PR.

#541
TomWerner added a commit that referenced this issue Feb 9, 2025
@TomWerner
Allow modifying tile assignments in the city screen
44a7fd5 
This currently only allows moving the "worst" citizen as well as resetting tile assignments by clicking on the city center, but it's a good start. Implementing entertainers (which is necessary to support fancier moves) will be a separate PR.

#541
@TomWerner TomWerner mentioned this issue Feb 9, 2025
Merged
TomWerner added a commit that referenced this issue Feb 10, 2025
@TomWerner
Tile.cs: Use TileLocation instead of a tuple in NeighborCoordinate
2457668 
This simplifies some expressions and will allow chaining calls to NeighborCoordinate in a following PR.

#541
TomWerner added a commit that referenced this issue Feb 10, 2025
@TomWerner
Tile.cs: Use TileLocation instead of a tuple in NeighborCoordinate
b62290b 
This simplifies some expressions and will allow chaining calls to NeighborCoordinate in a following PR.

#541
TomWerner added a commit that referenced this issue Feb 10, 2025
@TomWerner
Tile.cs: Use TileLocation instead of a tuple in NeighborCoordinate
b05b904 
This simplifies some expressions and will allow chaining calls to NeighborCoordinate in a following PR.

#541
@TomWerner TomWerner mentioned this issue Feb 10, 2025
Merged
TomWerner added a commit that referenced this issue Feb 10, 2025
@TomWerner
Import the tile assignments of citizens from save files
959eba1 
This doesn't yet handle resistors or specialists, and doesn't handle scenarios.

The "spiral" logic was tested by creating a bunch of sav files with one city and one population, and then positioning that citizen in each of the spots. I then printed the tile worked variable in the `SaveTest` for each of them to confirm the ordering.

#541
TomWerner added a commit that referenced this issue Feb 10, 2025
@TomWerner
Import the tile assignments of citizens from save files
1a6d9cd 
This doesn't yet handle resistors or specialists, and doesn't handle scenarios.

The "spiral" logic was tested by creating a bunch of sav files with one city and one population, and then positioning that citizen in each of the spots. I then printed the tile worked variable in the `SaveTest` for each of them to confirm the ordering.

#541
TomWerner added a commit that referenced this issue Feb 10, 2025
@TomWerner
Import the tile assignments of citizens from save files
9c94178 
This doesn't yet handle resistors or specialists, and doesn't handle scenarios.

The "spiral" logic was tested by creating a bunch of sav files with one city and one population, and then positioning that citizen in each of the spots. I then printed the tile worked variable in the `SaveTest` for each of them to confirm the ordering.

#541
TomWerner added a commit that referenced this issue Feb 10, 2025
@TomWerner
Import the tile assignments of citizens from save files
3de878b 
This doesn't yet handle resistors or specialists, and doesn't handle scenarios.

The "spiral" logic was tested by creating a bunch of sav files with one city and one population, and then positioning that citizen in each of the spots. I then printed the tile worked variable in the `SaveTest` for each of them to confirm the ordering.

#541
@TomWerner TomWerner mentioned this issue Feb 10, 2025
Merged
TomWerner added a commit that referenced this issue Feb 10, 2025
@TomWerner
Import citizen types from the BIC file
432bc43 
This allows us to know about things like entertainers, tax collectors, etc.

While here I noticed that one of the tests wasn't actually doing anything, so I fixed the path issue and added an assertion to catch similar issues in the future.

#541
@TomWerner TomWerner mentioned this issue Feb 10, 2025
Merged
TomWerner added a commit that referenced this issue Feb 10, 2025
@TomWerner
Import citizen types from the BIC file
0822c3b 
This allows us to know about things like entertainers, tax collectors, etc.

While here I noticed that one of the tests wasn't actually doing anything, so I fixed the path issue and added an assertion to catch similar issues in the future.

#541
TomWerner added a commit that referenced this issue Feb 11, 2025
@TomWerner
Import citizen types from the BIC file
1b6798d 
This allows us to know about things like entertainers, tax collectors, etc.

While here I noticed that one of the tests wasn't actually doing anything, so I fixed the path issue and added an assertion to catch similar issues in the future.

#541
TomWerner added a commit that referenced this issue Feb 12, 2025
@TomWerner
Add initial support for rendering citizens and specialists
65c6128 
This doesn't yet handle citizen moods (everyone is rendered as content), doesn't handle citizen gender, and doesn't handle the "region" of the civ. But it does allow us to see specialists, which will be important for tile assignment - we need to be able to turn a citizen into an entertainer to support some types of tile reassignment.

#541
TomWerner added a commit that referenced this issue Feb 12, 2025
@TomWerner
Add initial support for rendering citizens and specialists
5703463 
This doesn't yet handle citizen moods (everyone is rendered as content), doesn't handle citizen gender, and doesn't handle the "region" of the civ. But it does allow us to see specialists, which will be important for tile assignment - we need to be able to turn a citizen into an entertainer to support some types of tile reassignment.

#541
@TomWerner TomWerner mentioned this issue Feb 12, 2025
Merged
TomWerner added a commit that referenced this issue Feb 12, 2025
@TomWerner
Support turning citizens into specialists and changing their type
c9baef9 
This doesn't yet implement the benefits of specialists, but it does allow us to force certain tiles to not be worked. This is important when passing tiles between cities, for example.

#541
@TomWerner TomWerner mentioned this issue Feb 12, 2025
Merged
TomWerner added a commit that referenced this issue Feb 12, 2025
@TomWerner
Provide tile assignments for cities in scenarios
06e0e99 
Unlike with `.SAV` files, scenarios don't specify the tile assignments for each of the citizens in cities. To handle this we backfill them using the tile assignment AI. This is slightly complicated by fact that the `C7Engine` code can't depend directly on the AI logic, so we have to do some dependency injection via an `Action`.

#541
@TomWerner TomWerner mentioned this issue Feb 12, 2025
Merged
TomWerner added a commit that referenced this issue Feb 13, 2025
@TomWerner
Provide tile assignments for cities in scenarios
92bec26 
Unlike with `.SAV` files, scenarios don't specify the tile assignments for each of the citizens in cities. To handle this we backfill them using the tile assignment AI. This is slightly complicated by fact that the `C7Engine` code can't depend directly on the AI logic, so we have to do some dependency injection via an `Action`.

#541
TomWerner added a commit that referenced this issue Feb 13, 2025
@TomWerner
Load culture values from saves and scenarios and display them
13395aa 
This doesn't yet handle per-turn culture (we'll need building for that) but it should allow us to determine the proper border expansion levels in a following PR, as well as improve the tile assignment logic to restrict things to the BFC.

#541
TomWerner added a commit that referenced this issue Feb 13, 2025
@TomWerner
Load culture values from saves and scenarios and display them
a2e049b 
This doesn't yet handle per-turn culture (we'll need building for that) but it should allow us to determine the proper border expansion levels in a following PR, as well as improve the tile assignment logic to restrict things to the BFC.

#541
@TomWerner TomWerner mentioned this issue Feb 13, 2025
Merged
TomWerner added a commit that referenced this issue Feb 15, 2025
@TomWerner
Allow modifying tile assignments in the city screen
3586d0b 
This currently only allows moving the "worst" citizen as well as resetting tile assignments by clicking on the city center, but it's a good start. Implementing entertainers (which is necessary to support fancier moves) will be a separate PR.

#541
TomWerner added a commit that referenced this issue Feb 15, 2025
@TomWerner
Tile.cs: Use TileLocation instead of a tuple in NeighborCoordinate
468a715 
This simplifies some expressions and will allow chaining calls to NeighborCoordinate in a following PR.

#541
TomWerner added a commit that referenced this issue Feb 15, 2025
@TomWerner
Import the tile assignments of citizens from save files
407306d 
This doesn't yet handle resistors or specialists, and doesn't handle scenarios.

The "spiral" logic was tested by creating a bunch of sav files with one city and one population, and then positioning that citizen in each of the spots. I then printed the tile worked variable in the `SaveTest` for each of them to confirm the ordering.

#541
TomWerner added a commit that referenced this issue Feb 15, 2025
@TomWerner
Import citizen types from the BIC file
7f0e063 
This allows us to know about things like entertainers, tax collectors, etc.

While here I noticed that one of the tests wasn't actually doing anything, so I fixed the path issue and added an assertion to catch similar issues in the future.

#541
TomWerner added a commit that referenced this issue Feb 15, 2025
@TomWerner
Add initial support for rendering citizens and specialists
96fa1fa 
This doesn't yet handle citizen moods (everyone is rendered as content), doesn't handle citizen gender, and doesn't handle the "region" of the civ. But it does allow us to see specialists, which will be important for tile assignment - we need to be able to turn a citizen into an entertainer to support some types of tile reassignment.

#541
TomWerner added a commit that referenced this issue Feb 16, 2025
@TomWerner
TileAssignmentLayer: Draw the big fat cross and indicate tiles worked…
5997828 
… by other cities

#541
@TomWerner TomWerner mentioned this issue Feb 16, 2025
Merged
TomWerner added a commit that referenced this issue Feb 16, 2025
@TomWerner
TileAssignmentLayer: Draw the big fat cross and indicate tiles worked…
a48d951 
… by other cities

#541
TomWerner added a commit that referenced this issue Feb 16, 2025
@TomWerner
TileAssignmentLayer: Draw the big fat cross and indicate tiles worked…
a870f55 
… by other cities

#541
TomWerner added a commit that referenced this issue Feb 16, 2025
@TomWerner
TileAssignmentLayer: Draw the big fat cross and indicate tiles worked…
5013f30 
… by other cities

#541
TomWerner added a commit that referenced this issue Feb 16, 2025
@TomWerner
TileAssignmentLayer: Draw the big fat cross and indicate tiles worked…
949593e 
… by other cities

#541
TomWerner added a commit that referenced this issue Feb 16, 2025
@TomWerner
TileAssignmentLayer: Draw the big fat cross and indicate tiles worked…
ebfa5a5 
… by other cities

#541
TomWerner added a commit that referenced this issue Feb 16, 2025
@TomWerner
TileAssignmentLayer: Draw the big fat cross and indicate tiles worked…
404182c 
… by other cities

#541
TomWerner added a commit that referenced this issue Feb 16, 2025
@TomWerner
Fix tile yields for city centers
5106d01 
This is primarily based on the english translation of this german wiki: https://wiki.civforum.de/wiki/Stadtfeldertrag_(Civ3)

#541
@TomWerner TomWerner mentioned this issue Feb 16, 2025
Open
TomWerner added a commit that referenced this issue Feb 16, 2025
@TomWerner
Fix tile yields for city centers
9af4740 
This is primarily based on the english translation of this german wiki: https://wiki.civforum.de/wiki/Stadtfeldertrag_(Civ3)

#541
TomWerner added a commit that referenced this issue Feb 17, 2025
@TomWerner
Fix tile yields for city centers
f57c7fa 
This is primarily based on the english translation of this german wiki: https://wiki.civforum.de/wiki/Stadtfeldertrag_(Civ3)

#541
TomWerner added a commit that referenced this issue Feb 17, 2025
@TomWerner
Display food/shield/commerce yields in the city screen
fc6cc37 
We can now see the result of moving citizens around.

#541
@TomWerner TomWerner mentioned this issue Feb 17, 2025
Open
TomWerner added a commit that referenced this issue Feb 18, 2025
@TomWerner
Display food/shield/commerce yields in the city screen
42bf659 
We can now see the result of moving citizens around.

#541
TomWerner added a commit that referenced this issue Feb 18, 2025
@TomWerner
Display food/shield/commerce yields in the city screen
2dd95c1 
We can now see the result of moving citizens around.

#541
TomWerner added a commit that referenced this issue Feb 19, 2025
@TomWerner
Support turning citizens into specialists and changing their type
4b62fc9 
This doesn't yet implement the benefits of specialists, but it does allow us to force certain tiles to not be worked. This is important when passing tiles between cities, for example.

#541
TomWerner added a commit that referenced this issue Feb 19, 2025
@TomWerner
Provide tile assignments for cities in scenarios
88e7a70 
Unlike with `.SAV` files, scenarios don't specify the tile assignments for each of the citizens in cities. To handle this we backfill them using the tile assignment AI. This is slightly complicated by fact that the `C7Engine` code can't depend directly on the AI logic, so we have to do some dependency injection via an `Action`.

#541
TomWerner added a commit that referenced this issue Feb 20, 2025
@TomWerner
Load culture values from saves and scenarios and display them
8dc6506 
This doesn't yet handle per-turn culture (we'll need building for that) but it should allow us to determine the proper border expansion levels in a following PR, as well as improve the tile assignment logic to restrict things to the BFC.

#541
TomWerner added a commit that referenced this issue Feb 22, 2025
@TomWerner
TileAssignmentLayer: Draw the big fat cross and indicate tiles worked…
2ce8159 
… by other cities

#541
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@TomWerner TomWerner

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@TomWerner