merging heads

This commit is contained in:
Yann 2016-01-31 17:46:30 +01:00
commit ab75879fb5
3 changed files with 6 additions and 6 deletions

View file

@ -3,14 +3,14 @@
<PARENT Filename="_armaboss.creature"/> <PARENT Filename="_armaboss.creature"/>
<STRUCT> <STRUCT>
<STRUCT Name="Basics"> <STRUCT Name="Basics">
<ATOM Name="Ecosystem" Value="Forest"/> <ATOM Name="Ecosystem" Value="Prime"/>
<STRUCT Name="Scores"> <STRUCT Name="Scores">
<ATOM Name="HitPoints" Value="default"/> <ATOM Name="HitPoints" Value="default"/>
<ATOM Name="Stamina" Value="default"/> <ATOM Name="Stamina" Value="default"/>
</STRUCT> </STRUCT>
<STRUCT Name="Equipment"> <STRUCT Name="Equipment">
<STRUCT Name="Body"> <STRUCT Name="Body">
<ATOM Name="Texture" Value="Jungle/High Quality/Old"/> <ATOM Name="Texture" Value="Prime/High Quality/Old"/>
</STRUCT> </STRUCT>
</STRUCT> </STRUCT>
</STRUCT> </STRUCT>

View file

@ -2,7 +2,7 @@
<FORM Revision="$Revision: 1.10 $" State="modified"> <FORM Revision="$Revision: 1.10 $" State="modified">
<STRUCT> <STRUCT>
<STRUCT Name="Basics"> <STRUCT Name="Basics">
<ATOM Name="FamilyId" Value="BSDMA"/> <ATOM Name="FamilyId" Value="BSDEA"/>
<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_UP"/> <ATOM Name="Property 0" Value="SP_SPEEDING_UP"/>

View file

@ -2,10 +2,10 @@
<FORM Revision="$Revision: 1.10 $" State="modified"> <FORM Revision="$Revision: 1.10 $" State="modified">
<STRUCT> <STRUCT>
<STRUCT Name="Basics"> <STRUCT Name="Basics">
<ATOM Name="FamilyId" Value="BSDMA"/> <ATOM Name="FamilyId" Value="BSXPA"/>
<ATOM Name="SabrinaCost" Value="0"/> <ATOM Name="SPCost" Value="0"/>
<ATOM Name="LearnRequiresOneOfSkills" Value="SP 0"/> <ATOM Name="LearnRequiresOneOfSkills" Value="SP 0"/>
<ATOM Name="Action Nature" Value="FIGHT"/> <ATOM Name="Action Nature" Value="ACTION"/>
<ATOM Name="Skill" Value="SP"/> <ATOM Name="Skill" Value="SP"/>
<ATOM Name="Level" Value="0"/> <ATOM Name="Level" Value="0"/>
</STRUCT> </STRUCT>