Commit Graph

63578 Commits

Author SHA1 Message Date
Hans Mackowiak
f166394db0 GameEntityCounterTable: respect MaxFromEffect for Clockwork 2023-03-21 07:39:19 +01:00
Anthony Calosa
a0e3949aab update pause timing 2023-03-21 13:17:06 +08:00
Anthony Calosa
1190f40b55 update playlist selection 2023-03-21 07:20:21 +08:00
Anthony Calosa
bdaed72d2d Merge branch 'master' into newmaster2 2023-03-21 07:09:10 +08:00
Anthony Calosa
e0493f1556 Merge pull request #2715 from Simisays/adventurebis
Xira's Hive collision improvements + removal horse overworld
2023-03-21 07:04:53 +08:00
Anthony Calosa
1ecede7726 Merge pull request #2716 from tool4ever/charmFix
Fix NPE when trying to build Charm description
2023-03-21 07:03:55 +08:00
Northmoc
acce156205 Merge pull request #2704 from paulsnoops/sir_draft
Booster Draft: SIR
2023-03-20 17:22:29 -04:00
tool4EvEr
348670776e Clean up 2023-03-20 18:25:03 +01:00
tool4EvEr
84aef29d69 Fix NPE when trying to build Charm description 2023-03-20 18:24:32 +01:00
Simisays
652f799ec3 update 2023-03-20 18:23:34 +01:00
Anthony Calosa
2a22be944b update BGM detection, update Arena Challenges for Hard/Insane
- still have the layer bug for the BGM since it's not boundary based, but tolerable atm, it must get the colored boundaries for accuracy
2023-03-20 20:24:26 +08:00
Hans Mackowiak
c5e52aab7d AbilityUtils: add Convoked as DefinedCards (#2710) 2023-03-20 06:20:35 +01:00
Anthony Calosa
6978733fb0 Merge pull request #2712 from kevlahnota/newmaster2
fix JSON typos
2023-03-20 12:25:31 +08:00
Anthony Calosa
38a11a8bac fix JSON typos 2023-03-20 12:24:56 +08:00
Anthony Calosa
85d549cb86 Merge pull request #2711 from kevlahnota/newmaster2
update missing music and rename custom card
2023-03-20 12:02:47 +08:00
Anthony Calosa
de300f9c00 update missing music and rename custom card 2023-03-20 12:01:55 +08:00
Anthony Calosa
33189271b1 Merge pull request #2709 from tool4ever/defile
Fix Defilers applying twice with MayPlay
2023-03-20 11:50:22 +08:00
Anthony Calosa
7600ec5492 Merge pull request #2705 from kevlahnota/newmaster2
update adventure BGM..
2023-03-20 11:50:03 +08:00
Anthony Calosa
b95226b031 Merge pull request #2698 from EldritchBimbo/Gwyn-Master
Adds 1 dungeon, 2 enemies based on the Machine Orthodoxy
2023-03-20 11:46:15 +08:00
Anthony Calosa
8fc22b9d02 Merge pull request #2692 from Simisays/XIRAA
Large Adventure update
2023-03-20 11:25:34 +08:00
Anthony Calosa
af88585695 Update tibalts_bag_of_tricks.txt 2023-03-20 11:14:14 +08:00
tool4EvEr
714baa47ee Fix Defilers applying twice with MayPlay 2023-03-19 21:13:27 +01:00
tool4ever
25d2aa82b6 Bunch of fixes (#2706)
* Fix Tawnos's Coffin not using ETB counters

* Cost fix

* Saga tweaks

---------

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
2023-03-19 22:07:03 +03:00
tool4ever
7b78a2052d Update karumonix_the_rat_king.txt 2023-03-19 18:58:57 +00:00
Hans Mackowiak
6b61d7fc7e CardFactoryUtil: Read Ahead use DisableTriggers (#2703) 2023-03-19 18:34:47 +03:00
Hans Mackowiak
a4b52b4b40 Merge pull request #2699 from tool4ever/copycleanup
CardFactory: remove redundant copying
2023-03-19 15:14:12 +01:00
Anthony Calosa
1b7180a0f2 prevent NPE 2023-03-19 21:36:34 +08:00
Anthony Calosa
a91845c444 update 2023-03-19 21:03:51 +08:00
Simisays
149dc720f1 update 2023-03-19 13:42:30 +01:00
Anthony Calosa
1bc8abf7e1 update adventure BGM.. 2023-03-19 19:16:51 +08:00
Simisays
40d4d9381b sprite fixes for editor 2023-03-19 11:45:30 +01:00
paulsnoops
7962d0bfca Booster Draft: SIR 2023-03-19 09:52:49 +00:00
EldritchBimbo
35a8d7b636 Merge branch 'Card-Forge:master' into Gwyn-Master 2023-03-18 16:29:04 -04:00
Alwayssnarky
23734b2f79 Tweaks to Tiles
Modifies phyrexiantiles.png to standardize tile grid, edits phyreixan_w1 and tiles.tsx to accommodate.
2023-03-18 16:21:31 -04:00
Simisays
1a4c370b39 Update xiras_hive.txt 2023-03-18 14:13:41 +01:00
Paul Hammerton
1186d4ee22 Merge pull request #2702 from JohnWilliams77/patch-81
Update Secret Lair Drop Series.txt
2023-03-18 08:28:54 +00:00
JohnWilliams77
069c50daa5 Update Secret Lair Drop Series.txt 2023-03-18 08:19:44 +00:00
Simisays
4b2bc09acb update 2023-03-18 08:51:33 +01:00
Hans Mackowiak
eef4dd58fc CardFactoryUtil: Equip shouldn't care if it is a creature (#2696) 2023-03-18 07:02:08 +03:00
tool4EvEr
11ca3ca7b0 remove redundant calls 2023-03-17 22:19:15 +01:00
Simisays
95d23e9fd6 update 2023-03-17 22:08:33 +01:00
Alwayssnarky
bd6f6bcf77 Adds 1 dungeon, 2 enemies based on the Machine Orthodoxy
Adds:
.2 new enemies (Orthodoxy Duelist and Orthodoxy Angel), along with accompanying infrastructure. (Sprites, atlas, decks. Decks both use JSON randomization.)
.New file for Phyrexian overworld buildings (and other dungeons I might make), along with accompanying infrastructure.
.New tiles for in-dungeon tilesets, along with accompanying infrastructure.
.1 new dungeon, based on the Machine Orthodoxy. Uses new "patrolling enemy" mechanic.
Changes:
.Enemies.json - defines the new enemies' stats and drop table.
.Points_of_Interest.json - Defines new dungeon and sets it up to link to new map correctly.
.White.json - Allows new dungeon to spawn in white area of the world. Enemies are limited to this dungeon (for now)
2023-03-17 16:59:46 -04:00
Simisays
dbf9433238 Update tibalt_boss_effect.txt 2023-03-17 15:42:34 +01:00
Simisays
8b397611ec update 2023-03-17 15:41:18 +01:00
Simisays
582cf84e68 Update xira_boss_effect.txt 2023-03-17 15:38:30 +01:00
Simisays
a60a1747fc Update tibalt_boss_effect.txt 2023-03-17 15:28:36 +01:00
Simisays
ec153b0e73 Update slobads_iron_boots.txt 2023-03-17 15:16:41 +01:00
Simisays
f75ebd4379 Update slobad_boss_effect.txt 2023-03-17 15:14:29 +01:00
Simisays
9f26fd5670 update 2023-03-17 13:02:05 +01:00
Simisays
25e1189e41 update 2023-03-17 12:59:48 +01:00