From 932cf8c31515531829b98d7b01e5866d1e5bc83e Mon Sep 17 00:00:00 2001 From: Sigureya Date: Thu, 22 Mar 2018 22:53:58 +0900 Subject: [PATCH 1/7] Supports requestImages plugin command MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 先読みをプラグインコマンドに対応 --- js/rpg_objects/Game_Interpreter.js | 244 +++++++++++++++-------------- 1 file changed, 127 insertions(+), 117 deletions(-) diff --git a/js/rpg_objects/Game_Interpreter.js b/js/rpg_objects/Game_Interpreter.js index a68a6fe9..c77f68b5 100644 --- a/js/rpg_objects/Game_Interpreter.js +++ b/js/rpg_objects/Game_Interpreter.js @@ -1740,129 +1740,139 @@ Game_Interpreter.prototype.pluginCommand = function(command, args) { // to be overridden by plugins }; -Game_Interpreter.requestImages = function(list, commonList){ - if(!list) return; +Game_Interpreter.requestImagesByPluginCommand=function(command,args){ - list.forEach(function(command){ - var params = command.parameters; - switch(command.code){ - // Show Text - case 101: - ImageManager.requestFace(params[0]); - break; - - // Common Event - case 117: - var commonEvent = $dataCommonEvents[params[0]]; - if (commonEvent) { - if (!commonList) { - commonList = []; - } - if (!commonList.contains(params[0])) { - commonList.push(params[0]); - Game_Interpreter.requestImages(commonEvent.list, commonList); - } - } - break; +} - // Change Party Member - case 129: - var actor = $gameActors.actor(params[0]); - if (actor && params[1] === 0) { - var name = actor.characterName(); - ImageManager.requestCharacter(name); - } - break; - - // Set Movement Route - case 205: - if(params[1]){ - params[1].list.forEach(function(command){ - var params = command.parameters; - if(command.code === Game_Character.ROUTE_CHANGE_IMAGE){ - ImageManager.requestCharacter(params[0]); - } - }); - } - break; - - // Show Animation, Show Battle Animation - case 212: case 337: - if(params[1]) { - var animation = $dataAnimations[params[1]]; - var name1 = animation.animation1Name; - var name2 = animation.animation2Name; - var hue1 = animation.animation1Hue; - var hue2 = animation.animation2Hue; - ImageManager.requestAnimation(name1, hue1); - ImageManager.requestAnimation(name2, hue2); +Game_Interpreter.requestImagesForCommand　=function(command){ + var params = command.parameters; + switch(command.code){ + // Show Text + case 101: + ImageManager.requestFace(params[0]); + break; + + // Common Event + case 117: + var commonEvent = $dataCommonEvents[params[0]]; + if (commonEvent) { + if (!commonList) { + commonList = []; } - break; - - // Change Player Followers - case 216: - if (params[0] === 0) { - $gamePlayer.followers().forEach(function(follower) { - var name = follower.characterName(); - ImageManager.requestCharacter(name); - }); + if (!commonList.contains(params[0])) { + commonList.push(params[0]); + Game_Interpreter.requestImages(commonEvent.list, commonList); } - break; - - // Show Picture - case 231: - ImageManager.requestPicture(params[1]); - break; - - // Change Tileset - case 282: - var tileset = $dataTilesets[params[0]]; - tileset.tilesetNames.forEach(function(tilesetName){ - ImageManager.requestTileset(tilesetName); + } + break; + + // Change Party Member + case 129: + var actor = $gameActors.actor(params[0]); + if (actor && params[1] === 0) { + var name = actor.characterName(); + ImageManager.requestCharacter(name); + } + break; + + // Set Movement Route + case 205: + if(params[1]){ + params[1].list.forEach(function(command){ + var params = command.parameters; + if(command.code === Game_Character.ROUTE_CHANGE_IMAGE){ + ImageManager.requestCharacter(params[0]); + } }); - break; + } + break; - // Change Battle Back - case 283: - if ($gameParty.inBattle()) { - ImageManager.requestBattleback1(params[0]); - ImageManager.requestBattleback2(params[1]); - } - break; + // Show Animation, Show Battle Animation + case 212: case 337: + if(params[1]) { + var animation = $dataAnimations[params[1]]; + var name1 = animation.animation1Name; + var name2 = animation.animation2Name; + var hue1 = animation.animation1Hue; + var hue2 = animation.animation2Hue; + ImageManager.requestAnimation(name1, hue1); + ImageManager.requestAnimation(name2, hue2); + } + break; - // Change Parallax - case 284: - if (!$gameParty.inBattle()) { - ImageManager.requestParallax(params[0]); - } - break; + // Change Player Followers + case 216: + if (params[0] === 0) { + $gamePlayer.followers().forEach(function(follower) { + var name = follower.characterName(); + ImageManager.requestCharacter(name); + }); + } + break; - // Change Actor Images - case 322: + // Show Picture + case 231: + ImageManager.requestPicture(params[1]); + break; + + // Change Tileset + case 282: + var tileset = $dataTilesets[params[0]]; + tileset.tilesetNames.forEach(function(tilesetName){ + ImageManager.requestTileset(tilesetName); + }); + break; + + // Change Battle Back + case 283: + if ($gameParty.inBattle()) { + ImageManager.requestBattleback1(params[0]); + ImageManager.requestBattleback2(params[1]); + } + break; + + // Change Parallax + case 284: + if (!$gameParty.inBattle()) { + ImageManager.requestParallax(params[0]); + } + break; + + // Change Actor Images + case 322: + ImageManager.requestCharacter(params[1]); + ImageManager.requestFace(params[3]); + ImageManager.requestSvActor(params[5]); + break; + + // Change Vehicle Image + case 323: + var vehicle = $gameMap.vehicle(params[0]); + if(vehicle){ ImageManager.requestCharacter(params[1]); - ImageManager.requestFace(params[3]); - ImageManager.requestSvActor(params[5]); - break; - - // Change Vehicle Image - case 323: - var vehicle = $gameMap.vehicle(params[0]); - if(vehicle){ - ImageManager.requestCharacter(params[1]); - } - break; - - // Enemy Transform - case 336: - var enemy = $dataEnemies[params[1]]; - var name = enemy.battlerName; - var hue = enemy.battlerHue; - if ($gameSystem.isSideView()) { - ImageManager.requestSvEnemy(name, hue); - } else { - ImageManager.requestEnemy(name, hue); - } - break; - } - }); -}; \ No newline at end of file + } + break; + + // Enemy Transform + case 336: + var enemy = $dataEnemies[params[1]]; + var name = enemy.battlerName; + var hue = enemy.battlerHue; + if ($gameSystem.isSideView()) { + ImageManager.requestSvEnemy(name, hue); + } else { + ImageManager.requestEnemy(name, hue); + } + break; + // Plugin Command + case 356: + var args = this._params[0].split(" "); + var command = args.shift(); + Game_Interpreter.requestImagesByPluginCommand(args,command); + break; + } +}; +Game_Interpreter.requestImages = function(list, commonList){ + if(!list) return; + list.forEach(Game_Interpreter.requestImagesForCommand); +}; From aabd1cda59d8363f5e680d7c6531188bd93c8013 Mon Sep 17 00:00:00 2001 From: Sigureya Date: Fri, 23 Mar 2018 00:16:12 +0900 Subject: [PATCH 2/7] =?UTF-8?q?=E5=BE=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/rpg_objects/Game_Interpreter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/rpg_objects/Game_Interpreter.js b/js/rpg_objects/Game_Interpreter.js index c77f68b5..13ee6348 100644 --- a/js/rpg_objects/Game_Interpreter.js +++ b/js/rpg_objects/Game_Interpreter.js @@ -1866,7 +1866,7 @@ Game_Interpreter.requestImagesForCommand　=function(command){ break; // Plugin Command case 356: - var args = this._params[0].split(" "); + var args = params[0].split(" "); var command = args.shift(); Game_Interpreter.requestImagesByPluginCommand(args,command); break; From cd70ddb9bd34831f243dfecf892d51bc226afc2d Mon Sep 17 00:00:00 2001 From: Sigureya Date: Fri, 23 Mar 2018 00:47:00 +0900 Subject: [PATCH 3/7] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E7=94=A8?= =?UTF-8?q?=E3=81=AB=E3=83=97=E3=83=A9=E3=82=B0=E3=82=A4=E3=83=B3=E3=81=A8?= =?UTF-8?q?=E3=81=97=E3=81=A6=E5=88=87=E3=82=8A=E5=88=86=E3=81=91=E3=81=9F?= =?UTF-8?q?=E7=8A=B6=E6=85=8B=E3=81=A7=E5=85=AC=E9=96=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/Mano_InterpriterSakiyomi.js | 142 ++++++++++++++++++++++++++++++ 1 file changed, 142 insertions(+) create mode 100644 tests/Mano_InterpriterSakiyomi.js diff --git a/tests/Mano_InterpriterSakiyomi.js b/tests/Mano_InterpriterSakiyomi.js new file mode 100644 index 00000000..fb8f5345 --- /dev/null +++ b/tests/Mano_InterpriterSakiyomi.js @@ -0,0 +1,142 @@ + +Game_Interpreter.requestImagesByPluginCommand=function(command,args){ + +}; + +Game_Interpreter.requestImagesForCommand　=function(command){ + var params = command.parameters; + switch(command.code){ + // Show Text + case 101: + ImageManager.requestFace(params[0]); + break; + + // Change Party Member + case 129: + var actor = $gameActors.actor(params[0]); + if (actor && params[1] === 0) { + var name = actor.characterName(); + ImageManager.requestCharacter(name); + } + break; + + // Set Movement Route + case 205: + if(params[1]){ + params[1].list.forEach(function(command){ + var params = command.parameters; + if(command.code === Game_Character.ROUTE_CHANGE_IMAGE){ + ImageManager.requestCharacter(params[0]); + } + }); + } + break; + + // Show Animation, Show Battle Animation + case 212: case 337: + if(params[1]) { + var animation = $dataAnimations[params[1]]; + var name1 = animation.animation1Name; + var name2 = animation.animation2Name; + var hue1 = animation.animation1Hue; + var hue2 = animation.animation2Hue; + ImageManager.requestAnimation(name1, hue1); + ImageManager.requestAnimation(name2, hue2); + } + break; + + // Change Player Followers + case 216: + if (params[0] === 0) { + $gamePlayer.followers().forEach(function(follower) { + var name = follower.characterName(); + ImageManager.requestCharacter(name); + }); + } + break; + + // Show Picture + case 231: + ImageManager.requestPicture(params[1]); + break; + + // Change Tileset + case 282: + var tileset = $dataTilesets[params[0]]; + tileset.tilesetNames.forEach(function(tilesetName){ + ImageManager.requestTileset(tilesetName); + }); + break; + + // Change Battle Back + case 283: + if ($gameParty.inBattle()) { + ImageManager.requestBattleback1(params[0]); + ImageManager.requestBattleback2(params[1]); + } + break; + + // Change Parallax + case 284: + if (!$gameParty.inBattle()) { + ImageManager.requestParallax(params[0]); + } + break; + + // Change Actor Images + case 322: + ImageManager.requestCharacter(params[1]); + ImageManager.requestFace(params[3]); + ImageManager.requestSvActor(params[5]); + break; + + // Change Vehicle Image + case 323: + var vehicle = $gameMap.vehicle(params[0]); + if(vehicle){ + ImageManager.requestCharacter(params[1]); + } + break; + + // Enemy Transform + case 336: + var enemy = $dataEnemies[params[1]]; + var name = enemy.battlerName; + var hue = enemy.battlerHue; + if ($gameSystem.isSideView()) { + ImageManager.requestSvEnemy(name, hue); + } else { + ImageManager.requestEnemy(name, hue); + } + break; + } +}; + +Game_Interpreter.requestImagesByChildEvent =function(command,commonList){ + var params =command.parameters; + var commonEvent = $dataCommonEvents[params[0]]; + if (commonEvent) { + if (!commonList) { + commonList = []; + } + if (!commonList.contains(params[0])) { + commonList.push(params[0]); + Game_Interpreter.requestImages(commonEvent.list, commonList); + } + } + +}; + +Game_Interpreter.requestImages = function(list, commonList){ + if(!list) return; + var len = list.length; + for(var i=0; i Date: Fri, 23 Mar 2018 01:24:17 +0900 Subject: [PATCH 4/7] =?UTF-8?q?=E3=83=97=E3=83=A9=E3=82=B0=E3=82=A4?= =?UTF-8?q?=E3=83=B3=E3=82=B3=E3=83=9E=E3=83=B3=E3=83=89=E5=AF=BE=E5=BF=9C?= =?UTF-8?q?=E3=82=92=E5=BF=98=E3=82=8C=E3=81=A6=E3=81=9F=E3=81=AE=E3=81=A7?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/Mano_InterpriterSakiyomi.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/Mano_InterpriterSakiyomi.js b/tests/Mano_InterpriterSakiyomi.js index fb8f5345..c1583486 100644 --- a/tests/Mano_InterpriterSakiyomi.js +++ b/tests/Mano_InterpriterSakiyomi.js @@ -109,6 +109,12 @@ Game_Interpreter.requestImagesForCommand　=function(command){ ImageManager.requestEnemy(name, hue); } break; + case 356: + var args = params[0].split(" "); + var commandName = args.shift(); + Game_Interpreter.requestImagesByPluginCommand(commandName,args); + break; + } }; @@ -124,7 +130,6 @@ Game_Interpreter.requestImagesByChildEvent =function(command,commonList){ Game_Interpreter.requestImages(commonEvent.list, commonList); } } - }; Game_Interpreter.requestImages = function(list, commonList){ From d17a3d2b525386e8998729d860b84ad26a96fc20 Mon Sep 17 00:00:00 2001 From: Sigureya Date: Fri, 23 Mar 2018 16:07:55 +0900 Subject: [PATCH 5/7] =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=82=BF=E3=83=97?= =?UTF-8?q?=E3=83=AA=E3=82=BF=E3=81=A7=E3=81=AE=E5=85=88=E8=AA=AD=E3=81=BF?= =?UTF-8?q?=E6=A9=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/rpg_objects/Game_Interpreter.js | 52 +++++++++++++++++++----------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/js/rpg_objects/Game_Interpreter.js b/js/rpg_objects/Game_Interpreter.js index 13ee6348..affbff49 100644 --- a/js/rpg_objects/Game_Interpreter.js +++ b/js/rpg_objects/Game_Interpreter.js @@ -1744,6 +1744,11 @@ Game_Interpreter.requestImagesByPluginCommand=function(command,args){ } + +Game_Interpreter.requestImagesByPluginCommand=function(command,args){ + +}; + Game_Interpreter.requestImagesForCommand　=function(command){ var params = command.parameters; switch(command.code){ @@ -1752,20 +1757,6 @@ Game_Interpreter.requestImagesForCommand　=function(command){ ImageManager.requestFace(params[0]); break; - // Common Event - case 117: - var commonEvent = $dataCommonEvents[params[0]]; - if (commonEvent) { - if (!commonList) { - commonList = []; - } - if (!commonList.contains(params[0])) { - commonList.push(params[0]); - Game_Interpreter.requestImages(commonEvent.list, commonList); - } - } - break; - // Change Party Member case 129: var actor = $gameActors.actor(params[0]); @@ -1867,12 +1858,37 @@ Game_Interpreter.requestImagesForCommand　=function(command){ // Plugin Command case 356: var args = params[0].split(" "); - var command = args.shift(); - Game_Interpreter.requestImagesByPluginCommand(args,command); - break; + var commandName = args.shift(); + Game_Interpreter.requestImagesByPluginCommand(commandName,args); + break; + } }; + +Game_Interpreter.requestImagesByChildEvent =function(command,commonList){ + var params =command.parameters; + var commonEvent = $dataCommonEvents[params[0]]; + if (commonEvent) { + if (!commonList) { + commonList = []; + } + if (!commonList.contains(params[0])) { + commonList.push(params[0]); + Game_Interpreter.requestImages(commonEvent.list, commonList); + } + } +}; + Game_Interpreter.requestImages = function(list, commonList){ if(!list) return; - list.forEach(Game_Interpreter.requestImagesForCommand); + var len = list.length; + for(var i=0; i Date: Fri, 23 Mar 2018 16:13:10 +0900 Subject: [PATCH 6/7] =?UTF-8?q?=E9=87=8D=E8=A4=87=E3=82=B3=E3=83=BC?= =?UTF-8?q?=E3=83=89=E9=99=A4=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/rpg_objects/Game_Interpreter.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/js/rpg_objects/Game_Interpreter.js b/js/rpg_objects/Game_Interpreter.js index affbff49..d62a0c25 100644 --- a/js/rpg_objects/Game_Interpreter.js +++ b/js/rpg_objects/Game_Interpreter.js @@ -1744,11 +1744,6 @@ Game_Interpreter.requestImagesByPluginCommand=function(command,args){ } - -Game_Interpreter.requestImagesByPluginCommand=function(command,args){ - -}; - Game_Interpreter.requestImagesForCommand　=function(command){ var params = command.parameters; switch(command.code){ From e42dc566891a6935d203f78e5fb3457fbe9f369d Mon Sep 17 00:00:00 2001 From: Sigureya Date: Fri, 23 Mar 2018 16:22:16 +0900 Subject: [PATCH 7/7] =?UTF-8?q?=E4=B8=AD=E8=BA=AB=E3=82=92=E7=A2=BA?= =?UTF-8?q?=E8=AA=8D=E3=81=97=E3=81=A6=E3=82=82=E3=82=89=E3=81=A3=E3=81=9F?= =?UTF-8?q?=E3=81=AE=E3=81=A7=E3=80=81=E3=83=86=E3=82=B9=E3=83=88=E7=94=A8?= =?UTF-8?q?=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/Mano_InterpriterSakiyomi.js | 147 ------------------------------ 1 file changed, 147 deletions(-) delete mode 100644 tests/Mano_InterpriterSakiyomi.js diff --git a/tests/Mano_InterpriterSakiyomi.js b/tests/Mano_InterpriterSakiyomi.js deleted file mode 100644 index c1583486..00000000 --- a/tests/Mano_InterpriterSakiyomi.js +++ /dev/null @@ -1,147 +0,0 @@ - -Game_Interpreter.requestImagesByPluginCommand=function(command,args){ - -}; - -Game_Interpreter.requestImagesForCommand　=function(command){ - var params = command.parameters; - switch(command.code){ - // Show Text - case 101: - ImageManager.requestFace(params[0]); - break; - - // Change Party Member - case 129: - var actor = $gameActors.actor(params[0]); - if (actor && params[1] === 0) { - var name = actor.characterName(); - ImageManager.requestCharacter(name); - } - break; - - // Set Movement Route - case 205: - if(params[1]){ - params[1].list.forEach(function(command){ - var params = command.parameters; - if(command.code === Game_Character.ROUTE_CHANGE_IMAGE){ - ImageManager.requestCharacter(params[0]); - } - }); - } - break; - - // Show Animation, Show Battle Animation - case 212: case 337: - if(params[1]) { - var animation = $dataAnimations[params[1]]; - var name1 = animation.animation1Name; - var name2 = animation.animation2Name; - var hue1 = animation.animation1Hue; - var hue2 = animation.animation2Hue; - ImageManager.requestAnimation(name1, hue1); - ImageManager.requestAnimation(name2, hue2); - } - break; - - // Change Player Followers - case 216: - if (params[0] === 0) { - $gamePlayer.followers().forEach(function(follower) { - var name = follower.characterName(); - ImageManager.requestCharacter(name); - }); - } - break; - - // Show Picture - case 231: - ImageManager.requestPicture(params[1]); - break; - - // Change Tileset - case 282: - var tileset = $dataTilesets[params[0]]; - tileset.tilesetNames.forEach(function(tilesetName){ - ImageManager.requestTileset(tilesetName); - }); - break; - - // Change Battle Back - case 283: - if ($gameParty.inBattle()) { - ImageManager.requestBattleback1(params[0]); - ImageManager.requestBattleback2(params[1]); - } - break; - - // Change Parallax - case 284: - if (!$gameParty.inBattle()) { - ImageManager.requestParallax(params[0]); - } - break; - - // Change Actor Images - case 322: - ImageManager.requestCharacter(params[1]); - ImageManager.requestFace(params[3]); - ImageManager.requestSvActor(params[5]); - break; - - // Change Vehicle Image - case 323: - var vehicle = $gameMap.vehicle(params[0]); - if(vehicle){ - ImageManager.requestCharacter(params[1]); - } - break; - - // Enemy Transform - case 336: - var enemy = $dataEnemies[params[1]]; - var name = enemy.battlerName; - var hue = enemy.battlerHue; - if ($gameSystem.isSideView()) { - ImageManager.requestSvEnemy(name, hue); - } else { - ImageManager.requestEnemy(name, hue); - } - break; - case 356: - var args = params[0].split(" "); - var commandName = args.shift(); - Game_Interpreter.requestImagesByPluginCommand(commandName,args); - break; - - } -}; - -Game_Interpreter.requestImagesByChildEvent =function(command,commonList){ - var params =command.parameters; - var commonEvent = $dataCommonEvents[params[0]]; - if (commonEvent) { - if (!commonList) { - commonList = []; - } - if (!commonList.contains(params[0])) { - commonList.push(params[0]); - Game_Interpreter.requestImages(commonEvent.list, commonList); - } - } -}; - -Game_Interpreter.requestImages = function(list, commonList){ - if(!list) return; - var len = list.length; - for(var i=0; i