Commit Graph

4198 Commits

Author SHA1 Message Date
Anthony Calosa
905006e362 Merge pull request #3331 from schnautzr/common-music
Common music
2023-07-04 11:19:52 +08:00
Anthony Calosa
63fb4874e4 Update DuelScene.java
include Insane difficulty for random GeneticAI decks
2023-07-03 10:40:40 +08:00
Anthony Calosa
96c88382dc Update MapViewScene.java
fix showing quest button on empty quest POI
2023-07-02 11:41:42 +08:00
Anthony Calosa
8fb92a9df1 Update Forge.java 2023-07-02 09:13:37 +08:00
Anthony Calosa
e5ebcb51e2 update 2023-07-02 09:08:43 +08:00
Anthony Calosa
75435aa699 add description 2023-07-02 08:56:32 +08:00
Anthony Calosa
a4505279aa update 2023-07-02 08:55:32 +08:00
Anthony Calosa
1f03836b20 update SettingsScene
- fix preferences
2023-07-02 08:50:41 +08:00
Anthony Calosa
059a407d2f remove duplicated code 2023-07-01 21:08:28 +08:00
Anthony Calosa
6b20505a2e update 2023-07-01 20:38:23 +08:00
Anthony Calosa
48709aed5d update player collision
- add flicker effect when restoring player collision after map/world duel
2023-07-01 20:31:51 +08:00
jjayers99
42b9581c9e Adventure - prevention from getting stuck between POI 2023-07-01 13:26:33 +02:00
Anthony Calosa
a5c6090b2f update GameHUD
- add GPS Icon on Zoom button to notify player for quest location
2023-06-30 14:24:27 +08:00
Anthony Calosa
93ce6e4425 Update HudScene.java 2023-06-30 13:33:49 +08:00
Anthony Calosa
c8e9fd2089 update 2023-06-30 13:09:09 +08:00
Anthony Calosa
e67539ebdd stop player movement when dialog is shown 2023-06-30 06:39:58 +08:00
Anthony Calosa
048426050b unused import 2023-06-29 22:54:01 +08:00
Anthony Calosa
65bba54900 .. 2023-06-29 22:48:35 +08:00
Anthony Calosa
3956fa6584 reset index 2023-06-29 20:01:16 +08:00
Anthony Calosa
49507b9b3b add quest button on MapViewScene
-to scroll available quests
2023-06-29 19:51:25 +08:00
Anthony Calosa
60c79a32c3 Quest location on MapViewScene 2023-06-29 16:34:57 +08:00
TabletopGeneral
d026e9324e MOM jumpstart typo, adventure event patch (#3357)
* Adventure - draft fixes

* Update AdventureEventData.java

cleanup

* Adventure map updates

Adding collision barriers around several maps, expanding entry objects to prevent moving outside the map

minor Temple of Gideon progress

* Adventure draft set filtering

Preventing sealed-only sets from being selected only for drafts

* Adventure mob spawn rate adjustment

Making enemy spawn allocation more reasonable while still allowing for higher and lower rates.

* Adventure - Map updates

Removing unneeded collision layers from dungeons

* Adventure - Fix for missing event rewards

getHumanPlayer() is backed by a transient field and will lose track of game wins if saved / reloaded

* Removal of unneeded collision layers

* Adventure - Event bugfix

Preventing NPE if event was created with an enemy participant that is no longer found in enemies.json

* MOM Red Jumpstart insert typo fix

---------

Co-authored-by: Anthony Calosa <anthonycalosa@gmail.com>
2023-06-29 09:59:15 +08:00
Anthony Calosa
dd1d5d09fe simplify 2023-06-28 12:01:00 +08:00
Anthony Calosa
cc4342b356 update 2023-06-28 11:58:01 +08:00
Anthony Calosa
d3a3c5ae69 restrict menus when DuelScene or RewardScene is loading 2023-06-28 11:37:24 +08:00
Rob Schnautz
2e7ba8c8a3 add support for music in common folder. currently only Shandalar may override, not Amonkhet. Need to add support for current plane to override instead of hard-coding Shandalar. 2023-06-24 10:27:09 -05:00
Anthony Calosa
e57566e7df update default plane 2023-06-24 15:33:46 +08:00
Anthony Calosa
05e488c263 from @jjayers99 2023-06-23 12:26:51 +08:00
Rob Schnautz
8877780b60 TileMapScene: use common maps (dungeons, cities, etc) 2023-06-22 13:55:15 -05:00
Rob Schnautz
545b8486db CardUtil use common decks 2023-06-22 11:28:10 -05:00
Anthony Calosa
918a38ece2 move CustomCards and Pics to common 2023-06-22 19:14:35 +08:00
Anthony Calosa
0f88548360 Merge pull request #3282 from schnautzr/working
Support common adventure resources, relocate resources to common directory, sorting, and groundwork for Amonkhet
2023-06-22 19:00:52 +08:00
TabletopGeneral
3098cc122f Adventure updates (#3309)
* Adventure - draft fixes

* Update AdventureEventData.java

cleanup

* Adventure map updates

Adding collision barriers around several maps, expanding entry objects to prevent moving outside the map

minor Temple of Gideon progress

* Adventure draft set filtering

Preventing sealed-only sets from being selected only for drafts

* Adventure mob spawn rate adjustment

Making enemy spawn allocation more reasonable while still allowing for higher and lower rates.

---------

Co-authored-by: Anthony Calosa <anthonycalosa@gmail.com>
2023-06-21 22:46:49 +03:00
Rob Schnautz
a5b28e578e optimize getFile 2023-06-21 10:23:50 -05:00
Rob Schnautz
1149f58192 consolidate getFile, eliminate need for enumeration, compacted log output, eliminated need for isCommon. 2023-06-21 09:41:10 -05:00
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