chibicode · chibicode · Sep 8, 2019 · Sep 8, 2019
diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts
@@ -2304,10 +2304,19 @@ export const fkqu: ExpressionRunnerShorthandConfig = {
   initialExpressionContainer: initialExpressionContainers.reak,
   showPriorities: true,
   variableSize: 'sm',
-  initialState: 'falseCaseOnly',
+  initialState: 'falseCaseActive',
   explanationsVisibility: 'visible'
 }
 
+export const wjwu: ExpressionRunnerShorthandConfig = {
+  runner: 'simple',
+  skipActive: true,
+  initialExpressionContainer: initialExpressionContainers.reak,
+  showPriorities: true,
+  variableSize: 'sm',
+  nextIterations: 1
+}
+
 export const ngxc: ExpressionRunnerShorthandConfig = {
   runner: 'simple',
   skipActive: true,
@@ -2496,9 +2505,8 @@ export const msrk: ExpressionRunnerShorthandConfig = {
   skipActive: true,
   initialExpressionContainer: initialExpressionContainers.ihdu,
   showPriorities: true,
-  variableSize: 'md',
-  initialState: 'trueCaseOnly',
-  explanationsVisibility: 'visible'
+  variableSize: 'xs',
+  initialState: 'trueCaseActive'
 }
 
 export const jwce: ExpressionRunnerShorthandConfig = {

diff --git a/scripts/lib/stepExpressionContainer.ts b/scripts/lib/stepExpressionContainer.ts
@@ -22,7 +22,6 @@ import {
   stepToCaseActive,
   stepToConditionActive,
   stepToCaseProcessed,
-  stepToCaseOnly,
   stepToShorthandComputed,
   stepToAlphaConvertCallArg
 } from 'scripts/lib/steps'
@@ -86,24 +85,12 @@ const stepConditional = (
       }
     }
     case 'trueCaseActive': {
-      return {
-        nextExpression: stepToCaseOnly(e, true),
-        previouslyChangedExpressionState: 'trueCaseOnly'
-      }
-    }
-    case 'falseCaseActive': {
-      return {
-        nextExpression: stepToCaseOnly(e, false),
-        previouslyChangedExpressionState: 'falseCaseOnly'
-      }
-    }
-    case 'trueCaseOnly': {
       return {
         nextExpression: stepToCaseProcessed(e, true),
         previouslyChangedExpressionState: 'default'
       }
     }
-    case 'falseCaseOnly': {
+    case 'falseCaseActive': {
       return {
         nextExpression: stepToCaseProcessed(e, false),
         previouslyChangedExpressionState: 'default'

diff --git a/scripts/lib/steps/index.ts b/scripts/lib/steps/index.ts
@@ -37,7 +37,6 @@ export { default as stepToCaseActive } from 'scripts/lib/steps/stepToCaseActive'
 export {
   default as stepToCaseProcessed
 } from 'scripts/lib/steps/stepToCaseProcessed'
-export { default as stepToCaseOnly } from 'scripts/lib/steps/stepToCaseOnly'
 export { default as stepToDefault } from 'scripts/lib/steps/stepToDefault'
 export {
   default as stepToShorthandComputed

diff --git a/scripts/lib/steps/stepToCaseOnly.ts b/scripts/lib/steps/stepToCaseOnly.ts
diff --git a/src/components/ConditionalExpressionBox.tsx b/src/components/ConditionalExpressionBox.tsx
@@ -37,55 +37,48 @@ const ConditionalExpressionBox = ({
             position: relative;
           `}
         >
-          {expression.state !== 'trueCaseOnly' && (
-            <FlexCenter
-              css={css`
-                position: relative;
-              `}
-            >
-              <ConditionalBorder
-                type="falseCase"
-                shaded={
-                  expression.state === 'trueCaseActive' ||
-                  expression.state === 'conditionActive'
-                }
-              />
-              <ExpressionBox expression={expression.falseCase} />
-            </FlexCenter>
-          )}
-          {expression.state !== 'falseCaseOnly' &&
-            expression.state !== 'trueCaseOnly' && (
-              <FlexCenter
-                css={css`
-                  position: relative;
-                `}
-              >
-                <ConditionalBorder
-                  type="condition"
-                  shaded={
-                    expression.state === 'trueCaseActive' ||
-                    expression.state === 'falseCaseActive'
-                  }
-                />
-                <ExpressionBox expression={expression.condition} />
-              </FlexCenter>
-            )}
-          {expression.state !== 'falseCaseOnly' && (
-            <FlexCenter
-              css={css`
-                position: relative;
-              `}
-            >
-              <ConditionalBorder
-                type="trueCase"
-                shaded={
-                  expression.state === 'falseCaseActive' ||
-                  expression.state === 'conditionActive'
-                }
-              />
-              <ExpressionBox expression={expression.trueCase} />
-            </FlexCenter>
-          )}
+          <FlexCenter
+            css={css`
+              position: relative;
+            `}
+          >
+            <ConditionalBorder
+              type="falseCase"
+              shaded={
+                expression.state === 'trueCaseActive' ||
+                expression.state === 'conditionActive'
+              }
+            />
+            <ExpressionBox expression={expression.falseCase} />
+          </FlexCenter>
+          <FlexCenter
+            css={css`
+              position: relative;
+            `}
+          >
+            <ConditionalBorder
+              type="condition"
+              shaded={
+                expression.state === 'trueCaseActive' ||
+                expression.state === 'falseCaseActive'
+              }
+            />
+            <ExpressionBox expression={expression.condition} />
+          </FlexCenter>
+          <FlexCenter
+            css={css`
+              position: relative;
+            `}
+          >
+            <ConditionalBorder
+              type="trueCase"
+              shaded={
+                expression.state === 'falseCaseActive' ||
+                expression.state === 'conditionActive'
+              }
+            />
+            <ExpressionBox expression={expression.trueCase} />
+          </FlexCenter>
         </Flex>
       </ExpressionPriorityContext.Provider>
     </ConditionalContext.Provider>

diff --git a/src/components/ExpressionPrioritiesLabel.tsx b/src/components/ExpressionPrioritiesLabel.tsx
@@ -12,7 +12,6 @@ interface ExpressionPrioritiesLabelProps {
   emphasize: boolean
   priorities: number[]
   position: 'topleft' | 'bottomleft'
-  hideActive: boolean
 }
 
 interface ExpressionPrioritiesLabelBoxProps {
@@ -109,15 +108,10 @@ const ExpressionPrioritiesLabelBox = ({
 const ExpressionPrioritiesLabel = ({
   priorities,
   position,
-  emphasize,
-  hideActive
+  emphasize
 }: ExpressionPrioritiesLabelProps) => {
   const { variableSize } = useContext(ExpressionRunnerContext)
-  const { activePriority } = useContext(ExpressionPriorityContext)
 
-  if (hideActive) {
-    priorities = priorities.filter(x => x !== activePriority)
-  }
   return (
     <div
       css={[

diff --git a/src/components/ExpressionRunnerExplanation.tsx b/src/components/ExpressionRunnerExplanation.tsx
@@ -283,7 +283,6 @@ const Explanation = ({
         )
       }
     }
-    case 'trueCaseOnly':
     case 'trueCaseActive': {
       if (locale === 'en') {
         return <>?</>
@@ -297,7 +296,6 @@ const Explanation = ({
         )
       }
     }
-    case 'falseCaseOnly':
     case 'falseCaseActive': {
       if (locale === 'en') {
         return <>?</>

diff --git a/src/components/Runners/Wjwu.tsx b/src/components/Runners/Wjwu.tsx
@@ -0,0 +1,12 @@
+import React from 'react'
+import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed'
+import config from 'src/lib/runners/wjwu.json'
+
+const Wjwu = ({ children }: { children?: React.ReactNode }) => (
+  // @ts-ignore
+  <ExpressionRunnerPrecomputed {...config}>
+    {children}
+  </ExpressionRunnerPrecomputed>
+)
+
+export default Wjwu
diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts
@@ -309,6 +309,7 @@ export { default as Yyfi } from 'src/components/Runners/Yyfi'
 export { default as Amjx } from 'src/components/Runners/Amjx'
 export { default as Avsl } from 'src/components/Runners/Avsl'
 export { default as Fkqu } from 'src/components/Runners/Fkqu'
+export { default as Wjwu } from 'src/components/Runners/Wjwu'
 export { default as Ngxc } from 'src/components/Runners/Ngxc'
 export { default as Fkvy } from 'src/components/Runners/Fkvy'
 export { default as Dwmc } from 'src/components/Runners/Dwmc'

diff --git a/src/components/VariableExpressionBox.tsx b/src/components/VariableExpressionBox.tsx
@@ -320,10 +320,6 @@ const VariableExpressionBox = ({ expression }: VariableExpressionBoxProps) => {
     <>
       {!hidePriorities && (
         <ExpressionPrioritiesLabel
-          hideActive={
-            conditionalState === 'trueCaseOnly' ||
-            conditionalState === 'falseCaseOnly'
-          }
           priorities={expression.argPriorityAgg}
           position="topleft"
           emphasize={
@@ -344,10 +340,6 @@ const VariableExpressionBox = ({ expression }: VariableExpressionBoxProps) => {
       </FlexCenter>
       {!hidePriorities && (
         <ExpressionPrioritiesLabel
-          hideActive={
-            conditionalState === 'trueCaseOnly' ||
-            conditionalState === 'falseCaseOnly'
-          }
           priorities={expression.funcPriorityAgg}
           position="bottomleft"
           emphasize={

diff --git a/src/contents/14.jp.tsx b/src/contents/14.jp.tsx
@@ -225,6 +225,8 @@ export default () => (
             <R.Avsl></R.Avsl>
             <ExpressionRunnerSeparator />
             <R.Fkqu></R.Fkqu>
+            <ExpressionRunnerSeparator />
+            <R.Wjwu></R.Wjwu>
           </>
         )
       },
@@ -699,7 +701,12 @@ export default () => (
             />
             <R.Afoh></R.Afoh>
             <ExpressionRunnerSeparator />
-            <R.Msrk></R.Msrk>
+            <R.Msrk>
+              <InlineBorder type="trueCase" /> に入っている{' '}
+              <EmojiNumber number={2} /> が残る
+            </R.Msrk>
+            <ExpressionRunnerSeparator />
+            <R.Jwce></R.Jwce>
             <BubbleQuotes
               quotes={[
                 {

diff --git a/src/lib/runners/fkqu.json b/src/lib/runners/fkqu.json
@@ -3,7 +3,7 @@
     {
       "expression": {
         "type": "conditional",
-        "state": "falseCaseOnly",
+        "state": "falseCaseActive",
         "checkType": "isZero",
         "condition": {
           "name": "shorthandNumber",
@@ -106,7 +106,7 @@
         },
         "priority": 1
       },
-      "previouslyChangedExpressionState": "falseCaseOnly",
+      "previouslyChangedExpressionState": "falseCaseActive",
       "activePriority": 1,
       "containerState": "stepped"
     }

diff --git a/src/lib/runners/ifiq.json b/src/lib/runners/ifiq.json
@@ -11603,7 +11603,7 @@
       }
     }
   ],
-  "speed": 1.5,
+  "speed": 1.75,
   "hideControls": false,
   "explanationsVisibility": "hiddenInitialPausedOnly",
   "hidePriorities": false,

diff --git a/src/lib/runners/msrk.json b/src/lib/runners/msrk.json
@@ -2,13 +2,13 @@
   "expressionContainers": [
     {
       "containerState": "stepped",
-      "previouslyChangedExpressionState": "trueCaseOnly",
+      "previouslyChangedExpressionState": "trueCaseActive",
       "expression": {
         "arg": {
           "arg": {
             "arg": {
               "type": "conditional",
-              "state": "trueCaseOnly",
+              "state": "trueCaseActive",
               "checkType": "isZero",
               "condition": {
                 "name": "shorthandNumber",
@@ -233,9 +233,9 @@
   ],
   "speed": 1,
   "hideControls": true,
-  "explanationsVisibility": "visible",
+  "explanationsVisibility": "hidden",
   "hidePriorities": false,
-  "variableSize": "md",
+  "variableSize": "xs",
   "containerSize": "xxs",
   "hidePlayButton": false,
   "hideBottomRightBadges": false,