diff options
| -rw-r--r-- | AUTHORS | 2 | ||||
| -rw-r--r-- | conf/messages.conf | 2 | ||||
| -rw-r--r-- | doc/constants.md | 2 | ||||
| -rw-r--r-- | doc/option_drop_group.md | 6 | ||||
| -rw-r--r-- | doc/script_commands.txt | 18 | ||||
| -rw-r--r-- | src/config/secure.h | 2 |
6 files changed, 12 insertions, 20 deletions
@@ -186,7 +186,6 @@ Shido <the.keikun@gmail.com> Shizuke <matiasdvt@hotmail.com> sigtus <vantimothy@openmailbox.org> sirius <fw@f-ws.de> -Sirius <zopokx@gmail.com> skyleo <leo-pflug@web.de> skyleo <skyleo@skyleo.de> smokexyz <sagunkho@hotmail.com> @@ -214,6 +213,7 @@ Yommy <yomanda@gmail.com> Your Name <ibrahem.h.basyone@gmail.com> zackdreaver <zackdreaver@gmail.com> Zarbony <justonlinegames@web.de> +Zopokx <zopokx@gmail.com> diff --git a/conf/messages.conf b/conf/messages.conf index 98b0e0a9d..c9ae8cc66 100644 --- a/conf/messages.conf +++ b/conf/messages.conf @@ -913,7 +913,7 @@ 1044: Autotrade Disabled 1045: Battlegrounds ON 1046: PvP Flags: -1047: Pvp ON | +1047: PvP ON | 1048: NoGuild | 1049: NoParty | 1050: NightmareDrop | diff --git a/doc/constants.md b/doc/constants.md index c44654b71..07a4d8a6d 100644 --- a/doc/constants.md +++ b/doc/constants.md @@ -3657,7 +3657,7 @@ - `MER_SWORDMAN09`: 6045 - `MER_SWORDMAN10`: 6046 -### checkquest +### questprogress - `HAVEQUEST`: 0 - `PLAYTIME`: 1 diff --git a/doc/option_drop_group.md b/doc/option_drop_group.md index 325cf9fe2..730db53e6 100644 --- a/doc/option_drop_group.md +++ b/doc/option_drop_group.md @@ -1,6 +1,6 @@ # Option Drop Group Database -## Description +## Description Explanation of the `db/option_drop_groups.conf` file and structure. This database file allows the creation of groups of random options @@ -23,7 +23,7 @@ options for each of these slots. // Possible options for slot 1 // min/max value : int, defaults to 0 - // chance : int, 100 = 1% if not set, will be 100%/number of possibiltiies + // chance : int, 100 = 1% if not set, will be 100%/number of possibilities OptionName: value // or OptionName: [min value, max value] @@ -70,7 +70,7 @@ When chance is not specified in an option, it will be auto calculated by the server as being `100%/num`, when `num` is the number of possibilities in this option slot. -For example, if you specify 3 possible options, all of them without +For example, if you specify 3 possible options, all of them without a `chance` defined, all of them will have 33.33% chance of being picked (100%/3). If you set the chance of one of them to 50%, you will have one option with 50% chance, and each of the others with diff --git a/doc/script_commands.txt b/doc/script_commands.txt index 2fc6a95e5..cc23da4ca 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -4549,7 +4549,7 @@ Name is optional, and defaults to the attached player if omitted. *agitcheck() *agitcheck2() -These function will let you check whether the server is currently in WoE +These functions will let you check whether the server is currently in WoE mode (or WoE SE mode if the second function is called) and will return true if War of Emperium is on and false if it isn't. @@ -9638,26 +9638,18 @@ This will open a book item at the specified page. --------------------------------------- *rodex_sendmail(<char id>, "<sender name>", "<title>", "<body>"{, <zeny>{, <item1>, <amount1>{, <item2>, <amount2>{, <item3>, <amount3>{, <item4>, <amount4>{, <item5>, <amount5>}}}}}}) +*rodex_sendmail2(<char id>, "<sender name>", "<title>", "<body>"{, <zeny>{, <item1>, <amount1>, <refine1>, <attribute1>, <card0_1>, <card1_1>, <card2_1>, <card3_1>{,<item2>, <amount2>, <refine2>, <attribute2>, <card0_2>, <card1_2>, <card2_2>, <card3_2>{,<item3>, <amount3>, <refine3>, <attribute3>, <card0_3>, <card1_3>, <card2_3>, <card3_3>{,<item4>, <amount4>, <refine4>, <attribute4>, <card0_4>, <card1_4>, <card2_4>, <card3_4>{,<item5>, <amount5>, <refine5>, <attribute5>, <card0_5>, <card1_5>, <card2_5>, <card3_5>}}}}}}) + *rodex_sendmail_acc(<account id>, "<sender name>", "<title>", "<body>"{, <zeny>{, <item1>, <amount1>{, <item2>, <amount2>{, <item3>, <amount3>{, <item4>, <amount4>{, <item5>, <amount5>}}}}}}) +*rodex_sendmail_acc2(<account id>, "<sender name>", "<title>", "<body>"{, <zeny>{, <item1>, <amount1>, <refine1>, <attribute1>, <card0_1>, <card1_1>, <card2_1>, <card3_1>{,<item2>, <amount2>, <refine2>, <attribute2>, <card0_2>, <card1_2>, <card2_2>, <card3_2>{,<item3>, <amount3>, <refine3>, <attribute3>, <card0_3>, <card1_3>, <card2_3>, <card3_3>{,<item4>, <amount4>, <refine4>, <attribute4>, <card0_4>, <card1_4>, <card2_4>, <card3_4>{,<item5>, <amount5>, <refine5>, <attribute5>, <card0_5>, <card1_5>, <card2_5>, <card3_5>}}}}}}) This will send a mail using the RoDEX mail system, in newer clients the message will be marked as a NPC mail (that you can't reply). If items and zeny are specified, they will be added as attachments to the message. - For examples of usage, see /doc/sample/npc_rodex.txt ---------------------------------------- - -*rodex_sendmail2(<char id>, "<sender name>", "<title>", "<body>"{, <zeny>{, <item1>, <amount1>, <refine1>, <attribute1>, <card0_1>, <card1_1>, <card2_1>, <card3_1>{,<item2>, <amount2>, <refine2>, <attribute2>, <card0_2>, <card1_2>, <card2_2>, <card3_2>{,<item3>, <amount3>, <refine3>, <attribute3>, <card0_3>, <card1_3>, <card2_3>, <card3_3>{,<item4>, <amount4>, <refine4>, <attribute4>, <card0_4>, <card1_4>, <card2_4>, <card3_4>{,<item5>, <amount5>, <refine5>, <attribute5>, <card0_5>, <card1_5>, <card2_5>, <card3_5>}}}}}}) -*rodex_sendmail_acc2(<account id>, "<sender name>", "<title>", "<body>"{, <zeny>{, <item1>, <amount1>, <refine1>, <attribute1>, <card0_1>, <card1_1>, <card2_1>, <card3_1>{,<item2>, <amount2>, <refine2>, <attribute2>, <card0_2>, <card1_2>, <card2_2>, <card3_2>{,<item3>, <amount3>, <refine3>, <attribute3>, <card0_3>, <card1_3>, <card2_3>, <card3_3>{,<item4>, <amount4>, <refine4>, <attribute4>, <card0_4>, <card1_4>, <card2_4>, <card3_4>{,<item5>, <amount5>, <refine5>, <attribute5>, <card0_5>, <card1_5>, <card2_5>, <card3_5>}}}}}}) - -These are more flexible versions of rodex_sendmail and rodex_sendmail_acc. - -This will send a mail using the RoDEX mail system, in newer clients the message will be marked as a NPC mail (that you can't reply). -If items and zeny are specified, they will be added as attachments to the message. +rodex_sendmail2 and rodex_sendmail_acc2 are more flexible versions. Check getitem2 command for more information of the extra parameters. -For examples of usage, see /doc/sample/npc_rodex.txt - --------------------------------------- //===================================== 7 - Instance-Related Commands diff --git a/src/config/secure.h b/src/config/secure.h index fd05b4a49..bcd4e022b 100644 --- a/src/config/secure.h +++ b/src/config/secure.h @@ -60,7 +60,7 @@ * (Secure) Optional NPC Dialog Timer * @requirement : SECURE_NPCTIMEOUT must be enabled * Minimum Interval Between timeout checks in seconds - * Default: 1s + * Default: 1 **/ #define SECURE_NPCTIMEOUT_INTERVAL 1 |