115 Commits

Author SHA1 Message Date
Lemongrass3110
54fb88d8af Follow up to ae98019 2015-11-17 12:19:38 +01:00
Cydh Ramdh
b71ed05857 Bug Fixes
* Now coma triggered on every attack types (bugreport:3100)
  * Added bonuses `bonus2 bComaRace,r,n;` and `bonus2 bComaClass,c,n;`, replacing the current usages of `bWeaponComaRace` and `bWeaponComaClass`.
  * This bonus has no effect for GVG and BG monsters.
* Fixed Shockwave Trap (HT_SHOCKWAVE) SP reduction, should be % of MaxSP not % of 'current' SP.
* Fixed #462, failure in `setunitdata` for NPC. Thank a91323, @julia40124009
* Fixed #470, changed SO_ARRULLO target to BL_CHAR.
* Added skill flag INF2_HIT_TRAP (0x40000) to removed hardcoded 'skill that can hit traps'.
  * NOTE: Client-side's factor also determines that skill can be targeted to trap-type skill or not.

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2015-06-17 00:33:08 +07:00
aleos89
730311e009 Script Command Adjustments and Additions
* Fixes #158 - Implemented 'getvar' script command to avoid blindly attaching players and messing up their NPC progress.
* Fixes #449 - Fixed 'unitskilluseid' and 'unitskillusepos' not casting skills that require stat info when the NPC's status wasn't loaded.
* Implemented 'getunittype' script command to return the object type of the given GID.
* Adjusted 'unitwalk' to support an Event Label which is executed when the object reaches the target.
* Added 'unitwalkto' when giving a target GID rather than coordinates. Also supports Event Labels.
- Thanks to @cydh.
2015-06-09 11:10:05 -04:00
Cydh Ramdh
7d929a06a3 NPC Market Shop support
* New shop script definition: `<map name>,<x>,<y>,<facing>%TAB%marketshop%TAB%<NPC Name>%TAB%<sprite id>,<itemid>:<price>:<quantity>{,<itemid>:<price>:<quantity>...}`
* Added script command to update shop NPC: 'npcshopupdate "<name>",<itemid>,<price>{,<stock>}'
* Added NPCMarketDB (DBMap) for market data persistance method.
* Added `market_table` definition for market table in conf/inter_athena.conf.
* Thank to @aleos89, @Lemongrass, @icxbb-xx, merged HerculesWS/Hercules@cf19b26.

NOTES:
* Minimum client needed 2013-12-23 (but this client has bugs there-and-there).
* There's new table, see `upgrade_20150327.sql`.
* Market shop doesn't support discount.
* Added items by script `npcshopitem` or `npchopadditem` will be assumed as persistance items, will be loaded on next script reload or server start even market_shop NPC does't list them (unless NPC is not exists, entries will be removed).

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-03-27 21:11:07 +07:00
Lemongrass3110
ebe4a1cc17 Added support for the latest NPC ids 2015-01-04 10:51:09 +01:00
aleos89
a39f9ac8a2 Various cleanups.
* Updated comments for chat.c and pet.c files.
* Cleaned up various other comments and stylization.
2014-10-02 12:49:04 -04:00
lighta
402170c018 -Update doc/souce_doc.txt for refactoring change
-Add doc/packet_interserv.txt and doc/packet_client.txt, to refer packets
-Upd src inner documentation, map/intif mostly
-Add  common::utils::check_filepath(), fixing bugreport:9131 @loadnpc crash
-Fix pc_level_penalty_mod not using mob_class correctly
-Fix db/import/ for produce, arrow, abra, impro db...
-Upd install script (config.pl) to use mariadb for fedora/centos distrib
2014-08-20 20:58:48 -04:00
aleos89
7cd82d00db Increased item ID array size.
- Increased limit from 32,767 to 65,535.
- Still uses same amount of memory with doubled usable size.
- Adjusted CARD0_PET from -256 to 256.
- Please run both SQL files after applying this update to avoid values becoming corrupt.
- Tested and works on clients 2012-04-10 and up thanks to Cydh.
- Removed an unused SQL file.
2014-06-12 11:29:10 -04:00
Cydh Ramdh
dd67f9de96 Bug Fixes:
- 'hp_rate' and 'sp_rate' config aren't working. http://rathena.org/board/tracker/issue-8742-max-hpsp-battleconf-not-working/
- Mercenary DB that aren't being read properly whic also happens for Homunculus DB. http://rathena.org/board/tracker/issue-8761-mercenary-db-import-folder-issue/
- Fixed Elemental DBs that aren't being imported yet. (also changed to sv_readdb)

Rebellion Skill Updates:
- Some updates according to kRO updates on http://forums.irowiki.org/showpost.php?p=1364894&postcount=579, http://forums.irowiki.org/showpost.php?p=1388802&postcount=981, and http://forums.irowiki.org/showpost.php?p=1389627&postcount=1008
- Partial merge from idAthena.
- Using 0x107 as temporary marker on mini-map for Crimson Marker target.
- Some stuffs maybe still wrong, feel free to report/fix it.
- Thank people on those links, Ziu, and idAthena.

Misc changes:
- Changed some function names for homunculus.c/h with prefix hom_* and mercenary.c/h with prefix mercenary_*
- Change unnecessary 'int' return value tos 'void'

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-03-13 23:59:29 +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
222b773c20 Added support for constants in NPC sprite IDs. (Hercules 124ab2a, e9b4aec)
Fixed some typos in source files.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
2014-02-13 11:01:20 -05:00
Cydh Ramdh
b4bdaebeeb * Replaced INF2_NO_AUTOSHADOWSPELL with INF2_AUTOSHADOWSPELL following AEGIS standard, reverted c9cf222.
* Fixed bugreport:8596 http://rathena.org/board/tracker/issue-8596-compile-warnings-with-fresh-svn/
* Removed temporary array while parsing shop NPC, makes remove the limit 100 items each NPC
* Added idRO cash trader according to Chinese New Year event

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2014-02-04 12:32:38 +07:00
Lemongrass3110
e3372f2d5d NPC ID update
Added some missing NPC IDs and adjusted the NPC range for the newest IDs
2014-01-22 18:51:52 +01: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
Cahyadi Ramadhan Togihon
659cc57574 * INF2_NO_NEARNPC (skill_db.txt updates):
-- Added a new option info for skill's 'inf2', INF2_NO_NEARNPC, that used for checking if the skill is castable if caster/ground/target is near with NPC (by specified range option)
-- Corrected Shadow Chaser skills, SC_CHAOSPANIC and SC_MAELSTROM, that cannot be placed near warp portal (according to iRO Skill Balance Patch)
-- Added 'db/skill_nonearnpc_db.txt' for more option of INF2_NO_NEARNPC (additional range beside splash area, unit range, or layout range calculaiton and type of NPC)
* Follow up 5e6626e
2013-09-26 17:39:41 +07:00
akinari1087
cd95d1cada Instance System Rewrite!
- Removed a bunch of script commands and replaced others
- Rewrote the way instances are created
- Added Instance Database files
- Fixed and rewrote instances scripts (Euphy)
- Added reloading to instancedb
- Instances are now persistent through @reloadscript
- Special thanks to Auriga (emulator) for the base of their system
- Special thanks to Euphy for doing major testing and script rewrites for this
- Special thanks to Lemongrass and Lighta for some help along the way

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17386 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-06-26 17:33:59 +00:00
glighta
eb013a6d5e -Fix bugrepot:7609 fix picklog enum (add cashshop type)
-Fix bugreport:7615 freeze after closse by Secure timer, also fix "Unable to restore stack! Double continuation!" case (when dead by mob talking to npc)
-Upd secure timer, now stop timer when we already in close/end state.
-Fix st_>mes_active case where var wasn't refresh but dialogue was ended 
-Add packet support for ZC_ITEM_PICKUP_ACK_V5 (0x990), (0x0897,0x093F,0x0886,0x035f) (Hercule/Shaktoh)
-Cleanup too duplicate, too wide comment

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17303 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-04-29 05:51:36 +00:00
aleos
ae5e899822 * Small cleanup in friend_auto_add config to now note auto-deletion.
* Updated the Secure NPC Timeout feature to work as it does on official servers and enabled by default. (bugreport:1721) (Hercules e671397)
* Fixed disable_items not working when the close button appears in NPC dialog while keeping close/close2/end backwards compatibility. (bugreport:7307 / bugreport:7469)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17280 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-04-22 02:08:11 +00:00
lemongrass3110
48431ee9db New NPC range now working.
Sorry guys, back in my days it was as easy as this, but I did not test it. So now tested and working. :)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17246 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-04-10 15:02:11 +00:00
lemongrass3110
386f0ae36e Cashshop support
Since our neighbors were a little earlier with releasing the cash shop system, here is our version of it.
It supports TXT and SQL databases and even features kafra point support.
Don't forget to run your SQL updates, since this feature needs another log table for your own security. ;)

Follow up to r17240 finalizing pincode feature. Should be stable now - no beta anymore. Fixes bugreport:7505

Fixed guild creation bug bugreport:7502

Implemented the new NPC range tid:81303

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17242 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-04-10 02:09:34 +00:00
euphyy
e59e1d99d3 * Fixed an error in pincode system (follow-up r17183).
* Revised/added 'npc_isnear' to check if an NPC is nearby when opening chat rooms or using vending. (Hercules bc63ef1)
* Misc. fixes.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17187 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-03-10 05:25:54 +00:00
euphyy
3a330a455a * Part one of fixing bugreport:6527. This does not yet change functionality.
-- Added 'disable_items' to all applicable scripts.
-- Added preliminary source modifications. (Hercules 137cc43)
* Raised max stat for third jobs to 125 (follow-up r17133, bugreport:7295).
* Fixed logical issue with r17151. (Hercules 5c667cc)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17160 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-02-25 03:04:33 +00:00
glighta
0cdba10793 -Harmonize skillid, skill_num, skillnum, skill, to skill_id and same for skill_lv
-Optimise type from int to int16 in order to reduce ram consumtion.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17065 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-30 16:00:24 +00:00
momacabu
825ddd053c * Implemented `useskilltopc' (tid:74685), and now if desired npcs can carry status such as str, atk, def, etc and level.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17048 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-27 03:49:29 +00:00
brianluau
a2bdc47daf - Undid r16968: SVN Replaced with source:/trunk/src/@16966 (tid:74924).
[16969:16991/trunk/src/] will be re-committed in the next 24 hours.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16992 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-05 02:53:33 +00:00
greenboxal2
a7c32653f7 Applied AStyle code formating as discussed on tid:74602.
Removed /SAFESEH option from MSVC11 projects.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16968 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-25 21:20:43 +00:00
momacabu
069793e804 Modified @addwarp to accept a new optional parameter <npc name>. If <npc name> is specified, then the warp created will have that name.
Otherwise it will use a name chosen by the emulator.
If there is already another warp with that name the generic name will be used instead.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16919 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-12 02:46:28 +00:00
momacabu
f28c2a56f5 - Modified *monster and *areamonster script commands to allow size and ai parameters.
-- Event parameter now no longer works as size & ai replacement.
-- If not defined, it'll assume the default size (0 = medium) and default ai (0 = none).
- Changed all hardcoded AI states to recently created enum.

Please test, if you find any bugs, report on our Bug Tracker.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16904 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-10 19:44:12 +00:00
shennetsind
40b3dfe73b Added 2 (3) new atcommands:
* @unloadnpcfile <file path>
** e.g. "@unloadnpcfile npc/cities/alberta.txt" unloads all npcs created by the npc/cities/alberta.txt file.
* @addperm/@rmvperm <permission_name>
** e.g. "@addperm skill_unconditional" / "#rmvperm "player" skill_unconditional"

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16656 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-08-17 19:41:29 +00:00
cookiecrumbs
0fd45ac13e Added the ability to bind atcommands to NPC events (ex: NPCNAME::OnEvent); original version by ToastOfDoom however heavily modified by I enabling command level at the invoking/character (@/#) level and fixes to prevent console errors as well as fixes aimed to ensure compatibility with rAthena.
Updated the script_commands.txt documentation with the following script commands: bindatcmd, unbindatcmd and useatcmd.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16471 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-22 05:15:32 +00:00
shennetsind
d098c01bd2 NPC Loaded by @loadnpc will now trigger their OnInit labels as they're loaded.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16130 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-19 23:15:28 +00:00
epoque11
33d4763ad2 - Fixed compilation errors due to unnamed argument in npc_unload (bugreport:5676)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16020 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-30 13:13:07 +00:00
shennetsind
622ce6fd0f Yet another performance improvement: Shut Down processing is now about to 7 times faster.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16006 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-29 16:33:55 +00:00
shennetsind
535e0712a9 reasonably-sized performance improvement: @reloadscript is about to 3 times faster.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16004 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-29 15:47:57 +00:00
greenboxal2
4f4f19caf6 Fixed memory leak on MvP tomb system, killer name now uses static buffer. (bugreport:5615)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15954 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-24 16:27:04 +00:00
greenboxal2
1ccea559bf Added mvp tomb system.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15908 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-21 14:00:23 +00:00
shennetsind
c827a4e13b Fixed problem with OnTouch on NPC ID 139, blame on r14993, bugreport:5206
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15441 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-14 05:40:02 +00:00
shennetsind
136a78a9bb RE cashshop fix, bugreport:4764
-- requires a msgstringtable.txt modification or client will crash (will be in the client svn asap)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15137 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-16 03:13:00 +00:00
brianluau
27f53c1386 - Renamed 'RRConfig' folder to 'config'.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15052 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-10 01:27:41 +00:00
shennetsind
a785b383d7 Merging RREmu into rAthena -- quite a few stuff yet to be renamed, but we'll get it sorted.
Some of the stuff included in RREmu that is now part of rAthena:
- RE Drop Rate Modifier
- RE Experience Rate Modifier
- RE Weapon MATK
- RE Shield ASPD job-specific penalty
- RE Cast Time
- Renewal-specific item DEF
- 3.1 classes.
- All-New Mounts
- Official Magical Reflection
- And other perks, such as fully-functional @mapflag
also merged eAthena 15006 into rAthena.
For Bugs, Comments and Suggestions: http://rathena.org/board/tracker/

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15009 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-05 20:51:58 +00:00
ai4rei
f204e8aa09 * Fixed npc class HIDDEN_WARP_NPC (139) being sent to the client, causing client crashes in poring war. It's a server-side "sprite" only.
- Updated Aegis NPC ID constants from current npcidentity.lub (569~603).
- Reintroduced HIDDEN_WARP_NPC script constant, which was removed by accident (since r14679).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14993 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-11-12 08:08:19 +00:00
ai4rei
442f27c128 * Corrected npcdb_checkid to exclude border constants 400 (JT_NEW_NPC_START) and 1000 (JT_MON_BEGIN) (since r4425 and r12025, related r4537).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14882 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-03 06:45:13 +00:00
ai4rei
bfbac60c74 * Changed enumerating defines into enumerations (related topic:264007).
- Minor fixups on few macros.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14831 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-05-23 07:12:02 +00:00
ai4rei
333c944cae * Fixed map-server printing deprecation message, when monster event label was used as transport for special attributes (small/large monsters etc.) in script command 'monster' and related commands (bugreport:1274, since r6592, related r5707).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14814 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-05-14 10:05:49 +00:00
Inkfish
5485daa6df * NPC event code cleanups.
- removed the 'OnMyMobDead' dead code. It's never supported though documented.
- removed the 'feature' that events only trigger when the player is in the OnTouch area IF it's specified. 
  It's never documented and breaks official scripts.
- some cleanups and bug fixes to OnTouch_.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14173 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-11-26 12:01:19 +00:00
Inkfish
42987f61ad * Implemented the official version of 'OnTouch' named as 'OnTouch_'.(it can be defined in script_athena.conf)
* Adapted 'map_foreachinarea' to 'map_forsomeinarea' so that it allows you to specify the number of bl you wanna operate on.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14097 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-10-25 09:38:33 +00:00
Inkfish
137e993d52 Partially revert r14085, NPC names are allowed to be more than 24 character long in Aegis.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14087 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-10-12 08:57:02 +00:00
Inkfish
6abe64b1d7 NPC should only have a 24 characters long name including EOS. (bugreport:3599)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14085 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-10-11 04:55:57 +00:00
zephyrus
6b710571ad - Optimization to instance system.
* Removed the crc feature to generate instance npc names. The instance npc name will be "dup_" + instanceid + "_" + srcnpcid.
* Removed the big array under map structure and coded in a different way. It was only used to generate map names, but i just used the instance_id + "origin map name".
* Moved all instance features to separated files.
* Moved the npc duplication for instances into npc.c as Ultramage says (removed npcname_db from npc.h).
* Added recomendations for scripts commands by Saithis.
- Testing required, i will prepare Endless Tower script soon. I hope this do almost anything in bugreport 3276.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14003 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-08-12 21:44:02 +00:00