diff --git a/About/About.xml b/About/About.xml index e40bf7c..30bdbef 100644 --- a/About/About.xml +++ b/About/About.xml @@ -1,56 +1,20 @@ - + - Research Tree - Fluffy - https://ludeon.com/forums/index.php?topic=16120 - 0.19.1996 - A better research tree. - -<size=24>Features</size> - -automatically generated to maximize readability*. -shows research projects, buildings, plants and recipes unlocked by each research project. -projects can be queued, and colonists will automatically start the next project when the current research project completes. -search functionality to quickly find research projects. - -<size=24>FAQ</size> -<i>Can I add/remove this from an existing save?</i> -You can add it to existing saves without problems. Removing this mod will lead to some errors when loading, but these should not affect gameplay - and will go away after saving. - -<i>Why is research X in position Y?</i> -Honestly, I have no idea. The placement of projects (nodes) is automated to minimize the number of crossings between dependancies (edges), and reduce the total length of these edges. There are many possible scenarios in which this can lead to placements that may appear non-optimal. Sometimes they really are non-optimal, sometimes they just appear to be so. See also the <i>technical</i> section below for more information. - -<i>Can I use this with mod X</i> -Most likely, yes. Added researches and their requirements are automatically parsed and the tree layout will be updated accordingly. ResearchPal implements a lot of the same functionality as this mod, and the research queue will likely not work correctly if both mods are loaded. - -<i>This looks very similar to ResearchPal</i> -Yep. ResearchPal is based on a legacy version of this mod that was kept up-to-date by SkyArkAngel in the HCSK modpack. I haven’t worked on this mod in a long time, but I recently had some spare time and decided to give it another go. Feel free to use whichever you like better (ResearchPal has an entirely different layout algorithm). You can run both mods side by side to check out the different tree layouts, but be aware that the research queue will not work correctly if both mods are loaded. - -<size=24>Known Issues</size> - -The vertical labels for tech levels are drawn in the wrong location when UI scale is not 1. This is a known problem for me, the same issue appears in my Work Tab mod. As soon as I have a working solution, I’ll go and fix it. -Layouts are not perfect, if you have experience with graph layouts - please do feel free to look at the source code, and/or implement a Sugiyama layout algorithm for me that runs in C# .NET 3.5 (Mono 2.0). - -<size=24>Technical</size> -So how does this all work? - -Creating an optimal layout is a known problem in the area of <i>Graph Theory</i>. There’s serious mathematicians who’ve spent years of their live trying to figure out this problem, and numerous solutions exist. The group of solutions most relevant to our research tree (a <i>directed acyclic graph</i>, or <i>DAG</i>) is that derived from Sugiyama’s work. Generally speaking, these algorithms have four steps; - - -layering (set the <i>x</i> coordinates of nodes, enforcing that follow-up research is always at a higher x position than any of its prerequisites, this is a fairly straightforward heuristic) -crossing reduction (set the <i>y</i> coordinates of nodes such that there is a minimal amount of intersections of connections between nodes) -edge length reduction (set the <i>y</i> coordinates of nodes such that the length of connections between nodes is minimal) -horizontal alignment (set the <i>y</i> coordinates of nodes such that the connections between nodes are straight as much as possible) - -The final step is the hardest, but also the most important to create a visually pleasing tree. Sadly, I’ve been unable to implement two of the most well known algorithms for this purpose; - - -Brandes, U., & Köpf, B. (2001, September). Fast and simple horizontal coordinate assignment. -Eiglsperger M., Siebenhaller M., Kaufmann M. (2005) An Efficient Implementation of Sugiyama’s Algorithm for Layered Graph Drawing. -Luckily, the crossing reduction and edge length reduction steps partially achieve the goals of the final step. The final graph is not as pretty as it could be, but it’s still pretty good - in most scenarios. - -<size=24>Version</size> -This is version 2.15.465, for RimWorld 0.19.1996. - - - \ No newline at end of file + ResearchPal + notfood + https://ludeon.com/forums/index.php?topic=33593.0 + 0.19.0 + Smooth painless research +# Features + - automatically generated to maximize readability*. + - shows research projects, buildings, plants and recipes unlocked by each research project. + - projects can be queued, and colonists will automatically start the next project when the current research project completes. + - search functionality to quickly find research projects. + - helptab integration, right click the researches for extra information. + +# Credits: + All the work by Fluffy + Some optimizations by NotFood + Previous updates by NotFood and Skyarkangel + + diff --git a/About/Preview.png b/About/Preview.png index cb7742f..8b0f10d 100644 Binary files a/About/Preview.png and b/About/Preview.png differ diff --git a/About/PublishedFileId.txt b/About/PublishedFileId.txt new file mode 100644 index 0000000..93adaf1 --- /dev/null +++ b/About/PublishedFileId.txt @@ -0,0 +1 @@ +946390822 \ No newline at end of file diff --git a/Assemblies/ResearchTree.dll b/Assemblies/ResearchTree.dll index 7872db9..06526b5 100755 Binary files a/Assemblies/ResearchTree.dll and b/Assemblies/ResearchTree.dll differ diff --git a/Defs/MainTabDefs/MainTabWindow.xml b/Defs/MainTabDefs/MainTabWindow.xml index 921c70c..753746e 100644 --- a/Defs/MainTabDefs/MainTabWindow.xml +++ b/Defs/MainTabDefs/MainTabWindow.xml @@ -5,10 +5,10 @@ Research Examine and decide on research projects. - FluffyResearchTree.MainButtonWorker_ResearchTree - FluffyResearchTree.MainTabWindow_ResearchTree + ResearchPal.MainButtonWorker_ResearchTree + ResearchPal.MainTabWindow_ResearchTree 50 F5 - \ No newline at end of file + diff --git a/Languages/English/Keyed/KeyedTranslations.xml b/Languages/English/Keyed/KeyedTranslations.xml index 9404d87..ed071e6 100644 --- a/Languages/English/Keyed/KeyedTranslations.xml +++ b/Languages/English/Keyed/KeyedTranslations.xml @@ -1,44 +1,44 @@  - ResearchTree - - Enables construction {0} - Enables recipe {0} - Enables planting {0} in {1} - Enables growing {0} - - Left-Click to replace queue - Left-Click to remove from queue - Shift-Left-Click to add to queue - (DEBUG) Ctrl-Left-Click to instantly complete - Right click for details - - Requires - Leads to - - Already queued node - Missing {0} - - no research found - no research queued - Next in queue: {0} - - Building Research Tree - Preparing research nodes - Reducing crossings - Finalizing layout - Restoring queue - - Show Notification Popup - Whenever you finish research, pause and show the default notification. - Group Researches by Tech Level - Otherwise use a more dense layout (REQUIRES RESTART) - Pause on Display - Whenever the game should pause when the research tab is displayed. - Reset on Display - Clear filtering and reset scroll position. + ResearchPal + + Enables construction {0} + Enables recipe {0} + Enables planting {0} in {1} + Enables growing {0} + + Left-Click to replace queue + Left-Click to remove from queue + Shift-Left-Click to add to queue + (DEBUG) Ctrl-Left-Click to instantly complete + Right click for details + + Requires + Leads to + + Already queued node + Missing {0} + + no research found + no research queued + Next in queue: {0} + + Building Research Tree + Preparing research nodes + Reducing crossings + Finalizing layout + Restoring queue + + Show Notification Popup + Whenever you finish research, pause and show the default notification. + Group Researches by Tech Level + Otherwise use a more dense layout (REQUIRES RESTART) + Pause on Display + Whenever the game should pause when the research tab is displayed. + Reset on Display + Clear filtering and reset scroll position. - Research settings changed, restart RimWorld to apply the change. - Finished research: {0} + Research settings changed, restart RimWorld to apply the change. + Finished research: {0} diff --git a/README.md b/README.md new file mode 100644 index 0000000..7d7f2fc --- /dev/null +++ b/README.md @@ -0,0 +1,51 @@ +# RimWorld-ResearchPal + +[![Version](https://img.shields.io/badge/Rimworld-A19-green.svg)](http://rimworldgame.com/) +[![License: CC BY-NC-SA 4.0](https://img.shields.io/badge/License-CC%20BY--NC--SA%204.0-blue.svg)](http://creativecommons.org/licenses/by-nc-sa/4.0/) + +Smooth painless research + +# Features + - automatically generated to maximize readability*. + - shows research projects, buildings, plants and recipes unlocked by each research project. + - projects can be queued, and colonists will automatically start the next project when the current research project completes. + - search functionality to quickly find research projects. + - helptab integration, right click the researches for extra information. + +# FAQ +### *Can I add/remove this from an existing save?* + +You can add it to existing saves without problems. Removing this mod will lead to some errors when loading, but these should not affect gameplay - and will go away after saving. + +### *Why is research X in position Y?* + +Lonely unconnected researches will be found on top. The rest follows a stacking algorithm. + +### *Can I use this with mod X* + +Should work with everything, even alongside ResearchTree. They'll have different queues though. + +### *This looks very similar to ResearchTree* + +This is a fork, Fluffy's ResearchTree is the upstream project, there are minor but important differences between those two projects. +ResearchPal offers a denser layout and builds it as RimWorld starts. Less scrolling for the user and in my experience no slowdowns or lag. + +# Technical +It's all magic. Fluffy knows the how, I just adapt things. See their [GitHub](https://github.com/FluffierThanThou/ResearchTree/#Technical). + +# License +All original code in this mod is licensed under the [MIT license](https://opensource.org/licenses/MIT). Do what you want, but give me credit. +All original content (e.g. text, imagery, sounds) in this mod is licensed under the [CC-BY-SA 4.0 license](http://creativecommons.org/licenses/by-sa/4.0/). + +Parts of the code in this mod, and some content may be licensed by their original authors. If this is the case, the original author & license will either be given in the source code, or be in a LICENSE file next to the content. Please do not decompile my mods, but use the original source code available on [GitHub](https://github.com/FluffierThanThou/ResearchTree/), so license information in the source code is preserved. + +# Feeling grateful? +[Buy Fluffy a coffee](https://ko-fi.com/fluffymods). They did most of the work. + + +## Credits: +All the work by Fluffy + +Some optimizations by NotFood + +Previous updates by NotFood and Skyarkangel diff --git a/Readme.md b/Readme.md deleted file mode 100644 index 6744fc4..0000000 --- a/Readme.md +++ /dev/null @@ -1,63 +0,0 @@ -[![RimWorld Alpha undefined](https://img.shields.io/badge/RimWorld-Alpha%20undefined-brightgreen.svg)](http://rimworldgame.com/) - -A better research tree. - -# Features - - automatically generated to maximize readability*. - - shows research projects, buildings, plants and recipes unlocked by each research project. - - projects can be queued, and colonists will automatically start the next project when the current research project completes. - - search functionality to quickly find research projects. - -# FAQ -*Can I add/remove this from an existing save?* -You can add it to existing saves without problems. Removing this mod will lead to some errors when loading, but these should not affect gameplay - and will go away after saving. - -*Why is research X in position Y?* -Honestly, I have no idea. The placement of projects (nodes) is automated to minimize the number of crossings between dependancies (edges), and reduce the total length of these edges. There are many possible scenarios in which this can lead to placements that may appear non-optimal. Sometimes they really are non-optimal, sometimes they just appear to be so. See also the *technical* section below for more information. - -*Can I use this with mod X* -Most likely, yes. Added researches and their requirements are automatically parsed and the tree layout will be updated accordingly. ResearchPal implements a lot of the same functionality as this mod, and the research queue will likely not work correctly if both mods are loaded. - -*This looks very similar to ResearchPal* -Yep. ResearchPal is based on a legacy version of this mod that was kept up-to-date by SkyArkAngel in the HCSK modpack. I haven't worked on this mod in a long time, but I recently had some spare time and decided to give it another go. Feel free to use whichever you like better (ResearchPal has an entirely different layout algorithm). You can run both mods side by side to check out the different tree layouts, but be aware that the research queue will not work correctly if both mods are loaded. - -# Known Issues - - The vertical labels for tech levels are drawn in the wrong location when UI scale is not 1. This is a known problem for me, the same issue appears in my Work Tab mod. As soon as I have a working solution, I'll go and fix it. - - Layouts are not perfect, if you have experience with graph layouts - please do feel free to look at the source code, and/or implement a Sugiyama layout algorithm for me that runs in C# .NET 3.5 (Mono 2.0). - -# Technical -So how does this all work? - -Creating an optimal layout is a known problem in the area of *Graph Theory*. There's serious mathematicians who've spent years of their live trying to figure out this problem, and numerous solutions exist. The group of solutions most relevant to our research tree (a *directed acyclic graph*, or *DAG*) is that derived from Sugiyama's work. Generally speaking, these algorithms have four steps; - - layering (set the *x* coordinates of nodes, enforcing that follow-up research is always at a higher x position than any of its prerequisites, this is a fairly straightforward heuristic) - - crossing reduction (set the *y* coordinates of nodes such that there is a minimal amount of intersections of connections between nodes) - - edge length reduction (set the *y* coordinates of nodes such that the length of connections between nodes is minimal) - - horizontal alignment (set the *y* coordinates of nodes such that the connections between nodes are straight as much as possible) - -The final step is the hardest, but also the most important to create a visually pleasing tree. Sadly, I've been unable to implement two of the most well known algorithms for this purpose; - - Brandes, U., & Köpf, B. (2001, September). Fast and simple horizontal coordinate assignment. - - Eiglsperger M., Siebenhaller M., Kaufmann M. (2005) An Efficient Implementation of Sugiyama’s Algorithm for Layered Graph Drawing. -Luckily, the crossing reduction and edge length reduction steps partially achieve the goals of the final step. The final graph is not as pretty as it could be, but it's still pretty good - in most scenarios. - - - -# Think you found a bug? -Please read [this guide](http://steamcommunity.com/sharedfiles/filedetails/?id=725234314) before creating a bug report, - and then create a bug report [here](https://github.com/FluffierThanThou/ResearchTree/issues) - -# Older versions -All current and past versions of this mod can be downloaded from [GitHub](https://github.com/FluffierThanThou/ResearchTree/releases). - -# License -All original code in this mod is licensed under the [MIT license](https://opensource.org/licenses/MIT). Do what you want, but give me credit. -All original content (e.g. text, imagery, sounds) in this mod is licensed under the [CC-BY-SA 4.0 license](http://creativecommons.org/licenses/by-sa/4.0/). - -Parts of the code in this mod, and some content may be licensed by their original authors. If this is the case, the original author & license will either be given in the source code, or be in a LICENSE file next to the content. Please do not decompile my mods, but use the original source code available on [GitHub](https://github.com/FluffierThanThou/ResearchTree/), so license information in the source code is preserved. - -# Are you enjoying my mods? -Show your appreciation by buying me a coffee (or contribute towards a nice single malt). - -[![Buy Me a Coffee](http://i.imgur.com/EjWiUwx.gif)](https://ko-fi.com/fluffymods) - -# Version -This is version 2.15.465, for RimWorld 0.19.1996. \ No newline at end of file diff --git a/Source/.gitattributes b/Source/.gitattributes deleted file mode 100644 index 1ff0c42..0000000 --- a/Source/.gitattributes +++ /dev/null @@ -1,63 +0,0 @@ -############################################################################### -# Set default behavior to automatically normalize line endings. -############################################################################### -* text=auto - -############################################################################### -# Set default behavior for command prompt diff. -# -# This is need for earlier builds of msysgit that does not have it on by -# default for csharp files. -# Note: This is only used by command line -############################################################################### -#*.cs diff=csharp - -############################################################################### -# Set the merge driver for project and solution files -# -# Merging from the command prompt will add diff markers to the files if there -# are conflicts (Merging from VS is not affected by the settings below, in VS -# the diff markers are never inserted). Diff markers may cause the following -# file extensions to fail to load in VS. An alternative would be to treat -# these files as binary and thus will always conflict and require user -# intervention with every merge. To do so, just uncomment the entries below -############################################################################### -#*.sln merge=binary -#*.csproj merge=binary -#*.vbproj merge=binary -#*.vcxproj merge=binary -#*.vcproj merge=binary -#*.dbproj merge=binary -#*.fsproj merge=binary -#*.lsproj merge=binary -#*.wixproj merge=binary -#*.modelproj merge=binary -#*.sqlproj merge=binary -#*.wwaproj merge=binary - -############################################################################### -# behavior for image files -# -# image files are treated as binary by default. -############################################################################### -#*.jpg binary -#*.png binary -#*.gif binary - -############################################################################### -# diff behavior for common document formats -# -# Convert binary document formats to text before diffing them. This feature -# is only available from the command line. Turn it on by uncommenting the -# entries below. -############################################################################### -#*.doc diff=astextplain -#*.DOC diff=astextplain -#*.docx diff=astextplain -#*.DOCX diff=astextplain -#*.dot diff=astextplain -#*.DOT diff=astextplain -#*.pdf diff=astextplain -#*.PDF diff=astextplain -#*.rtf diff=astextplain -#*.RTF diff=astextplain diff --git a/Source/.gitignore b/Source/.gitignore deleted file mode 100644 index b06e864..0000000 --- a/Source/.gitignore +++ /dev/null @@ -1,212 +0,0 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. - -# User-specific files -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -build/ -bld/ -[Bb]in/ -[Oo]bj/ - -# Visual Studio 2015 cache/options directory -.vs/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUNIT -*.VisualState.xml -TestResult.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# DNX -project.lock.json -artifacts/ - -*_i.c -*_p.c -*_i.h -*.ilk -*.meta -*.obj -*.pch -*.pdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opensdf -*.sdf -*.cachefile - -# Visual Studio profiler -*.psess -*.vsp -*.vspx - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# JustCode is a .NET coding add-in -.JustCode - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# NCrunch -_NCrunch_* -.*crunch*.local.xml - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -## TODO: Comment the next line if you want to checkin your -## web deploy settings but do note that will include unencrypted -## passwords -#*.pubxml - -*.publishproj - -# NuGet Packages -*.nupkg -# The packages folder can be ignored because of Package Restore -**/packages/* -# except build/, which is used as an MSBuild target. -!**/packages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/packages/repositories.config - -# Windows Azure Build Output -csx/ -*.build.csdef - -# Windows Store app package directory -AppPackages/ - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!*.[Cc]ache/ - -# Others -ClientBin/ -[Ss]tyle[Cc]op.* -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.pfx -*.publishsettings -node_modules/ -orleans.codegen.cs - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm - -# SQL Server files -*.mdf -*.ldf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings - -# Microsoft Fakes -FakesAssemblies/ - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# LightSwitch generated files -GeneratedArtifacts/ -_Pvt_Extensions/ -ModelManifest.xml diff --git a/Source/.idea/.idea.ResearchTree/.idea/contentModel.xml b/Source/.idea/.idea.ResearchTree/.idea/contentModel.xml deleted file mode 100644 index e1faf93..0000000 --- a/Source/.idea/.idea.ResearchTree/.idea/contentModel.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Source/Assets.cs b/Source/Assets.cs index 0833740..baee97f 100644 --- a/Source/Assets.cs +++ b/Source/Assets.cs @@ -9,7 +9,7 @@ using UnityEngine; using Verse; -namespace FluffyResearchTree +namespace ResearchPal { [StaticConstructorOnStartup] public static class Assets diff --git a/Source/Constants.cs b/Source/Constants.cs index 6cee855..5552dfa 100644 --- a/Source/Constants.cs +++ b/Source/Constants.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace FluffyResearchTree +namespace ResearchPal { public static class Constants { diff --git a/Source/Extensions/Building_ResearchBench_Extensions.cs b/Source/Extensions/Building_ResearchBench_Extensions.cs index 1aba449..401c407 100644 --- a/Source/Extensions/Building_ResearchBench_Extensions.cs +++ b/Source/Extensions/Building_ResearchBench_Extensions.cs @@ -5,7 +5,7 @@ using RimWorld; using Verse; -namespace FluffyResearchTree +namespace ResearchPal { public static class Building_ResearchBench_Extensions { diff --git a/Source/Extensions/Def_Extensions.cs b/Source/Extensions/Def_Extensions.cs index d399a09..e422a08 100644 --- a/Source/Extensions/Def_Extensions.cs +++ b/Source/Extensions/Def_Extensions.cs @@ -8,7 +8,7 @@ using UnityEngine; using Verse; -namespace FluffyResearchTree +namespace ResearchPal { public static class Def_Extensions { diff --git a/Source/Extensions/ResearchProjectDef_Extensions.cs b/Source/Extensions/ResearchProjectDef_Extensions.cs index 9025a2a..e582248 100644 --- a/Source/Extensions/ResearchProjectDef_Extensions.cs +++ b/Source/Extensions/ResearchProjectDef_Extensions.cs @@ -9,7 +9,7 @@ using RimWorld; using Verse; -namespace FluffyResearchTree +namespace ResearchPal { public static class ResearchProjectDef_Extensions { diff --git a/Source/FloatMenu_Fixed.cs b/Source/FloatMenu_Fixed.cs index 5050e58..afdf7c1 100644 --- a/Source/FloatMenu_Fixed.cs +++ b/Source/FloatMenu_Fixed.cs @@ -5,7 +5,7 @@ using UnityEngine; using Verse; -namespace FluffyResearchTree +namespace ResearchPal { public class FloatMenu_Fixed : FloatMenu { diff --git a/Source/Graph/DummyNode.cs b/Source/Graph/DummyNode.cs index 71e6eb0..f8fb496 100644 --- a/Source/Graph/DummyNode.cs +++ b/Source/Graph/DummyNode.cs @@ -5,7 +5,7 @@ using System.Linq; using UnityEngine; -namespace FluffyResearchTree +namespace ResearchPal { public class DummyNode : Node { diff --git a/Source/Graph/Edge.cs b/Source/Graph/Edge.cs index 4887da8..53506c4 100644 --- a/Source/Graph/Edge.cs +++ b/Source/Graph/Edge.cs @@ -5,10 +5,10 @@ using System.Collections.Generic; using UnityEngine; using Verse; -using static FluffyResearchTree.Assets; -using static FluffyResearchTree.Constants; +using static ResearchPal.Assets; +using static ResearchPal.Constants; -namespace FluffyResearchTree +namespace ResearchPal { public class Edge where T1 : Node where T2 : Node { diff --git a/Source/Graph/Node.cs b/Source/Graph/Node.cs index 7ab678a..8c8fad1 100644 --- a/Source/Graph/Node.cs +++ b/Source/Graph/Node.cs @@ -9,9 +9,9 @@ using System.Text; using UnityEngine; using Verse; -using static FluffyResearchTree.Constants; +using static ResearchPal.Constants; -namespace FluffyResearchTree +namespace ResearchPal { public class Node { diff --git a/Source/Graph/ResearchNode.cs b/Source/Graph/ResearchNode.cs index c608c5e..5ac8a1a 100644 --- a/Source/Graph/ResearchNode.cs +++ b/Source/Graph/ResearchNode.cs @@ -5,9 +5,9 @@ using RimWorld; using UnityEngine; using Verse; -using static FluffyResearchTree.Constants; +using static ResearchPal.Constants; -namespace FluffyResearchTree +namespace ResearchPal { public class ResearchNode : Node { diff --git a/Source/Graph/Tree.cs b/Source/Graph/Tree.cs index f01a33c..e1be3a3 100644 --- a/Source/Graph/Tree.cs +++ b/Source/Graph/Tree.cs @@ -10,9 +10,9 @@ using System.Text; using UnityEngine; using Verse; -using static FluffyResearchTree.Constants; +using static ResearchPal.Constants; -namespace FluffyResearchTree +namespace ResearchPal { public static class Tree { diff --git a/Source/Log.cs b/Source/Log.cs index 2e998d8..b0c1847 100644 --- a/Source/Log.cs +++ b/Source/Log.cs @@ -4,7 +4,7 @@ using System; using System.Diagnostics; -namespace FluffyResearchTree +namespace ResearchPal { public static class Log { @@ -20,7 +20,7 @@ public static void Warning( string msg, params object[] args ) private static string Format( string msg, params object[] args ) { - return "ResearchTree :: " + String.Format( msg, args ); + return "ResearchPal :: " + String.Format( msg, args ); } public static void Error( string msg, bool once, params object[] args ){ diff --git a/Source/MainButtonWorker_ResearchTree.cs b/Source/MainButtonWorker_ResearchTree.cs index 6276f03..f0bf830 100644 --- a/Source/MainButtonWorker_ResearchTree.cs +++ b/Source/MainButtonWorker_ResearchTree.cs @@ -5,7 +5,7 @@ using UnityEngine; using Verse; -namespace FluffyResearchTree +namespace ResearchPal { public class MainButtonWorker_ResearchTree : MainButtonWorker_ToggleResearchTab { diff --git a/Source/MainTabWindow_ResearchTree.cs b/Source/MainTabWindow_ResearchTree.cs index 54994a4..9ee94a8 100644 --- a/Source/MainTabWindow_ResearchTree.cs +++ b/Source/MainTabWindow_ResearchTree.cs @@ -9,9 +9,9 @@ using System.Linq; using UnityEngine; using Verse; -using static FluffyResearchTree.Constants; +using static ResearchPal.Constants; -namespace FluffyResearchTree +namespace ResearchPal { public class MainTabWindow_ResearchTree : MainTabWindow { diff --git a/Source/Profiler.cs b/Source/Profiler.cs index 7055df8..8e367aa 100644 --- a/Source/Profiler.cs +++ b/Source/Profiler.cs @@ -4,7 +4,7 @@ using System.Diagnostics; using Verse; -namespace FluffyResearchTree +namespace ResearchPal { public class Profiler { diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs index a9c6efd..414e9d7 100644 --- a/Source/Properties/AssemblyInfo.cs +++ b/Source/Properties/AssemblyInfo.cs @@ -4,11 +4,11 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle( "ResearchTree" )] +[assembly: AssemblyTitle( "ResearchPal" )] [assembly: AssemblyDescription( "" )] [assembly: AssemblyConfiguration( "" )] [assembly: AssemblyCompany( "" )] -[assembly: AssemblyProduct( "ResearchTree" )] +[assembly: AssemblyProduct( "ResearchPal" )] [assembly: AssemblyCopyright( "Copyright © 2015" )] [assembly: AssemblyTrademark( "" )] [assembly: AssemblyCulture( "" )] @@ -31,5 +31,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.10.450")] -[assembly: AssemblyFileVersion("0.10.450")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Source/Queue/Queue.cs b/Source/Queue/Queue.cs index 49b60bf..dda507d 100644 --- a/Source/Queue/Queue.cs +++ b/Source/Queue/Queue.cs @@ -8,10 +8,10 @@ using RimWorld.Planet; using UnityEngine; using Verse; -using static FluffyResearchTree.Assets; -using static FluffyResearchTree.Constants; +using static ResearchPal.Assets; +using static ResearchPal.Constants; -namespace FluffyResearchTree +namespace ResearchPal { public class Queue : WorldComponent { diff --git a/Source/Queue/Queue_HarmonyPatches.cs b/Source/Queue/Queue_HarmonyPatches.cs index 625fb9c..2ce2bc4 100644 --- a/Source/Queue/Queue_HarmonyPatches.cs +++ b/Source/Queue/Queue_HarmonyPatches.cs @@ -6,7 +6,7 @@ using RimWorld; using Verse; -namespace FluffyResearchTree +namespace ResearchPal { public class HarmonyPatches_Queue { diff --git a/Source/ResearchTree.cs b/Source/ResearchTree.cs index 3dc31bf..a678005 100644 --- a/Source/ResearchTree.cs +++ b/Source/ResearchTree.cs @@ -7,15 +7,15 @@ using RimWorld; using Verse; -namespace FluffyResearchTree +namespace ResearchPal { public class ResearchTree : Mod { public ResearchTree( ModContentPack content ) : base( content ) { - HarmonyInstance.Create( "Fluffy.ResearchTree" ).PatchAll(Assembly.GetExecutingAssembly()); + HarmonyInstance.Create( "rimworld.ResearchPal" ).PatchAll(Assembly.GetExecutingAssembly()); - LongEventHandler.QueueLongEvent(Tree.Initialize, "Fluffy.ResearchTree.BuildingResearchTree", false, null); + LongEventHandler.QueueLongEvent(Tree.Initialize, "ResearchPal.BuildingResearchTree", false, null); LongEventHandler.ExecuteWhenFinished(InitializeHelpSuport); GetSettings(); @@ -23,7 +23,7 @@ public ResearchTree( ModContentPack content ) : base( content ) #region Overrides of Mod - public override string SettingsCategory() { return "Fluffy.ResearchTree".Translate(); } + public override string SettingsCategory() { return "ResearchPal".Translate(); } public override void DoSettingsWindowContents(UnityEngine.Rect inRect) { Settings.DoSettingsWindowContents(inRect); } #endregion diff --git a/Source/ResourceBank.cs b/Source/ResourceBank.cs index 4ade076..624b0e8 100644 --- a/Source/ResourceBank.cs +++ b/Source/ResourceBank.cs @@ -1,12 +1,12 @@ using Verse; -namespace FluffyResearchTree +namespace ResearchPal { public static class ResourceBank { public static class String { - const string PREFIX = "Fluffy.ResearchTree."; + const string PREFIX = "ResearchPal."; static string TL(string s) => (PREFIX + s).Translate(); static string TL(string s, params object[] args) => (PREFIX + s).Translate(args); diff --git a/Source/Settings.cs b/Source/Settings.cs index d7ebca4..534d97d 100644 --- a/Source/Settings.cs +++ b/Source/Settings.cs @@ -1,8 +1,8 @@ using UnityEngine; using Verse; -using static FluffyResearchTree.ResourceBank.String; +using static ResearchPal.ResourceBank.String; -namespace FluffyResearchTree +namespace ResearchPal { public class Settings : ModSettings {