diff --git a/resource/roguelike/JieGarden/map.json b/resource/roguelike/JieGarden/map.json new file mode 100644 index 0000000000..c2d74ae587 --- /dev/null +++ b/resource/roguelike/JieGarden/map.json @@ -0,0 +1,25 @@ +{ + "theme": "JieGarden", + "node": [ + { + "type": "CombatOps", + "template": ["JieGarden@Roguelike@MapNodeCombatOps.png", "JieGarden@Roguelike@MapNodeCombatOpsGrey.png"] + }, + { + "type": "EmergencyOps", + "template": ["JieGarden@Roguelike@MapNodeEmergencyOps.png", "JieGarden@Roguelike@MapNodeEmergencyOpsGrey.png"] + }, + { + "type": "Encounter", + "template": ["JieGarden@Roguelike@MapNodeEncounter.png", "JieGarden@Roguelike@MapNodeEncounterGrey.png"] + }, + { + "type": "RogueTrader", + "template": ["JieGarden@Roguelike@MapNodeRogueTrader.png", "JieGarden@Roguelike@MapNodeRogueTraderGrey.png"] + }, + { + "type": "BoskyPassage", + "template": ["JieGarden@Roguelike@MapNodeBoskyPassage.png", "JieGarden@Roguelike@MapNodeBoskyPassageGrey.png"] + } + ] +} diff --git a/resource/tasks/Roguelike/JieGarden.json b/resource/tasks/Roguelike/JieGarden.json index 3b7f09a95f..7f184d8d80 100644 --- a/resource/tasks/Roguelike/JieGarden.json +++ b/resource/tasks/Roguelike/JieGarden.json @@ -447,7 +447,10 @@ "JieGarden@Roguelike@MapNodeEmergencyOpsGrey.png", "JieGarden@Roguelike@MapNodeEncounter.png", "JieGarden@Roguelike@MapNodeEncounterGrey.png", - "JieGarden@Roguelike@MapNodeRogueTraderGrey.png" + "JieGarden@Roguelike@MapNodeRogueTraderGrey.png", + "JieGarden@Roguelike@MapNodeRogueTrader.png", + "JieGarden@Roguelike@MapNodeBoskyPassageGrey.png", + "JieGarden@Roguelike@MapNodeBoskyPassage.png" ], "roi": [246, 60, 288, 575], "postDelay": 300 diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeBoons.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeBoons.png new file mode 100644 index 0000000000..6a71c2cc56 Binary files /dev/null and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeBoons.png differ diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeBoonsGrey.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeBoonsGrey.png new file mode 100644 index 0000000000..77779d4d26 Binary files /dev/null and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeBoonsGrey.png differ diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeBoskyPassage.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeBoskyPassage.png new file mode 100644 index 0000000000..c3d745e36e Binary files /dev/null and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeBoskyPassage.png differ diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeBoskyPassageGrey.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeBoskyPassageGrey.png new file mode 100644 index 0000000000..5558ca62cc Binary files /dev/null and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeBoskyPassageGrey.png differ diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeCombatOps.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeCombatOps.png index d2a9d253b6..649b8b9626 100644 Binary files a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeCombatOps.png and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeCombatOps.png differ diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeCombatOpsGrey.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeCombatOpsGrey.png index d2a9d253b6..f24b0401cb 100644 Binary files a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeCombatOpsGrey.png and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeCombatOpsGrey.png differ diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeEmergencyOps.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeEmergencyOps.png index d2a9d253b6..96d20bea4b 100644 Binary files a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeEmergencyOps.png and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeEmergencyOps.png differ diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeEmergencyOpsGrey.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeEmergencyOpsGrey.png index d2a9d253b6..ddf8f23753 100644 Binary files a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeEmergencyOpsGrey.png and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeEmergencyOpsGrey.png differ diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeEncounter.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeEncounter.png index d2a9d253b6..f2e98e7f09 100644 Binary files a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeEncounter.png and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeEncounter.png differ diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeEncounterGrey.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeEncounterGrey.png index d2a9d253b6..e7be41d250 100644 Binary files a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeEncounterGrey.png and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeEncounterGrey.png differ diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeRogueTrader.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeRogueTrader.png new file mode 100644 index 0000000000..0a1c896794 Binary files /dev/null and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeRogueTrader.png differ diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeRogueTraderGrey.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeRogueTraderGrey.png index d2a9d253b6..9c33885986 100644 Binary files a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeRogueTraderGrey.png and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapNodeRogueTraderGrey.png differ diff --git a/src/MaaCore/Config/ResourceLoader.cpp b/src/MaaCore/Config/ResourceLoader.cpp index 785ccbecb1..dbbe4e3cef 100644 --- a/src/MaaCore/Config/ResourceLoader.cpp +++ b/src/MaaCore/Config/ResourceLoader.cpp @@ -236,6 +236,7 @@ bool asst::ResourceLoader::load(const std::filesystem::path& path) // –––––––– Roguelike Map Config ––––––––––––––––––––––––––––––––––––––––––––------ LoadResourceAndCheckRet(RoguelikeMapConfig, "roguelike"_p / "Sarkaz"_p / "map.json"_p); + LoadResourceAndCheckRet(RoguelikeMapConfig, "roguelike"_p / "JieGarden"_p / "map.json"_p); // –––––––– Sami Plugin Config –––––––––––––––––––––––––––––––––––––––––––––––––––– LoadResourceAndCheckRet(RoguelikeFoldartalConfig, "roguelike"_p / "Sami"_p / "foldartal.json"_p);