Merge branch 'release/0.3'

Doc/Example/HTML.texportf

@@ -9,6 +9,7 @@
 	  <tr>
 		<th>Unit</th>
 		<th>Acceleration</th>
+        <th>Allowed Targets</th>
 		<th>Armor Type</th>
 		<th>Attack Damage</th>
 		<th>Attack Range</th>

Doc/Example/HTML.texportl

@@ -0,0 +1,3 @@
+      <td>
+        $FIELD_VALUE$
+      </td>

Doc/Example/HTML.texportld

@@ -0,0 +1 @@
+, 

Doc/Example/HTML.texportli

@@ -0,0 +1 @@
+$LIST_ITEM$

Doc/Example/JSON.texportl

@@ -0,0 +1 @@
+        "$FIELD_ID$": [$FIELD_VALUE$]

Doc/Example/JSON.texportld

@@ -0,0 +1 @@
+, 

Doc/Example/JSON.texportli

@@ -0,0 +1 @@
+"$LIST_ITEM$"

Doc/Example/Slash XML.texportl

@@ -0,0 +1,6 @@
+        <Attribute keyType="System.String" valueType="System.Collections.Generic.List`1[[$FIELD_TYPE$]]">
+          <Key>$FIELD_ID$</Key>
+          <Value>
+$FIELD_VALUE$
+          </Value>
+        </Attribute>

Doc/Example/Slash XML.texportld

@@ -0,0 +1 @@
+

Doc/Example/Slash XML.texportli

@@ -0,0 +1,3 @@
+            <$FIELD_TYPE$>
+              $LIST_ITEM$
+            </$FIELD_TYPE$>

Doc/Example/StarCraft II XML.texportl

@@ -0,0 +1 @@
+$FIELD_VALUE$

Doc/Example/StarCraft II XML.texportld

@@ -0,0 +1 @@
+

Doc/Example/StarCraft II XML.texportli

@@ -0,0 +1 @@
+        <$FIELD_ID$ value="$LIST_ITEM$"/>

Doc/Example/Tome Example Project.tdata

@@ -2,6 +2,10 @@
 <Records>
     <Record Id="Archer" DisplayName="Archer">
         <Acceleration Value="5"/>
+        <AllowedTargets>
+            <Item Value="Air"/>
+            <Item Value="Ground"/>
+        </AllowedTargets>
         <ArmorType Value="Leather"/>
         <AttackDamage Value="8"/>
         <AttackRange Value="8"/>
@@ -33,6 +37,9 @@
     </Record>
     <Record Id="Knight" DisplayName="Knight">
         <Acceleration Value="8"/>
+        <AllowedTargets>
+            <Item Value="Ground"/>
+        </AllowedTargets>
         <ArmorType Value="Mail"/>
         <AttackDamage Value="7"/>
         <AttackRange Value="1"/>
@@ -46,14 +53,18 @@
         <Mass Value="2.5"/>
         <MovementSpeed Value="20"/>
         <Name Value="Knight"/>
-        <Projectile Value=""/>
+        <Projectile/>
         <RotationSpeed Value="360"/>
         <SightRadius Value="25"/>
         <Sprite Value="Sprites/Knight"/>
         <SpriteColor Value="#FFFFFFFF"/>
     </Record>
     <Record Id="Mage" DisplayName="Mage">
         <Acceleration Value="4"/>
+        <AllowedTargets>
+            <Item Value="Air"/>
+            <Item Value="Ground"/>
+        </AllowedTargets>
         <ArmorType Value="Cloth"/>
         <AttackDamage Value="10"/>
         <AttackRange Value="6"/>
@@ -75,6 +86,9 @@
     </Record>
     <Record Id="Peasant" DisplayName="Peasant">
         <Acceleration Value="4.5"/>
+        <AllowedTargets>
+            <Item Value="Ground"/>
+        </AllowedTargets>
         <ArmorType Value="Cloth"/>
         <AttackDamage Value="5"/>
         <AttackRange Value="1"/>
@@ -88,7 +102,7 @@
         <Mass Value="1"/>
         <MovementSpeed Value="12.75"/>
         <Name Value="Peasant"/>
-        <Projectile Value=""/>
+        <Projectile/>
         <RotationSpeed Value="360"/>
         <SightRadius Value="20"/>
         <Sprite Value="Sprites/Peasant"/>

Doc/Example/Tome Example Project.tfields

@@ -1,22 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Fields>
-    <Field Id="Acceleration" DisplayName="Acceleration" Description="Acceleration of this entity, in m/s²." DefaultValue="4.500" Type="Real" Component="PhysicsComponent"/>
-    <Field Id="ArmorType" DisplayName="Armor Type" Description="Type of the armor of this entity. Affects actual damage taken by enemy attacks, depending on the attacker's damage type." DefaultValue="Cloth" Type="Armor Type" Component="ArmorComponent"/>
-    <Field Id="AttackDamage" DisplayName="Attack Damage" Description="Damage dealt by every attack of this entity. Affected by its damage type and the defender's armor type." DefaultValue="12" Type="Integer" Component="AttackComponent"/>
-    <Field Id="AttackRange" DisplayName="Attack Range" Description="Range of attack of this entity, in m." DefaultValue="18.250" Type="Real" Component="RangeComponent"/>
-    <Field Id="Cooldown" DisplayName="Cooldown" Description="Time between two attacks of this entity, in seconds." DefaultValue="1.200" Type="Real" Component="AttackComponent"/>
-    <Field Id="DamageType" DisplayName="Damage Type" Description="Type of the damage dealt by this entity. Affects actual damage dealt by its attacks, depending on the target's armor type." DefaultValue="Normal" Type="Damage Type" Component="AttackComponent"/>
-    <Field Id="Health" DisplayName="Health" Description="Maximum health of this entity. If reduced to zero, it dies." DefaultValue="200" Type="Integer" Component="HealthComponent"/>
-    <Field Id="HealthRegeneration" DisplayName="Health Regeneration" Description="Health regeneration rate of this entity, in health / second." DefaultValue="0" Type="Integer" Component="HealthComponent"/>
-    <Field Id="Invulnerable" DisplayName="Invulnerable" Description="Whether this entity can take damage and be targeted, or not." DefaultValue="False" Type="Boolean" Component="InvulnerabilityComponent"/>
-    <Field Id="Mana" DisplayName="Mana" Description="Maximum mana of this entity. Regenerates automatically. Required for most spells." DefaultValue="100" Type="Integer" Component="ManaComponent"/>
-    <Field Id="MP5" DisplayName="Mana Regeneration" Description="Mana regeneration rate of this entity, in mana / 5 seconds." DefaultValue="3" Type="Integer" Component="ManaComponent"/>
-    <Field Id="Mass" DisplayName="Mass" Description="Mass of this entity, in kg. Affects physics and collision separation." DefaultValue="1.000" Type="Real" Component="PhysicsComponent"/>
-    <Field Id="MovementSpeed" DisplayName="Movement Speed" Description="Speed of this entity, in m/s." DefaultValue="12.750" Type="Real" Component="PhysicsComponent"/>
-    <Field Id="Name" DisplayName="Name" Description="Name of this entity." DefaultValue="" Type="String" Component="NameComponent"/>
-    <Field Id="Projectile" DisplayName="Projectile" Description="Type of the projectile fired by this entity when attacking." DefaultValue="" Type="Reference" Component="AttackComponent"/>
-    <Field Id="RotationSpeed" DisplayName="Rotation Speed" Description="Rotation speed of this entity, in degrees / second." DefaultValue="360.000" Type="Real" Component="PhysicsComponent"/>
-    <Field Id="SightRadius" DisplayName="Sight Radius" Description="Range of sight of this entity, in m." DefaultValue="25.000" Type="Real" Component="SightComponent"/>
-    <Field Id="Sprite" DisplayName="Sprite" Description="Name of the sprite used to visualize this entity." DefaultValue="" Type="String" Component="VisualizationComponent"/>
-    <Field Id="SpriteColor" DisplayName="SpriteColor" Description="Color to render the sprite of this entity with." DefaultValue="#ffffffff" Type="Color" Component="VisualizationComponent"/>
+    <Field Id="Acceleration" DisplayName="Acceleration" Description="Acceleration of this entity, in m/s²." Type="Real" Component="PhysicsComponent" DefaultValue="4.500"/>
+    <Field Id="AllowedTargets" DisplayName="Allowed Targets" Description="Targets that can be acquired by this entity." Type="Movement Types" Component="AttackComponent">
+        <DefaultValue Value="Ground"/>
+    </Field>
+    <Field Id="ArmorType" DisplayName="Armor Type" Description="Type of the armor of this entity. Affects actual damage taken by enemy attacks, depending on the attacker's damage type." Type="Armor Type" Component="ArmorComponent" DefaultValue="Cloth"/>
+    <Field Id="AttackDamage" DisplayName="Attack Damage" Description="Damage dealt by every attack of this entity. Affected by its damage type and the defender's armor type." Type="Integer" Component="AttackComponent" DefaultValue="12"/>
+    <Field Id="AttackRange" DisplayName="Attack Range" Description="Range of attack of this entity, in m." Type="Real" Component="RangeComponent" DefaultValue="18.250"/>
+    <Field Id="Cooldown" DisplayName="Cooldown" Description="Time between two attacks of this entity, in seconds." Type="Real" Component="AttackComponent" DefaultValue="1.200"/>
+    <Field Id="DamageType" DisplayName="Damage Type" Description="Type of the damage dealt by this entity. Affects actual damage dealt by its attacks, depending on the target's armor type." Type="Damage Type" Component="AttackComponent" DefaultValue="Normal"/>
+    <Field Id="Health" DisplayName="Health" Description="Maximum health of this entity. If reduced to zero, it dies." Type="Integer" Component="HealthComponent" DefaultValue="200"/>
+    <Field Id="HealthRegeneration" DisplayName="Health Regeneration" Description="Health regeneration rate of this entity, in health / second." Type="Integer" Component="HealthComponent" DefaultValue="0"/>
+    <Field Id="Invulnerable" DisplayName="Invulnerable" Description="Whether this entity can take damage and be targeted, or not." Type="Boolean" Component="InvulnerabilityComponent" DefaultValue="False"/>
+    <Field Id="Mana" DisplayName="Mana" Description="Maximum mana of this entity. Regenerates automatically. Required for most spells." Type="Integer" Component="ManaComponent" DefaultValue="100"/>
+    <Field Id="MP5" DisplayName="Mana Regeneration" Description="Mana regeneration rate of this entity, in mana / 5 seconds." Type="Integer" Component="ManaComponent" DefaultValue="3"/>
+    <Field Id="Mass" DisplayName="Mass" Description="Mass of this entity, in kg. Affects physics and collision separation." Type="Real" Component="PhysicsComponent" DefaultValue="1.000"/>
+    <Field Id="MovementSpeed" DisplayName="Movement Speed" Description="Speed of this entity, in m/s." Type="Real" Component="PhysicsComponent" DefaultValue="12.750"/>
+    <Field Id="Name" DisplayName="Name" Description="Name of this entity." Type="String" Component="NameComponent" DefaultValue=""/>
+    <Field Id="Projectile" DisplayName="Projectile" Description="Type of the projectile fired by this entity when attacking." Type="Reference" Component="AttackComponent" DefaultValue=""/>
+    <Field Id="RotationSpeed" DisplayName="Rotation Speed" Description="Rotation speed of this entity, in degrees / second." Type="Real" Component="PhysicsComponent" DefaultValue="360.000"/>
+    <Field Id="SightRadius" DisplayName="Sight Radius" Description="Range of sight of this entity, in m." Type="Real" Component="SightComponent" DefaultValue="25.000"/>
+    <Field Id="Sprite" DisplayName="Sprite" Description="Name of the sprite used to visualize this entity." Type="String" Component="VisualizationComponent" DefaultValue=""/>
+    <Field Id="SpriteColor" DisplayName="Sprite Color" Description="Color to render the sprite of this entity with." Type="Color" Component="VisualizationComponent" DefaultValue="#ffffff"/>
 </Fields>

Doc/Example/Tome Example Project.tproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<TomeProject>
+<TomeProject Version="1">
     <Name>Tome Example Project</Name>
     <Components>
         <Name>ArmorComponent</Name>
@@ -34,14 +34,15 @@
             <Name>Slash XML</Name>
             <FileExtension>.blueprints.xml</FileExtension>
             <TypeMap>
+                <Mapping TomeType="Armor Type" ExportedType="FantasyGame.Data.ArmorType"/>
                 <Mapping TomeType="Boolean" ExportedType="System.Boolean"/>
                 <Mapping TomeType="Color" ExportedType="System.String"/>
+                <Mapping TomeType="Damage Type" ExportedType="FantasyGame.Data.DamageType"/>
                 <Mapping TomeType="Integer" ExportedType="System.Int32"/>
+                <Mapping TomeType="Movement Type" ExportedType="FantasyGame.Data.MovementType"/>
                 <Mapping TomeType="Real" ExportedType="System.Single"/>
                 <Mapping TomeType="Reference" ExportedType="System.String"/>
                 <Mapping TomeType="String" ExportedType="System.String"/>
-                <Mapping TomeType="Armor Type" ExportedType="FantasyGame.Data.ArmorType"/>
-                <Mapping TomeType="Damage Type" ExportedType="FantasyGame.Data.DamageType"/>
             </TypeMap>
         </Template>
         <Template>
@@ -51,15 +52,25 @@
         </Template>
     </RecordExportTemplates>
     <Types>
-        <Type Name="Armor Type" BaseType="String">
+        <Type Name="Armor Type">
             <Restrictions>
                 <Restriction Key="Enumeration" Value="Cloth;Leather;Mail"/>
             </Restrictions>
         </Type>
-        <Type Name="Damage Type" BaseType="String">
+        <Type Name="Damage Type">
             <Restrictions>
                 <Restriction Key="Enumeration" Value="Magic;Normal;Pierce"/>
             </Restrictions>
         </Type>
+        <Type Name="Movement Type">
+            <Restrictions>
+                <Restriction Key="Enumeration" Value="Air;Ground"/>
+            </Restrictions>
+        </Type>
+        <Type Name="Movement Types">
+            <Restrictions>
+                <Restriction Key="ItemType" Value="Movement Type"/>
+            </Restrictions>
+        </Type>
     </Types>
 </TomeProject>