Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Skill Ammo requirement fixes

Browse Source 
* Fixes #4589.
* Resolves an issue with the skill converter outputting the incorrect ammo type requirement.
* Also fixes an issue with physically attacking targets while having a status option active.
Thanks to @mazvi!
This commit is contained in:
aleos
2020-02-01 16:06:13 -05:00
parent 6f9c931efe
commit 7bdfe81867
4 changed files with 59 additions and 475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

263
db/pre-re/skill_db.yml
View File

@@ -1881,12 +1881,7 @@ Body:
Weapon: Weapon:
Bow: true Bow: true
Ammo: Ammo:
Shell: true Arrow: true
Grenade: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 47 - Id: 47
Name: AC_SHOWER Name: AC_SHOWER
@@ -1915,12 +1910,7 @@ Body:
Weapon: Weapon:
Bow: true Bow: true
Ammo: Ammo:
Shell: true Arrow: true
Grenade: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 48 - Id: 48
Name: TF_DOUBLE Name: TF_DOUBLE
@@ -5041,12 +5031,7 @@ Body:
Weapon: Weapon:
Bow: true Bow: true
Ammo: Ammo:
Shell: true Arrow: true
Grenade: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 149 - Id: 149
Name: TF_SPRINKLESAND Name: TF_SPRINKLESAND
@@ -8334,12 +8319,7 @@ Body:
Weapon: Weapon:
Musical: true Musical: true
Ammo: Ammo:
Shell: true Arrow: true
Grenade: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 317 - Id: 317
Name: BA_DISSONANCE Name: BA_DISSONANCE
@@ -8619,12 +8599,7 @@ Body:
Weapon: Weapon:
Whip: true Whip: true
Ammo: Ammo:
Shell: true Arrow: true
Grenade: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 325 - Id: 325
Name: DC_UGLYDANCE Name: DC_UGLYDANCE
@@ -10168,12 +10143,7 @@ Body:
Weapon: Weapon:
Bow: true Bow: true
Ammo: Ammo:
Shell: true Arrow: true
Grenade: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 383 - Id: 383
Name: SN_WINDWALK Name: SN_WINDWALK
@@ -10522,12 +10492,7 @@ Body:
Musical: true Musical: true
Whip: true Whip: true
Ammo: Ammo:
Shell: true Arrow: true
Grenade: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 395 - Id: 395
Name: CG_MOONLIT Name: CG_MOONLIT
@@ -13321,12 +13286,7 @@ Body:
Weapon: Weapon:
Bow: true Bow: true
Ammo: Ammo:
Shell: true Arrow: true
Grenade: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 500 - Id: 500
Name: GS_GLITTERING Name: GS_GLITTERING
@@ -13374,9 +13334,13 @@ Body:
SpCost: 20 SpCost: 20
Ammo: Ammo:
Arrow: true Arrow: true
Dagger: true
Bullet: true Bullet: true
Shell: true
Grenade: true Grenade: true
Shuriken: true
Kunai: true Kunai: true
Cannonball: true
Throwweapon: true Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
SpiritSphereCost: 1 SpiritSphereCost: 1
@@ -13400,9 +13364,13 @@ Body:
SpCost: 30 SpCost: 30
Ammo: Ammo:
Arrow: true Arrow: true
Dagger: true
Bullet: true Bullet: true
Shell: true
Grenade: true Grenade: true
Shuriken: true
Kunai: true Kunai: true
Cannonball: true
Throwweapon: true Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
SpiritSphereCost: 1 SpiritSphereCost: 1
@@ -13484,9 +13452,13 @@ Body:
SpCost: 10 SpCost: 10
Ammo: Ammo:
Arrow: true Arrow: true
Dagger: true
Bullet: true Bullet: true
Shell: true
Grenade: true Grenade: true
Shuriken: true
Kunai: true Kunai: true
Cannonball: true
Throwweapon: true Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
SpiritSphereCost: 1 SpiritSphereCost: 1
@@ -13570,12 +13542,7 @@ Body:
Revolver: true Revolver: true
Rifle: true Rifle: true
Ammo: Ammo:
Dagger: true
Bullet: true Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 513 - Id: 513
Name: GS_DISARM Name: GS_DISARM
@@ -13604,12 +13571,7 @@ Body:
Revolver: true Revolver: true
Rifle: true Rifle: true
Ammo: Ammo:
Dagger: true
Bullet: true Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 514 - Id: 514
Name: GS_PIERCINGSHOT Name: GS_PIERCINGSHOT
@@ -13643,12 +13605,7 @@ Body:
Revolver: true Revolver: true
Rifle: true Rifle: true
Ammo: Ammo:
Dagger: true
Bullet: true Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 515 - Id: 515
Name: GS_RAPIDSHOWER Name: GS_RAPIDSHOWER
@@ -13688,12 +13645,7 @@ Body:
Weapon: Weapon:
Revolver: true Revolver: true
Ammo: Ammo:
Dagger: true
Bullet: true Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true
AmmoAmount: 5 AmmoAmount: 5
- Id: 516 - Id: 516
Name: GS_DESPERADO Name: GS_DESPERADO
@@ -13735,12 +13687,7 @@ Body:
Weapon: Weapon:
Revolver: true Revolver: true
Ammo: Ammo:
Dagger: true
Bullet: true Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true
AmmoAmount: 10 AmmoAmount: 10
Unit: Unit:
Id: Dummyskill Id: Dummyskill
@@ -13840,12 +13787,7 @@ Body:
Weapon: Weapon:
Shotgun: true Shotgun: true
Ammo: Ammo:
Dagger: true
Bullet: true Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 519 - Id: 519
Name: GS_FULLBUSTER Name: GS_FULLBUSTER
@@ -13907,12 +13849,7 @@ Body:
Weapon: Weapon:
Shotgun: true Shotgun: true
Ammo: Ammo:
Dagger: true
Bullet: true Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true
AmmoAmount: AmmoAmount:
- Level: 1 - Level: 1
Amount: 2 Amount: 2
@@ -13995,12 +13932,7 @@ Body:
Weapon: Weapon:
Shotgun: true Shotgun: true
Ammo: Ammo:
Dagger: true
Bullet: true Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true
AmmoAmount: 5 AmmoAmount: 5
- Id: 521 - Id: 521
Name: GS_GROUNDDRIFT Name: GS_GROUNDDRIFT
@@ -14074,14 +14006,7 @@ Body:
Weapon: Weapon:
Grenade: true Grenade: true
Ammo: Ammo:
Dagger: true
Bullet: true
Shell: true
Grenade: true Grenade: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
Unit: Unit:
Id: Grounddrift_Wind Id: Grounddrift_Wind
@@ -14109,14 +14034,7 @@ Body:
Requires: Requires:
SpCost: 2 SpCost: 2
Ammo: Ammo:
Dagger: true
Bullet: true
Shell: true
Grenade: true
Shuriken: true Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 524 - Id: 524
Name: NJ_KUNAI Name: NJ_KUNAI
@@ -14145,14 +14063,7 @@ Body:
- Level: 5 - Level: 5
Amount: 10 Amount: 10
Ammo: Ammo:
Dagger: true
Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 525 - Id: 525
Name: NJ_HUUMA Name: NJ_HUUMA
@@ -16408,11 +16319,6 @@ Body:
SpCost: 15 SpCost: 15
Ammo: Ammo:
Dagger: true Dagger: true
Bullet: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 1005 - Id: 1005
Name: RG_CLOSECONFINE Name: RG_CLOSECONFINE
@@ -19520,12 +19426,7 @@ Body:
Weapon: Weapon:
Bow: true Bow: true
Ammo: Ammo:
Shell: true Arrow: true
Grenade: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 10 AmmoAmount: 10
- Id: 2234 - Id: 2234
Name: RA_FEARBREEZE Name: RA_FEARBREEZE
@@ -19612,12 +19513,7 @@ Body:
Weapon: Weapon:
Bow: true Bow: true
Ammo: Ammo:
Shell: true Arrow: true
Grenade: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 2237 - Id: 2237
Name: RA_DETONATOR Name: RA_DETONATOR
@@ -20356,14 +20252,7 @@ Body:
- Level: 3 - Level: 3
Amount: 60 Amount: 60
Ammo: Ammo:
Dagger: true
Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true
Cannonball: true Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
State: Mado State: Mado
ItemCost: ItemCost:
@@ -21292,12 +21181,7 @@ Body:
Weapon: Weapon:
Bow: true Bow: true
Ammo: Ammo:
Shell: true Arrow: true
Grenade: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 3 AmmoAmount: 3
- Id: 2289 - Id: 2289
Name: SC_BODYPAINT Name: SC_BODYPAINT
@@ -23981,12 +23865,7 @@ Body:
Weapon: Weapon:
Bow: true Bow: true
Ammo: Ammo:
Shell: true Arrow: true
Grenade: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 20 AmmoAmount: 20
Unit: Unit:
Id: Severe_Rainstorm Id: Severe_Rainstorm
@@ -26178,14 +26057,7 @@ Body:
- Level: 5 - Level: 5
Amount: 50 Amount: 50
Ammo: Ammo:
Dagger: true
Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true
Cannonball: true Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
State: Cart State: Cart
- Id: 2478 - Id: 2478
@@ -26852,13 +26724,6 @@ Body:
Requires: Requires:
SpCost: 4 SpCost: 4
Ammo: Ammo:
Dagger: true
Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 2494 - Id: 2494
@@ -27070,12 +26935,7 @@ Body:
Weapon: Weapon:
Rifle: true Rifle: true
Ammo: Ammo:
Dagger: true
Bullet: true Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 2554 - Id: 2554
Name: RL_BANISHING_BUSTER Name: RL_BANISHING_BUSTER
@@ -27117,12 +26977,7 @@ Body:
Weapon: Weapon:
Shotgun: true Shotgun: true
Ammo: Ammo:
Dagger: true
Bullet: true Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 2555 - Id: 2555
Name: RL_B_TRAP Name: RL_B_TRAP
@@ -27303,12 +27158,7 @@ Body:
Weapon: Weapon:
Shotgun: true Shotgun: true
Ammo: Ammo:
Dagger: true
Bullet: true Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 2558 - Id: 2558
Name: RL_E_CHAIN Name: RL_E_CHAIN
@@ -27372,12 +27222,9 @@ Body:
Shotgun: true Shotgun: true
Grenade: true Grenade: true
Ammo: Ammo:
Dagger: true
Bullet: true Bullet: true
Shell: true Shell: true
Grenade: true Grenade: true
Shuriken: true
Kunai: true
AmmoAmount: 1 AmmoAmount: 1
Status: Status:
Qd_Shot_Ready: true Qd_Shot_Ready: true
@@ -27433,12 +27280,7 @@ Body:
Weapon: Weapon:
Revolver: true Revolver: true
Ammo: Ammo:
Dagger: true
Bullet: true Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true
AmmoAmount: 5 AmmoAmount: 5
- Id: 2562 - Id: 2562
Name: RL_H_MINE Name: RL_H_MINE
@@ -27514,12 +27356,7 @@ Body:
- Level: 5 - Level: 5
Amount: 36 Amount: 36
Ammo: Ammo:
Dagger: true
Bullet: true Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true
AmmoAmount: 1 AmmoAmount: 1
Equipment: Equipment:
Silver_Bullet: true Silver_Bullet: true
@@ -27589,12 +27426,7 @@ Body:
Weapon: Weapon:
Gatling: true Gatling: true
Ammo: Ammo:
Dagger: true
Bullet: true Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true
AmmoAmount: 5 AmmoAmount: 5
- Id: 2566 - Id: 2566
Name: RL_D_TAIL Name: RL_D_TAIL
@@ -27638,14 +27470,7 @@ Body:
Weapon: Weapon:
Grenade: true Grenade: true
Ammo: Ammo:
Dagger: true
Bullet: true
Shell: true
Grenade: true Grenade: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 2567 - Id: 2567
Name: RL_FIRE_RAIN Name: RL_FIRE_RAIN
@@ -27668,12 +27493,7 @@ Body:
Weapon: Weapon:
Gatling: true Gatling: true
Ammo: Ammo:
Dagger: true
Bullet: true Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true
AmmoAmount: 10 AmmoAmount: 10
Unit: Unit:
Id: Fire_Rain Id: Fire_Rain
@@ -28025,14 +27845,7 @@ Body:
- Level: 5 - Level: 5
Amount: 20 Amount: 20
Ammo: Ammo:
Dagger: true
Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 8 AmmoAmount: 8
- Id: 3008 - Id: 3008
Name: KO_MUCHANAGE Name: KO_MUCHANAGE
@@ -31342,12 +31155,7 @@ Body:
Requires: Requires:
SpCost: 12 SpCost: 12
Ammo: Ammo:
Shell: true Arrow: true
Grenade: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 8208 - Id: 8208
Name: MA_SHOWER Name: MA_SHOWER
@@ -31370,12 +31178,7 @@ Body:
Requires: Requires:
SpCost: 15 SpCost: 15
Ammo: Ammo:
Shell: true Arrow: true
Grenade: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 8209 - Id: 8209
Name: MA_SKIDTRAP Name: MA_SKIDTRAP
@@ -31590,12 +31393,7 @@ Body:
Requires: Requires:
SpCost: 15 SpCost: 15
Ammo: Ammo:
Shell: true Arrow: true
Grenade: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 8215 - Id: 8215
Name: MA_SHARPSHOOTING Name: MA_SHARPSHOOTING
@@ -31634,12 +31432,7 @@ Body:
- Level: 5 - Level: 5
Amount: 30 Amount: 30
Ammo: Ammo:
Shell: true Arrow: true
Grenade: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 8216 - Id: 8216
Name: ML_PIERCE Name: ML_PIERCE

261
db/re/skill_db.yml
View File

@@ -2023,12 +2023,7 @@ Body:
Weapon: Weapon:
Bow: true Bow: true
Ammo: Ammo:
Shell: true Arrow: true
Grenade: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 47 - Id: 47
Name: AC_SHOWER Name: AC_SHOWER
@@ -2078,12 +2073,7 @@ Body:
Weapon: Weapon:
Bow: true Bow: true
Ammo: Ammo:
Shell: true Arrow: true
Grenade: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 48 - Id: 48
Name: TF_DOUBLE Name: TF_DOUBLE
@@ -5400,12 +5390,7 @@ Body:
Weapon: Weapon:
Bow: true Bow: true
Ammo: Ammo:
Shell: true Arrow: true
Grenade: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 149 - Id: 149
Name: TF_SPRINKLESAND Name: TF_SPRINKLESAND
@@ -8821,12 +8806,7 @@ Body:
Weapon: Weapon:
Musical: true Musical: true
Ammo: Ammo:
Shell: true Arrow: true
Grenade: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 317 - Id: 317
Name: BA_DISSONANCE Name: BA_DISSONANCE
@@ -9107,12 +9087,7 @@ Body:
Weapon: Weapon:
Whip: true Whip: true
Ammo: Ammo:
Shell: true Arrow: true
Grenade: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 325 - Id: 325
Name: DC_UGLYDANCE Name: DC_UGLYDANCE
@@ -10654,12 +10629,7 @@ Body:
Weapon: Weapon:
Bow: true Bow: true
Ammo: Ammo:
Shell: true Arrow: true
Grenade: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 383 - Id: 383
Name: SN_WINDWALK Name: SN_WINDWALK
@@ -11043,12 +11013,7 @@ Body:
Musical: true Musical: true
Whip: true Whip: true
Ammo: Ammo:
Shell: true Arrow: true
Grenade: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 395 - Id: 395
Name: CG_MOONLIT Name: CG_MOONLIT
@@ -13891,12 +13856,7 @@ Body:
Weapon: Weapon:
Bow: true Bow: true
Ammo: Ammo:
Shell: true Arrow: true
Grenade: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 500 - Id: 500
Name: GS_GLITTERING Name: GS_GLITTERING
@@ -13945,9 +13905,13 @@ Body:
SpCost: 20 SpCost: 20
Ammo: Ammo:
Arrow: true Arrow: true
Dagger: true
Bullet: true Bullet: true
Shell: true
Grenade: true Grenade: true
Shuriken: true
Kunai: true Kunai: true
Cannonball: true
Throwweapon: true Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
SpiritSphereCost: 1 SpiritSphereCost: 1
@@ -13973,9 +13937,13 @@ Body:
SpCost: 30 SpCost: 30
Ammo: Ammo:
Arrow: true Arrow: true
Dagger: true
Bullet: true Bullet: true
Shell: true
Grenade: true Grenade: true
Shuriken: true
Kunai: true Kunai: true
Cannonball: true
Throwweapon: true Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
SpiritSphereCost: 1 SpiritSphereCost: 1
@@ -14061,9 +14029,13 @@ Body:
SpCost: 10 SpCost: 10
Ammo: Ammo:
Arrow: true Arrow: true
Dagger: true
Bullet: true Bullet: true
Shell: true
Grenade: true Grenade: true
Shuriken: true
Kunai: true Kunai: true
Cannonball: true
Throwweapon: true Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
SpiritSphereCost: 1 SpiritSphereCost: 1
@@ -14148,12 +14120,7 @@ Body:
Revolver: true Revolver: true
Rifle: true Rifle: true
Ammo: Ammo:
Dagger: true
Bullet: true Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 513 - Id: 513
Name: GS_DISARM Name: GS_DISARM
@@ -14185,12 +14152,7 @@ Body:
Revolver: true Revolver: true
Rifle: true Rifle: true
Ammo: Ammo:
Dagger: true
Bullet: true Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 514 - Id: 514
Name: GS_PIERCINGSHOT Name: GS_PIERCINGSHOT
@@ -14226,12 +14188,7 @@ Body:
Revolver: true Revolver: true
Rifle: true Rifle: true
Ammo: Ammo:
Dagger: true
Bullet: true Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 515 - Id: 515
Name: GS_RAPIDSHOWER Name: GS_RAPIDSHOWER
@@ -14271,12 +14228,7 @@ Body:
Weapon: Weapon:
Revolver: true Revolver: true
Ammo: Ammo:
Dagger: true
Bullet: true Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 516 - Id: 516
Name: GS_DESPERADO Name: GS_DESPERADO
@@ -14319,12 +14271,7 @@ Body:
Weapon: Weapon:
Revolver: true Revolver: true
Ammo: Ammo:
Dagger: true
Bullet: true Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true
AmmoAmount: 10 AmmoAmount: 10
Unit: Unit:
Id: Dummyskill Id: Dummyskill
@@ -14426,12 +14373,7 @@ Body:
Weapon: Weapon:
Shotgun: true Shotgun: true
Ammo: Ammo:
Dagger: true
Bullet: true Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 519 - Id: 519
Name: GS_FULLBUSTER Name: GS_FULLBUSTER
@@ -14495,12 +14437,7 @@ Body:
Weapon: Weapon:
Shotgun: true Shotgun: true
Ammo: Ammo:
Dagger: true
Bullet: true Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true
AmmoAmount: 2 AmmoAmount: 2
- Id: 520 - Id: 520
Name: GS_SPREADATTACK Name: GS_SPREADATTACK
@@ -14565,12 +14502,7 @@ Body:
Shotgun: true Shotgun: true
Grenade: true Grenade: true
Ammo: Ammo:
Dagger: true
Bullet: true Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true
AmmoAmount: 5 AmmoAmount: 5
- Id: 521 - Id: 521
Name: GS_GROUNDDRIFT Name: GS_GROUNDDRIFT
@@ -14645,12 +14577,7 @@ Body:
Weapon: Weapon:
Grenade: true Grenade: true
Ammo: Ammo:
Dagger: true
Bullet: true Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true
AmmoAmount: 1 AmmoAmount: 1
Unit: Unit:
Id: Grounddrift_Wind Id: Grounddrift_Wind
@@ -14678,14 +14605,7 @@ Body:
Requires: Requires:
SpCost: 5 SpCost: 5
Ammo: Ammo:
Dagger: true
Bullet: true
Shell: true
Grenade: true
Shuriken: true Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 524 - Id: 524
Name: NJ_KUNAI Name: NJ_KUNAI
@@ -14703,14 +14623,7 @@ Body:
Requires: Requires:
SpCost: 10 SpCost: 10
Ammo: Ammo:
Dagger: true
Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 525 - Id: 525
Name: NJ_HUUMA Name: NJ_HUUMA
@@ -17256,11 +17169,6 @@ Body:
SpCost: 15 SpCost: 15
Ammo: Ammo:
Dagger: true Dagger: true
Bullet: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 1005 - Id: 1005
Name: RG_CLOSECONFINE Name: RG_CLOSECONFINE
@@ -20415,12 +20323,7 @@ Body:
Weapon: Weapon:
Bow: true Bow: true
Ammo: Ammo:
Shell: true Arrow: true
Grenade: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 10 AmmoAmount: 10
- Id: 2234 - Id: 2234
Name: RA_FEARBREEZE Name: RA_FEARBREEZE
@@ -20510,12 +20413,7 @@ Body:
Weapon: Weapon:
Bow: true Bow: true
Ammo: Ammo:
Shell: true Arrow: true
Grenade: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 2237 - Id: 2237
Name: RA_DETONATOR Name: RA_DETONATOR
@@ -21262,14 +21160,7 @@ Body:
- Level: 3 - Level: 3
Amount: 60 Amount: 60
Ammo: Ammo:
Dagger: true
Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true
Cannonball: true Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
State: Mado State: Mado
ItemCost: ItemCost:
@@ -22224,12 +22115,7 @@ Body:
Weapon: Weapon:
Bow: true Bow: true
Ammo: Ammo:
Shell: true Arrow: true
Grenade: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 3 AmmoAmount: 3
- Id: 2289 - Id: 2289
Name: SC_BODYPAINT Name: SC_BODYPAINT
@@ -24936,12 +24822,7 @@ Body:
Weapon: Weapon:
Bow: true Bow: true
Ammo: Ammo:
Shell: true Arrow: true
Grenade: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 20 AmmoAmount: 20
Unit: Unit:
Id: Severe_Rainstorm Id: Severe_Rainstorm
@@ -27236,14 +27117,7 @@ Body:
- Level: 5 - Level: 5
Amount: 50 Amount: 50
Ammo: Ammo:
Dagger: true
Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true
Cannonball: true Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
State: Cart State: Cart
- Id: 2478 - Id: 2478
@@ -27911,13 +27785,6 @@ Body:
Requires: Requires:
SpCost: 4 SpCost: 4
Ammo: Ammo:
Dagger: true
Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 2494 - Id: 2494
@@ -28129,12 +27996,7 @@ Body:
Weapon: Weapon:
Rifle: true Rifle: true
Ammo: Ammo:
Dagger: true
Bullet: true Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true
AmmoAmount: 1 AmmoAmount: 1
ItemCost: ItemCost:
- Item: Full_Metal_Jacket - Item: Full_Metal_Jacket
@@ -28180,12 +28042,7 @@ Body:
Weapon: Weapon:
Shotgun: true Shotgun: true
Ammo: Ammo:
Dagger: true
Bullet: true Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 2555 - Id: 2555
Name: RL_B_TRAP Name: RL_B_TRAP
@@ -28367,12 +28224,7 @@ Body:
Weapon: Weapon:
Shotgun: true Shotgun: true
Ammo: Ammo:
Dagger: true
Bullet: true Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 2558 - Id: 2558
Name: RL_E_CHAIN Name: RL_E_CHAIN
@@ -28436,12 +28288,9 @@ Body:
Shotgun: true Shotgun: true
Grenade: true Grenade: true
Ammo: Ammo:
Dagger: true
Bullet: true Bullet: true
Shell: true Shell: true
Grenade: true Grenade: true
Shuriken: true
Kunai: true
AmmoAmount: 1 AmmoAmount: 1
Status: Status:
Qd_Shot_Ready: true Qd_Shot_Ready: true
@@ -28497,12 +28346,7 @@ Body:
Weapon: Weapon:
Revolver: true Revolver: true
Ammo: Ammo:
Dagger: true
Bullet: true Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true
AmmoAmount: 5 AmmoAmount: 5
- Id: 2562 - Id: 2562
Name: RL_H_MINE Name: RL_H_MINE
@@ -28581,12 +28425,7 @@ Body:
- Level: 5 - Level: 5
Amount: 36 Amount: 36
Ammo: Ammo:
Dagger: true
Bullet: true Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true
AmmoAmount: 1 AmmoAmount: 1
Equipment: Equipment:
Silver_Bullet: true Silver_Bullet: true
@@ -28658,12 +28497,7 @@ Body:
Weapon: Weapon:
Gatling: true Gatling: true
Ammo: Ammo:
Dagger: true
Bullet: true Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true
AmmoAmount: 5 AmmoAmount: 5
- Id: 2566 - Id: 2566
Name: RL_D_TAIL Name: RL_D_TAIL
@@ -28706,14 +28540,7 @@ Body:
Weapon: Weapon:
Grenade: true Grenade: true
Ammo: Ammo:
Dagger: true
Bullet: true
Shell: true
Grenade: true Grenade: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
ItemCost: ItemCost:
- Item: Dragon_Tail_Missile - Item: Dragon_Tail_Missile
@@ -28739,12 +28566,7 @@ Body:
Weapon: Weapon:
Gatling: true Gatling: true
Ammo: Ammo:
Dagger: true
Bullet: true Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true
AmmoAmount: 10 AmmoAmount: 10
Unit: Unit:
Id: Fire_Rain Id: Fire_Rain
@@ -29671,14 +29493,7 @@ Body:
- Level: 5 - Level: 5
Amount: 20 Amount: 20
Ammo: Ammo:
Dagger: true
Bullet: true
Shell: true
Grenade: true
Shuriken: true
Kunai: true Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 8 AmmoAmount: 8
- Id: 3008 - Id: 3008
Name: KO_MUCHANAGE Name: KO_MUCHANAGE
@@ -34211,12 +34026,7 @@ Body:
Requires: Requires:
SpCost: 12 SpCost: 12
Ammo: Ammo:
Shell: true Arrow: true
Grenade: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 8208 - Id: 8208
Name: MA_SHOWER Name: MA_SHOWER
@@ -34260,12 +34070,7 @@ Body:
Requires: Requires:
SpCost: 15 SpCost: 15
Ammo: Ammo:
Shell: true Arrow: true
Grenade: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 8209 - Id: 8209
Name: MA_SKIDTRAP Name: MA_SKIDTRAP
@@ -34482,12 +34287,7 @@ Body:
Requires: Requires:
SpCost: 15 SpCost: 15
Ammo: Ammo:
Shell: true Arrow: true
Grenade: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 8215 - Id: 8215
Name: MA_SHARPSHOOTING Name: MA_SHARPSHOOTING
@@ -34527,12 +34327,7 @@ Body:
- Level: 5 - Level: 5
Amount: 30 Amount: 30
Ammo: Ammo:
Shell: true Arrow: true
Grenade: true
Shuriken: true
Kunai: true
Cannonball: true
Throwweapon: true
AmmoAmount: 1 AmmoAmount: 1
- Id: 8216 - Id: 8216
Name: ML_PIERCE Name: ML_PIERCE

5
src/map/status.cpp
View File

@@ -2229,10 +2229,7 @@ bool status_check_skilluse(struct block_list *src, struct block_list *target, ui
} }
if (sc->option) { if (sc->option) {
if (skill_id == 0) // Normal attack if ((sc->option&OPTION_HIDE) && src->type == BL_PC && (skill_id == 0 || !skill_get_inf2(skill_id, INF2_ALLOWWHENHIDDEN))) {
return false;
if ((sc->option&OPTION_HIDE) && src->type == BL_PC && !skill_get_inf2(skill_id, INF2_ALLOWWHENHIDDEN)) {
// Non players can use all skills while hidden. // Non players can use all skills while hidden.
return false; return false;
} }

5
src/tool/csv2yaml.cpp
View File

@@ -2140,13 +2140,12 @@ static bool skill_parse_row_skilldb(char* split[], int columns, int current) {
int temp = it_req->second.ammo; int temp = it_req->second.ammo;
for (int i = 1; i < MAX_AMMO_TYPE; i++) { for (int i = 1; i < MAX_AMMO_TYPE; i++) {
if (temp & i) { if (temp & 1 << i) {
constant = constant_lookup(i, "A_"); constant = constant_lookup(i, "A_");
constant.erase(0, 2); constant.erase(0, 2);
body << YAML::Key << name2Upper(constant) << YAML::Value << "true"; body << YAML::Key << name2Upper(constant) << YAML::Value << "true";
temp ^= 1 << i;
} }
temp ^= 1 << i;
} }
body << YAML::EndMap; body << YAML::EndMap;