Commit Graph

4013 Commits

Author SHA1 Message Date
Rob Schnautz
3534eff26e enumerate cache statuses 2023-06-21 08:39:53 -05:00
schnautzr
c7f9ba7991 Merge branch 'Card-Forge:master' into working 2023-06-20 17:21:33 -05:00
Anthony Calosa
d14e706cb0 Fix starting ColorID 2023-06-20 20:36:15 +08:00
Rob Schnautz
21d1714090 change the way the common path is declared so it doesn't use the getPlanePath method 2023-06-18 20:57:34 -05:00
Rob Schnautz
be316ccd4e Add FilenameFilter for getting plane names 2023-06-18 19:27:46 -05:00
Rob Schnautz
80f5ee9253 resolve deck paths, move config.json to common 2023-06-17 22:20:09 -05:00
Rob Schnautz
c57dc1286a Merge branch 'working' of https://github.com/schnautzr/forge into working 2023-06-16 15:02:30 -05:00
Rob Schnautz
9c58fbe31e finish cleaning up sprite sorting; new Amonkhet sprites; general fixes 2023-06-16 15:02:00 -05:00
schnautzr
191956dc07 Merge branch 'Card-Forge:master' into working 2023-06-16 14:58:29 -05:00
Agetian
8b0fa88546 Adventure: several minor fixes / QoL changes (#3258)
* - Fix double music playback in deck selection/deck editor screens.
- Make shops use Esc to quit (consistent with other screens).
- Very minor style correction.

* - Experimental: sort editions by name in the SpellSmith card filter.

* - Experimental: sort editions by name in the SpellSmith card filter.

* - Revert the button assignment for the shop button until a better solution can be devised.

* - Added puzzles PS_MOM4, PS_MOM5.
- Fixed the name of PS_MOM3.

* - Avoid resetting the music for some of the scene events.

* - One more music tweak.

* - Fix imports.

* - Take care of seamless music in the inn.

* - Fix imports.

* - Fix more imports.
2023-06-16 07:54:52 +03:00
Rob Schnautz
015fd574a7 make several adventure resources common (particle_effects, skin, sprites, ui, most of world) 2023-06-14 01:19:09 -05:00
TabletopGeneral
1adb7e5462 Adventure - draft fixes (#3260)
* Adventure - draft fixes

* Update AdventureEventData.java

cleanup

---------

Co-authored-by: Anthony Calosa <anthonycalosa@gmail.com>
2023-06-13 19:01:54 +03:00
Anthony Calosa
b5d1b37ba0 update winlose 2023-06-13 01:48:00 +08:00
jjayers99
0f39541857 Merge branch 'master' of https://github.com/jjayers99/forge-updates 2023-06-11 23:11:56 -04:00
jjayers99
284b3023fc Adventure - 1 tile rivers, upping quest enemy spawn 2023-06-11 23:08:33 -04:00
Anthony Calosa
13605d5350 update 2023-06-10 09:00:55 +08:00
Anthony Calosa
a118a3df93 filter out invalid option for BoosterDraft 2023-06-09 21:16:25 +08:00
Agetian
7c2133d0a7 - Fix double music in player statistics screen. 2023-06-07 08:33:39 +03:00
Agetian
68ea350bf4 - Add music back to town events/draft scene. 2023-06-07 08:28:41 +03:00
Agetian
f3c8c60487 - Fix imports. 2023-06-06 20:51:59 +03:00
Agetian
dbae7c8a2c - Fix double music playback in the inn. 2023-06-06 20:46:47 +03:00
jjayers99
327f46f129 Adventure - Name overrides, new Slivers, Tibalt map fix 2023-06-05 15:27:37 -04:00
TabletopGeneral
794e1b7932 Merge branch 'Card-Forge:master' into master 2023-06-04 11:28:38 -04:00
jjayers99
6eb9dd071b Adventure - Deck editor event cleanup 2023-06-04 11:18:34 -04:00
jjayers99
c44554c43e Adventure - Temporarily disabling drafts containing P9 2023-06-04 11:16:40 -04:00
jjayers99
ff38ffda52 Adventure - Deck builder update for events 2023-06-04 09:22:50 -04:00
Anthony Calosa
bc890fee6e Merge pull request #3194 from kevlahnota/newmaster2
update booster reward
2023-06-04 11:43:13 +08:00
Anthony Calosa
b83963b285 adjust labels 2023-06-04 11:41:59 +08:00
Anthony Calosa
4eec93a3d8 increase text 2023-06-04 11:13:37 +08:00
Anthony Calosa
379344dc84 update 2023-06-04 11:07:33 +08:00
jjayers99
d952ff5f15 Adventure - fix mana shard handling 2023-06-03 22:20:35 -04:00
jjayers99
d0d329918d Revert "Adventure - shard count fix"
This reverts commit 6888f8627d.
2023-06-03 22:17:50 -04:00
jjayers99
6888f8627d Adventure - shard count fix 2023-06-03 22:15:10 -04:00
Anthony Calosa
11986e1412 update booster reward 2023-06-04 01:37:21 +08:00
jjayers99
c31537d66e Adventure card inventory update fix 2023-06-03 09:40:49 -04:00
Anthony Calosa
314b4e8fa7 update winlose 2023-06-03 02:29:35 +08:00
Anthony Calosa
deaf391c5c Merge pull request #3171 from jjayers99/master
Adventure events initial implementation
2023-06-03 00:55:36 +08:00
jjayers99
2392be77fd Adventure - Portal activation logic, area effect triggers 2023-06-01 15:16:09 -04:00
jjayers99
8e67b5474f Adventure tavern events, take 2 2023-05-31 16:36:34 -04:00
jjayers99
d6f5bf20f4 Adventure tavern events initial implementation 2023-05-31 00:00:21 -04:00
Anthony Calosa
15a4e28305 remove duplicated code 2023-05-31 12:00:16 +08:00
Anthony Calosa
b45d543e1a include setcode and artid for gamestate 2023-05-31 11:55:59 +08:00
Anthony Calosa
15116add08 remove redundant import 2023-05-30 19:53:10 +08:00
Anthony Calosa
15372e6dd6 update mobile gamestate options 2023-05-30 19:51:39 +08:00
Anthony Calosa
85cfdfca4d Merge pull request #3150 from leriomaggio/formats/pauper
Chaning Pauper as Sanctioned format
2023-05-28 19:03:57 +08:00
jjayers99
4a56991f6c Adventure fixes
Bugfix for Arena quest objectives that previously caused offer dialog to hang
Redo of Teferi Hideout collisions / terrain
2023-05-27 00:09:25 -04:00
Valerio Maggio
3d5ab82cc5 Merge remote-tracking branch 'upstream/master' into formats/pauper 2023-05-20 14:06:35 +01:00
Valerio Maggio
2049a3dce4 New PauperArchetypeCardGen DeckType added and UI updated for desktop/mobile 2023-05-20 13:59:29 +01:00
jjayers99
280361c651 Adding spawn points that can't be used to as exits 2023-05-17 22:26:22 -04:00
Valerio Maggio
a92b2a72c3 adding Random Pauper Color Deck in Gauntlet mode on mobile 2023-05-17 17:56:39 +01:00