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.

Sign up for GitHub

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

Achievement update #2470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
30ec16f
Move enum achievement_types entries from constants.conf to script.c
hemagx May 11, 2019
9bcd4f4
Implement ACH_ZENY_SPEND_VENDING and ACH_ZENY_SPEND_VENDING_TOTAL
hemagx May 11, 2019
23eb25b
Update MonsterId criteria to accept 0 as Monster ID for a wildcard ac…
hemagx May 11, 2019
f3cae0b
Implemented ACH_PET_INTIMACY and ACH_PET_RUNAWAY, corrected ACH_PET_C…
hemagx May 12, 2019
1379351
Fix vending achievements 220009, 220010, 220011, 220012, 220013 previ…
hemagx May 12, 2019
4474971
HPM Hooks update
hemagx May 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 0 additions & 48 deletions db/constants.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3949,54 +3949,6 @@ constants_db: {
HAT_DIGITAL_SPACE: 87
HAT_EF_SLEIPNIR: 88

comment__: "Achievement Types"
ACH_QUEST: 0
ACH_KILL_PC_TOTAL: 1
ACH_KILL_PC_JOB: 2
ACH_KILL_PC_JOBTYPE: 3
ACH_KILL_MOB_CLASS: 4
ACH_DAMAGE_PC_MAX: 5
ACH_DAMAGE_PC_TOTAL: 6
ACH_DAMAGE_PC_REC_MAX: 7
ACH_DAMAGE_PC_REC_TOTAL: 8
ACH_DAMAGE_MOB_MAX: 9
ACH_DAMAGE_MOB_TOTAL: 10
ACH_DAMAGE_MOB_REC_MAX: 11
ACH_DAMAGE_MOB_REC_TOTAL: 12
ACH_JOB_CHANGE: 13
ACH_STATUS: 14
ACH_STATUS_BY_JOB: 15
ACH_STATUS_BY_JOBTYPE: 16
ACH_CHATROOM_CREATE_DEAD: 17
ACH_CHATROOM_CREATE: 18
ACH_CHATROOM_MEMBERS: 19
ACH_FRIEND_ADD: 20
ACH_PARTY_CREATE: 21
ACH_PARTY_JOIN: 22
ACH_MARRY: 23
ACH_ADOPT_BABY: 24
ACH_ADOPT_PARENT: 25
ACH_ZENY_HOLD: 26
ACH_ZENY_GET_ONCE: 27
ACH_ZENY_GET_TOTAL: 28
ACH_ZENY_SPEND_ONCE: 29
ACH_ZENY_SPEND_TOTAL: 30
ACH_EQUIP_REFINE_SUCCESS: 31
ACH_EQUIP_REFINE_FAILURE: 32
ACH_EQUIP_REFINE_SUCCESS_TOTAL: 33
ACH_EQUIP_REFINE_FAILURE_TOTAL: 34
ACH_EQUIP_REFINE_SUCCESS_WLV: 35
ACH_EQUIP_REFINE_FAILURE_WLV: 36
ACH_EQUIP_REFINE_SUCCESS_ID: 37
ACH_EQUIP_REFINE_FAILURE_ID: 38
ACH_ITEM_GET_COUNT: 39
ACH_ITEM_GET_COUNT_ITEMTYPE: 40
ACH_ITEM_GET_WORTH: 41
ACH_ITEM_SELL_WORTH: 42
ACH_PET_CREATE: 43
ACH_ACHIEVE: 44
ACH_ACHIEVEMENT_RANK: 45

comment__: "inventory expansion"
INVENTORY_INCREASE_STEP: 10
}
24 changes: 16 additions & 8 deletions db/pre-re/achievement_db.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ achievement_db: (
ACH_KILL_PC_TOTAL: (Accumulative) Total kill count. (Player kill)
ACH_KILL_PC_JOB: Kill a player of the specified job. (Player Kill)
ACH_KILL_PC_JOBTYPE: Kill a player of the specified job type. (Player Kill)
ACH_KILL_MOB_CLASS: Kill a particular mob class. (Mob Kill)
ACH_KILL_MOB_CLASS: (Accumulative) Kill a particular mob class. (Mob Kill)
ACH_DAMAGE_PC_MAX: Maximum damage caused on a player. (Player Damage)
ACH_DAMAGE_PC_TOTAL: (Accumulative) Damage on players. (Player Damage)
ACH_DAMAGE_PC_REC_MAX: Maximum damage received by a player. (Receive Player Damage)
Expand All @@ -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

ACH_ZENY_SPEND_VENDING_TOTAL: (Accumulative) Spend a specific amount of zeny in one transaction to a vending player
ACH_EQUIP_REFINE_SUCCESS: Refine an item to +N. (Successful Refine)
ACH_EQUIP_REFINE_FAILURE: Fail to refine an item of +N refine. (Failed Refine)
ACH_EQUIP_REFINE_SUCCESS_TOTAL: (Accumulative) Refine an item successfully N times. (Success Refine)
Expand All @@ -79,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

ACH_PET_RUNAWAY: (Accumulative) Successfully make a pet runaway
ACH_ACHIEVE: Achieve an Achievement. (Achievement Completion)
ACH_ACHIEVEMENT_RANK: Achieve an Achievement Rank. (Achievement Rank Increase)
Objectives: { [Mandatory Field] Objectives of an achievement. Up to 10 objectives per achievement.
Expand All @@ -89,7 +93,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, ACH_PET_CREATE, ACH_PET_INTIMACY, ACH_PET_RUNAWAY.
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

JobId: (mixed) Array or Single entry of JobIds.
For types - ACH_KILL_PC_JOBTYPE, ACH_JOB_CHANGE or ACH_STATUS_BY_JOBTYPE.
Can be either a numeric or string constant.
Expand All @@ -115,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

unlike other criteria this one checked for equal or bigger than, since Intimacy is not increased
or decreased by a predictable amount
}
Goal: (int) Target amount to be met for the completion of the objective. Default is 1.
}
Expand Down Expand Up @@ -4644,7 +4652,7 @@ achievement_db: (
{
Id: 220009
Name: "Activating the market economy (1)"
Type: "ACH_ZENY_SPEND_TOTAL"
Type: "ACH_ZENY_SPEND_VENDING_TOTAL"
Objectives: {
*1: {
Description: "Spend 10000 zeny on vending merchant"
Expand All @@ -4656,7 +4664,7 @@ achievement_db: (
{
Id: 220010
Name: "Activating the market economy (2)"
Type: "ACH_ZENY_SPEND_TOTAL"
Type: "ACH_ZENY_SPEND_VENDING_TOTAL"
Objectives: {
*1: {
Description: "Spend 100000 zeny on vending merchant"
Expand All @@ -4668,7 +4676,7 @@ achievement_db: (
{
Id: 220011
Name: "Activating the market economy (3)"
Type: "ACH_ZENY_SPEND_TOTAL"
Type: "ACH_ZENY_SPEND_VENDING_TOTAL"
Objectives: {
*1: {
Description: "Spend 500000 zeny on vending merchant"
Expand All @@ -4680,7 +4688,7 @@ achievement_db: (
{
Id: 220012
Name: "Activating the market economy (4)"
Type: "ACH_ZENY_SPEND_TOTAL"
Type: "ACH_ZENY_SPEND_VENDING_TOTAL"
Objectives: {
*1: {
Description: "Spend 1.000000 zeny on vending merchant"
Expand All @@ -4692,7 +4700,7 @@ achievement_db: (
{
Id: 220013
Name: "Activating the market economy (5)"
Type: "ACH_ZENY_SPEND_TOTAL"
Type: "ACH_ZENY_SPEND_VENDING_TOTAL"
Objectives: {
*1: {
Description: "Spend 5.000000 zeny on vending merchant"
Expand Down
24 changes: 16 additions & 8 deletions db/re/achievement_db.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ achievement_db: (
ACH_KILL_PC_TOTAL: (Accumulative) Total kill count. (Player kill)
ACH_KILL_PC_JOB: Kill a player of the specified job. (Player Kill)
ACH_KILL_PC_JOBTYPE: Kill a player of the specified job type. (Player Kill)
ACH_KILL_MOB_CLASS: Kill a particular mob class. (Mob Kill)
ACH_KILL_MOB_CLASS: (Accumulative) Kill a particular mob class. (Mob Kill)
ACH_DAMAGE_PC_MAX: Maximum damage caused on a player. (Player Damage)
ACH_DAMAGE_PC_TOTAL: (Accumulative) Damage on players. (Player Damage)
ACH_DAMAGE_PC_REC_MAX: Maximum damage received by a player. (Receive Player Damage)
Expand All @@ -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

ACH_ZENY_SPEND_VENDING_TOTAL: (Accumulative) Spend a specific amount of zeny in total to a vending player
ACH_EQUIP_REFINE_SUCCESS: Refine an item to +N. (Successful Refine)
ACH_EQUIP_REFINE_FAILURE: Fail to refine an item of +N refine. (Failed Refine)
ACH_EQUIP_REFINE_SUCCESS_TOTAL: (Accumulative) Refine an item successfully N times. (Success Refine)
Expand All @@ -79,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

ACH_PET_RUNAWAY: (Accumulative) Successfully make a pet runaway
ACH_ACHIEVE: Achieve an Achievement. (Achievement Completion)
ACH_ACHIEVEMENT_RANK: Achieve an Achievement Rank. (Achievement Rank Increase)
Objectives: { [Mandatory Field] Objectives of an achievement. Up to 10 objectives per achievement.
Expand All @@ -89,7 +93,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, ACH_PET_CREATE, ACH_PET_INTIMACY, ACH_PET_RUNAWAY.
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

JobId: (mixed) Array or Single entry of JobIds.
For types - ACH_KILL_PC_JOBTYPE, ACH_JOB_CHANGE or ACH_STATUS_BY_JOBTYPE.
Can be either a numeric or string constant.
Expand All @@ -115,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

unlike other criteria this one checked for equal or bigger than, since Intimacy is not increased
or decreased by a predictable amount
}
Goal: (int) Target amount to be met for the completion of the objective. Default is 1.
}
Expand Down Expand Up @@ -5345,7 +5353,7 @@ achievement_db: (
{
Id: 220009
Name: "Activating the market economy (1)"
Type: "ACH_ZENY_SPEND_TOTAL"
Type: "ACH_ZENY_SPEND_VENDING_TOTAL"
Objectives: {
*1: {
Description: "Spend 10000 zeny on vending merchant"
Expand All @@ -5357,7 +5365,7 @@ achievement_db: (
{
Id: 220010
Name: "Activating the market economy (2)"
Type: "ACH_ZENY_SPEND_TOTAL"
Type: "ACH_ZENY_SPEND_VENDING_TOTAL"
Objectives: {
*1: {
Description: "Spend 100000 zeny on vending merchant"
Expand All @@ -5369,7 +5377,7 @@ achievement_db: (
{
Id: 220011
Name: "Activating the market economy (3)"
Type: "ACH_ZENY_SPEND_TOTAL"
Type: "ACH_ZENY_SPEND_VENDING_TOTAL"
Objectives: {
*1: {
Description: "Spend 500000 zeny on vending merchant"
Expand All @@ -5381,7 +5389,7 @@ achievement_db: (
{
Id: 220012
Name: "Activating the market economy (4)"
Type: "ACH_ZENY_SPEND_TOTAL"
Type: "ACH_ZENY_SPEND_VENDING_TOTAL"
Objectives: {
*1: {
Description: "Spend 1.000000 zeny on vending merchant"
Expand All @@ -5393,7 +5401,7 @@ achievement_db: (
{
Id: 220013
Name: "Activating the market economy (5)"
Type: "ACH_ZENY_SPEND_TOTAL"
Type: "ACH_ZENY_SPEND_VENDING_TOTAL"
Objectives: {
*1: {
Description: "Spend 5.000000 zeny on vending merchant"
Expand Down
Loading