diff options
author | euphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-25 01:08:33 +0000 |
---|---|---|
committer | euphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-25 01:08:33 +0000 |
commit | a8fedec270c751ee212cf5c8d5c1eab9dbca5f9c (patch) | |
tree | b95e5afdc7726e814eee75b869bf5b489552eccf /src/map | |
parent | 432e794f6cda3d5bcf03db78dcc36e3c006f72d4 (diff) | |
download | hercules-a8fedec270c751ee212cf5c8d5c1eab9dbca5f9c.tar.gz hercules-a8fedec270c751ee212cf5c8d5c1eab9dbca5f9c.tar.bz2 hercules-a8fedec270c751ee212cf5c8d5c1eab9dbca5f9c.tar.xz hercules-a8fedec270c751ee212cf5c8d5c1eab9dbca5f9c.zip |
* Added the "Catalog Magician" NPC to merchants/buying_shops.txt, thanks to Muad_Dib!
* Changed all commands in atcommands.txt to their defined names, not aliases, and added two more common aliases.
* Documented 'makerune' in script_commands.txt.
* Documented '@accinfo' in atcommands.txt.
* Follow-up r16965, database update for rune crafting formula.
* Updated Magic Mushroom DB according to 3CeAM revision 703.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16966 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r-- | src/map/skill.c | 2 | ||||
-rw-r--r-- | src/map/skill.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index def642cd6..82b502420 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -15998,7 +15998,7 @@ int skill_produce_mix (struct map_session_data *sd, int skill_id, int nameid, in { int A = 100 * (51 + 2 * pc_checkskill(sd, skill_id)); int B = 100 * status->dex / 30 + 10 * (status->luk + sd->status.job_level); - int C = cap_value(sd->itemid,0,10000); //itemid depend on used rune () + int C = 100 * cap_value(sd->itemid,0,100); //itemid depend on makerune() int D = 0; switch (nameid) { //rune rank it_diff 9 craftable rune case ITEMID_BERKANA: diff --git a/src/map/skill.h b/src/map/skill.h index b94fd836d..265f2c7aa 100644 --- a/src/map/skill.h +++ b/src/map/skill.h @@ -1821,7 +1821,7 @@ int skill_block_check(struct block_list *bl, enum sc_type type, int skillid); /** * Guilottine Cross **/ -#define MAX_SKILL_MAGICMUSHROOM_DB 22 +#define MAX_SKILL_MAGICMUSHROOM_DB 23 struct s_skill_magicmushroom_db { int skillid; }; |