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

Added atcommand '@autoloottype' - Suggestion tid:87014.

Browse Source
This commit is contained in:
aleos89 2013-10-16 11:06:18 -04:00
parent 3387b6a441
commit a487746b63
7 changed files with 152 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
conf/atcommand_athena.conf
View File

@ -59,6 +59,7 @@ aliases: {
accinfo: ["accountinfo"]
itemreset: ["clearinventory"]
channel: ["main"]
autoloottype: ["aloottype"]
}
/* Commands help file */

1
conf/groups.conf
View File

@ -125,6 +125,7 @@ groups: (
noks: true
autoloot: true
alootid: true
autoloottype: true
autotrade: true
request: true
go: true

14
conf/msg_conf/map_msg.conf
View File

@ -1478,5 +1478,19 @@
1478: Party share level range has been changed successfully.
1479: Failed to update configuration. Character server is offline.
// @autoloottype
1480: Item type not found.
1481: You're already autolooting this item type.
1482: Your autoloottype list has all item types. You can remove some items with @autoloottype -<type name or ID>.
1483: Autolooting item type: '%s' {%d}
1484: You're currently not autolooting this item type.
1485: Removed item type: '%s' {%d} from your autoloottype list.
1486: To add an item type to the list, use "@aloottype +<type name or ID>". To remove an item type, use "@aloottype -<type name or ID>".
1487: Type List: healing = 0, usable = 2, etc = 3, weapon = 4, armor = 5, card = 6, petegg = 7, petarmor = 8, ammo = 10
1488: "@aloottype reset" will clear your autoloottype list.
1489: Your autoloottype list is empty.
1490: Item types on your autoloottype list:
1491: Your autoloottype list has been reset.
//Custom translations
//import: conf/msg_conf/import/map_msg_eng_conf.txt

9
doc/atcommands.txt
View File

@ -356,6 +356,15 @@ By default, 10 items can be autolooted at one time.
---------------------------------------
@autoloottype <+/- type name/ID>
@autoloottype reset
Starts or stops autolooting a specified item type.
Type List: healing = 0, usable = 2, etc = 3, weapon = 4, armor = 5, card = 6, petegg = 7, petarmor = 8, ammo = 10
Typing "reset" will clear the autoloot item list.
---------------------------------------
@mobsearch <monster name>
Locates and displays the position of a certain mob on the current map.

114
src/map/atcommand.c
View File

@ -5851,6 +5851,8 @@ ACMD_FUNC(autolootitem)
int i;
int action = 3; // 1=add, 2=remove, 3=help+list (default), 4=reset
nullpo_retr(-1, sd);
if (message && *message) {
if (message[0] == '+') {
message++;
@ -5937,6 +5939,117 @@ ACMD_FUNC(autolootitem)
}
return 0;
}
/*==========================================
* @autoloottype
* Flags:
* 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
*------------------------------------------
* Credits:
* chriser
* Aleos
*------------------------------------------*/
ACMD_FUNC(autoloottype)
{
uint8 i = 0, action = 3; // 1=add, 2=remove, 3=help+list (default), 4=reset
enum item_types type;
int ITEM_NONE = 0, ITEM_MAX = 1533;
nullpo_retr(-1, sd);
if (message && *message) {
if (message[0] == '+') {
message++;
action = 1;
}
else if (message[0] == '-') {
message++;
action = 2;
}
else if (!strcmp(message,"reset"))
action = 4;
}
if (action < 3) { // add or remove
if ((strncmp(message, "healing", 3) == 0) || (atoi(message) == 0))
type = IT_HEALING;
else if ((strncmp(message, "usable", 3) == 0) || (atoi(message) == 2))
type = IT_USABLE;
else if ((strncmp(message, "etc", 3) == 0) || (atoi(message) == 3))
type = IT_ETC;
else if ((strncmp(message, "weapon", 3) == 0) || (atoi(message) == 4))
type = IT_WEAPON;
else if ((strncmp(message, "armor", 3) == 0) || (atoi(message) == 5))
type = IT_ARMOR;
else if ((strncmp(message, "card", 3) == 0) || (atoi(message) == 6))
type = IT_CARD;
else if ((strncmp(message, "petegg", 4) == 0) || (atoi(message) == 7))
type = IT_PETEGG;
else if ((strncmp(message, "petarmor", 4) == 0) || (atoi(message) == 8))
type = IT_PETARMOR;
else if ((strncmp(message, "ammo", 3) == 0) || (atoi(message) == 10))
type = IT_AMMO;
else {
clif_displaymessage(fd, msg_txt(sd,1480)); // Item type not found.
return -1;
}
}
switch (action) {
case 1:
if (sd->state.autoloottype&(1<<type)) {
clif_displaymessage(fd, msg_txt(sd,1481)); // You're already autolooting this item type.
return -1;
}
if (sd->state.autoloottype == ITEM_MAX) {
clif_displaymessage(fd, msg_txt(sd,1482)); // Your autoloottype list has all item types. You can remove some items with @autoloottype -<type name or ID>.
return -1;
}
sd->state.autolootingtype = 1; // Autoloot Activated
sd->state.autoloottype |= (1<<type); // Stores the type
sprintf(atcmd_output, msg_txt(sd,1483), itemdb_typename(type), type); // Autolooting item type: '%s' {%d}
clif_displaymessage(fd, atcmd_output);
break;
case 2:
if (!(sd->state.autoloottype&(1<<type))) {
clif_displaymessage(fd, msg_txt(sd,1484)); // You're currently not autolooting this item type.
return -1;
}
sd->state.autoloottype &= ~(1<<type);
sprintf(atcmd_output, msg_txt(sd,1485), itemdb_typename(type), type); // Removed item type: '%s' {%d} from your autoloottype list.
clif_displaymessage(fd, atcmd_output);
if (sd->state.autoloottype == ITEM_NONE)
sd->state.autolootingtype = 0;
break;
case 3:
clif_displaymessage(fd, msg_txt(sd,1486)); // To add an item type to the list, use "@aloottype +<type name or ID>". To remove an item type, use "@aloottype -<type name or ID>".
clif_displaymessage(fd, msg_txt(sd,1487)); // Type List: healing = 0, usable = 2, etc = 3, weapon = 4, armor = 5, card = 6, petegg = 7, petarmor = 8, ammo = 10
clif_displaymessage(fd, msg_txt(sd,1488)); // "@aloottype reset" will clear your autoloottype list.
if (sd->state.autoloottype == ITEM_NONE)
clif_displaymessage(fd, msg_txt(sd,1489)); // Your autoloottype list is empty.
else {
clif_displaymessage(fd, msg_txt(sd,1490)); // Item types on your autoloottype list:
while (i < IT_MAX) {
if (sd->state.autoloottype&(1<<i)) {
sprintf(atcmd_output, " '%s' {%d}", itemdb_typename(i), i);
clif_displaymessage(fd, atcmd_output);
}
i++;
}
}
break;
case 4:
sd->state.autoloottype = ITEM_NONE;
sd->state.autolootingtype = 0;
clif_displaymessage(fd, msg_txt(sd,1491)); // Your autoloottype list has been reset.
break;
}
return 0;
}
/**
* No longer available, keeping here just in case it's back someday. [Ind]
**/
@ -9284,6 +9397,7 @@ void atcommand_basecommands(void) {
ACMD_DEF(changelook),
ACMD_DEF(autoloot),
ACMD_DEF2("alootid", autolootitem),
ACMD_DEF(autoloottype),
ACMD_DEF(mobinfo),
ACMD_DEF(exp),
ACMD_DEF(version),

15
src/map/pc.c
View File

@ -9464,11 +9464,18 @@ void pc_overheat(struct map_session_data *sd, int val) {
*/
bool pc_isautolooting(struct map_session_data *sd, int nameid)
{
int i;
if( !sd->state.autolooting )
uint8 i;
bool j = false;
if (!sd->state.autolooting && !sd->state.autolootingtype)
return false;
ARR_FIND(0, AUTOLOOTITEM_SIZE, i, sd->state.autolootid[i] == nameid);
return (i != AUTOLOOTITEM_SIZE);
if (sd->state.autolooting)
ARR_FIND(0, AUTOLOOTITEM_SIZE, i, sd->state.autolootid[i] == nameid);
if (sd->state.autolootingtype && sd->state.autoloottype&(1<<itemdb_type(nameid)))
j = true;
return (i != AUTOLOOTITEM_SIZE || j );
}
/**

2
src/map/pc.h
View File

@ -184,7 +184,9 @@ struct map_session_data {
short pmap; // Previous map on Map Change
unsigned short autoloot;
unsigned short autolootid[AUTOLOOTITEM_SIZE]; // [Zephyrus]
unsigned short autoloottype;
unsigned int autolooting : 1; //performance-saver, autolooting state for @alootid
unsigned int autolootingtype : 1; //performance-saver, autolooting state for @autoloottype
unsigned short autobonus; //flag to indicate if an autobonus is activated. [Inkfish]
struct guild *gmaster_flag;
unsigned int prevend : 1;//used to flag wheather you've spent 40sp to open the vending or not.