12454 Commits

Author SHA1 Message Date
aleos89
d3625e5c10 Cleaned up merge issues. 2015-02-21 15:43:58 -05:00
Cydh Ramdh
c92915b6cd DEFAULT_MAP clean up
* Moved hardcoded `DEFAULT_MAP`, `DEFAULT_MAP_X`, and `DEFAULT_MAP_Y` definition to conf/char_athena.conf: `default_map`, `default_map_x`, and `default_map_y` for `DEFAULT_MAP`
* Default map existance check only will be checked once, after map_index finished load by char-server, previously map-server also do a check that maybe cause unnecessary debug message
* `instance_start` value should be init'd with `map_num` not by `map_num + 1`. I was causing send extra 1 empty map to char-server.
* A little clean up in `chmapif_parse_getmapname()` and `doc/packet_interserv.txt`

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-02-19 15:02:14 +07:00
Capuche
001e6967d4 Fixed some variables issues and cleaned Instructor Boya and Michael
Signed-off-by: Capuche <capucrath@gmail.com>
2015-02-19 01:09:30 +01:00
Atemo
9849945756 Merge pull request #286 from emistry/patch-2
Fixed Issue #283
2015-02-16 22:31:17 +01:00
Capuche
6552a184f6 Follow up 7e997bf267e937d314ec594650284fa7f82358cd fixed a mistake 2015-02-16 18:59:00 +01:00
Capuche
7e997bf267 Updated Blacksmith Thorn and Weapons Expert NPC
Signed-off-by: Capuche <capucrath@gmail.com>
2015-02-16 01:31:18 +01:00
Cydh Ramdh
2ae4bcb694 Implemented 'NeedLevel' for Homunculus skill tree
* Changed 'JobLevel' to 'NeedLevel' and don't make it as optional.
* Make sure homun_skill_tree.txt column number is 15!

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-02-16 00:38:09 +07:00
Cydh Ramdh
36be5aa5b9 Homunculus intimacy check
* Moved out intimacy required to evo the homun to conf/battle/homunc.conf: 'homunculus_evo_intimacy_need'
* Moved out intimacy reset after evo the homun to conf/battle/homunc.conf: 'homunculus_evo_intimacy_reset'
* Follow up eca4fa0e38c060c0f9918d11899ee00d099a16f7, missed the '/100' for intimacy info.
* Corrected intimacy set after using skill 'HVAN_EXPLOSION' to 1 (100, Hate with passion) instead of 2 (200, is for HFLI_SBR44)
* Init 'hardcoded' homunculus intimacy grade tables for some lookups

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-02-16 00:32:41 +07:00
Cydh Ramdh
3c202388e5 Bug fixes:
* Fixed wrong check while reading homun_skill_tree.txt, causing homunculus skill tree doesn't follow prerequisite skills.
* Follow up 083cf5d9626b7aafd9856f406d3f9d2a98e19cbe, homunculus def & mdef aren't resetted on calculation.
* Reduce max Homunculus skill tree to 8 (previously using MAX_SKILL_TREE fro player, 84)

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-02-15 16:07:58 +07:00
Cydh Ramdh
ddfe1683a5 Skill ID in array leftover~
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-02-15 13:34:11 +07:00
Cydh Ramdh
f1d7cc5777 Homunculus skill tree fix.
~ Thank Philippe Girard

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-02-15 10:18:37 +07:00
Cydh Ramdh
db7e130366 Fixed wrong 'subrace' value for combo effect, should be -/+200 instead of -/+300
* 2376:2435:2538
* 2377:2435:2538
* 2378:2435:2538
* 2379:2436:2539
* 2380:2436:2539
* 2381:2436:2539
* 2382:2437:2540
* 2387:2440:2744

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-02-13 19:55:47 +07:00
Cydh Ramdh
d5b271b926 Merge pull request #289 from rathena/feature/bonus_HPSP_VanishRace
Bonus HP/SP Vanish updates:
* Added 'bonus3 bHPVanishRaceRate,r,n,x' (2074) and 'bonus3 bSPVanishRaceRate,r,n,x' (2075)
* Corrected documentation about 'bHPVanishRate' and 'bSPVanishRate', rate should be n/100%, 10000 for 100%
* 'bHPVanishRate' and 'bSPVanishRate' applied regardless the target's Race and map (before, if target is player bHPVanishRate only works in PVP/GVG maps)
* Changed Velum item scripts:
  * (1294) Velum_Scare to 'bonus3 bSPVanishRaceRate,RC_Player,10000,10;'
  * (1395) Velum_Buster to 'bonus3 bSPVanishRaceRate,RC_Player,10000,10;'
  * (18113) Velum_Arbalest to 'bonus3 bSPVanishRaceRate,RC_Player,10000,4;'
  * (21002) Velum_Katzbalger to 'bonus3 bHPVanishRaceRate,RC_Player,10000,8;'
2015-02-13 16:45:23 +07:00
Cydh Ramdh
bf6d2f0197 Merge pull request #263 from rathena/cleanup/bonus_script
Bonus Script clean up
* Removed fixed array size (MAX_PC_BONUS_SCRIPT) of bonus_script on players, changed to link list.
* Changed fixed script string on player's bonus_script to StringBuf, reduce memory usage for each connected player.
* Added new flags to expand duplicated script and flag to allow duplicate script.
* Reduced buf length from 1024 to 512 on bonus_script_data (used for saving/loading bonus_script from char-server). Still, MAX_PC_BONUS_SCRIPT is used to gives limit data can be loaded.
* Merged 'pc_bonus_script_clear_all' to 'pc_bonus_script_clear'
* Now bonus script will be saved on auto-save timer or other save request, prevent losing the bonus when "something" happen. But, saving when player is quitting will removes the bonus that won't be saved on logout.
* Fixed Superstar_Snack (22843) and Sealed_Dracula_Card (22846) fields

NOTE:
Please import 'upgrade_20150131.sql' for `bonus_script` table changes

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-02-13 16:37:28 +07:00
Cydh Ramdh
4726f4c968 Fixed warning from unused variables
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-02-13 16:28:55 +07:00
Cydh Ramdh
ebc009e252 Wrong documentation 4cf7acc65203acef252d6f299ab01e14acf2f007 :P
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-02-13 16:12:07 +07:00
Cydh Ramdh
4cf7acc652 A follow up of 2ef7a7daa8f7fdc74cf4e9b3815c1345c777a06d
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-02-13 15:19:29 +07:00
Cydh Ramdh
2ef7a7daa8 Bonus HP/SP Vanish updates:
* Added 'bonus3 bHPVanishRaceRate,r,n,x' (2074) and 'bonus3 bSPVanishRaceRate,r,n,x' (2075)
* Corrected documentation about 'bHPVanishRate' and 'bSPVanishRate', rate should be n/100%, 10000 for 100%
* 'bHPVanishRate' and 'bSPVanishRate' applied regardless the target's Race and map (before, if target is player bHPVanishRate only works in PVP/GVG maps)
* Changed Velum item scripts:
  * (1294) Velum_Scare to 'bonus3 bSPVanishRaceRate,RC_Player,10000,10;'
  * (1395) Velum_Buster to 'bonus3 bSPVanishRaceRate,RC_Player,10000,10;'
  * (18113) Velum_Arbalest to 'bonus3 bSPVanishRaceRate,RC_Player,10000,4;'
  * (21002) Velum_Katzbalger to 'bonus3 bHPVanishRaceRate,RC_Player,10000,8;'

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-02-13 01:39:17 +07:00
Cydh Ramdh
9d3d34205f 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.
* Fixed #277
* Changed 'skill' script command flag to constant value

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>

NOTE:
* 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.
* Please import upgrade_20150211_skillset.sql

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-02-12 15:50:50 +07:00
Cydh Ramdh
892e961823 * Fixed Superstar_Snack (22843) and Sealed_Dracula_Card (22846) fields
* Removed debug leftover

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-02-12 14:57:59 +07:00
Emistry
9fa7a5fd50 Issue #283
Enable same items to be added to different category.
2015-02-12 08:59:16 +08:00
Lemongrass3110
12a0b0533b Follow up to 083cf5d
Fixed a compilate error when renewal aspd calculation was disabled.
Fixes #284
2015-02-11 23:58:28 +01:00
Capuche
cc1e89012f Follow up abc78e51f7de938c881d45720da67e3fef3450a5
Signed-off-by: Capuche <capucrath@gmail.com>
2015-02-11 23:11:47 +01:00
aleos89
831dcc2608 Follow up to 083cf5d
- Fixed MATK calculation for pre-renewal.
- Resolved compile warnings.
2015-02-11 09:56:44 -05:00
Lemongrass3110
abc78e51f7 Fixed friendship quest questlog
Added a check if the quest was already added to the questlog.
Additionally removed some AEGIS logic that was converted without thinking.

Fixes #241
2015-02-10 23:50:26 +01:00
Lemongrass3110
d98c0dd4e3 Fixed duplicate pickup animation for thief's pick stone
Fixes #276
2015-02-10 23:17:21 +01:00
Aleos
f931ba80c7 Merge pull request #280 from Akkarinage/hotfix/readme
Updated README files with correct URLs.
2015-02-10 15:00:17 -05:00
aleos89
769a27287f Follow up to 083cf5d
- Fixed compile warnings.
2015-02-10 14:58:17 -05:00
Akkarinage
adf64907d0 Updated README files with correct URLs.
Signed-off-by: Akkarinage <akkarin@rathena.org>
2015-02-10 17:44:19 +00:00
aleos89
083cf5d962 Bug Fixes
* Fixed Severe Rainstorm not being able to be copied by Reproduce. (bugreport:9361)
* Fixed #137 - Updated Homunculus S Race and Element values to official.
* Fixed #163 - Proper renewal calculations for Homunculus. Merge from HerculesWS/Hercules@8faef4f
* Fixed #254 - Corrected King's Grace cooldown to be 60 seconds.
* +20 Foods cannot be dispelled or removed by death.
2015-02-10 12:13:08 -05:00
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
148353eed9 Follow up 95705d41bee8d15d50d34c484617790e4aae9b21
* Changed bonus script list to link list
* Merged 'pc_bonus_script_clear_all' to 'pc_bonus_script_clear'
* Now bonus script will be saved on auto-save timer or other save request, prevent losing the bonus when "something" happen. But, saving when player is quiting, will removes the bonus that won't be saved on logout.

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-02-03 11:56:09 +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
Cydh Ramdh
95705d41be Bonus Script clean up
* Removed fixed array size (MAX_PC_BONUS_SCRIPT) of bonus_script on players.
* Changed fixed script string on player's bonus_script to StringBuf, reduce memory usage for each connected player.
* Added new flags to expand duplicated script and flag to allow duplicate script.
* Reduced buf lenght from 1024 to 512 on bonus_script_data (used for saving/loading bonus_script from char-server). Still, MAX_PC_BONUS_SCRIPT is used to gives limit data can be loaded.

NOTE:
Please import 'upgrade_20150131.sql' for `bonus_script` table changes

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-01-31 15:07:13 +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