14589 Commits

Author SHA1 Message Date
Cydh Ramdh
a15661ecfa RE:Initial release script commands for Item Random Options (#2066)
* Added script commands getitem3, getitembound3, makeitem3, rentitem3, countitem3, and delitem3.
2017-05-04 12:11:43 -04:00
aleos89
4bb6aa13a0 Revert "Status Change display in status window (#1481)"
This reverts commit a75133eb4d8976c1c890d5420665e7a76349e226.
2017-05-04 10:25:44 -04:00
aleos89
9ba2513ff4 Revert "Fixed hidden statuses not being applied"
This reverts commit ef3ad997c77e7afda6b8f56ed3fb8b2a5f6a0347.
2017-05-04 10:24:04 -04:00
Jittapan Pluemsumran
7749c18a06
Prepared the project for mixing C++ code in 2017-05-03 22:32:46 +07:00
Jeybla
cc59048d86 Adjusted Feint Bomb behavior near a Maelstrom Cell. (#2107)
* Feint Bomb near a Maelstrom Cell now matches the official behavior.

Rathena before:
* FB was possible to use near Maelstrom, but didn't trigger an explosion

Now:
* FB fails near Maelstrom, displaying a "skill failed" message.
* It's possible to use FB right after it failed.
2017-05-03 07:54:39 +02:00
Aleos
10b512b859 Updated Giant Fly Wing behavior (#2098)
* Party members should be recalled to their own positions in a 3x3 area around the party leader.
* Added two missing client messages.
* Adjusted script command warpparty to support range values.
* Adjusted script command warpparty to not warp the party leader if "Leader" is passed as the map.
2017-05-02 20:51:26 -04:00
Lemongrass3110
cac27fc3d5 Refactored script_rid2sd (#2062)
It now matches the other script_***2sd or script_***2bl functions.
Also added script_mapid2sd for mapid to map session lookups.
Cleaned up the order of some of the checks in the script functions that used script_rid2sd and sometimes checked the validity of the retrieved session to late or even never at all.
2017-05-03 00:17:46 +02:00
aleos
ef3ad997c7 Fixed hidden statuses not being applied
* Follow up to a75133e.
* Fixes #2111.
Thanks to @Canoe, @Lemongrass3110, and @Jeybla!
2017-05-02 17:33:54 -04:00
rpdigos
07e1a670bc Replaced strcopy with memmove (#2061)
Shortened the original title and commit message a little.
Thanks to @rpdigos!

Original commit message:
When we try to run the application we got the signal Abort trap 6 and the application is interrupted by the OS.
This issue is related with the fact that when using strncpy the source and destination string should not overlap, as we can see in the man page:

man stpncpy()
...
The source and destination strings should not overlap, as the behavior is undefined.

We've replaced it by the function memove:

man memmove()
...
The two strings may overlap; the copy is always done in a non-destructive manner.

Follow ec1fe15d7d480e4fa6ff3f56986bbfd49a4cde2a
2017-05-02 23:30:47 +02:00
Lemongrass3110
799f781ac2 Fixed MySQL 5.7 compatibility (#2074) 2017-05-02 22:59:05 +02:00
Playtester
b6ff1c6030 Claymore Trap and Blast Mine in Renewal (fixes #1028, fixes #2113)
* Reverted 574f69e
* These traps were already working fine before that commit, so no further changes needed
2017-05-02 20:03:25 +02:00
Jittapan Pluemsumran
cacd98ddeb Merge pull request #2089 from rathena/refactor/windows-build
* Dropped support for VS older than 2012
* Delete all solutions
* Added a new global VS2013 solution (2015+ also supported by this solution)
* Added x64 build support for Windows (Thanks to @Lemongrass3110)
2017-05-02 12:52:39 +07:00
Jeybla
9e6b02ae59 Fixes a getcharid error message. (#2106)
* In quests/quests_morroc.txt Continental Guard.
2017-04-29 19:20:25 +02:00
Lemongrass3110
4a6498665c Enabled x64 in appveyor 2017-04-28 15:13:30 +02:00
Lemongrass3110
be9b13d0bc Removed dbghelp.dll
Follow up to b1881ea by @wilkemeyer
2017-04-28 14:54:48 +02:00
Lemongrass3110
6bbce0f372 Merge branch 'master' into refactor/windows-build
Added all missing import-tmpl copies to the map-server project

# Conflicts:
#	vcproj-10/map-server.vcxproj
#	vcproj-12/map-server.vcxproj
#	vcproj-13/map-server.vcxproj
#	vcproj-14/map-server.vcxproj
2017-04-28 14:38:07 +02:00
Lemongrass3110
07b2ef28a0 Added Visual Studio x64 support
Removed the .dll files for the libraries from the root directory.
They are now copied from the 3rdparty folder when your build finishes and the project requires them.
If you clean your project they will also automatically be removed from the root directory again.

Updated libraries:
MySQL 5.0.20 -> 6.1.9
PCRE 8.30 -> 8.33.0.1 UTF8

Both Win32 and x64 are now supported. Remember to clean and build when you switch the target platform, otherwise you will end up with the wrong .dll files at runtime.
2017-04-28 13:40:08 +02:00
rAthenaAPI
bf2461f2b0 SQL synchronization 2017-04-28 00:43:16 +02:00
Cydh Ramdh
e59cdfff90 RE:Initial release item random option for monster drop (#2065)
* Initial release item random option for monster drop
* To add item for monster with random option group, see 'db/[pre-]re/mob_drop.txt'
* To add item random option group with random option group, see 'db/[pre-]re/mob_item_randomopt_group.txt'
* Default entries for random options are follow iRO Crimson/Scarlet Weapon based on
  * "[Renewal] Episode 15.2 Crimson Weapon System", see http://www.playragnarok.com/news/updatedetail.aspx?id=280&p=1.
  * File uploaded by Oda (iRO's CM) on https://forums.warpportal.com/index.php?/topic/168763-fansitedb-information-distribution-and-request-station/?p=2495922

Signed-off-by: Cydh Ramdh <cydh@pservero.com>

* Follow up 3b7db36288d70b6f40632e7397af4ed073595c8c
* Moved `RDMOPTG_Crimson_Weapon` from const.txt to `enum Random_Option_Group` in `itemdb.h`.
* Removed `RDMOPT_WEAPON_ATTR_POISON`, `RDMOPT_WEAPON_ATTR_TELEKINESIS`, and `RDMOPT_WEAPON_ATTR_UNDEAD` from Crimson Weapon random group (`RDMOPTG_Crimson_Weapon`), thanks to @atemo
* Added db header for impot-tmpl files, thanks to @secretdataz

Signed-off-by: Cydh Ramdh <cydh@pservero.com>

* Follow up ac0cdd8dc87c534d26510cf3d37cb1609629919a
* Fixed type on steal checking

Signed-off-by: Cydh Ramdh <cydh@pservero.com>

* Cleared some drop slot for crimson weapon
2017-04-28 00:43:09 +02:00
Lemongrass3110
31cd394d1d Follow up to 4cfaa18
Removed the duplicated lines
Also removed project dependencies for libconfig and mt19937ar from common-minicore
2017-04-27 11:06:59 +02:00
Jittapan Pluemsumran
4cfaa1817b
Removed unneccessary library includes 2017-04-27 15:05:08 +07:00
Jey
cbc3b260c8 Follow up to caed38927ac6edd327a63488ec5d3a0fe1fedb9f
* Fixed a possible map server crash
* Fixes #2094

Thanks to @spangler88.
2017-04-26 15:03:40 +02:00
Lemongrass3110
4348ef3b89 Added a -D equivalent for msbuild
Fixes appveyor not building in pre-renewal mode
See original commit 15b4050
2017-04-26 03:44:37 +02:00
Lemongrass3110
bfeb697933 Redirected build output into the .vs folder 2017-04-26 03:38:08 +02:00
Lemongrass3110
3995fff863 Updated gitignore for the moved shell scripts
Added some of the new visual studio output files to the ignore list too
2017-04-26 03:18:58 +02:00
Jey
4f99567e41 Channel System message correction
* Follow up to c87dba5.
* Fixed the member limit message pointing to the wrong index.
2017-04-26 03:18:48 +02:00
Lemongrass3110
448e5e893f Moved the bat scripts into the tools folder
Added post build copies and post cleanup deletions for the required bat scripts for each project
2017-04-26 02:58:39 +02:00
Lemongrass3110
5923633ad7 Added deprecation functionality to script engine (#2064)
This commit adds support to deprecate script commands or constants.

Based on the following two commits by @MishimaHaruna
HerculesWS/Hercules@ce85609
HerculesWS/Hercules@6ae9045
2017-04-25 23:43:29 +02:00
aleos89
b4857cca83 Follow up to 452d9c6
* Added missing cases for Midnight Frenzy and Silvervein Rush.
2017-04-25 14:06:12 -04:00
Aleos
452d9c60eb Updated Homunculus S skill failure messages (#2082)
* Fixes #2058.
* Added missing skill failure messages for Homunculus S.
* Eternal Quick Combo can no longer be used on Status Immune monsters.
* Disabled the Style Change message for Eleanor. Aegis does not display a message when switching fighting style.
Thanks to @feltenc and @Jeybla!
2017-04-25 13:33:05 -04:00
aleos89
f1af3210d6 Follow up to eb0a79f
* Fixed Blessing ending Curse before the Curse check.
2017-04-25 12:46:57 -04:00
Jittapan Pluemsumran
fcba7b7213
Added missing EOL in project files 2017-04-25 23:11:58 +07:00
Jittapan Pluemsumran
7fb245b8e6
Updated appveyor.yml to use new solution. 2017-04-25 21:14:43 +07:00
Jittapan Pluemsumran
da36b26572
Remove rAthena-15.sln 2017-04-25 21:05:30 +07:00
Jittapan Pluemsumran
f9a0f81d4e
Resolve compile errors 2017-04-25 21:05:18 +07:00
Jittapan Pluemsumran
96073607bf
Merge branch 'master' into refactor/windows-build
# Conflicts:
#	vcproj-10/char-server.vcxproj
#	vcproj-10/char-server.vcxproj.filters
#	vcproj-10/login-server.vcxproj
#	vcproj-10/map-server.vcxproj
#	vcproj-10/map-server.vcxproj.filters
#	vcproj-10/mapcache.vcxproj
#	vcproj-12/char-server.vcxproj
#	vcproj-12/char-server.vcxproj.filters
#	vcproj-12/login-server.vcxproj
#	vcproj-12/map-server.vcxproj
#	vcproj-12/map-server.vcxproj.filters
#	vcproj-12/mapcache.vcxproj
#	vcproj-13/char-server.vcxproj
#	vcproj-13/char-server.vcxproj.filters
#	vcproj-13/login-server.vcxproj
#	vcproj-13/map-server.vcxproj
#	vcproj-13/map-server.vcxproj.filters
#	vcproj-13/mapcache.vcxproj
#	vcproj-14/char-server.vcxproj
#	vcproj-14/char-server.vcxproj.filters
#	vcproj-14/login-server.vcxproj
#	vcproj-14/map-server.vcxproj
#	vcproj-14/map-server.vcxproj.filters
#	vcproj-14/mapcache.vcxproj
#	vcproj-9/char-server.vcproj
#	vcproj-9/dbghelpplug.vcproj
#	vcproj-9/login-server.vcproj
#	vcproj-9/map-server.vcproj
#	vcproj-9/mapcache.vcproj
2017-04-25 21:00:33 +07:00
rAthenaAPI
f56a3f6d1e SQL synchronization 2017-04-25 15:50:12 +02:00
Arashi
a040a52764 Fixed some Armors wLV and refineables (#2077)
Fixed armors level 1 weapons
Fixed accessories and lower headgears being refinable

Thank you @crazystorm2017 !
2017-04-25 15:50:05 +02:00
Jeybla
a7c682ff12 Adjusted skill_nocast_db settings. (#2081)
For the following skills:
* SC_MANHOLE - PvP only
* SC_DIMENSIONDOOR - town and field, doesn't work in PvP
* SC_CHAOSPANIC - No restriction
* SC_BLOODYLUST - Enabled in town

Fixes #1496.

Thanks to @Everade and @aleos89.
2017-04-25 14:37:44 +02:00
Lemongrass3110
cdc0527b71 Converted some scripts to warps (#1947)
Credits to @Atemo!
2017-04-24 23:54:43 +02:00
aleos89
c3ad04dc90 Channel System message correction
* Follow up to c87dba5.
* Fixed the join message pointing to the wrong index.
Thanks to @CairoLee!
2017-04-24 10:18:51 -04:00
Cydh Ramdh
c87dba5a52 Channel System is Expanded! (#1933)
* Many changes on conf/channel.conf!
- Now capable of setting default values for channels through the config such as the channel name, channel password, member capacity, chat color, chat delay, and more.
* Many new channel script commands!
- Added script commands channel_create, channel_setopt channel_setcolor, channel_setpass, channel_setgroup, channel_chat, channel_ban, channel_unban, channel_kick, and channel_delete.
2017-04-19 14:12:00 -04:00
rAthenaAPI
97f989f7d8 SQL synchronization 2017-04-19 10:36:12 +02:00
Akkarinage
25da0fe4fd NPC ID Updates (#2075)
Also added new commented Mob IDs to mob_db.txt

Signed-off-by: Akkarinage <akkarin@rathena.org>
2017-04-19 10:36:05 +02:00
Akkarinage
58bad46c32 Misc grammar changes to documentation.
Signed-off-by: Akkarinage <akkarin@rathena.org>
2017-04-19 03:13:17 +01:00
Akkarinage
33c31ca368 Updated default PACKETVER
It makes no sense to use 20130807 as the default PACKETVER when we use 55 (20151104) as the default packet_ver in /db/packet_db.txt

Signed-off-by: Akkarinage <akkarin@rathena.org>
2017-04-18 15:23:43 +01:00
rAthenaAPI
e18d636d79 SQL synchronization 2017-04-17 23:03:14 +02:00
aleos
38e0496027 Removed empty script check for usable items
* Fixes #2069.
* Usable items that don't have a script will now execute as normal.
* Items that have a special effect with no script were not displaying their effect since the check was stopping any execution.
* Cleared up some usages of script command end.
Thanks to @LiamKarlMitchell!
2017-04-17 17:03:03 -04:00
Aleos
a75133eb4d Status Change display in status window (#1481)
* Adjusted the way some status changes display in the player's status window.
- Some status changes are hidden from the display.
* Katar critical bonus is no longer shown in the status window.
- Added a configuration to enable or disable the critical display for Katars.
* SC_INCCRI now has doubled critical rate while wearing Katars. Thanks to @Limestone!
* Refactored some status_calc_* functions to no longer be static and moved them to the header.
2017-04-14 23:56:34 -04:00
Lemongrass3110
ed24be1625 Cleaned up MAPID definitions
Fixed the wrong initialization for baby summoner, who was actually a baby swordman summoner like this.
Follow up to 39e54d6
2017-04-14 23:34:25 +02:00