Skip to content
Permalink
Browse files
Refine overhaul (#2295) 
* Converted refine_db.txt to refine_db.yml
* Refine success rates can now be set in refine_db.yml. rAthena's default NPCs will respect this database by default.
* Added shadow equipment refiner
Thanks to @Akkarinage @aleos89 @Atemo and @Mikegyver for their inputs.
  • Loading branch information
@secretdataz
secretdataz committed Sep 18, 2017
1 parent 8222208 commit e24d30a7113835f9c33f0fb51b89acfb7e00882f
5 conf/battle/items.conf
View file
@@ -110,3 +110,8 @@ default_bind_on_equip: 4
// no = Bound items are unable to be sold at Itemshops
// yes = Bound items are able to be sold at Itemshops
allow_bound_sell: no

// Turn on event refine chance (see db/{pre-}re/refine_db.yml)
// no = normal refine chances in effect (official/default value)
// yes = event refine chances in effect
event_refine_chance: no
32 db/import-tmpl/refine_db.txt
View file

This file was deleted.

20 db/import-tmpl/refine_db.yml
View file
@@ -0,0 +1,20 @@
# This file is a part of rAthena++.
# Copyright(C) 2017 rAthena Development Team
# https://rathena.org - https://github.com/rathena
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
###########################################################################
# Custom Refine Database
###########################################################################
41 db/pre-re/refine_db.txt
View file

This file was deleted.

235 db/pre-re/refine_db.yml
View file
@@ -0,0 +1,235 @@
# This file is a part of rAthena++.
# Copyright(C) 2017 rAthena Development Team
# https://rathena.org - https://github.com/rathena
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
###########################################################################
# Pre-Renewal Refine Database
###########################################################################
Armor:
StatsPerLevel: 66
RandomBonusStartLevel: 0
RandomBonusValue: 0
Costs:
- Type: REFINE_COST_NORMAL
Price: 2000
Material: 985
- Type: REFINE_COST_ENRICHED
Price: 2000
Material: 7619
Rates:
- Level: 5
NormalChance: 60
EnrichedChance: 90
EventNormalChance: 60
EventEnrichedChance: 95
- Level: 6
NormalChance: 40
EnrichedChance: 70
EventNormalChance: 40
EventEnrichedChance: 80
- Level: 7
NormalChance: 40
EnrichedChance: 70
EventNormalChance: 40
EventEnrichedChance: 80
- Level: 8
NormalChance: 20
EnrichedChance: 40
EventNormalChance: 20
EventEnrichedChance: 50
- Level: 9
NormalChance: 20
EnrichedChance: 40
EventNormalChance: 20
EventEnrichedChance: 50
- Level: 10
NormalChance: 9
EnrichedChance: 20
EventNormalChance: 9
EventEnrichedChance: 35
WeaponLv1:
StatsPerLevel: 200
RandomBonusStartLevel: 8
RandomBonusValue: 300
Costs:
- Type: REFINE_COST_NORMAL
Price: 50
Material: 1010
- Type: REFINE_COST_ENRICHED
Price: 2000
Material: 7620
Rates:
- Level: 8
NormalChance: 60
EnrichedChance: 90
EventNormalChance: 60
EventEnrichedChance: 95
- Level: 9
NormalChance: 40
EnrichedChance: 70
EventNormalChance: 40
EventEnrichedChance: 85
- Level: 10
NormalChance: 19
EnrichedChance: 30
EventNormalChance: 19
EventEnrichedChance: 55
WeaponLv2:
StatsPerLevel: 300
RandomBonusStartLevel: 7
RandomBonusValue: 500
Costs:
- Type: REFINE_COST_NORMAL
Price: 200
Material: 1011
- Type: REFINE_COST_ENRICHED
Price: 2000
Material: 7620
Rates:
- Level: 7
NormalChance: 60
EnrichedChance: 90
EventNormalChance: 60
EventEnrichedChance: 95
- Level: 8
NormalChance: 40
EnrichedChance: 70
EventNormalChance: 40
EventEnrichedChance: 85
- Level: 9
NormalChance: 20
EnrichedChance: 40
EventNormalChance: 20
EventEnrichedChance: 60
- Level: 10
NormalChance: 19
EnrichedChance: 30
EventNormalChance: 19
EventEnrichedChance: 45
WeaponLv3:
StatsPerLevel: 500
RandomBonusStartLevel: 6
RandomBonusValue: 800
Costs:
- Type: REFINE_COST_NORMAL
Price: 5000
Material: 984
- Type: REFINE_COST_ENRICHED
Price: 2000
Material: 7620
Rates:
- Level: 6
NormalChance: 60
EnrichedChance: 90
EventNormalChance: 60
EventEnrichedChance: 95
- Level: 7
NormalChance: 50
EnrichedChance: 80
EventNormalChance: 50
EventEnrichedChance: 90
- Level: 8
NormalChance: 20
EnrichedChance: 40
EventNormalChance: 20
EventEnrichedChance: 70
- Level: 9
NormalChance: 20
EnrichedChance: 40
EventNormalChance: 20
EventEnrichedChance: 60
- Level: 10
NormalChance: 19
EnrichedChance: 30
EventNormalChance: 19
EventEnrichedChance: 45
WeaponLv4:
StatsPerLevel: 700
RandomBonusStartLevel: 5
RandomBonusValue: 1300
Costs:
- Type: REFINE_COST_NORMAL
Price: 20000
Material: 984
- Type: REFINE_COST_ENRICHED
Price: 2000
Material: 7620
Rates:
- Level: 5
NormalChance: 60
EnrichedChance: 90
EventNormalChance: 60
EventEnrichedChance: 95
- Level: 6
NormalChance: 40
EnrichedChance: 70
EventNormalChance: 40
EventEnrichedChance: 80
- Level: 7
NormalChance: 40
EnrichedChance: 70
EventNormalChance: 40
EventEnrichedChance: 80
- Level: 8
NormalChance: 20
EnrichedChance: 40
EventNormalChance: 20
EventEnrichedChance: 60
- Level: 9
NormalChance: 20
EnrichedChance: 40
EventNormalChance: 20
EventEnrichedChance: 50
- Level: 10
NormalChance: 9
EnrichedChance: 20
EventNormalChance: 9
EventEnrichedChance: 35
Shadow:
StatsPerLevel: 0
RandomBonusStartLevel: 0
RandomBonusValue: 0
Rates:
- Level: 5
NormalChance: 60
EnrichedChance: 90
EventNormalChance: 60
EventEnrichedChance: 95
- Level: 6
NormalChance: 40
EnrichedChance: 70
EventNormalChance: 40
EventEnrichedChance: 80
- Level: 7
NormalChance: 40
EnrichedChance: 70
EventNormalChance: 40
EventEnrichedChance: 80
- Level: 8
NormalChance: 20
EnrichedChance: 40
EventNormalChance: 20
EventEnrichedChance: 50
- Level: 9
NormalChance: 20
EnrichedChance: 40
EventNormalChance: 20
EventEnrichedChance: 50
- Level: 10
NormalChance: 9
EnrichedChance: 20
EventNormalChance: 9
EventEnrichedChance: 35
41 db/re/refine_db.txt
View file

This file was deleted.

10 comments on commit e24d30a

@Daegaladh
Copy link
Member

@Daegaladh Daegaladh commented on e24d30a Sep 18, 2017

Choose a reason for hiding this comment

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

No errors or warnings on VS17.
@Haikenz try a clean checkout, that line should be 23593, so you have modifications on the file :/

@Jeybla
Copy link
Contributor

@Jeybla Jeybla commented on e24d30a Sep 18, 2017 •
edited

Choose a reason for hiding this comment

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

status_get_refine_cost isn't even a rathena function... I don't know what this function is supposed to do, but you should be able to fix it by yourself. The warning above just indicates one parameter is an integer, but bool is expected. So just add a != 0 to that parameter.

@Daegaladh
Copy link
Member

@Daegaladh Daegaladh commented on e24d30a Sep 18, 2017

Choose a reason for hiding this comment

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

@Jeybla it is now since this commit lol
@Haikenz do you even know how to properly update your emulator with git? Isn't just downloading and pasting the lastest files...
Try compiling a full clean installation please

@Jeybla
Copy link
Contributor

@Jeybla Jeybla commented on e24d30a Sep 18, 2017

Choose a reason for hiding this comment

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

Oh I'm dumb. Sorry guys!

@vstumpf
Copy link
Member

@vstumpf vstumpf commented on e24d30a Sep 19, 2017 •
edited

Choose a reason for hiding this comment

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

Yup, the fix is in #2429

@Mikegyver
Copy link
Contributor

@Mikegyver Mikegyver commented on e24d30a Sep 19, 2017

Choose a reason for hiding this comment

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

@Haikenz i just want to share with u on easy way to update (more specifically fetch & merge any rA commit) rather than manual update line by line, u can convert any commit on rA github repo to a patch files by just simply add .diff OR .patch extension on PR or COMMIT link. and later u can just apply this patch using TortoiseGit (if in windows) or git apply patchname.diff (if in linux). i think this way, much easier & reduce the probability of getting wrongly keyin the line.

I always manually update, so as not to conflict with the updates of the mods I use. I get line by line and I change according to the commit

https://github.com/rathena/rathena/commit/e24d30a7113835f9c33f0fb51b89acfb7e00882f.diff

i know this comment not related with this commit issue, but i think this is good info to be share. xD

@Vaans
Copy link

@Vaans Vaans commented on e24d30a Sep 19, 2017

Choose a reason for hiding this comment

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

status.c: In function ‘status_yaml_readdb_refine_sub’:
status.c:14239:3: error: ‘for’ loop initial declarations are only allowed in C99 or C11 mode
for (yamlwrapper* type = yaml_iterator_first(it); yaml_iterator_has_next(it); type = yaml_iterator_next(it)) {
^
status.c:14239:3: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code
status.c:14273:3: error: ‘for’ loop initial declarations are only allowed in C99 or C11 mode
for (yamlwrapper* level = yaml_iterator_first(it); yaml_iterator_has_next(it); level = yaml_iterator_next(it)) {
^
status.c: In function ‘status_yaml_readdb_refine’:
status.c:14323:2: error: ‘for’ loop initial declarations are only allowed in C99 or C11 mode
for (int i = 0; i < ARRAYLENGTH(labels); i++) {
^
make[1]: *** [obj/status.o] Error 1
make[1]: Leaving directory `/home/ro/rAthena/src/map'
make: *** [map] Error 2

@Jeybla
Copy link
Contributor

@Jeybla Jeybla commented on e24d30a Sep 19, 2017

Choose a reason for hiding this comment

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

@Vaans Install g++ version 5 or later

@Vaans
Copy link

@Vaans Vaans commented on e24d30a Sep 19, 2017

Choose a reason for hiding this comment

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

@Jeybla Thank you !

@Mikegyver
Copy link
Contributor

@Mikegyver Mikegyver commented on e24d30a Sep 22, 2017

Choose a reason for hiding this comment

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

@secretdataz i think this 2 npcs are overlapped (on same coordinate). The location of Shadow Blacksmith is same as Mighty Hammer (prt_in,59,54)

Please sign in to comment.