From e09be328db8e085ae55ec362941f3c3f321da6aa Mon Sep 17 00:00:00 2001 From: ihsoft Date: Fri, 6 Dec 2019 20:51:03 -0800 Subject: [PATCH 1/5] Start v1.24 --- CHANGELOG.md | 2 ++ Source/Properties/AssemblyInfo.cs | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 55fbf107..58c83eae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +# 1.24 (pre-release): + # 1.23 (October 23rd, 2019): * [Change] `KSP 1.8` compatibility. __WARNING__: the mod won't work with version lower than `KSP 1.8`! * [Change] Replace `Editor/partGrabModifiers` setting with `Editor/editorPartGrabAction`. diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs index 7025671d..20c18c76 100644 --- a/Source/Properties/AssemblyInfo.cs +++ b/Source/Properties/AssemblyInfo.cs @@ -29,6 +29,6 @@ // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion ("1.23.*")] -[assembly: AssemblyInformationalVersion ("1.23 for KSP 1.8+")] -[assembly: KSPAssembly ("KIS", 1, 23)] +[assembly: AssemblyVersion ("1.24.*")] +[assembly: AssemblyInformationalVersion ("1.24 for KSP 1.8+")] +[assembly: KSPAssembly ("KIS", 1, 24)] From 461c3c7021831c847c03022bcfda7884f0641352 Mon Sep 17 00:00:00 2001 From: ihsoft Date: Fri, 6 Dec 2019 20:52:44 -0800 Subject: [PATCH 2/5] Fix #352 Reset mass/cost on every recalculate. --- CHANGELOG.md | 1 + Source/KIS_Item.cs | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 58c83eae..431be0bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ # 1.24 (pre-release): +* [Fix #352] Incorrect calculation of resources on the equipped items. # 1.23 (October 23rd, 2019): * [Change] `KSP 1.8` compatibility. __WARNING__: the mod won't work with version lower than `KSP 1.8`! diff --git a/Source/KIS_Item.cs b/Source/KIS_Item.cs index 420d1a26..0ce731a2 100644 --- a/Source/KIS_Item.cs +++ b/Source/KIS_Item.cs @@ -735,6 +735,8 @@ void CaptureItemStateFromPart(Part copyFrom) { + copyFrom.GetModuleMass(copyFrom.partInfo.partPrefab.mass); _itemDryCost = copyFrom.partInfo.cost + copyFrom.GetModuleCosts(copyFrom.partInfo.cost); + _resourceMass = 0; + _resourceCost = 0; foreach (var resource in copyFrom.Resources) { _resourceMass += (float)resource.amount * resource.info.density; _resourceCost += (float)resource.amount * resource.info.unitCost; From 1d75c7ee5e6faf3ea07589d4c110de14b095839a Mon Sep 17 00:00:00 2001 From: ihsoft Date: Fri, 6 Dec 2019 22:26:53 -0800 Subject: [PATCH 3/5] Workaround #354 Update to the recent KSPDev that addresses it. It doesn't really fix the issue, it only elimiates the bad GUI behavior. --- ...Dev_Utils.2.0.dll => KSPDev_Utils.2.1.dll} | Bin 135168 -> 135168 bytes ...Dev_Utils.2.0.xml => KSPDev_Utils.2.1.xml} | 48 ++++++++++-------- Source/KIS.csproj | 4 +- 3 files changed, 28 insertions(+), 24 deletions(-) rename Binaries/{KSPDev_Utils.2.0.dll => KSPDev_Utils.2.1.dll} (61%) rename Binaries/{KSPDev_Utils.2.0.xml => KSPDev_Utils.2.1.xml} (99%) diff --git a/Binaries/KSPDev_Utils.2.0.dll b/Binaries/KSPDev_Utils.2.1.dll similarity index 61% rename from Binaries/KSPDev_Utils.2.0.dll rename to Binaries/KSPDev_Utils.2.1.dll index cd9f79b9f219a4551396e2d87f7533e946f70c4b..f3f4aceae13aae0d2d8d6734e222a56bc1e26b06 100644 GIT binary patch delta 20190 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 delta 20005 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 QALl9Q^S?zvE8ATE2TRL_@&Et; diff --git a/Binaries/KSPDev_Utils.2.0.xml b/Binaries/KSPDev_Utils.2.1.xml similarity index 99% rename from Binaries/KSPDev_Utils.2.0.xml rename to Binaries/KSPDev_Utils.2.1.xml index cc396c40..ca24da6d 100644 --- a/Binaries/KSPDev_Utils.2.0.xml +++ b/Binaries/KSPDev_Utils.2.1.xml @@ -1,7 +1,7 @@ - KSPDev_Utils.2.0 + KSPDev_Utils.2.1 @@ -2465,7 +2465,7 @@ The key to find a message for. The relevant message if the is found. Otherwise, either the - or a string represenation of the key. It's never null. + or a string representation of the key. It's never null. @@ -2645,7 +2645,7 @@ The template of the messages supports special tags that may give a hint to the caller code on - how the messages should be rendered. Those tags must be palced at the beginning of the template. + how the messages should be rendered. Those tags must be placed at the beginning of the template. For the available tags see . @@ -2676,7 +2676,7 @@ - Tag to use when resolving the string via the Localizer. + Tag to use when resolving the string via the localizer. It can be null to indicate that the localization is not needed. In this case the will be used as text. @@ -2688,7 +2688,7 @@ GUI specific settings that suggest how to show the message. - Due to the lazzy update nature of the localized messages, these settings are not + Due to the lazy update nature of the localized messages, these settings are not loaded until the message is used at least once. The caller code may ensure the values are updated by calling to , or by simply getting the value. @@ -2711,7 +2711,7 @@ Constructs a localizable message. The tag to use when getting the localized version of the template. If null then the - message will alaways use as text. + message will always use as text. @@ -2730,7 +2730,7 @@ specifying the circumstances of when this string is displayed. The context does matter! - An example of how the template can be used and what is the output in the langauge of the + An example of how the template can be used and what is the output in the language of the . Provide it to illustrate the non-obvious cases. Lingoona Grammar help @@ -2751,13 +2751,13 @@ When current language is changed the cached version needs to be reloaded. Call - the method to force it. However, as of KSP 1.3.0 the langauge + the method to force it. However, as of KSP 1.3.0 the language cannot be changed while the game is running. A Lingoona Grammar template in the - current languge. + current language. @@ -2765,27 +2765,29 @@ - Various values that give hints on how the messages should be presented in GUI. + + Various values that give hints on how the messages should be presented in GUI. + - It's up to the caller to handle theses settings. They improve the appearence, but are not + It's up to the caller to handle theses settings. They improve the appearance, but are not required for the proper content presentation. Minimum width of the area in GUI. - Defined via tag: <gui:min:width,heigth> + Defined via tag: <gui:min:width,height> Minimum height of the area in GUI. - Defined via tag: <gui:min:width,heigth> + Defined via tag: <gui:min:width,height> Maximum width of the area in GUI. - Defined via tag: <gui:max:width,heigth> + Defined via tag: <gui:max:width,height> Maximum height of the area in GUI. - Defined via tag: <gui:max:width,heigth> + Defined via tag: <gui:max:width,height> A utility class to localize the annotated members @@ -4553,8 +4555,8 @@ standard 101-key keyboard and, thus, have "left" and "right" keys. These are: ALT, CTRL, SHIFT, and COMMAND. - - + The event to get modifiers from. + true if the the current hold modifier(s) match the event. @@ -4566,8 +4568,8 @@ standard 101-key keyboard and, thus, have "left" and "right" keys. These are: ALT, CTRL, SHIFT, and COMMAND. - - + The event to get modifiers from. + true if the the current hold modifier(s) match the event. @@ -4579,8 +4581,8 @@ standard 101-key keyboard and, thus, have "left" and "right" keys. These are: ALT, CTRL, SHIFT, and COMMAND. - - + The event to get modifiers from. + true if the the current hold modifier(s) match the event. Extracts mouse button from a keyboard event definition. @@ -6325,6 +6327,7 @@ The game event to register for. The event listener. + The type of EventData of the related event. Helper methods to deal with the part models. @@ -6581,7 +6584,7 @@ - + Activates the component. @@ -6592,6 +6595,7 @@ Previously known scale onf UI. + The UI scale value that was in effect before the change. Set of tools to check the API method arguments. diff --git a/Source/KIS.csproj b/Source/KIS.csproj index 0c77b225..4c60d52e 100644 --- a/Source/KIS.csproj +++ b/Source/KIS.csproj @@ -52,8 +52,8 @@ Q:\KSP_x64_Data\Managed\Assembly-CSharp-firstpass.dll - - ..\Binaries\KSPDev_Utils.2.0.dll + + ..\Binaries\KSPDev_Utils.2.1.dll Q:\KSP_x64_Data\Managed\System.dll From ddd78b515e7d4d191cf2abcd36243c210eb1ae46 Mon Sep 17 00:00:00 2001 From: ihsoft Date: Fri, 6 Dec 2019 22:47:27 -0800 Subject: [PATCH 4/5] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 431be0bb..3f34b6a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ # 1.24 (pre-release): +* [Change] Add a workaround for #354 to not get GUI freezed. * [Fix #352] Incorrect calculation of resources on the equipped items. # 1.23 (October 23rd, 2019): From baff86bbda62aee732b06a9dc2627b2b4ed6c170 Mon Sep 17 00:00:00 2001 From: ihsoft Date: Fri, 6 Dec 2019 22:48:38 -0800 Subject: [PATCH 5/5] Release v1.24 --- KIS.version | 6 +++--- Tools/publish_curseforge_args.txt | 2 +- Tools/publish_github_args.txt | 2 +- Tools/publish_spacedock_args.txt | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/KIS.version b/KIS.version index 28cc9b3d..a2a8342b 100644 --- a/KIS.version +++ b/KIS.version @@ -19,9 +19,9 @@ "NAME": "Kerbal Inventory System", "URL": "https://raw.githubusercontent.com/ihsoft/KIS/master/KIS.version", "VERSION": { - "BUILD": 41726, + "BUILD": 41031, "MAJOR": 1, - "MINOR": 23, - "PATCH": 7234 + "MINOR": 24, + "PATCH": 7279 } } \ No newline at end of file diff --git a/Tools/publish_curseforge_args.txt b/Tools/publish_curseforge_args.txt index 391a8a4f..e0fbdffe 100644 --- a/Tools/publish_curseforge_args.txt +++ b/Tools/publish_curseforge_args.txt @@ -4,4 +4,4 @@ --github=ihsoft/KIS --versions=latest_all_builds --title=KIS {tag} ---archive=../KIS_v1.23.zip +--archive=../KIS_v1.24.zip diff --git a/Tools/publish_github_args.txt b/Tools/publish_github_args.txt index 1fb4374b..0a179e16 100644 --- a/Tools/publish_github_args.txt +++ b/Tools/publish_github_args.txt @@ -4,4 +4,4 @@ --changelog=../CHANGELOG.md --as_draft --title=KIS v{tag} ---archive=../KIS_v1.23.zip +--archive=../KIS_v1.24.zip diff --git a/Tools/publish_spacedock_args.txt b/Tools/publish_spacedock_args.txt index 1f6e62b5..56953e74 100644 --- a/Tools/publish_spacedock_args.txt +++ b/Tools/publish_spacedock_args.txt @@ -3,4 +3,4 @@ --changelog=../CHANGELOG.md --github=ihsoft/KIS --ksp_version=latest ---archive=../KIS_v1.23.zip +--archive=../KIS_v1.24.zip