Achievement update #2470

hemagx · 2019-05-12T08:51:44Z

Pull Request Prelude

I have followed proper Hercules code styling.
I have read and understood the contribution guidelines before making this PR.
I am aware that this PR may be closed if the above-mentioned criteria are not fulfilled.

Changes Proposed

Implemented the following new achievement types:

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

Updated the following achievement criteria:

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

Update the following in script constant:

Moved Achievement types from constants.conf to script.c

Issues addressed:

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

HerculesWSAPI · 2019-05-12T08:51:53Z

This change is

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>

4144 · 2019-05-12T16:49:22Z

db/pre-re/achievement_db.conf

@@ -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


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

4144 · 2019-05-12T16:49:30Z

db/re/achievement_db.conf

@@ -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


4144 · 2019-05-12T16:51:09Z

db/pre-re/achievement_db.conf

@@ -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.


and here formatting different

4144 · 2019-05-12T16:51:20Z

db/re/achievement_db.conf

@@ -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.


4144 · 2019-05-12T16:52:15Z

db/pre-re/achievement_db.conf

@@ -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


formatting here too

4144 · 2019-05-12T16:52:41Z

db/pre-re/achievement_db.conf

@@ -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,


and here formatting

4144 · 2019-05-12T16:52:49Z

db/re/achievement_db.conf

@@ -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


4144 · 2019-05-12T16:52:58Z

db/re/achievement_db.conf

@@ -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,


Move enum achievement_types entries from constants.conf to script.c

30ec16f

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

hemagx added 5 commits May 12, 2019 10:52

Implement ACH_ZENY_SPEND_VENDING and ACH_ZENY_SPEND_VENDING_TOTAL

9bcd4f4

A new achievement type that triggers on spending zeny on vendors Signed-off-by: Ibrahim Zidan <brahem@aotsw.com>

Update MonsterId criteria to accept 0 as Monster ID for a wildcard ac…

23eb25b

…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>

Fix vending achievements 220009, 220010, 220011, 220012, 220013 previ…

1379351

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

HPM Hooks update

4474971

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

hemagx force-pushed the achievement_update branch from 03fc81d to 4474971 Compare May 12, 2019 08:54

4144 requested changes May 12, 2019

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Achievement update #2470

Achievement update #2470

hemagx commented May 12, 2019

HerculesWSAPI commented May 12, 2019

4144 May 12, 2019

4144 May 12, 2019

4144 May 12, 2019

4144 May 12, 2019

4144 May 12, 2019

4144 May 12, 2019

4144 May 12, 2019

4144 May 12, 2019

Achievement update #2470

Are you sure you want to change the base?

Achievement update #2470

Conversation

hemagx commented May 12, 2019

Pull Request Prelude

Changes Proposed

HerculesWSAPI commented May 12, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment