325 Commits

Author SHA1 Message Date
eathenabot
47013253bd * Merged changes up to eAthena 15049.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15264 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-25 10:14:42 +00:00
eathenabot
e1eacd2587 * Merged changes up to eAthena 15038.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15225 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-23 13:41:11 +00:00
shennetsind
77a4e0d2e3 Follow up to r15193, bugreport:5135
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15198 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-21 15:20:35 +00:00
shennetsind
4f11432152 Fixed GCC "--enable-debug", and 2 compiler warnings that were omitted due to enable-debug being broken.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15197 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-21 06:54:57 +00:00
shennetsind
f0e3ef3e2e Fixed soul drain visual effect not being displayed to mobs, bugreport:2980
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15193 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-21 04:44:17 +00:00
shennetsind
16314f4a50 Fixed pneuma being displayed on land protector, bugreport:1715
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15187 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-20 13:22:04 +00:00
protimus
a9618a476e * Fixed invalid state running of TK_JUMPKICK (Flying Kick).
- This was causing wrong damages when use the ability with 1 cell difference of your target.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15176 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-20 06:13:19 +00:00
shennetsind
883f01c367 slaves are now able to teleport to their master even on monster_noteleport flags, bugreport:4030
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15171 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-20 04:23:40 +00:00
shennetsind
019165a3a9 Fixed Monster Animation Bug:
-- Example
Before: You JT a evil druid, shortly after it finishes taking damage it'd appear near you without showing it moving again.
Now: walk animation no longer glitches, it moves \o/!
bugreport:1255

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15148 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-17 05:41:34 +00:00
shennetsind
d7a7f60dde fixed asura targetting, bugreport:5052
fixed a typo in a bug report number, for bugreport:4629

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15136 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-15 20:32:06 +00:00
shennetsind
72b4ecc74d Asura-Combo Fixed, bugreport:5052
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15130 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-15 04:35:59 +00:00
shennetsind
4a9eecf97a unit_blown now returns number of moved cells, bugreport:4985
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15116 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-14 21:25:58 +00:00
epoque11
bf05deda6f - Fixed mercenaries not warping to their master if the master is more than 15 cells away
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15108 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-14 16:18:36 +00:00
shennetsind
7f2432aafc Follow up r15084, tested and adjusted
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15086 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-13 05:03:59 +00:00
epoque11
bb0dad8ec9 - Optimised the guild aura routine which was wasting cycles by processing every unit on a map (rather than guild members)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15084 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-13 02:55:36 +00:00
epoque11
5d1438cced - Fixed hidden GMs being processed in the PVP ranking timer
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15083 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-13 02:21:13 +00:00
shennetsind
ceabffe099 Battlegrounds bug fix, bugreport:4996
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15035 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-09 01:54:29 +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
ddd5609af3 * Changed function-like macros into inline functions where it seemed appropriate (topic:264007).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14976 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-10-16 06:46:57 +00:00
Skotlex
5b4c84d286 - Rewrote/updated the SC_COMBO logic. Got rid of state.combo and added usage of packet 0x7e1 (PACKET_ZC_SKILLINFO_UPDATE2) to report skill inf changes.
- Cleaned up a bit the function clif_setlevel (these functions should be as lightweight as possible...)
- Fixed the server sending twice the skill tree during login.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14939 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-08-23 17:30:08 +00:00
ultramage
edcb998d59 Replaced custom type 'intptr' with standard 'intptr_t'.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14873 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-06-30 09:14:21 +00:00
ai4rei
bb48f685e7 * Fixed party invite packet 0xfe (ZC_REQ_JOIN_GROUP) using account id of the inviter rather than party id.
- Added support for new party invite packet 0x2c6 (ZC_PARTY_JOIN_REQ), introduction date guessed.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14844 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-06-11 16:08:44 +00:00
ai4rei
dc6ae732e4 * Some cleanups related to player and monster states.
- Moved user_font and bg_id out of states as they are data, not states.
- Reordered members of state structs so that bitfields are packed together (less memory gets wasted).
- Other insignificant code tweaks.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14795 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-04-16 12:18:24 +00:00
ai4rei
a94aea7582 * Moved duel code into a separate file.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14785 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-04-09 12:07:58 +00:00
ai4rei
bba102a818 * Added separate character state for vending (like for buyingstore), instead of vender_id != 0 (follow up to r14682, related r14713).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14762 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-03-27 18:43:31 +00:00
ai4rei
6b74ef9b50 * Implemented search store info system (aka. vending and buying store search) together with related items.
- Requires 2010-08-03aRagexeRE or later and can be disabled in 'conf/battle/feature.conf'.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14732 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-03-06 19:16:09 +00:00
ai4rei
ce3f78556c * Implemented buying store system (aka. reverse vending, purchase shop) together with related skill and items, without NPCs.
- For SQL apply upgrade_svn14713_log.sql to upgrade tables `picklog` and `zenylog`; for TXT no action is necessary.
- Requires 2010-04-20aRagexeRE or later and can be disabled in 'conf/battle/feature.conf'.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14713 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-02-19 12:59:36 +00:00
ai4rei
ad4e9bbee1 * Replaced remaining occurences of '-1' with 'INVALID_TIMER', where appropriate (follow up to r12998).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14670 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-01-14 21:00:38 +00:00
ai4rei
c8f5056a4a * Fixed kill steal protection result in skill casting (unit_skilluse_id2) not getting evaluated (bugreport:1808, since r12203).
- Moved kill steal protection in skill casting to be only executed, after the actual target has been determined and validated (since r12203).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14658 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-01-08 12:25:59 +00:00
ai4rei
c8cae9e659 * Removed clif_weather_sub and clif_misceffect2 in favor of clif_specialeffect_single and clif_specialeffect (all of them are ZC_NOTIFY_EFFECT2).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14541 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-02 12:08:44 +00:00
ai4rei
b870941ee0 * Insignificant code tweaks: removal of excess function declarations and self assignments.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14520 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-29 11:28:13 +00:00
ai4rei
93e376eac5 * Added emotion_type enumeration for clif_emotion constants.
- Made clif_parse_Emotion use clif_emotion, rather than having it's code inlined.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14518 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-28 22:43:10 +00:00
ai4rei
5d1bbf6c2a * Added clr_type enumeration for vanish effect constants.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14517 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-28 21:41:38 +00:00
ai4rei
7a092c2aca * Removed 'negative clrtype is used for skipping unauthed objects from saving' introduced in r9975, as it is no longer required/used (follow up to r12223).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14515 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-28 17:12:22 +00:00
ai4rei
d19aa50b9e * Fixed calls to pc_delautobonus assuming map_session_data::autobonus2 and map_session_data::autobonus3 arrays having the same size as map_session_data::autobonus (since r13915).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14497 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-24 23:31:14 +00:00
ai4rei
4ffaed9527 * Various small cleanups.
- Fixed truncation warnings in @statuspoint, @skillpoint and @str/@agi/@vit/@int/@dex/@luk (since r14436).
- Fixed data type inconsistency in @statuspoint and @skillpoint (since r5762, related r13541).
- Silenced truncation warnings in CR_ACIDDEMONSTRATION damage calculation and cardfix application (since r13700).
- Reformatted unit_blown to make it look cleaner (follow up to r14492).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14493 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-23 11:13:49 +00:00
ai4rei
1b9c1fc3d1 * Added script command pushpc, which is required by newer scripts.
- Moved knockback-part of skill_blown into unit_blown, to allow unconditional knockback required by pushpc without copy-pasting code.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14492 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-23 09:26:00 +00:00
Paradox924X
2f9e3dbf81 Replaced all nullpo_retr() calls which returned 0 with nullpo_ret() calls.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14414 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-10-09 01:57:04 +00:00
ultramage
e5a32cb5e7 Fixed a memleak that occurs when a player exits while waiting on a script select() or menu() (caused by r12481).
The change made the attached script not deallocate to avoid a crash when changing mapservers, however deallocation must occur here since scripts waiting for user input are unable to free themselves.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14213 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-12-24 12:19:34 +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
L0ne_W0lf
8d0be03e8a * Added battle_config.mob_slave_keep_target config option (monster.conf)
- When yes (default) MVP slaves will always keep their prior targets.
- When no the old behavior of switching to the closest target is enabled.
* Updated MAX_MOB_DB to 4000 (Monsters are starting to appear in the 2k ranges)
* Changed default respawn time (when 0) to 500 from 5000.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14119 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-11-03 01:39:45 +00:00
Inkfish
e8d9984582 * Cast time of Emergency Call is doubled if you master of High Jump.
* High Jump can't be used on PvP maps.
* Fixed a potential null pointer from last commit.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14106 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-10-27 14:46:42 +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
395149b2b8 Fixed self skills affecting target unit when used within combo delay for Asura and Flying Kick. (bugreport:3495) (follow up to r13900)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14007 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-08-15 02:22:24 +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
zephyrus
86563064db - Fixed a bug cleaning instance variable on party when instance is destroy.
- Fixed a bug on Yuno Castle 2 and 3, not killing guardians.
- Moved battleground team leave on unit remove map to prevent a crash on multimap servers.
- Fixed a bug on checking range with the wrong target. Fix a crash on Item 2002 at refine >= 9.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13979 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-07-29 09:10:51 +00:00
Inkfish
4cafc71047 * Kaahi heals no matter if attack connects. (bugreport:2440)
* Fixed a typo causing skillitem always resets skill delay. (bugreport:3431)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13977 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-07-29 04:33:00 +00:00
ultramage
e54bf092d2 Fixed sql char deletion code using a broken pet deletion query (ran very slow, and had a typo in a binary shift operation) (bugreport:3304).
Fixed change r13774 to the code responsible for deciding whether to move 1 extra cell when stopping walking; it had its logic inverted by mistake (bugreport:3312).
Cleaned up the itemlist, cartlist and storagelist gm command code:
- fixed buffer overflows in all three functions (bugreport:456).
- merged all three atcommand functions into a single one; the appropriate behavior is detected from the command's name.
- using the StringBuf class instead of static-size buffers and string operations for more efficient and safe processing.
- using 'jname' (the one without underscores) as the primary item name in the list, and not using the aegis name for cards at all (since it's almost identical).
- fixed forged item details never being displayed due to a missing strcat().
- extended item info (crafted/named items, pet eggs) will now be displayed for storage and cart list as well.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13920 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-06-30 09:21:28 +00:00
Inkfish
5516002a5c * Implemented script command "autobonus". [Inkfish]
- "autobonus" is similar to "bonusautoscript", however it has a timer of its own.
- Updated itemdb changing items bonus using "bonusautoscript + sc_start" mode to "autobonus + bonus" mode.
- Remove bonusautoscript and status changes that was needed by bonusautoscript and is no longer in use.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13915 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-06-28 08:23:53 +00:00
zephyrus
33e1fbbd66 - Instancing System (Thanks to Sirius White who did most of the code, with some of my work to implement client side information, some optimizations and bugfixes). Also thanks to contributions from UEAUP team and Orcao.
- Fixed a bug on areamobuseskill and changed it to make it as Aegis.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13901 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-06-20 17:56:01 +00:00