Skip to content

Commit

Permalink
Update battle messages
Browse files Browse the repository at this point in the history
  • Loading branch information
starfi5h committed Mar 10, 2024
1 parent 4185b63 commit 85b1c39
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions NebulaPatcher/Patches/Dynamic/DFRelayComponent_Patch.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand All @@ -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);
}
}

Expand Down
3 changes: 1 addition & 2 deletions NebulaWorld/Player/GizmoManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 85b1c39

Please sign in to comment.