From e81a9f537ba333316b965bad65e391198ac2a878 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jul 2020 05:46:10 +0000 Subject: [PATCH 01/10] Bump lodash from 4.17.15 to 4.17.19 Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19) Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2784462c..cb1216f7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5285,9 +5285,9 @@ } }, "lodash": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", + "version": "4.17.19", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", + "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", "dev": true }, "lodash._baseassign": { diff --git a/package.json b/package.json index 8ed93d1d..3f41e26e 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "cross-env": "^7.0", "jquery": "^3.2", "laravel-mix": "^5.0.1", - "lodash": "^4.17.13", + "lodash": "^4.17.19", "popper.js": "^1.12", "resolve-url-loader": "^2.3.1", "sass": "^1.20.1", From d8b37e19941c5fc61b03b5c3162b8266d24c4944 Mon Sep 17 00:00:00 2001 From: Simon Date: Tue, 4 Aug 2020 00:43:11 +0200 Subject: [PATCH 02/10] Correct collection model table names --- app/Boss/AbyssalSire.php | 2 ++ app/Boss/AlchemicalHydra.php | 2 ++ app/Boss/BarrowsChests.php | 2 ++ app/Boss/Bryophyta.php | 2 ++ app/Boss/Callisto.php | 2 ++ app/Boss/Cerberus.php | 2 ++ app/Boss/ChaosElemental.php | 2 ++ app/Boss/ChaosFanatic.php | 2 ++ app/Boss/CommanderZilyana.php | 2 ++ app/Boss/CorporealBeast.php | 2 ++ app/Boss/CrazyArchaeologist.php | 2 ++ app/Boss/DagannothKings.php | 2 ++ app/Boss/GeneralGraardor.php | 2 ++ app/Boss/GiantMole.php | 2 ++ app/Boss/GrotesqueGuardians.php | 2 ++ app/Boss/Hespori.php | 2 ++ app/Boss/KalphiteQueen.php | 2 ++ app/Boss/KingBlackDragon.php | 2 ++ app/Boss/Kraken.php | 2 ++ app/Boss/Kreearra.php | 2 ++ app/Boss/KrilTsutsaroth.php | 2 ++ app/Boss/Obor.php | 2 ++ app/Boss/Sarachnis.php | 2 ++ app/Boss/Scorpia.php | 2 ++ app/Boss/Skotizo.php | 2 ++ app/Boss/TheFightCaves.php | 2 ++ app/Boss/TheGauntlet.php | 2 ++ app/Boss/TheInferno.php | 2 ++ app/Boss/TheNightmare.php | 2 ++ app/Boss/ThermonuclearSmokeDevil.php | 2 ++ app/Boss/Venenatis.php | 2 ++ app/Boss/Vetion.php | 2 ++ app/Boss/Vorkath.php | 2 ++ app/Boss/Wintertodt.php | 2 ++ app/Boss/Zalcano.php | 2 ++ app/Boss/Zulrah.php | 2 ++ 36 files changed, 72 insertions(+) diff --git a/app/Boss/AbyssalSire.php b/app/Boss/AbyssalSire.php index 038d0cfe..787e6e29 100644 --- a/app/Boss/AbyssalSire.php +++ b/app/Boss/AbyssalSire.php @@ -6,6 +6,8 @@ class AbyssalSire extends Model { + protected $table = 'abyssal_sire'; + protected $fillable = [ 'obtained', 'kill_count', diff --git a/app/Boss/AlchemicalHydra.php b/app/Boss/AlchemicalHydra.php index ff1ddd8b..24b03b0c 100644 --- a/app/Boss/AlchemicalHydra.php +++ b/app/Boss/AlchemicalHydra.php @@ -6,6 +6,8 @@ class AlchemicalHydra extends Model { + protected $table = 'alchemical_hydra'; + protected $fillable = [ 'obtained', 'kill_count', diff --git a/app/Boss/BarrowsChests.php b/app/Boss/BarrowsChests.php index 3a0c9ba1..95bc1374 100644 --- a/app/Boss/BarrowsChests.php +++ b/app/Boss/BarrowsChests.php @@ -6,6 +6,8 @@ class BarrowsChests extends Model { + protected $table = 'barrows_chests'; + protected $fillable = [ 'obtained', 'kill_count', diff --git a/app/Boss/Bryophyta.php b/app/Boss/Bryophyta.php index e25b5964..f784ef8b 100644 --- a/app/Boss/Bryophyta.php +++ b/app/Boss/Bryophyta.php @@ -6,6 +6,8 @@ class Bryophyta extends Model { + protected $table = 'bryophyta'; + protected $fillable = [ 'obtained', 'kill_count', diff --git a/app/Boss/Callisto.php b/app/Boss/Callisto.php index bb480642..566bf483 100644 --- a/app/Boss/Callisto.php +++ b/app/Boss/Callisto.php @@ -6,6 +6,8 @@ class Callisto extends Model { + protected $table = 'callisto'; + protected $fillable = [ 'obtained', 'kill_count', diff --git a/app/Boss/Cerberus.php b/app/Boss/Cerberus.php index ea1aa609..f7af12b9 100644 --- a/app/Boss/Cerberus.php +++ b/app/Boss/Cerberus.php @@ -6,6 +6,8 @@ class Cerberus extends Model { + protected $table = 'cerberus'; + protected $fillable = [ 'obtained', 'kill_count', diff --git a/app/Boss/ChaosElemental.php b/app/Boss/ChaosElemental.php index 7d5dc7ce..c6502d2a 100644 --- a/app/Boss/ChaosElemental.php +++ b/app/Boss/ChaosElemental.php @@ -6,6 +6,8 @@ class ChaosElemental extends Model { + protected $table = 'chaos_elemental'; + protected $fillable = [ 'obtained', 'kill_count', diff --git a/app/Boss/ChaosFanatic.php b/app/Boss/ChaosFanatic.php index c8160743..ea86a0c3 100644 --- a/app/Boss/ChaosFanatic.php +++ b/app/Boss/ChaosFanatic.php @@ -6,6 +6,8 @@ class ChaosFanatic extends Model { + protected $table = 'chaos_fanatic'; + protected $fillable = [ 'obtained', 'kill_count', diff --git a/app/Boss/CommanderZilyana.php b/app/Boss/CommanderZilyana.php index d0372a5c..d216e0e2 100644 --- a/app/Boss/CommanderZilyana.php +++ b/app/Boss/CommanderZilyana.php @@ -6,6 +6,8 @@ class CommanderZilyana extends Model { + protected $table = 'commander_zilyana'; + protected $fillable = [ 'obtained', 'kill_count', diff --git a/app/Boss/CorporealBeast.php b/app/Boss/CorporealBeast.php index c7459d69..023a1dc7 100644 --- a/app/Boss/CorporealBeast.php +++ b/app/Boss/CorporealBeast.php @@ -6,6 +6,8 @@ class CorporealBeast extends Model { + protected $table = 'corporeal_beast'; + protected $fillable = [ 'obtained', 'kill_count', diff --git a/app/Boss/CrazyArchaeologist.php b/app/Boss/CrazyArchaeologist.php index 1b465289..572e77e0 100644 --- a/app/Boss/CrazyArchaeologist.php +++ b/app/Boss/CrazyArchaeologist.php @@ -6,6 +6,8 @@ class CrazyArchaeologist extends Model { + protected $table = 'crazy_archaeologist'; + protected $fillable = [ 'obtained', 'kill_count', diff --git a/app/Boss/DagannothKings.php b/app/Boss/DagannothKings.php index b411b0ab..9f84090f 100644 --- a/app/Boss/DagannothKings.php +++ b/app/Boss/DagannothKings.php @@ -6,6 +6,8 @@ class DagannothKings extends Model { + protected $table = 'dagannoth_kings'; + protected $fillable = [ 'obtained', 'kill_count', diff --git a/app/Boss/GeneralGraardor.php b/app/Boss/GeneralGraardor.php index 75b3949d..049497c4 100644 --- a/app/Boss/GeneralGraardor.php +++ b/app/Boss/GeneralGraardor.php @@ -6,6 +6,8 @@ class GeneralGraardor extends Model { + protected $table = 'general_graardor'; + protected $fillable = [ 'obtained', 'kill_count', diff --git a/app/Boss/GiantMole.php b/app/Boss/GiantMole.php index 7e9d0971..0cf5fb3c 100644 --- a/app/Boss/GiantMole.php +++ b/app/Boss/GiantMole.php @@ -6,6 +6,8 @@ class GiantMole extends Model { + protected $table = 'giant_mole'; + protected $fillable = [ 'obtained', 'kill_count', diff --git a/app/Boss/GrotesqueGuardians.php b/app/Boss/GrotesqueGuardians.php index 6b934934..d9cb28aa 100644 --- a/app/Boss/GrotesqueGuardians.php +++ b/app/Boss/GrotesqueGuardians.php @@ -6,6 +6,8 @@ class GrotesqueGuardians extends Model { + protected $table = 'grotesque_guardians'; + protected $fillable = [ 'obtained', 'kill_count', diff --git a/app/Boss/Hespori.php b/app/Boss/Hespori.php index 7757e806..4272a359 100644 --- a/app/Boss/Hespori.php +++ b/app/Boss/Hespori.php @@ -6,6 +6,8 @@ class Hespori extends Model { + protected $table = 'hespori'; + protected $fillable = [ 'obtained', 'kill_count', diff --git a/app/Boss/KalphiteQueen.php b/app/Boss/KalphiteQueen.php index 87c59328..017170f0 100644 --- a/app/Boss/KalphiteQueen.php +++ b/app/Boss/KalphiteQueen.php @@ -6,6 +6,8 @@ class KalphiteQueen extends Model { + protected $table = 'kalphite_queen'; + protected $fillable = [ 'obtained', 'kill_count', diff --git a/app/Boss/KingBlackDragon.php b/app/Boss/KingBlackDragon.php index 37c365b7..678157b3 100644 --- a/app/Boss/KingBlackDragon.php +++ b/app/Boss/KingBlackDragon.php @@ -6,6 +6,8 @@ class KingBlackDragon extends Model { + protected $table = 'king_black_dragon'; + protected $fillable = [ 'obtained', 'kill_count', diff --git a/app/Boss/Kraken.php b/app/Boss/Kraken.php index 753a317c..de77504d 100644 --- a/app/Boss/Kraken.php +++ b/app/Boss/Kraken.php @@ -6,6 +6,8 @@ class Kraken extends Model { + protected $table = 'kraken'; + protected $fillable = [ 'obtained', 'kill_count', diff --git a/app/Boss/Kreearra.php b/app/Boss/Kreearra.php index 857890e8..4f68428a 100644 --- a/app/Boss/Kreearra.php +++ b/app/Boss/Kreearra.php @@ -6,6 +6,8 @@ class Kreearra extends Model { + protected $table = 'kreearra'; + protected $fillable = [ 'obtained', 'kill_count', diff --git a/app/Boss/KrilTsutsaroth.php b/app/Boss/KrilTsutsaroth.php index 055a8b9c..cc845156 100644 --- a/app/Boss/KrilTsutsaroth.php +++ b/app/Boss/KrilTsutsaroth.php @@ -6,6 +6,8 @@ class KrilTsutsaroth extends Model { + protected $table = 'kril_tsutsaroth'; + protected $fillable = [ 'obtained', 'kill_count', diff --git a/app/Boss/Obor.php b/app/Boss/Obor.php index dfcb9abc..4639e978 100644 --- a/app/Boss/Obor.php +++ b/app/Boss/Obor.php @@ -6,6 +6,8 @@ class Obor extends Model { + protected $table = 'obor'; + protected $fillable = [ 'obtained', 'kill_count', diff --git a/app/Boss/Sarachnis.php b/app/Boss/Sarachnis.php index de66ac6f..b115f007 100644 --- a/app/Boss/Sarachnis.php +++ b/app/Boss/Sarachnis.php @@ -6,6 +6,8 @@ class Sarachnis extends Model { + protected $table = 'sarachnis'; + protected $fillable = [ 'obtained', 'kill_count', diff --git a/app/Boss/Scorpia.php b/app/Boss/Scorpia.php index 336a1a43..5c93decc 100644 --- a/app/Boss/Scorpia.php +++ b/app/Boss/Scorpia.php @@ -6,6 +6,8 @@ class Scorpia extends Model { + protected $table = 'scorpia'; + protected $fillable = [ 'obtained', 'kill_count', diff --git a/app/Boss/Skotizo.php b/app/Boss/Skotizo.php index 567615f8..22170b86 100644 --- a/app/Boss/Skotizo.php +++ b/app/Boss/Skotizo.php @@ -6,6 +6,8 @@ class Skotizo extends Model { + protected $table = 'skotizo'; + protected $fillable = [ 'obtained', 'kill_count', diff --git a/app/Boss/TheFightCaves.php b/app/Boss/TheFightCaves.php index 86d19940..c53a61a1 100644 --- a/app/Boss/TheFightCaves.php +++ b/app/Boss/TheFightCaves.php @@ -6,6 +6,8 @@ class TheFightCaves extends Model { + protected $table = 'the_fight_caves'; + protected $fillable = [ 'obtained', 'kill_count', diff --git a/app/Boss/TheGauntlet.php b/app/Boss/TheGauntlet.php index ecd1eba1..b8c66f18 100644 --- a/app/Boss/TheGauntlet.php +++ b/app/Boss/TheGauntlet.php @@ -6,6 +6,8 @@ class TheGauntlet extends Model { + protected $table = 'the_gauntlet'; + protected $fillable = [ 'obtained', 'kill_count', diff --git a/app/Boss/TheInferno.php b/app/Boss/TheInferno.php index e0235bd6..84a90041 100644 --- a/app/Boss/TheInferno.php +++ b/app/Boss/TheInferno.php @@ -6,6 +6,8 @@ class TheInferno extends Model { + protected $table = 'the_inferno'; + protected $fillable = [ 'obtained', 'kill_count', diff --git a/app/Boss/TheNightmare.php b/app/Boss/TheNightmare.php index 5335daab..27afb1d7 100644 --- a/app/Boss/TheNightmare.php +++ b/app/Boss/TheNightmare.php @@ -6,6 +6,8 @@ class TheNightmare extends Model { + protected $table = 'the_nightmare'; + protected $fillable = [ 'obtained', 'kill_count', diff --git a/app/Boss/ThermonuclearSmokeDevil.php b/app/Boss/ThermonuclearSmokeDevil.php index d999924b..cc468342 100644 --- a/app/Boss/ThermonuclearSmokeDevil.php +++ b/app/Boss/ThermonuclearSmokeDevil.php @@ -6,6 +6,8 @@ class ThermonuclearSmokeDevil extends Model { + protected $table = 'thermonuclear_smoke_devil'; + protected $fillable = [ 'obtained', 'kill_count', diff --git a/app/Boss/Venenatis.php b/app/Boss/Venenatis.php index a41b25ea..90226817 100644 --- a/app/Boss/Venenatis.php +++ b/app/Boss/Venenatis.php @@ -6,6 +6,8 @@ class Venenatis extends Model { + protected $table = 'venenatis'; + protected $fillable = [ 'obtained', 'kill_count', diff --git a/app/Boss/Vetion.php b/app/Boss/Vetion.php index b95b3c2a..0949cf81 100644 --- a/app/Boss/Vetion.php +++ b/app/Boss/Vetion.php @@ -6,6 +6,8 @@ class Vetion extends Model { + protected $table = 'vetion'; + protected $fillable = [ 'obtained', 'kill_count', diff --git a/app/Boss/Vorkath.php b/app/Boss/Vorkath.php index 396564f0..c6d2ac0a 100644 --- a/app/Boss/Vorkath.php +++ b/app/Boss/Vorkath.php @@ -6,6 +6,8 @@ class Vorkath extends Model { + protected $table = 'vorkath'; + protected $fillable = [ 'obtained', 'kill_count', diff --git a/app/Boss/Wintertodt.php b/app/Boss/Wintertodt.php index 07e45b23..3706483e 100644 --- a/app/Boss/Wintertodt.php +++ b/app/Boss/Wintertodt.php @@ -6,6 +6,8 @@ class Wintertodt extends Model { + protected $table = 'wintertodt'; + protected $fillable = [ 'obtained', 'kill_count', diff --git a/app/Boss/Zalcano.php b/app/Boss/Zalcano.php index 184ad685..307db6b0 100644 --- a/app/Boss/Zalcano.php +++ b/app/Boss/Zalcano.php @@ -6,6 +6,8 @@ class Zalcano extends Model { + protected $table = 'zalcano'; + protected $fillable = [ 'obtained', 'kill_count', diff --git a/app/Boss/Zulrah.php b/app/Boss/Zulrah.php index 4f53467f..889357a9 100644 --- a/app/Boss/Zulrah.php +++ b/app/Boss/Zulrah.php @@ -6,6 +6,8 @@ class Zulrah extends Model { + protected $table = 'zulrah'; + protected $fillable = [ 'obtained', 'kill_count', From 2e7553d7f95dcf60c500ec7359cee5d575c3ffc8 Mon Sep 17 00:00:00 2001 From: Simon Date: Tue, 4 Aug 2020 01:16:26 +0200 Subject: [PATCH 03/10] Correct collection migration table names --- ...08_03_230720_create_abyssal_sire_table.php | 43 ++++++++++++++ ...3_230721_create_alchemical_hydra_table.php | 45 ++++++++++++++ ...03_230721_create_barrows_chests_table.php} | 0 ...20_08_03_230721_create_bryophyta_table.php | 35 +++++++++++ ...020_08_03_230721_create_callisto_table.php | 38 ++++++++++++ ...20_08_03_230721_create_cerberus_table.php} | 0 ...03_230722_create_chaos_elemental_table.php | 37 ++++++++++++ ...8_03_230722_create_chaos_fanatic_table.php | 37 ++++++++++++ ..._230722_create_commander_zilyana_table.php | 42 +++++++++++++ ...03_230722_create_corporeal_beast_table.php | 40 +++++++++++++ ...30722_create_crazy_archaeologist_table.php | 37 ++++++++++++ ...3_230723_create_dagannoth_kings_table.php} | 0 ...3_230723_create_general_graardor_table.php | 42 +++++++++++++ ...0_08_03_230723_create_giant_mole_table.php | 37 ++++++++++++ ...0723_create_grotesque_guardians_table.php} | 0 ...2020_08_03_230724_create_hespori_table.php | 38 ++++++++++++ ..._03_230724_create_kalphite_queen_table.php | 39 ++++++++++++ ..._230724_create_king_black_dragon_table.php | 38 ++++++++++++ .../2020_08_03_230724_create_kraken_table.php | 38 ++++++++++++ ...020_08_03_230724_create_kreearra_table.php | 42 +++++++++++++ ...03_230725_create_kril_tsutsaroth_table.php | 42 +++++++++++++ .../2020_08_03_230725_create_obor_table.php | 35 +++++++++++ ...0_08_03_230725_create_sarachnis_table.php} | 0 ...2020_08_03_230725_create_scorpia_table.php | 37 ++++++++++++ ...2020_08_03_230726_create_skotizo_table.php | 40 +++++++++++++ ...3_230726_create_the_fight_caves_table.php} | 0 ...08_03_230726_create_the_gauntlet_table.php | 39 ++++++++++++ ..._08_03_230726_create_the_inferno_table.php | 36 +++++++++++ ...8_03_230726_create_the_nightmare_table.php | 44 ++++++++++++++ ...create_thermonuclear_smoke_devil_table.php | 38 ++++++++++++ ...0_08_03_230727_create_venenatis_table.php} | 0 .../2020_08_03_230727_create_vetion_table.php | 38 ++++++++++++ ...2020_08_03_230727_create_vorkath_table.php | 40 +++++++++++++ ...0_08_03_230727_create_wintertodt_table.php | 44 ++++++++++++++ ...2020_08_03_230728_create_zalcano_table.php | 38 ++++++++++++ .../2020_08_03_230728_create_zulrah_table.php | 44 ++++++++++++++ ...7_05_133123_create_abyssal_sires_table.php | 0 ..._133123_create_alchemical_hydras_table.php | 0 ..._05_133123_create_barrows_chests_table.php | 59 +++++++++++++++++++ ...0_07_05_133124_create_bryophytas_table.php | 0 ...20_07_05_133124_create_callistos_table.php | 0 ...020_07_05_133124_create_cerberus_table.php | 41 +++++++++++++ ...5_133124_create_chaos_elementals_table.php | 0 ..._05_133125_create_chaos_fanatics_table.php | 0 ...133125_create_commander_zilyanas_table.php | 0 ...5_133125_create_corporeal_beasts_table.php | 0 ...3125_create_crazy_archaeologists_table.php | 0 ...05_133125_create_dagannoth_kings_table.php | 44 ++++++++++++++ ..._133126_create_general_graardors_table.php | 0 ..._07_05_133126_create_giant_moles_table.php | 0 ...33126_create_grotesque_guardians_table.php | 41 +++++++++++++ ...020_07_05_133126_create_hesporis_table.php | 0 ...05_133127_create_kalphite_queens_table.php | 0 ...133127_create_king_black_dragons_table.php | 0 ...2020_07_05_133127_create_krakens_table.php | 0 ...20_07_05_133127_create_kreearras_table.php | 0 ...5_133128_create_kril_tsutsaroths_table.php | 0 .../2020_07_05_133128_create_obors_table.php | 0 ...20_07_05_133128_create_sarachnis_table.php | 38 ++++++++++++ ...020_07_05_133128_create_scorpias_table.php | 0 ...020_07_05_133129_create_skotizos_table.php | 0 ...05_133129_create_the_fight_caves_table.php | 36 +++++++++++ ...7_05_133129_create_the_gauntlets_table.php | 0 ...07_05_133129_create_the_infernos_table.php | 0 ..._05_133130_create_the_nightmares_table.php | 0 ...reate_thermonuclear_smoke_devils_table.php | 0 ...20_07_05_133130_create_venenatis_table.php | 38 ++++++++++++ ...2020_07_05_133130_create_vetions_table.php | 0 ...020_07_05_133130_create_vorkaths_table.php | 0 ..._07_05_133131_create_wintertodts_table.php | 0 ...020_07_05_133131_create_zalcanos_table.php | 0 ...2020_07_05_133131_create_zulrahs_table.php | 0 72 files changed, 1440 insertions(+) create mode 100644 database/migrations/2020_08_03_230720_create_abyssal_sire_table.php create mode 100644 database/migrations/2020_08_03_230721_create_alchemical_hydra_table.php rename database/migrations/{2020_07_05_133123_create_barrows_chests_table.php => 2020_08_03_230721_create_barrows_chests_table.php} (100%) create mode 100644 database/migrations/2020_08_03_230721_create_bryophyta_table.php create mode 100644 database/migrations/2020_08_03_230721_create_callisto_table.php rename database/migrations/{2020_07_05_133124_create_cerberus_table.php => 2020_08_03_230721_create_cerberus_table.php} (100%) create mode 100644 database/migrations/2020_08_03_230722_create_chaos_elemental_table.php create mode 100644 database/migrations/2020_08_03_230722_create_chaos_fanatic_table.php create mode 100644 database/migrations/2020_08_03_230722_create_commander_zilyana_table.php create mode 100644 database/migrations/2020_08_03_230722_create_corporeal_beast_table.php create mode 100644 database/migrations/2020_08_03_230722_create_crazy_archaeologist_table.php rename database/migrations/{2020_07_05_133125_create_dagannoth_kings_table.php => 2020_08_03_230723_create_dagannoth_kings_table.php} (100%) create mode 100644 database/migrations/2020_08_03_230723_create_general_graardor_table.php create mode 100644 database/migrations/2020_08_03_230723_create_giant_mole_table.php rename database/migrations/{2020_07_05_133126_create_grotesque_guardians_table.php => 2020_08_03_230723_create_grotesque_guardians_table.php} (100%) create mode 100644 database/migrations/2020_08_03_230724_create_hespori_table.php create mode 100644 database/migrations/2020_08_03_230724_create_kalphite_queen_table.php create mode 100644 database/migrations/2020_08_03_230724_create_king_black_dragon_table.php create mode 100644 database/migrations/2020_08_03_230724_create_kraken_table.php create mode 100644 database/migrations/2020_08_03_230724_create_kreearra_table.php create mode 100644 database/migrations/2020_08_03_230725_create_kril_tsutsaroth_table.php create mode 100644 database/migrations/2020_08_03_230725_create_obor_table.php rename database/migrations/{2020_07_05_133128_create_sarachnis_table.php => 2020_08_03_230725_create_sarachnis_table.php} (100%) create mode 100644 database/migrations/2020_08_03_230725_create_scorpia_table.php create mode 100644 database/migrations/2020_08_03_230726_create_skotizo_table.php rename database/migrations/{2020_07_05_133129_create_the_fight_caves_table.php => 2020_08_03_230726_create_the_fight_caves_table.php} (100%) create mode 100644 database/migrations/2020_08_03_230726_create_the_gauntlet_table.php create mode 100644 database/migrations/2020_08_03_230726_create_the_inferno_table.php create mode 100644 database/migrations/2020_08_03_230726_create_the_nightmare_table.php create mode 100644 database/migrations/2020_08_03_230727_create_thermonuclear_smoke_devil_table.php rename database/migrations/{2020_07_05_133130_create_venenatis_table.php => 2020_08_03_230727_create_venenatis_table.php} (100%) create mode 100644 database/migrations/2020_08_03_230727_create_vetion_table.php create mode 100644 database/migrations/2020_08_03_230727_create_vorkath_table.php create mode 100644 database/migrations/2020_08_03_230727_create_wintertodt_table.php create mode 100644 database/migrations/2020_08_03_230728_create_zalcano_table.php create mode 100644 database/migrations/2020_08_03_230728_create_zulrah_table.php rename database/migrations/{ => dsfsddf}/2020_07_05_133123_create_abyssal_sires_table.php (100%) rename database/migrations/{ => dsfsddf}/2020_07_05_133123_create_alchemical_hydras_table.php (100%) create mode 100644 database/migrations/dsfsddf/2020_07_05_133123_create_barrows_chests_table.php rename database/migrations/{ => dsfsddf}/2020_07_05_133124_create_bryophytas_table.php (100%) rename database/migrations/{ => dsfsddf}/2020_07_05_133124_create_callistos_table.php (100%) create mode 100644 database/migrations/dsfsddf/2020_07_05_133124_create_cerberus_table.php rename database/migrations/{ => dsfsddf}/2020_07_05_133124_create_chaos_elementals_table.php (100%) rename database/migrations/{ => dsfsddf}/2020_07_05_133125_create_chaos_fanatics_table.php (100%) rename database/migrations/{ => dsfsddf}/2020_07_05_133125_create_commander_zilyanas_table.php (100%) rename database/migrations/{ => dsfsddf}/2020_07_05_133125_create_corporeal_beasts_table.php (100%) rename database/migrations/{ => dsfsddf}/2020_07_05_133125_create_crazy_archaeologists_table.php (100%) create mode 100644 database/migrations/dsfsddf/2020_07_05_133125_create_dagannoth_kings_table.php rename database/migrations/{ => dsfsddf}/2020_07_05_133126_create_general_graardors_table.php (100%) rename database/migrations/{ => dsfsddf}/2020_07_05_133126_create_giant_moles_table.php (100%) create mode 100644 database/migrations/dsfsddf/2020_07_05_133126_create_grotesque_guardians_table.php rename database/migrations/{ => dsfsddf}/2020_07_05_133126_create_hesporis_table.php (100%) rename database/migrations/{ => dsfsddf}/2020_07_05_133127_create_kalphite_queens_table.php (100%) rename database/migrations/{ => dsfsddf}/2020_07_05_133127_create_king_black_dragons_table.php (100%) rename database/migrations/{ => dsfsddf}/2020_07_05_133127_create_krakens_table.php (100%) rename database/migrations/{ => dsfsddf}/2020_07_05_133127_create_kreearras_table.php (100%) rename database/migrations/{ => dsfsddf}/2020_07_05_133128_create_kril_tsutsaroths_table.php (100%) rename database/migrations/{ => dsfsddf}/2020_07_05_133128_create_obors_table.php (100%) create mode 100644 database/migrations/dsfsddf/2020_07_05_133128_create_sarachnis_table.php rename database/migrations/{ => dsfsddf}/2020_07_05_133128_create_scorpias_table.php (100%) rename database/migrations/{ => dsfsddf}/2020_07_05_133129_create_skotizos_table.php (100%) create mode 100644 database/migrations/dsfsddf/2020_07_05_133129_create_the_fight_caves_table.php rename database/migrations/{ => dsfsddf}/2020_07_05_133129_create_the_gauntlets_table.php (100%) rename database/migrations/{ => dsfsddf}/2020_07_05_133129_create_the_infernos_table.php (100%) rename database/migrations/{ => dsfsddf}/2020_07_05_133130_create_the_nightmares_table.php (100%) rename database/migrations/{ => dsfsddf}/2020_07_05_133130_create_thermonuclear_smoke_devils_table.php (100%) create mode 100644 database/migrations/dsfsddf/2020_07_05_133130_create_venenatis_table.php rename database/migrations/{ => dsfsddf}/2020_07_05_133130_create_vetions_table.php (100%) rename database/migrations/{ => dsfsddf}/2020_07_05_133130_create_vorkaths_table.php (100%) rename database/migrations/{ => dsfsddf}/2020_07_05_133131_create_wintertodts_table.php (100%) rename database/migrations/{ => dsfsddf}/2020_07_05_133131_create_zalcanos_table.php (100%) rename database/migrations/{ => dsfsddf}/2020_07_05_133131_create_zulrahs_table.php (100%) diff --git a/database/migrations/2020_08_03_230720_create_abyssal_sire_table.php b/database/migrations/2020_08_03_230720_create_abyssal_sire_table.php new file mode 100644 index 00000000..d3ee1577 --- /dev/null +++ b/database/migrations/2020_08_03_230720_create_abyssal_sire_table.php @@ -0,0 +1,43 @@ +id(); + $table->integer('user_id')->unsigned()->unique(); + $table->integer('obtained')->default(0)->unsigned(); + $table->integer('kill_count')->default(0)->unsigned(); + $table->integer('abyssal_orphan')->default(0)->unsigned(); + $table->integer('unsired')->default(0)->unsigned(); + $table->integer('abyssal_head')->default(0)->unsigned(); + $table->integer('bludgeon_spine')->default(0)->unsigned(); + $table->integer('bludgeon_claw')->default(0)->unsigned(); + $table->integer('bludgeon_axon')->default(0)->unsigned(); + $table->integer('jar_of_miasma')->default(0)->unsigned(); + $table->integer('abyssal_dagger')->default(0)->unsigned(); + $table->integer('abyssal_whip')->default(0)->unsigned(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('abyssal_sire'); + } +} diff --git a/database/migrations/2020_08_03_230721_create_alchemical_hydra_table.php b/database/migrations/2020_08_03_230721_create_alchemical_hydra_table.php new file mode 100644 index 00000000..c01e1804 --- /dev/null +++ b/database/migrations/2020_08_03_230721_create_alchemical_hydra_table.php @@ -0,0 +1,45 @@ +id(); + $table->integer('user_id')->unsigned()->unique(); + $table->integer('obtained')->default(0)->unsigned(); + $table->integer('kill_count')->default(0)->unsigned(); + $table->integer('ikkle_hydra')->default(0)->unsigned(); + $table->integer('hydras_claw')->default(0)->unsigned(); + $table->integer('hydra_tail')->default(0)->unsigned(); + $table->integer('hydra_leather')->default(0)->unsigned(); + $table->integer('hydras_fang')->default(0)->unsigned(); + $table->integer('hydras_eye')->default(0)->unsigned(); + $table->integer('hydras_heart')->default(0)->unsigned(); + $table->integer('dragon_knife')->default(0)->unsigned(); + $table->integer('dragon_thrownaxe')->default(0)->unsigned(); + $table->integer('jar_of_chemicals')->default(0)->unsigned(); + $table->integer('alchemical_hydra_heads')->default(0)->unsigned(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('alchemical_hydra'); + } +} diff --git a/database/migrations/2020_07_05_133123_create_barrows_chests_table.php b/database/migrations/2020_08_03_230721_create_barrows_chests_table.php similarity index 100% rename from database/migrations/2020_07_05_133123_create_barrows_chests_table.php rename to database/migrations/2020_08_03_230721_create_barrows_chests_table.php diff --git a/database/migrations/2020_08_03_230721_create_bryophyta_table.php b/database/migrations/2020_08_03_230721_create_bryophyta_table.php new file mode 100644 index 00000000..e7f3b988 --- /dev/null +++ b/database/migrations/2020_08_03_230721_create_bryophyta_table.php @@ -0,0 +1,35 @@ +id(); + $table->integer('user_id')->unsigned()->unique(); + $table->integer('obtained')->default(0)->unsigned(); + $table->integer('kill_count')->default(0)->unsigned(); + $table->integer('bryophytas_essence')->default(0)->unsigned(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('bryophyta'); + } +} diff --git a/database/migrations/2020_08_03_230721_create_callisto_table.php b/database/migrations/2020_08_03_230721_create_callisto_table.php new file mode 100644 index 00000000..e35b5191 --- /dev/null +++ b/database/migrations/2020_08_03_230721_create_callisto_table.php @@ -0,0 +1,38 @@ +id(); + $table->integer('user_id')->unsigned()->unique(); + $table->integer('obtained')->default(0)->unsigned(); + $table->integer('kill_count')->default(0)->unsigned(); + $table->integer('callisto_cub')->default(0)->unsigned(); + $table->integer('tyrannical_ring')->default(0)->unsigned(); + $table->integer('dragon_pickaxe')->default(0)->unsigned(); + $table->integer('dragon_2h_sword')->default(0)->unsigned(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('callisto'); + } +} diff --git a/database/migrations/2020_07_05_133124_create_cerberus_table.php b/database/migrations/2020_08_03_230721_create_cerberus_table.php similarity index 100% rename from database/migrations/2020_07_05_133124_create_cerberus_table.php rename to database/migrations/2020_08_03_230721_create_cerberus_table.php diff --git a/database/migrations/2020_08_03_230722_create_chaos_elemental_table.php b/database/migrations/2020_08_03_230722_create_chaos_elemental_table.php new file mode 100644 index 00000000..694b11e6 --- /dev/null +++ b/database/migrations/2020_08_03_230722_create_chaos_elemental_table.php @@ -0,0 +1,37 @@ +id(); + $table->integer('user_id')->unsigned()->unique(); + $table->integer('obtained')->default(0)->unsigned(); + $table->integer('kill_count')->default(0)->unsigned(); + $table->integer('pet_chaos_elemental')->default(0)->unsigned(); + $table->integer('dragon_pickaxe')->default(0)->unsigned(); + $table->integer('dragon_2h_sword')->default(0)->unsigned(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('chaos_elemental'); + } +} diff --git a/database/migrations/2020_08_03_230722_create_chaos_fanatic_table.php b/database/migrations/2020_08_03_230722_create_chaos_fanatic_table.php new file mode 100644 index 00000000..a7c6ed59 --- /dev/null +++ b/database/migrations/2020_08_03_230722_create_chaos_fanatic_table.php @@ -0,0 +1,37 @@ +id(); + $table->integer('user_id')->unsigned()->unique(); + $table->integer('obtained')->default(0)->unsigned(); + $table->integer('kill_count')->default(0)->unsigned(); + $table->integer('pet_chaos_elemental')->default(0)->unsigned(); + $table->integer('odium_shard_1')->default(0)->unsigned(); + $table->integer('malediction_shard_1')->default(0)->unsigned(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('chaos_fanatic'); + } +} diff --git a/database/migrations/2020_08_03_230722_create_commander_zilyana_table.php b/database/migrations/2020_08_03_230722_create_commander_zilyana_table.php new file mode 100644 index 00000000..e90cf774 --- /dev/null +++ b/database/migrations/2020_08_03_230722_create_commander_zilyana_table.php @@ -0,0 +1,42 @@ +id(); + $table->integer('user_id')->unsigned()->unique(); + $table->integer('obtained')->default(0)->unsigned(); + $table->integer('kill_count')->default(0)->unsigned(); + $table->integer('pet_zilyana')->default(0)->unsigned(); + $table->integer('armadyl_crossbow')->default(0)->unsigned(); + $table->integer('saradomin_hilt')->default(0)->unsigned(); + $table->integer('saradomin_sword')->default(0)->unsigned(); + $table->integer('saradomins_light')->default(0)->unsigned(); + $table->integer('godsword_shard_1')->default(0)->unsigned(); + $table->integer('godsword_shard_2')->default(0)->unsigned(); + $table->integer('godsword_shard_3')->default(0)->unsigned(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('commander_zilyana'); + } +} diff --git a/database/migrations/2020_08_03_230722_create_corporeal_beast_table.php b/database/migrations/2020_08_03_230722_create_corporeal_beast_table.php new file mode 100644 index 00000000..e93143dd --- /dev/null +++ b/database/migrations/2020_08_03_230722_create_corporeal_beast_table.php @@ -0,0 +1,40 @@ +id(); + $table->integer('user_id')->unsigned()->unique(); + $table->integer('obtained')->default(0)->unsigned(); + $table->integer('kill_count')->default(0)->unsigned(); + $table->integer('pet_dark_core')->default(0)->unsigned(); + $table->integer('elysian_sigil')->default(0)->unsigned(); + $table->integer('spectral_sigil')->default(0)->unsigned(); + $table->integer('arcane_sigil')->default(0)->unsigned(); + $table->integer('holy_elixir')->default(0)->unsigned(); + $table->integer('spirit_shield')->default(0)->unsigned(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('corporeal_beast'); + } +} diff --git a/database/migrations/2020_08_03_230722_create_crazy_archaeologist_table.php b/database/migrations/2020_08_03_230722_create_crazy_archaeologist_table.php new file mode 100644 index 00000000..a7c0a8b9 --- /dev/null +++ b/database/migrations/2020_08_03_230722_create_crazy_archaeologist_table.php @@ -0,0 +1,37 @@ +id(); + $table->integer('user_id')->unsigned()->unique(); + $table->integer('obtained')->default(0)->unsigned(); + $table->integer('kill_count')->default(0)->unsigned(); + $table->integer('odium_shard_2')->default(0)->unsigned(); + $table->integer('malediction_shard_2')->default(0)->unsigned(); + $table->integer('fedora')->default(0)->unsigned(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('crazy_archaeologist'); + } +} diff --git a/database/migrations/2020_07_05_133125_create_dagannoth_kings_table.php b/database/migrations/2020_08_03_230723_create_dagannoth_kings_table.php similarity index 100% rename from database/migrations/2020_07_05_133125_create_dagannoth_kings_table.php rename to database/migrations/2020_08_03_230723_create_dagannoth_kings_table.php diff --git a/database/migrations/2020_08_03_230723_create_general_graardor_table.php b/database/migrations/2020_08_03_230723_create_general_graardor_table.php new file mode 100644 index 00000000..730ec37d --- /dev/null +++ b/database/migrations/2020_08_03_230723_create_general_graardor_table.php @@ -0,0 +1,42 @@ +id(); + $table->integer('user_id')->unsigned()->unique(); + $table->integer('obtained')->default(0)->unsigned(); + $table->integer('kill_count')->default(0)->unsigned(); + $table->integer('pet_general_graardor')->default(0)->unsigned(); + $table->integer('bandos_chestplate')->default(0)->unsigned(); + $table->integer('bandos_tassets')->default(0)->unsigned(); + $table->integer('bandos_boots')->default(0)->unsigned(); + $table->integer('bandos_hilt')->default(0)->unsigned(); + $table->integer('godsword_shard_1')->default(0)->unsigned(); + $table->integer('godsword_shard_2')->default(0)->unsigned(); + $table->integer('godsword_shard_3')->default(0)->unsigned(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('general_graardor'); + } +} diff --git a/database/migrations/2020_08_03_230723_create_giant_mole_table.php b/database/migrations/2020_08_03_230723_create_giant_mole_table.php new file mode 100644 index 00000000..2efb93ba --- /dev/null +++ b/database/migrations/2020_08_03_230723_create_giant_mole_table.php @@ -0,0 +1,37 @@ +id(); + $table->integer('user_id')->unsigned()->unique(); + $table->integer('obtained')->default(0)->unsigned(); + $table->integer('kill_count')->default(0)->unsigned(); + $table->integer('baby_mole')->default(0)->unsigned(); + $table->integer('mole_skin')->default(0)->unsigned(); + $table->integer('mole_claw')->default(0)->unsigned(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('giant_mole'); + } +} diff --git a/database/migrations/2020_07_05_133126_create_grotesque_guardians_table.php b/database/migrations/2020_08_03_230723_create_grotesque_guardians_table.php similarity index 100% rename from database/migrations/2020_07_05_133126_create_grotesque_guardians_table.php rename to database/migrations/2020_08_03_230723_create_grotesque_guardians_table.php diff --git a/database/migrations/2020_08_03_230724_create_hespori_table.php b/database/migrations/2020_08_03_230724_create_hespori_table.php new file mode 100644 index 00000000..0623f432 --- /dev/null +++ b/database/migrations/2020_08_03_230724_create_hespori_table.php @@ -0,0 +1,38 @@ +id(); + $table->integer('user_id')->unsigned()->unique(); + $table->integer('obtained')->default(0)->unsigned(); + $table->integer('kill_count')->default(0)->unsigned(); + $table->integer('bottomless_compost_bucket')->default(0)->unsigned(); + $table->integer('iasor_seed')->default(0)->unsigned(); + $table->integer('kronos_seed')->default(0)->unsigned(); + $table->integer('attas_seed')->default(0)->unsigned(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('hespori'); + } +} diff --git a/database/migrations/2020_08_03_230724_create_kalphite_queen_table.php b/database/migrations/2020_08_03_230724_create_kalphite_queen_table.php new file mode 100644 index 00000000..2513b9d5 --- /dev/null +++ b/database/migrations/2020_08_03_230724_create_kalphite_queen_table.php @@ -0,0 +1,39 @@ +id(); + $table->integer('user_id')->unsigned()->unique(); + $table->integer('obtained')->default(0)->unsigned(); + $table->integer('kill_count')->default(0)->unsigned(); + $table->integer('kalphite_princess')->default(0)->unsigned(); + $table->integer('kq_head')->default(0)->unsigned(); + $table->integer('jar_of_sand')->default(0)->unsigned(); + $table->integer('dragon_2h_sword')->default(0)->unsigned(); + $table->integer('dragon_chainbody')->default(0)->unsigned(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('kalphite_queen'); + } +} diff --git a/database/migrations/2020_08_03_230724_create_king_black_dragon_table.php b/database/migrations/2020_08_03_230724_create_king_black_dragon_table.php new file mode 100644 index 00000000..2db65b1c --- /dev/null +++ b/database/migrations/2020_08_03_230724_create_king_black_dragon_table.php @@ -0,0 +1,38 @@ +id(); + $table->integer('user_id')->unsigned()->unique(); + $table->integer('obtained')->default(0)->unsigned(); + $table->integer('kill_count')->default(0)->unsigned(); + $table->integer('prince_black_dragon')->default(0)->unsigned(); + $table->integer('kbd_heads')->default(0)->unsigned(); + $table->integer('dragon_pickaxe')->default(0)->unsigned(); + $table->integer('draconic_visage')->default(0)->unsigned(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('king_black_dragon'); + } +} diff --git a/database/migrations/2020_08_03_230724_create_kraken_table.php b/database/migrations/2020_08_03_230724_create_kraken_table.php new file mode 100644 index 00000000..c2108932 --- /dev/null +++ b/database/migrations/2020_08_03_230724_create_kraken_table.php @@ -0,0 +1,38 @@ +id(); + $table->integer('user_id')->unsigned()->unique(); + $table->integer('obtained')->default(0)->unsigned(); + $table->integer('kill_count')->default(0)->unsigned(); + $table->integer('pet_kraken')->default(0)->unsigned(); + $table->integer('kraken_tentacle')->default(0)->unsigned(); + $table->integer('trident_of_the_seas_(full)')->default(0)->unsigned(); + $table->integer('jar_of_dirt')->default(0)->unsigned(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('kraken'); + } +} diff --git a/database/migrations/2020_08_03_230724_create_kreearra_table.php b/database/migrations/2020_08_03_230724_create_kreearra_table.php new file mode 100644 index 00000000..9dc4d3f7 --- /dev/null +++ b/database/migrations/2020_08_03_230724_create_kreearra_table.php @@ -0,0 +1,42 @@ +id(); + $table->integer('user_id')->unsigned()->unique(); + $table->integer('obtained')->default(0)->unsigned(); + $table->integer('kill_count')->default(0)->unsigned(); + $table->integer('pet_kreearra')->default(0)->unsigned(); + $table->integer('armadyl_helmet')->default(0)->unsigned(); + $table->integer('armadyl_chestplate')->default(0)->unsigned(); + $table->integer('armadyl_chainskirt')->default(0)->unsigned(); + $table->integer('armadyl_hilt')->default(0)->unsigned(); + $table->integer('godsword_shard_1')->default(0)->unsigned(); + $table->integer('godsword_shard_2')->default(0)->unsigned(); + $table->integer('godsword_shard_3')->default(0)->unsigned(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('kreearra'); + } +} diff --git a/database/migrations/2020_08_03_230725_create_kril_tsutsaroth_table.php b/database/migrations/2020_08_03_230725_create_kril_tsutsaroth_table.php new file mode 100644 index 00000000..f01bf008 --- /dev/null +++ b/database/migrations/2020_08_03_230725_create_kril_tsutsaroth_table.php @@ -0,0 +1,42 @@ +id(); + $table->integer('user_id')->unsigned()->unique(); + $table->integer('obtained')->default(0)->unsigned(); + $table->integer('kill_count')->default(0)->unsigned(); + $table->integer('pet_kril_tsutsaroth')->default(0)->unsigned(); + $table->integer('staff_of_the_dead')->default(0)->unsigned(); + $table->integer('zamorakian_spear')->default(0)->unsigned(); + $table->integer('steam_battlestaff')->default(0)->unsigned(); + $table->integer('zamorak_hilt')->default(0)->unsigned(); + $table->integer('godsword_shard_1')->default(0)->unsigned(); + $table->integer('godsword_shard_2')->default(0)->unsigned(); + $table->integer('godsword_shard_3')->default(0)->unsigned(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('kril_tsutsaroth'); + } +} diff --git a/database/migrations/2020_08_03_230725_create_obor_table.php b/database/migrations/2020_08_03_230725_create_obor_table.php new file mode 100644 index 00000000..2cda47fd --- /dev/null +++ b/database/migrations/2020_08_03_230725_create_obor_table.php @@ -0,0 +1,35 @@ +id(); + $table->integer('user_id')->unsigned()->unique(); + $table->integer('obtained')->default(0)->unsigned(); + $table->integer('kill_count')->default(0)->unsigned(); + $table->integer('hill_giant_club')->default(0)->unsigned(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('obor'); + } +} diff --git a/database/migrations/2020_07_05_133128_create_sarachnis_table.php b/database/migrations/2020_08_03_230725_create_sarachnis_table.php similarity index 100% rename from database/migrations/2020_07_05_133128_create_sarachnis_table.php rename to database/migrations/2020_08_03_230725_create_sarachnis_table.php diff --git a/database/migrations/2020_08_03_230725_create_scorpia_table.php b/database/migrations/2020_08_03_230725_create_scorpia_table.php new file mode 100644 index 00000000..65090ba0 --- /dev/null +++ b/database/migrations/2020_08_03_230725_create_scorpia_table.php @@ -0,0 +1,37 @@ +id(); + $table->integer('user_id')->unsigned()->unique(); + $table->integer('obtained')->default(0)->unsigned(); + $table->integer('kill_count')->default(0)->unsigned(); + $table->integer('scorpias_offspring')->default(0)->unsigned(); + $table->integer('odium_shard_3')->default(0)->unsigned(); + $table->integer('malediction_shard_3')->default(0)->unsigned(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('scorpia'); + } +} diff --git a/database/migrations/2020_08_03_230726_create_skotizo_table.php b/database/migrations/2020_08_03_230726_create_skotizo_table.php new file mode 100644 index 00000000..59b4a53c --- /dev/null +++ b/database/migrations/2020_08_03_230726_create_skotizo_table.php @@ -0,0 +1,40 @@ +id(); + $table->integer('user_id')->unsigned()->unique(); + $table->integer('obtained')->default(0)->unsigned(); + $table->integer('kill_count')->default(0)->unsigned(); + $table->integer('skotos')->default(0)->unsigned(); + $table->integer('jar_of_darkness')->default(0)->unsigned(); + $table->integer('dark_claw')->default(0)->unsigned(); + $table->integer('dark_totem')->default(0)->unsigned(); + $table->integer('uncut_onyx')->default(0)->unsigned(); + $table->integer('ancient_shard')->default(0)->unsigned(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('skotizo'); + } +} diff --git a/database/migrations/2020_07_05_133129_create_the_fight_caves_table.php b/database/migrations/2020_08_03_230726_create_the_fight_caves_table.php similarity index 100% rename from database/migrations/2020_07_05_133129_create_the_fight_caves_table.php rename to database/migrations/2020_08_03_230726_create_the_fight_caves_table.php diff --git a/database/migrations/2020_08_03_230726_create_the_gauntlet_table.php b/database/migrations/2020_08_03_230726_create_the_gauntlet_table.php new file mode 100644 index 00000000..39163bf3 --- /dev/null +++ b/database/migrations/2020_08_03_230726_create_the_gauntlet_table.php @@ -0,0 +1,39 @@ +id(); + $table->integer('user_id')->unsigned()->unique(); + $table->integer('obtained')->default(0)->unsigned(); + $table->integer('kill_count')->default(0)->unsigned(); + $table->integer('youngllef')->default(0)->unsigned(); + $table->integer('crystal_armour_seed')->default(0)->unsigned(); + $table->integer('crystal_weapon_seed')->default(0)->unsigned(); + $table->integer('blade_of_saeldor_(inactive)')->default(0)->unsigned(); + $table->integer('gauntlet_cape')->default(0)->unsigned(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('the_gauntlet'); + } +} diff --git a/database/migrations/2020_08_03_230726_create_the_inferno_table.php b/database/migrations/2020_08_03_230726_create_the_inferno_table.php new file mode 100644 index 00000000..333913ab --- /dev/null +++ b/database/migrations/2020_08_03_230726_create_the_inferno_table.php @@ -0,0 +1,36 @@ +id(); + $table->integer('user_id')->unsigned()->unique(); + $table->integer('obtained')->default(0)->unsigned(); + $table->integer('kill_count')->default(0)->unsigned(); + $table->integer('jal-nib-rek')->default(0)->unsigned(); + $table->integer('infernal_cape')->default(0)->unsigned(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('the_inferno'); + } +} diff --git a/database/migrations/2020_08_03_230726_create_the_nightmare_table.php b/database/migrations/2020_08_03_230726_create_the_nightmare_table.php new file mode 100644 index 00000000..1c7b14e9 --- /dev/null +++ b/database/migrations/2020_08_03_230726_create_the_nightmare_table.php @@ -0,0 +1,44 @@ +id(); + $table->integer('user_id')->unsigned()->unique(); + $table->integer('obtained')->default(0)->unsigned(); + $table->integer('kill_count')->default(0)->unsigned(); + $table->integer('little_nightmare')->default(0)->unsigned(); + $table->integer('inquisitors_mace')->default(0)->unsigned(); + $table->integer('inquisitors_great_helm')->default(0)->unsigned(); + $table->integer('inquisitors_hauberk')->default(0)->unsigned(); + $table->integer('inquisitors_plateskirt')->default(0)->unsigned(); + $table->integer('nightmare_staff')->default(0)->unsigned(); + $table->integer('volatile_orb')->default(0)->unsigned(); + $table->integer('harmonised_orb')->default(0)->unsigned(); + $table->integer('eldritch_orb')->default(0)->unsigned(); + $table->integer('jar_of_dreams')->default(0)->unsigned(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('the_nightmare'); + } +} diff --git a/database/migrations/2020_08_03_230727_create_thermonuclear_smoke_devil_table.php b/database/migrations/2020_08_03_230727_create_thermonuclear_smoke_devil_table.php new file mode 100644 index 00000000..30fda9db --- /dev/null +++ b/database/migrations/2020_08_03_230727_create_thermonuclear_smoke_devil_table.php @@ -0,0 +1,38 @@ +id(); + $table->integer('user_id')->unsigned()->unique(); + $table->integer('obtained')->default(0)->unsigned(); + $table->integer('kill_count')->default(0)->unsigned(); + $table->integer('pet_smoke_devil')->default(0)->unsigned(); + $table->integer('occult_necklace')->default(0)->unsigned(); + $table->integer('smoke_battlestaff')->default(0)->unsigned(); + $table->integer('dragon_chainbody')->default(0)->unsigned(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('thermonuclear_smoke_devil'); + } +} diff --git a/database/migrations/2020_07_05_133130_create_venenatis_table.php b/database/migrations/2020_08_03_230727_create_venenatis_table.php similarity index 100% rename from database/migrations/2020_07_05_133130_create_venenatis_table.php rename to database/migrations/2020_08_03_230727_create_venenatis_table.php diff --git a/database/migrations/2020_08_03_230727_create_vetion_table.php b/database/migrations/2020_08_03_230727_create_vetion_table.php new file mode 100644 index 00000000..88faa81b --- /dev/null +++ b/database/migrations/2020_08_03_230727_create_vetion_table.php @@ -0,0 +1,38 @@ +id(); + $table->integer('user_id')->unsigned()->unique(); + $table->integer('obtained')->default(0)->unsigned(); + $table->integer('kill_count')->default(0)->unsigned(); + $table->integer('vetion_jr')->default(0)->unsigned(); + $table->integer('ring_of_the_gods')->default(0)->unsigned(); + $table->integer('dragon_pickaxe')->default(0)->unsigned(); + $table->integer('dragon_2h_sword')->default(0)->unsigned(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('vetion'); + } +} diff --git a/database/migrations/2020_08_03_230727_create_vorkath_table.php b/database/migrations/2020_08_03_230727_create_vorkath_table.php new file mode 100644 index 00000000..db5031de --- /dev/null +++ b/database/migrations/2020_08_03_230727_create_vorkath_table.php @@ -0,0 +1,40 @@ +id(); + $table->integer('user_id')->unsigned()->unique(); + $table->integer('obtained')->default(0)->unsigned(); + $table->integer('kill_count')->default(0)->unsigned(); + $table->integer('vorki')->default(0)->unsigned(); + $table->integer('vorkaths_head')->default(0)->unsigned(); + $table->integer('draconic_visage')->default(0)->unsigned(); + $table->integer('skeletal_visage')->default(0)->unsigned(); + $table->integer('jar_of_decay')->default(0)->unsigned(); + $table->integer('dragonbone_necklace')->default(0)->unsigned(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('vorkath'); + } +} diff --git a/database/migrations/2020_08_03_230727_create_wintertodt_table.php b/database/migrations/2020_08_03_230727_create_wintertodt_table.php new file mode 100644 index 00000000..6ea87287 --- /dev/null +++ b/database/migrations/2020_08_03_230727_create_wintertodt_table.php @@ -0,0 +1,44 @@ +id(); + $table->integer('user_id')->unsigned()->unique(); + $table->integer('obtained')->default(0)->unsigned(); + $table->integer('kill_count')->default(0)->unsigned(); + $table->integer('phoenix')->default(0)->unsigned(); + $table->integer('tome_of_fire_(empty)')->default(0)->unsigned(); + $table->integer('burnt_page')->default(0)->unsigned(); + $table->integer('pyromancer_garb')->default(0)->unsigned(); + $table->integer('pyromancer_hood')->default(0)->unsigned(); + $table->integer('pyromancer_robe')->default(0)->unsigned(); + $table->integer('pyromancer_boots')->default(0)->unsigned(); + $table->integer('warm_gloves')->default(0)->unsigned(); + $table->integer('bruma_torch')->default(0)->unsigned(); + $table->integer('dragon_axe')->default(0)->unsigned(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('wintertodt'); + } +} diff --git a/database/migrations/2020_08_03_230728_create_zalcano_table.php b/database/migrations/2020_08_03_230728_create_zalcano_table.php new file mode 100644 index 00000000..d197a973 --- /dev/null +++ b/database/migrations/2020_08_03_230728_create_zalcano_table.php @@ -0,0 +1,38 @@ +id(); + $table->integer('user_id')->unsigned()->unique(); + $table->integer('obtained')->default(0)->unsigned(); + $table->integer('kill_count')->default(0)->unsigned(); + $table->integer('smolcano')->default(0)->unsigned(); + $table->integer('crystal_tool_seed')->default(0)->unsigned(); + $table->integer('zalcano_shard')->default(0)->unsigned(); + $table->integer('uncut_onyx')->default(0)->unsigned(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('zalcano'); + } +} diff --git a/database/migrations/2020_08_03_230728_create_zulrah_table.php b/database/migrations/2020_08_03_230728_create_zulrah_table.php new file mode 100644 index 00000000..8bba0b94 --- /dev/null +++ b/database/migrations/2020_08_03_230728_create_zulrah_table.php @@ -0,0 +1,44 @@ +id(); + $table->integer('user_id')->unsigned()->unique(); + $table->integer('obtained')->default(0)->unsigned(); + $table->integer('kill_count')->default(0)->unsigned(); + $table->integer('pet_snakeling')->default(0)->unsigned(); + $table->integer('tanzanite_mutagen')->default(0)->unsigned(); + $table->integer('magma_mutagen')->default(0)->unsigned(); + $table->integer('jar_of_swamp')->default(0)->unsigned(); + $table->integer('magic_fang')->default(0)->unsigned(); + $table->integer('serpentine_visage')->default(0)->unsigned(); + $table->integer('tanzanite_fang')->default(0)->unsigned(); + $table->integer('zul-andra_teleport')->default(0)->unsigned(); + $table->integer('uncut_onyx')->default(0)->unsigned(); + $table->integer('zulrahs_scales')->default(0)->unsigned(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('zulrah'); + } +} diff --git a/database/migrations/2020_07_05_133123_create_abyssal_sires_table.php b/database/migrations/dsfsddf/2020_07_05_133123_create_abyssal_sires_table.php similarity index 100% rename from database/migrations/2020_07_05_133123_create_abyssal_sires_table.php rename to database/migrations/dsfsddf/2020_07_05_133123_create_abyssal_sires_table.php diff --git a/database/migrations/2020_07_05_133123_create_alchemical_hydras_table.php b/database/migrations/dsfsddf/2020_07_05_133123_create_alchemical_hydras_table.php similarity index 100% rename from database/migrations/2020_07_05_133123_create_alchemical_hydras_table.php rename to database/migrations/dsfsddf/2020_07_05_133123_create_alchemical_hydras_table.php diff --git a/database/migrations/dsfsddf/2020_07_05_133123_create_barrows_chests_table.php b/database/migrations/dsfsddf/2020_07_05_133123_create_barrows_chests_table.php new file mode 100644 index 00000000..53cc29ec --- /dev/null +++ b/database/migrations/dsfsddf/2020_07_05_133123_create_barrows_chests_table.php @@ -0,0 +1,59 @@ +id(); + $table->integer('user_id')->unsigned()->unique(); + $table->integer('obtained')->default(0)->unsigned(); + $table->integer('kill_count')->default(0)->unsigned(); + $table->integer('karils_coif')->default(0)->unsigned(); + $table->integer('ahrims_hood')->default(0)->unsigned(); + $table->integer('dharoks_helm')->default(0)->unsigned(); + $table->integer('guthans_helm')->default(0)->unsigned(); + $table->integer('torags_helm')->default(0)->unsigned(); + $table->integer('veracs_helm')->default(0)->unsigned(); + $table->integer('karils_leathertop')->default(0)->unsigned(); + $table->integer('ahrims_robetop')->default(0)->unsigned(); + $table->integer('dharoks_platebody')->default(0)->unsigned(); + $table->integer('guthans_platebody')->default(0)->unsigned(); + $table->integer('torags_platebody')->default(0)->unsigned(); + $table->integer('veracs_brassard')->default(0)->unsigned(); + $table->integer('karils_leatherskirt')->default(0)->unsigned(); + $table->integer('ahrims_robeskirt')->default(0)->unsigned(); + $table->integer('dharoks_platelegs')->default(0)->unsigned(); + $table->integer('guthans_chainskirt')->default(0)->unsigned(); + $table->integer('torags_platelegs')->default(0)->unsigned(); + $table->integer('veracs_plateskirt')->default(0)->unsigned(); + $table->integer('karils_crossbow')->default(0)->unsigned(); + $table->integer('ahrims_staff')->default(0)->unsigned(); + $table->integer('dharoks_greataxe')->default(0)->unsigned(); + $table->integer('guthans_warspear')->default(0)->unsigned(); + $table->integer('torags_hammers')->default(0)->unsigned(); + $table->integer('veracs_flail')->default(0)->unsigned(); + $table->integer('bolt_rack')->default(0)->unsigned(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('barrows_chests'); + } +} diff --git a/database/migrations/2020_07_05_133124_create_bryophytas_table.php b/database/migrations/dsfsddf/2020_07_05_133124_create_bryophytas_table.php similarity index 100% rename from database/migrations/2020_07_05_133124_create_bryophytas_table.php rename to database/migrations/dsfsddf/2020_07_05_133124_create_bryophytas_table.php diff --git a/database/migrations/2020_07_05_133124_create_callistos_table.php b/database/migrations/dsfsddf/2020_07_05_133124_create_callistos_table.php similarity index 100% rename from database/migrations/2020_07_05_133124_create_callistos_table.php rename to database/migrations/dsfsddf/2020_07_05_133124_create_callistos_table.php diff --git a/database/migrations/dsfsddf/2020_07_05_133124_create_cerberus_table.php b/database/migrations/dsfsddf/2020_07_05_133124_create_cerberus_table.php new file mode 100644 index 00000000..c262d220 --- /dev/null +++ b/database/migrations/dsfsddf/2020_07_05_133124_create_cerberus_table.php @@ -0,0 +1,41 @@ +id(); + $table->integer('user_id')->unsigned()->unique(); + $table->integer('obtained')->default(0)->unsigned(); + $table->integer('kill_count')->default(0)->unsigned(); + $table->integer('hellpuppy')->default(0)->unsigned(); + $table->integer('eternal_crystal')->default(0)->unsigned(); + $table->integer('pegasian_crystal')->default(0)->unsigned(); + $table->integer('primordial_crystal')->default(0)->unsigned(); + $table->integer('jar_of_souls')->default(0)->unsigned(); + $table->integer('smouldering_stone')->default(0)->unsigned(); + $table->integer('key_master_teleport')->default(0)->unsigned(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('cerberus'); + } +} diff --git a/database/migrations/2020_07_05_133124_create_chaos_elementals_table.php b/database/migrations/dsfsddf/2020_07_05_133124_create_chaos_elementals_table.php similarity index 100% rename from database/migrations/2020_07_05_133124_create_chaos_elementals_table.php rename to database/migrations/dsfsddf/2020_07_05_133124_create_chaos_elementals_table.php diff --git a/database/migrations/2020_07_05_133125_create_chaos_fanatics_table.php b/database/migrations/dsfsddf/2020_07_05_133125_create_chaos_fanatics_table.php similarity index 100% rename from database/migrations/2020_07_05_133125_create_chaos_fanatics_table.php rename to database/migrations/dsfsddf/2020_07_05_133125_create_chaos_fanatics_table.php diff --git a/database/migrations/2020_07_05_133125_create_commander_zilyanas_table.php b/database/migrations/dsfsddf/2020_07_05_133125_create_commander_zilyanas_table.php similarity index 100% rename from database/migrations/2020_07_05_133125_create_commander_zilyanas_table.php rename to database/migrations/dsfsddf/2020_07_05_133125_create_commander_zilyanas_table.php diff --git a/database/migrations/2020_07_05_133125_create_corporeal_beasts_table.php b/database/migrations/dsfsddf/2020_07_05_133125_create_corporeal_beasts_table.php similarity index 100% rename from database/migrations/2020_07_05_133125_create_corporeal_beasts_table.php rename to database/migrations/dsfsddf/2020_07_05_133125_create_corporeal_beasts_table.php diff --git a/database/migrations/2020_07_05_133125_create_crazy_archaeologists_table.php b/database/migrations/dsfsddf/2020_07_05_133125_create_crazy_archaeologists_table.php similarity index 100% rename from database/migrations/2020_07_05_133125_create_crazy_archaeologists_table.php rename to database/migrations/dsfsddf/2020_07_05_133125_create_crazy_archaeologists_table.php diff --git a/database/migrations/dsfsddf/2020_07_05_133125_create_dagannoth_kings_table.php b/database/migrations/dsfsddf/2020_07_05_133125_create_dagannoth_kings_table.php new file mode 100644 index 00000000..aa0bcb43 --- /dev/null +++ b/database/migrations/dsfsddf/2020_07_05_133125_create_dagannoth_kings_table.php @@ -0,0 +1,44 @@ +id(); + $table->integer('user_id')->unsigned()->unique(); + $table->integer('obtained')->default(0)->unsigned(); + $table->integer('kill_count')->default(0)->unsigned(); + $table->integer('pet_dagannoth_prime')->default(0)->unsigned(); + $table->integer('pet_dagannoth_supreme')->default(0)->unsigned(); + $table->integer('pet_dagannoth_rex')->default(0)->unsigned(); + $table->integer('berserker_ring')->default(0)->unsigned(); + $table->integer('archers_ring')->default(0)->unsigned(); + $table->integer('seers_ring')->default(0)->unsigned(); + $table->integer('warrior_ring')->default(0)->unsigned(); + $table->integer('dragon_axe')->default(0)->unsigned(); + $table->integer('seercull')->default(0)->unsigned(); + $table->integer('mud_battlestaff')->default(0)->unsigned(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('dagannoth_kings'); + } +} diff --git a/database/migrations/2020_07_05_133126_create_general_graardors_table.php b/database/migrations/dsfsddf/2020_07_05_133126_create_general_graardors_table.php similarity index 100% rename from database/migrations/2020_07_05_133126_create_general_graardors_table.php rename to database/migrations/dsfsddf/2020_07_05_133126_create_general_graardors_table.php diff --git a/database/migrations/2020_07_05_133126_create_giant_moles_table.php b/database/migrations/dsfsddf/2020_07_05_133126_create_giant_moles_table.php similarity index 100% rename from database/migrations/2020_07_05_133126_create_giant_moles_table.php rename to database/migrations/dsfsddf/2020_07_05_133126_create_giant_moles_table.php diff --git a/database/migrations/dsfsddf/2020_07_05_133126_create_grotesque_guardians_table.php b/database/migrations/dsfsddf/2020_07_05_133126_create_grotesque_guardians_table.php new file mode 100644 index 00000000..fb6a366e --- /dev/null +++ b/database/migrations/dsfsddf/2020_07_05_133126_create_grotesque_guardians_table.php @@ -0,0 +1,41 @@ +id(); + $table->integer('user_id')->unsigned()->unique(); + $table->integer('obtained')->default(0)->unsigned(); + $table->integer('kill_count')->default(0)->unsigned(); + $table->integer('noon')->default(0)->unsigned(); + $table->integer('black_tourmaline_core')->default(0)->unsigned(); + $table->integer('granite_gloves')->default(0)->unsigned(); + $table->integer('granite_ring')->default(0)->unsigned(); + $table->integer('granite_hammer')->default(0)->unsigned(); + $table->integer('jar_of_stone')->default(0)->unsigned(); + $table->integer('granite_dust')->default(0)->unsigned(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('grotesque_guardians'); + } +} diff --git a/database/migrations/2020_07_05_133126_create_hesporis_table.php b/database/migrations/dsfsddf/2020_07_05_133126_create_hesporis_table.php similarity index 100% rename from database/migrations/2020_07_05_133126_create_hesporis_table.php rename to database/migrations/dsfsddf/2020_07_05_133126_create_hesporis_table.php diff --git a/database/migrations/2020_07_05_133127_create_kalphite_queens_table.php b/database/migrations/dsfsddf/2020_07_05_133127_create_kalphite_queens_table.php similarity index 100% rename from database/migrations/2020_07_05_133127_create_kalphite_queens_table.php rename to database/migrations/dsfsddf/2020_07_05_133127_create_kalphite_queens_table.php diff --git a/database/migrations/2020_07_05_133127_create_king_black_dragons_table.php b/database/migrations/dsfsddf/2020_07_05_133127_create_king_black_dragons_table.php similarity index 100% rename from database/migrations/2020_07_05_133127_create_king_black_dragons_table.php rename to database/migrations/dsfsddf/2020_07_05_133127_create_king_black_dragons_table.php diff --git a/database/migrations/2020_07_05_133127_create_krakens_table.php b/database/migrations/dsfsddf/2020_07_05_133127_create_krakens_table.php similarity index 100% rename from database/migrations/2020_07_05_133127_create_krakens_table.php rename to database/migrations/dsfsddf/2020_07_05_133127_create_krakens_table.php diff --git a/database/migrations/2020_07_05_133127_create_kreearras_table.php b/database/migrations/dsfsddf/2020_07_05_133127_create_kreearras_table.php similarity index 100% rename from database/migrations/2020_07_05_133127_create_kreearras_table.php rename to database/migrations/dsfsddf/2020_07_05_133127_create_kreearras_table.php diff --git a/database/migrations/2020_07_05_133128_create_kril_tsutsaroths_table.php b/database/migrations/dsfsddf/2020_07_05_133128_create_kril_tsutsaroths_table.php similarity index 100% rename from database/migrations/2020_07_05_133128_create_kril_tsutsaroths_table.php rename to database/migrations/dsfsddf/2020_07_05_133128_create_kril_tsutsaroths_table.php diff --git a/database/migrations/2020_07_05_133128_create_obors_table.php b/database/migrations/dsfsddf/2020_07_05_133128_create_obors_table.php similarity index 100% rename from database/migrations/2020_07_05_133128_create_obors_table.php rename to database/migrations/dsfsddf/2020_07_05_133128_create_obors_table.php diff --git a/database/migrations/dsfsddf/2020_07_05_133128_create_sarachnis_table.php b/database/migrations/dsfsddf/2020_07_05_133128_create_sarachnis_table.php new file mode 100644 index 00000000..596c6a2d --- /dev/null +++ b/database/migrations/dsfsddf/2020_07_05_133128_create_sarachnis_table.php @@ -0,0 +1,38 @@ +id(); + $table->integer('user_id')->unsigned()->unique(); + $table->integer('obtained')->default(0)->unsigned(); + $table->integer('kill_count')->default(0)->unsigned(); + $table->integer('sraracha')->default(0)->unsigned(); + $table->integer('jar_of_eyes')->default(0)->unsigned(); + $table->integer('giant_egg_sac(full)')->default(0)->unsigned(); + $table->integer('sarachnis_cudgel')->default(0)->unsigned(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('sarachnis'); + } +} diff --git a/database/migrations/2020_07_05_133128_create_scorpias_table.php b/database/migrations/dsfsddf/2020_07_05_133128_create_scorpias_table.php similarity index 100% rename from database/migrations/2020_07_05_133128_create_scorpias_table.php rename to database/migrations/dsfsddf/2020_07_05_133128_create_scorpias_table.php diff --git a/database/migrations/2020_07_05_133129_create_skotizos_table.php b/database/migrations/dsfsddf/2020_07_05_133129_create_skotizos_table.php similarity index 100% rename from database/migrations/2020_07_05_133129_create_skotizos_table.php rename to database/migrations/dsfsddf/2020_07_05_133129_create_skotizos_table.php diff --git a/database/migrations/dsfsddf/2020_07_05_133129_create_the_fight_caves_table.php b/database/migrations/dsfsddf/2020_07_05_133129_create_the_fight_caves_table.php new file mode 100644 index 00000000..1909b902 --- /dev/null +++ b/database/migrations/dsfsddf/2020_07_05_133129_create_the_fight_caves_table.php @@ -0,0 +1,36 @@ +id(); + $table->integer('user_id')->unsigned()->unique(); + $table->integer('obtained')->default(0)->unsigned(); + $table->integer('kill_count')->default(0)->unsigned(); + $table->integer('tzrek-jad')->default(0)->unsigned(); + $table->integer('fire_cape')->default(0)->unsigned(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('the_fight_caves'); + } +} diff --git a/database/migrations/2020_07_05_133129_create_the_gauntlets_table.php b/database/migrations/dsfsddf/2020_07_05_133129_create_the_gauntlets_table.php similarity index 100% rename from database/migrations/2020_07_05_133129_create_the_gauntlets_table.php rename to database/migrations/dsfsddf/2020_07_05_133129_create_the_gauntlets_table.php diff --git a/database/migrations/2020_07_05_133129_create_the_infernos_table.php b/database/migrations/dsfsddf/2020_07_05_133129_create_the_infernos_table.php similarity index 100% rename from database/migrations/2020_07_05_133129_create_the_infernos_table.php rename to database/migrations/dsfsddf/2020_07_05_133129_create_the_infernos_table.php diff --git a/database/migrations/2020_07_05_133130_create_the_nightmares_table.php b/database/migrations/dsfsddf/2020_07_05_133130_create_the_nightmares_table.php similarity index 100% rename from database/migrations/2020_07_05_133130_create_the_nightmares_table.php rename to database/migrations/dsfsddf/2020_07_05_133130_create_the_nightmares_table.php diff --git a/database/migrations/2020_07_05_133130_create_thermonuclear_smoke_devils_table.php b/database/migrations/dsfsddf/2020_07_05_133130_create_thermonuclear_smoke_devils_table.php similarity index 100% rename from database/migrations/2020_07_05_133130_create_thermonuclear_smoke_devils_table.php rename to database/migrations/dsfsddf/2020_07_05_133130_create_thermonuclear_smoke_devils_table.php diff --git a/database/migrations/dsfsddf/2020_07_05_133130_create_venenatis_table.php b/database/migrations/dsfsddf/2020_07_05_133130_create_venenatis_table.php new file mode 100644 index 00000000..eaecdba6 --- /dev/null +++ b/database/migrations/dsfsddf/2020_07_05_133130_create_venenatis_table.php @@ -0,0 +1,38 @@ +id(); + $table->integer('user_id')->unsigned()->unique(); + $table->integer('obtained')->default(0)->unsigned(); + $table->integer('kill_count')->default(0)->unsigned(); + $table->integer('venenatis_spiderling')->default(0)->unsigned(); + $table->integer('treasonous_ring')->default(0)->unsigned(); + $table->integer('dragon_pickaxe')->default(0)->unsigned(); + $table->integer('dragon_2h_sword')->default(0)->unsigned(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('venenatis'); + } +} diff --git a/database/migrations/2020_07_05_133130_create_vetions_table.php b/database/migrations/dsfsddf/2020_07_05_133130_create_vetions_table.php similarity index 100% rename from database/migrations/2020_07_05_133130_create_vetions_table.php rename to database/migrations/dsfsddf/2020_07_05_133130_create_vetions_table.php diff --git a/database/migrations/2020_07_05_133130_create_vorkaths_table.php b/database/migrations/dsfsddf/2020_07_05_133130_create_vorkaths_table.php similarity index 100% rename from database/migrations/2020_07_05_133130_create_vorkaths_table.php rename to database/migrations/dsfsddf/2020_07_05_133130_create_vorkaths_table.php diff --git a/database/migrations/2020_07_05_133131_create_wintertodts_table.php b/database/migrations/dsfsddf/2020_07_05_133131_create_wintertodts_table.php similarity index 100% rename from database/migrations/2020_07_05_133131_create_wintertodts_table.php rename to database/migrations/dsfsddf/2020_07_05_133131_create_wintertodts_table.php diff --git a/database/migrations/2020_07_05_133131_create_zalcanos_table.php b/database/migrations/dsfsddf/2020_07_05_133131_create_zalcanos_table.php similarity index 100% rename from database/migrations/2020_07_05_133131_create_zalcanos_table.php rename to database/migrations/dsfsddf/2020_07_05_133131_create_zalcanos_table.php diff --git a/database/migrations/2020_07_05_133131_create_zulrahs_table.php b/database/migrations/dsfsddf/2020_07_05_133131_create_zulrahs_table.php similarity index 100% rename from database/migrations/2020_07_05_133131_create_zulrahs_table.php rename to database/migrations/dsfsddf/2020_07_05_133131_create_zulrahs_table.php From d206e5a40df9fc7a5fd2e2d2661acd37d9d7ed5d Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 6 Aug 2020 01:16:58 +0200 Subject: [PATCH 04/10] Test collection --- app/Boss/Goblin.php | 23 +++++++++++ app/Http/Controllers/CollectionController.php | 32 ++++++++++----- .../2020_08_05_225546_create_goblin_table.php | 40 +++++++++++++++++++ database/seeds/CollectionSeeder.php | 1 + 4 files changed, 85 insertions(+), 11 deletions(-) create mode 100644 app/Boss/Goblin.php create mode 100644 database/migrations/2020_08_05_225546_create_goblin_table.php diff --git a/app/Boss/Goblin.php b/app/Boss/Goblin.php new file mode 100644 index 00000000..0b02266b --- /dev/null +++ b/app/Boss/Goblin.php @@ -0,0 +1,23 @@ +getUserCollectionLog($collection->collection_type, $user->id); + if ($collection) { + $collectionLog = $this->getUserCollectionLog($collection->collection_type, $user->id); - if ($collectionLog) { - return response()->json($collectionLog, 200); - } else { - $test = $this->store($collectionName, $user->id); + if ($collectionLog) { + return response()->json($collectionLog, 200); + } else { + // return response()->json("This user does not have any registered loot for this collection", 404); + + $test = $this->store($collectionName, $user->id); - return response()->json($test, 201); + return response()->json($test, 201); + } + } else { + return response()->json("This collection does not exist", 404); } } else { return response()->json("This user could not be found", 404); @@ -94,14 +100,18 @@ public function update($collectionName, Request $request) { if ($user) { $collection = Collection::findByName($collectionName); - $collectionLog = $this->getUserCollectionLog($collection->collection_type, $user->id); + if ($collection) { + $collectionLog = $this->getUserCollectionLog($collection->collection_type, $user->id); - if ($collectionLog) { - $collectionLog->update($request->all()); + if ($collectionLog) { + $collectionLog->update($request->all()); - return response()->json($collectionLog, 201); + return response()->json($collectionLog, 201); + } else { + return response()->json("This user does not have any registered loot for this collection", 404); + } } else { - return response()->json("This user does not have any registered loot for this collection", 404); + return response()->json("This collection does not exist", 404); } } else { return response()->json("This user could not be found", 404); diff --git a/database/migrations/2020_08_05_225546_create_goblin_table.php b/database/migrations/2020_08_05_225546_create_goblin_table.php new file mode 100644 index 00000000..092567f2 --- /dev/null +++ b/database/migrations/2020_08_05_225546_create_goblin_table.php @@ -0,0 +1,40 @@ +id(); + $table->integer('user_id')->unsigned()->unique(); + $table->integer('obtained')->default(0)->unsigned(); + $table->integer('kill_count')->default(0)->unsigned(); + $table->integer('bones')->default(0)->unsigned(); + $table->integer('water_rune')->default(0)->unsigned(); + $table->integer('coins')->default(0)->unsigned(); + $table->integer('hammer')->default(0)->unsigned(); + $table->integer('beer')->default(0)->unsigned(); + $table->integer('goblin_mail')->default(0)->unsigned(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('goblin'); + } +} diff --git a/database/seeds/CollectionSeeder.php b/database/seeds/CollectionSeeder.php index 7253eb2a..9f1695b3 100644 --- a/database/seeds/CollectionSeeder.php +++ b/database/seeds/CollectionSeeder.php @@ -48,6 +48,7 @@ public function run() ["name" => "wintertodt", "collection_type" => "App\Boss\Wintertodt"], ["name" => "zalcano", "collection_type" => "App\Boss\Zalcano"], ["name" => "zulrah", "collection_type" => "App\Boss\Zulrah"], + ["name" => "goblin", "collection_type" => "App\Boss\Goblin"], // TODO remove later ]); } } From 034b33a49521d8e3f33b00632d7ef2c6e8d03d3c Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 6 Aug 2020 02:17:58 +0200 Subject: [PATCH 05/10] Cleanup from some weird folder --- ...7_05_133123_create_abyssal_sires_table.php | 43 -------------- ..._133123_create_alchemical_hydras_table.php | 45 -------------- ..._05_133123_create_barrows_chests_table.php | 59 ------------------- ...0_07_05_133124_create_bryophytas_table.php | 35 ----------- ...20_07_05_133124_create_callistos_table.php | 38 ------------ ...020_07_05_133124_create_cerberus_table.php | 41 ------------- ...5_133124_create_chaos_elementals_table.php | 37 ------------ ..._05_133125_create_chaos_fanatics_table.php | 37 ------------ ...133125_create_commander_zilyanas_table.php | 42 ------------- ...5_133125_create_corporeal_beasts_table.php | 40 ------------- ...3125_create_crazy_archaeologists_table.php | 37 ------------ ...05_133125_create_dagannoth_kings_table.php | 44 -------------- ..._133126_create_general_graardors_table.php | 42 ------------- ..._07_05_133126_create_giant_moles_table.php | 37 ------------ ...33126_create_grotesque_guardians_table.php | 41 ------------- ...020_07_05_133126_create_hesporis_table.php | 38 ------------ ...05_133127_create_kalphite_queens_table.php | 39 ------------ ...133127_create_king_black_dragons_table.php | 38 ------------ ...2020_07_05_133127_create_krakens_table.php | 38 ------------ ...20_07_05_133127_create_kreearras_table.php | 42 ------------- ...5_133128_create_kril_tsutsaroths_table.php | 42 ------------- .../2020_07_05_133128_create_obors_table.php | 35 ----------- ...20_07_05_133128_create_sarachnis_table.php | 38 ------------ ...020_07_05_133128_create_scorpias_table.php | 37 ------------ ...020_07_05_133129_create_skotizos_table.php | 40 ------------- ...05_133129_create_the_fight_caves_table.php | 36 ----------- ...7_05_133129_create_the_gauntlets_table.php | 39 ------------ ...07_05_133129_create_the_infernos_table.php | 36 ----------- ..._05_133130_create_the_nightmares_table.php | 44 -------------- ...reate_thermonuclear_smoke_devils_table.php | 38 ------------ ...20_07_05_133130_create_venenatis_table.php | 38 ------------ ...2020_07_05_133130_create_vetions_table.php | 38 ------------ ...020_07_05_133130_create_vorkaths_table.php | 40 ------------- ..._07_05_133131_create_wintertodts_table.php | 44 -------------- ...020_07_05_133131_create_zalcanos_table.php | 38 ------------ ...2020_07_05_133131_create_zulrahs_table.php | 44 -------------- 36 files changed, 1440 deletions(-) delete mode 100644 database/migrations/dsfsddf/2020_07_05_133123_create_abyssal_sires_table.php delete mode 100644 database/migrations/dsfsddf/2020_07_05_133123_create_alchemical_hydras_table.php delete mode 100644 database/migrations/dsfsddf/2020_07_05_133123_create_barrows_chests_table.php delete mode 100644 database/migrations/dsfsddf/2020_07_05_133124_create_bryophytas_table.php delete mode 100644 database/migrations/dsfsddf/2020_07_05_133124_create_callistos_table.php delete mode 100644 database/migrations/dsfsddf/2020_07_05_133124_create_cerberus_table.php delete mode 100644 database/migrations/dsfsddf/2020_07_05_133124_create_chaos_elementals_table.php delete mode 100644 database/migrations/dsfsddf/2020_07_05_133125_create_chaos_fanatics_table.php delete mode 100644 database/migrations/dsfsddf/2020_07_05_133125_create_commander_zilyanas_table.php delete mode 100644 database/migrations/dsfsddf/2020_07_05_133125_create_corporeal_beasts_table.php delete mode 100644 database/migrations/dsfsddf/2020_07_05_133125_create_crazy_archaeologists_table.php delete mode 100644 database/migrations/dsfsddf/2020_07_05_133125_create_dagannoth_kings_table.php delete mode 100644 database/migrations/dsfsddf/2020_07_05_133126_create_general_graardors_table.php delete mode 100644 database/migrations/dsfsddf/2020_07_05_133126_create_giant_moles_table.php delete mode 100644 database/migrations/dsfsddf/2020_07_05_133126_create_grotesque_guardians_table.php delete mode 100644 database/migrations/dsfsddf/2020_07_05_133126_create_hesporis_table.php delete mode 100644 database/migrations/dsfsddf/2020_07_05_133127_create_kalphite_queens_table.php delete mode 100644 database/migrations/dsfsddf/2020_07_05_133127_create_king_black_dragons_table.php delete mode 100644 database/migrations/dsfsddf/2020_07_05_133127_create_krakens_table.php delete mode 100644 database/migrations/dsfsddf/2020_07_05_133127_create_kreearras_table.php delete mode 100644 database/migrations/dsfsddf/2020_07_05_133128_create_kril_tsutsaroths_table.php delete mode 100644 database/migrations/dsfsddf/2020_07_05_133128_create_obors_table.php delete mode 100644 database/migrations/dsfsddf/2020_07_05_133128_create_sarachnis_table.php delete mode 100644 database/migrations/dsfsddf/2020_07_05_133128_create_scorpias_table.php delete mode 100644 database/migrations/dsfsddf/2020_07_05_133129_create_skotizos_table.php delete mode 100644 database/migrations/dsfsddf/2020_07_05_133129_create_the_fight_caves_table.php delete mode 100644 database/migrations/dsfsddf/2020_07_05_133129_create_the_gauntlets_table.php delete mode 100644 database/migrations/dsfsddf/2020_07_05_133129_create_the_infernos_table.php delete mode 100644 database/migrations/dsfsddf/2020_07_05_133130_create_the_nightmares_table.php delete mode 100644 database/migrations/dsfsddf/2020_07_05_133130_create_thermonuclear_smoke_devils_table.php delete mode 100644 database/migrations/dsfsddf/2020_07_05_133130_create_venenatis_table.php delete mode 100644 database/migrations/dsfsddf/2020_07_05_133130_create_vetions_table.php delete mode 100644 database/migrations/dsfsddf/2020_07_05_133130_create_vorkaths_table.php delete mode 100644 database/migrations/dsfsddf/2020_07_05_133131_create_wintertodts_table.php delete mode 100644 database/migrations/dsfsddf/2020_07_05_133131_create_zalcanos_table.php delete mode 100644 database/migrations/dsfsddf/2020_07_05_133131_create_zulrahs_table.php diff --git a/database/migrations/dsfsddf/2020_07_05_133123_create_abyssal_sires_table.php b/database/migrations/dsfsddf/2020_07_05_133123_create_abyssal_sires_table.php deleted file mode 100644 index 7b1092fc..00000000 --- a/database/migrations/dsfsddf/2020_07_05_133123_create_abyssal_sires_table.php +++ /dev/null @@ -1,43 +0,0 @@ -id(); - $table->integer('user_id')->unsigned()->unique(); - $table->integer('obtained')->default(0)->unsigned(); - $table->integer('kill_count')->default(0)->unsigned(); - $table->integer('abyssal_orphan')->default(0)->unsigned(); - $table->integer('unsired')->default(0)->unsigned(); - $table->integer('abyssal_head')->default(0)->unsigned(); - $table->integer('bludgeon_spine')->default(0)->unsigned(); - $table->integer('bludgeon_claw')->default(0)->unsigned(); - $table->integer('bludgeon_axon')->default(0)->unsigned(); - $table->integer('jar_of_miasma')->default(0)->unsigned(); - $table->integer('abyssal_dagger')->default(0)->unsigned(); - $table->integer('abyssal_whip')->default(0)->unsigned(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('abyssal_sires'); - } -} diff --git a/database/migrations/dsfsddf/2020_07_05_133123_create_alchemical_hydras_table.php b/database/migrations/dsfsddf/2020_07_05_133123_create_alchemical_hydras_table.php deleted file mode 100644 index 0e23473d..00000000 --- a/database/migrations/dsfsddf/2020_07_05_133123_create_alchemical_hydras_table.php +++ /dev/null @@ -1,45 +0,0 @@ -id(); - $table->integer('user_id')->unsigned()->unique(); - $table->integer('obtained')->default(0)->unsigned(); - $table->integer('kill_count')->default(0)->unsigned(); - $table->integer('ikkle_hydra')->default(0)->unsigned(); - $table->integer('hydras_claw')->default(0)->unsigned(); - $table->integer('hydra_tail')->default(0)->unsigned(); - $table->integer('hydra_leather')->default(0)->unsigned(); - $table->integer('hydras_fang')->default(0)->unsigned(); - $table->integer('hydras_eye')->default(0)->unsigned(); - $table->integer('hydras_heart')->default(0)->unsigned(); - $table->integer('dragon_knife')->default(0)->unsigned(); - $table->integer('dragon_thrownaxe')->default(0)->unsigned(); - $table->integer('jar_of_chemicals')->default(0)->unsigned(); - $table->integer('alchemical_hydra_heads')->default(0)->unsigned(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('alchemical_hydras'); - } -} diff --git a/database/migrations/dsfsddf/2020_07_05_133123_create_barrows_chests_table.php b/database/migrations/dsfsddf/2020_07_05_133123_create_barrows_chests_table.php deleted file mode 100644 index 53cc29ec..00000000 --- a/database/migrations/dsfsddf/2020_07_05_133123_create_barrows_chests_table.php +++ /dev/null @@ -1,59 +0,0 @@ -id(); - $table->integer('user_id')->unsigned()->unique(); - $table->integer('obtained')->default(0)->unsigned(); - $table->integer('kill_count')->default(0)->unsigned(); - $table->integer('karils_coif')->default(0)->unsigned(); - $table->integer('ahrims_hood')->default(0)->unsigned(); - $table->integer('dharoks_helm')->default(0)->unsigned(); - $table->integer('guthans_helm')->default(0)->unsigned(); - $table->integer('torags_helm')->default(0)->unsigned(); - $table->integer('veracs_helm')->default(0)->unsigned(); - $table->integer('karils_leathertop')->default(0)->unsigned(); - $table->integer('ahrims_robetop')->default(0)->unsigned(); - $table->integer('dharoks_platebody')->default(0)->unsigned(); - $table->integer('guthans_platebody')->default(0)->unsigned(); - $table->integer('torags_platebody')->default(0)->unsigned(); - $table->integer('veracs_brassard')->default(0)->unsigned(); - $table->integer('karils_leatherskirt')->default(0)->unsigned(); - $table->integer('ahrims_robeskirt')->default(0)->unsigned(); - $table->integer('dharoks_platelegs')->default(0)->unsigned(); - $table->integer('guthans_chainskirt')->default(0)->unsigned(); - $table->integer('torags_platelegs')->default(0)->unsigned(); - $table->integer('veracs_plateskirt')->default(0)->unsigned(); - $table->integer('karils_crossbow')->default(0)->unsigned(); - $table->integer('ahrims_staff')->default(0)->unsigned(); - $table->integer('dharoks_greataxe')->default(0)->unsigned(); - $table->integer('guthans_warspear')->default(0)->unsigned(); - $table->integer('torags_hammers')->default(0)->unsigned(); - $table->integer('veracs_flail')->default(0)->unsigned(); - $table->integer('bolt_rack')->default(0)->unsigned(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('barrows_chests'); - } -} diff --git a/database/migrations/dsfsddf/2020_07_05_133124_create_bryophytas_table.php b/database/migrations/dsfsddf/2020_07_05_133124_create_bryophytas_table.php deleted file mode 100644 index 0d45c7db..00000000 --- a/database/migrations/dsfsddf/2020_07_05_133124_create_bryophytas_table.php +++ /dev/null @@ -1,35 +0,0 @@ -id(); - $table->integer('user_id')->unsigned()->unique(); - $table->integer('obtained')->default(0)->unsigned(); - $table->integer('kill_count')->default(0)->unsigned(); - $table->integer('bryophytas_essence')->default(0)->unsigned(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('bryophytas'); - } -} diff --git a/database/migrations/dsfsddf/2020_07_05_133124_create_callistos_table.php b/database/migrations/dsfsddf/2020_07_05_133124_create_callistos_table.php deleted file mode 100644 index 8d061bcf..00000000 --- a/database/migrations/dsfsddf/2020_07_05_133124_create_callistos_table.php +++ /dev/null @@ -1,38 +0,0 @@ -id(); - $table->integer('user_id')->unsigned()->unique(); - $table->integer('obtained')->default(0)->unsigned(); - $table->integer('kill_count')->default(0)->unsigned(); - $table->integer('callisto_cub')->default(0)->unsigned(); - $table->integer('tyrannical_ring')->default(0)->unsigned(); - $table->integer('dragon_pickaxe')->default(0)->unsigned(); - $table->integer('dragon_2h_sword')->default(0)->unsigned(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('callistos'); - } -} diff --git a/database/migrations/dsfsddf/2020_07_05_133124_create_cerberus_table.php b/database/migrations/dsfsddf/2020_07_05_133124_create_cerberus_table.php deleted file mode 100644 index c262d220..00000000 --- a/database/migrations/dsfsddf/2020_07_05_133124_create_cerberus_table.php +++ /dev/null @@ -1,41 +0,0 @@ -id(); - $table->integer('user_id')->unsigned()->unique(); - $table->integer('obtained')->default(0)->unsigned(); - $table->integer('kill_count')->default(0)->unsigned(); - $table->integer('hellpuppy')->default(0)->unsigned(); - $table->integer('eternal_crystal')->default(0)->unsigned(); - $table->integer('pegasian_crystal')->default(0)->unsigned(); - $table->integer('primordial_crystal')->default(0)->unsigned(); - $table->integer('jar_of_souls')->default(0)->unsigned(); - $table->integer('smouldering_stone')->default(0)->unsigned(); - $table->integer('key_master_teleport')->default(0)->unsigned(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('cerberus'); - } -} diff --git a/database/migrations/dsfsddf/2020_07_05_133124_create_chaos_elementals_table.php b/database/migrations/dsfsddf/2020_07_05_133124_create_chaos_elementals_table.php deleted file mode 100644 index 7790735e..00000000 --- a/database/migrations/dsfsddf/2020_07_05_133124_create_chaos_elementals_table.php +++ /dev/null @@ -1,37 +0,0 @@ -id(); - $table->integer('user_id')->unsigned()->unique(); - $table->integer('obtained')->default(0)->unsigned(); - $table->integer('kill_count')->default(0)->unsigned(); - $table->integer('pet_chaos_elemental')->default(0)->unsigned(); - $table->integer('dragon_pickaxe')->default(0)->unsigned(); - $table->integer('dragon_2h_sword')->default(0)->unsigned(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('chaos_elementals'); - } -} diff --git a/database/migrations/dsfsddf/2020_07_05_133125_create_chaos_fanatics_table.php b/database/migrations/dsfsddf/2020_07_05_133125_create_chaos_fanatics_table.php deleted file mode 100644 index a4c1603b..00000000 --- a/database/migrations/dsfsddf/2020_07_05_133125_create_chaos_fanatics_table.php +++ /dev/null @@ -1,37 +0,0 @@ -id(); - $table->integer('user_id')->unsigned()->unique(); - $table->integer('obtained')->default(0)->unsigned(); - $table->integer('kill_count')->default(0)->unsigned(); - $table->integer('pet_chaos_elemental')->default(0)->unsigned(); - $table->integer('odium_shard_1')->default(0)->unsigned(); - $table->integer('malediction_shard_1')->default(0)->unsigned(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('chaos_fanatics'); - } -} diff --git a/database/migrations/dsfsddf/2020_07_05_133125_create_commander_zilyanas_table.php b/database/migrations/dsfsddf/2020_07_05_133125_create_commander_zilyanas_table.php deleted file mode 100644 index b392d0df..00000000 --- a/database/migrations/dsfsddf/2020_07_05_133125_create_commander_zilyanas_table.php +++ /dev/null @@ -1,42 +0,0 @@ -id(); - $table->integer('user_id')->unsigned()->unique(); - $table->integer('obtained')->default(0)->unsigned(); - $table->integer('kill_count')->default(0)->unsigned(); - $table->integer('pet_zilyana')->default(0)->unsigned(); - $table->integer('armadyl_crossbow')->default(0)->unsigned(); - $table->integer('saradomin_hilt')->default(0)->unsigned(); - $table->integer('saradomin_sword')->default(0)->unsigned(); - $table->integer('saradomins_light')->default(0)->unsigned(); - $table->integer('godsword_shard_1')->default(0)->unsigned(); - $table->integer('godsword_shard_2')->default(0)->unsigned(); - $table->integer('godsword_shard_3')->default(0)->unsigned(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('commander_zilyanas'); - } -} diff --git a/database/migrations/dsfsddf/2020_07_05_133125_create_corporeal_beasts_table.php b/database/migrations/dsfsddf/2020_07_05_133125_create_corporeal_beasts_table.php deleted file mode 100644 index 340a0032..00000000 --- a/database/migrations/dsfsddf/2020_07_05_133125_create_corporeal_beasts_table.php +++ /dev/null @@ -1,40 +0,0 @@ -id(); - $table->integer('user_id')->unsigned()->unique(); - $table->integer('obtained')->default(0)->unsigned(); - $table->integer('kill_count')->default(0)->unsigned(); - $table->integer('pet_dark_core')->default(0)->unsigned(); - $table->integer('elysian_sigil')->default(0)->unsigned(); - $table->integer('spectral_sigil')->default(0)->unsigned(); - $table->integer('arcane_sigil')->default(0)->unsigned(); - $table->integer('holy_elixir')->default(0)->unsigned(); - $table->integer('spirit_shield')->default(0)->unsigned(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('corporeal_beasts'); - } -} diff --git a/database/migrations/dsfsddf/2020_07_05_133125_create_crazy_archaeologists_table.php b/database/migrations/dsfsddf/2020_07_05_133125_create_crazy_archaeologists_table.php deleted file mode 100644 index 78991e7d..00000000 --- a/database/migrations/dsfsddf/2020_07_05_133125_create_crazy_archaeologists_table.php +++ /dev/null @@ -1,37 +0,0 @@ -id(); - $table->integer('user_id')->unsigned()->unique(); - $table->integer('obtained')->default(0)->unsigned(); - $table->integer('kill_count')->default(0)->unsigned(); - $table->integer('odium_shard_2')->default(0)->unsigned(); - $table->integer('malediction_shard_2')->default(0)->unsigned(); - $table->integer('fedora')->default(0)->unsigned(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('crazy_archaeologists'); - } -} diff --git a/database/migrations/dsfsddf/2020_07_05_133125_create_dagannoth_kings_table.php b/database/migrations/dsfsddf/2020_07_05_133125_create_dagannoth_kings_table.php deleted file mode 100644 index aa0bcb43..00000000 --- a/database/migrations/dsfsddf/2020_07_05_133125_create_dagannoth_kings_table.php +++ /dev/null @@ -1,44 +0,0 @@ -id(); - $table->integer('user_id')->unsigned()->unique(); - $table->integer('obtained')->default(0)->unsigned(); - $table->integer('kill_count')->default(0)->unsigned(); - $table->integer('pet_dagannoth_prime')->default(0)->unsigned(); - $table->integer('pet_dagannoth_supreme')->default(0)->unsigned(); - $table->integer('pet_dagannoth_rex')->default(0)->unsigned(); - $table->integer('berserker_ring')->default(0)->unsigned(); - $table->integer('archers_ring')->default(0)->unsigned(); - $table->integer('seers_ring')->default(0)->unsigned(); - $table->integer('warrior_ring')->default(0)->unsigned(); - $table->integer('dragon_axe')->default(0)->unsigned(); - $table->integer('seercull')->default(0)->unsigned(); - $table->integer('mud_battlestaff')->default(0)->unsigned(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('dagannoth_kings'); - } -} diff --git a/database/migrations/dsfsddf/2020_07_05_133126_create_general_graardors_table.php b/database/migrations/dsfsddf/2020_07_05_133126_create_general_graardors_table.php deleted file mode 100644 index 31950062..00000000 --- a/database/migrations/dsfsddf/2020_07_05_133126_create_general_graardors_table.php +++ /dev/null @@ -1,42 +0,0 @@ -id(); - $table->integer('user_id')->unsigned()->unique(); - $table->integer('obtained')->default(0)->unsigned(); - $table->integer('kill_count')->default(0)->unsigned(); - $table->integer('pet_general_graardor')->default(0)->unsigned(); - $table->integer('bandos_chestplate')->default(0)->unsigned(); - $table->integer('bandos_tassets')->default(0)->unsigned(); - $table->integer('bandos_boots')->default(0)->unsigned(); - $table->integer('bandos_hilt')->default(0)->unsigned(); - $table->integer('godsword_shard_1')->default(0)->unsigned(); - $table->integer('godsword_shard_2')->default(0)->unsigned(); - $table->integer('godsword_shard_3')->default(0)->unsigned(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('general_graardors'); - } -} diff --git a/database/migrations/dsfsddf/2020_07_05_133126_create_giant_moles_table.php b/database/migrations/dsfsddf/2020_07_05_133126_create_giant_moles_table.php deleted file mode 100644 index 4ef1cdb2..00000000 --- a/database/migrations/dsfsddf/2020_07_05_133126_create_giant_moles_table.php +++ /dev/null @@ -1,37 +0,0 @@ -id(); - $table->integer('user_id')->unsigned()->unique(); - $table->integer('obtained')->default(0)->unsigned(); - $table->integer('kill_count')->default(0)->unsigned(); - $table->integer('baby_mole')->default(0)->unsigned(); - $table->integer('mole_skin')->default(0)->unsigned(); - $table->integer('mole_claw')->default(0)->unsigned(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('giant_moles'); - } -} diff --git a/database/migrations/dsfsddf/2020_07_05_133126_create_grotesque_guardians_table.php b/database/migrations/dsfsddf/2020_07_05_133126_create_grotesque_guardians_table.php deleted file mode 100644 index fb6a366e..00000000 --- a/database/migrations/dsfsddf/2020_07_05_133126_create_grotesque_guardians_table.php +++ /dev/null @@ -1,41 +0,0 @@ -id(); - $table->integer('user_id')->unsigned()->unique(); - $table->integer('obtained')->default(0)->unsigned(); - $table->integer('kill_count')->default(0)->unsigned(); - $table->integer('noon')->default(0)->unsigned(); - $table->integer('black_tourmaline_core')->default(0)->unsigned(); - $table->integer('granite_gloves')->default(0)->unsigned(); - $table->integer('granite_ring')->default(0)->unsigned(); - $table->integer('granite_hammer')->default(0)->unsigned(); - $table->integer('jar_of_stone')->default(0)->unsigned(); - $table->integer('granite_dust')->default(0)->unsigned(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('grotesque_guardians'); - } -} diff --git a/database/migrations/dsfsddf/2020_07_05_133126_create_hesporis_table.php b/database/migrations/dsfsddf/2020_07_05_133126_create_hesporis_table.php deleted file mode 100644 index 458276e1..00000000 --- a/database/migrations/dsfsddf/2020_07_05_133126_create_hesporis_table.php +++ /dev/null @@ -1,38 +0,0 @@ -id(); - $table->integer('user_id')->unsigned()->unique(); - $table->integer('obtained')->default(0)->unsigned(); - $table->integer('kill_count')->default(0)->unsigned(); - $table->integer('bottomless_compost_bucket')->default(0)->unsigned(); - $table->integer('iasor_seed')->default(0)->unsigned(); - $table->integer('kronos_seed')->default(0)->unsigned(); - $table->integer('attas_seed')->default(0)->unsigned(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('hesporis'); - } -} diff --git a/database/migrations/dsfsddf/2020_07_05_133127_create_kalphite_queens_table.php b/database/migrations/dsfsddf/2020_07_05_133127_create_kalphite_queens_table.php deleted file mode 100644 index 0213656b..00000000 --- a/database/migrations/dsfsddf/2020_07_05_133127_create_kalphite_queens_table.php +++ /dev/null @@ -1,39 +0,0 @@ -id(); - $table->integer('user_id')->unsigned()->unique(); - $table->integer('obtained')->default(0)->unsigned(); - $table->integer('kill_count')->default(0)->unsigned(); - $table->integer('kalphite_princess')->default(0)->unsigned(); - $table->integer('kq_head')->default(0)->unsigned(); - $table->integer('jar_of_sand')->default(0)->unsigned(); - $table->integer('dragon_2h_sword')->default(0)->unsigned(); - $table->integer('dragon_chainbody')->default(0)->unsigned(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('kalphite_queens'); - } -} diff --git a/database/migrations/dsfsddf/2020_07_05_133127_create_king_black_dragons_table.php b/database/migrations/dsfsddf/2020_07_05_133127_create_king_black_dragons_table.php deleted file mode 100644 index e5268095..00000000 --- a/database/migrations/dsfsddf/2020_07_05_133127_create_king_black_dragons_table.php +++ /dev/null @@ -1,38 +0,0 @@ -id(); - $table->integer('user_id')->unsigned()->unique(); - $table->integer('obtained')->default(0)->unsigned(); - $table->integer('kill_count')->default(0)->unsigned(); - $table->integer('prince_black_dragon')->default(0)->unsigned(); - $table->integer('kbd_heads')->default(0)->unsigned(); - $table->integer('dragon_pickaxe')->default(0)->unsigned(); - $table->integer('draconic_visage')->default(0)->unsigned(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('king_black_dragons'); - } -} diff --git a/database/migrations/dsfsddf/2020_07_05_133127_create_krakens_table.php b/database/migrations/dsfsddf/2020_07_05_133127_create_krakens_table.php deleted file mode 100644 index 530ff240..00000000 --- a/database/migrations/dsfsddf/2020_07_05_133127_create_krakens_table.php +++ /dev/null @@ -1,38 +0,0 @@ -id(); - $table->integer('user_id')->unsigned()->unique(); - $table->integer('obtained')->default(0)->unsigned(); - $table->integer('kill_count')->default(0)->unsigned(); - $table->integer('pet_kraken')->default(0)->unsigned(); - $table->integer('kraken_tentacle')->default(0)->unsigned(); - $table->integer('trident_of_the_seas_(full)')->default(0)->unsigned(); - $table->integer('jar_of_dirt')->default(0)->unsigned(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('krakens'); - } -} diff --git a/database/migrations/dsfsddf/2020_07_05_133127_create_kreearras_table.php b/database/migrations/dsfsddf/2020_07_05_133127_create_kreearras_table.php deleted file mode 100644 index 7359db1d..00000000 --- a/database/migrations/dsfsddf/2020_07_05_133127_create_kreearras_table.php +++ /dev/null @@ -1,42 +0,0 @@ -id(); - $table->integer('user_id')->unsigned()->unique(); - $table->integer('obtained')->default(0)->unsigned(); - $table->integer('kill_count')->default(0)->unsigned(); - $table->integer('pet_kreearra')->default(0)->unsigned(); - $table->integer('armadyl_helmet')->default(0)->unsigned(); - $table->integer('armadyl_chestplate')->default(0)->unsigned(); - $table->integer('armadyl_chainskirt')->default(0)->unsigned(); - $table->integer('armadyl_hilt')->default(0)->unsigned(); - $table->integer('godsword_shard_1')->default(0)->unsigned(); - $table->integer('godsword_shard_2')->default(0)->unsigned(); - $table->integer('godsword_shard_3')->default(0)->unsigned(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('kreearras'); - } -} diff --git a/database/migrations/dsfsddf/2020_07_05_133128_create_kril_tsutsaroths_table.php b/database/migrations/dsfsddf/2020_07_05_133128_create_kril_tsutsaroths_table.php deleted file mode 100644 index 64dca0b5..00000000 --- a/database/migrations/dsfsddf/2020_07_05_133128_create_kril_tsutsaroths_table.php +++ /dev/null @@ -1,42 +0,0 @@ -id(); - $table->integer('user_id')->unsigned()->unique(); - $table->integer('obtained')->default(0)->unsigned(); - $table->integer('kill_count')->default(0)->unsigned(); - $table->integer('pet_kril_tsutsaroth')->default(0)->unsigned(); - $table->integer('staff_of_the_dead')->default(0)->unsigned(); - $table->integer('zamorakian_spear')->default(0)->unsigned(); - $table->integer('steam_battlestaff')->default(0)->unsigned(); - $table->integer('zamorak_hilt')->default(0)->unsigned(); - $table->integer('godsword_shard_1')->default(0)->unsigned(); - $table->integer('godsword_shard_2')->default(0)->unsigned(); - $table->integer('godsword_shard_3')->default(0)->unsigned(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('kril_tsutsaroths'); - } -} diff --git a/database/migrations/dsfsddf/2020_07_05_133128_create_obors_table.php b/database/migrations/dsfsddf/2020_07_05_133128_create_obors_table.php deleted file mode 100644 index b81bd1ad..00000000 --- a/database/migrations/dsfsddf/2020_07_05_133128_create_obors_table.php +++ /dev/null @@ -1,35 +0,0 @@ -id(); - $table->integer('user_id')->unsigned()->unique(); - $table->integer('obtained')->default(0)->unsigned(); - $table->integer('kill_count')->default(0)->unsigned(); - $table->integer('hill_giant_club')->default(0)->unsigned(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('obors'); - } -} diff --git a/database/migrations/dsfsddf/2020_07_05_133128_create_sarachnis_table.php b/database/migrations/dsfsddf/2020_07_05_133128_create_sarachnis_table.php deleted file mode 100644 index 596c6a2d..00000000 --- a/database/migrations/dsfsddf/2020_07_05_133128_create_sarachnis_table.php +++ /dev/null @@ -1,38 +0,0 @@ -id(); - $table->integer('user_id')->unsigned()->unique(); - $table->integer('obtained')->default(0)->unsigned(); - $table->integer('kill_count')->default(0)->unsigned(); - $table->integer('sraracha')->default(0)->unsigned(); - $table->integer('jar_of_eyes')->default(0)->unsigned(); - $table->integer('giant_egg_sac(full)')->default(0)->unsigned(); - $table->integer('sarachnis_cudgel')->default(0)->unsigned(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('sarachnis'); - } -} diff --git a/database/migrations/dsfsddf/2020_07_05_133128_create_scorpias_table.php b/database/migrations/dsfsddf/2020_07_05_133128_create_scorpias_table.php deleted file mode 100644 index 2de21565..00000000 --- a/database/migrations/dsfsddf/2020_07_05_133128_create_scorpias_table.php +++ /dev/null @@ -1,37 +0,0 @@ -id(); - $table->integer('user_id')->unsigned()->unique(); - $table->integer('obtained')->default(0)->unsigned(); - $table->integer('kill_count')->default(0)->unsigned(); - $table->integer('scorpias_offspring')->default(0)->unsigned(); - $table->integer('odium_shard_3')->default(0)->unsigned(); - $table->integer('malediction_shard_3')->default(0)->unsigned(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('scorpias'); - } -} diff --git a/database/migrations/dsfsddf/2020_07_05_133129_create_skotizos_table.php b/database/migrations/dsfsddf/2020_07_05_133129_create_skotizos_table.php deleted file mode 100644 index 87a793a4..00000000 --- a/database/migrations/dsfsddf/2020_07_05_133129_create_skotizos_table.php +++ /dev/null @@ -1,40 +0,0 @@ -id(); - $table->integer('user_id')->unsigned()->unique(); - $table->integer('obtained')->default(0)->unsigned(); - $table->integer('kill_count')->default(0)->unsigned(); - $table->integer('skotos')->default(0)->unsigned(); - $table->integer('jar_of_darkness')->default(0)->unsigned(); - $table->integer('dark_claw')->default(0)->unsigned(); - $table->integer('dark_totem')->default(0)->unsigned(); - $table->integer('uncut_onyx')->default(0)->unsigned(); - $table->integer('ancient_shard')->default(0)->unsigned(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('skotizos'); - } -} diff --git a/database/migrations/dsfsddf/2020_07_05_133129_create_the_fight_caves_table.php b/database/migrations/dsfsddf/2020_07_05_133129_create_the_fight_caves_table.php deleted file mode 100644 index 1909b902..00000000 --- a/database/migrations/dsfsddf/2020_07_05_133129_create_the_fight_caves_table.php +++ /dev/null @@ -1,36 +0,0 @@ -id(); - $table->integer('user_id')->unsigned()->unique(); - $table->integer('obtained')->default(0)->unsigned(); - $table->integer('kill_count')->default(0)->unsigned(); - $table->integer('tzrek-jad')->default(0)->unsigned(); - $table->integer('fire_cape')->default(0)->unsigned(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('the_fight_caves'); - } -} diff --git a/database/migrations/dsfsddf/2020_07_05_133129_create_the_gauntlets_table.php b/database/migrations/dsfsddf/2020_07_05_133129_create_the_gauntlets_table.php deleted file mode 100644 index f72d3b2a..00000000 --- a/database/migrations/dsfsddf/2020_07_05_133129_create_the_gauntlets_table.php +++ /dev/null @@ -1,39 +0,0 @@ -id(); - $table->integer('user_id')->unsigned()->unique(); - $table->integer('obtained')->default(0)->unsigned(); - $table->integer('kill_count')->default(0)->unsigned(); - $table->integer('youngllef')->default(0)->unsigned(); - $table->integer('crystal_armour_seed')->default(0)->unsigned(); - $table->integer('crystal_weapon_seed')->default(0)->unsigned(); - $table->integer('blade_of_saeldor_(inactive)')->default(0)->unsigned(); - $table->integer('gauntlet_cape')->default(0)->unsigned(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('the_gauntlets'); - } -} diff --git a/database/migrations/dsfsddf/2020_07_05_133129_create_the_infernos_table.php b/database/migrations/dsfsddf/2020_07_05_133129_create_the_infernos_table.php deleted file mode 100644 index 332e5a75..00000000 --- a/database/migrations/dsfsddf/2020_07_05_133129_create_the_infernos_table.php +++ /dev/null @@ -1,36 +0,0 @@ -id(); - $table->integer('user_id')->unsigned()->unique(); - $table->integer('obtained')->default(0)->unsigned(); - $table->integer('kill_count')->default(0)->unsigned(); - $table->integer('jal-nib-rek')->default(0)->unsigned(); - $table->integer('infernal_cape')->default(0)->unsigned(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('the_infernos'); - } -} diff --git a/database/migrations/dsfsddf/2020_07_05_133130_create_the_nightmares_table.php b/database/migrations/dsfsddf/2020_07_05_133130_create_the_nightmares_table.php deleted file mode 100644 index 315428f3..00000000 --- a/database/migrations/dsfsddf/2020_07_05_133130_create_the_nightmares_table.php +++ /dev/null @@ -1,44 +0,0 @@ -id(); - $table->integer('user_id')->unsigned()->unique(); - $table->integer('obtained')->default(0)->unsigned(); - $table->integer('kill_count')->default(0)->unsigned(); - $table->integer('little_nightmare')->default(0)->unsigned(); - $table->integer('inquisitors_mace')->default(0)->unsigned(); - $table->integer('inquisitors_great_helm')->default(0)->unsigned(); - $table->integer('inquisitors_hauberk')->default(0)->unsigned(); - $table->integer('inquisitors_plateskirt')->default(0)->unsigned(); - $table->integer('nightmare_staff')->default(0)->unsigned(); - $table->integer('volatile_orb')->default(0)->unsigned(); - $table->integer('harmonised_orb')->default(0)->unsigned(); - $table->integer('eldritch_orb')->default(0)->unsigned(); - $table->integer('jar_of_dreams')->default(0)->unsigned(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('the_nightmares'); - } -} diff --git a/database/migrations/dsfsddf/2020_07_05_133130_create_thermonuclear_smoke_devils_table.php b/database/migrations/dsfsddf/2020_07_05_133130_create_thermonuclear_smoke_devils_table.php deleted file mode 100644 index 71121b5d..00000000 --- a/database/migrations/dsfsddf/2020_07_05_133130_create_thermonuclear_smoke_devils_table.php +++ /dev/null @@ -1,38 +0,0 @@ -id(); - $table->integer('user_id')->unsigned()->unique(); - $table->integer('obtained')->default(0)->unsigned(); - $table->integer('kill_count')->default(0)->unsigned(); - $table->integer('pet_smoke_devil')->default(0)->unsigned(); - $table->integer('occult_necklace')->default(0)->unsigned(); - $table->integer('smoke_battlestaff')->default(0)->unsigned(); - $table->integer('dragon_chainbody')->default(0)->unsigned(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('thermonuclear_smoke_devils'); - } -} diff --git a/database/migrations/dsfsddf/2020_07_05_133130_create_venenatis_table.php b/database/migrations/dsfsddf/2020_07_05_133130_create_venenatis_table.php deleted file mode 100644 index eaecdba6..00000000 --- a/database/migrations/dsfsddf/2020_07_05_133130_create_venenatis_table.php +++ /dev/null @@ -1,38 +0,0 @@ -id(); - $table->integer('user_id')->unsigned()->unique(); - $table->integer('obtained')->default(0)->unsigned(); - $table->integer('kill_count')->default(0)->unsigned(); - $table->integer('venenatis_spiderling')->default(0)->unsigned(); - $table->integer('treasonous_ring')->default(0)->unsigned(); - $table->integer('dragon_pickaxe')->default(0)->unsigned(); - $table->integer('dragon_2h_sword')->default(0)->unsigned(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('venenatis'); - } -} diff --git a/database/migrations/dsfsddf/2020_07_05_133130_create_vetions_table.php b/database/migrations/dsfsddf/2020_07_05_133130_create_vetions_table.php deleted file mode 100644 index fd68a9c6..00000000 --- a/database/migrations/dsfsddf/2020_07_05_133130_create_vetions_table.php +++ /dev/null @@ -1,38 +0,0 @@ -id(); - $table->integer('user_id')->unsigned()->unique(); - $table->integer('obtained')->default(0)->unsigned(); - $table->integer('kill_count')->default(0)->unsigned(); - $table->integer('vetion_jr')->default(0)->unsigned(); - $table->integer('ring_of_the_gods')->default(0)->unsigned(); - $table->integer('dragon_pickaxe')->default(0)->unsigned(); - $table->integer('dragon_2h_sword')->default(0)->unsigned(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('vetions'); - } -} diff --git a/database/migrations/dsfsddf/2020_07_05_133130_create_vorkaths_table.php b/database/migrations/dsfsddf/2020_07_05_133130_create_vorkaths_table.php deleted file mode 100644 index 12a24125..00000000 --- a/database/migrations/dsfsddf/2020_07_05_133130_create_vorkaths_table.php +++ /dev/null @@ -1,40 +0,0 @@ -id(); - $table->integer('user_id')->unsigned()->unique(); - $table->integer('obtained')->default(0)->unsigned(); - $table->integer('kill_count')->default(0)->unsigned(); - $table->integer('vorki')->default(0)->unsigned(); - $table->integer('vorkaths_head')->default(0)->unsigned(); - $table->integer('draconic_visage')->default(0)->unsigned(); - $table->integer('skeletal_visage')->default(0)->unsigned(); - $table->integer('jar_of_decay')->default(0)->unsigned(); - $table->integer('dragonbone_necklace')->default(0)->unsigned(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('vorkaths'); - } -} diff --git a/database/migrations/dsfsddf/2020_07_05_133131_create_wintertodts_table.php b/database/migrations/dsfsddf/2020_07_05_133131_create_wintertodts_table.php deleted file mode 100644 index 24c4c602..00000000 --- a/database/migrations/dsfsddf/2020_07_05_133131_create_wintertodts_table.php +++ /dev/null @@ -1,44 +0,0 @@ -id(); - $table->integer('user_id')->unsigned()->unique(); - $table->integer('obtained')->default(0)->unsigned(); - $table->integer('kill_count')->default(0)->unsigned(); - $table->integer('phoenix')->default(0)->unsigned(); - $table->integer('tome_of_fire_(empty)')->default(0)->unsigned(); - $table->integer('burnt_page')->default(0)->unsigned(); - $table->integer('pyromancer_garb')->default(0)->unsigned(); - $table->integer('pyromancer_hood')->default(0)->unsigned(); - $table->integer('pyromancer_robe')->default(0)->unsigned(); - $table->integer('pyromancer_boots')->default(0)->unsigned(); - $table->integer('warm_gloves')->default(0)->unsigned(); - $table->integer('bruma_torch')->default(0)->unsigned(); - $table->integer('dragon_axe')->default(0)->unsigned(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('wintertodts'); - } -} diff --git a/database/migrations/dsfsddf/2020_07_05_133131_create_zalcanos_table.php b/database/migrations/dsfsddf/2020_07_05_133131_create_zalcanos_table.php deleted file mode 100644 index ee1e5479..00000000 --- a/database/migrations/dsfsddf/2020_07_05_133131_create_zalcanos_table.php +++ /dev/null @@ -1,38 +0,0 @@ -id(); - $table->integer('user_id')->unsigned()->unique(); - $table->integer('obtained')->default(0)->unsigned(); - $table->integer('kill_count')->default(0)->unsigned(); - $table->integer('smolcano')->default(0)->unsigned(); - $table->integer('crystal_tool_seed')->default(0)->unsigned(); - $table->integer('zalcano_shard')->default(0)->unsigned(); - $table->integer('uncut_onyx')->default(0)->unsigned(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('zalcanos'); - } -} diff --git a/database/migrations/dsfsddf/2020_07_05_133131_create_zulrahs_table.php b/database/migrations/dsfsddf/2020_07_05_133131_create_zulrahs_table.php deleted file mode 100644 index df4ca596..00000000 --- a/database/migrations/dsfsddf/2020_07_05_133131_create_zulrahs_table.php +++ /dev/null @@ -1,44 +0,0 @@ -id(); - $table->integer('user_id')->unsigned()->unique(); - $table->integer('obtained')->default(0)->unsigned(); - $table->integer('kill_count')->default(0)->unsigned(); - $table->integer('pet_snakeling')->default(0)->unsigned(); - $table->integer('tanzanite_mutagen')->default(0)->unsigned(); - $table->integer('magma_mutagen')->default(0)->unsigned(); - $table->integer('jar_of_swamp')->default(0)->unsigned(); - $table->integer('magic_fang')->default(0)->unsigned(); - $table->integer('serpentine_visage')->default(0)->unsigned(); - $table->integer('tanzanite_fang')->default(0)->unsigned(); - $table->integer('zul-andra_teleport')->default(0)->unsigned(); - $table->integer('uncut_onyx')->default(0)->unsigned(); - $table->integer('zulrahs_scales')->default(0)->unsigned(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('zulrahs'); - } -} From 9b14584b9715110aa9cb2985dd9d5aeaa8a57bd3 Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 6 Aug 2020 02:22:59 +0200 Subject: [PATCH 06/10] Collection boss list endpoint --- app/Http/Controllers/CollectionController.php | 5 +++++ routes/api.php | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/app/Http/Controllers/CollectionController.php b/app/Http/Controllers/CollectionController.php index 60a63f7a..1fd3343c 100644 --- a/app/Http/Controllers/CollectionController.php +++ b/app/Http/Controllers/CollectionController.php @@ -16,6 +16,11 @@ class CollectionController extends Controller { + public function bossList(Request $request) { + $allCollections = Collection::select('name')->get(); + return response()->json($allCollections, 200); + } + public function index(Request $request) { $user = $this->getUser($request->header('uuid')); diff --git a/routes/api.php b/routes/api.php index 850a1ead..6a83871c 100644 --- a/routes/api.php +++ b/routes/api.php @@ -25,3 +25,9 @@ Route::put('/{boss}', 'CollectionController@update'); // }); }); + +Route::prefix('/collection')->group(function () { + // Route::middleware('auth:api')->group(function () { + Route::get('/', 'CollectionController@bossList'); + // }); +}); \ No newline at end of file From 44a00dc72bdacfd0d5ba3cb15136e378350f0320 Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 13 Aug 2020 20:16:50 +0200 Subject: [PATCH 07/10] Homestead support --- .gitignore | 1 + Vagrantfile | 53 ++++ after.sh | 26 ++ aliases | 283 +++++++++++++++++++++ composer.json | 1 + composer.lock | 678 +++++++++++++++++++++++++++++++++++++++++++++++++- 6 files changed, 1040 insertions(+), 2 deletions(-) create mode 100644 Vagrantfile create mode 100644 after.sh create mode 100644 aliases diff --git a/.gitignore b/.gitignore index 0f7df0fb..d1df871e 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ Homestead.json Homestead.yaml npm-debug.log yarn-error.log +.vagrant \ No newline at end of file diff --git a/Vagrantfile b/Vagrantfile new file mode 100644 index 00000000..de4e6ba9 --- /dev/null +++ b/Vagrantfile @@ -0,0 +1,53 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +require 'json' +require 'yaml' + +VAGRANTFILE_API_VERSION ||= "2" +confDir = $confDir ||= File.expand_path("vendor/laravel/homestead", File.dirname(__FILE__)) + +homesteadYamlPath = File.expand_path("Homestead.yaml", File.dirname(__FILE__)) +homesteadJsonPath = File.expand_path("Homestead.json", File.dirname(__FILE__)) +afterScriptPath = "after.sh" +customizationScriptPath = "user-customizations.sh" +aliasesPath = "aliases" + +require File.expand_path(confDir + '/scripts/homestead.rb') + +Vagrant.require_version '>= 2.2.4' + +Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| + if File.exist? aliasesPath then + config.vm.provision "file", source: aliasesPath, destination: "/tmp/bash_aliases" + config.vm.provision "shell" do |s| + s.inline = "awk '{ sub(\"\r$\", \"\"); print }' /tmp/bash_aliases > /home/vagrant/.bash_aliases" + end + end + + if File.exist? homesteadYamlPath then + settings = YAML::load(File.read(homesteadYamlPath)) + elsif File.exist? homesteadJsonPath then + settings = JSON::parse(File.read(homesteadJsonPath)) + else + abort "Homestead settings file not found in " + File.dirname(__FILE__) + end + + Homestead.configure(config, settings) + + if File.exist? afterScriptPath then + config.vm.provision "shell", path: afterScriptPath, privileged: false, keep_color: true + end + + if File.exist? customizationScriptPath then + config.vm.provision "shell", path: customizationScriptPath, privileged: false, keep_color: true + end + + if Vagrant.has_plugin?('vagrant-hostsupdater') + config.hostsupdater.aliases = settings['sites'].map { |site| site['map'] } + elsif Vagrant.has_plugin?('vagrant-hostmanager') + config.hostmanager.enabled = true + config.hostmanager.manage_host = true + config.hostmanager.aliases = settings['sites'].map { |site| site['map'] } + end +end diff --git a/after.sh b/after.sh new file mode 100644 index 00000000..08c25e7f --- /dev/null +++ b/after.sh @@ -0,0 +1,26 @@ +#!/bin/sh + +# If you would like to do some extra provisioning you may +# add any commands you wish to this file and they will +# be run after the Homestead machine is provisioned. +# +# If you have user-specific configurations you would like +# to apply, you may also create user-customizations.sh, +# which will be run after this script. + +# If you're not quite ready for Node 12.x +# Uncomment these lines to roll back to +# v11.x or v10.x + +# Remove Node.js v12.x: +#sudo apt-get -y purge nodejs +#sudo rm -rf /usr/lib/node_modules/npm/lib +#sudo rm -rf //etc/apt/sources.list.d/nodesource.list + +# Install Node.js v11.x +#curl -sL https://deb.nodesource.com/setup_11.x | sudo -E bash - +#sudo apt-get install -y nodejs + +# Install Node.js v10.x +#curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash - +#sudo apt-get install -y nodejs diff --git a/aliases b/aliases new file mode 100644 index 00000000..ba11c7c0 --- /dev/null +++ b/aliases @@ -0,0 +1,283 @@ +alias ..="cd .." +alias ...="cd ../.." + +alias h='cd ~' +alias c='clear' +alias art=artisan + +alias codecept='vendor/bin/codecept' +alias phpspec='vendor/bin/phpspec' +alias phpunit='vendor/bin/phpunit' +alias serve=serve-laravel + +alias xoff='sudo phpdismod -s cli xdebug' +alias xon='sudo phpenmod -s cli xdebug' + +function artisan() { + php artisan "$@" +} + +function dusk() { + pids=$(pidof /usr/bin/Xvfb) + + if [ ! -n "$pids" ]; then + Xvfb :0 -screen 0 1280x960x24 & + fi + + php artisan dusk --filter "$@" +} + +function php56() { + sudo update-alternatives --set php /usr/bin/php5.6 + sudo update-alternatives --set php-config /usr/bin/php-config5.6 + sudo update-alternatives --set phpize /usr/bin/phpize5.6 +} + +function php70() { + sudo update-alternatives --set php /usr/bin/php7.0 + sudo update-alternatives --set php-config /usr/bin/php-config7.0 + sudo update-alternatives --set phpize /usr/bin/phpize7.0 +} + +function php71() { + sudo update-alternatives --set php /usr/bin/php7.1 + sudo update-alternatives --set php-config /usr/bin/php-config7.1 + sudo update-alternatives --set phpize /usr/bin/phpize7.1 +} + +function php72() { + sudo update-alternatives --set php /usr/bin/php7.2 + sudo update-alternatives --set php-config /usr/bin/php-config7.2 + sudo update-alternatives --set phpize /usr/bin/phpize7.2 +} + +function php73() { + sudo update-alternatives --set php /usr/bin/php7.3 + sudo update-alternatives --set php-config /usr/bin/php-config7.3 + sudo update-alternatives --set phpize /usr/bin/phpize7.3 +} + +function php74() { + sudo update-alternatives --set php /usr/bin/php7.4 + sudo update-alternatives --set php-config /usr/bin/php-config7.4 + sudo update-alternatives --set phpize /usr/bin/phpize7.4 +} + +function serve-apache() { + if [[ "$1" && "$2" ]] + then + sudo bash /vagrant/vendor/laravel/homestead/scripts/create-certificate.sh "$1" + sudo dos2unix /vagrant/vendor/laravel/homestead/scripts/serve-apache.sh + sudo bash /vagrant/vendor/laravel/homestead/scripts/serve-apache.sh "$1" "$2" 80 443 "${3:-7.4}" + else + echo "Error: missing required parameters." + echo "Usage: " + echo " serve-apache domain path" + fi +} + +function serve-laravel() { + if [[ "$1" && "$2" ]] + then + sudo bash /vagrant/vendor/laravel/homestead/scripts/create-certificate.sh "$1" + sudo dos2unix /vagrant/vendor/laravel/homestead/scripts/serve-laravel.sh + sudo bash /vagrant/vendor/laravel/homestead/scripts/serve-laravel.sh "$1" "$2" 80 443 "${3:-7.4}" + else + echo "Error: missing required parameters." + echo "Usage: " + echo " serve domain path" + fi +} + +function serve-proxy() { + if [[ "$1" && "$2" ]] + then + sudo dos2unix /vagrant/vendor/laravel/homestead/scripts/serve-proxy.sh + sudo bash /vagrant/vendor/laravel/homestead/scripts/serve-proxy.sh "$1" "$2" 80 443 "${3:-7.4}" + else + echo "Error: missing required parameters." + echo "Usage: " + echo " serve-proxy domain port" + fi +} + +function serve-silverstripe() { + if [[ "$1" && "$2" ]] + then + sudo bash /vagrant/vendor/laravel/homestead/scripts/create-certificate.sh "$1" + sudo dos2unix /vagrant/vendor/laravel/homestead/scripts/serve-silverstripe.sh + sudo bash /vagrant/vendor/laravel/homestead/scripts/serve-silverstripe.sh "$1" "$2" 80 443 "${3:-7.4}" + else + echo "Error: missing required parameters." + echo "Usage: " + echo " serve-silverstripe domain path" + fi +} + +function serve-spa() { + if [[ "$1" && "$2" ]] + then + sudo bash /vagrant/vendor/laravel/homestead/scripts/create-certificate.sh "$1" + sudo dos2unix /vagrant/vendor/laravel/homestead/scripts/serve-spa.sh + sudo bash /vagrant/vendor/laravel/homestead/scripts/serve-spa.sh "$1" "$2" 80 443 "${3:-7.4}" + else + echo "Error: missing required parameters." + echo "Usage: " + echo " serve-spa domain path" + fi +} + +function serve-statamic() { + if [[ "$1" && "$2" ]] + then + sudo bash /vagrant/vendor/laravel/homestead/scripts/create-certificate.sh "$1" + sudo dos2unix /vagrant/vendor/laravel/homestead/scripts/serve-statamic.sh + sudo bash /vagrant/vendor/laravel/homestead/scripts/serve-statamic.sh "$1" "$2" 80 443 "${3:-7.4}" + else + echo "Error: missing required parameters." + echo "Usage: " + echo " serve-statamic domain path" + fi +} + +function serve-symfony2() { + if [[ "$1" && "$2" ]] + then + sudo bash /vagrant/vendor/laravel/homestead/scripts/create-certificate.sh "$1" + sudo dos2unix /vagrant/vendor/laravel/homestead/scripts/serve-symfony2.sh + sudo bash /vagrant/vendor/laravel/homestead/scripts/serve-symfony2.sh "$1" "$2" 80 443 "${3:-7.4}" + else + echo "Error: missing required parameters." + echo "Usage: " + echo " serve-symfony2 domain path" + fi +} + +function serve-symfony4() { + if [[ "$1" && "$2" ]] + then + sudo bash /vagrant/vendor/laravel/homestead/scripts/create-certificate.sh "$1" + sudo dos2unix /vagrant/vendor/laravel/homestead/scripts/serve-symfony4.sh + sudo bash /vagrant/vendor/laravel/homestead/scripts/serve-symfony4.sh "$1" "$2" 80 443 "${3:-7.4}" + else + echo "Error: missing required parameters." + echo "Usage: " + echo " serve-symfony4 domain path" + fi +} + +function serve-pimcore() { + if [[ "$1" && "$2" ]] + then + sudo bash /vagrant/vendor/laravel/homestead/scripts/create-certificate.sh "$1" + sudo dos2unix /vagrant/vendor/laravel/homestead/scripts/serve-pimcore.sh + sudo bash /vagrant/vendor/laravel/homestead/scripts/serve-pimcore.sh "$1" "$2" 80 443 "${3:-7.4}" + else + echo "Error: missing required parameters." + echo "Usage: " + echo " serve-pimcore domain path" + fi +} + +function share() { + if [[ "$1" ]] + then + ngrok http ${@:2} -host-header="$1" 80 + else + echo "Error: missing required parameters." + echo "Usage: " + echo " share domain" + echo "Invocation with extra params passed directly to ngrok" + echo " share domain -region=eu -subdomain=test1234" + fi +} + +function flip() { + sudo bash /vagrant/vendor/laravel/homestead/scripts/flip-webserver.sh +} + +function __has_pv() { + $(hash pv 2>/dev/null); + + return $? +} + +function __pv_install_message() { + if ! __has_pv; then + echo $1 + echo "Install pv with \`sudo apt-get install -y pv\` then run this command again." + echo "" + fi +} + +function dbexport() { + FILE=${1:-/vagrant/mysqldump.sql.gz} + + # This gives an estimate of the size of the SQL file + # It appears that 80% is a good approximation of + # the ratio of estimated size to actual size + SIZE_QUERY="select ceil(sum(data_length) * 0.8) as size from information_schema.TABLES" + + __pv_install_message "Want to see export progress?" + + echo "Exporting databases to '$FILE'" + + if __has_pv; then + ADJUSTED_SIZE=$(mysql --vertical -uhomestead -psecret -e "$SIZE_QUERY" 2>/dev/null | grep 'size' | awk '{print $2}') + HUMAN_READABLE_SIZE=$(numfmt --to=iec-i --suffix=B --format="%.3f" $ADJUSTED_SIZE) + + echo "Estimated uncompressed size: $HUMAN_READABLE_SIZE" + mysqldump -uhomestead -psecret --all-databases --skip-lock-tables --routines 2>/dev/null | pv --size=$ADJUSTED_SIZE | gzip > "$FILE" + else + mysqldump -uhomestead -psecret --all-databases --skip-lock-tables --routines 2>/dev/null | gzip > "$FILE" + fi + + echo "Done." +} + +function dbimport() { + FILE=${1:-/vagrant/mysqldump.sql.gz} + + __pv_install_message "Want to see import progress?" + + echo "Importing databases from '$FILE'" + + if __has_pv; then + pv "$FILE" --progress --eta | zcat | mysql -uhomestead -psecret 2>/dev/null + else + cat "$FILE" | zcat | mysql -uhomestead -psecret 2>/dev/null + fi + + echo "Done." +} + +function xphp() { + (php -m | grep -q xdebug) + if [[ $? -eq 0 ]] + then + XDEBUG_ENABLED=true + else + XDEBUG_ENABLED=false + fi + + if ! $XDEBUG_ENABLED; then xon; fi + + php \ + -dxdebug.remote_host=192.168.10.1 \ + -dxdebug.remote_autostart=1 \ + "$@" + + if ! $XDEBUG_ENABLED; then xoff; fi +} + +function update-socket-wrench() { + cd /var/www/socket-wrench + git pull origin release + composer install + php artisan migrate --force +} + +function seed-socket-wrench() { + cd /var/www/socket-wrench + php artisan db:seed +} diff --git a/composer.json b/composer.json index 381c5bae..4c63028f 100644 --- a/composer.json +++ b/composer.json @@ -19,6 +19,7 @@ "require-dev": { "facade/ignition": "^2.0", "fzaninotto/faker": "^1.9.1", + "laravel/homestead": "^11.0", "mockery/mockery": "^1.3.1", "nunomaduro/collision": "^4.1", "phpunit/phpunit": "^8.5" diff --git a/composer.lock b/composer.lock index 487fe1cf..40dd1ae4 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f0dcbdc80776ca79d6311b8f92c5a4b5", + "content-hash": "bd8320171484a9faab0c0543bcd46c97", "packages": [ { "name": "asm89/stack-cors", @@ -102,6 +102,12 @@ "brick", "math" ], + "funding": [ + { + "url": "https://tidelift.com/funding/github/packagist/brick/math", + "type": "tidelift" + } + ], "time": "2020-04-15T15:59:35+00:00" }, { @@ -212,6 +218,20 @@ "uppercase", "words" ], + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finflector", + "type": "tidelift" + } + ], "time": "2020-05-29T15:13:26+00:00" }, { @@ -274,6 +294,20 @@ "parser", "php" ], + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer", + "type": "tidelift" + } + ], "time": "2020-05-25T17:44:05+00:00" }, { @@ -508,6 +542,12 @@ "crossdomain", "laravel" ], + "funding": [ + { + "url": "https://github.com/barryvdh", + "type": "github" + } + ], "time": "2020-04-28T08:47:37+00:00" }, { @@ -1042,6 +1082,32 @@ "md", "parser" ], + "funding": [ + { + "url": "https://enjoy.gitstore.app/repositories/thephpleague/commonmark", + "type": "custom" + }, + { + "url": "https://www.colinodell.com/sponsor", + "type": "custom" + }, + { + "url": "https://www.paypal.me/colinpodell/10.00", + "type": "custom" + }, + { + "url": "https://github.com/colinodell", + "type": "github" + }, + { + "url": "https://www.patreon.com/colinodell", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/league/commonmark", + "type": "tidelift" + } + ], "time": "2020-06-21T20:50:13+00:00" }, { @@ -1126,6 +1192,12 @@ "sftp", "storage" ], + "funding": [ + { + "url": "https://offset.earth/frankdejonge", + "type": "other" + } + ], "time": "2020-05-18T15:13:39+00:00" }, { @@ -1207,6 +1279,16 @@ "logging", "psr-3" ], + "funding": [ + { + "url": "https://github.com/Seldaek", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/monolog/monolog", + "type": "tidelift" + } + ], "time": "2020-05-22T08:12:19+00:00" }, { @@ -1280,6 +1362,16 @@ "datetime", "time" ], + "funding": [ + { + "url": "https://opencollective.com/Carbon", + "type": "open_collective" + }, + { + "url": "https://tidelift.com/funding/github/packagist/nesbot/carbon", + "type": "tidelift" + } + ], "time": "2020-05-24T18:27:52+00:00" }, { @@ -1448,6 +1540,16 @@ "php", "type" ], + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpoption/phpoption", + "type": "tidelift" + } + ], "time": "2020-06-07T10:40:07+00:00" }, { @@ -1942,6 +2044,12 @@ "identifier", "uuid" ], + "funding": [ + { + "url": "https://github.com/ramsey", + "type": "github" + } + ], "time": "2020-03-29T20:13:32+00:00" }, { @@ -2083,6 +2191,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-06-15T12:59:21+00:00" }, { @@ -2136,6 +2258,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-20T17:43:50+00:00" }, { @@ -2182,6 +2318,20 @@ ], "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-27T08:34:37+00:00" }, { @@ -2239,6 +2389,20 @@ ], "description": "Symfony ErrorHandler Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-30T20:35:19+00:00" }, { @@ -2311,6 +2475,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-20T17:43:50+00:00" }, { @@ -2369,6 +2547,20 @@ "interoperability", "standards" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-20T17:43:50+00:00" }, { @@ -2418,6 +2610,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-20T17:43:50+00:00" }, { @@ -2479,6 +2685,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-06-15T06:52:54+00:00" }, { @@ -2578,6 +2798,20 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-06-15T13:51:38+00:00" }, { @@ -2641,6 +2875,20 @@ "mime", "mime-type" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-06-09T15:07:35+00:00" }, { @@ -2699,6 +2947,20 @@ "polyfill", "portable" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-12T16:14:59+00:00" }, { @@ -2758,6 +3020,20 @@ "portable", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-12T16:47:27+00:00" }, { @@ -2818,6 +3094,20 @@ "portable", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-12T16:47:27+00:00" }, { @@ -2880,6 +3170,20 @@ "portable", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-12T16:47:27+00:00" }, { @@ -2943,6 +3247,20 @@ "portable", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-12T16:14:59+00:00" }, { @@ -3002,6 +3320,20 @@ "portable", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-12T16:47:27+00:00" }, { @@ -3057,6 +3389,20 @@ "portable", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-12T16:47:27+00:00" }, { @@ -3115,6 +3461,20 @@ "portable", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-12T16:47:27+00:00" }, { @@ -3177,6 +3537,20 @@ "portable", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-12T16:47:27+00:00" }, { @@ -3227,6 +3601,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-30T20:35:19+00:00" }, { @@ -3305,6 +3693,20 @@ "uri", "url" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-06-10T11:49:58+00:00" }, { @@ -3363,6 +3765,20 @@ "interoperability", "standards" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-20T17:43:50+00:00" }, { @@ -3434,6 +3850,20 @@ "utf-8", "utf8" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-06-11T12:16:36+00:00" }, { @@ -3512,6 +3942,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-30T20:35:19+00:00" }, { @@ -3569,6 +4013,20 @@ "interoperability", "standards" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-20T17:43:50+00:00" }, { @@ -3645,6 +4103,20 @@ "debug", "dump" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-30T20:35:19+00:00" }, { @@ -3758,6 +4230,16 @@ "env", "environment" ], + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv", + "type": "tidelift" + } + ], "time": "2020-06-07T18:25:35+00:00" }, { @@ -3806,6 +4288,24 @@ "clean", "php" ], + "funding": [ + { + "url": "https://www.paypal.me/moelleken", + "type": "custom" + }, + { + "url": "https://github.com/voku", + "type": "github" + }, + { + "url": "https://www.patreon.com/voku", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/voku/portable-ascii", + "type": "tidelift" + } + ], "time": "2020-06-15T23:49:30+00:00" } ], @@ -3864,6 +4364,20 @@ "constructor", "instantiate" ], + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", + "type": "tidelift" + } + ], "time": "2020-05-29T17:27:14+00:00" }, { @@ -3918,6 +4432,12 @@ "flare", "reporting" ], + "funding": [ + { + "url": "https://www.patreon.com/spatie", + "type": "patreon" + } + ], "time": "2020-03-02T15:52:04+00:00" }, { @@ -4194,6 +4714,51 @@ ], "time": "2016-01-20T08:20:44+00:00" }, + { + "name": "laravel/homestead", + "version": "v11.0.2", + "source": { + "type": "git", + "url": "https://github.com/laravel/homestead.git", + "reference": "24408631240e5835ef9e497470c733d7540922e0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laravel/homestead/zipball/24408631240e5835ef9e497470c733d7540922e0", + "reference": "24408631240e5835ef9e497470c733d7540922e0", + "shasum": "" + }, + "require": { + "php": "^7.1", + "symfony/console": "~3.0||~4.0||~5.0", + "symfony/process": "~3.0||~4.0||~5.0", + "symfony/yaml": "~3.0||~4.0||~5.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.0" + }, + "bin": [ + "bin/homestead" + ], + "type": "library", + "autoload": { + "psr-4": { + "Laravel\\Homestead\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "A virtual machine for web artisans.", + "time": "2020-08-12T14:42:35+00:00" + }, { "name": "mockery/mockery", "version": "1.3.1", @@ -4375,6 +4940,20 @@ "php", "symfony" ], + "funding": [ + { + "url": "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66BYDWAT92N6L", + "type": "custom" + }, + { + "url": "https://github.com/nunomaduro", + "type": "github" + }, + { + "url": "https://www.patreon.com/nunomaduro", + "type": "patreon" + } + ], "time": "2020-04-04T19:56:08+00:00" }, { @@ -4940,6 +5519,7 @@ "keywords": [ "tokenizer" ], + "abandoned": true, "time": "2019-09-17T06:23:10+00:00" }, { @@ -5023,6 +5603,16 @@ "testing", "xunit" ], + "funding": [ + { + "url": "https://phpunit.de/donate.html", + "type": "custom" + }, + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], "time": "2020-06-21T06:32:54+00:00" }, { @@ -5092,6 +5682,12 @@ "highlight.php", "syntax" ], + "funding": [ + { + "url": "https://github.com/allejo", + "type": "github" + } + ], "time": "2020-03-02T05:59:21+00:00" }, { @@ -5709,6 +6305,83 @@ "homepage": "https://github.com/sebastianbergmann/version", "time": "2016-10-03T07:35:21+00:00" }, + { + "name": "symfony/yaml", + "version": "v5.1.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/yaml.git", + "reference": "ea342353a3ef4f453809acc4ebc55382231d4d23" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/yaml/zipball/ea342353a3ef4f453809acc4ebc55382231d4d23", + "reference": "ea342353a3ef4f453809acc4ebc55382231d4d23", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1", + "symfony/polyfill-ctype": "~1.8" + }, + "conflict": { + "symfony/console": "<4.4" + }, + "require-dev": { + "symfony/console": "^4.4|^5.0" + }, + "suggest": { + "symfony/console": "For validating YAML files using the lint command" + }, + "bin": [ + "Resources/bin/yaml-lint" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Yaml\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Yaml Component", + "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-05-20T17:43:50+00:00" + }, { "name": "theseer/tokenizer", "version": "1.1.3", @@ -5807,5 +6480,6 @@ "platform": { "php": "^7.2.5" }, - "platform-dev": [] + "platform-dev": [], + "plugin-api-version": "1.1.0" } From 77d9e6c98b7240b81919603186c231451aac0caf Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 13 Aug 2020 20:17:07 +0200 Subject: [PATCH 08/10] Model case fix --- app/Boss/{Kreearra.php => KreeArra.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename app/Boss/{Kreearra.php => KreeArra.php} (100%) diff --git a/app/Boss/Kreearra.php b/app/Boss/KreeArra.php similarity index 100% rename from app/Boss/Kreearra.php rename to app/Boss/KreeArra.php From 3461d5c66fd4bc912e20f61d8913dfd825c03f96 Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 14 Aug 2020 01:02:56 +0200 Subject: [PATCH 09/10] Loot update logic Sum loot amounts --- app/Http/Controllers/CollectionController.php | 27 ++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/CollectionController.php b/app/Http/Controllers/CollectionController.php index 1fd3343c..9eea30dc 100644 --- a/app/Http/Controllers/CollectionController.php +++ b/app/Http/Controllers/CollectionController.php @@ -109,7 +109,32 @@ public function update($collectionName, Request $request) { $collectionLog = $this->getUserCollectionLog($collection->collection_type, $user->id); if ($collectionLog) { - $collectionLog->update($request->all()); + $oldValues = $collectionLog->getAttributes(); // Get old data + //array_splice($oldValues, count($oldValues) - 2, 2); // Remove created_at and updated_at + + $newValues = $request->all(); + + $sums = []; + + $sums["kill_count"] = $oldValues["kill_count"] + 1; + + $uniques = $oldValues["obtained"]; + + // Merge old data and new data and sum the total of common keys + foreach (array_keys($newValues + $oldValues) as $lootType) { + if (isset($newValues[$lootType]) && isset($oldValues[$lootType])) { + // If unique loot is detected, increase the total amount of uniques obtained by 1 + if ($oldValues[$lootType] == 0) { + $uniques++; + } + + $sums[$lootType] = (isset($newValues[$lootType]) ? $newValues[$lootType] : 0) + (isset($oldValues) ? $oldValues[$lootType] : 0); + } + } + + $sums["obtained"] = $uniques; + + $collectionLog->update($sums); return response()->json($collectionLog, 201); } else { From 22bbcf0477b40cf5e292b86e57e21cd9beb7f5c3 Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 14 Aug 2020 01:49:27 +0200 Subject: [PATCH 10/10] BossController & Updater --- app/Http/Controllers/BossController.php | 68 +++++++++++++++++++ app/Http/Controllers/CollectionController.php | 47 +------------ routes/api.php | 2 +- 3 files changed, 70 insertions(+), 47 deletions(-) create mode 100644 app/Http/Controllers/BossController.php diff --git a/app/Http/Controllers/BossController.php b/app/Http/Controllers/BossController.php new file mode 100644 index 00000000..a60ae285 --- /dev/null +++ b/app/Http/Controllers/BossController.php @@ -0,0 +1,68 @@ +getUser($request->header('uuid')); + + if ($user) { + $boss = Collection::findByName($bossName); + + if ($boss) { + $bossLog = $this->getUserBossLog($boss->collection_type, $user->id); + + if ($bossLog) { + $oldValues = $bossLog->getAttributes(); // Get old data + //array_splice($oldValues, count($oldValues) - 2, 2); // Remove created_at and updated_at + + $newValues = $request->all(); + + $sums = []; + + $sums["kill_count"] = $oldValues["kill_count"] + 1; + + $uniques = $oldValues["obtained"]; + + // Merge old data and new data and sum the total of common keys + foreach (array_keys($newValues + $oldValues) as $lootType) { + if (isset($newValues[$lootType]) && isset($oldValues[$lootType])) { + // If unique loot is detected, increase the total amount of uniques obtained by 1 + if ($oldValues[$lootType] == 0) { + $uniques++; + } + + $sums[$lootType] = (isset($newValues[$lootType]) ? $newValues[$lootType] : 0) + (isset($oldValues) ? $oldValues[$lootType] : 0); + } + } + + $sums["obtained"] = $uniques; + + $bossLog->update($sums); + + return response()->json($bossLog, 201); + } else { + return response()->json("This user does not have any registered loot for this boss", 404); + } + } else { + return response()->json("This boss does not exist", 404); + } + } else { + return response()->json("This user could not be found", 404); + } + } + + private function getUser($uuid) { + return User::where('uuid', $uuid)->first(); + } + + private function getUserBossLog($boss, $userId) { + return $boss::where('user_id', $userId)->first(); + } +} diff --git a/app/Http/Controllers/CollectionController.php b/app/Http/Controllers/CollectionController.php index 9eea30dc..25ae0da6 100644 --- a/app/Http/Controllers/CollectionController.php +++ b/app/Http/Controllers/CollectionController.php @@ -100,52 +100,7 @@ private function store($collectionName, $userId) { } public function update($collectionName, Request $request) { - $user = $this->getUser($request->header('uuid')); - - if ($user) { - $collection = Collection::findByName($collectionName); - - if ($collection) { - $collectionLog = $this->getUserCollectionLog($collection->collection_type, $user->id); - - if ($collectionLog) { - $oldValues = $collectionLog->getAttributes(); // Get old data - //array_splice($oldValues, count($oldValues) - 2, 2); // Remove created_at and updated_at - - $newValues = $request->all(); - - $sums = []; - - $sums["kill_count"] = $oldValues["kill_count"] + 1; - - $uniques = $oldValues["obtained"]; - - // Merge old data and new data and sum the total of common keys - foreach (array_keys($newValues + $oldValues) as $lootType) { - if (isset($newValues[$lootType]) && isset($oldValues[$lootType])) { - // If unique loot is detected, increase the total amount of uniques obtained by 1 - if ($oldValues[$lootType] == 0) { - $uniques++; - } - - $sums[$lootType] = (isset($newValues[$lootType]) ? $newValues[$lootType] : 0) + (isset($oldValues) ? $oldValues[$lootType] : 0); - } - } - - $sums["obtained"] = $uniques; - - $collectionLog->update($sums); - - return response()->json($collectionLog, 201); - } else { - return response()->json("This user does not have any registered loot for this collection", 404); - } - } else { - return response()->json("This collection does not exist", 404); - } - } else { - return response()->json("This user could not be found", 404); - } + // TODO collection log updater } private function getUser($uuid) { diff --git a/routes/api.php b/routes/api.php index 6a83871c..73d0f116 100644 --- a/routes/api.php +++ b/routes/api.php @@ -22,7 +22,7 @@ // Route::middleware('auth:api')->group(function () { Route::get('/', 'CollectionController@index'); Route::get('/{boss}', 'CollectionController@show'); - Route::put('/{boss}', 'CollectionController@update'); + Route::put('/{boss}', 'BossController@update'); // }); });