Skip to content
This repository has been archived by the owner on Sep 27, 2023. It is now read-only.

Commit

Permalink
Updated Animation List
Browse files Browse the repository at this point in the history
  • Loading branch information
@Khyrou
Khyrou committed Oct 30, 2019
1 parent 8194df9 commit 74b5761
Show file tree
Hide file tree
Showing 4 changed files with 134 additions and 114 deletions.
238 changes: 129 additions & 109 deletions FFXIVTool/Resources/actiontimeline.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,""
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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,""
Expand Down Expand Up @@ -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,""
Expand Down Expand Up @@ -6309,8 +6309,8 @@ Index, Name
6307,""
6308,""
6309,""
6310,""
6311,""
6310,"normal/Toast"
6311,"normal/u_Toast"
6312,""
6313,""
6314,""
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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,""
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -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,""
Expand Down Expand Up @@ -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,""
Expand Down Expand Up @@ -7735,4 +7735,24 @@ Index, Name
7733,""
7734,""
7735,"warp/deactive_warp_start"
7736,"warp/deactive_warp_end"
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"
4 changes: 2 additions & 2 deletions FFXIVTool/Utility/ThreadWriting.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions FFXIVTool/Views/CharacterDetailsView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@
<Button Content="Rotation Panel" Margin="955,162,10,344" Height="23" FontSize="11" Click="RotationPanel_Click" />

<CheckBox IsChecked="{Binding CharacterDetails.Emote.freeze}" Content="Idle Anim:" ToolTip="Changes the Idle Animation of the selected entity.&#xD;&#xA;&#x2022; This can be used both in and out of GPose.&#xD;&#xA;&#x2022; If you plan to use this in GPose, you will need to sit/stand, then use /cpose until your Idle Anim reads '3'&#xD;&#xA;&#x2022; This can be used on Pets, Minions, Chocobos and most NPCs!" HorizontalAlignment="Left" Margin="545,375,0,0" VerticalAlignment="Top" Height="28"/>
<mah:NumericUpDown x:Name="EmoteBox" Maximum="7736" Minimum="1" Value="{Binding CharacterDetails.Emote.value, Mode=TwoWay, NotifyOnSourceUpdated=True, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Left" Margin="654,375,0,0" VerticalAlignment="Top" Width="115" Background="{x:Null}" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource {x:Static SystemColors.ActiveBorderBrushKey}}" TextAlignment="Right" NumericInputMode="Numbers" SourceUpdated="EmoteBox_SourceUpdated" Height="28" FontFamily="Segoe UI" FontSize="11.35"/>
<mah:NumericUpDown x:Name="EmoteBox" Maximum="7756" Minimum="1" Value="{Binding CharacterDetails.Emote.value, Mode=TwoWay, NotifyOnSourceUpdated=True, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Left" Margin="654,375,0,0" VerticalAlignment="Top" Width="115" Background="{x:Null}" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource {x:Static SystemColors.ActiveBorderBrushKey}}" TextAlignment="Right" NumericInputMode="Numbers" SourceUpdated="EmoteBox_SourceUpdated" Height="28" FontFamily="Segoe UI" FontSize="11.35"/>
<Button x:Name="EmoteSearch" Content="View" HorizontalAlignment="Left" Margin="773,375,0,0" VerticalAlignment="Top" Width="65" Height="28" Click="EmoteSearch_Click"/>
<CheckBox IsChecked="{Binding CharacterDetails.FreezeFacial.freeze}" Content="Lock Facial Animation:" ToolTip="Locks the Facial Animation of the selected actor.&#xD;&#xA;&#x2022; To properly lock the facial animation of the selected actor, you need to toggle this on, freeze the option, and then set Anim Speed to Zero." HorizontalAlignment="Left" Margin="545,465,0,0" VerticalAlignment="Top" Height="28"/>
<ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" IsChecked="{Binding CharacterDetails.FreezeFacial.Activated}" Margin="705,467,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Height="28" />
Expand All @@ -231,7 +231,7 @@

<Label x:Name="FrozenPlayaLabel" x:FieldModifier="public" Content="Targeted Actor is ???" HorizontalAlignment="Left" Height="28" Margin="540,495,0,0" VerticalAlignment="Top" Width="260" FontWeight="Bold" FontSize="14"/>
<CheckBox IsChecked="{Binding CharacterDetails.EmoteOld.freeze}" Content="Force Anim:" ToolTip="Forces the selected entity to perform an animation.&#xD;&#xA;&#x2022; This can only be used in GPose.&#xD;&#xA;&#x2022; In order to use this, you need to do a non-looping emote, suchs as /wave before entering GPose.&#xD;&#xA;&#x2022; Some animations have a specific race/gender requirement in order to perform. You may need to use a different Data Path if your character is just twitching.&#xD;&#xA;&#x2022; Does not work on NPCs!" HorizontalAlignment="Left" Margin="545,405,0,0" VerticalAlignment="Top" Height="28"/>
<mah:NumericUpDown x:Name="EmoteBox_Copy" Maximum="7736" Minimum="1" Value="{Binding CharacterDetails.EmoteOld.value, Mode=TwoWay, NotifyOnSourceUpdated=True, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Left" Margin="654,405,0,0" VerticalAlignment="Top" Width="115" Background="{x:Null}" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource {x:Static SystemColors.ActiveBorderBrushKey}}" TextAlignment="Right" NumericInputMode="Numbers" SourceUpdated="EmoteBox_SourceUpdated" Height="28" FontFamily="Segoe UI" FontSize="11.35"/>
<mah:NumericUpDown x:Name="EmoteBox_Copy" Maximum="7756" Minimum="1" Value="{Binding CharacterDetails.EmoteOld.value, Mode=TwoWay, NotifyOnSourceUpdated=True, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Left" Margin="654,405,0,0" VerticalAlignment="Top" Width="115" Background="{x:Null}" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource {x:Static SystemColors.ActiveBorderBrushKey}}" TextAlignment="Right" NumericInputMode="Numbers" SourceUpdated="EmoteBox_SourceUpdated" Height="28" FontFamily="Segoe UI" FontSize="11.35"/>
<Button x:Name="EmoteSearch_Copy" Content="View" HorizontalAlignment="Left" Margin="773,405,0,0" VerticalAlignment="Top" Width="65" Height="28" Click="EmoteOldSearch_Click"/>
<Button x:Name="Setto0" Content="Zero" HorizontalAlignment="Left" Margin="773,435,0,0" VerticalAlignment="Top" Width="65" Height="28" FontSize="14" Click="SetSpeedToZero"/>
<CheckBox IsChecked="{Binding CharacterDetails.DataPath.freeze}" Content="Data Path:" ToolTip="Changes the Data Path of the selected entity. &#xD;&#xA;This will allow you use the animations of other Races or Genders.&#xD;&#xA;&#x2022; Does not require an Actor Refresh, and can be used in and out of GPose.&#xD;&#xA;&#x2022; The entity's skeleton will be morphed to fit the selected race. This stretching or shrinking is unavoidable.&#xD;&#xA;&#x2022; You can use Actor Refresh if you want to become an abomination for fun." HorizontalAlignment="Left" Margin="545,345,0,0" VerticalAlignment="Top" Height="28"/>
Expand Down
2 changes: 1 addition & 1 deletion FFXIVTool/Views/CharacterDetailsView.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,7 @@ private void EmoteBox_SourceUpdated(object sender, DataTransferEventArgs e)
private void Emotexd(object sender, RoutedPropertyChangedEventArgs<double?> e)
{
if (EmoteBox.Value.HasValue)
if (EmoteBox.Value <= 7736) CharacterDetails.Emote.value = (int)EmoteBox.Value;
if (EmoteBox.Value <= 7756) CharacterDetails.Emote.value = (int)EmoteBox.Value;
EmoteBox.ValueChanged -= Emotexd;
}

Expand Down

0 comments on commit 74b5761

Please sign in to comment.