Commit Graph

64060 Commits

Author SHA1 Message Date
Simisays
859815e258 Update phyrexian_archivist.txt 2023-04-15 22:39:58 +02:00
Anthony Calosa
fcce9f8bc6 Merge pull request #2934 from kevlahnota/newmaster2
update dialog and some icons
2023-04-15 21:22:51 +08:00
Anthony Calosa
7a60241f73 update dialog and some icons 2023-04-15 21:18:42 +08:00
Alwayssnarky
37b991fd0b Tweaks
Tweaks to level, fixes to furnacetormentor.json and dross pit quest entries.
2023-04-15 08:04:20 -04:00
Simisays
98a18b3ce7 update 2023-04-15 13:28:26 +02:00
Simisays
ed94cc2bdd update 2023-04-15 12:50:09 +02:00
Simisays
b9101e76e7 Update invasion_of_tarkir_defiant_thundermaw.txt 2023-04-15 09:16:19 +02:00
tool4EvEr
7ab19408bd Fix trigger when rolling 0 times 2023-04-15 08:31:00 +02:00
Anthony Calosa
41bf7461db Merge pull request #2931 from jjayers99/master
Adventure quest updates
2023-04-15 10:31:05 +08:00
Anthony Calosa
d0a00461ae Update AdventureQuestController.java 2023-04-15 10:30:16 +08:00
jjayers99
fb8a7b904a Adventure quest updates
Arena quest stage objectives now available, one quest added.
Removed extra trigger for accepting quest in "A Vision of Destruction" offer dialog.
Minor dialog enhancements.
2023-04-14 22:14:12 -04:00
Anthony Calosa
93204bdd13 Merge pull request #2927 from jjayers99/master
Adventure updates
2023-04-15 06:57:42 +08:00
Anthony Calosa
08106f3add Merge pull request #2930 from tool4ever/sliverfix
Fix Frenetic Sliver + Tribute placer
2023-04-15 06:56:58 +08:00
Simisays
a159932b04 Update invasion_of_tarkir_defiant_thundermaw.txt 2023-04-14 22:23:40 +02:00
tool4EvEr
7a50e013e5 Placer is opponent 2023-04-14 22:18:52 +02:00
tool4EvEr
64dd09c0d0 Fix Frenetic Sliver trigger 2023-04-14 21:27:20 +02:00
Simisays
06e3bb5445 update 2023-04-14 21:14:12 +02:00
Simisays
e929b5c604 update 2023-04-14 21:00:25 +02:00
Alwayssnarky
bf8f13bc15 Furnace Host Update
Additions:
.Added two enemies based on the Furnace Host along with accompanying infrastructure.
.Added level based on the Furnace Host.
.Added tileset based on the Furnace Host along with accompanying infrastructure.

Changes:
.Added new building to Phyrexian Buildings for furnace dungeon, edited atlas file to detect it.
.Added new dungeon to POIs and Red jsons.
.Added new enemies to enemies json.
.Added proper quest tags to Dross faction enemies and dungeon.
2023-04-14 13:20:30 -04:00
Paul Hammerton
6c6d36d2a7 Merge pull request #2928 from Northmoc/clbranks
add CLB to rankings.txt
2023-04-14 17:05:04 +01:00
Simisays
f8c14edafa update 2023-04-14 17:13:25 +02:00
Northmoc
32ba7fb513 Merge branch 'master' into clbranks 2023-04-14 08:48:24 -04:00
Northmoc
064f99b034 add CLB to rankings.txt 2023-04-14 08:42:42 -04:00
Simisays
450cefcdf1 MOM 9 cards (#2902)
* update

* update

* update

* update

* Delete inga_and_esika.txt

* Update invasion_of_arcavios_invocation_of_the_founders.txt

* update

* Update final_flourish.txt
2023-04-14 08:33:55 -04:00
jjayers99
92ec69e095 Adventure updates
Clear quests on New Game+
Small cleanup tweaks to town layouts
Added (big) signs to capitals for arena and spellsmith.
Quests can now be tagged with sources, allowing generation in specific towns / biomes.
NPC arena matches are now weighted on relative HP rather than 50/50 odds.
Removed invisible collision wall in Maze_1.tmx, gave threat range to nearby enemy instead.
2023-04-14 07:55:38 -04:00
Simisays
cdf4d0ec28 Update invasion_of_tarkir_defiant_thundermaw.txt 2023-04-14 13:52:48 +02:00
Simisays
43acdf3218 update 2023-04-14 13:50:31 +02:00
Simisays
ca3916a4f8 cleanup 2023-04-14 12:05:33 +02:00
Simisays
1158d47e46 update 2023-04-14 12:02:59 +02:00
Anthony Calosa
c71c5874b3 Merge pull request #2910 from bbp9857/master
Added copy and delete deck
2023-04-14 08:31:39 +08:00
Benjamin Perry
0505b6c709 Merge conflicts 2023-04-13 20:10:21 -04:00
Benjamin Perry
2f17c2f8f9 Merge conflicts 2023-04-13 20:08:05 -04:00
Anthony Calosa
c9bf01475f Merge pull request #2925 from kevlahnota/newmaster2
fix buttons
2023-04-14 08:01:26 +08:00
Benjamin Perry
cf86796b0e Add portrait-mode layout for delete/copy buttons 2023-04-13 19:59:07 -04:00
Anthony Calosa
93b8fc79b7 fix buttons 2023-04-14 07:52:55 +08:00
Anthony Calosa
10ac2bf139 Merge pull request #2924 from tool4ever/autopay
Fix Autopay test selecting same mana multiple times
2023-04-14 07:13:27 +08:00
tool4EvEr
6a27f7ea70 Fix Autopay test selecting same mana multiple times 2023-04-13 23:55:43 +02:00
Anthony Calosa
ae4f4e3555 Merge pull request #2923 from kevlahnota/newmaster2
update menu button positions
2023-04-14 05:37:40 +08:00
Anthony Calosa
26cc7d0fe5 update menu button positions 2023-04-14 05:26:25 +08:00
Anthony Calosa
a6705dcecf Merge pull request #2922 from paulsnoops/mom_edition_tokens
Remove redundant tokens from MOM edition
2023-04-14 05:07:37 +08:00
paulsnoops
c2e7060584 Remove redundant tokens from MOM edition 2023-04-13 21:50:38 +01:00
Anthony Calosa
27117f3102 Merge pull request #2921 from tool4ever/cleanup13
Clean up descriptions
2023-04-14 04:42:12 +08:00
tool4EvEr
6103c7b657 Clean up descriptions 2023-04-13 22:30:12 +02:00
Anthony Calosa
0fee7bfe53 Merge pull request #2861 from EldritchBimbo/Gwyn-Dev
Dross Pit Content Update
2023-04-14 04:18:05 +08:00
Anthony Calosa
9da9d1f714 Update AdventureQuestController.java
update check
2023-04-14 04:10:08 +08:00
Anthony Calosa
9298feb297 Merge pull request #2920 from kevlahnota/newmaster2
fix loading error classcastexception
2023-04-14 04:05:41 +08:00
Anthony Calosa
4bbf516e89 fix loading error classcastexception
- fix classcastexception-cannot-assign-instance-of since the old value is of UUID and changed to String, old file will not load...
2023-04-14 04:04:09 +08:00
Simisays
3e736104a1 Adventure: Grolnok Rework + a bunch of tweaks to my older PR's (#2915) 2023-04-14 03:47:23 +08:00
Paul Hammerton
315478aac0 Merge pull request #2919 from paulsnoops/update_mat
Edition updates: MAT
2023-04-13 20:44:29 +01:00
paulsnoops
edbc2d2e10 Edition updates: MAT 2023-04-13 20:41:03 +01:00