13767 Commits

Author SHA1 Message Date
Jittapan Pluemsumran
cf4e6495fe
SQL Synchronization
[ci skip]
2016-06-30 14:40:10 +07:00
Jittapan Pluemsumran
c5e3fb073c Merge pull request #1377 from rathena/db/itemdb
Item database update
2016-06-30 13:08:04 +07:00
Jittapan Pluemsumran
3a121e9aa8
Merge branch 'master' into db/itemdb
Conflicts:
db/re/item_db.txt
2016-06-30 12:44:28 +07:00
Jittapan Pluemsumran
16ad1fce9c
Implemented God Material Box
* also corrected Hermose_Cap item script. Thanks to @zackdreaver
2016-06-30 12:34:53 +07:00
Lemongrass3110
d6d92a4b8e Small follow up to fe11416 2016-06-30 01:03:17 +02:00
aleos89
fe11416429 Streamlined renewal ASPD skill and potion calculations
* Only calculate the specific ASPD type (fixed or rate) when needed.
* Condensed some fixed ASPD bonus checks.
2016-06-29 13:23:54 -04:00
aleos89
4b679bcbb4 Merge branch 'master' of https://github.com/rathena/rathena 2016-06-29 10:16:23 -04:00
aleos89
06eab75006 Cleaned up Impressive Riff ASPD formula
* Renewal - No longer has to be /10 each time.
* Pre-renewal - Calculated separately from renewal formula.
2016-06-29 10:14:59 -04:00
Jittapan Pluemsumran
933d6879d3 Fixed #1405.
Changed a misplaced close to end
2016-06-29 20:59:26 +07:00
aleos89
b99114c0ce Corrected Swing Dance ASPD bonus
* Wrong status change value was being applied.
2016-06-28 14:00:06 -04:00
aleos89
cccb740817 Adjusted atcommand showexp display (fixes #1401)
* Follow up to d2bbd91.
* When no base or job EXP is given the message won't display.
2016-06-28 09:27:25 -04:00
Lemongrass3110
de1bc36a7a Revert "SQL synchronization"
This reverts commit e49cba5ceee5ae0d670f67f0505fe6d5d8a141cb.

Sorry I really do not know why or how this came into master... >_<
2016-06-28 00:05:15 +02:00
rAthenaAPI
e49cba5cee SQL synchronization
[ci skip]
2016-06-27 21:58:29 +02:00
aleos89
c2035f0477 Follow up to 82af619
* Resolved a compile error.
2016-06-27 14:33:22 -04:00
aleos89
82af619dfd Refactored clif damage type calls
* Cleaned up the calls for e_damage_type to use the constant value.
2016-06-27 12:48:26 -04:00
Jittapan Pluemsumran
b8a221fc99 Merge pull request #1397 from Akkarinage/hotfix/issue1387
Added duplicate NPCs to Novice Grounds. Fixes #1387.
2016-06-27 20:22:05 +07:00
Akkarinage
1dd674ff0d Added duplicate NPCs to Novice Grounds. Fixes #1387. 2016-06-27 05:58:19 +01:00
Jittapan Pluemsumran
3eac0617cd
SQL Synchronization 2016-06-26 23:01:27 +07:00
Jittapan Pluemsumran
b1d827183f Merge pull request #1392 from zackdreaver/master
Renewal item_db fix and update
2016-06-26 22:58:03 +07:00
zackdreaver
eb007e4b06 follow up 69ac7c3be996e6d7293cde61a7dc797368ad7b5f
Signed-off-by: zackdreaver <zackdreaver@gmail.com>
2016-06-26 22:42:13 +07:00
zackdreaver
69ac7c3be9 Renewal item_db fix and update
Signed-off-by: zackdreaver <zackdreaver@gmail.com>
2016-06-26 10:50:35 +07:00
aleos89
562a1a7b61 Removed some leftover variables
* Follow up to 65b716f.
2016-06-24 13:06:55 -04:00
Jittapan Pluemsumran
574f69e211
Updated HT_BLASTMINE and HT_CLAYMORETRAP renewal behavior
* These two skills now bypass defense cards.
Fixed #1028. Thanks to @Vomaito
2016-06-24 21:36:52 +07:00
Jittapan Pluemsumran
26aa69d6ef
ECL_SQUOIA now removes SC_DECREASEAGI 2016-06-24 20:16:49 +07:00
Lemongrass3110
bea47eac42 Added some more missing placeholders to mobdb 2016-06-23 23:24:56 +02:00
Lemongrass3110
f03174123e Fixed full throttle status icon
It now displays the time correctly.
Fixes #1384 thanks to @julia40124009
2016-06-23 15:55:28 +02:00
Jittapan Pluemsumran
440921fba0 Merge branch 'master' into db/itemdb 2016-06-23 20:16:32 +07:00
Jittapan Pluemsumran
b3ab05d1b8
Implemented missing Summoner's weapons. 2016-06-23 19:13:54 +07:00
Jittapan Pluemsumran
b95df50cd1
Follow up to 6412c82
Correct typo in the code
2016-06-23 17:14:02 +07:00
Cydh Ramdh
6412c82d59 Follow up d2bbd913ec886b1f4466f8d7651aba88f0de2b93
* Clean up `party_exp_share` for Renewal.
* Updated `party_exp_share` source doc.

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2016-06-23 10:42:59 +07:00
Cydh Ramdh
d2bbd913ec Fixed #1383: 0 EXP oddity for 'even share' party EXP
Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2016-06-23 08:48:21 +07:00
Atemo
94b866e938 Fixed issue #1382 (quest error)
Thanks @anacondaqq
2016-06-23 02:25:31 +02:00
Lemongrass3110
4ad8eb0655 Fixed appveyor project id 2016-06-23 01:40:12 +02:00
Lemongrass3110
7316c45ba6 Added appveyor for windows build tests 2016-06-23 01:28:22 +02:00
Lemongrass3110
2534588af6 Added const support to mob race2 db 2016-06-23 01:16:27 +02:00
Lemongrass3110
65b716f586 Removed some hardcoded mob ids
Created some race2 values for mobs used in the Manuk and Splendide status changes
2016-06-23 00:41:21 +02:00
Lemongrass3110
9558ef0868 Moved mob random groups constants
Added/Moved the two missing groups into src.
All of them are exported now directly through script_constants.h
2016-06-22 21:04:53 +02:00
aleos89
2e98ff68ae Updated script documentation
* Updated the constant location references to the new script_constants.h file.
2016-06-22 13:47:19 -04:00
Atemo
85f44a587d Removed useless lines 2016-06-22 15:50:40 +02:00
Jittapan Pluemsumran
c658ea23d4
Follow up to 33270ed.
Change type of running_npc_stat_calc_event variable to bool.
2016-06-22 17:54:40 +07:00
Jittapan Pluemsumran
33270ed2f5 Expands pc_bonus warnings to give more info when unknown bonus type is detected. 2016-06-22 15:42:58 +07:00
Lemongrass3110
124572efad Updated slots of shield of aeon
Fixes #1265.
This data was taken from divine-pride and iRO patch 2016-06-16data_gm_desc_r2.gpf, since the item does not exist on kRO.
2016-06-21 23:57:38 +02:00
Jittapan Pluemsumran
0798acec94 Update .gitignore. Ignore *.VC.opendb
[ci skip]
2016-06-21 18:37:07 +07:00
Jittapan Pluemsumran
ec042e99a5
Follow up to 1d09abe
Only retrieve the pointer for base status once
2016-06-21 17:23:16 +07:00
Jittapan Pluemsumran
815368accf Merge pull request #1381 from AtlantisRO/master
Added use of F_HasEdenGroupMark function.
Thanks to @AtlantisRO!
2016-06-21 17:13:56 +07:00
AtlantisRO
cfe7e3efc6 Added use of F_HasEdenGroupMark function. 2016-06-21 03:44:31 -06:00
Jittapan Pluemsumran
274232f716 Merge pull request #1380 from AtlantisRO/master
Added support to Para_Team_Mark_ item in Eden Group
Thanks to @AtlantisRO!
2016-06-21 13:56:56 +07:00
AtlantisRO
3a526c7ca0 Added support to Para_Team_Mark_ in Eden Group. 2016-06-20 21:28:20 -06:00
AtlantisRO
22aa75511c Update to rAthena's Latest Version 2016-06-20 16:08:17 -06:00
aleos89
b2fedb8ea1 Follow up to 1d09abe
* Removed an unused variable.
2016-06-20 14:21:20 -04:00