From 87eaa1b9721ee98b619909b6f84ab9f72e497070 Mon Sep 17 00:00:00 2001 From: SAKATA Sinji Date: Sun, 29 Mar 2020 12:56:28 +0900 Subject: [PATCH] Fix name of DungeonsAndDragons --- CHANGELOG.md | 3 +++ src/configBcDice.rb | 2 +- ...geonsAndDoragons.rb => DungeonsAndDragons.rb} | 4 ++-- src/diceBot/Pathfinder.rb | 4 ++-- ...onsAndDoragons.txt => DungeonsAndDragons.txt} | 16 ++++++++-------- src/test/testDiceBotLoaders.rb | 4 ++-- 6 files changed, 18 insertions(+), 15 deletions(-) rename src/diceBot/{DungeonsAndDoragons.rb => DungeonsAndDragons.rb} (86%) rename src/test/data/{DungeonsAndDoragons.txt => DungeonsAndDragons.txt} (52%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a68d7ce8..52c80a891 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # ChangeLog +### Unreleased +- ダンジョンズ&ドラゴンズのIDを修正 (#143) + ### Ver2.04.00 2020/03/26 - ダイスボットに「獸ノ森」を追加。ゆいこさんありがとうっ! (#124) - ダイスボットに「ADVANCED FIGHTING FANTASY 2nd Edition」を追加。opparcoさんありがとうっ! (#135) diff --git a/src/configBcDice.rb b/src/configBcDice.rb index ba45d77fb..6ceab57b1 100644 --- a/src/configBcDice.rb +++ b/src/configBcDice.rb @@ -78,7 +78,7 @@ DoubleCross Dracurouge Dracurouge:Korean - DungeonsAndDoragons + DungeonsAndDragons EarthDawn EarthDawn3 EarthDawn4 diff --git a/src/diceBot/DungeonsAndDoragons.rb b/src/diceBot/DungeonsAndDragons.rb similarity index 86% rename from src/diceBot/DungeonsAndDoragons.rb rename to src/diceBot/DungeonsAndDragons.rb index d5795c7fe..b3ca3d715 100644 --- a/src/diceBot/DungeonsAndDoragons.rb +++ b/src/diceBot/DungeonsAndDragons.rb @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- # frozen_string_literal: true -class DungeonsAndDoragons < DiceBot +class DungeonsAndDragons < DiceBot # ゲームシステムの識別子 - ID = 'DungeonsAndDoragons' + ID = 'DungeonsAndDragons' # ゲームシステム名 NAME = 'ダンジョンズ&ドラゴンズ' diff --git a/src/diceBot/Pathfinder.rb b/src/diceBot/Pathfinder.rb index f6920078d..6c8abda4b 100644 --- a/src/diceBot/Pathfinder.rb +++ b/src/diceBot/Pathfinder.rb @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- # frozen_string_literal: true -require 'diceBot/DungeonsAndDoragons' +require 'diceBot/DungeonsAndDragons' -class Pathfinder < DungeonsAndDoragons +class Pathfinder < DungeonsAndDragons # ゲームシステムの識別子 ID = 'Pathfinder' diff --git a/src/test/data/DungeonsAndDoragons.txt b/src/test/data/DungeonsAndDragons.txt similarity index 52% rename from src/test/data/DungeonsAndDoragons.txt rename to src/test/data/DungeonsAndDragons.txt index 5a10c442a..add0dcf46 100644 --- a/src/test/data/DungeonsAndDoragons.txt +++ b/src/test/data/DungeonsAndDragons.txt @@ -1,47 +1,47 @@ input: 1D4>=3 output: -DungeonsAndDoragons : (1D4>=3) > 3 > 成功 +DungeonsAndDragons : (1D4>=3) > 3 > 成功 rand:3/4 ============================ input: 1D6>=5 output: -DungeonsAndDoragons : (1D6>=5) > 5 > 成功 +DungeonsAndDragons : (1D6>=5) > 5 > 成功 rand:5/6 ============================ input: 1D8>=7 output: -DungeonsAndDoragons : (1D8>=7) > 7 > 成功 +DungeonsAndDragons : (1D8>=7) > 7 > 成功 rand:7/8 ============================ input: 1D10>=9 output: -DungeonsAndDoragons : (1D10>=9) > 9 > 成功 +DungeonsAndDragons : (1D10>=9) > 9 > 成功 rand:9/10 ============================ input: 1D12>=11 output: -DungeonsAndDoragons : (1D12>=11) > 11 > 成功 +DungeonsAndDragons : (1D12>=11) > 11 > 成功 rand:11/12 ============================ input: 1D20>=19 output: -DungeonsAndDoragons : (1D20>=19) > 19 > 成功 +DungeonsAndDragons : (1D20>=19) > 19 > 成功 rand:19/20 ============================ input: (1+2)D10+3>=12 output: -DungeonsAndDoragons : (3D10+3>=12) > 12[3,4,5]+3 > 15 > 成功 +DungeonsAndDragons : (3D10+3>=12) > 12[3,4,5]+3 > 15 > 成功 rand:3/10,4/10,5/10 ============================ input: S1D10>=10 output: -DungeonsAndDoragons : (1D10>=10) > 9 > 失敗###secret dice### +DungeonsAndDragons : (1D10>=10) > 9 > 失敗###secret dice### rand:9/10 diff --git a/src/test/testDiceBotLoaders.rb b/src/test/testDiceBotLoaders.rb index 6430dc344..38ff8dcc9 100644 --- a/src/test/testDiceBotLoaders.rb +++ b/src/test/testDiceBotLoaders.rb @@ -645,8 +645,8 @@ def test_Dracurouge_Korean assertDiceBotWithoutLoader('Dracurouge:Korean', 'Dracurouge_Korean') end - def test_DungeonsAndDoragons - assertDiceBotWithoutLoader('DungeonsAndDoragons') + def test_DungeonsAndDragons + assertDiceBotWithoutLoader('DungeonsAndDragons') end def test_EtrianOdysseySRS