Merge branch 'Beta' into Translation

MacSergey · Mar 4, 2023 · 25fb5f1 · 25fb5f1
2 parents 9c13a53 + 774120c
commit 25fb5f1
Show file tree

Hide file tree

Showing 17 changed files with 415 additions and 324 deletions.
diff --git a/ModsCommon b/ModsCommon
diff --git a/NodeControllerRenewal/Manager/BaseNodeType.cs b/NodeControllerRenewal/Manager/BaseNodeType.cs
diff --git a/NodeControllerRenewal/Manager/NodeData.cs b/NodeControllerRenewal/Manager/NodeData.cs
@@ -82,7 +82,7 @@ public IEnumerable<SegmentEndData> MainSegmentEndDatas
         public bool IsStraight => IsTwoRoads && MainDot < -0.995f;
         public bool Is180 => IsTwoRoads && MainDot > 0.995f;
         public bool IsEqualWidth => IsTwoRoads && Math.Abs(FirstSegment.Info.m_halfWidth - SecondSegment.Info.m_halfWidth) < 0.001f;
-        public bool HasNodeLess => SegmentEndDatas.Any(s => s.FinalNodeLess);
+        public bool HasNodeLess => SegmentEndDatas.Any(s => s.IsNodeLess);
         public bool IsUnderground => Id.GetNode().m_flags.IsSet(NetNode.Flags.Underground);
         public bool IsSameRoad
         {
@@ -278,7 +278,7 @@ private void UpdateSegmentEndSet()
                     newSegmentEnds[newSegmentEnd.Id] = newSegmentEnd;
 
                     if (Style is NodeStyle style)
-                        newSegmentEnd.ResetToDefault(style, mode, true);
+                        newSegmentEnd.ResetToDefault(style, mode, true, false);
                 }
             }
 #if DEBUG && EXTRALOG
@@ -582,7 +582,7 @@ private void SetType(NodeStyleType type, bool force)
 
             var mode = Mode;
             foreach (var segmentEnd in SegmentEndDatas)
-                segmentEnd.ResetToDefault(Style, mode, force);
+                segmentEnd.ResetToDefault(Style, mode, force, false);
         }
         public void SetMain(ushort first, ushort second)
         {

diff --git a/NodeControllerRenewal/Manager/NodeType.cs b/NodeControllerRenewal/Manager/NodeType.cs
@@ -148,7 +148,7 @@ public class CrossingNode : NodeStyle
         public override SupportOption SupportTwist => SupportOption.Group;
         public override SupportOption SupportStretch => SupportOption.Group;
         public override SupportOption SupportMarking => SupportOption.All;
-        public override bool OnlyKeepDefault => true;
+        public override bool ForceKeepDefault => true;
         public override bool SupportTrafficLights => true;
         public override bool NeedFixDirection => false;
 
@@ -173,7 +173,7 @@ public class UTurnNode : NodeStyle
         public override SupportOption SupportMarking => SupportOption.All;
         public override SupportOption SupportMode => SupportOption.Group;
         public override bool SupportTrafficLights => true;
-        public override bool OnlyKeepDefault => true;
+        public override bool ForceKeepDefault => true;
         public override bool NeedFixDirection => false;
 
         public UTurnNode(NodeData data) : base(data) { }
+1 −7		DependencyShared/DependenciesMessageBox.cs
+0 −4		DependencyShared/DependenciesWatcher.cs
+1 −3		DependencyShared/DependencyInfo.cs
+42 −19		HeaderShared/HeaderButton.cs
+27 −4		HeaderShared/HeaderContent.cs
+13 −9		HeaderShared/HeaderPanel.cs
+32 −20		HeaderShared/HeaderPopupButton.cs
+0 −2		LoadExtensionShared/Loader.cs
+23 −9		LoadExtensionShared/LoadingExtension.cs
+0 −4		LoadExtensionShared/Patcher.cs
+13 −4		LoadExtensionShared/SerializableDataExtension.cs
+1 −1		LocalizeShared/LocalizeExtension.cs
+3 −5		LocalizeShared/LocalizeManager/Manager.cs
+0 −1		LocalizeShared/LocalizeManager/ResxReader.cs
+117 −1		MathExtension/MathExtention.cs
+6 −5		MessageBoxShared/BaseMessageBox.cs
+3 −5		ModShared/BaseMod.cs
+43 −22		ModShared/BasePatcherMod.cs
+1 −0		ModShared/ModsCommonShared.projitems
+13 −8		ModShared/Settings.cs
+1 −1		ModShared/Utilities/Extensions/EnumExtension.cs
+16 −0		ModShared/Utilities/Extensions/ResourceUtility.cs
+1 −5		ModShared/Utilities/Manager.cs
+2 −2		ModShared/Utilities/Shortcut.cs
+0 −1		ModShared/Utilities/Transpiler.cs
+0 −1		ModShared/Utilities/Utilites.cs
+1 −4		ModsBridge/IMarkingNetInfo.cs
+0 −1		ModsBridge/Properties/AssemblyInfo.cs
+5 −9		NetAssetDataExtension/AssetDataExtension.cs
+1 −5		NetAssetDataExtension/Patcher.cs
+4 −7		NetExtension/NetExtension.cs
+2 −6		NetObjectMapShared/ObjectMap.cs
+2 −4		ObjectMapShared/ObjectMap.cs
+33 −26		PropertyPanelShared/BaseProperty.cs
+7 −1		PropertyPanelShared/ButtonPanel.cs
+217 −41		PropertyPanelShared/ColorProperty.cs
+7 −7		PropertyPanelShared/EnumProperty.cs
+3 −3		PropertyPanelShared/FieldProperty.cs
+5 −3		PropertyPanelShared/GroupPanel.cs
+4 −4		PropertyPanelShared/ListProperty.cs
+1 −0		PropertyPanelShared/PropertyPanelShared.projitems
+0 −1		PropertyPanelShared/SelectProperty.cs
+168 −0		PropertyPanelShared/SliderProperty.cs
+1 −6		PropertyPanelShared/VariationProperty.cs
+4 −7		PropertyPanelShared/VectorProperty.cs
+121 −24		PropertyValueShared/PropertyValue.cs
+1 −3		RenderExtension/RenderExtension.cs
+1 −0		SingletonShared/Singleton.cs
+0 −2		ToolPanelShared/Panel.cs
+1 −1		ToolShared/BaseSelectMode.cs
+0 −1		ToolShared/BaseToolMode.cs
+1 −4		ToolShared/Patcher.cs
+2 −2		ToolShared/Selection.cs
+0 −1		ToolShared/ToolButton.cs
+16 −6		TrajectoryShared/Bezier.cs
+3 −7		TrajectoryShared/Bound.cs
+17 −9		TrajectoryShared/Combined.cs
+0 −2		TrajectoryShared/Helper.cs
+4 −5		TrajectoryShared/ITrajectory.cs
+409 −198		TrajectoryShared/Intersects.cs
+13 −33		TrajectoryShared/Points.cs
+10 −6		TrajectoryShared/Straight.cs
+303 −0		TriangulatorShared/Area.cs
+74 −137		TriangulatorShared/Triangulator.cs
+1 −0		TriangulatorShared/Triangulator.projitems
+33 −0		UIShared/Custom elements/CustomElements.cs
+67 −68		UIShared/Custom elements/CustomUIListbox.cs
+0 −6		UIShared/Custom elements/CustomUITextField.cs
+1 −4		UIShared/Custom elements/MultyAtlasUIButton.cs
+1 −8		UIShared/DonatePanel.cs
+3 −5		UIShared/DropDown.cs
+0 −2		UIShared/Keymapping.cs
+1 −0		UIShared/ModsUIShared.projitems
+158 −24		UIShared/Popup.cs
+ −		UIShared/Resources/CloseButton/CloseButton.psd
+ −		UIShared/Resources/CloseButton/CloseButtonHovered.png
+ −		UIShared/Resources/CloseButton/CloseButtonNormal.png
+ −		UIShared/Resources/CloseButton/CloseButtonPressed.png
+43 −30		UIShared/Segmented.cs
+2 −3		UIShared/Selector.cs
+1 −4		UIShared/SizeChanger.cs
+3 −2		UIShared/Utilities/CommonTextures.cs
+8 −1		UIShared/Utilities/ComponentPool.cs
+0 −3		UIShared/Utilities/Style.cs
+1 −2		UIShared/Utilities/UIExtension.cs
+3 −1		UIShared/Utilities/UIHelper.cs
+22 −12		UIShared/ValueField.cs
+139 −0		UIShared/ValueSlider.cs
+1 −3		UUIRegisterShared/UUIRegister.cs
+121 −90		WhatsNewMessageBoxShared/WhatsNewMessageBox.cs