Compare commits

...

32 Commits

Author SHA1 Message Date
IIIaKa d332287a4c Add OnAnimalDungProduce(d) hooks
- OnAnimalDungProduce(BaseRidableAnimal)
- OnAnimalDungProduced(BaseRidableAnimal, Item)
2025-02-05 07:40:09 +01:00
Mr. Blue 6ca4691566 Add OnFrankensteinPetWake/Sleep hooks
- OnFrankensteinPetWake(FrankensteinTable, BasePlayer)
- OnFrankensteinPetSleep(FrankensteinPet, FrankensteinTable, BasePlayer)
2025-02-05 06:43:01 +01:00
Lorenzo 27340a6b56 Fix OnFishCaught hook
Fix OnFishCaught being called in the wrong location
2025-02-05 06:24:54 +01:00
Mr. Blue 227526100e Patch for January 23rd Rust update (Protocol 2574.263.1) 2025-01-23 19:33:13 +01:00
Mr. Blue 695cf573ef Patch for January 2nd Rust update (Protocol 2573.263.1) 2025-01-02 19:35:44 +01:00
Mr. Blue 1ffd8e847a Fix OnPlayerVanish and OnPlayerUnvanish hooks 2024-12-31 16:02:22 +01:00
Mr. Blue cae1d0b8e2 Remove unused default references 2024-12-31 15:51:41 +01:00
IIIaKa 0d02c729da
Add OnPlayerVanish and OnPlayerUnvanish hooks (#541) 2024-12-30 17:54:29 +01:00
Lorenzo b967f3f2a4
Fix OnEntityReskinned not getting called for all items (#542) 2024-12-30 17:34:28 +01:00
k1lly0u 136403c949
Add OnNpcTarget hook for new NPC types (#540) 2024-12-30 17:29:56 +01:00
Mr. Blue ba8655f7ec Patch for December 16th Rust update (Protocol 2570.262.1) 2024-12-16 12:51:16 +01:00
Mr. Blue 21019b2700 Patch for December 5th Rust update (Protocol 2570.262.1) 2024-12-05 19:04:24 +01:00
Mr. Blue f23b2a2ebf Patch for November 7th Rust update (Protocol 2567.261.1) 2024-11-07 19:28:38 +01:00
TheKiiiing 544f4df233 Expose CH47HelicopterAIController::CheckSpawnScientists 2024-11-07 06:08:40 +01:00
Lorenzo 191af1e82f Add OnPlayerHandcuff(ed) hooks
- object OnPlayerHandcuff( BasePlayer victim, BasePlayer handcuffer )
- void OnPlayerHandcuffed( BasePlayer victim, BasePlayer handcuffer )
2024-11-07 06:08:20 +01:00
WhiteThunder e9df3c275f Add OnInventoryItemFind and OnInventoryAmmoItemFind hooks 2024-11-07 06:05:47 +01:00
Oleg 9e8d57b281 Add steamid option to RustCui RawImageComponent 2024-11-07 05:46:41 +01:00
Mr. Blue 42c54f30b3 Patch for November 5th Rust update (Protocol 2565.259.1) 2024-11-05 13:10:37 +01:00
Mr. Blue 8d7247a94e Patch for October 28th Rust update (Protocol 2565.259.1) 2024-10-28 18:41:56 +01:00
Mr. Blue cc678b6c14 Patch for October 8th Rust update (Protocol 2564.259.1) 2024-10-08 15:49:41 +02:00
Mr. Blue c0eb9fa022 Patch for October 6th Rust update (Protocol 2564.259.1) 2024-10-06 13:39:56 +02:00
Mr. Blue 15a393876f Patch for October 4th Rust update (Protocol 2564.259.1) 2024-10-04 17:59:26 +02:00
Mr. Blue b8f1bd54db Expose various BasePlayer fields 2024-10-04 17:52:15 +02:00
Mr. Blue 9a41d40b93 Patch for October 3rd Rust update (Protocol 2564.259.1) 2024-10-03 19:26:48 +02:00
Mr. Blue 4f36b5c0a3 Expose various BasePlayer and TerrainCollision fields and methods 2024-10-02 04:30:32 +02:00
Mr. Blue 4fd1f04099 Expose various fields and methods 2024-10-02 03:52:38 +02:00
Mr. Blue 9105692f93 Add CanLootEntity hook to WorldItems
- CanLootEntity(BasePlayer, WorldItem)
2024-10-02 03:36:16 +02:00
Mr. Blue 5a47d0f3f6 Add WallPaper & Digital Clock hooks
- OnWallpaperSet(BuildingBlock, ulong)
- OnWallpaperRemove(BuildingBlock)
- OnDigitalClockAlarmsSet(DigitalClock, DigitalClockMessage)
- OnDigitalClockRing(DigitalClock)
- OnDigitalClockRingStop(DigitalClock)
2024-10-02 03:09:00 +02:00
Mr. Blue e6199f8697 Fix DepotDownloader timing out 2024-10-01 08:41:02 +02:00
Mr. Blue dd70e48aae Patch for September 6th Rust update (2556.254.1) 2024-09-06 15:35:44 +02:00
Mr. Blue 240698b73e Patch for September 5th Rust update (2556.254.1) 2024-09-05 19:36:03 +02:00
Oleg d39d1a39f7 Add new CuiCountdownComponent TimerFormats 2024-09-05 19:24:03 +02:00
5 changed files with 1678 additions and 760 deletions

View File

@ -41,7 +41,7 @@ $references_file = Join-Path $tools_dir ".references"
New-Item "$tools_dir", "$managed_dir", "$docs_dir" -ItemType Directory -Force | Out-Null
# Set URLs of dependencies and tools to download
$steam_depotdl_url = "https://github.com/SteamRE/DepotDownloader/releases/download/DepotDownloader_2.5.0/depotdownloader-2.5.0.zip"
$steam_depotdl_url = "https://img.mrblue.io/bf641959245341c381cffc95f38a2bc6.zip"
$de4dot_url = "https://github.com/0xd4d/de4dot/suites/507020524/artifacts/2658127"
$patcher_url = "https://github.com/OxideMod/Oxide.Patcher/releases/download/latest/OxidePatcher.exe"
@ -102,7 +102,7 @@ function Find-Dependencies {
function Get-Downloader {
# Check if DepotDownloader is already downloaded
$steam_depotdl_dll = Join-Path $tools_dir "DepotDownloader.dll"
$steam_depotdl_dll = Join-Path $tools_dir "DepotDownloader.exe"
$steam_depotdl_zip = Join-Path $tools_dir "DepotDownloader.zip"
if (!(Test-Path $steam_depotdl_dll) -or (Get-Item $steam_depotdl_dll).LastWriteTime -lt (Get-Date).AddDays(-7)) {
# Download and extract DepotDownloader
@ -167,7 +167,7 @@ function Get-Dependencies {
# Attempt to run DepotDownloader to get game DLLs
try {
Write-Host "$steam_access -app $steam_appid -branch $steam_branch $steam_depot -os $platform -dir $deps_dir"
Start-Process dotnet -WorkingDirectory $tools_dir -ArgumentList "$steam_depotdl_dll $steam_access -app $steam_appid -branch $steam_branch $steam_depot -os $platform -dir $platform_dir -filelist $references_file" -NoNewWindow -Wait
Start-Process $steam_depotdl_dll -WorkingDirectory $tools_dir -ArgumentList "$steam_access -app $steam_appid -branch $steam_branch $steam_depot -os $platform -dir $platform_dir -filelist $references_file" -NoNewWindow -Wait
} catch {
Write-Host "Error: Could not start or complete getting dependencies"
Write-Host $_.Exception | Format-List -Force

File diff suppressed because it is too large Load Diff

View File

@ -299,6 +299,9 @@ namespace Oxide.Game.Rust.Cui
[JsonProperty("png")]
public string Png { get; set; }
[JsonProperty("steamid")]
public string SteamId { get; set; }
[JsonProperty("fadeIn")]
public float FadeIn { get; set; }
@ -438,7 +441,12 @@ namespace Oxide.Game.Rust.Cui
MinutesSeconds,
MinutesSecondsHundreth,
HoursMinutes,
HoursMinutesSeconds
HoursMinutesSeconds,
HoursMinutesSecondsMilliseconds,
HoursMinutesSecondsTenths,
DaysHoursMinutes,
DaysHoursMinutesSeconds,
Custom
}
public class CuiNeedsCursorComponent : ICuiComponent

View File

@ -48,12 +48,12 @@ namespace Oxide.Game.Rust
/// </summary>
public override string[] DefaultReferences => new[]
{
"0Harmony", "ApexAI", "ApexShared", "Facepunch.Network", "Facepunch.Steamworks.Posix64", "Facepunch.System", "Facepunch.UnityEngine", "Facepunch.Steamworks.Win64", "Rust.Data",
"Rust.FileSystem", "Rust.Clans", "Rust.Clans.Local", "Rust.Global", "Rust.Localization", "Rust.Platform", "Rust.Platform.Common", "Rust.Platform.Steam", "Rust.Workshop",
"Rust.World", "System.Drawing", "UnityEngine.AIModule", "UnityEngine.AssetBundleModule", "UnityEngine.CoreModule", "UnityEngine.GridModule", "UnityEngine.ImageConversionModule",
"UnityEngine.Networking", "UnityEngine.PhysicsModule", "UnityEngine.TerrainModule", "UnityEngine.TerrainPhysicsModule", "UnityEngine.UI", "UnityEngine.UIModule",
"UnityEngine.UIElementsModule", "UnityEngine.UnityWebRequestAudioModule","UnityEngine.UnityWebRequestModule", "UnityEngine.UnityWebRequestTextureModule",
"UnityEngine.UnityWebRequestWWWModule", "UnityEngine.VehiclesModule", "UnityEngine.WebModule", "netstandard"
"0Harmony", "Facepunch.Network", "Facepunch.Steamworks.Posix64", "Facepunch.System", "Facepunch.UnityEngine", "Facepunch.Steamworks.Win64", "Rust.Data", "Rust.FileSystem",
"Rust.Clans", "Rust.Clans.Local", "Rust.Global", "Rust.Localization", "Rust.Platform", "Rust.Platform.Common", "Rust.Platform.Steam", "Rust.Workshop", "Rust.World",
"System.Drawing", "UnityEngine.AIModule", "UnityEngine.AssetBundleModule", "UnityEngine.CoreModule", "UnityEngine.GridModule", "UnityEngine.ImageConversionModule",
"UnityEngine.PhysicsModule", "UnityEngine.TerrainModule", "UnityEngine.TerrainPhysicsModule", "UnityEngine.UI", "UnityEngine.UIModule", "UnityEngine.UIElementsModule",
"UnityEngine.UnityWebRequestAudioModule","UnityEngine.UnityWebRequestModule", "UnityEngine.UnityWebRequestTextureModule", "UnityEngine.UnityWebRequestWWWModule",
"UnityEngine.VehiclesModule", "netstandard"
};
/// <summary>

View File

@ -6,6 +6,7 @@ using Oxide.Core.Libraries.Covalence;
using Oxide.Core.Plugins;
using Oxide.Core.RemoteConsole;
using Oxide.Game.Rust.Libraries.Covalence;
using Rust.Ai.Gen2;
using Steamworks;
using System;
using System.Collections.Generic;
@ -68,6 +69,34 @@ namespace Oxide.Game.Rust
return null;
}
/// <summary>
/// Called when an NPC tries to target an entity
/// </summary>
/// <param name="sense"></param>
/// <param name="target"></param>
/// <returns></returns>
[HookMethod("IOnNpcTarget")]
private object IOnNpcTarget(SenseComponent sense, BaseEntity target)
{
if (!sense || !target)
{
return null;
}
BaseEntity baseEntity = sense.baseEntity;
if (!baseEntity)
{
return null;
}
if (Interface.CallHook("OnNpcTarget", baseEntity, target) != null)
{
return false;
}
return null;
}
/// <summary>
/// Called after a BaseNetworkable has been saved into a ProtoBuf object that is about to
/// be serialized for a network connection or cache