diff --git a/IsAllItemHave/IsAllItemHave.js b/HasAllItems/HasAllItems.js similarity index 82% rename from IsAllItemHave/IsAllItemHave.js rename to HasAllItems/HasAllItems.js index a2748f8..ddbc364 100644 --- a/IsAllItemHave/IsAllItemHave.js +++ b/HasAllItems/HasAllItems.js @@ -1,5 +1,5 @@ //============================================================================= -// IsAllItemHave.js +// HasAllItems.js //============================================================================= /*: @@ -12,12 +12,12 @@ * @help * * Plugin Command: - * Command IsAllItemHave SwitchId ItemNameA, ItemNameB, ... + * Command HasAllItems SwitchId ItemNameA, ItemNameB, ... * SwitchId -> check result. * ItemNameA -> check ItemName * * Script: - * $gameParty.IsAllItemHave(['ItemNameA', 'ItemNameB']); + * $gameParty.HasAllItems(['ItemNameA', 'ItemNameB']); * return -> true (have item) * -> false (not have item) * @@ -31,12 +31,12 @@ * @help * * Plugin Command: - * Command IsAllItemHave SwitchId ItemNameA, ItemNameB, ... + * Command HasAllItems SwitchId ItemNameA, ItemNameB, ... * SwitchId -> 持っているかどうかの結果を返すスイッチID * ItemNameA -> 調べるアイテム名 * * Script: - * $gameParty.IsAllItemHave(['ItemNameA', 'ItemNameB']); + * $gameParty.HasAllItems(['ItemNameA', 'ItemNameB']); * return -> true (アイテムを持っている場合) * -> false (アイテムを持っていない場合) * @@ -51,22 +51,22 @@ */ var Imported = Imported || {}; -Imported.IsAllItemHave = {}; +Imported.HasAllItems = {}; (function() { 'use strict'; - var parameters = PluginManager.parameters('IsAllItemHave'); + var parameters = PluginManager.parameters('HasAllItems'); var _Game_Interpreter_pluginCommand = Game_Interpreter.prototype.pluginCommand; Game_Interpreter.prototype.pluginCommand = function(command, args) { _Game_Interpreter_pluginCommand.call(this, command, args); - if (command === 'isAllItemHave') { + if (command === 'hasAllItems') { if (/^[0-9]+$/.test(args[0])) { var targets = args.filter(function(i){return /^[^0-9]+$/.test(i);}); - var result = $gameParty.isAllItemHave(targets); + var result = $gameParty.hasAllItems(targets); if (result) { $gameSwitches.setValue(Number(args[0]), true); } @@ -85,7 +85,7 @@ Imported.IsAllItemHave = {}; return targets.filter(function(i){return isValidName(i);}).length !== 0; }; - Game_Party.prototype.isAllItemHave = function(targets) { + Game_Party.prototype.hasAllItems = function(targets) { if (!isValidTargets(targets)) { return false; } @@ -106,8 +106,8 @@ Imported.IsAllItemHave = {}; // クロージャの関数をテスト用にエクスポート try { - if (should) { - exports.isAllItemHave = Game_Party.prototype.isAllItemHave; + if (isTest) { + exports.hasAllItems = Game_Party.prototype.hasAllItems; exports.pluginCommand = Game_Interpreter.prototype.pluginCommand; exports.isValidName = isValidName; exports.isValidTargets = isValidTargets; diff --git a/IsAllItemHave/README.md b/HasAllItems/README.md similarity index 76% rename from IsAllItemHave/README.md rename to HasAllItems/README.md index 92fbafc..53ff120 100644 --- a/IsAllItemHave/README.md +++ b/HasAllItems/README.md @@ -8,9 +8,9 @@ - プラグインコマンドの場合 ``` -IsAllItemHave スイッチID アイテム名1 アイテム名2 アイテム名3 ... +HasAllItems スイッチID アイテム名1 アイテム名2 アイテム名3 ... ``` -- コマンド名は「IsAllItemHave」です。 +- コマンド名は「HasAllItems」です。 - スイッチIDは数字で入力して下さい。そのIDのスイッチに結果が入ります。(ON:持ってる/OFF:持ってない) - アイテム名は確認したいアイテム名を入れます。いくつでも入れられます。 - 注意事項:プラグインコマンドは半角スペースで区切って下さい。 @@ -18,13 +18,13 @@ IsAllItemHave スイッチID アイテム名1 アイテム名2 アイテム - スクリプトコマンドの場合 ```javascript -$gameParty.isAllItemHave(['アイテム名1', 'アイテム名2']); +$gameParty.hasAllItems(['アイテム名1', 'アイテム名2']); ``` - 結果は、アイテムを持っている場合は true 持ってない場合は false が返ります。 -詳しい処理は IsAllItemHave.js を見て下さい。 +詳しい処理は HasAllItems.js を見て下さい。 @@ -32,6 +32,9 @@ $gameParty.isAllItemHave(['アイテム名1', 'アイテム名2']); version 0.0.1 - ツクった! +version 0.0.2 +- 名前変更。あと変数名とか。 + ## Author saronpasu diff --git a/IsAllItemHave/test/IsAllItemHave.spec.js b/HasAllItems/test/HasAllItems.spec.js similarity index 79% rename from IsAllItemHave/test/IsAllItemHave.spec.js rename to HasAllItems/test/HasAllItems.spec.js index 423e3c3..7a59d21 100644 --- a/IsAllItemHave/test/IsAllItemHave.spec.js +++ b/HasAllItems/test/HasAllItems.spec.js @@ -1,13 +1,15 @@ +isTest = true; + should = require('chai').should(); sinon = require('sinon'); -describe('IsAllItemHave', function() { +describe('HasAllItems', function() { // initialize before(function() { // define mock PluginManager PluginManager = {}; PluginManager.parameters = sinon.stub() - .withArgs('IsAllItemHave').returns({ + .withArgs('HasAllItems').returns({ // PluginParam: 'default' }); // define mock Game_Interpreter @@ -20,13 +22,13 @@ describe('IsAllItemHave', function() { Game_Party.prototype.members = function() {}; // import Test functions. - IsAllItemHave = require('../IsAllItemHave.js'); - isAllItemHave = IsAllItemHave.isAllItemHave; - Game_Party.prototype.isAllItemHave = isAllItemHave; - pluginCommand = IsAllItemHave.pluginCommand; + HasAllItems = require('../HasAllItems.js'); + hasAllItems = HasAllItems.hasAllItems; + Game_Party.prototype.hasAllItems = hasAllItems; + pluginCommand = HasAllItems.pluginCommand; Game_Interpreter.prototype.pluginCommand = pluginCommand; - isValidName = IsAllItemHave.isValidName; - isValidTargets = IsAllItemHave.isValidTargets; + isValidName = HasAllItems.isValidName; + isValidTargets = HasAllItems.isValidTargets; }); describe('validator', function() { @@ -76,15 +78,15 @@ describe('IsAllItemHave', function() { }); it('target find', function() { - gameParty.isAllItemHave(['targetName']).should.be.true; + gameParty.hasAllItems(['targetName']).should.be.true; }); it('two target find', function() { - gameParty.isAllItemHave(['targetName', 'otherTarget']).should.be.false; + gameParty.hasAllItems(['targetName', 'otherTarget']).should.be.false; }); it('target not found', function() { - gameParty.isAllItemHave(['notMatchName']).should.be.false; + gameParty.hasAllItems(['notMatchName']).should.be.false; }); }); @@ -100,15 +102,15 @@ describe('IsAllItemHave', function() { }); it('one target find', function() { - gameParty.isAllItemHave(['targetName1', 'notMatchName2']).should.be.false; + gameParty.hasAllItems(['targetName1', 'notMatchName2']).should.be.false; }); it('two targets not found', function() { - gameParty.isAllItemHave(['targetName1', 'targetName2']).should.be.true; + gameParty.hasAllItems(['targetName1', 'targetName2']).should.be.true; }); it('target not found', function() { - gameParty.isAllItemHave(['notMatchName1', 'notMatchName2']).should.be.false; + gameParty.hasAllItems(['notMatchName1', 'notMatchName2']).should.be.false; }); }); @@ -134,15 +136,15 @@ describe('IsAllItemHave', function() { }); it('target find', function() { - gameParty.isAllItemHave(['targetName']).should.be.true; + gameParty.hasAllItems(['targetName']).should.be.true; }); it('two targets not found', function() { - gameParty.isAllItemHave(['targetName', 'otherTarget']).should.be.false; + gameParty.hasAllItems(['targetName', 'otherTarget']).should.be.false; }); it('target not found', function() { - gameParty.isAllItemHave(['notMatchName']).should.be.false; + gameParty.hasAllItems(['notMatchName']).should.be.false; }); }); @@ -168,20 +170,20 @@ describe('IsAllItemHave', function() { }); it('one target find', function() { - gameParty.isAllItemHave(['targetName1', 'notMatchName2']).should.be.false; + gameParty.hasAllItems(['targetName1', 'notMatchName2']).should.be.false; }); it('two target find', function() { - gameParty.isAllItemHave(['targetName1', 'targetName2']).should.be.true; + gameParty.hasAllItems(['targetName1', 'targetName2']).should.be.true; }); it('target not found', function() { - gameParty.isAllItemHave(['notMatchName1', 'notMatchName2']).should.be.false; + gameParty.hasAllItems(['notMatchName1', 'notMatchName2']).should.be.false; }); }); it('Party not have target item and equips', function() { - gameParty.isAllItemHave(['targetName']).should.be.false; + gameParty.hasAllItems(['targetName']).should.be.false; }); describe('call from PluginCommand', function() { @@ -203,16 +205,16 @@ describe('IsAllItemHave', function() { sinon.stub($gameParty, 'allItems').returns(items); sinon.stub($gameParty, 'members').returns([actor1, actor2]); - spy = sinon.spy($gameParty, 'isAllItemHave'); + spy = sinon.spy($gameParty, 'hasAllItems'); }); it('valid argments', function() { - gameInterpreter.pluginCommand('isAllItemHave', ['1', 'foo', 'bar']); + gameInterpreter.pluginCommand('hasAllItems', ['1', 'foo', 'bar']); spy.called.should.be.true; }); it('invalid argments', function() { - gameInterpreter.pluginCommand('isAllItemHave', ['aaa', 'foo', 'bar']); + gameInterpreter.pluginCommand('hasAllItems', ['aaa', 'foo', 'bar']); spy.called.should.be.false; }); diff --git a/IsAnyItemHave/IsAnyItemHave.js b/HasAnyItems/HasAnyItems.js similarity index 90% rename from IsAnyItemHave/IsAnyItemHave.js rename to HasAnyItems/HasAnyItems.js index d3af2df..1788169 100644 --- a/IsAnyItemHave/IsAnyItemHave.js +++ b/HasAnyItems/HasAnyItems.js @@ -51,22 +51,22 @@ */ var Imported = Imported || {}; -Imported.IsAnyItemHave = {}; +Imported.HasAnyItems = {}; (function() { 'use strict'; - var parameters = PluginManager.parameters('IsAnyItemHave'); + var parameters = PluginManager.parameters('HasAnyItems'); var _Game_Interpreter_pluginCommand = Game_Interpreter.prototype.pluginCommand; Game_Interpreter.prototype.pluginCommand = function(command, args) { _Game_Interpreter_pluginCommand.call(this, command, args); - if (command === 'isAnyItemHave') { + if (command === 'hasAnyItems') { if (/^[0-9]+$/.test(args[0])) { var targets = args.filter(function(i){return /^[^0-9]+$/.test(i);}); - var result = $gameParty.isAnyItemHave(targets); + var result = $gameParty.hasAnyItems(targets); if (result) { $gameSwitches.setValue(Number(args[0]), true); } @@ -85,7 +85,7 @@ Imported.IsAnyItemHave = {}; return targets.filter(function(i){return isValidName(i);}).length !== 0; }; - Game_Party.prototype.isAnyItemHave = function(targets) { + Game_Party.prototype.hasAnyItems = function(targets) { if (!isValidTargets(targets)) { return false; } @@ -106,8 +106,8 @@ Imported.IsAnyItemHave = {}; // クロージャの関数をテスト用にエクスポート try { - if (should) { - exports.isAnyItemHave = Game_Party.prototype.isAnyItemHave; + if (isTest) { + exports.hasAnyItems = Game_Party.prototype.hasAnyItems; exports.pluginCommand = Game_Interpreter.prototype.pluginCommand; exports.isValidName = isValidName; exports.isValidTargets = isValidTargets; diff --git a/IsAnyItemHave/README.md b/HasAnyItems/README.md similarity index 76% rename from IsAnyItemHave/README.md rename to HasAnyItems/README.md index 90a560a..6350c47 100644 --- a/IsAnyItemHave/README.md +++ b/HasAnyItems/README.md @@ -8,9 +8,9 @@ - プラグインコマンドの場合 ``` -IsAnyItemHave スイッチID アイテム名1 アイテム名2 アイテム名3 ... +HasAnyItems スイッチID アイテム名1 アイテム名2 アイテム名3 ... ``` -- コマンド名は「IsAnyItemHave」です。 +- コマンド名は「HasAnyItems」です。 - スイッチIDは数字で入力して下さい。そのIDのスイッチに結果が入ります。(ON:持ってる/OFF:持ってない) - アイテム名は確認したいアイテム名を入れます。いくつでも入れられます。 - 注意事項:プラグインコマンドは半角スペースで区切って下さい。 @@ -18,13 +18,13 @@ IsAnyItemHave スイッチID アイテム名1 アイテム名2 アイテム - スクリプトコマンドの場合 ```javascript -$gameParty.isAnyItemHave(['アイテム名1', 'アイテム名2']); +$gameParty.HasAnyItems(['アイテム名1', 'アイテム名2']); ``` - 結果は、アイテムを持っている場合は true 持ってない場合は false が返ります。 -詳しい処理は IsAnyItemHave.js を見て下さい。 +詳しい処理は HasAnyItems.js を見て下さい。 @@ -32,6 +32,9 @@ $gameParty.isAnyItemHave(['アイテム名1', 'アイテム名2']); version 0.0.1 - ツクった! +version 0.0.2 +- 名前変更。あと変数名とか。 + ## Author saronpasu diff --git a/IsAnyItemHave/test/IsAnyItemHave.spec.js b/HasAnyItems/test/HasAnyItems.spec.js similarity index 80% rename from IsAnyItemHave/test/IsAnyItemHave.spec.js rename to HasAnyItems/test/HasAnyItems.spec.js index 5a89b84..b41371c 100644 --- a/IsAnyItemHave/test/IsAnyItemHave.spec.js +++ b/HasAnyItems/test/HasAnyItems.spec.js @@ -1,13 +1,15 @@ +isTest = true; + should = require('chai').should(); sinon = require('sinon'); -describe('IsAnyItemHave', function() { +describe('HasAnyItems', function() { // initialize before(function() { // define mock PluginManager PluginManager = {}; PluginManager.parameters = sinon.stub() - .withArgs('IsAnyItemHave').returns({ + .withArgs('HasAnyItems').returns({ // PluginParam: 'default' }); // define mock Game_Interpreter @@ -20,13 +22,13 @@ describe('IsAnyItemHave', function() { Game_Party.prototype.members = function() {}; // import Test functions. - IsAnyItemHave = require('../IsAnyItemHave.js'); - isAnyItemHave = IsAnyItemHave.isAnyItemHave; - Game_Party.prototype.isAnyItemHave = isAnyItemHave; - pluginCommand = IsAnyItemHave.pluginCommand; + HasAnyItems = require('../HasAnyItems.js'); + hasAnyItems = HasAnyItems.hasAnyItems; + Game_Party.prototype.hasAnyItems = hasAnyItems; + pluginCommand = HasAnyItems.pluginCommand; Game_Interpreter.prototype.pluginCommand = pluginCommand; - isValidName = IsAnyItemHave.isValidName; - isValidTargets = IsAnyItemHave.isValidTargets; + isValidName = HasAnyItems.isValidName; + isValidTargets = HasAnyItems.isValidTargets; }); describe('validator', function() { @@ -76,11 +78,11 @@ describe('IsAnyItemHave', function() { }); it('target find', function() { - gameParty.isAnyItemHave(['targetName']).should.be.true; + gameParty.hasAnyItems(['targetName']).should.be.true; }); it('target not found', function() { - gameParty.isAnyItemHave(['notMatchName']).should.be.false; + gameParty.hasAnyItems(['notMatchName']).should.be.false; }); }); @@ -96,15 +98,15 @@ describe('IsAnyItemHave', function() { }); it('one target find', function() { - gameParty.isAnyItemHave(['targetName1', 'notMatchName2']).should.be.true; + gameParty.hasAnyItems(['targetName1', 'notMatchName2']).should.be.true; }); it('two target find', function() { - gameParty.isAnyItemHave(['targetName1', 'targetName2']).should.be.true; + gameParty.hasAnyItems(['targetName1', 'targetName2']).should.be.true; }); it('target not found', function() { - gameParty.isAnyItemHave(['notMatchName1', 'notMatchName2']).should.be.false; + gameParty.hasAnyItems(['notMatchName1', 'notMatchName2']).should.be.false; }); }); @@ -130,11 +132,11 @@ describe('IsAnyItemHave', function() { }); it('target find', function() { - gameParty.isAnyItemHave(['targetName']).should.be.true; + gameParty.hasAnyItems(['targetName']).should.be.true; }); it('target not found', function() { - gameParty.isAnyItemHave(['notMatchName']).should.be.false; + gameParty.hasAnyItems(['notMatchName']).should.be.false; }); }); @@ -160,20 +162,20 @@ describe('IsAnyItemHave', function() { }); it('one target find', function() { - gameParty.isAnyItemHave(['targetName1', 'notMatchName2']).should.be.true; + gameParty.hasAnyItems(['targetName1', 'notMatchName2']).should.be.true; }); it('two target find', function() { - gameParty.isAnyItemHave(['targetName1', 'targetName2']).should.be.true; + gameParty.hasAnyItems(['targetName1', 'targetName2']).should.be.true; }); it('target not found', function() { - gameParty.isAnyItemHave(['notMatchName1', 'notMatchName2']).should.be.false; + gameParty.hasAnyItems(['notMatchName1', 'notMatchName2']).should.be.false; }); }); it('Party not have target item and equips', function() { - gameParty.isAnyItemHave(['targetName']).should.be.false; + gameParty.hasAnyItems(['targetName']).should.be.false; }); describe('call from PluginCommand', function() { @@ -195,16 +197,16 @@ describe('IsAnyItemHave', function() { sinon.stub($gameParty, 'allItems').returns(items); sinon.stub($gameParty, 'members').returns([actor1, actor2]); - spy = sinon.spy($gameParty, 'isAnyItemHave'); + spy = sinon.spy($gameParty, 'hasAnyItems'); }); it('valid argments', function() { - gameInterpreter.pluginCommand('isAnyItemHave', ['1', 'foo', 'bar']); + gameInterpreter.pluginCommand('hasAnyItems', ['1', 'foo', 'bar']); spy.called.should.be.true; }); it('invalid argments', function() { - gameInterpreter.pluginCommand('isAnyItemHave', ['aaa', 'foo', 'bar']); + gameInterpreter.pluginCommand('hasAnyItems', ['aaa', 'foo', 'bar']); spy.called.should.be.false; }); diff --git a/MyTemplate/MyTemplate.js b/MyTemplate/MyTemplate.js index af0f33a..cab32f7 100644 --- a/MyTemplate/MyTemplate.js +++ b/MyTemplate/MyTemplate.js @@ -68,7 +68,7 @@ Imported.PluginName = {}; // クロージャの関数をテスト用にエクスポート try { - if (should) { + if (isTest) { // exports.MyTemplate = LocalFunction; } } diff --git a/MyTemplate/test/MyTemplate.spec.js b/MyTemplate/test/MyTemplate.spec.js index 2bfeeee..d51e3dd 100644 --- a/MyTemplate/test/MyTemplate.spec.js +++ b/MyTemplate/test/MyTemplate.spec.js @@ -1,3 +1,5 @@ +isTest = true; + should = require('chai').should(); sinon = require('sinon');