Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.9.14 update #3

Merged
merged 5 commits into from
Mar 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/centipede-shields/CentiShields.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<Assets Include="$(ProjectDir)assets/**/*.*" />
</ItemGroup>
<Copy SourceFiles="@(Assets)" DestinationFiles="$(RainWorldDir)/RainWorld_Data/StreamingAssets/mods/$(ProjectName)/%(RecursiveDir)%(Filename)%(Extension)" />
<Copy SourceFiles="$(TargetPath)" DestinationFolder="$(RainWorldDir)/RainWorld_Data/StreamingAssets/mods/$(ProjectName)/plugins" />
<Copy SourceFiles="$(TargetPath)" DestinationFolder="$(RainWorldDir)/RainWorld_Data/StreamingAssets/mods/$(ProjectName)/newest/plugins" />
</Target>

</Project>
9 changes: 6 additions & 3 deletions examples/mosquitoes/Mosquito.cs
Original file line number Diff line number Diff line change
Expand Up @@ -143,12 +143,15 @@ void Act()
}

var pather = AI.pathFinder as StandardPather;
var movementConnection = pather!.FollowPath(room.GetWorldCoordinate(followingPos), true) ?? pather.FollowPath(room.GetWorldCoordinate(followingPos), true);
if (movementConnection != null) {
var movementConnection = pather!.FollowPath(room.GetWorldCoordinate(followingPos), true);
if (movementConnection == default) {
movementConnection = pather.FollowPath(room.GetWorldCoordinate(followingPos), true);
}
if (movementConnection != default) {
Run(movementConnection);
} else {
if (lastFollowedConnection != null) {
MoveTowards(room.MiddleOfTile(lastFollowedConnection.DestTile));
MoveTowards(room.MiddleOfTile(lastFollowedConnection.Value.DestTile));
}
if (Submersion > .5) {
firstChunk.vel += new Vector2((Random.value - .5f) * .5f, Random.value * .5f);
Expand Down
2 changes: 1 addition & 1 deletion examples/mosquitoes/Mosquitoes.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<Assets Include="$(ProjectDir)assets/**/*.*" />
</ItemGroup>
<Copy SourceFiles="@(Assets)" DestinationFiles="$(RainWorldDir)/RainWorld_Data/StreamingAssets/mods/$(ProjectName)/%(RecursiveDir)%(Filename)%(Extension)" />
<Copy SourceFiles="$(TargetPath)" DestinationFolder="$(RainWorldDir)/RainWorld_Data/StreamingAssets/mods/$(ProjectName)/plugins" />
<Copy SourceFiles="$(TargetPath)" DestinationFolder="$(RainWorldDir)/RainWorld_Data/StreamingAssets/mods/$(ProjectName)/newest/plugins" />
</Target>

</Project>
Binary file modified lib/HOOKS-Assembly-CSharp.dll
Binary file not shown.
Binary file modified lib/PUBLIC-Assembly-CSharp.dll
Binary file not shown.
Binary file added lib/Unity.Mathematics.dll
Binary file not shown.
2 changes: 1 addition & 1 deletion src/Core/Ext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public static string SaveToString(this AbstractPhysicalObject apo, string custom
/// <returns>True if the space is clear.</returns>
public static bool IsFreeSpace(this AImap map, IntVector2 tile, int tilesOfFreeSpace)
{
return map.getAItile(tile).terrainProximity >= tilesOfFreeSpace;
return map.getTerrainProximity(tile) >= tilesOfFreeSpace;
}

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion src/Fisobs.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<Assets Include="$(ProjectDir)../assets/**/*.*" />
</ItemGroup>
<Copy SourceFiles="@(Assets)" DestinationFiles="$(RainWorldDir)/RainWorld_Data/StreamingAssets/mods/$(ProjectName)/%(RecursiveDir)%(Filename)%(Extension)" />
<Copy SourceFiles="$(TargetPath)" DestinationFolder="$(RainWorldDir)/RainWorld_Data/StreamingAssets/mods/$(ProjectName)/plugins" />
<Copy SourceFiles="$(TargetPath)" DestinationFolder="$(RainWorldDir)/RainWorld_Data/StreamingAssets/mods/$(ProjectName)/newest/plugins" />
</Target>

</Project>
Loading