15441 Commits

Author SHA1 Message Date
Lemongrass3110
c20d1cc3e9 Follow up to 243f4ca 2017-11-13 21:04:23 +01:00
Lemongrass3110
243f4ca3be Support for 2017-10-25 and 2017-11-01
Merges HerculesWS/Hercules@3e03556

Thanks to @4144
2017-11-13 20:51:58 +01:00
Aleos
805a6fb69a
Updated Heal formulas to match kRO (#2585)
* Fixes #2575 and fixes #2574.
* Adjusted the formula to properly account for bonuses which are additive of one another, not multiplicative.
* Added the global multiplier which is added on after MATK.
* Updated Highness Heal, Fresh Shrimp, and Bunch of Shrimp heal formulas.
Thanks to @Tokeiburu for his extensive research and code!
2017-11-13 13:02:39 -05:00
Jeybla
576d48865d
Adds Emotion Conversion Script (#2600)
* Simple scripts which replaces the old emotion script constants to new constants
* Follow up to ea88ea50546fd140bda875056f83a60b6b0bef96
2017-11-13 16:39:14 +01:00
Aleos
da0883572d
Small cleanup of Rune Knight Runes (#2596)
* Small cleanup of Rune Knight Runes
* Stone Hard Skin weapon break chance only applies to physical melee attacks.
* Giant Growth's physical bonus damage only applies to Rune Knights.
* Corrected weapon break chance to only happen when damage is increased for Giant Growth.
Thanks to @Rytech2 and @Jeybla!
2017-11-13 09:59:24 -05:00
Jey
cd08915530 Follow up to ea88ea50546fd140bda875056f83a60b6b0bef96
* Fixes wrong syntax in GeffenMagicTournament due
* Fixes #2598
2017-11-13 09:58:57 +01:00
sader fawall
c6fe9e9cde Update warper NPC (#2542)
* Adds several dungeons and fields
* Adds options for WOE TE Castles and dungeons
* Adds option to disable satan morroc and re-enable old morroc maps
* Adds option to warp only on the first level (of dungeons/fields)
* Adds Lasagna Town
* Adds castles Kafragarten and Gloria
* Adds several instances
* Adds Dimensional Rift and Para Market
2017-11-10 19:42:56 +01:00
rAthenaAPI
333d978a9d SQL synchronization 2017-11-10 19:22:16 +01:00
Aleos
e0b43ecc93 Corrected Mavka Card item bonus (#2597)
* Fixes #2594.
* The item bonus should increase MATK damage for Fire and Earth.
Thanks to @uddevil!
2017-11-10 19:22:00 +01:00
Atemo
ea88ea5054
Emoticons constant name (#2527)
This PR change the emoticons constant name to match emoticonlist from client side.
Note: the previous emoticons names are now deprecated.

Additionnally emotion and unitemote scripts commands are being merged together to the new format
-> emotion <emotion number>{,<target>};
Where target use the target Game ID (GID) of the unit (npc, pet, character etc..).

* unitemote is now deprecated.
* Additionnally fixed incorrect variable in quests_brasilis.txt

Thanks to @aleos89 and @Lemongrass3110 !
2017-11-10 18:35:21 +01:00
Roman Kalashnikov
1f7a314c78 Fixed twice assigned values (#2560)
* Resolves the skill timer getting assigned twice.
Thanks to @lunixoid!
2017-11-09 14:50:11 -05:00
Aleos
63daab5860
Added battle config autoloot_adjust (#2562)
* Fixes #2540.
* Added battle config autoloot_adjust that allows autoloot to take player drop penalties and bonuses into account.
Thanks to @ecdarreola!
2017-11-08 18:55:20 -05:00
Aleos
86241b0eb8
Adjusted item drop minimum value limit (#2561)
* Fixes #2551.
* Lowered the item drop minimum value limits to be able to be set to 0.
Thanks to @mazvi!
2017-11-08 18:44:32 -05:00
aleos89
c13f271a94 Resolved some compile warnings
* Fixes #2588.
* Clean up from 24b3509.
Thanks to @darhlism!
2017-11-08 13:36:01 -05:00
lighta
a587b913fa Initial work for login server to C++ (#2583)
* Initial progression of moving the map-server to C++ format.
* Converted all core files to .cpp and header files to .hpp.
Thanks to @lighta!
2017-11-08 12:56:41 -05:00
aleos89
728a29d435 Harmonized include guards
* Follow up to 24b3509 and c4a364b.
* Harmonized the include guards for char-server and map-server header files.
2017-11-07 10:22:03 -05:00
lighta
24b3509e53
Initial work for char server to C++ (#2567)
* Initial work for char server to C++

* Changes suggested from @Lemongrass3110

* Removes unwanted beginning white spaces.
2017-11-06 22:40:35 -04:00
aleos
6decf6c6d0 Resolved skill NK checks
* Fixes #2577.
* Adjusted the battle checks to properly return the NK value rather than bool.
Thanks to @darhylism!
2017-11-06 17:16:45 -05:00
lighta
673315994b Temporary adjustment for strict aliasing (#2582)
* Fixes #2572.
* Added a custom rule to avoid optimization causing monsters to not attack. (From tests this appears to be npc.cpp on Centos 7 and mob.cpp on Windows vc141)
* Added -fno-strict-alising to CMake when building with GCC. (Clang and VS have it by default)
* Fixed cmake output path.
Thanks to @lighta!
2017-11-06 16:59:59 -05:00
lighta
e7e9cf6d73 Cleanup and harmonize cmake. 2017-11-03 03:42:29 -04:00
Aleos
c4a364be2c
Initial work for map server to C++ (#2565)
* Initial progression of moving the map-server to C++ format.
* Converted all core files to .cpp and header files to .hpp.
* Refactored the refine database parser to utilize native YAML C++.
Thanks to @Jeybla and @lighta for their help!
2017-11-02 17:39:03 -04:00
Maz-V
c6cc8edeb4 Mapflag NoWarpTo: Novice Island (#2566)
Added Mapflag nowarpto on Novice Island Renewal.

Thanks to @mazvi !
2017-11-02 15:12:38 +01:00
Jey
c09929aa16 Negative npc input checks for arena_points.
* Related issue: #2557
* Thanks to @mazvi
2017-11-01 22:17:31 +01:00
rAthenaAPI
fbb447ac8c SQL synchronization 2017-11-01 16:57:26 +01:00
Lemongrass3110
125ab2853a Last missing mob ids from old range 2017-11-01 16:57:05 +01:00
rAthenaAPI
d6171801ca SQL synchronization 2017-11-01 16:40:39 +01:00
Lemongrass3110
af358809b9 New npc and mob IDs
The old range has been fully used up now.
2017-11-01 16:40:22 +01:00
rAthenaAPI
4d602135fc SQL synchronization 2017-10-30 22:16:53 +01:00
Aleos
d15b5fc584
Corrected St. Patrick's Hat and Green Ale (#2558)
* Fixes #2547.
* St. Patrick's Hat bonus should be granted from +8 or higher refine.
* Green Ale has a 10 second use delay.
Thanks to @uddevil!
2017-10-30 17:16:28 -04:00
lighta
611dee0753 Fix cmake (#2554)
* Fix cmake
Thanks to @secretdataz for help. (cherry-picked from refactor)
2017-10-30 13:19:27 -04:00
Maz-V
c76f3675a2 Global_Function: Added "F_GetPlatinumSkills" (#2545)
* Added global function F_GetPlatinumSkills.
* Adjusted the Job Master and Platinum Skills NPCs to use this function.
Thanks to @mazvi!
2017-10-30 10:57:57 -04:00
Jittapan Pluemsumran
09519f3b37
Merge pull request #2546 from lighta/fix_configure
Add check in configure to ensure c++ compiler
2017-10-29 05:35:13 -07:00
Roman Kalashnikov
9772639ae7 Fixed duplicated condition (#2553)
The condition `if(node->prev)` was checked in the previous:
`if( node->prev && n > 5 ) {`
2017-10-29 11:00:59 +01:00
rAthenaAPI
618e668bdf SQL synchronization 2017-10-28 01:56:35 +02:00
Atemo
c9ee8eb647 Follow up 5ed2113251 2017-10-28 01:56:00 +02:00
rAthenaAPI
af20c0ca8c SQL synchronization 2017-10-27 23:42:34 +02:00
Atemo
5ed2113251
Initial release of Sarah and Fenrir memorial (#2504)
Initial release of Sarah and Fenrir memorial
Notes:
* Some monsters status are inaccurated.
* Sarah seems to cast NPC_WIDESOULDRAIN and Gigantes cast NPC_PETRIFYATTACK (need more infos).

Thanks to @aleos89 for the grammatical fixes !
Big thanks to Divine Pride for the infos!
2017-10-27 23:42:12 +02:00
Aleos
2c1df58ba4
Corrected Dark Claw behavior (#2548)
* Fixes #2537.
* The wound effect should be applied even if Dark Claw misses.
Thanks to @esu1214!
2017-10-27 14:25:03 -04:00
Lemongrass3110
18e0f0ab48 Fixed searchstore for vendings with item id > 32k 2017-10-27 00:57:32 +02:00
lighta
feb1ab9d95 Add check in configure to ensure c++ compiler 2017-10-26 09:00:02 -04:00
Aleos
5208d16995 Item Shop Trade Restriction adjustment (#2517)
* Item Shop Trade Restriction adjustment
* Fixes #2503.
* Added a config to allow usage of sell-restricted items as currency in Item Shops.
Thanks to @Mickosis!

* Cleaned up some final things
* Fixed some typos in the configuration file.
* Resolved the shop ID not being stored at the time of checking the currency.
* Optimized the inventory check.
2017-10-25 13:49:39 -04:00
Maz-V
10d405706b Platinum Skill: skill MC_CARTDECORATE (#2521)
* Added MC_CARTDECORATE for Merchant Class
* Added PACKETVER check
Thanks to @mazvi and @anacondaqq!
2017-10-25 10:38:31 -04:00
Lemongrass3110
93ad3a1378 2 new NPC constants 2017-10-24 23:19:57 +02:00
Lemongrass3110
3b219565d3 Enabled import for translations by default (#2535)
Added possibility to override MAP_MAX_MSG with defines_pre.h
Added possibility to override LANG_ENABLE with defines_pre.h

Thanks to @Daegaladh for the idea with LANG_ENABLE.
2017-10-24 22:36:59 +02:00
Lemongrass3110
cb760a0a42 Adjusted atcommand go for new novi grounds
Follow up to c7d5b61
2017-10-22 17:18:54 +02:00
Atemo
c7d5b61409 New Intro for Renewal - continuation of https://github.com/rathena/rathena/pull/2309 (#2530)
* Update map iz_int in mapcache.dat for the new Intro Map
* Update Academy script for the new Intro based on kRO: [http://www.inven.co.kr/webzine/news/?news=176048&site=ro](http://www.inven.co.kr/webzine/news/?news=176048&site=ro)
* Add monster spawn in the new Intro Map
     
Thanks 805a2b3b1a (diff-8d1dca8dc246e9f4d38c6f1ad0d2c930) for original script.

Thanks @jenkijo for the base, @Lemongrass3110 and @aleos89 for the review, and Divine Pride for some infos !
2017-10-21 00:23:49 +02:00
Atemo
0a96c9089b Merge branch 'master' of https://github.com/rathena/rathena 2017-10-20 16:02:45 +02:00
Atemo
f07ceced91 Added missing warps from dali to dali02, dali02 to dali (issue #2531)
Thanks @hendra814 !
2017-10-20 16:02:10 +02:00
rAthenaAPI
535804be6a SQL synchronization 2017-10-20 15:52:30 +02:00
Atemo
b90df89380 Fixed Crimson Saber (Item ID: 13454) equip class requirement
Thanks @ToiletMaster !
2017-10-20 15:52:17 +02:00