16361 Commits

Author SHA1 Message Date
Locien
15ee996fb4 Revert "Another small fix"
This reverts commit bfb94d0abceff19ddcfa7787c623c72f22017f7a.
2016-12-30 19:58:40 +01:00
Locien
bfb94d0abc Another small fix
Same as last time.
2016-12-30 19:58:07 +01:00
rAthenaAPI
dd1d78865a SQL synchronization 2016-12-30 19:48:28 +01:00
Locien
92174bbae6 More fixes to Geffen Magic Tournament
This should finally fix it.
2016-12-30 19:48:09 +01:00
rAthenaAPI
c1a26796e3 SQL synchronization 2016-12-30 19:44:49 +01:00
Locien
8ac9fb7f3d Another small fix to the Geffen Magical Tournament commit
Fixed missing values in mob_db.txt.
2016-12-30 19:44:31 +01:00
rAthenaAPI
44cdd34fce SQL synchronization 2016-12-30 19:34:16 +01:00
Locien
1efbe3675b Small fix to Geffen Magic Tournanment commit
Commented out missing monster skills and added a missing item.
2016-12-30 19:33:57 +01:00
rAthenaAPI
64858fba87 SQL synchronization 2016-12-30 18:48:40 +01:00
Locien
be1c0ee1e6 Geffen Magic Tournament instance - Semi-official implementation
Big thanks to @RagnarokNova for creating this script with the help of
@tokeiburu, Diablo and others. I simply converted it to be compliant
with rAthena master standard. Hope you guys enjoy it and report any bugs
:)

To clarify on the semi-official part: This script was made from scratch
by playing on iRO and may have inconsistencies with the official
version. If you want to use this on your server you must enable it
yourself by uncommenting the entry in scripts_athena.conf.
2016-12-30 18:45:49 +01:00
Atemo
a9faab82cb Fixed incorrect OnTouch label in Crow of Destiny Quest (issue #1840) and in Guild dungeon 2 event. Thanks @Tokeiburu 2016-12-29 23:00:37 +01:00
Dragonnnn
a06028bb48 Corrected misspelled git command. 2016-12-29 11:20:38 +07:00
Dragonnnn
39cc005feb Added guide to allow users to receive updates from main rAthena repo to their forked versions in Bitbucket/GitLab (#1828)
* Added guide to update forked repositories.
2016-12-28 15:21:48 -05:00
rAthenaAPI
36704f9045 SQL synchronization 2016-12-28 13:04:05 +01:00
Lemongrass3110
575583d0a6 Added some new NPC constants and mob placeholders 2016-12-28 13:03:44 +01:00
Playtester
260655a3c4 Songs and Dances vs. Dispell and Vanishing Buster (fixes #1824)
* Songs and Dances can no longer be dispelled by Dispell and Vanishing Buster
* Added a configuration to simulate the old behavior: Dispelling works if target not inside song area
2016-12-25 20:02:07 +01:00
Jittapan Pluemsumran
9f4587a652 Made prevent_logout effect on log-in optional (#1827)
* Made prevent_logout effect on log-in optional
kRO does not prevent players from logging out after connecting to its zone servers.
2016-12-25 22:16:30 +07:00
rAthenaAPI
eb142883c2 SQL synchronization 2016-12-21 08:04:07 +01:00
Jittapan Pluemsumran
b62f4a2c36
Made Para_Team_Mark_ (22508) follow kRO effect.
Fixed #1820.
2016-12-21 14:03:54 +07:00
Playtester
182557311b Official song and dance formulas (fixes #1808)
* Fixed musical lessons not having any effect on Song of Lutie's MaxHP bonus (lesson/2)
* Song of Lutie now heals 1 HP more every 2 vit instead of 5 HP more every 10 vit
* Perfect Tablature's flee bonus in renewal is now 3*skill_lv + agi/15 + lesson/2
* Perfect Tablature's perfect dodge bonus is now (skill_lv+1)/2 + luk/30 + lesson/5
* Focus Ballet's hit bonus in renewal is now 20 + 2*skill_lv + dex/15 + lesson
* Focus Ballet's hit bonus in pre-re is now 1 + 2*skill_lv + dex/10 + lesson
* Slow Grace's ASPD decrease in renewal is now 3*skill_lv + dex/15 + lesson
* Slow Grace's ASPD decrease in pre-re is now 5 + 3*skill_lv + dex/10 + lesson
* Slow Grace's speed decrease in renewal is now 2*skill_lv + agi/20 + lesson/2
* Slow Grace's speed decrease in pre-re is now 5 + 3*skill_lv + agi/10 + lesson
* Impressive Riff's ASPD increase in pre-re is now 5 + skill_lv + agi/20 + lesson/2
* Lady Luck's critical bonus is now 10 + skill_lv + luk/10 + 0.5*lesson (not rounded down)
2016-12-20 22:17:52 +01:00
Playtester
08812e0523 Monster level 10 Frost Diver and Decrease Agi (fixes #1819)
* Freeze from monster level 10 Frost Diver will now last 30s in pre-re and 32.5s in re
* Fixed monster level 10 Decrease Agi in renewal lasting way too
2016-12-20 17:17:48 +01:00
Playtester
e5a89a74f4 Fixed Satan Morroc not using most of his skills (fixes #1818)
* Satan Morroc will now be able to cast all of his skills if his HP are low
-- There is no "HP higher than" limit for casting skills, only "HP lower than"
* Satan Morroc no longer summons slaves on spawn or when idle
2016-12-20 16:56:07 +01:00
Playtester
d5357c3e9f Hell Power, Hallucination, Gospel (follow-up to 74d577c, fixes #1816)
* NPC_HELLPOWER is now a "no damage" skill and works similar to NPC_HALLUCINATION
* NPC_HALLUCINATION now has a fixed duration
* Both skills have a max level of 5 (for activation chance)
* Fixed Gospel's activation chance being 1% higher than it should be
* Fixed a compiler warning (see #1816)
2016-12-20 15:49:49 +01:00
rAthenaAPI
700950b1f4 SQL synchronization 2016-12-20 13:58:17 +01:00
Lemongrass3110
c407ec211d Fixed #1817
Additionally corrected iRO name.
2016-12-20 13:57:57 +01:00
rAthenaAPI
e3e752cdba SQL synchronization 2016-12-20 11:30:20 +01:00
Cydh Ramdh
ffb3182046 Fixed Location for Darklord Essences
* Follow up 9fcdcbde3b8bd9831ea46585af58e94a4b218525
* The compound location must be `1023`

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2016-12-20 17:26:25 +07:00
Cydh Ramdh
2896d894d1 Official Random Coordinates for Savepoint (#1756)
* Added parameters for `savepoint are range for `x` and `y` for random savepoint coordinates.
* Added documentation for new savepoint params. Credits to @aleos89
* Updated savepoint on script to follow official behaviour (random save in 3x3). All credits to @Atemo
2016-12-20 17:16:42 +07:00
Cydh Ramdh
388e699e15 Added party config change_party_leader_samemap (#1803)
* Added party config `change_party_leader_samemap`
* Prevent changing the party leader if the specified player is not on the same map (Note 1)
* Default is `yes` as official does
* This config will be ignored by `party_changeleader` script command
* Thanks to @aleos89 and @Lemongrass3110

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2016-12-20 17:06:14 +07:00
Locien
fb29b18b52 Consistency changes for script unit commands (#1801)
* Consistency changes for script unit commands

Made it so that all unit commands(except for unitexists) take 0 as the
unit ID argument which will reference the activator of the script.
Unitwarp has since previously had this functionality and it's very
useful. Example use: When a monster walks over an npc script with the
OnTouchNPC label unitkill 0; will kill the monster.

* Clean up and fixes to unit script commands self referencing with ID 0

Added a script_rid2bl function that will return the block list beloning
to an RID specified or the activator of the script if 0 is specified as
RID.
2016-12-20 02:08:35 +01:00
Lemongrass3110
1b634c8f42 Fixed showdigit's start values (#1807)
Fixed #1769
2016-12-20 01:37:40 +01:00
aleos
8492f6c35e Fixes Feint Bomb and bNoKnockBack (fixes #1814)
* Resolves Feint Bomb's backslide effect not working when the player is wearing an item that has the bonus NoKnockBack active.
Thanks to @Everade!
2016-12-19 19:32:35 -05:00
aleos
1a5e3a35bd Added readable constants for knockback functions
* Added enum for skill_blown.
* Added enum for unit_blown_immune.
2016-12-19 19:04:01 -05:00
Lemongrass3110
552c39acc3 Fixed #1809
Thanks to @Tokeiburu
2016-12-20 00:13:48 +01:00
Playtester
d1f8c8ca6c Fiber Lock vs. Land Protector (follow-up to 79e9afa)
* Fiber Lock now ends in all situations in which the unit group is removed (e.g. Land Protector)
2016-12-19 23:43:56 +01:00
Playtester
74d577ce52 Gospel, Tarot, Curse, Poison, Hallucination, Hell Power, NPC skills
* Official Gospel chances, effects and duration (fixes #1812)
-- Chance of Gospel to trigger increased from 10%*skill_lv to 50%+5%*skill_lv
-- Gospel's Heal effect now heals 1000-9999 HP instead of 1-9999 HP
-- Blessing and Increase Agi effects now last for 4 minutes instead of 60 seconds
-- Increase Defense now only lasts 10 seconds instead of 60 seconds
-- Gospel's damage is now twice likely to trigger with one of two different effects
-- Fixed Gospel's damage not showing the Holy Cross effect
-- Gospel's first damage effect deals 3000-7999 damage which is reduced by DEF (percentual in pre-re)
-- Gospel's second damage effect deals 1500-5499 damage which cannot be reduced by DEF
-- Curse, Blind and Poison effect now last 30 minutes instead of 60 seconds
-- Provoke lasts infinite, but is removed when changing maps or logging out
-- Fixed Provoke's icon from disappearing whenever a status changes
-- DEF, ATK, Flee and Speed super debuffs now only last 20 seconds instead of 60 seconds
* Official status change base duration for curse (fixes #1811)
-- Curse base duration is 30 seconds in pre-re and 20 seconds in renewal
-- Napalm Vulcan, Tarot Card of Fate, NPC_HELLJUDGEMENT, NPC_WIDECURSE use this duration
-- NPC_CURSEATTACK has a fixed 30 seconds duration
* Official status change base duration for poison (fixes #1811)
-- Poison base duration is 60 seconds in pre-re and 20 seconds in renewal
-- Duration is no longer halved for monsters in pre-re
-- Envenom, Venom Dust, Venom Splasher, Tarot Card of Fate, NPC_POISON, NPC_ACIDBREATH use this duration
* NPC_STOP now has a duration of 15 seconds instead of 10 seconds
* NPC_HELLPOWER and NPC_WIDEHELLDIGNITY now have a duration of 180 seconds instead of 300 seconds
* Tarot Card of Fate uses base duration for Curse, Poison, Stone, Freeze and Stun
-- For Confusion and Stop the duration remains fixed to 30 seconds
* All NPC status skills now have a 20%*skill_lv chance to trigger instead of 50%+10%*skill_lv
-- NPC_HALLUCINATION and NPC_HELLPOWER now only affect you to 20% instead of 100%/60%
* Damage shown by Hallucination is now completely random instead of being multiplied by 6
* The animation is now shown when trying to resurrect someone affected by Hell Power

Special thanks to @mrjnumber1 and Luke for providing various information on these.
2016-12-19 22:28:18 +01:00
Locien
a4a6dd896f Small fix to previous magic rod changes
Fixed a compiler error.
2016-12-17 04:10:07 +01:00
Locien
d92272eb89 Corrected behavior for magic rod showing its animation in pre-renewal
In pre-renewal the animation of magic rod only shows up when the user is
attacked with a spell that can be absorbed by it. In renewal it shows
when you cast the skill instead. This has been tested on iRO Chaos and
iRO Classic.
2016-12-17 00:55:34 +01:00
Lemongrass3110
b0bcd060c4 Added windows specific socket timeout code (#1714)
* Added windows specific socket timeout code

Added socket code for windows that respects our given timeout.
Also added some more ifndef checks to some stat reporting functions.
Updated the MSDN reference link.
Fixed the delay being milliseconds on windows, thanks to @theultramage
Fixes #794 on windows.
2016-12-17 00:36:23 +01:00
Stolao
25bcb51598 Merge pull request #1793 from rathena/Code_Consistancy_Edit
Code Consistency
2016-12-16 13:27:52 -08:00
Lemongrass3110
7df9962a72 Follow up to 9333921
Thanks to @Playtester's friend Ash for reporting this.
2016-12-13 09:10:07 +01:00
Stolao
f0059affb3 no message 2016-12-12 11:44:55 -08:00
Aleos
d095fe7a67 Merge pull request #1741 from rathena/cleanup/itemgroups
Cleaned up Item Groups
- Moved constants from const.txt to script_constants.h.
- Removes hard coded item groups into the IG_* database to easily be adjusted/created.
- Renamed IG_FingingOre -> IG_FindingOre.
2016-12-12 13:58:54 -05:00
Playtester
b4225e8436 Tarot Card of Fate Follow-Up (fixes #1789)
* The tarot card THE SUN no longer blocks other cards in pre-re (still does in renewal)
* Added a configuration for equal chance for all cards in case someone prefers eAthena behavior
2016-12-12 19:10:28 +01:00
Lemongrass3110
0e78dfca26 Fixed a compiler warning
Follow up to 79e9afa
Fixes #1787
Thanks to @srhmike
2016-12-12 08:47:58 +01:00
Playtester
f084db4f1c Monsters spreading out on hide (fixes #1786)
* When you hide and monsters are still on their original chase path, they will no longer spread out
-- This makes Grimtooth mobbing viable again on default settings
-- In all other situations, monsters will still spread out
2016-12-11 22:37:32 +01:00
Playtester
79e9afaff0 Fiber Lock / Spider Web (fixes #1782)
* Fiber Lock's duration now depends on the map and how many fiber locks have been stacked
-- PVM: 1st - 8s, 2nd - 16s (default - 8s)
-- PVP: 1st - 4s, 2nd - 8s, 3rd - 12s (default - 4s)
* Fiber Lock now always doubles fire damage, even in renewal
* When a unit affected by Fiber Lock takes fire damage, the Fiber Lock that lasts shortest is now removed
* A unit can now only move when all Fiber Locks on it were removed or have expired
* When a unit with multiple Fiber Locks on it dies, not all Fiber Locks are removed
* A unit can no longer be affected by more than 3 Fiber Locks at the same time
2016-12-11 19:25:48 +01:00
Lemongrass3110
ab38f2cd7e Fixed jobmasks for custom jobs(>32 bit)
Fixes #1784
Thanks to @Stolao
2016-12-11 16:33:41 +01:00
Lemongrass3110
93339212bc Fixed #1772 (#1773)
* Fixed #1772

Added support for char_id to readparam
Added a check and error message if get_var is used on a parameter instead of a variable
2016-12-11 16:00:44 +01:00
Lemongrass3110
d13acf3886 Fixed a bug with getarraysize
When the attached rid of the script was actually not a player, but a monster or something else the script was terminated. A good example for this was to use getarraysize on a OnTouchNPC event.

Thanks to MasterOfMuppets(@Locien) for reporting this.
2016-12-11 14:57:18 +01:00