383 Commits

Author SHA1 Message Date
Cydh Ramdh
f756d7e249 Merge branch 'rathena/master' 2014-03-27 13:48:41 +07:00
Cydh Ramdh
01c30bf505 Script Command Updates:
- *countitem:
-- Added cartcountitem
-- Added storagecountitem
-- Added cartcountitem2
-- Added storagecountitem2
-- Added a new param 'AccountID'
- *delitem:
-- Added cartdelitem
-- Added storagedelitem
-- Added cartdelitem2
-- Added storagedelitem2

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-03-22 14:44:20 +07:00
Jeric
7081f0ce7a Update script_commands.txt
Added documentation for switch statement.
2014-03-20 17:18:40 +08:00
Euphy
8c133f139b Hercules merges.
- If a player has both a Cart and Magic Gear, removing them will now first remove the Magic Gear first (instead of both simultaneously).  (2f9a514)
- Added overflow check to 'itemheal'; documentation updated. (1849d35)

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-03-13 16:20:56 -04:00
Euphy
4889699376 Bug fixes.
- Fixed guild names for payg_cas02 and payg_cas04. (bugreport:8763)
http://rathena.org/board/tracker/issue-8763-castle-db-wrong-castle-names/
- Fixed OnTouch issues in Old Glast Heim instance. (bugreport:8738)
http://rathena.org/board/tracker/issue-8738-oldglastheim/
- Fixed a minor documentation issue with 'pcblockmove'. (bugreport:8706)
http://rathena.org/board/tracker/issue-8706-pcblockmove-description-incorrect/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-03-13 15:47:02 -04:00
Jeric
83ee884891 Update script_commands.txt
Improved explanation for OnWhisperGlobal and included the reference in the docs.
2014-03-13 15:34:38 +08:00
Jeric
7ee480a38b Update script_commands.txt 2014-03-12 18:11:07 +08:00
Akkarinage
6e5545274e Variable typo (bugreport:8722) 2014-03-06 11:49:25 +00:00
Euphy
4a84de748c Merge pull request #49 from CairoLee/master
- Add instance_enter2 script command
2014-03-03 16:41:29 -05:00
Euphy
cad0a57865 Replaced 'getserverdef' command with 'script_hardcoded_constants' function in source. These constants can now be directly accessed in scripts. (Hercules 950e3eb)
- Relocated 'Option_*' constants from 'db/const.txt' to source; added OPTION_COSTUME compound. (Hercules a5728fd)
- Added MAX_CHAT_USERS define. (Hercules 950e3eb)
- Follow-up ca9642a: applied 'Loc' changes to Pre-Renewal database.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-03-01 15:42:49 -05:00
Sean Allen
f20e54150a Update script_commands.txt
- Update instance_enter Description
2014-02-24 03:01:49 +08:00
CairoLee
1f426bcb07 - Add instance_enter2 script command 2014-02-24 00:45:57 +08:00
Cydh Ramdh
072e98bdf2 Spiritball typo
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-02-23 19:17:11 +07:00
Cydh Ramdh
992c382562 Updated documentation for spiritball script commands
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-02-23 19:05:16 +07:00
Cydh Ramdh
a607a42ea3 Merge branch 'rathena/master' 2014-02-20 10:45:49 +07:00
Euphy
944e7d041f Minor bug fixes.
- Changed 'bIgnoreDefRate' to 'bIgnoreDefRaceRate' in Pre-Renewal item database. (bugreport:8674)
http://rathena.org/board/tracker/issue-8674-item-bonus-error-or-not/
- Added missing 'bFixedCastrate' bonus for item 1832. (bugreport:8422)
http://rathena.org/board/tracker/issue-8422-vellum-claw-not-giving-insta-cast-on-10/
- Clarified 'getgmlevel()' and 'getgroupid()' functions in script documentation. (bugreport:8586, pull #46)
http://rathena.org/board/tracker/issue-8586-script-commandstxt-doc-getgroupid/
- Added Buying Store tables to source documentation.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-02-18 19:09:37 -05:00
Euphy
27a0f3f88e Added 'OnPCStatCalcEvent' trigger. (tid:77230, credits: @QQfoolsorellina, AnnieRuru)
This label triggers whenever a player's stats are recalculated.
http://rathena.org/board/topic/77230-onpcstatcalcevent/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-02-15 12:40:43 -05:00
Euphy
877af1cfab Added optional 'dragon color' parameter to @mount. (tid:79844)
http://rathena.org/board/topic/79844-mount/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-02-11 22:53:17 -05:00
Euphy
eba153919e Added script command 'getguildmember', similar to 'getpartymember'. (tid:78308, credits: AnnieRuru, GodLesZ)
http://rathena.org/board/topic/78308-getguildmember/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-02-11 15:12:47 -05:00
Euphy
a2d095f5c4 Item database update.
- Added/edited itemscripts for some new items.
- Corrected the persistence of many Hit- and Flee-increasing consumables, as they should dispel upon death. (incl. bugreport:8626)
http://rathena.org/board/tracker/issue-8626-accuracy-30-scroll-effect-when-death/

Hercules merges:
- Added optional 'count' parameter to script command 'successrefitem'. (9d1f80e)
- Atcommand bindings are now case-insensitive, like normal atcommands. (92be98c)
- Consumables without expire time no longer stack with rental items. (afcb4bc, bugreport:8458)
http://rathena.org/board/tracker/issue-8458-rent-item-bug/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-02-10 16:13:53 -05:00
Cydh Ramdh
842e35c293 Merge branch 'rathena/master'
Conflicts:
	src/map/script.c
2014-02-10 19:05:45 +07:00
Euphy
2fff785894 Modernized syntax and fixed errors in the sample scripts. (Hercules 21fa090)
Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-02-08 16:34:26 -05:00
Euphy
de46393592 Improved 'client_hash_check' config. (Hercules e4a1ca2)
- Added option to disable hash check by GM group_id (specify 'disabled' as hash for a certain group_id to let them log in with any client, even if 'client_hash_check' is enabled.
- Updated and reworded related documentation for the feature.

Improvements on script command 'axtoi'; added 'strtol'. (Hercules 1cf7c1e)
- Added script command 'strtol' (conforming to the ISO C90 function).
- Modified script command 'axtoi' to internally use 'strtol' instead of an unnecessary separate implementation.

Cleaned up many sections of script documentation, and modernized syntax in examples.
Added documentation for 'rentitem2' and 'makeitem2'. (follow-up 339c0a8)

Added 'true' (1) and 'false' (2) as script constants.

'freeloop' argument is now optional, and will only return the value of freeloop if no argument is given. (tid:92470)
http://rathena.org/board/topic/92470-freeloop-optional-argument/

Added a missing mapflag to custom 'devil_square' script. (bugreport:8611)
http://rathena.org/board/tracker/issue-8611-devil-square-bug/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-02-08 15:32:28 -05:00
Cydh Ramdh
339c0a8c48 * Added script commands2, rentitem2 and makeitem2, suggestion http://rathena.org/board/topic/90918-emistrys-rentitem2-be-added-to-svn/
-- *rentitem2 <item id>,<time>,<identify>,<refine>,<attribute>,<card1>,<card2>,<card3>,<card4>;
-- *rentitem2 "<item name>",<time>,<identify>,<refine>,<attribute>,<card1>,<card2>,<card3>,<card4>;
-- from http://www.eathena.ws/board/index.php?showtopic=241313&view=findpost&p=1315831
-- *makeitem2 <item id>,<amount>,"<map name>",<X>,<Y>,<identify>,<refine>,<attribute>,<card1>,<card2>,<card3>,<card4>;
-- *makeitem2 "<item name>",<amount>,"<map name>",<X>,<Y>,<identify>,<refine>,<attribute>,<card1>,<card2>,<card3>,<card4>;
-- Credits for the script author(s) & contributor(s)
-- NOTE: I didn't make the documentation yet
* Follow up 3441d4a

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-02-08 16:34:55 +07:00
Euphy
957f49563a Added 'preg_match' script command to match regular expressions.
The command is only available if the PCRE library is installed.

Updated indefinite articles in Global_Functions with regex. (credits: Kaivosukeltaja/php-indefinite-article/863f1d5)

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-29 16:33:27 -05:00
Euphy
ad13f26fc2 'consumeitem' no longer requires npc_id to run. (bugreport:8563, credits: AnnieRuru)
Second part of the bug report is not yet fixed.
http://rathena.org/board/tracker/issue-8563-consumeitem-doesnt-work-if-the-npc-id-is-0-example-bonus-script/

Replaced a few 'consumeitem' commands in scripts that were broken.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-28 03:00:48 -05:00
Cydh Ramdh
03108701c0 Implemented suggestion "Script Command to block commands" http://rathena.org/board/topic/88888-script-command-to-block-commands/
-- Added new script commands: 'enable_command', 'disable_command'
-- Added new config 'atcommand_enable_npc' at conf/battle/gm.conf
-- Thank Kichi for the patch file

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-01-27 19:34:29 +07:00
Cydh Ramdh
69481e0583 Merge branch 'rathena/master' 2014-01-24 09:36:12 +07:00
Euphy
5d08795837 Implemented 2012 Headgear Quests.
Credits to @cydh for helping out with the quest bonus.
Follow-up 1a9b54: added missing SQL item_db entries.

Clarified description of "delayed consumption" item type (11) in item_db documentation. (tid:91187, thanks Annie!)

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-21 16:01:57 -05:00
Euphy
d569d288bd Added 'strcmp' script command.
Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-13 19:07:01 -05:00
Cydh Ramdh
d35ac5a601 * Initial release idRO Cash trader NPC. npc: npc/re/merchants/cash_trader-idRO.txt (disabled by default)
* Added some items following idRO Cash trader NPC (added on db/re/item_db.txt)
* Updated documentation on doc/script_command.txt and npc.c
* Follow up d4128ce

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-01-14 01:54:38 +07:00
Euphy
2f45d8c7ea Some minor edits.
Follow-up c0e87af: changed file encoding.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-12 17:39:43 -05:00
Euphy
90b187ff3e Changed all "Compatible With" fields to "rAthena Project".
Edited a handful separately, as appropriate.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-12 16:24:38 -05:00
Euphy
b2d96cbc7f Implemented Kagerou/Oboro job change quest.
Uses official script structure, with iRO dialogue taken from M45T3Ryu/KO-Proyect@d78f847.

Added Kagerou/Oboro support to other Ninja-related files.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-11 22:37:36 -05:00
Euphy
a3dbbe21ce Added script command 'isbeginquest'.
Aegis has been using this command instead of 'checkquest(id,HASQUEST)' for years, so we will no longer be writing workarounds for it.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-11 09:45:32 -05:00
Cydh Ramdh
e2e71c73cc Merge branch 'rathena/master' 2014-01-02 20:01:17 +07:00
Cydh Ramdh
12007fef7e * Follow ups of:
-- 51074a0: Moved the 'group' check when make 'must' item also as random item
-- 96443cd: Leftover, fixed @allstats issue
-- 7083ecf: 7083ecf079 (commitcomment-4952745)
-- 744195a
* Added 'get_githash' script command.
* Fixed overflowed parameters calculation will gives 32767 stat effect instead 1 (ex. overflowed LUK will gives crit 32767)

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-30 20:03:21 +07:00
Cydh Ramdh
be05bc399b *Added 'status_icon' param for *bonus_script script, thank QQfoolsorellina for the suggestion (https://github.com/rathena/rathena/commit/99098c1#commitcomment-4558795)
--> bonus_script "<script code>",<duration>{,<flag>{,<type>{,<status_icon>{,<char_id>}}}};
* Please update your sql database (main database) with upgrade_20131227.sql

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-27 18:17:41 +07:00
Cydh Ramdh
1fd10b13da Merge branch 'rathena/master'
Conflicts:
	src/map/script.c
2013-12-26 13:34:07 +07:00
Cydh Ramdh
51074a0637 Added some official item packages!
- Added db/re/item_package.txt, imported file for item_group_db.txt
- Added doc/item_group.txt for more details about item group
- Added new IG_ids on db/const.txt, up to 300 additions
- Added 'getgroupitem' script command to get item from specified item group (see doc/script_commands.txt)
- Modified 'grouprandomitem', added an optional parameter: 'sub_group' (see doc/script_commands.txt)
- Modified 'getrandgroupitem', added an optional parameter: 'sub_group' (see doc/script_commands.txt)
- Updated db/re/item_db.txt
- Updated sql-files/item_db_re.sql, so for MySQL user, please udate your item db
NOTE:
- I ocmmented some lines because some items aren't exist yet on rAthena db (or maybe have different name?)
- For pre-re, maybe I can do it later, or will someone do it?
- If there's something I forget to tell you, it's habit

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-23 23:37:27 +07:00
Cydh Ramdh
701a0580d2 Merge branch 'rathena/master' 2013-12-09 12:20:19 +07:00
Cydh Ramdh
c88b77f5fd Fixed cell_basilica which gave nothing. Only works only for player
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-08 14:21:16 +07:00
Cydh Ramdh
b40da76736 * Fixed addspiritball script command
* Fixed delspiritball script command
* Add some documentaion for pc_addspiritball and pc_delspiritball

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-04 02:45:10 +07:00
Cydh Ramdh
8f6b4b4bb0 * Some little follow up of addspiritball, delspiritball, & countspiritball
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-04 02:06:53 +07:00
Cahyadi Ramadhan Togihon
a7396c7998 Added some script commands: addspiritball, delspiritball, and countspiritball
Signed-off-by: Cahyadi Ramadhan Togihon <house.bad@gmail.com>
2013-12-04 01:11:03 +07:00
Cahyadi Ramadhan Togihon
1ce4dbf107 Follow up 32fd3ee:
- Added config 'discount_item_point_shop' to decide item/point shop is discountable or not. (see conf/misc.conf), thx http://rathena.org/board/tracker/issue-8298-itemshop-and-pointshop/
- (for advanced use) Added optional discount flag for item/point shop. (see doc/script_commands.txt)
--> -%TAB%itemshop%TAB%<NPC Name>%TAB%<sprite id>,<costitemid>{:<discount>},<itemid>:<price>{,<itemid>:<price>...}
--> -%TAB%pointshop%TAB%<NPC Name>%TAB%<sprite id>,<costvariable>{:<discount>},<itemid>:<price>{,<itemid>:<price>...}

Signed-off-by: Cahyadi Ramadhan Togihon <house.bad@gmail.com>
2013-12-01 13:17:50 +07:00
Cahyadi Ramadhan Togihon
32fd3ee303 Initial release of 'itemshop' and 'pointshop'
-- Suggestion: http://rathena.org/board/topic/84169-specialty-shops/
-- Credits: Aleos & Akinari for first diff file that I used to finish this and testing/debugging (well, I don't know the original ones, just tell us or just do pull request if you know the first creator.)
-- How to use?
---> -%TAB%itemshop%TAB%<NPC Name>%TAB%<sprite id>,<costitemid>,<itemid>:<price>{,<itemid>:<price>...}
---> -%TAB%pointshop%TAB%<NPC Name>%TAB%<sprite id>,<costvariable>,<itemid>:<price>{,<itemid>:<price>...}

Signed-off-by: Cahyadi Ramadhan Togihon <house.bad@gmail.com>
2013-12-01 00:33:22 +07:00
lighta
65d270ce0a Doc and Tools update
Replace check-doc (shell) by perl equivalent and update it.
Now checking custom folder and restricted atcm, also check for unmatch
command in documentation as requested before.
Update documentation to match sources.
Update config.pl replace svn install by git.
2013-11-26 00:00:11 -05:00
Euphy
d2ee0dd55f * Implemented VIP system in many official scripts.
- VIP players gain two more badges after Battleground matches.
- VIP players pay ten times less for transportation to Brasilis and Dewata.
- VIP players get free buffs and mercenary rentals in the Eden Group Headquarters. (iRO only, disabled)
- Non-VIP players must use a Reset Stone to begin the third job quests.
- Non-VIP players must have a Marriage Covenant to get married.
- Non-VIP players pay double for Kafra and Cool Event Corp. Teleport Services.
- Non-VIP players pay considerably more for refining equipment.
- Non-VIP players gain less quest reward items in Port Malaya quests.
- Non-VIP players gain less EXP rewards in Brasilis quests.
- Non-VIP players cannot access all towns in Acolyte Warpers script. (iRO only, disabled)
- A Reset Stone is required for Bossnia entry.
Note that official servers run different VIP/premium systems; the changes above are based on euRO, unless otherwise stated.

* Other script changes:
- Adding Marriage Covenant item in marriage script.
- Fixed some EXP values in Brasilis quests.
- Minor updates to Kafra functions.
- Turned Cool Event Corp. scripts into a basic function.
- Turned Battleground badge rewards into basic functions.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2013-11-18 23:54:17 -05:00
Lilith-
bd2503e279 Added Shadow Equipment System support (item type 12) 2013-11-14 16:37:03 -08:00