[email protected] (#934)

* [email protected]

* Newer Node image; fix typings

* Remove more puppeteer

* Corrected Yarn cache key

Author: Josh Goldberg

.circleci/config.yml

@@ -1,23 +1,18 @@
 version: 2.1
 
-orbs:
-    puppeteer: threetreeslight/[email protected]
-
 references:
     default_env: &default_env
         docker:
-            - image: circleci/node:14.4.0
+            - image: cimg/node:16.7-browsers
 
-    yarn_cache_key_1: &yarn_cache_key_1 yarn---
-    yarn_cache_key_2: &yarn_cache_key_2 yarn--
-    yarn_cache_key_3: &yarn_cache_key_3 yarn-
+    yarn_cache_key_1: &yarn_cache_key_1 yarn-v1-{{ checksum "yarn.lock" }}
+    yarn_cache_key_2: &yarn_cache_key_2 yarn-v1-
 
     restore_yarn_cache: &restore_yarn_cache
         restore_cache:
             keys:
                 - *yarn_cache_key_1
                 - *yarn_cache_key_2
-                - *yarn_cache_key_3
 
     save_yarn_cache: &save_yarn_cache
         save_cache:
@@ -38,7 +33,6 @@ jobs:
         <<: *default_env
         steps:
             - checkout
-            - puppeteer/install
             - *restore_yarn_cache
             - run: yarn compile
             - run: yarn test

.eslintrc.json

@@ -12,6 +12,7 @@
     },
     "plugins": ["@typescript-eslint"],
     "rules": {
+        // TODO: It would be nice to enable these...
         "@typescript-eslint/explicit-module-boundary-types": "off",
         "@typescript-eslint/no-empty-function": "off",
         "@typescript-eslint/no-explicit-any": "off",
@@ -21,10 +22,9 @@
         "@typescript-eslint/no-unsafe-call": "off",
         "@typescript-eslint/no-unsafe-member-access": "off",
         "@typescript-eslint/no-unsafe-return": "off",
-        "@typescript-eslint/require-await": "off",
-        "@typescript-eslint/restrict-template-expressions": "off",
+        "@typescript-eslint/no-unused-vars": "off",
         "@typescript-eslint/restrict-plus-operands": "off",
-        "@typescript-eslint/unbound-method": "off",
-        "@typescript-eslint/no-unused-vars": "off"
+        "@typescript-eslint/restrict-template-expressions": "off",
+        "@typescript-eslint/unbound-method": "off"
     }
 }

docs/map-spawning.md

@@ -1,11 +1,11 @@
 # Map Spawning
 
 Individual sections of the overworld are stored as separate maps under `src/creators/mapLibrary`.
-Areas register their neighbors by placing an `AreaSpawner` Thing on the border between the two areas:
+Areas register their neighbors by placing an `AreaSpawner` Actor on the border between the two areas:
 
 ```typescript
 creation: [
-    { thing: "AreaSpawner", width: 608, height: 544, map: "Route 1", area: "Land", direction: 0 },
+    { actor: "AreaSpawner", width: 608, height: 544, map: "Route 1", area: "Land", direction: 0 },
     // ...
 ],
 ```

docs/pokemon-creation.md

@@ -4,7 +4,7 @@ The main file that handles Pokemon creation is [`Equations.ts`](../src/sections/
 `Equations.ts` includes functions for choosing random wild Pokemon and for creating the actual Pokemon object.
 It also facilitates the creating of a wild Pokemon by preparing parameters then calling creation of the Pokemon object.
 
-A newly created Pokemon's member types can be found in [`Battles.ts`](../src/sections/Battles.ts) under the `IPokemon` interface.
+A newly created Pokemon's member types can be found in [`Battles.ts`](../src/sections/Battles.ts) under the `Pokemon` interface.
 
 ### Equations
 
@@ -20,11 +20,11 @@ Pass into the `newPokemon` function from `Equations.ts` an object of type `INewP
 ```javascript
 const pokemonTitle: string[] = "CHARMANDER".split("");
 const pokemonLevel: number = 10;
-const pokemon: IPokemon = FSP.equations.newPokemon({
+const pokemon: Pokemon = FSP.equations.newPokemon({
     level: pokemonLevel,
     title: pokemonTitle,
 });
-const pokemon: IPokemon = FSP.equations.newPokemon({
+const pokemon: Pokemon = FSP.equations.newPokemon({
     item: "Potion".split(""),
     level: pokemonLevel,
     moves: [
@@ -43,13 +43,13 @@ const pokemon: IPokemon = FSP.equations.newPokemon({
 The steps for creating a Pokemon in a wild Pokemon encounter are:
 
 1. The `chooseWildPokemonForBattle` function is run.
-   The grass `IMap` and `IArea` determine which wild Pokemon can be encountered by looking at the current location which is an object labeled `areas` that includes an object `wildPokemon` that holds what Pokemon can be found along with appearance rates.
+   The grass `Map` and `Area` determine which wild Pokemon can be encountered by looking at the current location which is an object labeled `areas` that includes an object `wildPokemon` that holds what Pokemon can be found along with appearance rates.
 2. After selecting a valid wild Pokemon that can be encountered `chooseRandomWildPokemon` is called and chooses a Pokemon from the list of valid Pokemon based on the chance of encountering that wild Pokemon.
 3. Next, `createPokemon` is called which sets up an object of type `INewPokemon` containing information on the level and title of the chosen Pokemon.
 4. `newPokemon` is called creating and returning the wild encountered Pokemon.
 
 ```javascript
-const options: IWildPokemonSchema[] = [
+const options: WildPokemonSchema[] = [
     {
         title: "CHARMANDER".split(""),
         level: 10,
@@ -70,6 +70,6 @@ const options: IWildPokemonSchema[] = [
 ];
 
 // Chosen has a 75% chance of being a Squirtle and 25% chance of being a Charmander.
-const chosen: IWildPokemonSchema = fsp.equations.chooseRandomWildPokemon(options);
+const chosen: WildPokemonSchema = fsp.equations.chooseRandomWildPokemon(options);
 const chosenPokemon = fsp.equations.createPokemon(chosen);
 ```

docs/walking.md

@@ -2,7 +2,7 @@
 
 ## Walking paths
 
-Characters can be told to walk along a predefined path as per `IWalkingInstructions`.
+Characters can be told to walk along a predefined path as per `WalkingInstructions`.
 Each "step" on that path must be either an instruction with the number of `blocks` in which `direction` or a lambda to generate them.
 You can manually trigger a character to talk along a path using `FSP.walking.startWalkingOnPath`:
 
@@ -35,14 +35,14 @@ FSP.following.startFollowing(player, borderingCharacter);
 ## Wild Pokemon
 
 When walking in grass, within a cave, or while in surf mode, the player will randomly encounter wild Pokemon.
-This is checked in the `Walking` component's `continueWalking`, which, if a given Thing is a player, checks for cave, grass, or water battle starts.
+This is checked in the `Walking` component's `continueWalking`, which, if a given Actor is a player, checks for cave, grass, or water battle starts.
 
 Which Pokemon may be encountered by an area are stored within the area's `wildPokemon` member, which may specify `grass`, `fishing`, `surfing`, and/or `walking`.
-See `IAreaWildPokemonOptionGroups`.
+See `AreaWildPokemonOptionGroups`.
 
 ### Grass
 
-When a character collides with a `Grass` thing, several changes happen to the character:
+When a character collides with a `Grass` actor, several changes happen to the character:
 
 -   The grass is stored as a member of the character.
 -   The character's height is reduced.
@@ -52,7 +52,7 @@ Once the character is no longer bording the grass, those changes are undone.
 
 ### Fishing
 
-Starting the fishing routine is only allowed if the player is bording and facing a `WaterEdge*` Thing.
+Starting the fishing routine is only allowed if the player is bording and facing a `WaterEdge*` Actor.
 You can trigger a fishing session by providing a Player and a rod item to `fishing.startFishing`:
 
 ```typescript

package.json

@@ -8,36 +8,35 @@
         "url": "https://github.com/FullScreenShenanigans/FullScreenPokemon/issues"
     },
     "dependencies": {
-        "areaspawnr": "^0.8.0",
-        "audioplayr": "^0.8.0",
-        "babyioc": "^0.8.0",
-        "battlemovr": "^0.8.0",
-        "changelinr": "^0.8.0",
-        "classcyclr": "^0.8.0",
-        "devicelayr": "^0.8.0",
-        "eightbittr": "^0.8.0",
-        "flagswappr": "^0.8.0",
-        "fpsanalyzr": "^0.8.0",
-        "frametickr": "^0.8.0",
-        "groupholdr": "^0.8.0",
-        "inputwritr": "^0.8.0",
-        "itemsholdr": "^0.8.0",
-        "mapscreatr": "^0.8.0",
-        "mapscreenr": "^0.8.0",
-        "menugraphr": "^0.8.0",
-        "modattachr": "^0.8.0",
-        "numbermakr": "^0.8.0",
-        "objectmakr": "^0.8.0",
-        "pixeldrawr": "^0.8.0",
-        "pixelrendr": "^0.8.0",
-        "quadskeepr": "^0.8.0",
-        "sceneplayr": "^0.8.0",
-        "stateholdr": "^0.8.0",
-        "stringfilr": "^0.8.0",
-        "thinghittr": "^0.8.0",
-        "timehandlr": "^0.8.0",
-        "touchpassr": "^0.8.0",
-        "userwrappr": "^0.8.0"
+        "actorhittr": "^0.8.1",
+        "areaspawnr": "^0.8.1",
+        "audioplayr": "^0.8.1",
+        "babyioc": "^0.8.1",
+        "battlemovr": "^0.8.1",
+        "classcyclr": "^0.8.1",
+        "devicelayr": "^0.8.1",
+        "eightbittr": "^0.8.1",
+        "flagswappr": "^0.8.1",
+        "fpsanalyzr": "^0.8.1",
+        "frametickr": "^0.8.1",
+        "groupholdr": "^0.8.1",
+        "inputwritr": "^0.8.1",
+        "itemsholdr": "^0.8.1",
+        "mapscreatr": "^0.8.1",
+        "mapscreenr": "^0.8.1",
+        "menugraphr": "^0.8.1",
+        "modattachr": "^0.8.1",
+        "numbermakr": "^0.8.1",
+        "objectmakr": "^0.8.1",
+        "pixeldrawr": "^0.8.1",
+        "pixelrendr": "^0.8.1",
+        "quadskeepr": "^0.8.1",
+        "sceneplayr": "^0.8.1",
+        "stateholdr": "^0.8.1",
+        "stringfilr": "^0.8.1",
+        "timehandlr": "^0.8.1",
+        "touchpassr": "^0.8.1",
+        "userwrappr": "^0.8.1"
     },
     "description": "HTML5 remake of the original Pokemon, expanded for modern browsers.",
     "devDependencies": {
@@ -71,7 +70,7 @@
         "react": "^16.8.6",
         "react-dom": "^16.8.6",
         "requirejs": "^2.3.6",
-        "shenanigans-manager": "^0.8.0",
+        "shenanigans-manager": "^0.8.1",
         "sinon": "^9.0.2",
         "sinon-chai": "^3.5.0",
         "typescript": "^3.9.5",
@@ -155,5 +154,5 @@
         "web": true
     },
     "types": "./src/index.d.ts",
-    "version": "0.8.0"
+    "version": "0.8.1"
 }