Commit Graph

8589 Commits

Author SHA1 Message Date
atemo
d79513402d Merge branch 'master' into feature/lapine_synthesis_and_upgrade 2020-10-31 02:55:37 +01:00
Atemo
0964881a81 Small correction of getiteminfo script command (subtype shifted the values) (#5508)
Fixed #5505 

Thanks to @Triedge !
2020-10-30 18:32:09 +01:00
inhyositsu
b61089093f Corrects BuyingStore parsing (#5502)
* Fixes a label parse check when loading BuyingStore values for items.
Thanks to @inhyositsu!
2020-10-29 08:47:42 -04:00
Daegaladh
8682a9e02e Small walkpath optimizations (#5322)
* Thanks to @mattthewaz
Co-authored-by: Aleos <aleos89@users.noreply.github.com>
Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>
2020-10-27 11:58:35 +01:00
Eric Liu
7a4bef2ab7 Fix several honor token items and add Prontera Recall skill (#5431)
Co-authored-by: Eric <eric@nomoss.co>
Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>
2020-10-26 20:44:13 +01:00
Aleos
ad3f48f9de Cleans up the item SQL parsing (#5478)
Fixes a couple issues with the column checking.
Adds verification to table columns to make sure table format is correct.
Cleans up the node processing.
Adds a loading progress status.
Adjusts the SQL import files to not destroy previously imported data.
Updated README.md to reflect the changes for SQL importing.

Fixes #5485
Fixes #5477

Thanks to @Lemongrass3110!

Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>
2020-10-26 00:16:15 +01:00
Vincent Stumpf
de621fee16 Fix erroneous freeing of global combo script (#5483)
Fixes #5476
When removing a combo, we free the bonus script in the global map
Thanks to @saya9200
2020-10-25 22:53:43 +01:00
Atemo
4786d76ef7 Fixed a typo in the item parsing (#5480)
The 'Locations' node doesn't exist in the block
2020-10-24 22:31:30 +02:00
Daegaladh
f28019a798 Fixed Acid Terror armor break rate on renewal (#5475)
*Follow up to ea8da71cdd
2020-10-23 16:21:48 +02:00
Vincent Stumpf
2c199f1aad Fix items not being refineable (#5474) 2020-10-23 13:18:04 +02:00
Lemongrass3110
ed473d066d Cleaned up hat effect code (#5462)
Converted from self written container to std::vector.
Converted clif code to struct usage.
2020-10-23 01:07:12 +02:00
Lemongrass3110
7336058485 Cleaned up and fixed some subtype checks (#5472)
Fixes #5471

Thanks to @LuciferGmes

Co-authored-by: aleos <aleos89@users.noreply.github.com>
2020-10-22 23:56:54 +02:00
Lemongrass3110
20f39922dc Fixes compilation on 2010-07-30 and older (#5470)
Fixes #5464

Thanks to @KrokusPokus
2020-10-22 12:54:22 +02:00
Lemongrass3110
52dbea2fba Follow up to 323db7e
Fixes 2 compilation warnings

Thanks to @zEro-trap and Mael
2020-10-22 11:07:07 +02:00
Lemongrass3110
63e42dbd4b First small follow up to 04cfe17
Only report duplicate Aegisname, if it is not the same item.
When buy and sell price caused a possible zeny exploit the whole YAML node will be reported, since it could be from import and either Buy or Sell might not exist.
2020-10-22 10:37:55 +02:00
Aleos
04cfe17b2b Converted item database to YAML (#4335)
* Combines item_avail, item_buyingstore, item_delay, item_flag, item_nouse, item_stack, and item_trade databases into one.
* General cleanups and optimizations.
* Includes CSV2YAML conversion tool.
* Includes YAML2SQL conversion tool.
* Adjusts dummy_item from being created by malloc and now creates it by make_shared.
* Item combos are now stored as a STL.
Thanks to @Lemongrass3110, @Atemo, and @cydh!
Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>
2020-10-21 19:02:11 -04:00
Aleos
323db7e661 Fixes Overheat behavior (#5455)
* Fixes #5395.
* Fixes Overheat not properly accounting for the Mechanic during battle calculations.
* Minor cleanups and improvements.
Thanks to @LotusRO!
Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>
2020-10-19 16:03:48 -04:00
Aleos
ef33ba1fca Fixes Stellar Mark causing a map crash (#5438)
* Fixes #5429.
* Follow up to 6ba869e.
* Fixes a potential crash from Stellar Mark.
Thanks to @ecdarreola!
2020-10-19 15:24:47 -04:00
Aleos
3f36c0d60a Fixes damage reduction statuses/skills (#5453)
* Resolves an issue with damage not being passed back to the parent function after it has been reduced by various statuses or skills.
Thanks to @teededung!
2020-10-19 14:04:36 -04:00
Aleos
7367714d40 Moves AUTOLOOT_DISTANCE macro define location (#5421)
* Fixes #5375.
* Moves the macro define for AUTOLOOT_DISTANCE to mob.hpp as mob.cpp requires this, not atcommand.cpp.
Thanks to @vstumpf!
2020-10-19 08:49:57 -04:00
Lemongrass3110
6328383578 Follow up to 8e84f0e
Fixed pre-renewal compilation
2020-10-19 14:10:55 +02:00
Jittapan Pluemsumran
8e84f0e9ef Grouped bonus arrays into a single struct (#5454) 2020-10-19 11:08:11 +07:00
Lemongrass3110
be3aee7f74 Update and cleanup of packet definitions (#5443)
Moved changes from the Hercules file to rAthena's intermediate layer where possible.
Updated to the latest Hercules definitions.
Added missing packed attributes.
2020-10-13 20:02:29 +02:00
Lemongrass3110
f4f2f886d1 Hat Effect Update (#5442) 2020-10-11 17:21:40 +02:00
Lemongrass3110
0d2154b0fb Effect State Update (#5440) 2020-10-10 10:02:30 +02:00
Aleos
8385162fdc Fixes Sonic Blow damage in renewal (#5439)
* Fixes #5432.
* Corrects the damage formula for Sonic Blow in renewal mode.
Thanks to @kyurejl!
2020-10-09 09:10:17 -04:00
Lemongrass3110
d4c018cd90 Mob and NPC Identity Update (#5441) 2020-10-09 14:44:59 +02:00
Aleos
00c02479db Fixes Magnetic field behavior (#5423)
* Fixes #5401.
* Minor optimizations to core skill behavior.
* Adjusts the status timer to be stored in val4.
* Impose a unit lock before doing status damage.
* Check for status state before attempting to reapply the status timer.
Thanks to @LotusRO!
2020-10-07 09:45:58 -04:00
atemo
0dae6b4251 Merge branch 'master' into feature/lapine_synthesis_and_upgrade 2020-10-05 19:22:50 +02:00
Aleos
62312d2e84 Fixes achievements and multi level up events (#5425)
* Fixes #5413.
* Fixes an issue where achievements that check for specific base/job level events don't get triggered if battle_config.multi_level_up is enabled.
Thanks to @saya9200!
Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>
2020-10-02 10:05:05 -04:00
Aleos
6ba869e398 Fixes Flash Kick and Stellar Mark interaction (#5400)
* Fixes #5399.
* Fixes targets getting stored into Stellar Mark if they are killed by Flash Kick.
Thanks to @SeravySensei!
2020-09-28 08:15:51 -04:00
Aleos
35702c62c2 Corrects item group announce flag item ID cap (#5371)
* Fixes #5370.
* Corrects the item group announce flag option being limited to uint16 for the item to display in the broadcast.
Thanks to @OriginRO!
2020-09-15 11:08:07 -04:00
aleos
93cfc55118 Converts item ID to item name
* Converts the databases to utilize item names instead of their ID.
* Updates header of YAML files.
* Enables some 32bit items.
* Updates item names to match kRO.
* Removes some items that got duplicated during the merge to master.
* Fixes some minor left overs for t_itemid usage.
2020-09-14 14:15:12 -04:00
aleos
b44f0e66f4 Fixes packet header 2020-09-10 15:43:07 -04:00
aleos
22da4efed2 Item group typo 2020-09-10 13:57:07 -04:00
aleos
616ca96c92 Fixes a couple typos 2020-09-10 13:53:00 -04:00
aleos
a02e829d03 Merge branch 'master' into feature/lapine_synthesis_and_upgrade 2020-09-10 13:41:20 -04:00
Aleos
0da05e29c3 Corrected some statuses and Mado Gear interaction (#3782)
* Follow up to 0d81697.
* Added a separate check for Mado Gear and blocking Merchant/Blacksmith/Whitesmith specific statuses.
* Harmonized the statuses with the new allowed skill list.
Thanks to @slyx88!
2020-09-10 10:27:04 -04:00
Atemo
e1761aff6c Addtionnal check in npc_touch_areanpc for npc_click (#5386)
Added a check in npc_touch_areanpc (only) to avoid a warning from npc_click
2020-09-09 15:12:27 +02:00
Atemo
08adc45ba9 bg_join - battleground doc update (#5385)
* Added more information in the doc about waitingroom2bg_single and bg_join commands
* Added MF_BATTLEGROUND mapflag check in waitingroom2bg_single and bg_join to prevent the player to join a bg when the battle map is not a battleground map
2020-09-09 15:09:55 +02:00
Atemo
7264180a6f Small correction in bg_team_leave (#5372)
Corrected bg_team_leave to also remove the player from the bg when entry_point (bg enqueue) is not defined
2020-09-03 22:51:24 +02:00
Atemo
07cac123a9 Terra Gloria (episode 16.2) - walkthrough conversion (#3990)
* Updated monsters DB (data from aegis and DP)
* Updated item_db (data from aegis and DP)
* Updated quest_db, thanks to @zackdreaver for the quests names !
* Implemented SC_EP16_2_BUFF_SS, SC_EP16_2_BUFF_SC, SC_EP16_2_BUFF_AC buff, thanks to @aleos89 !
** Not removed on change map
** Not removed on log out
** Not removed by dispell/clearance/Vanishing Buster
** Removed on death
* SQL synchronisation

Thanks to @Badarosk0, @attackjom, @admkakaroto, @JohnnyPlayy, @Angelic234, @teededung for the reviews/contributions !
2020-08-29 00:33:28 +02:00
Daegaladh
1c123a517e Added/improved SG's maps and monsters reset script and GM commands (#5359) 2020-08-26 23:52:26 +02:00
Aleos
09c6f7511d Fixes timer deletion errors from skill_keep_using (#5355)
* Fixes #5354.
* Fixes invalid or wrong timers getting deleted from skill_keep_using when using a second time.
* Adds skill casting checks to prevent timers from being created if the player can't cast the skill to begin with.
Thanks to @Masao87 and @admkakaroto!
2020-08-25 14:27:47 -04:00
Aleos
229f086b31 Fixes a potential crash with the mail system (#5345)
* Fixes a potential crash with the mail system
* Fixes #5298.
* Resolves a potential crash with the mail system if someone is modifying packets.
* Adds an extra item verification check.
Thanks to @blipblopblip!
2020-08-21 16:59:34 -04:00
Aleos
ca27c6d89d Parry delay should be based on adelay (#5325)
* Removes hard coded 1 second delay.
* The delay should scale based on the player's ASPD.
Thanks to @mrjnumber1 and @Daegaladh!
2020-08-21 13:10:55 -04:00
Aleos
73928b4fe2 Fixes renewal Spiral Pierce damage (#5262)
* Fixes #3503.
* Adjusts weight damage modifier 7%.
* Adjusts size damage modifier for small targets to 115%.
* Adjusts size damage modifier for large targets to 85%.
* Adjusts size damage modifier to only apply for players.
Thanks to @mrjnumber1!
2020-08-21 10:17:44 -04:00
Aleos
2afc3c1a7f Corrects some details about new Alchemist Potions (#5335)
* Fixes the Concentrated Red, Blue, and Golden Syrup Potions to only require 5 Empty Potion Bottles instead of 10.
* Fixes Golden X to return 1 damage instead of 0 on reflect.
Thanks to @Badarosk0 and Sigma!
2020-08-20 14:56:39 -04:00
Daegaladh
0e4b36dbb8 Fixed battlegrounds not resetting on reloadscript (#5255)
* Thanks to @aleos89
2020-08-19 18:05:52 +02:00
Daegaladh
2d164cb8c8 Fixed skill usage keeping timer being set when skill id is 0 (#5341) 2020-08-19 17:44:27 +02:00