9795 Commits

Author SHA1 Message Date
Cydh Ramdh
3ee970a0e0 * Renamed SI_CARTSBOOST for Genetic to SI_GN_CARTBOOST
* Fixed Crimson Marker icon that doesn't show when it's casted to mob

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-29 01:29:46 +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
lighta
90ced830a4 Eleanor Tinder combo
Fix Eleanor Tinder-CBC-EQC being broken since hash:a506c7f due to a
little requirement check typo.
2013-12-27 04:13:30 -05:00
lighta
4212080bd9 Storagelist fix
Follow up hash:0f2dd7f (adding support to map<=>client to allow longer
storagelist)
Fix most of : [Error]: WFIFOSET: Maximum write buffer size for client
connection 7 exceeded, most likely caused by packet 0x0996 (len=11932,
ip=127.0.140733193388032.1). Still remain some if you openup the list
like 5time/s, see tid:90541
2013-12-26 04:13:32 -05:00
Cydh Ramdh
1fd10b13da Merge branch 'rathena/master'
Conflicts:
	src/map/script.c
2013-12-26 13:34:07 +07:00
Cydh Ramdh
6ccc9757f2 Follow up 2211ea1
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-25 12:28:08 +07:00
Cydh Ramdh
716de547dc Added newline at end of file, http://rathena.org/board/tracker/issue-8380-warnings-warnings/
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-25 12:17:48 +07:00
Cydh Ramdh
2211ea156a * Follow up 51074a0, 2bf2216, 432cdb7
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-25 12:13:02 +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
74740b4491 * Follow up 9cca188, change enum of IT_WEAPON and IT_ARMOR on src files
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-23 11:07:49 +07:00
lighta
00e63be81c Upd Documentation
Update some src documentation for doxygen
Fix typo in [hash:9cca188] in clif, making it uncompilable
2013-12-21 04:41:11 -05:00
lighta
9cca188908 Itemtype
Fix itemtype IT_ARMOR and IT_WEAPON being inverted, bugreport:8180
please run tools/convert_itemtype.pl to update your dbs.
Upd athena-start having some issue for some os.
Fix a typo on DC_SERVICEFORYOU for val1 assignment.
2013-12-21 01:02:41 -05:00
Cydh Ramdh
e6b0acfb9d Follow up 4ec6925, thx lighta
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-21 11:57:46 +07:00
Cydh Ramdh
4ec69254c3 * Updated Dancer skill's effect: Service For You / Gypsy's Kiss, according to http://irowiki.org/wiki/Gypsy%27s_Kiss
* Fixed bugreport:8363, http://rathena.org/board/tracker/issue-8363-identify/

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-20 16:35:06 +07:00
lighta
3b5e527c7f Vip_followup
Fix bugreport:8301 were groupid wasn't keeping in vip state at new
logon.
Fix groupid wasn't reload without logout when we wasn't vip anymore
Fix decreasing vip_time scenario
Add a timer so vip_member doesn't keep status until they logout.
2013-12-20 02:01:51 -05:00
Cydh Ramdh
5ed0a5bf99 Merge branch 'rathena/master' 2013-12-20 11:17:25 +07:00
lighta
854f8fc502 Quickfix
Follow up hash:0f2dd7fcf, fixed a typo on packet lenght for storagelist
this should fix bugreport:8344
Hotfix for bugreport:8333, (we're now checking if we fully add object on
map before attempting to spawn it)
2013-12-19 18:27:01 -05:00
Cydh Ramdh
432cdb7686 Implemented 'devotion_rdamage' on conf/battle/skill.conf for suggestion on http://rathena.org/board/topic/78620-renewal-devotion/
// Using 'old' behavior for devotion vs reflect damage? (Note 2)
// Default is 0 (official). If 'devotion_rdamage' is > 0 (chance to devot the reflected damage),
// when player with devotion attacks player with reflect damage ability (item bonus or skill),
// the damage will be taken by the person who provides devotion instead the attacker.
devotion_rdamage: 0

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-19 12:59:26 +07:00
Lilith-
a29aace9c5 Follow up bd2503e,7355677 and fef6307. Merged Hercules e115c30 2013-12-16 06:46:21 -08:00
Lilith-
54dfc67925 * Fixed bug http://rathena.org/board/tracker/issue-8330-secure-npctimeout-bug-for-those-npc-who-have-no-dialog-window/
Merged Hercules adc2e6e
2013-12-16 05:04:52 -08:00
exneval
7f6afa84b0 *Fix bugreport http://rathena.org/board/tracker/issue-8107-dual-wield-problem/ 2013-12-14 14:20:19 +07:00
exneval
fc763367db *Fix bugreport http://rathena.org/board/tracker/issue-8332-npc-dark-breath/ 2013-12-14 14:13:01 +07:00
exneval
bc9eff5b0c Merge branch 'master' of github.com:rathena/rathena 2013-12-14 13:42:26 +07:00
exneval
43c21ad667 *Fix bugreport http://rathena.org/board/tracker/issue-8337-all-hidecloaking-skills-in-pvpduelwoe/ 2013-12-14 13:40:23 +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
42811c9869 Merge remote-tracking branch 'rathena/master' 2013-12-11 23:16:10 +07:00
Cydh Ramdh
fba3ed9e3e * Added items from http://forums.irowiki.org/showpost.php?p=1360597&postcount=448 (Thank Lilith)
* Added items from http://forums.irowiki.org/showpost.php?p=1367371&postcount=636 (Thank Lilith)
* Fixed some typos

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-11 23:10:01 +07:00
Cydh Ramdh
701a0580d2 Merge branch 'rathena/master' 2013-12-09 12:20:19 +07:00
Cydh Ramdh
3029d3bbc4 * Fxied Telekinesis Intense buff duration (thx Akuma)
* Fixed Earth Strain divest chance (part of rebalancing formula)

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-08 16:27:28 +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
7107cc7ce9 * Fixed succes rate of Dark Crow
* Fixed damage rate bonus of Telekinesis Intense

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-07 14:28:37 +07: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
4f2c1d4eb3 Fix charban, align to Herc model,
Add a timered function to refresh block data if you still on charselection waiting for unban (prevent deco reco for refresh)
Fix char_charlist_notify (0x9a0) counting page. The previous was quite an ugly estimate.
2013-12-06 03:36:51 -05:00
Cydh Ramdh
ffa4273475 Fixed bugreport http://rathena.org/board/tracker/issue-8311-latest-update-commit-broken/ (Just a little leftover)
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-05 16:23:11 +07:00
Cydh Ramdh
02d44bf822 Update 'RequirementRemoved' field on 'skill_copyable_db.txt', following 'RequiredEquipment' field on skill_require_db.txt
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-05 13:47:27 +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
77b2ff8df6 * Fixed bugreport http://rathena.org/board/tracker/issue-8309-map-server-crash/
* Fixed bugreport http://rathena.org/board/tracker/issue-8307-error-in-map-server-in-latest-update/

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-05 11:16:40 +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
98949d5355 * Follow up b307531, updating item_db_re.sql
* Follow up 2524c69, compile problem on MSVS compiler

Signed-off-by: Cahyadi Ramadhan Togihon <house.bad@gmail.com>
2013-12-04 00:55:52 +07:00
lighta
2524c69465 Fix item_combo who wasn't checking for different index in case of same item required for combo (e.g 2890:2890,{ bonus bAgi,10; }) 2013-12-03 12:22:00 -05: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
02dda56913 * Fixed bug report http://rathena.org/board/tracker/issue-8296-bank-system-is-off-but-its-messages-are-not/
* Updated conf/map_msg_idn.conf

Signed-off-by: Cahyadi Ramadhan Togihon <house.bad@gmail.com>
2013-12-02 11:46:47 +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
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
Cahyadi Ramadhan Togihon
a3f0aedf53 * Follow up 3064821: Attempt show EXP, Drop, & Death Penalty info (clif_display_pinfo) if VIP_ENABLE. NOTE, still need correct behavior/values for each rate details.
* Updated map_msg_idn.conf

Signed-off-by: Cahyadi Ramadhan Togihon <house.bad@gmail.com>
2013-11-26 21:01:13 +07:00