Merge branch 'development'

Zlimon · Dec 29, 2020 · a03ee8e · a03ee8e
2 parents e8fef89 + fefce66
commit a03ee8e
Show file tree

Hide file tree

Showing 493 changed files with 12,867 additions and 54,781 deletions.
diff --git a/.env.example b/.env.example
@@ -12,6 +12,7 @@ DB_PORT=3306
 DB_DATABASE=laravel
 DB_USERNAME=root
 DB_PASSWORD=
+MYSQL_SSL=false
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file

diff --git a/.gitignore b/.gitignore
@@ -11,4 +11,9 @@ Homestead.yaml
 npm-debug.log
 yarn-error.log
 .vagrant
-/ssl/BaltimoreCyberTrustRoot.crt.pem
+/ssl/BaltimoreCyberTrustRoot.crt.pem
+/public/resource-packs/*
+/public/js/*
+/.idea/*
+_ide_helper.php
+.phpstorm.meta.php
diff --git a/app/Account.php b/app/Account.php
@@ -4,6 +4,35 @@
 
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * App\Account
+ *
+ * @property int $id
+ * @property int $user_id
+ * @property string $account_type
+ * @property string $username
+ * @property int $rank
+ * @property int $level
+ * @property int $xp
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \Illuminate\Database\Eloquent\Collection|\App\Notification[] $notification
+ * @property-read int|null $notification_count
+ * @property-read \App\User $user
+ * @method static \Illuminate\Database\Eloquent\Builder|Account newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|Account newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|Account query()
+ * @method static \Illuminate\Database\Eloquent\Builder|Account whereAccountType($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Account whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Account whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Account whereLevel($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Account whereRank($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Account whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Account whereUserId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Account whereUsername($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Account whereXp($value)
+ * @mixin \Eloquent
+ */
 class Account extends Model
 {
     /**
@@ -12,10 +41,14 @@ class Account extends Model
      * @var array
      */
     protected $fillable = [
-        'user_id', 'type', 'username', 'rank', 'level', 'xp', 'private'
+        'user_id', 'account_type', 'username', 'rank', 'level', 'xp'
     ];
 
     public function user() {
         return $this->belongsTo(User::class);
     }
+
+    public function notification() {
+        return $this->hasMany(Notification::class);
+    }
 }
diff --git a/app/AccountAuthStatus.php b/app/AccountAuthStatus.php
@@ -4,7 +4,34 @@
 
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * App\AccountAuthStatus
+ *
+ * @property int $id
+ * @property int $user_id
+ * @property string $account_type
+ * @property string $username
+ * @property string $code
+ * @property string $status
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \App\User $user
+ * @method static \Illuminate\Database\Eloquent\Builder|AccountAuthStatus newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|AccountAuthStatus newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|AccountAuthStatus query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AccountAuthStatus whereAccountType($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AccountAuthStatus whereCode($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AccountAuthStatus whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AccountAuthStatus whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AccountAuthStatus whereStatus($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AccountAuthStatus whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AccountAuthStatus whereUserId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AccountAuthStatus whereUsername($value)
+ * @mixin \Eloquent
+ */
 class AccountAuthStatus extends Model
 {
-    //
+    public function user() {
+        return $this->belongsTo(User::class);
+    }
 }
diff --git a/app/Boss/AbyssalSire.php b/app/Boss/AbyssalSire.php
@@ -4,6 +4,47 @@
 
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * App\Boss\AbyssalSire
+ *
+ * @property int $id
+ * @property int $account_id
+ * @property int $kill_count
+ * @property int $rank
+ * @property int $obtained
+ * @property int $abyssal_orphan
+ * @property int $unsired
+ * @property int $abyssal_head
+ * @property int $bludgeon_spine
+ * @property int $bludgeon_claw
+ * @property int $bludgeon_axon
+ * @property int $jar_of_miasma
+ * @property int $abyssal_dagger
+ * @property int $abyssal_whip
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \App\Account $account
+ * @method static \Illuminate\Database\Eloquent\Builder|AbyssalSire newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbyssalSire newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbyssalSire query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbyssalSire whereAbyssalDagger($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbyssalSire whereAbyssalHead($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbyssalSire whereAbyssalOrphan($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbyssalSire whereAbyssalWhip($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbyssalSire whereAccountId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbyssalSire whereBludgeonAxon($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbyssalSire whereBludgeonClaw($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbyssalSire whereBludgeonSpine($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbyssalSire whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbyssalSire whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbyssalSire whereJarOfMiasma($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbyssalSire whereKillCount($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbyssalSire whereObtained($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbyssalSire whereRank($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbyssalSire whereUnsired($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbyssalSire whereUpdatedAt($value)
+ * @mixin \Eloquent
+ */
 class AbyssalSire extends Model
 {
     protected $table = 'abyssal_sire';
@@ -24,7 +65,8 @@ class AbyssalSire extends Model
 
     protected $hidden = ['user_id'];
 
-    public function account() {
+    public function account()
+    {
         return $this->belongsTo(\App\Account::class);
     }
 }
diff --git a/app/Boss/AlchemicalHydra.php b/app/Boss/AlchemicalHydra.php
@@ -4,6 +4,51 @@
 
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * App\Boss\AlchemicalHydra
+ *
+ * @property int $id
+ * @property int $account_id
+ * @property int $kill_count
+ * @property int $rank
+ * @property int $obtained
+ * @property int $ikkle_hydra
+ * @property int $hydras_claw
+ * @property int $hydra_tail
+ * @property int $hydra_leather
+ * @property int $hydras_fang
+ * @property int $hydras_eye
+ * @property int $hydras_heart
+ * @property int $dragon_knife
+ * @property int $dragon_thrownaxe
+ * @property int $jar_of_chemicals
+ * @property int $alchemical_hydra_heads
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \App\Account $account
+ * @method static \Illuminate\Database\Eloquent\Builder|AlchemicalHydra newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|AlchemicalHydra newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|AlchemicalHydra query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AlchemicalHydra whereAccountId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AlchemicalHydra whereAlchemicalHydraHeads($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AlchemicalHydra whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AlchemicalHydra whereDragonKnife($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AlchemicalHydra whereDragonThrownaxe($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AlchemicalHydra whereHydraLeather($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AlchemicalHydra whereHydraTail($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AlchemicalHydra whereHydrasClaw($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AlchemicalHydra whereHydrasEye($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AlchemicalHydra whereHydrasFang($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AlchemicalHydra whereHydrasHeart($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AlchemicalHydra whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AlchemicalHydra whereIkkleHydra($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AlchemicalHydra whereJarOfChemicals($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AlchemicalHydra whereKillCount($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AlchemicalHydra whereObtained($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AlchemicalHydra whereRank($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|AlchemicalHydra whereUpdatedAt($value)
+ * @mixin \Eloquent
+ */
 class AlchemicalHydra extends Model
 {
     protected $table = 'alchemical_hydra';
@@ -26,7 +71,8 @@ class AlchemicalHydra extends Model
 
     protected $hidden = ['user_id'];
 
-    public function account() {
+    public function account()
+    {
         return $this->belongsTo(\App\Account::class);
     }
 }
diff --git a/app/Boss/BarrowsChests.php b/app/Boss/BarrowsChests.php
@@ -4,6 +4,79 @@
 
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * App\Boss\BarrowsChests
+ *
+ * @property int $id
+ * @property int $account_id
+ * @property int $kill_count
+ * @property int $rank
+ * @property int $obtained
+ * @property int $karils_coif
+ * @property int $ahrims_hood
+ * @property int $dharoks_helm
+ * @property int $guthans_helm
+ * @property int $torags_helm
+ * @property int $veracs_helm
+ * @property int $karils_leathertop
+ * @property int $ahrims_robetop
+ * @property int $dharoks_platebody
+ * @property int $guthans_platebody
+ * @property int $torags_platebody
+ * @property int $veracs_brassard
+ * @property int $karils_leatherskirt
+ * @property int $ahrims_robeskirt
+ * @property int $dharoks_platelegs
+ * @property int $guthans_chainskirt
+ * @property int $torags_platelegs
+ * @property int $veracs_plateskirt
+ * @property int $karils_crossbow
+ * @property int $ahrims_staff
+ * @property int $dharoks_greataxe
+ * @property int $guthans_warspear
+ * @property int $torags_hammers
+ * @property int $veracs_flail
+ * @property int $bolt_rack
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \App\Account $account
+ * @method static \Illuminate\Database\Eloquent\Builder|BarrowsChests newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|BarrowsChests newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|BarrowsChests query()
+ * @method static \Illuminate\Database\Eloquent\Builder|BarrowsChests whereAccountId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|BarrowsChests whereAhrimsHood($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|BarrowsChests whereAhrimsRobeskirt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|BarrowsChests whereAhrimsRobetop($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|BarrowsChests whereAhrimsStaff($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|BarrowsChests whereBoltRack($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|BarrowsChests whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|BarrowsChests whereDharoksGreataxe($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|BarrowsChests whereDharoksHelm($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|BarrowsChests whereDharoksPlatebody($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|BarrowsChests whereDharoksPlatelegs($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|BarrowsChests whereGuthansChainskirt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|BarrowsChests whereGuthansHelm($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|BarrowsChests whereGuthansPlatebody($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|BarrowsChests whereGuthansWarspear($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|BarrowsChests whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|BarrowsChests whereKarilsCoif($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|BarrowsChests whereKarilsCrossbow($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|BarrowsChests whereKarilsLeatherskirt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|BarrowsChests whereKarilsLeathertop($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|BarrowsChests whereKillCount($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|BarrowsChests whereObtained($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|BarrowsChests whereRank($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|BarrowsChests whereToragsHammers($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|BarrowsChests whereToragsHelm($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|BarrowsChests whereToragsPlatebody($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|BarrowsChests whereToragsPlatelegs($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|BarrowsChests whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|BarrowsChests whereVeracsBrassard($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|BarrowsChests whereVeracsFlail($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|BarrowsChests whereVeracsHelm($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|BarrowsChests whereVeracsPlateskirt($value)
+ * @mixin \Eloquent
+ */
 class BarrowsChests extends Model
 {
     protected $table = 'barrows_chests';
@@ -40,7 +113,8 @@ class BarrowsChests extends Model
 
     protected $hidden = ['user_id'];
 
-    public function account() {
+    public function account()
+    {
         return $this->belongsTo(\App\Account::class);
     }
 }
diff --git a/app/Boss/Bryophyta.php b/app/Boss/Bryophyta.php
@@ -4,6 +4,31 @@
 
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * App\Boss\Bryophyta
+ *
+ * @property int $id
+ * @property int $account_id
+ * @property int $kill_count
+ * @property int $rank
+ * @property int $obtained
+ * @property int $bryophytas_essence
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \App\Account $account
+ * @method static \Illuminate\Database\Eloquent\Builder|Bryophyta newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|Bryophyta newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|Bryophyta query()
+ * @method static \Illuminate\Database\Eloquent\Builder|Bryophyta whereAccountId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Bryophyta whereBryophytasEssence($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Bryophyta whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Bryophyta whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Bryophyta whereKillCount($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Bryophyta whereObtained($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Bryophyta whereRank($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Bryophyta whereUpdatedAt($value)
+ * @mixin \Eloquent
+ */
 class Bryophyta extends Model
 {
     protected $table = 'bryophyta';
@@ -16,7 +41,8 @@ class Bryophyta extends Model
 
     protected $hidden = ['user_id'];
 
-    public function account() {
+    public function account()
+    {
         return $this->belongsTo(\App\Account::class);
     }
 }