From 85b1c39c39fa58c5eb192244c077150fc4a77839 Mon Sep 17 00:00:00 2001 From: starfish <50672801+starfi5h@users.noreply.github.com> Date: Sun, 10 Mar 2024 14:43:24 +0800 Subject: [PATCH] Update battle messages --- .../Combat/DFTinder/DFTinderDispatchProcessor.cs | 2 +- NebulaPatcher/Patches/Dynamic/DFRelayComponent_Patch.cs | 4 ++-- NebulaWorld/Player/GizmoManager.cs | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/NebulaNetwork/PacketProcessors/Combat/DFTinder/DFTinderDispatchProcessor.cs b/NebulaNetwork/PacketProcessors/Combat/DFTinder/DFTinderDispatchProcessor.cs index 64d73618c..6cdfeb192 100644 --- a/NebulaNetwork/PacketProcessors/Combat/DFTinder/DFTinderDispatchProcessor.cs +++ b/NebulaNetwork/PacketProcessors/Combat/DFTinder/DFTinderDispatchProcessor.cs @@ -18,7 +18,7 @@ protected override void ProcessPacket(DFTinderDispatchPacket packet, NebulaConne var hiveSystem = GameMain.spaceSector.GetHiveByAstroId(packet.OriginHiveAstroId); if (hiveSystem == null) return; - Multiplayer.Session.Enemies.DisplayAstroMessage("Dark Fog seed send out from".Translate(), hiveSystem.starData.astroId); + Multiplayer.Session.Enemies.DisplayAstroMessage("DF seed sent out from".Translate(), hiveSystem.starData.astroId); ref var tinderComponent = ref hiveSystem.tinders.buffer[packet.TinderId]; if (tinderComponent.id != packet.TinderId) return; diff --git a/NebulaPatcher/Patches/Dynamic/DFRelayComponent_Patch.cs b/NebulaPatcher/Patches/Dynamic/DFRelayComponent_Patch.cs index 47bb6e5f5..8cdbca0a1 100644 --- a/NebulaPatcher/Patches/Dynamic/DFRelayComponent_Patch.cs +++ b/NebulaPatcher/Patches/Dynamic/DFRelayComponent_Patch.cs @@ -42,7 +42,7 @@ public static void ArriveBase_Postfix(DFRelayComponent __instance) var planet = GameMain.galaxy.PlanetById(__instance.targetAstroId); if (planet != null && __instance.baseId > 0) { - Multiplayer.Session.Enemies.DisplayPlanetPingMessage("Relay lands on planet".Translate(), __instance.targetAstroId, __instance.targetLPos); + Multiplayer.Session.Enemies.DisplayPlanetPingMessage("DF relay landed on planet".Translate(), __instance.targetAstroId, __instance.targetLPos); } } @@ -68,7 +68,7 @@ public static bool LeaveBase_Prefix(DFRelayComponent __instance) var planet = GameMain.galaxy.PlanetById(__instance.targetAstroId); if (planet != null) { - Multiplayer.Session.Enemies.DisplayPlanetPingMessage("Relay leaves from planet", __instance.targetAstroId, __instance.targetLPos); + Multiplayer.Session.Enemies.DisplayPlanetPingMessage("DF relay left from planet", __instance.targetAstroId, __instance.targetLPos); } } diff --git a/NebulaWorld/Player/GizmoManager.cs b/NebulaWorld/Player/GizmoManager.cs index c028c50d7..ff74f6be2 100644 --- a/NebulaWorld/Player/GizmoManager.cs +++ b/NebulaWorld/Player/GizmoManager.cs @@ -75,11 +75,10 @@ public void OnUpdate() private static void GetMapPing() { - // Modify from UIGlobemap.TeleportLogic + // Modify from UIGlobemap.TeleportLogic var mainCam = Camera.main; if (mainCam == null || GameMain.localPlanet == null) return; if (!Physics.Raycast(mainCam.ScreenPointToRay(Input.mousePosition), out var hitInfo, 800f, 8720, QueryTriggerInteraction.Collide)) return; - if (!Physics.Raycast(Camera.main.ScreenPointToRay(Input.mousePosition), out var hitInfo, 800f, 8720, QueryTriggerInteraction.Collide)) return; var starmap = UIRoot.instance.uiGame.starmap; if (starmap.active)