Skip to content

Commit

Permalink
updates modfeatures, improves translation
Browse files Browse the repository at this point in the history
  • Loading branch information
pardeike committed Aug 23, 2023
1 parent b88629c commit 856fa29
Show file tree
Hide file tree
Showing 15 changed files with 36 additions and 47 deletions.
Binary file modified 1.4/Assemblies/AchtungMod.dll
Binary file not shown.
Binary file modified 1.4/Assemblies/ModFeatures.dll
Binary file not shown.
9 changes: 0 additions & 9 deletions Languages/Dutch/DefInjected/WorkTypeDef/WorkTypes.xml

This file was deleted.

5 changes: 5 additions & 0 deletions Languages/Dutch/Keyed/Text.xml
Original file line number Diff line number Diff line change
Expand Up @@ -110,4 +110,9 @@
<NoForcedWork>Geen gedwongen werk</NoForcedWork>
<ForcedWorkWasInterrupted>Geforceerd werk van {0} werd onderbroken.</ForcedWorkWasInterrupted>

<WorkType_Rescue_Label>redden</WorkType_Rescue_Label>
<WorkType_Rescue_PawnLabel>Redden</WorkType_Rescue_PawnLabel>
<WorkType_Rescue_GerundLabel>Kolonistenredding</WorkType_Rescue_GerundLabel>
<WorkType_Rescue_Description>Gewonde kolonisten worden naar bedden gebracht waar ze behandeld kunnen worden.</WorkType_Rescue_Description>

</LanguageData>
5 changes: 5 additions & 0 deletions Languages/English/Keyed/Text.xml
Original file line number Diff line number Diff line change
Expand Up @@ -110,4 +110,9 @@
<NoForcedWork>No forced work</NoForcedWork>
<ForcedWorkWasInterrupted>Forced work of {0} was interrupted.</ForcedWorkWasInterrupted>

<WorkType_Rescue_Label>rescue</WorkType_Rescue_Label>
<WorkType_Rescue_PawnLabel>Rescue</WorkType_Rescue_PawnLabel>
<WorkType_Rescue_GerundLabel>Colonist Rescue</WorkType_Rescue_GerundLabel>
<WorkType_Rescue_Description>Wounded colonists are brought to beds where they can be treated.</WorkType_Rescue_Description>

</LanguageData>
9 changes: 0 additions & 9 deletions Languages/German/DefInjected/WorkTypeDef/WorkTypes.xml

This file was deleted.

5 changes: 5 additions & 0 deletions Languages/German/Keyed/Text.xml
Original file line number Diff line number Diff line change
Expand Up @@ -110,4 +110,9 @@
<NoForcedWork>Keine erzw. Arbeit.</NoForcedWork>
<ForcedWorkWasInterrupted>Erzw. Arbeit von {0} wurde unterbrochen.</ForcedWorkWasInterrupted>

<WorkType_Rescue_Label>rettung</WorkType_Rescue_Label>
<WorkType_Rescue_PawnLabel>Rettung </WorkType_Rescue_PawnLabel>
<WorkType_Rescue_GerundLabel>Kolonistenrettung</WorkType_Rescue_GerundLabel>
<WorkType_Rescue_Description>Verwundete Kolonisten werden zu Betten gebracht wo sie behandelt werden können</WorkType_Rescue_Description>

</LanguageData>
9 changes: 0 additions & 9 deletions Languages/Spanish/DefInjected/WorkTypeDef/WorkTypes.xml

This file was deleted.

5 changes: 5 additions & 0 deletions Languages/Spanish/Keyed/Text.xml
Original file line number Diff line number Diff line change
Expand Up @@ -110,4 +110,9 @@
<NoForcedWork>No hay trabajo forzado</NoForcedWork>
<ForcedWorkWasInterrupted>Se interrumpió el trabajo forzado de {0}.</ForcedWorkWasInterrupted>

<WorkType_Rescue_Label>rescate</WorkType_Rescue_Label>
<WorkType_Rescue_PawnLabel>Rescate</WorkType_Rescue_PawnLabel>
<WorkType_Rescue_GerundLabel>Rescate de Colonos</WorkType_Rescue_GerundLabel>
<WorkType_Rescue_Description>Los colonos heridos son llevados a camas donde pueden ser tratados</WorkType_Rescue_Description>

</LanguageData>
9 changes: 0 additions & 9 deletions Languages/Swedish/DefInjected/WorkTypeDef/WorkTypes.xml

This file was deleted.

5 changes: 5 additions & 0 deletions Languages/Swedish/Keyed/Text.xml
Original file line number Diff line number Diff line change
Expand Up @@ -110,4 +110,9 @@
<NoForcedWork>Inget påtvingat arbete</NoForcedWork>
<ForcedWorkWasInterrupted>Påtvingat arbete av {0} avbröts.</ForcedWorkWasInterrupted>

<WorkType_Rescue_Label>rädda</WorkType_Rescue_Label>
<WorkType_Rescue_PawnLabel>Rädda</WorkType_Rescue_PawnLabel>
<WorkType_Rescue_GerundLabel>Kolonisträddning</WorkType_Rescue_GerundLabel>
<WorkType_Rescue_Description>Skadade kolonister tas till sängar där de kan behandlas.</WorkType_Rescue_Description>

</LanguageData>
2 changes: 1 addition & 1 deletion Source/Achtung.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@

<ItemGroup>
<PackageReference Include="Brrainz.RimWorld.CrossPromotion" Version="1.1.1" />
<PackageReference Include="Brrainz.RimWorld.ModFeatures" Version="1.0.0" />
<PackageReference Include="Krafs.Rimworld.Ref" Version="1.4.3704" GeneratePathProperty="true" />
<PackageReference Include="Lib.Harmony" Version="2.2.2" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="7.0.4" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net472" Version="1.0.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="ModFeatures" Version="1.0.0" />
<PackageReference Include="RimWorld.MultiplayerAPI" Version="0.4.0" />
<PackageReference Include="TaskPubliciser" Version="1.0.3" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Source/Main.cs
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,10 @@ public static void Prefix()
{
ForcedWork.Instance = null;

var rescuing = DefDatabase<WorkTypeDef>.GetNamedSilentFail(Tools.rescuingWorkTypeDef.defName);
var rescuing = DefDatabase<WorkTypeDef>.GetNamedSilentFail(Tools.RescuingWorkTypeDef.defName);
var doctorRescueWorkGiver = DefDatabase<WorkGiverDef>.GetNamed("DoctorRescue");
if (rescuing == null && Achtung.Settings.rescueEnabled)
Tools.savedWorkTypeDef = DynamicWorkTypes.AddWorkTypeDef(Tools.rescuingWorkTypeDef, doctorRescueWorkGiver);
Tools.savedWorkTypeDef = DynamicWorkTypes.AddWorkTypeDef(Tools.RescuingWorkTypeDef, doctorRescueWorkGiver);

Log.Message($"Achtung v{Performance.GetModVersionString()} Info: To make Achtung log some performance info, create an empty 'AchtungPerformance.txt' file in same directory as Player.log");
}
Expand Down
6 changes: 3 additions & 3 deletions Source/Settings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,12 @@ public static void DoWindowContents(Rect canvas)
}
list.Gap(18);
list.CheckboxEnhanced("RescueEnabled", ref Achtung.Settings.rescueEnabled);
var rescuing = DefDatabase<WorkTypeDef>.GetNamedSilentFail(Tools.rescuingWorkTypeDef.defName);
var rescuing = DefDatabase<WorkTypeDef>.GetNamedSilentFail(Tools.RescuingWorkTypeDef.defName);
var doctorRescueWorkGiver = DefDatabase<WorkGiverDef>.GetNamed("DoctorRescue");
if (rescuing == null && Achtung.Settings.rescueEnabled)
Tools.savedWorkTypeDef = DynamicWorkTypes.AddWorkTypeDef(Tools.rescuingWorkTypeDef, doctorRescueWorkGiver);
Tools.savedWorkTypeDef = DynamicWorkTypes.AddWorkTypeDef(Tools.RescuingWorkTypeDef, doctorRescueWorkGiver);
else if (rescuing != null && Achtung.Settings.rescueEnabled == false)
DynamicWorkTypes.RemoveWorkTypeDef(Tools.rescuingWorkTypeDef, Tools.savedWorkTypeDef, doctorRescueWorkGiver);
DynamicWorkTypes.RemoveWorkTypeDef(Tools.RescuingWorkTypeDef, Tools.savedWorkTypeDef, doctorRescueWorkGiver);

// var r = list.GetRect(Tools.menuExampleTexture.height);
// r.width = r.height * Tools.menuExampleTexture.width / Tools.menuExampleTexture.height;
Expand Down
10 changes: 5 additions & 5 deletions Source/Tools.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ static class Tools
public static string goHereLabel;
public static WorkTypeDef savedWorkTypeDef = null;

public static WorkTypeDef rescuingWorkTypeDef = new WorkTypeDef()
public static WorkTypeDef RescuingWorkTypeDef => new WorkTypeDef()
{
defName = "Rescuing",
labelShort = "rescue",
pawnLabel = "Rescue",
gerundLabel = "Rescuing",
description = "Rescue colonists",
labelShort = "WorkType_Rescue_Label".Translate(),
pawnLabel = "WorkType_Rescue_PawnLabel".Translate(),
gerundLabel = "WorkType_Rescue_GerundLabel".Translate(),
description = "WorkType_Rescue_Description".Translate(),
verb = "Rescue",
naturalPriority = 1310,
alwaysStartActive = true,
Expand Down

0 comments on commit 856fa29

Please sign in to comment.