Jump to content

mkbu95's msg_athena update diff


Ind

Recommended Posts


  • Group:  Members
  • Topic Count:  169
  • Topics Per Day:  0.04
  • Content Count:  1260
  • Reputation:   750
  • Joined:  11/19/11
  • Last Seen:  

@mkbu95 sent me this early this week, its a great update for the msg_athena system however there is one small detail impeding me from moving on with it and I'd like your opinion about it, it seems the whitespaces are being screwed up at some point (not by his additions to the system, but by something else) which makes many messages layout end up wrong (e.g. @job's one), any ideas? Thank you for your time. atcommand_msg_athena.patch

Link to comment
Share on other sites


  • Group:  Members
  • Topic Count:  75
  • Topics Per Day:  0.02
  • Content Count:  2223
  • Reputation:   593
  • Joined:  10/26/11
  • Last Seen:  

We could do 2 commits:

  1. mkbu95's msg_athena patch
  2. fix the spacing in @go and @job

EDIT: #1 done in r16724

#2 I'll do tomorrow

Edited by Brian
Link to comment
Share on other sites


  • Group:  Members
  • Topic Count:  75
  • Topics Per Day:  0.02
  • Content Count:  2223
  • Reputation:   593
  • Joined:  10/26/11
  • Last Seen:  

I thought all he did was copy-paste those hard-coded messages from atcommand.c and put them in msg_athena.conf

Link to comment
Share on other sites


  • Group:  Members
  • Topic Count:  72
  • Topics Per Day:  0.02
  • Content Count:  2997
  • Reputation:   1130
  • Joined:  05/27/12
  • Last Seen:  

I've fixed and standardized all msg_athena messages. Mind if I commit them?

msg_athena.patch

Only afterwards did I realize the original messages are in the source as comments. I didn't change those. Are they even needed?


This is a patch to Ind's patch, didn't realize it was committed already e.e.

msg_athena.conf.patch

  • Upvote 2
Link to comment
Share on other sites


  • Group:  Members
  • Topic Count:  75
  • Topics Per Day:  0.02
  • Content Count:  2223
  • Reputation:   593
  • Joined:  10/26/11
  • Last Seen:  

Looks good to me.

Link to comment
Share on other sites


  • Group:  Members
  • Topic Count:  75
  • Topics Per Day:  0.02
  • Content Count:  2223
  • Reputation:   593
  • Joined:  10/26/11
  • Last Seen:  

The %c is for the atcommand symbol.

The hard-coded message before was:

sprintf(atcmd_output, "Help for command %c%s:", atcommand_symbol, command_name);

Link to comment
Share on other sites


  • Group:  Members
  • Topic Count:  72
  • Topics Per Day:  0.02
  • Content Count:  2997
  • Reputation:   1130
  • Joined:  05/27/12
  • Last Seen:  

Jman/Brian: Thanks, I had no idea how those things worked. xD So I should leave that line alone?

I'll wait a couple more hours before I commit since this isn't urgent.

Edit: Done, r16725.

Link to comment
Share on other sites


  • Group:  Members
  • Topic Count:  75
  • Topics Per Day:  0.02
  • Content Count:  2223
  • Reputation:   593
  • Joined:  10/26/11
  • Last Seen:  

Couple of things:

+
+// @help
+988: There is no help for this command_name.
+989: Help for command %c%s:
+990: Available aliases:
+

988: Shouldn't that be %s?

i.e.:

988: There is no help for the command %s

?

Other than that, looks good from here. Thanks Euphy for the quick corrections.

Oh now I see what you're talking about XD

Yes, it should be:

988: There is no help for %c%s.

and atcommand.c replace line 1597 with:

sprintf(atcmd_output, msg_txt(988), atcommand_symbol, command_name); // There is no help for %c%s.
clif_displaymessage(fd, atcmd_output);

Edited by Brian
  • Upvote 1
Link to comment
Share on other sites


  • Group:  Members
  • Topic Count:  8
  • Topics Per Day:  0.00
  • Content Count:  148
  • Reputation:   46
  • Joined:  11/02/11
  • Last Seen:  

The line was like this:

clif_displaymessage(fd, "There is no help for this command_name.");

And I didn't realize it should be a parameter x)

Thanks for the corrections Euphy :P

@edit

I changed all strings that were modified on r16725 to reflect on atcommand.c (I think I covered everything).

Also, I added the commentaries on @send that I forgot, and commented the lines with custom jobs on @jobchange.

atcommand.c.patch

  • Upvote 2
Link to comment
Share on other sites


  • Group:  Members
  • Topic Count:  75
  • Topics Per Day:  0.02
  • Content Count:  2223
  • Reputation:   593
  • Joined:  10/26/11
  • Last Seen:  

2. fix the spacing in @go and @job

Done in r16729/rathena/trunk/conf/help.txt

  • Changed the column spacing in @go (town list) and @job (jobname list) so it lines up for Arial font, instead of fixed-width fonts.

Link to comment
Share on other sites


  • Group:  Members
  • Topic Count:  72
  • Topics Per Day:  0.02
  • Content Count:  2997
  • Reputation:   1130
  • Joined:  05/27/12
  • Last Seen:  

Applied mkbu95's patch in r16735. Thanks!

  • Upvote 2
Link to comment
Share on other sites

×
×
  • Create New...