16361 Commits

Author SHA1 Message Date
Atemo
ead1ed9100 Fixed typo in Weapons Expert BK (issue #2619) follow up 08338e0a64 (diff-2b9b79c7ee5796ba7f5073001e69aa06)
Thanks to @mazvi !
2017-11-21 14:40:08 +01:00
Jey
b2d904b764 Follow up to ba9314cba590f831c88b7a6a69afb62f4d51fe59
* Fixes #2621
* Makes the getspawn functions independent of the mob_db struct.
  Removes the getMobID() function from the struct which caused the
  the issue.
* Thanks to @Lemongrass3110 and @uddevil!
2017-11-21 12:35:51 +01:00
Aleos
8e002bc993
Adjusting Vending tax to match official (#2620)
* Adjusting Vending tax to match official
* Fixes #2528.
* There are no taxes on items being sold for less than 100 million. Anything above incurs a 5% tax.
* Refactored the tax code to use a single function.
Thanks to @mazvi, @Jeybla, and @lighta!
2017-11-20 22:07:55 -05:00
Aleos
1c66035761
Refactored achievements to utilize C++ features (#2607)
* Refactored achievements to utilize C++ features
* Cleaned up the YAML parser.
* Moved achievements from DBMap to an unordered_map.
* Moved achievement targets from DBMap to a vector.
* Changed all struct arrays into vectors.
* Changed all char arrays to strings.
* Changed all int arrays to std::arrays.
* Removed achievement_dummy as it's no longer needed.
* Achievements now use smart pointer to ensure proper construction and deconstruction of objects.
Thanks to @lighta!
2017-11-20 21:34:16 -05:00
Atemo
ca1b980ede
Fixed issue #2616 and #2617 (#2618)
* Added savepoint from int_land -> izlude
* Updated monsters spawn in prt_fild08 based from Divine Pride

Thanks to zackdreaver and Divine Pride !
2017-11-20 18:15:36 +01:00
Lemongrass3110
60b5491766 Fixed compilation for the Windows XP API (#2611)
* Fixed compilation for the Windows XP API

Fixes #2137

Thanks to @zackdreaver

* Fixed Windows version initialization

Respecting the SDK's Windows version and only use our own defines if they are not set by the SDK, which should not happen.

Thanks to @lighta.

* Moved Windows Vista declaration up

This way all defines that should actually come from sdkddkver.h will be checked right behind it and defined if they were not.

* Reverted line deletion
2017-11-20 00:30:31 -05:00
Lemongrass3110
4de727efbc Changed minimum VS version to VS 2013 SP5 (#2610)
With this you will not be able to open the solution with any older visual studio version anymore.
2017-11-19 12:33:32 -05:00
Lemongrass3110
a2e8d02752 Respect the default platform toolset (#2609)
With this you will not have to upgrade your solution everytime you clone a fresh copy of rAthena and the problem with having to stash between branch switches should also be gone.
If you want to compile it for another toolset you simply have to set the target toolset by yourself.
2017-11-19 12:19:36 -05:00
Lemongrass3110
a49a1a52a3 Fixed a compiler warning due to a wrong include
Follow up to c4a364b
2017-11-19 04:11:53 +01:00
Lemongrass3110
b2ab9724fe
Implemented new monster range (#2604)
With this the internal static array was changed to a std::map which manages it's memory dynamically when needed.

Dropped mob_dummy since it was useless to have it in the first place.

Replaced a lot of direct accesses to the mob db by the "get" function.

With this you can now use 20021-31998 for monsters and also 4000-20020 will be used for player clones whenever needed.

Dropped mobdb_exists
Replaced almost all references to MAX_MOB_DB

Moved MAX_MOB_DB from the header directly into the source file to make it only visible to the .cpp file itself and not to any other.

Moved the mob drop calculation function from itemdb.cpp into mob.cpp, because it needs to iterate over the whole mob db.

Added a few missing clone checks.

Thanks to @lighta, @Jeybla and @aleos89.
2017-11-19 01:22:29 +01:00
Jey
34817c9715 Adds auto parse of consts in convert_emotions.
* Thanks to @lighta for the suggestion
2017-11-18 21:02:11 +01:00
Jey
4f62f68e0f Extends convert_emotions script
* Replaces magic numbers
* Replaces unitemote
* Replaces emotion e,0,name; with emotion e, getnpcid(0, name);
* Replaces emotion e,1; with emotion e,playerattached();
2017-11-18 19:03:17 +01:00
Jey
c5ceda03f5 Shebang of conv_emotion to be platform independent 2017-11-17 10:34:38 +01:00
rAthenaAPI
1a7f2db6a9 SQL synchronization 2017-11-16 21:38:45 +01:00
Haziel
50ef5650a0 Wickebine's Black Cat Ears (#2606)
* Removed Unofficial Bonuses
* Fixed Class Restriction
* Fixed Level Requirement
* Added Code to item 19134.
* Added Official Autobonus Code
* Arbitrary 'Power Up' Effect
Thanks to @SirHaziel and @hendra814!
2017-11-16 15:38:26 -05:00
Jey
e148bd3a63 Follow up to ba9314cba590f831c88b7a6a69afb62f4d51fe59
* Now mob_get_spawn does not add empty vectors to mob_spawn_data, when the
  mobid does not exist in mob_spawn_data
* Saves a bit more memory space
* Thanks to @Lemongrass3110 for the suggestion
2017-11-16 11:19:26 +01:00
Jeybla
ba9314cba5
Fixes spawn infos after mobdb reload. (#2469)
* Moves the monster spawn infos from the mob_db struct to an own
  data structure.
* Fixes whereis after mobdb reload. Fixes #2360
* Fixes Taekwon Mission after mobdb reload. Closes #2460
* Thanks to @uddevil, @mgksrt8, @lighta and @aleos89!
2017-11-16 02:02:37 +01:00
aleos
9766ec9489 Corrected Free Cast and Exceed Break walk speed
* Fixes #2599.
* Follow up to 1f7a314.
Thanks to @mazvi and @uddevil!
2017-11-14 20:08:49 -05:00
rAthenaAPI
90f79cc2c5 SQL synchronization 2017-11-14 16:39:47 +01:00
Haziel
c4ce8cfeba Item DB Fix: Part I (#2602)
* Fixed Valhalla Idol based on item's description.
Thanks to @AetherHaziel!
2017-11-14 10:39:38 -05:00
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