From da390cae2f90dbde47d2464870343fd1e426fe4f Mon Sep 17 00:00:00 2001 From: Akinari1087 Date: Thu, 29 Aug 2013 00:48:18 -0400 Subject: [PATCH] Fix pre-re Ensemble songs ignoring Land Protector - Fixes bugreport:8013 Re-add Solo songs to ignore Land Protector in Renewal Blame a9b48ba for the confusion Hermode's Rod is now a Solo song - Fixes bugreport:8001 --- db/pre-re/skill_db.txt | 18 +++++++++--------- db/re/skill_db.txt | 22 +++++++++++----------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/db/pre-re/skill_db.txt b/db/pre-re/skill_db.txt index 32c6e894ac..fc22a06500 100644 --- a/db/pre-re/skill_db.txt +++ b/db/pre-re/skill_db.txt @@ -366,13 +366,13 @@ 304,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0,0x8, BD_ADAPTATION,Amp 305,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0,0x0, BD_ENCORE,Encore 306,0,6,4,0,0x1,0,1,1,no,0,0x40,0,misc,0,0x0, BD_LULLABY,Lullaby -307,0,6,4,0,0x1,0,5,1,no,0,0x40,0,misc,0,0x1, BD_RICHMANKIM,Mental Sensing -308,0,6,4,0,0x1,0,1,1,no,0,0x40,0,misc,0,0x1, BD_ETERNALCHAOS,Down Tempo -309,0,6,4,0,0x1,0,5,1,no,0,0x40,0,misc,0,0x1, BD_DRUMBATTLEFIELD,Battle Theme -310,0,6,4,0,0x1,0,5,1,no,0,0x40,0,misc,0,0x1, BD_RINGNIBELUNGEN,Harmonic Lick -311,0,6,4,0,0x1,0,1,1,no,0,0x40,0,misc,0,0x1, BD_ROKISWEIL,Classical Pluck -312,0,6,4,0,0x1,0,1,1,no,0,0x40,0,misc,0,0x1, BD_INTOABYSS,Power Chord -313,0,6,4,0,0x1,0,5,1,no,0,0x40,0,misc,0,0x1, BD_SIEGFRIED,Acoustic Rhythm +307,0,6,4,0,0x1,0,5,1,no,0,0x40,0,misc,0,0x0, BD_RICHMANKIM,Mental Sensing +308,0,6,4,0,0x1,0,1,1,no,0,0x40,0,misc,0,0x0, BD_ETERNALCHAOS,Down Tempo +309,0,6,4,0,0x1,0,5,1,no,0,0x40,0,misc,0,0x0, BD_DRUMBATTLEFIELD,Battle Theme +310,0,6,4,0,0x1,0,5,1,no,0,0x40,0,misc,0,0x0, BD_RINGNIBELUNGEN,Harmonic Lick +311,0,6,4,0,0x1,0,1,1,no,0,0x40,0,misc,0,0x0, BD_ROKISWEIL,Classical Pluck +312,0,6,4,0,0x1,0,1,1,no,0,0x40,0,misc,0,0x0, BD_INTOABYSS,Power Chord +313,0,6,4,0,0x1,0,5,1,no,0,0x40,0,misc,0,0x0, BD_SIEGFRIED,Acoustic Rhythm //314,0,0,0,0,0,0,1,1,no,0,0x40,0,misc,0,0x0, BD_RAGNAROK,Ragnarok 315,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0,0x0, BA_MUSICALLESSON,Music Lessons 316,9,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0x8, BA_MUSICALSTRIKE,Melody Strike @@ -454,7 +454,7 @@ 392,0,0,4,0,0x1,0,1,1,yes,0,0,0,none,0,0x0, CR_ALCHEMY,Alchemy 393,0,0,4,0,0x1,0,1,1,yes,0,0,0,none,0,0x0, CR_SYNTHESISPOTION,Potion Synthesis 394,9,8,1,-1,0,0,10,-9,yes,0,0,0,weapon,0,0x0, CG_ARROWVULCAN,Vulcan Arrow -395,0,0,4,0,0x1,3,1,1,yes,0,0x40,0,misc,2,0x1, CG_MOONLIT,Sheltering Bliss +395,0,0,4,0,0x1,3,1,1,yes,0,0x40,0,misc,2,0x0, CG_MOONLIT,Sheltering Bliss 396,1,6,16,0,0x1,0,1,1,yes,0,0x600,0,none,0,0x40, CG_MARIONETTE,Marionette Control 397,5,8,1,-1,0x20,0,5,5,no,0,0,0,weapon,0,0x0, LK_SPIRALPIERCE,Spiral Pierce 398,4,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0x0, LK_HEADCRUSH,Traumatic Blow @@ -547,7 +547,7 @@ 485,-2,6,1,-1,0x8,0,10,1,no,0,0,0,weapon,0,0x4000, WS_CARTTERMINATION,Cart Termination 486,0,6,4,0,0x1,0,5,1,no,0,0,0,weapon,0,0x4000, WS_OVERTHRUSTMAX,Maximum Power Thrust 487,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x8, CG_LONGINGFREEDOM,Longing for Freedom -488,0,6,4,0,0x1,1,5,1,no,0,0x40,0,misc,0,0x0, CG_HERMODE,Wand of Hermode +488,0,6,4,0,0x1,1,5,1,no,0,0x20,0,misc,0,0x1, CG_HERMODE,Wand of Hermode 489,9,6,1,0,0x41,0,5,1,no,0,0,0,misc,0,0x0, CG_TAROTCARD,Tarot Card of Fate 490,9,8,1,0,0x40,0,10,1:2:3:4:5:6:7:8:9:10,yes,0,0,0,misc,0,0x0, CR_ACIDDEMONSTRATION,Acid Demonstration 491,1,6,2,0,0x1,0,2,1,no,0,0,0,none,0,0x0, CR_CULTIVATION,Plant Cultivation diff --git a/db/re/skill_db.txt b/db/re/skill_db.txt index 9569cbf9d0..42856b5d48 100644 --- a/db/re/skill_db.txt +++ b/db/re/skill_db.txt @@ -378,20 +378,20 @@ //314,0,0,0,0,0,0,1,1,no,0,0x40,0,misc,0,0x0, BD_RAGNAROK,Ragnarok 315,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0,0x0, BA_MUSICALLESSON,Music Lessons 316,9,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0x8, BA_MUSICALSTRIKE,Melody Strike -317,0,8,4,0,0x41,0,5,1,no,0,0x20,0,misc,0,0x0, BA_DISSONANCE,Unchained Serenade +317,0,8,4,0,0x41,0,5,1,no,0,0x20,0,misc,0,0x1, BA_DISSONANCE,Unchained Serenade 318,0,6,4,0,0x3,-1,5,1,no,0,0,0,misc,0,0x0, BA_FROSTJOKER,Unbarring Octave -319,0,6,4,0,0x1,0,10,1,no,0,0x20,0,misc,0,0x0, BA_WHISTLE,Perfect Tablature -320,0,6,4,0,0x1,0,10,1,no,0,0x20,0,misc,0,0x0, BA_ASSASSINCROSS,Impressive Riff -321,0,6,4,0,0x1,0,10,1,no,0,0x20,0,misc,0,0x0, BA_POEMBRAGI,Magic Strings -322,0,6,4,0,0x1,0,10,1,no,0,0x20,0,misc,0,0x0, BA_APPLEIDUN,Song of Lutie +319,0,6,4,0,0x1,0,10,1,no,0,0x20,0,misc,0,0x1, BA_WHISTLE,Perfect Tablature +320,0,6,4,0,0x1,0,10,1,no,0,0x20,0,misc,0,0x1, BA_ASSASSINCROSS,Impressive Riff +321,0,6,4,0,0x1,0,10,1,no,0,0x20,0,misc,0,0x1, BA_POEMBRAGI,Magic Strings +322,0,6,4,0,0x1,0,10,1,no,0,0x20,0,misc,0,0x1, BA_APPLEIDUN,Song of Lutie 323,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0,0x0, DC_DANCINGLESSON,Dance Lessons 324,9,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0x8, DC_THROWARROW,Slinging Arrow -325,0,8,4,0,0x1,0,5,1,no,0,0x20,0,misc,0,0x0, DC_UGLYDANCE,Hip Shaker +325,0,8,4,0,0x1,0,5,1,no,0,0x20,0,misc,0,0x1, DC_UGLYDANCE,Hip Shaker 326,0,6,4,0,0x3,-1,5,1,no,0,0,0,misc,0,0x0, DC_SCREAM,Dazzler -327,0,6,4,0,0x1,0,10,1,no,0,0x20,0,misc,0,0x0, DC_HUMMING,Focus Ballet -328,0,6,4,0,0x1,0,10,1,no,0,0x20,0,misc,0,0x0, DC_DONTFORGETME,Slow Grace -329,0,6,4,0,0x1,0,10,1,no,0,0x20,0,misc,0,0x0, DC_FORTUNEKISS,Lady Luck -330,0,6,4,0,0x1,0,10,1,no,0,0x20,0,misc,0,0x0, DC_SERVICEFORYOU,Gypsy's Kiss +327,0,6,4,0,0x1,0,10,1,no,0,0x20,0,misc,0,0x1, DC_HUMMING,Focus Ballet +328,0,6,4,0,0x1,0,10,1,no,0,0x20,0,misc,0,0x1, DC_DONTFORGETME,Slow Grace +329,0,6,4,0,0x1,0,10,1,no,0,0x20,0,misc,0,0x1, DC_FORTUNEKISS,Lady Luck +330,0,6,4,0,0x1,0,10,1,no,0,0x20,0,misc,0,0x1, DC_SERVICEFORYOU,Gypsy's Kiss 331,0,6,4,0,0x1,0,10,0,no,0,0x2,0,none,0,0x0, NPC_RANDOMMOVE,Random Move 332,0,6,4,0,0x1,0,10,0,no,0,0x2,0,none,0,0x0, NPC_SPEEDUP,Speed UP 333,0,6,4,0,0x1,0,1,0,no,0,0x2,0,none,0,0x0, NPC_REVENGE,Revenge @@ -549,7 +549,7 @@ 485,-2,6,1,-1,0x8,0,10,1,no,0,0,0,weapon,0,0x4000, WS_CARTTERMINATION,Cart Termination 486,0,6,4,0,0x1,0,5,1,no,0,0,0,weapon,0,0x4000, WS_OVERTHRUSTMAX,Maximum Power Thrust 487,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x8, CG_LONGINGFREEDOM,Longing for Freedom -488,0,6,4,0,0x1,1,5,1,no,0,0x40,0,misc,0,0x0, CG_HERMODE,Wand of Hermode +488,0,6,4,0,0x1,1,5,1,no,0,0x20,0,misc,0,0x1, CG_HERMODE,Wand of Hermode 489,9,6,1,0,0x41,0,5,1,no,0,0,0,misc,0,0x0, CG_TAROTCARD,Tarot Card of Fate 490,9,8,1,-1,0x60,0,10,1:2:3:4:5:6:7:8:9:10,yes,0,0,0,misc,0,0x0, CR_ACIDDEMONSTRATION,Acid Demonstration 491,1,6,2,0,0x1,0,2,1,no,0,0,0,none,0,0x0, CR_CULTIVATION,Plant Cultivation