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

Bay ammo correction #5465

Merged
merged 2 commits into from
May 16, 2024
Merged

Bay ammo correction #5465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4feb8d
correct bay ammo error
SJuliez May 12, 2024
82ab721
correct BLKDropshipFileTest.java
SJuliez May 12, 2024
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 megamek/src/megamek/common/equipment/WeaponMounted.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ public void clearBayAmmo() {
}

public List<AmmoMounted> getBayAmmo() {
return bayWeapons.stream()
return bayAmmo.stream()
.map(i -> getEntity().getAmmo(i))
.filter(Objects::nonNull)
.collect(Collectors.toList());
Expand Down
237 changes: 123 additions & 114 deletions megamek/unittests/megamek/common/loaders/BLKDropshipFileTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 - The MegaMek Team. All Rights Reserved.
* Copyright (c) 2023, 2024 - The MegaMek Team. All Rights Reserved.
*
* This file is part of MegaMek.
*
Expand All @@ -20,6 +20,7 @@

import megamek.common.*;
import megamek.common.util.BuildingBlock;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;

import java.io.ByteArrayInputStream;
Expand All @@ -30,8 +31,123 @@

public class BLKDropshipFileTest {

private static String newFormatDSwithMixedBA = String.join(
System.getProperty("line.separator"),
/**
* Load a string of BLK-style blocks as an InputStream and create a new DropShip
* produces the desired mix of tech, specifically with Clan tech and IS BA bays.
*/
private Dropship loadDropshipFromString(String strOfBLK) throws Exception {

// Create InputStream from string
InputStream is = new ByteArrayInputStream(strOfBLK.getBytes());

// Instantiate bb with string
BuildingBlock bb = new BuildingBlock(is);

// Instantiate Dropship with bb
IMechLoader loader = new BLKDropshipFile(bb);

// Get Entity
Entity m_entity = loader.getEntity();

return (Dropship) m_entity;
}

/**
* Helper to troll through bays looking for a specific combination.
* Can be extended as needed.
*/
private boolean confirmBayTypeinBays(Vector<Bay> bays, String type) {
boolean found = false;
for(Bay b: bays) {
switch(type) {
case "BA_IS":
if (b instanceof BattleArmorBay) {
found = !b.isClan();
}
break;
case "BA_CLAN":
if (b instanceof BattleArmorBay) {
found = b.isClan();
}
break;
case "BA_CS":
if (b instanceof BattleArmorBay) {
found = ((BattleArmorBay) b).isComStar();
}
break;
}
if (found) {
return true;
}
}

return false;
}

@BeforeAll
public static void initialize() {
EquipmentType.initializeTypes();
}

@Test
public void testLoadNewFormatDSHasMixedBATechLevels() {
boolean parsed = false;
boolean mixedTech = false;
boolean ISBACorrect = false;
boolean ClanBACorrect = false;
boolean ComStarBACorrect = false;
Vector<Bay> bays;

try {
Dropship ds = loadDropshipFromString(newFormatDSwithMixedBA);
parsed = true;
mixedTech = ds.isMixedTech() && ds.isClan(); // confirm mixed-tech Clan design
bays = ds.getTransportBays();
ISBACorrect = confirmBayTypeinBays(bays, "BA_IS");
ClanBACorrect = confirmBayTypeinBays(bays, "BA_CLAN");
ComStarBACorrect = confirmBayTypeinBays(bays, "BA_CS");
} catch (Exception e){
e.printStackTrace();
}
assertTrue(parsed);
assertTrue(mixedTech);
assertTrue(ISBACorrect);
assertTrue(ClanBACorrect);
assertTrue(ComStarBACorrect);
}

@Test
public void testLoadOldFormatClanDSHasClanBATech() {
// We want to verify that the correct tech type is applied to non-mixed
// Clan BA bays when loading old-format files.
boolean parsed = false;
boolean mixedTech = false;
boolean clan = false;
boolean ClanBACorrect = false;
boolean ISBAExists = false;
Vector<Bay> bays;

try {
Dropship ds = loadDropshipFromString(oldFormatClanDSwithBA);
parsed = true;
mixedTech = ds.isMixedTech(); // confirm not mixed tech
clan = ds.isClan(); // confirm clan tech base
bays = ds.getTransportBays();
ClanBACorrect = confirmBayTypeinBays(bays, "BA_CLAN");
ISBAExists = confirmBayTypeinBays(bays, "BA_IS");
} catch (Exception e){
e.printStackTrace();
}
assertTrue(parsed);
assertTrue(clan);
assertFalse(mixedTech);
assertTrue(ClanBACorrect);
assertFalse(ISBAExists);
}

//region DS definitions
private static final String newFormatDSwithMixedBA = String.join(
System.lineSeparator(),
"<BlockVersion>",
"1",
"</BlockVersion>",
Expand Down Expand Up @@ -139,10 +255,10 @@ public class BLKDropshipFileTest {
"<escape_pod>",
"0",
"</escape_pod>"
);
);

private static String oldFormatClanDSwithBA = String.join(
System.getProperty("line.separator"),
private static final String oldFormatClanDSwithBA = String.join(
System.lineSeparator(),
"<BlockVersion>",
"1",
"</BlockVersion>",
Expand Down Expand Up @@ -249,112 +365,5 @@ public class BLKDropshipFileTest {
"0",
"</escape_pod>"
);
private Dropship loadDropshipFromString(String strOfBLK) throws Exception {
/**
* Load a string of BLK-style blocks as an InputStream and create a new DropShip
* produces the desired mix of tech, specifically with Clan tech and IS BA bays.
*/

// Create InputStream from string
InputStream is = new ByteArrayInputStream(strOfBLK.getBytes());

// Instantiate bb with string
BuildingBlock bb = new BuildingBlock(is);

// Instantiate Dropship with bb
IMechLoader loader = new BLKDropshipFile(bb);

// Get Entity
Entity m_entity = loader.getEntity();

return (Dropship) m_entity;

}

private boolean confirmBayTypeinBays(Vector<Bay> bays, String type){
/**
* Helper to troll through bays looking for a specific combination.
* Can be extended as needed.
*/
boolean found = false;
for(Bay b: bays){
switch(type) {
case "BA_IS":
if(b instanceof BattleArmorBay) {
found = !b.isClan();
}
break;
case "BA_CLAN":
if(b instanceof BattleArmorBay) {
found = b.isClan();
}
break;
case "BA_CS":
if(b instanceof BattleArmorBay) {
found = ((BattleArmorBay) b).isComStar();
}
break;
}
if(found){
return true;
}
}

return false;
}

@Test
public void testLoadNewFormatDSHasMixedBATechLevels() {
boolean parsed = false;
boolean mixedTech = false;
boolean ISBACorrect = false;
boolean ClanBACorrect = false;
boolean ComStarBACorrect = false;
Vector<Bay> bays = null;

try{
Dropship ds = loadDropshipFromString(newFormatDSwithMixedBA);
parsed = true;
mixedTech = ds.isMixedTech() && ds.isClan(); // confirm mixed-tech Clan design
bays = ds.getTransportBays();
ISBACorrect = confirmBayTypeinBays(bays, "BA_IS");
ClanBACorrect = confirmBayTypeinBays(bays, "BA_CLAN");
ComStarBACorrect = confirmBayTypeinBays(bays, "BA_CS");
} catch (Exception e){
}
assertTrue(parsed);
assertTrue(mixedTech);
assertTrue(ISBACorrect);
assertTrue(ClanBACorrect);
assertTrue(ComStarBACorrect);

}
@Test
public void testLoadOldFormatClanDSHasClanBATech() {
// We want to verify that the correct tech type is applied to non-mixed
// Clan BA bays when loading old-format files.
boolean parsed = false;
boolean mixedTech = false;
boolean clan = false;
boolean ClanBACorrect = false;
boolean ISBAExists = false;
Vector<Bay> bays = null;

try{
Dropship ds = loadDropshipFromString(oldFormatClanDSwithBA);
parsed = true;
mixedTech = ds.isMixedTech(); // confirm not mixed tech
clan = ds.isClan(); // confirm clan tech base
bays = ds.getTransportBays();
ClanBACorrect = confirmBayTypeinBays(bays, "BA_CLAN");
ISBAExists = confirmBayTypeinBays(bays, "BA_IS");
} catch (Exception e){
}
assertTrue(parsed);
assertTrue(clan);
assertFalse(mixedTech);
assertTrue(ClanBACorrect);
assertFalse(ISBAExists);

}
//endregion
}
Loading