13748 Commits

Author SHA1 Message Date
Aleos
196536e491 Merge pull request #1322 from wilkemeyer/fix/mapserver-intif-party-addmember-wfifoset
Corrected intif_party_addmember send-buffer-allocation size
Thanks to @wilkemeyer!
2016-05-27 17:30:29 -04:00
Florian Wilkemeyer
b7643e3373 map-server: intif -> intif_party_addmember: fixed wrong wfifo buffer space reservation / allocation 2016-05-27 20:57:21 +02:00
Jittapan Pluemsumran
5287f82a0e
Add support for unsetting bit flag in item_noequip (Closes #1319).
* Unset the flag by passing in negative value.
* Thanks to @Everade
2016-05-28 00:20:08 +07:00
Florian Wilkemeyer
332f66d9c8 map-server: corrected intif_create_party sent-buffer-allocation size. 2016-05-27 16:58:01 +02:00
Stolao
38155a625e Merge pull request #1294 from rathena/resetnpc_update
updated resetnpc
2016-05-26 16:03:28 -07:00
Jittapan Pluemsumran
c0ab4d5594
Documentation update on body style (LOOK_BODY2) 2016-05-27 01:58:32 +07:00
Playtester
1640b40236 Official Enchant Blade damage (fixes #975)
- Implemented the fully official damage calculation for this skill, it's now 100% accurate
** Partially reverted c3f4618
** The damage bonus is: [((SkillLv x 20) + 100) x srcBaseLevel / 150] + srcINT + srcMATK - tarMDEF - tarMDEF2
** The damage bonus from base level and INT is calculated when the status change starts
** The damage bonus from MATK and the reduction from MDEF/MDEF2 is calculated per hit
2016-05-26 20:06:24 +02:00
aleos89
f91bf02154 Resolved instance destruction causing a map crash (fixes #1309)
* Follow up to 32c829d.
2016-05-26 11:07:34 -04:00
aleos89
161a4c01c9 Small adjustments for the instance system
* Follow up to 32c829d.
* Added a missing break on guild type instance creation.
- Thanks to @Canoe!
* Added instance name back to script command instance_enter.
- This will present the proper error message when trying to enter another instance.
2016-05-26 09:06:49 -04:00
Lemongrass3110
a98d6b13e8 Refactored the code of the parsing function 2016-05-26 12:25:29 +02:00
Jittapan Pluemsumran
5ac2292cc3 Correct Fatal enchantment item script. Fixes #1307 2016-05-26 11:51:14 +07:00
Aleos
32c829debe Merge pull request #1264 from rathena/feature/instance_expansion
Expanded the instance system to support new modes
* New modes include: No player attached, single player, and guild.
* Modified the instance_db to allow instance idle time to be adjustable.
* Removed Map1 from the instance_db as the EnterMap is always the same value.
* Adjusted the stored maps of instances to dynamic arrays to conserve memory.
- Max amount of possible maps increased to 255.
* Instances will now be destroyed even if the owner cannot be found.
* Corrected the return value when entering an instance when a character, party, or guild does not have an instance.
* Expanded script command instance_create to take in an owner ID and an optional mode.
* Added a new script command instance_check_guild (works the same as instance_check_party).
* Corrected a few script commands to properly stop the script engine on failures for instance script commands.
* Removed the instance name lookup for when entering an instance as instance_id is now passed.
- Adjusted script command instance_enter to no longer require the instance name.
* Cleaned up script command instance_warpall.
* Adjusted script command instance_announce to check when instance ID is 0 rather than -1 since instance IDs are stored as unsigned now.
* Refactored all instance_id to unsigned short.
* Updated documentation to reflect changes.
2016-05-25 14:55:50 -04:00
aleos89
28ad9ac22d Resolved compile warnings
* Follow up to 2cfb844.
* Initialized some variables.
2016-05-25 14:22:27 -04:00
Jittapan Pluemsumran
6f0ed156f4
Fixed #1114
Made Rhydo rune undispellable.
Correct variable type in Old Glast Heim script.
Thanks to @nehpetskie
2016-05-25 19:18:07 +07:00
Jittapan Pluemsumran
e81137c0a9
SQL Synchronization 2016-05-25 12:01:18 +07:00
Jittapan Pluemsumran
9b4c7dd1fe
Correct hit amount of KO_HUUMARANKA
Fixes #1300. Thanks to @spinzaku
2016-05-25 11:57:26 +07:00
Aleos
e40c5a2fc3 Merge pull request #1279 from secretdataz/cards
Item database update - kRO Cards
* Added Infinite Space, Nightmare Pyramids, and Bio Labs level 4.
* Added a couple missing combo bonuses.
Thanks to @secretdataz!
2016-05-24 19:10:10 -04:00
nanakiwurtz
aec8b516b6 Fixed #1296
* Thanks to @X-eno

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2016-05-25 04:35:07 +07:00
Stolao
a0dd3a175a Changed revision numbering 2016-05-24 07:46:23 -07:00
aleos89
1cd648b1af Resolved compile errors
* Follow up to 1408eef.
2016-05-24 10:30:42 -04:00
aleos89
1408eefd80 Expanded max maps per instance define
* Follow up to c97be60.
* Increased the max amount of maps per instance to the limit.
2016-05-24 09:57:42 -04:00
aleos89
6babca3689 Corrected a few minor issues
* Follow up to 2cfb844.
* Adjusted the instance_db documentation.
* Adjusted script command instance_announce to check when instance ID is 0 rather than -1 since instance IDs are stored as unsigned now.
* Added a couple of checks when sending instance information to the client.
* Fixed a compile warning.
2016-05-24 09:22:03 -04:00
aleos89
cc30d9df09 Resolved some map blocks not getting freed
* Fixes Bio Explosion, Suicide Bombing, and Summon Legion not properly freeing map blocks.
Thanks to @Tokeiburu!
2016-05-23 14:55:49 -04:00
aleos89
c591586f2b Adjusted instance script's instance_enter to new format
* Follow up to c97be60.
* No longer requires instance name.
2016-05-23 14:20:55 -04:00
aleos89
2cfb844429 Refactored a bit of the instance modes
* Follow up to c97be60.
* Added some safety measures when sending the instance name to the client.
* Adjusted the stored maps of instances to dynamic arrays to conserve memory.
- Max amount of possible maps increased to 255.
* Removed Map1 from the instance_db as the EnterMap is always the same value.
* Instances will now be destroyed even if the owner cannot be found.
* Corrected the return value when entering an instance when a character, party, or guild does not have an instance.
* Corrected a few script commands to properly stop the script engine on failures for instance script commands.
* Removed the instance name lookup for when entering an instance as instance_id is now passed.
- Adjusted script command instance_enter to no longer require the instance name.
* Adjusted script command instance_create to keep backwards compatibility.
* Cleaned up script command instance_warpall.
* Updated script documentation to reflect changes.
* Updated instance_db to reflect changes.
2016-05-23 14:12:34 -04:00
aleos89
9c89b0e06e Revert "Adjusted instance scripts to new format"
This reverts commit 8f7d2208a972d2bee603364a6069bf1e8127e59d.
2016-05-23 12:56:11 -04:00
Stolao
65419729f9 updated resetnpc 2016-05-23 05:10:34 -07:00
Jittapan Pluemsumran
631187b3ec
Follow up to 33184fe
add comment/explaination on the fix
[ci skip]
2016-05-23 00:51:46 +07:00
Jittapan Pluemsumran
33184fe3d5
Assassin job quest shouldn't set variable before the dialog is actually finished.
Fixes #1228. Thanks to @MrAntares and @spinzaku.
2016-05-23 00:43:48 +07:00
aleos89
6e9c67cb82 Fixed active_transform not getting removed (fixes #1282)
* Corrected active_transform and transform stacking display issues.
* Implemented ZC_EFST_SET_ENTER and ZC_EFST_SET_ENTER2.
- Adjusted the sc_display to make use of this.
Thanks to @exneval for the packet info!
2016-05-22 09:22:20 -04:00
Lemongrass3110
208407cfe6 Added the new import templates 2016-05-22 03:59:13 +02:00
Lemongrass3110
1e6eb7d1da Removed old entries item_group_db 2016-05-22 03:58:54 +02:00
Lemongrass3110
1739ff4153 Changed item group parsing to svreaddb 2016-05-22 03:54:52 +02:00
aleos89
4f3468958f Added a map cell check for Shadow Leap (fixes #1291)
* Resolves players being able to enter non-walkable parts of maps.
Thanks to @Tokeiburu!
2016-05-21 09:47:59 -04:00
aleos89
19f2bc597c Corrected NPC Earthquake skill (fixes #1289)
* Properly implemented the skill as a unit skill.
* Corrected the damage calculation and removed attempts at diving by zero.
* The skill now ignores the target's defense.
2016-05-20 14:00:58 -04:00
Jittapan Pluemsumran
37b3644350
Correct Boarding_Halter weight 2016-05-20 22:19:51 +07:00
Jittapan Pluemsumran
4a671ea379 Merge pull request #1183 from secretdataz/fix/holywater
Aqua Benedicta/Water Ball official behavior. Fixes #1119
2016-05-20 19:10:45 +07:00
Jittapan Pluemsumran
7e31f4fc3e Merge branch 'fix/issue1272' 2016-05-20 18:01:02 +07:00
Jittapan Pluemsumran
d1819e71b6
RAG203 (13190, 13195) should use AL_DECAGI on enemy.
Fixes #1272. Thanks to @Yuchinin
2016-05-20 17:56:02 +07:00
Lemongrass3110
2e668ea25a Merge pull request #1286 from Jeybla/add_1278
Adds var 'killedrid' to script monster OnKillEvents. (Closes #1278)

Thanks to @Jeybla - tested by @Stolao and confirmed as working.
2016-05-20 12:49:45 +02:00
Jittapan Pluemsumran
935235cea0
Item bonus bAddEff should not effect the user when hit by own skill. Fixes #720 2016-05-20 13:01:24 +07:00
Jey
5b35e1afd0 Adds var 'killedrid' to script monster OnKillEvents. (Closes #1278) 2016-05-20 02:10:22 +02:00
Cydh Ramdh
ed8c9672ee Fixed #1285
* `SC_HASTEATTACK_CASH` -> `SC_ATTHASTE_CASH`

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2016-05-20 06:29:58 +07:00
Jittapan Pluemsumran
440a265dff
Follow up to bcdf196
silly mistake
2016-05-20 03:06:01 +07:00
Jittapan Pluemsumran
bcdf196391
Implemented new kRO cards
Added monster from new Biolab as placeholder for transform script
Corrected Nightmare Pyramids card drops
2016-05-20 03:02:29 +07:00
aleos89
01bff3bb08 Follow up to db0f231
* Refactored battle_vanish a bit more.
Thanks to @Lemongrass3110!
2016-05-19 12:38:27 -04:00
aleos89
db0f231507 Corrected vanish damage with some physical damage statuses (fixes #1262)
* Resolves Exceed Break, Spell Fist, and Giant Growth being able to do more damage with Vellum-type weapons.
* Optimized the battle_vanish calculations to their respective case.
2016-05-19 10:48:16 -04:00
Lemongrass3110
0bd54c4114 Merge pull request #1284 from secretdataz/fix/issue1265
Correct Strawberry_Decoration (2979) and Tasty_Strawberry_Hat (18852)…
2016-05-19 13:55:42 +02:00
Jittapan Pluemsumran
1672e0f7cc
Correct Strawberry_Decoration (2979) and Tasty_Strawberry_Hat (18852) item script. Fixes #1265 2016-05-19 18:40:03 +07:00
Lemongrass3110
b2a50491d9 SQL Sync
[ci skip]
2016-05-19 10:08:22 +02:00