Skip to content

Commit 5d64b46

Browse files
author
liply
authored
Merge pull request #95 from rpgtkoolmv/1.4.1
1.4.1
2 parents 6c92470 + fcc5a47 commit 5d64b46

File tree

14 files changed

+20
-30
lines changed

14 files changed

+20
-30
lines changed

js/rpg_core/TouchInput.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,6 @@ TouchInput.isPressed = function() {
100100
return this._mousePressed || this._screenPressed;
101101
};
102102

103-
TouchInput.isMousePressed = function() {
104-
return this._mousePressed;
105-
};
106-
107103
/**
108104
* Checks whether the left mouse button or touchscreen is just pressed.
109105
*

js/rpg_core/Utils.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ Utils.RPGMAKER_NAME = 'MV';
2626
* @type String
2727
* @final
2828
*/
29-
Utils.RPGMAKER_VERSION = "1.3.5";
29+
Utils.RPGMAKER_VERSION = "1.4.1";
3030

31-
Utils.RPGMAKER_ENGINE = "community-1.1b";
31+
Utils.RPGMAKER_ENGINE = "community-1.2";
3232

3333
/**
3434
* Checks whether the option is in the query string.

js/rpg_core/_header.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
//=============================================================================
2-
// rpg_core.js v1.3.5 (community-1.1b)
2+
// rpg_core.js v1.4.1 (community-1.2)
33
//=============================================================================

js/rpg_managers/_header.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
//=============================================================================
2-
// rpg_managers.js v1.3.5 (community-1.1b)
2+
// rpg_managers.js v1.4.1 (community-1.2)
33
//=============================================================================

js/rpg_objects/Game_Actor.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -886,8 +886,8 @@ Game_Actor.prototype.testEscape = function(item) {
886886
};
887887

888888
Game_Actor.prototype.meetsUsableItemConditions = function(item) {
889-
if($gameParty.inBattle() && !BattleManager.canEscape() && this.testEscape(item)){
889+
if ($gameParty.inBattle() && !BattleManager.canEscape() && this.testEscape(item)) {
890890
return false;
891891
}
892-
return this.canMove() && this.isOccasionOk(item);
892+
return Game_BattlerBase.prototype.meetsUsableItemConditions.call(this, item);
893893
};

js/rpg_objects/Game_Map.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,11 @@ Game_Map.prototype.canvasToMapY = function(y) {
393393

394394
Game_Map.prototype.autoplay = function() {
395395
if ($dataMap.autoplayBgm) {
396-
AudioManager.playBgm($dataMap.bgm);
396+
if ($gamePlayer.isInVehicle()) {
397+
$gameSystem.saveWalkingBgm2();
398+
} else {
399+
AudioManager.playBgm($dataMap.bgm);
400+
}
397401
}
398402
if ($dataMap.autoplayBgs) {
399403
AudioManager.playBgs($dataMap.bgs);

js/rpg_objects/Game_Player.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ Game_Player.prototype.updateDashing = function() {
295295
return;
296296
}
297297
if (this.canMove() && !this.isInVehicle() && !$gameMap.isDashDisabled()) {
298-
this._dashing = $gameTemp.isMapTouched() ? $gameTemp.isDestinationValid() : this.isDashButtonPressed(); // || $gameTemp.isDestinationValid();
298+
this._dashing = this.isDashButtonPressed() || $gameTemp.isDestinationValid();
299299
} else {
300300
this._dashing = false;
301301
}

js/rpg_objects/Game_System.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,3 +208,7 @@ Game_System.prototype.replayWalkingBgm = function() {
208208
AudioManager.playBgm(this._walkingBgm);
209209
}
210210
};
211+
212+
Game_System.prototype.saveWalkingBgm2 = function() {
213+
this._walkingBgm = $dataMap.bgm;
214+
};

js/rpg_objects/Game_Temp.js

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ Game_Temp.prototype.initialize = function() {
1212
this._commonEventId = 0;
1313
this._destinationX = null;
1414
this._destinationY = null;
15-
this._isMapTouch = false;
1615
};
1716

1817
Game_Temp.prototype.isPlaytest = function() {
@@ -56,12 +55,3 @@ Game_Temp.prototype.destinationX = function() {
5655
Game_Temp.prototype.destinationY = function() {
5756
return this._destinationY;
5857
};
59-
60-
//
61-
Game_Temp.prototype.isMapTouched = function() {
62-
return this._isMapTouch;
63-
};
64-
65-
Game_Temp.prototype.setIsMapTouched = function(val) {
66-
this._isMapTouch = val;
67-
};

js/rpg_objects/_header.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
//=============================================================================
2-
// rpg_objects.js v1.3.5 (community-1.1b)
2+
// rpg_objects.js v1.4.1 (community-1.2)
33
//=============================================================================

0 commit comments

Comments
 (0)