Merge
This commit is contained in:
commit
88f1b8f7e7
6 changed files with 12615 additions and 12593 deletions
|
@ -3173,6 +3173,14 @@
|
||||||
<ATOM Name="Animation" Value="FBT"/>
|
<ATOM Name="Animation" Value="FBT"/>
|
||||||
</STRUCT>
|
</STRUCT>
|
||||||
<STRUCT>
|
<STRUCT>
|
||||||
|
<ATOM Name="Phrase With Target To The Crowd" Value="EMOTE_DRINK_TARGET"/>
|
||||||
|
<ATOM Name="Phrase With Target To The Actor" Value="EMOTE_DRINK_TARGET"/>
|
||||||
|
<ATOM Name="Phrase With Target To The Target" Value="EMOTE_DRINK_TARGET"/>
|
||||||
|
<ATOM Name="Phrase Without Target To The Crowd" Value="EMOTE_DRINK_NOBODY"/>
|
||||||
|
<ATOM Name="Phrase Without Target To The Actor" Value="EMOTE_DRINK_NOBODY"/>
|
||||||
|
<ATOM Name="Phrase Self Target To The Actor" Value="EMOTE_DRINK_SELF"/>
|
||||||
|
<ATOM Name="Phrase Self Target To The Crowd" Value="EMOTE_DRINK_SELF"/>
|
||||||
|
<ATOM Name="Access Path" Value="uiEM_Emotes|uiEM_NegGes|uiEM_Drink"/>
|
||||||
<ATOM Name="EmoteId" Value="drink"/>
|
<ATOM Name="EmoteId" Value="drink"/>
|
||||||
<ATOM Name="Animation" Value="drink"/>
|
<ATOM Name="Animation" Value="drink"/>
|
||||||
</STRUCT>
|
</STRUCT>
|
||||||
|
|
|
@ -5,8 +5,9 @@
|
||||||
<ATOM Name="FamilyId" Value="BSDMA"/>
|
<ATOM Name="FamilyId" Value="BSDMA"/>
|
||||||
<ATOM Name="SabrinaCost" Value="0"/>
|
<ATOM Name="SabrinaCost" Value="0"/>
|
||||||
<ATOM Name="SPCost" Value="0"/>
|
<ATOM Name="SPCost" Value="0"/>
|
||||||
<ATOM Name="Property 0" Value="SP: speeding"/>
|
<ATOM Name="Property 0" Value="SpeedMod:50"/> //powerType
|
||||||
<ATOM Name="Property 1" Value="SP_SPEEDING_UP:30"/>
|
<ATOM Name="Property 1" Value="DisableTime:10"/> // temps en minutes
|
||||||
|
<ATOM Name="Property 2" Value="Duration:30"/> //temps en seconde
|
||||||
<ATOM Name="LearnRequiresOneOfSkills" Value="SP 0"/>
|
<ATOM Name="LearnRequiresOneOfSkills" Value="SP 0"/>
|
||||||
<ATOM Name="Skill" Value="UNKNOWN"/>
|
<ATOM Name="Skill" Value="UNKNOWN"/>
|
||||||
</STRUCT>
|
</STRUCT>
|
||||||
|
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -701,6 +701,7 @@ uiEM_Worried [WORRIED]
|
||||||
uiEM_Wounded [WOUNDED]
|
uiEM_Wounded [WOUNDED]
|
||||||
uiEM_Yawn [YAWN]
|
uiEM_Yawn [YAWN]
|
||||||
uiEM_Youandme [YOU AND ME]
|
uiEM_Youandme [YOU AND ME]
|
||||||
|
uiEM_Drink [BOIRE]
|
||||||
uimInfos [Info]
|
uimInfos [Info]
|
||||||
uiCombatTitle [COMBAT]
|
uiCombatTitle [COMBAT]
|
||||||
uiDesertRawMats [Desert Exotic Raw Materials]
|
uiDesertRawMats [Desert Exotic Raw Materials]
|
||||||
|
|
Loading…
Reference in a new issue