Skip to content

Commit

Permalink
update preview image, move some debug behind trace
Browse files Browse the repository at this point in the history
  • Loading branch information
FluffierThanThou committed Mar 16, 2024
1 parent 945f8cf commit 8cb91d2
Show file tree
Hide file tree
Showing 16 changed files with 1,199 additions and 22 deletions.
2 changes: 1 addition & 1 deletion About/About.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ In games with many faction mods or a lot of colonists, the dynamic displays may
- Some mods (noticably, the Zabrak faction) change pawn rendering in such a way that it breaks the relations tab. I'm looking for the root cause of this.</description>
<url>https://github.com/fluffy-mods/RelationsTab</url>
<supportedVersions>
<li>1.4</li>
<li>1.5</li>
</supportedVersions>
</ModMetaData>
Binary file modified About/Preview.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Assemblies/Fluffy_Relations.dll
Binary file not shown.
17 changes: 5 additions & 12 deletions Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,13 @@ In games with many faction mods or a lot of colonists, the dynamic displays may
- In games with a lot of factions/colonists, the algorithm may 'explode'. See the 'Notes' section on how to fix this.
- Some mods (noticably, the Zabrak faction) change pawn rendering in such a way that it breaks the relations tab. I'm looking for the root cause of this.
![Think you found a bug?](https://headers.karel-kroeze.nl/title/Think%20you%20found%20a%20bug%3F.png)

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/fluffy-mods/RelationsTab/issues)

![Older versions](https://headers.karel-kroeze.nl/title/Older%20versions.png)

All current and past versions of this mod can be downloaded from [GitHub](https://github.com/fluffy-mods/RelationsTab/releases).

![License](https://headers.karel-kroeze.nl/title/License.png)

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/).

Expand All @@ -30,7 +27,6 @@ Parts of this mod were created by, or derived from works created by;


![Are you enjoying my mods?](https://headers.karel-kroeze.nl/title/Are%20you%20enjoying%20my%20mods%3F.png)

Normally, this is where I ask you to show you appreciation by buying me a coffee.

These are not normal times. Ukraine is being invaded by Russia, at the whim of a ruthless dictator. Innocent people are loosing their lives, and fighting for their continued freedom.
Expand All @@ -41,14 +37,11 @@ The prospect of waking up to see my country at war is alien to me, as it must ha

**I ask you to join me in supporting the people of Ukraine**

![Humanitarian Aid](https://headers.karel-kroeze.nl/title/Humanitarian%20Aid.png)
![How can you help?](https://headers.karel-kroeze.nl/title/How%20can%20you%20help%3F.png)
If you can, donate to the various charities providing humanitarian aid.

If you can, donate to the various charities providing humanitarian aid. If you don't know where to donate, Global Citizen maintains a list of charitable organizations active in the region.
You can also help out in other ways, from reaching out to your elected representatives to helping fact-check social media.

<https://www.globalcitizen.org/en/content/ways-to-help-ukraine-conflict/>

![Speak up](https://headers.karel-kroeze.nl/title/Speak%20up.png)
If you don't know where to donate, or how to start helping, Global Citizen maintains a list of charitable organizations active in the region and other ways in which you can help.

Leaders around the world are deciding on how to respond to Putins' aggression. They are balancing their conscience, and their desire to be re-elected. Many are afraid to impose heavy sanctions because the economic repercussions might loose them votes. The Dutch government, my government, has hinted that they are unwilling to accept Ukranian refugees, and has played a part in allowing Russia to have continued access to international finance. I am ashamed of these actions, taken in my name.

Whereever your live, please let your government know you care more about supporting the people of Ukraine than you do about the price of gas. Join a protest, write letters, call your representatives, and show them that you care about justice!
<https://www.globalcitizen.org/en/content/ways-to-help-ukraine-conflict/>
2 changes: 1 addition & 1 deletion Source/Fluffy_Relations.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
<PostBuildEvent>mod update</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Krafs.Rimworld.Ref" Version="1.4.3517-beta" />
<PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4034-beta" />
</ItemGroup>
</Project>
12 changes: 6 additions & 6 deletions Source/ForceDirectedGraph/Graph.cs
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public void Update() {
return;
}

#if DEBUG
#if TRACE
msg = new StringBuilder();
msg.AppendLine("Iteration: " + iteration);
#endif
Expand All @@ -128,7 +128,7 @@ public void Update() {

// calculate attractive forces
foreach (Edge edge in edges) {
#if DEBUG
#if TRACE
msg.AppendLine("\tAttractive force between " + edge.nodeA.pawn.Name.ToStringShort + edge.nodeA.position + " and " + edge.nodeB.pawn.Name.ToStringShort + edge.nodeB.position);
#endif
edge.nodeA.AttractedTo(edge.nodeB);
Expand All @@ -137,7 +137,7 @@ public void Update() {

// calculate repulsive forces
foreach (Node node in nodes) {
#if DEBUG
#if TRACE
msg.AppendLine("\tRepulsion for " + node.pawn.Name.ToStringShort + node.position);
#endif
foreach (Node other in nodes) {
Expand Down Expand Up @@ -182,7 +182,7 @@ public void Update() {
nodes.Where(n => !n.Frozen).Min(node => node.position.y));
Vector2 offset = (size / 2f) - graphCentre;

#if DEBUG
#if TRACE
msg.AppendLine("Centre: " + graphCentre + ", offset: " + (size / 2f));
#endif
foreach (Node node in nodes) {
Expand All @@ -197,7 +197,7 @@ public void Update() {
//if ( !node.frozen )
// node.Clamp( size );

#if DEBUG
#if TRACE
msg.AppendLine("\t" + node.pawn.LabelShort + ", velocity: " + node.velocity + ", position: " + node.position);
}
Log.Message(msg.ToString());
Expand All @@ -213,7 +213,7 @@ private void PrepareNextIteration() {
Constants.SlotSize * 5f);
temperature = MAX_TEMPERATURE * (1f - (1f / MAX_ITERATIONS * iteration));

#if DEBUG
#if TRACE
msg.AppendLine("idealDistance: " + idealDistance + ", temperature: " + temperature);
#endif
}
Expand Down
Binary file added Source/Images/preview/001-dwarf.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Source/Images/preview/002-family.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Source/Images/preview/003-monster.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Source/Images/preview/004-alien.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Source/Images/preview/005-shiba.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Source/Images/preview/006-zombie.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 8cb91d2

Please sign in to comment.