✨ Add 45+ pets to choose

Change log: -add 40+ pets -bump version
SeakMengs · Nov 18, 2023 · d80044a · d80044a
1 parent 2e74163
commit d80044a
Show file tree

Hide file tree

Showing 109 changed files with 2,805 additions and 548 deletions.
diff --git a/README.md b/README.md
@@ -52,7 +52,7 @@
 
 ## ✨ Features
 ![image](https://github.com/SeakMengs/WindowPet/assets/54373229/42ecd3ea-5999-462e-8630-7904a1a3075f)
-- Add pets
+- Add pets (45+ pets and characters available to choose from)
 - Add your own custom pet
 - Remove pets
 - Pixel perfect drag pets on your screen

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "WindowPet",
   "private": true,
-  "version": "0.0.4",
+  "version": "0.0.5",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -12,22 +12,22 @@
     "tauri": "tauri"
   },
   "dependencies": {
-    "@mantine/core": "^7.2.1",
-    "@mantine/modals": "^7.2.1",
-    "@mantine/notifications": "^7.2.1",
-    "@tabler/icons-react": "^2.40.0",
+    "@mantine/core": "^7.2.2",
+    "@mantine/modals": "^7.2.2",
+    "@mantine/notifications": "^7.2.2",
+    "@tabler/icons-react": "^2.41.0",
     "@tauri-apps/api": "^1.5.1",
     "clsx": "^2.0.0",
-    "i18next": "^23.6.0",
+    "i18next": "^23.7.6",
     "jsdom": "^22.1.0",
-    "phaser": "^3.60.0",
+    "phaser": "^3.70.0",
     "postcss": "^8.4.31",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-i18next": "^13.3.1",
-    "react-intersection-observer": "^9.5.2",
+    "react-i18next": "^13.5.0",
+    "react-intersection-observer": "^9.5.3",
     "react-query": "^3.39.3",
-    "react-router-dom": "^6.18.0",
+    "react-router-dom": "^6.19.0",
     "tauri-plugin-autostart-api": "github:tauri-apps/tauri-plugin-autostart#v1",
     "tauri-plugin-log-api": "github:tauri-apps/tauri-plugin-log#v1",
     "tauri-plugin-store-api": "github:tauri-apps/tauri-plugin-store#v1",
@@ -36,15 +36,15 @@
   },
   "devDependencies": {
     "@tauri-apps/cli": "1.5.6",
-    "@testing-library/react": "^14.0.0",
-    "@types/node": "^20.8.10",
-    "@types/react": "^18.2.36",
-    "@types/react-dom": "^18.2.14",
-    "@vitejs/plugin-react": "^4.1.1",
-    "postcss-preset-mantine": "^1.9.1",
+    "@testing-library/react": "^14.1.2",
+    "@types/node": "^20.9.1",
+    "@types/react": "^18.2.37",
+    "@types/react-dom": "^18.2.15",
+    "@vitejs/plugin-react": "^4.2.0",
+    "postcss-preset-mantine": "^1.11.0",
     "ts-node": "^10.9.1",
     "typescript": "^5.2.2",
-    "vite": "^4.5.0",
+    "vite": "^5.0.0",
     "vitest": "^0.34.6",
     "vitest-canvas-mock": "^0.3.3"
   }

diff --git a/public/media/68.png b/public/media/68.png
diff --git a/public/media/Albedo.png b/public/media/Albedo.png
diff --git a/public/media/Blooky Shimeji.png b/public/media/Blooky Shimeji.png
diff --git a/public/media/Childe.png b/public/media/Childe.png
diff --git a/public/media/Chongyun.png b/public/media/Chongyun.png
diff --git a/public/media/Dearla.png b/public/media/Dearla.png
diff --git a/public/media/Electro Childe.png b/public/media/Electro Childe.png
diff --git a/public/media/Gengar Shimeji.png b/public/media/Gengar Shimeji.png
diff --git a/public/media/Growlithe.png b/public/media/Growlithe.png
diff --git a/public/media/Hu Tao.png b/public/media/Hu Tao.png
diff --git a/public/media/Jotaro.png b/public/media/Jotaro.png
diff --git a/public/media/Kamado Nezuko.png b/public/media/Kamado Nezuko.png
diff --git a/public/media/Kazuha-xll.png b/public/media/Kazuha-xll.png
diff --git a/public/media/Kazuha.png b/public/media/Kazuha.png
diff --git a/public/media/Kizuna AI-ver1.png b/public/media/Kizuna AI-ver1.png
diff --git a/public/media/Klee.png b/public/media/Klee.png
diff --git a/public/media/Lumine-xll.png b/public/media/Lumine-xll.png
diff --git a/public/media/Marisa.png b/public/media/Marisa.png
diff --git a/public/media/Nahida.png b/public/media/Nahida.png
diff --git a/public/media/Punishing Bird.png b/public/media/Punishing Bird.png
diff --git a/public/media/Puro the Latex Wolf Shimeji.png b/public/media/Puro the Latex Wolf Shimeji.png
diff --git a/public/media/Pusheen.png b/public/media/Pusheen.png
diff --git a/public/media/Rosaria-xll.png b/public/media/Rosaria-xll.png
diff --git a/public/media/Spongebob.png b/public/media/Spongebob.png
diff --git a/public/media/Starphin Shimeji.png b/public/media/Starphin Shimeji.png
diff --git a/public/media/The Chosen One.png b/public/media/The Chosen One.png
diff --git a/public/media/The King.png b/public/media/The King.png
diff --git a/public/media/Thoma.png b/public/media/Thoma.png
diff --git a/public/media/Venti-ys.png b/public/media/Venti-ys.png
diff --git a/public/media/XiaoCat.png b/public/media/XiaoCat.png
diff --git a/public/media/Xingqiu-xll.png b/public/media/Xingqiu-xll.png
diff --git a/public/media/Yoimiya-ys.png b/public/media/Yoimiya-ys.png
diff --git a/public/media/Yuan Ji.png b/public/media/Yuan Ji.png
diff --git a/public/media/Zhongli-1.png b/public/media/Zhongli-1.png
diff --git a/public/media/Zhongli-ys.png b/public/media/Zhongli-ys.png
diff --git a/public/media/Zuo Ci.png b/public/media/Zuo Ci.png
diff --git a/public/media/kuro.png b/public/media/kuro.png
diff --git a/public/media/readme.md b/public/media/readme.md
@@ -0,0 +1,3 @@
+# All of these images are from the public domain.
+
+I do not own any of these images. They are all from the public domain. If you are the owner of any of these images and would like them removed, please contact me or open a pull request to remove the image and I will remove them immediately.
diff --git a/public/media/sanji.png b/public/media/sanji.png
diff --git a/public/media/shimeji_Caneko.png b/public/media/shimeji_Caneko.png
diff --git a/public/media/shimeji_Germouser.png b/public/media/shimeji_Germouser.png
diff --git a/public/media/shimeji_Turkat.png b/public/media/shimeji_Turkat.png
diff --git a/public/media/shimeji_nekojapan.png b/public/media/shimeji_nekojapan.png
diff --git a/public/media/shimeji_skoreacat.png b/public/media/shimeji_skoreacat.png
diff --git a/public/media/slugcat.png b/public/media/slugcat.png
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "window_pet"
-version = "0.0.4"
+version = "0.0.5"
 description = "Window Pet"
 authors = ["SeakMengs"]
 license = "MIT"

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "WindowPet",
-    "version": "0.0.4"
+    "version": "0.0.5"
   },
   "tauri": {
     "allowlist": {

diff --git a/src/PhaserWrapper.tsx b/src/PhaserWrapper.tsx
@@ -3,7 +3,7 @@ import Phaser from "phaser";
 import Pets from "./scenes/Pets";
 import { useSettingStore } from "./hooks/useSettingStore";
 import { appWindow } from "@tauri-apps/api/window";
-import defaultPetConfig from "./config/pet_config.json";
+import defaultPetConfig from "./config/pet_config";
 
 
 function PhaserWrapper() {

diff --git a/src/__tests__/components/component.test.tsx b/src/__tests__/components/component.test.tsx
@@ -3,7 +3,7 @@ import { cleanup, render, screen } from "@testing-library/react";
 import PetCard from "../../ui/components/PetCard";
 import { ISpriteConfig } from "../../types/ISpriteConfig";
 import { PetCardType } from "../../types/components/type";
-import defaultPet from "../../config/pet_config.json";
+import defaultPet from "../../config/pet_config";
 import { afterEach } from "node:test";
 import SettingWindow from "../../SettingWindow";
 

diff --git a/src/config/68.json b/src/config/68.json
@@ -0,0 +1,43 @@
+{
+    "name": "68",
+    "imageSrc": "media/68.png",
+    "frameSize": 128,
+    "states": {
+        "stand": {
+            "spriteLine": 1,
+            "frameMax": 1
+        },
+        "walk": {
+            "spriteLine": 2,
+            "frameMax": 3
+        },
+        "sit": {
+            "spriteLine": 3,
+            "frameMax": 1
+        },
+        "greet": {
+            "spriteLine": 4,
+            "frameMax": 1
+        },
+        "crawl": {
+            "spriteLine": 8,
+            "frameMax": 8
+        },
+        "climb": {
+            "spriteLine": 9,
+            "frameMax": 8
+        },
+        "jump": {
+            "spriteLine": 5,
+            "frameMax": 1
+        },
+        "fall": {
+            "spriteLine": 6,
+            "frameMax": 4
+        },
+        "drag": {
+            "spriteLine": 7,
+            "frameMax": 1
+        }
+    }
+}
diff --git a/src/config/Blooky Shimeji.json b/src/config/Blooky Shimeji.json
@@ -0,0 +1,46 @@
+{
+    "name": "Blooky Shimeji",
+    "imageSrc": "media/Blooky Shimeji.png",
+    "frameSize": 128,
+    "credit": {
+        "link": "https://undertaleshimejis.tumblr.com/post/140301252826/thank-you-for-6000-followers-here-i-present?is_related_post=1"
+    },
+    "states": {
+        "stand": {
+            "spriteLine": 1,
+            "frameMax": 1
+        },
+        "walk": {
+            "spriteLine": 2,
+            "frameMax": 4
+        },
+        "sit": {
+            "spriteLine": 3,
+            "frameMax": 8
+        },
+        "greet": {
+            "spriteLine": 4,
+            "frameMax": 4
+        },
+        "crawl": {
+            "spriteLine": 8,
+            "frameMax": 8
+        },
+        "climb": {
+            "spriteLine": 9,
+            "frameMax": 8
+        },
+        "jump": {
+            "spriteLine": 5,
+            "frameMax": 1
+        },
+        "fall": {
+            "spriteLine": 6,
+            "frameMax": 3
+        },
+        "drag": {
+            "spriteLine": 7,
+            "frameMax": 1
+        }
+    }
+}
diff --git a/src/config/Childe.json b/src/config/Childe.json
@@ -0,0 +1,43 @@
+{
+    "name": "Childe",
+    "imageSrc": "media/Childe.png",
+    "frameSize": 128,
+    "states": {
+        "stand": {
+            "spriteLine": 1,
+            "frameMax": 1
+        },
+        "walk": {
+            "spriteLine": 2,
+            "frameMax": 4
+        },
+        "sit": {
+            "spriteLine": 3,
+            "frameMax": 1
+        },
+        "greet": {
+            "spriteLine": 4,
+            "frameMax": 4
+        },
+        "crawl": {
+            "spriteLine": 8,
+            "frameMax": 8
+        },
+        "climb": {
+            "spriteLine": 9,
+            "frameMax": 8
+        },
+        "jump": {
+            "spriteLine": 5,
+            "frameMax": 1
+        },
+        "fall": {
+            "spriteLine": 6,
+            "frameMax": 3
+        },
+        "drag": {
+            "spriteLine": 7,
+            "frameMax": 1
+        }
+    }
+}
diff --git a/src/config/Chongyun.json b/src/config/Chongyun.json
@@ -0,0 +1,46 @@
+{
+    "name": "Chongyun",
+    "imageSrc": "media/Chongyun.png",
+    "frameSize": 128,
+    "credit": {
+      "socialMedia": "@uuteki_art on twitter"
+    },
+    "states": {
+        "stand": {
+            "spriteLine": 1,
+            "frameMax": 1
+        },
+        "walk": {
+            "spriteLine": 2,
+            "frameMax": 4
+        },
+        "sit": {
+            "spriteLine": 3,
+            "frameMax": 1
+        },
+        "greet": {
+            "spriteLine": 4,
+            "frameMax": 4
+        },
+        "crawl": {
+            "spriteLine": 8,
+            "frameMax": 8
+        },
+        "climb": {
+            "spriteLine": 9,
+            "frameMax": 8
+        },
+        "jump": {
+            "spriteLine": 5,
+            "frameMax": 1
+        },
+        "fall": {
+            "spriteLine": 6,
+            "frameMax": 3
+        },
+        "drag": {
+            "spriteLine": 7,
+            "frameMax": 1
+        }
+    }
+}
diff --git a/src/config/Electro Childe.json b/src/config/Electro Childe.json
@@ -0,0 +1,46 @@
+{
+    "name": "Electro Childe",
+    "imageSrc": "media/Electro Childe.png",
+    "frameSize": 128,
+    "credit": {
+        "resource": "https://drive.google.com/drive/folders/1sWs0nQlMJxkIh01qqvCbQF0AF1esdaZQ"
+    },
+    "states": {
+        "stand": {
+            "spriteLine": 1,
+            "frameMax": 1
+        },
+        "walk": {
+            "spriteLine": 2,
+            "frameMax": 4
+        },
+        "sit": {
+            "spriteLine": 3,
+            "frameMax": 1
+        },
+        "greet": {
+            "spriteLine": 4,
+            "frameMax": 4
+        },
+        "crawl": {
+            "spriteLine": 8,
+            "frameMax": 8
+        },
+        "climb": {
+            "spriteLine": 9,
+            "frameMax": 8
+        },
+        "jump": {
+            "spriteLine": 5,
+            "frameMax": 1
+        },
+        "fall": {
+            "spriteLine": 6,
+            "frameMax": 3
+        },
+        "drag": {
+            "spriteLine": 7,
+            "frameMax": 1
+        }
+    }
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# All of these images are from the public domain.

		I do not own any of these images. They are all from the public domain. If you are the owner of any of these images and would like them removed, please contact me or open a pull request to remove the image and I will remove them immediately.