Merge pull request #80 from Zlimon/development

Project Refactor
Zlimon · May 3, 2021 · 39aa84e · 39aa84e
2 parents bddca1f + 54fc714
commit 39aa84e
Show file tree

Hide file tree

Showing 976 changed files with 9,965 additions and 7,313 deletions.
diff --git a/app/Account.php b/app/Account.php
@@ -44,11 +44,40 @@ class Account extends Model
         'user_id', 'account_type', 'username', 'rank', 'level', 'xp'
     ];
 
+    public function getRouteKeyName()
+    {
+        return 'username';
+    }
+
     public function user() {
         return $this->belongsTo(User::class);
     }
 
+    public function log() {
+        return $this->hasMany(Log::class);
+    }
+
+    public function logBroadcast() {
+        return $this->hasManyThrough(Broadcast::class, Log::class);
+    }
+
+    public function collection(Collection $collection) {
+        return $this->hasOne($collection->model);
+    }
+
+    public function skill(Skill $skill) {
+        return $this->hasOne($skill->model);
+    }
+
     public function equipment() {
         return $this->hasOne(Equipment::class);
     }
+
+    public function bank() {
+        return $this->hasOne(Bank::class);
+    }
+
+    public function quest() {
+        return $this->hasOne(Quest::class);
+    }
 }
diff --git a/app/Boss/Nightmare.php b/app/Boss/Nightmare.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace App\Boss;
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * App\Boss\Nightmare
+ *
+ * @property int $id
+ * @property int $account_id
+ * @property int $kill_count
+ * @property int $rank
+ * @property int $obtained
+ * @property int $little_nightmare
+ * @property int $inquisitors_mace
+ * @property int $inquisitors_great_helm
+ * @property int $inquisitors_hauberk
+ * @property int $inquisitors_plateskirt
+ * @property int $nightmare_staff
+ * @property int $volatile_orb
+ * @property int $harmonised_orb
+ * @property int $eldritch_orb
+ * @property int $jar_of_dreams
+ * @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|Nightmare newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|Nightmare newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|Nightmare query()
+ * @method static \Illuminate\Database\Eloquent\Builder|Nightmare whereAccountId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Nightmare whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Nightmare whereEldritchOrb($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Nightmare whereHarmonisedOrb($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Nightmare whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Nightmare whereInquisitorsGreatHelm($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Nightmare whereInquisitorsHauberk($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Nightmare whereInquisitorsMace($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Nightmare whereInquisitorsPlateskirt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Nightmare whereJarOfDreams($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Nightmare whereKillCount($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Nightmare whereLittleNightmare($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Nightmare whereNightmareStaff($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Nightmare whereObtained($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Nightmare whereRank($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Nightmare whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Nightmare whereVolatileOrb($value)
+ * @mixin \Eloquent
+ */
+class Nightmare extends Model
+{
+    protected $table = 'nightmare';
+
+    protected $fillable = [
+        'obtained',
+        'kill_count',
+        'little_nightmare',
+        'inquisitors_mace',
+        'inquisitors_great_helm',
+        'inquisitors_hauberk',
+        'inquisitors_plateskirt',
+        'nightmare_staff',
+        'volatile_orb',
+        'harmonised_orb',
+        'eldritch_orb',
+        'jar_of_dreams',
+    ];
+
+    protected $hidden = ['user_id'];
+
+    public function account()
+    {
+        return $this->belongsTo(\App\Account::class);
+    }
+}
diff --git a/app/Boss/TheFightCaves.php b/app/Boss/TheFightCaves.php
diff --git a/app/Boss/TheInferno.php b/app/Boss/TheInferno.php
diff --git a/app/Boss/TheNightmare.php b/app/Boss/TheNightmare.php
diff --git a/app/Boss/TzKalZuk.php b/app/Boss/TzKalZuk.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Boss;
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * App\Boss\TzKalZuk
+ *
+ * @property int $id
+ * @property int $account_id
+ * @property int $kill_count
+ * @property int $rank
+ * @property int $obtained
+ * @property int $jal-nib-rek
+ * @property int $infernal_cape
+ * @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|TzKalZuk newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|TzKalZuk newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|TzKalZuk query()
+ * @method static \Illuminate\Database\Eloquent\Builder|TzKalZuk whereAccountId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TzKalZuk whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TzKalZuk whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TzKalZuk whereInfernalCape($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TzKalZuk whereJalNibRek($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TzKalZuk whereKillCount($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TzKalZuk whereObtained($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TzKalZuk whereRank($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|TzKalZuk whereUpdatedAt($value)
+ * @mixin \Eloquent
+ */
+class TzKalZuk extends Model
+{
+    protected $table = 'tzkal_zuk';
+
+    protected $fillable = [
+        'obtained',
+        'kill_count',
+        'jal-nib-rek',
+        'infernal_cape',
+    ];
+
+    protected $hidden = ['user_id'];
+
+    public function account()
+    {
+        return $this->belongsTo(\App\Account::class);
+    }
+}