ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved the different table draft formats to separate package; WeightDraftBot now properly works with missing card values

Browse Source
This commit is contained in:
jakub.salavec
2025-03-12 10:33:51 +01:00
parent 70476f1bf5
commit 4d95f6ee13
14 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/TableDraftDefinitions.java
View File

@@ -1,10 +1,10 @@
package com.gempukku.lotro.draft3; package com.gempukku.lotro.draft3;
import com.gempukku.lotro.collection.CollectionsManager; import com.gempukku.lotro.collection.CollectionsManager;
import com.gempukku.lotro.draft3.fotr.FotrTableDraftDefinition; import com.gempukku.lotro.draft3.format.fotr.FotrTableDraftDefinition;
import com.gempukku.lotro.draft3.fotr_mixed.FotrMixedTableDraftDefinition; import com.gempukku.lotro.draft3.format.fotr_mixed.FotrMixedTableDraftDefinition;
import com.gempukku.lotro.draft3.ttt.TttTableDraftDefinition; import com.gempukku.lotro.draft3.format.ttt.TttTableDraftDefinition;
import com.gempukku.lotro.draft3.ttt_mixed.TttMixedTableDraftDefinition; import com.gempukku.lotro.draft3.format.ttt_mixed.TttMixedTableDraftDefinition;
import com.gempukku.lotro.game.LotroCardBlueprintLibrary; import com.gempukku.lotro.game.LotroCardBlueprintLibrary;
import com.gempukku.lotro.game.formats.LotroFormatLibrary; import com.gempukku.lotro.game.formats.LotroFormatLibrary;

2
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/bot/WeightDraftBot.java
View File

@@ -48,7 +48,7 @@ public class WeightDraftBot extends DraftPlayer implements DraftBot {
private double getTotalValue(List<String> topCards) { private double getTotalValue(List<String> topCards) {
// Sum up the values of the top N cards // Sum up the values of the top N cards
return topCards.stream() return topCards.stream()
.mapToDouble(cardId -> cardValues.getOrDefault(cardId, 0.0)) .mapToDouble(cardId -> cardValues.getOrDefault(cardId, 0.1))
.sum(); .sum();
} }

2
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/fotr/FotrDraftCardEvaluator.java → gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/fotr/FotrDraftCardEvaluator.java
View File

@@ -1,4 +1,4 @@
package com.gempukku.lotro.draft3.fotr; package com.gempukku.lotro.draft3.format.fotr;
import com.gempukku.lotro.common.AppConfig; import com.gempukku.lotro.common.AppConfig;
import com.gempukku.lotro.common.Side; import com.gempukku.lotro.common.Side;

2
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/fotr/FotrTableDraftBoosterProducer.java → gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/fotr/FotrTableDraftBoosterProducer.java
View File

@@ -1,4 +1,4 @@
package com.gempukku.lotro.draft3.fotr; package com.gempukku.lotro.draft3.format.fotr;
import com.gempukku.lotro.collection.CollectionsManager; import com.gempukku.lotro.collection.CollectionsManager;
import com.gempukku.lotro.draft3.Booster; import com.gempukku.lotro.draft3.Booster;

3
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/fotr/FotrTableDraftDefinition.java → gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/fotr/FotrTableDraftDefinition.java
View File

@@ -1,11 +1,10 @@
package com.gempukku.lotro.draft3.fotr; package com.gempukku.lotro.draft3.format.fotr;
import com.gempukku.lotro.collection.CollectionsManager; import com.gempukku.lotro.collection.CollectionsManager;
import com.gempukku.lotro.db.vo.CollectionType; import com.gempukku.lotro.db.vo.CollectionType;
import com.gempukku.lotro.draft3.*; import com.gempukku.lotro.draft3.*;
import com.gempukku.lotro.draft3.timer.DraftTimer; import com.gempukku.lotro.draft3.timer.DraftTimer;
import com.gempukku.lotro.draft3.timer.DraftTimerProducer; import com.gempukku.lotro.draft3.timer.DraftTimerProducer;
import com.gempukku.lotro.game.CardNotFoundException;
import com.gempukku.lotro.game.LotroCardBlueprintLibrary; import com.gempukku.lotro.game.LotroCardBlueprintLibrary;
import com.gempukku.lotro.game.formats.LotroFormatLibrary; import com.gempukku.lotro.game.formats.LotroFormatLibrary;

4
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/fotr/FotrTableDraftStartingCollectionProducer.java → gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/fotr/FotrTableDraftStartingCollectionProducer.java
View File

@@ -1,4 +1,4 @@
package com.gempukku.lotro.draft3.fotr; package com.gempukku.lotro.draft3.format.fotr;
import com.gempukku.lotro.collection.CollectionsManager; import com.gempukku.lotro.collection.CollectionsManager;
import com.gempukku.lotro.draft3.StartingCollectionProducer; import com.gempukku.lotro.draft3.StartingCollectionProducer;
@@ -39,7 +39,7 @@ public class FotrTableDraftStartingCollectionProducer implements StartingCollect
@Override @Override
public MutableCardCollection getStartingCardCollection(String uniqueEventName, String playerName) { public MutableCardCollection getStartingCardCollection(String uniqueEventName, String playerName) {
long seed = uniqueEventName.hashCode() + (long) playerName.hashCode() * HIGH_ENOUGH_PRIME_NUMBER; long seed = uniqueEventName.hashCode() + (long) playerName.hashCode() * HIGH_ENOUGH_PRIME_NUMBER;
Random rnd = new Random(seed); Random rnd = new Random(seed);
final DefaultCardCollection startingCollection = new DefaultCardCollection(); final DefaultCardCollection startingCollection = new DefaultCardCollection();

2
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/fotr_mixed/FotrMixedTableDraftBoosterProducer.java → gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/fotr_mixed/FotrMixedTableDraftBoosterProducer.java
View File

@@ -1,4 +1,4 @@
package com.gempukku.lotro.draft3.fotr_mixed; package com.gempukku.lotro.draft3.format.fotr_mixed;
import com.gempukku.lotro.collection.CollectionsManager; import com.gempukku.lotro.collection.CollectionsManager;
import com.gempukku.lotro.draft3.Booster; import com.gempukku.lotro.draft3.Booster;

6
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/fotr_mixed/FotrMixedTableDraftDefinition.java → gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/fotr_mixed/FotrMixedTableDraftDefinition.java
View File

@@ -1,10 +1,10 @@
package com.gempukku.lotro.draft3.fotr_mixed; package com.gempukku.lotro.draft3.format.fotr_mixed;
import com.gempukku.lotro.collection.CollectionsManager; import com.gempukku.lotro.collection.CollectionsManager;
import com.gempukku.lotro.db.vo.CollectionType; import com.gempukku.lotro.db.vo.CollectionType;
import com.gempukku.lotro.draft3.*; import com.gempukku.lotro.draft3.*;
import com.gempukku.lotro.draft3.fotr.FotrDraftCardEvaluator; import com.gempukku.lotro.draft3.format.fotr.FotrDraftCardEvaluator;
import com.gempukku.lotro.draft3.fotr.FotrTableDraftStartingCollectionProducer; import com.gempukku.lotro.draft3.format.fotr.FotrTableDraftStartingCollectionProducer;
import com.gempukku.lotro.draft3.timer.DraftTimer; import com.gempukku.lotro.draft3.timer.DraftTimer;
import com.gempukku.lotro.draft3.timer.DraftTimerProducer; import com.gempukku.lotro.draft3.timer.DraftTimerProducer;
import com.gempukku.lotro.game.LotroCardBlueprintLibrary; import com.gempukku.lotro.game.LotroCardBlueprintLibrary;

2
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/ttt/TttDraftCardEvaluator.java → gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/ttt/TttDraftCardEvaluator.java
View File

@@ -1,4 +1,4 @@
package com.gempukku.lotro.draft3.ttt; package com.gempukku.lotro.draft3.format.ttt;
import com.gempukku.lotro.common.AppConfig; import com.gempukku.lotro.common.AppConfig;
import com.gempukku.lotro.common.Side; import com.gempukku.lotro.common.Side;

2
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/ttt/TttTableDraftBoosterProducer.java → gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/ttt/TttTableDraftBoosterProducer.java
View File

@@ -1,4 +1,4 @@
package com.gempukku.lotro.draft3.ttt; package com.gempukku.lotro.draft3.format.ttt;
import com.gempukku.lotro.collection.CollectionsManager; import com.gempukku.lotro.collection.CollectionsManager;
import com.gempukku.lotro.draft3.Booster; import com.gempukku.lotro.draft3.Booster;

2
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/ttt/TttTableDraftDefinition.java → gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/ttt/TttTableDraftDefinition.java
View File

@@ -1,4 +1,4 @@
package com.gempukku.lotro.draft3.ttt; package com.gempukku.lotro.draft3.format.ttt;
import com.gempukku.lotro.collection.CollectionsManager; import com.gempukku.lotro.collection.CollectionsManager;
import com.gempukku.lotro.db.vo.CollectionType; import com.gempukku.lotro.db.vo.CollectionType;

4
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/ttt/TttTableDraftStartingCollectionProducer.java → gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/ttt/TttTableDraftStartingCollectionProducer.java
View File

@@ -1,4 +1,4 @@
package com.gempukku.lotro.draft3.ttt; package com.gempukku.lotro.draft3.format.ttt;
import com.gempukku.lotro.collection.CollectionsManager; import com.gempukku.lotro.collection.CollectionsManager;
import com.gempukku.lotro.draft3.StartingCollectionProducer; import com.gempukku.lotro.draft3.StartingCollectionProducer;
@@ -40,7 +40,7 @@ public class TttTableDraftStartingCollectionProducer implements StartingCollecti
@Override @Override
public MutableCardCollection getStartingCardCollection(String uniqueEventName, String playerName) { public MutableCardCollection getStartingCardCollection(String uniqueEventName, String playerName) {
long seed = uniqueEventName.hashCode() + (long) playerName.hashCode() * HIGH_ENOUGH_PRIME_NUMBER; long seed = uniqueEventName.hashCode() + (long) playerName.hashCode() * HIGH_ENOUGH_PRIME_NUMBER;
Random rnd = new Random(seed); Random rnd = new Random(seed);
final DefaultCardCollection startingCollection = new DefaultCardCollection(); final DefaultCardCollection startingCollection = new DefaultCardCollection();

2
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/ttt_mixed/TttMixedTableDraftBoosterProducer.java → gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/ttt_mixed/TttMixedTableDraftBoosterProducer.java
View File

@@ -1,4 +1,4 @@
package com.gempukku.lotro.draft3.ttt_mixed; package com.gempukku.lotro.draft3.format.ttt_mixed;
import com.gempukku.lotro.collection.CollectionsManager; import com.gempukku.lotro.collection.CollectionsManager;
import com.gempukku.lotro.draft3.Booster; import com.gempukku.lotro.draft3.Booster;

6
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/ttt_mixed/TttMixedTableDraftDefinition.java → gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft3/format/ttt_mixed/TttMixedTableDraftDefinition.java
View File

@@ -1,12 +1,12 @@
package com.gempukku.lotro.draft3.ttt_mixed; package com.gempukku.lotro.draft3.format.ttt_mixed;
import com.gempukku.lotro.collection.CollectionsManager; import com.gempukku.lotro.collection.CollectionsManager;
import com.gempukku.lotro.db.vo.CollectionType; import com.gempukku.lotro.db.vo.CollectionType;
import com.gempukku.lotro.draft3.*; import com.gempukku.lotro.draft3.*;
import com.gempukku.lotro.draft3.timer.DraftTimer; import com.gempukku.lotro.draft3.timer.DraftTimer;
import com.gempukku.lotro.draft3.timer.DraftTimerProducer; import com.gempukku.lotro.draft3.timer.DraftTimerProducer;
import com.gempukku.lotro.draft3.ttt.TttDraftCardEvaluator; import com.gempukku.lotro.draft3.format.ttt.TttDraftCardEvaluator;
import com.gempukku.lotro.draft3.ttt.TttTableDraftStartingCollectionProducer; import com.gempukku.lotro.draft3.format.ttt.TttTableDraftStartingCollectionProducer;
import com.gempukku.lotro.game.LotroCardBlueprintLibrary; import com.gempukku.lotro.game.LotroCardBlueprintLibrary;
import com.gempukku.lotro.game.formats.LotroFormatLibrary; import com.gempukku.lotro.game.formats.LotroFormatLibrary;