Skip to content

Commit

Permalink
Version 1.2.1 (#16)
Browse files Browse the repository at this point in the history
* Merge branch 'dota-feature-multiple-steam-bots'

Squashed commit of the following:

commit ff26b5d
Author: Pablo Rodríguez <[email protected]>
Date:   Sat Jan 14 17:15:09 2017 +0100

    Works apparently.

commit bed8095
Author: Pablo Rodríguez <[email protected]>
Date:   Fri Jan 13 11:34:17 2017 +0100

    small progress

commit 07a80e5
Author: Pablo Rodríguez <[email protected]>
Date:   Thu Jan 12 20:47:31 2017 +0100

    Fixed some things + status command (untested)

commit 5594b93
Author: Pablo Rodríguez <[email protected]>
Date:   Thu Jan 12 14:06:28 2017 +0100

    Seems to work now

commit e864b89
Author: Pablo Rodríguez <[email protected]>
Date:   Thu Jan 12 13:26:51 2017 +0100

    Getting an error on lobby creation

commit 100c4df
Author: Pablo Rodríguez <[email protected]>
Date:   Wed Jan 11 20:41:56 2017 +0100

    Still a wip...

commit 64bb4e1
Author: Pablo Rodríguez <[email protected]>
Date:   Wed Jan 11 13:30:49 2017 +0100

    Forgot to upload the next version sql changes

commit 977b5cb
Author: Pablo Rodríguez <[email protected]>
Date:   Wed Jan 11 13:29:45 2017 +0100

    Still a wip

    I'm making soooooo much changes without testing, but I can't right now. Debugging is gonna be fun.

commit 403bf75
Merge: 227c59a 4b005fd
Author: Pablo Rodríguez <[email protected]>
Date:   Wed Jan 11 12:01:08 2017 +0100

    Merge branch 'dota-dev' into dota-feature-multiple-steam-bots

commit 227c59a
Author: Pablo Rodríguez <[email protected]>
Date:   Sat Jan 7 14:22:57 2017 +0100

    Still a work in progress

    Rewriting the dotahandler module.

commit 5d1aa84
Author: Pablo Rodríguez <[email protected]>
Date:   Fri Jan 6 21:38:12 2017 +0100

    Doesn't work so far

commit a95b25e
Author: Pablo Rodríguez <[email protected]>
Date:   Fri Jan 6 13:28:27 2017 +0100

    Changed scripts to work with multiple bots

* Fetching MMR from OpenDota

* Finished MMR support.

* Added CM Pick option (Needs testing)

* Updated usage guide

* Bug fixes

* The bot is able to retrieve the Match ID

* Removed uneccessary comment

* Added enfore MMR ability

* Added some config options. Final v1.2 commit-

* v1.2.1 with bug fixes
  • Loading branch information
MeLlamoPablo authored Jan 26, 2017
1 parent c7f113f commit ce7a377
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion lib/commands/admin/get-lobby.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module.exports = new Clapp.Command({
desc: "Gets the current lobby name and password sent to you on a DM",
fn: (argv, context) => {
return new Promise((fulfill, reject) => {
db.events.get(argv.args.event).then(event => {
db.get(argv.args.event).then(event => {
if (event === null) {
fulfill("Error: the specified event `" + argv.args.event + "` doesn't exist.");
} else {
Expand Down
4 changes: 2 additions & 2 deletions lib/modules/dotahandler/DotaClientX.js
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ class DotaClientX extends Dota2.Dota2Client {
"game_name": this.currentLobby.name,
"server_region": server,
"game_mode": gamemode,
"game_version": EGameVersion.GAME_VERSION_STABLE,
"game_version": EGameVersion.GAME_VERSION_CURRENT,
"series_type": ESeriesType.NONE,
"cm_pick": cmpick,
"allow_cheats": false,
Expand All @@ -191,7 +191,7 @@ class DotaClientX extends Dota2.Dota2Client {
};

if (cfg.dota.ticketing.enabled) {
options.leaguid = cfg.dota.ticketing.league_id;
options.leagueid = cfg.dota.ticketing.league_id;
}

this.createPracticeLobby(
Expand Down
2 changes: 1 addition & 1 deletion lib/modules/dotahandler/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ class DotaHandler {
if (client.inLobby()) {
return {
name: client.currentLobby.name,
password: client.currentLobby.name
password: client.currentLobby.password
};
} else {
return null;
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "schedulebot",
"version": "1.2.0",
"version": "1.2.1",
"description": "A Discord bot that makes scheduling easy",
"homepage": "https://github.com/mellamopablo/schedulebot#readme",
"author": "Pablo Rodríguez <[email protected]> (https://github.com/MeLlamoPablo)",
Expand Down
1 change: 1 addition & 0 deletions scripts/shared/versions.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[
"v1.2.1-dota",
"v1.2.0-dota",
"v1.1.1-dota",
"v1.1.0-dota",
Expand Down
1 change: 1 addition & 0 deletions scripts/sql/1.2.0-to-1.2.1.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--noop

0 comments on commit ce7a377

Please sign in to comment.