Skip to content

feature/mz core script #208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Naruto merged 2 commits into from
Apr 5, 2025
Merged

feature/mz core script #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d18ba0
update mz core script to 1.9.0
Naruto Apr 5, 2025
c410400
update packages.
Naruto Apr 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
620 changes: 297 additions & 323 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions packages/ss6player-lib/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,23 +39,23 @@
"ssfblib": "1.2.3"
},
"devDependencies": {
"typescript": "^5.8.2",
"typescript": "^5.8.3",
"typedoc": "^0.28.1",
"flatbuffers": "^25.2.10",
"lodash.camelcase": "^4.3.0",
"rimraf": "^6.0.1",
"rollup": "^4.37.0",
"rollup": "^4.39.0",
"@rollup/plugin-typescript": "^12.1.2",
"@rollup/plugin-commonjs": "^28.0.3",
"rollup-plugin-includepaths": "^0.2.4",
"@rollup/plugin-json": "^6.1.0",
"rollup-plugin-license": "^3.6.0",
"@rollup/plugin-node-resolve": "^16.0.1",
"rollup-plugin-esbuild": "^6.2.1",
"esbuild": "^0.25.1",
"eslint": "^9.23.0",
"@typescript-eslint/eslint-plugin": "^8.27.0",
"@typescript-eslint/parser": "^8.27.0"
"esbuild": "^0.25.2",
"eslint": "^9.24.0",
"@typescript-eslint/eslint-plugin": "^8.29.0",
"@typescript-eslint/parser": "^8.29.0"
},
"optionalDependencies": {
"fsevents": "^2.3.3"
Expand Down
14 changes: 7 additions & 7 deletions packages/ss6player-pixi/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@
"ss6player-lib": "1.0.3"
},
"devDependencies": {
"typescript": "^5.8.2",
"typescript": "^5.8.3",
"typedoc": "^0.28.1",
"flatbuffers": "^25.2.10",
"lodash.camelcase": "^4.3.0",
"rimraf": "^6.0.1",
"rollup": "^4.37.0",
"rollup": "^4.39.0",
"@rollup/plugin-typescript": "^12.1.2",
"@rollup/plugin-commonjs": "^28.0.3",
"rollup-plugin-includepaths": "^0.2.4",
Expand All @@ -61,14 +61,14 @@
"@rollup/plugin-node-resolve": "^16.0.1",
"rollup-plugin-tsconfig-paths": "^1.5.2",
"rollup-plugin-esbuild": "^6.2.1",
"esbuild": "^0.25.1",
"pixi.js": "^8.9.0",
"esbuild": "^0.25.2",
"pixi.js": "^8.9.1",
"concurrently": "^9.1.2",
"http-server": "^14.1.1",
"opener": "^1.5.2",
"eslint": "^9.23.0",
"@typescript-eslint/eslint-plugin": "^8.27.0",
"@typescript-eslint/parser": "^8.27.0"
"eslint": "^9.24.0",
"@typescript-eslint/eslint-plugin": "^8.29.0",
"@typescript-eslint/parser": "^8.29.0"
},
"optionalDependencies": {
"fsevents": "^2.3.3"
Expand Down
12 changes: 6 additions & 6 deletions packages/ss6player-pixi6/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@
"ss6player-lib": "1.0.3"
},
"devDependencies": {
"typescript": "^5.8.2",
"typescript": "^5.8.3",
"typedoc": "^0.28.1",
"lodash.camelcase": "^4.3.0",
"rimraf": "^6.0.1",
"rollup": "^4.37.0",
"rollup": "^4.39.0",
"@rollup/plugin-typescript": "^12.1.2",
"@rollup/plugin-commonjs": "^28.0.3",
"rollup-plugin-includepaths": "^0.2.4",
Expand All @@ -59,7 +59,7 @@
"@rollup/plugin-node-resolve": "^16.0.1",
"rollup-plugin-tsconfig-paths": "^1.5.2",
"rollup-plugin-esbuild": "^6.2.1",
"esbuild": "^0.25.1",
"esbuild": "^0.25.2",
"pixi.js": "^6.5.10",
"@pixi/loaders": "^6.5.10",
"@pixi/display": "^6.5.10",
Expand All @@ -71,9 +71,9 @@
"concurrently": "^9.1.2",
"http-server": "^14.1.1",
"opener": "^1.5.2",
"eslint": "^9.23.0",
"@typescript-eslint/eslint-plugin": "^8.27.0",
"@typescript-eslint/parser": "^8.27.0"
"eslint": "^9.24.0",
"@typescript-eslint/eslint-plugin": "^8.29.0",
"@typescript-eslint/parser": "^8.29.0"
},
"optionalDependencies": {
"fsevents": "^2.3.3"
Expand Down
2 changes: 1 addition & 1 deletion packages/ss6player-rpgmakermz/SampleProject/js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//=============================================================================
// main.js v1.8.1
// main.js v1.9.0
//=============================================================================

const scriptUrls = [
Expand Down
4 changes: 2 additions & 2 deletions packages/ss6player-rpgmakermz/SampleProject/js/rmmz_core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//=============================================================================
// rmmz_core.js v1.8.1
// rmmz_core.js v1.9.0
//=============================================================================

//-----------------------------------------------------------------------------
Expand Down Expand Up @@ -192,7 +192,7 @@ Utils.RPGMAKER_NAME = "MZ";
* @type string
* @constant
*/
Utils.RPGMAKER_VERSION = "1.8.1";
Utils.RPGMAKER_VERSION = "1.9.0";

/**
* Checks whether the current RPG Maker version is greater than or equal to
Expand Down
54 changes: 49 additions & 5 deletions packages/ss6player-rpgmakermz/SampleProject/js/rmmz_managers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//=============================================================================
// rmmz_managers.js v1.8.1
// rmmz_managers.js v1.9.0
//=============================================================================

//-----------------------------------------------------------------------------
Expand Down Expand Up @@ -851,15 +851,59 @@ function ImageManager() {
throw new Error("This is a static class");
}

ImageManager.iconWidth = 32;
ImageManager.iconHeight = 32;
ImageManager.faceWidth = 144;
ImageManager.faceHeight = 144;
ImageManager.standardIconWidth = 32;
ImageManager.standardIconHeight = 32;
ImageManager.standardFaceWidth = 144;
ImageManager.standardFaceHeight = 144;

ImageManager._cache = {};
ImageManager._system = {};
ImageManager._emptyBitmap = new Bitmap(1, 1);

Object.defineProperty(ImageManager, "iconWidth", {
get: function() {
return this.getIconSize();
},
configurable: true
});

Object.defineProperty(ImageManager, "iconHeight", {
get: function() {
return this.getIconSize();
},
configurable: true
});

Object.defineProperty(ImageManager, "faceWidth", {
get: function() {
return this.getFaceSize();
},
configurable: true
});

Object.defineProperty(ImageManager, "faceHeight", {
get: function() {
return this.getFaceSize();
},
configurable: true
});

ImageManager.getIconSize = function() {
if ("iconSize" in $dataSystem) {
return $dataSystem.iconSize;
} else {
return this.defaultIconWidth;
}
};

ImageManager.getFaceSize = function() {
if ("faceSize" in $dataSystem) {
return $dataSystem.faceSize;
} else {
return this.defaultFaceWidth;
}
};

ImageManager.loadAnimation = function(filename) {
return this.loadBitmap("img/animations/", filename);
};
Expand Down
8 changes: 6 additions & 2 deletions packages/ss6player-rpgmakermz/SampleProject/js/rmmz_objects.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//=============================================================================
// rmmz_objects.js v1.8.1
// rmmz_objects.js v1.9.0
//=============================================================================

//-----------------------------------------------------------------------------
Expand Down Expand Up @@ -901,7 +901,11 @@ Game_Screen.prototype.eraseBattlePictures = function() {
};

Game_Screen.prototype.maxPictures = function() {
return 100;
if ("picturesUpperLimit" in $dataSystem.advanced) {
return $dataSystem.advanced.picturesUpperLimit;
} else {
return 100;
}
};

Game_Screen.prototype.startFadeOut = function(duration) {
Expand Down
4 changes: 2 additions & 2 deletions packages/ss6player-rpgmakermz/SampleProject/js/rmmz_scenes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//=============================================================================
// rmmz_scenes.js v1.8.1
// rmmz_scenes.js v1.9.0
//=============================================================================

//-----------------------------------------------------------------------------
Expand Down Expand Up @@ -2907,7 +2907,7 @@ Scene_Name.prototype.editWindowRect = function() {
const inputWindowHeight = this.calcWindowHeight(9, true);
const padding = $gameSystem.windowPadding();
const ww = 600;
const wh = ImageManager.faceHeight + padding * 2;
const wh = ImageManager.standardFaceHeight + padding * 2;
const wx = (Graphics.boxWidth - ww) / 2;
const wy = (Graphics.boxHeight - (wh + inputWindowHeight + 8)) / 2;
return new Rectangle(wx, wy, ww, wh);
Expand Down
2 changes: 1 addition & 1 deletion packages/ss6player-rpgmakermz/SampleProject/js/rmmz_sprites.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//=============================================================================
// rmmz_sprites.js v1.8.1
// rmmz_sprites.js v1.9.0
//=============================================================================

//-----------------------------------------------------------------------------
Expand Down
36 changes: 21 additions & 15 deletions packages/ss6player-rpgmakermz/SampleProject/js/rmmz_windows.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//=============================================================================
// rmmz_windows.js v1.8.1
// rmmz_windows.js v1.9.0
//=============================================================================

//-----------------------------------------------------------------------------
Expand Down Expand Up @@ -395,10 +395,14 @@ Window_Base.prototype.processColorChange = function(colorIndex) {
};

Window_Base.prototype.processDrawIcon = function(iconIndex, textState) {
const deltaX = ImageManager.standardIconWidth - ImageManager.iconWidth;
const deltaY = ImageManager.standardIconHeight - ImageManager.iconHeight;
if (textState.drawing) {
this.drawIcon(iconIndex, textState.x + 2, textState.y + 2);
const x = textState.x + deltaX / 2 + 2;
const y = textState.y + deltaY / 2 + 2;
this.drawIcon(iconIndex, x, y);
}
textState.x += ImageManager.iconWidth + 4;
textState.x += ImageManager.standardIconWidth + 4;
};

Window_Base.prototype.makeFontBigger = function() {
Expand Down Expand Up @@ -458,8 +462,8 @@ Window_Base.prototype.drawIcon = function(iconIndex, x, y) {
Window_Base.prototype.drawFace = function(
faceName, faceIndex, x, y, width, height
) {
width = width || ImageManager.faceWidth;
height = height || ImageManager.faceHeight;
width = width || ImageManager.standardFaceWidth;
height = height || ImageManager.standardFaceHeight;
const bitmap = ImageManager.loadFace(faceName);
const pw = ImageManager.faceWidth;
const ph = ImageManager.faceHeight;
Expand Down Expand Up @@ -489,10 +493,11 @@ Window_Base.prototype.drawCharacter = function(
Window_Base.prototype.drawItemName = function(item, x, y, width) {
if (item) {
const iconY = y + (this.lineHeight() - ImageManager.iconHeight) / 2;
const textMargin = ImageManager.iconWidth + 4;
const delta = ImageManager.standardIconWidth - ImageManager.iconWidth;
const textMargin = ImageManager.standardIconWidth + 4;
const itemWidth = Math.max(0, width - textMargin);
this.resetTextColor();
this.drawIcon(item.iconIndex, x, iconY);
this.drawIcon(item.iconIndex, x + delta / 2, iconY);
this.drawText(item.name, x + textMargin, y, itemWidth);
}
};
Expand Down Expand Up @@ -1791,9 +1796,10 @@ Window_StatusBase.prototype.drawActorLevel = function(actor, x, y) {

Window_StatusBase.prototype.drawActorIcons = function(actor, x, y, width) {
width = width || 144;
const iconWidth = ImageManager.iconWidth;
const delta = ImageManager.standardIconWidth - ImageManager.iconWidth;
const iconWidth = ImageManager.standardIconWidth;
const icons = actor.allIcons().slice(0, Math.floor(width / iconWidth));
let iconX = x;
let iconX = x + delta / 2;
for (const icon of icons) {
this.drawIcon(icon, iconX, y + 2);
iconX += iconWidth;
Expand Down Expand Up @@ -1986,7 +1992,7 @@ Window_MenuStatus.prototype.drawPendingItemBackground = function(index) {
Window_MenuStatus.prototype.drawItemImage = function(index) {
const actor = this.actor(index);
const rect = this.itemRect(index);
const width = ImageManager.faceWidth;
const width = ImageManager.standardFaceWidth;
const height = rect.height - 2;
this.changePaintOpacity(actor.isBattleMember());
this.drawActorFace(actor, rect.x + 1, rect.y + 1, width, height);
Expand Down Expand Up @@ -2584,7 +2590,7 @@ Window_EquipStatus.prototype.paramX = function() {
};

Window_EquipStatus.prototype.paramY = function(index) {
const faceHeight = ImageManager.faceHeight;
const faceHeight = ImageManager.standardFaceHeight;
return faceHeight + Math.floor(this.lineHeight() * (index + 1.5));
};

Expand Down Expand Up @@ -4880,7 +4886,7 @@ Window_Message.prototype.startMessage = function() {

Window_Message.prototype.newLineX = function(textState) {
const faceExists = $gameMessage.faceName() !== "";
const faceWidth = ImageManager.faceWidth;
const faceWidth = ImageManager.standardFaceWidth;
const spacing = 20;
const margin = faceExists ? faceWidth + spacing : 4;
return textState.rtl ? this.innerWidth - margin : margin;
Expand Down Expand Up @@ -5087,7 +5093,7 @@ Window_Message.prototype.drawMessageFace = function() {
const faceName = $gameMessage.faceName();
const faceIndex = $gameMessage.faceIndex();
const rtl = $gameMessage.isRTL();
const width = ImageManager.faceWidth;
const width = ImageManager.standardFaceWidth;
const height = this.innerHeight;
const x = rtl ? this.innerWidth - width - 4 : 4;
this.drawFace(faceName, faceIndex, x, 0, width, height);
Expand Down Expand Up @@ -6173,11 +6179,11 @@ Window_BattleStatus.prototype.nameY = function(rect) {
};

Window_BattleStatus.prototype.stateIconX = function(rect) {
return rect.x + rect.width - ImageManager.iconWidth / 2 + 4;
return rect.x + rect.width - ImageManager.standardIconWidth / 2 + 4;
};

Window_BattleStatus.prototype.stateIconY = function(rect) {
return rect.y + ImageManager.iconHeight / 2 + 4;
return rect.y + ImageManager.standardIconHeight / 2 + 4;
};

Window_BattleStatus.prototype.basicGaugesX = function(rect) {
Expand Down
12 changes: 6 additions & 6 deletions packages/ss6player-rpgmakermz/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,28 +46,28 @@
"ss6player-pixi6": "^1.0.3"
},
"devDependencies": {
"typescript": "^5.8.2",
"typescript": "^5.8.3",
"typedoc": "^0.28.1",
"lodash.camelcase": "^4.3.0",
"rimraf": "^6.0.1",
"rollup": "^4.37.0",
"rollup": "^4.39.0",
"@rollup/plugin-typescript": "^12.1.2",
"@rollup/plugin-commonjs": "^28.0.3",
"rollup-plugin-includepaths": "^0.2.4",
"@rollup/plugin-json": "^6.1.0",
"rollup-plugin-license": "^3.6.0",
"@rollup/plugin-node-resolve": "^16.0.1",
"rollup-plugin-esbuild": "^6.2.1",
"esbuild": "^0.25.1",
"esbuild": "^0.25.2",
"pixi.js": "^5.3.12",
"concurrently": "^9.1.2",
"http-server": "^14.1.1",
"opener": "^1.5.2",
"replace": "^1.2.2",
"ncp": "^2.0.0",
"eslint": "^9.23.0",
"@typescript-eslint/eslint-plugin": "^8.27.0",
"@typescript-eslint/parser": "^8.27.0"
"eslint": "^9.24.0",
"@typescript-eslint/eslint-plugin": "^8.29.0",
"@typescript-eslint/parser": "^8.29.0"
},
"optionalDependencies": {
"fsevents": "^2.3.3"
Expand Down
Loading