gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Rename nuba -> noba.

Browse Source 
Also renames clubman to maceman.

Patch by: @Nescio
Differential Revision: D3018
This was SVN commit r24207.
This commit is contained in:
Freagarach
2020-11-18 20:13:30 +00:00
parent 0cbd07b455
commit 2dd223af29
15 changed files with 44 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/maps/random/jebel_barkal.js
+7 -7
View File
@@ -72,8 +72,8 @@ const oTower = g_MapSettings.Size >= 256 && getDifficulty() >= 3 ? "structures/k
const oHouse = "structures/kush_house";
const oMarket = "structures/kush_market";
const oForge = "structures/kush_forge";
const oBlemmyeCamp = "structures/kush_blemmye_camp";
const oNubaVillage = "structures/kush_nuba_village";
const oBlemmyeCamp = "structures/kush_camp_blemmye";
const oNobaCamp = "structures/kush_camp_noba";
const oCivicCenter = "structures/kush_civil_centre";
const oBarracks = "structures/kush_barracks";
const oStable = "structures/kush_stable";
@@ -187,7 +187,7 @@ const clElephantStables = g_Map.createTileClass();
const clCivicCenter = g_Map.createTileClass();
const clBarracks = g_Map.createTileClass();
const clBlemmyeCamp = g_Map.createTileClass();
const clNubaVillage = g_Map.createTileClass();
const clNobaCamp = g_Map.createTileClass();
const clMarket = g_Map.createTileClass();
const clDecorative = g_Map.createTileClass();
@@ -306,10 +306,10 @@ const layoutKushCity = [
"painters": new TileClassPainter(clForge)
},
{
"templateName": oNubaVillage,
"templateName": oNobaCamp,
"difficulty": "Easy",
"constraints": avoidClasses(clNubaVillage, 30),
"painters": new TileClassPainter(clNubaVillage)
"constraints": avoidClasses(clNobaCamp, 30),
"painters": new TileClassPainter(clNobaCamp)
},
{
"templateName": oBlemmyeCamp,
@@ -1067,7 +1067,7 @@ var areaCityBushes =
clCivicCenter, 1,
clBarracks, 1,
clBlemmyeCamp, 1,
clNubaVillage, 1,
clNobaCamp, 1,
clMarket, 1)
]);
binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/simulation/ai/petra/config.js
+2 -2
View File
@@ -75,8 +75,8 @@ PETRA.Config = function(difficulty, behavior)
"structures/{civ}_monument"
],
"kush": [
"structures/{civ}_blemmye_camp",
"structures/{civ}_nuba_village",
"structures/{civ}_camp_blemmye",
"structures/{civ}_camp_noba",
"structures/{civ}_pyramid_large",
"structures/{civ}_pyramid_small",
"structures/{civ}_temple_amun"
binaries/data/mods/public/simulation/components/Identity.js
+1 -1
View File
@@ -65,7 +65,7 @@ Identity.prototype.Schema =
"</element>" +
"</optional>" +
"<optional>" +
"<element name='VisibleClasses' a:help='Optional list of space-separated classes applying to this entity. These classes will also be visible in various GUI elements. If the classes need spaces, underscores will be replaced with spaces. Choices include: Amphitheater, Archer, ArmyCamp, Arsenal, ArtilleryTower, Axeman, Barracks, Bireme, BoltShooter, BoltTower, Bribable, Camel, Cavalry, Champion, Chariot, Citizen, City, Civic, CivilCentre, Clubman, Colony, Corral, Council, Crossbowman, Defensive, Dock, Dog, Economic, Elephant, ElephantStable, Embassy, Farmstead, Field, Fireship, FishingBoat, Forge, Fortress, Gate, Gladiator, Gymnasium, Hall, Healer, Hero, House, Infantry, IshtarGate, Javelineer, Library, Lighthouse, Maceman, Melee, Market, Mercenary, Military, Monument, Naval, Outpost, Palace, Palisade, Pikeman, Pillar, Pyramid, Quinquereme, Ram, Range, Ranged, Relic, Resource, RotaryMill, SentryTower, Ship, Shipyard, Siege, SiegeTower, SiegeWall, Slave, Slinger, Soldier, Spearman, Stable, Stoa, StoneThrower, StoneTower, Storehouse, Support, Swordsman, Syssiton, Temple, TempleOfAmun, TempleOfApedemak, TempleOfMars, TempleOfVesta, Theater, Tower, Town, Trade, Trader, Trireme, TriumphalArch, Village, Wall, Warship, Wonder, Worker.'>" +
"<element name='VisibleClasses' a:help='Optional list of space-separated classes applying to this entity. These classes will also be visible in various GUI elements. If the classes need spaces, underscores will be replaced with spaces. Choices include: Amphitheater, Archer, ArmyCamp, Arsenal, ArtilleryTower, Axeman, Barracks, Bireme, BoltShooter, BoltTower, Bribable, Camel, Cavalry, Champion, Chariot, Citizen, City, Civic, CivilCentre, Colony, Corral, Council, Crossbowman, Defensive, Dock, Dog, Economic, Elephant, ElephantStable, Embassy, Farmstead, Field, Fireship, FishingBoat, Forge, Fortress, Gate, Gladiator, Gymnasium, Hall, Healer, Hero, House, Infantry, IshtarGate, Javelineer, Library, Lighthouse, Maceman, Melee, Market, Mercenary, Military, Monument, Naval, Outpost, Palace, Palisade, Pikeman, Pillar, Pyramid, Quinquereme, Ram, Range, Ranged, Relic, Resource, RotaryMill, SentryTower, Ship, Shipyard, Siege, SiegeTower, SiegeWall, Slave, Slinger, Soldier, Spearman, Stable, Stoa, StoneThrower, StoneTower, Storehouse, Support, Swordsman, Syssiton, Temple, TempleOfAmun, TempleOfApedemak, TempleOfMars, TempleOfVesta, Theater, Tower, Town, Trade, Trader, Trireme, TriumphalArch, Village, Wall, Warship, Wonder, Worker.'>" +
"<attribute name='datatype'>" +
"<value>tokens</value>" +
"</attribute>" +
binaries/data/mods/public/simulation/templates/structures/kush_blemmye_camp.xml → binaries/data/mods/public/simulation/templates/structures/kush_camp_blemmye.xml
+1 -2
View File
@@ -20,8 +20,7 @@
<Identity>
<Civ>kush</Civ>
<GenericName>Blemmye Camp</GenericName>
<SpecificName>Blemmye Camp</SpecificName>
<Tooltip>Train Blemmye Desert Raiders.</Tooltip>
<Tooltip>Train Blemmye Mercenaries.</Tooltip>
<Icon>structures/mercenary_camp.png</Icon>
</Identity>
<Loot>
binaries/data/mods/public/simulation/templates/structures/kush_nuba_village.xml → binaries/data/mods/public/simulation/templates/structures/kush_camp_noba.xml
+3 -4
View File
@@ -19,9 +19,8 @@
</Health>
<Identity>
<Civ>kush</Civ>
<GenericName>Nuba Village</GenericName>
<SpecificName>Nuba Village</SpecificName>
<Tooltip>Train the Nuba Clubman and Nuba Hunter.</Tooltip>
<GenericName>Noba Village</GenericName>
<Tooltip>Train Noba Mercenaries.</Tooltip>
<Icon>structures/mercenary_camp.png</Icon>
</Identity>
<Loot>
@@ -33,7 +32,7 @@
</Obstruction>
<ProductionQueue>
<Entities datatype="tokens">
units/{native}_infantry_clubman_b
units/{native}_infantry_maceman_merc_b
units/{native}_infantry_javelineer_merc_b
</Entities>
</ProductionQueue>
binaries/data/mods/public/simulation/templates/units/kush_infantry_archer_b.xml
+2 -2
View File
@@ -5,8 +5,8 @@
structures/kush_pyramid_small
structures/kush_pyramid_large
structures/kush_temple_amun
structures/kush_blemmye_camp
structures/kush_nuba_village
structures/kush_camp_blemmye
structures/kush_camp_noba
</Entities>
</Builder>
<Identity>
binaries/data/mods/public/simulation/templates/units/kush_infantry_javelineer_merc_b.xml
+6 -6
View File
@@ -2,11 +2,11 @@
<Entity parent="template_unit_infantry_ranged_javelineer">
<Builder>
<Entities datatype="tokens">
structures/{civ}_pyramid_small
structures/{civ}_pyramid_large
structures/{civ}_temple_amun
structures/{civ}_blemmye_camp
structures/{civ}_nuba_village
structures/kush_pyramid_small
structures/kush_pyramid_large
structures/kush_temple_amun
structures/kush_camp_blemmye
structures/kush_camp_noba
</Entities>
</Builder>
<Cost>
@@ -20,7 +20,7 @@
<Lang>napatan</Lang>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<SelectionGroupName>units/kush_infantry_javelineer_merc_b</SelectionGroupName>
<GenericName>Nuba Skirmisher</GenericName>
<GenericName>Noba Skirmisher</GenericName>
<SpecificName>nhw ʿhȝw Noba</SpecificName>
<Icon>units/kush_infantry_javelinist.png</Icon>
<RequiredTechnology>phase_town</RequiredTechnology>
binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_a.xml → binaries/data/mods/public/simulation/templates/units/kush_infantry_maceman_merc_a.xml
+2 -2
View File
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="units/kush_infantry_clubman_b">
<Entity parent="units/kush_infantry_maceman_merc_b">
<Identity>
<Rank>Advanced</Rank>
</Identity>
<Promotion>
<Entity>units/kush_infantry_clubman_e</Entity>
<Entity>units/kush_infantry_maceman_merc_e</Entity>
</Promotion>
<VisualActor>
<Actor>units/kushites/infantry_clubman_a.xml</Actor>
binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml → binaries/data/mods/public/simulation/templates/units/kush_infantry_maceman_merc_b.xml
+9 -9
View File
@@ -10,11 +10,11 @@
</Attack>
<Builder>
<Entities datatype="tokens">
structures/{civ}_pyramid_small
structures/{civ}_pyramid_large
structures/{civ}_temple_amun
structures/{civ}_blemmye_camp
structures/{civ}_nuba_village
structures/kush_pyramid_small
structures/kush_pyramid_large
structures/kush_temple_amun
structures/kush_camp_blemmye
structures/kush_camp_noba
</Entities>
</Builder>
<Cost>
@@ -26,15 +26,15 @@
<Identity>
<Civ>kush</Civ>
<Lang>napatan</Lang>
<VisibleClasses datatype="tokens">-Swordsman Clubman Mercenary</VisibleClasses>
<SelectionGroupName>units/kush_infantry_clubman_b</SelectionGroupName>
<GenericName>Nuba Clubman</GenericName>
<VisibleClasses datatype="tokens">-Swordsman Macemen Mercenary</VisibleClasses>
<SelectionGroupName>units/kush_infantry_maceman_b</SelectionGroupName>
<GenericName>Noba Maceman</GenericName>
<SpecificName>nhw Noba</SpecificName>
<Icon>units/kush_infantry_clubman.png</Icon>
<RequiredTechnology>phase_town</RequiredTechnology>
</Identity>
<Promotion>
<Entity>units/kush_infantry_clubman_a</Entity>
<Entity>units/kush_infantry_maceman_a</Entity>
</Promotion>
<Resistance>
<Entity>
binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_e.xml → binaries/data/mods/public/simulation/templates/units/kush_infantry_maceman_merc_e.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="units/kush_infantry_clubman_a">
<Entity parent="units/kush_infantry_maceman_merc_a">
<Identity>
<Rank>Elite</Rank>
</Identity>
binaries/data/mods/public/simulation/templates/units/kush_infantry_pikeman_b.xml
+2 -2
View File
@@ -5,8 +5,8 @@
structures/kush_pyramid_small
structures/kush_pyramid_large
structures/kush_temple_amun
structures/kush_blemmye_camp
structures/kush_nuba_village
structures/kush_camp_blemmye
structures/kush_camp_noba
</Entities>
</Builder>
<Identity>
binaries/data/mods/public/simulation/templates/units/kush_infantry_spearman_b.xml
+2 -2
View File
@@ -5,8 +5,8 @@
structures/kush_pyramid_small
structures/kush_pyramid_large
structures/kush_temple_amun
structures/kush_blemmye_camp
structures/kush_nuba_village
structures/kush_camp_blemmye
structures/kush_camp_noba
</Entities>
</Builder>
<Identity>
binaries/data/mods/public/simulation/templates/units/kush_infantry_swordsman_b.xml
+2 -2
View File
@@ -5,8 +5,8 @@
structures/kush_pyramid_small
structures/kush_pyramid_large
structures/kush_temple_amun
structures/kush_blemmye_camp
structures/kush_nuba_village
structures/kush_camp_blemmye
structures/kush_camp_noba
</Entities>
</Builder>
<Identity>
binaries/data/mods/public/simulation/templates/units/kush_support_female_citizen.xml
+2 -2
View File
@@ -5,8 +5,8 @@
structures/kush_pyramid_small
structures/kush_pyramid_large
structures/kush_temple_amun
structures/kush_blemmye_camp
structures/kush_nuba_village
structures/kush_camp_blemmye
structures/kush_camp_noba
</Entities>
</Builder>
<Identity>