From 11700b7fbb7bb8acf235107f491954c58d5c093b Mon Sep 17 00:00:00 2001 From: justi <justi@LAPTOP-258UDA82> Date: Wed, 25 Aug 2021 19:59:02 -0700 Subject: [PATCH] Frank Assignment 3 --- .../Frank/FrankSimulationProgram.java | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/assignments/src/MV3500Cohort2021JulySeptember/homework3/Frank/FrankSimulationProgram.java b/assignments/src/MV3500Cohort2021JulySeptember/homework3/Frank/FrankSimulationProgram.java index 886c7881f3..dda4408d56 100644 --- a/assignments/src/MV3500Cohort2021JulySeptember/homework3/Frank/FrankSimulationProgram.java +++ b/assignments/src/MV3500Cohort2021JulySeptember/homework3/Frank/FrankSimulationProgram.java @@ -104,7 +104,7 @@ public class FrankSimulationProgram { EntityStatePdu entityStatePdu2 = pduFactory.makeEntityStatePdu(); - EntityID T62ID = new EntityID();//1.1.222.2.2.1 Platform,Ground,Russia,ArmoredFightingVehicle,BMP2,BMP2 + EntityID T62ID = new EntityID();//1.1.45.1.7.1 Platform,Ground,China, Tank, T-62 T62ID.setSiteID(1); T62ID.setApplicationID(13); T62ID.setEntityID(2); @@ -149,26 +149,26 @@ public class FrankSimulationProgram { firePdu.setFiringEntityID(fireID); firePdu.setTargetEntityID(targetID); - EntityType HEType = new EntityType(); //2.9.225.2.2.1 - HEType.setEntityKind(EntityKind.MUNITION); - HEType.setDomain(Domain.inst(PlatformDomain.AIR)); - HEType.setCountry(Country.UNITED_STATES_OF_AMERICA_USA); - HEType.setCategory(2); - HEType.setSubCategory(2); - HEType.setSpecific(1); - MunitionDescriptor HEIT = new MunitionDescriptor(); - HEIT.setMunitionType(HEType); - HEIT.setQuantity(3); - HEIT.setFuse(MunitionDescriptorFuse.CONTACT_GRAZE); - HEIT.setRate(200); - - firePdu.setDescriptor(HEIT); - EntityID HEID = new EntityID(); - HEID.setEntityID(1); - firePdu.setMunitionExpendibleID(HEID); + EntityType M829Type = new EntityType(); //2.2.225.2.13.1 + M829Type.setEntityKind(EntityKind.MUNITION); + M829Type.setDomain(Domain.inst(PlatformDomain.AIR)); + M829Type.setCountry(Country.UNITED_STATES_OF_AMERICA_USA); + M829Type.setCategory(2); + M829Type.setSubCategory(13); + M829Type.setSpecific(1); + MunitionDescriptor M829IT = new MunitionDescriptor(); + M829IT.setMunitionType(M829Type); + M829IT.setQuantity(3); + M829IT.setFuse(MunitionDescriptorFuse.CONTACT_GRAZE); + M829IT.setRate(200); + + firePdu.setDescriptor(M829IT); + EntityID M829ID = new EntityID(); + M829ID.setEntityID(1); + firePdu.setMunitionExpendibleID(M829ID); // - CommentReliablePdu T62DestroyedComment = pduFactory.makeCommentReliablePdu("T62 DESTROYED BY M1 Abrams AFTER 2 rounds of 25mm HEI-T ON TARGET"); + CommentReliablePdu T62DestroyedComment = pduFactory.makeCommentReliablePdu("T62 DESTROYED BY M1 Abrams AFTER 2 rounds M829I-T ON TARGET"); CommentReliablePdu T62SightedComment = pduFactory.makeCommentReliablePdu("M1 Abrams Acquires Target - T62 with in firing distance"); //if(eloc1.getX()) EntityID MTVRID = new EntityID(); @@ -201,7 +201,7 @@ public class FrankSimulationProgram { if (T62HitsReceived > 1) { // The M1 destroyst the T62 - System.out.println("M1 Abrams destroys T62 after " + T62HitsReceived + "rounds hit T62 Chinese Tank"); + System.out.println("M1 Abrams destroys T62 after " + T62HitsReceived + "rounds hit T62 Russian Tank"); narrativeMessage4 = "Destroyed T62"; destBool = true; -- GitLab