Attempt at fixing unidentified error on SettingsChanged.

jptrrs · Feb 11, 2020 · 95fbfb7 · 95fbfb7
1 parent 2810699
commit 95fbfb7
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 102 deletions.
diff --git a/About/Manifest.xml b/About/Manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <Manifest>
   <identifier>BurnItForFuel</identifier>
-  <version>2.1</version>
+  <version>2.1.2</version>
   <dependencies>
     <li>HugsLib</li>
   </dependencies>

diff --git a/About/Version.xml b/About/Version.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VersionData>
-  <overrideVersion>2.0.0</overrideVersion>
+  <overrideVersion>2.1.2</overrideVersion>
 </VersionData>
diff --git a/Assemblies/BurnItForFuel.dll b/Assemblies/BurnItForFuel.dll
diff --git a/Languages/English/Keyed/BurnItForFuel_keys.xml b/Languages/English/Keyed/BurnItForFuel_keys.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <LanguageData>
   <TabFuel>Fuel</TabFuel>
-  <FuelSettingsNote>&lt;size=20&gt;&lt;b&gt;Fuel List:&lt;/b&gt;&lt;/size&gt;
-&lt;size=16&gt;Select what should be considered fuel.&lt;/size&gt;
+  <FuelSettingsNote>Select what should be considered fuel. Items selected here will appear on the fuel tab of every relevant building. From there you can decide what your colonists will actually bring to be burned in.
 
 &lt;b&gt;Notes:&lt;/b&gt;
-&lt;b&gt;1.&lt;/b&gt; Please reload your game for the changes to have full effect
+&lt;b&gt;1.&lt;/b&gt; Please reload your game for the changes to have full effect.
 &lt;b&gt;2.&lt;/b&gt; Deselecting any resource normally used by a building (&lt;i&gt;e.g.&lt;/i&gt; wood logs for the campfire) will disable that building's fuel tab, and it will revert to using only their original fuel.
 &lt;b&gt;3.&lt;/b&gt; The Pod Laucher and any other building that allows for fuel level adjustment are also excluded.
 &lt;b&gt;4.&lt;/b&gt; Fuel units are always the same for any resource: 1 unit = 1 fuel.

diff --git a/Languages/Portuguese/Keyed/BurnItForFuel_keys.xml b/Languages/Portuguese/Keyed/BurnItForFuel_keys.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <LanguageData>
   <TabFuel>Combustível</TabFuel>
-<FuelSettingsNote>&lt;size=20&gt;&lt;b&gt;Lista de Combustíveis:&lt;/b&gt;&lt;/size&gt;
-&lt;size=16&gt;Escolha o que deve ser considerado combustível.&lt;/size&gt;
+<FuelSettingsNote>Escolha o que deve ser considerado combustível. Os itens aqui selecionados vão aparecer na guia de combustível de cada construção onde isto for relevante. Ali poderás decidir o quê seus colonos vão queimar afinal naquele sítio.
 
 &lt;b&gt;Notas:&lt;/b&gt;
 &lt;b&gt;1.&lt;/b&gt; Desmarcar um recurso que é normalmente utilizado por uma construção (ex.: madeira para a fogueira) desativa o painel de combustível para aquela construção e ela vai voltar a usar apenas seu combustível original.

diff --git a/Languages/PortugueseBrazilian/Keyed/BurnItForFuel_keys.xml b/Languages/PortugueseBrazilian/Keyed/BurnItForFuel_keys.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <LanguageData>
   <TabFuel>Combustível</TabFuel>
-<FuelSettingsNote>&lt;size=20&gt;&lt;b&gt;Lista de Combustíveis:&lt;/b&gt;&lt;/size&gt;
-&lt;size=16&gt;Escolha o que deve ser considerado combustível.&lt;/size&gt;
+<FuelSettingsNote>Escolha o que deve ser considerado combustível. Os itens selecionados aqui vão aparecer na guia de combustível de cada construção onde isto for relevante. Alí você poderá decidir o quê seus colonos vão de fato queimar naquele local.
 
 &lt;b&gt;Notas:&lt;/b&gt;
 &lt;b&gt;1.&lt;/b&gt; Desmarcar um recurso que é normalmente utilizado por uma construção (ex.: madeira para a fogueira) desativa o painel de combustível para aquela construção e ela vai voltar a usar apenas seu combustível original.

diff --git a/Source/BurnItForFuel.csproj b/Source/BurnItForFuel.csproj
@@ -21,7 +21,7 @@
     <OutputPath>..\Assemblies\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <WarningLevel>3</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>

diff --git a/Source/JobDriver_MakeBed.cs b/Source/JobDriver_MakeBed.cs
diff --git a/Source/ModBaseBurnItForFuel.cs b/Source/ModBaseBurnItForFuel.cs
@@ -83,10 +83,13 @@ public override void SettingsChanged()
                     foreach (Thing t in affected)
                     {
                         Building b = t as Building;
-                        CompSelectFuel comp = b.GetComp<CompSelectFuel>();
-                        if (comp != null)
+                        if (b != null)
                         {
-                            comp.ValidateFuelSettings();
+                            CompSelectFuel comp = b.GetComp<CompSelectFuel>();
+                            if (comp != null)
+                            {
+                                comp.ValidateFuelSettings();
+                            }
                         }
                     }
                 });

diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0")]
-[assembly: AssemblyFileVersion("2.1")]
+[assembly: AssemblyFileVersion("2.1.2")]