Skip to content

Commit

Permalink
Merge pull request #203 from SpriteStudio/feature/update
Browse files Browse the repository at this point in the history 
feature/update
  • Loading branch information
@SpriteStudio
SpriteStudio authored Oct 28, 2024
2 parents b559bce + 767ca2e commit c7fca62
Show file tree
Hide file tree
Showing 15 changed files with 972 additions and 517 deletions.
1,341 changes: 895 additions & 446 deletions package-lock.json
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
"mzview": "npx lerna run view --scope=ss6player-rpgmakermz"
},
"devDependencies": {
"typescript": "^5.5.4",
"typedoc": "^0.26.5",
"lerna": "^8.1.7",
"typescript": "^5.6.3",
"typedoc": "^0.26.10",
"lerna": "^8.1.8",
"ncp": "^2.0.0",
"rimraf": "^6.0.1",
"@typescript-eslint/eslint-plugin": "^7.15.0",
Expand Down
16 changes: 8 additions & 8 deletions packages/ss6player-lib/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,20 @@
"ssfblib": "1.2.3"
},
"devDependencies": {
"typescript": "^5.5.4",
"typedoc": "^0.26.5",
"typescript": "^5.6.3",
"typedoc": "^0.26.10",
"flatbuffers": "^24.3.25",
"lodash.camelcase": "^4.3.0",
"rimraf": "^6.0.1",
"rollup": "^4.20.0",
"@rollup/plugin-typescript": "^11.1.6",
"@rollup/plugin-commonjs": "^26.0.1",
"rollup": "^4.24.0",
"@rollup/plugin-typescript": "^12.1.1",
"@rollup/plugin-commonjs": "^28.0.1",
"rollup-plugin-includepaths": "^0.2.4",
"@rollup/plugin-json": "^6.1.0",
"rollup-plugin-license": "^3.5.2",
"@rollup/plugin-node-resolve": "^15.2.3",
"rollup-plugin-license": "^3.5.3",
"@rollup/plugin-node-resolve": "^15.3.0",
"rollup-plugin-esbuild": "^6.1.1",
"esbuild": "^0.23.0",
"esbuild": "^0.24.0",
"@typescript-eslint/eslint-plugin": "^7.15.0",
"@typescript-eslint/parser": "^7.15.0",
"@typescript-eslint/eslint-plugin-tslint": "^7.0.2",
Expand Down
20 changes: 10 additions & 10 deletions packages/ss6player-pixi/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,23 +47,23 @@
"ss6player-lib": "1.0.3"
},
"devDependencies": {
"typescript": "^5.5.4",
"typedoc": "^0.26.5",
"typescript": "^5.6.3",
"typedoc": "^0.26.10",
"flatbuffers": "^24.3.25",
"lodash.camelcase": "^4.3.0",
"rimraf": "^6.0.1",
"rollup": "^4.20.0",
"@rollup/plugin-typescript": "^11.1.6",
"@rollup/plugin-commonjs": "^26.0.1",
"rollup": "^4.24.0",
"@rollup/plugin-typescript": "^12.1.1",
"@rollup/plugin-commonjs": "^28.0.1",
"rollup-plugin-includepaths": "^0.2.4",
"@rollup/plugin-json": "^6.1.0",
"rollup-plugin-license": "^3.5.2",
"@rollup/plugin-node-resolve": "^15.2.3",
"rollup-plugin-license": "^3.5.3",
"@rollup/plugin-node-resolve": "^15.3.0",
"rollup-plugin-tsconfig-paths": "^1.5.2",
"rollup-plugin-esbuild": "^6.1.1",
"esbuild": "^0.23.0",
"pixi.js": "^8.2.6",
"concurrently": "^8.2.2",
"esbuild": "^0.24.0",
"pixi.js": "^8.5.2",
"concurrently": "^9.0.1",
"http-server": "^14.1.1",
"opener": "^1.5.2",
"@typescript-eslint/eslint-plugin": "^7.15.0",
Expand Down
18 changes: 9 additions & 9 deletions packages/ss6player-pixi6/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,20 +46,20 @@
"ss6player-lib": "1.0.3"
},
"devDependencies": {
"typescript": "^5.5.4",
"typedoc": "^0.26.5",
"typescript": "^5.6.3",
"typedoc": "^0.26.10",
"lodash.camelcase": "^4.3.0",
"rimraf": "^6.0.1",
"rollup": "^4.20.0",
"@rollup/plugin-typescript": "^11.1.6",
"@rollup/plugin-commonjs": "^26.0.1",
"rollup": "^4.24.0",
"@rollup/plugin-typescript": "^12.1.1",
"@rollup/plugin-commonjs": "^28.0.1",
"rollup-plugin-includepaths": "^0.2.4",
"@rollup/plugin-json": "^6.1.0",
"rollup-plugin-license": "^3.5.2",
"@rollup/plugin-node-resolve": "^15.2.3",
"rollup-plugin-license": "^3.5.3",
"@rollup/plugin-node-resolve": "^15.3.0",
"rollup-plugin-tsconfig-paths": "^1.5.2",
"rollup-plugin-esbuild": "^6.1.1",
"esbuild": "^0.23.0",
"esbuild": "^0.24.0",
"pixi.js": "^6.5.10",
"@pixi/loaders": "^6.5.10",
"@pixi/display": "^6.5.10",
Expand All @@ -68,7 +68,7 @@
"@pixi/filter-color-matrix": "^6.5.10",
"@pixi/core": "^6.5.10",
"@pixi/constants": "^6.5.10",
"concurrently": "^8.2.2",
"concurrently": "^9.0.1",
"http-server": "^14.1.1",
"opener": "^1.5.2",
"@typescript-eslint/eslint-plugin": "^7.15.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/ss6player-rpgmakermz/SampleProject/js/main.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//=============================================================================
// main.js v1.8.0
// main.js v1.8.1
//=============================================================================

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

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

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

//-----------------------------------------------------------------------------
Expand Down Expand Up @@ -2806,8 +2806,8 @@ BattleManager.invokeMagicReflection = function(subject, target) {

BattleManager.applySubstitute = function(target) {
if (this.checkSubstitute(target)) {
const substitute = target.friendsUnit().substituteBattler();
if (substitute && target !== substitute) {
const substitute = target.friendsUnit().substituteBattler(target);
if (substitute) {
this._logWindow.displaySubstitute(substitute, target);
return substitute;
}
Expand Down
10 changes: 7 additions & 3 deletions packages/ss6player-rpgmakermz/SampleProject/js/rmmz_objects.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//=============================================================================
// rmmz_objects.js v1.8.0
// rmmz_objects.js v1.8.1
//=============================================================================

//-----------------------------------------------------------------------------
Expand Down Expand Up @@ -224,6 +224,10 @@ Game_System.prototype.isAutosaveEnabled = function() {
return $dataSystem.optAutosave;
};

Game_System.prototype.isMessageSkipEnabled = function() {
return $dataSystem.optMessageSkip;
};

Game_System.prototype.isSaveEnabled = function() {
return this._saveEnabled;
};
Expand Down Expand Up @@ -5350,9 +5354,9 @@ Game_Unit.prototype.isAllDead = function() {
return this.aliveMembers().length === 0;
};

Game_Unit.prototype.substituteBattler = function() {
Game_Unit.prototype.substituteBattler = function(target) {
for (const member of this.members()) {
if (member.isSubstitute()) {
if (member.isSubstitute() && member !== target) {
return member;
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/ss6player-rpgmakermz/SampleProject/js/rmmz_scenes.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//=============================================================================
// rmmz_scenes.js v1.8.0
// rmmz_scenes.js v1.8.1
//=============================================================================

//-----------------------------------------------------------------------------
Expand Down Expand Up @@ -2019,7 +2019,7 @@ Scene_Equip.prototype.onSlotOk = function() {
this._slotWindow.hide();
this._itemWindow.show();
this._itemWindow.activate();
this._itemWindow.select(0);
this._itemWindow.forceSelect(0);
};

Scene_Equip.prototype.onSlotCancel = function() {
Expand Down
2 changes: 1 addition & 1 deletion packages/ss6player-rpgmakermz/SampleProject/js/rmmz_sprites.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//=============================================================================
// rmmz_sprites.js v1.8.0
// rmmz_sprites.js v1.8.1
//=============================================================================

//-----------------------------------------------------------------------------
Expand Down
6 changes: 4 additions & 2 deletions packages/ss6player-rpgmakermz/SampleProject/js/rmmz_windows.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//=============================================================================
// rmmz_windows.js v1.8.0
// rmmz_windows.js v1.8.1
//=============================================================================

//-----------------------------------------------------------------------------
Expand Down Expand Up @@ -4916,7 +4916,9 @@ Window_Message.prototype.updateWait = function() {
};

Window_Message.prototype.cancelWait = function() {
this._waitCount = 0;
if ($gameSystem.isMessageSkipEnabled()) {
this._waitCount = 0;
}
};

Window_Message.prototype.updateLoading = function() {
Expand Down
18 changes: 9 additions & 9 deletions packages/ss6player-rpgmakermz/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,21 +46,21 @@
"ss6player-pixi6": "^1.0.3"
},
"devDependencies": {
"typescript": "^5.5.4",
"typedoc": "^0.26.5",
"typescript": "^5.6.3",
"typedoc": "^0.26.10",
"lodash.camelcase": "^4.3.0",
"rimraf": "^6.0.1",
"rollup": "^4.20.0",
"@rollup/plugin-typescript": "^11.1.6",
"@rollup/plugin-commonjs": "^26.0.1",
"rollup": "^4.24.0",
"@rollup/plugin-typescript": "^12.1.1",
"@rollup/plugin-commonjs": "^28.0.1",
"rollup-plugin-includepaths": "^0.2.4",
"@rollup/plugin-json": "^6.1.0",
"rollup-plugin-license": "^3.5.2",
"@rollup/plugin-node-resolve": "^15.2.3",
"rollup-plugin-license": "^3.5.3",
"@rollup/plugin-node-resolve": "^15.3.0",
"rollup-plugin-esbuild": "^6.1.1",
"esbuild": "^0.23.0",
"esbuild": "^0.24.0",
"pixi.js": "^5.3.12",
"concurrently": "^8.2.2",
"concurrently": "^9.0.1",
"http-server": "^14.1.1",
"opener": "^1.5.2",
"replace": "^1.2.2",
Expand Down
20 changes: 10 additions & 10 deletions packages/ss6player-viewer/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,21 +47,21 @@
"jszip": "^3.10.1"
},
"devDependencies": {
"typescript": "^5.5.4",
"typedoc": "^0.26.5",
"typescript": "^5.6.3",
"typedoc": "^0.26.10",
"lodash.camelcase": "^4.3.0",
"rimraf": "^6.0.1",
"rollup": "^4.20.0",
"@rollup/plugin-typescript": "^11.1.6",
"@rollup/plugin-commonjs": "^26.0.1",
"rollup": "^4.24.0",
"@rollup/plugin-typescript": "^12.1.1",
"@rollup/plugin-commonjs": "^28.0.1",
"rollup-plugin-includepaths": "^0.2.4",
"@rollup/plugin-json": "^6.1.0",
"rollup-plugin-license": "^3.5.2",
"@rollup/plugin-node-resolve": "^15.2.3",
"rollup-plugin-license": "^3.5.3",
"@rollup/plugin-node-resolve": "^15.3.0",
"rollup-plugin-esbuild": "^6.1.1",
"esbuild": "^0.23.0",
"pixi.js": "^8.2.6",
"concurrently": "^8.2.2",
"esbuild": "^0.24.0",
"pixi.js": "^8.5.2",
"concurrently": "^9.0.1",
"http-server": "^14.1.1",
"opener": "^1.5.2",
"replace": "^1.2.2",
Expand Down
16 changes: 8 additions & 8 deletions packages/ssfblib/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,19 @@
"flatbuffers": "^24.3.25"
},
"devDependencies": {
"typescript": "^5.5.4",
"typedoc": "^0.26.5",
"typescript": "^5.6.3",
"typedoc": "^0.26.10",
"lodash.camelcase": "^4.3.0",
"rimraf": "^6.0.1",
"rollup": "^4.20.0",
"@rollup/plugin-typescript": "^11.1.6",
"@rollup/plugin-commonjs": "^26.0.1",
"rollup": "^4.24.0",
"@rollup/plugin-typescript": "^12.1.1",
"@rollup/plugin-commonjs": "^28.0.1",
"rollup-plugin-includepaths": "^0.2.4",
"@rollup/plugin-json": "^6.1.0",
"rollup-plugin-license": "^3.5.2",
"@rollup/plugin-node-resolve": "^15.2.3",
"rollup-plugin-license": "^3.5.3",
"@rollup/plugin-node-resolve": "^15.3.0",
"rollup-plugin-esbuild": "^6.1.1",
"esbuild": "^0.23.0"
"esbuild": "^0.24.0"
},
"optionalDependencies": {
"fsevents": "^2.3.3"
Expand Down

0 comments on commit c7fca62

Please sign in to comment.