From 5cf7aceb2a6ec37142e55ca753b690d7b4f77090 Mon Sep 17 00:00:00 2001 From: Lemongrass3110 Date: Sun, 2 Feb 2020 16:04:11 +0100 Subject: [PATCH] Fixed some bugs with the new skill db Fixes #4590 Thanks to @mazvi --- db/pre-re/skill_db.yml | 113 +++++++++++++++++++++++++++++++++++ db/re/skill_db.yml | 131 +++++++++++++++++++++++++++++++++++++++++ src/map/skill.cpp | 6 +- src/tool/csv2yaml.cpp | 4 +- 4 files changed, 249 insertions(+), 5 deletions(-) diff --git a/db/pre-re/skill_db.yml b/db/pre-re/skill_db.yml index 216cea31f5..08f6dd1dea 100644 --- a/db/pre-re/skill_db.yml +++ b/db/pre-re/skill_db.yml @@ -938,6 +938,7 @@ Body: Target: Enemy Flag: PathCheck: true + RemovedByFireRain: true - Id: 19 Name: MG_FIREBOLT Description: Fire Bolt @@ -1308,6 +1309,7 @@ Body: Flag: NoEnemy: true NoReiteration: true + RangedSingleUnit: true - Id: 26 Name: AL_TELEPORT Description: Teleport @@ -2823,6 +2825,7 @@ Body: Flag: NoOverlap: true PathCheck: true + RemovedByFireRain: true - Id: 80 Name: WZ_FIREPILLAR Description: Fire Pillar @@ -3418,6 +3421,8 @@ Body: Interval: 1000 Flag: PathCheck: true + NoKnockback: true + RemovedByFireRain: true - Id: 88 Name: WZ_FROSTNOVA Description: Frost Nova @@ -3725,6 +3730,7 @@ Body: Target: Enemy Flag: PathCheck: true + RemovedByFireRain: true - Id: 93 Name: WZ_ESTIMATION Description: Sense @@ -4071,6 +4077,7 @@ Body: Flag: NoReiteration: true NoFootSet: true + RemovedByFireRain: true - Id: 116 Name: HT_LANDMINE Description: Land Mine @@ -4118,6 +4125,7 @@ Body: Flag: NoReiteration: true NoFootSet: true + RemovedByFireRain: true - Id: 117 Name: HT_ANKLESNARE Description: Ankle Snare @@ -4168,6 +4176,8 @@ Body: Flag: NoReiteration: true NoFootSet: true + NoKnockback: true + RemovedByFireRain: true - Id: 118 Name: HT_SHOCKWAVE Description: Shockwave Trap @@ -4209,6 +4219,7 @@ Body: Flag: NoReiteration: true NoFootSet: true + RemovedByFireRain: true - Id: 119 Name: HT_SANDMAN Description: Sandman @@ -4251,6 +4262,7 @@ Body: Flag: NoReiteration: true NoFootSet: true + RemovedByFireRain: true - Id: 120 Name: HT_FLASHER Description: Flasher @@ -4293,6 +4305,7 @@ Body: Flag: NoReiteration: true NoFootSet: true + RemovedByFireRain: true - Id: 121 Name: HT_FREEZINGTRAP Description: Freezing Trap @@ -4351,6 +4364,7 @@ Body: Flag: NoReiteration: true NoFootSet: true + RemovedByFireRain: true - Id: 122 Name: HT_BLASTMINE Description: Blast Mine @@ -4399,6 +4413,7 @@ Body: Flag: NoReiteration: true NoFootSet: true + RemovedByFireRain: true - Id: 123 Name: HT_CLAYMORETRAP Description: Claymore Trap @@ -4448,6 +4463,7 @@ Body: Flag: NoReiteration: true NoFootSet: true + RemovedByFireRain: true - Id: 124 Name: HT_REMOVETRAP Description: Remove Trap @@ -4489,6 +4505,7 @@ Body: Interval: 1000 Flag: NoMob: true + RemovedByFireRain: true - Id: 126 Name: HT_BEASTBANE Description: Beast Bane @@ -4870,6 +4887,8 @@ Body: Range: 1 Interval: 1000 Target: Enemy + Flag: + RemovedByFireRain: true - Id: 141 Name: AS_SPLASHER Description: Venom Splasher @@ -6184,6 +6203,7 @@ Body: Interval: -1 Flag: NoReiteration: true + RemovedByFireRain: true - Id: 221 Name: RG_FLAGGRAFFITI Description: Piece @@ -7630,6 +7650,7 @@ Body: Interval: -1 Flag: PathCheck: true + RemovedByFireRain: true - Id: 286 Name: SA_DELUGE Description: Deluge @@ -7678,6 +7699,7 @@ Body: Interval: -1 Flag: PathCheck: true + RemovedByFireRain: true - Id: 287 Name: SA_VIOLENTGALE Description: Whirlwind @@ -7726,6 +7748,7 @@ Body: Interval: -1 Flag: PathCheck: true + RemovedByFireRain: true - Id: 288 Name: SA_LANDPROTECTOR Description: Magnetic Earth @@ -7799,6 +7822,7 @@ Body: Interval: -1 Flag: PathCheck: true + RemovedByFireRain: true - Id: 289 Name: SA_DISPELL Description: Dispell @@ -8095,6 +8119,8 @@ Body: Layout: 4 Interval: 6000 Target: Enemy + Flag: + Ensemble: true - Id: 307 Name: BD_RICHMANKIM Description: Mental Sensing @@ -8121,6 +8147,7 @@ Body: Target: Enemy Flag: NoPc: true + Ensemble: true - Id: 308 Name: BD_ETERNALCHAOS Description: Down Tempo @@ -8145,6 +8172,8 @@ Body: Layout: 4 Interval: -1 Target: Enemy + Flag: + Ensemble: true - Id: 309 Name: BD_DRUMBATTLEFIELD Description: Battle Theme @@ -8179,6 +8208,8 @@ Body: Layout: 4 Interval: -1 Target: Party + Flag: + Ensemble: true - Id: 310 Name: BD_RINGNIBELUNGEN Description: Harmonic Lick @@ -8213,6 +8244,8 @@ Body: Layout: 4 Interval: -1 Target: Party + Flag: + Ensemble: true - Id: 311 Name: BD_ROKISWEIL Description: Classical Pluck @@ -8236,6 +8269,8 @@ Body: Id: Rokisweil Layout: 4 Interval: -1 + Flag: + Ensemble: true - Id: 312 Name: BD_INTOABYSS Description: Power Chord @@ -8262,6 +8297,7 @@ Body: Target: Party Flag: NoMob: true + Ensemble: true - Id: 313 Name: BD_SIEGFRIED Description: Acoustic Rhythm @@ -8286,6 +8322,8 @@ Body: Layout: 4 Interval: -1 Target: Party + Flag: + Ensemble: true - Id: 315 Name: BA_MUSICALLESSON Description: Music Lessons @@ -8356,6 +8394,8 @@ Body: Layout: 3 Interval: 3000 Target: Enemy + Flag: + Song: true - Id: 318 Name: BA_FROSTJOKER Description: Unbarring Octave @@ -8428,6 +8468,7 @@ Body: Interval: -1 Flag: NoMob: true + Song: true - Id: 320 Name: BA_ASSASSINCROSS Description: Impressive Riff @@ -8474,6 +8515,7 @@ Body: Interval: -1 Flag: NoMob: true + Song: true - Id: 321 Name: BA_POEMBRAGI Description: Magic Strings @@ -8520,6 +8562,7 @@ Body: Interval: -1 Flag: NoMob: true + Song: true - Id: 322 Name: BA_APPLEIDUN Description: Song of Lutie @@ -8566,6 +8609,8 @@ Body: Interval: 6000 Flag: NoMob: true + Song: true + DualMode: true - Id: 323 Name: DC_DANCINGLESSON Description: Dance Lessons @@ -8635,6 +8680,8 @@ Body: Layout: 3 Interval: 3000 Target: Enemy + Flag: + Dance: true - Id: 326 Name: DC_SCREAM Description: Dazzler @@ -8707,6 +8754,7 @@ Body: Interval: -1 Flag: NoMob: true + Dance: true - Id: 328 Name: DC_DONTFORGETME Description: Slow Grace @@ -8752,6 +8800,8 @@ Body: Layout: 3 Interval: -1 Target: Enemy + Flag: + Dance: true - Id: 329 Name: DC_FORTUNEKISS Description: Lady Luck @@ -8798,6 +8848,7 @@ Body: Interval: -1 Flag: NoMob: true + Dance: true - Id: 330 Name: DC_SERVICEFORYOU Description: Gypsy's Kiss @@ -8844,6 +8895,7 @@ Body: Interval: -1 Flag: NoMob: true + Dance: true - Id: 331 Name: NPC_RANDOMMOVE Description: Random Move @@ -9536,6 +9588,8 @@ Body: Id: Basilica Layout: 2 Interval: 300 + Flag: + RangedSingleUnit: true - Id: 363 Name: HP_MEDITATIO Description: Meditatio @@ -10537,6 +10591,8 @@ Body: Id: Moonlit Layout: 4 Interval: -1 + Flag: + Ensemble: true - Id: 396 Name: CG_MARIONETTE Description: Marionette Control @@ -10811,6 +10867,8 @@ Body: Id: Fogwall Layout: -1 Interval: -1 + Flag: + RemovedByFireRain: true - Id: 405 Name: PF_SPIDERWEB Description: Fiber Lock @@ -10835,6 +10893,8 @@ Body: Id: Spiderweb Interval: -1 Target: Enemy + Flag: + RemovedByFireRain: true - Id: 406 Name: ASC_METEORASSAULT Description: Meteor Assault @@ -12873,6 +12933,8 @@ Body: Flag: NoOverlap: true PathCheck: true + DualMode: true + RemovedByFireRain: true - Id: 485 Name: WS_CARTTERMINATION Description: Cart Termination @@ -13054,6 +13116,8 @@ Body: Id: Hermode Layout: 3 Interval: -1 + Flag: + Ensemble: true - Id: 489 Name: CG_TAROTCARD Description: Tarot Card of Fate @@ -14558,6 +14622,7 @@ Body: Target: Enemy Flag: PathCheck: true + RemovedByFireRain: true - Id: 536 Name: NJ_BAKUENRYU Description: Raging Fire Dragon @@ -14791,6 +14856,7 @@ Body: Interval: -1 Flag: PathCheck: true + RemovedByFireRain: true - Id: 539 Name: NJ_HYOUSYOURAKU Description: Ice Meteor @@ -16211,6 +16277,8 @@ Body: Id: Reverberation Interval: 1000 Target: Enemy + Flag: + NoKnockback: true - Id: 726 Name: NPC_REVERBERATION_ATK Description: Reverberation Attack @@ -18437,6 +18505,7 @@ Body: Flag: NoOverlap: true PathCheck: true + RemovedByFireRain: true - Id: 2033 Name: GC_CLOAKINGEXCEED Description: Cloaking Exceed @@ -19576,6 +19645,8 @@ Body: Flag: NoReiteration: true NoFootSet: true + NoKnockback: true + RemovedByFireRain: true - Id: 2239 Name: RA_CLUSTERBOMB Description: Cluster Bomb @@ -19612,6 +19683,7 @@ Body: Flag: NoReiteration: true NoFootSet: true + RemovedByFireRain: true - Id: 2240 Name: RA_WUGMASTERY Description: Warg Mastery @@ -19827,6 +19899,7 @@ Body: Flag: NoReiteration: true NoPc: true + RemovedByFireRain: true - Id: 2250 Name: RA_COBALTTRAP Description: Cobalt Trap @@ -19864,6 +19937,7 @@ Body: Flag: NoReiteration: true NoPc: true + RemovedByFireRain: true - Id: 2251 Name: RA_MAIZETRAP Description: Maize Trap @@ -19901,6 +19975,7 @@ Body: Flag: NoReiteration: true NoPc: true + RemovedByFireRain: true - Id: 2252 Name: RA_VERDURETRAP Description: Verdure Trap @@ -19938,6 +20013,7 @@ Body: Flag: NoReiteration: true NoPc: true + RemovedByFireRain: true - Id: 2253 Name: RA_FIRINGTRAP Description: Firing Trap @@ -19976,6 +20052,7 @@ Body: Target: Enemy Flag: NoReiteration: true + RemovedByFireRain: true - Id: 2254 Name: RA_ICEBOUNDTRAP Description: Icebound Trap @@ -20014,6 +20091,7 @@ Body: Target: Enemy Flag: NoReiteration: true + RemovedByFireRain: true - Id: 2255 Name: NC_MADOLICENCE Description: Mado License @@ -21574,6 +21652,7 @@ Body: Flag: NoReiteration: true NoFootSet: true + RemovedByFireRain: true - Id: 2300 Name: SC_DIMENSIONDOOR Description: Dimension Door @@ -21616,6 +21695,7 @@ Body: Flag: NoReiteration: true NoFootSet: true + RemovedByFireRain: true - Id: 2301 Name: SC_CHAOSPANIC Description: Chaos Panic @@ -21670,6 +21750,8 @@ Body: NoReiteration: true NoFootSet: true NoOverlap: true + RangedSingleUnit: true + RemovedByFireRain: true - Id: 2302 Name: SC_MAELSTROM Description: Maelstrom @@ -21717,6 +21799,8 @@ Body: Interval: -1 Flag: NoReiteration: true + RangedSingleUnit: true + RemovedByFireRain: true - Id: 2303 Name: SC_BLOODYLUST Description: Bloody Lust @@ -21759,6 +21843,8 @@ Body: NoOverlap: true PathCheck: true NoMob: true + RangedSingleUnit: true + RemovedByFireRain: true - Id: 2304 Name: SC_FEINTBOMB Description: Feint Bomb @@ -23762,6 +23848,8 @@ Body: Id: Reverberation Interval: 1000 Target: Enemy + Flag: + NoKnockback: true - Id: 2415 Name: WM_REVERBERATION_MELEE Description: Reverberation Melee @@ -23872,6 +23960,8 @@ Body: Range: 5 Interval: 300 Target: Enemy + Flag: + DualMode: true - Id: 2419 Name: WM_POEMOFNETHERWORLD Description: Poem of The Netherworld @@ -23938,6 +24028,7 @@ Body: Flag: NoFootSet: true PathCheck: true + NoKnockback: true - Id: 2420 Name: WM_VOICEOFSIREN Description: Voice of Siren @@ -25253,6 +25344,7 @@ Body: Target: Enemy Flag: PathCheck: true + RemovedByFireRain: true - Id: 2451 Name: SO_STRIKING Description: Striking @@ -25345,6 +25437,8 @@ Body: Interval: -1 Flag: PathCheck: true + RangedSingleUnit: true + RemovedByFireRain: true - Id: 2453 Name: SO_VACUUM_EXTREME Description: Vacuum Extreme @@ -25429,6 +25523,7 @@ Body: Target: Enemy Flag: PathCheck: true + RemovedByFireRain: true - Id: 2454 Name: SO_VARETYR_SPEAR Description: Varetyr Spear @@ -25846,6 +25941,7 @@ Body: Interval: -1 Flag: PathCheck: true + RangedSingleUnit: true - Id: 2466 Name: SO_WATER_INSIGNIA Description: Water Insignia @@ -25885,6 +25981,7 @@ Body: Interval: -1 Flag: PathCheck: true + RangedSingleUnit: true - Id: 2467 Name: SO_WIND_INSIGNIA Description: Wind Insignia @@ -25924,6 +26021,7 @@ Body: Interval: -1 Flag: PathCheck: true + RangedSingleUnit: true - Id: 2468 Name: SO_EARTH_INSIGNIA Description: Earth Insignia @@ -25963,6 +26061,7 @@ Body: Interval: -1 Flag: PathCheck: true + RangedSingleUnit: true - Id: 2474 Name: GN_TRAINING_SWORD Description: Sword Training @@ -26140,6 +26239,7 @@ Body: Flag: NoReiteration: true NoFootSet: true + RemovedByFireRain: true - Id: 2480 Name: GN_BLOOD_SUCKER Description: Blood Sucker @@ -26297,6 +26397,8 @@ Body: Range: 1 Interval: 300 Target: Enemy + Flag: + RemovedByFireRain: true - Id: 2483 Name: GN_CRAZYWEED Description: Crazy Weed @@ -26464,6 +26566,7 @@ Body: NoOverlap: true PathCheck: true Skill: true + RemovedByFireRain: true - Id: 2486 Name: GN_FIRE_EXPANSION Description: Fire Expansion @@ -26513,6 +26616,8 @@ Body: Id: Fire_Expansion_Smoke_Powder Layout: 2 Interval: -1 + Flag: + RangedSingleUnit: true - Id: 2488 Name: GN_FIRE_EXPANSION_TEAR_GAS Description: Fire Expansion Tear Gas @@ -26528,6 +26633,8 @@ Body: Id: Fire_Expansion_Tear_Gas Layout: 2 Interval: -1 + Flag: + RangedSingleUnit: true - Id: 2489 Name: GN_FIRE_EXPANSION_ACID Description: Fire Expansion Acid @@ -26640,6 +26747,7 @@ Body: Target: Enemy Flag: NoReiteration: true + RemovedByFireRain: true - Id: 2491 Name: GN_HELLS_PLANT_ATK Description: Hell's Plant Attack @@ -29194,6 +29302,7 @@ Body: Interval: -1 Flag: NoReiteration: true + RangedSingleUnit: true - Id: 5014 Name: ALL_FULL_THROTTLE Description: Full Throttle @@ -30926,6 +31035,7 @@ Body: Flag: NoOverlap: true PathCheck: true + RangedSingleUnit: true - Id: 8201 Name: MS_BASH Description: Bash @@ -32277,6 +32387,7 @@ Body: Flag: NoOverlap: true PathCheck: true + RangedSingleUnit: true - Id: 8407 Name: EL_WIND_STEP Description: Wind Step @@ -32319,6 +32430,7 @@ Body: Flag: NoOverlap: true PathCheck: true + RangedSingleUnit: true - Id: 8410 Name: EL_SOLID_SKIN Description: Solid Skin @@ -32361,6 +32473,7 @@ Body: Flag: NoOverlap: true PathCheck: true + RangedSingleUnit: true - Id: 8413 Name: EL_PYROTECHNIC Description: Pyrotechnic diff --git a/db/re/skill_db.yml b/db/re/skill_db.yml index 6f611d6fed..215b56b4a7 100644 --- a/db/re/skill_db.yml +++ b/db/re/skill_db.yml @@ -1026,6 +1026,7 @@ Body: Target: Enemy Flag: PathCheck: true + RemovedByFireRain: true - Id: 19 Name: MG_FIREBOLT Description: Fire Bolt @@ -1459,6 +1460,7 @@ Body: Flag: NoEnemy: true NoReiteration: true + RangedSingleUnit: true - Id: 26 Name: AL_TELEPORT Description: Teleport @@ -3002,6 +3004,7 @@ Body: Flag: NoOverlap: true PathCheck: true + RemovedByFireRain: true - Id: 80 Name: WZ_FIREPILLAR Description: Fire Pillar @@ -3662,6 +3665,8 @@ Body: Interval: 1000 Flag: PathCheck: true + NoKnockback: true + RemovedByFireRain: true - Id: 88 Name: WZ_FROSTNOVA Description: Frost Nova @@ -4053,6 +4058,7 @@ Body: Target: Enemy Flag: PathCheck: true + RemovedByFireRain: true - Id: 93 Name: WZ_ESTIMATION Description: Sense @@ -4400,6 +4406,8 @@ Body: Flag: NoReiteration: true NoFootSet: true + RemovedByFireRain: true + HiddenTrap: true - Id: 116 Name: HT_LANDMINE Description: Land Mine @@ -4449,6 +4457,8 @@ Body: Flag: NoReiteration: true NoFootSet: true + RemovedByFireRain: true + HiddenTrap: true - Id: 117 Name: HT_ANKLESNARE Description: Ankle Snare @@ -4499,6 +4509,9 @@ Body: Flag: NoReiteration: true NoFootSet: true + NoKnockback: true + RemovedByFireRain: true + HiddenTrap: true - Id: 118 Name: HT_SHOCKWAVE Description: Shockwave Trap @@ -4540,6 +4553,8 @@ Body: Flag: NoReiteration: true NoFootSet: true + RemovedByFireRain: true + HiddenTrap: true - Id: 119 Name: HT_SANDMAN Description: Sandman @@ -4582,6 +4597,8 @@ Body: Flag: NoReiteration: true NoFootSet: true + RemovedByFireRain: true + HiddenTrap: true - Id: 120 Name: HT_FLASHER Description: Flasher @@ -4624,6 +4641,8 @@ Body: Flag: NoReiteration: true NoFootSet: true + RemovedByFireRain: true + HiddenTrap: true - Id: 121 Name: HT_FREEZINGTRAP Description: Freezing Trap @@ -4682,6 +4701,8 @@ Body: Flag: NoReiteration: true NoFootSet: true + RemovedByFireRain: true + HiddenTrap: true - Id: 122 Name: HT_BLASTMINE Description: Blast Mine @@ -4733,6 +4754,7 @@ Body: Flag: NoReiteration: true NoFootSet: true + RemovedByFireRain: true - Id: 123 Name: HT_CLAYMORETRAP Description: Claymore Trap @@ -4785,6 +4807,7 @@ Body: Flag: NoReiteration: true NoFootSet: true + RemovedByFireRain: true - Id: 124 Name: HT_REMOVETRAP Description: Remove Trap @@ -4826,6 +4849,8 @@ Body: Interval: 1000 Flag: NoMob: true + RemovedByFireRain: true + HiddenTrap: true - Id: 126 Name: HT_BEASTBANE Description: Beast Bane @@ -5207,6 +5232,8 @@ Body: Range: 1 Interval: 1000 Target: Enemy + Flag: + RemovedByFireRain: true - Id: 141 Name: AS_SPLASHER Description: Venom Splasher @@ -6630,6 +6657,7 @@ Body: Interval: -1 Flag: NoReiteration: true + RemovedByFireRain: true - Id: 221 Name: RG_FLAGGRAFFITI Description: Piece @@ -8112,6 +8140,7 @@ Body: Interval: -1 Flag: PathCheck: true + RemovedByFireRain: true - Id: 286 Name: SA_DELUGE Description: Deluge @@ -8161,6 +8190,7 @@ Body: Interval: -1 Flag: PathCheck: true + RemovedByFireRain: true - Id: 287 Name: SA_VIOLENTGALE Description: Whirlwind @@ -8210,6 +8240,7 @@ Body: Interval: -1 Flag: PathCheck: true + RemovedByFireRain: true - Id: 288 Name: SA_LANDPROTECTOR Description: Magnetic Earth @@ -8284,6 +8315,7 @@ Body: Interval: -1 Flag: PathCheck: true + RemovedByFireRain: true - Id: 289 Name: SA_DISPELL Description: Dispell @@ -8581,6 +8613,8 @@ Body: Layout: 4 Interval: 6000 Target: Enemy + Flag: + Ensemble: true - Id: 307 Name: BD_RICHMANKIM Description: Mental Sensing @@ -8607,6 +8641,7 @@ Body: Target: Enemy Flag: NoPc: true + Ensemble: true - Id: 308 Name: BD_ETERNALCHAOS Description: Down Tempo @@ -8631,6 +8666,9 @@ Body: Layout: 4 Interval: -1 Target: Enemy + Flag: + Ensemble: true + RemovedByFireRain: true - Id: 309 Name: BD_DRUMBATTLEFIELD Description: Battle Theme @@ -8665,6 +8703,8 @@ Body: Layout: 4 Interval: -1 Target: Party + Flag: + Ensemble: true - Id: 310 Name: BD_RINGNIBELUNGEN Description: Harmonic Lick @@ -8699,6 +8739,8 @@ Body: Layout: 4 Interval: -1 Target: Party + Flag: + Ensemble: true - Id: 311 Name: BD_ROKISWEIL Description: Classical Pluck @@ -8722,6 +8764,9 @@ Body: Id: Rokisweil Layout: 4 Interval: -1 + Flag: + Ensemble: true + RemovedByFireRain: true - Id: 312 Name: BD_INTOABYSS Description: Power Chord @@ -8748,6 +8793,7 @@ Body: Target: Party Flag: NoMob: true + Ensemble: true - Id: 313 Name: BD_SIEGFRIED Description: Acoustic Rhythm @@ -8772,6 +8818,8 @@ Body: Layout: 4 Interval: -1 Target: Party + Flag: + Ensemble: true - Id: 315 Name: BA_MUSICALLESSON Description: Music Lessons @@ -8843,6 +8891,9 @@ Body: Layout: 3 Interval: 3000 Target: Enemy + Flag: + Song: true + RemovedByFireRain: true - Id: 318 Name: BA_FROSTJOKER Description: Unbarring Octave @@ -8915,6 +8966,7 @@ Body: Interval: -1 Flag: NoMob: true + Song: true - Id: 320 Name: BA_ASSASSINCROSS Description: Impressive Riff @@ -8961,6 +9013,7 @@ Body: Interval: -1 Flag: NoMob: true + Song: true - Id: 321 Name: BA_POEMBRAGI Description: Magic Strings @@ -9007,6 +9060,7 @@ Body: Interval: -1 Flag: NoMob: true + Song: true - Id: 322 Name: BA_APPLEIDUN Description: Song of Lutie @@ -9053,6 +9107,8 @@ Body: Interval: 6000 Flag: NoMob: true + Song: true + DualMode: true - Id: 323 Name: DC_DANCINGLESSON Description: Dance Lessons @@ -9123,6 +9179,8 @@ Body: Layout: 3 Interval: 3000 Target: Enemy + Flag: + Dance: true - Id: 326 Name: DC_SCREAM Description: Dazzler @@ -9195,6 +9253,7 @@ Body: Interval: -1 Flag: NoMob: true + Dance: true - Id: 328 Name: DC_DONTFORGETME Description: Slow Grace @@ -9240,6 +9299,8 @@ Body: Layout: 3 Interval: -1 Target: Enemy + Flag: + Dance: true - Id: 329 Name: DC_FORTUNEKISS Description: Lady Luck @@ -9286,6 +9347,7 @@ Body: Interval: -1 Flag: NoMob: true + Dance: true - Id: 330 Name: DC_SERVICEFORYOU Description: Gypsy's Kiss @@ -9332,6 +9394,7 @@ Body: Interval: -1 Flag: NoMob: true + Dance: true - Id: 331 Name: NPC_RANDOMMOVE Description: Random Move @@ -10026,6 +10089,8 @@ Body: Id: Basilica Layout: 2 Interval: 300 + Flag: + RangedSingleUnit: true - Id: 363 Name: HP_MEDITATIO Description: Meditatio @@ -11058,6 +11123,8 @@ Body: Id: Moonlit Layout: 4 Interval: -1 + Flag: + Ensemble: true - Id: 396 Name: CG_MARIONETTE Description: Marionette Control @@ -11334,6 +11401,8 @@ Body: Id: Fogwall Layout: -1 Interval: -1 + Flag: + RemovedByFireRain: true - Id: 405 Name: PF_SPIDERWEB Description: Fiber Lock @@ -11358,6 +11427,8 @@ Body: Id: Spiderweb Interval: -1 Target: Enemy + Flag: + RemovedByFireRain: true - Id: 406 Name: ASC_METEORASSAULT Description: Meteor Assault @@ -13445,6 +13516,8 @@ Body: Flag: NoOverlap: true PathCheck: true + DualMode: true + RemovedByFireRain: true - Id: 485 Name: WS_CARTTERMINATION Description: Cart Termination @@ -13624,6 +13697,8 @@ Body: Id: Hermode Layout: 3 Interval: -1 + Flag: + Ensemble: true - Id: 489 Name: CG_TAROTCARD Description: Tarot Card of Fate @@ -15169,6 +15244,7 @@ Body: Target: Enemy Flag: PathCheck: true + RemovedByFireRain: true - Id: 536 Name: NJ_BAKUENRYU Description: Raging Fire Dragon @@ -15427,6 +15503,7 @@ Body: Interval: -1 Flag: PathCheck: true + RemovedByFireRain: true - Id: 539 Name: NJ_HYOUSYOURAKU Description: Ice Meteor @@ -16864,6 +16941,7 @@ Body: Flag: NoOverlap: true PathCheck: true + RemovedByFireRain: true - Id: 711 Name: NPC_FLAMECROSS Description: Flame Cross @@ -16886,6 +16964,7 @@ Body: Flag: NoOverlap: true PathCheck: true + RemovedByFireRain: true - Id: 715 Name: NPC_DARKPIERCING Description: Dark Piercing @@ -17006,6 +17085,8 @@ Body: Id: Reverberation Interval: 1000 Target: Enemy + Flag: + NoKnockback: true - Id: 726 Name: NPC_REVERBERATION_ATK Description: Reverberation Attack @@ -19319,6 +19400,7 @@ Body: Flag: NoOverlap: true PathCheck: true + RemovedByFireRain: true - Id: 2033 Name: GC_CLOAKINGEXCEED Description: Cloaking Exceed @@ -20476,6 +20558,7 @@ Body: Flag: NoReiteration: true NoFootSet: true + RemovedByFireRain: true - Id: 2239 Name: RA_CLUSTERBOMB Description: Cluster Bomb @@ -20512,6 +20595,7 @@ Body: Flag: NoReiteration: true NoFootSet: true + RemovedByFireRain: true - Id: 2240 Name: RA_WUGMASTERY Description: Warg Mastery @@ -20727,6 +20811,7 @@ Body: Flag: NoReiteration: true NoPc: true + RemovedByFireRain: true - Id: 2250 Name: RA_COBALTTRAP Description: Cobalt Trap @@ -20764,6 +20849,7 @@ Body: Flag: NoReiteration: true NoPc: true + RemovedByFireRain: true - Id: 2251 Name: RA_MAIZETRAP Description: Maize Trap @@ -20801,6 +20887,7 @@ Body: Flag: NoReiteration: true NoPc: true + RemovedByFireRain: true - Id: 2252 Name: RA_VERDURETRAP Description: Verdure Trap @@ -20838,6 +20925,7 @@ Body: Flag: NoReiteration: true NoPc: true + RemovedByFireRain: true - Id: 2253 Name: RA_FIRINGTRAP Description: Firing Trap @@ -20876,6 +20964,7 @@ Body: Target: Enemy Flag: NoReiteration: true + RemovedByFireRain: true - Id: 2254 Name: RA_ICEBOUNDTRAP Description: Icebound Trap @@ -20914,6 +21003,7 @@ Body: Target: Enemy Flag: NoReiteration: true + RemovedByFireRain: true - Id: 2255 Name: NC_MADOLICENCE Description: Mado License @@ -22508,6 +22598,7 @@ Body: Flag: NoReiteration: true NoFootSet: true + RemovedByFireRain: true - Id: 2300 Name: SC_DIMENSIONDOOR Description: Dimension Door @@ -22550,6 +22641,7 @@ Body: Flag: NoReiteration: true NoFootSet: true + RemovedByFireRain: true - Id: 2301 Name: SC_CHAOSPANIC Description: Chaos Panic @@ -22604,6 +22696,8 @@ Body: NoReiteration: true NoFootSet: true NoOverlap: true + RangedSingleUnit: true + RemovedByFireRain: true - Id: 2302 Name: SC_MAELSTROM Description: Maelstrom @@ -22651,6 +22745,8 @@ Body: Interval: -1 Flag: NoReiteration: true + RangedSingleUnit: true + RemovedByFireRain: true - Id: 2303 Name: SC_BLOODYLUST Description: Bloody Lust @@ -22693,6 +22789,8 @@ Body: NoOverlap: true PathCheck: true NoMob: true + RangedSingleUnit: true + RemovedByFireRain: true - Id: 2304 Name: SC_FEINTBOMB Description: Feint Bomb @@ -24718,6 +24816,8 @@ Body: Id: Reverberation Interval: 1000 Target: Enemy + Flag: + NoKnockback: true - Id: 2415 Name: WM_REVERBERATION_MELEE Description: Reverberation Melee @@ -24829,6 +24929,8 @@ Body: Range: 5 Interval: 300 Target: Enemy + Flag: + DualMode: true - Id: 2419 Name: WM_POEMOFNETHERWORLD Description: Poem of The Netherworld @@ -24895,6 +24997,7 @@ Body: Flag: NoFootSet: true PathCheck: true + NoKnockback: true - Id: 2420 Name: WM_VOICEOFSIREN Description: Voice of Siren @@ -26273,6 +26376,7 @@ Body: Target: Enemy Flag: PathCheck: true + RemovedByFireRain: true - Id: 2451 Name: SO_STRIKING Description: Striking @@ -26376,6 +26480,8 @@ Body: Interval: -1 Flag: PathCheck: true + RangedSingleUnit: true + RemovedByFireRain: true - Id: 2453 Name: SO_VACUUM_EXTREME Description: Vacuum Extreme @@ -26460,6 +26566,7 @@ Body: Target: Enemy Flag: PathCheck: true + RemovedByFireRain: true - Id: 2454 Name: SO_VARETYR_SPEAR Description: Varetyr Spear @@ -26903,6 +27010,7 @@ Body: Interval: -1 Flag: PathCheck: true + RangedSingleUnit: true - Id: 2466 Name: SO_WATER_INSIGNIA Description: Water Insignia @@ -26943,6 +27051,7 @@ Body: Interval: -1 Flag: PathCheck: true + RangedSingleUnit: true - Id: 2467 Name: SO_WIND_INSIGNIA Description: Wind Insignia @@ -26983,6 +27092,7 @@ Body: Interval: -1 Flag: PathCheck: true + RangedSingleUnit: true - Id: 2468 Name: SO_EARTH_INSIGNIA Description: Earth Insignia @@ -27023,6 +27133,7 @@ Body: Interval: -1 Flag: PathCheck: true + RangedSingleUnit: true - Id: 2474 Name: GN_TRAINING_SWORD Description: Sword Training @@ -27200,6 +27311,7 @@ Body: Flag: NoReiteration: true NoFootSet: true + RemovedByFireRain: true - Id: 2480 Name: GN_BLOOD_SUCKER Description: Blood Sucker @@ -27357,6 +27469,8 @@ Body: Range: 1 Interval: 300 Target: Enemy + Flag: + RemovedByFireRain: true - Id: 2483 Name: GN_CRAZYWEED Description: Crazy Weed @@ -27524,6 +27638,7 @@ Body: NoOverlap: true PathCheck: true Skill: true + RemovedByFireRain: true - Id: 2486 Name: GN_FIRE_EXPANSION Description: Fire Expansion @@ -27573,6 +27688,8 @@ Body: Id: Fire_Expansion_Smoke_Powder Layout: 2 Interval: -1 + Flag: + RangedSingleUnit: true - Id: 2488 Name: GN_FIRE_EXPANSION_TEAR_GAS Description: Fire Expansion Tear Gas @@ -27588,6 +27705,8 @@ Body: Id: Fire_Expansion_Tear_Gas Layout: 2 Interval: -1 + Flag: + RangedSingleUnit: true - Id: 2489 Name: GN_FIRE_EXPANSION_ACID Description: Fire Expansion Acid @@ -27701,6 +27820,7 @@ Body: Target: Enemy Flag: NoReiteration: true + RemovedByFireRain: true - Id: 2491 Name: GN_HELLS_PLANT_ATK Description: Hell's Plant Attack @@ -30870,6 +30990,7 @@ Body: Interval: -1 Flag: NoReiteration: true + RangedSingleUnit: true - Id: 5014 Name: ALL_FULL_THROTTLE Description: Full Throttle @@ -31127,6 +31248,7 @@ Body: Target: Enemy Flag: PathCheck: true + RangedSingleUnit: true - Id: 5028 Name: SU_CN_METEOR Description: Catnip Meteor @@ -31802,6 +31924,7 @@ Body: Target: Enemy Flag: PathCheck: true + RangedSingleUnit: true - Id: 5049 Name: SU_GROOMING Description: Grooming @@ -33793,6 +33916,7 @@ Body: Flag: NoOverlap: true PathCheck: true + RangedSingleUnit: true - Id: 8201 Name: MS_BASH Description: Bash @@ -34108,6 +34232,7 @@ Body: Flag: NoReiteration: true NoFootSet: true + RemovedByFireRain: true - Id: 8210 Name: MA_LANDMINE Description: Land_Mine @@ -34147,6 +34272,7 @@ Body: Flag: NoReiteration: true NoFootSet: true + RemovedByFireRain: true - Id: 8211 Name: MA_SANDMAN Description: Sandman @@ -34196,6 +34322,7 @@ Body: Flag: NoReiteration: true NoFootSet: true + RemovedByFireRain: true - Id: 8212 Name: MA_FREEZINGTRAP Description: Freezing_Trap @@ -34247,6 +34374,7 @@ Body: Flag: NoReiteration: true NoFootSet: true + RemovedByFireRain: true - Id: 8213 Name: MA_REMOVETRAP Description: Remove_Trap @@ -35180,6 +35308,7 @@ Body: Flag: NoOverlap: true PathCheck: true + RangedSingleUnit: true - Id: 8407 Name: EL_WIND_STEP Description: Wind Step @@ -35222,6 +35351,7 @@ Body: Flag: NoOverlap: true PathCheck: true + RangedSingleUnit: true - Id: 8410 Name: EL_SOLID_SKIN Description: Solid Skin @@ -35264,6 +35394,7 @@ Body: Flag: NoOverlap: true PathCheck: true + RangedSingleUnit: true - Id: 8413 Name: EL_PYROTECHNIC Description: Pyrotechnic diff --git a/src/map/skill.cpp b/src/map/skill.cpp index cb6692cfaa..b9d74db159 100755 --- a/src/map/skill.cpp +++ b/src/map/skill.cpp @@ -21237,7 +21237,7 @@ uint64 SkillDatabase::parseBodyNode(const YAML::Node &node) { const YAML::Node &elementNode = node["Element"]; std::string element; - if (node.IsScalar()) { + if (elementNode.IsScalar()) { if (!this->asString(node, "Element", element)) return 0; @@ -21723,8 +21723,8 @@ uint64 SkillDatabase::parseBodyNode(const YAML::Node &node) { } } - if (this->nodeExists(requireNode, "SphereCost")) { - if (!this->parseNode("SphereCost", "Amount", requireNode, skill->require.spiritball)) + if (this->nodeExists(requireNode, "SpiritSphereCost")) { + if (!this->parseNode("SpiritSphereCost", "Amount", requireNode, skill->require.spiritball)) return 0; } else { if (!exists) diff --git a/src/tool/csv2yaml.cpp b/src/tool/csv2yaml.cpp index 56d2b93493..d919dcd1ef 100644 --- a/src/tool/csv2yaml.cpp +++ b/src/tool/csv2yaml.cpp @@ -73,7 +73,7 @@ int getch( void ){ struct s_skill_unit_csv : s_skill_db { std::string target_str; - e_skill_unit_flag unit_flag_csv; + int unit_flag_csv; }; std::unordered_map skill_require; @@ -1350,7 +1350,7 @@ static bool skill_parse_row_unitdb(char* split[], int columns, int current) skill_split_atoi(split[4], entry.unit_range); entry.unit_interval = atoi(split[5]); entry.target_str = trim(split[6]); - entry.unit_flag_csv = static_cast(strtol(split[7], NULL, 16)); + entry.unit_flag_csv = strtol(split[7], NULL, 16); skill_unit.insert({ atoi(split[0]), entry });