Itms/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Converted many entity property names to CamelCase and added TerritoryRestriction property for buildings. Also moved building-related stuff (foundation, socket and territoryRestriction) inside traits.creation.

Browse Source 
This was SVN commit r4205.
This commit is contained in:
Matei 2006-08-08 03:44:15 +00:00
parent d789c92bd0
commit 235ad34669
28 changed files with 122 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
binaries/data/mods/official/entities/template_entity.xml
View File

@ -27,25 +27,25 @@
</Armour>
<Health>
<Bar_Height>-1.0</Bar_Height>
<Bar_Size>20</Bar_Size>
<Bar_Width>2.0</Bar_Width>
<Regen_Rate>0.2</Regen_Rate>
<Regen_Start>15.0</Regen_Start>
<Decay_Rate>0.2</Decay_Rate>
<BarHeight>-1.0</BarHeight>
<BarSize>20</BarSize>
<BarWidth>2.0</BarWidth>
<RegenRate>0.2</RegenRate>
<RegenStart>15.0</RegenStart>
<DecayRate>0.2</DecayRate>
<Border_Height>7</Border_Height>
<Border_Width>28</Border_Width>
<Border_Name>bar.dds</Border_Name>
<BorderHeight>7</BorderHeight>
<BorderWidth>28</BorderWidth>
<BorderName>bar.dds</BorderName>
</Health>
<Stamina>
<Max>0.0</Max>
<Bar_Height>-1.0</Bar_Height>
<Bar_Size>20</Bar_Size>
<Bar_Width>2.0</Bar_Width>
<Border_Height>7</Border_Height>
<Border_Width>28</Border_Width>
<Border_Name>bar.dds</Border_Name>
<BarHeight>-1.0</BarHeight>
<BarSize>20</BarSize>
<BarWidth>2.0</BarWidth>
<BorderHeight>7</BorderHeight>
<BorderWidth>28</BorderWidth>
<BorderName>bar.dds</BorderName>
</Stamina>
<Rank>
<Width>7.0</Width>
@ -59,10 +59,10 @@
<Width>7.0</Width>
</Rally>
<Flank_Penalty>
<FlankPenalty>
<Sectors>6</Sectors>
<Value>.2</Value>
</Flank_Penalty>
</FlankPenalty>
<Elevation>
<Rate>1.0</Rate>
@ -78,11 +78,11 @@
<Bars>
<Enabled>false</Enabled>
<Border>bar.dds</Border>
<Border_Size>0.15</Border_Size>
<BorderSize>0.15</BorderSize>
</Bars>
</Display>
<Is_Territory_Centre>false</Is_Territory_Centre>
<IsTerritoryCentre>false</IsTerritoryCentre>
</Traits>

4
binaries/data/mods/official/entities/template_foundation.xml
View File

@ -16,8 +16,8 @@
</Id>
<Health>
<Bar_Height>6.0</Bar_Height>
<Regen_Rate>0.0</Regen_Rate>
<BarHeight>6.0</BarHeight>
<RegenRate>0.0</RegenRate>
</Health>
<Display>

3
binaries/data/mods/official/entities/template_structure.xml
View File

@ -18,6 +18,7 @@
</Id>
<Creation>
<TerritoryRestriction>Allied</TerritoryRestriction>
<Time>10</Time>
<Resource>
<Food>0</Food>
@ -27,7 +28,7 @@
</Creation>
<Health>
<Bar_Height>12.0</Bar_Height>
<BarHeight>12.0</BarHeight>
<Repairable />
</Health>

7
binaries/data/mods/official/entities/template_structure_civic_civil_centre.xml
View File

@ -19,9 +19,12 @@
</Id>
<Foundation>foundation_5x5</Foundation>
<Socket>Settlement</Socket>
<Creation>
<TerritoryRestriction>All</TerritoryRestriction>
<Foundation>foundation_5x5</Foundation>
<Socket>Settlement</Socket>
</Creation>
<Footprint>
<Width>24.0</Width>

4
binaries/data/mods/official/entities/template_structure_civic_house.xml
View File

@ -19,7 +19,9 @@
</Id>
<Foundation>foundation_2x2</Foundation>
<Creation>
<Foundation>foundation_2x2</Foundation>
</Creation>
<Footprint>
<Width>9.0</Width>

6
binaries/data/mods/official/entities/template_structure_civic_temple.xml
View File

@ -19,8 +19,10 @@
</Id>
<Foundation>foundation_3x3</Foundation>
<Creation>
<Foundation>foundation_3x3</Foundation>
</Creation>
<Footprint>
<Width>12.0</Width>
<Depth>12.0</Depth>

6
binaries/data/mods/official/entities/template_structure_defense_scout_tower.xml
View File

@ -19,8 +19,10 @@
</Id>
<Foundation>foundation_1x1</Foundation>
<Creation>
<Foundation>foundation_1x1</Foundation>
</Creation>
<Footprint>
<Width>6.0</Width>
<Depth>6.0</Depth>

4
binaries/data/mods/official/entities/template_structure_defense_wall.xml
View File

@ -19,7 +19,9 @@
</Id>
<Foundation>foundation_1x1</Foundation>
<Creation>
<Foundation>foundation_1x1</Foundation>
</Creation>
<Footprint>
<Width>6.0</Width>

4
binaries/data/mods/official/entities/template_structure_defense_wall_gate.xml
View File

@ -19,7 +19,9 @@
</Id>
<Foundation>foundation_1x1</Foundation>
<Creation>
<Foundation>foundation_1x1</Foundation>
</Creation>
<Footprint>
<Width>6.0</Width>

4
binaries/data/mods/official/entities/template_structure_defense_wall_tower.xml
View File

@ -19,7 +19,9 @@
</Id>
<Foundation>foundation_1x1</Foundation>
<Creation>
<Foundation>foundation_1x1</Foundation>
</Creation>
<Footprint>
<Width>6.0</Width>

4
binaries/data/mods/official/entities/template_structure_economic_farmstead.xml
View File

@ -17,7 +17,9 @@
</Id>
<Foundation>foundation_3x3</Foundation>
<Creation>
<Foundation>foundation_3x3</Foundation>
</Creation>
<Footprint>
<Width>12.0</Width>

6
binaries/data/mods/official/entities/template_structure_economic_market.xml
View File

@ -19,8 +19,10 @@
</Id>
<Foundation>foundation_4x4</Foundation>
<Creation>
<Foundation>foundation_4x4</Foundation>
</Creation>
<Footprint>
<Width>18.0</Width>
<Depth>18.0</Depth>

5
binaries/data/mods/official/entities/template_structure_economic_mill.xml
View File

@ -19,7 +19,10 @@
</Id>
<Foundation>foundation_3x3</Foundation>
<Creation>
<TerritoryRestriction>All</TerritoryRestriction>
<Foundation>foundation_3x3</Foundation>
</Creation>
<Footprint>
<Width>12.0</Width>

2
binaries/data/mods/official/entities/template_structure_gaia_settlement.xml
View File

@ -22,7 +22,7 @@
</Id>
<Is_Territory_Centre>true</Is_Territory_Centre>
<IsTerritoryCentre>true</IsTerritoryCentre>
<Footprint>
<Width>24.0</Width>

4
binaries/data/mods/official/entities/template_structure_military_barracks.xml
View File

@ -19,7 +19,9 @@
</Id>
<Foundation>foundation_4x4</Foundation>
<Creation>
<Foundation>foundation_4x4</Foundation>
</Creation>
<Footprint>
<Width>18.0</Width>

4
binaries/data/mods/official/entities/template_structure_military_dock.xml
View File

@ -19,7 +19,9 @@
</Id>
<Foundation>foundation_4x4</Foundation>
<Creation>
<Foundation>foundation_4x4</Foundation>
</Creation>
<Footprint>
<Width>18.0</Width>

4
binaries/data/mods/official/entities/template_structure_military_fortress.xml
View File

@ -19,7 +19,9 @@
</Id>
<Foundation>foundation_5x5</Foundation>
<Creation>
<Foundation>foundation_5x5</Foundation>
</Creation>
<Footprint>
<Width>24.0</Width>

4
binaries/data/mods/official/entities/template_structure_resource_corral.xml
View File

@ -19,7 +19,9 @@
</Id>
<Foundation>foundation_3x3</Foundation>
<Creation>
<Foundation>foundation_3x3</Foundation>
</Creation>
<Footprint>
<Width>12.0</Width>

4
binaries/data/mods/official/entities/template_structure_resource_field.xml
View File

@ -19,7 +19,9 @@
</Id>
<Foundation>foundation_3x3</Foundation>
<Creation>
<Foundation>foundation_3x3</Foundation>
</Creation>
<Footprint>
<Width>12.0</Width>

4
binaries/data/mods/official/entities/template_structure_special.xml
View File

@ -19,7 +19,9 @@
</Id>
<Foundation>foundation_5x5</Foundation>
<Creation>
<Foundation>foundation_5x5</Foundation>
</Creation>
<Footprint>
<Width>24.0</Width>

10
binaries/data/mods/official/entities/template_unit.xml
View File

@ -48,14 +48,14 @@
<Health>
<Max>100</Max>
<Bar_Height>5.0</Bar_Height>
<BarHeight>5.0</BarHeight>
<Bar_Size>20</Bar_Size>
<Healable />
</Health>
<Stamina>
<Max>5.0</Max>
<Bar_Height>5.3</Bar_Height>
<BarHeight>5.3</BarHeight>
<Bar_Size>20</Bar_Size>
</Stamina>
@ -93,11 +93,11 @@
<Range>50.0</Range>
<RangeMin>0.0</RangeMin>
<Regen_Rate>0.1</Regen_Rate>
<Decay_Rate>0.2</Decay_Rate>
<RegenRate>0.1</RegenRate>
<DecayRate>0.2</DecayRate>
</Run>
<Pass_Through_Allies>true</Pass_Through_Allies>
<PassThroughAllies>true</PassThroughAllies>
</Move>
<Patrol />

2
binaries/data/mods/official/entities/template_unit_cavalry.xml
View File

@ -24,7 +24,7 @@
</Footprint>
<Health>
<Regen_Rate>0.2</Regen_Rate>
<RegenRate>0.2</RegenRate>
</Health>
<Stamina>

2
binaries/data/mods/official/entities/template_unit_hero.xml
View File

@ -20,7 +20,7 @@
</Armour>
<Health>
<Regen_Rate>0.2</Regen_Rate>
<RegenRate>0.2</RegenRate>
</Health>
<Loot>

2
binaries/data/mods/official/entities/template_unit_infantry.xml
View File

@ -19,7 +19,7 @@
</Armour>
<Health>
<Regen_Rate>0.2</Regen_Rate>
<RegenRate>0.2</RegenRate>
</Health>
<Loot>

4
binaries/data/mods/official/entities/template_unit_mechanical_ship.xml
View File

@ -23,11 +23,11 @@
</Footprint>
<Health>
<Bar_Height>12.0</Bar_Height>
<BarHeight>12.0</BarHeight>
</Health>
<Stamina>
<Bar_Height>12.3</Bar_Height>
<BarHeight>12.3</BarHeight>
</Stamina>
</Traits>

2
binaries/data/mods/official/entities/template_unit_super.xml
View File

@ -14,7 +14,7 @@
</Id>
<Health>
<Regen_Rate>0.2</Regen_Rate>
<RegenRate>0.2</RegenRate>
</Health>
<Loot>

2
binaries/data/mods/official/entities/template_unit_support.xml
View File

@ -14,7 +14,7 @@
</Id>
<Health>
<Regen_Rate>0.2</Regen_Rate>
<RegenRate>0.2</RegenRate>
</Health>
<Loot>

64
binaries/data/mods/official/scripts/entity_functions.js
View File

@ -106,9 +106,9 @@ function entityInit()
id.civ = building.traits.id.civ;
id.icon_cell = building.traits.id.icon_cell;
this.traits.health.max = building.traits.health.max;
this.build_points = new Object();
this.build_points.curr = 0.0;
this.build_points.max = parseFloat( building.traits.creation.time );
this.buildPoints = new Object();
this.buildPoints.curr = 0.0;
this.buildPoints.max = parseFloat( building.traits.creation.time );
}
// Generate civ code (1st four characters of civ name, in lower case eg "Carthaginians" => "cart").
@ -149,17 +149,17 @@ function entityInit()
if (supply.type && !supply.subType)
supply.subType = supply.type;
// The "dropsite_count" array holds the number of units with gather aura in range of the object;
// The "dropsiteCount" array holds the number of units with gather aura in range of the object;
// this is important so that if you have two mills near something and one of them is destroyed,
// you can still gather from the thing. Initialize it to 0 (ungatherable) for every player unless
// the entity is forageable (e.g. for huntable animals).
var dropsite_count = new Array();
var dropsiteCount = new Array();
initialCount = supply.subType.meat ? 1 : 0;
for( i=0; i<=8; i++ )
{
dropsite_count[i] = initialCount;
dropsiteCount[i] = initialCount;
}
supply.dropsite_count = dropsite_count;
supply.dropsiteCount = dropsiteCount;
}
if (!this.traits.promotion)
@ -186,7 +186,7 @@ function entityInit()
if( this.actions )
{
if ( this.actions.move && this.actions.move.speed )
this.actions.move.speed_curr = this.actions.move.speed;
this.actions.move.speedCurr = this.actions.move.speed;
if( this.actions.attack && this.actions.attack.melee )
{
@ -321,17 +321,17 @@ function entityInitQuasi()
if (supply.type && !supply.subType)
supply.subType = supply.type;
// The "dropsite_count" array holds the number of units with gather aura in range of the object;
// The "dropsiteCount" array holds the number of units with gather aura in range of the object;
// this is important so that if you have two mills near something and one of them is destroyed,
// you can still gather from the thing. Initialize it to 0 (ungatherable) for every player unless
// the entity is forageable (e.g. for huntable animals).
var dropsite_count = new Array();
var dropsiteCount = new Array();
initialCount = supply.subType.meat ? 1 : 0;
for( i=0; i<=8; i++ )
{
dropsite_count[i] = initialCount;
dropsiteCount[i] = initialCount;
}
supply.dropsite_count = dropsite_count;
supply.dropsiteCount = dropsiteCount;
}
stopXTimer(6);
@ -530,7 +530,7 @@ function foundationDestroyed( evt )
{
//console.write( "Hari Seldon made a small calculation error." );
var bp = this.build_points;
var bp = this.buildPoints;
var fractionToReturn = (bp.max - bp.curr) / bp.max;
var resources = getEntityTemplate( this.building, this.player ).traits.creation.resource;
@ -546,7 +546,7 @@ function foundationDestroyed( evt )
function performAttack( evt )
{
this.last_combat_time = getGameTime();
this.lastCombatTime = getGameTime();
var curr_hit = getGUIGlobal().newRandomSound("voice", "hit", this.traits.audio.path);
curr_hit.play();
@ -571,9 +571,9 @@ function performAttack( evt )
}
// Add flank penalty
if(evt.target.traits.flank_penalty)
if(evt.target.traits.flankPenalty)
{
var flank = (evt.target.getAttackDirections()-1)*evt.target.traits.flank_penalty.value;
var flank = (evt.target.getAttackDirections()-1)*evt.target.traits.flankPenalty.value;
dmg.crush += dmg.crush * flank;
dmg.hack += dmg.hack * flank;
dmg.pierce += dmg.pierce * flank;
@ -587,7 +587,7 @@ function performAttack( evt )
function performAttackRanged( evt )
{
this.last_combat_time = getGameTime();
this.lastCombatTime = getGameTime();
// Create a projectile from us, to the target, that will do some damage when it hits them.
dmg = new DamageType();
@ -603,9 +603,9 @@ function performAttackRanged( evt )
dmg.hack += dmg.hack * elevationBonus;
dmg.pierce += dmg.pierce * elevationBonus;
if(evt.target.traits.flank_penalty)
if(evt.target.traits.flankPenalty)
{
var flank = (evt.target.getAttackDirections()-1)*evt.target.traits.flank_penalty.value;
var flank = (evt.target.getAttackDirections()-1)*evt.target.traits.flankPenalty.value;
dmg.crush += dmg.crush * flank;
dmg.hack += dmg.hack * flank;
dmg.pierce += dmg.pierce * flank;
@ -681,7 +681,7 @@ function performGather( evt )
g = this.actions.gather;
s = evt.target.traits.supply;
if( !s.dropsite_count[this.player.id] )
if( !s.dropsiteCount[this.player.id] )
{
// Entity has become ungatherable for us, probably meaning our mill near it was killed; cancel order
evt.preventDefault();
@ -780,7 +780,7 @@ function performBuild( evt )
var t = evt.target;
var b = this.actions.build;
var bp = t.build_points;
var bp = t.buildPoints;
var hp = t.traits.health;
var points = parseFloat( b.rate ) * parseFloat( b.speed ) / 1000.0;
@ -852,7 +852,7 @@ function damage( dmg, inflictor )
{
if(!this.traits.armour) return; // corpses have no armour, everything else should
this.last_combat_time = getGameTime();
this.lastCombatTime = getGameTime();
// Apply armour and work out how much damage we actually take
crushDamage = parseInt(dmg.crush - this.traits.armour.value * this.traits.armour.crush);
@ -1073,15 +1073,15 @@ function entityEventMovement( evt )
{
sector += ((divs+1)/2 - sector)*2;
sector -= (divs+1)/2;
this.actions.move.speed_curr = this.actions.move.speed;
this.actions.move.speed_curr += this.actions.move.speed*this.traits.pitch.value*sector;
this.actions.move.speedCurr = this.actions.move.speed;
this.actions.move.speedCurr += this.actions.move.speed*this.traits.pitch.value*sector;
}
else
{
sector += ((divs)/2 - sector)*2;
sector -= (divs)/2;
this.actions.move.speed_curr = this.actions.move.speed;
this.actions.move.speed_curr += this.actions.move.speed*this.traits.pitch.value*sector;
this.actions.move.speedCurr = this.actions.move.speed;
this.actions.move.speedCurr += this.actions.move.speed*this.traits.pitch.value*sector;
}
}
@ -1726,7 +1726,7 @@ function canGather( source, target )
return ( g && s && g.resource && g.resource[s.type] &&
( s.subType==s.type || g.resource[s.type][s.subType] ) &&
( s.curr > 0 || s.max == 0 ) &&
s.dropsite_count[source.player.id] );
s.dropsiteCount[source.player.id] );
}
// ====================================================================
@ -1826,7 +1826,7 @@ function DropsiteAura( source, types )
if( this.affects( e ) )
{
//console.write( "Dropsite aura: adding +1 for " + this.source.player.id + " on " + e );
e.traits.supply.dropsite_count[this.source.player.id]++;
e.traits.supply.dropsiteCount[this.source.player.id]++;
}
};
@ -1835,7 +1835,7 @@ function DropsiteAura( source, types )
if( this.affects( e ) )
{
//console.write( "Dropsite aura: adding -1 for " + this.source.player.id + " on " + e );
e.traits.supply.dropsite_count[this.source.player.id]--;
e.traits.supply.dropsiteCount[this.source.player.id]--;
}
};
}
@ -1975,7 +1975,7 @@ function TrampleAura( source )
// Check if the target is an enemy foot unit with health and if we were running in the last 3 seconds
var a = this.source.traits.auras.trample;
return ( e.player.id != this.source.player.id && e.traits.health && e.hasClass("Foot")
&& (getGameTime() - this.source.last_run_time < a.duration) );
&& (getGameTime() - this.source.lastRunTime < a.duration) );
}
this.onTick = function( e )
@ -1990,9 +1990,9 @@ function TrampleAura( source )
dmg.pierce = parseInt(a.damage * a.pierce);
// Add flank bonus
if(e.traits.flank_penalty)
if(e.traits.flankPenalty)
{
var flank = (e.getAttackDirections()-1)*e.traits.flank_penalty.value;
var flank = (e.getAttackDirections()-1)*e.traits.flankPenalty.value;
dmg.crush += dmg.crush * flank;
dmg.hack += dmg.hack * flank;
dmg.pierce += dmg.pierce * flank;