Skip to content

Commit 0887683

Browse files
committed
Add: config for emotion control in GemsFarming
1 parent 2b5657f commit 0887683

4 files changed

Lines changed: 106 additions & 0 deletions

File tree

config/template.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,19 @@
348348
"Fleet2Step": 2,
349349
"FleetOrder": "fleet1_all_fleet2_standby"
350350
},
351+
"Emotion": {
352+
"Mode": "calculate_ignore",
353+
"Fleet1Value": 119,
354+
"Fleet1Record": "2020-01-01 00:00:00",
355+
"Fleet1Control": "prevent_red_face",
356+
"Fleet1Recover": "not_in_dormitory",
357+
"Fleet1Oath": false,
358+
"Fleet2Value": 119,
359+
"Fleet2Record": "2020-01-01 00:00:00",
360+
"Fleet2Control": "prevent_red_face",
361+
"Fleet2Recover": "not_in_dormitory",
362+
"Fleet2Oath": false
363+
},
351364
"Submarine": {
352365
"Fleet": 0,
353366
"Mode": "do_not_use",

module/config/argument/args.json

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1850,6 +1850,90 @@
18501850
"display": "display"
18511851
}
18521852
},
1853+
"Emotion": {
1854+
"Mode": {
1855+
"type": "select",
1856+
"value": "calculate_ignore",
1857+
"option": [
1858+
"calculate",
1859+
"ignore",
1860+
"calculate_ignore"
1861+
],
1862+
"display": "hide"
1863+
},
1864+
"Fleet1Value": {
1865+
"type": "input",
1866+
"value": 119
1867+
},
1868+
"Fleet1Record": {
1869+
"type": "datetime",
1870+
"value": "2020-01-01 00:00:00",
1871+
"validate": "datetime",
1872+
"display": "disabled"
1873+
},
1874+
"Fleet1Control": {
1875+
"type": "select",
1876+
"value": "prevent_red_face",
1877+
"option": [
1878+
"keep_exp_bonus",
1879+
"prevent_green_face",
1880+
"prevent_yellow_face",
1881+
"prevent_red_face"
1882+
],
1883+
"display": "hide"
1884+
},
1885+
"Fleet1Recover": {
1886+
"type": "select",
1887+
"value": "not_in_dormitory",
1888+
"option": [
1889+
"not_in_dormitory",
1890+
"dormitory_floor_1",
1891+
"dormitory_floor_2"
1892+
],
1893+
"display": "hide"
1894+
},
1895+
"Fleet1Oath": {
1896+
"type": "checkbox",
1897+
"value": false,
1898+
"display": "hide"
1899+
},
1900+
"Fleet2Value": {
1901+
"type": "input",
1902+
"value": 119
1903+
},
1904+
"Fleet2Record": {
1905+
"type": "datetime",
1906+
"value": "2020-01-01 00:00:00",
1907+
"validate": "datetime",
1908+
"display": "disabled"
1909+
},
1910+
"Fleet2Control": {
1911+
"type": "select",
1912+
"value": "prevent_red_face",
1913+
"option": [
1914+
"keep_exp_bonus",
1915+
"prevent_green_face",
1916+
"prevent_yellow_face",
1917+
"prevent_red_face"
1918+
],
1919+
"display": "hide"
1920+
},
1921+
"Fleet2Recover": {
1922+
"type": "select",
1923+
"value": "not_in_dormitory",
1924+
"option": [
1925+
"not_in_dormitory",
1926+
"dormitory_floor_1",
1927+
"dormitory_floor_2"
1928+
],
1929+
"display": "hide"
1930+
},
1931+
"Fleet2Oath": {
1932+
"type": "checkbox",
1933+
"value": false,
1934+
"display": "hide"
1935+
}
1936+
},
18531937
"Submarine": {
18541938
"Fleet": {
18551939
"type": "select",

module/config/argument/override.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,14 @@ GemsFarming:
4646
display: display
4747
value: fleet1_all_fleet2_standby
4848
option: [ fleet1_all_fleet2_standby, fleet1_standby_fleet2_all ]
49+
Emotion:
50+
Mode: calculate_ignore
51+
Fleet1Control: prevent_red_face
52+
Fleet1Recover: not_in_dormitory
53+
Fleet1Oath: false
54+
Fleet2Control: prevent_red_face
55+
Fleet2Recover: not_in_dormitory
56+
Fleet2Oath: false
4957
Submarine:
5058
Mode:
5159
display: display

module/config/argument/task.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ Farm:
6262
- Campaign
6363
- StopCondition
6464
- Fleet
65+
- Emotion
6566
- Submarine
6667

6768
# ==================== Event ====================

0 commit comments

Comments
 (0)