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

Splitted guild_skill_tree.txt into re and pre-re #3841

Merged
merged 18 commits into from Mar 11, 2019

Conversation

Daegaladh
Copy link
Member

@Daegaladh Daegaladh commented Jan 7, 2019

  • Server Mode: Both
  • Description of Pull Request:
    • Split guild_skill_tree into re and pre-re, Guild Storage Expansion skill left commented on pre-re for custom use.
    • Converted guild_skill_tree to YAML.

@Daegaladh Daegaladh added the status:code-review Pull Request that requires reviewing from other developers before being pushed to master label Jan 7, 2019
Lemongrass3110
Lemongrass3110 previously approved these changes Jan 7, 2019
@Lemongrass3110 Lemongrass3110 dismissed their stale review January 13, 2019 16:05

Additional changes since review.

@Lemongrass3110
Copy link
Member

Blocked until #3694 was merged.

@Lemongrass3110 Lemongrass3110 added the status:onhold Issue that is on-hold for an unspecified length of time label Jan 28, 2019
yaml_invalid_warning("guild_read_guildskill_tree_db_sub: Guild skill definition with invalid ID field in '" CL_WHITE "%s" CL_RESET "', skipping.\n", node, source);
return false;
}
if (!script_get_constant(name.c_str(), (int *)&skill_id)) {
Copy link
Contributor

Choose a reason for hiding this comment

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

How about int skill_id = skill_name2id( name.c_str() ); instead?

* Adjusted guild skill name parsing to use previously defined functions so we don't have to export skill names to the script engine.
Thanks to @Atemo's suggestion!
* Forgot to adjust the required skill name check.
@secretdataz secretdataz removed the status:onhold Issue that is on-hold for an unspecified length of time label Mar 1, 2019
@Lemongrass3110 Lemongrass3110 merged commit cbe0d6b into master Mar 11, 2019
@Lemongrass3110 Lemongrass3110 deleted the hotfix/issue3840 branch March 11, 2019 18:57
@aleos89 aleos89 removed the status:code-review Pull Request that requires reviewing from other developers before being pushed to master label Mar 11, 2019
@Lemongrass3110 Lemongrass3110 added this to the YAML Conversion milestone Dec 21, 2019
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.

None yet

5 participants