Skip to content

Commit 819989a

Browse files
romaniac01romaniac01
committed
Update to text, update to the rounding to be 1 decimal. correct conversion rate
1 parent 8579f8c commit 819989a

1 file changed

Lines changed: 65 additions & 28 deletions

File tree

‎src/Extension/EconTraitExt.cs‎

Lines changed: 65 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,16 @@ public static string GetDisplayNameLocalized(this EconTraitXmlEffect effect, ILa
6060
//Will this work as it is?
6161
case ResourceTypeEnum.Food:
6262
return
63-
languages["stringtablex"][language][18900].Text + " " + languages["stringtablex"][language][64947].Text + " " + languages["stringtablex"][language][66918].Text + ":";
63+
/*languages["stringtablex"][language][18900].Text + " " + */languages["stringtablex"][language][64947].Text + " " + languages["stringtablex"][language][66918].Text + ":";
6464
case ResourceTypeEnum.Gold:
6565
return
66-
languages["stringtablex"][language][18129].Text + " " + languages["stringtablex"][language][64947].Text + " " + languages["stringtablex"][language][66918].Text + ":";
66+
/*languages["stringtablex"][language][18129].Text + " " + */languages["stringtablex"][language][64947].Text + " " + languages["stringtablex"][language][66918].Text + ":";
6767
case ResourceTypeEnum.Stone:
6868
return
69-
languages["stringtablex"][language][28529].Text + " " + languages["stringtablex"][language][64947].Text + " " + languages["stringtablex"][language][66918].Text + ":";
69+
/*languages["stringtablex"][language][28529].Text + " " + */languages["stringtablex"][language][64947].Text + " " + languages["stringtablex"][language][66918].Text + ":";
7070
case ResourceTypeEnum.Wood:
7171
return
72-
languages["stringtablex"][language][18899].Text + " " + languages["stringtablex"][language][64947].Text + " " + languages["stringtablex"][language][66918].Text + ":";
72+
/*languages["stringtablex"][language][18899].Text + " " + */languages["stringtablex"][language][64947].Text + " " + languages["stringtablex"][language][66918].Text + ":";
7373
default:
7474
//throw new ArgumentOutOfRangeException(nameof(effect.UnitType), effect.UnitType, null);
7575
return languages["stringtablex"][language][64947].Text + " " + languages["stringtablex"][language][66918].Text + ":";
@@ -109,10 +109,10 @@ public static string GetDisplayNameLocalized(this EconTraitXmlEffect effect, ILa
109109
//Should show what unit receives the Critical Chance
110110
case EffectActionTypeEnum.MeleeAttack:
111111
return
112-
languages["stringtablex"][language][58251].Text + " " + languages["stringtablex"][language][55093].Text.Replace(" +%1.0f", ":");;
112+
/*languages["stringtablex"][language][58251].Text + " " + */languages["stringtablex"][language][55093].Text.Replace(" +%1.0f", ":");;
113113
case EffectActionTypeEnum.RangedAttack:
114114
return
115-
languages["stringtablex"][language][58250].Text + " " + languages["stringtablex"][language][55093].Text.Replace(" +%1.0f", ":");;
115+
/*languages["stringtablex"][language][58250].Text + " " + */languages["stringtablex"][language][55093].Text.Replace(" +%1.0f", ":");;
116116
default:
117117
return
118118
languages["stringtablex"][language][55093].Text.Replace(" +%1.0f", ":");;
@@ -163,10 +163,10 @@ public static string GetDisplayNameLocalized(this EconTraitXmlEffect effect, ILa
163163
//Should show what unit receives the Critical Chance
164164
case EffectActionTypeEnum.MeleeAttack:
165165
return
166-
languages["stringtablex"][language][58251].Text + " " + languages["stringtablex"][language][57584].Text;
166+
/*languages["stringtablex"][language][58251].Text + " " + */languages["stringtablex"][language][57584].Text;
167167
case EffectActionTypeEnum.RangedAttack:
168168
return
169-
languages["stringtablex"][language][58250].Text + " " + languages["stringtablex"][language][57584].Text;
169+
/*languages["stringtablex"][language][58250].Text + " " + */languages["stringtablex"][language][57584].Text;
170170
default:
171171
return
172172
languages["stringtablex"][language][57584].Text;
@@ -195,31 +195,31 @@ public static string GetDisplayNameLocalized(this EconTraitXmlEffect effect, ILa
195195
{
196196
case EffectUnitTypeEnum.AbstractFruit:
197197
return
198-
$"{languages["stringtablex"][language][65866].Text}:";
198+
languages["stringtablex"][language][55352].Text + " " + languages["stringtablex"][language][18900].Text + ":";
199199
case EffectUnitTypeEnum.AbstractFarm:
200200
return
201-
$"{languages["stringtablex"][language][65869].Text}:";
201+
languages["stringtablex"][language][55352].Text + " " + languages["stringtablex"][language][18900].Text + ":";
202202
case EffectUnitTypeEnum.AbstractFish:
203203
return
204-
$"{languages["stringtablex"][language][65870].Text}:";
204+
languages["stringtablex"][language][55352].Text + " " + languages["stringtablex"][language][18900].Text + ":";
205205
case EffectUnitTypeEnum.Fish:
206206
return
207-
$"{languages["stringtablex"][language][65870].Text}:";
207+
languages["stringtablex"][language][55352].Text + " " + languages["stringtablex"][language][18900].Text + ":";
208208
case EffectUnitTypeEnum.Herdable:
209209
return
210-
$"{languages["stringtablex"][language][65867].Text}:";
210+
languages["stringtablex"][language][55352].Text + " " + languages["stringtablex"][language][18900].Text + ":";
211211
case EffectUnitTypeEnum.Huntable:
212212
return
213-
$"{languages["stringtablex"][language][65868].Text}:";
213+
languages["stringtablex"][language][55352].Text + " " + languages["stringtablex"][language][18900].Text + ":";
214214
case EffectUnitTypeEnum.Tree:
215215
return
216-
$"{languages["stringtablex"][language][65871].Text}:";
216+
languages["stringtablex"][language][55352].Text + " " + languages["stringtablex"][language][18899].Text + ":";
217217
case EffectUnitTypeEnum.Gold:
218218
return
219-
$"{languages["stringtablex"][language][65872].Text}:";
219+
languages["stringtablex"][language][55352].Text + " " + languages["stringtablex"][language][18129].Text + ":";
220220
case EffectUnitTypeEnum.Stone:
221221
return
222-
$"{languages["stringtablex"][language][65873].Text}:";
222+
languages["stringtablex"][language][55352].Text + " " + languages["stringtablex"][language][28529].Text + ":";
223223
case EffectUnitTypeEnum.Building:
224224
return
225225
$"{languages["stringtablex"][language][55353].Text}:";
@@ -234,10 +234,10 @@ public static string GetDisplayNameLocalized(this EconTraitXmlEffect effect, ILa
234234
}
235235
case EffectUnitTypeEnum.AbstractTownCenter:
236236
return
237-
languages["stringtablex"][language][55355].Text + " " + languages["stringtablex"][language][54006].Text + ":";
237+
languages["stringtablex"][language][55355].Text/* + " " + languages["stringtablex"][language][54006].Text*/ + ":";
238238
case EffectUnitTypeEnum.AbstractDock:
239239
return
240-
languages["stringtablex"][language][55355].Text + " " + languages["stringtablex"][language][49782].Text + ":";
240+
languages["stringtablex"][language][55355].Text/* + " " + languages["stringtablex"][language][49782].Text*/ + ":";
241241
case EffectUnitTypeEnum.Dropsite:
242242
return
243243
languages["stringtablex"][language][56285].Text + " " + languages["stringtablex"][language][56286].Text + ":";
@@ -258,7 +258,44 @@ public static string GetDisplayNameLocalized(this EconTraitXmlEffect effect, ILa
258258
languages["stringtablex"][language][65459].Text + " " + languages["stringtablex"][language][42167].Text + ":";
259259
default:
260260
//Instead of throw excemption, I put a default text.
261-
return languages["stringtablex"][language][66811].Text.Replace(" +%1.1f", string.Empty) + ":";
261+
return languages["stringtablex"][language][55353].Text.Replace(" +%1.1f", string.Empty) + ":";
262+
//throw new ArgumentOutOfRangeException(nameof(effect.UnitType), effect.UnitType, null);
263+
}
264+
}
265+
case EffectSubTypeEnum.Yield:
266+
{
267+
switch (effect.UnitType)
268+
{
269+
case EffectUnitTypeEnum.AbstractFruit:
270+
return
271+
languages["stringtablex"][language][300046].Text.Replace(" +%1.1f", string.Empty) + ":";
272+
case EffectUnitTypeEnum.AbstractFarm:
273+
return
274+
languages["stringtablex"][language][300046].Text.Replace(" +%1.1f", string.Empty) + ":";
275+
case EffectUnitTypeEnum.AbstractFish:
276+
return
277+
languages["stringtablex"][language][300046].Text.Replace(" +%1.1f", string.Empty) + ":";
278+
case EffectUnitTypeEnum.Fish:
279+
return
280+
languages["stringtablex"][language][300046].Text.Replace(" +%1.1f", string.Empty) + ":";
281+
case EffectUnitTypeEnum.Herdable:
282+
return
283+
languages["stringtablex"][language][300046].Text.Replace(" +%1.1f", string.Empty) + ":";
284+
case EffectUnitTypeEnum.Huntable:
285+
return
286+
languages["stringtablex"][language][300046].Text.Replace(" +%1.1f", string.Empty) + ":";
287+
case EffectUnitTypeEnum.Tree:
288+
return
289+
languages["stringtablex"][language][300046].Text.Replace(" +%1.1f", string.Empty) + ":";
290+
case EffectUnitTypeEnum.Gold:
291+
return
292+
languages["stringtablex"][language][300046].Text.Replace(" +%1.1f", string.Empty) + ":";
293+
case EffectUnitTypeEnum.Stone:
294+
return
295+
languages["stringtablex"][language][300046].Text.Replace(" +%1.1f", string.Empty) + ":";
296+
default:
297+
//Instead of throw excemption, I put a default text.
298+
return languages["stringtablex"][language][300046].Text.Replace(" +%1.1f", string.Empty) + ":";
262299
//throw new ArgumentOutOfRangeException(nameof(effect.UnitType), effect.UnitType, null);
263300
}
264301
}
@@ -408,29 +445,29 @@ public static string GetEnding(this EconTraitXmlEffect effect, ILanguages langua
408445
switch (effect.UnitType)
409446
{
410447
case EffectUnitTypeEnum.Dropsite:
411-
return Math.Round((modifierValue - 1.0) * 1100, 2, MidpointRounding.AwayFromZero).ToString() + "%\r\n";
448+
return Math.Round((modifierValue - 1.0) * 1100, 1, MidpointRounding.AwayFromZero).ToString() + "%\r\n";
412449
case EffectUnitTypeEnum.ActionTrain:
413-
return Math.Round((modifierValue - 1.0) * 1100, 2, MidpointRounding.AwayFromZero).ToString() + "%\r\n";
450+
return Math.Round((modifierValue - 1.0) * 1100, 1, MidpointRounding.AwayFromZero).ToString() + "%\r\n";
414451
case EffectUnitTypeEnum.ActionBuild:
415-
return Math.Round((modifierValue - 1.0) * 1100, 2, MidpointRounding.AwayFromZero).ToString() + "%\r\n";
452+
return Math.Round((modifierValue - 1.0) * 1100, 1, MidpointRounding.AwayFromZero).ToString() + "%\r\n";
416453
case EffectUnitTypeEnum.LogicalTypeHealed:
417454
switch (effect.Action)
418455
{
419456
case EffectActionTypeEnum.SelfHeal:
420-
return Math.Round(modifierValue, 2, MidpointRounding.AwayFromZero).ToString() + languages["stringtablex"][language][300001].Text.Replace(languages["stringtablex"][language][300031].Text + ": %s%.1f",string.Empty) + "\r\n";
457+
return Math.Round(modifierValue, 1, MidpointRounding.AwayFromZero).ToString() + languages["stringtablex"][language][300001].Text.Replace(languages["stringtablex"][language][300031].Text + ": %s%.1f",string.Empty) + "\r\n";
421458
default:
422-
return Math.Round((modifierValue - 1.0) * 100, 2, MidpointRounding.AwayFromZero).ToString() + "%\r\n";
459+
return Math.Round((modifierValue - 1.0) * 100, 1, MidpointRounding.AwayFromZero).ToString() + "%\r\n";
423460
}
424461
default:
425-
return Math.Round((modifierValue - 1.0) * 100, 2, MidpointRounding.AwayFromZero).ToString() + "%\r\n";
462+
return Math.Round((modifierValue - 1.0) * 100, 1, MidpointRounding.AwayFromZero).ToString() + "%\r\n";
426463
}
427464
}
428465
case EffectSubTypeEnum.ArmorVulnerability:
429466
{
430-
return Math.Round((modifierValue) * 100, 2, MidpointRounding.AwayFromZero).ToString() + "%\r\n";
467+
return Math.Round((modifierValue) * 100, 1, MidpointRounding.AwayFromZero).ToString() + "%\r\n";
431468
}
432469
default:
433-
return Math.Round((modifierValue - 1.0) * 100, 2, MidpointRounding.AwayFromZero).ToString() + "%\r\n";
470+
return Math.Round((modifierValue - 1.0) * 100, 1, MidpointRounding.AwayFromZero).ToString() + "%\r\n";
434471
}
435472
}
436473

0 commit comments

Comments
 (0)