degradin/CampFirePlay
degradin/CampFirePlay
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

v0.0.73-79

Browse Source 
• После отработки пишется общее количество отработок.
• Добавлена система промокодов.
• Добавлен список правил в "Помощь".
• Добавлена система привелегий.
• Обновлен вывод пользователей в "Топ"
• Общие исправления.
Переработан магазин.
Проработка внешнего вида команд.
This commit is contained in:
Degradin 2023-09-27 01:24:38 +03:00
parent a9c5e6b966
commit bbe91b03c3
9 changed files with 427 additions and 294 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

650
index.js
View File

File diff suppressed because it is too large Load Diff

18
json/weaponshop.json
View File

@ -1,31 +1,31 @@
{
"0": {
"name": "Deagle",
"name": "SCAR L",
"price": 1000,
"type": "weapon"
},
"1": {
"name": "AK-47",
"name": "Deagle",
"price": 1000,
"type": "weapon"
},
"2": {
"name": "SCAR-H",
"name": "ПМ",
"price": 1000,
"type": "weapon"
},
"3": {
"name": "SCAR-H",
"name": "Deagle",
"price": 1000,
"type": "weapon"
},
"4": {
"name": "Five-Seven",
"name": "SCAR L",
"price": 1000,
"type": "weapon"
},
"5": {
"name": "Наколенники",
"name": "Бронежилет M4",
"price": 1000,
"type": "equipment"
},
@ -35,17 +35,17 @@
"type": "equipment"
},
"7": {
"name": "Бронежилет M4",
"name": "Бронежилет M5",
"price": 1000,
"type": "equipment"
},
"8": {
"name": "Шлем танкиста",
"name": "Картонные накладки",
"price": 1000,
"type": "equipment"
},
"9": {
"name": "Бронежилет M5",
"name": "Бронежилет M6",
"price": 1000,
"type": "equipment"
}

5
models/business.model.js
View File

@ -7,9 +7,8 @@ const Business = sequelize.define('business', {
owner: {type: DataTypes.STRING, defaultValue: 0},
balance: {type: DataTypes.INTEGER, defaultValue: 0},
materials: {type: DataTypes.INTEGER, defaultValue: 0},
users: {type: DataTypes.ARRAY(DataTypes.INTEGER)},
checks: {type: DataTypes.INTEGER, defaultValue: 0},
percent: {type: DataTypes.INTEGER, defaultValue: 10}
users: {type: DataTypes.ARRAY(DataTypes.BIGINT)},
checks: {type: DataTypes.INTEGER, defaultValue: 0}
})
module.exports = Business;

1
models/user.model.js
View File

@ -5,6 +5,7 @@ const User = sequelize.define('user', {
telegram_id: {type: DataTypes.STRING, primaryKey: true, unique: true},
username: {type: DataTypes.STRING},
name: {type: DataTypes.STRING},
status: {type: DataTypes.STRING, defaultValue: 'user'},
level: {type: DataTypes.INTEGER, defaultValue: 1},
exp: {type: DataTypes.INTEGER, defaultValue: 0},
money: {type: DataTypes.INTEGER, defaultValue: 0},

14
package-lock.json generated
View File

@ -16,6 +16,7 @@
"nodemon": "^2.0.7",
"pg": "^8.6.0",
"pg-hstore": "^2.3.3",
"prettytable": "^0.3.1",
"sequelize": "^6.6.2",
"shortid": "^2.2.16",
"telegraf": "^4.13.1",
@ -508,6 +509,11 @@
"node": ">=8"
}
},
"node_modules/csv-parse": {
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/csv-parse/-/csv-parse-5.5.0.tgz",
"integrity": "sha512-RxruSK3M4XgzcD7Trm2wEN+SJ26ChIb903+IWxNOcB5q4jT2Cs+hFr6QP39J05EohshRFEvyzEBoZ/466S2sbw=="
},
"node_modules/dashdash": {
"version": "1.14.1",
"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
@ -1767,6 +1773,14 @@
"node": ">=4"
}
},
"node_modules/prettytable": {
"version": "0.3.1",
"resolved": "https://registry.npmjs.org/prettytable/-/prettytable-0.3.1.tgz",
"integrity": "sha512-gQNaAPovyDhe/D0ziwad9ULsKcTvOdgv7iIxOSxGWunMaWYdXJLZNdF0Kmke9rn6qPScn/ipbtTlj/X3H3allg==",
"dependencies": {
"csv-parse": "latest"
}
},
"node_modules/process-nextick-args": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",

1
package.json
View File

@ -18,6 +18,7 @@
"nodemon": "^2.0.7",
"pg": "^8.6.0",
"pg-hstore": "^2.3.3",
"prettytable": "^0.3.1",
"sequelize": "^6.6.2",
"shortid": "^2.2.16",
"telegraf": "^4.13.1",

2
presets/cars.json
View File

@ -36,7 +36,7 @@
"price": 1450000
},
"10": {
"name": "Mercedes Benz E-200",
"name": "Mercedes Benz E200",
"price": 2000000
}
}

8
presets/houses.json
View File

@ -12,11 +12,11 @@
"price": 150000
},
"4": {
"name": "1-комнатная квартира в сталинке",
"name": "1 комнатная квартира в сталинке",
"price": 300000
},
"5": {
"name": "3-комнатная квартира в сталинке",
"name": "3 комнатная квартира в сталинке",
"price": 500000
},
"6": {
@ -24,11 +24,11 @@
"price": 2000000
},
"7": {
"name": "2-комнатная квартира с евроремонтом в панельке",
"name": "2 комнатная квартира с евроремонтом в панельке",
"price": 3800000
},
"8": {
"name": "2-этажный дом",
"name": "2 этажный дом",
"price": 5000000
},
"9": {

8
presets/weapons.json
View File

@ -10,7 +10,7 @@
"type": "weapon"
},
"3": {
"name": "Five-Seven",
"name": "FiveSeven",
"price": 1000,
"type": "weapon"
},
@ -20,7 +20,7 @@
"type": "weapon"
},
"5": {
"name": "AK-47",
"name": "AK47",
"price": 1000,
"type": "weapon"
},
@ -30,7 +30,7 @@
"type": "weapon"
},
"7": {
"name": "SCAR-H",
"name": "SCAR H",
"price": 1000,
"type": "weapon"
},
@ -40,7 +40,7 @@
"type": "weapon"
},
"9": {
"name": "SCAR-L",
"name": "SCAR L",
"price": 1000,
"type": "weapon"
},