Commit Graph

64287 Commits

Author SHA1 Message Date
EldritchBimbo
f55f17fcd6 Sprite Request Fulfilled (Dimir Faerie, Witch) (#3080)
* Sprite Request Fulfilled

Adds:
.Adds sprite, atlas for Witch and Dimir Faerie as requested, in "Requested" folder of "Unused" sprite folder.

Changes:
.Splits "Unused" folder into "Requested" (for sprites that were requested in the spreadsheet but haven't been implemented as enemies anywhere) and "Removed" - for sprites that were either replaced, or were attached to a de-implemented creature.
.Moved previous contents of "unused" folder to "removed" folder.

* Update witch.png

* Update witch.png
2023-05-09 06:48:29 +03:00
Anthony Calosa
01790479e8 update StandardLDA 2023-05-08 23:39:59 -04:00
Anthony Calosa
27118ceb2d update StandardLDA 2023-05-09 07:35:19 +08:00
Agetian
a368466b13 Merge branch 'Card-Forge:master' into master 2023-05-08 17:11:41 +03:00
tool4ever
87d934acef Update vraska_betrayals_sting.txt 2023-05-08 15:58:32 +02:00
Agetian
71362ce82b Update support for Meld in GameState/Puzzle Mode. (#3078)
* - Simplify MeldedWith support in GameState (as a parameter for Meld).

* - Maintain support for old-style "|Meld" game states just in case.
2023-05-08 14:12:33 +02:00
Michael Kamensky
2f2204b81f - Maintain support for old-style "|Meld" game states just in case. 2023-05-08 14:45:53 +03:00
Michael Kamensky
4a6ce340ba - Simplify MeldedWith support in GameState (as a parameter for Meld). 2023-05-08 14:45:53 +03:00
Anthony Calosa
80cf74d26c Merge pull request #3075 from Agetian/master
Add several puzzles (ONE, MOM)
2023-05-08 19:23:00 +08:00
Michael Kamensky
c846b30014 - Minor cleanup for PS_ONE3. 2023-05-08 14:11:07 +03:00
Michael Kamensky
f4984495f4 - Add support for MeldedWith in Game State.
- Add proper support for PS_ONE3 (goal and all).
2023-05-08 14:08:46 +03:00
Anthony Calosa
bac9a0c4bd Merge pull request #3076 from tool4ever/fixroll
Fix rollback sometimes reverting to LKI version of card
2023-05-08 17:36:03 +08:00
TRT
6c3ba98667 Fix casting disturbed from other zones 2023-05-08 11:16:12 +02:00
TRT
936833321b Clean up 2023-05-08 11:03:32 +02:00
TRT
0303a0e6fd Better fix for Mutagen Connoisseur 2023-05-08 10:00:19 +02:00
Agetian
dfb69fa0d4 Merge branch 'Card-Forge:master' into master 2023-05-08 08:37:41 +03:00
tool4EvEr
fa7e9024fe Fix rollback sometimes reverting to LKI version of card 2023-05-07 23:49:55 +02:00
Hans Mackowiak
bb3709ebad CardFactory: Token Copy of transforming permanent 2023-05-07 22:53:24 +02:00
Michael Kamensky
215a41ed84 - Added puzzles PS_ONE3 (disabled for now), PS_ONE4, PS_ONE5, PS_MOM1, PS_MOM2. 2023-05-07 21:10:25 +03:00
Anthony Calosa
3bc8fb6f9a Merge pull request #3074 from Simisays/LOTRBIS
LTR 3 cards
2023-05-07 22:09:39 +08:00
Simisays
7eb6518aee update 2023-05-07 13:46:46 +02:00
Paul Hammerton
a8af1ffbfe Merge pull request #3073 from paulsnoops/update_sld
Edition updates: SLD
2023-05-07 11:28:01 +01:00
paulsnoops
02e8efd496 Edition updates: SLD 2023-05-07 11:23:12 +01:00
Simisays
16e5f58c35 CMM 3 face commanders (#3069) 2023-05-07 08:42:24 +00:00
Agetian
1c7828314e Merge branch 'Card-Forge:master' into master 2023-05-07 08:53:17 +03:00
tool4ever
384b2aa0cc Fix exiling sometimes handled incomplete for combined permanents (#3071)
* Fix exiling sometimes handled incomplete for combined permanents

* Fix Mutagen Connoisseur ignoring transformed battles

* LKI fix

---------

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
2023-05-07 07:17:17 +03:00
Paul Hammerton
6dcfab0712 Merge pull request #3068 from paulsnoops/edition_updates
Edition updates: CMM, LTR, SLD, WHO
2023-05-06 10:40:48 +01:00
paulsnoops
033ce44bb5 Edition updates: CMM, LTR, SLD, WHO 2023-05-06 10:35:05 +01:00
Anthony Calosa
45a86bd04e Merge pull request #3067 from tool4ever/mayplayreset
MayPlayLimit is not copiable
2023-05-06 17:15:07 +08:00
tool4EvEr
bb2244abba MayPlayLimit is not copiable 2023-05-06 10:17:39 +02:00
Anthony Calosa
e3d9db279f Merge pull request #3066 from kevlahnota/newmaster2
fix typo
2023-05-06 07:59:01 +08:00
Anthony Calosa
5abdb6b2ef fix typo 2023-05-06 07:58:17 +08:00
Anthony Calosa
b3450129d3 Merge pull request #3065 from kevlahnota/newmaster2
update SettingsScene
2023-05-06 07:33:35 +08:00
Anthony Calosa
fd9c7c57e9 Merge pull request #3055 from EldritchBimbo/Gwyn-Dev
Kor Replacement Update
2023-05-06 07:21:50 +08:00
Anthony Calosa
c6040086d3 update SettingsScene
-update Music Slider, BorderMask Options
-fix not applying changes
2023-05-06 07:20:19 +08:00
Alwayssnarky
f441ca4d4b PC Portrait Tweak
Adjusted player portraits to a more shading-heavy, less flat artstyle.

Reworked some to have different hair, skin and/or eye colour.
2023-05-03 14:03:18 -04:00
tool4ever
06df4451d2 Fix Multiple Choice (#3057)
Co-authored-by: TRT <>
2023-05-03 20:18:37 +03:00
tool4ever
c54fd5323a Update wall_of_mourning.txt 2023-05-03 14:56:32 +02:00
Paul Hammerton
678d3aba5c Merge pull request #3059 from paulsnoops/mat_oops
MAT oops
2023-05-03 08:46:23 +01:00
paulsnoops
cd69dac032 MAT oops 2023-05-03 08:42:22 +01:00
Paul Hammerton
780810e6e8 Merge pull request #3058 from paulsnoops/update_mat
Update edition: MAT
2023-05-03 08:34:30 +01:00
paulsnoops
296bf5b213 Update edition: MAT 2023-05-03 08:29:05 +01:00
Simisays
4b6e0c206a MAT 7 cards (#3022) 2023-05-03 09:09:33 +02:00
Northmoc
c82982f82a trim redundant 2023-05-02 17:55:35 -04:00
Alwayssnarky
408a0181d1 Kor Replacement Update
Changes:
.Replaced Kor Warrior sprite with more canon-compliant one.
.Replaced Kor player models and portraits with more canon-compliant new ones.
.Archived old sprites, portraits.

Additional Comments:
.This was originally discussed in the spirit of replacing the existing sprites, so that's what I wrote it as. That said, (specifically in the case of the player sprite), we have a couple other options if we want to keep the old sprites. (This would also prevent existing saves from having their appearance changed.)
1. Just replace the sprites.
2. Keep the current sprites as the Kor, and rename the new ones to "Zendikari Kor" or similar.
3. (My personal preference.) The old sprites don't much look like Kor, but honestly they'd make decent Orcs. Rename the existing sprites accordingly, and implement the new ones as a new option.
2023-05-02 16:58:47 -04:00
Paul Hammerton
6c0872bb75 Merge pull request #3053 from paulsnoops/mat_legal
Formats update: Add MAT
2023-05-02 20:04:42 +01:00
paulsnoops
8c128147a4 Formats update: Add MAT 2023-05-02 19:58:35 +01:00
Northmoc
7f7e8f0ea0 Merge pull request #3052 from tool4ever/cardfix05
Fix outdated TargetMin
2023-05-02 13:59:01 -04:00
tool4EvEr
db3fc76c9a Clean up worst TgtPrompts 2023-05-02 19:54:49 +02:00
Northmoc
c3f0e0ce10 MAT: remaining card scripts (#3041)
* MAT: remaining card scripts

* Update quirion_beastcaller.txt

---------

Co-authored-by: tool4ever <therealtoolkit@hotmail.com>
2023-05-02 19:45:44 +03:00