Skip to content

Commit

Permalink
Merge pull request #63 from Zlimon/development
Browse files Browse the repository at this point in the history
Fixes and features [v.3.0]
  • Loading branch information
Simon committed Mar 28, 2021
2 parents 31c7a7e + fc355fe commit 70bcb06
Show file tree
Hide file tree
Showing 716 changed files with 7,220 additions and 1,797 deletions.
4 changes: 4 additions & 0 deletions app/Account.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,8 @@ public function user() {
public function notification() {
return $this->hasMany(Notification::class);
}

public function equipment() {
return $this->hasOne(Equipment::class);
}
}
29 changes: 29 additions & 0 deletions app/Bank.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?php

namespace App;

use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;

class Bank extends Model
{
use HasFactory;

/**
* The attributes that are mass assignable.
*
* @var array
*/
protected $fillable = [
'data',
'total'
];

protected $casts = [
'data' => 'array'
];

public function account() {
return $this->belongsTo(Account::class);
}
}
23 changes: 23 additions & 0 deletions app/Boss/Tempoross.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?php

namespace App\Boss;

use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;

class Tempoross extends Model
{
protected $table = 'tempoross';

protected $fillable = [
'obtained',
'kill_count'
];

protected $hidden = ['user_id'];

public function account()
{
return $this->belongsTo(\App\Account::class);
}
}
24 changes: 8 additions & 16 deletions app/Category.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,15 @@

use Illuminate\Database\Eloquent\Model;

/**
* App\Category
*
* @property int $id
* @property string $category
* @property-read \Illuminate\Database\Eloquent\Collection|\App\NewsPost[] $newsPost
* @property-read int|null $news_post_count
* @method static \Illuminate\Database\Eloquent\Builder|Category newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|Category newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|Category query()
* @method static \Illuminate\Database\Eloquent\Builder|Category whereCategory($value)
* @method static \Illuminate\Database\Eloquent\Builder|Category whereId($value)
* @mixin \Eloquent
*/
class Category extends Model
{
public function newsPost() {
return $this->hasMany(NewsPost::class);
public function collection()
{
return $this->hasMany(Collection::class);
}

public function notification()
{
return $this->hasMany(Notification::class);
}
}
38 changes: 38 additions & 0 deletions app/Clues/BeginnerTreasureTrails.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?php

namespace App\Clues;

use Illuminate\Database\Eloquent\Model;

class BeginnerTreasureTrails extends Model
{
protected $table = 'beginner_treasure_trails';

protected $fillable = [
'obtained',
'kill_count',
'mole_slippers',
'frog_slippers',
'bear_feet',
'demon_feet',
'jester_cape',
'shoulder_parrot',
'monks_robe_top_(t)',
'monks_robe_(t)',
'amulet_of_defence_(t)',
'sandwich_lady_hat',
'sandwich_lady_top',
'sandwich_lady_bottom',
'rune_scimitar_ornament_kit_(guthix)',
'rune_scimitar_ornament_kit_(saradomin)',
'rune_scimitar_ornament_kit_(zamorak)',
'black_pickaxe',
];

protected $hidden = ['user_id'];

public function account()
{
return $this->belongsTo(\App\Account::class);
}
}
153 changes: 153 additions & 0 deletions app/Clues/EasyTreasureTrails.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,153 @@
<?php

namespace App\Clues;

use Illuminate\Database\Eloquent\Model;

class EasyTreasureTrails extends Model
{
protected $table = 'easy_treasure_trails';

protected $fillable = [
'obtained',
'kill_count',
'team_cape_zero',
'team_cape_i',
'team_cape_x',
'cape_of_skulls',
'golden_chefs_hat',
'golden_apron',
'wooden_shield_(g)',
'black_full_helm_(t)',
'black_platebody_(t)',
'black_platelegs_(t)',
'black_plateskirt_(t)',
'black_kiteshield_(t)',
'black_full_helm_(g)',
'black_platebody_(g)',
'black_platelegs_(g)',
'black_plateskirt_(g)',
'black_kiteshield_(g)',
'black_shield_(h1)',
'black_shield_(h2)',
'black_shield_(h3)',
'black_shield_(h4)',
'black_shield_(h5)',
'black_helm_(h1)',
'black_helm_(h2)',
'black_helm_(h3)',
'black_helm_(h4)',
'black_helm_(h5)',
'black_platebody_(h1)',
'black_platebody_(h2)',
'black_platebody_(h3)',
'black_platebody_(h4)',
'black_platebody_(h5)',
'steel_full_helm_(t)',
'steel_platebody_(t)',
'steel_platelegs_(t)',
'steel_plateskirt_(t)',
'steel_kiteshield_(t)',
'steel_full_helm_(g)',
'steel_platebody_(g)',
'steel_platelegs_(g)',
'steel_plateskirt_(g)',
'steel_kiteshield_(g)',
'iron_platebody_(t)',
'iron_platelegs_(t)',
'iron_plateskirt_(t)',
'iron_kiteshield_(t)',
'iron_full_helm_(t)',
'iron_platebody_(g)',
'iron_platelegs_(g)',
'iron_plateskirt_(g)',
'iron_kiteshield_(g)',
'iron_full_helm_(g)',
'bronze_platebody_(t)',
'bronze_platelegs_(t)',
'bronze_plateskirt_(t)',
'bronze_kiteshield_(t)',
'bronze_full_helm_(t)',
'bronze_platebody_(g)',
'bronze_platelegs_(g)',
'bronze_plateskirt_(g)',
'bronze_kiteshield_(g)',
'bronze_full_helm_(g)',
'studded_body_(g)',
'studded_chaps_(g)',
'studded_body_(t)',
'studded_chaps_(t)',
'leather_body_(g)',
'leather_chaps_(g)',
'blue_wizard_hat_(g)',
'blue_wizard_robe_(g)',
'blue_skirt_(g)',
'blue_wizard_hat_(t)',
'blue_wizard_robe_(t)',
'blue_skirt_(t)',
'black_wizard_hat_(g)',
'black_wizard_robe_(g)',
'black_skirt_(g)',
'black_wizard_hat_(t)',
'black_wizard_robe_(t)',
'black_skirt_(t)',
'monks_robe_top_(g)',
'monks_robe_(g)',
'saradomin_robe_top',
'saradomin_robe_legs',
'guthix_robe_top',
'guthix_robe_legs',
'zamorak_robe_top',
'zamorak_robe_legs',
'ancient_robe_top',
'ancient_robe_legs',
'armadyl_robe_top',
'armadyl_robe_legs',
'bandos_robe_top',
'bandos_robe_legs',
'bobs_red_shirt',
'bobs_green_shirt',
'bobs_blue_shirt',
'bobs_black_shirt',
'bobs_purple_shirt',
'highwayman_mask',
'blue_beret',
'black_beret',
'white_beret',
'red_beret',
'a_powdered_wig',
'beanie',
'imp_mask',
'goblin_mask',
'sleeping_cap',
'flared_trousers',
'pantaloons',
'black_cane',
'staff_of_bob_the_cat',
'red_elegant_shirt',
'red_elegant_blouse',
'red_elegant_legs',
'red_elegant_skirt',
'green_elegant_shirt',
'green_elegant_blouse',
'green_elegant_legs',
'green_elegant_skirt',
'blue_elegant_shirt',
'blue_elegant_blouse',
'blue_elegant_legs',
'blue_elegant_skirt',
'amulet_of_magic_(t)',
'amulet_of_power_(t)',
'black_pickaxe',
'ham_joint',
'rain_bow',
'willow_comp_bow',
];

protected $hidden = ['user_id'];

public function account()
{
return $this->belongsTo(\App\Account::class);
}
}
Loading

0 comments on commit 70bcb06

Please sign in to comment.