Commit Graph

57843 Commits

Author SHA1 Message Date
Magpie
6455a3332c Adventure mode - Small map updates
* Castle gates do not consume keys anymore.
* Prototype waste town update.
2022-05-11 21:22:54 +02:00
tool4ever
57eeb5e0bf Fix NPE with Crystalline Giant (#321)
* Fix Crystalline Giant NPE

* Clean up

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
2022-05-11 16:45:36 +00:00
Agetian
284fbb9d53 Merge pull request #319 from Northmoc/ncc10
NCC: 10 April
2022-05-11 09:15:46 +03:00
Northmoc
b7a9bb9742 sinister_concierge.txt 2022-05-10 22:13:42 -04:00
Northmoc
27af5756e1 waste_management.txt add AI hint 2022-05-10 11:38:17 -04:00
Agetian
0b3e9745f8 Merge pull request #317 from Northmoc/nccSmugBug
NCC: Smuggler's Buggy and a little support
2022-05-10 18:19:02 +03:00
Agetian
4a3eabd690 Merge pull request #318 from paulsnoops/update_snc_draft_rank
Update SNC Draft Ranking
2022-05-10 18:18:52 +03:00
Northmoc
7a7dff9088 Card.java Kicker for non-permanents same spacing in card detail 2022-05-10 11:01:36 -04:00
Northmoc
3dd2a2c076 waste_management.txt 2022-05-10 11:00:53 -04:00
paul_snoops
bac850072a Update SNC Draft Ranking 2022-05-10 15:57:45 +01:00
Northmoc
2e85504747 smugglers_buggy.txt "cast" means ValidSA$ Spell is needed 2022-05-10 10:51:55 -04:00
Northmoc
08c7a3d5b1 PlayEffect optional is not final 2022-05-10 10:27:38 -04:00
Northmoc
d95dd98fce PlayEffect add option to Imprint 2022-05-10 09:51:04 -04:00
Northmoc
771092a2b5 smugglers_buggy.txt 2022-05-10 09:44:25 -04:00
Northmoc
6c9ce36c17 NCC: Gavel of the Righteous and output support (#298) 2022-05-10 14:53:49 +02:00
Northmoc
a49015316e extravagant_replication.txt AI hint 2022-05-10 08:20:38 -04:00
Northmoc
24970bff01 spellbinding_soprano.txt 2022-05-10 08:20:19 -04:00
Hans Mackowiak
6c4367efa4 Merge pull request #274 from tool4ever/slogurk
Fix Slogurk not triggering when dying from SBA legendary
2022-05-10 10:32:01 +02:00
Northmoc
8b84ec9998 NCC: Agent's Toolkit and support (#300)
* agents_toolkit.txt

* CardFactoryUtil support multiple counter kinds for etbCounter

* CountersPutEffect support ETBcounters for CounterTypes

* add " " to syntax
2022-05-10 08:09:37 +02:00
Agetian
083ea2fc69 Merge pull request #310 from tool4ever/cleanstuff
Cleanup some scripts
2022-05-10 08:42:31 +03:00
Agetian
cdd7089534 Merge pull request #311 from Northmoc/ncc9
NCC: 9 April
2022-05-10 08:40:16 +03:00
Agetian
b8334c8891 Merge pull request #314 from CCTV-1/master
update simplified chinese translation
2022-05-10 08:39:32 +03:00
CCTV-1
87bad87d54 translate new strings. 2022-05-10 10:15:35 +08:00
Northmoc
99e00468bc syrix_carrier_of_the_flame.txt remove comment 2022-05-09 19:16:38 -04:00
Northmoc
e931169390 parnesse_the_subtle_brush.txt 2022-05-09 19:13:57 -04:00
Northmoc
f2cefcff5d syrix_carrier_of_the_flame.txt 2022-05-09 18:40:57 -04:00
tool4EvEr
3fe10a24fa Tweak declareAttackers 2022-05-09 22:25:29 +02:00
tool4EvEr
6b84716f53 Cleanup cards 2022-05-09 22:24:59 +02:00
tool4EvEr
e5f3488d5d Clean up 2022-05-09 22:24:41 +02:00
TheBlackMarvel
5e9a76043a NCC Extravagant Replication (#307)
* NCC Extravagant Replication
2022-05-09 13:10:06 +02:00
Northmoc
6b13169fd5 NCC: 8 April (#299)
* familys_favor.txt

* brokers_confluence.txt

* denry_klin_editor_in_chief.txt

* skyboon_evangelist.txt fix Oracle
2022-05-09 06:22:37 +00:00
Anthony Calosa
5427e51a04 Merge pull request #296 from magpie514/master
Adventure mode - Small fixes
2022-05-09 08:10:56 +08:00
Anthony Calosa
f16825acdc Merge pull request #297 from tool4ever/manafix
ComputerUtilMana: Fix payment fails with TapsForMana triggers
2022-05-09 08:09:46 +08:00
Agetian
f481d5d78c Merge pull request #295 from tool4ever/scriptparser
Small improvement to CardScriptParser
2022-05-08 22:37:50 +03:00
tool4EvEr
93e1a58a13 Fix for Reflecting Pool + Wastes 2022-05-08 21:16:14 +02:00
Hans Mackowiak
a028986abf SNC: Lagrella, the Magpie (#293)
* SNC: add Special ReturnAbility for Magpie

* StaticAbilityPanharmonicon: no for delayed trigger
2022-05-08 17:37:54 +02:00
Northmoc
66bcff8eea Merge branch 'master' of https://github.com/Card-Forge/forge 2022-05-08 09:07:14 -04:00
tool4EvEr
43ca318931 Fix payment fails with TapsForMana triggers 2022-05-08 14:52:50 +02:00
Magpie
522ccc2f2d Adventure mode - Small fixes
* Fixed hedge walls not having collisions.
* Variable timer added to reward scenes, it'll wait longer the more rewards are given. It can also be exited by activating the button again after 0.2 seconds (to prevent accidental double clicks).
2022-05-08 14:40:31 +02:00
tool4EvEr
ebe1642bec Small improvement to CardScriptParser 2022-05-08 14:12:38 +02:00
Agetian
e14ae15c70 Merge pull request #294 from Agetian/ai-witnessthefuture
Make Witness the Future AI playable.
2022-05-08 12:41:29 +03:00
Michael Kamensky
75a974165d - Make Witness the Future AI playable. 2022-05-08 12:31:32 +03:00
Anthony Calosa
21fca37c7d Merge pull request #292 from kevlahnota/master
[Adventure] Fix Layout and add Preview Date Time
2022-05-08 14:14:32 +08:00
Anthony Calosa
e88c25ce7c Merge branch 'master' into newmaster 2022-05-08 14:08:19 +08:00
Anthony Calosa
8708b6300c [Adventure] Fix Layout and add Preview Date Time 2022-05-08 14:06:09 +08:00
Anthony Calosa
b4a0f673f6 Merge pull request #289 from kevlahnota/master
[Adventure] Refactor GameHud
2022-05-08 06:50:56 +08:00
Anthony Calosa
ace4ba4aea Merge branch 'master' into newmaster 2022-05-08 05:58:42 +08:00
Anthony Calosa
3c9cabfb7b [Adventure] Refactor GameHud
Make GameHud controls/layout for Android landscape mode identical to Android portrait mode. Desktop Adventure mode retains previous layout and controls.
2022-05-08 05:57:36 +08:00
Anthony Calosa
c039f238d0 Merge pull request #283 from tool4ever/caststuff
Fix casting card copies not being added to stack correctly
2022-05-08 05:53:50 +08:00
Anthony Calosa
864d2caa12 Merge pull request #287 from JohnWilliams77/patch-5
Update Secret Lair Drop Series.txt
2022-05-08 05:53:01 +08:00