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.

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

Instrument research #69

Merged
merged 2 commits into from
Dec 20, 2015
Merged

Instrument research #69

merged 2 commits into from
Dec 20, 2015

Conversation

eswald
Copy link
Contributor

@eswald eswald commented Dec 18, 2015

MakeInstrument is no longer a supported job type, and there are new tags allowed in raws for tools.
Depends on DFHack/dfhack#770 for plugin compilation.

This job type is no longer used, because instruments are now crafted individually.
Depends on dfhack commit e4de341 for plugin compilation.
I haven't analyzed the structure of the items in default_improvements, except that they definitely aren't stl-strings.
<stl-string name="unk_v4201_1" comment='v0.42.01'/>
<stl-vector name="unk_v4201_2" comment='v0.42.01'/>
<stl-string name="description" comment='v0.42.01'/>
<stl-vector name="default_improvements" comment='v0.42.01'/>
Copy link
Member

Choose a reason for hiding this comment

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

Do you know what these contain? I think these might end up being vector<void*>s.

@eswald
Copy link
Contributor Author

eswald commented Dec 19, 2015

The description field is a simple string.
The default_improvements vector, no idea. I can tell it has the same number of items as the tool has [DEFAULT_IMPROVEMENT:?:?:?] tags in the raws, but I haven't looked at the actual values, except that they're not stl-strings.

@lethosor
Copy link
Member

Oh, I misread those and thought they were both vectors. Thanks! I'll try looking into the layout of default_improvements when I have time, although it shouldn't prevent merging this (once other stuff with .02/.03 is cleaned up).

lethosor added a commit that referenced this pull request Dec 20, 2015
@lethosor lethosor merged commit a95e6d7 into DFHack:master Dec 20, 2015
@eswald eswald deleted the instruments branch December 20, 2015 05:20
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