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

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@577 54d463be-8e91-2dee-dedb-b68131a5f0ec

Browse Source
This commit is contained in:
mc_cameri 2004-12-16 01:53:35 +00:00
parent aff4bdb579
commit 4f34ae0c68
8 changed files with 319 additions and 313 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog.txt
View File

@ -1,5 +1,7 @@
Date Added Date Added
12/16 12/16
* Added #itemlist, removed @charitemlist [MC Cameri]
* Changed @job and #job so that when it's used it unequips all the items, to prevent sprite errors [MC Cameri]
* Updated Forging and Potion making formulas by DracoRPG [celest] * Updated Forging and Potion making formulas by DracoRPG [celest]
* Changes to the guild skills * Changes to the guild skills
- Dropped using sc_data and use flag values instead - Dropped using sc_data and use flag values instead

3
conf-tmpl/atcommand_athena.conf
View File

@ -260,9 +260,6 @@ save: 40
// Do some visual effect on your character // Do some visual effect on your character
effect: 40 effect: 40
// Display all items of a player
charitemlist: 40
// Display all items of a player's storage // Display all items of a player's storage
charstoragelist: 40 charstoragelist: 40

3
conf-tmpl/charcommand_athena.conf
View File

@ -16,4 +16,5 @@ stats: 40
option: 60 option: 60
save: 60 save: 60
statsall: 40 statsall: 40
spiritball: 60 spiritball: 60
itemlist: 40

495
src/map/atcommand.c
View File

@ -38,201 +38,200 @@ static char command_symbol = '@'; // first char of the commands (by [Yor])
char msg_table[1000][256]; // Server messages (0-499 reserved for GM commands, 500-999 reserved for others) char msg_table[1000][256]; // Server messages (0-499 reserved for GM commands, 500-999 reserved for others)
#define ATCOMMAND_FUNC(x) int atcommand_ ## x (const int fd, struct map_session_data* sd, const char* command, const char* message) #define ACMD_FUNC(x) int atcommand_ ## x (const int fd, struct map_session_data* sd, const char* command, const char* message)
ATCOMMAND_FUNC(broadcast); ACMD_FUNC(broadcast);
ATCOMMAND_FUNC(localbroadcast); ACMD_FUNC(localbroadcast);
ATCOMMAND_FUNC(rurap); ACMD_FUNC(rurap);
ATCOMMAND_FUNC(rura); ACMD_FUNC(rura);
ATCOMMAND_FUNC(where); ACMD_FUNC(where);
ATCOMMAND_FUNC(jumpto); ACMD_FUNC(jumpto);
ATCOMMAND_FUNC(jump); ACMD_FUNC(jump);
ATCOMMAND_FUNC(who); ACMD_FUNC(who);
ATCOMMAND_FUNC(who2); ACMD_FUNC(who2);
ATCOMMAND_FUNC(who3); ACMD_FUNC(who3);
ATCOMMAND_FUNC(whomap); ACMD_FUNC(whomap);
ATCOMMAND_FUNC(whomap2); ACMD_FUNC(whomap2);
ATCOMMAND_FUNC(whomap3); ACMD_FUNC(whomap3);
ATCOMMAND_FUNC(whogm); // by Yor ACMD_FUNC(whogm); // by Yor
ATCOMMAND_FUNC(whozeny); // [Valaris] ACMD_FUNC(whozeny); // [Valaris]
ATCOMMAND_FUNC(happyhappyjoyjoy); // [Valaris] ACMD_FUNC(happyhappyjoyjoy); // [Valaris]
ATCOMMAND_FUNC(save); ACMD_FUNC(save);
ATCOMMAND_FUNC(load); ACMD_FUNC(load);
ATCOMMAND_FUNC(speed); ACMD_FUNC(speed);
ATCOMMAND_FUNC(storage); ACMD_FUNC(storage);
ATCOMMAND_FUNC(guildstorage); ACMD_FUNC(guildstorage);
ATCOMMAND_FUNC(option); ACMD_FUNC(option);
ATCOMMAND_FUNC(hide); ACMD_FUNC(hide);
ATCOMMAND_FUNC(jobchange); ACMD_FUNC(jobchange);
ATCOMMAND_FUNC(die); ACMD_FUNC(die);
ATCOMMAND_FUNC(kill); ACMD_FUNC(kill);
ATCOMMAND_FUNC(alive); ACMD_FUNC(alive);
ATCOMMAND_FUNC(kami); ACMD_FUNC(kami);
ATCOMMAND_FUNC(heal); ACMD_FUNC(heal);
ATCOMMAND_FUNC(item); ACMD_FUNC(item);
ATCOMMAND_FUNC(item2); ACMD_FUNC(item2);
ATCOMMAND_FUNC(itemreset); ACMD_FUNC(itemreset);
ATCOMMAND_FUNC(itemcheck); ACMD_FUNC(itemcheck);
ATCOMMAND_FUNC(baselevelup); ACMD_FUNC(baselevelup);
ATCOMMAND_FUNC(joblevelup); ACMD_FUNC(joblevelup);
ATCOMMAND_FUNC(help); ACMD_FUNC(help);
ATCOMMAND_FUNC(gm); ACMD_FUNC(gm);
ATCOMMAND_FUNC(pvpoff); ACMD_FUNC(pvpoff);
ATCOMMAND_FUNC(pvpon); ACMD_FUNC(pvpon);
ATCOMMAND_FUNC(gvgoff); ACMD_FUNC(gvgoff);
ATCOMMAND_FUNC(gvgon); ACMD_FUNC(gvgon);
ATCOMMAND_FUNC(model); ACMD_FUNC(model);
ATCOMMAND_FUNC(go); ACMD_FUNC(go);
ATCOMMAND_FUNC(monster); ACMD_FUNC(monster);
ATCOMMAND_FUNC(monstersmall); ACMD_FUNC(monstersmall);
ATCOMMAND_FUNC(monsterbig); ACMD_FUNC(monsterbig);
ATCOMMAND_FUNC(spawn); ACMD_FUNC(spawn);
ATCOMMAND_FUNC(killmonster); ACMD_FUNC(killmonster);
ATCOMMAND_FUNC(killmonster2); ACMD_FUNC(killmonster2);
ATCOMMAND_FUNC(refine); ACMD_FUNC(refine);
ATCOMMAND_FUNC(produce); ACMD_FUNC(produce);
ATCOMMAND_FUNC(memo); ACMD_FUNC(memo);
ATCOMMAND_FUNC(gat); ACMD_FUNC(gat);
ATCOMMAND_FUNC(packet); ACMD_FUNC(packet);
ATCOMMAND_FUNC(statuspoint); ACMD_FUNC(statuspoint);
ATCOMMAND_FUNC(skillpoint); ACMD_FUNC(skillpoint);
ATCOMMAND_FUNC(zeny); ACMD_FUNC(zeny);
ATCOMMAND_FUNC(param); ACMD_FUNC(param);
ATCOMMAND_FUNC(guildlevelup); ACMD_FUNC(guildlevelup);
ATCOMMAND_FUNC(makeegg); ACMD_FUNC(makeegg);
ATCOMMAND_FUNC(hatch); ACMD_FUNC(hatch);
ATCOMMAND_FUNC(petfriendly); ACMD_FUNC(petfriendly);
ATCOMMAND_FUNC(pethungry); ACMD_FUNC(pethungry);
ATCOMMAND_FUNC(petrename); ACMD_FUNC(petrename);
ATCOMMAND_FUNC(recall); ACMD_FUNC(recall);
ATCOMMAND_FUNC(recallall); ACMD_FUNC(recallall);
ATCOMMAND_FUNC(revive); ACMD_FUNC(revive);
ATCOMMAND_FUNC(character_stats_all); ACMD_FUNC(character_stats_all);
ATCOMMAND_FUNC(character_save); ACMD_FUNC(character_save);
ATCOMMAND_FUNC(night); ACMD_FUNC(night);
ATCOMMAND_FUNC(day); ACMD_FUNC(day);
ATCOMMAND_FUNC(doom); ACMD_FUNC(doom);
ATCOMMAND_FUNC(doommap); ACMD_FUNC(doommap);
ATCOMMAND_FUNC(raise); ACMD_FUNC(raise);
ATCOMMAND_FUNC(raisemap); ACMD_FUNC(raisemap);
ATCOMMAND_FUNC(character_baselevel); ACMD_FUNC(character_baselevel);
ATCOMMAND_FUNC(character_joblevel); ACMD_FUNC(character_joblevel);
ATCOMMAND_FUNC(kick); ACMD_FUNC(kick);
ATCOMMAND_FUNC(kickall); ACMD_FUNC(kickall);
ATCOMMAND_FUNC(allskill); ACMD_FUNC(allskill);
ATCOMMAND_FUNC(questskill); ACMD_FUNC(questskill);
ATCOMMAND_FUNC(charquestskill); ACMD_FUNC(charquestskill);
ATCOMMAND_FUNC(lostskill); ACMD_FUNC(lostskill);
ATCOMMAND_FUNC(charlostskill); ACMD_FUNC(charlostskill);
ATCOMMAND_FUNC(spiritball); ACMD_FUNC(spiritball);
ATCOMMAND_FUNC(party); ACMD_FUNC(party);
ATCOMMAND_FUNC(guild); ACMD_FUNC(guild);
ATCOMMAND_FUNC(charskreset); ACMD_FUNC(charskreset);
ATCOMMAND_FUNC(charstreset); ACMD_FUNC(charstreset);
ATCOMMAND_FUNC(charreset); ACMD_FUNC(charreset);
ATCOMMAND_FUNC(charstpoint); ACMD_FUNC(charstpoint);
ATCOMMAND_FUNC(charmodel); ACMD_FUNC(charmodel);
ATCOMMAND_FUNC(charskpoint); ACMD_FUNC(charskpoint);
ATCOMMAND_FUNC(charzeny); ACMD_FUNC(charzeny);
ATCOMMAND_FUNC(agitstart); ACMD_FUNC(agitstart);
ATCOMMAND_FUNC(agitend); ACMD_FUNC(agitend);
ATCOMMAND_FUNC(reloaditemdb); ACMD_FUNC(reloaditemdb);
ATCOMMAND_FUNC(reloadmobdb); ACMD_FUNC(reloadmobdb);
ATCOMMAND_FUNC(reloadskilldb); ACMD_FUNC(reloadskilldb);
#ifndef TXT_ONLY #ifndef TXT_ONLY
ATCOMMAND_FUNC(rehash);// by Fr3DBr ACMD_FUNC(rehash);// by Fr3DBr
#else /* TXT_ONLY */ #else /* TXT_ONLY */
ATCOMMAND_FUNC(reloadscript); ACMD_FUNC(reloadscript);
#endif /* TXT_ONLY */ #endif /* TXT_ONLY */
ATCOMMAND_FUNC(reloadgmdb); // by Yor ACMD_FUNC(reloadgmdb); // by Yor
ATCOMMAND_FUNC(mapexit); ACMD_FUNC(mapexit);
ATCOMMAND_FUNC(idsearch); ACMD_FUNC(idsearch);
ATCOMMAND_FUNC(mapinfo); ACMD_FUNC(mapinfo);
ATCOMMAND_FUNC(dye); //** by fritz ACMD_FUNC(dye); //** by fritz
ATCOMMAND_FUNC(hair_style); //** by fritz ACMD_FUNC(hair_style); //** by fritz
ATCOMMAND_FUNC(hair_color); //** by fritz ACMD_FUNC(hair_color); //** by fritz
ATCOMMAND_FUNC(stat_all); //** by fritz ACMD_FUNC(stat_all); //** by fritz
ATCOMMAND_FUNC(char_change_sex); // by Yor ACMD_FUNC(char_change_sex); // by Yor
ATCOMMAND_FUNC(char_block); // by Yor ACMD_FUNC(char_block); // by Yor
ATCOMMAND_FUNC(char_ban); // by Yor ACMD_FUNC(char_ban); // by Yor
ATCOMMAND_FUNC(char_unblock); // by Yor ACMD_FUNC(char_unblock); // by Yor
ATCOMMAND_FUNC(char_unban); // by Yor ACMD_FUNC(char_unban); // by Yor
ATCOMMAND_FUNC(mount_peco); // by Valaris ACMD_FUNC(mount_peco); // by Valaris
ATCOMMAND_FUNC(char_mount_peco); // by Yor ACMD_FUNC(char_mount_peco); // by Yor
ATCOMMAND_FUNC(guildspy); // [Syrus22] ACMD_FUNC(guildspy); // [Syrus22]
ATCOMMAND_FUNC(partyspy); // [Syrus22] ACMD_FUNC(partyspy); // [Syrus22]
ATCOMMAND_FUNC(repairall); // [Valaris] ACMD_FUNC(repairall); // [Valaris]
ATCOMMAND_FUNC(guildrecall); // by Yor ACMD_FUNC(guildrecall); // by Yor
ATCOMMAND_FUNC(partyrecall); // by Yor ACMD_FUNC(partyrecall); // by Yor
//ATCOMMAND_FUNC(nuke); // [Valaris] //ACMD_FUNC(nuke); // [Valaris]
ATCOMMAND_FUNC(enablenpc); ACMD_FUNC(enablenpc);
ATCOMMAND_FUNC(disablenpc); ACMD_FUNC(disablenpc);
ATCOMMAND_FUNC(servertime); // by Yor ACMD_FUNC(servertime); // by Yor
ATCOMMAND_FUNC(chardelitem); // by Yor ACMD_FUNC(chardelitem); // by Yor
ATCOMMAND_FUNC(jail); // by Yor ACMD_FUNC(jail); // by Yor
ATCOMMAND_FUNC(unjail); // by Yor ACMD_FUNC(unjail); // by Yor
ATCOMMAND_FUNC(disguise); // [Valaris] ACMD_FUNC(disguise); // [Valaris]
ATCOMMAND_FUNC(undisguise); // by Yor ACMD_FUNC(undisguise); // by Yor
ATCOMMAND_FUNC(chardisguise); // Kalaspuff ACMD_FUNC(chardisguise); // Kalaspuff
ATCOMMAND_FUNC(charundisguise); // Kalaspuff ACMD_FUNC(charundisguise); // Kalaspuff
ATCOMMAND_FUNC(email); // by Yor ACMD_FUNC(email); // by Yor
ATCOMMAND_FUNC(effect);//by Apple ACMD_FUNC(effect);//by Apple
ATCOMMAND_FUNC(character_item_list); // by Yor ACMD_FUNC(character_storage_list); // by Yor
ATCOMMAND_FUNC(character_storage_list); // by Yor ACMD_FUNC(character_cart_list); // by Yor
ATCOMMAND_FUNC(character_cart_list); // by Yor ACMD_FUNC(addwarp); // by MouseJstr
ATCOMMAND_FUNC(addwarp); // by MouseJstr ACMD_FUNC(follow); // by MouseJstr
ATCOMMAND_FUNC(follow); // by MouseJstr ACMD_FUNC(skillon); // by MouseJstr
ATCOMMAND_FUNC(skillon); // by MouseJstr ACMD_FUNC(skilloff); // by MouseJstr
ATCOMMAND_FUNC(skilloff); // by MouseJstr ACMD_FUNC(killer); // by MouseJstr
ATCOMMAND_FUNC(killer); // by MouseJstr ACMD_FUNC(npcmove); // by MouseJstr
ATCOMMAND_FUNC(npcmove); // by MouseJstr ACMD_FUNC(killable); // by MouseJstr
ATCOMMAND_FUNC(killable); // by MouseJstr ACMD_FUNC(charkillable); // by MouseJstr
ATCOMMAND_FUNC(charkillable); // by MouseJstr ACMD_FUNC(chareffect); // by MouseJstr
ATCOMMAND_FUNC(chareffect); // by MouseJstr ACMD_FUNC(dropall); // by MouseJstr
ATCOMMAND_FUNC(dropall); // by MouseJstr ACMD_FUNC(chardropall); // by MouseJstr
ATCOMMAND_FUNC(chardropall); // by MouseJstr ACMD_FUNC(storeall); // by MouseJstr
ATCOMMAND_FUNC(storeall); // by MouseJstr ACMD_FUNC(charstoreall); // by MouseJstr
ATCOMMAND_FUNC(charstoreall); // by MouseJstr ACMD_FUNC(skillid); // by MouseJstr
ATCOMMAND_FUNC(skillid); // by MouseJstr ACMD_FUNC(useskill); // by MouseJstr
ATCOMMAND_FUNC(useskill); // by MouseJstr ACMD_FUNC(summon);
ATCOMMAND_FUNC(summon); ACMD_FUNC(rain);
ATCOMMAND_FUNC(rain); ACMD_FUNC(snow);
ATCOMMAND_FUNC(snow); ACMD_FUNC(sakura);
ATCOMMAND_FUNC(sakura); ACMD_FUNC(fog);
ATCOMMAND_FUNC(fog); ACMD_FUNC(leaves);
ATCOMMAND_FUNC(leaves); ACMD_FUNC(adjgmlvl); // by MouseJstr
ATCOMMAND_FUNC(adjgmlvl); // by MouseJstr ACMD_FUNC(adjcmdlvl); // by MouseJstr
ATCOMMAND_FUNC(adjcmdlvl); // by MouseJstr ACMD_FUNC(trade); // by MouseJstr
ATCOMMAND_FUNC(trade); // by MouseJstr ACMD_FUNC(send); // by davidsiaw
ATCOMMAND_FUNC(send); // by davidsiaw ACMD_FUNC(setbattleflag); // by MouseJstr
ATCOMMAND_FUNC(setbattleflag); // by MouseJstr ACMD_FUNC(unmute); // [Valaris]
ATCOMMAND_FUNC(unmute); // [Valaris] ACMD_FUNC(clearweather); // Dexity
ATCOMMAND_FUNC(clearweather); // Dexity ACMD_FUNC(uptime); // by MC Cameri
ATCOMMAND_FUNC(uptime); // by MC Cameri ACMD_FUNC(changesex); // by MC Cameri
ATCOMMAND_FUNC(changesex); // by MC Cameri ACMD_FUNC(mute); // celest
ATCOMMAND_FUNC(mute); // celest ACMD_FUNC(refresh); // by MC Cameri
ATCOMMAND_FUNC(refresh); // by MC Cameri ACMD_FUNC(petid); // by MC Cameri
ATCOMMAND_FUNC(petid); // by MC Cameri ACMD_FUNC(identify); // by MC Cameri
ATCOMMAND_FUNC(identify); // by MC Cameri ACMD_FUNC(gmotd); // Added by MC Cameri, created by davidsiaw
ATCOMMAND_FUNC(gmotd); // Added by MC Cameri, created by davidsiaw ACMD_FUNC(misceffect); // by MC Cameri
ATCOMMAND_FUNC(misceffect); // by MC Cameri
#ifndef TXT_ONLY #ifndef TXT_ONLY
ATCOMMAND_FUNC(checkmail); // [Valaris] ACMD_FUNC(checkmail); // [Valaris]
ATCOMMAND_FUNC(listmail); // [Valaris] ACMD_FUNC(listmail); // [Valaris]
ATCOMMAND_FUNC(listnewmail); // [Valaris] ACMD_FUNC(listnewmail); // [Valaris]
ATCOMMAND_FUNC(readmail); // [Valaris] ACMD_FUNC(readmail); // [Valaris]
ATCOMMAND_FUNC(sendmail); // [Valaris] ACMD_FUNC(sendmail); // [Valaris]
ATCOMMAND_FUNC(sendprioritymail); // [Valaris] ACMD_FUNC(sendprioritymail); // [Valaris]
ATCOMMAND_FUNC(deletemail); // [Valaris] ACMD_FUNC(deletemail); // [Valaris]
ATCOMMAND_FUNC(sound); // [Valaris] ACMD_FUNC(sound); // [Valaris]
ATCOMMAND_FUNC(refreshonline); // [Valaris] ACMD_FUNC(refreshonline); // [Valaris]
#endif /* TXT_ONLY */ #endif /* TXT_ONLY */
ATCOMMAND_FUNC(skilltree); // by MouseJstr ACMD_FUNC(skilltree); // by MouseJstr
ATCOMMAND_FUNC(marry); // by MouseJstr ACMD_FUNC(marry); // by MouseJstr
ATCOMMAND_FUNC(divorce); // by MouseJstr ACMD_FUNC(divorce); // by MouseJstr
ATCOMMAND_FUNC(rings); // by MouseJstr ACMD_FUNC(rings); // by MouseJstr
/*========================================== /*==========================================
*AtCommandInfo atcommand_info[]<EFBFBD>\‘¢‘Ì‚Ì’è‹` *AtCommandInfo atcommand_info[]<EFBFBD>\‘¢‘Ì‚Ì’è‹`
@ -421,7 +420,7 @@ static AtCommandInfo atcommand_info[] = {
{ AtCommand_CharUnDisguise, "@charundisguise", 60, atcommand_charundisguise }, // Kalaspuff { AtCommand_CharUnDisguise, "@charundisguise", 60, atcommand_charundisguise }, // Kalaspuff
{ AtCommand_EMail, "@email", 0, atcommand_email }, // by Yor { AtCommand_EMail, "@email", 0, atcommand_email }, // by Yor
{ AtCommand_Effect, "@effect", 40, atcommand_effect }, // by Apple { AtCommand_Effect, "@effect", 40, atcommand_effect }, // by Apple
{ AtCommand_Char_Item_List, "@charitemlist", 40, atcommand_character_item_list }, // by Yor // { AtCommand_Char_Item_List, "@charitemlist", 40, atcommand_character_item_list }, // by Yor, now #itemlist
{ AtCommand_Char_Storage_List, "@charstoragelist", 40, atcommand_character_storage_list }, // by Yor { AtCommand_Char_Storage_List, "@charstoragelist", 40, atcommand_character_storage_list }, // by Yor
{ AtCommand_Char_Cart_List, "@charcartlist", 40, atcommand_character_cart_list }, // by Yor { AtCommand_Char_Cart_List, "@charcartlist", 40, atcommand_character_cart_list }, // by Yor
{ AtCommand_Follow, "@follow", 10, atcommand_follow }, // by MouseJstr { AtCommand_Follow, "@follow", 10, atcommand_follow }, // by MouseJstr
@ -2068,7 +2067,11 @@ int atcommand_jobchange(
job = 4015; job = 4015;
} }
} }
int j;
for (j=0; j < MAX_INVENTORY; j++) {
if(sd->status.inventory[j].nameid>0 && sd->status.inventory[j].equip!=0)
pc_unequipitem(sd, j, 3);
}
if (pc_jobchange(sd, job, upper) == 0) if (pc_jobchange(sd, job, upper) == 0)
clif_displaymessage(fd, msg_table[12]); // Your job has been changed. clif_displaymessage(fd, msg_table[12]); // Your job has been changed.
else { else {
@ -6724,120 +6727,6 @@ int atcommand_effect(
return 0; return 0;
} }
/*==========================================
* @charitemlist <character>: Displays the list of a player's items.
*------------------------------------------
*/
int
atcommand_character_item_list(
const int fd, struct map_session_data* sd,
const char* command, const char* message)
{
struct map_session_data *pl_sd;
struct item_data *item_data, *item_temp;
int i, j, equip, count, counter, counter2;
char character[100], output[200], equipstr[100], outputtmp[200];
nullpo_retr(-1, sd);
memset(character, '\0', sizeof(character));
memset(output, '\0', sizeof(output));
memset(equipstr, '\0', sizeof(equipstr));
memset(outputtmp, '\0', sizeof(outputtmp));
if (!message || !*message || sscanf(message, "%99[^\n]", character) < 1) {
clif_displaymessage(fd, "Please, enter a player name (usage: @charitemlist <char name>).");
return -1;
}
if ((pl_sd = map_nick2sd(character)) != NULL) {
if (pc_isGM(sd) >= pc_isGM(pl_sd)) { // you can look items only lower or same level
counter = 0;
count = 0;
for (i = 0; i < MAX_INVENTORY; i++) {
if (pl_sd->status.inventory[i].nameid > 0 && (item_data = itemdb_search(pl_sd->status.inventory[i].nameid)) != NULL) {
counter = counter + pl_sd->status.inventory[i].amount;
count++;
if (count == 1) {
sprintf(output, "------ Items list of '%s' ------", pl_sd->status.name);
clif_displaymessage(fd, output);
}
if ((equip = pl_sd->status.inventory[i].equip)) {
strcpy(equipstr, "| equiped: ");
if (equip & 4)
strcat(equipstr, "robe/gargment, ");
if (equip & 8)
strcat(equipstr, "left accessory, ");
if (equip & 16)
strcat(equipstr, "body/armor, ");
if ((equip & 34) == 2)
strcat(equipstr, "right hand, ");
if ((equip & 34) == 32)
strcat(equipstr, "left hand, ");
if ((equip & 34) == 34)
strcat(equipstr, "both hands, ");
if (equip & 64)
strcat(equipstr, "feet, ");
if (equip & 128)
strcat(equipstr, "right accessory, ");
if ((equip & 769) == 1)
strcat(equipstr, "lower head, ");
if ((equip & 769) == 256)
strcat(equipstr, "top head, ");
if ((equip & 769) == 257)
strcat(equipstr, "lower/top head, ");
if ((equip & 769) == 512)
strcat(equipstr, "mid head, ");
if ((equip & 769) == 512)
strcat(equipstr, "lower/mid head, ");
if ((equip & 769) == 769)
strcat(equipstr, "lower/mid/top head, ");
// remove final ', '
equipstr[strlen(equipstr) - 2] = '\0';
} else
memset(equipstr, '\0', sizeof(equipstr));
if (sd->status.inventory[i].refine)
sprintf(output, "%d %s %+d (%s %+d, id: %d) %s", pl_sd->status.inventory[i].amount, item_data->name, pl_sd->status.inventory[i].refine, item_data->jname, pl_sd->status.inventory[i].refine, pl_sd->status.inventory[i].nameid, equipstr);
else
sprintf(output, "%d %s (%s, id: %d) %s", pl_sd->status.inventory[i].amount, item_data->name, item_data->jname, pl_sd->status.inventory[i].nameid, equipstr);
clif_displaymessage(fd, output);
memset(output, '\0', sizeof(output));
counter2 = 0;
for (j = 0; j < item_data->slot; j++) {
if (pl_sd->status.inventory[i].card[j]) {
if ((item_temp = itemdb_search(pl_sd->status.inventory[i].card[j])) != NULL) {
if (output[0] == '\0')
sprintf(outputtmp, " -> (card(s): #%d %s (%s), ", ++counter2, item_temp->name, item_temp->jname);
else
sprintf(outputtmp, "#%d %s (%s), ", ++counter2, item_temp->name, item_temp->jname);
strcat(output, outputtmp);
}
}
}
if (output[0] != '\0') {
output[strlen(output) - 2] = ')';
output[strlen(output) - 1] = '\0';
clif_displaymessage(fd, output);
}
}
}
if (count == 0)
clif_displaymessage(fd, "No item found on this player.");
else {
sprintf(output, "%d item(s) found in %d kind(s) of items.", counter, count);
clif_displaymessage(fd, output);
}
} else {
clif_displaymessage(fd, msg_table[81]); // Your GM level don't authorise you to do this action on this player.
return -1;
}
} else {
clif_displaymessage(fd, msg_table[3]); // Character not found.
return -1;
}
return 0;
}
/*========================================== /*==========================================
* @charstoragelist <character>: Displays the items list of a player's storage. * @charstoragelist <character>: Displays the items list of a player's storage.
*------------------------------------------ *------------------------------------------

1
src/map/atcommand.h
View File

@ -157,7 +157,6 @@ enum AtCommandType {
AtCommand_EMail, // by Yor AtCommand_EMail, // by Yor
AtCommand_Hatch, AtCommand_Hatch,
AtCommand_Effect, // by Apple AtCommand_Effect, // by Apple
AtCommand_Char_Item_List, // by Yor
AtCommand_Char_Storage_List, // by Yor AtCommand_Char_Storage_List, // by Yor
AtCommand_Char_Cart_List, // by Yor AtCommand_Char_Cart_List, // by Yor
AtCommand_AddWarp, // by MouseJstr AtCommand_AddWarp, // by MouseJstr

122
src/map/charcommand.c
View File

@ -43,6 +43,7 @@ CCMD_FUNC(save);
CCMD_FUNC(stats_all); CCMD_FUNC(stats_all);
CCMD_FUNC(reset); CCMD_FUNC(reset);
CCMD_FUNC(spiritball); CCMD_FUNC(spiritball);
CCMD_FUNC(itemlist);
#ifdef TXT_ONLY #ifdef TXT_ONLY
/* TXT_ONLY */ /* TXT_ONLY */
@ -72,6 +73,7 @@ static CharCommandInfo charcommand_info[] = {
{ CharCommandSave, "#save", 60, charcommand_save }, { CharCommandSave, "#save", 60, charcommand_save },
{ CharCommandStatsAll, "#statsall", 40, charcommand_stats_all }, { CharCommandStatsAll, "#statsall", 40, charcommand_stats_all },
{ CharCommandSpiritball, "#spiritball", 40, charcommand_spiritball }, { CharCommandSpiritball, "#spiritball", 40, charcommand_spiritball },
{ CharCommandItemList, "#itemlist", 40, charcommand_itemlist },
#ifdef TXT_ONLY #ifdef TXT_ONLY
/* TXT_ONLY */ /* TXT_ONLY */
@ -317,7 +319,11 @@ int charcommand_jobchange(
job = 4015; job = 4015;
} }
} }
int j;
for (j=0; j < MAX_INVENTORY; j++) {
if(pl_sd->status.inventory[j].nameid>0 && pl_sd->status.inventory[j].equip!=0)
pc_unequipitem(pl_sd, j, 3);
}
if (pc_jobchange(pl_sd, job, upper) == 0) if (pc_jobchange(pl_sd, job, upper) == 0)
clif_displaymessage(fd, msg_table[48]); // Character's job changed. clif_displaymessage(fd, msg_table[48]); // Character's job changed.
else { else {
@ -744,3 +750,117 @@ int charcommand_spiritball(const int fd, struct map_session_data* sd,const char*
} }
return 0; return 0;
} }
/*==========================================
* #itemlist <character>: Displays the list of a player's items.
*------------------------------------------
*/
int
charcommand_itemlist(
const int fd, struct map_session_data* sd,
const char* command, const char* message)
{
struct map_session_data *pl_sd;
struct item_data *item_data, *item_temp;
int i, j, equip, count, counter, counter2;
char character[100], output[200], equipstr[100], outputtmp[200];
nullpo_retr(-1, sd);
memset(character, '\0', sizeof(character));
memset(output, '\0', sizeof(output));
memset(equipstr, '\0', sizeof(equipstr));
memset(outputtmp, '\0', sizeof(outputtmp));
if (!message || !*message || sscanf(message, "%99[^\n]", character) < 1) {
clif_displaymessage(fd, "Please, enter a player name (usage: #itemlist <char name>).");
return -1;
}
if ((pl_sd = map_nick2sd(character)) != NULL) {
if (pc_isGM(sd) >= pc_isGM(pl_sd)) { // you can look items only lower or same level
counter = 0;
count = 0;
for (i = 0; i < MAX_INVENTORY; i++) {
if (pl_sd->status.inventory[i].nameid > 0 && (item_data = itemdb_search(pl_sd->status.inventory[i].nameid)) != NULL) {
counter = counter + pl_sd->status.inventory[i].amount;
count++;
if (count == 1) {
sprintf(output, "------ Items list of '%s' ------", pl_sd->status.name);
clif_displaymessage(fd, output);
}
if ((equip = pl_sd->status.inventory[i].equip)) {
strcpy(equipstr, "| equiped: ");
if (equip & 4)
strcat(equipstr, "robe/gargment, ");
if (equip & 8)
strcat(equipstr, "left accessory, ");
if (equip & 16)
strcat(equipstr, "body/armor, ");
if ((equip & 34) == 2)
strcat(equipstr, "right hand, ");
if ((equip & 34) == 32)
strcat(equipstr, "left hand, ");
if ((equip & 34) == 34)
strcat(equipstr, "both hands, ");
if (equip & 64)
strcat(equipstr, "feet, ");
if (equip & 128)
strcat(equipstr, "right accessory, ");
if ((equip & 769) == 1)
strcat(equipstr, "lower head, ");
if ((equip & 769) == 256)
strcat(equipstr, "top head, ");
if ((equip & 769) == 257)
strcat(equipstr, "lower/top head, ");
if ((equip & 769) == 512)
strcat(equipstr, "mid head, ");
if ((equip & 769) == 512)
strcat(equipstr, "lower/mid head, ");
if ((equip & 769) == 769)
strcat(equipstr, "lower/mid/top head, ");
// remove final ', '
equipstr[strlen(equipstr) - 2] = '\0';
} else
memset(equipstr, '\0', sizeof(equipstr));
if (sd->status.inventory[i].refine)
sprintf(output, "%d %s %+d (%s %+d, id: %d) %s", pl_sd->status.inventory[i].amount, item_data->name, pl_sd->status.inventory[i].refine, item_data->jname, pl_sd->status.inventory[i].refine, pl_sd->status.inventory[i].nameid, equipstr);
else
sprintf(output, "%d %s (%s, id: %d) %s", pl_sd->status.inventory[i].amount, item_data->name, item_data->jname, pl_sd->status.inventory[i].nameid, equipstr);
clif_displaymessage(fd, output);
memset(output, '\0', sizeof(output));
counter2 = 0;
for (j = 0; j < item_data->slot; j++) {
if (pl_sd->status.inventory[i].card[j]) {
if ((item_temp = itemdb_search(pl_sd->status.inventory[i].card[j])) != NULL) {
if (output[0] == '\0')
sprintf(outputtmp, " -> (card(s): #%d %s (%s), ", ++counter2, item_temp->name, item_temp->jname);
else
sprintf(outputtmp, "#%d %s (%s), ", ++counter2, item_temp->name, item_temp->jname);
strcat(output, outputtmp);
}
}
}
if (output[0] != '\0') {
output[strlen(output) - 2] = ')';
output[strlen(output) - 1] = '\0';
clif_displaymessage(fd, output);
}
}
}
if (count == 0)
clif_displaymessage(fd, "No item found on this player.");
else {
sprintf(output, "%d item(s) found in %d kind(s) of items.", counter, count);
clif_displaymessage(fd, output);
}
} else {
clif_displaymessage(fd, msg_table[81]); // Your GM level don't authorise you to do this action on this player.
return -1;
}
} else {
clif_displaymessage(fd, msg_table[3]); // Character not found.
return -1;
}
return 0;
}

1
src/map/charcommand.h
View File

@ -12,6 +12,7 @@ enum CharCommandType {
CharCommandSave, CharCommandSave,
CharCommandStatsAll, CharCommandStatsAll,
CharCommandSpiritball, CharCommandSpiritball,
CharCommandItemList,
#ifdef TXT_ONLY #ifdef TXT_ONLY
/* TXT_ONLY */ /* TXT_ONLY */

5
src/map/map.c
View File

@ -2309,7 +2309,6 @@ int do_init(int argc, char *argv[]) {
srand(gettick()); srand(gettick());
for (i = 1; i < argc ; i++) { for (i = 1; i < argc ; i++) {
if (strcmp(argv[i], "--help") == 0 || strcmp(argv[i], "--h") == 0 || strcmp(argv[i], "--?") == 0 || strcmp(argv[i], "/?") == 0) if (strcmp(argv[i], "--help") == 0 || strcmp(argv[i], "--h") == 0 || strcmp(argv[i], "--?") == 0 || strcmp(argv[i], "/?") == 0)
map_helpscreen(1); map_helpscreen(1);
if (strcmp(argv[i], "--version") == 0 || strcmp(argv[i], "--v") == 0 || strcmp(argv[i], "-v") == 0 || strcmp(argv[i], "/v") == 0) if (strcmp(argv[i], "--version") == 0 || strcmp(argv[i], "--v") == 0 || strcmp(argv[i], "-v") == 0 || strcmp(argv[i], "/v") == 0)
@ -2405,9 +2404,7 @@ int do_init(int argc, char *argv[]) {
//Added by Mugendai for GUI support //Added by Mugendai for GUI support
if (flush_on) if (flush_on)
{
add_timer_interval(gettick()+10, flush_timer,0,0,flush_time); add_timer_interval(gettick()+10, flush_timer,0,0,flush_time);
}
#ifndef TXT_ONLY // online status timer, checks every hour [Valaris] #ifndef TXT_ONLY // online status timer, checks every hour [Valaris]
add_timer_func_list(online_timer, "online_timer"); add_timer_func_list(online_timer, "online_timer");
@ -2447,7 +2444,7 @@ int do_init(int argc, char *argv[]) {
} }
if (battle_config.pk_mode == 1) if (battle_config.pk_mode == 1)
printf("The server is running in \033[1;31mPK Mode\033[0m.\n"); ShowNotice("Server is running on '"CL_WHITE"PK Mode"CL_RESET"'.\n");
//Added for Mugendais I'm Alive mod //Added for Mugendais I'm Alive mod
if (imalive_on) if (imalive_on)