Skip to content
This repository was archived by the owner on Mar 29, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: IDotD/Userscript
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v49.1.0
Choose a base ref
...
head repository: IDotD/Userscript
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Oct 3, 2016

  1. Copy the full SHA
    4615c04 View commit details
  2. Copy the full SHA
    bb45337 View commit details
  3. Copy the full SHA
    f541ea5 View commit details

Commits on Oct 4, 2016

  1. Copy the full SHA
    8896b53 View commit details
  2. Copy the full SHA
    cb8cf51 View commit details

Commits on Oct 6, 2016

  1. Copy the full SHA
    b6545a1 View commit details

Commits on Oct 9, 2016

  1. Added core package;

    w20k committed Oct 9, 2016
    Copy the full SHA
    cbf3b0b View commit details

Commits on Oct 11, 2016

  1. Copy the full SHA
    9329162 View commit details
  2. #125: changed vars to this;

    w20k committed Oct 11, 2016
    Copy the full SHA
    ec5e63b View commit details

Commits on Oct 12, 2016

  1. Copy the full SHA
    05d8e2b View commit details
  2. Copy the full SHA
    c0ec231 View commit details

Commits on Oct 13, 2016

  1. Copy the full SHA
    a32961d View commit details

Commits on Oct 18, 2016

  1. Copy the full SHA
    6953752 View commit details

Commits on Jan 14, 2017

  1. Copy the full SHA
    75f1186 View commit details
  2. Copy the full SHA
    5d01b9b View commit details
  3. Merge remote-tracking branch 'origin/asdsad' into asdsad

    # Conflicts:
    #	src/mods/land.js
    #	tests/mods/land.spec.js
    w20k committed Jan 14, 2017
    Copy the full SHA
    236c2e9 View commit details
  4. Copy the full SHA
    9a0715f View commit details

Commits on Dec 5, 2017

  1. hopefully fixing loader in FF

    fixes #326
    Idrinth authored Dec 5, 2017
    Copy the full SHA
    0e20016 View commit details

Commits on Dec 6, 2017

  1. Update loader.js

    Idrinth authored Dec 6, 2017
    Copy the full SHA
    09cb46c View commit details
  2. Merge pull request #327 from IDotD/idrinth

    hopefully fixing loader in FF
    Idrinth authored Dec 6, 2017
    Copy the full SHA
    f9429b6 View commit details

Commits on Dec 24, 2017

  1. Update mutik.scss

    Idrinth authored Dec 24, 2017
    Copy the full SHA
    fc2212f View commit details
  2. Update mutik.scss

    Idrinth authored Dec 24, 2017
    Copy the full SHA
    03503fc View commit details
  3. Update mutik.scss

    Idrinth authored Dec 24, 2017
    Copy the full SHA
    57ce6d3 View commit details
  4. Update mutik.scss

    Idrinth authored Dec 24, 2017
    Copy the full SHA
    630e962 View commit details
  5. Merge pull request #328 from IDotD/idrinth

    Idrinth
    Idrinth authored Dec 24, 2017
    Copy the full SHA
    33e3233 View commit details

Commits on May 30, 2018

  1. Merge origin/asdsad

    Conflicts:
    	src/mods/text.js
    	tests/landbuy.js
    Idrinth committed May 30, 2018
    Copy the full SHA
    c9925a1 View commit details
  2. adding travis-config

    Idrinth committed May 30, 2018
    Copy the full SHA
    dd6af7e View commit details
  3. var -> let

    support should long be sufficient
    Idrinth committed May 30, 2018
    Copy the full SHA
    21603ad View commit details
  4. Copy the full SHA
    abc79d5 View commit details
  5. Copy the full SHA
    b88b4e5 View commit details

Commits on May 31, 2018

  1. Copy the full SHA
    fd74cc5 View commit details
  2. adding docs

    Idrinth committed May 31, 2018
    Copy the full SHA
    22e3b76 View commit details
  3. adjusting tests

    Idrinth committed May 31, 2018
    Copy the full SHA
    6ba513f View commit details
  4. fixing name

    Idrinth committed May 31, 2018
    Copy the full SHA
    126ae2f View commit details
  5. adjusting travis config

    Idrinth committed May 31, 2018
    Copy the full SHA
    3ffe244 View commit details
  6. fixing folder in config

    Idrinth committed May 31, 2018
    Copy the full SHA
    dc16265 View commit details
  7. Copy the full SHA
    0935557 View commit details
  8. renaming test file

    Idrinth committed May 31, 2018
    Copy the full SHA
    04e74b8 View commit details
  9. Copy the full SHA
    b6683db View commit details
  10. Copy the full SHA
    e1c0f10 View commit details
  11. Copy the full SHA
    26b8ea9 View commit details
  12. simplifiing tier filter

    adding basic structure tests for tier worker
    Idrinth committed May 31, 2018
    Copy the full SHA
    8990436 View commit details
  13. Copy the full SHA
    3a1f878 View commit details
  14. fixing typos

    adding basic functionality test
    Idrinth committed May 31, 2018
    Copy the full SHA
    5970c0e View commit details
  15. extracting table row creation

    Idrinth committed May 31, 2018
    Copy the full SHA
    e569b1d View commit details

Commits on Sep 12, 2018

  1. Merge pull request #331 from IDotD/simplify

    Simplify+Tests
    Idrinth authored Sep 12, 2018
    Copy the full SHA
    4eae24a View commit details
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Coverage directory used by tools like istanbul
coverage
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt
# Dependency directories
node_modules
.npm

18 changes: 18 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
language: node_js
node_js: "node"
git:
depth: 3
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- libstdc++-4.9-dev
before_script:
- npm install
- npm install codeclimate-test-reporter codacy-coverage istanbul -g
script:
- istanbul cover "./node_modules/mocha/bin/_mocha" --report lcovonly --print detail -- --recursive --reporter spec
after_success:
- codeclimate-test-reporter < ./coverage/lcov.info
- codacy-coverage < ./coverage/lcov.info
38 changes: 38 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"name": "idotd",
"version": "10.0.0",
"description": "A script for dawn of the dragons, that works based on data provided to https://dotd.idrinth.de via UgUp",
"main": "src/stable.js",
"directories": {
"lib": "./src",
"test": "./test"
},
"scripts": {
"test": "./node_modules/mocha/bin/mocha -R test/**/*.js"
},
"repository": {
"type": "git",
"url": "git+https://github.com/IDotD/Userscript.git"
},
"keywords": [
"dotd",
"idrinth",
"script",
"userscript",
"dawn of the dragons"
],
"author": {
"name": "Björn Büttner",
"url": "https://github.com/Idrinth"
},
"license": "MIT",
"bugs": {
"url": "https://github.com/IDotD/Userscript/issues"
},
"homepage": "https://idotd.github.io",
"devDependencies": {
"mocha": "^5",
"chai": "^4.1",
"rewire": "^4"
}
}
62 changes: 35 additions & 27 deletions src/loader.js
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
// @name Idrinth's DotD Script
// @description A userscript for the game Dawn of the Dragons which provides multiple useful tools, like time-saving raid catching, private chatrooms and much more to discover, see the manual at https://idotd.github.io/
// @author Idrinth
// @version 2.3.1
// @version 2.3.2
// @grant none
// @hompage https://dotd.idrinth.de
// @include http://www.kongregate.com/games/5thplanetgames/dawn-of-the-dragons*
@@ -34,34 +34,42 @@
window.location.host === "web1.dawnofthedragons.com" ||
window.location.host === "dotd-web1.5thplanetgames.com"
) {
window.idrinth = {};
window.idrinth.add = function(data) {
var s = document.createElement("script");
s.appendChild(document.createTextNode(data));
document.getElementsByTagName("head")[0].appendChild(s);
let f = function() {
window.idrinth = {
add: function(data) {
let s = document.createElement("script");
s.appendChild(document.createTextNode(data));
document.getElementsByTagName("head")[0].appendChild(s);
}
};
window.addEventListener(
"message",
function(event) {
try {
var data = JSON.parse(event.data);
if (
data.to !== "idotd" ||
!window.idrinth.hasOwnProperty(data.task) ||
!data.data
) {
return;
window.addEventListener(
"message",
function(event) {
try {
let data = JSON.parse(event.data);
if (
!data ||
data.to !== "idotd" ||
!window.idrinth.hasOwnProperty(data.task) ||
!data.data
) {
return;
}
window.idrinth[data.task](data.data);
} catch (e) {
//nothing
}
window.idrinth[data.task](data.data);
} catch (e) {
//nothing
}
},
false
);
},
false
);
};
let sc = document.createElement("script");
sc.setAttribute("id", "idotd-loader");
sc.appendChild(document.createTextNode('('+f.toString()+'());'));
document.getElementsByTagName("head")[0].appendChild(sc);
return;
}
var sc = document.createElement("script");
let sc = document.createElement("script");
sc.setAttribute(
"src",
"https://dotd.idrinth.de/static/userscript/" + GM_info.script.version + "/"
@@ -70,9 +78,9 @@
sc.setAttribute("async", "async");
sc.errorCounter = 0;
sc.errorFunction = function() {
var self = document.getElementById("idotd-loader");
let self = document.getElementById("idotd-loader");
self.parentNode.removeChild(self);
var sc = document.createElement("script");
let sc = document.createElement("script");
sc.onerror = self.onerror;
sc.errorCounter = self.errorCounter + 1;
sc.errorFunction = self.errorFunction;
Loading