Skip to content

Commit 86e7204

Browse files
authored
Merge pull request #42 from rpgtkoolmv/request_interpreter
preload image for Game_Interpreter
2 parents 0ec4bb3 + 062f61c commit 86e7204

File tree

2 files changed

+66
-19
lines changed

2 files changed

+66
-19
lines changed

js/rpg_managers/ImageManager.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -278,10 +278,14 @@ ImageManager.requestTitle2 = function(filename, hue) {
278278
};
279279

280280
ImageManager.requestBitmap = function(folder, filename, hue, smooth) {
281-
var path = folder + encodeURIComponent(filename) + '.png';
282-
var bitmap = ImageManager.requestNormalBitmap(path, hue || 0);
283-
bitmap.smooth = smooth;
284-
return bitmap;
281+
if (filename) {
282+
var path = folder + encodeURIComponent(filename) + '.png';
283+
var bitmap = this.requestNormalBitmap(path, hue || 0);
284+
bitmap.smooth = smooth;
285+
return bitmap;
286+
} else {
287+
return this.loadEmptyBitmap();
288+
}
285289
};
286290

287291
ImageManager.requestNormalBitmap = function(path, hue){

js/rpg_objects/Game_Interpreter.js

Lines changed: 58 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1746,11 +1746,22 @@ Game_Interpreter.requestImages = function(list){
17461746
switch(command.code){
17471747
// Show Text
17481748
case 101:
1749-
if(params[0]) ImageManager.requestFace(params[0]);
1749+
ImageManager.requestFace(params[0]);
17501750
break;
17511751

1752-
//Change Party Member
1752+
// Common Event
1753+
case 117:
1754+
var commonEvent = $dataCommonEvents[params[0]];
1755+
if (commonEvent) this.requestImages(commonEvent.list);
1756+
break;
1757+
1758+
// Change Party Member
17531759
case 129:
1760+
var actor = $gameActors.actor(params[0]);
1761+
if (actor && params[1] === 0) {
1762+
var name = actor.characterName();
1763+
ImageManager.requestCharacter(name);
1764+
}
17541765
break;
17551766

17561767
// Set Movement Route
@@ -1765,50 +1776,82 @@ Game_Interpreter.requestImages = function(list){
17651776
}
17661777
break;
17671778

1768-
//Show Animation
1769-
case 212:
1779+
// Show Animation, Show Battle Animation
1780+
case 212: case 337:
1781+
if(params[1]) {
1782+
var animation = $dataAnimations[params[1]];
1783+
var name1 = animation.animation1Name;
1784+
var name2 = animation.animation2Name;
1785+
var hue1 = animation.animation1Hue;
1786+
var hue2 = animation.animation2Hue;
1787+
ImageManager.requestAnimation(name1, hue1);
1788+
ImageManager.requestAnimation(name2, hue2);
1789+
}
1790+
break;
1791+
1792+
// Change Player Followers
1793+
case 216:
1794+
if (params[0] === 0) {
1795+
$gamePlayer.followers().forEach(function(follower) {
1796+
var name = follower.characterName();
1797+
ImageManager.requestCharacter(name);
1798+
});
1799+
}
17701800
break;
17711801

17721802
// Show Picture
17731803
case 231:
1774-
if(params[1]) ImageManager.requestPicture(params[1]);
1804+
ImageManager.requestPicture(params[1]);
17751805
break;
17761806

17771807
// Change Tileset
17781808
case 282:
17791809
var tileset = $dataTilesets[params[0]];
17801810
tileset.tilesetNames.forEach(function(tilesetName){
1781-
if(tilesetName) ImageManager.requestTileset(tilesetName);
1811+
ImageManager.requestTileset(tilesetName);
17821812
});
17831813
break;
17841814

1785-
// Chage Battle Back
1815+
// Change Battle Back
17861816
case 283:
1817+
if ($gameParty.inBattle()) {
1818+
ImageManager.requestBattleback1(params[0]);
1819+
ImageManager.requestBattleback2(params[1]);
1820+
}
17871821
break;
17881822

17891823
// Change Parallax
17901824
case 284:
1825+
if (!$gameParty.inBattle()) {
1826+
ImageManager.requestParallax(params[0]);
1827+
}
17911828
break;
17921829

1793-
17941830
// Change Actor Images
17951831
case 322:
1796-
if(params[1]) ImageManager.requestCharacter(params[1]);
1797-
if(params[3]) ImageManager.requestFace(params[3]);
1798-
if(params[5]) ImageManager.requestEnemy(params[5]);
1832+
ImageManager.requestCharacter(params[1]);
1833+
ImageManager.requestFace(params[3]);
1834+
ImageManager.requestSvActor(params[5]);
17991835
break;
18001836

18011837
// Change Vehicle Image
18021838
case 323:
18031839
var vehicle = $gameMap.vehicle(params[0]);
1804-
if(vehicle && params[1]){
1840+
if(vehicle){
18051841
ImageManager.requestCharacter(params[1]);
18061842
}
18071843
break;
18081844

1809-
// Show Battle Animation
1810-
case 337:
1811-
if(params[1]) ImageManager.requestAnimation(params[1]);
1845+
// Enemy Transform
1846+
case 336:
1847+
var enemy = $dataEnemies[params[1]];
1848+
var name = enemy.battlerName;
1849+
var hue = enemy.battlerHue;
1850+
if ($gameSystem.isSideView()) {
1851+
ImageManager.requestSvEnemy(name, hue);
1852+
} else {
1853+
ImageManager.requestEnemy(name, hue);
1854+
}
18121855
break;
18131856
}
18141857
});

0 commit comments

Comments
 (0)