Skip to content

Commit

Permalink
Merge pull request #77 from Amusement-Cafe/bort
Browse files Browse the repository at this point in the history
Bort Final
  • Loading branch information
madebynoxc authored Jan 2, 2023
2 parents 6874257 + d026115 commit 46198a7
Show file tree
Hide file tree
Showing 62 changed files with 7,215 additions and 3,272 deletions.
2 changes: 1 addition & 1 deletion collections/audit.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ module.exports = model('Audit', {
report_type: { type: Number, default: 0 },
card: [],

time: { type: Date, default: new Date() },
time: { type: Date, default: Date.now },

})
2 changes: 1 addition & 1 deletion collections/auditAucSell.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ module.exports = model('AuditAucSell', {
sold: { type: Number, default: 0 },
unsold: { type: Number, default: 0 },

time: { type: Date, default: new Date() },
time: { type: Date, default: Date.now },

})
15 changes: 15 additions & 0 deletions collections/claim.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
const {model, Schema} = require('mongoose')

module.exports = model('Claim', {
id: { type: String, default: "aaaaaa", index: true },

user: { type: String, index: true },
guild: { type: String },
cards: [{ type: Number }],

cost: { type: Number },
promo: { type: Boolean, default: false },
lock: { type: String, default: "" },

date: { type: Date, default: Date.now },
})
5 changes: 4 additions & 1 deletion collections/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,8 @@ module.exports = {
Audit: require('./audit'),
AuditAucSell: require('./auditAucSell'),
AuditTags: require('./auditTag'),
Plots: require('./plot')
Plots: require('./plot'),
UserCard: require('./userCard'),
UserStats: require('./userstats'),
UserSlot: require('./userSlot')
}
14 changes: 9 additions & 5 deletions collections/user.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ module.exports = model('User', {
discord_id: { type: String, index: true },
username: { type: String },

exp: { type: Number, default: 0 },
promoexp: { type: Number, default: 0 },
exp: { type: Number, default: 0, index: true },
promoexp: { type: Number, default: 0, index: true },
joined: { type: Date },

lastQueriedCard: { type: Object },
Expand Down Expand Up @@ -36,6 +36,10 @@ module.exports = model('User', {
memoryhall: {type: Number, default: 0},
memorybday: {type: Number, default: 0},
memoryval: {type: Number, default: 0},
xmasspace: {type: Boolean, default: false},
hallspace: {type: Boolean, default: false},
bdayspace: {type: Boolean, default: false},
valspace: {type: Boolean, default: false},
},

cards: { type: Array, default: [] },
Expand Down Expand Up @@ -72,9 +76,9 @@ module.exports = model('User', {
},

lastcard: { type: Number, default: -1 },
xp: { type: Number, default: 0 },
vials: { type: Number, default: 0 },
lemons: { type: Number, default: 0 },
xp: { type: Number, default: 0, index: true },
vials: { type: Number, default: 0, index: true },
lemons: { type: Number, default: 0, index: true },
votes: { type: Number, default: 0 },

dailyquests: { type: Array, default: [] },
Expand Down
11 changes: 11 additions & 0 deletions collections/userCard.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
const {model, Schema} = require('mongoose')

module.exports = model('UserCard', {
userid: { type: String, index: true },
cardid: { type: Number, index: true },

fav: { type: Boolean, default: false },
amount: { type: Number, default: 1 },
rating: { type: Number, default: 0 },
obtained: { type: Date, default: Date.now },
})
11 changes: 11 additions & 0 deletions collections/userSlot.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
const {model, Schema} = require('mongoose')

module.exports = model('UserSlot', {
discord_id: { type: String, index: true },
effect_name: { type: String, default: null },

slot_expires: { type: Date, default: null },
cooldown: { type: Date, default: null },

is_active: { type: Boolean, default: true }
})
46 changes: 46 additions & 0 deletions collections/userstats.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
const {model, Schema} = require('mongoose')

module.exports = model('Userstats', {
discord_id: { type: String, index: true },
username: { type: String },
daily: { type: Date, index: true },
claims: { type: Number, default: 0 },
promoclaims: { type: Number, default: 0 },
totalregclaims: { type: Number, default: 0 },
aucsell: { type: Number, default: 0 },
aucbid: { type: Number, default: 0 },
aucwin: { type: Number, default: 0 },
liquefy: { type: Number, default: 0 },
liquefy1: { type: Number, default: 0 },
liquefy2: { type: Number, default: 0 },
liquefy3: { type: Number, default: 0 },
draw: { type: Number, default: 0 },
draw1: { type: Number, default: 0 },
draw2: { type: Number, default: 0 },
draw3: { type: Number, default: 0 },
forge: { type: Number, default: 0 },
forge1: { type: Number, default: 0 },
forge2: { type: Number, default: 0 },
forge3: { type: Number, default: 0 },
tags: { type: Number, default: 0 },
rates: { type: Number, default: 0 },
wish: { type: Number, default: 0 },
usersell: { type: Number, default: 0 },
botsell: { type: Number, default: 0 },
userbuy: { type: Number, default: 0 },
tomatoin: { type: Number, default: 0 },
tomatoout: { type: Number, default: 0 },
promoin: { type: Number, default: 0 },
promoout: { type: Number, default: 0 },
vialin: { type: Number, default: 0 },
vialout: { type: Number, default: 0 },
lemonin: { type: Number, default: 0 },
lemonout: { type: Number, default: 0 },
store: { type: Number, default: 0 },
store1: { type: Number, default: 0 },
store2: { type: Number, default: 0 },
store3: { type: Number, default: 0 },
store4: { type: Number, default: 0 },
t1quests: { type: Number, default: 0 },
t2quests: { type: Number, default: 0 },
})
Loading

0 comments on commit 46198a7

Please sign in to comment.