Compare commits

..

No commits in common. "main" and "0.37.3" have entirely different histories.
main ... 0.37.3

6 changed files with 21 additions and 35 deletions

4
.gitignore vendored
View file

@ -1,6 +1,4 @@
bin/ bin/
obj/ obj/
/packages/ /packages/
.idea/ .idea
.vs/
.vscode/

View file

@ -1,8 +1,7 @@
{ {
"BuildMode": { "BuildMode": {
"ExampleMod.CustomTable": "Custom Table", "ExampleMod.CustomTable": "Custom Table",
"ExampleMod.CrossedWallpaper": "Crossed Wallpaper", "ExampleMod.CrossedWallpaper": "Crossed Wallpaper"
"ExampleMod.CustomTile": "Custom Tile"
}, },
"Clothes": { "Clothes": {
"ExampleMod.DarkShirt": "Dark Shirt", "ExampleMod.DarkShirt": "Dark Shirt",

Binary file not shown.

Before

Width:  |  Height:  |  Size: 535 B

View file

@ -34,14 +34,12 @@ public class ExampleMod : Mod {
public override string Description => "This is the example mod for Tiny Life!"; public override string Description => "This is the example mod for Tiny Life!";
public override TextureRegion Icon => this.uiTextures[new Point(0, 0)]; public override TextureRegion Icon => this.uiTextures[new Point(0, 0)];
public override string IssueTrackerUrl => "https://github.com/Ellpeck/TinyLifeExampleMod/issues"; public override string IssueTrackerUrl => "https://github.com/Ellpeck/TinyLifeExampleMod/issues";
public override string TestedVersionRange => "[0.42.0,0.42.4]";
private Dictionary<Point, TextureRegion> customTops; private Dictionary<Point, TextureRegion> customTops;
private Dictionary<Point, TextureRegion> customHairs; private Dictionary<Point, TextureRegion> customHairs;
private Dictionary<Point, TextureRegion> customBottoms; private Dictionary<Point, TextureRegion> customBottoms;
private Dictionary<Point, TextureRegion> uiTextures; private Dictionary<Point, TextureRegion> uiTextures;
private Dictionary<Point, TextureRegion> wallpaperTextures; private Dictionary<Point, TextureRegion> wallpaperTextures;
private Dictionary<Point, TextureRegion> tileTextures;
public override void Initialize(Logger logger, RawContentManager content, RuntimeTexturePacker texturePacker, ModInfo info) { public override void Initialize(Logger logger, RawContentManager content, RuntimeTexturePacker texturePacker, ModInfo info) {
ExampleMod.Logger = logger; ExampleMod.Logger = logger;
@ -54,7 +52,6 @@ public class ExampleMod : Mod {
texturePacker.Add(new UniformTextureAtlas(content.Load<Texture2D>("CustomHairs"), 4, 5), r => this.customHairs = r, 1, true); texturePacker.Add(new UniformTextureAtlas(content.Load<Texture2D>("CustomHairs"), 4, 5), r => this.customHairs = r, 1, true);
texturePacker.Add(new UniformTextureAtlas(content.Load<Texture2D>("CustomBottomsShoes"), 8, 6), r => this.customBottoms = r, 1, true); texturePacker.Add(new UniformTextureAtlas(content.Load<Texture2D>("CustomBottomsShoes"), 8, 6), r => this.customBottoms = r, 1, true);
texturePacker.Add(new UniformTextureAtlas(content.Load<Texture2D>("UiTextures"), 8, 8), r => this.uiTextures = r, 1, true); texturePacker.Add(new UniformTextureAtlas(content.Load<Texture2D>("UiTextures"), 8, 8), r => this.uiTextures = r, 1, true);
texturePacker.Add(new UniformTextureAtlas(content.Load<Texture2D>("Tiles"), 4, 2), r => this.tileTextures = r, 1, true);
// wallpaper textures require special treatment to work with openings, the x and y values are passed to the UniformTextureAtlas constructor // wallpaper textures require special treatment to work with openings, the x and y values are passed to the UniformTextureAtlas constructor
WallMode.ApplyMasks(content.Load<Texture2D>("Wallpapers"), 4, 5, texturePacker, r => this.wallpaperTextures = r); WallMode.ApplyMasks(content.Load<Texture2D>("Wallpapers"), 4, 5, texturePacker, r => this.wallpaperTextures = r);
} }
@ -118,7 +115,7 @@ public class ExampleMod : Mod {
// we allow the action to be done even if the solved needs aren't low enough on a person // we allow the action to be done even if the solved needs aren't low enough on a person
CanDoRandomly = true, CanDoRandomly = true,
// the solved needs indicate when the AI should mark this action as important, they don't actually have to match the action's behavior // the solved needs indicate when the AI should mark this action as important, they don't actually have to match the action's behavior
SolvedNeeds = [NeedType.Energy], SolvedNeeds = new[] {NeedType.Energy},
// make people more likely to sit down in the grass if they're uncomfortable // make people more likely to sit down in the grass if they're uncomfortable
PassivePriority = p => p.Emotion == EmotionType.Uncomfortable ? 150 : 25 PassivePriority = p => p.Emotion == EmotionType.Uncomfortable ? 150 : 25
}, },
@ -132,9 +129,6 @@ public class ExampleMod : Mod {
// adding a custom wallpaper (we're using the top left texture region, which is why we pass 0, 0 as the texture coordinate) // adding a custom wallpaper (we're using the top left texture region, which is why we pass 0, 0 as the texture coordinate)
Wallpaper.Register("ExampleMod.CrossedWallpaper", 15, this.wallpaperTextures, new Point(0, 0), ColorScheme.Modern, this.Icon); Wallpaper.Register("ExampleMod.CrossedWallpaper", 15, this.wallpaperTextures, new Point(0, 0), ColorScheme.Modern, this.Icon);
// adding a custom tile
Tile.Register("ExampleMod.CustomTile", 8, this.tileTextures, new Point(0, 0), ColorScheme.Bricks, icon: this.Icon);
} }
public override IEnumerable<string> GetCustomFurnitureTextures(ModInfo info) { public override IEnumerable<string> GetCustomFurnitureTextures(ModInfo info) {
@ -152,9 +146,11 @@ public class ExampleMod : Mod {
group.AddChild(new Paragraph(Anchor.AutoLeft, 1, _ => $"{Localization.Get(LnCategory.Ui, "ExampleMod.DarkShirtSpeedOption")}: {ExampleMod.Options.DarkShirtSpeedIncrease}")); group.AddChild(new Paragraph(Anchor.AutoLeft, 1, _ => $"{Localization.Get(LnCategory.Ui, "ExampleMod.DarkShirtSpeedOption")}: {ExampleMod.Options.DarkShirtSpeedIncrease}"));
group.AddChild(new Slider(Anchor.AutoLeft, new Vector2(1, 10), 5, 5) { group.AddChild(new Slider(Anchor.AutoLeft, new Vector2(1, 10), 5, 5) {
CurrentValue = ExampleMod.Options.DarkShirtSpeedIncrease, CurrentValue = ExampleMod.Options.DarkShirtSpeedIncrease,
OnValueChanged = (_, v) => ExampleMod.Options.DarkShirtSpeedIncrease = v OnValueChanged = (_, v) => {
ExampleMod.Options.DarkShirtSpeedIncrease = v;
info.SaveOptions(ExampleMod.Options);
}
}); });
group.OnRemovedFromUi += _ => info.SaveOptions(ExampleMod.Options);
} }
} }

View file

@ -1,21 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="TinyLifeApi" Version="0.42.4" /> <PackageReference Include="TinyLifeApi" Version="0.37.3" />
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.303" /> <PackageReference Include="ExtremelySimpleLogger" Version="1.3.1" />
<PackageReference Include="Lib.Harmony" Version="2.2.2" /> <PackageReference Include="Lib.Harmony" Version="2.2.2" />
<PackageReference Include="ExtremelySimpleLogger" Version="1.4.1" /> <PackageReference Include="MLEM.Data" Version="6.1.0" />
<PackageReference Include="MLEM.Data" Version="6.3.0" /> <PackageReference Include="MLEM.Extended" Version="6.1.0" />
<PackageReference Include="MLEM.Extended" Version="6.3.0" /> <PackageReference Include="MLEM.Startup" Version="6.1.0" />
<PackageReference Include="MLEM.Startup" Version="6.3.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="DynamicEnums" Version="1.2.0" /> <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.303" />
<PackageReference Include="Coroutine" Version="2.1.5" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View file

@ -4,7 +4,6 @@ using System.Threading;
var target = Argument("target", "Run"); var target = Argument("target", "Run");
var config = Argument("configuration", "Release"); var config = Argument("configuration", "Release");
var args = Argument("args", "");
var tinyLifeDir = $"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)}/Tiny Life"; var tinyLifeDir = $"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)}/Tiny Life";
@ -30,16 +29,12 @@ Task("Run").IsDependentOn("CopyToMods").Does(() => {
// start the tiny life process // start the tiny life process
var exeDir = System.IO.File.ReadAllText($"{tinyLifeDir}/GameDir"); var exeDir = System.IO.File.ReadAllText($"{tinyLifeDir}/GameDir");
var process = Process.Start(new ProcessStartInfo($"{exeDir}/Tiny Life") { var process = Process.Start(new ProcessStartInfo($"{exeDir}/Tiny Life") {
Arguments = $"-v --skip-splash --skip-preloads --debug-saves --ansi {args}", Arguments = "-v --skip-splash --skip-preloads --debug-saves",
RedirectStandardOutput = true, CreateNoWindow = true
RedirectStandardError = true
}); });
// make sure the output buffers (which we ignore) don't fill up
process.BeginOutputReadLine();
process.BeginErrorReadLine();
// we wait a bit to make sure the process has generated a new log file // we wait a bit to make sure the process has generated a new log file, bleh
Thread.Sleep(1000); Thread.Sleep(3000);
// attach to the newest log file // attach to the newest log file
var logsDir = $"{tinyLifeDir}/Logs"; var logsDir = $"{tinyLifeDir}/Logs";
@ -49,12 +44,12 @@ Task("Run").IsDependentOn("CopyToMods").Does(() => {
using (var reader = new StreamReader(stream)) { using (var reader = new StreamReader(stream)) {
var lastPos = 0L; var lastPos = 0L;
do { do {
if (stream.Length > lastPos) { if (reader.BaseStream.Length > lastPos) {
stream.Seek(lastPos, SeekOrigin.Begin); reader.BaseStream.Seek(lastPos, SeekOrigin.Begin);
string line; string line;
while ((line = reader.ReadLine()) != null) while ((line = reader.ReadLine()) != null)
Information(line); Information(line);
lastPos = stream.Position; lastPos = reader.BaseStream.Position;
} }
Thread.Sleep(10); Thread.Sleep(10);
} while (!process.HasExited); } while (!process.HasExited);