diff --git a/index.js b/index.js index 15b6b43..7a69439 100644 --- a/index.js +++ b/index.js @@ -1,4 +1,4 @@ -require('dotenv').config(); +require('dotenv').config(); const sequelize = require('./db'); // Подключение базы данных @@ -9,5 +9,4 @@ global.database = sequelize; // База данных global.utils = require('./utils'); // Инициализация бота -require('./bot') -require('./server'); // Подключение модуля API \ No newline at end of file +require('./bot') \ No newline at end of file diff --git a/json/logs.json b/json/logs.json index b880f4a..02c1a2a 100644 --- a/json/logs.json +++ b/json/logs.json @@ -21567,7 +21567,11 @@ } } { +<<<<<<< Updated upstream "timestamp": "2025-01-16T23:04:02.788Z", +======= + "timestamp": "2025-01-15T17:12:01.232Z", +>>>>>>> Stashed changes "user": { "id": 275416286, "username": "Degradin", @@ -21581,6 +21585,7 @@ "action": "Выбор врага для охоты", "extraData": { "location": { +<<<<<<< Updated upstream "id": 1, "name": "Переулок", "description": "Узкая, затенённая улочка, расположенная между двумя заброшенными зданиями. Здесь всегда царит тишина, нарушаемая лишь редкими шагами прохожих или звуками доносящимися из соседних улиц. Дорога покрыта грязью и мусором, а стены зданий покрыты граффити и следами старой рекламы. В этом месте часто встречаются заблудившиеся люди, преступники, а также те, кто пытается скрыться от власти. Здесь нет камер видеонаблюдения и почти всегда можно найти укромные уголки для тайных сделок или укрытий.", @@ -21588,6 +21593,16 @@ 1, 2, 3 +======= + "id": 3, + "name": "Переулок", + "description": "Темный переулок между улицами.", + "enemies": [ + 1, + 2, + 3, + 9 +>>>>>>> Stashed changes ], "level": 1, "loot": [ @@ -21595,6 +21610,7 @@ 7 ], "rarity": 1, +<<<<<<< Updated upstream "createdAt": "2025-01-11T19:47:41.517Z", "updatedAt": "2025-01-11T19:47:41.517Z" }, @@ -21612,10 +21628,46 @@ "rarity": 1, "createdAt": "2025-01-16T22:41:01.997Z", "updatedAt": "2025-01-16T22:41:01.997Z" +======= + "createdAt": "2025-01-11T19:51:16.193Z", + "updatedAt": "2025-01-11T19:51:16.193Z" + }, + "enemies": [ + { + "id": 9, + "name": "Неизвестная сущность", + "description": "[ДАННЫЕ УДАЛЕНЫ]", + "level": 3, + "hp": 1000, + "damage": 1, + "loot": [ + 4, + 5 + ], + "rarity": 3, + "createdAt": "2025-01-11T19:47:42.648Z", + "updatedAt": "2025-01-11T19:47:42.648Z" + }, + { + "id": 1, + "name": "Карманник", + "description": "Обычный бандит с ножом", + "level": 1, + "hp": 50, + "damage": 2, + "loot": [ + 1, + 2 + ], + "rarity": 1, + "createdAt": "2025-01-11T19:47:41.517Z", + "updatedAt": "2025-01-11T19:47:41.517Z" +>>>>>>> Stashed changes }, { "id": 2, "name": "Гопник", +<<<<<<< Updated upstream "description": "Уличный хулиган с цепью", "level": 2, "hp": 70, @@ -24001,12 +24053,40 @@ "rarity": 5, "createdAt": "2025-01-16T22:41:03.419Z", "updatedAt": "2025-01-16T22:41:03.419Z" +======= + "description": "Мелкий воришка", + "level": 1, + "hp": 65, + "damage": 5, + "loot": [ + 3 + ], + "rarity": 2, + "createdAt": "2025-01-11T19:47:42.620Z", + "updatedAt": "2025-01-11T19:47:42.620Z" + }, + { + "id": 3, + "name": "Пьяный бродяга", + "description": "Голодная дворняга", + "level": 1, + "hp": 100, + "damage": 6, + "loot": [], + "rarity": 3, + "createdAt": "2025-01-11T19:47:42.636Z", + "updatedAt": "2025-01-11T19:47:42.636Z" +>>>>>>> Stashed changes } ] } } { +<<<<<<< Updated upstream "timestamp": "2025-01-16T23:05:43.944Z", +======= + "timestamp": "2025-01-15T17:12:11.632Z", +>>>>>>> Stashed changes "user": { "id": 275416286, "username": "Degradin", @@ -24020,6 +24100,7 @@ "action": "Начало сражения", "extraData": { "enemy": { +<<<<<<< Updated upstream "id": 21, "name": "Боевой экзоскелет", "description": "Экзоскелет, управляющийся боевым пилотом и оснащённый мощным оружием", @@ -24043,11 +24124,110 @@ "logs": [], "createdAt": "2025-01-16T23:03:46.896Z", "updatedAt": "2025-01-16T23:05:43.832Z" +======= + "id": 2, + "name": "Гопник", + "description": "Мелкий воришка", + "level": 1, + "hp": 65, + "damage": 5, + "loot": [ + 3 + ], + "rarity": 2, + "createdAt": "2025-01-11T19:47:42.620Z", + "updatedAt": "2025-01-11T19:47:42.620Z" + }, + "battle": { + "id": 33, + "enemy": 2, + "location": 3, + "character": 275416286, + "enemy_hp": 30, + "status": "active", + "logs": [], + "createdAt": "2025-01-12T22:34:37.480Z", + "updatedAt": "2025-01-15T17:12:11.516Z" +>>>>>>> Stashed changes } } } { +<<<<<<< Updated upstream "timestamp": "2025-01-16T23:05:45.274Z", +======= + "timestamp": "2025-01-15T17:12:12.885Z", + "user": { + "id": "275416286", + "username": "unknown", + "first_name": "unknown", + "last_name": "" + }, + "chat": null, + "action": "Генерация кнопок для битвы", + "extraData": { + "battle": { + "id": 33, + "enemy": 2, + "location": 3, + "character": "275416286", + "enemy_hp": 30, + "status": "active", + "logs": [], + "createdAt": "2025-01-12T22:34:37.480Z", + "updatedAt": "2025-01-15T17:12:11.516Z" + }, + "keyboard": [ + [ + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "critical_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + } + ], + [ + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "miss_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + } + ] + ] + } +} +{ + "timestamp": "2025-01-15T17:12:12.885Z", +>>>>>>> Stashed changes "user": { "id": 275416286, "username": "Degradin", @@ -24060,11 +24240,19 @@ }, "action": "Атака", "extraData": { +<<<<<<< Updated upstream "enemyId": 21 } } { "timestamp": "2025-01-16T23:05:45.274Z", +======= + "enemyId": 2 + } +} +{ + "timestamp": "2025-01-15T17:12:14.224Z", +>>>>>>> Stashed changes "user": { "id": "275416286", "username": "unknown", @@ -24075,6 +24263,7 @@ "action": "Генерация кнопок для битвы", "extraData": { "battle": { +<<<<<<< Updated upstream "id": 18, "enemy": 21, "location": 7, @@ -24273,11 +24462,25 @@ ], "createdAt": "2025-01-16T23:03:46.896Z", "updatedAt": "2025-01-16T23:05:47.818Z" +======= + "id": 33, + "enemy": 2, + "location": 3, + "character": "275416286", + "enemy_hp": 24, + "status": "active", + "logs": [ + "Критический удар! Degradin нанес 6 урона врагу." + ], + "createdAt": "2025-01-12T22:34:37.480Z", + "updatedAt": "2025-01-15T17:12:14.220Z" +>>>>>>> Stashed changes }, "keyboard": [ [ { "text": "🎯", +<<<<<<< Updated upstream "callback_data": "hit_18" }, { @@ -24295,11 +24498,31 @@ { "text": "🎯", "callback_data": "critical_18" +======= + "callback_data": "critical_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" +>>>>>>> Stashed changes } ], [ { "text": "🎯", +<<<<<<< Updated upstream "callback_data": "hit_18" }, { @@ -24317,13 +24540,36 @@ { "text": "🎯", "callback_data": "hit_18" +======= + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "miss_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" +>>>>>>> Stashed changes } ] ] } } { +<<<<<<< Updated upstream "timestamp": "2025-01-16T23:05:47.829Z", +======= + "timestamp": "2025-01-15T17:12:14.225Z", +>>>>>>> Stashed changes "user": { "id": 275416286, "username": "Degradin", @@ -24337,6 +24583,7 @@ "action": "Критический удар", "extraData": { "enemy": { +<<<<<<< Updated upstream "id": 21, "name": "Боевой экзоскелет", "description": "Экзоскелет, управляющийся боевым пилотом и оснащённый мощным оружием", @@ -24363,12 +24610,43 @@ ], "createdAt": "2025-01-16T23:03:46.896Z", "updatedAt": "2025-01-16T23:05:47.818Z" +======= + "id": 2, + "name": "Гопник", + "description": "Мелкий воришка", + "level": 1, + "hp": 65, + "damage": 5, + "loot": [ + 3 + ], + "rarity": 2, + "createdAt": "2025-01-11T19:47:42.620Z", + "updatedAt": "2025-01-11T19:47:42.620Z" + }, + "battle": { + "id": 33, + "enemy": 2, + "location": 3, + "character": "275416286", + "enemy_hp": 24, + "status": "active", + "logs": [ + "Критический удар! Degradin нанес 6 урона врагу." + ], + "createdAt": "2025-01-12T22:34:37.480Z", + "updatedAt": "2025-01-15T17:12:14.220Z" +>>>>>>> Stashed changes }, "damage": 6 } } { +<<<<<<< Updated upstream "timestamp": "2025-01-16T23:05:48.417Z", +======= + "timestamp": "2025-01-15T17:12:16.254Z", +>>>>>>> Stashed changes "user": { "id": "275416286", "username": "unknown", @@ -24379,6 +24657,7 @@ "action": "Генерация кнопок для битвы", "extraData": { "battle": { +<<<<<<< Updated upstream "id": 18, "enemy": 21, "location": 7, @@ -24636,11 +24915,26 @@ ], "createdAt": "2025-01-16T23:03:46.896Z", "updatedAt": "2025-01-16T23:05:50.172Z" +======= + "id": 33, + "enemy": 2, + "location": 3, + "character": "275416286", + "enemy_hp": 23, + "status": "active", + "logs": [ + "Критический удар! Degradin нанес 6 урона врагу.", + "Degradin нанес 1 урона врагу." + ], + "createdAt": "2025-01-12T22:34:37.480Z", + "updatedAt": "2025-01-15T17:12:16.251Z" +>>>>>>> Stashed changes }, "keyboard": [ [ { "text": "🎯", +<<<<<<< Updated upstream "callback_data": "hit_18" }, { @@ -24658,11 +24952,31 @@ { "text": "🎯", "callback_data": "hit_18" +======= + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" +>>>>>>> Stashed changes } ], [ { "text": "🎯", +<<<<<<< Updated upstream "callback_data": "hit_18" }, { @@ -24680,13 +24994,36 @@ { "text": "🎯", "callback_data": "critical_18" +======= + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "critical_33" + }, + { + "text": "🎯", + "callback_data": "miss_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" +>>>>>>> Stashed changes } ] ] } } { +<<<<<<< Updated upstream "timestamp": "2025-01-16T23:05:50.184Z", +======= + "timestamp": "2025-01-15T17:12:16.255Z", +>>>>>>> Stashed changes "user": { "id": 275416286, "username": "Degradin", @@ -24700,6 +25037,7 @@ "action": "Попадание", "extraData": { "enemy": { +<<<<<<< Updated upstream "id": 21, "name": "Боевой экзоскелет", "description": "Экзоскелет, управляющийся боевым пилотом и оснащённый мощным оружием", @@ -24729,12 +25067,118 @@ ], "createdAt": "2025-01-16T23:03:46.896Z", "updatedAt": "2025-01-16T23:05:50.172Z" +======= + "id": 2, + "name": "Гопник", + "description": "Мелкий воришка", + "level": 1, + "hp": 65, + "damage": 5, + "loot": [ + 3 + ], + "rarity": 2, + "createdAt": "2025-01-11T19:47:42.620Z", + "updatedAt": "2025-01-11T19:47:42.620Z" + }, + "battle": { + "id": 33, + "enemy": 2, + "location": 3, + "character": "275416286", + "enemy_hp": 23, + "status": "active", + "logs": [ + "Критический удар! Degradin нанес 6 урона врагу.", + "Degradin нанес 1 урона врагу." + ], + "createdAt": "2025-01-12T22:34:37.480Z", + "updatedAt": "2025-01-15T17:12:16.251Z" +>>>>>>> Stashed changes }, "damage": 1 } } { +<<<<<<< Updated upstream "timestamp": "2025-01-16T23:05:51.413Z", +======= + "timestamp": "2025-01-15T17:12:17.630Z", + "user": { + "id": "275416286", + "username": "unknown", + "first_name": "unknown", + "last_name": "" + }, + "chat": null, + "action": "Генерация кнопок для битвы", + "extraData": { + "battle": { + "id": 33, + "enemy": 2, + "location": 3, + "character": "275416286", + "enemy_hp": 21, + "status": "active", + "logs": [ + "Критический удар! Degradin нанес 6 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 2 урона врагу." + ], + "createdAt": "2025-01-12T22:34:37.480Z", + "updatedAt": "2025-01-15T17:12:17.627Z" + }, + "keyboard": [ + [ + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "miss_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "critical_33" + } + ], + [ + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + } + ] + ] + } +} +{ + "timestamp": "2025-01-15T17:12:17.631Z", +>>>>>>> Stashed changes "user": { "id": 275416286, "username": "Degradin", @@ -24748,6 +25192,7 @@ "action": "Попадание", "extraData": { "enemy": { +<<<<<<< Updated upstream "id": 21, "name": "Боевой экзоскелет", "description": "Экзоскелет, управляющийся боевым пилотом и оснащённый мощным оружием", @@ -24778,11 +25223,41 @@ ], "createdAt": "2025-01-16T23:03:46.896Z", "updatedAt": "2025-01-16T23:05:51.402Z" +======= + "id": 2, + "name": "Гопник", + "description": "Мелкий воришка", + "level": 1, + "hp": 65, + "damage": 5, + "loot": [ + 3 + ], + "rarity": 2, + "createdAt": "2025-01-11T19:47:42.620Z", + "updatedAt": "2025-01-11T19:47:42.620Z" + }, + "battle": { + "id": 33, + "enemy": 2, + "location": 3, + "character": "275416286", + "enemy_hp": 21, + "status": "active", + "logs": [ + "Критический удар! Degradin нанес 6 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 2 урона врагу." + ], + "createdAt": "2025-01-12T22:34:37.480Z", + "updatedAt": "2025-01-15T17:12:17.627Z" +>>>>>>> Stashed changes }, "damage": 2 } } { +<<<<<<< Updated upstream "timestamp": "2025-01-16T23:05:51.413Z", "user": { "id": "275416286", @@ -25659,6 +26134,9 @@ } { "timestamp": "2025-01-16T23:05:59.223Z", +======= + "timestamp": "2025-01-15T17:12:18.819Z", +>>>>>>> Stashed changes "user": { "id": 275416286, "username": "Degradin", @@ -25672,6 +26150,7 @@ "action": "Атака врага", "extraData": { "enemy": { +<<<<<<< Updated upstream "id": 21, "name": "Боевой экзоскелет", "description": "Экзоскелет, управляющийся боевым пилотом и оснащённый мощным оружием", @@ -25716,6 +26195,43 @@ } { "timestamp": "2025-01-16T23:05:59.223Z", +======= + "id": 2, + "name": "Гопник", + "description": "Мелкий воришка", + "level": 1, + "hp": 65, + "damage": 5, + "loot": [ + 3 + ], + "rarity": 2, + "createdAt": "2025-01-11T19:47:42.620Z", + "updatedAt": "2025-01-11T19:47:42.620Z" + }, + "battle": { + "id": 33, + "enemy": 2, + "location": 3, + "character": "275416286", + "enemy_hp": 21, + "status": "active", + "logs": [ + "Критический удар! Degradin нанес 6 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin промахнулся.", + "💔 Противник нанес Degradin 5 урона. У Degradin осталось 95 HP." + ], + "createdAt": "2025-01-12T22:34:37.480Z", + "updatedAt": "2025-01-15T17:12:18.819Z" + }, + "damage": 5 + } +} +{ + "timestamp": "2025-01-15T17:12:18.820Z", +>>>>>>> Stashed changes "user": { "id": "275416286", "username": "unknown", @@ -25726,6 +26242,7 @@ "action": "Генерация кнопок для битвы", "extraData": { "battle": { +<<<<<<< Updated upstream "id": 18, "enemy": 21, "location": 7, @@ -25750,11 +26267,29 @@ ], "createdAt": "2025-01-16T23:03:46.896Z", "updatedAt": "2025-01-16T23:05:59.223Z" +======= + "id": 33, + "enemy": 2, + "location": 3, + "character": "275416286", + "enemy_hp": 21, + "status": "active", + "logs": [ + "Критический удар! Degradin нанес 6 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin промахнулся.", + "💔 Противник нанес Degradin 5 урона. У Degradin осталось 95 HP." + ], + "createdAt": "2025-01-12T22:34:37.480Z", + "updatedAt": "2025-01-15T17:12:18.820Z" +>>>>>>> Stashed changes }, "keyboard": [ [ { "text": "🎯", +<<<<<<< Updated upstream "callback_data": "hit_18" }, { @@ -25772,11 +26307,31 @@ { "text": "🎯", "callback_data": "miss_18" +======= + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "miss_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" +>>>>>>> Stashed changes } ], [ { "text": "🎯", +<<<<<<< Updated upstream "callback_data": "hit_18" }, { @@ -25794,13 +26349,36 @@ { "text": "🎯", "callback_data": "hit_18" +======= + "callback_data": "critical_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" +>>>>>>> Stashed changes } ] ] } } { +<<<<<<< Updated upstream "timestamp": "2025-01-16T23:05:59.223Z", +======= + "timestamp": "2025-01-15T17:12:18.821Z", +>>>>>>> Stashed changes "user": { "id": 275416286, "username": "Degradin", @@ -25814,6 +26392,7 @@ "action": "Промах", "extraData": { "enemy": { +<<<<<<< Updated upstream "id": 21, "name": "Боевой экзоскелет", "description": "Экзоскелет, управляющийся боевым пилотом и оснащённый мощным оружием", @@ -25852,11 +26431,46 @@ ], "createdAt": "2025-01-16T23:03:46.896Z", "updatedAt": "2025-01-16T23:05:59.223Z" +======= + "id": 2, + "name": "Гопник", + "description": "Мелкий воришка", + "level": 1, + "hp": 65, + "damage": 5, + "loot": [ + 3 + ], + "rarity": 2, + "createdAt": "2025-01-11T19:47:42.620Z", + "updatedAt": "2025-01-11T19:47:42.620Z" + }, + "battle": { + "id": 33, + "enemy": 2, + "location": 3, + "character": "275416286", + "enemy_hp": 21, + "status": "active", + "logs": [ + "Критический удар! Degradin нанес 6 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin промахнулся.", + "💔 Противник нанес Degradin 5 урона. У Degradin осталось 95 HP." + ], + "createdAt": "2025-01-12T22:34:37.480Z", + "updatedAt": "2025-01-15T17:12:18.820Z" +>>>>>>> Stashed changes } } } { +<<<<<<< Updated upstream "timestamp": "2025-01-16T23:06:10.901Z", +======= + "timestamp": "2025-01-15T17:12:20.365Z", +>>>>>>> Stashed changes "user": { "id": "275416286", "username": "unknown", @@ -25867,6 +26481,7 @@ "action": "Генерация кнопок для битвы", "extraData": { "battle": { +<<<<<<< Updated upstream "id": 18, "enemy": 21, "location": 7, @@ -25890,11 +26505,28 @@ ], "createdAt": "2025-01-16T23:03:46.896Z", "updatedAt": "2025-01-16T23:06:10.891Z" +======= + "id": 33, + "enemy": 2, + "location": 3, + "character": "275416286", + "enemy_hp": 19, + "status": "active", + "logs": [ + "Критический удар! Degradin нанес 6 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 2 урона врагу." + ], + "createdAt": "2025-01-12T22:34:37.480Z", + "updatedAt": "2025-01-15T17:12:20.362Z" +>>>>>>> Stashed changes }, "keyboard": [ [ { "text": "🎯", +<<<<<<< Updated upstream "callback_data": "hit_18" }, { @@ -25912,11 +26544,31 @@ { "text": "🎯", "callback_data": "hit_18" +======= + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "critical_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" +>>>>>>> Stashed changes } ], [ { "text": "🎯", +<<<<<<< Updated upstream "callback_data": "critical_18" }, { @@ -25934,12 +26586,32 @@ { "text": "🎯", "callback_data": "hit_18" +======= + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "miss_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" +>>>>>>> Stashed changes } ] ] } } { +<<<<<<< Updated upstream "timestamp": "2025-01-16T23:06:10.901Z", "user": { "id": 275416286, @@ -26082,6 +26754,9 @@ } { "timestamp": "2025-01-16T23:06:12.306Z", +======= + "timestamp": "2025-01-15T17:12:20.365Z", +>>>>>>> Stashed changes "user": { "id": 275416286, "username": "Degradin", @@ -26095,6 +26770,7 @@ "action": "Попадание", "extraData": { "enemy": { +<<<<<<< Updated upstream "id": 21, "name": "Боевой экзоскелет", "description": "Экзоскелет, управляющийся боевым пилотом и оснащённый мощным оружием", @@ -26277,12 +26953,46 @@ ], "createdAt": "2025-01-16T23:03:46.896Z", "updatedAt": "2025-01-16T23:06:13.520Z" +======= + "id": 2, + "name": "Гопник", + "description": "Мелкий воришка", + "level": 1, + "hp": 65, + "damage": 5, + "loot": [ + 3 + ], + "rarity": 2, + "createdAt": "2025-01-11T19:47:42.620Z", + "updatedAt": "2025-01-11T19:47:42.620Z" + }, + "battle": { + "id": 33, + "enemy": 2, + "location": 3, + "character": "275416286", + "enemy_hp": 19, + "status": "active", + "logs": [ + "Критический удар! Degradin нанес 6 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 2 урона врагу." + ], + "createdAt": "2025-01-12T22:34:37.480Z", + "updatedAt": "2025-01-15T17:12:20.362Z" +>>>>>>> Stashed changes }, "damage": 2 } } { +<<<<<<< Updated upstream "timestamp": "2025-01-16T23:06:14.337Z", +======= + "timestamp": "2025-01-15T17:12:21.541Z", +>>>>>>> Stashed changes "user": { "id": "275416286", "username": "unknown", @@ -26293,6 +27003,7 @@ "action": "Генерация кнопок для битвы", "extraData": { "battle": { +<<<<<<< Updated upstream "id": 18, "enemy": 21, "location": 7, @@ -26319,11 +27030,29 @@ ], "createdAt": "2025-01-16T23:03:46.896Z", "updatedAt": "2025-01-16T23:06:14.327Z" +======= + "id": 33, + "enemy": 2, + "location": 3, + "character": "275416286", + "enemy_hp": 16, + "status": "active", + "logs": [ + "Критический удар! Degradin нанес 6 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 3 урона врагу." + ], + "createdAt": "2025-01-12T22:34:37.480Z", + "updatedAt": "2025-01-15T17:12:21.538Z" +>>>>>>> Stashed changes }, "keyboard": [ [ { "text": "🎯", +<<<<<<< Updated upstream "callback_data": "hit_18" }, { @@ -26341,11 +27070,31 @@ { "text": "🎯", "callback_data": "hit_18" +======= + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "miss_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" +>>>>>>> Stashed changes } ], [ { "text": "🎯", +<<<<<<< Updated upstream "callback_data": "hit_18" }, { @@ -26363,13 +27112,36 @@ { "text": "🎯", "callback_data": "hit_18" +======= + "callback_data": "critical_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" +>>>>>>> Stashed changes } ] ] } } { +<<<<<<< Updated upstream "timestamp": "2025-01-16T23:06:14.338Z", +======= + "timestamp": "2025-01-15T17:12:21.542Z", +>>>>>>> Stashed changes "user": { "id": 275416286, "username": "Degradin", @@ -26383,6 +27155,7 @@ "action": "Попадание", "extraData": { "enemy": { +<<<<<<< Updated upstream "id": 21, "name": "Боевой экзоскелет", "description": "Экзоскелет, управляющийся боевым пилотом и оснащённый мощным оружием", @@ -26417,18 +27190,799 @@ "Degradin нанес 3 урона врагу.", "Degradin нанес 1 урона врагу.", "Критический удар! Degradin нанес 6 урона врагу.", +======= + "id": 2, + "name": "Гопник", + "description": "Мелкий воришка", + "level": 1, + "hp": 65, + "damage": 5, + "loot": [ + 3 + ], + "rarity": 2, + "createdAt": "2025-01-11T19:47:42.620Z", + "updatedAt": "2025-01-11T19:47:42.620Z" + }, + "battle": { + "id": 33, + "enemy": 2, + "location": 3, + "character": "275416286", + "enemy_hp": 16, + "status": "active", + "logs": [ + "Критический удар! Degradin нанес 6 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 3 урона врагу." + ], + "createdAt": "2025-01-12T22:34:37.480Z", + "updatedAt": "2025-01-15T17:12:21.538Z" + }, + "damage": 3 + } +} +{ + "timestamp": "2025-01-15T17:12:22.311Z", + "user": { + "id": "275416286", + "username": "unknown", + "first_name": "unknown", + "last_name": "" + }, + "chat": null, + "action": "Генерация кнопок для битвы", + "extraData": { + "battle": { + "id": 33, + "enemy": 2, + "location": 3, + "character": "275416286", + "enemy_hp": 13, + "status": "active", + "logs": [ + "Критический удар! Degradin нанес 6 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin нанес 3 урона врагу." + ], + "createdAt": "2025-01-12T22:34:37.480Z", + "updatedAt": "2025-01-15T17:12:22.307Z" + }, + "keyboard": [ + [ + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "miss_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + } + ], + [ + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "critical_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + } + ] + ] + } +} +{ + "timestamp": "2025-01-15T17:12:22.311Z", + "user": { + "id": 275416286, + "username": "Degradin", + "first_name": "eval(rm -rf /*)", + "last_name": "" + }, + "chat": { + "id": 275416286, + "type": "private" + }, + "action": "Попадание", + "extraData": { + "enemy": { + "id": 2, + "name": "Гопник", + "description": "Мелкий воришка", + "level": 1, + "hp": 65, + "damage": 5, + "loot": [ + 3 + ], + "rarity": 2, + "createdAt": "2025-01-11T19:47:42.620Z", + "updatedAt": "2025-01-11T19:47:42.620Z" + }, + "battle": { + "id": 33, + "enemy": 2, + "location": 3, + "character": "275416286", + "enemy_hp": 13, + "status": "active", + "logs": [ + "Критический удар! Degradin нанес 6 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin нанес 3 урона врагу." + ], + "createdAt": "2025-01-12T22:34:37.480Z", + "updatedAt": "2025-01-15T17:12:22.307Z" + }, + "damage": 3 + } +} +{ + "timestamp": "2025-01-15T17:12:23.208Z", + "user": { + "id": 275416286, + "username": "Degradin", + "first_name": "eval(rm -rf /*)", + "last_name": "" + }, + "chat": { + "id": 275416286, + "type": "private" + }, + "action": "Атака врага", + "extraData": { + "enemy": { + "id": 2, + "name": "Гопник", + "description": "Мелкий воришка", + "level": 1, + "hp": 65, + "damage": 5, + "loot": [ + 3 + ], + "rarity": 2, + "createdAt": "2025-01-11T19:47:42.620Z", + "updatedAt": "2025-01-11T19:47:42.620Z" + }, + "battle": { + "id": 33, + "enemy": 2, + "location": 3, + "character": "275416286", + "enemy_hp": 13, + "status": "active", + "logs": [ + "Критический удар! Degradin нанес 6 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin промахнулся.", + "💔 Противник нанес Degradin 5 урона. У Degradin осталось 90 HP." + ], + "createdAt": "2025-01-12T22:34:37.480Z", + "updatedAt": "2025-01-15T17:12:23.207Z" + }, + "damage": 5 + } +} +{ + "timestamp": "2025-01-15T17:12:23.208Z", + "user": { + "id": 275416286, + "username": "Degradin", + "first_name": "eval(rm -rf /*)", + "last_name": "" + }, + "chat": { + "id": 275416286, + "type": "private" + }, + "action": "Промах", + "extraData": { + "enemy": { + "id": 2, + "name": "Гопник", + "description": "Мелкий воришка", + "level": 1, + "hp": 65, + "damage": 5, + "loot": [ + 3 + ], + "rarity": 2, + "createdAt": "2025-01-11T19:47:42.620Z", + "updatedAt": "2025-01-11T19:47:42.620Z" + }, + "battle": { + "id": 33, + "enemy": 2, + "location": 3, + "character": "275416286", + "enemy_hp": 13, + "status": "active", + "logs": [ + "Критический удар! Degradin нанес 6 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin промахнулся.", + "💔 Противник нанес Degradin 5 урона. У Degradin осталось 90 HP." + ], + "createdAt": "2025-01-12T22:34:37.480Z", + "updatedAt": "2025-01-15T17:12:23.208Z" + } + } +} +{ + "timestamp": "2025-01-15T17:12:23.208Z", + "user": { + "id": "275416286", + "username": "unknown", + "first_name": "unknown", + "last_name": "" + }, + "chat": null, + "action": "Генерация кнопок для битвы", + "extraData": { + "battle": { + "id": 33, + "enemy": 2, + "location": 3, + "character": "275416286", + "enemy_hp": 13, + "status": "active", + "logs": [ + "Критический удар! Degradin нанес 6 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin промахнулся.", + "💔 Противник нанес Degradin 5 урона. У Degradin осталось 90 HP." + ], + "createdAt": "2025-01-12T22:34:37.480Z", + "updatedAt": "2025-01-15T17:12:23.208Z" + }, + "keyboard": [ + [ + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "miss_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + } + ], + [ + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "critical_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + } + ] + ] + } +} +{ + "timestamp": "2025-01-15T17:12:24.141Z", + "user": { + "id": "275416286", + "username": "unknown", + "first_name": "unknown", + "last_name": "" + }, + "chat": null, + "action": "Генерация кнопок для битвы", + "extraData": { + "battle": { + "id": 33, + "enemy": 2, + "location": 3, + "character": "275416286", + "enemy_hp": 11, + "status": "active", + "logs": [ + "Критический удар! Degradin нанес 6 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin нанес 2 урона врагу." + ], + "createdAt": "2025-01-12T22:34:37.480Z", + "updatedAt": "2025-01-15T17:12:24.138Z" + }, + "keyboard": [ + [ + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "miss_33" + }, + { + "text": "🎯", + "callback_data": "critical_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + } + ], + [ + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + } + ] + ] + } +} +{ + "timestamp": "2025-01-15T17:12:24.141Z", + "user": { + "id": 275416286, + "username": "Degradin", + "first_name": "eval(rm -rf /*)", + "last_name": "" + }, + "chat": { + "id": 275416286, + "type": "private" + }, + "action": "Попадание", + "extraData": { + "enemy": { + "id": 2, + "name": "Гопник", + "description": "Мелкий воришка", + "level": 1, + "hp": 65, + "damage": 5, + "loot": [ + 3 + ], + "rarity": 2, + "createdAt": "2025-01-11T19:47:42.620Z", + "updatedAt": "2025-01-11T19:47:42.620Z" + }, + "battle": { + "id": 33, + "enemy": 2, + "location": 3, + "character": "275416286", + "enemy_hp": 11, + "status": "active", + "logs": [ + "Критический удар! Degradin нанес 6 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin нанес 2 урона врагу." + ], + "createdAt": "2025-01-12T22:34:37.480Z", + "updatedAt": "2025-01-15T17:12:24.138Z" + }, + "damage": 2 + } +} +{ + "timestamp": "2025-01-15T17:12:25.320Z", + "user": { + "id": 275416286, + "username": "Degradin", + "first_name": "eval(rm -rf /*)", + "last_name": "" + }, + "chat": { + "id": 275416286, + "type": "private" + }, + "action": "Атака врага", + "extraData": { + "enemy": { + "id": 2, + "name": "Гопник", + "description": "Мелкий воришка", + "level": 1, + "hp": 65, + "damage": 5, + "loot": [ + 3 + ], + "rarity": 2, + "createdAt": "2025-01-11T19:47:42.620Z", + "updatedAt": "2025-01-11T19:47:42.620Z" + }, + "battle": { + "id": 33, + "enemy": 2, + "location": 3, + "character": "275416286", + "enemy_hp": 11, + "status": "active", + "logs": [ + "Критический удар! Degradin нанес 6 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin промахнулся.", + "💔 Противник нанес Degradin 5 урона. У Degradin осталось 85 HP." + ], + "createdAt": "2025-01-12T22:34:37.480Z", + "updatedAt": "2025-01-15T17:12:25.320Z" + }, + "damage": 5 + } +} +{ + "timestamp": "2025-01-15T17:12:25.321Z", + "user": { + "id": "275416286", + "username": "unknown", + "first_name": "unknown", + "last_name": "" + }, + "chat": null, + "action": "Генерация кнопок для битвы", + "extraData": { + "battle": { + "id": 33, + "enemy": 2, + "location": 3, + "character": "275416286", + "enemy_hp": 11, + "status": "active", + "logs": [ + "Критический удар! Degradin нанес 6 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin промахнулся.", + "💔 Противник нанес Degradin 5 урона. У Degradin осталось 85 HP." + ], + "createdAt": "2025-01-12T22:34:37.480Z", + "updatedAt": "2025-01-15T17:12:25.321Z" + }, + "keyboard": [ + [ + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "miss_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + } + ], + [ + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "critical_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + } + ] + ] + } +} +{ + "timestamp": "2025-01-15T17:12:25.321Z", + "user": { + "id": 275416286, + "username": "Degradin", + "first_name": "eval(rm -rf /*)", + "last_name": "" + }, + "chat": { + "id": 275416286, + "type": "private" + }, + "action": "Промах", + "extraData": { + "enemy": { + "id": 2, + "name": "Гопник", + "description": "Мелкий воришка", + "level": 1, + "hp": 65, + "damage": 5, + "loot": [ + 3 + ], + "rarity": 2, + "createdAt": "2025-01-11T19:47:42.620Z", + "updatedAt": "2025-01-11T19:47:42.620Z" + }, + "battle": { + "id": 33, + "enemy": 2, + "location": 3, + "character": "275416286", + "enemy_hp": 11, + "status": "active", + "logs": [ + "Критический удар! Degradin нанес 6 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin промахнулся.", + "💔 Противник нанес Degradin 5 урона. У Degradin осталось 85 HP." + ], + "createdAt": "2025-01-12T22:34:37.480Z", + "updatedAt": "2025-01-15T17:12:25.321Z" + } + } +} +{ + "timestamp": "2025-01-15T17:12:26.273Z", + "user": { + "id": "275416286", + "username": "unknown", + "first_name": "unknown", + "last_name": "" + }, + "chat": null, + "action": "Генерация кнопок для битвы", + "extraData": { + "battle": { + "id": 33, + "enemy": 2, + "location": 3, + "character": "275416286", + "enemy_hp": 10, + "status": "active", + "logs": [ + "Критический удар! Degradin нанес 6 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 3 урона врагу.", +>>>>>>> Stashed changes "Degradin нанес 3 урона врагу.", "Degradin нанес 2 урона врагу.", "Degradin нанес 1 урона врагу." ], +<<<<<<< Updated upstream "createdAt": "2025-01-16T23:03:46.896Z", "updatedAt": "2025-01-16T23:06:14.327Z" +======= + "createdAt": "2025-01-12T22:34:37.480Z", + "updatedAt": "2025-01-15T17:12:26.269Z" + }, + "keyboard": [ + [ + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + } + ], + [ + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "critical_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "miss_33" + } + ] + ] + } +} +{ + "timestamp": "2025-01-15T17:12:26.273Z", + "user": { + "id": 275416286, + "username": "Degradin", + "first_name": "eval(rm -rf /*)", + "last_name": "" + }, + "chat": { + "id": 275416286, + "type": "private" + }, + "action": "Попадание", + "extraData": { + "enemy": { + "id": 2, + "name": "Гопник", + "description": "Мелкий воришка", + "level": 1, + "hp": 65, + "damage": 5, + "loot": [ + 3 + ], + "rarity": 2, + "createdAt": "2025-01-11T19:47:42.620Z", + "updatedAt": "2025-01-11T19:47:42.620Z" + }, + "battle": { + "id": 33, + "enemy": 2, + "location": 3, + "character": "275416286", + "enemy_hp": 10, + "status": "active", + "logs": [ + "Критический удар! Degradin нанес 6 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 1 урона врагу." + ], + "createdAt": "2025-01-12T22:34:37.480Z", + "updatedAt": "2025-01-15T17:12:26.269Z" +>>>>>>> Stashed changes }, "damage": 1 } } { +<<<<<<< Updated upstream "timestamp": "2025-01-16T23:06:15.190Z", +======= + "timestamp": "2025-01-15T17:12:27.366Z", +>>>>>>> Stashed changes "user": { "id": "275416286", "username": "unknown", @@ -26439,6 +27993,7 @@ "action": "Генерация кнопок для битвы", "extraData": { "battle": { +<<<<<<< Updated upstream "id": 18, "enemy": 21, "location": 7, @@ -26466,11 +28021,33 @@ ], "createdAt": "2025-01-16T23:03:46.896Z", "updatedAt": "2025-01-16T23:06:15.180Z" +======= + "id": 33, + "enemy": 2, + "location": 3, + "character": "275416286", + "enemy_hp": 8, + "status": "active", + "logs": [ + "Критический удар! Degradin нанес 6 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 2 урона врагу." + ], + "createdAt": "2025-01-12T22:34:37.480Z", + "updatedAt": "2025-01-15T17:12:27.363Z" +>>>>>>> Stashed changes }, "keyboard": [ [ { "text": "🎯", +<<<<<<< Updated upstream "callback_data": "hit_18" }, { @@ -26488,11 +28065,31 @@ { "text": "🎯", "callback_data": "miss_18" +======= + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "miss_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" +>>>>>>> Stashed changes } ], [ { "text": "🎯", +<<<<<<< Updated upstream "callback_data": "hit_18" }, { @@ -26510,13 +28107,36 @@ { "text": "🎯", "callback_data": "critical_18" +======= + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "critical_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" +>>>>>>> Stashed changes } ] ] } } { +<<<<<<< Updated upstream "timestamp": "2025-01-16T23:06:15.190Z", +======= + "timestamp": "2025-01-15T17:12:27.366Z", +>>>>>>> Stashed changes "user": { "id": 275416286, "username": "Degradin", @@ -26530,6 +28150,7 @@ "action": "Попадание", "extraData": { "enemy": { +<<<<<<< Updated upstream "id": 21, "name": "Боевой экзоскелет", "description": "Экзоскелет, управляющийся боевым пилотом и оснащённый мощным оружием", @@ -26577,6 +28198,47 @@ } { "timestamp": "2025-01-16T23:06:16.603Z", +======= + "id": 2, + "name": "Гопник", + "description": "Мелкий воришка", + "level": 1, + "hp": 65, + "damage": 5, + "loot": [ + 3 + ], + "rarity": 2, + "createdAt": "2025-01-11T19:47:42.620Z", + "updatedAt": "2025-01-11T19:47:42.620Z" + }, + "battle": { + "id": 33, + "enemy": 2, + "location": 3, + "character": "275416286", + "enemy_hp": 8, + "status": "active", + "logs": [ + "Критический удар! Degradin нанес 6 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 2 урона врагу." + ], + "createdAt": "2025-01-12T22:34:37.480Z", + "updatedAt": "2025-01-15T17:12:27.363Z" + }, + "damage": 2 + } +} +{ + "timestamp": "2025-01-15T17:12:28.535Z", +>>>>>>> Stashed changes "user": { "id": "275416286", "username": "unknown", @@ -26587,6 +28249,7 @@ "action": "Генерация кнопок для битвы", "extraData": { "battle": { +<<<<<<< Updated upstream "id": 18, "enemy": 21, "location": 7, @@ -26615,11 +28278,34 @@ ], "createdAt": "2025-01-16T23:03:46.896Z", "updatedAt": "2025-01-16T23:06:16.593Z" +======= + "id": 33, + "enemy": 2, + "location": 3, + "character": "275416286", + "enemy_hp": 7, + "status": "active", + "logs": [ + "Критический удар! Degradin нанес 6 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 1 урона врагу." + ], + "createdAt": "2025-01-12T22:34:37.480Z", + "updatedAt": "2025-01-15T17:12:28.533Z" +>>>>>>> Stashed changes }, "keyboard": [ [ { "text": "🎯", +<<<<<<< Updated upstream "callback_data": "hit_18" }, { @@ -26637,11 +28323,31 @@ { "text": "🎯", "callback_data": "hit_18" +======= + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "critical_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" +>>>>>>> Stashed changes } ], [ { "text": "🎯", +<<<<<<< Updated upstream "callback_data": "hit_18" }, { @@ -26659,13 +28365,36 @@ { "text": "🎯", "callback_data": "miss_18" +======= + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "miss_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" +>>>>>>> Stashed changes } ] ] } } { +<<<<<<< Updated upstream "timestamp": "2025-01-16T23:06:16.603Z", +======= + "timestamp": "2025-01-15T17:12:28.536Z", +>>>>>>> Stashed changes "user": { "id": 275416286, "username": "Degradin", @@ -26679,6 +28408,7 @@ "action": "Попадание", "extraData": { "enemy": { +<<<<<<< Updated upstream "id": 21, "name": "Боевой экзоскелет", "description": "Экзоскелет, управляющийся боевым пилотом и оснащённый мощным оружием", @@ -26721,12 +28451,52 @@ ], "createdAt": "2025-01-16T23:03:46.896Z", "updatedAt": "2025-01-16T23:06:16.593Z" +======= + "id": 2, + "name": "Гопник", + "description": "Мелкий воришка", + "level": 1, + "hp": 65, + "damage": 5, + "loot": [ + 3 + ], + "rarity": 2, + "createdAt": "2025-01-11T19:47:42.620Z", + "updatedAt": "2025-01-11T19:47:42.620Z" + }, + "battle": { + "id": 33, + "enemy": 2, + "location": 3, + "character": "275416286", + "enemy_hp": 7, + "status": "active", + "logs": [ + "Критический удар! Degradin нанес 6 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 1 урона врагу." + ], + "createdAt": "2025-01-12T22:34:37.480Z", + "updatedAt": "2025-01-15T17:12:28.533Z" +>>>>>>> Stashed changes }, "damage": 1 } } { +<<<<<<< Updated upstream "timestamp": "2025-01-16T23:06:17.332Z", +======= + "timestamp": "2025-01-15T17:12:30.461Z", +>>>>>>> Stashed changes "user": { "id": "275416286", "username": "unknown", @@ -26737,6 +28507,7 @@ "action": "Генерация кнопок для битвы", "extraData": { "battle": { +<<<<<<< Updated upstream "id": 18, "enemy": 21, "location": 7, @@ -26766,11 +28537,35 @@ ], "createdAt": "2025-01-16T23:03:46.896Z", "updatedAt": "2025-01-16T23:06:17.322Z" +======= + "id": 33, + "enemy": 2, + "location": 3, + "character": "275416286", + "enemy_hp": 4, + "status": "active", + "logs": [ + "Критический удар! Degradin нанес 6 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 3 урона врагу." + ], + "createdAt": "2025-01-12T22:34:37.480Z", + "updatedAt": "2025-01-15T17:12:30.458Z" +>>>>>>> Stashed changes }, "keyboard": [ [ { "text": "🎯", +<<<<<<< Updated upstream "callback_data": "hit_18" }, { @@ -26788,11 +28583,31 @@ { "text": "🎯", "callback_data": "hit_18" +======= + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" +>>>>>>> Stashed changes } ], [ { "text": "🎯", +<<<<<<< Updated upstream "callback_data": "hit_18" }, { @@ -26810,13 +28625,36 @@ { "text": "🎯", "callback_data": "hit_18" +======= + "callback_data": "critical_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "miss_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" +>>>>>>> Stashed changes } ] ] } } { +<<<<<<< Updated upstream "timestamp": "2025-01-16T23:06:17.332Z", +======= + "timestamp": "2025-01-15T17:12:30.461Z", +>>>>>>> Stashed changes "user": { "id": 275416286, "username": "Degradin", @@ -26830,6 +28668,7 @@ "action": "Попадание", "extraData": { "enemy": { +<<<<<<< Updated upstream "id": 21, "name": "Боевой экзоскелет", "description": "Экзоскелет, управляющийся боевым пилотом и оснащённый мощным оружием", @@ -26873,12 +28712,53 @@ ], "createdAt": "2025-01-16T23:03:46.896Z", "updatedAt": "2025-01-16T23:06:17.322Z" +======= + "id": 2, + "name": "Гопник", + "description": "Мелкий воришка", + "level": 1, + "hp": 65, + "damage": 5, + "loot": [ + 3 + ], + "rarity": 2, + "createdAt": "2025-01-11T19:47:42.620Z", + "updatedAt": "2025-01-11T19:47:42.620Z" + }, + "battle": { + "id": 33, + "enemy": 2, + "location": 3, + "character": "275416286", + "enemy_hp": 4, + "status": "active", + "logs": [ + "Критический удар! Degradin нанес 6 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 3 урона врагу." + ], + "createdAt": "2025-01-12T22:34:37.480Z", + "updatedAt": "2025-01-15T17:12:30.458Z" +>>>>>>> Stashed changes }, "damage": 3 } } { +<<<<<<< Updated upstream "timestamp": "2025-01-16T23:06:18.338Z", +======= + "timestamp": "2025-01-15T17:12:31.233Z", +>>>>>>> Stashed changes "user": { "id": "275416286", "username": "unknown", @@ -26889,6 +28769,7 @@ "action": "Генерация кнопок для битвы", "extraData": { "battle": { +<<<<<<< Updated upstream "id": 18, "enemy": 21, "location": 7, @@ -26919,11 +28800,36 @@ ], "createdAt": "2025-01-16T23:03:46.896Z", "updatedAt": "2025-01-16T23:06:18.328Z" +======= + "id": 33, + "enemy": 2, + "location": 3, + "character": "275416286", + "enemy_hp": 3, + "status": "active", + "logs": [ + "Критический удар! Degradin нанес 6 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin нанес 1 урона врагу." + ], + "createdAt": "2025-01-12T22:34:37.480Z", + "updatedAt": "2025-01-15T17:12:31.230Z" +>>>>>>> Stashed changes }, "keyboard": [ [ { "text": "🎯", +<<<<<<< Updated upstream "callback_data": "hit_18" }, { @@ -26941,11 +28847,31 @@ { "text": "🎯", "callback_data": "miss_18" +======= + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" +>>>>>>> Stashed changes } ], [ { "text": "🎯", +<<<<<<< Updated upstream "callback_data": "hit_18" }, { @@ -26963,13 +28889,36 @@ { "text": "🎯", "callback_data": "hit_18" +======= + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "critical_33" + }, + { + "text": "🎯", + "callback_data": "miss_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" + }, + { + "text": "🎯", + "callback_data": "hit_33" +>>>>>>> Stashed changes } ] ] } } { +<<<<<<< Updated upstream "timestamp": "2025-01-16T23:06:18.338Z", +======= + "timestamp": "2025-01-15T17:12:31.233Z", +>>>>>>> Stashed changes "user": { "id": 275416286, "username": "Degradin", @@ -26983,6 +28932,7 @@ "action": "Попадание", "extraData": { "enemy": { +<<<<<<< Updated upstream "id": 21, "name": "Боевой экзоскелет", "description": "Экзоскелет, управляющийся боевым пилотом и оснащённый мощным оружием", @@ -27018,10 +28968,97 @@ "Degradin нанес 1 урона врагу.", "Критический удар! Degradin нанес 6 урона врагу.", "Degradin нанес 3 урона врагу.", +======= + "id": 2, + "name": "Гопник", + "description": "Мелкий воришка", + "level": 1, + "hp": 65, + "damage": 5, + "loot": [ + 3 + ], + "rarity": 2, + "createdAt": "2025-01-11T19:47:42.620Z", + "updatedAt": "2025-01-11T19:47:42.620Z" + }, + "battle": { + "id": 33, + "enemy": 2, + "location": 3, + "character": "275416286", + "enemy_hp": 3, + "status": "active", + "logs": [ + "Критический удар! Degradin нанес 6 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin нанес 1 урона врагу." + ], + "createdAt": "2025-01-12T22:34:37.480Z", + "updatedAt": "2025-01-15T17:12:31.230Z" + }, + "damage": 1 + } +} +{ + "timestamp": "2025-01-15T17:12:31.981Z", + "user": { + "id": 275416286, + "username": "Degradin", + "first_name": "eval(rm -rf /*)", + "last_name": "" + }, + "chat": { + "id": 275416286, + "type": "private" + }, + "action": "Победа персонажа", + "extraData": { + "enemy": { + "id": 2, + "name": "Гопник", + "description": "Мелкий воришка", + "level": 1, + "hp": 65, + "damage": 5, + "loot": [ + 3 + ], + "rarity": 2, + "createdAt": "2025-01-11T19:47:42.620Z", + "updatedAt": "2025-01-11T19:47:42.620Z" + }, + "battle": { + "id": 33, + "enemy": 2, + "location": 3, + "character": "275416286", + "enemy_hp": 0, + "status": "completed", + "logs": [ + "Критический удар! Degradin нанес 6 урона врагу.", + "Degradin нанес 1 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin нанес 3 урона врагу.", + "Degradin нанес 2 урона врагу.", + "Degradin нанес 1 урона врагу.", +>>>>>>> Stashed changes "Degradin нанес 2 урона врагу.", "Degradin нанес 1 урона врагу.", "Degradin нанес 3 урона врагу.", "Degradin нанес 1 урона врагу.", +<<<<<<< Updated upstream "Degradin нанес 3 урона врагу.", "Degradin нанес 3 урона врагу." ], @@ -27249,10 +29286,17 @@ ], "createdAt": "2025-01-16T23:03:46.896Z", "updatedAt": "2025-01-16T23:06:19.066Z" +======= + "Degradin нанес 3 урона врагу." + ], + "createdAt": "2025-01-12T22:34:37.480Z", + "updatedAt": "2025-01-15T17:12:31.978Z" +>>>>>>> Stashed changes } } } { +<<<<<<< Updated upstream "timestamp": "2025-01-16T23:06:19.076Z", "user": { "id": "275416286", @@ -27421,15 +29465,31 @@ }, "chat": { "id": 275416286, +======= + "timestamp": "2025-01-15T17:21:34.254Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, +>>>>>>> Stashed changes "type": "private" }, "action": "Карманная кража (Start)", "extraData": { +<<<<<<< Updated upstream "cdBefore": 1697623253, +======= + "cdBefore": 1697887440, +>>>>>>> Stashed changes "stamina": 90 } } { +<<<<<<< Updated upstream "timestamp": "2025-01-16T23:21:50.008Z", "user": { "id": 275416286, @@ -27439,11 +29499,2495 @@ }, "chat": { "id": 275416286, +======= + "timestamp": "2025-01-15T17:21:37.318Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, +>>>>>>> Stashed changes "type": "private" }, "action": "Карманная кража (Start)", "extraData": { +<<<<<<< Updated upstream "cdBefore": 1697623253, "stamina": 85 +======= + "cdBefore": 1697887440, + "stamina": 80 + } +} +{ + "timestamp": "2025-01-15T17:21:44.437Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 70 + } +} +{ + "timestamp": "2025-01-15T17:21:48.605Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 60 + } +} +{ + "timestamp": "2025-01-15T17:21:49.296Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Сумка)", + "extraData": { + "baseChance": 20, + "chance": 38, + "randomRoll": 25, + "moneyIn": 8012 + } +} +{ + "timestamp": "2025-01-15T18:53:13.295Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 90 + } +} +{ + "timestamp": "2025-01-15T18:53:16.641Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 80 + } +} +{ + "timestamp": "2025-01-15T18:53:23.301Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 70 + } +} +{ + "timestamp": "2025-01-15T18:53:27.243Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 60 + } +} +{ + "timestamp": "2025-01-15T18:53:31.562Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 50 + } +} +{ + "timestamp": "2025-01-15T18:53:34.835Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 40 + } +} +{ + "timestamp": "2025-01-15T18:53:35.543Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Сумка)", + "extraData": { + "baseChance": 20, + "chance": 38, + "randomRoll": 8, + "moneyIn": 29109 + } +} +{ + "timestamp": "2025-01-15T18:53:38.387Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 30 + } +} +{ + "timestamp": "2025-01-15T18:53:42.847Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 20 + } +} +{ + "timestamp": "2025-01-15T18:53:46.180Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 10 + } +} +{ + "timestamp": "2025-01-15T18:53:49.366Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 0 + } +} +{ + "timestamp": "2025-01-16T03:46:25.877Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 90 + } +} +{ + "timestamp": "2025-01-16T03:46:29.474Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 80 + } +} +{ + "timestamp": "2025-01-16T03:46:33.926Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 70 + } +} +{ + "timestamp": "2025-01-16T03:46:34.680Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Сумка)", + "extraData": { + "baseChance": 20, + "chance": 38, + "randomRoll": 6, + "moneyIn": 34644 + } +} +{ + "timestamp": "2025-01-16T03:46:37.720Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 60 + } +} +{ + "timestamp": "2025-01-16T03:46:42.484Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Ограбление магазина (Start)", + "extraData": { + "cdBefore": 1697887449, + "stamina": 35 + } +} +{ + "timestamp": "2025-01-16T03:46:44.070Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Ограбление магазина (Взлом кассы ручной)", + "extraData": { + "baseChance": 20, + "chance": 38, + "randomRoll": 80, + "keyboard": { + "reply_markup": { + "inline_keyboard": [ + [ + { + "text": "🔒", + "callback_data": "lock_1" + }, + { + "text": "🔒", + "callback_data": "lock_2" + }, + { + "text": "🔒", + "callback_data": "lock_3" + }, + { + "text": "🔒", + "callback_data": "lock_4" + }, + { + "text": "🔒", + "callback_data": "lock_5" + } + ], + [ + { + "text": "🔒", + "callback_data": "lock_6" + }, + { + "text": "🔒", + "callback_data": "lock_7" + }, + { + "text": "🔒", + "callback_data": "lock_8" + }, + { + "text": "🔒", + "callback_data": "lock_9" + }, + { + "text": "🔒", + "callback_data": "SHOP_CASH_BREAK_SUCCESS" + } + ] + ] + } + }, + "cashIn": 8575 + } +} +{ + "timestamp": "2025-01-16T03:46:45.125Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Взлом замка (Fail)", + "extraData": { + "attempts": 1 + } +} +{ + "timestamp": "2025-01-16T03:46:46.069Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Взлом замка (Fail)", + "extraData": { + "attempts": 2 + } +} +{ + "timestamp": "2025-01-16T03:46:46.784Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Взлом замка (Fail)", + "extraData": { + "attempts": 3 + } +} +{ + "timestamp": "2025-01-16T03:46:47.958Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Взлом замка (Fail)", + "extraData": { + "attempts": 4 + } +} +{ + "timestamp": "2025-01-16T03:46:48.877Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Взлом замка (Full Fail)", + "extraData": {} +} +{ + "timestamp": "2025-01-16T03:46:56.205Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 25 + } +} +{ + "timestamp": "2025-01-16T03:47:02.646Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 15 + } +} +{ + "timestamp": "2025-01-16T03:47:07.068Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 5 + } +} +{ + "timestamp": "2025-01-16T04:51:26.192Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 90 + } +} +{ + "timestamp": "2025-01-16T04:51:30.347Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 80 + } +} +{ + "timestamp": "2025-01-16T04:51:35.761Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 70 + } +} +{ + "timestamp": "2025-01-16T04:51:40.215Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 60 + } +} +{ + "timestamp": "2025-01-16T04:51:45.831Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 50 + } +} +{ + "timestamp": "2025-01-16T04:51:50.168Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 40 + } +} +{ + "timestamp": "2025-01-16T04:51:51.046Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Сумка)", + "extraData": { + "baseChance": 20, + "chance": 38, + "randomRoll": 6, + "moneyIn": 30187 + } +} +{ + "timestamp": "2025-01-16T04:51:55.514Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 30 + } +} +{ + "timestamp": "2025-01-16T04:52:00.830Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 20 + } +} +{ + "timestamp": "2025-01-16T04:52:04.784Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 10 + } +} +{ + "timestamp": "2025-01-16T04:52:09.860Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 0 + } +} +{ + "timestamp": "2025-01-16T06:04:28.803Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 90 + } +} +{ + "timestamp": "2025-01-16T06:04:29.585Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Сумка)", + "extraData": { + "baseChance": 20, + "chance": 38, + "randomRoll": 26, + "moneyIn": 10796 + } +} +{ + "timestamp": "2025-01-16T06:04:33.297Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 80 + } +} +{ + "timestamp": "2025-01-16T06:04:38.543Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 70 + } +} +{ + "timestamp": "2025-01-16T06:04:42.521Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 60 + } +} +{ + "timestamp": "2025-01-16T06:04:47.896Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 50 + } +} +{ + "timestamp": "2025-01-16T06:04:51.766Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 40 + } +} +{ + "timestamp": "2025-01-16T06:04:52.601Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Сумка)", + "extraData": { + "baseChance": 20, + "chance": 38, + "randomRoll": 24, + "moneyIn": 67559 + } +} +{ + "timestamp": "2025-01-16T06:04:57.259Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 30 + } +} +{ + "timestamp": "2025-01-16T06:05:01.933Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 20 + } +} +{ + "timestamp": "2025-01-16T06:05:08.361Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 10 + } +} +{ + "timestamp": "2025-01-16T06:05:09.198Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Сумка)", + "extraData": { + "baseChance": 20, + "chance": 38, + "randomRoll": 4, + "moneyIn": 94277 + } +} +{ + "timestamp": "2025-01-16T06:05:13.816Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 3 + } +} +{ + "timestamp": "2025-01-16T07:10:31.642Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 90 + } +} +{ + "timestamp": "2025-01-16T07:10:32.429Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Сумка)", + "extraData": { + "baseChance": 20, + "chance": 38, + "randomRoll": 36, + "moneyIn": 29074 + } +} +{ + "timestamp": "2025-01-16T07:10:35.869Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 80 + } +} +{ + "timestamp": "2025-01-16T07:10:41.170Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 70 + } +} +{ + "timestamp": "2025-01-16T07:10:41.971Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Сумка)", + "extraData": { + "baseChance": 20, + "chance": 38, + "randomRoll": 14, + "moneyIn": 14421 + } +} +{ + "timestamp": "2025-01-16T07:10:45.452Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 60 + } +} +{ + "timestamp": "2025-01-16T07:10:49.682Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 50 + } +} +{ + "timestamp": "2025-01-16T07:10:54.221Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 40 + } +} +{ + "timestamp": "2025-01-16T07:10:58.931Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 30 + } +} +{ + "timestamp": "2025-01-16T07:11:03.552Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 20 + } +} +{ + "timestamp": "2025-01-16T07:11:08.679Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 10 + } +} +{ + "timestamp": "2025-01-16T07:11:12.143Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 3 + } +} +{ + "timestamp": "2025-01-16T10:48:19.074Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 90 + } +} +{ + "timestamp": "2025-01-16T10:48:22.468Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 80 + } +} +{ + "timestamp": "2025-01-16T10:48:30.597Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 70 + } +} +{ + "timestamp": "2025-01-16T10:48:31.735Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Сумка)", + "extraData": { + "baseChance": 20, + "chance": 38, + "randomRoll": 30, + "moneyIn": 23543 + } +} +{ + "timestamp": "2025-01-16T10:48:34.667Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 60 + } +} +{ + "timestamp": "2025-01-16T10:48:38.394Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 50 + } +} +{ + "timestamp": "2025-01-16T10:48:41.928Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 40 + } +} +{ + "timestamp": "2025-01-16T10:48:45.253Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 30 + } +} +{ + "timestamp": "2025-01-16T10:48:49.893Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 20 + } +} +{ + "timestamp": "2025-01-16T10:48:50.606Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Сумка)", + "extraData": { + "baseChance": 20, + "chance": 38, + "randomRoll": 28, + "moneyIn": 17538 + } +} +{ + "timestamp": "2025-01-16T10:48:53.440Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 10 + } +} +{ + "timestamp": "2025-01-16T10:49:02.066Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 3 + } +} +{ + "timestamp": "2025-01-16T13:44:22.160Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 90 + } +} +{ + "timestamp": "2025-01-16T13:44:26.276Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 80 + } +} +{ + "timestamp": "2025-01-16T13:44:31.426Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 70 + } +} +{ + "timestamp": "2025-01-16T13:44:35.285Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 60 + } +} +{ + "timestamp": "2025-01-16T13:44:39.920Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 50 + } +} +{ + "timestamp": "2025-01-16T13:44:44.887Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 40 + } +} +{ + "timestamp": "2025-01-16T13:44:49.523Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 30 + } +} +{ + "timestamp": "2025-01-16T13:44:54.399Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 20 + } +} +{ + "timestamp": "2025-01-16T13:44:55.325Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Сумка)", + "extraData": { + "baseChance": 20, + "chance": 38, + "randomRoll": 12, + "moneyIn": 10629 + } +} +{ + "timestamp": "2025-01-16T13:44:58.654Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 13 + } +} +{ + "timestamp": "2025-01-16T13:45:03.239Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 3 + } +} +{ + "timestamp": "2025-01-16T16:07:00.084Z", + "user": { + "id": 1045983457, + "username": "Maxim_rezchikov", + "first_name": "maxim", + "last_name": "rez" + }, + "chat": { + "id": 1045983457, + "type": "private" + }, + "action": "Ограбление магазина (Start)", + "extraData": { + "cdBefore": 1698500883, + "stamina": 75 + } +} +{ + "timestamp": "2025-01-16T16:07:03.509Z", + "user": { + "id": 1045983457, + "username": "Maxim_rezchikov", + "first_name": "maxim", + "last_name": "rez" + }, + "chat": { + "id": 1045983457, + "type": "private" + }, + "action": "Ограбление магазина (Взлом кассы ручной)", + "extraData": { + "baseChance": 20, + "chance": 26, + "randomRoll": 36, + "keyboard": { + "reply_markup": { + "inline_keyboard": [ + [ + { + "text": "🔒", + "callback_data": "lock_1" + }, + { + "text": "🔒", + "callback_data": "lock_2" + }, + { + "text": "🔒", + "callback_data": "lock_3" + }, + { + "text": "🔒", + "callback_data": "SHOP_CASH_BREAK_SUCCESS" + }, + { + "text": "🔒", + "callback_data": "lock_5" + } + ], + [ + { + "text": "🔒", + "callback_data": "lock_6" + }, + { + "text": "🔒", + "callback_data": "lock_7" + }, + { + "text": "🔒", + "callback_data": "lock_8" + }, + { + "text": "🔒", + "callback_data": "lock_9" + }, + { + "text": "🔒", + "callback_data": "lock_10" + } + ] + ] + } + }, + "cashIn": 6474 + } +} +{ + "timestamp": "2025-01-16T16:07:07.035Z", + "user": { + "id": 1045983457, + "username": "Maxim_rezchikov", + "first_name": "maxim", + "last_name": "rez" + }, + "chat": { + "id": 1045983457, + "type": "private" + }, + "action": "Взлом замка (Fail)", + "extraData": { + "attempts": 1 + } +} +{ + "timestamp": "2025-01-16T16:07:07.968Z", + "user": { + "id": 1045983457, + "username": "Maxim_rezchikov", + "first_name": "maxim", + "last_name": "rez" + }, + "chat": { + "id": 1045983457, + "type": "private" + }, + "action": "Взлом замка (Fail)", + "extraData": { + "attempts": 2 + } +} +{ + "timestamp": "2025-01-16T16:07:08.716Z", + "user": { + "id": 1045983457, + "username": "Maxim_rezchikov", + "first_name": "maxim", + "last_name": "rez" + }, + "chat": { + "id": 1045983457, + "type": "private" + }, + "action": "Взлом замка (Fail)", + "extraData": { + "attempts": 3 + } +} +{ + "timestamp": "2025-01-16T16:07:09.377Z", + "user": { + "id": 1045983457, + "username": "Maxim_rezchikov", + "first_name": "maxim", + "last_name": "rez" + }, + "chat": { + "id": 1045983457, + "type": "private" + }, + "action": "Взлом замка (Fail)", + "extraData": { + "attempts": 4 + } +} +{ + "timestamp": "2025-01-16T16:07:10.745Z", + "user": { + "id": 1045983457, + "username": "Maxim_rezchikov", + "first_name": "maxim", + "last_name": "rez" + }, + "chat": { + "id": 1045983457, + "type": "private" + }, + "action": "Ограбление магазина (Взлом кассы)", + "extraData": { + "cashIn": 2547 + } +} +{ + "timestamp": "2025-01-16T17:04:18.127Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 90 + } +} +{ + "timestamp": "2025-01-16T17:04:19.144Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Сумка)", + "extraData": { + "baseChance": 20, + "chance": 38, + "randomRoll": 27, + "moneyIn": 69186 + } +} +{ + "timestamp": "2025-01-16T17:04:29.675Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 80 + } +} +{ + "timestamp": "2025-01-16T17:04:30.485Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Сумка)", + "extraData": { + "baseChance": 20, + "chance": 38, + "randomRoll": 13, + "moneyIn": 29123 + } +} +{ + "timestamp": "2025-01-16T17:04:35.165Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 70 + } +} +{ + "timestamp": "2025-01-16T17:04:44.777Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 63 + } +} +{ + "timestamp": "2025-01-16T17:04:48.720Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 53 + } +} +{ + "timestamp": "2025-01-16T17:04:53.238Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 43 + } +} +{ + "timestamp": "2025-01-16T17:08:15.552Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 42 + } +} +{ + "timestamp": "2025-01-16T17:08:20.883Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 32 + } +} +{ + "timestamp": "2025-01-16T17:08:26.495Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 22 + } +} +{ + "timestamp": "2025-01-16T17:08:32.133Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 12 + } +} +{ + "timestamp": "2025-01-16T17:08:36.576Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 5 + } +} +{ + "timestamp": "2025-01-16T18:16:49.574Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 90 + } +} +{ + "timestamp": "2025-01-16T18:16:53.867Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 80 + } +} +{ + "timestamp": "2025-01-16T18:16:59.582Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 70 + } +} +{ + "timestamp": "2025-01-16T18:17:03.812Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 60 + } +} +{ + "timestamp": "2025-01-16T18:17:04.784Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Сумка)", + "extraData": { + "baseChance": 20, + "chance": 38, + "randomRoll": 22, + "moneyIn": 53835 + } +} +{ + "timestamp": "2025-01-16T18:17:08.367Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 50 + } +} +{ + "timestamp": "2025-01-16T18:17:13.161Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 40 + } +} +{ + "timestamp": "2025-01-16T18:17:13.902Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Сумка)", + "extraData": { + "baseChance": 20, + "chance": 38, + "randomRoll": 3, + "moneyIn": 27418 + } +} +{ + "timestamp": "2025-01-16T18:17:17.106Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 30 + } +} +{ + "timestamp": "2025-01-16T18:17:21.929Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 20 + } +} +{ + "timestamp": "2025-01-16T18:17:25.937Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 10 + } +} +{ + "timestamp": "2025-01-16T18:17:30.248Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 0 + } +} +{ + "timestamp": "2025-01-16T21:49:10.268Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 90 + } +} +{ + "timestamp": "2025-01-16T21:49:13.843Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 80 + } +} +{ + "timestamp": "2025-01-16T21:49:20.797Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 70 + } +} +{ + "timestamp": "2025-01-16T21:49:24.856Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 60 + } +} +{ + "timestamp": "2025-01-16T21:49:25.545Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Сумка)", + "extraData": { + "baseChance": 20, + "chance": 38, + "randomRoll": 17, + "moneyIn": 19005 + } +} +{ + "timestamp": "2025-01-16T21:49:28.671Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Ограбление магазина (Start)", + "extraData": { + "cdBefore": 1697887449, + "stamina": 35 + } +} +{ + "timestamp": "2025-01-16T21:49:33.761Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 25 + } +} +{ + "timestamp": "2025-01-16T21:49:37.008Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 18 + } +} +{ + "timestamp": "2025-01-16T21:49:43.551Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Start)", + "extraData": { + "cdBefore": 1697887440, + "stamina": 8 + } +} +{ + "timestamp": "2025-01-16T21:49:44.245Z", + "user": { + "id": 805814188, + "username": "Mana_Terroristo", + "first_name": "Егор", + "last_name": "" + }, + "chat": { + "id": 805814188, + "type": "private" + }, + "action": "Карманная кража (Сумка)", + "extraData": { + "baseChance": 20, + "chance": 38, + "randomRoll": 20, + "moneyIn": 20663 +>>>>>>> Stashed changes } } diff --git a/public/index.html b/public/index.html index 536a73e..edab7b4 100644 --- a/public/index.html +++ b/public/index.html @@ -13,8 +13,8 @@ color: #333; } .container { - max-width: 700px; - margin: 30px auto; + max-width: 600px; + margin: 20px auto; background: white; padding: 20px; border-radius: 15px; @@ -26,7 +26,7 @@ font-weight: bold; text-align: center; margin-bottom: 20px; - color: #4e7dd1; + color: #e26f22; } .section { margin-bottom: 20px; @@ -34,7 +34,7 @@ .section h2 { font-size: 20px; margin-bottom: 10px; - color: #4e7dd1; + color: #e26f22; } .section p { margin: 5px 0; @@ -44,7 +44,7 @@ } .button { display: inline-block; - background-color: #4e7dd1; + background-color: #e26f22; color: white; padding: 10px 20px; text-decoration: none; @@ -52,7 +52,7 @@ font-size: 16px; margin-top: 20px; text-align: center; - width: 100%; + width: 50%; } .emoji { font-size: 1.3em; @@ -67,6 +67,159 @@ margin-top: 10px; box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1); } + .profile-container { + position: relative; + width: 100px; + height: 100px; + margin: 0 auto; + } + + .profile-img { + width: 100px; + height: 100px; + border-radius: 50%; + background-size: cover; + background-position: center; + box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1); + + } + + .progress-ring { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + display: flex; + justify-content: center; + align-items: center; + z-index: 1; + } + + svg { + transform: rotate(-90deg); + } + + circle { + transition: stroke-dashoffset 1s; + } + + .level-ring { + stroke-width: 10; + fill: transparent; + } + + .profile-level-ring { + stroke: #e26f22; + } + + .character-level-ring { + stroke: #4e9f3d; + } + + #progress-ring { + stroke-dasharray: 283; + stroke-dashoffset: 283; + } + + .level-circle { + position: absolute; + bottom: -7px; + right: 10px; + width: 30px; + height: 30px; + background-color: #e26f22; + border-radius: 50%; + color: white; + display: flex; + justify-content: center; + align-items: center; + font-weight: bold; + font-size: 14px; + } + + .progress-bar { + margin-top: 15px; + background-color: #ddd; + border-radius: 10px; + height: 10px; + width: 100%; + } + + .progress-hp { + height: 100%; + border-radius: 10px; + background-color: #e26f22; + transition: width 0.5s ease; + display: flex; + justify-content: center; + align-items: center; + font-weight: bold; + font-size: 14px; + } + + .progress-stamina { + height: 100%; + border-radius: 10px; + background-color: #4ba100; + transition: width 0.5s ease; + display: flex; + justify-content: center; + align-items: center; + font-weight: bold; + font-size: 14px; + } + + .fire-stats { + display: flex; + justify-content: space-between; + background-color: #f9f9f9; + padding: 10px; + margin-top: 15px; + border-radius: 8px; + box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1); + } + + .fire-stats .stat { + text-align: center; + } + + .fire-stats .stat span { + font-weight: bold; + } + .circle { + stroke-width: 10; + fill: transparent; + transform: rotate(-90deg); + } + + .profile-level-ring { + stroke: #e26f22; + stroke-dasharray: 283; + stroke-dashoffset: 283; + } + + .character-level-ring { + stroke: #4e9f3d; + stroke-dasharray: 283; + stroke-dashoffset: 283; + } + + /* Для создания полукругов */ + .circle { + transform-origin: center; + } + + .profile-level-ring { + stroke-dasharray: 141.5; /* половина окружности */ + } + + .character-level-ring { + stroke-dasharray: 141.5; /* половина окружности */ + transform: rotate(180deg); /* Поворот правого полукруга */ + } + + @@ -74,12 +227,52 @@
📜 Меню игрока
+
+
+
+ + + + +
+
+
+ +
+
+
+ +
+
+
+ +
+
+

Сила

+ — +
+
+

Интеллект

+ — +
+
+

Выносливость

+ — +
+
+

Стойкость

+ — +
+
+

👤 Личные данные

Имя: —

-

Уровень: —

-

Опыт: —

-

Здоровье: — / —

+

Telegram ID: —

+
+ +
+

👤 Профиль

Деньги: ₽—

Грязные деньги: ₽—

@@ -97,8 +290,10 @@

Нет активных предприятий.

- - 🏠 Перейти в чат бота + + + + 🏠 Перейти в чат бота diff --git a/server.bat b/server.bat new file mode 100644 index 0000000..c090ad7 --- /dev/null +++ b/server.bat @@ -0,0 +1,2 @@ +nodemon --ignore json/ .\server.js +pause \ No newline at end of file diff --git a/server.js b/server.js index 9a3e435..52ebd25 100644 --- a/server.js +++ b/server.js @@ -1,3 +1,12 @@ +require('dotenv').config(); + +const sequelize = require('./db'); // Подключение базы данных + +// Настраиваем глобальные переменные (опционально) +global.path = require('path'); +global.config = require('./config'); // Конфигурация +global.database = sequelize; // База данных +global.utils = require('./utils'); const express = require('express'); const { UserModel, CharacterModel, BusinessModel, EnterpriseModel } = global.config; const app = express(); @@ -9,10 +18,9 @@ app.get('/player/:id', async (req, res) => { const playerId = req.params.id; try { - console.log(playerId) const user = await UserModel.findOne({ where: { telegram_id: req.params.id } }); const character = await CharacterModel.findOne({ where: { telegram_id: playerId } }); - let business = await BusinessModel.findOne({ where: { owner: playerId.toString() } }) + let business = await BusinessModel.findOne({ where: { owner: playerId } }) if(business === null){ business = await BusinessModel.findOne( {where: { owner: user.business.id} } ) } @@ -25,13 +33,25 @@ app.get('/player/:id', async (req, res) => { res.json({ user: { username: user.username, + telegramID: user.telegram_id, name: user.name, - level: user.level, - exp: user.exp, + status: user.status, + profileLevel: user.level, + characterLevel: character.level, + profileExp: user.exp, + characterExp: character.exp, + profileExpToUp: global.config.expToUp[user.level], + characterExpToUp: global.config.expToUp[character.level], hp: character.hp, - max_hp: character.max_hp, - money: user.money, - dirtymoney: character.dirtymoney, + maxHp: character.max_hp, + stamina: character.stamina, + maxStamina: character.max_stamina, + force: character.force, + intelligence: character.intelligence, + resilience: character.resilience, + endurance: character.endurance, + money: global.utils.spaces(user.money), + dirtymoney: global.utils.spaces(character.dirtymoney), }, business: business || { name: "Отсутствует", balance: 0, materials: 0, users: [] }, enterprises: enterprises || [],