* Some more updates to the channel system, including documentation for new atcommands.
* Updated IDN map_msg translation. (credits: Cydh) * Reverted changes to fortune.txt in r17297. git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17299 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
euphyy
parent
7520c8c5b3
commit
8e810c050c
@ -5,16 +5,16 @@ chsys: (
|
||||
/* Default channels (available to all players) */
|
||||
default_channels: {
|
||||
/* channel_name : channel_messages_color */
|
||||
main: "Orange"
|
||||
main: "Yellow"
|
||||
support: "Blue"
|
||||
trade: "Red"
|
||||
offtopic: "Cyan"
|
||||
chat: "Default"
|
||||
/* Add as many channels as you'd like. */
|
||||
}
|
||||
|
||||
/* Colors available */
|
||||
colors: {
|
||||
Default: "0xffffff" /* Custom channels will use the first in the list unless a font is selected through @channel. */
|
||||
Default: "0xffffff" /* Custom channels will use the first in the list unless a color is selected through @channel. */
|
||||
Red: "0xff0000"
|
||||
Blue: "0x83cfe9"
|
||||
Orange: "0xe57c00"
|
||||
|
||||
@ -1457,7 +1457,7 @@
|
||||
1441: Player '%s' is unbanned from the '%s' channel.
|
||||
1442: Cleared all bans from the '%s' channel.
|
||||
1443: ---- '#%s' Ban List:
|
||||
//1444 free
|
||||
1444: ---- Available Colors ----
|
||||
1445: - %s
|
||||
1446: You need to input an option.
|
||||
1447: Unknown channel option '%s'.
|
||||
|
||||
@ -1457,7 +1457,7 @@
|
||||
1441: Le joueur '%s' n'est plus banni du canal '%s'
|
||||
1442: Liste des bannis du canal '%s' supprimée.
|
||||
1443: ---- liste des bannis de '#%s':
|
||||
//1444 free
|
||||
1444: ---- Couleurs disponibles ----
|
||||
1445: - %s
|
||||
1446: Veuillez entrer une option.
|
||||
1447: Option de canal '%s' inconnue.
|
||||
|
||||
@ -446,7 +446,7 @@
|
||||
// Pesan-pesan untuk keperluan lain (Bukan untuk perintah GM)
|
||||
// ----------------------------------------
|
||||
|
||||
//500: kosong
|
||||
//500 kosong
|
||||
501: Batas akun kamu adalah: %d-%m-%Y %H:%M:%S.
|
||||
502: Mode siang diaktifkan.
|
||||
503: Mode malam diaktifkan.
|
||||
@ -460,7 +460,7 @@
|
||||
|
||||
507: Player ini sudah dihukum selama %d menit.
|
||||
508: Player ini tidak dapat dihukum (Hukuman dinonaktifkan).
|
||||
//509 Tersedia....
|
||||
//509 kosong
|
||||
|
||||
// Sistem surat (e-mail)
|
||||
510: Kamu memiliki %d pesan baru (ada %d pesan yang belum dibaca)
|
||||
@ -558,8 +558,8 @@
|
||||
616: Taekwon
|
||||
617: Star Gladiator
|
||||
618: Soul Linker
|
||||
//619: kosong
|
||||
//620: kosong
|
||||
//619 kosong
|
||||
//620 kosong
|
||||
621: Summer
|
||||
622: Gangsi
|
||||
623: Death Knight
|
||||
@ -1410,10 +1410,10 @@
|
||||
1398: -- Menampilkan %d bagian pertama yang cocok:
|
||||
|
||||
// @channel
|
||||
1399: Channel tidak diketahui. (Penggunaan: %s <#nama_channel>)
|
||||
1400: Channel '%s' tidak diketahui. (Penggunaan: %s <#nama_channel>)
|
||||
1401: Channel '%s' menggunakan password. (Penggunaan: %s <#nama_channel> <password>)
|
||||
1402: kamu tidak berada di channel tersebut, ketikkan '@join <#nama_channel>'
|
||||
1399: Channel tidak diketahui. (Penggunaan: %s <#nama_channel>).
|
||||
1400: Channel '%s' tidak diketahui. (Penggunaan: %s <#nama_channel>).
|
||||
1401: Channel '%s' menggunakan password. (Penggunaan: %s <#nama_channel> <password>).
|
||||
1402: Kamu tidak berada di channel tersebut (gunakan '@join <#nama_channel>').
|
||||
1403: Kamu sekarang berada di channel '%s'.
|
||||
1404: %s gagal.
|
||||
1405: Nama Channel harus dimulai dengan '#'.
|
||||
@ -1448,44 +1448,44 @@
|
||||
1434: Kamu telah berada di channel '%s'.
|
||||
1435: Kamu sekarang berada di channel '#%s' untuk '%s'.
|
||||
1436: Password channel tidak dapat lebih banyak dari %d.
|
||||
1437: Pemain '%s' sekarang telah diban dari channel '%s'.
|
||||
1438: Kamu tidak dapat bergabung di channel '%s' karena kamu telah diban dari channel tersebut.
|
||||
1437: Pemain '%s' diban dari channel '%s'.
|
||||
1438: Kamu saat ini diban dari channel '%s'.
|
||||
1439: Channel '%s' tidak memiliki pemain yang diban.
|
||||
1440: Pemain '%s' tidak diban dari channel ini.
|
||||
1441: Pemain '%s' sudah diunban dari channel '%s' saat ini.
|
||||
1442: Menghilangkan semua 'ban' dari channel '%s'.
|
||||
1441: Pemain '%s' diunban dari channel '%s' saat ini.
|
||||
1442: Semua pemain yang diban dari channel '%s' sudah dibersihkan.
|
||||
1443: ---- Daftar 'ban' '#%s':
|
||||
//1444 kosong
|
||||
1444: ---- Warna yang tersedia ----
|
||||
1445: - %s
|
||||
1446: Kamu butuh untuk memasukkan pilihan.
|
||||
1446: Kamu butuh untuk memasukkan sebuah pilihan.
|
||||
1447: '%s' adalah pilihan channel yang tidak diketahui.
|
||||
1448: Channel %s dihapus.
|
||||
1449: Pilihan '%s' sudah diaktifkan, jika kamu ingin mematikannya ketik '@channel setopt %s 0'.
|
||||
1449: Pilihan '%s' sudah diaktifkan, (gunakan '@channel setopt %s 0' untuk mematikannya).
|
||||
1450: Pilihan '%s' saat ini diaktifkan untuk channel '%s'.
|
||||
1451: Nilai '%d' keluar dari batas untuk option '%s' (batasnya 0-10).
|
||||
1452: Pilihan '%s' sekarang diaktifkan untuk channel '%s' dalam %d detik.
|
||||
1453: Pilihan '%s' sekarang dimatikan untuk channel '%s'.
|
||||
//1454 kosong
|
||||
1455: Kamu berbicara terlalu cepat!
|
||||
1456: * %s ban <#nama_channel> <nama karakter>
|
||||
1457: -- ban <nama karakter> dari channel <#nama_channel>
|
||||
1456: * %s ban <#nama_channel> <pemain>
|
||||
1457: -- Ban pemain yang ditentukan dari channel.
|
||||
1458: * %s banlist <#nama_channel>
|
||||
1459: -- daftar semua pemain yang diban dari channel <#nama_channel>
|
||||
1460: * %s unban <#nama_channel> <nama karakter>
|
||||
1461: -- unban <nama karakter> dari channel <#nama_channel>
|
||||
1462: * %s setopt <#nama_channel> <nama pilihan> <nilai pilihan>
|
||||
1463: -- menambahkan atau mengurangi <nama pilihan> dengan <nilai pilihan> untuk channel <#nama_channel>
|
||||
1464: 'Ban' gagal, tidak mungkin untuk 'ban'/'unban' pengguna ini.
|
||||
1459: -- Menampilkan daftar semua pemain yang diban dari channel yang ditentukan
|
||||
1460: * %s unban <#nama_channel> <pemain>
|
||||
1461: -- Unban pemain yang ditentukan dari suatu channel.
|
||||
1462: * %s setopt <#nama_channel> <pilihan> <nilai>
|
||||
1463: -- Mengatur sebuah pilihan dan nilainya dari channel yang ditentukan.
|
||||
1464: 'Ban' gagal untuk pemain '%s'.
|
||||
1465: Pemain '%s' sudah diban dari channel ini.
|
||||
1466: Untuk '%s' kamu membutuhkan jumlah dalam detik (dari 0 sampai 10)
|
||||
1466: Masukkan nilai beberapa detik (0-10) untuk pilihan '%s'.
|
||||
1467: * %s unbanall <#nama_channel>
|
||||
1468: -- 'unban' semua orang dari <#nama_channel>
|
||||
1468: -- Membersihkan semua pemain yang diban dari channel yang ditentukan.
|
||||
1469: * %s delete <#nama_channel>
|
||||
1470: -- Memaksa pemain meninggalkan channel dan menghilangkan channel yang ditentukan.
|
||||
1470: -- Memusnahkan channel yang ditentukan.
|
||||
1471: * %s list mine
|
||||
1472: -- Daftar semua channel yang kamu ikuti.
|
||||
1472: -- Menampilkan daftar semua channel yang kamu ikuti.
|
||||
1473: * %s join <#nama_channel> <password_channel>
|
||||
1474: -- bergabung ke channel yang ditentukan
|
||||
1474: -- Bergabung ke channel yang ditentukan.
|
||||
1475: ---- Channel yang diikuti ----
|
||||
1476: Kamu tidak bergabung ke channel manapun saat ini.
|
||||
|
||||
|
||||
@ -1467,10 +1467,10 @@
|
||||
1438: No puedes ingresar al canal '%s' por que estás banneado.
|
||||
1439: El canal '%s' no tiene ningún jugador banneado.
|
||||
1440: El jugador '%s' no esta banneado de este canal.
|
||||
1441: El jugador '%s' ha sido desbanneado del canal '%s'
|
||||
1442: Removidos todos los banneados del canal '%s'
|
||||
1441: El jugador '%s' ha sido desbanneado del canal '%s'.
|
||||
1442: Removidos todos los banneados del canal '%s'.
|
||||
1443: ---- '#%s' Lista de banneados:
|
||||
//1444 free
|
||||
1444: ---- Colores disponibles ----
|
||||
1445: - %s
|
||||
1446: Necesitas ingresar una opción.
|
||||
1447: '%s' Es una opción invalida.
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
//Item Trading Restrictions File
|
||||
//Specify here special rules for item trading.
|
||||
//Item ID, TradeMask, GM-Level Override
|
||||
//Item ID, TradeMask, Group-Level Override
|
||||
//Trading mask values:
|
||||
//1:Item can't be droped
|
||||
//2:Item can't be traded (nor vended)
|
||||
@ -13,7 +13,7 @@
|
||||
//256:Item can't be auctioned
|
||||
//Example:
|
||||
//1161,67,50 //Balmung: No drop, No trade, No Guild Store (1+2+64 =67),
|
||||
//only GMs of GM-level 50 and up can override the setting.
|
||||
//only groups of group-level 50 and up can override the setting.
|
||||
|
||||
// Wedding Related items
|
||||
2634,507,100 // Wedding Ring
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
//Item Trading Restrictions File
|
||||
//Specify here special rules for item trading.
|
||||
//Item ID, TradeMask, GM-Level Override
|
||||
//Item ID, TradeMask, Group-Level Override
|
||||
//Trading mask values:
|
||||
//1:Item can't be droped
|
||||
//2:Item can't be traded (nor vended)
|
||||
@ -13,7 +13,7 @@
|
||||
//256:Item can't be auctioned
|
||||
//Example:
|
||||
//1161,67,50 //Balmung: No drop, No trade, No Guild Store (1+2+64 =67),
|
||||
//only GMs of GM-level 50 and up can override the setting.
|
||||
//only groups of group-level 50 and up can override the setting.
|
||||
|
||||
// Wedding Related items
|
||||
2634,507,100 // Wedding Ring
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
//===== By: ==================================================
|
||||
//= rAthena Dev Team
|
||||
//===== Current Version: =====================================
|
||||
//= 20130413
|
||||
//= 20130426
|
||||
//===== Description: =========================================
|
||||
//= List of available atcommands and their functions.
|
||||
//============================================================
|
||||
@ -1447,11 +1447,18 @@ Sets the hunger level of your homunculus, with 100 being "Stuffed".
|
||||
========================
|
||||
|
||||
@join <#channel_name> {<password>}
|
||||
@channel join <#channel_name> {<password>}
|
||||
|
||||
Joins the specified channel.
|
||||
|
||||
---------------------------------------
|
||||
|
||||
@channel leave <#channel_name>
|
||||
|
||||
Leaves the specified channel.
|
||||
|
||||
---------------------------------------
|
||||
|
||||
@channel create <#channel_name> <channel_password>
|
||||
|
||||
Creates a new channel.
|
||||
@ -1459,15 +1466,19 @@ Creates a new channel.
|
||||
|
||||
---------------------------------------
|
||||
|
||||
@channel list
|
||||
@channel delete <#channel_name>
|
||||
|
||||
Displays a list of all public channels.
|
||||
Destroys the specified channel.
|
||||
|
||||
---------------------------------------
|
||||
|
||||
@channel list
|
||||
@channel list mine
|
||||
@channel list colors
|
||||
|
||||
Displays a list of all available colors for custom channels.
|
||||
'list' displays a list of all public channels.
|
||||
'list mine' displays a list of channels you have joined.
|
||||
'list colors' displays a list of all available colors for custom channels.
|
||||
|
||||
---------------------------------------
|
||||
|
||||
@ -1478,9 +1489,25 @@ You must either be the channel's owner or have the channel_admin permission.
|
||||
|
||||
---------------------------------------
|
||||
|
||||
@channel leave <#channel_name>
|
||||
@channel setopt <#channel_name> <option> <value>
|
||||
|
||||
Leaves the specified channel.
|
||||
Sets an option and value for the specified channel.
|
||||
You must either be the channel's owner or have the channel_admin permission.
|
||||
|
||||
Available options:
|
||||
-- 'JoinAnnounce <1|0>' : Toggles channel announcement when a new player enters.
|
||||
-- 'MessageDelay <0-10>' : Sets the delay (in seconds) for messages sent to the channel.
|
||||
|
||||
---------------------------------------
|
||||
|
||||
@channel ban <#channel_name> <player>
|
||||
@channel unban <#channel_name> <player>
|
||||
@channel unbanall <#channel_name>
|
||||
@channel banlist <#channel_name>
|
||||
|
||||
Bans or unbans a player from the specified channel.
|
||||
'unbanall' clears all bans from the channel.
|
||||
'banlist' displays a list of all players banned from the channel.
|
||||
|
||||
---------------------------------------
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -10,15 +10,15 @@
|
||||
//= [Official Conversion]
|
||||
//= Quest for getting a Nile Rose
|
||||
//= There are two versions of this quest.
|
||||
//= Version 1 (Not implemented) was used on iRO as an event
|
||||
//= for it's anniversary, while version 2 (this version),
|
||||
//= Version 1 (not implemented) was used on iRO as an event
|
||||
//= for its anniversary, while version 2 (this version)
|
||||
//= is the one that remained active on main servers.
|
||||
//===== Additional Comments: =================================
|
||||
//= 1.5 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
|
||||
//= Tracking variable is not backwards compatable meaning
|
||||
//= you can again repeat this quest from the start.
|
||||
//= 1.6 Fixed issue with #prt_key-1-1. [L0ne_W0lf]
|
||||
//= 1.7 Corrected reminants from Official Conversion. [L0en_w0lf]
|
||||
//= 1.7 Corrected remnants from Official Conversion. [L0ne_W0lf]
|
||||
//= 1.8 Replaced effect numerics with constants. [L0ne_W0lf]
|
||||
//= 1.9 Removed duplicate text. [Kisuka]
|
||||
//= 2.0 Updated EXP rewards.
|
||||
|
||||
@ -134,7 +134,7 @@ int channel_join(struct Channel *channel, struct map_session_data *sd) {
|
||||
sd->stealth = false;
|
||||
} else if( channel->opt & CHAN_OPT_ANNOUNCE_JOIN ) {
|
||||
char message[60];
|
||||
sprintf(message, "#%s '%s' joined",channel->name,sd->status.name);
|
||||
sprintf(message, "[ #%s ] '%s' has joined.",channel->name,sd->status.name);
|
||||
clif_channel_msg(channel,sd,message);
|
||||
}
|
||||
|
||||
@ -460,9 +460,7 @@ int channel_pc_haschan(struct map_session_data *sd, struct Channel *channel){
|
||||
* return
|
||||
* 0 : all cases
|
||||
*/
|
||||
int
|
||||
channel_colormes(struct map_session_data *__restrict sd, uint32 channel_color, const char *__restrict msg)
|
||||
{
|
||||
int channel_colormes(struct map_session_data *__restrict sd, uint32 channel_color, const char *__restrict msg){
|
||||
uint16 msg_len = strlen(msg) + 1;
|
||||
|
||||
WFIFOHEAD(sd->fd,msg_len + 12);
|
||||
@ -497,8 +495,9 @@ int channel_display_list(struct map_session_data *sd, char *options){
|
||||
//display availaible colors
|
||||
if( options[0] != '\0' && strcmpi(options,"colors") == 0 ) {
|
||||
char msg[40];
|
||||
clif_displaymessage(sd->fd, msg_txt(sd,1444)); // ---- Available Colors ----
|
||||
for( k = 0; k < Channel_Config.colors_count; k++ ) {
|
||||
sprintf(msg, "[ Channel list colors ] : %s",Channel_Config.colors_name[k]);
|
||||
sprintf(msg, msg_txt(sd,1445),Channel_Config.colors_name[k]);// - '%s'
|
||||
channel_colormes(sd, k, msg);
|
||||
}
|
||||
}
|
||||
@ -941,7 +940,6 @@ int channel_pcsetopt(struct map_session_data *sd, char *chname, const char *opti
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
if( option == '\0' ) {
|
||||
clif_displaymessage(sd->fd, msg_txt(sd,1446));// You need to input an option.
|
||||
return -1;
|
||||
@ -1024,9 +1022,6 @@ int channel_pcsetopt(struct map_session_data *sd, char *chname, const char *opti
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* Read and verify configuration in confif_filename
|
||||
* Assign table value with value
|
||||
@ -1105,7 +1100,7 @@ void channel_read_config(void) {
|
||||
if( k < Channel_Config.colors_count ) {
|
||||
Channel_Config.map_chcolor = k;
|
||||
} else {
|
||||
ShowError("channels.conf: unknown color '%s' for channel 'map_local_channel_color', disabling '#%s'...\n",map_color,map_chname);
|
||||
ShowError("channels.conf: unknown color '%s' for 'map_local_channel_color', disabling '#%s'...\n",map_color,map_chname);
|
||||
Channel_Config.map_enable = false;
|
||||
}
|
||||
|
||||
@ -1119,7 +1114,7 @@ void channel_read_config(void) {
|
||||
if( k < Channel_Config.colors_count ) {
|
||||
Channel_Config.ally_chcolor = k;
|
||||
} else {
|
||||
ShowError("channels.conf: unknown color '%s' for channel 'ally_channel_color', disabling '#%s'...\n",map_color,ally_chname);
|
||||
ShowError("channels.conf: unknown color '%s' for 'ally_channel_color', disabling '#%s'...\n",ally_color,ally_chname);
|
||||
Channel_Config.ally_enable = false;
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user