Commit Graph

  • 4676fe08a0 Accidentally removed the tick check * Added back the tick check. aleos 2017-10-17 19:35:28 -04:00
  • 0f4a3943d3 This PR change the emoticons constant name to match emoticonlist from client side. * Note: the previous emoticons names are now deprecated. Atemo 2017-10-18 01:18:01 +02:00
  • 94835853b7 Corrected Vacuum Extreme behavior * Fixes #2497. * Vacuum Extreme will now pull players into the center. Thanks to @esu1214! aleos 2017-10-17 16:36:11 -04:00
  • e16ec58a36 Corrected Endure hit count behavior * Fixes #2508. * Endure should have 7 hits (instead of 8) in PvM. Thanks to @kaninhot004! aleos 2017-10-17 16:09:42 -04:00
  • 7b98975597 Implemented round,floor,ceil script commands. Jittapan Pluemsumran 2017-10-17 23:05:59 +07:00
  • 0deab830db Try Again Travis Maz-V 2017-10-17 20:05:10 +07:00
  • 93db243b7e Indent Line Maz-V 2017-10-17 17:46:09 +07:00
  • cacf3d1807 Added PACKETVER Maz-V 2017-10-17 17:11:01 +07:00
  • 274b235a67 Platinum Skill: skill MC_CARTDECORATE Maz-V 2017-10-17 13:49:03 +07:00
  • b4106eb988 Adjusted script command bindatcmd (#2518) Aleos 2017-10-16 14:49:39 -04:00
  • 8a534ddaf9 Adjusted script command bindatcmd * Fixes #2513. * Defaulted the char-command level to 100. Thanks to @mazvi and @Lemongrass3110! aleos89 2017-10-16 13:35:37 -04:00
  • 707d1eba4f Item Shop Trade Restriction adjustment * Fixes #2503. * Added a config to allow usage of sell-restricted items as currency in Item Shops. Thanks to @Mickosis! aleos89 2017-10-16 13:28:28 -04:00
  • 7e9029d8f9 Merge 4ae1fbd0ce9772a75ab49671990cf3ca2996142e into 7991f47a01812276a7a5fa0353545f79f34da46f Maz-V 2017-10-16 10:30:37 +00:00
  • 4ae1fbd0ce Update jobmaster.txt Maz-V 2017-10-16 17:30:35 +07:00
  • 277048fb58 Jobmaster: Third Class Non Trans Option Maz-V 2017-10-16 17:28:44 +07:00
  • 7991f47a01 Adds jobmaster option disable Baby Novice only (#2514) Maz-V 2017-10-16 14:54:03 +07:00
  • 908beb823a Disable Job Baby Novice Only Maz-V 2017-10-16 11:38:53 +07:00
  • e9f6ded264 Fixed an import issue in mapindex Lemongrass3110 2017-10-15 19:00:29 +02:00
  • 56f3288bb5 Fixed several issues in enchant npc Atemo 2017-10-15 16:14:03 +02:00
  • 48fcc92a9c Follow up to 828f78322b12b42a11bb7974777010076e5b8753 Jey 2017-10-15 13:19:12 +02:00
  • 54c12fa29d Fix typos and update marketshop Anity99 2017-10-15 10:01:48 +07:00
  • a750220758 Merge branch 'master' into cleanup/renewal_aspd aleos 2017-10-14 22:49:08 -04:00
  • db37fc7ddd Fixes required equipment check for skills (#2374) Aleos 2017-10-14 22:37:55 -04:00
  • 8c2f727f64 Added support for 3 new hat effects Lemongrass3110 2017-10-15 02:29:38 +02:00
  • 122644ef76 Removed an unneeded comment * Comet does not report missing Red Gemstones. aleos 2017-10-14 20:23:41 -04:00
  • b196b46bd5 Follow up to f42c2ff Lemongrass3110 2017-10-15 02:19:58 +02:00
  • 403c3c7095 Merge branch 'master' into hotfix/issue2372 aleos 2017-10-14 18:06:30 -04:00
  • cf05acaf14 Merge branch 'master' into feature/2016_wedding_skills aleos 2017-10-14 17:11:20 -04:00
  • 29a45d4dc6 Cleaned up some family skills * Cleaned up some checks during skill usage. * Call All Family, One Forever, and Cheer Up are no longer influenced by INT/DEX. Thanks to @Lemongrass3110 and Rytech2! aleos 2017-10-14 17:07:19 -04:00
  • 207497c60a Merge branch 'master' of https://github.com/rathena/rathena into Implement-official-content Lemongrass3110 2017-10-14 19:27:44 +02:00
  • 2606cf977f Migrated skill.c to C++ (#2500) Aleos 2017-10-14 13:03:27 -04:00
  • eb5f644930 Follow up to b8a6803 Anity99 2017-10-14 23:46:53 +07:00
  • 0f99bf9f44 Merge branch 'master' into refactor/skill_cpp aleos 2017-10-14 12:19:46 -04:00
  • 18b3f1584c Minor changes * Updated some things based on @lighta's review. aleos 2017-10-14 12:17:06 -04:00
  • f42c2ff211 Moved some remaining constants into src (#2501) Lemongrass3110 2017-10-14 18:13:51 +02:00
  • e147ea4069 Added enum prefix Lemongrass3110 2017-10-14 17:45:56 +02:00
  • 951ff55573 Updated Convex Mirror to match official behavior (#2506) Aleos 2017-10-14 11:45:24 -04:00
  • b8a6803c99 Added Airship Assault Anity99 2017-10-14 22:27:55 +07:00
  • c75d77067d Follow up to 8e9f72a Anity99 2017-10-14 22:22:51 +07:00
  • b3167c9c7e Follow up to 7553501 * Made use of the other BOSS_INFO packet messages. * Properly end the status when the player changes maps. * Small cleanups and updated status change documentation. Thanks to @Lemongrass3110! aleos 2017-10-14 10:49:14 -04:00
  • 76923ac506 Corrected some refiner checks * Follow up to e24d30a. * Fixes #2505 and fixes #2507. * Added a missing material check for Suhnbi. * Added a missing safe limit check for normal refiners. Safe limit was always 0. Thanks to @mazvi, @Mickosis, and @cydh! aleos 2017-10-14 09:11:30 -04:00
  • e7dcbe5043 Fixed a nullpointer access Lemongrass3110 2017-10-14 00:25:19 +02:00
  • 536db4f8ef Fix it for real this time Lemongrass3110 2017-10-13 23:56:34 +02:00
  • 63719a0553 Fixed inventory item checks Lemongrass3110 2017-10-13 23:22:25 +02:00
  • 7553501b93 Updated Convex Mirror to match official behavior * Fixes #2498. * When a MVP dies it will only show the respawn time once instead of flooding the chat window. * The Boss icon will now properly display itself when the MVP respawns if the player has already consumed a Convex Mirror. * Converted some integers to constant values. Thanks to @esu1214! aleos 2017-10-13 17:17:12 -04:00
  • d344f675de Merge branch 'master' into cleanup/renewal_aspd Aleos 2017-10-13 14:38:02 -04:00
  • 2f008a5b47 Updated script accordly @cydh comment Atemo 2017-10-13 19:54:46 +02:00
  • f3630cbb4a Merge branch 'master' into refactor/skill_cpp aleos89 2017-10-13 13:29:27 -04:00
  • 3ab39c4cb3 Follow up to 6a2c122 * Removed an unused variable. aleos89 2017-10-13 09:53:36 -04:00
  • 353179a5b1 Partial revert of dcaacf9 * Resolved a crash when monsters move. aleos 2017-10-12 23:29:23 -04:00
  • 3e86c3f740 Added mailmap file to coalesce together commits. Taylor Locke 2017-10-12 03:40:26 -07:00
  • 08b3bb0460 Merge branch 'master' into hotfix/issue2372 Aleos 2017-10-12 13:18:57 -04:00
  • 0e598ec90d Updated special effect constant from Rebel branch * Adjusted integer -> constant from the Rebellion Awakening branch. aleos89 2017-10-12 12:38:34 -04:00
  • 232db6d92f Merge branch 'master' into cleanup/npc_viewids aleos89 2017-10-12 12:33:25 -04:00
  • 5eb2511807 Merge pull request #1 from rathena/master Ex0ample 2017-10-12 22:33:40 +07:00
  • 57113d1fbb SQL synchronization rAthenaAPI 2017-10-12 17:04:12 +02:00
  • 6a2c1229d0 Updated Rebellion class (#1692) Aleos 2017-10-12 11:04:03 -04:00
  • 0165ce4b76 Merge branch 'master' into update/rebellion_awakening aleos89 2017-10-12 10:41:16 -04:00
  • 6195b2ca23 Initial release of Sarah and Fenrir memorial Atemo 2017-10-12 15:43:25 +02:00
  • 7c41432938 Refine UI fixes * Added fail type 3 for clif_refine to displays refine was failed but without breaking the equip so the refine attempt button is still can be used. * Added sanity check for use_blacksmith_blessing, reset the value if the item is never required. Cydh Ramdh 2017-10-12 13:59:46 +07:00
  • 4072955d6e Moved all hat effect constants into src Lemongrass3110 2017-10-11 23:39:21 +02:00
  • 4b065f4ccc Small cleanup for the effect documentations Lemongrass3110 2017-10-11 23:24:36 +02:00
  • 1288067515 Moved all effect constants into src Lemongrass3110 2017-10-11 23:08:35 +02:00
  • deb7f0f5f3 Moved all npc view constants into src Lemongrass3110 2017-10-11 19:05:48 +02:00
  • c2a288d853 Merge 63c0c03801737b1f8beb0ac0bf06b1b4f0df2a5e into db2d332cab0f41771b24812521b1e54a3fc4639a Arashi 2017-10-11 13:32:27 +00:00
  • db2d332cab SQL synchronization rAthenaAPI 2017-10-11 15:24:39 +02:00
  • 705cc5a869 Mob DB placeholders Lemongrass3110 2017-10-11 15:23:14 +02:00
  • abbc86a5d8 Added Refine material limitations * HD Oridecon & HD Elunium only can be used to update equip with refine level +7 to +9. It means +7 -> +8, +8 -> +9, +9 -> +10. * Enriched Oridecon & Enriched Elunium are just replacement of normal materials. It means only can be used to refine up to +10. * Corrected true = enriched flag for getequippercentrefinery commands. HD just simply use normal rates, not enriched. Or create new value for HDs later Cydh Ramdh 2017-10-11 09:14:12 +07:00
  • 60228be8e8 Refine UI Updates * Enabled Blacksmith Blessing check for refining to disable downrefine on fail! (of course without breaking the refined item) * +7 to +8 needs 1 ea * +8 to +9 needs 2 ea * +9 to +10 needs 4 ea * +10 to +11 needs 7 ea * +11 to +12 needs 11 ea * Added Blacksmith Blessing entries to refine_db.yml follow the values above. * Fixed refine_info clearances on loading files. Cydh Ramdh 2017-10-10 23:50:40 +07:00
  • 5f4c5559a5 Migrated skill.c to C++ * Needed in preparation for future projects. aleos 2017-10-10 16:10:40 -04:00
  • 9c155acdca Added 'Blacksmith blessing' system in refine npcs (Basta and Mighty hammer) Atemo 2017-10-10 20:14:59 +02:00
  • 6a1891c720 Fixed a typo thanks @anity99 ! Atemo 2017-10-10 17:35:07 +02:00
  • fe391b0997 Fixed Refine UI doesn't update the refine value on downrefine. Thanks to @ecdarreola Cydh Ramdh 2017-10-10 21:23:29 +07:00
  • fa425b834f Updated callshop selling list variables (#2480) Aleos 2017-10-10 06:15:51 -04:00
  • 71e285e8bd Small unrelated cleanup Lemongrass3110 2017-10-10 10:42:10 +02:00
  • d50cb66665 Sanity check for current refine level Lemongrass3110 2017-10-10 10:21:13 +02:00
  • db82c459cd Added downgrade logic Lemongrass3110 2017-10-10 00:21:12 +02:00
  • 0a2d6c1b8b Added a feature check for existing refiners Lemongrass3110 2017-10-09 23:47:17 +02:00
  • ed664a3e47 Added a logic check for the feature configuration Lemongrass3110 2017-10-09 23:30:23 +02:00
  • b9858f7062 Added a missing index check Lemongrass3110 2017-10-09 15:37:38 +02:00
  • 82217a44bd Initial release of the refine UI Lemongrass3110 2017-10-09 14:58:27 +02:00
  • 7898a667df SQL synchronization rAthenaAPI 2017-10-09 14:37:51 +02:00
  • 3e78cc1c3a Fixes item positions Jey 2017-10-09 14:35:59 +02:00
  • 9e1c5dbec1 SQL synchronization rAthenaAPI 2017-10-09 03:55:27 +02:00
  • 828f78322b Adds a duplicate name check for the itemdb. (#2492) Jeybla 2017-10-09 03:55:12 +02:00
  • 368503b8d6 Adds a duplicate name check for the itemdb. Jey 2017-10-08 22:52:41 +02:00
  • ff6722c924 Follow up to fb882c4aa09af17992f5073f1f32566d9ff7e21f Jey 2017-10-08 20:20:33 +02:00
  • 63c0c03801 Fix Portal Aki Hayakawa 2017-10-09 03:20:04 +09:00
  • 4a6708bedd Merge 34cb19782f7d04b0dac26f5b701376684af9fbeb into ba7a766472396c046d1e42c675910707845a97f6 Arashi 2017-10-08 18:03:43 +00:00
  • 34cb19782f Portal Error Aki Hayakawa 2017-10-09 03:00:30 +09:00
  • 2514d61999 Merge pull request #3 from rathena/master Arashi 2017-10-09 02:30:32 +09:00
  • ba7a766472 SQL synchronization rAthenaAPI 2017-10-08 16:50:46 +02:00
  • 800fd3da45 Fixed Zaha Doll Hat not being refinable. Fixes #2485 Jittapan Pluemsumran 2017-10-08 21:50:38 +07:00
  • 463c332e23 Fixed Zaha Doll Hat not being refinable. Fixes #2485 Thanks to @uddevil Jittapan Pluemsumran 2017-10-08 21:35:44 +07:00
  • 8a93b12020 SQL synchronization rAthenaAPI 2017-10-08 00:58:05 +02:00
  • 319fc4d18c Fixed a duplicate aegis name Thanks @Jeybla ! Atemo 2017-10-08 00:57:43 +02:00
  • eb6801fdc4 Resolve merge conflit Atemo 2017-10-08 00:42:41 +02:00
  • 54a119c56a Resolves Skill Unit Database parsing issue (#2484) Aleos 2017-10-07 11:29:50 -04:00
  • b8562932cf Removes SCRIPT_CALLFUNC_CHECK ifdef-directives. (#2482) Jeybla 2017-10-07 16:59:45 +02:00
  • e19f37e75e Resolves Skill Unit Database parsing issue * Fixes #2483. * Properly trims the target field so it can be processed accurately. aleos 2017-10-07 10:52:07 -04:00