added unit components

roman-bytes · Jul 19, 2024 · 8ed29d4 · 8ed29d4
1 parent 217f28e
commit 8ed29d4
Show file tree

Hide file tree

Showing 14 changed files with 335 additions and 215 deletions.
diff --git a/.env.example b/.env.example
diff --git a/README.md b/README.md
@@ -1,180 +1,4 @@
-# Remix Indie Stack
+# Shadowforge chess 
 
-![The Remix Indie Stack](https://repository-images.githubusercontent.com/465928257/a241fa49-bd4d-485a-a2a5-5cb8e4ee0abf)
+## A chess rouge like pvp combat
 
-Learn more about [Remix Stacks](https://remix.run/stacks).
-
-```
-npx create-remix --template remix-run/indie-stack
-```
-
-## What's in the stack
-
-- [Fly app deployment](https://fly.io) with [Docker](https://www.docker.com/)
-- Production-ready [SQLite Database](https://sqlite.org)
-- Healthcheck endpoint for [Fly backups region fallbacks](https://fly.io/docs/reference/configuration/#services-http_checks)
-- [GitHub Actions](https://github.com/features/actions) for deploy on merge to production and staging environments
-- Email/Password Authentication with [cookie-based sessions](https://remix.run/docs/en/v1/api/remix#createcookiesessionstorage)
-- Database ORM with [Prisma](https://prisma.io)
-- Styling with [Tailwind](https://tailwindcss.com/)
-- End-to-end testing with [Cypress](https://cypress.io)
-- Local third party request mocking with [MSW](https://mswjs.io)
-- Unit testing with [Vitest](https://vitest.dev) and [Testing Library](https://testing-library.com)
-- Code formatting with [Prettier](https://prettier.io)
-- Linting with [ESLint](https://eslint.org)
-- Static Types with [TypeScript](https://typescriptlang.org)
-
-Not a fan of bits of the stack? Fork it, change it, and use `npx create-remix --template your/repo`! Make it your own.
-
-## Quickstart
-
-Click this button to create a [Gitpod](https://gitpod.io) workspace with the project set up and Fly pre-installed
-
-[![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=gitpod)](https://gitpod.io/from-referrer/)
-
-## Development
-
-- This step only applies if you've opted out of having the CLI install dependencies for you:
-
-  ```sh
-  npx remix init
-  ```
-
-- Initial setup: _If you just generated this project, this step has been done for you._
-
-  ```sh
-  npm run setup
-  ```
-
-- Start dev server:
-
-  ```sh
-  npm run dev
-  ```
-
-This starts your app in development mode, rebuilding assets on file changes.
-
-The database seed script creates a new user with some data you can use to get started:
-
-- Email: `[email protected]`
-- Password: `racheliscool`
-
-### Relevant code:
-
-This is a pretty simple note-taking app, but it's a good example of how you can build a full stack app with Prisma and Remix. The main functionality is creating users, logging in and out, and creating and deleting notes.
-
-- creating users, and logging in and out [./app/models/user.server.ts](./app/models/user.server.ts)
-- user sessions, and verifying them [./app/session.server.ts](./app/session.server.ts)
-- creating, and deleting notes [./app/models/note.server.ts](./app/models/note.server.ts)
-
-## Deployment
-
-This Remix Stack comes with two GitHub Actions that handle automatically deploying your app to production and staging environments.
-
-Prior to your first deployment, you'll need to do a few things:
-
-- [Install Fly](https://fly.io/docs/getting-started/installing-flyctl/)
-
-- Sign up and log in to Fly
-
-  ```sh
-  fly auth signup
-  ```
-
-  > **Note:** If you have more than one Fly account, ensure that you are signed into the same account in the Fly CLI as you are in the browser. In your terminal, run `fly auth whoami` and ensure the email matches the Fly account signed into the browser.
-
-- Create two apps on Fly, one for staging and one for production:
-
-  ```sh
-  fly apps create bloctics-f495
-  fly apps create bloctics-f495-staging
-  ```
-
-  > **Note:** Make sure this name matches the `app` set in your `fly.toml` file. Otherwise, you will not be able to deploy.
-
-  - Initialize Git.
-
-  ```sh
-  git init
-  ```
-
-- Create a new [GitHub Repository](https://repo.new), and then add it as the remote for your project. **Do not push your app yet!**
-
-  ```sh
-  git remote add origin <ORIGIN_URL>
-  ```
-
-- Add a `FLY_API_TOKEN` to your GitHub repo. To do this, go to your user settings on Fly and create a new [token](https://web.fly.io/user/personal_access_tokens/new), then add it to [your repo secrets](https://docs.github.com/en/actions/security-guides/encrypted-secrets) with the name `FLY_API_TOKEN`.
-
-- Add a `SESSION_SECRET` to your fly app secrets, to do this you can run the following commands:
-
-  ```sh
-  fly secrets set SESSION_SECRET=$(openssl rand -hex 32) --app bloctics-f495
-  fly secrets set SESSION_SECRET=$(openssl rand -hex 32) --app bloctics-f495-staging
-  ```
-
-  If you don't have openssl installed, you can also use [1password](https://1password.com/password-generator/) to generate a random secret, just replace `$(openssl rand -hex 32)` with the generated secret.
-
-- Create a persistent volume for the sqlite database for both your staging and production environments. Run the following:
-
-  ```sh
-  fly volumes create data --size 1 --app bloctics-f495
-  fly volumes create data --size 1 --app bloctics-f495-staging
-  ```
-
-Now that everything is set up you can commit and push your changes to your repo. Every commit to your `main` branch will trigger a deployment to your production environment, and every commit to your `dev` branch will trigger a deployment to your staging environment.
-
-### Connecting to your database
-
-The sqlite database lives at `/data/sqlite.db` in your deployed application. You can connect to the live database by running `fly ssh console -C database-cli`.
-
-### Getting Help with Deployment
-
-If you run into any issues deploying to Fly, make sure you've followed all of the steps above and if you have, then post as many details about your deployment (including your app name) to [the Fly support community](https://community.fly.io). They're normally pretty responsive over there and hopefully can help resolve any of your deployment issues and questions.
-
-## GitHub Actions
-
-We use GitHub Actions for continuous integration and deployment. Anything that gets into the `main` branch will be deployed to production after running tests/build/etc. Anything in the `dev` branch will be deployed to staging.
-
-## Testing
-
-### Cypress
-
-We use Cypress for our End-to-End tests in this project. You'll find those in the `cypress` directory. As you make changes, add to an existing file or create a new file in the `cypress/e2e` directory to test your changes.
-
-We use [`@testing-library/cypress`](https://testing-library.com/cypress) for selecting elements on the page semantically.
-
-To run these tests in development, run `npm run test:e2e:dev` which will start the dev server for the app as well as the Cypress client. Make sure the database is running in docker as described above.
-
-We have a utility for testing authenticated features without having to go through the login flow:
-
-```ts
-cy.login();
-// you are now logged in as a new user
-```
-
-We also have a utility to auto-delete the user at the end of your test. Just make sure to add this in each test file:
-
-```ts
-afterEach(() => {
-  cy.cleanupUser();
-});
-```
-
-That way, we can keep your local db clean and keep your tests isolated from one another.
-
-### Vitest
-
-For lower level tests of utilities and individual components, we use `vitest`. We have DOM-specific assertion helpers via [`@testing-library/jest-dom`](https://testing-library.com/jest-dom).
-
-### Type Checking
-
-This project uses TypeScript. It's recommended to get TypeScript set up for your editor to get a really great in-editor experience with type checking and auto-complete. To run type checking across the whole project, run `npm run typecheck`.
-
-### Linting
-
-This project uses ESLint for linting. That is configured in `.eslintrc.js`.
-
-### Formatting
-
-We use [Prettier](https://prettier.io/) for auto-formatting in this project. It's recommended to install an editor plugin (like the [VSCode Prettier plugin](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode)) to get auto-formatting on save. There's also a `npm run format` script you can run to format all files in the project.
diff --git a/app/components/Bloctics.tsx b/app/components/Bloctics.tsx
@@ -2,9 +2,14 @@
 import React from "react";
 import IsometricMap from "~/components/IsometricMap";
 import IsometricTile from "~/components/IsometricTile";
-import IsometricObject from "~/components/IsometricObject";
-import { getClassAsset, highlightTile, unHighlightTile } from "~/util";
-import hoverSound from "../../public/sounds/hover_sound_2.wav";
+
+// Units
+import Knight from "~/components/units/Knight";
+import FireMage from "~/components/units/FireMage";
+import Assassin from "~/components/units/Assassin";
+import Priest from "~/components/units/Priest";
+import Ranger from "~/components/units/Ranger";
+
 
 const mapWidth = 11;
 const mapHeight = 11;
@@ -45,7 +50,7 @@ const mapLayout = [
   {},
   {},
   { starter: true, class: "fire-mage" },
-  { starter: true, class: "assassian" },
+  { starter: true, class: "assassin" },
   {},
   {},
   {},
@@ -133,8 +138,8 @@ const mapLayout = [
 ];
 
 function Bloctics(props) {
-  const hover = new Audio(hoverSound);
-  hover.volume = 0.1;
+//  const hover = new Audio(hoverSound);
+//  hover.volume = 0.1;
   return (
     <div className="flex justify-center">
       <IsometricMap
@@ -161,11 +166,9 @@ function Bloctics(props) {
                 "--background-right-wall": "#815E4A",
               }}
               onEnter={(e) => {
-                hover.play();
                 e.target.style.backgroundColor = "#82A67C";
               }}
               onLeave={(e) => {
-                hover.pause();
                 const area = e.area;
                 switch (area) {
                   case "floor":
@@ -183,29 +186,57 @@ function Bloctics(props) {
           ];
 
           if (z.starter) {
-            result.push(
-              <IsometricObject
-                key={`object${index}`}
-                x={x}
-                y={y}
-                z={1}
-                width={64}
-                height={64}
-                frames={[getClassAsset(z.class)]}
-                active={true}
-                onEnter={(e) => {
-                  hover.play();
-                  highlightTile(e.target);
-                }}
-                onLeave={(e) => {
-                  hover.pause();
-                  unHighlightTile(e.target);
-                }}
-                onClick={() => {
-                  console.log("cclicked");
-                }}
-              />
-            );
+            switch (z.class) {
+              case('knight'): {
+                result.push(
+                  <Knight
+                    x={x}
+                    y={y}
+                    z={1}
+                    unit={z.class}
+                  />
+                );
+              }
+              break;
+
+              case('fire-mage'): {
+                result.push(
+                  <FireMage
+                    x={x}
+                    y={y}
+                    z={1}
+                    unit={z.class}
+                  />
+                )
+              }
+              break;
+
+              case('assassin'): {
+                result.push(
+                  <Assassin
+                    x={x}
+                    y={y}
+                    z={1}
+                    unit={z.class}
+                  />
+                )
+              }
+              break;
+
+              case('priest'): {
+                result.push(
+                  <Priest x={x} y={y} z={1} unit={z.class} />
+                )
+              }
+              break;
+
+              case('ranger'): {
+                result.push(
+                  <Ranger x={x} y={y} z={1} unit={z.class} />
+                )
+              }
+              break;
+            }
           }
           return result;
         })}

diff --git a/app/components/IsometricObject.tsx b/app/components/IsometricObject.tsx
@@ -5,6 +5,11 @@ import AnimatedTexture from "./AnimatedTexture";
 
 import IsometricMapEvent from "../events/IsometricMapEvent";
 
+// todo: Hover sounds and other things should be here.
+// import { getClassAsset, highlightTile, unHighlightTile } from "~/util";
+// import hoverSound from "../../public/sounds/hover_sound_2.wav";
+
+
 // import "./IsometricObject.scss";
 
 interface IsometricObjectProps {
@@ -41,7 +46,7 @@ interface IsometricObjectProps {
 /**
  * An isometric object is everything than is not  a tile or a character.
  * They can be animated and over any tile.
- * They are used for decorations than don't look like a floor pice, like trees, rocks
+ * They are used for decorations than don't look like a floor piece, like trees, rocks
  * or buildings.
  *
  * @version 1.0.0

diff --git a/app/components/IsometricTile.tsx b/app/components/IsometricTile.tsx
@@ -4,6 +4,12 @@ import React, { Component } from "react";
 import AnimatedTexture from "~/components/AnimatedTexture";
 
 import IsometricMapEvent from "../events/IsometricMapEvent";
+
+// todo: hover sound needs to go here
+// import { getClassAsset, highlightTile, unHighlightTile } from "~/util";
+// import hoverSound from "../../public/sounds/hover_sound_2.wav";
+
+
 // import "./IsometricTile.scss";
 
 interface IsometricTileProps {

diff --git a/app/components/units/Assassin.tsx b/app/components/units/Assassin.tsx
@@ -0,0 +1,41 @@
+import IsometricObject from "~/components/IsometricObject";
+import { getClassAsset } from "~/util";
+
+type AssassinProps = {
+  x: number;
+  y: number;
+  z: number;
+  unit: string;
+}
+
+function Assassin({ x, y, z, unit }: AssassinProps) {
+  const unitStats = {
+    movement: 4,
+    attack: 1,
+    damage: 10, // todo: random generator
+    position: "N", // todo: add in constants
+  };
+
+  return (
+    <IsometricObject
+      x={x}
+      width={64}
+      y={y}
+      z={z}
+      height={64}
+      frames={[getClassAsset(unit)]}
+      active={true}
+      onEnter={() => {
+        console.log('ENTERED')
+      }}
+      onLeave={() => {
+        console.log('LEAVE')
+      }}
+      onClick={() => {
+        console.log('CLICKED22', unitStats)
+      }}
+    />
+  )
+}
+
+export default Assassin;