Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix some issues around Astral Spirit appearing in $classes #508

Merged
merged 2 commits into from
Jan 21, 2022
Merged

Fix some issues around Astral Spirit appearing in $classes #508

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc61cf0
Fix some issues around Astral Spirit appearing in
gausie Jan 21, 2022
2164031
Add test for fixing none class
gausie Jan 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/net/sourceforge/kolmafia/AscensionClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.util.Arrays;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import net.sourceforge.kolmafia.KoLConstants.Stat;
import net.sourceforge.kolmafia.objectpool.ItemPool;
Expand Down Expand Up @@ -42,6 +43,10 @@ public enum AscensionClass {
private final int primeStatIndex;
private final String stun;

public static Set<AscensionClass> allClasses() {
return Arrays.stream(values()).filter(a -> a.getId() > -1).collect(Collectors.toSet());
}

public static AscensionClass nameToClass(String name) {
if (name.equals("")) {
return null;
Expand Down
4 changes: 4 additions & 0 deletions src/net/sourceforge/kolmafia/textui/DataTypes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,6 +769,10 @@ public static final Value makeClassValue(
DataTypes.CLASS_TYPE, ascensionClass.getId(), ascensionClass.getName(), ascensionClass);
}

public static final Value makeClassValue(final int id, boolean returnDefault) {
return makeClassValue(AscensionClass.idToClass(id), returnDefault);
}

private static Value makeNormalizedSkill(final int num, String name) {
if (num == -1) {
return DataTypes.SKILL_INIT;
Expand Down
4 changes: 4 additions & 0 deletions src/net/sourceforge/kolmafia/textui/parsetree/ProxyRecordValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,10 @@ public ClassProxy(Value obj) {
}

public Value get_primestat() {
if (this.content == null) {
return DataTypes.STAT_INIT;
}

int primeIndex = ((AscensionClass) this.content).getPrimeStatIndex();

String name = null;
Expand Down
18 changes: 15 additions & 3 deletions src/net/sourceforge/kolmafia/textui/parsetree/Type.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,8 @@ public Value coerceValue(final Object object, final boolean returnDefault) {
switch (this.type) {
case DataTypes.TYPE_BOOLEAN:
return DataTypes.makeBooleanValue(integer);
case DataTypes.TYPE_CLASS:
return DataTypes.makeClassValue(integer, returnDefault);
case DataTypes.TYPE_INT:
return DataTypes.makeIntValue(integer);
case DataTypes.TYPE_FLOAT:
Expand Down Expand Up @@ -383,6 +385,18 @@ public Value coerceValue(final Object object, final boolean returnDefault) {
}
return null;
}
if (object instanceof AscensionClass) {
AscensionClass ascensionClass = (AscensionClass) object;
switch (this.type) {
case DataTypes.TYPE_INT:
return DataTypes.makeIntValue(ascensionClass.getId());
case DataTypes.TYPE_STRING:
return new Value(DataTypes.STRING_TYPE, ascensionClass.getName());
case DataTypes.TYPE_CLASS:
return DataTypes.makeClassValue(ascensionClass, returnDefault);
}
return null;
}
return null;
}

Expand All @@ -406,9 +420,7 @@ public Value allValues() {
this.addValues(list, AdventureDatabase.getAsLockableListModel());
break;
case DataTypes.TYPE_CLASS:
for (AscensionClass ascensionClass : AscensionClass.values()) {
list.add(DataTypes.makeClassValue(ascensionClass, true));
}
this.addValues(list, AscensionClass.allClasses());
break;
case DataTypes.TYPE_STAT:
this.addValues(list, DataTypes.STAT_ARRAY, 0, 3);
Expand Down