15086 Commits

Author SHA1 Message Date
Lemongrass3110
7c1a88270b Added support for custom constant import (#2656) 2017-12-01 13:58:24 -05:00
lighta
53db4358b7 Add few test to travis and appveyor. (#2641)
* Add few test to travis and appveyor.
* Update runserver.bat to be more alike athena-start. (nb terminating cmd.bat would be better)
2017-12-01 13:46:09 -05:00
Lemongrass3110
f59298adda Added support for windows admin detection (#2657)
Credits to Microsoft
2017-12-01 13:09:51 -05:00
Lemongrass3110
b3cfd12228 Added the custom and test scripts to the buildbot (#2658)
* Added the custom and test scripts to the buildbot

All scripts inside the custom and test npc directory are now parsed and executed automatically by the buildbot.
The only exceptions are the custom battleground scripts that would cause duplication warnings.

Thanks to @Jeybla for the Unix script!
2017-12-01 12:50:34 -05:00
Lemongrass3110
812e3a9a04
Disabled root/admin user check for build bots (#2659)
Thanks to @hurtsky
2017-12-01 17:24:16 +01:00
rAthenaAPI
217bd0e5bf SQL synchronization 2017-12-01 16:39:11 +01:00
Aleos
37b95826fb
Corrected some item bonuses (#2642)
* Fixes #1430.
* Corrected the bonuses for Flying Galapago and Falconer's Claw.
* Added missing item Falconer's Flute.
Thanks to @Everade and @exneval!
2017-12-01 10:39:02 -05:00
rAthenaAPI
8223f46867 SQL synchronization 2017-11-30 19:52:27 +01:00
Aleos
da152c6f7e
Corrected Gray and Thanatos equipment sets (#2638)
* Corrected Gray and Thanatos equipment sets
* Fixes #2636.
* Corrected display names.
* Corrected applicable jobs.
* Corrected item bonuses.
Thanks to @mazvi and @Atemo!
2017-11-30 13:52:10 -05:00
rAthenaAPI
21aa0155df SQL synchronization 2017-11-30 18:20:33 +01:00
Aleos
b00f3bcf5f
Corrected Magical Ring bonus (#2640)
* Fixes #2635.
* Should add ATK versus element and not add DEF against element.
Thanks to @uddevil!
2017-11-30 12:20:16 -05:00
Cydh Ramdh
02044c0d58
Added custom src files to rAthena.sln (#2650)
Listed all files inside src/custom/ to rAthena.sln makes easier to find the file while opening the solution
2017-11-29 10:31:54 +07:00
Lemongrass3110
c5af8c76e3 Added 2 new hat effects
Thanks to @RagnarokNova
2017-11-28 23:15:00 +01:00
lighta
664ea47891 Fix basic_test not having common.lib has dependancies registered in solution.
(cause some build failure due to linking trying to be process before lib was finished)
2017-11-28 03:57:07 -04:00
lighta
618b9356fc
Fix #2591 spinlock issue. (#2637)
* Fix #2591 spinlock issue.
Add basic_test, for few integration test.
Add thread_local_storage support in cmake
Fix thread.c for linux and fix small typo
2017-11-26 22:30:17 -04:00
sader fawall
cfb8b42d84 Fix Bifrost Tower (#2644) 2017-11-26 19:02:40 +01:00
aleos
1645fc0cdb Corrected a ShowError output
* The new mob database range error message was missing the new ranges.
Thanks to @CairoLee!
2017-11-26 10:29:41 -05:00
rAthenaAPI
4128740a1a SQL synchronization 2017-11-25 21:46:35 +01:00
Atemo
c45db5d6ef Fixed issue #2629 "Dummy at Prontera prevents critical attack from being displayed" 2017-11-25 21:46:15 +01:00
Atemo
d708fb35d7 * Move close3 function into Global_Functions.txt
* Added mapflag for some instance
2017-11-25 21:42:03 +01:00
aleos
114bebac68 Corrected a potential map crash with achievements
* Follow up to 1c66035.
* Reverted a lambda function which was causing a mismatch between achievement vectors and player achievements.
Thanks to @reymarbc and @cydh!
2017-11-23 16:40:06 -05:00
lighta
03da2f6854 Fix tools/config.pl
Add current path to @inc
Add more support for public_ip / private_ip.
Add pincode support
2017-11-22 07:29:05 -05:00
Aleos
cdbb14b90d
Resolved a compile warning on pre-renewal (#2625)
* Fixes #2624.
* Resolves a switch statement warning with only a default case for pre-renewal builds.
Thanks to @Daegaladh!
2017-11-21 17:35:32 -05:00
aleos89
3ce3bc3fed Added a new Vending Tax config
* Follow up to 8e002bc.
* Added vending_tax_min which allows for defining a custom minimum value to apply taxes to.
Thanks to @cydh's suggestion!
2017-11-21 10:27:18 -05:00
aleos89
6fdb605932 Corrected Hell Inferno Dark damage behavior
* Follow up to dc2c51c.
* Fixes #2623.
* Resolved the Dark damage not being flagged properly.
Thanks to @Sweet520 and @hartonox!
2017-11-21 09:36:52 -05:00
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