Skip to content

Commit ad6a616

Browse files
committed
Rogue matchmaking
1 parent 1048e1d commit ad6a616

File tree

26 files changed

+1597
-1101
lines changed

26 files changed

+1597
-1101
lines changed

build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,10 @@ subprojects {
211211
if (details.requested.group == 'org.apache.commons' && details.requested.name == 'commons-lang3') {
212212
details.useVersion '3.13.0'
213213
}
214+
215+
if (details.requested.group == 'org.wildfly.common' && details.requested.name == 'wildfly-common') {
216+
details.useVersion '1.5.1.Final'
217+
}
214218
}
215219
}
216220
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package net.demilich.metastone.game.events;
2+
3+
import com.hiddenswitch.spellsource.rpc.Spellsource;
4+
import net.demilich.metastone.game.GameContext;
5+
6+
/**
7+
* Just as the game starts, before mulligans
8+
*/
9+
public class GameInitializedEvent extends BasicGameEvent {
10+
11+
public GameInitializedEvent(GameContext context, int targetPlayerId, int sourcePlayerId) {
12+
super(Spellsource.GameEventTypeMessage.GameEventType.GAME_INITIALIZED, context, targetPlayerId, sourcePlayerId);
13+
}
14+
15+
}

spellsource-game/src/main/java/net/demilich/metastone/game/logic/GameLogic.java

Lines changed: 180 additions & 465 deletions
Large diffs are not rendered by default.
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package net.demilich.metastone.game.spells.trigger;
2+
3+
import com.hiddenswitch.spellsource.rpc.Spellsource;
4+
import net.demilich.metastone.game.entities.Entity;
5+
import net.demilich.metastone.game.events.GameEvent;
6+
import net.demilich.metastone.game.spells.desc.trigger.EventTriggerDesc;
7+
8+
public class GameInitializedTrigger extends EventTrigger {
9+
public GameInitializedTrigger(EventTriggerDesc desc) {
10+
super(desc);
11+
}
12+
13+
@Override
14+
protected boolean innerQueues(GameEvent event, Enchantment enchantment, Entity host) {
15+
return true;
16+
}
17+
18+
@Override
19+
public Spellsource.GameEventTypeMessage.GameEventType interestedIn() {
20+
return Spellsource.GameEventTypeMessage.GameEventType.GAME_INITIALIZED;
21+
}
22+
}
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
fragment rogueRun on RogueRun {
22
id
33
player
4-
seed
5-
choices,
6-
bossesDefeated,
4+
state
5+
bossesDefeated
76
deckByDeck {
87
...deck
98
...deckCards
109
}
10+
currentChoice {
11+
cards
12+
canPick
13+
}
1114
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
mutation makeRogueChoice($choiceId: BigInt!, $choices: [Int!]!) {
2+
makeRogueChoice(choiceId: $choiceId, choices: $choices) {
3+
...rogueRun
4+
}
5+
}

spellsource-graphql/graphql/shared/queries/getDecks.graphql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
query getDecks($user: String) {
2-
allDecks(condition: {trashed: false}) {
2+
allDecks(condition: {trashed: false, deckType: 1}) {
33
nodes {
44
...deck
55
}

0 commit comments

Comments
 (0)