Skip to content

Commit

Permalink
1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
badcw committed Sep 3, 2017
1 parent ca9e5f1 commit ec7d53f
Show file tree
Hide file tree
Showing 43 changed files with 467 additions and 313 deletions.
3 changes: 3 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ android {
buildToolsVersion "26.0.1"
defaultConfig {
applicationId "test.myapplication"
minSdkVersion 22
minSdkVersion 8
targetSdkVersion 26
versionCode 1
versionName "1.0"
versionName "1.1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
Expand All @@ -24,6 +24,4 @@ dependencies {
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile 'com.android.support:appcompat-v7:26.+'
testCompile 'junit:junit:4.12'
}
4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.skpd.lightning"
android:versionCode="500"
android:versionName="1"
android:versionCode="501"
android:versionName="1.2"
android:installLocation="auto">

<uses-permission android:name="android.permission.VIBRATE"/>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/skpd/noosa/Game.java
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public class Game extends Activity implements GLSurfaceView.Renderer, View.OnTou

public static String version;
public static int versionBuild;
public static String vanillaVersion = "1.0";
public static String vanillaVersion = "1.1";

// Current scene
protected Scene scene;
Expand Down
64 changes: 23 additions & 41 deletions app/src/main/java/com/skpd/pixeldungeonskills/Difficulties.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

import com.skpd.pixeldungeonskills.items.food.Food;
import com.skpd.pixeldungeonskills.items.potions.PotionOfHealing;
import com.skpd.pixeldungeonskills.messages.Messages;

import java.util.ArrayList;

Expand Down Expand Up @@ -37,64 +38,45 @@ private Difficulties( int difficulty ) {
}

public static final String[] EASY_DESC = {
"- Start with 2 extra rations.",
"- Start with 2 potions of healing.",
"- Start with 200 Gold.",
"- Mobs are Weak, do 25% less damage, take 10% more damage and have 15% less HP.",
"- Champion spawn rate set to 10%."
Messages.get(Difficulties.class,"eazy")
};

public static final String[] NORMAL_DESC = {
"- Mobs are standard.",
"- Champion spawn rate set to 20%."
Messages.get(Difficulties.class,"nomal")
};

public static final String[] HARD_DESC = {
"- Potion of healing heals 75% max hp.",
"- Mobs are Strong, do 10% extra damage, take 10% less damage and have 20% more HP.",
"- Champion spawn rate set to 30%."
Messages.get(Difficulties.class,"hard")
};

public static final String[] HELL_DESC = {
"- Potion of healing heals 50% max hp.",
"- Mobs are Immortal, do 25% more damage, take 20% less damage and have 35% more HP.",
"- Champion spawn rate set to 40%.",
"- Hero starts with 4 less maxHP.",
"- Hero gains 1 less maxHP on leveling."
Messages.get(Difficulties.class,"hell")
};

public static final String[] SUICIDE_DESC = {
"- Potion of healing heals 25% max hp.",
"- Mobs are Godlike, do 45% more damage, take 30% less damage and have 60% more HP.",
"- Champion spawn rate set to 50%.",
"- Hero starts with 8 less maxHP.",
"- Hero gains 3 less maxHP on leveling."
Messages.get(Difficulties.class,"suicide")
};

public static final String[] JUST_KILL_ME_DESC = {
"- Potion of healing heals 10% max hp.",
"- Mobs are Deities, do 60% more damage, take 40% less damage and have 75% more HP.",
"- Champion spawn rate set to 100%.",
"- Hero starts with 8 less maxHP.",
"- Hero gains 3 less maxHP on leveling."
Messages.get(Difficulties.class,"justkillme")
};


public String title() {

switch (this) {
case EASY:
return "Easy";
return Messages.get(Difficulties.class,"rate1");
case NORMAL:
return "Normal";
return Messages.get(Difficulties.class,"rate2");
case HARD:
return "Hard";
return Messages.get(Difficulties.class,"rate3");
case HELL:
return "Hell!";
return Messages.get(Difficulties.class,"rate4");
case SUICIDE:
return "Suicide!!";
return Messages.get(Difficulties.class,"rate5");
case JUSTKILLME:
return "Just Kill Me";
return Messages.get(Difficulties.class,"rate6");
}
return "";
}
Expand Down Expand Up @@ -122,17 +104,17 @@ public String mobPrefix() {

switch (this) {
case EASY:
return "Weak ";
return Messages.get(Difficulties.class,"mob1");
case NORMAL:
return "";
case HARD:
return "Strong ";
return Messages.get(Difficulties.class,"mob3");
case HELL:
return "Immortal ";
return Messages.get(Difficulties.class,"mob4");
case SUICIDE:
return "Godlike ";
return Messages.get(Difficulties.class,"mob5");
case JUSTKILLME:
return "Deity ";
return Messages.get(Difficulties.class,"mob6");
}
return "";
}
Expand Down Expand Up @@ -278,10 +260,10 @@ public String healingPotionMessage() {
switch (this) {
case EASY:
case NORMAL:
return "Your wounds heal completely.";
return Messages.get(this,"heal1");

}
return "Your wounds are partially healed.";
return Messages.get(this,"heal2");
}


Expand Down Expand Up @@ -443,11 +425,11 @@ public String GetToggleNightDesc()
switch(isNight)
{
case ALWAYS_DAY:
return "Always Day";
return Messages.get(this,"day");
case ALWAYS_NIGHT:
return "Always Night";
return Messages.get(this,"night");
case DEFAULT:
return "Day/Night";
return Messages.get(this,"default");
}
return "error";
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import com.skpd.pixeldungeonskills.actors.buffs.Vertigo;
import com.skpd.pixeldungeonskills.effects.BlobEmitter;
import com.skpd.pixeldungeonskills.effects.Speck;
import com.skpd.pixeldungeonskills.messages.Messages;

public class ConfusionGas extends Blob {

Expand All @@ -47,6 +48,6 @@ public void use( BlobEmitter emitter ) {

@Override
public String tileDesc() {
return "A cloud of confusion gas is swirling here.";
return Messages.get(this,"1");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import com.skpd.pixeldungeonskills.effects.particles.FlameParticle;
import com.skpd.pixeldungeonskills.items.Heap;
import com.skpd.pixeldungeonskills.levels.Level;
import com.skpd.pixeldungeonskills.messages.Messages;
import com.skpd.pixeldungeonskills.scenes.GameScene;

public class Fire extends Blob {
Expand Down Expand Up @@ -108,6 +109,6 @@ public void use( BlobEmitter emitter ) {

@Override
public String tileDesc() {
return "A fire is raging here.";
return Messages.get(this,"1");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import com.skpd.pixeldungeonskills.effects.particles.ShaftParticle;
import com.skpd.pixeldungeonskills.levels.Level;
import com.skpd.pixeldungeonskills.levels.Terrain;
import com.skpd.pixeldungeonskills.messages.Messages;
import com.skpd.pixeldungeonskills.scenes.GameScene;

public class Foliage extends Blob {
Expand Down Expand Up @@ -81,6 +82,6 @@ public void use( BlobEmitter emitter ) {

@Override
public String tileDesc() {
return "Shafts of light pierce the gloom of the underground garden.";
return Messages.get(this,"1");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import com.skpd.pixeldungeonskills.actors.buffs.Paralysis;
import com.skpd.pixeldungeonskills.effects.BlobEmitter;
import com.skpd.pixeldungeonskills.effects.Speck;
import com.skpd.pixeldungeonskills.messages.Messages;

public class ParalyticGas extends Blob {

Expand All @@ -47,6 +48,6 @@ public void use( BlobEmitter emitter ) {

@Override
public String tileDesc() {
return "A cloud of paralytic gas is swirling here.";
return Messages.get(this,"1");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import com.skpd.pixeldungeonskills.effects.Wound;
import com.skpd.pixeldungeonskills.effects.particles.SacrificialParticle;
import com.skpd.pixeldungeonskills.items.scrolls.ScrollOfWipeOut;
import com.skpd.pixeldungeonskills.messages.Messages;
import com.skpd.pixeldungeonskills.scenes.GameScene;
import com.skpd.pixeldungeonskills.ui.BuffIndicator;
import com.skpd.pixeldungeonskills.utils.GLog;
Expand All @@ -42,9 +43,9 @@

public class SacrificialFire extends Blob {

private static final String TXT_WORTHY = "\"Your sacrifice is worthy...\" ";
private static final String TXT_UNWORTHY = "\"Your sacrifice is unworthy...\" ";
private static final String TXT_REWARD = "\"Your sacrifice is worthy and so you are!\" ";
private static final String TXT_WORTHY = Messages.get(SacrificialFire.class,"1");
private static final String TXT_UNWORTHY = Messages.get(SacrificialFire.class,"2");
private static final String TXT_REWARD = Messages.get(SacrificialFire.class,"3");

protected int pos;

Expand Down Expand Up @@ -128,7 +129,7 @@ public static void sacrifice( Char ch ) {

@Override
public String tileDesc() {
return "Sacrificial fire burns here. Every creature touched by this fire is marked as an offering for the spirits of the dungeon.";
return Messages.get(this,"4");
}

public static class Marked extends FlavourBuff {
Expand All @@ -142,7 +143,7 @@ public int icon() {

@Override
public String toString() {
return "Marked for sacrifice";
return Messages.get(this,"5");
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import com.skpd.pixeldungeonskills.actors.hero.Hero;
import com.skpd.pixeldungeonskills.effects.BlobEmitter;
import com.skpd.pixeldungeonskills.effects.Speck;
import com.skpd.pixeldungeonskills.messages.Messages;
import com.skpd.pixeldungeonskills.utils.GLog;
import com.skpd.pixeldungeonskills.utils.Utils;
import com.skpd.utils.Random;
Expand Down Expand Up @@ -80,7 +81,7 @@ public void use( BlobEmitter emitter ) {

@Override
public String tileDesc() {
return "A greenish cloud of toxic gas is swirling here.";
return Messages.get(this,"1");
}

@Override
Expand All @@ -89,6 +90,6 @@ public void onDeath() {
Badges.validateDeathFromGas();

Dungeon.fail( Utils.format( ResultDescriptions.GAS, Dungeon.depth ) );
GLog.n( "You died from a toxic gas.." );
GLog.n( Messages.get(this,"2") );
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,13 @@
import com.skpd.pixeldungeonskills.items.Item;
import com.skpd.pixeldungeonskills.levels.Level;
import com.skpd.pixeldungeonskills.levels.Terrain;
import com.skpd.pixeldungeonskills.messages.Messages;
import com.skpd.pixeldungeonskills.scenes.GameScene;
import com.skpd.pixeldungeonskills.utils.GLog;

public class WaterOfAwareness extends WellWater {

private static final String TXT_PROCCED =
"As you take a sip, you feel the knowledge pours into your mind. " +
"Now you know everything about your equipped items. Also you sense " +
"all items on the level and know all its secrets.";
private static final String TXT_PROCCED = Messages.get(WaterOfAwareness.class,"1");

@Override
protected boolean affectHero( Hero hero ) {
Expand Down Expand Up @@ -102,7 +100,6 @@ public void use( BlobEmitter emitter ) {
@Override
public String tileDesc() {
return
"Power of knowledge radiates from the water of this well. " +
"Take a sip from it to reveal all secrets of equipped items.";
Messages.get(this,"2");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,13 @@
import com.skpd.pixeldungeonskills.items.DewVial;
import com.skpd.pixeldungeonskills.items.Item;
import com.skpd.pixeldungeonskills.items.potions.PotionOfHealing;
import com.skpd.pixeldungeonskills.messages.Messages;
import com.skpd.pixeldungeonskills.utils.GLog;

public class WaterOfHealth extends WellWater {

private static final String TXT_PROCCED =
"As you take a sip, you feel your wounds heal completely.";
Messages.get(WaterOfAwareness.class,"1");

@Override
protected boolean affectHero( Hero hero ) {
Expand Down Expand Up @@ -78,7 +79,6 @@ public void use( BlobEmitter emitter ) {
@Override
public String tileDesc() {
return
"Power of health radiates from the water of this well. " +
"Take a sip from it to heal your wounds and satisfy hunger.";
Messages.get(this,"2");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import com.skpd.pixeldungeonskills.items.scrolls.ScrollOfEnchantment;
import com.skpd.pixeldungeonskills.items.wands.Wand;
import com.skpd.pixeldungeonskills.items.weapon.melee.*;
import com.skpd.pixeldungeonskills.messages.Messages;
import com.skpd.pixeldungeonskills.plants.Plant;

public class WaterOfTransmutation extends WellWater {
Expand Down Expand Up @@ -218,8 +219,7 @@ private Potion changePotion( Potion p ) {

@Override
public String tileDesc() {
return
"Power of change radiates from the water of this well. " +
"Throw an item into the well to turn it into something else.";
return
Messages.get(this,"1");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import com.skpd.pixeldungeonskills.actors.buffs.Roots;
import com.skpd.pixeldungeonskills.effects.BlobEmitter;
import com.skpd.pixeldungeonskills.effects.particles.WebParticle;
import com.skpd.pixeldungeonskills.messages.Messages;

public class Web extends Blob {

Expand Down Expand Up @@ -63,6 +64,6 @@ public void seed( int cell, int amount ) {

@Override
public String tileDesc() {
return "Everything is covered with a thick web here.";
return Messages.get(this,"");
}
}
Loading

0 comments on commit ec7d53f

Please sign in to comment.