Skip to content

create-unit: bug fixes and update#52

Merged
lethosor merged 3 commits intoDFHack:masterfrom
AtomicChicken:create-unit
May 12, 2018
Merged

create-unit: bug fixes and update#52
lethosor merged 3 commits intoDFHack:masterfrom
AtomicChicken:create-unit

Conversation

@AtomicChicken
Copy link
Copy Markdown
Member

  • creatures of the appropriate age are now spawned as babies or children where applicable
  • fix: civ_id is now properly assigned to historical_figure, resolving several hostility issues (spawned pets are no longer attacked by fortress military!)
  • fix: unnamed creatures are no longer spawned with a string of numbers as a first name

- creatures of the appropriate age are now spawned as babies or children where applicable
- fix: civ_id is now properly assigned to historical_figure, resolving several hostility issues (spawned pets are no longer attacked by fortress military!)
- fix: unnamed creatures are no longer spawned with a string of numbers as a first name
@AtomicChicken AtomicChicken changed the title bug fixes and update create-unit: bug fixes and update May 7, 2018
u.animal.population.population_idx = -1
u.animal.population.depth = -1

u.counters.soldier_mood_countdown = -1
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Which change is this related to? This section was last changed in 96b118b, which led to the merge conflict here, but I can't imagine the first two fields here (at least) corresponding to the bugs you fixed.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

And for reference, the rest of this section dates back to the initial commit of this script (only the field names were changed recently)

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

To clarify, I did not remove this section, but simply relocated it from the domesticate() function to line 552. This is because, as far as I can tell, these changes should apply to all units, not just tamed creatures.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Ah, thanks

@lethosor
Copy link
Copy Markdown
Member

lethosor commented May 7, 2018

Just so you know if you try to push more changes - I used the "resolve conflicts" button here, which made a new commit, so be sure to pull that.

@lethosor lethosor mentioned this pull request May 11, 2018
@lethosor lethosor merged commit 9a44403 into DFHack:master May 12, 2018
@AtomicChicken AtomicChicken deleted the create-unit branch May 14, 2018 15:49
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