diff options
| author | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-04-22 06:38:03 +0000 |
|---|---|---|
| committer | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-04-22 06:38:03 +0000 |
| commit | 8b8f847bb862c2cfa31557fb54d81e3e7b5c6be4 (patch) | |
| tree | 03a20ec3e80d4b44c145875bf91bd77e452914f6 /src/map/atcommand.c | |
| parent | 170f8fe0c31c0fb2a92ff3e21e34e2d63992e726 (diff) | |
| download | hercules-8b8f847bb862c2cfa31557fb54d81e3e7b5c6be4.tar.gz hercules-8b8f847bb862c2cfa31557fb54d81e3e7b5c6be4.tar.bz2 hercules-8b8f847bb862c2cfa31557fb54d81e3e7b5c6be4.tar.xz hercules-8b8f847bb862c2cfa31557fb54d81e3e7b5c6be4.zip | |
- Changed @pettalk /dice to roll random 1-6 (before it always rolled 1).
- Added more /emotions to pet emotion processing.
- Removed the clif_skill_fail so it doesn't spam them with a message
(the client limits spamming clif_parse_Emotion, but not spamming @commands).
- Follow up to r15009: used clif_emotion constants (see r14518).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15916 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/atcommand.c')
| -rw-r--r-- | src/map/atcommand.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 0bbbf4f44..bfe510e34 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -6242,17 +6242,20 @@ ACMD_FUNC(pettalk) "/!", "/?", "/ho", "/lv", "/swt", "/ic", "/an", "/ag", "/$", "/...", "/scissors", "/rock", "/paper", "/korea", "/lv2", "/thx", "/wah", "/sry", "/heh", "/swt2", "/hmm", "/no1", "/??", "/omg", "/O", "/X", "/hlp", "/go", "/sob", "/gg", - "/kis", "/kis2", "/pif", "/ok", "-?-", "-?-", "/bzz", "/rice", "/awsm", "/meh", - "/shy", "/pat", "/mp", "/slur", "/com", "/yawn", "/grat", "/hp", "/philippines", "/usa", - "/indonesia", "/brazil", "/fsh", "/spin", "/sigh", "/dum", "/crwd", "/desp", "/dice" + "/kis", "/kis2", "/pif", "/ok", "-?-", "/indonesia", "/bzz", "/rice", "/awsm", "/meh", + "/shy", "/pat", "/mp", "/slur", "/com", "/yawn", "/grat", "/hp", "/philippines", "/malaysia", + "/singapore", "/brazil", "/fsh", "/spin", "/sigh", "/dum", "/crwd", "/desp", "/dice", "-dice2", + "-dice3", "-dice4", "-dice5", "-dice6", "/india", "/love", "/russia", "-?-", "/mobile", "/mail", + "/chinese", "/antenna1", "/antenna2", "/antenna3", "/hum", "/abs", "/oops", "/spit", "/ene", "/panic", + "/whisp" }; int i; ARR_FIND( 0, ARRAYLENGTH(emo), i, stricmp(message, emo[i]) == 0 ); + if( i == E_DICE1 ) i = rand()%6 + E_DICE1; // randomize /dice if( i < ARRAYLENGTH(emo) ) { if (sd->emotionlasttime + 1 >= time(NULL)) { // not more than 1 per second sd->emotionlasttime = time(NULL); - clif_skill_fail(sd, 1, 0, 1); return 0; } sd->emotionlasttime = time(NULL); |