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.

Sign up for GitHub

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

Jump to bottom

Refactor code to add new units to a C3 network #5259

Merged
merged 1 commit into from
Mar 19, 2024
Merged

Refactor code to add new units to a C3 network #5259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
82 changes: 82 additions & 0 deletions megamek/src/megamek/common/util/C3Util.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
package megamek.common.util;

import megamek.common.Entity;
import megamek.common.Game;

import java.util.ArrayList;
import java.util.List;

public class C3Util {
/**
* Adds C3 connections when new units are being added.
* @param game The Game the unit is being added to, the unit should already be in the Game.
* @param entity The entity being added.
* @return A list of units affected
*/
public static List<Entity> wireC3(Game game, Entity entity) {
ArrayList<Entity> affectedUnits = new ArrayList<>();
if (!entity.hasC3() && !entity.hasC3i() && !entity.hasNavalC3()) {
return affectedUnits;
}

boolean C3iSet = false;

for (Entity e : game.getEntitiesVector()) {

// C3 Checks
if (entity.hasC3()) {
if ((entity.getC3MasterIsUUIDAsString() != null)
&& entity.getC3MasterIsUUIDAsString().equals(e.getC3UUIDAsString())) {
entity.setC3Master(e, false);
entity.setC3MasterIsUUIDAsString(null);
} else if ((e.getC3MasterIsUUIDAsString() != null)
&& e.getC3MasterIsUUIDAsString().equals(entity.getC3UUIDAsString())) {
e.setC3Master(entity, false);
e.setC3MasterIsUUIDAsString(null);

affectedUnits.add(e);
}
}

// C3i Checks
if (entity.hasC3i() && !C3iSet) {
entity.setC3NetIdSelf();
int pos = 0;
while (pos < Entity.MAX_C3i_NODES) {
// We've found a network, join it.
if ((entity.getC3iNextUUIDAsString(pos) != null)
&& (e.getC3UUIDAsString() != null)
&& entity.getC3iNextUUIDAsString(pos)
.equals(e.getC3UUIDAsString())) {
entity.setC3NetId(e);
C3iSet = true;
break;
}

pos++;
}
}

// NC3 Checks
if (entity.hasNavalC3() && !C3iSet) {
entity.setC3NetIdSelf();
int pos = 0;
while (pos < Entity.MAX_C3i_NODES) {
// We've found a network, join it.
if ((entity.getNC3NextUUIDAsString(pos) != null)
&& (e.getC3UUIDAsString() != null)
&& entity.getNC3NextUUIDAsString(pos)
.equals(e.getC3UUIDAsString())) {
entity.setC3NetId(e);
C3iSet = true;
break;
}

pos++;
}
}
}

return affectedUnits;
}
}
81 changes: 10 additions & 71 deletions megamek/src/megamek/server/GameManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import megamek.common.enums.GamePhase;
import megamek.common.enums.WeaponSortOrder;
import megamek.common.equipment.ArmorType;
import megamek.common.event.GameListener;
import megamek.common.event.GameVictoryEvent;
import megamek.common.force.Force;
import megamek.common.force.Forces;
Expand All @@ -38,10 +37,7 @@
import megamek.common.options.IOption;
import megamek.common.options.OptionsConstants;
import megamek.common.preference.PreferenceManager;
import megamek.common.util.BoardUtilities;
import megamek.common.util.EmailService;
import megamek.common.util.SerializationHelper;
import megamek.common.util.StringUtil;
import megamek.common.util.*;
import megamek.common.util.fileUtils.MegaMekFile;
import megamek.common.verifier.*;
import megamek.common.weapons.*;
Expand Down Expand Up @@ -29580,75 +29576,18 @@ public boolean accept(Entity entity) {

// Now we relink C3/NC3/C3i to our guys! Yes, this is hackish... but, we
// do what we must. Its just too bad we have to loop over the entire entities array..
if (entity.hasC3() || entity.hasC3i() || entity.hasNavalC3()) {
boolean C3iSet = false;

for (Entity e : game.getEntitiesVector()) {

// C3 Checks
if (entity.hasC3()) {
if ((entity.getC3MasterIsUUIDAsString() != null)
&& entity.getC3MasterIsUUIDAsString().equals(e.getC3UUIDAsString())) {
entity.setC3Master(e, false);
entity.setC3MasterIsUUIDAsString(null);
} else if ((e.getC3MasterIsUUIDAsString() != null)
&& e.getC3MasterIsUUIDAsString().equals(entity.getC3UUIDAsString())) {
e.setC3Master(entity, false);
e.setC3MasterIsUUIDAsString(null);
// Taharqa: we need to update the other entity for
// the
// client
// or it won't show up right. I am not sure if I
// like
// the idea of updating other entities in this
// method,
// but it
// will work for now.
if (!entities.contains(e)) {
entityUpdate(e.getId());
}
}
}

// C3i Checks
if (entity.hasC3i() && !C3iSet) {
entity.setC3NetIdSelf();
int pos = 0;
while (pos < Entity.MAX_C3i_NODES) {
// We've found a network, join it.
if ((entity.getC3iNextUUIDAsString(pos) != null)
&& (e.getC3UUIDAsString() != null)
&& entity.getC3iNextUUIDAsString(pos)
.equals(e.getC3UUIDAsString())) {
entity.setC3NetId(e);
C3iSet = true;
break;
}

pos++;
}
}

// NC3 Checks
if (entity.hasNavalC3() && !C3iSet) {
entity.setC3NetIdSelf();
int pos = 0;
while (pos < Entity.MAX_C3i_NODES) {
// We've found a network, join it.
if ((entity.getNC3NextUUIDAsString(pos) != null)
&& (e.getC3UUIDAsString() != null)
&& entity.getNC3NextUUIDAsString(pos)
.equals(e.getC3UUIDAsString())) {
entity.setC3NetId(e);
C3iSet = true;
break;
}

pos++;
}
}
var c3affected = C3Util.wireC3(game, entity);
for (Entity e : c3affected) {
// Taharqa: we need to update the other entities for
// the client or it won't show up right. I am not sure if I
// like the idea of updating other entities in this
// method, but it will work for now.
if (!entities.contains(e)) {
entityUpdate(e.getId());
}
}

// Give the unit a spotlight, if it has the spotlight quirk
entity.setExternalSearchlight(entity.hasExternalSearchlight()
|| entity.hasQuirk(OptionsConstants.QUIRK_POS_SEARCHLIGHT));
Expand Down
Loading