Commit Graph

40 Commits

Author SHA1 Message Date
TwentyToedToad
436a3382b6 Sadistic Shell Game 2024-10-02 14:11:00 +00:00
Hans Mackowiak
40bc5aa021 GameLoss: use CantHappen for cantLose (#6024)
* GameLoss: use CantHappen for cantLose
2024-09-02 10:35:45 +02:00
Simisays
927c6fab58 Update sorins_boss_effect.txt (#5985) 2024-08-26 16:47:10 +03:00
tool4ever
67b18b2e08 Update scripts (#5919) 2024-08-13 19:37:43 +02:00
Renato Filipe Vidal Santos
011c2570f4 ETB update: 'tokenscripts', 'custom_cards' in \adventure (#5837)
* Add files via upload

* Add files via upload

* Update rg_1_1_dragon_flying_devour.txt
2024-08-05 07:02:08 +02:00
Simisays
9183ddf558 Large adventure update (#5398)
* Squashed commit of the following:

commit 2e0f844a2f40a622ffc0b55ed45f69a4d812fee6
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat Jun 8 00:40:29 2024 +0200

    update

commit 25c21bf27f10fe6a78fb986f0a8ee6e7b0737978
Merge: d256832250 86154cccbd
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri Jun 7 21:33:32 2024 +0200

    Merge remote-tracking branch 'upstream/master' into garruknahiri

commit d256832250168447543c3ca0980636e853ff3910
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Jun 5 19:45:29 2024 +0200

    update

commit b4b75fedc01ff1a739774194dba77aeeee46a0e7
Merge: 951440de0e 6b5412e7dc
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Jun 2 21:22:33 2024 +0200

    Merge remote-tracking branch 'upstream/master' into garruknahiri

commit 951440de0e9c0551238f5d1f6099b5c818c4555f
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri May 31 23:29:14 2024 +0200

    update

commit f9a76ed16971afe94f0ee9e66332cff0e86f6e1b
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed May 29 20:48:37 2024 +0200

    update

commit 6f2c153a91a1a71e8264aa49a745d44277926bb7
Merge: 6944cfb2b4 5119b72066
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon May 27 23:33:56 2024 +0200

    Merge remote-tracking branch 'upstream/master' into garruknahiri

commit 6944cfb2b432672922de3e07ae6ad739c9b3b145
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon May 27 23:33:15 2024 +0200

    cleanup

commit 440ea14bf064f5a42a897cb711b9963adc711f05
Merge: 84687d1002 9810264d82
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun May 26 23:48:53 2024 +0200

    Merge remote-tracking branch 'upstream/master' into garruknahiri

commit 84687d100212a004f99b5d6b7f6bf73f065b7913
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun May 26 23:48:45 2024 +0200

    update

commit 61abd7abf20fb71b32253923073161ef97e16f0e
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat May 25 22:53:47 2024 +0200

    update

commit 12c9442e75146dfa2aff3b230c250d9a496896d6
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat May 25 09:03:13 2024 +0200

    update

commit 57de9e398c08ebf4c1d879683d4b2fc49002005e
Merge: fa9c878d74 6694b5a327
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri May 24 23:02:14 2024 +0200

    Merge remote-tracking branch 'upstream/master' into garruknahiri

commit fa9c878d74bc96296d2e13577940642ece84fc9f
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri May 24 23:02:09 2024 +0200

    Update config.json

commit fc51b02e2728ffa31941c879da712c8b7a051951
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Tue May 21 22:55:46 2024 +0200

    update

commit be24e7e6c97782430dd12234d006a0581556177e
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon May 20 21:49:32 2024 +0200

    updateupdate

commit 3544b9715dfd21fa6b57ebd082691be8272ec44d
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun May 19 23:30:44 2024 +0200

    update

commit 7fdf564c3f30466ae985cfd330c4ef64a013636d
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun May 19 11:59:07 2024 +0200

    update

commit 3c46938f70104de142afae80dac75b1007b3f59f
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat May 18 22:38:00 2024 +0200

    MOAR

commit 8c1126eb33073e6f4cd38b5734313de1c7454396
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat May 18 22:37:47 2024 +0200

    update

commit aab99445192045dcbcee93d32826f604e39eeff0
Merge: 175312aab6 3309a48710
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu May 16 23:34:17 2024 +0200

    Merge remote-tracking branch 'upstream/master' into garruknahiri

commit 175312aab690fbbc286171efece3e06944a3a32b
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu May 16 23:34:11 2024 +0200

    update

commit 847191072fe1a8c71e81e1b4d0e5b79f1bd992e9
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon May 13 19:18:52 2024 +0200

    update

commit a34f4ec0a9570be4f0ff0da4bb2512462efcebe1
Merge: babbfcfaa5 c7a138fc13
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat May 11 13:41:42 2024 +0200

    Merge remote-tracking branch 'upstream/master' into garruknahiri

commit babbfcfaa54983a4f0916f5588c554a198749255
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri May 10 23:40:12 2024 +0200

    hugemapupdate

commit ccbd5b907ad1a20d49d162ba7a2192a01fd7fc45
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu May 9 23:24:45 2024 +0200

    updatre

commit 3f2d0cbc0123d20e7bb9414e49fc08f3330381a9
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu May 9 13:01:08 2024 +0200

    update

commit 8f43aace8ad4434c56ae4e14bb3c1a02ee7c158a
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu May 9 00:40:41 2024 +0200

    update

commit 585134cdb9347298d7138a32c3e5906c2993d70a
Merge: c51c6b119b a2deb08337
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed May 8 18:42:43 2024 +0200

    Merge remote-tracking branch 'upstream/master' into garruknahiri

commit c51c6b119b72871cda3fcc0964d350d2e39830a2
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed May 8 18:42:37 2024 +0200

    update

commit 4c4f1d70005668339dd7f14f244a7170fa231748
Merge: d4ac1939da 085b9e9735
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon Apr 22 19:53:09 2024 +0200

    Merge remote-tracking branch 'upstream/master' into garruknahiri

commit d4ac1939daa16e77032978831a42c53d2139db01
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon Apr 22 19:53:02 2024 +0200

    update

commit 1e1d7b7cef12b3ac5fb28c9ce7fede915e54a809
Merge: d872995ea6 fd2522e51c
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Apr 14 13:08:20 2024 +0200

    Merge branch 'Card-Forge:master' into garruknahiri

commit d872995ea63531e44bcb0ef2bf38b53b7a434ceb
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri Jan 19 21:27:47 2024 +0100

    update

* temoraryrevert

* name changes

* Update shops.json

* Update config.json

* Update config.json

* d
2024-06-09 19:48:33 +03:00
Renato Filipe Vidal Santos
a979be95b3 Adventure Mode custom card cleanup (#5212)
* Add files via upload

* Update grolnoks_skin.txt

* Update scarecrow_totem.txt
2024-05-07 20:36:31 +03:00
Renato Filipe Vidal Santos
a10e3b48c3 Update xira_boss_effect.txt (#5202) 2024-05-06 09:35:47 +03:00
Simisays
7c0f13b918 4 small adventure fixes (#4650)
* update

* Update fort_green_3_forestcastle.tmx

* Update grove_8_hydra.tmx
2024-02-09 06:49:10 +03:00
Jerker Karlsson
0a1a5b508a Fix typo in waker_of_the_dead spellbook
A misplaced semi colon could crash the game when battling Liliana
2024-01-15 20:19:29 +01:00
Simisays
05743679d8 Adventure: Tibalt, Skep and White Castle rework (#4508)
* Squashed commit of the following:

commit abe8d9bc8ff01eec3da2347e66f8cdc5348a7327
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Jan 11 20:26:19 2024 +0100

    update

commit 16f45e1b1c64b95f7a38d8bb2ca8c2809e260b79
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Tue Jan 9 22:00:20 2024 +0100

    update

commit dd2cf3c0a840920fa9477cd1f85c6047de633a15
Merge: ebe940f020 acb5151a82
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Tue Jan 9 21:04:33 2024 +0100

    Merge remote-tracking branch 'upstream/master' into TIBALT

commit ebe940f0203de29c4466a3a0f676c409c254387f
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Tue Jan 9 21:04:24 2024 +0100

    update

commit 338947f02b7f133b97d2c9eb993423094645e421
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat Jan 6 16:41:00 2024 +0100

    update

commit 6328694aaf4311de3160fbd70edd49c1a8a6c289
Merge: 1f0a498b0d 94e154fcb8
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Jan 3 20:21:42 2024 +0100

    Merge remote-tracking branch 'upstream/master' into TIBALT

commit 1f0a498b0d5bb11655def1a3b8142c9898cb993d
Merge: 45b65fa602 9a5fe05838
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Jan 3 20:20:47 2024 +0100

    Merge remote-tracking branch 'upstream/master' into TIBALT

commit 45b65fa602ed1c5c6a6d65dbc9be89ea8ac636df
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Jan 3 20:20:37 2024 +0100

    update

commit f984e00dbc70ab428133337d10f5a1157ef6a333
Merge: acf99e95aa be2f9aa187
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri Dec 29 20:47:36 2023 +0100

    Merge remote-tracking branch 'upstream/master' into TIBALT

commit acf99e95aae979e9c718809277b455ec12766b33
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri Dec 29 20:47:31 2023 +0100

    update

commit a72da3d39a0b837370ef82b07253db1016a24772
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Tue Dec 26 21:19:55 2023 +0100

    update

commit 96d037511f35c6f9c0393b5091b49a030b0ce2f9
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat Dec 23 18:07:21 2023 +0100

    cleanup

commit e1271ec1f80918ace004c01b1e1183364c162a21
Merge: 3710aaad6a de851fc749
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat Dec 23 11:38:23 2023 +0100

    Merge remote-tracking branch 'upstream/master' into TIBALT

commit 3710aaad6a627138ff202b84335ffa4f06a48e4a
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat Dec 23 11:37:59 2023 +0100

    Update tibalt.tmx

* update

* Update skep_outer.tmx

* Update enemies.json

* More fitting homarid sprite
2024-01-13 12:57:55 +03:00
Hans Mackowiak
e8a6121d24 Saga and Read ahead refactor for WHO (#4436)
* Saga and Read ahead refactor for WHO

* ~ fix copy sagaRep

* fix etb counter with Barbara Wright

* ~ fix
2023-12-29 20:42:30 +03:00
Hans Mackowiak
e6a9ea20c7 Updates "Can't be countered" into Replacement Effects (#4429)
* isCounterableBy cleanup

* ~ move to Card

* update the rest

* ~ fix unused import

* ~ fix Counter better check for ValidSA instead of ValidCard

* ~remove last piece of text
2023-12-26 06:55:35 +03:00
Northmoc
7f5e75bdb0 PIP: Radiation mechanic implementation (#4204)
* PIP: Radiation mechanic implementation

* remove OVERRIDE

* remove unused property
2023-12-26 06:55:14 +03:00
Northmoc
3bf1e39f05 Remaining perpetual rework (#4394) 2023-12-20 18:32:09 +01:00
Northmoc
de851fc749 YWOE high_fae_prankster.txt and support (#3921)
* high_fae_prankster.txt and support

* Perpetual rework

* fix imports

* fix imports

* 12/9 cards and tweaks

* fix absorb_energy

* tidy

* 12/10 updates

* 12/12 tweaks and fixes

* 12/13 tweaks

* last tweaks for this PR

* revert unneeded

* revert unneeded for real

* tidy executePerpetual

* cleanup imports

* tweaks 12/15

* fix imports

* LosePerpetualEffect

* cleanup import
2023-12-16 22:25:41 +03:00
Northmoc
1a57062b94 LCI - Craft implementation 2023-11-29 19:52:09 -05:00
Simisays
b62b588060 Large Adventure update (Hydra ect) (#4136)
* Squashed commit of the following:

commit ccba1cbded5ca546f333ad33c227a1617296e9b4
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Nov 2 23:30:45 2023 +0100

    update

commit d8727b9d053b38a5faa806c0c2494826958e9e26
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Nov 1 21:31:30 2023 +0100

    update

commit 84d2bd0a29770c189ee24f9d413fda9c450569d6
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Tue Oct 31 22:51:03 2023 +0100

    update

commit 22c4ff1bd3b25bf0340f79b7a2ad096e3ff02bb5
Merge: 278ebc005b b6de8a6d63
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Tue Oct 31 11:40:20 2023 +0100

    Merge remote-tracking branch 'upstream/master' into adventurequickfix

commit 278ebc005bd32f332a6bf0637b3d2e2886d50dee
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Oct 29 19:35:42 2023 +0100

    update

commit a7d7a768fc47b8063c22462551a94a79fc9e4bee
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Oct 29 10:44:01 2023 +0100

    update

commit e4fe3fb08f084daccf155d809f1838ddbb32cb54
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat Oct 28 00:13:40 2023 +0200

    update

commit b9d2065d1545aa1c1b2145753144575f6b0b6888
Merge: 770082f750 920e811812
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri Oct 27 15:28:09 2023 +0200

    Merge remote-tracking branch 'upstream/master' into adventurequickfix

commit 770082f7502c7725610d10cb386bb6c9354730ba
Merge: 590945bcc5 3fed75e089
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Oct 26 22:06:22 2023 +0200

    Merge remote-tracking branch 'upstream/master' into adventurequickfix

commit 590945bcc5c0afca8012a11f31662f53be18652c
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Oct 26 21:23:27 2023 +0200

    update

commit ea9e1452de6d9b46dc74ef34526515581ea0d81c
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Oct 26 20:10:48 2023 +0200

    update

commit acfd54e8fccf19b490648e8f13530f1d5c487965
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Oct 26 17:44:04 2023 +0200

    update

commit 665f86fb4d307620a142fcb1604dd43ddd97abfb
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Oct 22 15:10:11 2023 +0200

    Squashed commit of the following:

    commit 916ffceecdf96ac505591aa070c3301f6fceaec8
    Merge: ce28f2b548 48a8aa5463
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Sun Oct 22 08:20:48 2023 +0200

        Merge branch 'vampirefort' of https://github.com/Simisays/forge into vampirefort

    commit ce28f2b548f4bb84db9a34d9149c358bda5ed96f
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Sun Oct 22 08:20:25 2023 +0200

        update

    commit 48a8aa54631b3cec5d65719d3a4a42d8ebed1d4d
    Merge: 0cc727a8f5 437d64dc08
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Sat Oct 21 22:36:16 2023 +0200

        Merge branch 'Card-Forge:master' into vampirefort

    commit 0cc727a8f52888efca1bb50426296cd2922839a4
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Sun Oct 15 12:02:57 2023 +0200

        update

    commit 38b5eddb61785210d086df99dea7497d9c06f61c
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Sat Oct 14 17:09:37 2023 +0200

        Update enemies.json

    commit bc12ef0c14fc4a838a54d7a10d091ba7e5ab5d5b
    Merge: 2a213a14cb 1fc11929a8
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Sat Oct 14 12:23:12 2023 +0200

        Merge remote-tracking branch 'upstream/master' into vampirefort

    commit 2a213a14cb7d8f04e1b5dc1b9c040421edba8419
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Tue Sep 26 21:28:52 2023 +0200

        update

    commit 093db5a7bb7b81881595907f0047ac7f806aa8c5
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Tue Sep 26 19:59:51 2023 +0200

        updarz

    commit d5af52298b9d12a9c1dce60ffaf7513565a0c214
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Tue Sep 26 19:59:32 2023 +0200

        update

    commit b06de36dacfaba785aea4f260a4e21f6869b52be
    Merge: 8ffb3ad52f 0fc88cc46c
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Mon Sep 25 20:13:50 2023 +0200

        Merge remote-tracking branch 'upstream/master' into vampirefort

    commit 8ffb3ad52f71282ae3f04f423249299c7e9ac608
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Sun Sep 24 17:39:55 2023 +0200

        update

    commit 723292aa9f47b140d41ab0ede394923aeaba9d60
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Sat Sep 23 19:32:58 2023 +0200

        update

    commit db882cc60275e07d6767597dc33fea8dc4c78bc6
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Sat Sep 23 08:34:43 2023 +0200

        update

    commit b22ee9e876f95d54718ec62b5236eb78dd125ccb
    Author: Simisays <67333662+Simisays@users.noreply.github.com>
    Date:   Fri Sep 22 15:25:06 2023 +0200

        update

commit 09b57894da4dd08723c71af1b6e0c1e9efe4ac9b
Merge: beefe201ee b9117873bc
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Oct 22 09:58:10 2023 +0200

    Merge remote-tracking branch 'upstream/master' into adventurequickfix

commit beefe201ee1720cfa254472fd74619408e53a98c
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat Oct 21 23:42:54 2023 +0200

    update

* update

* update

* update

* update

* update

* update

* grolnok cleanup

* move gold

* colission fix Fort 4 White
2023-11-10 19:10:09 +03:00
Northmoc
38cbd833ab replace quasi keyword with Static (#3920) 2023-10-18 15:57:37 +02:00
Simisays
49871bc2b6 update 2023-10-06 19:41:56 +02:00
kevlahnota
77f50b4e93 Update tibalts_bag_of_tricks.txt 2023-10-01 07:07:45 +08:00
Simisays
064d1d3818 update 2023-09-18 18:40:20 +02:00
Simisays
b0a7648a1f update 2023-09-17 22:05:36 +02:00
Simisays
14782944e3 update 2023-09-16 21:55:19 +02:00
Hans Mackowiak
282d9860c7 Mana convert refactor (#3718)
* ~ cleanup applyManaColorConversion with only one Parameter

* remove ManaConvert Keyword and Vizier of the Menagerie

* remove other ManaConvert Keyword

* ~ fix scripts

* ManaConvention on GainedActivatedAbility

* ~ fix scripts

* rework Celestial Dawn and nonWhite restriction

* * update AI to apply matrix instead of hardcoded ignoreType and ignoreColor

* store Mana Matrix in PaymentDecision instead of CostPartMana

* ~ move Mana Matrix to more methods

* ManaConversionMatrix: add for Unless and Optional Cost

* Clean up AI

* Remove some calls that should be unneeded but make debugging annoying

* After paying with mana ability the old matrix should apply again

* Move matrix restore because AI needs it too

* Only human needs extra matrix on effect payments

* fix checks

* Update ComputerUtilMana.java

more !effect checks

* Story by CardPlayOption

* Fix North Star

* Remove obsolete code

* ~ ignoreType > ignoreColor

---------

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.60>
2023-09-08 18:09:03 +03:00
kevlahnota
50a2147198 Update garruk_boss_effect_phasetwo.txt 2023-08-11 06:59:58 +08:00
Simisays
76d0732b70 update 2023-08-05 17:50:36 +02:00
Simisays
734d68a4e0 Update nahiris_boss_effect.txt 2023-08-05 17:21:51 +02:00
Simisays
7cad386934 cleanup 2023-07-13 09:45:50 +02:00
Simisays
86c1242492 update 2023-07-12 07:41:11 +02:00
Simisays
8778127876 update 2023-07-11 14:18:00 +02:00
Simisays
410501a9d2 Squashed commit of the following:
commit b8c05c468bf6f24e4a4ea0d07ae208f993aa727a
Merge: 7863f7f7f7 e0ac62e518
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon Jul 10 22:24:14 2023 +0200

    Merge remote-tracking branch 'upstream/master' into skepeldrazi

commit 7863f7f7f727e2fb1c5e837afd14aa2340ebce98
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon Jul 10 22:24:03 2023 +0200

    update

commit 1b081579d2647b7d81736724259e7b9d433a0abf
Merge: 5d77df87d7 b437d9764d
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon Jul 10 13:35:30 2023 +0200

    Merge remote-tracking branch 'upstream/master' into skepeldrazi

commit 5d77df87d7426df792e428c5f17bda2d33ed6f3d
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon Jul 10 13:35:24 2023 +0200

    update

commit a2ad5160c661da24dc158a1b6e734216403b529f
Merge: 0326d4321d 49e5ce974d
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Jul 9 08:51:51 2023 +0200

    Merge remote-tracking branch 'upstream/master' into skepeldrazi

commit 0326d4321dfa63a42cc5452527b25cab182f018e
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Jul 9 08:51:44 2023 +0200

    update

commit 1d713086f2032b04d0e2ed7fc25dc079bb0987f6
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat Jul 8 16:52:33 2023 +0200

    update

commit a7840d878e321e6c512155c69b34aa71f41c46f6
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri Jul 7 20:38:42 2023 +0200

    update

commit 76e34825185c536d0f7cbd102ada692dc6c4d20e
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Jul 5 21:02:29 2023 +0200

    update

commit 89f79fa47dbb3780c7cf9c6aa075cfe0cead404f
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Jul 5 15:20:36 2023 +0200

    update

commit 3e2bda59936cfd2fdd3a14baa0e3c87bdf65c838
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Tue Jul 4 16:56:31 2023 +0200

    update

commit 74ff2ba0bbf87fd343be3a118f63ab433597352f
Merge: 51323d9f8e 7f4705e6be
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon Jul 3 22:45:19 2023 +0200

    Merge remote-tracking branch 'upstream/master' into skepeldrazi

commit 51323d9f8ee780d854dad586333ce45c8849bf98
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon Jul 3 22:45:14 2023 +0200

    update

commit 588b3a3e86b27ae1a5f71e69053285d8e391698d
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Jul 2 20:40:53 2023 +0200

    update

commit 63cae02800cb3b4ce44e3f198c366ea8bc659ca3
Merge: 7348cfb517 7c2e3d2a47
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Jul 2 20:40:49 2023 +0200

    Merge remote-tracking branch 'upstream/master' into skepeldrazi

commit 7348cfb517bb859f8850c3df2624bb8f5a128e7a
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Jul 2 16:00:31 2023 +0200

    update

commit dd05b537484ff3e4fda310109e58fd02f37ab985
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Jul 2 09:09:07 2023 +0200

    updqte

commit 73f72462db817e9be9df6ab6f2a8ad3920e1b41b
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu Jun 29 20:53:45 2023 +0200

    update

commit 361fa91ebbfbff17e346d4b530cb4d6e2e18f57e
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Jun 28 16:39:23 2023 +0200

    update
2023-07-10 22:24:48 +02:00
Anthony Calosa
d6cc132c56 Update hallowed_sigil.txt 2023-07-04 11:34:42 +08:00
Anthony Calosa
4da74b8282 Update valyx_boss_effect.txt 2023-07-04 11:33:55 +08:00
Anthony Calosa
4118f25f7f Update sigil_of_torment.txt 2023-07-04 11:33:10 +08:00
Alwayssnarky
00234a3ace Improved custom card art, tweaked Valyx's boss ability 2023-06-28 10:57:46 -04:00
Alwayssnarky
50706c3952 Add card art for custom effects, reworks player sigils into enchantments, increased sigil of torment cost. 2023-06-26 21:42:38 -04:00
Alwayssnarky
dd67c97f30 Github changes
Acting on suggested github changes. I can change them to enchantments if you think that'd be better, I hadn't thought of interactions with things like metalcraft.
2023-06-26 16:02:05 -04:00
Alwayssnarky
f92a8040b7 Unhallowed Abbey Dungeon
Adds:

.New dungeon in white biome + tiles.

.3 new enemies (2 regular and 1 boss).

.Effect, sprite for boss.

.2 new equipable items (chosen between by player upon completing dungeon).

Changes:

.2 new sprites in Items.png and .atlas.

.3 new items in items.json.

.4 new entries in enemies.json

.1 new entry in points_of_interest.json

.1 new entry for dungeon spawns in white.json
2023-06-26 12:28:08 -04:00
Anthony Calosa
918a38ece2 move CustomCards and Pics to common 2023-06-22 19:14:35 +08:00