1281 Commits

Author SHA1 Message Date
Cydh Ramdh
5ed0a5bf99 Merge branch 'rathena/master' 2013-12-20 11:17:25 +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
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
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
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
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
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
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
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
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
Cahyadi Ramadhan Togihon
f17a385f86 * Fixed some memleaks because of bonus_script and sd->combos.pair
* Updated 'doc/item_db.txt' following bd2503e

Signed-off-by: Cahyadi Ramadhan Togihon <house.bad@gmail.com>
2013-11-17 00:32:00 +07:00
Akinari1087
a200e3a2a8 Revert a memleak fix in a506c7f 2013-11-15 03:04:10 -07:00
Lilith-
bd2503e279 Added Shadow Equipment System support (item type 12) 2013-11-14 16:37:03 -08:00
lighta
1c5a53f25e Add doxygen conf
Adding doxyconf as rA default conf for doxygen and for people if they
wish to build their doc.
Adding tools/build_doc to check app for building doc and to update
version number in documentation.
Fix few typo in src
2013-11-14 14:31:47 -05:00
Akinari1087
a506c7fc0e Follow up to 4d61cc0
Revert SONIC_CRAW consuming spheres.  My mistake
Update Eleanor skill damage formulas and spirit sphere consume requirements based on WarpPortal and iROWiki forums

Fixed most channel memory leaks - http://rathena.org/board/tracker/issue-8044-memory-leak-revision-17486-causes-players-to-disconnect/
Fixed memory leak caused by item combos breaking out of a loop without freeing
2013-11-12 10:36:40 -07:00
Akinari1087
2e21c39c9b Added bonus2 bHPVanishRate for Vellum weapons - http://rathena.org/board/tracker/issue-7968-vellum-weapons/ 2013-11-11 07:03:39 -07: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
Cahyadi Ramadhan Togihon
75af62845b * Fixed bugreport http://rathena.org/board/tracker/issue-8226-pcc-warning/
Signed-off-by: Cahyadi Ramadhan Togihon <house.bad@gmail.com>
2013-11-11 16:10:50 +07:00
Cahyadi Ramadhan Togihon
99098c19bc Added new script_command for 'timed bonus/script' idea: http://rathena.org/board/topic/72463-suggest-to-add-a-script-command-run-item-script-inside-npc-script/
-- bonus_script "<script code>",<duration>{,<flag>{,<type>{,<char_id>}}};
-- see 'doc/script_commands.txt' for more details.
-- Thank everyone who discussed it

Signed-off-by: Cahyadi Ramadhan Togihon <house.bad@gmail.com>
2013-11-10 00:49:13 +07:00
Cahyadi Ramadhan Togihon
e0397a6e34 Fixed @version issue
Signed-off-by: Cahyadi Ramadhan Togihon <house.bad@gmail.com>
2013-11-08 16:40:36 +07:00
lighta
cdb2e8ad33 Merge branch 'master' of https://github.com/rathena/rathena into banking
Manually resolve Conflicts:
	conf/msg_conf/map_msg.conf
	db/packet_db.txt
	src/common/mmo.h
	src/map/pc.c
	src/map/pc.h
2013-11-05 13:56:56 -05:00
lighta
1290826be2 Adding banking support 2013-11-05 13:41:42 -05:00
Cahyadi Ramadhan Togihon
507f047cfb Rebellion Skills are added!
** Some attempts to support this job with its skills (as usable as good as I can, some of them are custom from limited info, maybe I miss some behaviors)
** Maybe some formulas, entries on skill_db, skill_require_db, skill_unit_db, and skill_cast_db are still custom
** Thank posters are on: (1) http://rathena.org/board/topic/85195-rebellion-class-released-on-kro-sakray/ (2) http://forums.irowiki.org/showthread.php?t=100131
** Some notes:
--> RL_RICHS_COIN, Rich's Coin
--> RL_MASS_SPIRAL, Mass Spiral: Bleeding chance and additional damage still custom formula
--> RL_BANISHING_BUSTER,Banishing Buster: Custom chance formula to remove buff/debuff
--> RL_B_TRAP,Bind Trap: Even I updated my client and use original lua, I stil can't see the trap
--> RL_FLICKER,Flicker
--> RL_S_STORM,Shatter Storm: Custom formula for success rate
--> RL_E_CHAIN,Eternal Chain
--> RL_QD_SHOT,Quick Draw Shot
--> RL_C_MARKER,Crimson Marker: Still doesn't show the icon of marked target on minimap (I don't know the packet for it)
--> RL_FIREDANCE,Fire Dance: Not sure it's only 1 hit damage or works like Desperado (I saw someone's screenshot, it seem only deals 1 hit)
--> RL_H_MINE,Howling Mine
--> RL_P_ALTER,Platinum Alter
--> RL_FALLEN_ANGEL,Fallen Angel
--> RL_R_TRIP,Round Trip
--> RL_FIRE_RAIN,Fire Rain: (1) This should able to remove ground target aroung its area, (2) And the splash area like a 'cone' (I imagined like someone uses gun then fire brutally to his/her front way)
--> RL_HEAT_BARREL,Heat Barrel: Still custom formula, but I saw the damage is increased highly.
--> RL_AM_BLAST,Anti-Material Blast: Custom formula for success chance
--> RL_SLUGSHOT,Slug Shot: Custom formula for damage (I saw someone's screenshot, bullet with 120 weight can deals 100k damage)
--> RL_HAMMER_OF_GOD,Hammer of God: If there is no enemy with SC_C_MARKER around the area, the skill Hammer of God animation won't displayed (maybe I missed something? I guess so)
(I guess some lines and algorithm should be cleaner, cooler, and sexier. :P)

IMPORTANT for client side:
- You should have up-to-date grf files
- I used original lua files, I didn't use translated lua files that exist nowadays because I think they need to update their supports for Rebellion
- Some items for Rebellion Skill's requirement(s) aren't added yet

Signed-off-by: Cahyadi Ramadhan Togihon <house.bad@gmail.com>
2013-11-05 02:34:32 +07:00
aleos89
cdccf88376 Improved item_check to remove unavailable items from inventory, cart, and storage on character login. (tid:81548) 2013-11-04 13:07:57 -05:00
Akinari1087
f0566292bb Added support for Rebellion class (no skills) - Credits to Hercules, Sanasol, Cydh
Packets update for banking and 2013-08-07 - Credits to Shakto
Fixed a problem where players could use items in Invisibility
2013-10-27 12:58:24 -07:00
Akinari1087
af108b20c4 Added HP_SP_TABLES option in core.h which allows you to bypass the job HP and SP tables - http://rathena.org/board/tracker/issue-8015-hp-sp-bugs-exp/
The long range attack rate bonus now effects damage, rather than ATK - http://rathena.org/board/tracker/issue-8109-long-range-attack-rate/
Fixed SP cost on Invisibility and removed time limit - http://rathena.org/board/tracker/issue-8102-invisibility/
Fixed some warnings that popped up recently - http://rathena.org/board/tracker/issue-8145-warning-in-skillc
Some small changes for the double casted skills - http://rathena.org/board/tracker/issue-7382-aoe-bug-sometimes-it-hits-more-than-one/
Cleaned up some Masquerade Unlucky unused code
2013-10-16 18:49:22 -07:00
aleos89
a487746b63 Added atcommand '@autoloottype' - Suggestion tid:87014. 2013-10-16 11:06:18 -04:00
lighta
06c8b21ace Follow up of skillcooldown
-Fix skillcooldown mistmatch
-Add safecheck for variance atk calc
2013-10-13 01:21:06 -04:00
lighta
c70762a18f ReqItems and Various Fixs
-Add requiered equiped item to cast in skill_require_db.
-Fix SC_ASH not always giving 50% chance failing, wrong emplacement
-Fix SC_STYLE_CHANGE not being relaunch when eleanor resurected.
-Fix cardfix for target not being reseted and therefor using same value
as caster.
-Move ADJUST_SKILL_DAMAGE in battle_calc_weapon_final_atk_modifiers
(since it shuold alter the final dammage just like it do for magic and
misc)
-Add battle_do_reflect and skill_do_copy small function to encapsulate
code.
-Upd channel_clean and channel_delete to simplify autodelete case for
public chans
-Fix SC_FEINTBOMB that had a fixed blewcount and not 3*skilllv
-Fix SC_VACUUM_EXTREME where some scenario was setting scs_nomove to -1
and therefor blocking char forever.
-Fix SC_STRIKING where val1 was overwritten for sp cast but also used as
skilllv for critical bonus...
-Upd SC_GN_CARTBOOST, should be ending be DECREASE_AGI
-Upd SC_MAGNETICFIELD should be endend when getting earth dmg or
quagmire
-Mv SC_WARMER, SC_WHITEIMPRISON, SC_FREEZING ending other status section
in proper area.
2013-10-08 17:34:03 -04:00
lighta
69b28292cf Skill_colldown
Move skillcooldown from ram saving to sql saving.
This will fix multimap skillcooldown and avoind increasing ram by
offline users.
2013-10-08 16:54:03 -04:00
Cahyadi Ramadhan Togihon
5e6626e312 Plagiarism & Reproduce updates:
-- Fixed bugreport:6994, Preseve only prevent to copy skill via Plagiarism, player still able to copy skill by Reproduce
-- Re-structure db/skill_reproduce_db.txt becomes db/skill_copyable_db.txt that allow you customize the avaiable skill to be copied
-- Removed 'copyskill_restrict' config from conf/battle/skill.conf, this setting can be set on db/skill_reproduce_db.txt
-- Enjoy structure of skill_copyable_db.txt! SkillName,Option{,JobAllowed{,RequirementRemoved}}
2013-09-23 12:11:30 +07:00
Cahyadi Ramadhan Togihon
f3bb5d4c73 * Fixed bugreport:7844 (merged from Hercules:e3761a8) 2013-09-16 01:04:57 +07:00
Cahyadi Ramadhan Togihon
feca970d8a * Added 'RequireStatuses' field on skill_require_db.txt
- This field value uses SC_STATUS (see db/const.txt)
- You may custom add more than 1 status required, example: SC_SIGHT:SC_ENERGYCOAT
- Removed some ST_ for 'e_require_state' list and move the value from 'RequireState' to 'RequireStatuses' field:
-- ST_HIDING -> SC_HIDING
-- ST_CLOAKING -> SC_CLOAKING
-- ST_CART ->SC_PUSH_CART
-- ST_SIGHT -> SC_SIGHT
-- ST_EXPLOSIONSPIRITS ->SC_EXPLOSIONSPIRITS
-- ST_CARTBOOST -> SC_CARTBOOST
-- ST_POISONINGWEAPON -> SC_POISONINGWEAPON
-- ST_ROLLINGCUTTER -> SC_ROLLINGCUTTER
* Fixed bugreport:8053, restricted equip should be put-off when player warped to restricted map (of the equip) if 'allow_equip_restricted_item' is 'no'
* Corrected db/const.txt value
- Added mf_skill_damage
- Sync some SC_STATUS with 'sc_type' on status.h
2013-09-07 20:07:00 +07:00
Cahyadi Ramadhan Togihon
7d72060430 * Follow-up 15074d8
- Fix item restriction check that should only prevent the item script. ATK, DEF, and MATK for RE should be calculated (Thank Euphy)
- Added item restriction check for combo items
- Added some missing item restriction checks
2013-09-04 12:17:20 +07:00
Cahyadi Ramadhan Togihon
cd9a776f23 *Added Skill Damage Adjustment!
- Disabled by default on src/config/core.h. Uncomment '#define ADJUST_SKILL_DAMAGE' to enable this skill damage adjustment
- Added skill_damage_db.txt (thank Lilith for 'Manage Skill Damage')
- Added new mapflag: 'skill_damage'. Please read 'doc/mapflags.txt' for more details
*Fixed bugreport:8029 (thank exneval for testing and reporting) (Akinari)
*Follow-up 647f99f (Akinari)
*Follow-up 15074d8: optimized item_isNoEquip check parts
*and some mirror changes
2013-08-30 02:55:11 +07:00
Cahyadi Ramadhan Togihon
15074d8c37 Follow-up fc48f92, which is oppsite of r17119. (Euphy's fault :P)
- Config naming changed: 'item_restricted_consumption_type' to 'allow_consume_restricted_item' (conf/battle/items.conf)
- Add 'allow_equip_restricted_item' config to allow/disallow player use item that restricted. Default is yes, restricted item can be equipped but gives no script effect (related r17119) (conf/battle/items.conf)
- Moves item_nouse check to itemdb_isNoEquip
- PC_PERM_USE_ALL_EQUIPMENT is now can be used to bypass item no_equip flag for equipment (also card) to run the item script
- PC_PERM_ITEM_UNCONDITIONAL is now can be used to bypass item no_equip flag for consumable item to run the item script

Fixed typo issue on ef4fd59
(ef4fd59996 (commitcomment-3962459))
2013-08-28 20:01:15 +07:00
Cahyadi Ramadhan Togihon
fc48f925bc Fixed item_noequip.txt check when player try to equip an item (broken since hmm, I don't know) 2013-08-28 13:25:18 +07:00
Akinari1087
362d8264fe Fix MSVC conversion warnings - Fixes bugreport:8014
Added support for bSetDefRace and bSetMdefRace for Vellum Weapons
2013-08-27 14:27:26 +00:00
lighta
8bd0985159 More hardcoding cleaning with inf3
-Add skill lists for :
--spell blocked by statis
--spell blocked by kagehumi
--spell range affected by
AC_VULTURE|GS_SNAKEEYE|NJ_SHADOWJUMP|WL_RADIUSRA_RESEARCHTRAP
--spell that can't be copied
--spell that can be using while riding warg|mado
-Add a boolean return value for delequip (script cmd)
-Fix monster (script cmd) hardcoded cap for ai. (was preventing to put
ai_faw)
2013-08-24 15:39:26 -04:00
Cahyadi Ramadhan Togihon
5f123519f6 Added item check for third classes (as partial merge from Hercules: 1caae98).
- 1:Normal, 2:Trans/Upper, 4:Baby, 8:Third, 16:Trans.Third, 32:Third Baby (see 'doc/item_db.txt' for detail)
- Changed almost all items class on 'db/re/item_db.txt'
- Updated 'sql-files/item_db_re.sql', also fixed SQL error (bugreport:7998)
Added 'item_unconditional' as group permission, default is 'false' (see 'doc/permissions.txt' for detail).
2013-08-21 11:33:34 +07:00
lighta
342745de1a -Some clif work.
-Add packet definition for (2013-06-18, 2013-06-26, 2013-07-03, 2013-07-10, 2013-07-17) thx Shaktoh
-Optimise a bit pc_useitem processing
--Fix bugreport:7760 (Added new ranklist packet for newer client) 
--Fix bugreport:7739 (2013+ storelist had invalid offset)
--Fix bugreport:7806 (fix typo for 2013+ support and also fix breaking of old npc/merchants/cash_trader.txt)
2013-08-17 08:31:59 -04:00
Akinari1087
5c157a5ac5 Fix Highness Heal calculation : Fixes bugreport:7966
Map crash fix when casting Kaihou - Fixes bugreport:7962
Update Songs/Dances for Land Protector - Fixes bugreport:7913
Show baseATK increases in status window - Fixes bugreport:7960
Revert damage to int64 - Fixes bugreport:7939
- Also removed limit on Acid Demonstration
Changed Camouflage to increase Equip Attack - Partially fixes bugreport:7941
2013-08-13 16:07:32 -04:00