13748 Commits

Author SHA1 Message Date
Jittapan Pluemsumran
77212ece52
Follow up to 21c636c
Move CELL_CHKLANDPROTECTOR check to ST_WATER check
2016-04-17 18:30:55 +07:00
Jittapan Pluemsumran
21c636c12b
Correct Aqua Benedicta interaction with Watery Evasion to match official behavior. Fixes #1119 2016-04-17 17:45:02 +07:00
Playtester
33efbd0869 Summoner, Novice and Level 151+ HP/SP updated (fixes #1181)
* Summoner HP/SP values are now accurate for both HP/SP tables and the automatic calculation
* Summoner HP/SP adjustments in the code are now at the correct place and only used when the HP/SP tables are not used
* Super Novices now gain +2000 HP at both level 99 and level 150 and the bonus stays even on level 100-149 and 151+ (fixes #979)
* Normal Novices no longer get a HP boost
* Updated HP/SP tables to official values for level 151-175 and extrapolated new values for up to level 500
* Removed 3rd classes from the HP/SP tables in pre-re and replaced them with dummy data (using Novice values)
-- Note: This way updates like this one don't need to be done twice. If you want to use 3rd classes in pre-re just copy over the lines you need from the re folder or even better, use the import folder. You should use it for all customizations you do for easier updating.
2016-04-17 01:08:44 +02:00
Atemo
05a1b61bed Correct script part 2016-04-16 16:45:33 +02:00
Atemo
803a139e78 Correct docs and script follow up the refactor of EQI 2016-04-16 15:55:20 +02:00
aleos89
5d446e533b Updated Power of Sea effect (fixes #1174)
* Now gives MHP + 1000 and MSP + 100.
* Spending 20 skill points on Fish-type skills the bonus becomes MHP + 3000 and MSP + 300.
2016-04-16 09:51:14 -04:00
Lemongrass3110
7046cf8fc5 Fixed two npcs which used hardcoded EQI_ values
Follow up to 2bf64c9
2016-04-16 11:14:36 +02:00
Lemongrass3110
5731eca3b0 Fixed two item's weapon type
Thanks to @admkakaroto
Fixes #1172
2016-04-15 21:39:37 +02:00
aleos89
63e772956b Corrected some skills healing immune targets (fixes #1109)
* Gentle Touch - Cure and Tuna Belly will no longer heal Emperium or Barricades.
Thanks to @admkakaroto and @Darkelfen!
2016-04-15 10:50:13 -04:00
aleos89
a1777407f9 Resolved final GCC compile warnings
* Fully fixes #1171.
* Follow up to ee3cf98.
2016-04-15 10:02:51 -04:00
nanakiwurtz
a85a907df6 Item DB Update
* Added more Doram items and combo
* Thanks to @Darkelfen, @secretdataz, @Daniel4rt

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2016-04-15 09:49:24 +07:00
Lemongrass3110
7264099fb9 Fixes some compiler warnings on GCC
Partially fixes #1171 as a follow up to 2bf64c9.
2016-04-14 23:24:15 +02:00
Aleos
a41ba12cf2 Fixed character deletion on 2015-11-04 and higher (fixes #1167)
* Resolves characters not being removed from the character select screen after the delete time is met and clicking the delete button.
Thanks to @joelolopez, @Darkelfen, and @Lemongrass3110!
2016-04-14 17:01:29 -04:00
nanakiwurtz
fdf67ed119 Follow up to ad9df23
* Added padding to job bitmask to prevent confusion

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2016-04-15 02:02:25 +07:00
aleos89
9a3afff176 Merge branch 'master' of https://github.com/rathena/rathena 2016-04-13 14:07:39 -04:00
aleos89
bd3952c3d4 Updated Body Style command
* Now allows for Arch Bishop class.
2016-04-13 14:07:06 -04:00
Playtester
7e97b0db86 Summoner skill status changes
* Until tested, Summoner skills will now use the default renewal base duration for their status changes
-- Bleeding: 120s
-- Stun: 5s
* Moved status change durations to duration2 for these skills
2016-04-13 18:14:49 +02:00
Playtester
e3500093b1 Catnip Meteor Cast, AoE and Damage (fixes #1166)
* Catnip Meteor now has a variable cast time of 7500ms (previous 6000ms)
* Catnip Meteor now has a cooldown of 5000ms on all levels (previously 2000-6000ms)
* Each meteor now has an AoE range of 7x7 (previously 3x3)
* Each meteor now deals 5 hits regardless of level used (previous 1-5 hits)
* Each hit now only deals 40%+20%*level damage (previously 200%+100%*level)
-- Note: As damage is multiplied by number of hits (can hit plants), damage per meteor is now 200%+100%*level
2016-04-13 17:51:31 +02:00
aleos89
67e26c885d Added a new script command unitexists
* Small follow up to 4f16d82.
* Checks to see if a unit exists or not.
2016-04-13 09:34:43 -04:00
nanakiwurtz
2874b76b98 Removed excess right curly brackets on item_db_re
* Thanks to @Yuchinin

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2016-04-13 18:19:01 +07:00
Lemongrass3110
2bf64c9773 Refactored the EQI constants
The EQI constants of the constants database did not match the ones used in the source up to now.
For whatever reason long long ago an array was created which mapped the const_db EQI constants to the source's EQP constant(aegis bitmasks).
With this commit we now use the already existing array from pc.h(which was moved from pc.c to be accessible).

This merges and closes #1147 due to follow up changes with 1cd3741.
2016-04-13 11:11:42 +02:00
rAthenaAPI
99fe9a4418 SQL synchronization
[ci skip]
2016-04-12 20:03:43 +02:00
Lemongrass3110
ad9df23d91 Merge pull request #1153 from secretdataz/db/item/vicious
Item database update - Vicious Mind weapons

Thanks to @secretdataz for the updates and @nanakiwurtz for reviewing!
2016-04-12 20:02:24 +02:00
aleos89
4f16d82540 Added return values for unit script commands (fixes #1143)
* Script commands getunitdata and setunitdata will return -1 when the given GID is not found.
* Script commands getunitname and setunitname will return Unknown when the given GID is not found.
2016-04-12 10:16:58 -04:00
aleos89
ee3cf98daa Fixed a possible item ID overflow for script command makeitem (fixes #1160)
* Fixed a possible overflow with script command getareadropitem.
* Adjusted item count variables to match item ID variable type as well.
2016-04-12 09:52:06 -04:00
Jittapan Pluemsumran
ade6b2ae98
Follow up to 3ba54ff 2016-04-12 13:36:06 +07:00
nanakiwurtz
c8ee48ab10 Follow up to cee4081
* Reverted MATK value of Eden Group Foxtail I (1699)
* Thanks to @zackdreaver and @julia40124009

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2016-04-12 11:40:44 +07:00
Playtester
87471044aa Auto spell error log (fixes #1154)
* When using auto spell, it will no longer print error messages to the map-server when no valid skill was selected

Note: This needs to be done because the client sends us random IDs if the user simply presses on "Ok" without selecting a skill, so it's technically not an error, but expected behavior that needs to be handled.

Special thanks to @anacondaqq and @stealth62 for helping to reproduce the error.
2016-04-11 19:51:51 +02:00
aleos89
17685a3247 Fixed Heaven Drive not doing any damage (fixes #1156)
* Moved the Silver Vine Root Twist cancellation from Heaven Drive to skill_additional_effect as it was breaking out of the switch before skill_attack.
2016-04-11 09:45:03 -04:00
Aleos
6dfdc4519a Merge pull request #1122 from rathena/cleanup/runonce-warnings
Removed some warnings in run-once mode
* Some notice and warning messages are not important in run-once mode.
Thanks to @Lemongrass3110!
2016-04-10 09:53:52 -04:00
Aleos
1cd3741055 Merge pull request #1120 from secretdataz/feature/geteqweaponlv
Made a new argument for script command getequipweaponlv
* Added -1 which will return the weapon level that the item is compounded on.
Thanks to @secretdataz!
2016-04-09 10:08:15 -04:00
MysticFutur0
c38bc88b8e Corrected Power of Life (fixes #1138)
* Skill was giving 2 instead of 20 CRIT to players.
Thanks to @MysticFurur0RE!
2016-04-09 08:52:11 -04:00
Jittapan Pluemsumran
3ba54ffa34
Item database update - Vicious Mind weapons 2016-04-09 01:21:47 +07:00
aleos89
5e58149bbc Added support for 2015-11-04aRagEXE
* Added support for this client to replace the 2015-10-29aRagEXERE which had issues with unknown packets causing random disconnects.
Thanks to @icxbb-xx and @renniw!
2016-04-08 12:36:46 -04:00
aleos89
5766fc6209 Corrected the return value for script command query_sql
* Should return 0 on an empty query and -1 on a query failure.
* Updated script command documentation.
2016-04-08 09:27:14 -04:00
Playtester
98dc0608c7 Catnip Meteor (follow-up to 1365d94, hopefully fixes #1149)
* Fixed Catnip Meteor not deploying units when using a catnip fruit

Special thanks to @MysticFurur0RE
2016-04-07 21:49:41 +02:00
Lemongrass3110
9efd319900 Updated ZLIB
Upgraded from version 1.2.7 to the latest version 1.2.8

Source:
http://www.zlib.net/
2016-04-07 01:02:15 +02:00
aleos89
2305a66101 Resolved a flag overlap for status_change_clear_buffs
* Small follow up to 894d6f2.
* Resolves Chemical Protection flag coinciding with the Lux Anima flag.
* Changed all bitmask values to readable constants.
2016-04-06 09:09:39 -04:00
nanakiwurtz
486495cab8 Edited small typo on script_commands.txt
Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2016-04-06 13:12:01 +07:00
nanakiwurtz
cee4081364 Follow up to a40b0e5 (Updated Doram items)
* Updated item_db.txt, item_db.sql, item_combo_db.txt
* Thanks to @cydh, @Darkelfen, @julia40124009, @secretdataz

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2016-04-06 13:07:24 +07:00
Aleos
8a3c6727a2 Merge pull request #1130 from rathena/cleanup/status-mode-access
Standardized access to mode fields
* Preparation for future update.
Thanks to @Lemongrass3110!
2016-04-05 12:51:56 -04:00
Lemongrass3110
397728c213 Fixed an issue with mob randomwalk
This was caused accidently while trying to resolve some compiler warnings.
Partial revert of 8d43623
2016-04-05 09:41:32 +02:00
Playtester
2369f39854 Eska (fixes #1136)
* Eska no longer changes hard DEF
* In pre-renewal, Eska increases soft DEF by a random 0~99 each hit
* In renewal, Eska increases soft DEF by a fixed 80
* Eska no longer uses a weird timer that doesn't work anyway
* Fixed the effect of Eska not being removed when the status change ends on monsters
2016-04-04 22:44:04 +02:00
aleos89
8d43623a2b Resolved several compile warnings
* Miscellaneous compile warning fixes.
2016-04-04 13:27:43 -04:00
Atemo
d53a294a19 Merge pull request #1135 from secretdataz/db/item/update-1
Minify item scripts
Thanks @secretdataz
2016-04-04 18:27:13 +02:00
Jittapan Pluemsumran
5a4ed0d206 Follow up to 97e8891
I goofed hard.
2016-04-04 22:44:02 +07:00
Jittapan Pluemsumran
97e8891550 Fix typo in Big_Eggring_Card script 2016-04-04 21:37:06 +07:00
Jittapan Pluemsumran
691866ba34 Follow up to a266d5aa22148f8a14f00ba24b327ff8728deb64
Fix unmatched ')'
2016-04-04 21:34:02 +07:00
Jittapan Pluemsumran
a266d5aa22 SQL synchronization 2016-04-04 19:04:15 +07:00
Jittapan Pluemsumran
f6254b8706 Follow up to a0619d72c5e90ba2b36c74b69ba670b026abde64
Update combo scripts to use min/max
2016-04-04 18:58:44 +07:00