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

Achievement update #2470

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Conversation

hemagx
Copy link
Contributor

@hemagx hemagx commented May 12, 2019

Pull Request Prelude

Changes Proposed

Implemented the following new achievement types:

  1. ACH_ZENY_SPEND_VENDING - Spend a specific amount of zeny in one transaction to a vending player)
  2. ACH_ZENY_SPEND_VENDING_TOTAL - (Accumulative) Spend a specific amount of zeny in total to a vending player
  3. ACH_PET_INTIMACY - (Accumulative) Successfully reach a specific pet intimacy
  4. ACH_PET_RUNAWAY - (Accumulative) Successfully make a pet runaway

Updated the following achievement criteria:

  1. MobId criteria now accepts 0 as valid value for a wildcard achievement monster class

Update the following in script constant:

  1. Moved Achievement types from constants.conf to script.c

Issues addressed:

Signed-off-by: Ibrahim Zidan <brahem@aotsw.com>
@HerculesWSAPI
Copy link
Contributor

This change is Reviewable

A new achievement type that triggers on spending zeny on vendors

Signed-off-by: Ibrahim Zidan <brahem@aotsw.com>
…hievements

This also corrects the documentation of ACH_KILL_MOB_CLASS achievement type as it was missing the mention of being accumulative

Signed-off-by: Ibrahim Zidan <brahem@aotsw.com>
…REATE documentation.

- ACH_PET_INTIMACY allows an achievement to be triggered when pet intimacy reaches a specific intimacy or higher
- ACH_PET_RUNAWAY allows an achievement to be triggered when pet runsaway
- ACH_PET_CREATE corrected the documentation to include it being accumulative

Signed-off-by: Ibrahim Zidan <brahem@aotsw.com>
…ously they would be triggered on any zeny paying actions and not on vending merchants only

Signed-off-by: Ibrahim Zidan <brahem@aotsw.com>
Signed-off-by: Ibrahim Zidan <brahem@aotsw.com>
@@ -67,6 +67,8 @@ achievement_db: (
ACH_ZENY_GET_TOTAL: (Accumulative) Gain a specific amount of zeny in total. (Gain Zeny)
ACH_ZENY_SPEND_ONCE: Spend a specific amount of zeny in one transaction. (Pay Zeny)
ACH_ZENY_SPEND_TOTAL: (Accumulative) Spend a specific amount of zeny in total. (Pay Zeny)
ACH_ZENY_SPEND_VENDING: Spend a specific amount of zeny in one transaction to a vending player
Copy link
Contributor

Choose a reason for hiding this comment

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

look like formatting different. Other lines using spaces but new lines using tabs

@@ -67,6 +67,8 @@ achievement_db: (
ACH_ZENY_GET_TOTAL: (Accumulative) Gain a specific amount of zeny in total. (Gain Zeny)
ACH_ZENY_SPEND_ONCE: Spend a specific amount of zeny in one transaction. (Pay Zeny)
ACH_ZENY_SPEND_TOTAL: (Accumulative) Spend a specific amount of zeny in total. (Pay Zeny)
ACH_ZENY_SPEND_VENDING: Spend a specific amount of zeny in one transaction to a vending player
Copy link
Contributor

Choose a reason for hiding this comment

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

same here

@@ -91,7 +91,8 @@ achievement_db: (
Criteria: { This is a field for achievements whose objectives must meet
certain criteria before evaluating the player's progress for it.
MobId: (mixed) MonsterId required for an objective.
For types such as ACH_KILL_MOB_CLASS and ACH_PET_CREATE. Can be either int or string constant.
For types such as ACH_KILL_MOB_CLASS and ACH_PET_CREATE.
Can be either int or string constant. If set to 0 would apply to any monster.
Copy link
Contributor

Choose a reason for hiding this comment

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

and here formatting different

@@ -91,7 +91,8 @@ achievement_db: (
Criteria: { This is a field for achievements whose objectives must meet
certain criteria before evaluating the player's progress for it.
MobId: (mixed) MonsterId required for an objective.
For types such as ACH_KILL_MOB_CLASS and ACH_PET_CREATE. Can be either int or string constant.
For types such as ACH_KILL_MOB_CLASS and ACH_PET_CREATE.
Can be either int or string constant. If set to 0 would apply to any monster.
Copy link
Contributor

Choose a reason for hiding this comment

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

and here

@@ -81,7 +81,9 @@ achievement_db: (
ACH_ITEM_GET_COUNT_ITEMTYPE: Acquire N amount of items of a particular type mask. (Acquire Item)
ACH_ITEM_GET_WORTH: Acquire an item of buy value N. (Acquire Item)
ACH_ITEM_SELL_WORTH: Sell an item of sell value N. (NPC Sell Item)
ACH_PET_CREATE: Successfully tame a pet of a particular mob class. (Successful Pet Tame)
ACH_PET_CREATE: (Accumulative) Successfully tame a pet of a particular mob class. (Successful Pet Tame)
ACH_PET_INTIMACY: (Accumulative) Successfully reach a specific pet intimacy
Copy link
Contributor

Choose a reason for hiding this comment

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

formatting here too

@@ -118,6 +120,9 @@ achievement_db: (
For Types such as ACH_EQUIP_REFINE_SUCCESS_WLV and ACH_EQUIP_REFINE_FAILURE_WLV.
Achieve: (int) AchievementID to be achieved.
For Type - ACH_ACHIEVE.
Intimacy: (int) For types such as ACH_PET_INTIMACY, The desired pet intimacy for this achievement,
Copy link
Contributor

Choose a reason for hiding this comment

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

and here formatting

@@ -81,7 +81,9 @@ achievement_db: (
ACH_ITEM_GET_COUNT_ITEMTYPE: Acquire N amount of items of a particular type mask. (Acquire Item)
ACH_ITEM_GET_WORTH: Acquire an item of buy value N. (Acquire Item)
ACH_ITEM_SELL_WORTH: Sell an item of sell value N. (NPC Sell Item)
ACH_PET_CREATE: Successfully tame a pet of a particular mob class. (Successful Pet Tame)
ACH_PET_CREATE: (Accumulative) Successfully tame a pet of a particular mob class. (Successful Pet Tame)
ACH_PET_INTIMACY: (Accumulative) Successfully reach a specific pet intimacy
Copy link
Contributor

Choose a reason for hiding this comment

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

and here

@@ -118,6 +120,9 @@ achievement_db: (
For Types such as ACH_EQUIP_REFINE_SUCCESS_WLV and ACH_EQUIP_REFINE_FAILURE_WLV.
Achieve: (int) AchievementID to be achieved.
For Type - ACH_ACHIEVE.
Intimacy: (int) For types such as ACH_PET_INTIMACY, The desired pet intimacy for this achievement,
Copy link
Contributor

Choose a reason for hiding this comment

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

and here

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.

3 participants