Skip to content

Commit f870197

Browse files
committed
convert: Add new names for 'Battle for Greece' DLC.
1 parent 24e2f17 commit f870197

File tree

2 files changed

+79
-1
lines changed

2 files changed

+79
-1
lines changed

openage/convert/value_object/conversion/de2/internal_nyan_names.py

Lines changed: 70 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,37 @@
7070

7171
1802: ("EliteCompositeBowman", "elite_composite_bowman"),
7272
1805: ("EliteMonaspa", "elite_monaspa"),
73+
74+
# BfG
75+
2101: ("BfGUnkown_2101", "bfg_unkown_2101"),
76+
2102: ("BfGUnkown_2102", "bfg_unkown_2102"),
77+
2104: ("BfGUnkown_2104", "bfg_unkown_2104"),
78+
2105: ("BfGUnkown_2105", "bfg_unkown_2105"),
79+
2107: ("BfGUnkown_2107", "bfg_unkown_2107"),
80+
2108: ("BfGUnkown_2108", "bfg_unkown_2108"),
81+
2110: ("BfGUnkown_2110", "bfg_unkown_2110"),
82+
2111: ("BfGUnkown_2111", "bfg_unkown_2111"),
83+
2123: ("BfGUnkown_2123", "bfg_unkown_2123"),
84+
2124: ("BfGUnkown_2124", "bfg_unkown_2124"),
85+
2125: ("BfGUnkown_2125", "bfg_unkown_2125"),
86+
2126: ("BfGUnkown_2126", "bfg_unkown_2126"),
87+
2127: ("BfGUnkown_2127", "bfg_unkown_2127"),
88+
2128: ("BfGUnkown_2128", "bfg_unkown_2128"),
89+
2129: ("BfGUnkown_2129", "bfg_unkown_2129"),
90+
2130: ("BfGUnkown_2130", "bfg_unkown_2130"),
91+
2131: ("BfGUnkown_2131", "bfg_unkown_2131"),
92+
2132: ("BfGUnkown_2132", "bfg_unkown_2132"),
93+
2133: ("BfGUnkown_2133", "bfg_unkown_2133"),
94+
2134: ("BfGUnkown_2134", "bfg_unkown_2134"),
95+
2135: ("BfGUnkown_2135", "bfg_unkown_2135"),
96+
2138: ("BfGUnkown_2138", "bfg_unkown_2138"),
97+
2139: ("BfGUnkown_2139", "bfg_unkown_2139"),
98+
2140: ("BfGUnkown_2140", "bfg_unkown_2140"),
99+
2148: ("BfGUnkown_2148", "bfg_unkown_2148"),
100+
2149: ("BfGUnkown_2149", "bfg_unkown_2149"),
101+
2150: ("BfGUnkown_2150", "bfg_unkown_2150"),
102+
2151: ("BfGUnkown_2151", "bfg_unkown_2151"),
103+
2162: ("BfGUnkown_2162", "bfg_unkown_2162"),
73104
}
74105

75106
# key: head unit id; value: (nyan object name, filename prefix)
@@ -88,6 +119,10 @@
88119

89120
# TMR
90121
1808: ("MuleCart", "mule_cart"),
122+
123+
# BfG
124+
2119: ("BfGUnkown_2119", "bfg_unkown_2119"),
125+
2172: ("BfGUnkown_2172", "bfg_unkown_2172"),
91126
}
92127

93128
# key: (head) unit id; value: (nyan object name, filename prefix)
@@ -171,6 +206,33 @@
171206
924: ("AsnuariCavalry", "asnuari_cavalry"),
172207
929: ("FortifiedChurch", "fortified_church"),
173208
967: ("EliteQizilbashWarrior", "elite_qizilbash_warrior"),
209+
210+
# BfG
211+
1110: ("BfGUnkown_1110", "bfg_unkown_1110"),
212+
1111: ("BfGUnkown_1111", "bfg_unkown_1111"),
213+
1112: ("BfGUnkown_1112", "bfg_unkown_1112"),
214+
1113: ("BfGUnkown_1113", "bfg_unkown_1113"),
215+
1120: ("BfGUnkown_1120", "bfg_unkown_1120"),
216+
1121: ("BfGUnkown_1121", "bfg_unkown_1121"),
217+
1122: ("BfGUnkown_1122", "bfg_unkown_1122"),
218+
1123: ("BfGUnkown_1123", "bfg_unkown_1123"),
219+
1130: ("BfGUnkown_1130", "bfg_unkown_1130"),
220+
1131: ("BfGUnkown_1131", "bfg_unkown_1131"),
221+
1132: ("BfGUnkown_1132", "bfg_unkown_1132"),
222+
1133: ("BfGUnkown_1133", "bfg_unkown_1133"),
223+
1161: ("BfGUnkown_1161", "bfg_unkown_1161"),
224+
1162: ("BfGUnkown_1162", "bfg_unkown_1162"),
225+
1165: ("BfGUnkown_1165", "bfg_unkown_1165"),
226+
1167: ("BfGUnkown_1167", "bfg_unkown_1167"),
227+
1173: ("BfGUnkown_1173", "bfg_unkown_1173"),
228+
1198: ("BfGUnkown_1198", "bfg_unkown_1198"),
229+
1202: ("BfGUnkown_1202", "bfg_unkown_1202"),
230+
1203: ("BfGUnkown_1203", "bfg_unkown_1203"),
231+
1204: ("BfGUnkown_1204", "bfg_unkown_1204"),
232+
1223: ("BfGUnkown_1223", "bfg_unkown_1223"),
233+
1224: ("BfGUnkown_1224", "bfg_unkown_1224"),
234+
1225: ("BfGUnkown_1225", "bfg_unkown_1225"),
235+
1226: ("BfGUnkown_1226", "bfg_unkown_1226"),
174236
}
175237

176238
# key: civ index; value: (nyan object name, filename prefix)
@@ -201,14 +263,19 @@
201263
# TMR
202264
44: ("Armenians", "armenians"),
203265
45: ("Georgians", "georgians"),
266+
267+
# BfG
268+
46: ("BfGUnkown_46", "bfg_unkown_46"),
269+
47: ("BfGUnkown_47", "bfg_unkown_47"),
270+
48: ("BfGUnkown_48", "bfg_unkown_48"),
204271
}
205272

206273
# key: civ index; value: (civ ids, nyan object name, filename prefix)
207274
# contains only new/changed graphic sets of DE2
208275
GRAPHICS_SET_LOOKUPS = {
209276
0: ((0, 1, 2, 13, 14, 36), "WesternEuropean", "western_european"),
210277
4: ((7, 37), "Byzantine", "byzantine"),
211-
6: ((19, 24, 43, 44, 45), "Mediterranean", "mediterranean"),
278+
6: ((19, 24, 43, 44, 45, 46, 47, 48), "Mediterranean", "mediterranean"),
212279
7: ((20, 40, 41, 42), "Indian", "indian"),
213280
8: ((22, 23, 32, 35, 38, 39), "EasternEuropean", "eastern_european"),
214281
11: ((33, 34), "CentralAsian", "central_asian"),
@@ -238,4 +305,6 @@
238305
37: "SiegeBallista",
239306
38: "DE2Skirmisher",
240307
39: "DE2CamelRider",
308+
40: "BfGUnkown_40",
309+
60: "BfGUnkown_60",
241310
}

openage/convert/value_object/read/media/datfile/lookup_dicts.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,8 @@
279279
248: "DE2_UNKNOWN_248",
280280
249: "DE2_UNKNOWN_249",
281281
250: "DE2_UNKNOWN_250",
282+
501: "DE2_UNKNOWN_501",
283+
506: "DE2_UNKNOWN_506",
282284
}
283285

284286
EFFECT_APPLY_TYPE = {
@@ -338,6 +340,10 @@
338340
102: "TECH_TOGGLE", # d == research_id
339341
103: "TECH_TIME_MODIFY", # a == research_id, if c == 0: d==absval else d==relval
340342

343+
-54: "UNKNOWN", # 199: "UNKNOWN",
344+
-55: "UNKNOWN", # 200: "UNKNOWN",
345+
-56: "UNKNOWN", # 201: "UNKNOWN",
346+
341347
# attribute_id:
342348
# 0: hit points
343349
# 1: line of sight
@@ -506,6 +512,8 @@
506512
37: "DE2_SIEGE_BALLISTA",
507513
38: "DE2_SKIRMISHER",
508514
39: "DE2_CAMEL_RIDER",
515+
40: "DE2_UNKNOWN_40",
516+
60: "DE2_UNKNOWN_60",
509517
}
510518

511519
UNIT_CLASSES = {
@@ -757,4 +765,5 @@
757765
0x0b: "NOCAVALRY",
758766
0x0f: "ALL",
759767
0x10: "SWGB_LIVESTOCK",
768+
0x40: "DE2_UNKNOWN_40",
760769
}

0 commit comments

Comments
 (0)