Merge entity templates, removing two templates with non descriptive names.

Patch by: @Nescio
Discussed with: @elexis

Differential Revision: https://code.wildfiregames.com/D1734
This was SVN commit r22061.
This commit is contained in:
Stan
2019-01-19 12:47:39 +00:00
parent 14810ca5bf
commit 0d00866c8f
6 changed files with 46 additions and 33 deletions
@@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity>
<AIProxy/>
<Looter/>
<Ownership/>
<Position>
<Altitude>0</Altitude>
<Anchor>upright</Anchor>
<Floating>false</Floating>
<FloatDepth>0.0</FloatDepth>
<TurnRate>6.0</TurnRate>
</Position>
<Selectable/>
</Entity>
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity>
<AIProxy/>
<Ownership/>
<Position>
<Altitude>0</Altitude>
<Anchor>upright</Anchor>
<Floating>false</Floating>
<FloatDepth>0.0</FloatDepth>
<TurnRate>6.0</TurnRate>
</Position>
<Selectable>
<EditorOnly/>
</Selectable>
</Entity>
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_entity_quasi">
<Entity>
<AIProxy/>
<Fogging/>
<Identity>
<Civ>gaia</Civ>
@@ -17,6 +18,17 @@
<DeleteUponConstruction>false</DeleteUponConstruction>
</Obstruction>
<OverlayRenderer/>
<Ownership/>
<Position>
<Altitude>0</Altitude>
<Anchor>upright</Anchor>
<Floating>false</Floating>
<FloatDepth>0.0</FloatDepth>
<TurnRate>6.0</TurnRate>
</Position>
<Selectable>
<EditorOnly/>
</Selectable>
<StatusBars>
<BarWidth>2.0</BarWidth>
<BarHeight>0.333</BarHeight>
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_entity_full">
<Entity>
<AIProxy/>
<Armour>
<Hack>1</Hack>
<Pierce>1</Pierce>
@@ -68,6 +69,7 @@
<stone>0</stone>
<metal>0</metal>
</Loot>
<Looter/>
<Minimap>
<Type>structure</Type>
</Minimap>
@@ -82,6 +84,14 @@
<DeleteUponConstruction>false</DeleteUponConstruction>
</Obstruction>
<OverlayRenderer/>
<Ownership/>
<Position>
<Altitude>0</Altitude>
<Anchor>upright</Anchor>
<Floating>false</Floating>
<FloatDepth>0.0</FloatDepth>
<TurnRate>6.0</TurnRate>
</Position>
<ProductionQueue>
<TechCostMultiplier>
<food>1.0</food>
@@ -1,11 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_entity_quasi">
<Entity>
<AIProxy/>
<Footprint>
<Circle radius="2.0"/>
<Height>8.0</Height>
</Footprint>
<OverlayRenderer/>
<Ownership/>
<Position>
<Altitude>0</Altitude>
<Anchor>upright</Anchor>
<Floating>false</Floating>
<FloatDepth>0.0</FloatDepth>
<TurnRate>6.0</TurnRate>
</Position>
<Selectable>
<EditorOnly/>
<Overlay>
<Outline>
<LineTexture>outline_border.png</LineTexture>
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_entity_full">
<Entity>
<AIProxy/>
<Armour>
<Hack>1</Hack>
<Pierce>1</Pierce>
@@ -52,6 +53,7 @@
</Formations>
<Undeletable>false</Undeletable>
</Identity>
<Looter/>
<Minimap>
<Type>unit</Type>
</Minimap>
@@ -67,6 +69,14 @@
<DeleteUponConstruction>false</DeleteUponConstruction>
</Obstruction>
<OverlayRenderer/>
<Ownership/>
<Position>
<Altitude>0</Altitude>
<Anchor>upright</Anchor>
<Floating>false</Floating>
<FloatDepth>0.0</FloatDepth>
<TurnRate>6.0</TurnRate>
</Position>
<RangeOverlayManager/>
<RangeOverlayRenderer/>
<ResourceGatherer>