Skip to content

Nationality for MapUnits and adjective for Civilization#881

Closed
stavrosfa wants to merge 4 commits intoC7-Game:Developmentfrom
stavrosfa:enchancement/unit-nationality-civ-adjective
Closed

Nationality for MapUnits and adjective for Civilization#881
stavrosfa wants to merge 4 commits intoC7-Game:Developmentfrom
stavrosfa:enchancement/unit-nationality-civ-adjective

Conversation

@stavrosfa
Copy link
Contributor

Added property Nationality for MapUnit, distinguishing between native and captured units.
Added adjective for Civilization
Updated some description texts

Another bite size chunk that can be merged by itself, before I open a PR for the capturing units mechanism.

Copy link
Contributor

@TomWerner TomWerner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool! The captured workers being slower is a nice functionality gap to close

return !this.IsBusy() && this.movementPoints.canMove;
}

public bool IsSlave() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe IsCaptured? That seems like it generalizes better to artillery and such (and I think is how it's displayed in the military advisor)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about to IsCaptive ? IsCaptured seems like the logical term, but I associate it with the result of a method, like another unit tried to capture it, and it succeeded, not the state of the unit, if that makes any sense.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IsCaptive sounds great, thanks!

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants