Update for better calc and new Tailsman

README.md

@@ -7,7 +7,7 @@
 <div align="center">
 
 [![Status](https://img.shields.io/badge/status-active-success.svg)]()
-[![GitHub Issues](https://img.shields.io/github/issues/itayfeder/Fusion-Jokers.svg)](https://github.com/itayfeder/Fusion-Jokers/issues)
+[![GitHub Issues](https://img.shields.io/github/issues/wingedcatgirl/Fusion-Jokers.svg)](https://github.com/wingedcatgirl/Fusion-Jokers/issues)
 [![License](https://img.shields.io/badge/license-GNU-blue.svg)](/LICENSE)
 
 </div>
@@ -22,6 +22,7 @@
 
 - [About](#about)
 - [How to Download](#how_to_download)
+- [Config](#config)
 - [Fusion API (For Developers)](#fusion_api)
 - [Credits](#credits)
 
@@ -33,22 +34,72 @@ When you have a fusable joker, pressing on it will show a **"fuse" button**. Whe
 
 <img width=500px src="art/jokers_tab.png?raw=true" alt="Showcase of jokers tab 5"></a>
 
-The are a total of 15 fusions added in the mod, with more coming in the future!
+There are a total of 17 fusions added in the mod, two of which are exclusive to [Six Suits](https://github.com/Aurelius7309/SixSuits)!
 
 You can find a list of their abilities, as well as the jokers needed to make them, in this link: https://itayfeder.github.io/Fusion-Jokers/
 
 ## ⬇ How to Download <a name = "how_to_download"></a>
 
 - The mod requires Steamodded. You can see info about how to use it [here](https://github.com/Steamopollys/Steamodded)
-- Download the latest release of Fusion Jokers
+- Download the latest release of Fusion Jokers from the [releases tab](https://github.com/wingedcatgirl/Fusion-Jokers/releases) (should be stable), or the latest commit from the green "Code" button up there (might include bugfixes for some dumb thing I overlooked earlier)
 - Extract the downloaded mod to the Mods folder (at %appdata%/Balatro/Mods)
 
+## ⚙️ Config <a name = "config"></a>
+
+- **Block used components from reappearing**: Jokers used in a fusion cannot reappear if the fusion is present. Default true.
+  - These Jokers can reappear regardless if Showman or a Showman-like effect is active, if the fused Joker's `in_pool()` has `{allow_returning_components = true}` in its second return value, or if the component Joker's `in_pool()` has `{allow_duplicates = true}` in its second return value.
+- **Alt art for Club Wizard**: A lighter color to better match high-contrast Clubs.
+- **No price flickering**: Stop the fusion cost from flickering when multiple fusions are possible.
+
 ## ➕ Fusion API (For Developers) <a name = "fusion_api"></a>
 
 The mod adds a way for other developers to create their own fusions!
 
-Developers can call the function `FusionJokers.fusions:add_fusion()` to register their own fusion to the game. The function also allows them to determine carried stats between the component jokers and the fusion joker.
+Developers can call the function `FusionJokers.fusions:register_fusion()` to register their own fusion to the game. The function also allows them to determine carried stats between the component jokers and the fusion joker.
+
+```lua
+FusionJokers.fusions:register_fusion{
+  jokers = {
+      --First component Joker; all values except "name" optional
+			{ name = "j_modprefix_key", carry_stat = "stat_to_carry", merge_stat = "stat_to_merge" },
+      --       String, key of component 1      String, name of stat          String, name of stat
+      --                                               to carry over                 to merge                                  
+			{ name = "j_modprefix_key", carry_stat = "stat_to_carry", merge_stat = "stat_to_merge" },
+      --Second component Joker; same values.
+      --This works for arbitrary numbers of additional Jokers
+      --if you want to do the Exodia thing.
+  },
+  result_joker = "j_modprefix_key", --String, key of result Joker
+  cost = number,                    --Number, cost in $ to fuse this recipe
+  requirement = func,               --Optional function; fusion can only be carried out if this function returns `true`.
+  merged_stat = "stat",             --Optional string, name of stat that contains "merge_stat"s above
+  aftermath = func,                 --Optional function; will be run after the fusion is complete.
+}
+```
+
+> [!NOTE]
+> Carried and merged stats _always_ go in the new Joker's `ability.extra` table now! You also no longer need to specify whether the component Jokers' abilities are in an `extra` table or not; this is now detected automatically.
+
+> [!NOTE]
+> The old `add_fusion` method is depreciated and kept only for compatibility; please switch to `register_fusion` at your earliest convenience! You should be able to use [this regex](https://regex101.com/r/msZHKS/2/substitution) to quickly swap everything in your codespace.
+
+When fusing, calculation is called with the following context:
+```lua
+context = {
+  fusing_jokers = true, --Boolean to flag this context
+  fusion_components = {
+    [1] = Card, --first Joker to be fused away
+    [2] = Card, --next Joker to be fused away
+    --and so forth
+  },
+  fusion_result = Card --resulting Joker
+}
+```
+
+Fusions can be discounted by indexing a number to the final joker's key in `G.GAME.fujo_fusion_discount` for a flat discount in dollars, or `G.GAME.fujo_fusion_discountpercent` for a percentage discount. Alternately, index at the `universal` key for a discount that applies to all fusions. (Decimals always round down; minimum $1 after all discounts.)
 
 ## 🎉 Credits <a name = "credits"></a>
 
-- The mod was written by [**Itayfeder**](https://github.com/stars/itayfeder/lists/balatro-modding), with art created by [**Lyman**](https://github.com/spikeof2010)
+- The original mod was written by [**Itayfeder**](https://github.com/stars/itayfeder/lists/balatro-modding), with art created by [**Lyman**](https://github.com/spikeof2010)
+- [**elbe**](https://github.com/lshtech) maintained the mod for several months through breaking Steamodded changes, and added some features
+- [**wingedcatgirl**](https://github.com/wingedcatgirl) (hi!) is the current mod maintainer

mod/FusionJokers.json

@@ -0,0 +1,19 @@
+{
+	"id": "FusionJokers",
+	"name": "Fusion Jokers",
+	"display_name": "Fusion Jokers",
+	"author": ["itayfeder", "Lyman"],
+	"description": "Adds the ability to fuse jokers into special new jokers!",
+	"prefix": "fuse",
+	"main_file": "FusionJokers.lua",
+	"priority": -10000,
+	"badge_colour": "B26CBB",
+	"badge_text_colour": "FFFFFF",
+	"version": "1.2.2~BETA-20260715",
+	"dependencies": [
+        "Steamodded (>=1.0.0~BETA-0827a)",
+    ],
+    "conflicts": [
+        "Talisman (<=2.0)",
+    ],
+}