wip: 개인 전략 폼

hwe/func_converter.php

@@ -416,6 +416,27 @@ function buildGeneralCommandClass(?string $type, General $generalObj, array $env
     return new $class($generalObj, $env, $arg);
 }
 
+function getUserActionCommandClass(?string $type){
+    if($type === null || $type === ''){
+        $type = '휴식';
+    }
+
+    static $basePath = __NAMESPACE__.'\\Command\\UserAction\\';
+    $classPath = ($basePath.$type);
+
+    if(class_exists($classPath)){
+        return $classPath;
+    }
+
+    throw new \InvalidArgumentException("{$type}은 올바른 개변 전략 커맨드가 아님");
+}
+
+function buildUserActionCommandClass(?string $type, General $generalObj, array $env, $arg = null):Command\UserActionCommand{
+    $class = getUserActionCommandClass($type);
+    return new $class($generalObj, $env, $arg);
+}
+
+
 function getNationCommandClass(?string $type){
     if($type === null || $type === ''){
         $type = '휴식';

hwe/sammo/API/General/GetUserActionCommandTable.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace sammo\API\General;
+
+use sammo\DB;
+use sammo\Enums\APIRecoveryType;
+use sammo\GameConst;
+use sammo\General;
+use sammo\Session;
+use sammo\KVStorage;
+use sammo\Util;
+
+use function sammo\buildUserActionCommandClass;
+
+class GetUserActionCommandTable extends \sammo\BaseAPI
+{
+    public function validateArgs(): ?string
+    {
+        return null;
+    }
+
+    public function getRequiredSessionMode(): int
+    {
+        return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY;
+    }
+
+    public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
+    {
+        $generalID = $session->generalID;
+        $general = General::createObjFromDB($generalID);
+
+        $db = DB::db();
+        $gameStor = KVStorage::getStorage($db, 'game_env');
+        $gameStor->turnOnCache();
+        $env = $gameStor->getAll();
+
+        $commandTable = [];
+        foreach (GameConst::$availableUserActionCommand as $commandCategory => $commandList) {
+            $subList = [];
+            foreach ($commandList as $commandClassName) {
+                $commandObj = buildUserActionCommandClass($commandClassName, $general, $env);
+                if (!$commandObj->canDisplay()) {
+                    continue;
+                }
+                $subList[] = [
+                    'value' => Util::getClassNameFromObj($commandObj),
+                    'compensation' => $commandObj->getCompensationStyle(),
+                    'possible' => $commandObj->hasMinConditionMet(),
+                    'title' => $commandObj->getCommandDetailTitle(),
+                    'simpleName' => $commandObj->getName(),
+                    'reqArg' => $commandObj::$reqArg,
+                ];
+            }
+
+            $commandTable[] = [
+                'category' => $commandCategory,
+                'values' => $subList
+            ];
+        }
+
+        return [
+            'result' => true,
+            'commandTable' => $commandTable,
+        ];
+    }
+}

hwe/sammo/Command/UserAction/휴식.php

@@ -0,0 +1,38 @@
+<?php
+namespace sammo\Command\UserAction;
+
+use \sammo\Command;
+use \sammo\Util;
+use \sammo\JosaUtil;
+use sammo\LastTurn;
+
+class 휴식 extends Command\UserActionCommand{
+    static protected $actionName = '휴식';
+
+    protected function argTest():bool{
+        return true;
+    }
+
+    protected function init(){
+        //아무것도 하지 않음
+        $this->fullConditionConstraints=[];
+
+    }
+
+    public function getPreReqTurn():int{
+        return 0;
+    }
+
+    public function getPostReqTurn():int{
+        return 0;
+    }
+
+    public function getCost():array{
+        return [0, 0];
+    }
+
+    public function run(\Sammo\RandUtil $rng):bool{
+        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
+        return true;
+    }
+}

hwe/sammo/Command/UserActionCommand.php

@@ -0,0 +1,37 @@
+<?php
+namespace sammo\Command;
+use \sammo\Util;
+
+abstract class UserActionCommand extends BaseCommand{
+
+    public function getNextExecuteKey():string{
+        $turnKey = static::$actionName;
+        $generalID = $this->getGeneral()->getID();
+        $executeKey = "next_execute_{$generalID}_user_action_{$turnKey}";
+        return $executeKey;
+    }
+
+    public function getNextAvailableTurn():?int{
+        if($this->isArgValid && !$this->getPostReqTurn()){
+            return null;
+        }
+        $db = \sammo\DB::db();
+        $lastExecuteStor = \sammo\KVStorage::getStorage($db, 'next_execute');
+        return $lastExecuteStor->getValue($this->getNextExecuteKey());
+    }
+
+    public function setNextAvailable(?int $yearMonth=null){
+        if(!$this->getPostReqTurn()){
+            return;
+        }
+        if($yearMonth === null){
+            $yearMonth = Util::joinYearMonth($this->env['year'], $this->env['month'])
+            + $this->getPostReqTurn() - $this->getPreReqTurn();
+        }
+
+        $db = \sammo\DB::db();
+        $lastExecuteStor = \sammo\KVStorage::getStorage($db, 'next_execute');
+        $lastExecuteStor->setValue($this->getNextExecuteKey(), $yearMonth);
+    }
+
+};

hwe/sammo/GameConstBase.php

@@ -223,7 +223,7 @@ class GameConstBase
     public static $inheritItemRandomPoint = 3000;
     public static $inheritBuffPoints = [0, 200, 600, 1200, 2000, 3000];
     public static $inheritSpecificSpecialPoint = 4000;
-    public static $inheritResetAttrPointBase = [1000, 1000, 2000, 3000];//필요하면 늘려서 쓰기
+    public static $inheritResetAttrPointBase = [1000, 1000, 2000, 3000]; //필요하면 늘려서 쓰기
 
     /** @var ?string */
     public static $scenarioEffect = null;
@@ -246,7 +246,7 @@ class GameConstBase
             'che_명마_07_백마' => 2, 'che_명마_07_기주마' => 2, 'che_명마_07_오환마' => 2, 'che_명마_07_백상' => 2,
             'che_명마_08_양주마' => 2, 'che_명마_08_흉노마' => 2, 'che_명마_09_과하마' => 2, 'che_명마_09_의남백마' => 2,
             'che_명마_10_대완마' => 2, 'che_명마_10_옥추마' => 2, 'che_명마_11_서량마' => 2, 'che_명마_11_화종마' => 2,
-            'che_명마_12_사륜거' => 2, 'che_명마_12_옥란백용구'=> 2, 'che_명마_13_절영' => 2, 'che_명마_13_적로' => 2,
+            'che_명마_12_사륜거' => 2, 'che_명마_12_옥란백용구' => 2, 'che_명마_13_절영' => 2, 'che_명마_13_적로' => 2,
             'che_명마_14_적란마' => 2, 'che_명마_14_조황비전' => 2, 'che_명마_15_한혈마' => 2, 'che_명마_15_적토마' => 2,
         ],
         'weapon' => [
@@ -278,7 +278,7 @@ class GameConstBase
             'che_내정_납금박산로' => 1, 'che_전략_평만지장도' => 1, 'che_숙련_동작' => 1, 'che_명성_구석' => 1,
 
             'che_척사_오악진형도' => 1, 'che_격노_구정신단경' => 1, 'che_징병_낙주' => 1,
-            'che_저격_매화수전' => 1, 'che_저격_비도'=>1, 'che_위압_조목삭' => 1, 'che_공성_묵자' => 1,
+            'che_저격_매화수전' => 1, 'che_저격_비도' => 1, 'che_위압_조목삭' => 1, 'che_공성_묵자' => 1,
             'che_집중_전국책' => 1, 'che_환술_논어집해' => 1,
 
             'che_진압_박혁론' => 1, 'che_부적_태현청생부' => 1, 'che_저지_삼황내문' => 1,
@@ -395,6 +395,17 @@ class GameConstBase
             'che_국호변경',
         ]
     ];
+
+    /** @var array 개인 전략 커맨드 */
+    public static $availableUserActionCommand = [
+        '개인 전략' => [
+            '휴식',
+            /*'che_병사연회',
+            'che_내정집중',
+            'che_즉시치료',*/
+        ]
+    ];
+
     public static $retirementYear = 80;
 
     public static $targetGeneralPool = 'RandomNameGeneral';

hwe/ts/PageUserAction.vue

@@ -1,3 +1,51 @@
 <template>
-    유저 액션
+    <BContainer id="container" ref="container" :toast="{ root: true }">
-</template>
+        <TopBackBar :reloadable="true" title="개인 전략" @reload="refresh" />
+        <div v-if="asyncReady && gameConstStore" id="pages" class="bg0">
+            <div id="commandList">
+
+            </div>
+            <div id="actionForm">
+                <ReservedCommandForUserAction />
+            </div>
+        </div>
+
+
+    </BContainer>
+</template>
+
+<script setup lang="ts">
+import ReservedCommandForUserAction from './ReservedCommandForUserAction.vue';
+import { GameConstStore, getGameConstStore } from "./GameConstStore";
+import { useToast } from 'bootstrap-vue-next';
+import { unwrap } from './util/unwrap';
+import { provide, ref } from 'vue';
+import TopBackBar from './components/TopBackBar.vue';
+
+const toasts = unwrap(useToast());
+
+const asyncReady = ref(false);
+const gameConstStore = ref<GameConstStore>();
+provide("gameConstStore", gameConstStore);
+const storeP = getGameConstStore().then((store) => {
+    gameConstStore.value = store;
+});
+
+void Promise.all([storeP]).then(() => {
+    asyncReady.value = true;
+});
+
+async function refresh() {
+    console.log('갱신');
+}
+
+</script>
+
+<style lang="scss" scoped>
+//grid
+#pages {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    grid-gap: 10px;
+}
+</style>

hwe/ts/ReservedCommandForUserAction.vue

@@ -0,0 +1,424 @@
+<template>
+  <div class="commandPad">
+    <div class="col alert alert-dark m-0 p-1 center">
+      <h4 class="m-0">명령 목록</h4>
+    </div>
+    <div :style="{ position: 'relative' }">
+      <div class="bg-dark" :style="{
+        position: 'absolute',
+        top: `${basicModeRowHeight * currentQuickReserveTarget + 30}px`,
+        width: '100%',
+        zIndex: 9,
+      }">
+        <CommandSelectForm ref="commandQuickReserveForm" :activatedCategory="'개인 전략'" :commandList="commandList"
+          :hideClose="false" @onClose="chooseQuickReserveCommand($event)" />
+      </div>
+    </div>
+    <div :class="{
+      commandTable: true,
+    }">
+      <DragSelect :style="rowGridStyle" :disabled="true" attribute="turnIdx">
+        <div v-for="(turnObj, turnIdx) in reservedCommandList.slice(0, viewMaxTurn)" :key="turnIdx" :turnIdx="turnIdx"
+          class="idx_pad center d-grid">
+          <div class="plain-center">
+            {{ turnIdx + 1 }}
+          </div>
+        </div>
+      </DragSelect>
+      <DragSelect :style="rowGridStyle" attribute="turnIdx" :disabled="true">
+        <div v-for="(turnObj, turnIdx) in reservedCommandList.slice(0, viewMaxTurn)" :key="turnIdx" height="24"
+          class="month_pad center" :turnIdx="turnIdx" :style="{
+            'white-space': 'nowrap',
+            'font-size': `${Math.min(14, (75 / (`${turnObj.year ?? 1}`.length + 8)) * 1.8)}px`,
+            overflow: 'hidden',
+          }">
+          {{ turnObj.year ? `${turnObj.year}年` : "" }}
+          {{ turnObj.month ? `${turnObj.month}月` : "" }}
+        </div>
+      </DragSelect>
+      <div :style="rowGridStyle">
+        <div v-for="(turnObj, turnIdx) in reservedCommandList.slice(0, viewMaxTurn)" :key="turnIdx"
+          class="time_pad center" :style="{
+            backgroundColor: 'black',
+            whiteSpace: 'nowrap',
+            overflow: 'hidden',
+          }">
+          {{ turnObj.time }}
+        </div>
+      </div>
+      <div :style="rowGridStyle">
+        <div v-for="(turnObj, turnIdx) in reservedCommandList.slice(0, viewMaxTurn)" :key="turnIdx"
+          class="turn_pad center">
+          <span v-b-tooltip.hover="turnObj.tooltip" class="turn_text" :style="turnObj.style">
+            <!-- eslint-disable-next-line vue/no-v-html -->
+            <span v-html="turnObj.brief" />
+          </span>
+        </div>
+      </div>
+      <div :style="rowGridStyle">
+        <div v-for="(turnObj, turnIdx) in reservedCommandList.slice(0, viewMaxTurn)" :key="turnIdx"
+          class="action_pad d-grid">
+          <BButton :variant="turnIdx % 2 == 0 ? 'secondary' : 'dark'" size="sm" class="simple_action_btn bi bi-pencil"
+            :disabled="!commandList.length" @click="toggleQuickReserveForm(turnIdx)" />
+        </div>
+      </div>
+    </div>
+    <div class="row gx-1">
+      <div class="col d-grid">
+      </div>
+      <div class="col alert alert-primary m-0 p-0"
+        style="text-align: center; display: flex; justify-content: center; align-items: center">
+        <SimpleClock :serverTime="serverNow" />
+      </div>
+      <div class="col d-grid">
+        <BButton @click="toggleViewMaxTurn">
+          {{ flippedMaxTurn == viewMaxTurn ? "펼치기" : "접기" }}
+        </BButton>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+declare const staticValues: {
+  maxTurn: number;
+  maxPushTurn: number;
+  serverNow: string;
+  serverNick: string;
+  mapName: string;
+  unitSet: string;
+};
+</script>
+
+<script lang="ts" setup>
+import addMinutes from "date-fns/esm/addMinutes";
+import { isString, range, trim } from "lodash-es";
+import queryString from "query-string";
+import { onMounted, ref, watch } from "vue";
+import { formatTime } from "@util/formatTime";
+import { joinYearMonth } from "@util/joinYearMonth";
+import { mb_strwidth } from "@util/mb_strwidth";
+import { parseTime } from "@util/parseTime";
+import { parseYearMonth } from "@util/parseYearMonth";
+import DragSelect from "@/components/DragSelect.vue";
+import { SammoAPI } from "./SammoAPI";
+import type { CommandItem, CommandTableResponse } from "@/defs";
+import CommandSelectForm from "@/components/CommandSelectForm.vue";
+import { BButton, BButtonGroup, BDropdownItem, BDropdown, BDropdownText, BDropdownDivider, useToast } from "bootstrap-vue-next";
+import { StoredActionsHelper } from "./util/StoredActionsHelper";
+import type { TurnObj } from "@/defs";
+import type { Args } from "./processing/args";
+import { getEmptyTurn } from "./util/QueryActionHelper";
+import SimpleClock from "./components/SimpleClock.vue";
+import type { ReservedCommandResponse } from "./defs/API/Command";
+import { unwrap } from "./util/unwrap";
+
+defineExpose({
+  updateCommandTable,
+  reloadCommandList,
+})
+
+const toasts = unwrap(useToast());
+
+const { maxTurn } = staticValues;
+
+const commandList = ref<CommandTableResponse['commandTable']>([]);
+
+const nullCommand: CommandItem = {
+  'value': '휴식',
+  'compensation': 0,
+  'simpleName': '휴식',
+  'possible': true,
+  'info': '휴식',
+  'title': '휴식',
+  'reqArg': false,
+}
+
+const selectedCommand = ref<CommandItem>(nullCommand);
+const commandSelectForm = ref<InstanceType<typeof CommandSelectForm> | null>(null);
+const invCommandMap = new Map<string, CommandItem>();
+
+async function updateCommandTable() {
+  try {
+    const response = await SammoAPI.General.GetUserActionCommandTable();
+    console.log(response);
+    commandList.value = response.commandTable;
+  }
+  catch (e) {
+    console.error(e);
+  }
+}
+
+watch(commandList, (commandList) => {
+  if (!commandList) {
+    return;
+  }
+
+  for (const commandCategories of commandList) {
+    if (!commandCategories.values) {
+      continue;
+    }
+    for (const commandObj of commandCategories.values) {
+      if (!commandObj.reqArg) {
+        continue;
+      }
+      console.warn(`명령 ${commandObj.value}에는 인자가 필요하나, 현재는 지원하지 않습니다.`);
+    }
+  }
+
+  invCommandMap.clear();
+  for (const category of commandList) {
+    for (const command of category.values) {
+      invCommandMap.set(command.value, command);
+    }
+  }
+
+  if (selectedCommand.value === nullCommand || !invCommandMap.has(selectedCommand.value.value)) {
+    selectedCommand.value = commandList[0].values[0];
+  }
+});
+
+onMounted(() => {
+  void updateCommandTable();
+});
+
+const reservedCommandList = ref(getEmptyTurn(maxTurn));
+
+const flippedMaxTurn = 14;
+
+const basicModeRowHeight = 34.4;
+const viewMaxTurn = ref(flippedMaxTurn);
+const rowGridStyle = ref({
+  display: "grid",
+  gridTemplateRows: `repeat(${viewMaxTurn.value}, ${basicModeRowHeight}px)`,
+});
+
+watch([viewMaxTurn], ([maxTurn]) => {
+  rowGridStyle.value.gridTemplateRows = `repeat(${maxTurn}, ${basicModeRowHeight}px)`;
+});
+
+function toggleViewMaxTurn() {
+  if (viewMaxTurn.value == flippedMaxTurn) {
+    viewMaxTurn.value = maxTurn;
+  } else {
+    viewMaxTurn.value = flippedMaxTurn;
+  }
+}
+
+const serverNow = ref(new Date());
+
+async function reloadCommandList() {
+  let result: ReservedCommandResponse;
+  try {
+    result = await SammoAPI.Command.GetReservedCommand();
+  } catch (e) {
+    if (isString(e)) {
+      toasts.danger({
+        title: "에러",
+        body: e,
+      });
+    }
+    console.error(e);
+    return;
+  }
+
+  let yearMonth = joinYearMonth(result.year, result.month);
+
+  const turnTime = parseTime(result.turnTime);
+  let nextTurnTime = new Date(turnTime);
+
+  const autorunLimitYearMonth = result.autorun_limit ?? yearMonth - 1;
+  const [autorunLimitYear, autorunLimitMonth] = parseYearMonth(autorunLimitYearMonth);
+
+  reservedCommandList.value = [];
+  for (const obj of result.turn) {
+    const [year, month] = parseYearMonth(yearMonth);
+    let tooltip: string[] = [];
+    let style: Record<string, string> = {};
+
+    const brief = obj.brief;
+
+    if (yearMonth <= autorunLimitYearMonth) {
+      if (obj.brief == "휴식") {
+        obj.brief = "휴식<small>(자율 행동)</small>";
+      }
+      style.color = "#aaffff";
+
+      tooltip.push(`자율 행동 기간: ${autorunLimitYear}년 ${autorunLimitMonth}월까지`);
+    }
+
+    if (mb_strwidth(brief) > 22) {
+      tooltip.push(brief);
+    }
+
+    reservedCommandList.value.push({
+      ...obj,
+      year,
+      month,
+      time: formatTime(nextTurnTime, "HH:mm"),
+      tooltip: tooltip.length == 0 ? undefined : tooltip.join("\n"),
+      style,
+    });
+
+    yearMonth += 1;
+    nextTurnTime = addMinutes(nextTurnTime, result.turnTerm);
+  }
+
+  serverNow.value = parseTime(result.date);
+}
+
+async function reserveCommand() {
+  const turnIdx = currentQuickReserveTarget.value;
+
+  const commandName = selectedCommand.value.value;
+  if(turnIdx < 0) {
+    return;
+  }
+
+  try {
+    const result = await SammoAPI.Command.ReserveUserAction({
+      turnIdx,
+      action: commandName,
+    });
+  } catch (e) {
+    if (isString(e)) {
+      toasts.danger({
+        title: "에러",
+        body: e,
+      });
+    }
+    console.error(e);
+    return;
+  }
+  await reloadCommandList();
+}
+
+const commandQuickReserveForm = ref<InstanceType<typeof CommandSelectForm> | null>(null);
+
+const currentQuickReserveTarget = ref(-1);
+function chooseQuickReserveCommand(val?: string) {
+  if (!val) {
+    return;
+  }
+  selectedCommand.value = unwrap(invCommandMap.get(val));
+  void reserveCommand();
+}
+function toggleQuickReserveForm(turnIdx: number) {
+  if (turnIdx == currentQuickReserveTarget.value) {
+    commandQuickReserveForm.value?.toggle();
+    return;
+  }
+  currentQuickReserveTarget.value = turnIdx;
+  commandQuickReserveForm.value?.show();
+}
+
+onMounted(() => {
+  void reloadCommandList();
+});
+</script>
+<style lang="scss">
+@use "sass:color";
+
+@import "@scss/common/break_500px.scss";
+@import "@scss/common/variables.scss";
+@import "@scss/common/bootswatch_custom_variables.scss";
+@import "@scss/game_bg.scss";
+
+.commandPad {
+  background-color: $gray-900;
+  position: relative;
+}
+
+.commandTable {
+  width: 100%;
+  display: grid;
+  grid-template-columns:
+    minmax(20px, 0.8fr) minmax(75px, 2.4fr) minmax(40px, 0.9fr) 4.8fr minmax(28px, 0.8fr);
+  //30, 70, 37.65, 160
+}
+
+.commandTable.isEditMode {
+  width: 100%;
+  display: grid;
+  grid-template-columns: minmax(30px, 1fr) minmax(75px, 2.5fr) minmax(40px, 1fr) 5fr;
+  //30, 70, 37.65, 160
+}
+
+@include media-1000px {
+  .commandPad {
+    margin-left: 10px;
+
+    .turn_pad {
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+
+    .multiselect__content-wrapper {
+      margin-left: calc(-100% / 7 * 2);
+      width: calc(100% / 7 * 12);
+    }
+
+    .multiselect__single {
+      display: inline-block;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      overflow: hidden;
+    }
+  }
+}
+
+@include media-500px {
+  .dropdown-item {
+    padding: 8px;
+  }
+
+  .commandPad {
+    margin-top: 10px;
+    margin-bottom: 10px;
+
+    .btn {
+      transition: none !important;
+    }
+  }
+
+  .month_pad,
+  .time_pad,
+  .turn_pad {
+    padding: 6px;
+  }
+}
+
+.isEditMode .month_pad:hover {
+  text-decoration: underline;
+  cursor: pointer;
+}
+
+.plain-center {
+  background-color: black;
+}
+
+.plain-center,
+.month_pad,
+.time_pad,
+.turn_pad {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.turn_pad {
+  white-space: nowrap;
+  background-color: $nbase2color;
+}
+
+.turn_pad:nth-child(2n) {
+  background-color: color.adjust($nbase2color, $lightness: -5%);
+}
+
+.turn_pad .turn_text {
+  display: inline-block;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+</style>

hwe/ts/SammoAPI.ts

@@ -117,6 +117,10 @@ const apiRealPath = {
       }[],
       ReserveBulkCommandResponse
     >,
+    ReserveUserAction: PUT as APICallT<{
+      turnIdx: number;
+      action: string;
+    }>
   },
   General: {
     Join: POST as APICallT<JoinArgs>,
@@ -134,6 +138,7 @@ const apiRealPath = {
     InstantRetreat: POST as APICallT<undefined>,
     BuildNationCandidate: POST as APICallT<undefined>,
     GetCommandTable: GET as APICallT<undefined, CommandTableResponse>,
+    GetUserActionCommandTable: GET as APICallT<undefined, CommandTableResponse>,
     GetFrontInfo: GET as APICallT<{
       lastNationNoticeDate?: string,
       lastGeneralRecordID?: number,