Skip to content

Commit d9f6ec0

Browse files
MostCromulentclaude
andcommitted
Merge branch 'master' into auto-apply-ability-order
Resolve conflicts: - YieldUpdate.java: keep both SetYieldPref (V2) and ClearAbilityOrders permits - PlayerControllerHuman.applyYieldUpdate: switch to yieldController.apply() delegation; keep ClearAbilityOrders branch early-returning since orderedSALookup lives on PCH, not YieldController - GameMenu / VGameMenu: combine V2's Yield Settings + Auto-Pass items with our Clear-Ability-Orders item (Auto-mode only) - ForgePreferences: keep our UI_REORDER_SIMULTANEOUS_ABILITY_MODE alongside V2's YIELD_* prefs + UI_AUTO_DECISION_MODE rename Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2 parents d803854 + 3376898 commit d9f6ec0

340 files changed

Lines changed: 8913 additions & 3202 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CONTRIBUTING.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,12 @@ Card scripting resources are found in the forge-gui/res/ path.
6262

6363
Art files need to be copyright-free and they should be in the public domain.
6464

65+
## Using AI coding agents
66+
67+
If you use an AI agent (e.g. Claude Code, OpenAI Codex) to substantially code a contribution to Forge please identify this when you make a pull request, either by including the coding agent as a co-author or by noting in the body of the request.
68+
69+
Agents have a tendency to add unnecessary new unit or wiring tests to the CI suite. This should be avoided unless necessary to catch potential future integration regressions.
70+
6571
### Project Hierarchy
6672

6773
Forge is divided into 4 primary projects with additional projects that target specific platform releases. The primary projects are:

docs/Credit-and-Thanks.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,7 @@ Some of the sprites and tiles that are used in Adventure mode come from external
2929
1. Forest biome = Enchanted Forest - Logan Epic Canto // The Celtic King
3030
1. Plains biome = Cobblestone Village - Brandon Fiechter // Camelot - Brandon Fiechter
3131
1. Mountain biome = Goblin Tinker - Brandon Fiechter // Goblin King's Tavern - Brandon Fiechter
32-
1. Castle = Horus - Brandon Fiechter & Derek Fiechter
32+
1. Castle = Horus - Brandon Fiechter & Derek Fiechter
33+
34+
## Other sprites and icons
35+
1. Clipboard icon by Dimitry Miroliubov at [Flaticon](https://www.flaticon.com/free-icon/clipboard_340068)

docs/Frequently-Asked-Questions.md

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ https://discord.com/channels/267367946135928833/1047001034788196452
99
# General
1010

1111
## How do I download content?
12-
1312
Forge has content downloaders within the app itself, you can use those tools to update the graphics assets. More information about card and token image assets can be found here. [Card Images, Downloading](Card-Images.md#downloading)
1413

1514
## My desktop match/deck view is all messed up?
@@ -20,7 +19,6 @@ Sometimes people will decide that they do not like the changes that they made an
2019
Also use the mentioned measure if your match or deckeditor won't start - it would help in 90% of the cases.
2120

2221
## I think I found a bug in Forge. What do I do?
23-
2422
*Most users, who are running beta versions of Forge, should continue to use these instructions. As for alpha testers, these instructions have yet to be made congruent with the latest automatic bug reporting from within Forge.*
2523

2624
Bug reports from users are the lifeblood of Forge. Please keep in mind that "beta" releases *are* test releases. Forge is constantly evolving, so we do not yet have "stable" or "production" releases. Because of the pace at which new cards are added to the multiverse by external forces, this will be the norm for some time. We do not expect everything to work 100%. We have a small number of developers and a handful of slightly less technical people actively improving the game. We simply cannot devote the resources to test every single card, much less the nearly infinite ways the cards can interact.
@@ -38,13 +36,11 @@ Because duplicate bug reports use up our limited resources, please research your
3836
* If you're unsure, you can also post on one of the support channels of the discord. In case you do not get a timely response, please submit a new issue anyway to make sure it doesn't get lost.
3937

4038
## I have an idea to make Forge better. What do I do?
41-
4239
Follow the directions in [Bug Reports](Frequently-Asked-Questions#i-think-i-found-a-bug-in-forge-what-do-i-do), keeping in mind that you are not reporting a bug, but rather a **Feature Request**.
4340

4441
# Development
4542

4643
## I want to help develop Forge. How do I get started?
47-
4844
Forge is written in Java, so knowledge in that language (or similar Object Oriented languages like C++ or C\#) is very helpful. However, it is possible to learn the grammar for writing the data objects of cards without programming experience.
4945

5046
A development environment such as [IntelliJ](https://www.jetbrains.com/idea) is beneficial, as it helps writing, compiling and testing your changes.
@@ -64,25 +60,20 @@ For smaller first-time contributions using the GitHub web interface is also an a
6460
To obtain the source code of Forge, read our [Development Guide](Development/IntelliJ-setup/IntelliJ-setup.md).
6561

6662
## My system is all setup to help. What now?
67-
6863
Take a look through the /res/cardsfolder folder. This is where all the card data lives. If you know of cards that are missing from Forge, see if there are similar cards that already exist.
6964

7065
# Gameplay
7166

7267
## Where do I use Flashback or a similar ability that is in an External area?
73-
7468
Click on the Lightning Bolt icon in the player panel. Since cards with external Activations aren't as clear to activate, we created this shortcut for this specific purpose. After the last card is removed from a zone window, that window will automatically be hidden.
7569

7670
## How do I target a player?
77-
7871
Just click on the player's Avatar in the Player Panel when prompted to select a Player as a target.
7972

8073
## Where did my mana go?
81-
8274
If you have an effect that generated you some mana, and you don't know where it is. Check out the Player Panel. There are 6 different mana subpools one for each color/colorless that should have it. If you accidentally tapped your mana before your Main Phase, your mana is gone. Sorry, we don't have a way at this time to revert these actions. In general, I'd say it's easier/better to start casting a spell first, then activate your mana so this doesn't happen.
8375

8476
# Quest Mode
8577

8678
## What is the difference between Fantasy Quest and Normal Quest?
87-
88-
In Normal Quest, you start with 20 life and only have access to the Card Shop. In Fantasy Quest, you start at 15 life and gain additional access to the Bazaar which allows you to buy things like extra life points, Pets, Plants and more.
79+
In Normal Quest, you start with 20 life and only have access to the Card Shop. In Fantasy, you start at 15 life and gain additional access to the Bazaar which allows you to buy things like extra life points, Pets, Plants and more.

0 commit comments

Comments
 (0)