1305 Commits

Author SHA1 Message Date
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
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
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
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
007b88f2bb Added "Merry Badger" NPC to iRO Eden, and other tweaks. (credits: @SkittleNugget, pull #44)
Follow-up 957f495: 'preg_match' will still be compiled for users with PCRE disabled. (tid:92024)

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-31 03:11:18 -05: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
Cydh Ramdh
0ef4047306 Follow up fd063a8 bugreport:8576. Added sc check itself before using sc->data[SC_ALL_RIDING], http://rathena.org/board/tracker/issue-8576-loyal-pets-causing-map-server-to-crash/
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-01-29 20:28:36 +07:00
Lilith
fd063a8e2d * Merged from 3CeAM r689 & r690
- Removed OPTION_MOUNTING
 - Added SC_ALL_RIDING
 - Added new option in battle/player.conf for changing speed of players when mounted: 'rental_mount_speed_boost'
2014-01-28 07:41:06 -08: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
aleos89
c1871e91dc Bug Fixes
* Fixed Arm Cannon target type to be ground. (bugreport:8496)
* Fixed Rampage Blaster damage formula. (bugreport:8480)
* Fixed Lightning Walk spirit sphere cost requirement. (bugreport:8474)
* Fixed Deadly Infect to not pass Guillotine Cross poisons to MVPs. (bugreport:8505)
* Fixed Gentle Touch - Cure HP recovery formula. (bugreport:8511)
* Fixed Tiger Cannon taking more HP and SP than it should. (bugreport:8538)
* Fixed Voice of Siren duration time. (bugreport:8382)
* Fixed script command sscanf to return -1 when a string is empty. Thanks to AnnieRuru. (bugreport:8562)
* Fixed VIP bonus experience being included in a monster's death when a Non-VIP kills the monster.
2014-01-27 09:56:16 -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
31d97129f8 * Added @showrate to disable/enable the message of rate information when VIP is enabled. (Someone mention about this, I think the message has posibility will be annoying).
* Added 'vip_disp_rate' at player.conf to set the message of rate information is displayed or not by default.
* Added 'disp_serverbank_msg' at misc.conf to hide "login-serv has been asked to %s the player '%.*s'." message.
* Updated map_msg.conf and map_msg_idn.conf

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-01-25 21:44:36 +07:00
Cydh Ramdh
69481e0583 Merge branch 'rathena/master' 2014-01-24 09:36:12 +07:00
lighta
8115dc048a Checkweight
-Fix bugreport:8503 (chkweight uint16 limitation on weight thx to
AnnieRuru)
-Add this testcase on npc_test_checkweight.txt and move it to npec/tests
folder.
2014-01-23 12:36:52 -05:00
aleos89
b818c78f1d Added Oktoberfest costume.
- Requires client version 20131218 or newer.
2014-01-21 11:26:59 -05:00
Euphy
d569d288bd Added 'strcmp' script command.
Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-01-13 19:07:01 -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
f46a7920e2 * Added warning message when addtimer script is failed, as bugreport:8459 http://rathena.org/board/tracker/issue-8459-addtimer-command-should-report-an-error-if-it-hits-max-eventtimer/
* Follow up 0f7ecd0, 308ee6c, 1f29f50
* Little source documentation updated on script.c

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-01-11 16:10:22 +07:00
Cydh Ramdh
e2e71c73cc Merge branch 'rathena/master' 2014-01-02 20:01:17 +07:00
lighta
b695ab3f41 Fix compilation issue
Follow up dae81222 (AEGIS class system) fix out of bound issue for
array.
(didn't check the x_ALL option system yet)
Follow up 7a9aa7fb Fix possible mapcrash due to offline player
Follow up 12007fef Fix some invalide string check and remove the
reverted sqlfiles
2013-12-30 15:21:25 -05:00
Cydh Ramdh
e18bf43547 * Revert this 487f84e, please import upgrade_20131231.sql. Thank Lemongrass3110 and Toshiro90
* Follow up 7a9aa7f, enum errors
* Follow up 12007fe, function return type error
* Follow up dae8122, 'skill' to 'skill_learnlv'?

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-31 01:52:14 +07:00
aleos89
7a9aa7fbcf Bugfixes
* Fixed WE_MALE and WE_FEMALE up to You to not consume HP/SP when it's below 10%. (bugreport:3546)
* Fixed WE_CALLPARTNER, WE_CALLPARENT, and WE_CALLBABY to not recall target if they are autotrading. (bugreport:2479)
* Fixed WE_BABY not checking for parents if they are in the same party and in the area. (bugreport:2518)
* Fixed Dragon Breath - Water not requiring a dragon. (bugreport:8237)
* Added a new config 'char_del_option' to set whether email or birthdate should be used for deleting characters. (bugreport:8240)
* Follow up to 9a5a6b9. Fixed a missing define check for 2013 clients when deleting a character. (bugreport:8399)
* Fixed Weapon Refining to use clif_upgrademessage. (bugreport:2135)
* Fixed script command 'prompt' not ending script state when player selects Cancel from menu. (bugreport:7932)
* Fixed nomineeffect display on GvG enabled maps. (bugreport:7754)
Others
* All items, except for Cash items, can no longer be used when storage is open.
* Defined constants for a lot of item and monster IDs used throughout the source.
* Follow up to 0f2dd7f. Corrected a change to the wrong hostname array.
2013-12-30 13:20:33 -05:00
Lilith
dae81222a8 * Added AEGIS 'CLASS_' enum
- Removed RC_BOSS, RC_NONBOSS, RC_NONDEMIHUMAN.
 - Added CLASS_NORMAL, CLASS_BOSS, CLASS_GUARDIAN enum.
 - Added CLASS_ALL, RC_ALL, ELE_ALL, SZ_ALL.
 - Item bonuses 'bAddDefClass' and 'bAddMdefClass' replaced by 'bAddDefMonster' and 'bAddMdefMonster'.
 - Item bonuses 'bIgnoreMdefRate' and 'bIgnoreDefRate' replaced by 'bIgnoreMdefRaceRate' and 'bIgnoreDefRaceRate'.
 - Added new item bonuses: bIgnoreDefClass, bIgnoreMdefRaceRate, bDefRatioAtkClass, bAddClass, bSubClass, bMagicAddClass, bWeaponComaClass, bHpDrainValueClass, bSpDrainValueClass, bIgnoreMdefClassRate.
 - Updated doc/item_bonus.txt
 - Updated db/re/level_penalty.txt & 'pc_level_penalty_mod' function.
 - Updated 'battle_calc_cardfix' function.
 - 'md->class_' replaced by 'md->mob_id'
2013-12-30 08:46:24 -08: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
lighta
744195a931 Leak and Optimisation
Fix many typo and optimisation found by :
http://rathena.org/cppreport/index.html
Fix multiple unsafe scanf of string
Fix multiple battle wrong check (elemental bonus)
Fix camouflage defense reduction and cap expiato def reduction
Fix geoip leak
Upd few documentation in doxygen style
Fix path working directory issue to start servers
(now you won't need to be in maindir to launch server)
2013-12-30 02:05:34 -05: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
5ed0a5bf99 Merge branch 'rathena/master' 2013-12-20 11:17:25 +07:00
aleos89
0f2dd7fcf0 * Cleaned up a mercenary kill check. (bugreport:2222)
Bug Fixes
* Adjusted script commands that use script_isstring and script_isint to use script_getdata to dereference if variable is given. (bugreport:8198)
* Removed the hardcoded password so that users can pass blank passwords through the config for MySQL. (bugreport:7787)
* Increased the hostname array to account for longer hostnames. (bugreport:8003)
* Fixed the CashShop not listing items correctly. (bugreport:7585)
* Fixed Offertorium not consuming the correct amount of SP. (bugreport:8266)
* Cart Boost effect stays even if the cart is removed. Revert of change in r16339. (bugreport:5808)
2013-12-13 15:25:03 -05:00
Cydh Ramdh
423fa17075 wrong comment for 'countspiritball'
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-06 16:52:20 +07:00
Cydh Ramdh
84b5dbfb7e Merge branch 'rathena/master' 2013-12-06 16:46:00 +07:00
lighta
82b272f410 QuickFix for charban
Fixing charban causing segfault on charserv
Fixing charban wrong target
Fixing charban not able to ban unconnected char
Fixing charblock being sent before unban_time was filled
Reset unban_time to 0 when < now.
2013-12-04 23:42:10 -05: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
lighta
be4e7978d2 Follow up 02dda56 fix banking request when feature.banking
Fix UB on npc_shop (a || b && c)
Add $@mobid for script command wich will retain GID when creating monsters
2013-12-03 11:25:01 -05: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
6236b7dc6a Harmonizing script_command return value
--Fix bugreport:8249 (instance_announce)
Script command need to return SCRIPT_CMD_SUCCESS (0) otherwise they
display a ShowDebug.
Stating to harmonize return value for script_command to prevent issue
hapening again.
--Fix flood message "Transforming into monster"
2013-11-28 01:11:59 -05:00
lighta
4684090de9 InterPacket_rearrange
-Move charban and charunban packet out of 0x2b0e and mark that fonction
reserved for login request purpose.
(Charban and charunban now use 0x2b28 and 0x2b2a)
-Move chrif_savebankdata, chrif_datarequest, chrif_req_vipactive into
0x2b0e (as their some login operation request)
-Harmonize vip_time data type and fix some case where he would have get
INT_MAX value.
-Small revert on a3f0aedf @vip for vip_time alteration as the duration
should be able to get reduced.
-Fix vip_status(3) args of aFree 0x18E2777C is overflowed pointer
and incorect data returned, (altough dunno if we want this as returned
presentation string)
-fix bugreport:8289 where VIP_request anwser was broadcasted to all
mapserv
-Upd split_time month and year factor for a better approximation of
date. (splitting timestamp into years, month, days ...)
-Add loginif_isconnected to check if the loginserv is connected to char.
2013-11-28 00:21:41 -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
aleos89
30648216ec Initial release of VIP System.
By default system is disabled (src/config/core.h).
This follows the iRO implementation VIP System. More information can be found on the iRO Wiki.
All settings also have individual configs.
Official VIP scripts will be implemented later.
Big thanks to lighta and Cydh for support and debugging.
2013-11-18 15:21:51 -05:00
Lilith-
bd2503e279 Added Shadow Equipment System support (item type 12) 2013-11-14 16:37:03 -08:00
Cahyadi Ramadhan Togihon
9e8e3cfacc * Follow up to: 99098c1
-- 'bonus_script' is now by default will be store on 'bonus_script' table. CAUTION: Please import 'upgrade_20131111.sql' file or execute the query inside to make `bonus_script` table.
-- Updated bonus_script documentation following flag &8 (BONUS_FLAG_REM_ON_LOGOUT) behavior. By default, bonus_script will be stored when player logs out and will be continued when player logs in.

* And small changes.
2013-11-11 19:59:35 +07:00