16922 Commits

Author SHA1 Message Date
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
99e75b07bc
Implemented the items from sky fortress instance (#5479)
* Implemented the items from sky fortress instance (part of https://github.com/rathena/rathena/pull/3586)

Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>
2020-10-25 17:54:02 +01:00
Lemongrass3110
708056148e
Updated allowed jobs for renewal equip (#5482)
Based on Divine Pride's API
2020-10-25 07:29:11 +01:00
Lemongrass3110
7a4009601d Fixed newline escaping in YAML2SQL converter 2020-10-25 00:12:00 +02:00
Lemongrass3110
579dc7b3a1 Added an initial loading message to YAML parsing 2020-10-24 22:49:19 +02: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 ea8da71cdda5cddbc05cdc736683487e5c14bf08
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
f8dc145cd2
Corrects a couple items (#5437)
* Fixes #5420.
* Fixes Robot's Arm, Gigantic Blade, and Tornado Axe buy/sell price, range, and job equip.
Thanks to @mazvi and @Atemo!
2020-10-19 14:54:57 -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
aa4c1da450
Adds Rebellion stat bonus for new job levels (#5461)
* Fixes #5459.
* Adds some missing job stat bonuses for Rebellion.
Thanks to @Balferian!
2020-10-19 10:49:01 -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
550b65abcc
Fixed the required skills for guild storage (#5446) 2020-10-12 00:13:13 +02:00
Lemongrass3110
f4f2f886d1
Hat Effect Update (#5442) 2020-10-11 17:21:40 +02:00
Kanin Temsrisuk
d3074f69ec
item_db and item_combo_db correction #5 (#4877)
* Added Tenji, Item combo
* Adjusted RWC Staff combo use mAtk instead of mAtkRate
* Divers corrections and updates

Thanks to 🅺🅸🅽🅶🅰🆁🆃🅴🆁 ,  Ap[a]ch€,  Jumbo
2020-10-10 22:59:23 +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
0605037a0d
Adjusts Filir's Pinions refineability (#5436)
* Fixes #5415.
* Filir's Pinions will no longer be refineable.
Thanks to @AsuraPlop!
2020-10-09 08:16:42 -04: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
Maz-V
2794aeeed1
Adjusted the delay according to divine-pride (#5433)
Adjusted the delay according to Divine-Pride
* Adjusts the delay of Red_Syrup, Yellow_Syrup, White_Syrup, Blue_Syrup and Green_Ale.
Thanks to @mazvi!
2020-10-07 08:43:46 -04:00
Kanin Temsrisuk
0b8d80ba63
item_db and item_combo_db correction #7 (#5296)
* More of corrected up item_db and item_combo_db.
* Update item_db_re.sql
2020-10-03 15:08:25 +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
Kanin Temsrisuk
3b88f186c0
item_db and item_combo_db correction #9 (#5374)
* Update and correction in item_db and item_combo_db

Thanks to Edward Luciano # 1568
Thanks to 🅺🅸🅽🅶🅰🆁🆃🅴🆁 # 4210

Co-Authored-By: crazyarashi <meganekiho@gmail.com>
2020-09-28 14:42:00 +02:00
Lemongrass3110
b1b7d06559
Follow up to 3ab1ada (#5411)
Fixes calls to the function without the character session

Thanks to @KrokusPokus
2020-09-28 14:29:15 +02: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
Atemo
59b98cfa50
Small correction in HeartHunterWarBase.txt (#5417)
Thanks to @saya9200
2020-09-27 19:32:29 +02:00
Kanin Temsrisuk
a4d57cb8a3
item_db and item_combo_db correction #8 (#5332)
* item_db and item_combo_db update.

Thanks to
- Jumbo # 8053 (Discord)
- 🅺🅸🅽🅶🅰🆁🆃🅴🆁 # 4210 (Discord)
- Edward Luciano # 1568 (Discord)

Co-Authored-By: crazyarashi <meganekiho@gmail.com>
2020-09-26 19:07:27 +02:00
Atemo
cac6121f04
Corrected a typo in novice_vending_machine.txt (#5398)
Thanks to @RagnaWay
2020-09-16 19:44:21 +02: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
Daegaladh
4bac434357 Revert "Fixed reentering Sealed Shrine instance on pre-re"
This reverts commit b51a87146f070753d8082e19642a0ca4fdb909e7.

*This caused an exploit also present in the official pre-re script. NPC dialog suggests it was never intended to reenter this instance after players leaver or die.
2020-09-14 12:24:32 +02: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
Daegaladh
634e1b3991
Fixed Sealed Shrine timer not being disabled (#5389) 2020-09-09 16:20:52 +02:00
Daegaladh
ead8bd2272
Fixed a potential dead end in the merchant quest (#5378) 2020-09-09 16:19:31 +02:00
Atemo
4e5dec29e3
Added novice_vending_machine.txt (#5387)
Added the NPCs 'Vending Machine for Novice' from walkthrough
Fixed #3681

Thanks to @zackdreaver, @Balferian, @aleos89 and @secretdataz !
2020-09-09 15:14:49 +02: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
Daegaladh
bd90763ffe
Fixed a potential crash in the char-server (#5381) 2020-09-07 20:25:27 +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