Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Added support for IT_CASH to @iteminfo, logging filters and item drop rate adjustment. Added 'show_picker.item_type'-specific IT_CASH value to it's description (follow up to r14549).

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14550 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ai4rei 2010-12-02 20:44:38 +00:00
parent 28e4aaf123
commit df41665d39
6 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog-Trunk.txt
View File

@ -1,6 +1,7 @@
Date Added
2010/12/02
* Added support for IT_CASH to @iteminfo, logging filters and item drop rate adjustment. Added 'show_picker.item_type'-specific IT_CASH value to it's description (follow up to r14549). [Ai4rei]
* Rev. 14549 Added item type IT_CASH (item type 18) Requires user confirmation before using/generating item(s). [L0ne_W0lf]
* Fixed mapflags not getting initialized upon @reloadscript (bugreport:2247, since r1275). [Ai4rei]
* Removed redundant check in food vs. cash food status change overriding code, partially suggested by xazax (related r14437 and r14510). [Ai4rei]

1
conf/battle/party.conf
View File

@ -38,6 +38,7 @@ show_party_share_picker: yes
// 1: IT_HEALING, 2: IT_UNKNOWN, 4: IT_USABLE, 8: IT_ETC,
// 16: IT_WEAPON, 32: IT_ARMOR, 64: IT_CARD, 128: IT_PETEGG,
// 256: IT_PETARMOR, 512: IT_UNKNOWN2, 1024: IT_AMMO, 2048: IT_DELAYCONSUME
// 262144: IT_CASH
show_picker.item_type: 112
// Method of distribution when item party share is enabled in a party:

2
conf/log_athena.conf
View File

@ -30,7 +30,7 @@ sql_logs: 0
// Advanced Filter Bits by item type: ||
// 0002 - Healing items (0)
// 0004 - Etc Items(3) + Arrows (10)
// 0008 - Usable Items(2) + Lures,Scrolls(11)
// 0008 - Usable Items(2) + Lures,Scrolls(11) + Usable Cash Items(18)
// 0016 - Weapon(4)
// 0032 - Shields,Armor,Headgears,Accessories,etc(5)
// 0064 - Cards(6)

7
src/map/atcommand.c
View File

@ -7390,8 +7390,9 @@ ACMD_FUNC(homshuffle)
*------------------------------------------*/
ACMD_FUNC(iteminfo)
{
char *itype[12] = {"Potion/Food", "BUG!", "Usable", "Etc", "Weapon", "Protection", "Card", "Egg", "Pet Acessory", "BUG!", "Arrow"};
//, "Lure/Scroll"}; No need, type 11 items are converted to type 2 upon loading [Skotlex]
char *itype[IT_MAX] = {"Potion/Food", "BUG!", "Usable", "Etc", "Weapon", "Protection", "Card", "Egg", "Pet Acessory", "BUG!", "Arrow",
"BUG!", // No need, type 11 items are converted to type 2 upon loading [Skotlex]
"BUG!", "BUG!", "BUG!", "BUG!", "BUG!", "BUG!", "Cash Usable"};
struct item_data *item_data, *item_array[MAX_SEARCH];
int i, count = 1;
@ -7417,7 +7418,7 @@ ACMD_FUNC(iteminfo)
item_data = item_array[i];
sprintf(atcmd_output, "Item: '%s'/'%s'[%d] (%d) Type: %s | Extra Effect: %s",
item_data->name,item_data->jname,item_data->slot,item_data->nameid,
item_data->type < 12 ? itype[item_data->type] : "BUG!",
item_data->type < IT_MAX ? itype[item_data->type] : "BUG!",
(item_data->script==NULL)? "None" : "With script"
);
clif_displaymessage(fd, atcmd_output);

4
src/map/log.c
View File

@ -27,7 +27,7 @@ time_t curtime;
//Bits: ||
//2 - Healing items (0)
//3 - Etc Items(3) + Arrows (10)
//4 - Usable Items(2) + Scrolls,Lures(11)
//4 - Usable Items(2) + Scrolls,Lures(11) + Usable Cash Items(18)
//5 - Weapon(4)
//6 - Shields,Armor,Headgears,Accessories,etc(5)
//7 - Cards(6)
@ -45,7 +45,7 @@ int should_log_item(int filter, int nameid, int amount)
if ((filter&1) || // Filter = 1, we log any item
(filter&2 && item_data->type == IT_HEALING ) ||
(filter&4 && (item_data->type == IT_ETC || item_data->type == IT_AMMO) ) ||
(filter&8 && item_data->type == IT_USABLE ) ||
(filter&8 && (item_data->type == IT_USABLE || item_data->type == IT_CASH) ) ||
(filter&16 && item_data->type == IT_WEAPON ) ||
(filter&32 && item_data->type == IT_ARMOR ) ||
(filter&64 && item_data->type == IT_CARD ) ||

1
src/map/mob.c
View File

@ -3582,6 +3582,7 @@ static bool mob_parse_dbrow(char** str)
ratemax = battle_config.item_drop_heal_max;
break;
case IT_USABLE:
case IT_CASH:
rate_adjust = (status->mode&MD_BOSS) ? battle_config.item_rate_use_boss : battle_config.item_rate_use;
ratemin = battle_config.item_drop_use_min;
ratemax = battle_config.item_drop_use_max;