1.0.4 詳細説明を開けるウィンドウの実装を共通ファイルに切り出す

elleonard · Apr 16, 2024 · bb3374f · bb3374f
1 parent ccb49f4
commit bb3374f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 38 deletions.
diff --git a/src/codes/ItemDetail/DarkPlasma_ItemDetail.ts b/src/codes/ItemDetail/DarkPlasma_ItemDetail.ts
@@ -2,6 +2,7 @@
 
 import { settings } from "./_build/DarkPlasma_ItemDetail_parameters";
 import { Window_DetailText } from '../../common/window/detailWindow';
+import { Window_WithDetailWindowMixIn } from '../../common/window/withDetailWindow';
 
 function Scene_Item_DetailMixIn(sceneItem: Scene_Item) {
   const _create = sceneItem.create;
@@ -43,39 +44,7 @@ function Scene_Item_DetailMixIn(sceneItem: Scene_Item) {
 
 Scene_Item_DetailMixIn(Scene_Item.prototype);
 
-Window_CustomKeyHandlerMixIn(settings.openDetailKey, Window_ItemList.prototype, 'detail');
-
-function Window_ItemList_DetailMixIn(windowClass: Window_ItemList) {
-  windowClass.setDetailWindow = function (detailWindow) {
-    this._detailWindow = detailWindow;
-  };
-
-  const _setHelpWindowItem = windowClass.setHelpWindowItem;
-  windowClass.setHelpWindowItem = function (item) {
-    _setHelpWindowItem.call(this, item);
-    this._detailWindow?.setItem(item as (MZ.Item|MZ.Weapon|MZ.Armor|null));
-  };
-
-  const _isCursorMovable = windowClass.isCursorMovable;
-  windowClass.isCursorMovable = function () {
-    return _isCursorMovable.call(this)
-      && (!this._detailWindow || !this._detailWindow.visible);
-  };
-
-  const _isOkEnabled = windowClass.isOkEnabled;
-  windowClass.isOkEnabled = function () {
-    return _isOkEnabled.call(this)
-      && (!this._detailWindow || !this._detailWindow.visible);
-  };
-
-  const _processCancel = windowClass.processCancel;
-  windowClass.processCancel = function () {
-    this._detailWindow?.hide();
-    _processCancel.call(this);
-  };
-}
-
-Window_ItemList_DetailMixIn(Window_ItemList.prototype);
+Window_WithDetailWindowMixIn(settings.openDetailKey, Window_ItemList.prototype);
 
 class Window_ItemDetail extends Window_DetailText {
   heightAdjustment(): number {

diff --git a/src/codes/ItemDetail/ItemDetail.d.ts b/src/codes/ItemDetail/ItemDetail.d.ts
@@ -1,4 +1,5 @@
 /// <reference path="../../typings/rmmz.d.ts" />
+/// <reference path="../../common/window/detailWindow.d.ts" />
 /// <reference path="../CustomKeyHandler/CustomKeyHandler.d.ts" />
 /// <reference path="../CustomKeyHandler/CustomKeyHandlerExport.d.ts" />
 
@@ -17,8 +18,5 @@ declare interface Window_ItemList {
   setDetailWindow(detailWindow: Window_ItemDetail): void;
 }
 
-declare interface Window_ItemDetail extends Window_Scrollable {
-  _text: string;
-
-  setItem(item: MZ.Item|MZ.Weapon|MZ.Armor|null): void;
+declare interface Window_ItemDetail extends Window_DetailText {
 }
diff --git a/src/codes/ItemDetail/config.yml b/src/codes/ItemDetail/config.yml
@@ -4,7 +4,9 @@ DarkPlasma_ItemDetail:
   license: MIT
   histories:
     - date: 2024/04/17
-      version: 1.0.3
+      version: 1.0.4
+      description: '詳細説明を開けるウィンドウの実装を共通ファイルに切り出す'
+    - version: 1.0.3
       description: '詳細説明ウィンドウの実装を共通ファイルに切り出す'
     - date: 2023/10/20
       version: 1.0.2