11615 Commits

Author SHA1 Message Date
Cydh Ramdh
701a0580d2 Merge branch 'rathena/master' 2013-12-09 12:20:19 +07:00
lighta
8ce56465ad Update athena-start thx to <Talaysen> for reminding
Fix log directory check/creation
Fix watch option
Add help command to know how to use the script and explain a bit
2013-12-08 18:03:52 -05: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
lighta
ea925a05b1 Update check-doc to allow only listing, (for IDE that require functions for markup langage)
Add option for extra documentation file inc_scrtf and inc_atcf (for people who have their customs documented in other file, wich is probably best to avoid conflicts)
2013-12-07 18:03:03 -05: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
c54f35dad0 Just a little follow up of d3f6236
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-07 03:20:28 +07:00
Cydh Ramdh
d3f623613e Merge pull request #19 from nanakiwurtz/master
More new items. Related-post: http://rathena.org/board/topic/90115-item-db-help/
2013-12-06 09:42:51 -08:00
nanakiwurtz
c8f3ddeb4d Removed extra space 2013-12-06 23:50:11 +07:00
nanakiwurtz
fc37599a25 More items.
Source: http://forums.irowiki.org/showpost.php?p=1356728&postcount=365

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2013-12-06 23:15:13 +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
edaddfd02d Rebellion update. Merged Hercules 19758ee
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2013-12-06 13:01:55 +07: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
nanakiwurtz
4de5b23e8d Reapplied Rekiem's SC effect for 11551-11554.
Refference: https://github.com/rathena/rathena/commit/b307531

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2013-12-05 12:56:44 +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
nanakiwurtz
cd23da990a * Add new items.
Source: http://forums.irowiki.org/showpost.php?p=1366277&postcount=624
* Added 'Accessory' as Item Type 5 in /doc/item_db.txt

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2013-12-05 02:30:11 +07:00
nanakiwurtz
3e2536b09d Add new items.
Source: http://forums.irowiki.org/showpost.php?p=1360597&postcount=448

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2013-12-05 00:57:34 +07:00
nanakiwurtz
d60230f495 New items added.
Source: http://forums.irowiki.org/showpost.php?p=1364909&postcount=585

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2013-12-05 00:25:25 +07:00
nanakiwurtz
526bdfa416 New items added.
Source: http://forums.irowiki.org/showpost.php?p=1364909&postcount=585

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com> (reverted from commit de12054bdbc7ca2f24f3373ff0b4f57a05ad1564)
2013-12-05 00:25:24 +07:00
Cahyadi Ramadhan Togihon
f18548aef7 * 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-05 00:25:24 +07:00
lighta
78a4782abb 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-05 00:25:24 +07:00
Cydh Ramdh
2755164385 Merge pull request #18 from nanakiwurtz/master
New items added.
Source: http://forums.irowiki.org/showpost.php?p=1364909&postcount=585
2013-12-03 11:48:56 -08: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
nanakiwurtz
3db1a6a80d New items added.
Source: http://forums.irowiki.org/showpost.php?p=1364909&postcount=585

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2013-12-04 01:58:22 +07:00
nanakiwurtz
993fa35dd0 New items added.
Source: http://forums.irowiki.org/showpost.php?p=1364909&postcount=585

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com> (reverted from commit de12054bdbc7ca2f24f3373ff0b4f57a05ad1564)
2013-12-04 01:55:01 +07:00
Cahyadi Ramadhan Togihon
c4890a4984 * 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 01:52:23 +07:00
lighta
fa47d0c2f3 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-04 01:52:23 +07:00
nanakiwurtz
9c5bf1f241 New items added.
Source: http://forums.irowiki.org/showpost.php?p=1364909&postcount=585

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2013-12-04 01:26:23 +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
nanakiwurtz
273e919bed New items added.
Source: http://forums.irowiki.org/showpost.php?p=1364909&postcount=585

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2013-12-04 00:45:41 +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
Cydh Ramdh
563090b009 Merge pull request #16 from Rekiem/patch-1
Update item_db.txt
2013-12-03 07:49:57 -08:00
Rekiem
b3075319ea Update item_db.txt
Hello I would like them to add the following buff these items
based in kRo
11551,Savory_Herb_Salad sc_start SC_STRFOOD,180000,1;
3분동안 STR + 1.

11552,Apple_Carrot_Salad sc_start SC_AGIFOOD,180000,1;
3분동안 AGI + 1.

11553,Casual_Stew sc_start SC_VITFOOD,180000,1;
3분동안 VIT + 1.

11554,Golden_Roasted_Apple sc_start SC_DEXFOOD,180000,1;
3분동안 DEX + 1.

thx
2013-12-03 00:43:37 -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
1d485ca934 Tools again
--Upd doxygen version_number to github link, for easier comparaison
--Fix convert_sql calling case, now doesn't care from where perl script
is called.
2013-11-28 02:44:52 -05: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
lighta
3132262791 Upd build_doc
Fix small newline typo.
Add option argument in script.
Prevent rebuilding by default if git is unchanged.
see build_doc --help for available option
2013-11-27 21:27:39 -05:00
lighta
ec91269ff4 Tools follow up
check-doc.pl :
 add result message when no issues is found
config.pl :
 update centos enable coredump setup
2013-11-26 23:06:01 -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
lighta
2ddf95230b Merge branch 'master' of github.com:rathena/rathena 2013-11-26 00:00:25 -05:00