Merge branch 'master' into master

Author: Illya9999

README.md

@@ -0,0 +1,86 @@
+# sanctuary [![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-success.svg)](https://github.com/Picoseconds/sanctuary/graphs/commit-activity) [![Written in TypeScript](https://img.shields.io/badge/types-typescript-success)](https://github.com/microsoft/TypeScript/)
+Sanctuary is a private server implementation for the game MooMoo.io.
+
+## Features
+See [Issue #16](https://github.com/Picoseconds/sanctuary/issues/16) for a list of current features supported.
+
+## Getting started
+1. Clone the repo
+```
+git clone https://github.com/Picoseconds/sanctuary.git
+```
+2. Compile with `npm run build` **OR** `yarn build` depending on your package manager of choice.
+3. Run the server with `npm start`/`yarn start`
+
+## Project Scope
+The goal of the Sanctuary project is to create a customizable, modular private server for MooMoo.io. This means that some features will be implemented differently to support configuration using environment variables.
+
+See [Environment Variables](#environment-variables).
+
+### Environment variables
+| Variable name            | Effect                                                                                                                    |
+| ------------------------ | ------------------------------------------------------------------------------------------------------------------------- |
+| PORT                     | The port that the server binds on, defaults to 3000.                                                                      |
+| MAX_CPS                  | The CPS cap to use, defaults to 25.                                                                                       |
+| PLAYER_NEARBY_RADIUS     | The radius that players can see other players in.                                                                         |
+| GAMEOBJECT_NEARBY_RADIUS | The radius that players can see structures (this includes trees, bushes and all other naturally generated structures) in. |
+| MODERATOR_PASSWORD       | See [Password Login System](#password-login-system)                                                                       |
+
+This project utilises .env files with the `dotenv` module for configuration. Simply make a file named `.env` in the root of the cloned repo, and populate it with environment variables.
+
+A .env file is similar to a Unix shell file, and uses the same syntax for assigning environment variables.  
+Sample .env file:
+```bash
+PORT=8080
+MAX_CPS=20
+MODERATOR_PASSWORD=password123
+```
+
+## Moderation Commands
+| Command                                                                      | Use                                                                                                  |
+| ---------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------- |
+| set \<player id> \<health/food/wood/stone/kills/xp/gold> \<number>           | Sets the specified numerical attribute of a player to the specified number.                          |
+| tp \<destination player id>                                                  | Teleports you to the player specified.                                                               |
+| invisible                                                                    | Toggles invisibility. You can see yourself, but others cannot see you.                               |
+| invincible                                                                   | Toggles invincibility.                                                                               |
+| promote \<player id>                                                         | Makes someone else a moderator.                                                                      |
+| ban \<player id>                                                             | Bans someone by IP address. Moderators cannot be banned.                                             |
+| kick \<player id>                                                            | Kicks a user.                                                                                        |
+| broadcast \<message>                                                         | Displays a message in the top left of everyone's screen (including yours).                           |
+| restart                                                                      | Stops the server.                                                                                    |
+| speed \<speed multiplier>                                                    | Changes your speed.                                                                                  |
+| weaponVariant \<ruby/gold/diamond/normal> [player id (defaults to yourself)] | Changes the variant of the currently selected weapon of the player. |
+| login \<password>                                                            | See [Password Login System](#password-login-system)                                                  |
+
+Commands can be called from the terminal that Sanctuary is run from, and from chat.
+
+While Sanctuary doesn't enforce this with chat commands, with the normal MooMoo.io client, chat has a 15 character limit.
+When called from chat, commands must be prefixed with a `/` (slash) to differentiate them from normal chat.
+
+The player ID can be found from the API, or by the number beside the player's name.
+
+## Password Login System
+Sanctuary provides an additional login system for cases where not all moderators can be fully trusted. In this scheme, a password is used. The password is set with the environment variable `MODERATOR_PASSWORD`.  
+Admins utilize the `/login` command to log in. A major problem with this system's current implementation is that these temporary "admins" are able to use `/promote` to become permanent admins, so this system is not quite ready for production.
+
+## REST API
+Sanctuary implements a rudimentary REST API, with only two endpoints:
+### `/api/v1/players`
+Lists the currently connected clients. Output takes the following format (as a TypeScript type):
+```ts
+{
+  'type': 'success' | 'error',
+  'clients': { playerName: string = 'unknown', playerID: number = -1, clientIPHash: string }[] | undefined,
+  'message': string | undefined
+}
+```
+
+### `/api/v1/playerCount`
+Reports the amount of currently connected clients. Output takes the following format (as a TypeScript type):
+```ts
+{
+  'type': 'success' | 'error',
+  'playerCount': number | undefined,
+  'message': string | undefined
+}
+```

docs/.gitignore

@@ -0,0 +1,3 @@
+_site
+.sass-cache
+.jekyll-metadata

src/items/items.ts

@@ -38,7 +38,9 @@ const Weapons = {
 type Weapons = PrimaryWeapons | SecondaryWeapons
 
 function getHitTime(weapon: Weapons) {
-  return weapons[weapon].speed || -1;
+  let speed = weapons[weapon].speed || -1;
+  if (speed != -1) speed += 150;
+  return speed;
 }
 
 function isRangedWeapon(weapon: Weapons) {

src/moomoo/Game.ts

@@ -645,12 +645,8 @@ export default class Game {
         player.lastDot = now;
       }
 
-      if (
-        player.isAttacking &&
-        player.selectedWeapon != Weapons.Shield &&
-        player.buildItem == -1
-      ) {
-        if (now - player.lastHitTime >= player.getWeaponHitTime() + 120) {
+      if (player.isAttacking && player.selectedWeapon != Weapons.Shield && player.buildItem == -1) {
+        if (now - player.lastHitTime >= player.getWeaponHitTime()) {
           player.lastHitTime = now;
 
           if (isRangedWeapon(player.selectedWeapon)) {
@@ -929,9 +925,12 @@ export default class Game {
    * A manual attack
    * @param player the player doing the attacking
    */
-  normalAttack(player: Player) {
+  normalAttack(player: Player, angle: number | undefined) {
+		player.angle = angle || player.angle;
+
     if (player.buildItem != -1) {
-      let item = player.buildItem;
+			let item = player.buildItem;
+
       if (player.useItem(item, this.state, this.getNextGameObjectID())) {
         if (getPlaceable(item)) {
           player
@@ -1152,7 +1151,7 @@ export default class Game {
 
             client.lastAttackTime = Date.now();
 
-            this.normalAttack(client.player);
+            this.normalAttack(client.player, packet.data[1]);
           } else {
             client.player.isAttacking = false;
           }

src/moomoo/Physics.ts

@@ -21,11 +21,12 @@ function collideRectangles(x1: number, y1: number, w1: number, x2: number, y2: n
 }
 
 function moveTowards(player: Player, angle: number, speed: number, deltaTime: number, state: GameState) {
-  tryMovePlayer(player,
-    deltaTime / 170,
-    Math.cos(angle) * speed * 60, Math.sin(angle) * speed * 60,
+  /* tryMovePlayer(player,
+    deltaTime,
+    Math.cos(angle) * speed * 0.1528, Math.sin(angle) * speed * 0.1528,
     state
-  );
+  ); */
+  player.velocity.add(Math.cos(angle) * speed * .0016 * deltaTime, Math.sin(angle) * speed * .0016 * deltaTime);
 }
 
 /**
@@ -123,6 +124,21 @@ function tryMovePlayer(player: Player, delta: number, xVel: number, yVel: number
   player.inTrap = inTrap;
   if (inTrap) return;
 
+  // River
+  if (player.location.y > 6850 && player.location.y < 7550) {
+    if (getHat(player.hatID)?.watrImm) {
+      xVel *= .75;
+      yVel *= .75;
+
+      player.velocity.add(0.0011 * 0.4 * delta * (1 / .75), 0);
+    } else {
+      xVel *= .33;
+      yVel *= .33;
+
+      player.velocity.add(0.0011 * delta * (1 / .33), 0);
+    }
+  }
+
   newLocation.clamp(new Vec2(0 + 35, 0 + 35), new Vec2(14400 - 35, 14400 - 35));
   player.location = newLocation.add(delta * xVel, delta * yVel);
 }
@@ -133,6 +149,7 @@ function movePlayer(player: Player, delta: number, state: GameState) {
   if (player.velocity.x || player.velocity.y) {
     player.velocity = player.velocity.multiply(0.993 ** delta, 0.993 ** delta);
   }
+
   for (let p of player.getNearbyPlayers(state)) {
     if (collideCircles(p.location, 30, player.location, 30)) {
       let dis = player.location.distance(p.location);