Commit Graph

58976 Commits

Author SHA1 Message Date
Anthony Calosa
f61228f985 Merge pull request #1210 from Suthro/master
CLB: 5 scripts, incl. 2 backgrounds
2022-07-27 14:59:52 +08:00
Suthro
9e8179a778 Merge branch 'master' of https://github.com/Suthro/forge_scripttesting 2022-07-27 01:47:11 -05:00
Suthro
3f6d3180c8 DMU: Jaya, Fiery Negotiator + Token, + Evolved Sleeper
DMU: Added scripts for newly spoiled cards

- Jaya, Fiery Negotiator
- 1/1 red Monk creature token with prowess
- Evolved Sleeper
2022-07-27 01:47:09 -05:00
Northmoc
ecbc4ffdc8 Sarevok's Tome (CLB) and related tweaks (#1205)
* sarevoks_tome.txt

* DigUntilEffect.getStackDescription use exile verb when appropriate, better untilAmount parse

* DigUntilEffect.getStackDescription support "NoPutDesc"

* somewhat related old card tweaks

* DigUntilEffect.getStackDescription missing ')'

* sarevoks_tome.txt add DefinedDesc
2022-07-27 08:47:00 +02:00
Northmoc
2312dc27b8 TwoPiles streamline (+ CLB Split the Spoils) (#1200)
* remove cleanups from old TwoPiles cards

* TwoPilesEffect.resolve clear remembered after each pile sub

* split_the_spoils.txt

* split_the_spoils.txt fix

* epiphany_at_the_drownyard.txt too

* stand_or_fall.txt tighten up more

* TwoPilesEffect.resolve add "RememberChosen" as shortcut past ChosenPile -> Pump remember/imprint

* make_an_example.txt and stand_or_fall.txt with "RememberChosen"

* split_the_spoils.txt Defined -> Chooser
2022-07-27 08:45:10 +02:00
Anthony Calosa
b747edfa9f Merge pull request #1214 from kevlahnota/master
refactor RewardActor
2022-07-27 14:41:47 +08:00
Anthony Calosa
8f691f05d8 remove unnecesary loop 2022-07-27 14:33:18 +08:00
Anthony Calosa
4855ddcf5c refactor RewardActor
- fetched images online should update and appear immediately after download on Adventure mode on RewardScene (Shop, Loot)
2022-07-27 14:26:08 +08:00
Suthro
0f3fcdb1fd Update crystal_dragon_rob_the_hoard.txt 2022-07-26 23:46:49 -05:00
Suthro
d93b7b7547 Update criminal_past.txt 2022-07-26 23:45:56 -05:00
Suthro
d46f2677fa Update coronation_of_chaos.txt 2022-07-26 23:45:37 -05:00
Suthro
d99a5e7af0 Update cloudkill.txt 2022-07-26 23:45:04 -05:00
squee1968
08dfc4fcb1 Create skyline_savior.txt (#1213) 2022-07-27 07:27:38 +03:00
Suthro
95cc0fdbf6 Merge branch 'Card-Forge:master' into master 2022-07-26 17:16:17 -05:00
Suthro
f98a4a4eb1 Merge branch 'master' of https://github.com/Suthro/forge_scripttesting 2022-07-26 17:15:33 -05:00
Suthro
7ee4d74290 CLB: 2 backgrounds+ 3 other scripts
CLB: Added scripts

- Cloudkill
- Coronation of Chaos
- Criminal Past
- Crystal Dragon // Rob the Hoard
- Cultist of the Absolute
2022-07-26 17:15:31 -05:00
tool4ever
0f0df7e6ea PlayerFactory: Fix protection zones (#1204) 2022-07-26 16:34:24 +00:00
tool4ever
5540102b67 Fix Chooser$ defaults & Evolve for non-creatures (#1202)
Co-authored-by: TRT <>
2022-07-26 17:52:22 +03:00
Anthony Calosa
e6066c6d41 Merge pull request #1198 from Northmoc/clb_25
CLB - 25 Jul
2022-07-26 09:16:17 +08:00
Anthony Calosa
92bf495ee5 Merge pull request #1199 from kevlahnota/master
refactor loading defaultImage
2022-07-26 09:05:01 +08:00
Anthony Calosa
9b37b25a74 Update CardImageRenderer.java 2022-07-26 08:18:52 +08:00
Anthony Calosa
052a2bd16a refactor defaultImage
- use assetmanager to handle defaultImage
2022-07-26 08:11:13 +08:00
Northmoc
0157000144 popular_entertainer.txt fix Desc 2022-07-25 18:43:23 -04:00
Northmoc
c4fd300369 beacon_bolt.txt streamline 2022-07-25 18:42:47 -04:00
Northmoc
c161fab748 sailors_bane.txt streamline 2022-07-25 18:41:43 -04:00
Northmoc
4b16dccd4a tavern_brawler.txt 2022-07-25 16:53:09 -04:00
Northmoc
7330e27839 popular_entertainer.txt 2022-07-25 16:50:48 -04:00
Northmoc
55f742d32a passionate_archaeologist.txt 2022-07-25 16:49:31 -04:00
Northmoc
8b14f69da6 sapphire_dragon_psionic_pulse.txt 2022-07-25 16:48:14 -04:00
Northmoc
f88e3ab59a sailors_bane.txt 2022-07-25 16:47:47 -04:00
Anthony Calosa
e612076a4d Merge branch 'master' into newmaster 2022-07-26 02:29:17 +08:00
Anthony Calosa
ca1de6aacf prevent NPE 2022-07-26 02:25:23 +08:00
Anthony Calosa
9d2024b1ab Merge branch 'master' into newmaster 2022-07-26 01:19:39 +08:00
Anthony Calosa
bcb9ba16e8 Merge pull request #1195 from Card-Forge/kevlahnota-patch-2
update rewardactor
2022-07-26 01:17:55 +08:00
Anthony Calosa
637744e3cc update imagecache 2022-07-26 01:10:16 +08:00
Anthony Calosa
dd42977ac0 update reward actor 2022-07-26 01:08:25 +08:00
Anthony Calosa
027312e34c Merge branch 'master' into newmaster 2022-07-26 00:03:34 +08:00
Anthony Calosa
b2a0bf8a3a clear cardartCache on image fetched 2022-07-25 23:36:54 +08:00
Anthony Calosa
4601db0939 Merge branch 'master' into newmaster 2022-07-25 22:44:50 +08:00
Northmoc
c28a1f0f98 CLB - 22 Jul (more) (#1174)
* druidic_ritual.txt

* en-US.properties better Mill prompt

* fraying_line.txt

* barrowin_of_clan_undurr.txt should not target

* emerald_dragon_dissonant_wave.txt

* flaming_fist.txt

* drillworks_mole.txt

* CounterEnumType.ROPE

* druidic_ritual.txt just one ChangeZone

* ChangeZoneEffect.changeZonePlayerInvariant support ChangeType$ EACH X & Y

* ChangeZoneEffect.changeHiddenOriginStackDescription improve Yard -> Hand
2022-07-25 09:58:47 +03:00
Anthony Calosa
350af10aa7 Merge branch 'master' into newmaster 2022-07-25 07:51:43 +08:00
Anthony Calosa
bc8388ba3b Update MANUAL.txt 2022-07-25 07:49:11 +08:00
Anthony Calosa
dc810ae1cf Merge pull request #1184 from Northmoc/clb_23
CLB - 23 Jul
2022-07-25 07:02:56 +08:00
Anthony Calosa
9c67c1e797 Merge pull request #1187 from Northmoc/protect
Protection from player display updates (CLB Noble Heritage)
2022-07-25 07:02:22 +08:00
Anthony Calosa
0e79ddf8d8 fix check imagekey 2022-07-25 07:00:48 +08:00
Anthony Calosa
613deeddb7 Merge pull request #1192 from tool4ever/spectra
Fix Spectra Ward preventing attaching more aura (indirectly)
2022-07-25 06:56:56 +08:00
Anthony Calosa
d4c450b14f Merge branch 'master' into newmaster 2022-07-25 06:30:19 +08:00
tool4EvEr
df2341fc66 Fix Spectra Ward preventing attaching more aura (indirectly) 2022-07-24 21:01:12 +02:00
squee1968
f1c69d5275 Update baeloth_barrityl_entertainer.txt (#1191) 2022-07-24 17:31:28 +00:00
Paul Hammerton
1dee82a7f0 Merge pull request #1190 from paulsnoops/unf_edition_update
UNF edition update
2022-07-24 17:56:58 +01:00