Skip to content

Commit

Permalink
Merge c79bf5a into 886851b
Browse files Browse the repository at this point in the history
  • Loading branch information
koi-chan committed Feb 16, 2020
2 parents 886851b + c79bf5a commit f09df78
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 21 deletions.
42 changes: 22 additions & 20 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ GEM
buftok (0.2.0)
charlock_holmes (0.7.7)
coderay (1.1.2)
concurrent-ruby (1.1.5)
concurrent-ruby (1.1.6)
coveralls (0.8.23)
json (>= 1.8, < 3)
simplecov (~> 0.16.1)
Expand All @@ -38,7 +38,7 @@ GEM
unf (>= 0.0.5, < 1.0.0)
equalizer (0.0.11)
event_emitter (0.2.6)
ffi (1.11.3)
ffi (1.12.2)
gdbm (2.1.0)
grinch (1.0.1)
guess_html_encoding (0.0.11)
Expand All @@ -51,38 +51,38 @@ GEM
http-accept (1.7.0)
http-cookie (1.0.3)
domain_name (~> 0.5)
http-form_data (2.1.1)
http-form_data (2.2.0)
http_parser.rb (0.6.0)
i18n (1.7.0)
i18n (1.8.2)
concurrent-ruby (~> 1.0)
jaro_winkler (1.5.4)
json (2.3.0)
lumberjack (1.0.13)
lumberjack (1.2.4)
mail (2.7.1)
mini_mime (>= 0.1.1)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
method_source (0.9.2)
mime-types (3.3)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2019.1009)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.13.0)
minitest (5.14.0)
multipart-post (2.1.1)
naught (1.1.0)
netrc (0.11.0)
nokogiri (1.10.7)
nokogiri (1.10.8)
mini_portile2 (~> 2.4.0)
opus-ruby (1.0.1)
ffi
parallel (1.19.1)
parser (2.6.5.0)
parser (2.7.0.2)
ast (~> 2.4.0)
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
public_suffix (4.0.1)
public_suffix (4.0.3)
rainbow (3.0.0)
rake (13.0.1)
rbnacl (3.4.0)
Expand All @@ -96,19 +96,19 @@ GEM
rspec-core (~> 3.9.0)
rspec-expectations (~> 3.9.0)
rspec-mocks (~> 3.9.0)
rspec-core (3.9.0)
rspec-support (~> 3.9.0)
rspec-core (3.9.1)
rspec-support (~> 3.9.1)
rspec-expectations (3.9.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-mocks (3.9.0)
rspec-mocks (3.9.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-support (3.9.0)
rubocop (0.78.0)
rspec-support (3.9.2)
rubocop (0.79.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.6)
parser (>= 2.7.0.1)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.7)
Expand All @@ -120,12 +120,14 @@ GEM
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
sync (0.5.0)
sysexits (1.2.0)
term-ansicolor (1.7.1)
tins (~> 1.0)
thor (1.0.1)
thread_safe (0.3.6)
tins (1.22.2)
tins (1.24.1)
sync
twitter (6.2.0)
addressable (~> 2.3)
buftok (~> 0.2.0)
Expand All @@ -142,16 +144,16 @@ GEM
unf (0.1.4)
unf_ext
unf_ext (0.0.7.6)
unicode-display_width (1.6.0)
webmock (3.7.6)
unicode-display_width (1.6.1)
webmock (3.8.2)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
websocket (1.2.8)
websocket-client-simple (0.3.0)
event_emitter
websocket
yard (0.9.20)
yard (0.9.24)
zeitwerk (2.2.2)

PLATFORMS
Expand Down
2 changes: 1 addition & 1 deletion vendor/BCDice
Submodule BCDice updated 93 files
+2 −0 .gitignore
+1 −0 .travis.yml
+17 −0 CHANGELOG.md
+5 −5 README.md
+7 −5 src/.gitignore
+5 −1 src/.rubocop_todo.yml
+3 −4 src/CardTrader.rb
+1 −1 src/CountHolder.rb
+2 −0 src/Gemfile
+17 −1 src/Rakefile
+5 −20 src/bcdiceCore.rb
+1 −1 src/configBcDice.rb
+1 −1 src/dice/AddDice.rb
+1 −5 src/dice/RerollDice.rb
+1 −1 src/diceBot/Airgetlamh.rb
+1 −1 src/diceBot/Alsetto.rb
+10 −28 src/diceBot/Alshard.rb
+1 −1 src/diceBot/Avandner.rb
+2 −2 src/diceBot/BadLife.rb
+1 −3 src/diceBot/BeastBindTrinity.rb
+1 −1 src/diceBot/BlindMythos.rb
+1 −1 src/diceBot/Chill3.rb
+0 −1 src/diceBot/ColossalHunter.rb
+292 −289 src/diceBot/Cthulhu7th.rb
+3 −3 src/diceBot/DarkBlaze.rb
+2 −2 src/diceBot/DarkSouls.rb
+1 −1 src/diceBot/DetatokoSaga.rb
+1 −1 src/diceBot/DetatokoSaga_Korean.rb
+19 −8 src/diceBot/DiceBot.rb
+2 −0 src/diceBot/DiceBotLoaderList.rb
+2 −2 src/diceBot/DiceOfTheDead.rb
+259 −164 src/diceBot/DoubleCross.rb
+2 −2 src/diceBot/Dracurouge_Korean.rb
+3 −5 src/diceBot/EarthDawn.rb
+2 −2 src/diceBot/EarthDawn3.rb
+2 −2 src/diceBot/EarthDawn4.rb
+4 −4 src/diceBot/Elysion.rb
+3 −3 src/diceBot/EmbryoMachine.rb
+10 −30 src/diceBot/EtrianOdysseySRS.rb
+12 −28 src/diceBot/FullMetalPanic.rb
+2 −2 src/diceBot/Gurps.rb
+6 −6 src/diceBot/GurpsFW.rb
+1 −1 src/diceBot/Illusio.rb
+1 −1 src/diceBot/JamesBond.rb
+1 −1 src/diceBot/LiveraDoll.rb
+2 −2 src/diceBot/LogHorizon_Korean.rb
+25 −0 src/diceBot/LostRecord.rb
+1 −1 src/diceBot/MeikyuDays.rb
+8 −8 src/diceBot/MeikyuKingdom.rb
+9 −27 src/diceBot/MetallicGuadian.rb
+1 −1 src/diceBot/Nechronica.rb
+1 −1 src/diceBot/Nechronica_Korean.rb
+2 −2 src/diceBot/NightmareHunterDeep.rb
+73 −7 src/diceBot/NinjaSlayer.rb
+1 −1 src/diceBot/OrgaRain.rb
+316 −0 src/diceBot/Paradiso.rb
+180 −0 src/diceBot/PulpCthulhu.rb
+2 −2 src/diceBot/Raisondetre.rb
+307 −40 src/diceBot/SRS.rb
+2 −2 src/diceBot/Satasupe.rb
+1 −1 src/diceBot/ShadowRun5.rb
+420 −476 src/diceBot/ShinobiGami.rb
+5 −5 src/diceBot/Skynauts.rb
+630 −7 src/diceBot/StellarKnights.rb
+448 −0 src/diceBot/SterileLife.rb
+1 −1 src/diceBot/StrangerOfSwordCity.rb
+1 −1 src/diceBot/Strave.rb
+13 −2 src/diceBot/SwordWorld.rb
+2 −2 src/diceBot/TokumeiTenkousei.rb
+2 −2 src/diceBot/Torg.rb
+2 −5 src/diceBot/TrinitySeven.rb
+120 −2 src/diceBot/YankeeYogSothoth.rb
+1 −1 src/irc/ircBot.rb
+57 −27 src/test/data/Alshard.txt
+162 −144 src/test/data/Cthulhu7th.txt
+109 −115 src/test/data/DoubleCross.txt
+124 −22 src/test/data/EtrianOdysseySRS.txt
+137 −23 src/test/data/FullMetalPanic.txt
+11 −0 src/test/data/LostRecord.txt
+57 −27 src/test/data/MetallicGuadian.txt
+84 −0 src/test/data/NinjaSlayer.txt
+75 −0 src/test/data/Paradiso.txt
+744 −0 src/test/data/PulpCthulhu.txt
+232 −11 src/test/data/SRS.txt
+15 −15 src/test/data/ShinobiGami.txt
+360 −0 src/test/data/StellarKnights.txt
+54 −0 src/test/data/SterileLife.txt
+7 −1 src/test/data/SwordWorld.txt
+72 −0 src/test/data/YankeeYogSothoth.txt
+89 −0 src/test/test_srs_help_messages.rb
+23 −0 src/utils/d66_grid_table.rb
+24 −0 src/utils/modifier_formatter.rb
+30 −0 src/utils/table.rb

0 comments on commit f09df78

Please sign in to comment.