maj/MonsterCards
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds languages to monster cards.

Browse Source
This commit is contained in:
Tom Hicks
2020-09-01 23:13:17 -07:00
committed by Tom Hicks
parent 30c6dc7ee5
commit d7cf01e30d
5 changed files with 453 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
Android/app/src/main/java/com/majinnaibu/monstercards/models/Language.java
View File

@@ -1,74 +1,37 @@
package com.majinnaibu.monstercards.models;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.util.Comparator;
import java.util.Objects;
public class Language implements Comparator<Language>, Comparable<Language> {
private String mName;
private boolean mSpeaks;
public Language(String name, boolean speaks) {
mName = name;
mSpeaks = speaks;
}
private String mName;
public String getName() {
return mName;
}
public void setName(String value) {
mName = value;
}
private boolean mSpeaks;
public boolean getSpeaks() {
return mSpeaks;
}
public void setSpeaks(boolean value) {
mSpeaks = value;
}
@Override
public int compareTo(Language o) {
if (this.mSpeaks && !o.mSpeaks) {
return -1;
}
if (!this.mSpeaks && o.mSpeaks) {
return 1;
}
return this.mName.compareToIgnoreCase(o.mName);
return this.getName().compareToIgnoreCase(o.getName());
}
@Override
public int compare(@NonNull Language o1, Language o2) {
if (o1.mSpeaks && !o2.mSpeaks) {
return -1;
}
if (!o1.mSpeaks && o2.mSpeaks) {
return 1;
}
return o1.mName.compareToIgnoreCase(o2.mName);
}
@Override
public boolean equals(@Nullable Object obj) {
if (obj == null) {
return false;
}
if (!(obj instanceof Language)) {
return false;
}
Language otherLanguage = (Language) obj;
if (!Objects.equals(this.mName, otherLanguage.mName)) {
return false;
}
if (this.mSpeaks != otherLanguage.mSpeaks) {
return false;
}
return true;
public int compare(Language o1, Language o2) {
return o1.getName().compareToIgnoreCase(o2.getName());
}
}

221
Android/app/src/main/java/com/majinnaibu/monstercards/models/Monster.java
View File

@@ -4,6 +4,7 @@ import com.majinnaibu.monstercards.helpers.StringHelper;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
@@ -14,6 +15,9 @@ public class Monster {
public Monster() {
mSavingThrows = new HashSet<>();
mSkills = new HashSet<>();
mDamageTypes = new HashSet<>();
mConditionImmunities = new HashSet<>();
mLanguages = new HashSet<>();
}
private String mName;
@@ -619,4 +623,221 @@ public class Monster {
return sb.toString();
}
private HashSet<DamageType> mDamageTypes;
public Set<DamageType> getDamageTypes() {
return mDamageTypes;
}
public void addDamageType(DamageType damageType) {
// TODO: make this remove the damage type with the same name if it exists first
mDamageTypes.add(damageType);
}
public void removeDamageType(DamageType damageType) {
mDamageTypes.remove(damageType);
}
public void clearDamageTypes() {
mDamageTypes.clear();
}
public String getDamageVulnerabilitiesDescription() {
ArrayList<String> vulnerabilities = new ArrayList<>();
for (DamageType damageType : mDamageTypes) {
if (damageType != null && "v".equals(damageType.getType()) && !StringHelper.isNullOrEmpty(damageType.getName())) {
vulnerabilities.add(damageType.getName());
}
}
Collections.sort(vulnerabilities);
return StringHelper.oxfordJoin(", ", ", and ", " and ", vulnerabilities);
}
public String getDamageResistancesDescription() {
ArrayList<String> vulnerabilities = new ArrayList<>();
for (DamageType damageType : mDamageTypes) {
if (damageType != null && "r".equals(damageType.getType()) && !StringHelper.isNullOrEmpty(damageType.getName())) {
vulnerabilities.add(damageType.getName());
}
}
Collections.sort(vulnerabilities);
return StringHelper.oxfordJoin(", ", ", and ", " and ", vulnerabilities);
}
public String getDamageImmunitiesDescription() {
ArrayList<String> vulnerabilities = new ArrayList<>();
for (DamageType damageType : mDamageTypes) {
if (damageType != null && "i".equals(damageType.getType()) && !StringHelper.isNullOrEmpty(damageType.getName())) {
vulnerabilities.add(damageType.getName());
}
}
Collections.sort(vulnerabilities);
return StringHelper.oxfordJoin(", ", ", and ", " and ", vulnerabilities);
}
private HashSet<String> mConditionImmunities;
public Set<String> getConditionImmunities() {
return mConditionImmunities;
}
public void addConditionImmunity(String condition) {
// TODO: filter out duplicates
mConditionImmunities.add(condition);
}
public void removeConditionImmunity(String condition) {
// TODO: make sure this works even though we're using strings
mConditionImmunities.remove(condition);
}
public void clearConditionImmunities() {
mConditionImmunities.clear();
}
public String getConditionImmunitiesDescription() {
ArrayList<String> immunities = new ArrayList<>(getConditionImmunities());
Collections.sort(immunities);
return StringHelper.oxfordJoin(", ", ", and ", " and ", immunities);
}
private String mBlindsight;
public String getBlindsight() {
return mBlindsight;
}
public void setBlindsight(String value) {
mBlindsight = value;
}
private boolean mIsBlind;
public boolean getIsBlind() {
return mIsBlind;
}
public void setIsBlind(boolean value) {
mIsBlind = value;
}
private String mDarkvision;
public String getDarkvision() {
return mDarkvision;
}
public void setDarkvision(String value) {
mDarkvision = value;
}
private String mTremorsense;
public String getTremorsense() {
return mTremorsense;
}
public void setTremorsense(String value) {
mTremorsense = value;
}
private String mTruesight;
public String getTruesight() {
return mTruesight;
}
public void setTruesight(String value) {
mTruesight = value;
}
public String getSensesDescription() {
ArrayList<String> parts = new ArrayList<>();
String blindsight = getBlindsight();
if (!StringHelper.isNullOrEmpty(blindsight) && !"0".equals(blindsight)) {
parts.add(String.format(Locale.US, "blindsight %s ft.%s", blindsight, getIsBlind() ? " (blind beyond this radius)" : ""));
}
String darkvision = getDarkvision();
if (!StringHelper.isNullOrEmpty(darkvision) && !"0".equals(darkvision)) {
parts.add(String.format(Locale.US, "darkvision %s ft.", darkvision));
}
String tremorsense = getTremorsense();
if (!StringHelper.isNullOrEmpty(tremorsense) && !"0".equals(tremorsense)) {
parts.add(String.format(Locale.US, "tremorsense %s ft.", tremorsense));
}
String truesight = getTruesight();
if (!StringHelper.isNullOrEmpty(truesight) && !"0".equals(truesight)) {
parts.add(String.format(Locale.US, "truesight %s ft.", truesight));
}
parts.add(String.format(Locale.US, "passive Perception %d", 10 + getWisdomModifier()));
return StringHelper.join(", ", parts);
}
private HashSet<Language> mLanguages;
public Set<Language> getLanguages() {
return mLanguages;
}
public void addLanguage(Language value) {
mLanguages.add(value);
}
public void removeLanguage(Language value) {
mLanguages.remove(value);
}
public void clearLanguages() {
mLanguages.clear();
}
private int mTelepathy;
public int getTelepathy() {
return mTelepathy;
}
public void setTelepathy(int value) {
mTelepathy = value;
}
private String mUnderstandsBut;
public String getUnderstandsBut() {
return mUnderstandsBut;
}
public void setUnderstandsBut(String value) {
mUnderstandsBut = value;
}
public String getLanguagesDescription() {
ArrayList<String> spokenLanguages = new ArrayList<>();
ArrayList<String> understoodLanguages = new ArrayList<>();
for (Language language : mLanguages) {
if (language != null) {
if (language.getSpeaks()) {
spokenLanguages.add(language.getName());
} else {
understoodLanguages.add(language.getName());
}
}
}
Collections.sort(spokenLanguages);
Collections.sort(understoodLanguages);
String spokenLanguagesString = StringHelper.oxfordJoin(", ", ", and ", " and ", spokenLanguages);
String understoodLanguagesString = StringHelper.oxfordJoin(", ", ", and ", " and ", understoodLanguages);
String understandsBut = getUnderstandsBut();
boolean hasUnderstandsBut = understandsBut.length() > 0;
int telepathy = getTelepathy();
boolean hasTelepathy = telepathy > 0;
String telepathyString = String.format(Locale.US, ", telepathy %d ft.", telepathy);
if (spokenLanguages.size() > 0) {
if (understoodLanguages.size() > 0) {
return String.format(
"%s, understands %s%s%s",
spokenLanguagesString,
understoodLanguagesString,
hasUnderstandsBut ? " but " + understandsBut : "",
hasTelepathy ? telepathyString : "");
} else {
return String.format(
"%s%s%s",
spokenLanguagesString,
hasUnderstandsBut ? " but " + understandsBut : "",
hasTelepathy ? telepathyString : "");
}
} else {
if (understoodLanguages.size() > 0) {
return String.format(
"understands %s%s%s",
understoodLanguagesString,
hasUnderstandsBut ? " but " + understandsBut : "",
hasTelepathy ? telepathyString : "");
} else {
return String.format(
"%S%s",
hasUnderstandsBut ? "none but " + understandsBut : "",
hasTelepathy ? telepathyString : "");
}
}
}
}

107
Android/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterFragment.java
View File

@@ -15,6 +15,8 @@ import androidx.lifecycle.ViewModelProvider;
import com.majinnaibu.monstercards.R;
import com.majinnaibu.monstercards.helpers.StringHelper;
import com.majinnaibu.monstercards.models.DamageType;
import com.majinnaibu.monstercards.models.Language;
import com.majinnaibu.monstercards.models.Monster;
import com.majinnaibu.monstercards.models.SavingThrow;
import com.majinnaibu.monstercards.models.Skill;
@@ -70,6 +72,33 @@ public class MonsterFragment extends Fragment {
//Skills
monster.addSkill(new Skill("perception", "wis"));
monster.addSkill(new Skill("stealth", "dexterity"));
// Damage Types
monster.addDamageType(new DamageType("acid", " (Vulnerable)", "v"));
monster.addDamageType(new DamageType("bludgeoning", " (Vulnerable)", "v"));
monster.addDamageType(new DamageType("cold", " (Resistant)", "r"));
monster.addDamageType(new DamageType("fire", " (Resistant)", "r"));
monster.addDamageType(new DamageType("force", " (Immune)", "i"));
monster.addDamageType(new DamageType("lightning", " (Immune)", "i"));
monster.addDamageType(new DamageType("necrotic", " (Vulnerable)", "v"));
monster.addDamageType(new DamageType("piercing", " (Resistant)", "r"));
monster.addDamageType(new DamageType("poison", " (Immune)", "i"));
// Condition Immunities
monster.addConditionImmunity("blinded");
// Senses
monster.setBlindsight("10");
monster.setIsBlind(true);
monster.setDarkvision("20");
monster.setTremorsense("30");
monster.setTruesight("40");
monster.setTelepathy(20);
monster.setUnderstandsBut("doesn't care");
// Languages
monster.addLanguage(new Language("English", true));
monster.addLanguage(new Language("Steve", false));
monster.addLanguage(new Language("Spanish", true));
monster.addLanguage(new Language("French", true));
monster.addLanguage(new Language("Mermataur", false));
monster.addLanguage(new Language("Goldfish", false));
// Challenge Rating
monster.setChallengeRating("*");
@@ -194,6 +223,84 @@ public class MonsterFragment extends Fragment {
}
});
final TextView monsterDamageVulnerabilities = root.findViewById(R.id.damage_vulnerabilities);
monsterViewModel.getDamageVulnerabilities().observe(getViewLifecycleOwner(), new Observer<String>() {
@Override
public void onChanged(String damageType) {
if (StringHelper.isNullOrEmpty(damageType)) {
monsterDamageVulnerabilities.setVisibility(View.GONE);
} else {
monsterDamageVulnerabilities.setVisibility(View.VISIBLE);
}
monsterDamageVulnerabilities.setText(Html.fromHtml("<b>Damage Vulnerabilities</b> " + damageType));
}
});
final TextView monsterDamageResistances = root.findViewById(R.id.damage_resistances);
monsterViewModel.getDamageResistances().observe(getViewLifecycleOwner(), new Observer<String>() {
@Override
public void onChanged(String damageType) {
if (StringHelper.isNullOrEmpty(damageType)) {
monsterDamageResistances.setVisibility(View.GONE);
} else {
monsterDamageResistances.setVisibility(View.VISIBLE);
}
monsterDamageResistances.setText(Html.fromHtml("<b>Damage Resistances</b> " + damageType));
}
});
final TextView monsterDamageImmunities = root.findViewById(R.id.damage_immunities);
monsterViewModel.getDamageImmunities().observe(getViewLifecycleOwner(), new Observer<String>() {
@Override
public void onChanged(String damageType) {
if (StringHelper.isNullOrEmpty(damageType)) {
monsterDamageImmunities.setVisibility(View.GONE);
} else {
monsterDamageImmunities.setVisibility(View.VISIBLE);
}
monsterDamageImmunities.setText(Html.fromHtml("<b>Damage Immunities</b> " + damageType));
}
});
final TextView monsterConditionImmunities = root.findViewById(R.id.condition_immunities);
monsterViewModel.getConditionImmunities().observe(getViewLifecycleOwner(), new Observer<String>() {
@Override
public void onChanged(String conditionImmunities) {
if (StringHelper.isNullOrEmpty(conditionImmunities)) {
monsterConditionImmunities.setVisibility(View.GONE);
} else {
monsterConditionImmunities.setVisibility(View.VISIBLE);
}
monsterConditionImmunities.setText(Html.fromHtml("<b>Condition Immunities</b> " + conditionImmunities));
}
});
final TextView monsterSenses = root.findViewById(R.id.senses);
monsterViewModel.getSenses().observe(getViewLifecycleOwner(), new Observer<String>() {
@Override
public void onChanged(String senses) {
if (StringHelper.isNullOrEmpty(senses)) {
monsterSenses.setVisibility(View.GONE);
} else {
monsterSenses.setVisibility(View.VISIBLE);
}
monsterSenses.setText(Html.fromHtml("<b>Senses</b> " + senses));
}
});
final TextView monsterLanguages = root.findViewById(R.id.languages);
monsterViewModel.getLanguages().observe(getViewLifecycleOwner(), new Observer<String>() {
@Override
public void onChanged(String languages) {
if (StringHelper.isNullOrEmpty(languages)) {
monsterLanguages.setVisibility(View.GONE);
} else {
monsterLanguages.setVisibility(View.VISIBLE);
}
monsterLanguages.setText(Html.fromHtml("<b>Languages</b> " + languages));
}
});
return root;
}
}

42
Android/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterViewModel.java
View File

@@ -36,6 +36,18 @@ public class MonsterViewModel extends ViewModel {
mSavingThrows.setValue("");
mSkills = new MutableLiveData<>();
mSkills.setValue("");
mDamageVulnerabilities = new MutableLiveData<>();
mDamageVulnerabilities.setValue("");
mDamageResistances = new MutableLiveData<>();
mDamageResistances.setValue("");
mDamageImmunities = new MutableLiveData<>();
mDamageImmunities.setValue("");
mConditionImmunities = new MutableLiveData<>();
mConditionImmunities.setValue("");
mSenses = new MutableLiveData<>();
mSenses.setValue("");
mLanguages = new MutableLiveData<>();
mLanguages.setValue("");
}
private MutableLiveData<String> mName;
@@ -90,6 +102,30 @@ public class MonsterViewModel extends ViewModel {
public LiveData<String> getSkills() {
return mSkills;
}
private MutableLiveData<String> mDamageVulnerabilities;
public LiveData<String> getDamageVulnerabilities() {
return mDamageVulnerabilities;
}
private MutableLiveData<String> mDamageResistances;
public LiveData<String> getDamageResistances() {
return mDamageResistances;
}
private MutableLiveData<String> mDamageImmunities;
public LiveData<String> getDamageImmunities() {
return mDamageImmunities;
}
private MutableLiveData<String> mConditionImmunities;
public LiveData<String> getConditionImmunities() {
return mConditionImmunities;
}
private MutableLiveData<String> mSenses;
public LiveData<String> getSenses() {
return mSenses;
}
private MutableLiveData<String> mLanguages;
public LiveData<String> getLanguages() {
return mLanguages;
}
private Monster mMonster;
public void setMonster(Monster monster) {
@@ -107,5 +143,11 @@ public class MonsterViewModel extends ViewModel {
mCharisma.setValue(monster.getCharismaDescription());
mSavingThrows.setValue(monster.getSavingThrowsDescription());
mSkills.setValue(monster.getSkillsDescription());
mDamageVulnerabilities.setValue(mMonster.getDamageVulnerabilitiesDescription());
mDamageResistances.setValue(mMonster.getDamageResistancesDescription());
mDamageImmunities.setValue(mMonster.getDamageImmunitiesDescription());
mConditionImmunities.setValue(mMonster.getConditionImmunitiesDescription());
mSenses.setValue(monster.getSensesDescription());
mLanguages.setValue(mMonster.getLanguagesDescription());
}
}

78
Android/app/src/main/res/layout/fragment_monster.xml
View File

@@ -331,5 +331,83 @@
app:layout_constraintTop_toBottomOf="@+id/saving_throws"
tools:text="Skills" />
<TextView
android:id="@+id/damage_vulnerabilities"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/skills"
tools:text="Damage Vulnerabilities" />
<TextView
android:id="@+id/damage_resistances"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/damage_vulnerabilities"
tools:text="Damage Resistances" />
<TextView
android:id="@+id/damage_immunities"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/damage_resistances"
tools:text="Damage Immunities" />
<TextView
android:id="@+id/condition_immunities"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/damage_immunities"
tools:text="Condition Immunities" />
<TextView
android:id="@+id/senses"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/condition_immunities"
tools:text="Senses" />
<TextView
android:id="@+id/languages"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/senses"
tools:text="Languages" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>