From 095f4fefe694fe67a1ddc3f5d05ee0f5cf4bee66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Orhun=20Parmaks=C4=B1z?= Date: Mon, 29 Aug 2022 16:06:17 +0200 Subject: [PATCH] Rename to Fish Folk: Jumpy --- .github/workflows/release.yml | 2 +- Arcadefile | 4 ++-- Cargo.lock | 2 +- Cargo.toml | 2 +- PACKAGING.md | 4 ++-- README.md | 24 ++++++++++++------------ RELEASE.md | 4 ++-- assets/tiled_maps/README.md | 2 +- core/Cargo.toml | 2 +- src/gui/credits.rs | 4 ++-- src/main.rs | 2 +- 11 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b6bcdbee31..18ec30a368 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -130,6 +130,6 @@ jobs: file: jumpy-*/jumpy-* file_glob: true overwrite: true - body: "FishFight: Jumpy ${{ env.RELEASE_VERSION }} 🐟" + body: "Fish Folk: Jumpy ${{ env.RELEASE_VERSION }} 🐟" tag: ${{ github.ref }} repo_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/Arcadefile b/Arcadefile index b8d810bba0..b51c9febf6 100644 --- a/Arcadefile +++ b/Arcadefile @@ -1,4 +1,4 @@ -id: fish-fight-jumpy +id: fish-folk-jumpy name: jumpy logoUrl: /static/images/ship/original.png coverImage: @@ -9,7 +9,7 @@ marketingAssets: title: cover description: Cover image description: | - Fish Fight: Jumpy is a tactical 2D shooter, played online or on a shared screen. + Fish Folk: Jumpy is a tactical 2D shooter, played online or on a shared screen. Aim either left or right; the rest is up to clever movement and positioning in this fish-on-fish brawler! admins: - fllr diff --git a/Cargo.lock b/Cargo.lock index 00140e4c52..7822317f82 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -165,7 +165,7 @@ dependencies = [ [[package]] name = "fishsticks" version = "0.2.3" -source = "git+https://github.com/fishfight/fishsticks#25bd7676c85064ad976c449317f30b623f5e7515" +source = "git+https://github.com/fishfolks/fishsticks#25bd7676c85064ad976c449317f30b623f5e7515" dependencies = [ "cfg-if", "gilrs", diff --git a/Cargo.toml b/Cargo.toml index fce834e1c0..e7c970b8ac 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ opt-level = 3 [dependencies] core = { path = "./core", package = "jumpy-core" } ff-particles = { version = "0.1", features = ["serde"] } -fishsticks = { git = "https://github.com/fishfight/fishsticks", default-features = false, features = ["gilrs"] } +fishsticks = { git = "https://github.com/fishfolks/fishsticks", default-features = false, features = ["gilrs"] } macroquad = { version = "=0.3.16" } # Newer versions break is_key_pressed detection macroquad-platformer = "0.1.3" hecs = "0.7.1" diff --git a/PACKAGING.md b/PACKAGING.md index 85ec731a0c..5db6a5999a 100644 --- a/PACKAGING.md +++ b/PACKAGING.md @@ -1,4 +1,4 @@ -## Packaging Fish Fight: Jumpy +## Packaging Fish Folk: Jumpy ### Dependencies @@ -45,7 +45,7 @@ Also see [README.md#distro-packages](./README.md#distro-packages) ### Binary releases -Binary releases are automated via [Continuous Deployment](./.github/workflows/release.yml) workflow and they can be downloaded from the [releases](https://github.com/fishfight/jumpy/releases) page. Release artifacts are named in the following format: +Binary releases are automated via [Continuous Deployment](./.github/workflows/release.yml) workflow and they can be downloaded from the [releases](https://github.com/fishfolks/jumpy/releases) page. Release artifacts are named in the following format: - `jumpy--.` diff --git a/README.md b/README.md index 79e829a13d..075aceaa70 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -# Fish Fight: Jumpy +# Fish Folk: Jumpy -[![Build Status](https://img.shields.io/github/workflow/status/fishfight/jumpy/Continuous%20integration?logo=github&labelColor=1e1c24&color=8bcfcf)](https://github.com/fishfight/jumpy/actions) [![Documentation](https://img.shields.io/badge/documentation-fishfight.github.io-green.svg?labelColor=1e1c24&color=f3ee7a)](https://fishfight.github.io/FishFight/) [![License](https://img.shields.io/badge/License-MIT%20or%20Apache%202-green.svg?label=license&labelColor=1e1c24&color=34925e)](./LICENSE) [![Discord](https://img.shields.io/badge/chat-on%20discord-green.svg?logo=discord&logoColor=fff&labelColor=1e1c24&color=8d5b3f)](https://discord.gg/4smxjcheE5) +[![Build Status](https://img.shields.io/github/workflow/status/fishfolks/jumpy/Continuous%20integration?logo=github&labelColor=1e1c24&color=8bcfcf)](https://github.com/fishfolks/jumpy/actions) [![Documentation](https://img.shields.io/badge/documentation-fishfolks.github.io-green.svg?labelColor=1e1c24&color=f3ee7a)](https://fishfolks.github.io/jumpy/) [![License](https://img.shields.io/badge/License-MIT%20or%20Apache%202-green.svg?label=license&labelColor=1e1c24&color=34925e)](./LICENSE) [![Discord](https://img.shields.io/badge/chat-on%20discord-green.svg?logo=discord&logoColor=fff&labelColor=1e1c24&color=8d5b3f)](https://discord.gg/4smxjcheE5) -![Fish Fight: Jumpy Preview](https://user-images.githubusercontent.com/24392180/151969075-399e9fea-e2de-4340-96a4-0a0e5b79c281.gif) +![Fish Folk: Jumpy Preview](https://user-images.githubusercontent.com/24392180/151969075-399e9fea-e2de-4340-96a4-0a0e5b79c281.gif) ## Introduction -Fish Fight: Jumpy is a tactical 2D shooter, played by up to 4 players online or on a shared screen. Aim either left or right; the rest is up to clever movement and positioning in this fish-on-fish brawler! For more information about our origin story (Duck Game et.al.) and big-picture plans, see our [design document](https://www.notion.so/erlendsh/Fish-Fight-1647ed74217e4e38a59bd28f4f5bc81a). +Fish Folk: Jumpy is a tactical 2D shooter, played by up to 4 players online or on a shared screen. Aim either left or right; the rest is up to clever movement and positioning in this fish-on-fish brawler! For more information about our origin story (Duck Game et.al.) and big-picture plans, see our [design document](https://www.notion.so/erlendsh/Fish-Fight-1647ed74217e4e38a59bd28f4f5bc81a). ### Key Features (WIP) @@ -20,22 +20,22 @@ Fish Fight: Jumpy is a tactical 2D shooter, played by up to 4 players online or ### Status The game is fully playable: \ -https://twitter.com/fishfightgame/status/1424084016467226624 +https://twitter.com/spicylobsterfam/status/1424084016467226624 ## Community ### Contributing -Anyone involved in the Fish Fight community must follow our [code of conduct](https://github.com/fishfight/jumpy/blob/main/CODE_OF_CONDUCT.md). +Anyone involved in the Fish Folk community must follow our [code of conduct](https://github.com/fishfolks/jumpy/blob/main/CODE_OF_CONDUCT.md). -If you'd like to make something for Fish Fight, check out our [help-wanted](https://github.com/fishfight/jumpy/labels/help%20wanted) issues or just ask us on [Discord](https://discord.gg/4smxjcheE5). We'll soon post an updated roadmap for the next month or two of work ahead. +If you'd like to make something for Fish Folk, check out our [help-wanted](https://github.com/fishfolks/jumpy/labels/help%20wanted) issues or just ask us on [Discord](https://discord.gg/4smxjcheE5). We'll soon post an updated roadmap for the next month or two of work ahead. Before committing and opening a PR, please run the following commands and follow their instructions: 1. `cargo clippy -- -W clippy::correctness -D warnings` 2. `cargo fmt` ### Learning Materials -- https://fishfight.github.io/FishFight/ +- https://fishfolks.github.io/jumpy/ - https://macroquad.rs/tutorials/fish-tutorial/ (outdated) - https://not-fl3.github.io/platformer-book/intro.html (wip) - https://cleancut.github.io/rusty_engine/ @@ -44,12 +44,12 @@ Before committing and opening a PR, please run the following commands and follow ## Download & play -1. Download the latest version from the [releases](https://github.com/fishfight/jumpy/releases) page. +1. Download the latest version from the [releases](https://github.com/fishfolks/jumpy/releases) page. 2. Extract the archive and run the executable. (e.g. `./jumpy` or `jumpy.exe`) ### Launcher -[A cross-platform launcher](https://github.com/fishfight/SpicyLauncher) is also available for downloading and launching the game easily. +[A cross-platform launcher](https://github.com/spicylobstergames/SpicyLauncher) is also available for downloading and launching the game easily. ### Distro Packages @@ -62,7 +62,7 @@ pacman -S jumpy ## Building 1. Install Rust with [rustup.rs](https://rustup.rs/) -2. Clone this repository: `git clone https://github.com/fishfight/jumpy.git` +2. Clone this repository: `git clone https://github.com/fishfolks/jumpy.git` 3. `cargo run` ## Default Keybindings @@ -71,5 +71,5 @@ You can view and modify the default keybindings in [config.toml](./config.toml). ## Credits -- [Fish Fight: Jumpy Credits](./CREDITS.md) +- [Fish Folk: Jumpy Credits](./CREDITS.md) - Input Icons: [Kadith's Icons](https://kadith.itch.io/kadiths-free-icons) by Kadith diff --git a/RELEASE.md b/RELEASE.md index 53006021af..bbe0ad4629 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,10 +1,10 @@ # Creating a Release -[GitHub releases](https://github.com/fishfight/jumpy/releases) are automated via [GitHub actions](./.github/workflows/release.yml) and triggered by pushing a tag. +[GitHub releases](https://github.com/fishfolks/jumpy/releases) are automated via [GitHub actions](./.github/workflows/release.yml) and triggered by pushing a tag. 1. Bump the version in [Cargo.toml](Cargo.toml) and [core/Cargo.toml](core/Cargo.toml). 2. Update [Cargo.lock](Cargo.lock) by building the project. (`cargo build`) 3. Commit and push the changes. (i.e. submit a pull request) -4. Either [draft a new release](https://github.com/fishfight/jumpy/releases/new) from the GitHub interface or create a new tag and push it via the command line. +4. Either [draft a new release](https://github.com/fishfolks/jumpy/releases/new) from the GitHub interface or create a new tag and push it via the command line. 5. While naming the release, do not include the version in the title. (e.g. "Level Editor") 6. Add release notes and highlights. diff --git a/assets/tiled_maps/README.md b/assets/tiled_maps/README.md index 2a12cb4381..b088cffca0 100644 --- a/assets/tiled_maps/README.md +++ b/assets/tiled_maps/README.md @@ -1,4 +1,4 @@ -# How to add a level to the FishFight +# How to add a level to the Fish Folk: Jumpy Tiled: https://www.mapeditor.org/, also in most distros is available as `tiled` package. 1.7+ version is required, or you will have to open your `json` map file in a text editor and change the maps `version` diff --git a/core/Cargo.toml b/core/Cargo.toml index 4867d354ca..786dc56647 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT OR Apache-2.0" edition = "2021" [dependencies] -fishsticks = { version = "0.2.1", git = "https://github.com/fishfight/fishsticks", default-features = false, features = ["gilrs"] } +fishsticks = { version = "0.2.1", git = "https://github.com/fishfolks/fishsticks", default-features = false, features = ["gilrs"] } macroquad = { version = "=0.3.16" } # Newer versions break is_key_pressed detection hecs = "0.7.1" serde = { version = "1.0", package = "serde", features = ["derive"] } diff --git a/src/gui/credits.rs b/src/gui/credits.rs index 56bb63f781..aa83579476 100644 --- a/src/gui/credits.rs +++ b/src/gui/credits.rs @@ -9,7 +9,7 @@ const SECONDARY_HEADER_Y_OFFSET: f32 = 150.0; const TEXT_Y_OFFSET: f32 = 60.0; const CREDITS_LIST: [(&str, LabelType); 32] = [ - ("Fish Fight: Jumpy", LabelType::MainHeader), + ("Fish Folk: Jumpy", LabelType::MainHeader), ("Founding Team", LabelType::SecondaryHeader), ("Erlend Sogge Heggen - General Director", LabelType::Regular), ("'Emerald Jak' - Sound Director", LabelType::Regular), @@ -120,7 +120,7 @@ fn create_game_credits() -> Vec { let credit_label = credit; match credit_label.1 { LabelType::MainHeader => { - if credit.0 == "Fish Fight: Jumpy" { + if credit.0 == "Fish Folk: Jumpy" { prev_position -= MAIN_HEADER_Y_OFFSET; } else { prev_position -= -MAIN_HEADER_Y_OFFSET; diff --git a/src/main.rs b/src/main.rs index 351212711d..b4d31248d9 100644 --- a/src/main.rs +++ b/src/main.rs @@ -62,7 +62,7 @@ const CONFIG_FILE_ENV_VAR: &str = "JUMPY_CONFIG"; const ASSETS_DIR_ENV_VAR: &str = "JUMPY_ASSETS"; const MODS_DIR_ENV_VAR: &str = "JUMPY_MODS"; -const WINDOW_TITLE: &str = "Fish Fight: Jumpy"; +const WINDOW_TITLE: &str = "Fish Folk: Jumpy"; /// Exit to main menu pub fn exit_to_main_menu() {