Skip to content

Commit

Permalink
.44
Browse files Browse the repository at this point in the history
  • Loading branch information
@DragonLotus
DragonLotus committed Jan 1, 2017
1 parent 27401e4 commit d9e0076
Show file tree
Hide file tree
Showing 10 changed files with 305 additions and 146 deletions.
1 change: 1 addition & 0 deletions app/app.iml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
Expand Down
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ android {
applicationId "com.padassist"
minSdkVersion 11
targetSdkVersion 25
versionCode 35
versionName "0.43"
versionCode 36
versionName "0.44"
}
buildTypes {
release {
Expand Down
241 changes: 121 additions & 120 deletions app/src/main/java/com/padassist/Adapters/AwakeningGridAdapter.java
View file

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions app/src/main/java/com/padassist/Adapters/LatentSpinnerAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,42 +250,42 @@ public View getDropDownView(int position, View convertView, ViewGroup parent) {
case 13:
viewHolder.latentIcon.setImageResource(R.drawable.latent_awakening_13);
viewHolder.latentName.setText("");
viewHolder.latentDesc.setText("1.5x bonus damage versus God types");
viewHolder.latentDesc.setText("1.5x bonus damage versus God types. Takes 2 Latent slots.");
break;
case 14:
viewHolder.latentIcon.setImageResource(R.drawable.latent_awakening_14);
viewHolder.latentName.setText("");
viewHolder.latentDesc.setText("1.5x bonus damage versus Dragon types");
viewHolder.latentDesc.setText("1.5x bonus damage versus Dragon types. Takes 2 Latent slots.");
break;
case 15:
viewHolder.latentIcon.setImageResource(R.drawable.latent_awakening_15);
viewHolder.latentName.setText("");
viewHolder.latentDesc.setText("1.5x bonus damage versus Devil types");
viewHolder.latentDesc.setText("1.5x bonus damage versus Devil types. Takes 2 Latent slots.");
break;
case 16:
viewHolder.latentIcon.setImageResource(R.drawable.latent_awakening_16);
viewHolder.latentName.setText("");
viewHolder.latentDesc.setText("1.5x bonus damage versus Machine types");
viewHolder.latentDesc.setText("1.5x bonus damage versus Machine types. Takes 2 Latent slots.");
break;
case 17:
viewHolder.latentIcon.setImageResource(R.drawable.latent_awakening_17);
viewHolder.latentName.setText("");
viewHolder.latentDesc.setText("1.5x bonus damage versus Balanced types");
viewHolder.latentDesc.setText("1.5x bonus damage versus Balanced types. Takes 2 Latent slots.");
break;
case 18:
viewHolder.latentIcon.setImageResource(R.drawable.latent_awakening_18);
viewHolder.latentName.setText("");
viewHolder.latentDesc.setText("1.5x bonus damage versus Attacker types");
viewHolder.latentDesc.setText("1.5x bonus damage versus Attacker types. Takes 2 Latent slots.");
break;
case 19:
viewHolder.latentIcon.setImageResource(R.drawable.latent_awakening_19);
viewHolder.latentName.setText("");
viewHolder.latentDesc.setText("1.5x bonus damage versus Physical types");
viewHolder.latentDesc.setText("1.5x bonus damage versus Physical types. Takes 2 Latent slots.");
break;
case 20:
viewHolder.latentIcon.setImageResource(R.drawable.latent_awakening_20);
viewHolder.latentName.setText("");
viewHolder.latentDesc.setText("1.5x bonus damage versus Healer types");
viewHolder.latentDesc.setText("1.5x bonus damage versus Healer types. Takes 2 Latent slots.");
break;
default:
viewHolder.latentIcon.setImageResource(R.drawable.latent_awakening_blank);
Expand Down
60 changes: 48 additions & 12 deletions app/src/main/java/com/padassist/Data/Monster.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,22 +191,30 @@ public int getTotalHp() {
counter++;
}
}
int counter2 = 0;
int singleLatent = 0;
int doubleLatent = 0;

if(getTotalPlus() == 297){
for (int i = 0; i < latents.size(); i++) {
if (latents.get(i).getValue() == 1) {
counter2++;
singleLatent++;
}
if(latents.get(i).getValue() == 12){
doubleLatent++;
}
}
} else {
for (int i = 0; i < latents.size() - 1; i++) {
if (latents.get(i).getValue() == 1) {
counter2++;
singleLatent++;
}
if(latents.get(i).getValue() == 12){
doubleLatent++;
}
}
}
int latentHp = (int) Math.floor(currentHp * counter2 * 0.015 + .5);
doubleLatent = doubleLatent / 2;
int latentHp = (int) Math.floor(currentHp * (singleLatent + doubleLatent) * 0.015 + .5);
totalHp = totalHp + (200 * counter) + latentHp;
if(monsterInherit!= null) {
if (monsterInherit.getElement1Int() == getElement1Int()) {
Expand All @@ -231,22 +239,30 @@ public int getTotalAtk() {
counter++;
}
}
int counter2 = 0;
int singleLatent = 0;
int doubleLatent = 0;

if(getTotalPlus() == 297){
for (int i = 0; i < latents.size(); i++) {
if (latents.get(i).getValue() == 2) {
counter2++;
singleLatent++;
}
if(latents.get(i).getValue() == 12){
doubleLatent++;
}
}
} else {
for (int i = 0; i < latents.size() - 1; i++) {
if (latents.get(i).getValue() == 2) {
counter2++;
singleLatent++;
}
if(latents.get(i).getValue() == 12){
doubleLatent++;
}
}
}
int latentAtk = (int) Math.floor(currentAtk * counter2 * 0.01 + .5);
doubleLatent = doubleLatent / 2;
int latentAtk = (int) Math.floor(currentAtk * (singleLatent + doubleLatent) * 0.01 + .5);
totalAtk = totalAtk + (100 * counter) + latentAtk;

if(monsterInherit!= null){
Expand All @@ -272,22 +288,30 @@ public int getTotalRcv() {
counter++;
}
}
int counter2 = 0;
int singleLatent = 0;
int doubleLatent = 0;

if(getTotalPlus() == 297){
for (int i = 0; i < latents.size(); i++) {
if (latents.get(i).getValue() == 3) {
counter2++;
singleLatent++;
}
if(latents.get(i).getValue() == 12){
doubleLatent++;
}
}
} else {
for (int i = 0; i < latents.size() - 1; i++) {
if (latents.get(i).getValue() == 3) {
counter2++;
singleLatent++;
}
if(latents.get(i).getValue() == 12){
doubleLatent++;
}
}
}
int latentRcv = (int) Math.floor(currentRcv * counter2 * 0.05 + .5);
doubleLatent = doubleLatent / 2;
int latentRcv = (int) Math.floor(currentRcv * (singleLatent + doubleLatent) * 0.05 + .5);
totalRcv = totalRcv + (50 * counter) + latentRcv;
if(monsterInherit!= null) {
if (monsterInherit.getElement1Int() == getElement1Int()) {
Expand Down Expand Up @@ -586,6 +610,18 @@ public void setCurrentAwakenings(int currentAwakenings) {
this.currentAwakenings = currentAwakenings;
}

public ArrayList<Integer> getAwakenings(){
ArrayList<Integer> awakenings = new ArrayList<>();
for(int i = 0; i < currentAwakenings; i++){
if(currentAwakenings > getMaxAwakenings()){
break;
} else {
awakenings.add(getAwokenSkills(i));
}
}
return awakenings;
}

private void addKillerAwakenings(int awakening) {
switch (awakening) {
case 31:
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/padassist/Fragments/FilterDialogFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
latentAwakenings.setVisibility(View.VISIBLE);
latentAwakeningsGrid.setVisibility(View.VISIBLE);
latentsList = new ArrayList<>();
for (int i = 1; i < 12; i++) {
for (int i = 1; i < 21; i++) {
latentsList.add(i);
}
latentGridAdapter = new LatentGridAdapter(getActivity(), latentsList, Singleton.getInstance().getFilterLatents());
Expand Down
120 changes: 120 additions & 0 deletions app/src/main/java/com/padassist/Util/DamageCalculationUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,11 @@ public static double monsterElement1DamageEnemyElement(Team team, Monster monste
}
}
damage = killerCalculation(damage, monster, enemy);
if(monster.getAwakenings().contains(43)){
if(combos > 6){
damage *= 2;
}
}
return damage;
}

Expand Down Expand Up @@ -229,6 +234,11 @@ public static double monsterElement2DamageEnemyElement(Team team, Monster monste
}
}
damage = killerCalculation(damage, monster, enemy);
if(monster.getAwakenings().contains(43)){
if(combos > 6){
damage *= 2;
}
}
return damage;
}

Expand Down Expand Up @@ -565,6 +575,116 @@ private static double killerCalculation(double damage, Monster monster, Enemy en
}
}
}

ArrayList<Integer> latentKillerAwakenings = new ArrayList<>();
if (monster.getTotalPlus() == 297) {
for (int i = 0; i < monster.getLatents().size(); i++) {
if (monster.getLatents().get(i).getValue() > 12 && !latentKillerAwakenings.contains(monster.getLatents().get(i).getValue())) {
latentKillerAwakenings.add(monster.getLatents().get(i).getValue());
}
}
} else {
for (int i = 0; i < monster.getLatents().size() - 1; i++) {
if (monster.getLatents().get(i).getValue() > 12 && !latentKillerAwakenings.contains(monster.getLatents().get(i).getValue())) {
latentKillerAwakenings.add(monster.getLatents().get(i).getValue());
}
}
}
if (latentKillerAwakenings.size() != 0) {
for (int i = 0; i < latentKillerAwakenings.size(); i++) {
counter = 0;
switch (latentKillerAwakenings.get(i)) {
case 13:
if (enemy.typeContains(5)) {
for (int j = 0; j < monster.getLatents().size(); j++) {
if (monster.getLatents().get(j).getValue() == latentKillerAwakenings.get(i)) {
counter++;
}
}
counter = counter / 2;
killerDamage *= Math.pow(1.5, counter);
}
break;
case 14:
if (enemy.typeContains(4)) {
for (int j = 0; j < monster.getLatents().size(); j++) {
if (monster.getLatents().get(j).getValue() == latentKillerAwakenings.get(i)) {
counter++;
}
}
counter = counter / 2;
killerDamage *= Math.pow(1.5, counter);
}
break;
case 15:
if (enemy.typeContains(7)) {
for (int j = 0; j < monster.getLatents().size(); j++) {
if (monster.getLatents().get(j).getValue() == latentKillerAwakenings.get(i)) {
counter++;
}
}
counter = counter / 2;
killerDamage *= Math.pow(1.5, counter);
}
break;
case 16:
if (enemy.typeContains(8)) {
for (int j = 0; j < monster.getLatents().size(); j++) {
if (monster.getLatents().get(j).getValue() == latentKillerAwakenings.get(i)) {
counter++;
}
}
counter = counter / 2;
killerDamage *= Math.pow(1.5, counter);
}
break;
case 17:
if (enemy.typeContains(1)) {
for (int j = 0; j < monster.getLatents().size(); j++) {
if (monster.getLatents().get(j).getValue() == latentKillerAwakenings.get(i)) {
counter++;
}
}
counter = counter / 2;
killerDamage *= Math.pow(1.5, counter);
}
break;
case 18:
if (enemy.typeContains(6)) {
for (int j = 0; j < monster.getLatents().size(); j++) {
if (monster.getLatents().get(j).getValue() == latentKillerAwakenings.get(i)) {
counter++;
}
}
counter = counter / 2;
killerDamage *= Math.pow(1.5, counter);
}
break;
case 19:
if (enemy.typeContains(2)) {
for (int j = 0; j < monster.getLatents().size(); j++) {
if (monster.getLatents().get(j).getValue() == latentKillerAwakenings.get(i)) {
counter++;
}
}
counter = counter / 2;
killerDamage *= Math.pow(1.5, counter);
}
break;
case 20:
if (enemy.typeContains(3)) {
for (int j = 0; j < monster.getLatents().size(); j++) {
if (monster.getLatents().get(j).getValue() == latentKillerAwakenings.get(i)) {
counter++;
}
}
counter = counter / 2;
killerDamage *= Math.pow(1.5, counter);
}
break;
}
}
}
return killerDamage;
}
}
2 changes: 1 addition & 1 deletion app/src/main/java/com/padassist/Util/Migration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public void migrate(DynamicRealm realm, long oldVersion, long newVersion) {

if(oldVersion == 6){
schema.get("BaseMonster")
.addField("inheritable", boolean.class);
.addField("inheritable", boolean.class, FieldAttribute.INDEXED);
schema.get("Monster")
.removeField("activeSkill2")
.removeField("activeSkill2Level")
Expand Down
Binary file removed app/src/main/res/drawable/monster_inherit_frame.PNG
View file
Binary file not shown.
5 changes: 3 additions & 2 deletions app/src/main/res/layout/type_grid.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
android:layout_height="match_parent">
<ImageView
android:id="@+id/typePicture"
android:layout_width="24dp"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:layout_centerHorizontal="true"
android:src="@drawable/type_god"
android:layout_marginBottom="4dp"
android:layout_marginTop="4dp"/>
android:layout_marginTop="4dp"
android:adjustViewBounds="true"/>

</RelativeLayout>

0 comments on commit d9e0076

Please sign in to comment.