Commit Graph

65201 Commits

Author SHA1 Message Date
Simisays
5d28cb244c update 2023-07-30 11:32:22 +02:00
Simisays
ec9db2eb8d update 2023-07-30 11:01:53 +02:00
kevlahnota
f604cc60ac Merge pull request #3560 from pfirpfel/fix-breaking-fellowship
Breaking of the Fellowship: Fix mana cost
2023-07-30 04:19:22 +08:00
pfirpfel
95e03954c4 Breaking of the Fellowship: Fix mana cost 2023-07-29 21:01:14 +02:00
kevlahnota
83a076f3dd Merge pull request #3557 from kevlahnota/newmaster2
AdventureDeckEditor minor formatting, prevent NPE
2023-07-29 20:04:33 +08:00
Anthony Calosa
4d47931072 Merge branch 'master' into newmaster2 2023-07-29 19:46:53 +08:00
Anthony Calosa
0d6fb1e7fd AdventureDeckEditor minor formatting, prevent NPE 2023-07-29 19:45:31 +08:00
kevlahnota
c9c7ba122a Merge pull request #3554 from klaxnek/klaxnek-patch-escardtranslations
Update card translations
2023-07-29 18:58:51 +08:00
klaxnek
edcb2aff0b Updated japanese card translations 2023-07-29 11:37:36 +02:00
Hans Mackowiak
b380e6a12b CountersProliferateEffect: add default cases 2023-07-29 11:26:20 +02:00
klaxnek
b9d8941d28 Update other languages card translations 2023-07-29 11:21:09 +02:00
tool4ever
37d5e9e697 Update call_for_aid.txt 2023-07-29 09:16:44 +00:00
klaxnek
b4f437d10d Update spanish patched card translations 2023-07-29 10:09:14 +02:00
klaxnek
702e7f120f Update spanish card translations 2023-07-29 10:08:17 +02:00
Hans Mackowiak
c15542f949 Regenerate rework (#3385)
* CardFactoryUtil: remove false keyword

* CardFactoryUtil: remove wrong regenerate Keyword

* CantRegenerate as Static

* ~small fixes

* RegenerationAbility as SubAbility to the Regeneration Effect

* Card: use shieldCount instead of Collection

* remove deprecated trigger

* fix AiLogic vs AILogic

* EffectAi: start of logic for CantRegenerate

* EffectAi: try to do StackPeek for CantRegenerate

* ~ use wither damage

* AI prediction against Damage

* CantRegenerate: begin logic against Combat Damage

* AnimateAi: start logic for Bone Shaman

* fix Runesword
2023-07-29 10:58:14 +03:00
kevlahnota
7bf4b5c126 Merge pull request #3553 from kevlahnota/newmaster2
update BuyButton for RewardScene
2023-07-29 08:09:17 +08:00
kevlahnota
3a8b7e02e3 Merge pull request #3549 from tool4ever/clean28
Clean up train continues
2023-07-29 08:08:52 +08:00
Anthony Calosa
f38b907f37 settext count 2023-07-29 08:00:37 +08:00
Anthony Calosa
ae0852dcbe update 2023-07-29 07:49:26 +08:00
Anthony Calosa
b1ff117026 update BuyButton for RewardScene 2023-07-29 07:41:44 +08:00
tool4EvEr
a2c1853536 Clean up even more 2023-07-28 21:38:16 +02:00
tool4EvEr
70de03381c Clean up 2023-07-28 19:56:08 +02:00
Northmoc
d0777fce21 Secret Council mechanic and cards (#3542) 2023-07-28 17:30:13 +00:00
tool4EvEr
28d2a174c5 Fix script 2023-07-28 18:53:38 +02:00
tool4EvEr
d32cde8889 Clean up train continues 2023-07-28 17:51:15 +02:00
kevlahnota
f6537fdb1a Merge pull request #3547 from kevlahnota/newmaster2
show quantity of items on Adventure Shop
2023-07-28 21:53:32 +08:00
Anthony Calosa
c4e22e8ba2 show quantity of items on Adventure Shop
- closes #3546
2023-07-28 21:44:49 +08:00
tool4ever
5174c42d98 Remove some obsolete code (#3540) 2023-07-28 10:17:40 +00:00
kevlahnota
b15b810e81 Merge pull request #3545 from kevlahnota/newmaster2
update token
2023-07-28 17:23:22 +08:00
kevlahnota
9d456a8ea1 Merge pull request #3544 from CCTV-1/master
updated simplified chinese translation
2023-07-28 17:22:41 +08:00
Anthony Calosa
ba1a2a171d update token 2023-07-28 17:06:42 +08:00
CCTV-1
8c14e89c26 fix card type translation. 2023-07-28 16:51:18 +08:00
tool4ever
ce7c7b9fc5 Update escape_from_orthanc.txt 2023-07-28 08:43:03 +02:00
tool4ever
8fb16ed545 Update oriq_loremage.txt 2023-07-28 08:42:17 +02:00
tool4ever
c2cb89f3f5 Update crown_of_gondor.txt 2023-07-28 08:41:15 +02:00
tool4ever
718906f339 Update aragorn_company_leader.txt 2023-07-27 19:22:24 +00:00
Peter Helbing
05d7e28455 set Nazgûl variants as alternate art (#3541) 2023-07-27 17:19:09 +03:00
Agetian
8774566ac0 - Added LTR/LTC achievements by Marek. (#3539)
- Added puzzles PS_LTR1 and PS_LTR2.
2023-07-27 12:19:36 +03:00
Northmoc
276fc693a8 MAT: tyvar_the_bellicose.txt + support (#3040) 2023-07-27 07:43:15 +00:00
Chris H
68d8187646 Version update (how do we automate these?) (#3538) 2023-07-27 08:46:22 +03:00
GitHub Actions
0b6e5f9983 [maven-release-plugin] prepare for next development iteration 2023-07-26 22:00:13 -04:00
GitHub Actions
294b8c445b [maven-release-plugin] prepare release forge-1.6.57 2023-07-26 22:00:13 -04:00
friarsol
e0d81e2b5f Set java compiler version for release 2023-07-26 22:00:13 -04:00
Simisays
73f98c2999 CMM Guff Rewrites History (#3523) 2023-07-26 20:53:33 +02:00
Simisays
56d416b19e Update vodalian_mindsinger.txt (#3537) 2023-07-26 19:25:27 +02:00
tool4ever
3b832e02fc Clean up (#3536) 2023-07-26 19:21:04 +02:00
Chris H
abb2ff3cdf Ring tempts you (#3453)
* Ring tempts you WIP

* add ring triggers

* Update RingTemptsYouEffect.java

* Add files via upload

* Update TriggerRingbearerChosen.java

* Update token-images.txt

* Update TrackableProperty.java

* Update CardView.java

* Update CardRenderer.java

* Update RingTemptsYouEffect.java

fix crash

* Update Card.java

* Update CardView.java

* Update TrackableProperty.java

* Update StaticAbilityContinuous.java

* Update StaticEffect.java

* Update RingTemptsYouEffect.java

* update sprite_manaicons.png

* Update FSkinProp.java

* Update FSkinImage.java

* Update CardFaceSymbols.java

* Update CardRenderer.java

* update trigger

* update desktop symbol, add aragorn company leader

* update cleanup, add bilbo, add birthday escape

* update cleanup

* add 3 cards

* add five cards

* add two cards

* update aragorn,update bombadil, add two cards

* add ten cards

* Update horses_of_the_bruinen.txt

* add dunedain rangers + cleanup

* Update gollums_bite.txt

* update cleanup

* add six cards

* delete unnecessary file

* Update rangers_firebrand.txt

* add two cards, add RingTemptedYou playerproperty

* update frodo, add three cards

* update sauron, samwise, add two cards

* Update sauron_the_dark_lord.txt

* update validplayer

* add six cards

* update smeagol

* update sauron ransom two piles

* add four cards

* add three cards

* update card scripts

* Update war_of_the_last_alliance.txt

* update scripts, update ringbearer

* update CardDetailUtil

* remove unused param

* Update affected

* remove unnecesary variables

* update

* update scripts

* update RingTemptsYouEffect

* fix cantblockby RingTemptsYouEffect.java

* The Ring: use numTemptYou for RingLevel

* Update dunedain_rangers.txt

* Update jaces_defeat.txt

* update lord of the nazgul

* fix theRing CardView

* update ringEffect, update translation

* update translation

* update gamestate

* replace switch with if else

* fix effect

* update gamestate, translation

* update restartgameeffect, remove unneeded clearRingBearer

---------

Co-authored-by: Anthony Calosa <anthonycalosa@gmail.com>
Co-authored-by: tool4ever <therealtoolkit@hotmail.com>
Co-authored-by: Hans Mackowiak <hanmac@gmx.de>
2023-07-26 20:07:41 +03:00
Anthony Calosa
69748ab0fb Update gwaihir_greatest_of_the_eagles.txt
- closes #3533
2023-07-26 16:39:24 +08:00
Anthony Calosa
09f2ea9b38 Merge pull request #3486 from jjayers99/master
Adventure updates
2023-07-26 15:10:34 +08:00
Anthony Calosa
7e9efa6edf indent 2023-07-26 14:58:47 +08:00