diff --git a/index.js b/index.js index 746ee17..c7a91af 100644 --- a/index.js +++ b/index.js @@ -3,18 +3,18 @@ const { Telegraf, Markup } = require('telegraf') const { formatDistanceToNowStrict } = require('date-fns'); const fs = require('fs') const bot = new Telegraf(process.env.BOT_TOKEN) -const weaponshop = require('./db/weaponshop.json') +const weaponshop = require('./json/weaponshop.json') const houses = require('./presets/houses.json') const cars = require('./presets/cars.json') const phones = require('./presets/mobiles.json') const weapons = require('./presets/weapons.json') const equipment = require('./presets/equipment.json') const sequelize = require('./db'); -const UserModel = require('./user.model'); -const WorldModel = require('./world.model'); -const JobModel = require('./job.model'); -const PropertyModel = require('./property.model'); -const BusinessModel = require('./business.model'); +const UserModel = require('./models/user.model'); +const WorldModel = require('./models/world.model'); +const JobModel = require('./models/job.model'); +const PropertyModel = require('./models/property.model'); +const BusinessModel = require('./models/business.model'); const whitelist = [275416286, 1797342681] const adminList = [275416286] const expToUp = [0, 10, 15, 22, 35, 50, 70, 85, 100, 125, 200] @@ -792,7 +792,7 @@ function weaponShopUpdate() { weaponshop[counter] = equipment[equipId[i]] counter++ } - fs.writeFileSync('db/weaponshop.json', JSON.stringify(weaponshop, null, "\t")) + fs.writeFileSync('json/weaponshop.json', JSON.stringify(weaponshop, null, "\t")) } setInterval(() => { diff --git a/db/weaponshop.json b/json/weaponshop.json similarity index 75% rename from db/weaponshop.json rename to json/weaponshop.json index 55f3156..7231774 100644 --- a/db/weaponshop.json +++ b/json/weaponshop.json @@ -1,36 +1,36 @@ { "0": { - "name": "AK-47", - "price": 1000, - "type": "weapon" - }, - "1": { - "name": "AK-47", - "price": 1000, - "type": "weapon" - }, - "2": { "name": "SCAR-L", "price": 1000, "type": "weapon" }, + "1": { + "name": "Glock", + "price": 1000, + "type": "weapon" + }, + "2": { + "name": "ТТ", + "price": 1000, + "type": "weapon" + }, "3": { - "name": "Five-Seven", + "name": "ТТ", "price": 1000, "type": "weapon" }, "4": { - "name": "AK-47", + "name": "Glock", "price": 1000, "type": "weapon" }, "5": { - "name": "Бронежилет M4", + "name": "Бронежилет M6", "price": 1000, "type": "equipment" }, "6": { - "name": "Бронежилет M6", + "name": "Кольчуга", "price": 1000, "type": "equipment" }, @@ -40,12 +40,12 @@ "type": "equipment" }, "8": { - "name": "Бронежилет M5", + "name": "Картонные накладки", "price": 1000, "type": "equipment" }, "9": { - "name": "Бронежилет M3", + "name": "Бронежилет M2", "price": 1000, "type": "equipment" } diff --git a/business.model.js b/models/business.model.js similarity index 94% rename from business.model.js rename to models/business.model.js index 2b70e8a..adf0999 100644 --- a/business.model.js +++ b/models/business.model.js @@ -1,4 +1,4 @@ -const sequelize = require('./db'); +const sequelize = require('../db'); const {DataTypes} = require('sequelize'); const Business = sequelize.define('business', { diff --git a/job.model.js b/models/job.model.js similarity index 90% rename from job.model.js rename to models/job.model.js index b087008..007d236 100644 --- a/job.model.js +++ b/models/job.model.js @@ -1,4 +1,4 @@ -const sequelize = require('./db'); +const sequelize = require('../db'); const {DataTypes} = require('sequelize'); const Job = sequelize.define('job', { diff --git a/property.model.js b/models/property.model.js similarity index 92% rename from property.model.js rename to models/property.model.js index e3eeb7b..bed6d43 100644 --- a/property.model.js +++ b/models/property.model.js @@ -1,4 +1,4 @@ -const sequelize = require('./db'); +const sequelize = require('../db'); const {DataTypes} = require('sequelize'); const Property = sequelize.define('property', { diff --git a/user.model.js b/models/user.model.js similarity index 95% rename from user.model.js rename to models/user.model.js index dbcf0ce..1ca0d6e 100644 --- a/user.model.js +++ b/models/user.model.js @@ -1,4 +1,4 @@ -const sequelize = require('./db'); +const sequelize = require('../db'); const {DataTypes} = require('sequelize'); const User = sequelize.define('user', { diff --git a/world.model.js b/models/world.model.js similarity index 89% rename from world.model.js rename to models/world.model.js index aed44c6..a9457ea 100644 --- a/world.model.js +++ b/models/world.model.js @@ -1,4 +1,4 @@ -const sequelize = require('./db'); +const sequelize = require('../db'); const {DataTypes} = require('sequelize'); const World = sequelize.define('world', {