add pp-93

xxzl0130 · Oct 16, 2021 · 8f5d97d · 8f5d97d
1 parent 5c11038
commit 8f5d97d
Show file tree

Hide file tree

Showing 8 changed files with 308 additions and 180 deletions.
diff --git a/ChipSolver/ChipSolver.qrc b/ChipSolver/ChipSolver.qrc
@@ -21,5 +21,9 @@
         <file>Resources/Mk-153.json</file>
         <file>Resources/Mk-153-52-result.json</file>
         <file>Resources/Mk-153-result.json</file>
+        <file>Resources/PP-93.json</file>
+        <file>Resources/PP-93-2-result.json</file>
+        <file>Resources/PP-93-4-result.json</file>
+        <file>Resources/PP-93-result.json</file>
     </qresource>
 </RCC>
diff --git a/ChipSolver/Resources/PP-93-2-result.json b/ChipSolver/Resources/PP-93-2-result.json
diff --git a/ChipSolver/Resources/PP-93-4-result.json b/ChipSolver/Resources/PP-93-4-result.json
diff --git a/ChipSolver/Resources/PP-93-result.json b/ChipSolver/Resources/PP-93-result.json
@@ -0,0 +1 @@
+[[{"ID":17,"rotate":1,"x":2,"y":0},{"ID":28,"rotate":3,"x":3,"y":1},{"ID":30,"rotate":1,"x":0,"y":3},{"ID":30,"rotate":1,"x":5,"y":3},{"ID":17,"rotate":1,"x":3,"y":5},{"ID":28,"rotate":1,"x":2,"y":4}],[{"ID":17,"rotate":1,"x":2,"y":0},{"ID":28,"rotate":3,"x":3,"y":1},{"ID":30,"rotate":1,"x":0,"y":3},{"ID":30,"rotate":1,"x":5,"y":3},{"ID":16,"rotate":1,"x":2,"y":5},{"ID":29,"rotate":3,"x":3,"y":4}],[{"ID":17,"rotate":1,"x":2,"y":0},{"ID":28,"rotate":3,"x":3,"y":1},{"ID":30,"rotate":1,"x":0,"y":3},{"ID":30,"rotate":1,"x":5,"y":3},{"ID":24,"rotate":0,"x":4,"y":4},{"ID":25,"rotate":0,"x":2,"y":4}],[{"ID":16,"rotate":1,"x":3,"y":0},{"ID":29,"rotate":1,"x":2,"y":1},{"ID":30,"rotate":1,"x":0,"y":3},{"ID":30,"rotate":1,"x":5,"y":3},{"ID":16,"rotate":1,"x":2,"y":5},{"ID":29,"rotate":3,"x":3,"y":4}],[{"ID":16,"rotate":1,"x":3,"y":0},{"ID":29,"rotate":1,"x":2,"y":1},{"ID":30,"rotate":1,"x":0,"y":3},{"ID":30,"rotate":1,"x":5,"y":3},{"ID":24,"rotate":0,"x":4,"y":4},{"ID":25,"rotate":0,"x":2,"y":4}],[{"ID":25,"rotate":2,"x":4,"y":0},{"ID":24,"rotate":2,"x":2,"y":0},{"ID":30,"rotate":1,"x":0,"y":3},{"ID":30,"rotate":1,"x":5,"y":3},{"ID":24,"rotate":0,"x":4,"y":4},{"ID":25,"rotate":0,"x":2,"y":4}],[{"ID":17,"rotate":1,"x":2,"y":0},{"ID":24,"rotate":0,"x":4,"y":1},{"ID":30,"rotate":1,"x":5,"y":3},{"ID":17,"rotate":1,"x":3,"y":5},{"ID":24,"rotate":2,"x":2,"y":3},{"ID":30,"rotate":1,"x":0,"y":3}],[{"ID":16,"rotate":1,"x":3,"y":0},{"ID":25,"rotate":0,"x":2,"y":1},{"ID":30,"rotate":1,"x":0,"y":3},{"ID":16,"rotate":1,"x":2,"y":5},{"ID":25,"rotate":2,"x":4,"y":3},{"ID":30,"rotate":1,"x":5,"y":3}],[{"ID":17,"rotate":1,"x":2,"y":0},{"ID":24,"rotate":0,"x":4,"y":1},{"ID":30,"rotate":1,"x":5,"y":3},{"ID":17,"rotate":1,"x":3,"y":5},{"ID":21,"rotate":1,"x":1,"y":4},{"ID":38,"rotate":2,"x":0,"y":3}],[{"ID":16,"rotate":1,"x":3,"y":0},{"ID":25,"rotate":0,"x":2,"y":1},{"ID":30,"rotate":1,"x":0,"y":3},{"ID":16,"rotate":1,"x":2,"y":5},{"ID":21,"rotate":0,"x":4,"y":4},{"ID":38,"rotate":2,"x":4,"y":3}],[{"ID":13,"rotate":2,"x":3,"y":0},{"ID":25,"rotate":1,"x":0,"y":2},{"ID":24,"rotate":1,"x":0,"y":4},{"ID":12,"rotate":0,"x":3,"y":5},{"ID":30,"rotate":1,"x":5,"y":3},{"ID":38,"rotate":1,"x":4,"y":2}],[{"ID":16,"rotate":1,"x":3,"y":0},{"ID":21,"rotate":2,"x":1,"y":1},{"ID":38,"rotate":0,"x":0,"y":3},{"ID":16,"rotate":1,"x":2,"y":5},{"ID":21,"rotate":0,"x":4,"y":4},{"ID":38,"rotate":2,"x":4,"y":3}],[{"ID":17,"rotate":1,"x":2,"y":0},{"ID":21,"rotate":3,"x":4,"y":1},{"ID":38,"rotate":0,"x":4,"y":3},{"ID":17,"rotate":1,"x":3,"y":5},{"ID":21,"rotate":1,"x":1,"y":4},{"ID":38,"rotate":2,"x":0,"y":3}]]
diff --git a/ChipSolver/Resources/PP-93.json b/ChipSolver/Resources/PP-93.json
@@ -0,0 +1,35 @@
+{
+    "name": "PP-93",
+    "optional": {
+        "PP-93":0,
+        "PP-93-2":2,
+        "PP-93-4":4
+    },
+    "width": 8,
+    "height": 8,
+    "blocks": 32,
+    "color": 1,
+    "palindrome": 1,
+    "map": [
+        "11100111",
+        "11100111",
+        "11000011",
+        "00000000",
+        "00000000",
+        "11000011",
+        "11100111",
+        "11100111"
+    ],
+    "MaxBlocks": {
+        "damage": 16,
+        "def_break": 2,
+        "hit": 6,
+        "reload": 7
+    },
+    "MaxValues": {
+        "damage": 169,
+        "def_break": 55,
+        "hit": 100,
+        "reload": 91
+    }
+}
diff --git a/ChipSolver/Resources/squads.json b/ChipSolver/Resources/squads.json
@@ -24,5 +24,10 @@
     "Mk-153": {
         "6格+5格1类": "Mk-153-result.json",
         "带5格2类": "Mk-153-52-result.json"
+    },
+    "PP-93":{
+        "填满": "PP-93-result.json",
+        "最多空2格": "PP-93-2-result.json",
+        "最多空4格": "PP-93-4-result.json"
     }
 }
diff --git a/CodeX/AboutDialog.cpp b/CodeX/AboutDialog.cpp
@@ -4,7 +4,7 @@
 
 AboutDialog::AboutDialog(QWidget *parent)
 	: QDialog(parent),
-	version(2,2,5),
+	version(2,3,0),
 	ui(new Ui::AboutDialog()),
 	accessManager_(new QNetworkAccessManager(this))
 {