849 Commits

Author SHA1 Message Date
Nova
b99e9b7e97 Revert "Reverting Playtester's merge."
This reverts commit 21021751dafe78334f7f9e2b256eca16177a5212.
2016-02-01 14:33:23 -08:00
Nova
21021751da Reverting Playtester's merge. 2016-02-01 14:14:57 -08:00
aleos89
918ef966f8 Updated renewal mapcache 2016-01-31 10:52:57 -05:00
Lemongrass3110
3f78f16db9 Added some more missing monsters
Sorry missed them in the last commit
2016-01-29 20:09:16 +01:00
aleos89
fc6800701b Updated Flash Combo effect
* Includes fixes for Dragon Combo, Fallen Empire, Tiger Cannon, and Sky Net Blow.
* Removed the SR_FLASHCOMBO_ATK_STEP usage.
* Fixes #627, fixes #725, fixes #741, and fixes #765.
Thanks to @exneval and @Rytech!
2016-01-29 11:15:00 -05:00
Lemongrass3110
3011639bf3 Added some newer mob sprite names to mob db 2016-01-29 01:15:19 +01:00
Cydh Ramdh
7426c4bf2f Merge pull request #891 from rathena/hotfix/issue879
* Fixed #879. Added check while equipping Gun-type weapon X Ammo (bullets and grenades).
* Fixed Gunslinger's Spread Shot can be used by equipping Shotgun + Bullet or Grenade Launcher + Grenade.
2016-01-25 10:43:25 +07:00
Playtester
5971745dfd Fixed Land Mine, Blast Mine and Claymore Mine not ignoring damage reduction cards (fixes #732) 2016-01-24 22:48:26 +01:00
Playtester
9721dc94a5 NPC_EVILLAND and Sanctuary updates (fixes #927)
* NPC_EVILLAND now has 3+level intervals, a target range of 7 and ignores flee,
* NPC_EVILLAND's area of effect per unit is now 11x11 on level 1-9 and 27x27 on level 10
* NPC_EVILLAND now ignores Devotion
* Sanctuary now has exactly 1+3*level heal intervals, regardless of number of players healed
* Sanctuary will end early when 3+level targets have been hit, targets currently on Sanctuary might still be hit when it expires
2016-01-24 01:06:00 +01:00
Playtester
418dc47751 Fixed monster type 08 (see #926)
* Updated documentation for monster type 08
* Fixed mode of Luciola Vespa
2016-01-23 11:59:22 +01:00
Playtester
42b7d27e10 Merge branch 'master' of https://github.com/rathena/rathena 2016-01-22 22:57:42 +01:00
Playtester
e12fb643de Blacksmith skill update (fixes #912)
* Power-Thrust will no longer affects players that don't have a weapon equipped
* If weapon requirements on Adrenaline Rush or Power-Thrust are not met, the target will no longer display the buff animation
* Party members now only gain +5% ATK from Power-Thrust on all skill levels
* Hilt binding now increases the duration of Adrenaline Rush, Power-Thrust and Power Maximize for all party members as long as the caster has learned it
2016-01-22 22:57:21 +01:00
aleos89
8e6a65fff9 Updated Warg skills effects
* Tooth of Warg damage is now considered Weapon Mastery ATK which ignores elements.
* Warg Dash damage is no longer affected by player weight.
* When under the Warg Bite status players cannot use Hide, Cloaking, Cloaking Exceed, or Camouflage.
* Dance With Wug:
-- Damage is now considered a SC bonus.
-- Skills affected by Dance With Wug are now in INF3.
* Warg Strike and Warg Bite:
-- No longer affected by caster's % damage cards.
-- No longer ignores target's flee.
-- Ignores Demi-Human and Elemental reductions.

Thanks to @NovaRagnarok for helping test and get info!
2016-01-22 14:09:14 -05:00
nanakiwurtz
1922f892f4 Merge pull request #885 from secretdataz/carddrops
Mob DB Update
* Thanks to @secretdataz
2016-01-22 02:26:43 +07:00
nanakiwurtz
1d2dc2a82a Item DB Update
* Added item 6941, 6942, 6960, 17569, 22899, 22901

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2016-01-20 14:19:41 +07:00
Playtester
9cfca1cc08 Follow up to 5d7d994 and 6ebcb67 (code optimizations)
* Waterball now uses UNT_DUMMYSKILL
* Deluge/Volcano/Gale will no longer be blocked by UNT_DUMMYSKILL units
* Waterball will no longer cancel when damage is 0, on official servers this only happens if damage is negative but rAthena is no longer coded to handle negative damage unless you enable a custom feature, so... just don't use Waterball on water monsters, ok?
* Fixed two compiler warnings
2016-01-19 20:17:04 +01:00
Playtester
6ebcb67601 Waterball, Jupitel Thunder and Mystical Amplification behavior improved
- Implemented Waterball and Jupitel Thunder double cast (fixes #907)
* Waterball and Jupitel now won't apply a delay after they have been cast and won't notify the client about the spell until 150ms later, if another skill request is received, it will actually be cast as well
* To prevent exploits this behavior can only be used every 2 seconds
* This allows you to cast a spell after Jupitel that would not have enough range to be cast after knockback
- Finally implemented the official waterball unit behavior
* When casting Waterball, water, deluge and suiton units will be turned into waterball units
* These waterball units are then turned into waterballs one-by-one
* All unit behavior now also applies to waterball, special handling is now solved via db files
* If there are multiple waterball timers active at the same time, they will actually compete for the waterball units
* When waterball does not deal damage (100% resist), it will now cancel, allowing you to act and move again
* If this breaks anything, please notify me
- Mystical Amplification improved (fixes #908)
* Mystical Amplification will now toggle at cast begin rather than cast end
* When Mystical Amplification ends, spell damage will be immediately lower even for ongoing spells
2016-01-17 18:00:18 +01:00
Playtester
bbe9601c0d Fixed Soul Destroyer range (fixes #905)
- It is actually 9 in both renewal and pre-renewal
2016-01-16 13:37:09 +01:00
Nova
88d2cd7cfd Fixed Makibishi
Fixed an error where Makibishi unit_db was set to have an AoE, so when
you would refresh the screen you would see
http://i.imgur.com/mr3g1zG.png become http://i.imgur.com/UnecX60.png
This makes the skill behave as intended, as before the real AoE was that
of the second image.
2016-01-12 16:00:08 -08:00
nanakiwurtz
3f26c3ddcc Fixed #895
* Thanks to @Dark8008 and @Playtester

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2016-01-12 00:14:47 +07:00
Jittapan Pluemsumran
f987f1bcbe Mob DB Update - Added card drops
- Lighthalzen Biolab F4
- Hall of Abyss
- Malaya Port
- Eclage
- Old Glast Heim
2016-01-08 13:18:29 +07:00
Cydh Ramdh
68ab3d89fb Reverted Ground Drift changes on c699304bd95b5c3bf9dddcca1dd2fe842169c650
Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2016-01-07 11:37:01 +07:00
Cydh Ramdh
c699304bd9 Gunslinger Fixes
* Fixed #879. Added check while equiping Gun-type weapon X Ammo (bullets and grenades).
* Fixed Gunslinger's Spread Shot can be used by equipping Shotgun + Bullet or Grenade Launcher + Grenade.
* Fixed Gunslinger's Mine (Ground Drift) must cannot be casted on target's foot and must cannot be stacked.

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2016-01-07 00:54:57 +07:00
nanakiwurtz
8655913be7 Fixed #877
* Thanks to @Playtester

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2016-01-05 14:28:38 +07:00
nanakiwurtz
77578826f6 Item DB Update
* Removed AegisName duplicates

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2016-01-05 14:21:56 +07:00
nanakiwurtz
d289bf8fb0 Fixed #867
* Thanks to @Dark8008 and @Playtester

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2016-01-05 14:15:46 +07:00
nanakiwurtz
1abb02c840 Item DB Update
* Added new costumes

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2016-01-04 14:31:26 +07:00
nanakiwurtz
a3877abdea Updated item script for 18536
* Thanks to @ernestfegarido

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2016-01-01 23:25:22 +07:00
nanakiwurtz
3f44493d07 Follow up to 2807be3
* Reverted item 575, 583, 587

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2016-01-01 23:20:45 +07:00
nanakiwurtz
22a9a74d0c Fixed #781
* Thanks to @ernestfegarido, @Atemo, @Historica and @cydh

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-12-31 16:01:06 +07:00
nanakiwurtz
19ceb84324 Item Buying Store update
* Added missing items into item_buyingstore.txt

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-12-31 15:42:21 +07:00
nanakiwurtz
0506fc98e7 Item Trade update
* Added WOE TE item restrictions

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-12-31 15:42:20 +07:00
nanakiwurtz
2807be3381 Fixed #853
* Thanks to @secretdataz

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-12-31 15:42:19 +07:00
nanakiwurtz
d14f75ef23 Fixed #705
* Thanks to @joelolopez

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-12-24 20:43:55 +07:00
Napster
060f33408d Merge branch 'master' of https://github.com/rathena/rathena 2015-12-24 16:31:10 +07:00
Napster
71c6896541 Add New Skill(Pushcart Decoration)Packet Implemented
* This feature require the client support before 2015-08-26 or newer
  user can select cart for change to new design
​  Make sure you data&lub support for this

  Special Thanks you @Lemongrass3110, @renniw
  This is a Christmas gift for the rAthena people.
2015-12-24 16:29:40 +07:00
aleos89
f47d4dcc0f Updated Hells Plant effect
* Hells Plant can be removed from Crazy Weed and Land Protector.
2015-12-23 14:15:07 -05:00
aleos89
c0e6faee1b Updated Fire Pillar effect
* Fire Pillar no longer requires a Blue Gemstone for levels 6-10 on renewal.
2015-12-21 13:34:24 -05:00
Lemongrass3110
d8830d21f6 Follow up to 9aa8325
Thanks to @CairoLee.
2015-12-20 15:24:11 +01:00
Lemongrass3110
9aa832570e Fixed a lot of wrong SC group IDs for item delay database.
It also is able to parse the value for the script engine constants now.

Fixed #846.
2015-12-18 20:43:46 +01:00
nanakiwurtz
b53eacd7b2 Follow up to ee0d256f
* Thanks to @zackdreaver

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-12-18 08:10:59 +07:00
nanakiwurtz
ee0d256f7b Fixed #844
* Thanks to @ernestfegarido

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-12-17 17:55:39 +07:00
nanakiwurtz
b2b37fc3ae Fixed #824
* Thanks to @secretdataz and @Historica

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-12-11 12:07:42 +07:00
aleos89
9c7fbb2b67 Follow up to 3f8b381
* Added the missing knock back from Death Bound.
2015-12-10 14:43:01 -05:00
aleos89
aec1b1147a Updated Cart Cannon effect
* Should now ignore target's Flee.
2015-12-10 14:00:52 -05:00
aleos89
43585041e9 Updated Emergency Escape effect
* Now does a single fluid back slide.
* Adjusted Emergency Escape and Feint Bomb to use blewcount in skill_db.
2015-12-10 12:19:56 -05:00
aleos89
89a33a77ad Updated Genetic Sling Item effects
* Moved all item effects to source.
* Updated HP/SP Increase Potions to use the official statuses.
* Updated Vellum Flail to use the official status instead of Critical Wound.
Thanks to @exneval.
2015-12-08 14:38:55 -05:00
Atemo
24ecdadf48 Merge branch 'master' into academie 2015-12-02 00:40:42 +01:00
nanakiwurtz
9dafcee30d Item Package Update
* Fixed 0 drop on IG_Lucky_Scroll08 and IG_Adventurer_Returns_Support_Box (Since commit 51074a06 on 2013-12-23)

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-12-01 00:01:40 +07:00
Atemo
9b13351817 Merge branch 'master' into academie 2015-11-24 18:01:09 +01:00