12677 Commits

Author SHA1 Message Date
Cydh Ramdh
4169defd93 Merge pull request #386 from RagnarokNova/patch-6
Fixed SC_ALL_RIDING for Rangers
2015-04-14 09:03:38 +07:00
Cydh Ramdh
3104dcef5e Follow up 4a1bd2a3, missing max_sp for SC_MEIKYOUSISUI. Thank @raynra
Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2015-04-14 05:52:52 +07:00
rAthenaAPI
0922e8e050 SQL synchronization
[ci skip]
2015-04-13 12:07:56 +02:00
Cydh Ramdh
0f5050de20 Bug Fixes
* Follow up 46f010cb, cleaned up skill fail checks on `skill_castend_id`. This is should fixed #385
* Fixed #395, changed `mode` field for monster from `smallint` to `int`. Thank @LyndisRain
* Fixed #391, added `0` in fixed cast time field for SM_SELFPROVOKE. Thank @DriwFS

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2015-04-13 17:03:41 +07:00
Cydh Ramdh
82d43fe894 Bug Fixes
* Fixed #274 Castling (HAMI_CASTLE) makes a whole area attack you!
* Changed `skill_changetarget` to `unit_changetarget`, also fixed the validation before switching the `bl`'s attacking target from current `src` to new `target`.

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2015-04-11 22:20:00 +07:00
Cydh Ramdh
994aba683b Follow up 20c6149b60664561eed9ea6f2f7551c91a904d89
* Fixed #390, party skill didn't work on self
* Removed BCT_ALLWOS, added BCT_WOS for checking 'without self' skill target

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2015-04-11 10:46:15 +07:00
rAthenaAPI
c54af74f4b SQL synchronization
[ci skip]
2015-04-10 20:02:46 +02:00
nanakiwurtz
78e20436e4 Fixed #384
* Thanks to @DriwFS

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-04-11 01:02:05 +07:00
Cydh Ramdh
20c6149b60 Bug Fixes
* Fixed #376, status def for Voice of Siren effect (WM_VOICEOFSIREN) is calculated twice
* Fixed SC_DEEPSLEEP effect from Deep Sleep Lullaby (WM_LULLABY_DEEPSLEEP) and Arrullo (SO_ARRULLO)
* WM_VOICEOFSIREN & WM_LULLABY_DEEPSLEEP give effect for all targets except self
* Typos

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2015-04-11 00:27:46 +07:00
rAthenaAPI
f752619a41 SQL synchronization
[ci skip]
2015-04-10 19:01:24 +02:00
nanakiwurtz
56404b8857 Fixed #379
* Thanks to @Desground and @aleos89
2015-04-11 00:00:21 +07:00
Cydh Ramdh
be02e81228 * Follow up 5ed75dc8, disabled val2 on chmapif_parse_fwlog_changestatus
* Clean up MSVS vcxproj files. Added new filter for `config` files and moving the files to their filter.

[ci skip]
Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2015-04-10 01:25:22 +07:00
rAthenaAPI
7d98dce738 SQL synchronization 2015-04-09 19:17:10 +02:00
Cydh Ramdh
27ba6c5002 * Fixed #387
* Replacing 'rand()' leftwover with 'rnd()' of mt19937ar
* Cleaned up script commands related with item group: 'groupranditem', 'getrandgroupitem', 'getgroupitem'
* Corrected item scripts that are using 'getrandgroupitem'
* Updated script command and item group doc

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2015-04-09 20:54:01 +07:00
Cydh Ramdh
5ed75dc877 * Merge pull request #294 and its clean up
* Moved Bank Vault from `login` table (login-server level) to `global_reg_value` as #BANKVAULT (char-server level)
  * IMPORTANT: Read & import upgrade_20150408.sql
* Follow up cbdc0127, another fix for Point Shop NPC.
* Follow up 022d7289, corrected picklog initial for bound items that removed when member of guild/party or guild/party is broken. Please import upgrade_20150408_log.sql

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2015-04-09 01:26:17 +07:00
Nova
cb43e7dd10 Fixed SC_ALL_RIDING for Rangers
Due to this being OPTION_WUG before, Rangers who had a Warg but weren't riding it were unable to use Reins of Mount, but once you got on your Warg you were able to get on your mount while on a Warg.
2015-04-07 15:42:29 -07:00
Capuche
dd3e7e1710 Corrected typo in adven_boards.txt thanks grammatic@aleos89
Update lvl4_weapon_quest.txt, Hercules 169b3faae19e23a303a094fe26e181a8c1b1c6c7
Fix delitem bug in Ep13.1 quest. Hercules 9d1853aebd3ff34ed7869a3b1188943624078b8e
Corrected Tree Roots Location Hercules ca9cd51e683d39c8a7f099a46747ff166d632230

Signed-off-by: Capuche <capucrath@gmail.com>
2015-04-06 23:24:12 +02:00
nanakiwurtz
2fec0a881a Reverted npc/re/guides_alberta.txt to original state 2015-04-07 00:32:21 +07:00
nanakiwurtz
5eede89b49 Minor Typo 2015-04-07 00:26:21 +07:00
Cydh Ramdh
1c3c4955cb Follow up 823bc5397ba2fd96d042f53b37c7a6d78157e723, thank @cawogeek
Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2015-04-06 10:48:43 +07:00
Cydh Ramdh
4a1bd2a3ed Fixed #380, wrong HP & SP recovery bonus for Pure Soul effect (SC_MEIKYOUSISUI)
Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2015-04-05 20:03:49 +07:00
rAthenaAPI
1518d7be24 SQL synchronization 2015-04-04 17:10:44 +02:00
Cydh Ramdh
57ee2dd39f * Fixed #381, thank @DriwFS
* Updated .travis.yml as manual merge #374, removed IRC notification attempt

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2015-04-04 22:09:31 +07:00
nanakiwurtz
36462526a9 Eden Mace and Eden Staff swapped
* Thanks to @Desground

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-04-04 09:53:39 +07:00
rAthenaAPI
f924f5aeac SQL synchronization 2015-04-04 01:20:40 +02:00
nanakiwurtz
801b282723 HD Oridecon Box(30) item script fixed
* Thanks to @zackdreaver

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-04-03 19:15:45 +07:00
Cydh Ramdh
823bc5397b Merge pull request #339 from 'cydh/feature/script_command_rid' 2015-04-03 19:08:44 +07:00
Cydh Ramdh
ef5fe8e4f1 Added optional param for 'char_id' in some script commands
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-04-03 17:27:15 +07:00
Cydh Ramdh
86e856596e Fixed #373, HW_GRAVITATION is casted by Non-BL_PC causes map-server crash.
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-04-02 19:31:54 +07:00
Cydh Ramdh
1ab08b8f10 Another follow up 5f21afb2555d73bba219fd9fdb1d117c0e1950b1 (again)
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-04-02 15:54:51 +07:00
Cydh Ramdh
0f137f3c67 Added command 'getattachedrid()' as discussion result with @aleos89
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-04-01 22:37:14 +07:00
Cydh Ramdh
30940dc54f Fixed #365, pc_checkskill fail, another blame for 20695d629a59310a9e6a04c2234bbf4870609d90
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-04-01 21:18:00 +07:00
rAthenaAPI
e4f458f1dc SQL synchronization 2015-03-31 19:37:03 +02:00
Cydh Ramdh
a77223f029 Follow up c7062e5e7d039833e32f7a1da4dad094781921f2
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-04-01 00:36:07 +07:00
rAthenaAPI
f62d2ab2d6 SQL synchronization 2015-03-31 12:53:33 +02:00
Cydh Ramdh
c7062e5e7d Added status change (SC) documentation as merge #238. Thank @nanakiwurtz
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-03-31 17:52:25 +07:00
Cydh Ramdh
ee24f5c321 * Follow up 9d247d88c1f8a5d04a386ac6891726724ee226f9
* Typo

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-03-30 22:59:19 +07:00
Atemo
a2a4d62434 Merge pull request #354 from musashi076/patch-1
Corrected Tiucknuc mob name into Tiyanak in /npc/re/quest/quest_malaya.txt
2015-03-30 17:27:45 +02:00
Cydh Ramdh
dea64a2345 Follow up 20695d629a59310a9e6a04c2234bbf4870609d90
* Fixed #350
* Fixed also same potential issue for skill_nonearnpc_db.txt

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-03-30 22:21:48 +07:00
Cydh Ramdh
3028c871e3 Added monster config as https://rathena.org/board/topic/101136-toggle-for-loot-search-type-closest-vs-random/
* `monster_loot_search_type` default is `1` for official behavior in e6caa95, and `0` for old Athena style -closest- item.

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-03-30 12:54:09 +07:00
Cydh Ramdh
f41a63fd0c Changed macro & script_*2sd logic
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-03-30 12:50:25 +07:00
Cydh Ramdh
cbdc01271d NPC Shop fixes:
* Follow up 40c63f40: Fixed #368, warning fixes
* Fixed `pointshop` failed to get temporary player's variable (`@`) as currency.

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-03-29 20:55:12 +07:00
Cydh Ramdh
3c920759fa Fixed #366
* Somehow failed to get 'caster' status for calculation.
* A little cleanup for `SC_GT_ENERGYGAIN`, `SC_GT_CHANGE`, & `SC_GT_REVITALIZE` which don't need `bl->id` as `val2`. Caster is `src`, target is `bl`. (Was assumed `val2` to get caster status? `if (src2 = map_id2bl(val2))` but `bl` was target on skill_castend_nodamage_id.

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-03-29 08:59:26 +07:00
Cydh Ramdh
35e9c2b55c Temporary fix #321, reuse old matk calculation for monster until db/re/mob_db.txt is updated.
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
2015-03-28 12:05:21 +07:00
rAthenaAPI
a17d7bd8ed SQL synchronization 2015-03-28 02:15:20 +01:00
nanakiwurtz
212f5dbb8a Item DB Updated
* Fixed Heroic Boots item script

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-03-28 08:12:27 +07:00
Capuche
1e8aa4bdc4 Added adven_boards.txt dungeon signposts
Signed-off-by: Capuche <capucrath@gmail.com>
2015-03-28 00:31:36 +01:00
rAthenaAPI
ae66f7197f SQL synchronization 2015-03-27 17:11:57 +01:00
nanakiwurtz
d49d66b47f Item DB Fixed
* Thanks to @zackdreaver

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-03-27 23:09:35 +07:00
Cydh Ramdh
40c63f403f Merge pull request #364 from rathena/feature/market_shop
NPC Market Shop support
* New shop script definition: `<map name>,<x>,<y>,<facing>%TAB%marketshop%TAB%<NPC Name>%TAB%<sprite id>,<itemid>:<price>:<quantity>{,<itemid>:<price>:<quantity>...}`
* Added script command to update shop NPC: 'npcshopupdate "<name>",<itemid>,<price>{,<stock>}'
* Added NPCMarketDB (DBMap) for market data persistance method.
* Added `market_table` definition for market table in conf/inter_athena.conf.
* Thank to @aleos89, @Lemongrass, @icxbb-xx, merged HerculesWS/Hercules@cf19b26.

NOTES:
* Minimum client needed 2013-12-23 (but this client has bugs here-and-there).
* There's new table, see `upgrade_20150327_market.sql`.
* Market shop doesn't support discount.
* Added items by script `npcshopitem` or `npchopadditem` will be assumed as persistance items, will be loaded on next script reload or server start even market_shop NPC does't list them (unless NPC is not exists, entries will be removed).
2015-03-27 21:40:01 +07:00