0.3.0 to master

CHANGELOG.md

@@ -1,3 +1,18 @@
+#### 0.3.0
+
+* Implements the ShipSwitcher module
+  * Allows for switching of ships based on class, ship, or position on a per-slot basis and based on damage, fatigue, or sparkled status
+  * Due to the complexity of the config, it is strongly recommended that the [webUI](https://mrmin123.github.io/kcauto-kai/) be used to generate the relevant config
+  * May be buggy
+* Implements `ClearStop` combat option
+  * Like the `MedalStop` option of kancolle-auto, but also works for Event maps
+  * May be buggy
+* New damage-state assets for more accurate damage state detection of ringed ships
+* Added Patreon link to UI, in case you want to support the dev!
+* Major refactor of webUI
+* Various performance and memory optimizations
+* Various tweaks and bugfixes
+
 #### 0.2.10
 
 * Bugfix in combat and fleet modules

config.ini

@@ -18,7 +18,7 @@ Enabled: True
 
 [Combat]
 Enabled: False
-Engine: legacy
+Engine: live
 FleetMode:
 Map: 1-1
 CombatNodes:
@@ -27,12 +27,27 @@ Formations:
 NightBattles:
 RetreatLimit: heavy
 RepairLimit: moderate
-RepairTimeLimit: 0000
+RepairTimeLimit: 0030
 LBASGroups:
 LBASGroup1Nodes:
 LBASGroup2Nodes:
 LBASGroup3Nodes:
 MiscOptions:
 
+[ShipSwitcher]
+Enabled: False
+Slot1Criteria:
+Slot1Ships:
+Slot2Criteria:
+Slot2Ships:
+Slot3Criteria:
+Slot3Ships:
+Slot4Criteria:
+Slot4Ships:
+Slot5Criteria:
+Slot5Ships:
+Slot6Criteria:
+Slot6Ships:
+
 [Quests]
 Enabled: True

docs-src/src/actions/config/index.jsx

@@ -66,8 +66,32 @@ export const setPythonConfig = config => (
     if (config.combatOptionPortCheck) {
       combatOptions.push('PortCheck')
     }
-    if (config.combatOptionMedalStop) {
-      combatOptions.push('MedalStop')
+    if (config.combatOptionClearStop) {
+      combatOptions.push('ClearStop')
+    }
+    if (!configTemp.shipSwitcherSlot1Criteria || !configTemp.shipSwitcherSlot1Ships) {
+      configTemp.shipSwitcherSlot1Criteria = ''
+      configTemp.shipSwitcherSlot1Ships = ''
+    }
+    if (!configTemp.shipSwitcherSlot2Criteria || !configTemp.shipSwitcherSlot2Ships) {
+      configTemp.shipSwitcherSlot2Criteria = ''
+      configTemp.shipSwitcherSlot2Ships = ''
+    }
+    if (!configTemp.shipSwitcherSlot3Criteria || !configTemp.shipSwitcherSlot3Ships) {
+      configTemp.shipSwitcherSlot3Criteria = ''
+      configTemp.shipSwitcherSlot3Ships = ''
+    }
+    if (!configTemp.shipSwitcherSlot4Criteria || !configTemp.shipSwitcherSlot4Ships) {
+      configTemp.shipSwitcherSlot4Criteria = ''
+      configTemp.shipSwitcherSlot4Ships = ''
+    }
+    if (!configTemp.shipSwitcherSlot5Criteria || !configTemp.shipSwitcherSlot5Ships) {
+      configTemp.shipSwitcherSlot5Criteria = ''
+      configTemp.shipSwitcherSlot5Ships = ''
+    }
+    if (!configTemp.shipSwitcherSlot6Criteria || !configTemp.shipSwitcherSlot6Ships) {
+      configTemp.shipSwitcherSlot6Criteria = ''
+      configTemp.shipSwitcherSlot6Ships = ''
     }
 
     const pythonConfig = [
@@ -107,6 +131,21 @@ export const setPythonConfig = config => (
       `LBASGroup3Nodes: ${combatLBASGroup3Nodes}`,
       `MiscOptions: ${combatOptions.join(',')}`,
       '',
+      '[ShipSwitcher]',
+      `Enabled: ${configTemp.shipSwitcherEnabled}`,
+      `Slot1Criteria: ${configTemp.shipSwitcherSlot1Criteria}`,
+      `Slot1Ships: ${configTemp.shipSwitcherSlot1Ships}`,
+      `Slot2Criteria: ${configTemp.shipSwitcherSlot2Criteria}`,
+      `Slot2Ships: ${configTemp.shipSwitcherSlot2Ships}`,
+      `Slot3Criteria: ${configTemp.shipSwitcherSlot3Criteria}`,
+      `Slot3Ships: ${configTemp.shipSwitcherSlot3Ships}`,
+      `Slot4Criteria: ${configTemp.shipSwitcherSlot4Criteria}`,
+      `Slot4Ships: ${configTemp.shipSwitcherSlot4Ships}`,
+      `Slot5Criteria: ${configTemp.shipSwitcherSlot5Criteria}`,
+      `Slot5Ships: ${configTemp.shipSwitcherSlot5Ships}`,
+      `Slot6Criteria: ${configTemp.shipSwitcherSlot6Criteria}`,
+      `Slot6Ships: ${configTemp.shipSwitcherSlot6Ships}`,
+      '',
       '[Quests]',
       `Enabled: ${configTemp.questsEnabled}`,
     ]

docs-src/src/app.jsx

@@ -7,6 +7,9 @@ import thunk from 'redux-thunk'
 import { createLogger } from 'redux-logger'
 
 import Grid from 'material-ui/Grid'
+import MuiThemeProvider from 'material-ui/styles/MuiThemeProvider'
+import { createMuiTheme } from 'material-ui/styles'
+import blueGrey from 'material-ui/colors/blueGrey'
 
 import { getUIMode } from 'actions/ui/mode'
 import { setUILanguage } from 'actions/ui/language'
@@ -15,6 +18,16 @@ import MenuContainer from 'containers/MenuContainer'
 import Body from 'components/Body'
 import Footer from 'components/Footer'
 
+
+const theme = createMuiTheme({
+  palette: {
+    primary: blueGrey,
+    secondary: blueGrey,
+    contrastText: blueGrey[50],
+    contrastThreshold: 3,
+  },
+})
+
 let store = Reducers
 
 const reduxMiddleware = process.env.NODE_ENV === 'production' ?
@@ -28,11 +41,13 @@ store.dispatch(setUILanguage('en'))
 
 render(
   <Provider store={store}>
-    <Grid container>
-      <MenuContainer />
-      <Body />
-      <Footer />
-    </Grid>
+    <MuiThemeProvider theme={theme}>
+      <Grid container>
+        <MenuContainer />
+        <Body />
+        <Footer />
+      </Grid>
+    </MuiThemeProvider>
   </Provider>,
   document.getElementById('app')
 )

docs-src/src/components/Body.jsx

@@ -1,4 +1,4 @@
-import React, { Component } from 'react'
+import React, { PureComponent } from 'react'
 import PropTypes from 'prop-types'
 import { withStyles } from 'material-ui/styles'
 import AppBar from 'material-ui/AppBar'
@@ -15,7 +15,7 @@ const styles = () => ({
   },
 })
 
-class Body extends Component {
+class Body extends PureComponent {
   state = {
     value: 0,
   }

docs-src/src/components/BodyAbout.jsx

@@ -23,23 +23,23 @@ const BodyAbout = ({ classes }) => (
   <Grid container justify='center' spacing={0}>
     <Grid item xs={6}>
       <Paper className={classes.paper} elevation={0}>
-        <Typography type='body1' className={classes.paragraph}>
+        <Typography variant='body1' className={classes.paragraph}>
           <Localize field='bodyAbout.intro1' />
         </Typography>
 
-        <Typography type='body1' className={classes.paragraph}>
+        <Typography variant='body1' className={classes.paragraph}>
           <Localize field='bodyAbout.intro2' />
         </Typography>
 
-        <Typography type='title'>
+        <Typography variant='title'>
           <Localize field='bodyAbout.disclaimerHeader' />
         </Typography>
 
-        <Typography type='body2' className={classes.paragraph}>
+        <Typography variant='body2' className={classes.paragraph}>
           <Localize field='bodyAbout.disclaimer1' />
         </Typography>
 
-        <Typography type='body2' className={classes.paragraph}>
+        <Typography variant='body2' className={classes.paragraph}>
           <Localize field='bodyAbout.disclaimer2' />
         </Typography>
       </Paper>