Commit Graph

  • 0f10e6ed0f Couple fixes * Resolves damage calculation being too high. * Resolves damage not splitting based on targets in the area. * Fixes a possible case where a 4th hit would find it's way in. Thanks to @Daegaladh! aleos 2020-06-22 13:11:03 -04:00
  • 428e0c3744 Merge branch 'master' into feature/blocking_play aleos 2020-06-22 10:30:31 -04:00
  • 7ce82501e9 Fixes compile error * Adjusts skill information flag to new format. aleos 2020-06-22 10:19:11 -04:00
  • fcd7898a16 Merge branch 'master' into hotfix/mado_gear_statuses aleos 2020-06-22 10:09:42 -04:00
  • 568dba8ab2 Merge branch 'master' of https://github.com/rathena/rathena into template Kanin Temsrisuk 2020-06-22 21:08:00 +07:00
  • dafd91940a Fixes NC_REPAIR and NC_SHAPESHIFT requirements * Fixes #5124. * Fixes the level independent item requirements for Repair and Shape Shift being offset by 1. Thanks to @ecdarreola! aleos 2020-06-22 10:06:28 -04:00
  • 0cdd5c4ca5 Merge branch 'correct_up_item_db_27_apr_2020' of https://github.com/kaninhot004/Start into template Kanin Temsrisuk 2020-06-22 21:06:07 +07:00
  • d6d56babf2
    Fixes skill cast delay flag (#5127) Sader Fawall 2020-06-22 15:18:17 +02:00
  • 23fe7c4670 Just commit changes. Kanin Temsrisuk 2020-06-22 10:00:42 +07:00
  • 6fbcaa3fe4 Fix errors. Kanin Temsrisuk 2020-06-22 09:35:57 +07:00
  • cf5bade793 Merge branch 'correct_up_item_db_27_apr_2020' of https://github.com/kaninhot004/Start into template Kanin Temsrisuk 2020-06-21 19:00:24 +07:00
  • 55477eddba Corrected up RWC Combo, and some minor fix. Kanin Temsrisuk 2020-06-21 18:59:51 +07:00
  • db1f2b5b20 Merge branch 'correct_up_item_db_27_apr_2020' of https://github.com/kaninhot004/Start into template Kanin Temsrisuk 2020-06-21 17:16:06 +07:00
  • 322932da9c Corrected up Item combo 4958 - 4969 refine count. Kanin Temsrisuk 2020-06-21 17:15:00 +07:00
  • 91dcde2839 Added more missing item required. Kanin Temsrisuk 2020-06-21 17:08:06 +07:00
  • 797355758e Merge branch 'correct_up_item_db_27_apr_2020' of https://github.com/kaninhot004/Start into template Kanin Temsrisuk 2020-06-21 16:50:22 +07:00
  • 791ed70493 Added missing item required. Kanin Temsrisuk 2020-06-21 16:47:54 +07:00
  • 4c69344ed3 fix skill cast delay flag Sader Fawall 2020-06-21 11:43:24 +02:00
  • 9cc7f1f0bd Corrected up more items. Kanin Temsrisuk 2020-06-21 14:36:21 +07:00
  • aa0f616646 Merge branch 'master' of https://github.com/rathena/rathena into correct_up_item_db_27_apr_2020 Kanin Temsrisuk 2020-06-21 09:32:58 +07:00
  • 28c22f98e1 Update hairstyle and hair colour limit plus Stylist script Eric 2020-06-21 04:44:13 +10:00
  • adcfecad51 Merge branch 'master' of https://github.com/rathena/rathena into template Kanin Temsrisuk 2020-06-20 09:59:35 +07:00
  • d78726157f Corrects Power Swing and Axe Boomerang behavior * Fixes #5109. * Power Swing should only cast Axe Boomerang when an axe is equipped. Thanks to @Haydrich! aleos 2020-06-19 16:38:01 -04:00
  • c51fcdaaec Minor cleanups to converter aleos 2020-06-19 13:26:12 -04:00
  • 30cb8fa9a2 Fixes some parsing issues aleos 2020-06-19 12:33:42 -04:00
  • d13eed6cd8 Merge branch 'master' into feature/lapine_synthesis_and_upgrade aleos 2020-06-19 11:18:13 -04:00
  • 3c0d3b86e5 Corrected a Wanderer Outer + Wanderer's Sakkat combo atemo 2020-06-19 17:05:44 +02:00
  • bac53cf737 Fixed a possible crash in the char-server Lemongrass3110 2020-06-19 16:37:55 +02:00
  • 9775c947da
    Lux Anima is no longer able to be canceled (#5120) Aleos 2020-06-19 08:27:55 -04:00
  • 8b421e6373
    Adds a missing nullptr check Aleos 2020-06-19 08:27:37 -04:00
  • e185224174 Another cleanup Lemongrass3110 2020-06-19 12:16:07 +02:00
  • 8cc906b171 cleanup 2 Sader Fawall 2020-06-19 09:58:51 +02:00
  • 59a0b13ef9 fix notification Sader Fawall 2020-06-19 09:42:56 +02:00
  • fe1e2d873e cleanup command script Sader Fawall 2020-06-19 09:39:36 +02:00
  • 86a428da1f remove a file pushed by mistake Sader Fawall 2020-06-19 09:32:40 +02:00
  • e9e99cf789 cleanup1 Sader Fawall 2020-06-19 09:31:40 +02:00
  • 4e63f3e7e5 remove ignore timer Sader Fawall 2020-06-19 09:28:40 +02:00
  • dab3ae0944 Merge branch 'master' of https://github.com/rathena/rathena into map_duplication_instance_system Sader Fawall 2020-06-19 07:56:23 +02:00
  • 008aec7572 Merge branch 'master' of https://github.com/rathena/rathena into template Kanin Temsrisuk 2020-06-19 09:03:51 +07:00
  • f7bf667e32 Cleans up SC_MISTY_FROST * Adds missing val1 flag. * Adds missing SCB_NONE flag. aleos 2020-06-18 21:38:53 -04:00
  • 1f5871a85b Fixed position desync using Back Slide when being hit on pre-re * Follow up to c4609b19d6910ae05d6424a8cb1da2142d870ef0 Daegaladh 2020-06-19 02:51:48 +02:00
  • 43f6577abe Fixed GVG and BATTLEFIELD race2 IDs Daegaladh 2020-06-19 02:15:50 +02:00
  • bfa704faea Release no longer casts spell books randomly * Release will now cast spell books based on the reversed order they were learned. aleos 2020-06-18 17:13:47 -04:00
  • e9ba8e4fb8
    Fixes skill ID and level variable signage Aleos 2020-06-18 17:08:58 -04:00
  • c0ad58e514 Fixes a potential crash with Release level 2 aleos 2020-06-18 14:27:43 -04:00
  • 7d1a286424 Updates Summon Ball behavior * Summon Fire/Water/Lightning/Stone Ball level 2 will always replace the previously summoned balls no matter how many the player has. aleos 2020-06-18 14:25:15 -04:00
  • d3b4d84587 Updated item db atemo 2020-06-18 19:10:16 +02:00
  • 810e509a6e Updated script using rentalcountitem atemo 2020-06-18 19:07:11 +02:00
  • 17db5ec8b9 Merge branch 'master' into script/skyfortrest_instance atemo 2020-06-18 18:48:24 +02:00
  • 35ccb1d342
    Merge branch 'master' into update/warlock Aleos 2020-06-18 11:55:30 -04:00
  • 80b7361ba3 Lux Anima is no longer able to be canceled * Fixes #5026. * Lux Anima is no longer able to be canceled like the other Rune Stones. Thanks to @Masao87 and @flamefury! aleos 2020-06-18 11:52:08 -04:00
  • 9e98c3a019
    Corrected a count check for rental item woe te merchant (#5119) Atemo 2020-06-18 16:59:02 +02:00
  • a3c31dd78b Corrected another count check for rental item atemo 2020-06-18 16:24:17 +02:00
  • da85207c3d Merge branch 'master' of https://github.com/rathena/rathena into template Kanin Temsrisuk 2020-06-18 10:31:54 +07:00
  • 4cf15732d6 Improvements to skill_detonator * Fixes #3268. * Adds more safety checks for possible nullptr skill_unit_group data. * Adjusts order of failure checks to speed up operations. Thanks to @uddevil and @ecdarreola! aleos 2020-06-17 22:27:48 -04:00
  • de9c0f7a20 Fixes a crash non-player objects and timed skills * Fixes #5110. * Fixes a potential map server crash when non-player objects attempt to use Chain Lightning, Tetra Vortex, or Flash Combo and are kill during duration. Thanks to @Hope8888! aleos 2020-06-17 22:00:00 -04:00
  • dbe27fe510
    Adds script commands to count rental items (#5080) Aleos 2020-06-17 21:48:26 -04:00
  • 6ed00751f6 Adds new constant for EAJ_SUPERNOVICE aleos 2020-06-17 16:18:50 -04:00
  • 8bd6948474 Fixes Octopus Cave Instance check Thanks to @attackjom! aleos 2020-06-17 16:17:14 -04:00
  • 8d56f41247 Merge branch 'master' into feature/itemdb2yaml aleos 2020-06-17 15:51:08 -04:00
  • 5c238ebddd More cleanups to item job flags * Completely drop custom and limited item job flagging system in favor of EAJ/MAPID. aleos 2020-06-17 15:28:00 -04:00
  • 3804d7f603
    Adds support for instance destruction button (#5073) Aleos 2020-06-17 14:52:22 -04:00
  • 6c10ef34d1 Update map_msg.conf Kanin Temsrisuk 2020-06-17 22:31:58 +07:00
  • 0298694849 Added a note about the destroy button atemo 2020-06-17 17:13:52 +02:00
  • 08e1e96050 Merge branch 'master' of https://github.com/rathena/rathena into template Kanin Temsrisuk 2020-06-17 08:55:05 +07:00
  • 04ba3e3d96
    Adds a config for slave teleporting to master (#5095) Aleos 2020-06-16 20:58:12 -04:00
  • 8ff6f78359
    Fixes a SQL error Aleos 2020-06-16 16:07:13 -04:00
  • f90e70b234 Fixes IT_DELAYCONSUME * Fixes designation to become IT_USABLE. * Adds constants for delay consume tracking. aleos 2020-06-16 14:30:43 -04:00
  • 5a7f022d60 Follow-up 02b385341a atemo 2020-06-16 16:14:12 +02:00
  • 343dffd257 Merge branch 'master' of https://github.com/rathena/rathena into template Kanin Temsrisuk 2020-06-16 20:51:45 +07:00
  • a9b470e80b Fixes item searching to utilize stristr * Fixes item searching to utilize partial item name searching. aleos 2020-06-16 09:43:29 -04:00
  • 3598c74191 SQL synchronization rAthenaAPI 2020-06-16 15:41:14 +02:00
  • 12aaf28ca6
    Minor fixes for item_db.txt and item_combo_db.txt. (#5097) asdfghjkl 2020-06-16 09:41:05 -04:00
  • c1aa628bdb Cleanups and adjustments Lemongrass3110 2020-06-16 15:00:57 +02:00
  • 9ed1bc5d89 fix ignoretimer Sader Fawall 2020-06-16 14:15:01 +02:00
  • bb63a1718a mapflag check and instance_list command script Sader Fawall 2020-06-16 12:08:08 +02:00
  • 446cdfb7a2 add more checks for @reloadscript Sader Fawall 2020-06-16 10:56:21 +02:00
  • 5ad6c5ba3e Fix typo LordWhiplash 2020-06-16 04:38:57 -03:00
  • 17a0097166 Fix Survivor's Circlet LordWhiplash 2020-06-16 04:29:12 -03:00
  • 27033e1466 Create instance with no timer and no data Sader Fawall 2020-06-16 07:42:41 +02:00
  • 2078640471 Removes battle_config.recall_stuck_slave * Determined that slaves don't become completely stuck but rather immobile until a target comes in range again. aleos 2020-06-15 22:56:41 -04:00
  • a82d0974fb Merge branch 'master' of https://github.com/rathena/rathena into template Kanin Temsrisuk 2020-06-16 08:51:46 +07:00
  • 02b385341a Corrected instance_create command to only save the mode when the it is successfully created atemo 2020-06-16 00:45:55 +02:00
  • a7da581c68 Fixed instance window * The window could display a wrong instance information on an instance map when multiples instances were running for the character atemo 2020-06-15 23:45:26 +02:00
  • dc4787735c Display IM_CHAR status at login aleos 2020-06-15 17:21:12 -04:00
  • 2a5a67df66 Merge branch 'master' into hotfix/issue3150 aleos 2020-06-15 16:56:42 -04:00
  • 82f3ff9fb6
    Fixes IM_CHAR instances to persist relog (#5088) Aleos 2020-06-15 16:53:42 -04:00
  • 4e91c5f7db Refresh player instance info after destruction aleos 2020-06-15 15:30:11 -04:00
  • 3484d4c261 Reverts signage to account for failure aleos 2020-06-15 14:07:22 -04:00
  • 36161d5c4c EFST_MADOGEAR cleanups * Removes fake EFST send outs depending on the player option. * SC_MADOGEAR will be handled through the master pc_setoption function. * Adds SQL script to add SC to players who are mounted on a Madogear. * Adds missing special effect to Mado_Box. aleos 2020-06-15 13:58:38 -04:00
  • 21fd335d85 Merge branch 'master' of https://github.com/rathena/rathena into template Kanin Temsrisuk 2020-06-15 21:23:02 +07:00
  • 60d03a1978
    Fixes Rolling Cutter counter not resetting (#5082) Aleos 2020-06-15 08:42:18 -04:00
  • a6357fd8c2
    Updates Cross Slash casting data (#5101) flamefury 2020-06-15 05:09:22 -07:00
  • d929a87d9d Small signedness cleanup Lemongrass3110 2020-06-15 13:44:13 +02:00
  • 60a2f2fc14
    Fixed sending of storages full of equip (#5102) Lemongrass3110 2020-06-15 13:40:09 +02:00
  • 7922a1f57e Fixed sending of storages full of equip Lemongrass3110 2020-06-15 13:02:10 +02:00
  • 1c1422d494 Enable Gold Coin Trader NPC Eric 2020-06-15 18:50:32 +10:00
  • 4285c4232a Remove older version of Pet Trader NPC Eric 2020-06-15 18:32:44 +10:00
  • 58019eeb62 Fix extended vending using old nameid Eric 2020-06-15 18:14:25 +10:00
  • 0300ee0168 Merge branch 'gold-coin-system' into chocobot-ro Eric 2020-06-15 18:05:15 +10:00