Skip to content

Commit 637cf4b

Browse files
TkaelTkael
committed
Expand NPC suit loadout translations
1 parent 0f5b65a commit 637cf4b

15 files changed

Lines changed: 1153 additions & 859 deletions

‎DataDefinitions/Killer.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,19 @@ public Killer(string edName, string edModel, CombatRating rating)
4343

4444
// Might be a ship
4545
killerShip = ShipDefinitions.FromEDModel(edModel, false);
46+
if ( killerShip != null ) { return; }
4647

4748
// Might be a SRV or Fighter
4849
killerVehicle = VehicleDefinition.EDNameExists(edModel) ? VehicleDefinition.FromEDName(edModel) : null;
50+
if ( killerVehicle != null ) { return; }
4951

5052
// Might be an on foot commander
5153
killerCmdrSuit = Suit.EDNameExists(edModel) ? Suit.FromEDName(edModel) : null;
54+
if ( killerCmdrSuit != null ) { return; }
5255

5356
// Might be an on foot NPC
5457
killerNpcSuitLoadout = NpcSuitLoadout.EDNameExists(edModel) ? NpcSuitLoadout.FromEDName(edModel) : null;
58+
if ( killerNpcSuitLoadout != null ) { return; }
5559
}
5660
}
5761
}

‎DataDefinitions/NpcSuitLoadout.cs‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,15 @@ static NpcSuitLoadout()
1212
resourceManager.IgnoreCase = true;
1313
}
1414

15-
public static readonly NpcSuitLoadout CivilianAdmin = new NpcSuitLoadout("citizensuitai_admin");
16-
public static readonly NpcSuitLoadout CivilianScientist = new NpcSuitLoadout("citizensuitai_scientific");
17-
public static readonly NpcSuitLoadout CivilianWorker = new NpcSuitLoadout("citizensuitai_industrial");
18-
public static readonly NpcSuitLoadout Commando = new NpcSuitLoadout("assaultsuitai");
19-
public static readonly NpcSuitLoadout Scout = new NpcSuitLoadout("lightassaultsuitai");
20-
public static readonly NpcSuitLoadout Sharpshooter = new NpcSuitLoadout("rangedsuitai");
21-
public static readonly NpcSuitLoadout Striker = new NpcSuitLoadout("closesuitai");
15+
public static readonly NpcSuitLoadout CivilianAdmin = new NpcSuitLoadout("citizensuitai_admin"); // Administrator
16+
public static readonly NpcSuitLoadout CivilianScientist = new NpcSuitLoadout("citizensuitai_scientific"); // Researcher
17+
public static readonly NpcSuitLoadout CivilianWorker = new NpcSuitLoadout("citizensuitai_industrial"); // Technician
18+
public static readonly NpcSuitLoadout Commando = new NpcSuitLoadout("assaultsuitai"); // Commando
19+
public static readonly NpcSuitLoadout Scout = new NpcSuitLoadout("lightassaultsuitai"); // Scout
20+
public static readonly NpcSuitLoadout Sharpshooter = new NpcSuitLoadout("rangedsuitai"); // Sharpshooter
21+
public static readonly NpcSuitLoadout Striker = new NpcSuitLoadout("closesuitai"); // Striker
22+
public static readonly NpcSuitLoadout Pilot = new NpcSuitLoadout( "flightsuitai" ); // Pilot
23+
public static readonly NpcSuitLoadout TBD = new NpcSuitLoadout("heavysuitai"); // Commando
2224

2325
[PublicAPI]
2426
public int grade { get; private set; }

‎DataDefinitions/Properties/NpcSuitLoadout.Designer.cs‎

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎DataDefinitions/Properties/NpcSuitLoadout.cs.resx‎

Lines changed: 94 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,84 +1,104 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<root>
33
<!--
4-
Microsoft ResX Schema
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
556
6-
Version 1.3
7-
8-
The primary goals of this format is to allow a simple XML format
9-
that is mostly human readable. The generation and parsing of the
10-
various data types are done through the TypeConverter classes
11-
associated with the data types.
12-
13-
Example:
14-
15-
... ado.net/XML headers & schema ...
16-
<resheader name="resmimetype">text/microsoft-resx</resheader>
17-
<resheader name="version">1.3</resheader>
18-
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19-
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20-
<data name="Name1">this is my long string</data>
21-
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22-
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23-
[base64 mime encoded serialized .NET Framework object]
24-
</data>
25-
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26-
[base64 mime encoded string representing a byte array form of the .NET Framework object]
27-
</data>
28-
29-
There are any number of "resheader" rows that contain simple
30-
name/value pairs.
31-
32-
Each data row contains a name, and value. The row also contains a
33-
type or mimetype. Type corresponds to a .NET class that support
34-
text/value conversion through the TypeConverter architecture.
35-
Classes that don't support this are serialized and stored with the
36-
mimetype set.
37-
38-
The mimetype is used for serialized objects, and tells the
39-
ResXResourceReader how to depersist the object. This is currently not
40-
extensible. For a given mimetype the value must be set accordingly:
41-
42-
Note - application/x-microsoft.net.object.binary.base64 is the format
43-
that the ResXResourceWriter will generate, however the reader can
44-
read any of the formats listed below.
45-
46-
mimetype: application/x-microsoft.net.object.binary.base64
47-
value : The object must be serialized with
48-
: System.Serialization.Formatters.Binary.BinaryFormatter
49-
: and then encoded with base64 encoding.
50-
51-
mimetype: application/x-microsoft.net.object.soap.base64
52-
value : The object must be serialized with
53-
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
54-
: and then encoded with base64 encoding.
55-
56-
mimetype: application/x-microsoft.net.object.bytearray.base64
57-
value : The object must be serialized into a byte array
58-
: using a System.ComponentModel.TypeConverter
59-
: and then encoded with base64 encoding.
60-
-->
61-
<xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
6264
<xsd:element name="root" msdata:IsDataSet="true">
6365
<xsd:complexType>
6466
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
6584
<xsd:element name="data">
6685
<xsd:complexType>
6786
<xsd:sequence>
68-
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
69-
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
7089
</xsd:sequence>
71-
<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1"/>
72-
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
73-
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
7494
</xsd:complexType>
7595
</xsd:element>
7696
<xsd:element name="resheader">
7797
<xsd:complexType>
7898
<xsd:sequence>
79-
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
80100
</xsd:sequence>
81-
<xsd:attribute name="name" type="xsd:string" use="required"/>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
82102
</xsd:complexType>
83103
</xsd:element>
84104
</xsd:choice>
@@ -89,19 +109,19 @@
89109
<value>text/microsoft-resx</value>
90110
</resheader>
91111
<resheader name="version">
92-
<value>1.3</value>
112+
<value>2.0</value>
93113
</resheader>
94114
<resheader name="reader">
95-
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
96116
</resheader>
97117
<resheader name="writer">
98-
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
99119
</resheader>
100-
101-
102-
103-
104-
105-
106-
120+
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
121+
<data name="flightsuitai" type="System.Resources.ResXNullRef, System.Windows.Forms">
122+
<value />
123+
</data>
124+
<data name="heavysuitai" type="System.Resources.ResXNullRef, System.Windows.Forms">
125+
<value />
126+
</data>
107127
</root>

0 commit comments

Comments
 (0)