Ticket #4490: support_female.patch

File support_female.patch, 15.0 KB (added by elexis, 7 years ago)

solely removing the Female class from Boudica and session.js works too, dont really care

  • binaries/data/mods/public/gui/session/session.js

     
    159159/**
    160160 * Unit classes to be checked for the idle-worker-hotkey.
    161161 */
    162 var g_WorkerTypes = ["Female+Support", "Trader", "FishingBoat", "CitizenSoldier"];
     162var g_WorkerTypes = ["SupportFemale", "Trader", "FishingBoat", "CitizenSoldier"];
     163
    163164/**
    164165 * Unit classes to be checked for the military-only-selection modifier and for the idle-warrior-hotkey.
    165166 */
    … …  
    13791380        "total",
    13801381        "Infantry",
    13811382        "Worker",
    1382         "Female",
     1383        "SupportFemale",
    13831384        "Cavalry",
    13841385        "Champion",
    13851386        "Hero",

  • binaries/data/mods/public/gui/summary/counters.js

     
    7575        g_TeamHelperData[playerState.team] = {
    7676            "food": 0,
    7777            "vegetarianFood": 0,
    78             "female": 0,
     78            "supportFemale": 0,
    7979            "worker": 0,
    8080            "enemyUnitsKilled": 0,
    8181            "unitsLost": 0,
    … …  
    8989    g_TeamHelperData[playerState.team].food += playerState.statistics.resourcesGathered.food;
    9090    g_TeamHelperData[playerState.team].vegetarianFood += playerState.statistics.resourcesGathered.vegetarianFood;
    9191
    92     g_TeamHelperData[playerState.team].female += playerState.statistics.unitsTrained.Female;
     92    g_TeamHelperData[playerState.team].supportFemale += playerState.statistics.unitsTrained.SupportFemale;
    9393    g_TeamHelperData[playerState.team].worker += playerState.statistics.unitsTrained.Worker;
    9494
    9595    g_TeamHelperData[playerState.team].enemyUnitsKilled += playerState.statistics.enemyUnitsKilled.total;
    … …  
    439439function calculateFeminization(playerState)
    440440{
    441441    return formatPercent(
    442         playerState.statistics.unitsTrained.Female,
     442        playerState.statistics.unitsTrained.SupportFemale,
    443443        playerState.statistics.unitsTrained.Worker);
    444444}
    445445
    … …  
    479479            if (w == 0)
    480480                teamTotal = formatPercent(g_TeamHelperData[t].vegetarianFood, g_TeamHelperData[t].food);
    481481            else if (w == 1)
    482                 teamTotal = formatPercent(g_TeamHelperData[t].female, g_TeamHelperData[t].worker);
     482                teamTotal = formatPercent(g_TeamHelperData[t].supportFemale, g_TeamHelperData[t].worker);
    483483            else if (w == 2)
    484484                teamTotal = formatRatio(g_TeamHelperData[t].enemyUnitsKilled, g_TeamHelperData[t].unitsLost);
    485485            else if (w == 3)

  • binaries/data/mods/public/maps/random/survivalofthefittest_triggers.js

     
    171171        {
    172172            if (TriggerHelper.EntityHasClass(entity, "CivilCentre"))
    173173                this.playerCivicCenter[i] = entity;
    174             else if (TriggerHelper.EntityHasClass(entity, "Female"))
     174            else if (TriggerHelper.EntityHasClass(entity, "SupportFemale"))
    175175            {
    176176                let cmpDamageReceiver = Engine.QueryInterface(entity, IID_DamageReceiver);
    177177                cmpDamageReceiver.SetInvulnerability(true);

  • binaries/data/mods/public/simulation/ai/petra/attackPlan.js

     
    13741374                else if (target.hasClass("Ship") && !ent.hasClass("Ship"))
    13751375                    maybeUpdate = true;
    13761376                else if (!ent.hasClass("Cavalry") && !ent.hasClass("Ranged") &&
    1377                      target.hasClass("Female") && target.unitAIState().split(".")[1] == "FLEEING")
     1377                     target.hasClass("SupportFemale") && target.unitAIState().split(".")[1] == "FLEEING")
    13781378                    maybeUpdate = true;
    13791379            }
    13801380
    … …  
    14671467                        return false;
    14681468                    if (enemy.hasClass("Animal"))
    14691469                        return false;
    1470                     if (nearby && enemy.hasClass("Female") && enemy.unitAIState().split(".")[1] == "FLEEING")
     1470                    if (nearby && enemy.hasClass("SupportFemale") && enemy.unitAIState().split(".")[1] == "FLEEING")
    14711471                        return false;
    14721472                    let dist = API3.SquareVectorDistance(enemy.position(), ent.position());
    14731473                    if (dist > range)

  • binaries/data/mods/public/simulation/ai/petra/baseManager.js

     
    611611                if (lessNeed.type === "food" && gatherers.filter(API3.Filters.byClass("CitizenSoldier")).hasEntities())
    612612                    only = "CitizenSoldier";
    613613                else if ((lessNeed.type === "stone" || lessNeed.type === "metal") && moreNeed.type !== "stone" && moreNeed.type !== "metal" &&
    614                     gatherers.filter(API3.Filters.byClass("Female")).hasEntities())
    615                     only = "Female";
     614                    gatherers.filter(API3.Filters.byClass("SupportFemale")).hasEntities())
     615                    only = "SupportFemale";
    616616
    617617                gatherers.forEach( function (ent) {
    618618                    if (!ent.canGather(moreNeed.type))

  • binaries/data/mods/public/simulation/components/Identity.js

     
    5454        "</element>" +
    5555    "</optional>" +
    5656    "<optional>" +
    57         "<element name='Classes' a:help='Optional list of space-separated classes applying to this entity. Choices include: Animal, Apadana, ArmyCamp, Ashoka, BarterMarket, Celt, CitizenSoldier, CivCentre, Colony, ConquestCritical, Defensive, Domestic, DropsiteFood, DropsiteMetal, DropsiteStone, DropsiteWood, Elephant, Female, FishingBoat, ForestPlant, Fortress, GarrisonFortress, GarrisonTower, Gates, Human, Iberian, Immortal, Italian, Juggernaut, Kennel, Lighthouse, LongWall, MercenaryCamp, Naval, NavalMarket, Organic, Palace, Palisade, Player, PtolemyIV, SeaCreature, SiegeWall, SpecialBuilding, StoneWall, Structure, Syssiton, Theater, Tower, Unit'>" +
     57        "<element name='Classes' a:help='Optional list of space-separated classes applying to this entity. Choices include: Animal, Apadana, ArmyCamp, Ashoka, BarterMarket, Celt, CitizenSoldier, CivCentre, Colony, ConquestCritical, Defensive, Domestic, DropsiteFood, DropsiteMetal, DropsiteStone, DropsiteWood, Elephant, SupportFemale, FishingBoat, ForestPlant, Fortress, GarrisonFortress, GarrisonTower, Gates, Human, Iberian, Immortal, Italian, Juggernaut, Kennel, Lighthouse, LongWall, MercenaryCamp, Naval, NavalMarket, Organic, Palace, Palisade, Player, PtolemyIV, SeaCreature, SiegeWall, SpecialBuilding, StoneWall, Structure, Syssiton, Theater, Tower, Unit'>" +
    5858            "<attribute name='datatype'>" +
    5959                "<value>tokens</value>" +
    6060            "</attribute>" +

  • binaries/data/mods/public/simulation/components/StatisticsTracker.js

     
    88    this.unitsClasses = [
    99        "Infantry",
    1010        "Worker",
    11         "Female",
     11        "SupportFemale",
    1212        "Cavalry",
    1313        "Champion",
    1414        "Hero",
    … …  
    1919    this.unitsTrained = {
    2020        "Infantry": 0,
    2121        "Worker": 0,
    22         "Female": 0,
     22        "SupportFemale": 0,
    2323        "Cavalry": 0,
    2424        "Champion": 0,
    2525        "Hero": 0,
    … …  
    3131    this.unitsLost = {
    3232        "Infantry": 0,
    3333        "Worker": 0,
    34         "Female": 0,
     34        "SupportFemale": 0,
    3535        "Cavalry": 0,
    3636        "Champion": 0,
    3737        "Hero": 0,
    … …  
    4444    this.enemyUnitsKilled = {
    4545        "Infantry": 0,
    4646        "Worker": 0,
    47         "Female": 0,
     47        "SupportFemale": 0,
    4848        "Cavalry": 0,
    4949        "Champion": 0,
    5050        "Hero": 0,
    … …  
    5757    this.unitsCaptured = {
    5858        "Infantry": 0,
    5959        "Worker": 0,
    60         "Female": 0,
     60        "SupportFemale": 0,
    6161        "Cavalry": 0,
    6262        "Champion": 0,
    6363        "Hero": 0,

  • binaries/data/mods/public/simulation/components/TechnologyManager.js

     
    2626
    2727    // This stores the modifications to unit stats from researched technologies
    2828    // Example data: {"ResourceGatherer/Rates/food.grain": [
    29     //                     {"multiply": 1.15, "affects": ["Female", "Infantry Swordsman"]},
     29    //                     {"multiply": 1.15, "affects": ["SupportFemale", "Infantry Swordsman"]},
    3030    //                     {"add": 2}
    3131    //                 ]}
    3232    this.modifications = {};

  • binaries/data/mods/public/simulation/components/TrainingRestrictions.js

     
    77            "<Category>Hero</Category>" +
    88        "</TrainingRestrictions>" +
    99    "</a:example>" +
    10     "<element name='Category' a:help='Specifies the category of this unit, for satisfying special constraints. Choices include: Hero, FemaleCitizen, WarDog'>" +
     10    "<element name='Category' a:help='Specifies the category of this unit, for satisfying special constraints. Choices include: Hero, UniqueBuilding, WarDog'>" +
    1111        "<text/>" +
    1212    "</element>";
    1313

  • binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml

     
    3535  <GarrisonHolder>
    3636    <Max>20</Max>
    3737    <EjectHealth>0</EjectHealth>
    38     <EjectClassesOnDestroy datatype="tokens">Female Infantry Dog</EjectClassesOnDestroy>
     38    <EjectClassesOnDestroy datatype="tokens">SupportFemale Infantry Dog</EjectClassesOnDestroy>
    3939    <List datatype="tokens">Support Infantry Cavalry Dog</List>
    4040    <BuffHeal>0</BuffHeal>
    4141    <LoadingRange>10</LoadingRange>

  • binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_fishing.xml

     
    2222  <GarrisonHolder>
    2323    <Max>1</Max>
    2424    <EjectHealth>0</EjectHealth>
    25     <EjectClassesOnDestroy datatype="tokens">Female Infantry</EjectClassesOnDestroy>
     25    <EjectClassesOnDestroy datatype="tokens">SupportFemale Infantry</EjectClassesOnDestroy>
    2626    <List datatype="tokens">Support Infantry</List>
    2727    <BuffHeal>0</BuffHeal>
    2828    <LoadingRange>10</LoadingRange>

  • binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_merchant.xml

     
    1414  <GarrisonHolder>
    1515    <Max>15</Max>
    1616    <EjectHealth>0</EjectHealth>
    17     <EjectClassesOnDestroy datatype="tokens">Female Infantry Dog</EjectClassesOnDestroy>
     17    <EjectClassesOnDestroy datatype="tokens">SupportFemale Infantry Dog</EjectClassesOnDestroy>
    1818    <List datatype="tokens">Support Infantry Cavalry Dog</List>
    1919    <BuffHeal>0</BuffHeal>
    2020    <LoadingRange>10</LoadingRange>

  • binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_quinquereme.xml

     
    4444  <GarrisonHolder>
    4545    <Max>50</Max>
    4646    <EjectHealth>0</EjectHealth>
    47     <EjectClassesOnDestroy datatype="tokens">Female Infantry Dog</EjectClassesOnDestroy>
     47    <EjectClassesOnDestroy datatype="tokens">SupportFemale Infantry Dog</EjectClassesOnDestroy>
    4848    <List datatype="tokens">Support Infantry Cavalry Dog Siege Elephant</List>
    4949    <BuffHeal>0</BuffHeal>
    5050    <LoadingRange>10</LoadingRange>

  • binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_trireme.xml

     
    3535  <GarrisonHolder>
    3636    <Max>30</Max>
    3737    <EjectHealth>0</EjectHealth>
    38     <EjectClassesOnDestroy datatype="tokens">Female Infantry Dog</EjectClassesOnDestroy>
     38    <EjectClassesOnDestroy datatype="tokens">SupportFemale Infantry Dog</EjectClassesOnDestroy>
    3939    <List datatype="tokens">Support Infantry Cavalry Dog Siege Elephant</List>
    4040    <BuffHeal>0</BuffHeal>
    4141    <LoadingRange>10</LoadingRange>

  • binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml

     
    4343    <GenericName>Female Citizen</GenericName>
    4444    <Gender>female</Gender>
    4545    <History>Women in the ancient world took on a variety of roles - from leadership (Celts) to servant (Greeks). Women are hard workers, the economic backbone of any civilization. In history, it was typical when all the males (capable of fighting) were killed for the females, children, and elderly to be sold as slaves.</History>
    46     <Classes datatype="tokens">Female</Classes>
     46    <Classes datatype="tokens">SupportFemale</Classes>
    4747    <VisibleClasses datatype="tokens">Citizen Worker</VisibleClasses>
    4848    <Formations disable=""/>
    4949  </Identity>

  • binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml

     
    77  </Footprint>
    88  <Identity>
    99    <Civ>brit</Civ>
    10     <VisibleClasses datatype="tokens">Female Chariot</VisibleClasses>
     10    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
    1111    <GenericName>Boudicca (Chariot)</GenericName>
    1212    <SpecificName>Boadicea</SpecificName>
    1313    <Gender>female</Gender>