Skip to content

Commit d7cec38

Browse files
- Compatibility with latest updates
1 parent 1e5ab88 commit d7cec38

File tree

8 files changed

+43
-26
lines changed

8 files changed

+43
-26
lines changed

.idea/compiler.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/java/thenothing/characters/TheCharacter.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@ public Color getCardRenderColor() {
3737

3838
@Override
3939
public AbstractCard getStartCardForEvent() {
40-
if (ThePlayerData.core.strikes.size() > 0) {
41-
return GameUtilities.getRandomElement(ThePlayerData.core.strikes).create();
42-
}
4340
for (PCLCustomCardSlot slot : PCLCustomCardSlot.getCards(getCardColor())) {
4441
if (slot.getBuilder(0).cardRarity == AbstractCard.CardRarity.BASIC) {
4542
return slot.make();

src/main/java/thenothing/resources/the/TheImages.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package thenothing.resources.the;
22

3+
import com.badlogic.gdx.Gdx;
4+
import com.badlogic.gdx.files.FileHandle;
5+
import pinacolada.characters.PCLCharacterSpriterAnimation;
36
import pinacolada.resources.AbstractImages;
47

58
public class TheImages extends AbstractImages

src/main/java/thenothing/resources/the/TheLoadout.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public ArrayList<String> getAvailableRelicIDs() {
5050
@Override
5151
public ArrayList<String> getBaseStartingRelics() {
5252
PCLLoadoutData data = getPreset();
53-
if (data != null && data.relicSlots.size() > 0 && EUIUtils.any(data.relicSlots, r -> r.selected != null)) {
53+
if (data != null && !data.relicSlots.isEmpty() && EUIUtils.any(data.relicSlots, r -> r.selected != null)) {
5454
return EUIUtils.arrayList();
5555
}
5656
return EUIUtils.arrayList(ARelic.DATA.ID);
@@ -63,12 +63,12 @@ protected void setDefaultCardsForData(PCLLoadoutData data) {
6363
data.addCardSlot(slots.get(0).ID, 5);
6464
data.addCardSlot(slots.get(1).ID, 5);
6565
}
66-
else if (slots.size() > 0) {
66+
else if (!slots.isEmpty()) {
6767
data.addCardSlot(slots.get(0).ID, 5);
6868
}
6969
else {
7070
ArrayList<String> cards = getAvailableCardIDs();
71-
if (cards.size() > 0) {
71+
if (!cards.isEmpty()) {
7272
data.addCardSlot(cards.get(0), 5);
7373
}
7474
if (cards.size() > 1) {
@@ -80,7 +80,7 @@ else if (slots.size() > 0) {
8080
@Override
8181
protected void setDefaultRelicsForData(PCLLoadoutData data) {
8282
ArrayList<PCLCustomRelicSlot> slots = EUIUtils.filter(PCLCustomRelicSlot.getRelics(color), slot -> slot.getBuilder(0).tier == AbstractRelic.RelicTier.STARTER);
83-
if (slots.size() > 0) {
83+
if (!slots.isEmpty()) {
8484
data.addRelicSlot(slots.get(0).ID);
8585
}
8686
}

src/main/java/thenothing/resources/the/ThePlayerData.java

Lines changed: 31 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,44 @@ public class ThePlayerData extends PCLPlayerData<TheResources, TheConfig, TheCha
2121

2222
public ThePlayerData(TheResources resources)
2323
{
24-
super(resources, 75, 99, 5, 3, 0, true, false);
24+
super(resources, 75, 99, 5, 3, 0, 0, 0);
2525
}
2626

2727
@Override
28-
public String[] getAdditionalBlightIDs(boolean customEnabled) {
29-
return !customEnabled ? EUIUtils.arrayMap(PCLCustomBlightSlot.getBlights(resources.cardColor, AbstractCard.CardColor.COLORLESS),
30-
String.class, slot -> slot.ID
31-
) : super.getAdditionalBlightIDs(customEnabled);
28+
public boolean canChangeSkin() {
29+
return true;
30+
}
31+
32+
@Override
33+
public boolean canEditCore() {
34+
return true;
35+
}
36+
37+
@Override
38+
public boolean canUseAugments() {
39+
return true;
40+
}
41+
42+
@Override
43+
public boolean canUseCustom() {
44+
return true;
3245
}
3346

3447
@Override
35-
public String[] getAdditionalCardIDs(boolean customEnabled) {
36-
return !customEnabled ? EUIUtils.arrayMap(PCLCustomCardSlot.getCards(resources.cardColor, AbstractCard.CardColor.COLORLESS),
48+
public boolean canUseCustomColorless() {
49+
return true;
50+
}
51+
52+
@Override
53+
public boolean canUseSummons() {
54+
return true;
55+
}
56+
57+
@Override
58+
public String[] getAdditionalBlightIDs(boolean customEnabled) {
59+
return !customEnabled ? EUIUtils.arrayMap(PCLCustomBlightSlot.getBlights(resources.cardColor, AbstractCard.CardColor.COLORLESS),
3760
String.class, slot -> slot.ID
38-
) : super.getAdditionalCardIDs(customEnabled);
61+
) : super.getAdditionalBlightIDs(customEnabled);
3962
}
4063

4164
@Override
@@ -52,12 +75,6 @@ public String[] getAdditionalRelicIDs(boolean customEnabled) {
5275
) : super.getAdditionalRelicIDs(customEnabled);
5376
}
5477

55-
@Override
56-
public List<PCLLoadout> getAvailableLoadouts()
57-
{
58-
return Collections.emptyList();
59-
}
60-
6178
@Override
6279
public Class<TheCharacter> getCharacterClass() {
6380
return TheCharacter.class;

src/main/java/thenothing/resources/the/TheResources.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ public TheResources()
2929
// The colorless pool is filled with ALL colorless cards by default. This will determine whether a colorless card is allowed when playing as this character
3030
// In this example, we filter out any colorless cards exclusive to other Fabricate characters
3131
@Override
32-
public boolean containsColorless(AbstractCard card)
33-
{
32+
public boolean containsColorless(AbstractCard card) {
3433
if (card instanceof PCLCard) {
3534
return ((PCLCard) card).cardData.resources == PGR.core || ((PCLCard) card).cardData.resources == this;
3635
}

src/main/resources/ModTheSpire.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"author_list": ["PinaColada"],
55
"description": "Adds a new playable character.",
66
"credits" : "",
7-
"version": "1.0.2",
8-
"sts_version": "10-04-2022",
7+
"version": "1.0.4",
8+
"sts_version": "12-18-2022",
99
"mts_version": "3.30.0",
1010
"dependencies": ["basemod", "stslib", "extendedui", "pinacolada-fabricate"],
1111
"update_json": ""

0 commit comments

Comments
 (0)