poi-plugin-milk 1.0.3 → 1.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/.idea/workspace.xml +31 -31
  2. package/i18n/zh-CN.json +1 -1
  3. package/index.js +15 -7
  4. package/package.json +1 -1
  5. package/parts/fleet-list.js +2 -0
  6. package/parts/ship-row.js +8 -5
package/.idea/workspace.xml CHANGED
@@ -24,8 +24,8 @@
24
24
  <file leaf-file-name="fleet-list.js" pinned="false" current-in-tab="false">
25
25
  <entry file="file://$PROJECT_DIR$/parts/fleet-list.js">
26
26
  <provider selected="true" editor-type-id="text-editor">
27
- <state relative-caret-position="565">
28
- <caret line="134" column="17" lean-forward="false" selection-start-line="134" selection-start-column="17" selection-end-line="134" selection-end-column="17" />
27
+ <state relative-caret-position="-5995">
28
+ <caret line="124" column="51" lean-forward="false" selection-start-line="124" selection-start-column="51" selection-end-line="124" selection-end-column="51" />
29
29
  <folding />
30
30
  </state>
31
31
  </provider>
@@ -34,8 +34,8 @@
34
34
  <file leaf-file-name="index.js" pinned="false" current-in-tab="false">
35
35
  <entry file="file://$PROJECT_DIR$/index.js">
36
36
  <provider selected="true" editor-type-id="text-editor">
37
- <state relative-caret-position="565">
38
- <caret line="50" column="63" lean-forward="false" selection-start-line="50" selection-start-column="55" selection-end-line="50" selection-end-column="63" />
37
+ <state relative-caret-position="4264">
38
+ <caret line="102" column="6" lean-forward="false" selection-start-line="102" selection-start-column="6" selection-end-line="102" selection-end-column="6" />
39
39
  <folding />
40
40
  </state>
41
41
  </provider>
@@ -64,8 +64,8 @@
64
64
  <file leaf-file-name="zh-CN.json" pinned="false" current-in-tab="false">
65
65
  <entry file="file://$PROJECT_DIR$/i18n/zh-CN.json">
66
66
  <provider selected="true" editor-type-id="text-editor">
67
- <state relative-caret-position="287">
68
- <caret line="7" column="5" lean-forward="false" selection-start-line="7" selection-start-column="3" selection-end-line="7" selection-end-column="5" />
67
+ <state relative-caret-position="41">
68
+ <caret line="1" column="28" lean-forward="false" selection-start-line="1" selection-start-column="28" selection-end-line="1" selection-end-column="28" />
69
69
  <folding />
70
70
  </state>
71
71
  </provider>
@@ -122,22 +122,22 @@
122
122
  <find>Not ready</find>
123
123
  <find>canRepair</find>
124
124
  <find>HP</find>
125
- <find>repairId</find>
126
125
  <find>inRepair</find>
127
126
  <find>timeElapsed</find>
128
127
  <find>49</find>
129
- <find>poi-util-transpile</find>
130
128
  <find>49a</find>
129
+ <find>poi-util-transpile</find>
130
+ <find>repairId</find>
131
131
  </findStrings>
132
132
  </component>
133
133
  <component name="IdeDocumentHistory">
134
134
  <option name="CHANGED_PATHS">
135
135
  <list>
136
- <option value="$PROJECT_DIR$/i18n/zh-CN.json" />
137
- <option value="$PROJECT_DIR$/index.js" />
138
- <option value="$PROJECT_DIR$/parts/fleet-list.js" />
139
136
  <option value="$PROJECT_DIR$/parts/functions.js" />
137
+ <option value="$PROJECT_DIR$/parts/fleet-list.js" />
140
138
  <option value="$PROJECT_DIR$/parts/ship-row.js" />
139
+ <option value="$PROJECT_DIR$/index.js" />
140
+ <option value="$PROJECT_DIR$/i18n/zh-CN.json" />
141
141
  <option value="$PROJECT_DIR$/package.json" />
142
142
  </list>
143
143
  </option>
@@ -262,12 +262,12 @@
262
262
  <option name="presentableId" value="Default" />
263
263
  <updated>1764751942683</updated>
264
264
  <workItem from="1764751943836" duration="336000" />
265
- <workItem from="1764814660477" duration="7749000" />
265
+ <workItem from="1764814660477" duration="9279000" />
266
266
  </task>
267
267
  <servers />
268
268
  </component>
269
269
  <component name="TimeTrackingManager">
270
- <option name="totallyTimeSpent" value="8085000" />
270
+ <option name="totallyTimeSpent" value="9615000" />
271
271
  </component>
272
272
  <component name="ToolWindowManager">
273
273
  <frame x="140" y="22" width="3700" height="2138" extended-state="0" />
@@ -362,50 +362,50 @@
362
362
  </state>
363
363
  </provider>
364
364
  </entry>
365
- <entry file="file://$PROJECT_DIR$/i18n/zh-CN.json">
365
+ <entry file="file://$PROJECT_DIR$/parts/factor.js">
366
366
  <provider selected="true" editor-type-id="text-editor">
367
- <state relative-caret-position="287">
368
- <caret line="7" column="5" lean-forward="false" selection-start-line="7" selection-start-column="3" selection-end-line="7" selection-end-column="5" />
367
+ <state relative-caret-position="0">
368
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
369
369
  <folding />
370
370
  </state>
371
371
  </provider>
372
372
  </entry>
373
- <entry file="file://$PROJECT_DIR$/parts/factor.js">
373
+ <entry file="file://$PROJECT_DIR$/parts/functions.js">
374
374
  <provider selected="true" editor-type-id="text-editor">
375
- <state relative-caret-position="0">
376
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
375
+ <state relative-caret-position="973">
376
+ <caret line="58" column="56" lean-forward="false" selection-start-line="58" selection-start-column="56" selection-end-line="58" selection-end-column="56" />
377
377
  <folding />
378
378
  </state>
379
379
  </provider>
380
380
  </entry>
381
- <entry file="file://$PROJECT_DIR$/index.js">
381
+ <entry file="file://$PROJECT_DIR$/parts/fleet-list.js">
382
382
  <provider selected="true" editor-type-id="text-editor">
383
- <state relative-caret-position="565">
384
- <caret line="50" column="63" lean-forward="false" selection-start-line="50" selection-start-column="55" selection-end-line="50" selection-end-column="63" />
383
+ <state relative-caret-position="-5995">
384
+ <caret line="124" column="51" lean-forward="false" selection-start-line="124" selection-start-column="51" selection-end-line="124" selection-end-column="51" />
385
385
  <folding />
386
386
  </state>
387
387
  </provider>
388
388
  </entry>
389
- <entry file="file://$PROJECT_DIR$/parts/fleet-list.js">
389
+ <entry file="file://$PROJECT_DIR$/parts/ship-row.js">
390
390
  <provider selected="true" editor-type-id="text-editor">
391
- <state relative-caret-position="565">
392
- <caret line="134" column="17" lean-forward="false" selection-start-line="134" selection-start-column="17" selection-end-line="134" selection-end-column="17" />
391
+ <state relative-caret-position="893">
392
+ <caret line="65" column="42" lean-forward="false" selection-start-line="65" selection-start-column="42" selection-end-line="65" selection-end-column="42" />
393
393
  <folding />
394
394
  </state>
395
395
  </provider>
396
396
  </entry>
397
- <entry file="file://$PROJECT_DIR$/parts/functions.js">
397
+ <entry file="file://$PROJECT_DIR$/index.js">
398
398
  <provider selected="true" editor-type-id="text-editor">
399
- <state relative-caret-position="973">
400
- <caret line="58" column="56" lean-forward="false" selection-start-line="58" selection-start-column="56" selection-end-line="58" selection-end-column="56" />
399
+ <state relative-caret-position="4264">
400
+ <caret line="102" column="6" lean-forward="false" selection-start-line="102" selection-start-column="6" selection-end-line="102" selection-end-column="6" />
401
401
  <folding />
402
402
  </state>
403
403
  </provider>
404
404
  </entry>
405
- <entry file="file://$PROJECT_DIR$/parts/ship-row.js">
405
+ <entry file="file://$PROJECT_DIR$/i18n/zh-CN.json">
406
406
  <provider selected="true" editor-type-id="text-editor">
407
- <state relative-caret-position="893">
408
- <caret line="65" column="42" lean-forward="false" selection-start-line="65" selection-start-column="42" selection-end-line="65" selection-end-column="42" />
407
+ <state relative-caret-position="41">
408
+ <caret line="1" column="28" lean-forward="false" selection-start-line="1" selection-start-column="28" selection-end-line="1" selection-end-column="28" />
409
409
  <folding />
410
410
  </state>
411
411
  </provider>
package/i18n/zh-CN.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "Anchorage repair": "泊地修理",
2
+ "Anchorage repair": "修理和喂奶",
3
3
  "Akashi not flagship": "明石不是旗舰/野崎不是旗舰二舰",
4
4
  "Not ready": "未就绪",
5
5
  "Capacity: %s": "可修理数量: %s",
package/index.js CHANGED
@@ -83,16 +83,24 @@ const fleetAkashiConv = (fleet, $ships, ships, equips, repairId) => {
83
83
  });
84
84
 
85
85
  var repairStatus = 0
86
+ var flagshipa = _lodash2.default.get(fleet, 'api_ship.0', -1)
87
+ var secondshipa = _lodash2.default.get(fleet, 'api_ship.1', -1)
88
+ var flagshipid = ships[flagshipa]?ships[flagshipa].api_ship_id:-1;
89
+ var secondshipid = ships[secondshipa]?ships[secondshipa].api_ship_id:-1;
86
90
  if(canRepair){
87
91
  repairStatus = 1;
92
+ if(secondshipid==996
93
+ // ||secondshipid==357 //没有野崎，用初月改测试
94
+ ){
95
+ repairStatus = 4;
96
+ }
97
+ if(secondshipid==1002
98
+ ){
99
+ repairStatus = 5;
100
+ }
88
101
  }else{
89
- var flagshipa = _lodash2.default.get(fleet, 'api_ship.0', -1)
90
- var secondshipa = _lodash2.default.get(fleet, 'api_ship.1', -1)
91
- var flagshipid = ships[flagshipa]?ships[flagshipa].api_ship_id:-1;
92
- var secondshipid = ships[secondshipa]?ships[secondshipa].api_ship_id:-1;
93
-
94
102
  if(flagshipid==996||secondshipid==996
95
- ||flagshipid==357||secondshipid==357 //没有野崎，用初月改测试
103
+ //||flagshipid==357||secondshipid==357 //没有野崎，用初月改测试
96
104
  ){
97
105
  repairStatus = 2;
98
106
  }
@@ -103,7 +111,7 @@ const fleetAkashiConv = (fleet, $ships, ships, equips, repairId) => {
103
111
  }
104
112
  //console.log("cc:"+flagshipid)
105
113
  canRepair = repairStatus;
106
- //console.log("cc2:"+secondshipid)
114
+ console.log("cc2:"+canRepair)
107
115
  return {
108
116
  api_id: fleet.api_id || -1,
109
117
  shipId: fleet.api_ship || [],
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "poi-plugin-milk",
3
- "version": "1.0.3",
3
+ "version": "1.0.5",
4
4
  "description": "Anchorage repair plugin for poi",
5
5
  "main": "index.es",
6
6
  "repository": {
package/parts/fleet-list.js CHANGED
@@ -122,6 +122,8 @@ class FleetList extends _react.Component {
122
122
  s1 = __('Repairing')
123
123
  }else if(fleet.canRepair==2||fleet.canRepair==3){
124
124
  s1 = '正在喂奶';
125
+ }else if(fleet.canRepair==4||fleet.canRepair==5){
126
+ s1 = '正在修理和喂奶';
125
127
  }
126
128
 
127
129
  return _react2.default.createElement(
package/parts/ship-row.js CHANGED
@@ -62,8 +62,11 @@ const ShipRow = (0, _reactRedux.connect)(state => {
62
62
  //console.log(ship)
63
63
  const completeTime = lastRefresh + estimate;
64
64
  var milkadd = 0;
65
- if(canRepair==2||canRepair==3){
66
- milkadd = Math.floor(timeElapsed/900)*canRepair;
65
+ if(canRepair==2||canRepair==4){
66
+ milkadd = Math.floor(timeElapsed/900)*2;
67
+ }
68
+ if(canRepair==3||canRepair==5){
69
+ milkadd = Math.floor(timeElapsed/900)*3;
67
70
  }
68
71
  var milks = Math.max(api_cond,Math.min(api_cond + milkadd,54))
69
72
 
@@ -123,9 +126,9 @@ const ShipRow = (0, _reactRedux.connect)(state => {
123
126
  _react2.default.createElement(
124
127
  'td',
125
128
  null,
126
- (canRepair==1)?'❤️':null,
127
- (canRepair==1) && api_nowhp !== api_maxhp && !inRepair && (0, _functions.repairEstimate)(ship, timeElapsed, availableSRF),
128
- (canRepair==2||canRepair==3)?
129
+ (canRepair==1||canRepair==4||canRepair==5)?'❤️':null,
130
+ (canRepair==1||canRepair==4||canRepair==5) && api_nowhp !== api_maxhp && !inRepair && (0, _functions.repairEstimate)(ship, timeElapsed, availableSRF),
131
+ (canRepair==2||canRepair==3||canRepair==4||canRepair==5)?
129
132
  _react2.default.createElement(
130
133
  'td',
131
134
  null,