Skip to content

Commit

Permalink
recall mode param
Browse files Browse the repository at this point in the history
  • Loading branch information
@boardengineer
boardengineer committed Feb 25, 2023
1 parent 29afbd5 commit a93a211
Show file tree
Hide file tree
Showing 3 changed files with 86 additions and 43 deletions.
2 changes: 1 addition & 1 deletion src/main/java/battleaimod/battleai/StateNode.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ private void populateCommands() {
totalHandCost += handCard.costForTurn;
}

return totalHandCost >= EnergyPanel.totalCount;
return totalHandCost <= EnergyPanel.totalCount;
}
}

Expand Down
5 changes: 5 additions & 0 deletions src/main/java/battleaimod/networking/StatusAndControlThreads.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,11 @@ private static void startClientThread() {
SaveStateMod.lastFloorToDisplay = parsedRequest.get("replay_floor_end")
.getAsInt();

if (parsedRequest.has("recall_mode")) {
SavesPatches.recallMode = parsedRequest.get("recall_mode")
.getAsBoolean();
}

SavesPatches.load(path, playerClass);

JsonObject response = new JsonObject();
Expand Down
122 changes: 80 additions & 42 deletions src/main/java/battleaimod/utils/FightRequestClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,36 +18,36 @@

public class FightRequestClient {
public static HashSet<String> FORBIDDEN_RELIC_IDS = new HashSet<String>() {{
add("Achilles Heel Guard");
add("Blighted Snail");
add("Business Contract");
add("Clerics Golden Helm");
add("Comic Book");
add("Dice Of Fate");
add("Festivus Pole");
add("Filiform Needle");
add("Fresh Water");
add("Happy Flower Bed");
add("Horn Of Plenty");
add("Hotwired Cables");
add("Jade Mystic Knot");
add("Paper Bomb");
add("Preserved Amber");
add("PrismaticBranch");
add("Relic Compass");
add("Runic Replicator");
add("Sail");
add("Scales of Justice");
add("Snecko Charm");
add("Snecko Skin Boots");
add("Solid State Drive");
add("Tactical Harness");
add("Vampire Fang");
add("Venomous Scales");
add("Yin");
add("Toolbox");
add("hermit:BloodyTooth");
add("hermit:BrassTacks");
// add("Achilles Heel Guard");
// add("Blighted Snail");
// add("Business Contract");
// add("Clerics Golden Helm");
// add("Comic Book");
// add("Dice Of Fate");
// add("Festivus Pole");
// add("Filiform Needle");
// add("Fresh Water");
// add("Happy Flower Bed");
// add("Horn Of Plenty");
// add("Hotwired Cables");
// add("Jade Mystic Knot");
// add("Paper Bomb");
// add("Preserved Amber");
// add("PrismaticBranch");
// add("Relic Compass");
// add("Runic Replicator");
// add("Sail");
// add("Scales of Justice");
// add("Snecko Charm");
// add("Snecko Skin Boots");
// add("Solid State Drive");
// add("Tactical Harness");
// add("Vampire Fang");
// add("Venomous Scales");
// add("Yin");
// add("Toolbox");
// add("hermit:BloodyTooth");
// add("hermit:BrassTacks");
}};

private static final String HOST_IP = "127.0.0.1";
Expand Down Expand Up @@ -92,9 +92,10 @@ public static void main(String[] args) throws IOException {
});
}*/

runAllBattlesForSeed("2C1SBJ6UA8PZJ"); // Gamble for days
runAllBattlesForSeed("4Y2MSAT52IMU6"); // Sample 1
runAllBattlesForSeed("12MWK6QZQ6M3I"); // Sample 2
// runAllBattlesForSeed("2C1SBJ6UA8PZJ"); // Gamble for days (recorded and uploaded)
// runAllBattlesForSeed("4Y2MSAT52IMU6"); // Sample 1 (recorded)
// runAllBattlesForSeed("12MWK6QZQ6M3I"); // Sample 2 (recorded)
// runAllBattlesForSeed("3L9IBWMH6JM6X");

// runAllBattlesForSeed("EL7EAMUU8HH4"); // Reprogram (recorded)
// runAllBattlesForSeed("1AJNE74BS4XSG"); // broken
Expand All @@ -103,7 +104,35 @@ public static void main(String[] args) throws IOException {
// runAllBattlesForSeed("4GHCWVYLX0RJF"); // Winstone (recorded)

// macro samples
// runAllBattlesForSeed("4Y2MSAT52IMU6");
// runAllBattlesForSeed("NCH68SATLPZT");
// runAllBattlesForSeed("2S7AWMPY1DI3R");
// runAllBattlesForSeed("373WGHXRLEA01");
// runAllBattlesForSeed("3IFYTCZFXUI1P");
// runAllBattlesForSeed("503D7D0NZ9XQR");
// runAllBattlesForSeed("3IFECG0HVK7S4");
// runAllBattlesForSeed("2GW2F5FCKL64C");

//runAllBattlesForSeed("119HMD6Y7VTKV");

// runAllBattlesForSeed("JPENLVL522MC");
// runAllBattlesForSeed("4ETS18L4EL4US");
// runAllBattlesForSeed("2V921K2QEUB29");
// runAllBattlesForSeed("3N9IKUSYU0144");


// runAllBattlesForSeed("2TG6S1NB8YWMH");
// runAllBattlesForSeed("3M8NNS7X5BNEW");
// runAllBattlesForSeed("1YVVM6LZK1X5A");
// runAllBattlesForSeed("5CYYYW3E8SDCX");


// runAllBattlesForSeed("9042FKURJ7E7");
// runAllBattlesForSeed("4ND6UL5GT6HTB");
// runAllBattlesForSeed("VTHA6KRZVD78");

// runAllBattlesForSeed("1U1C3HUD51N81");
// runAllBattlesForSeed("4BQMJLXHX443K");
// runAllBattlesForSeed("2V1HUUG7CXQ5P");

// Watcher against champ Gets stuck in wrath and gets executed. Looks really good,
// Expected 0 Damage.
Expand All @@ -113,16 +142,22 @@ public static void main(String[] args) throws IOException {


// Failed ghost chad against champ.
// String charClass = "RobotSpaceExplorer";
// String charClass = "THE_SILENT";
// String charClass = "DEFECT";
// String seed = "1HQRN2G94VY8W";
// int floor = 50;

// String path = String
// .format("C:\\stuff\\rundata\\runs\\%s\\%02d\\%s.autosave", seed, floor, charClass);
// fightSaveFile(path, charClass);
// String charClass = "IRONCLAD";
// String charClass = "WATCHER";
// String charClass = "THE_CURSED";
String charClass = "MARISA";
String seed = "3NEWUYBBVJQ0M";
int floor = 46;
//
String path = String
.format("C:\\stuff\\rundata\\runs\\%s\\%02d\\%s.autosave", seed, floor, charClass);
fightSaveFile(path, charClass);
// sendLoadRequest(path, charClass);

// runAllBattlesForSeed("4Y2MSAT52IMU6");
// runAllBattlesForSeed("4Y2MSAT52IMU6" );

// socket.setSoTimeout(3000);
// boolean connect = true;
Expand Down Expand Up @@ -225,6 +260,8 @@ static void sendLoadRequest(String path, String playerClass, int start, int end)
requestJson.addProperty("path", path);
requestJson.addProperty("playerClass", playerClass);

requestJson.addProperty("recall_mode", true);

out.writeUTF(requestJson.toString());
} catch (SocketTimeoutException e) {
System.err.println("Failed on connect timeout");
Expand Down Expand Up @@ -402,6 +439,7 @@ private static void runAllBattlesForSeed(String seed) throws IOException {
boolean isVanilla = playerClass.equals("DEFECT") ||
playerClass.equals("THE_SILENT") ||
playerClass.equals("IRONCLAD") ||
playerClass.equals("RobotSpaceExplorer") ||
playerClass.equals("WATCHER");

if (!isVanilla) {
Expand All @@ -422,7 +460,7 @@ private static void runAllBattlesForSeed(String seed) throws IOException {
JsonObject commandsJson = new JsonParser().parse(fileToString(paths[4]))
.getAsJsonObject();

int predictedHpLoss = commandsJson.get("predictor_damage").getAsInt();
int predictedHpLoss = commandsJson.has("predictor_damage") ? commandsJson.get("predictor_damage").getAsInt() : 0;

int startHp = startState.getCurrentHp();
int endHp = new ParsedSaveState(fileToString(paths[3])).getCurrentHp();
Expand Down

0 comments on commit a93a211

Please sign in to comment.