reldens 4.0.0-beta.21 → 4.0.0-beta.22

package/migrations/production/beta.22-sql-update.sql

@@ -0,0 +1,27 @@
+#######################################################################################################################
+
+SET FOREIGN_KEY_CHECKS = 0;
+
+#######################################################################################################################
+
+# Config:
+INSERT INTO `config` VALUES(NULL, 'client', 'objects/npc/invalidOptionMessage', 'I do not understand.', 't');
+DELETE FROM `config` WHERE `path` = 'ui/minimap/roundMap';
+INSERT INTO `config` VALUES(NULL, 'client', 'ui/minimap/roundMap', '1', 'b');
+
+# Played Time:
+ALTER TABLE `users`
+	CHANGE COLUMN `email` `email` VARCHAR(255) NOT NULL COLLATE 'utf8_unicode_ci' AFTER `id`,
+	CHANGE COLUMN `username` `username` VARCHAR(255) NOT NULL COLLATE 'utf8_unicode_ci' AFTER `email`,
+	CHANGE COLUMN `password` `password` VARCHAR(255) NOT NULL COLLATE 'utf8_unicode_ci' AFTER `username`,
+	CHANGE COLUMN `status` `status` VARCHAR(255) NOT NULL COLLATE 'utf8_unicode_ci' AFTER `role_id`,
+	ADD COLUMN `played_time` INT(10) NOT NULL DEFAULT 0 AFTER `updated_at`;
+
+INSERT INTO `config` VALUES(NULL, 'client', 'players/playedTime/show', '2', 'i');
+INSERT INTO `config` VALUES(NULL, 'client', 'players/playedTime/label', 'Played Time:<br/>', 't');
+
+#######################################################################################################################
+
+SET FOREIGN_KEY_CHECKS = 1;
+
+#######################################################################################################################

package/migrations/production/reldens-install-v4.0.0.sql

@@ -162,7 +162,7 @@ CREATE TABLE IF NOT EXISTS `config` (
   `value` text CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
   `type` varchar(2) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=253 DEFAULT CHARSET=utf8mb3 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=257 DEFAULT CHARSET=utf8mb3 COLLATE=utf8_unicode_ci;
 
 -- Dumping data for table config: ~236 rows (approximately)
 /*!40000 ALTER TABLE `config` DISABLE KEYS */;
@@ -297,7 +297,7 @@ INSERT INTO `config` (`id`, `scope`, `path`, `value`, `type`) VALUES
 	(136, 'client', 'players/animations/collideWorldBounds', '1', 'b'),
 	(137, 'server', 'rooms/world/bulletsStopOnPlayer', '1', 'b'),
 	(138, 'client', 'players/animations/fallbackImage', 'player-base', 't'),
-	(139, 'client', 'players/multiplePlayers/enabled', '1', 'b'),
+	(139, 'client', 'players/multiplePlayers/enabled', '0', 'b'),
 	(140, 'server', 'players/gameOver/timeOut', '10000', 'i'),
 	(141, 'client', 'ui/controls/tabTarget', '1', 'b'),
 	(142, 'client', 'ui/controls/disableContextMenu', '1', 'b'),
@@ -336,12 +336,10 @@ INSERT INTO `config` (`id`, `scope`, `path`, `value`, `type`) VALUES
 	(182, 'client', 'ui/minimap/mapHeightDivisor', '1', 'i'),
 	(183, 'client', 'ui/minimap/fixedWidth', '450', 'i'),
 	(184, 'client', 'ui/minimap/fixedHeight', '450', 'i'),
-	(185, 'client', 'ui/minimap/roundMap', '1', 'b'),
 	(186, 'client', 'ui/minimap/camX', '140', 'i'),
 	(187, 'client', 'ui/minimap/camY', '10', 'i'),
 	(188, 'client', 'ui/minimap/camBackgroundColor', 'rgba(0,0,0,0.6)', 't'),
 	(189, 'client', 'ui/minimap/camZoom', '0.35', 'i'),
-	(190, 'client', 'ui/minimap/roundMap', '1', 'b'),
 	(191, 'client', 'ui/minimap/addCircle', '1', 'b'),
 	(192, 'client', 'ui/minimap/circleX', '220', 'i'),
 	(193, 'client', 'ui/minimap/circleY', '88', 'i'),
@@ -364,16 +362,16 @@ INSERT INTO `config` (`id`, `scope`, `path`, `value`, `type`) VALUES
 	(210, 'client', 'ui/settings/y', '280', 'i'),
 	(211, 'client', 'ui/settings/enabled', '1', 'b'),
 	(212, 'client', 'ui/lifeBar/showOnClick', '1', 'b'),
-	(213, 'client', 'rooms/selection/allowOnRegistration', '1', 'b'),
-	(214, 'client', 'rooms/selection/allowOnLogin', '1', 'b'),
+	(213, 'client', 'rooms/selection/allowOnRegistration', '0', 'b'),
+	(214, 'client', 'rooms/selection/allowOnLogin', '0', 'b'),
 	(215, 'client', 'rooms/selection/registrationAvailableRooms', '*', 't'),
 	(216, 'client', 'rooms/selection/loginLastLocation', '1', 'b'),
 	(218, 'client', 'rooms/selection/loginAvailableRooms', '*', 't'),
 	(219, 'client', 'rooms/selection/loginLastLocationLabel', 'Last Location', 't'),
 	(220, 'client', 'players/tapMovement/enabled', '1', 'b'),
 	(221, 'client', 'ui/chat/overheadChat/enabled', '1', 'b'),
-	(222, 'client', 'chat/messages/characterLimit', '10', 'i'),
-	(223, 'client', 'chat/messages/characterLimitOverhead', '5', 'i'),
+	(222, 'client', 'chat/messages/characterLimit', '100', 'i'),
+	(223, 'client', 'chat/messages/characterLimitOverhead', '50', 'i'),
 	(224, 'client', 'ui/chat/overheadText/fontFamily', 'Verdana, Geneva, sans-serif', 't'),
 	(225, 'client', 'ui/chat/overheadText/fontSize', '12px', 't'),
 	(226, 'client', 'ui/chat/overheadText/fill', '#ffffff', 't'),
@@ -402,7 +400,11 @@ INSERT INTO `config` (`id`, `scope`, `path`, `value`, `type`) VALUES
 	(249, 'client', 'ui/players/nameText/textLength', '4', 'i'),
 	(250, 'client', 'ui/chat/overheadChat/isTyping', '1', 'b'),
 	(251, 'client', 'ui/chat/overheadText/timeOut', '5000', 'i'),
-	(252, 'client', 'ui/chat/overheadChat/closeChatBoxAfterSend', '1', 'b');
+	(252, 'client', 'ui/chat/overheadChat/closeChatBoxAfterSend', '1', 'b'),
+	(253, 'client', 'players/playedTime/show', '2', 'i'),
+	(254, 'client', 'players/playedTime/label', 'Played Time:<br/>', 't'),
+	(255, 'client', 'objects/npc/invalidOptionMessage', 'I do not understand.', 't'),
+	(256, 'client', 'ui/minimap/roundMap', '1', 'b');
 /*!40000 ALTER TABLE `config` ENABLE KEYS */;
 
 -- Dumping structure for table features
@@ -1364,13 +1366,14 @@ INSERT INTO `stats` (`id`, `key`, `label`, `description`, `base_value`, `customD
 -- Dumping structure for table users
 CREATE TABLE IF NOT EXISTS `users` (
   `id` int unsigned NOT NULL AUTO_INCREMENT,
-  `email` varchar(255) NOT NULL,
-  `username` varchar(255) NOT NULL,
-  `password` varchar(255) NOT NULL,
+  `email` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
+  `username` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
+  `password` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
   `role_id` int unsigned NOT NULL,
-  `status` varchar(255) NOT NULL,
+  `status` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
   `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `played_time` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `email` (`email`),
   UNIQUE KEY `username` (`username`)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "reldens",
-    "version": "4.0.0-beta.21",
+    "version": "4.0.0-beta.22",
     "description": "Reldens - MMORPG Platform",
     "author": "Damian A. Pastorini",
     "license": "MIT",
@@ -37,7 +37,7 @@
         "@adminjs/design-system": "2.1.2",
         "@adminjs/express": "4.1.0",
         "@adminjs/upload": "2.0.2",
-        "@babel/core": "^7.17.5",
+        "@babel/core": "^7.17.8",
         "@colyseus/monitor": "^0.12.3",
         "@colyseus/schema": "^0.5.41",
         "@reldens/items-system": "^0.11.0",
@@ -49,16 +49,16 @@
         "bcrypt": "^5.0.1",
         "colyseus": "0.12.6",
         "colyseus.js": "0.12.2",
-        "core-js": "^3.21.0",
+        "core-js": "^3.21.1",
         "cors": "^2.8.5",
         "dotenv": "^16.0.0",
         "express": "^4.17.3",
         "express-basic-auth": "^1.2.1",
         "express-formidable": "^1.2.0",
         "express-session": "^1.17.2",
-        "firebase": "9.6.8",
+        "firebase": "9.6.9",
         "firebaseui": "6.0.1",
-        "mime-types": "^2.1.34",
+        "mime-types": "^2.1.35",
         "mustache": "^4.2.0",
         "nodemailer": "^6.7.2",
         "p2": "^0.7.1",
@@ -71,12 +71,12 @@
     },
     "devDependencies": {
         "babel-eslint": "^10.1.0",
-        "eslint": "^8.9.0",
+        "eslint": "^8.11.0",
         "eslint-config-standard": "^17.0.0-1",
         "eslint-plugin-import": "^2.25.4",
         "eslint-plugin-node": "^11.1.0",
         "eslint-plugin-promise": "^6.0.0",
         "eslint-plugin-standard": "^5.0.0",
-        "sass": "^1.49.7"
+        "sass": "^1.49.9"
     }
 }

package/packages/chat/client/chat-ui.js

@@ -237,7 +237,7 @@ class ChatUi
             message: message[ChatConst.CHAT_MESSAGE]
         });
         readPanel.innerHTML += output;
-        if(message[ChatConst.CHAT_FROM]){
+        if(message[ChatConst.CHAT_FROM] && this.isValidMessageType(message.t)){
             let playerSprite = this.fetchPlayerByName(message[ChatConst.CHAT_FROM]);
             if(playerSprite){
                 this.showOverheadChat(playerSprite, message[ChatConst.CHAT_MESSAGE]);
@@ -250,6 +250,13 @@ class ChatUi
         }
     }
 
+    isValidMessageType(messageType)
+    {
+        return ChatConst.CHAT_TYPE_SYSTEM !== messageType
+            && ChatConst.CHAT_TYPE_SYSTEM_ERROR !== messageType
+            && ChatConst.CHAT_TYPE_SYSTEM_BATTLE !== messageType;
+    }
+
     fetchPlayerByName(playerName)
     {
         let players = this.gameManager.getCurrentPlayer().players;

package/packages/chat/constants.js

@@ -32,6 +32,7 @@ module.exports.ChatConst = {
     CHAT_TYPE_GLOBAL: 'ctg',
     CHAT_TYPE_SYSTEM: 'cts',
     CHAT_TYPE_SYSTEM_ERROR: 'ctse',
+    CHAT_TYPE_SYSTEM_BATTLE: 'ctb',
     colors: {
         ctn: '#ffffff',
         ctpf: '#f39c12',

package/packages/chat/server/pack.js

@@ -52,7 +52,8 @@ class ChatPack extends PackInterface
                 let messageObject = {
                     act: ChatConst.CHAT_ACTION,
                     f: skill.owner.playerName,
-                    m: sendMessage
+                    m: sendMessage,
+                    t: ChatConst.CHAT_TYPE_SYSTEM_BATTLE
                 };
                 client.send(messageObject);
                 this.chatManager.saveMessage(

package/packages/config/processor.js

@@ -17,31 +17,29 @@ class ConfigProcessor
      */
     get(path, avoidLog = false)
     {
-        // default value will be always false:
-        let result = false;
         // since the amount of parameters should be always 3 (for a config group) or 4 (for a single value) then we can
         // easily split the path:
         let pathArray = path.split('/');
         // verify path size:
-        if(pathArray.length >= 3){
-            let levelCheck = (this[pathArray[0]] || {});
-            for(let i = 1; i < pathArray.length; i++){
-                if(!sc.hasOwn(levelCheck, pathArray[i])){
-                    if(!avoidLog){
-                        Logger.error('Configuration level '+i+' not defined: '+path);
-                    }
-                    levelCheck = false;
-                    break;
-                }
-                levelCheck = levelCheck[pathArray[i]];
-            }
-            result = levelCheck;
-        } else {
+        if(pathArray.length < 3){
             if(!avoidLog){
                 Logger.error('Path level is too low:', path);
             }
+            return false;
+        }
+        // default value will be always false:
+        let levelCheck = (this[pathArray[0]] || {});
+        for(let i = 1; i < pathArray.length; i++){
+            if(!sc.hasOwn(levelCheck, pathArray[i])){
+                if(!avoidLog){
+                    Logger.error('Configuration level '+i+' not defined: '+path);
+                }
+                levelCheck = false;
+                break;
+            }
+            levelCheck = levelCheck[pathArray[i]];
         }
-        return result;
+        return levelCheck;
     }
 
 }

package/packages/game/client/game-engine.js

@@ -78,11 +78,35 @@ class GameEngine extends Game
     {
         if(sc.hasOwn(this.uiScene, 'uiTarget')){
             this.uiScene.uiTarget.getChildByID('box-target').style.display = 'block';
-            this.uiScene.uiTarget.getChildByID('target-container').innerHTML = targetName;
+            this.uiScene.uiTarget.getChildByID('target-container').innerHTML = this.targetDisplay(targetName, target);
         }
         this.eventsManager.emit('reldens.gameEngineShowTarget', this, target, previousTarget);
     }
 
+    targetDisplay(targetName, target)
+    {
+        // @TODO - BETA - Refactor.
+        let gameManager = this.uiScene.gameManager;
+        let showPlayedTime = gameManager.config.get('client/players/playedTime/show');
+        if(0 === showPlayedTime || GameConst.TYPE_PLAYER !== target.type){
+            return targetName;
+        }
+        let currentPlayer = gameManager.getCurrentPlayer();
+        let timeText = '';
+        let label = gameManager.config.get('client/players/playedTime/label');
+        if(0 < showPlayedTime && currentPlayer.playerId === target.id){
+            let element = gameManager.gameDom.createElement('p');
+            element.innerHTML = label+(currentPlayer.playedTime / 60 / 60).toFixed(1)+'hs';
+            timeText = element.outerHTML;
+        }
+        if(2 === showPlayedTime && sc.hasOwn(currentPlayer.players, target.id)){
+            let element = gameManager.gameDom.createElement('p');
+            element.innerHTML = label+(currentPlayer.players[target.id].playedTime / 60 / 60).toFixed(1)+'hs';
+            timeText = element.outerHTML;
+        }
+        return targetName+timeText;
+    }
+
     clearTarget()
     {
         let currentScene = this.uiScene.gameManager.activeRoomEvents.getActiveScene();