Merge branch 'master' into feature/action-for-audit-yml

.deepsource.toml

@@ -1,21 +1,13 @@
 version = 1
-# configured at https://deepsource.io/gh/NinjaWars
-# and in github secrets
 
-exclude_patterns = [
-    "*.log",
-    "**/deploy/vendor/**",
-    "**/deploy/**/jquery*.js*",
-    "**/deploy/www/js/**/jquery*.js*",
-]
+[[analyzers]]
+name = "secrets"
+enabled = true
 
 [[analyzers]]
 name = "javascript"
 enabled = true
 
-  [analyzers.meta]
-  plugins = ["react"]
-
 [[analyzers]]
 name = "sql"
 enabled = true
@@ -28,32 +20,6 @@ enabled = true
 name = "php"
 enabled = true
 
-[[analyzers]]
-name = "java"
-enabled = true
-
-  [analyzers.meta]
-  runtime_version = "8"
-
-[[analyzers]]
-name = "secrets"
-enabled = true
-
-[[analyzers]]
-name = "test-coverage"
-enabled = true
-
-[[transformers]]
-name = "prettier"
-enabled = true
-
-[[transformers]]
-name = "yapf"
-enabled = true
-
 [[transformers]]
 name = "php-cs-fixer"
-enabled = true
-
-[analyzers.meta]
-runtime_version = "3.x.x"
+enabled = true

Pipfile

@@ -10,9 +10,9 @@ atomicwrites = "==1.4.0"
 attrs = "==19.1.0"
 certifi = "==2022.6.15"
 chardet = "==4.0.0"
-idna = "==2.8"
+idna = "==2.10"
 lxml = "==4.9.0"
-more-itertools = "==7.0.0"
+more-itertools = "==7.2.0"
 pluggy = "==0.13.1"
 py = "==1.8.0"
 pytest = "==6.2.5"

composer.json

@@ -29,7 +29,7 @@
         "oomphinc/composer-installers-extender": "^2.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "9.5.20",
+        "phpunit/phpunit": "9.5.21",
         "spatie/phpunit-watcher": "1.23.6"
     },
     "extra": {

deploy/npc-list.php

@@ -130,7 +130,7 @@
         ],
     ],
     'thief2'          => [
-        'name'      => 'Theif',
+        'name'      => 'Thief',
         'strength'  => 17,
         'stamina'   => 10,
         'speed'     => 10,

deploy/templates/about.tpl

@@ -102,7 +102,7 @@
   <a name="gameplay" class="question">How does the game play ?</a>
 
   <p class="answer">
-    To play the game, you create an account and then log in. Once logged in you will be able to do a number of things by clicking links: attack other ninja (from the "ninjas" list, you click on their name and then click "attack"), attack npcs (click "combat" and then click "Theif" to attack a theif, for example), gamble your money away at the casino, or come back from the dead at the monk's shrine.
+    To play the game, you create an account and then log in. Once logged in you will be able to do a number of things by clicking links: attack other ninja (from the "ninjas" list, you click on their name and then click "attack"), attack npcs (click "combat" and then click "Thief" to attack a thief, for example), gamble your money away at the casino, or come back from the dead at the monk's shrine.
   </p>
 
   <a href="/about">Return to Contents</a>

deploy/tests/unit/NpcUnitTest.php

@@ -111,7 +111,7 @@ public function testVariousVillagersHaveSameRace() {
         if (!(defined('DEBUG') && DEBUG)) {
             $this->markTestSkipped();
         } else {
-            $humans = array('peasant2', /*'theif2', */'guard2', 'merchant2');
+            $humans = array('peasant2', /*'thief2', */ 'guard2', 'merchant2');
             foreach($humans as $human){
                 $this->assertEquals('human', (new Npc($human))->race());
             }
@@ -198,7 +198,7 @@ function testThief2DoesStuff() {
          * it should have zero reward gold
          * it should sometimes be able to steal the equivalent of it's reward gold
          * it should always give a shuriken as long as it was "killed"
-         * also adds to the theif counter based on being in a gang, and thus has a chance
+         * also adds to the thief counter based on being in a gang, and thus has a chance
          * for the gang to enact retribution (though this won't be tested in unit behavior)
          */
         $thief2 = new Npc('thief2');

package.json

@@ -47,21 +47,21 @@
   "homepage": "https://github.com/BitLucid/ninjawars#readme",
   "devDependencies": {
     "@types/eslint": "^8.4.3",
-    "eslint": "^8.17.0",
+    "eslint": "^8.18.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-jsx-a11y": "^6.5.1",
-    "eslint-plugin-react": "^7.30.0",
+    "eslint-plugin-react": "^7.30.1",
     "eslint-plugin-react-hooks": "4.6.0",
-    "husky": "^7.0.4",
+    "husky": "^8.0.1",
     "jasmine-core": "^4.2.0",
     "karma": "^6.4.0",
     "karma-chrome-launcher": "^3.1.1",
-    "karma-jasmine": "^5.0.1",
+    "karma-jasmine": "^5.1.0",
     "karma-requirejs": "^1.1.0",
     "karma-sinon": "^1.0.5",
-    "prettier": "2.7.0",
-    "puppeteer": "^14.4.0",
+    "prettier": "2.7.1",
+    "puppeteer": "^15.0.0",
     "requirejs": "^2.3.6",
     "sinon": "^14.0.0"
   },