Ticket #2937: noform2.2.patch

File noform2.2.patch, 9.0 KB (added by scythetwirler, 9 years ago)

  • binaries/data/mods/public/civs/athen.json 

    diff --git a/binaries/data/mods/public/civs/athen.json b/binaries/data/mods/public/civs/athen.json
index 2697011..3ce6b26 100644
    a b  
    132132    ],
    133133    "Formations":
    134134    [
    135         "formations/scatter",
     135        "formations/null",
    136136        "formations/box",
    137137        "formations/column_closed",
    138138        "formations/line_closed",

  • binaries/data/mods/public/civs/brit.json 

    diff --git a/binaries/data/mods/public/civs/brit.json b/binaries/data/mods/public/civs/brit.json
index 7368dc0..b8b12fe 100644
    a b  
    114114    ],
    115115    "Formations":
    116116    [
    117         "formations/scatter",
     117        "formations/null",
    118118        "formations/box",
    119119        "formations/column_closed",
    120120        "formations/line_closed",

  • binaries/data/mods/public/civs/cart.json 

    diff --git a/binaries/data/mods/public/civs/cart.json b/binaries/data/mods/public/civs/cart.json
index b52ba79..c6e9efb 100644
    a b  
    135135    ],
    136136    "Formations":
    137137    [
    138         "formations/scatter",
     138        "formations/null",
    139139        "formations/box",
    140140        "formations/column_closed",
    141141        "formations/line_closed",

  • binaries/data/mods/public/civs/celt.json 

    diff --git a/binaries/data/mods/public/civs/celt.json b/binaries/data/mods/public/civs/celt.json
index 56ea6fb..b4be9ea 100644
    a b  
    151151    ],
    152152    "Formations":
    153153    [
    154         "formations/scatter",
     154        "formations/null",
    155155        "formations/box",
    156156        "formations/column_closed",
    157157        "formations/line_closed",

  • binaries/data/mods/public/civs/gaul.json 

    diff --git a/binaries/data/mods/public/civs/gaul.json b/binaries/data/mods/public/civs/gaul.json
index f24e2ab..bf918a2 100644
    a b  
    110110    ],
    111111    "Formations":
    112112    [
    113         "formations/scatter",
     113        "formations/null",
    114114        "formations/box",
    115115        "formations/column_closed",
    116116        "formations/line_closed",

  • binaries/data/mods/public/civs/hele.json 

    diff --git a/binaries/data/mods/public/civs/hele.json b/binaries/data/mods/public/civs/hele.json
index 1bf748c..fdc4d8a 100644
    a b  
    167167    ],
    168168    "Formations":
    169169    [
    170         "formations/scatter",
     170        "formations/null",
    171171        "formations/box",
    172172        "formations/column_closed",
    173173        "formations/line_closed",

  • binaries/data/mods/public/civs/iber.json 

    diff --git a/binaries/data/mods/public/civs/iber.json b/binaries/data/mods/public/civs/iber.json
index c79126d..3039a29 100644
    a b  
    108108    ],
    109109    "Formations":
    110110    [
    111         "formations/scatter",
     111        "formations/null",
    112112        "formations/box",
    113113        "formations/column_closed",
    114114        "formations/line_closed",

  • binaries/data/mods/public/civs/mace.json 

    diff --git a/binaries/data/mods/public/civs/mace.json b/binaries/data/mods/public/civs/mace.json
index 23cbebe..76ee3dd 100644
    a b  
    137137    ],
    138138    "Formations":
    139139    [
    140         "formations/scatter",
     140        "formations/null",
    141141        "formations/box",
    142142        "formations/column_closed",
    143143        "formations/line_closed",

  • binaries/data/mods/public/civs/maur.json 

    diff --git a/binaries/data/mods/public/civs/maur.json b/binaries/data/mods/public/civs/maur.json
index 24ba75d..5d230ae 100644
    a b  
    122122    ],
    123123    "Formations":
    124124    [
    125         "formations/scatter",
     125        "formations/null",
    126126        "formations/box",
    127127        "formations/column_closed",
    128128        "formations/line_closed",

  • binaries/data/mods/public/civs/pers.json 

    diff --git a/binaries/data/mods/public/civs/pers.json b/binaries/data/mods/public/civs/pers.json
index 437587c..36ad846 100644
    a b  
    127127    ],
    128128    "Formations":
    129129    [
    130         "formations/scatter",
     130        "formations/null",
    131131        "formations/box",
    132132        "formations/column_closed",
    133133        "formations/line_closed",

  • binaries/data/mods/public/civs/ptol.json 

    diff --git a/binaries/data/mods/public/civs/ptol.json b/binaries/data/mods/public/civs/ptol.json
index 63352b3..4071b0f 100644
    a b  
    136136    ],
    137137    "Formations":
    138138    [
    139         "formations/scatter",
     139        "formations/null",
    140140        "formations/box",
    141141        "formations/column_closed",
    142142        "formations/line_closed",

  • binaries/data/mods/public/civs/rome.json 

    diff --git a/binaries/data/mods/public/civs/rome.json b/binaries/data/mods/public/civs/rome.json
index d1cf911..c79048a 100644
    a b  
    112112    ],
    113113    "Formations":
    114114    [
    115         "formations/scatter",
     115        "formations/null",
    116116        "formations/box",
    117117        "formations/column_closed",
    118118        "formations/line_closed",

  • binaries/data/mods/public/civs/sele.json 

    diff --git a/binaries/data/mods/public/civs/sele.json b/binaries/data/mods/public/civs/sele.json
index 2277bcd..557ff50 100644
    a b  
    133133    ],
    134134    "Formations":
    135135    [
    136         "formations/scatter",
     136        "formations/null",
    137137        "formations/box",
    138138        "formations/column_closed",
    139139        "formations/line_closed",

  • binaries/data/mods/public/civs/spart.json 

    diff --git a/binaries/data/mods/public/civs/spart.json b/binaries/data/mods/public/civs/spart.json
index bc16030..fee64cc 100644
    a b  
    128128    ],
    129129    "Formations":
    130130    [
    131         "formations/scatter",
     131        "formations/null",
    132132        "formations/box",
    133133        "formations/column_closed",
    134134        "formations/line_closed",

  • binaries/data/mods/public/civs/theb.json 

    diff --git a/binaries/data/mods/public/civs/theb.json b/binaries/data/mods/public/civs/theb.json
index 777b69e..262a3d2 100644
    a b  
    121121    ],
    122122    "Formations":
    123123    [
    124         "formations/scatter",
     124        "formations/null",
    125125        "formations/box",
    126126        "formations/column_closed",
    127127        "formations/line_closed",

  • binaries/data/mods/public/simulation/helpers/Commands.js 

    diff --git a/binaries/data/mods/public/simulation/helpers/Commands.js b/binaries/data/mods/public/simulation/helpers/Commands.js
index 23eb81c..8d4cfb2 100644
    a b function GetFormationUnitAIs(ents, player, formationTemplate)  
    12731273        // TODO: We only check if the formation is usable by some units
    12741274        // if we move them to it. We should check if we can use formations
    12751275        // for the other cases.
    1276         if (cmpIdentity && cmpIdentity.CanUseFormation(formationTemplate || "formations/line_closed"))
     1276        var nullFormation = (formationTemplate || cmpUnitAI.GetLastFormationTemplate()) == "formations/null";
     1277        if (!nullFormation && cmpIdentity && cmpIdentity.CanUseFormation(formationTemplate || "formations/line_closed"))
    12771278            formedEnts.push(ent);
    12781279        else
     1280        {
     1281            if (nullFormation)
     1282                cmpUnitAI.SetLastFormationTemplate("formations/null");
    12791283            nonformedUnitAIs.push(cmpUnitAI);
     1284        }
    12801285    }
    12811286
    12821287    if (formedEnts.length == 0)
    … … function GetFormationUnitAIs(ents, player, formationTemplate)  
    13171322            if (cmpFormation)
    13181323                cmpFormation.RemoveMembers(formation.members[fid]);
    13191324        }
     1325
    13201326        // TODO replace the fixed 60 with something sensible, based on vision range f.e.
    13211327        var formationSeparation = 60;
    13221328        var clusters = ClusterEntities(formation.entities, formationSeparation);
    … … function GetFormationUnitAIs(ents, player, formationTemplate)  
    13561362            formationUnitAIs.push(Engine.QueryInterface(formationEnt, IID_UnitAI));
    13571363            cmpFormation.SetFormationSeparation(formationSeparation);
    13581364            cmpFormation.SetMembers(cluster);
    1359            
     1365
    13601366            for each (var ent in formationEnts)
    13611367                cmpFormation.RegisterTwinFormation(ent);
    13621368

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

    diff --git a/binaries/data/mods/public/simulation/templates/template_unit.xml b/binaries/data/mods/public/simulation/templates/template_unit.xml
index 131fc73..dab5125 100644
    a b  
    3636  <Identity>
    3737    <GenericName>Unit</GenericName>
    3838    <Classes datatype="tokens">Unit ConquestCritical</Classes>
     39        <Formations datatype="tokens">
     40            formations/null
     41            formations/box
     42            formations/column_closed
     43            formations/line_closed
     44            formations/column_open
     45            formations/line_open
     46            formations/flank
     47            formations/battle_line
     48        </Formations>
    3949  </Identity>
    4050  <Looter/>
    4151  <Minimap>

  • new file inaries/data/mods/public/simulation/templates/formations/null.xml 

    diff --git a/binaries/data/mods/public/art/textures/ui/session/icons/formations/null.png b/binaries/data/mods/public/art/textures/ui/session/icons/formations/null.png
new file mode 100644
index 0000000..e3eda01
Binary files /dev/null and b/binaries/data/mods/public/art/textures/ui/session/icons/formations/null.png differ
diff --git a/binaries/data/mods/public/simulation/templates/formations/null.xml b/binaries/data/mods/public/simulation/templates/formations/null.xml
new file mode 100644
index 0000000..6c94dab
    - +  
     1<?xml version="1.0" encoding="utf-8"?>
     2<Entity parent="template_formation">
     3  <Formation>
     4    <Icon>formations/null.png</Icon>
     5    <FormationName>None</FormationName>
     6  </Formation>
     7</Entity>