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

13785 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aleos89
b3e1c52cbb Corrected Shield Press damage delay (fixes #1165) 
* Damage should have a ~1 second delay as the shield animation falls.
 2016-07-04 11:47:08 -04:00
Jittapan Pluemsumran
95f09f84bf
Fixed some incorrect shadow gears combo script 
* They should grant total immunity to a status effect.
 2016-07-04 18:17:33 +07:00
Atemo
22bc0907d6 Fixed: Disable Loki NPC at entrance of Hazy Forest after the defeat of Wandering Purple Dragon. 2016-07-03 21:20:11 +02:00
Jittapan Pluemsumran
15c382ee2c
Item DB update 
* Changed AegisName for item #19133 (formerly Odin_Mask) to avoid duplicate AegisName
* Corrected script in item #4556 (Fenrir_Card). Thanks to @Jeybla.
 2016-07-04 00:40:27 +07:00
Atemo
1ea0e3899c Merge branch 'master' of https://github.com/rathena/rathena 2016-07-03 02:20:26 +02:00
Atemo
fd6f241074 Fixed EndlessTower.txt : officially a player can't enter in endless tower if he has changed party and he already entered in the instance with his previous party. Thanks to RagEmu/Renewal@73ec00faa5 2016-07-03 02:18:31 +02:00
Lemongrass3110
d632f100b5 Removed duplicate check in guild creation 
Merged from HerculesWS/Hercules@0b7498b thanks to @MishimaHaruna.
 2016-07-03 02:11:57 +02:00
Lemongrass3110
63f719a154 Fixed emperium deletion on guild creation 
Merged from HerculesWS/Hercules@71c24de thanks to @4144.
 2016-07-03 02:06:49 +02:00
Lemongrass3110
4744ee0731 Fixed instance idle timeout 
Fixed instances of going into idle mode when there were still users left in the instance.
Thanks to @Darkelfen for reporting it.
Fixes #1412.
 2016-07-03 01:52:06 +02:00
aleos89
e5a197ad70 Corrected Cloud Kill effect (fixes #407) 
* Properly implemented the Cloud Kill status icon.
* Poison duration is not reduced and lasts if the target leaves the AoE.
- Walking into the AoE a second time resets the Poison status.
 2016-07-02 19:49:58 -04:00
aleos89
10d1020008 Fixed Elemental Change skills versus players (fixes #1411) 
* Should not be usable on players or Status Immune monsters.
 2016-07-02 19:24:24 -04:00
aleos89
9f68f7817c Corrected an issue with script command set 
* Follow up to fd48238.
* Added a few checks so the optional value for script command setr doesn't conflict with the optional character ID value.
 2016-07-01 17:46:59 -04:00
aleos89
fd482381f6 Script engine fixes/additions (fixes #1212) 
* Follow up to c3193f3.
* Resolved some issues with += and -= operators.
* Cleaned up post ++ and -- operators.
* Implemented pre ++ and -- operators.
Thanks to Hercules!
 2016-07-01 17:13:50 -04:00
Lemongrass3110
11179e3d43 Fixed creator npc for rebirth 
The npc now gives the creators their homunculus skills if they had learned them before their rebirth.

Fixes #1408
 2016-07-01 09:34:52 +02:00
Lemongrass3110
a41b132321 Updated some aegis names 
Additionally trimmed some whitespaces at the end of names or at the end of lines.
Added some more placeholders for monsters.
 2016-07-01 08:48:44 +02:00
Lemongrass3110
b1b43bb0df Removed hardcoded aloevera restriction 
Additional changed some hardcoded ids to constants.
 2016-07-01 00:33:43 +02:00
rAthenaAPI
28d76e77df SQL synchronization 
[ci skip]
 2016-07-01 00:05:00 +02:00
Aleos
db592a269f Updated Homunculus S Summons (fixes #420) 
* Updated miscellaneous database values.
 2016-06-30 18:04:02 -04:00
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