From 74b57614cd6eff6cc0eecdd6e59153e0def03544 Mon Sep 17 00:00:00 2001 From: Johto Date: Tue, 29 Oct 2019 20:44:11 -0400 Subject: [PATCH] Updated Animation List --- FFXIVTool/Resources/actiontimeline.csv | 238 ++++++++++--------- FFXIVTool/Utility/ThreadWriting.cs | 4 +- FFXIVTool/Views/CharacterDetailsView.xaml | 4 +- FFXIVTool/Views/CharacterDetailsView.xaml.cs | 2 +- 4 files changed, 134 insertions(+), 114 deletions(-) diff --git a/FFXIVTool/Resources/actiontimeline.csv b/FFXIVTool/Resources/actiontimeline.csv index 280c02e..0701ddd 100644 --- a/FFXIVTool/Resources/actiontimeline.csv +++ b/FFXIVTool/Resources/actiontimeline.csv @@ -148,8 +148,8 @@ Index, Name 146,"overlay/sp2" 147,"overlay/sp3" 148,"battle/partsbreak" -149,"" -150,"" +149,"normal/facial/sleep_demi" +150,"normal/event_action_default_end" 151,"" 152,"" 153,"" @@ -294,7 +294,7 @@ Index, Name 292,"normal/fishing hit_excite" 293,"normal/fishing hit_strike" 294,"normal/fishing hit_bite" -295,"gather/attack" +295,"normal/Gather attack" 296,"normal/Planting" 297,"normal/Watering Plants" 298,"normal/Pulling up Plants" @@ -5692,19 +5692,19 @@ Index, Name 5690,"normal/event_magic_ast_out" 5691,"" 5692,"normal/event_base_knee_seach" -5693,"" -5694,"" -5695,"" -5696,"" -5697,"" -5698,"" -5699,"" -5700,"" -5701,"" -5702,"" -5703,"" -5704,"" -5705,"" +5693,"normal/event_base_ball_dance" +5694,"normal/event_pixy_flower_shower" +5695,"normal/event_talk3" +5696,"normal/event_talk4" +5697,"normal/event_base_sculptor" +5698,"normal/event_base_uneasy_stand" +5699,"normal/event_base_stand_chief" +5700,"normal/event_base_stand_shy" +5701,"normal/event_inhale" +5702,"normal/event_exhale" +5703,"normal/event_base_attention_chief" +5704,"normal/magic_healaction_loop" +5705,"normal/magic_healaction_out" 5706,"" 5707,"" 5708,"" @@ -6181,10 +6181,10 @@ Index, Name 6179,"normal/pc_scary_loop" 6180,"normal/event_base_push_up_sit_stop" 6181,"normal/slider_loop" -6182,"" -6183,"" -6184,"" -6185,"" +6182,"normal/pc_contentsaction/pet_order" +6183,"normal/pc_contentsaction/barrier_20m_pc" +6184,"normal/pc_contentsaction/barrier_20m_pc_hit" +6185,"normal/pc_contentsaction/slider2_loop" 6186,"" 6187,"" 6188,"" @@ -6309,8 +6309,8 @@ Index, Name 6307,"" 6308,"" 6309,"" -6310,"" -6311,"" +6310,"normal/Toast" +6311,"normal/u_Toast" 6312,"" 6313,"" 6314,"" @@ -6704,10 +6704,10 @@ Index, Name 6702,"" 6703,"" 6704,"" -6705,"" -6706,"" -6707,"" -6708,"" +6705,"normal/c0101/human_sp085" +6706,"normal/c0501/human_sp115" +6707,"normal/c0101/human_sp083" +6708,"normal/c0101/human_sp084" 6709,"mount/mount_walk" 6710,"mount/mount_jump" 6711,"mon_sp/gimmick/z3oe_boss_gimmick05_hit" @@ -6856,8 +6856,8 @@ Index, Name 6854,"mon_sp/gimmick/z3r3_boss2_gimmick02" 6855,"mon_sp/gimmick/z3r3_boss2_gimmick03" 6856,"human_sp/c0101/human_sp076" -6857,"" -6858,"" +6857,"mon_sp/gimmick/s1f1_boss_gimmick01" +6858,"mon_sp/gimmick/s1f1_boss_gimmick01_hit" 6859,"human_sp/c0601/human_sp020" 6860,"mon_sp/gimmick/z3r3_boss3_gimmick01" 6861,"mon_sp/gimmick/z3r3_boss3_gimmick02" @@ -6956,7 +6956,7 @@ Index, Name 6954,"battle/2gb_bgb/abl017" 6955,"battle/lbk_gunbreaker_lv3" 6956,"battle/lbk_gunbreaker_lv3_hit" -6957,"" +6957,"battle/2gb_bgb/abl010_bm" 6958,"" 6959,"" 6960,"" @@ -7037,7 +7037,7 @@ Index, Name 7035,"battle/2sw_dark/abl031" 7036,"" 7037,"" -7038,"" +7038,"ws/bt_clw_clw/ws_s14" 7039,"ws/bt_clw_clw/ws_s12" 7040,"ws/bt_clw_clw/ws_s12_hit" 7041,"battle/clw_monk/abl024" @@ -7058,8 +7058,8 @@ Index, Name 7056,"battle/dgr_ninja/abl027_hit" 7057,"battle/dgr_ninja/abl028" 7058,"battle/dgr_ninja/abl029" -7059,"" -7060,"" +7059,"battle/2kt_samrai/mgc006" +7060,"battle/2kt_samrai/mgc007" 7061,"battle/2kt_samrai/abl017" 7062,"battle/2kt_samrai/abl018" 7063,"battle/2kt_samrai/abl019" @@ -7304,23 +7304,23 @@ Index, Name 7302,"" 7303,"" 7304,"" -7305,"" -7306,"" -7307,"" -7308,"" -7309,"" -7310,"" -7311,"" -7312,"" -7313,"" -7314,"" -7315,"" -7316,"" -7317,"" -7318,"" -7319,"" -7320,"" -7321,"" +7305,"normal/c0201/human_sp019" +7306,"normal/c0201/human_sp017" +7307,"normal/c0201/human_sp018" +7308,"normal/pc_contentsaction/pc_ytcslide_loop" +7309,"normal/pc_contentsaction/pc_podjump_1" +7310,"normal/pc_contentsaction/pc_podjump_2" +7311,"normal/pc_contentsaction/pc_podjump_3" +7312,"normal/human_sp/c0201/human_sp011" +7313,"normal/human_sp/c0201/human_sp012" +7314,"normal/human_sp/c0201/human_sp013" +7315,"normal/human_sp/c0201/human_sp014" +7316,"normal/human_sp/c0201/human_sp015" +7317,"warp/warp_start2" +7318,"battle/magic_ytc_start" +7319,"battle/magic_ytc_loop" +7320,"battle/ytc/mgc001" +7321,"battle/ytc/mgc002" 7322,"normal/fistbump" 7323,"normal/u_fistbump" 7324,"normal/Slap" @@ -7334,15 +7334,15 @@ Index, Name 7332,"normal/u_think" 7333,"emote/Lali-ho" 7334,"emote/u_Lali-ho" -7335,"" -7336,"" -7337,"" -7338,"" -7339,"" -7340,"" -7341,"" -7342,"" -7343,"" +7335,"normal/u_item_eat_housing" +7336,"normal/u_item_drink_housing" +7337,"music/instrument04_start" +7338,"music/instrument04_idle" +7339,"music/instrument04_end" +7340,"music/instrument04_play01_start" +7341,"music/instrument04_play01_loop" +7342,"music/instrument04_play02_start" +7343,"music/instrument04_play02_loop" 7344,"" 7345,"" 7346,"" @@ -7530,62 +7530,62 @@ Index, Name 7528,"mon_sp/gimmick/n4fc_boss_gimmick05" 7529,"mon_sp/gimmick/n4g3_boss_gimmick15" 7530,"mon_sp/gimmick/n4g1_boss_gimmick06" -7531,"" -7532,"" -7533,"" -7534,"" -7535,"" -7536,"" -7537,"" -7538,"" -7539,"" -7540,"" -7541,"" -7542,"" -7543,"" -7544,"" -7545,"" -7546,"" -7547,"" -7548,"" -7549,"" -7550,"" -7551,"" -7552,"" -7553,"" -7554,"" -7555,"" -7556,"" -7557,"" -7558,"" -7559,"" -7560,"" -7561,"" +7531,"mon_sp/gimmick/n4fc_2_boss_gimmick01" +7532,"mon_sp/gimmick/n4fc_2_boss_gimmick02" +7533,"mon_sp/gimmick/n4fc_2_boss_gimmick03" +7534,"mon_sp/gimmick/n4fc_2_boss_gimmick04" +7535,"mon_sp/gimmick/n4fc_2_boss_gimmick05" +7536,"mon_sp/gimmick/n4fc_2_boss_gimmick06" +7537,"human_sp/c0501/human_sp113" +7538,"human_sp/c0101/human_sp081" +7539,"human_sp/c0101/human_sp082" +7540,"human_sp/c0501/human_sp114" +7541,"specialpop/specialpop3" +7542,"specialpop/specialdepop3" +7543,"mon_sp/gimmick/n4d9_boss_gimmick01" +7544,"mon_sp/gimmick/n4d9_boss_gimmick02" +7545,"mon_sp/gimmick/n4r1_boss3_gimmick01" +7546,"mon_sp/gimmick/n4r1_boss3_gimmick02" +7547,"mon_sp/gimmick/n4r1_boss3_gimmick03" +7548,"mon_sp/gimmick/n4r1_boss3_gimmick04" +7549,"mon_sp/gimmick/n4r1_boss3_gimmick05" +7550,"mon_sp/gimmick/n4r1_boss3_gimmick06" +7551,"mon_sp/gimmick/n4r1_boss2_gimmick01" +7552,"mon_sp/gimmick/n4r1_boss2_gimmick02" +7553,"mon_sp/gimmick/n4r1_boss2_gimmick03" +7554,"mon_sp/gimmick/n4r1_boss2_gimmick04" +7555,"mon_sp/gimmick/n4r1_boss2_gimmick05" +7556,"mount_sp/m0605/mon_sp001" +7557,"battle/run_slide_l" +7558,"battle/run_slide_r" +7559,"mon_sp/gimmick/n4r1_boss3_gimmick07" +7560,"mon_sp/gimmick/n4r1_trush_gimmick01" +7561,"mon_sp/common/mon_sph055" 7562,"" 7563,"" 7564,"" 7565,"" 7566,"" -7567,"" -7568,"" -7569,"" -7570,"" -7571,"" -7572,"" -7573,"" +7567,"mount_sp/m0607/mon_sp001" +7568,"mon_sp/gimmick/n4r1_boss1_gimmick01" +7569,"mon_sp/gimmick/n4r1_boss1_gimmick02" +7570,"mon_sp/gimmick/n4r1_boss4_gimmick01" +7571,"mon_sp/gimmick/n4r1_boss4_gimmick02" +7572,"mon_sp/gimmick/n4r1_boss4_gimmick03" +7573,"mon_sp/gimmick/n4r1_boss4_gimmick04" 7574,"" -7575,"" -7576,"" -7577,"" -7578,"" -7579,"" -7580,"" -7581,"" -7582,"" -7583,"" -7584,"" -7585,"" -7586,"" +7575,"mon_sp/gimmick/n4r1_boss4_gimmick05" +7576,"specialpop/specialpop4" +7577,"specialpop/specialdepop4" +7578,"specialpop/specialpop5" +7579,"specialpop/specialdepop5" +7580,"specialpop/specialpop6" +7581,"specialpop/specialdepop6" +7582,"mon_sp/gimmick/n4r1_boss2_gimmick06" +7583,"mon_sp/m0631/mon_sp006" +7584,"mon_sp/m0631/mon_sp007" +7585,"mon_sp/m0631/mon_sp008" +7586,"mon_sp/m0631/mon_sp009" 7587,"" 7588,"" 7589,"" @@ -7735,4 +7735,24 @@ Index, Name 7733,"" 7734,"" 7735,"warp/deactive_warp_start" -7736,"warp/deactive_warp_end" \ No newline at end of file +7736,"warp/deactive_warp_end" +7737,"warp/warp_start" +7738,"warp/warp_start2" +7739,"warp/warp_start3" +7740,"warp/warp_start_no_motion" +7741,"warp/warp_start_no_motion" +7742,"" +7743,"" +7744,"" +7745,"" +7746,"warp/deactive_warp_start" +7747,"warp/warp_end" +7748,"warp/warp_end2" +7749,"warp/warp_end3" +7750,"warp/warp_end_no_motion" +7751,"warp/warp_end_no_motion" +7752,"" +7753,"" +7754,"" +7755,"" +7756,"warp/deactive_warp_end" \ No newline at end of file diff --git a/FFXIVTool/Utility/ThreadWriting.cs b/FFXIVTool/Utility/ThreadWriting.cs index cf131c9..67d2944 100644 --- a/FFXIVTool/Utility/ThreadWriting.cs +++ b/FFXIVTool/Utility/ThreadWriting.cs @@ -280,12 +280,12 @@ private void Worker_DoWork(object sender, DoWorkEventArgs e) } if (CharacterDetails.Emote.freeze) { - if (CharacterDetails.Emote.value > 7736) CharacterDetails.Emote.value = 7736; + if (CharacterDetails.Emote.value > 7756) CharacterDetails.Emote.value = 7756; m.writeBytes(GAS(c.Emote), CharacterDetails.Emote.GetBytes()); } if (CharacterDetails.EmoteOld.freeze) { - if (CharacterDetails.EmoteOld.value > 7736) CharacterDetails.EmoteOld.value = 7736; + if (CharacterDetails.EmoteOld.value > 7756) CharacterDetails.EmoteOld.value = 7756; m.writeBytes(GAS(c.EmoteOld), CharacterDetails.EmoteOld.GetBytes()); } Thread.Sleep(9); diff --git a/FFXIVTool/Views/CharacterDetailsView.xaml b/FFXIVTool/Views/CharacterDetailsView.xaml index c8848f4..9fed259 100644 --- a/FFXIVTool/Views/CharacterDetailsView.xaml +++ b/FFXIVTool/Views/CharacterDetailsView.xaml @@ -209,7 +209,7 @@