[FIXED] police car spawn point.

[FIXED] Infinity fire trucks and disaster response trucks.
MacSergey · Nov 16, 2022 · efff5b5 · efff5b5
1 parent 4fd49b2
commit efff5b5
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 29 deletions.
diff --git a/BuildingSpawnPoints/BuildingSpawnPoints.csproj b/BuildingSpawnPoints/BuildingSpawnPoints.csproj
@@ -13,11 +13,11 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<AssemblyVersion>1.3.0.104</AssemblyVersion>
+		<AssemblyVersion>1.3.0.105</AssemblyVersion>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)' == 'Stable Release' OR '$(Configuration)' == 'Stable Debug'">
-		<AssemblyVersion>1.3.0.3</AssemblyVersion>
+		<AssemblyVersion>1.3.1</AssemblyVersion>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Stable Release|AnyCPU'">

diff --git a/BuildingSpawnPoints/Mod.cs b/BuildingSpawnPoints/Mod.cs
@@ -28,6 +28,7 @@ public class Mod : BasePatcherMod<Mod>
 
         public override List<ModVersion> Versions => new List<ModVersion>()
         {
+            new ModVersion(new Version(1,3,1), new DateTime(2022, 11, 16)),
             new ModVersion(new Version(1,3), new DateTime(2022, 9, 14)),
             new ModVersion(new Version(1,2,4), new DateTime(2022, 6, 19)),
             new ModVersion(new Version(1,2,3), new DateTime(2021, 8, 25)),

diff --git a/BuildingSpawnPoints/Patcher.cs b/BuildingSpawnPoints/Patcher.cs
@@ -234,7 +234,7 @@ public static bool CargoTrainAI_SetSource_Prefix(CargoTrainAI __instance, ushort
             {
                 data.Unspawn(vehicleID);
 
-                var building = sourceBuilding.GetBuilding();
+                ref var building = ref sourceBuilding.GetBuilding();
                 var randomizer = new Randomizer(vehicleID);
                 building.Info.m_buildingAI.CalculateSpawnPosition(sourceBuilding, ref building, ref randomizer, __instance.m_info, out var position, out _);
 
@@ -243,8 +243,8 @@ public static bool CargoTrainAI_SetSource_Prefix(CargoTrainAI __instance, ushort
                 data.m_targetPos1 = data.m_targetPos0;
                 data.m_targetPos2 = data.m_targetPos0;
                 data.m_targetPos3 = data.m_targetPos0;
-                Singleton<BuildingManager>.instance.m_buildings.m_buffer[sourceBuilding].AddOwnVehicle(vehicleID, ref data);
-                if ((sourceBuilding.GetBuilding().m_flags & Building.Flags.IncomingOutgoing) != 0)
+                building.AddOwnVehicle(vehicleID, ref data);
+                if ((building.m_flags & Building.Flags.IncomingOutgoing) != 0)
                 {
                     if ((data.m_flags & Vehicle.Flags.TransferToTarget) != 0)
                         data.m_flags |= Vehicle.Flags.Importing;
@@ -266,7 +266,7 @@ private static void VehicleAISetSource<TypeAI>(TypeAI instance, ushort vehicleID
             {
                 data.Unspawn(vehicleID);
 
-                var building = sourceBuilding.GetBuilding();
+                ref var building = ref sourceBuilding.GetBuilding();
                 var randomizer = new Randomizer(vehicleID);
                 building.Info.m_buildingAI.CalculateSpawnPosition(sourceBuilding, ref building, ref randomizer, instance.m_info, out var position, out var target);
                 var rotation = Quaternion.identity;

diff --git a/BuildingSpawnPoints/Properties/Localize.Designer.cs b/BuildingSpawnPoints/Properties/Localize.Designer.cs
diff --git a/BuildingSpawnPoints/Properties/Localize.resx b/BuildingSpawnPoints/Properties/Localize.resx
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Mod_Description" xml:space="preserve">
     <value>Change and add vehicles spawn points</value>
@@ -158,6 +158,10 @@
   <data name="Mod_WhatsNewMessage1_3" xml:space="preserve">
     <value>[UPDATED] Added Plazas &amp; Promenades DLC support.</value>
   </data>
+  <data name="Mod_WhatsNewMessage1_3_1" xml:space="preserve">
+    <value>[FIXED] police car spawn point.
+[FIXED] Infinity fire trucks and disaster response trucks.</value>
+  </data>
   <data name="Panel_AddAllVehicle" xml:space="preserve">
     <value>Add all types of vehicles</value>
   </data>

diff --git a/BuildingSpawnPoints/Properties/Localize.ru.resx b/BuildingSpawnPoints/Properties/Localize.ru.resx
@@ -59,46 +59,46 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
           <xsd:element name="metadata">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string"/>
-              <xsd:attribute name="type" type="xsd:string"/>
-              <xsd:attribute name="mimetype" type="xsd:string"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
             <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string"/>
-              <xsd:attribute name="name" type="xsd:string"/>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="data">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
             </xsd:complexType>
           </xsd:element>
         </xsd:choice>
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Mod_Description" xml:space="preserve">
     <value>Измените и добавьте точки появления транспортных средств</value>
@@ -158,6 +158,10 @@
   <data name="Mod_WhatsNewMessage1_3" xml:space="preserve">
     <value>[UPDATED] Добавлена поддержка Plazas &amp; Promenades DLC.</value>
   </data>
+  <data name="Mod_WhatsNewMessage1_3_1" xml:space="preserve">
+    <value>[FIXED] Точка появления полицейских машин.
+[FIXED] Бесконечные пожарные и спасательные машины.</value>
+  </data>
   <data name="Panel_AddAllVehicle" xml:space="preserve">
     <value>Добавить все типы транспортных средств</value>
   </data>
@@ -212,7 +216,6 @@
   <data name="Panel_TooFarPoint" xml:space="preserve">
     <value>Эта точка расположена слишком далеко от дорог для некоторых типов транспортных средств, пододвиньте ее ближе иначе на не будет работать</value>
   </data>
-
   <data name="PointType_Spawn" xml:space="preserve">
     <value>Появление</value>
   </data>