12422 Commits

Author SHA1 Message Date
Aleos
fe3fccee73 Merge pull request #279 from rathena/revert-264-cleanup/skill_db
Revert rathena/rathena#264 -- Skill DB clean up
- Reverted until further issues in the main pull request are resolved.
2015-02-10 09:45:50 -05:00
Aleos
0e533fa7ab Revert "Skill DB clean ups" 2015-02-10 09:33:00 -05:00
Lemongrass3110
adbf6f05c6 SQL synchronization 2015-02-10 14:22:49 +01:00
Lemongrass3110
965416bb76 Small fixes to @lighta's convert SQL script 2015-02-10 14:18:45 +01:00
Playtester
35f8971cee Devotion, Defender, Magnificat and Sitting fixes
- A devoted player will now get the full 5%+15%*level damage reduction of Defender (fixed #234)
- Magnificat will no longer increase HP regen (fixed #275)
- Sitting will now always double the regeneration speed instead of just adding 100% to the regen bonus (i.e. Magnificat + Sitting = quadruple SP regen instead of triple)
2015-02-08 16:28:25 +01:00
Capuche
90d9da18e1 Updated instructor Ur's quests
Signed-off-by: Capuche <capucrath@gmail.com>
2015-02-08 00:57:01 +01:00
Capuche
0bebbe6c05 Typo in lv4_weapon_quest (Hercules 3d47fdff7ddae8e5f028425c653dccc4ecfcfed5)
Fixes Biolab Enchant (Hercules 265ec7e012d3414e5fc4b3360c0795b4697663f6)
Fixed Eclage Quests (Hercules 1b0eacd770b128b02d3300b7efe05da136bbed3d and 7d93099232dcf3c74349a99d9fa891927f2351d6)
2015-02-08 00:14:26 +01:00
Aleos
da081129d5 Merge pull request #264 from rathena/cleanup/skill_db
Skill array clean up
- Changed skill_db array to better memory allocation.
- Reduced MAX_SKILL_LEVEL from 100 to 10 (part of Hercules HerculesWS/Hercules@0f4a50d), also has changes on skill_get checks for skill levels greater than 10.
- Reduced MAX_SKILL from 5020 to 1200 (only 1109 skills are used).
- Added macros for checking Homunculus, Guild, Mercenary, and Elemental skill ranges.
- Added skill check and index validation when player logs in and on use of @reloadskilldb.
- Corrected enum e_skill_flag order for SKILL_FLAG_REPLACED_LV_0's sake.
- Merged 'addtoskill' script command just as alias of 'skill' script command.
Summary:
- Decreased memory usage by map-server up to 50 MB.
- Decreased memory for each player because of mmo_charstatus::skill[] array size from 5020 to 1200.
- Please use skill_get_index() for accessing sd->status.skill[] or skill_db[], don't recklessly use skill_id as array index.
NOTE:
- Please import upgrade_20150131_skillset.sql
2015-02-07 01:12:21 -05:00
Aleos
a427dbf513 Merge pull request #247 from aleos89/hotfix/issue138
Fixed #138 - Updated trap visibility to official settings.
2015-02-07 01:03:47 -05:00
Cydh Ramdh
7357f9c384 Another follow up
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-02-05 12:11:13 +07:00
Aleos
bc74ffeba4 Merge pull request #248 from rathena/cleanup/DBMap_quest
* Quest DB update
- Change quest_db_data[] fixed array to DBMap *questdb.
2015-02-04 14:12:16 -05:00
Atemo
af9d5e8566 Merge pull request #267 from RadianFord/patch-4
Custom Job Master Fixed
2015-02-04 16:08:03 +01:00
Radian
dba0ab07f1 Custom Job Master Fixed
Thanks @Cydh !
2015-02-03 15:24:17 -08:00
Cydh Ramdh
5e58ab6fc9 Follow up 72617ac98b4c40407627fe86e7123a25bfd8a025
* Fixed an error

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-02-03 12:17:15 +07:00
Cydh Ramdh
72617ac98b Skill DB clean ups
* Changed skill_db array to better memory allocation.
* Reduced MAX_SKILL_LEVEL from 100 to 10 (part of Hercules 0f4a50d135), also has changes on skill_get checks for skill level that more than 10.
* Reduced MAX_SKILL from 5020 to 1200 (actually only 1109 skills are used).
* Added macros for checking Homunculus, Guild, Mercenary, & Elemental skill ranges.
* Added skill check & index validation when player logged in and when @reloadskilldb.
* Corrected `enum e_skill_flag` order for SKILL_FLAG_REPLACED_LV_0's sake.
* Merged 'addtoskill' script command just as alias of 'skill' script command.

Summary:
* Decreased memory usage by map-server reduced up to 50 MB.
* Decreased memory for each player because of mmo_charstatus::skill[] only has 1200 array, before is 5020.
* Please use skill_get_index() for accessing sd->status.skill[] or skill_db[], don't reckless use skill_id as array index.

NOTE:
* Please import upgrade_20150131_skillset.sql

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-31 19:45:52 +07:00
Capuche
1f147f207d Quick fix in kvm battleground
Signed-off-by: Capuche <capucrath@gmail.com>
2015-01-26 18:40:52 +01:00
Atemo
a55b526d41 Merge pull request #250 from Lemongrass3110/feature/3rd-jobquest-over99
3rd Job Quest compatibility fix
2015-01-26 14:30:08 +01:00
Lemongrass3110
bffabe9c75 3rd Job Quest compatibility fix
The job quests now (all) support servers where the 2nd classes can be over baselevel 99.
Most of them were correct anyway, because they check for BaseLevel > 98 and JobLevel > 49.
2015-01-25 23:04:25 +01:00
Cydh Ramdh
1d275262b6 Quest DB update (core)
* Change quest_db_data[] with fixed array to DBMap *questdb

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-24 11:13:04 +07:00
aleos89
73243e8e9d Fixed #138 - Updated trap visibility to official settings. 2015-01-23 14:39:13 -05:00
aleos89
707403d0b6 Follow up to 7fcacb6. Fixed a compile warning. 2015-01-23 13:44:31 -05:00
aleos89
995af4c667 Merge branch 'master' of https://github.com/rathena/rathena 2015-01-23 13:16:47 -05:00
aleos89
6848ce6a93 Fixed #169 - Disabled deprecated WINSOCK API warnings for MSVS 2013. 2015-01-23 13:16:08 -05:00
Cydh Ramdh
38217d023f Merge pull request #209 from rathena/hotfix/issue180
Fixed #180
2015-01-23 23:34:45 +07:00
aleos89
a3fae7ca1e Merge branch 'master' of https://github.com/rathena/rathena 2015-01-23 11:04:00 -05:00
Cydh Ramdh
c7c0bc405a Merge pull request #246 from aleos89/master
Fixed #205
2015-01-23 22:56:51 +07:00
aleos89
54fe46f756 Fixed #205 2015-01-23 10:51:16 -05:00
aleos89
d7d65838b9 Merge branch 'master' of https://github.com/rathena/rathena 2015-01-23 10:18:54 -05:00
Cydh Ramdh
a9a8e9e96f Merge pull request #244 from RagnarokNova/patch-1
Light of Regene fixes:
* Light of Regene doesn't affect the master
* Wrong intimacy set, should be 25100 instead of 251.
2015-01-23 17:36:29 +07:00
RagnarokNova
198d230f2b Update skill.c
Follow-up according to Cydh's comment.
2015-01-23 02:30:53 -08:00
RagnarokNova
e2ae91db0e Made Light of Regene work.
Straight up copied the code from Pyroclastic, as the original skill code for Light of Regen was not applying the status effect to the player. Seems to work just fine, not sure if that second sc_start2 can just be deleted.
2015-01-23 00:33:15 -08:00
RagnarokNova
1cf2dd59c5 Light of Regene
Due to the way the source handles hom intimacy, 251 actually sets intimacy to 2 (Hate with a passion). The two extra 0s make it the appropriate value.
2015-01-23 00:20:36 -08:00
Cydh Ramdh
cdad6e4571 Follow up 1d27de7a35e58d3a71f28057d494366a597a440f
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-23 10:59:38 +07:00
nanakiwurtz
e31ed0c3ea Item DB Fix
-- Thanks to Chaos92

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-01-22 22:53:44 +07:00
aleos89
48020c4d5c Merge branch 'master' of https://github.com/rathena/rathena 2015-01-21 12:20:00 -05:00
Cydh Ramdh
c32b8e0c09 Merge pull request #229 from rathena/cleanup/itemmaxlv_n_equipitemack
Cleanup item maxlv and clif_equipitemack
2015-01-21 10:29:27 +07:00
Cydh Ramdh
44d599875a Merge pull request #206 from rathena/feature/import-maps
Import support for map data
2015-01-21 10:28:03 +07:00
Cydh Ramdh
8b05ac2875 Merge pull request #240 from rathena/cydh-patch-1
Update status.h
2015-01-21 10:27:49 +07:00
Capuche
b72162f095 Follow up f2621eec605fee7135e424dd3d466635988b2600
Signed-off-by: Capuche <capucrath@gmail.com>
2015-01-20 15:37:25 +01:00
nanakiwurtz
a60e41e8cb Mob Drop Update
-- Thanks to @DrNebula
-- Added some new monsters

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-01-20 14:06:28 +07:00
Cydh Ramdh
3b40780434 Update status.h
Just some source documentation style~
2015-01-20 01:14:00 +07:00
nanakiwurtz
88fdcc0ac2 Item DB Fix #236
-- Thanks to @trickyloki3
2015-01-19 05:44:50 +07:00
Cydh Ramdh
b47dc0f054 Item DB updates
* Implemented ALL_REVERSEORCISH as follow up 01ae1ae6126dc8aa91f967eea7d145e10dfb29e3.
* Clean up `rand()` script usage in Fools_Day_Box (12396) and Fools_Day_Box2 (12397).

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-18 20:57:42 +07:00
Cydh Ramdh
01ae1ae612 Fixed #235
* Thank @trickyloki3
* Except items with "ALL_REVERSEORCISH" skill

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-18 19:09:18 +07:00
Atemo
95792ecac8 Merge pull request #233 from emistry/patch-2
Fixed Issue #232
2015-01-17 12:05:25 +01:00
Cydh Ramdh
009e0e3846 Missing md.damage assignment after battle_attr_fix for RENEWAL CR_ACIDDEMONSTRATION in battle_calc_misc_attack since f926d8750aef664abd91404de53c5a5e60d9e16f
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-17 17:59:30 +07:00
Emistry
e134c76859 Issue #232
https://github.com/rathena/rathena/issues/232

Just like @Cydh said:
somehow, += for a string in iteration is fail. /hmm
temp fix is .@foo$ = .@foo$+"bar";
2015-01-17 15:14:28 +08:00
Cydh Ramdh
b9f5bca9b1 Follow up fa75733cc109f926b1df4156ccdf1292c78f8f79 typos
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-16 23:38:00 +07:00
aleos89
ee6e47b7c2 Merge branch 'master' of https://github.com/rathena/rathena 2015-01-16 11:22:44 -05:00
Cydh Ramdh
73bd593055 Fixed #219
* Manhole effect (SC__MANHOLE & UNT_MANHOLE) is ignore player's knockback immunity at GVG/BG maps (only if target is BL_PC).

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-16 20:38:26 +07:00