Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,561 Commits 66 Branches 0 Tags 560 MiB
Commit Graph

12561 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Cydh Ramdh
7d929a06a3 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 there-and-there).
* There's new table, see `upgrade_20150327.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).

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
 2015-03-27 21:11:07 +07:00
aleos89
176f3daa93 Follow up to ec4f1f8 
* Adjusted the *unitdata parameter (changed in 2dc38e7) when making Guardians immune to attacks.
 2015-03-26 13:02:26 -04:00
aleos89
2dc38e77ca Follow up to 2cee5b6 
* Updated setunitdata to recalculate the object's information and update the client immediately.
* For setunitdata, map name can also be passed in as a valid value instead of map ID.
* Added mapid2name script command.
* Added status_set_maxhp and status_set_maxsp functions.
* Updated documentation to reflect changes.
 2015-03-26 11:47:36 -04:00
Cydh Ramdh
0b427a87e8 Fixed Cart Cannon skillratio, fixed #360. Thank @MrAntares 
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
 2015-03-26 21:56:20 +07:00
Cydh Ramdh
d495751d1d Follow up 2cee5b6ff1bf53c4ae53bc1278b09ae84b8a0a76 
* Revert `mercenary_create` command to don't return mercenary game id. Fixed #361

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
 2015-03-25 12:16:34 +07:00
nanakiwurtz
e0c348c7fb Minor typo at script_commands.txt 
* At movenpc example
 2015-03-24 12:28:06 +07:00
rAthenaAPI
c62b328413 SQL synchronization 2015-03-24 06:28:21 +01:00
Cydh Ramdh
8a6d673502 Follow up 5ec1b24c4ece647c62c1f99748df27468c919254, disabled some monster skills until related monster infos are done 
* 2477, NG_WANDER_MAN
* 2478, NG_RIDEWORD
* 2479, NG_MIMIC
* 2480, NG_EVIL_DRUID
* 2481, NG_WRAITH_DEAD
* 2483, NG_BAPHOMET
* 2485, NG_CHIMERA
* 2916, BIG_BEN
* 2917, BIG_BELL
* 2918, TIME_KEEPER
* 2919, NEO_PUNK
* 2920, ARC_ELDER
* 2921, OWL_VISCOUNT
* 2923, OWL_MARQUEES
* 3074, TIMEHOLDER

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
 2015-03-24 12:26:13 +07:00
Lemongrass3110
bbf6b96339 SQL synchronization 2015-03-23 21:09:59 +01:00
nanakiwurtz
5ec1b24c4e Added skill database of Nightmare Glast Heim & Champion monsters 
* Merge from https://code.google.com/p/idathena/source/browse/trunk/db/re/mob_skill_db.txt?spec=svn1809&r=1809
* Thanks to @exneval

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
 2015-03-23 23:17:13 +07:00
Cydh Ramdh
49a0b55f60 Fixed map-server crashed by Crimson Marker. Thank @raynra 
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
 2015-03-23 19:58:51 +07:00
Cydh Ramdh
12eaced423 Added CharID as optional param for 
* `getchildid({<char_id>})`
* `getmotherid({<char_id>})`
* `getfatherid({<char_id>})`
* `divorce({<char_id>})`
* `ispartneron({<char_id>})`
* `getpartnerid({<char_id>})`
* `getlook(<type>{,<char_id>})`
* `getsavepoint(<information type>{,<char_id>})`
* `getinventorylist {<char_id>}`
* `mergeitem({<item_id>{,<char_id>}})`
* `getgmlevel({<char_id>})`
* `getgroupid({<char_id>})`
* `getskilllist({<char_id>})`
* `skillpointcount({<char_id>})`
* `checkoption(<option number>{,<char_id>})`
* `checkoption1(<option number>{,<char_id>})`
* `checkoption2(<option number>{,<char_id>})`
* `setoption <option number>{,<flag>{,<char_id>}}`
* `setcart {<type>{,<char_id>}}`
* `checkcart({<char_id>})`
* `setfalcon {<flag>{,<char_id>}}`
* `checkfalcon({<char_id>})`
* `setriding {<flag>{,<char_id>}}`
* `checkriding({<char_id>})`
* `setdragon {<color>{,<char_id>}}`
* `checkdragon({<char_id>})`
* `setmadogear {<flag>{,<char_id>}}`
* `checkmadogear({<char_id>})`
* `setmounting {<char_id>}`
* `ismounting({<char_id>})`
* `checkwug({<char_id>})`
* `dispbottom "<message>"{,<color>{,<char_id>}}`
* `savepoint "<map name>",<x>,<y>{,<char_id>}`
* `save "<map name>",<x>,<y>{,<char_id>}`
* `changesex({<char_id>})`
* `countbound({<bound type>{,<char_id>}})`
* `consumeitem <item id>{,<char_id>}`
* `consumeitem "<item name>"{,<char_id>}`
* `makerune <% success bonus>{,<char_id>}`
* `resetlvl <action type>{,<char_id>}`
* `resetstatus({<char_id>})`
* `resetskill({<char_id>})`
* `getstatus(<effect type>{,<type>{,<char_id>}})`
* `nude {<char_id>}`
* `disguise <Monster ID>{,<char_id>}`
* `undisguise {<char_id>}

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
 2015-03-23 12:30:09 +07:00
Cydh Ramdh
d7964edbda Another follow up 5f21afb2555d73bba219fd9fdb1d117c0e1950b1 
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
 2015-03-22 18:36:39 +07:00
Cydh Ramdh
d951fab876 Follow up 231710c0fa9c2f9f3d150417e4ca2392850dd41b 
* Updated const.txt entries. Thank @julia40124009

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
 2015-03-22 11:07:46 +07:00
nanakiwurtz
5ce3c68393 Champion Mobs natural spawn area added 
* Follow up to fffb0adc66

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
 2015-03-22 03:41:20 +07:00
nanakiwurtz
fffb0adc66 Champion Mobs Implemented 
* Big thanks to @Skormie, @Lemongrass3110 and @euphyy

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
 2015-03-22 01:59:22 +07:00