Emoticons constant name (#2527)

This PR change the emoticons constant name to match emoticonlist from client side.
Note: the previous emoticons names are now deprecated.

Additionnally emotion and unitemote scripts commands are being merged together to the new format
-> emotion <emotion number>{,<target>};
Where target use the target Game ID (GID) of the unit (npc, pet, character etc..).

* unitemote is now deprecated.
* Additionnally fixed incorrect variable in quests_brasilis.txt

Thanks to @aleos89 and @Lemongrass3110 !
This commit is contained in:
Atemo
2017-11-10 18:35:21 +01:00
committed by GitHub
parent 1f7a314c78
commit ea88ea5054
176 changed files with 3444 additions and 3371 deletions

View File

@@ -662,7 +662,7 @@ int pet_catch_process2(struct map_session_data* sd, int target_id)
sd->catch_target_class = md->mob_id;
if(i < 0 || sd->catch_target_class != md->mob_id) {
clif_emotion(&md->bl, E_AG); //mob will do /ag if wrong lure is used on them.
clif_emotion(&md->bl, ET_ANGER); //mob will do /ag if wrong lure is used on them.
clif_pet_roulette(sd,0);
sd->catch_target_class = -1;
@@ -1433,7 +1433,7 @@ int pet_recovery_timer(int tid, unsigned int tick, int id, intptr_t data)
//Detoxify is chosen for now.
clif_skill_nodamage(&pd->bl,&sd->bl,TF_DETOXIFY,1,1);
status_change_end(&sd->bl, pd->recovery->type, INVALID_TIMER);
clif_emotion(&pd->bl, E_OK);
clif_emotion(&pd->bl, ET_OK);
}
pd->recovery->timer = INVALID_TIMER;