Skip to content

Commit

Permalink
Merge pull request #4 from egoal/0.4.2a
Browse files Browse the repository at this point in the history 
0.4.2a ready.
  • Loading branch information
@egoal
egoal authored May 22, 2020
2 parents 2af4268 + 5db19c1 commit c73e5d6
Show file tree
Hide file tree
Showing 82 changed files with 7,836 additions and 625 deletions.
4 changes: 2 additions & 2 deletions core/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.egoal.darkestpixeldungeon"
android:installLocation="auto"
android:versionCode="35"
android:versionName="0.4.2">
android:versionCode="36"
android:versionName="0.4.2a">

<uses-permission android:name="android.permission.VIBRATE" />

Expand Down
Binary file modified core/src/main/assets/miscs/badges.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified core/src/main/assets/miscs/items.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
177 changes: 108 additions & 69 deletions core/src/main/java/com/egoal/darkestpixeldungeon/Badges.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ import java.util.ArrayList
import java.util.Collections
import java.util.HashSet

// import kotlin.collections.HashSet

object Badges {

private lateinit var global: HashSet<Badge>
Expand Down Expand Up @@ -79,7 +81,7 @@ object Badges {
ALL_POTIONS_IDENTIFIED(16),
ALL_SCROLLS_IDENTIFIED(17),
ALL_RINGS_IDENTIFIED(18),
ALL_WANDS_IDENTIFIED(19),
// ALL_WANDS_IDENTIFIED(19),
ALL_ITEMS_IDENTIFIED(35, true),
BAG_BOUGHT_SEED_POUCH,
BAG_BOUGHT_SCROLL_HOLDER,
Expand Down Expand Up @@ -114,8 +116,8 @@ object Badges {
BOSS_SLAIN_3_STARGAZER,
BOSS_SLAIN_3_WITCH,
BOSS_SLAIN_3_ALL_SUBCLASSES(33, true),
RING_OF_HAGGLER(20),
RING_OF_THORNS(21),
// RING_OF_HAGGLER(20),
// RING_OF_THORNS(21),
STRENGTH_ATTAINED_1(40),
STRENGTH_ATTAINED_2(41),
STRENGTH_ATTAINED_3(42),
Expand Down Expand Up @@ -158,46 +160,36 @@ object Badges {
GRIM_WEAPON(29),
PIRANHAS(30),
NIGHT_HUNTER(58),
PERK_GAIN_1(64),
PERK_GAIN_2(65),
PERK_GAIN_3(66),
PERK_NONE(67, true),
SUICIDE(68, true),
GAMES_PLAYED_1(60, true),
GAMES_PLAYED_2(61, true),
GAMES_PLAYED_3(62, true),
GAMES_PLAYED_4(63, true),
HAPPY_END(38),
HAPPY_END(38, true),
CHAMPION(39, true),
SUPPORTER(31, true);

fun desc(): String = M.L(this, name)
}

fun reset() {
allVisiableBadges()
local.clear()
loadGlobal()
}

private fun restore(bundle: Bundle): HashSet<Badge> {
val badges = HashSet<Badge>()

val names = bundle.getStringArray(BADGES)
for (i in names.indices) {
try {
badges.add(Badge.valueOf(names[i]))
} catch (e: Exception) {
DarkestPixelDungeon.reportException(e)
}

}

badges.addAll(bundle.getStringArray(BADGES).map { Badge.valueOf(it) })
return badges
}

private fun store(bundle: Bundle, badges: HashSet<Badge>) {
var count = 0
val names = arrayOfNulls<String>(badges.size)

for (badge in badges) {
names[count++] = badge.toString()
}
bundle.put(BADGES, names)
bundle.put(BADGES, badges.map { it.toString() }.toTypedArray())
}

fun loadLocal(bundle: Bundle) {
Expand Down Expand Up @@ -734,30 +726,6 @@ object Badges {
}
}

//TODO: Replace this badge, delayed until an eventual badge rework
fun validateRingOfHaggler() {
if (Dungeon.IsChallenged()) return

if (!local.contains(Badge.RING_OF_HAGGLER)/* && new RingOfThorns()
.isKnown()*/) {
val badge = Badge.RING_OF_HAGGLER
local.add(badge)
displayBadge(badge)
}
}

//TODO: Replace this badge, delayed until an eventual badge rework
fun validateRingOfThorns() {
if (Dungeon.IsChallenged()) return

if (!local.contains(Badge.RING_OF_THORNS)/* && new RingOfThorns().isKnown
()*/) {
val badge = Badge.RING_OF_THORNS
local.add(badge)
displayBadge(badge)
}
}

fun validateRare(mob: Mob) {
if (Dungeon.IsChallenged()) return

Expand Down Expand Up @@ -904,6 +872,38 @@ object Badges {
displayBadge(badge)
}

fun validateGainPerk() {
if (Dungeon.IsChallenged()) return

var badge: Badge? = null
if (!local.contains(Badge.PERK_GAIN_1) && Dungeon.hero.perkGained >= 3) {
badge = Badge.PERK_GAIN_1
local.add(Badge.PERK_GAIN_1)
}
if (!local.contains(Badge.PERK_GAIN_2) && Dungeon.hero.perkGained >= 6) {
badge = Badge.PERK_GAIN_2
local.add(Badge.PERK_GAIN_2)
}
if (!local.contains(Badge.PERK_GAIN_3) && Dungeon.hero.perkGained >= 9) {
badge = Badge.PERK_GAIN_3
local.add(Badge.PERK_GAIN_3)
}

displayBadge(badge)
}

fun validateNoPerk() {
if (Dungeon.IsChallenged()) return

if (Dungeon.hero.perkGained == 0) displayBadge(Badge.PERK_NONE)
}

fun validateSuicide() {
if (Dungeon.IsChallenged()) return

displayBadge(Badge.SUICIDE)
}

fun validateHappyEnd() {
if (Dungeon.IsChallenged()) return

Expand All @@ -912,7 +912,7 @@ object Badges {

fun validateChampion() {
// if (Dungeon.IsChallenged()) return
if (Dungeon.hero.challenge != Challenge.LowPressure)
if (Dungeon.hero.challenge != null && Dungeon.hero.challenge != Challenge.LowPressure)
displayBadge(Badge.CHAMPION)
}

Expand All @@ -921,15 +921,14 @@ object Badges {
return
}

if (global!!.contains(badge)) {
if (global.contains(badge)) {

if (!badge.meta) {
GLog.h(Messages.get(Badges::class.java, "endorsed", badge.desc()))
}

} else {

global!!.add(badge)
global.add(badge)
saveNeeded = true

if (badge.meta) {
Expand All @@ -941,39 +940,78 @@ object Badges {
}
}

fun isUnlocked(badge: Badge): Boolean {
return global!!.contains(badge)
}
///
fun isUnlocked(badge: Badge): Boolean = global.contains(badge)

fun disown(badge: Badge) {
loadGlobal()
global!!.remove(badge)
global.remove(badge)
saveNeeded = true
}

fun filtered(global: Boolean): List<Badge> {
//todo: you still need to refactor badge...
fun allVisiableBadges(): HashSet<Badge> {
val badges = Badge.values().filter { it.image != -1 }.toHashSet()

keep(badges, Badge.MONSTERS_SLAIN_1, Badge.MONSTERS_SLAIN_2, Badge.MONSTERS_SLAIN_3, Badge.MONSTERS_SLAIN_4)
keep(badges, Badge.GOLD_COLLECTED_1, Badge.GOLD_COLLECTED_2, Badge.GOLD_COLLECTED_3, Badge.GOLD_COLLECTED_4)
keep(badges, Badge.BOSS_SLAIN_1, Badge.BOSS_SLAIN_2, Badge.BOSS_SLAIN_3, Badge.BOSS_SLAIN_4)
keep(badges, Badge.LEVEL_REACHED_1, Badge.LEVEL_REACHED_2, Badge.LEVEL_REACHED_3, Badge.LEVEL_REACHED_4)
keep(badges, Badge.STRENGTH_ATTAINED_1, Badge.STRENGTH_ATTAINED_2,
Badge.STRENGTH_ATTAINED_3, Badge.STRENGTH_ATTAINED_4)
keep(badges, Badge.FOOD_EATEN_1, Badge.FOOD_EATEN_2, Badge
.FOOD_EATEN_3, Badge.FOOD_EATEN_4)
keep(badges, Badge.ITEM_LEVEL_1, Badge.ITEM_LEVEL_2, Badge
.ITEM_LEVEL_3, Badge.ITEM_LEVEL_4)
keep(badges, Badge.POTIONS_COOKED_1, Badge.POTIONS_COOKED_2, Badge
.POTIONS_COOKED_3, Badge.POTIONS_COOKED_4)
keep(badges, Badge.BOSS_SLAIN_1_ALL_CLASSES, Badge
.BOSS_SLAIN_3_ALL_SUBCLASSES)
keep(badges, Badge.DEATH_FROM_FIRE, Badge.YASD)
keep(badges, Badge.DEATH_FROM_GAS, Badge.YASD)
keep(badges, Badge.DEATH_FROM_HUNGER, Badge.YASD)
keep(badges, Badge.DEATH_FROM_POISON, Badge.YASD)
keep(badges, Badge.ALL_POTIONS_IDENTIFIED, Badge
.ALL_ITEMS_IDENTIFIED)
keep(badges, Badge.ALL_SCROLLS_IDENTIFIED, Badge
.ALL_ITEMS_IDENTIFIED)
keep(badges, Badge.ALL_RINGS_IDENTIFIED, Badge.ALL_ITEMS_IDENTIFIED)
// keep(badges, Badge.ALL_WANDS_IDENTIFIED, Badge.ALL_ITEMS_IDENTIFIED)
keep(badges, Badge.VICTORY, Badge.VICTORY_ALL_CLASSES)
keep(badges, Badge.VICTORY, Badge.HAPPY_END)
keep(badges, Badge.VICTORY, Badge.CHAMPION)
keep(badges, Badge.GAMES_PLAYED_1, Badge.GAMES_PLAYED_2, Badge
.GAMES_PLAYED_3, Badge.GAMES_PLAYED_4)
keep(badges, Badge.PERK_GAIN_1, Badge.PERK_GAIN_2, Badge.PERK_GAIN_3)

return badges
}

private fun keep(list: HashSet<Badge>, vararg badges: Badge) {
for (i in badges.size - 1 downTo 1) {
if (global.contains(badges[i])) {
for (j in 0 until i) list.remove(badges[j])
return
}
list.remove(badges[i])
}
}

val filtered = HashSet(if (global)
Badges.global
else
Badges.local)
fun filtered(global: Boolean): List<Badge> {
val filtered = HashSet(if (global) Badges.global else Badges.local)

val iterator = filtered.iterator()
while (iterator.hasNext()) {
val badge = iterator.next()
if (!global && badge.meta || badge.image == -1) {
if ((!global && badge.meta) || badge.image == -1) {
iterator.remove()
}
}

leaveBest(filtered, Badge.MONSTERS_SLAIN_1, Badge.MONSTERS_SLAIN_2, Badge
.MONSTERS_SLAIN_3, Badge.MONSTERS_SLAIN_4)
leaveBest(filtered, Badge.GOLD_COLLECTED_1, Badge.GOLD_COLLECTED_2, Badge
.GOLD_COLLECTED_3, Badge.GOLD_COLLECTED_4)
leaveBest(filtered, Badge.BOSS_SLAIN_1, Badge.BOSS_SLAIN_2, Badge
.BOSS_SLAIN_3, Badge.BOSS_SLAIN_4)
leaveBest(filtered, Badge.LEVEL_REACHED_1, Badge.LEVEL_REACHED_2, Badge
.LEVEL_REACHED_3, Badge.LEVEL_REACHED_4)
leaveBest(filtered, Badge.MONSTERS_SLAIN_1, Badge.MONSTERS_SLAIN_2, Badge.MONSTERS_SLAIN_3, Badge.MONSTERS_SLAIN_4)
leaveBest(filtered, Badge.GOLD_COLLECTED_1, Badge.GOLD_COLLECTED_2, Badge.GOLD_COLLECTED_3, Badge.GOLD_COLLECTED_4)
leaveBest(filtered, Badge.BOSS_SLAIN_1, Badge.BOSS_SLAIN_2, Badge.BOSS_SLAIN_3, Badge.BOSS_SLAIN_4)
leaveBest(filtered, Badge.LEVEL_REACHED_1, Badge.LEVEL_REACHED_2, Badge.LEVEL_REACHED_3, Badge.LEVEL_REACHED_4)
leaveBest(filtered, Badge.STRENGTH_ATTAINED_1, Badge.STRENGTH_ATTAINED_2,
Badge.STRENGTH_ATTAINED_3, Badge.STRENGTH_ATTAINED_4)
leaveBest(filtered, Badge.FOOD_EATEN_1, Badge.FOOD_EATEN_2, Badge
Expand All @@ -993,12 +1031,13 @@ object Badges {
leaveBest(filtered, Badge.ALL_SCROLLS_IDENTIFIED, Badge
.ALL_ITEMS_IDENTIFIED)
leaveBest(filtered, Badge.ALL_RINGS_IDENTIFIED, Badge.ALL_ITEMS_IDENTIFIED)
leaveBest(filtered, Badge.ALL_WANDS_IDENTIFIED, Badge.ALL_ITEMS_IDENTIFIED)
// leaveBest(filtered, Badge.ALL_WANDS_IDENTIFIED, Badge.ALL_ITEMS_IDENTIFIED)
leaveBest(filtered, Badge.VICTORY, Badge.VICTORY_ALL_CLASSES)
leaveBest(filtered, Badge.VICTORY, Badge.HAPPY_END)
leaveBest(filtered, Badge.VICTORY, Badge.CHAMPION)
leaveBest(filtered, Badge.GAMES_PLAYED_1, Badge.GAMES_PLAYED_2, Badge
.GAMES_PLAYED_3, Badge.GAMES_PLAYED_4)
leaveBest(filtered, Badge.PERK_GAIN_1, Badge.PERK_GAIN_2, Badge.PERK_GAIN_3)

return filtered.sorted()
}
Expand Down
12 changes: 9 additions & 3 deletions core/src/main/java/com/egoal/darkestpixeldungeon/Challenge.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
*/
package com.egoal.darkestpixeldungeon

import com.egoal.darkestpixeldungeon.actors.buffs.BloodSuck
import com.egoal.darkestpixeldungeon.actors.buffs.Buff
import com.egoal.darkestpixeldungeon.actors.buffs.VampiricBite
import com.egoal.darkestpixeldungeon.actors.hero.Hero
import com.egoal.darkestpixeldungeon.items.Item
import com.egoal.darkestpixeldungeon.actors.hero.perks.ExtraPerkChoice
import com.egoal.darkestpixeldungeon.effects.PerkGain
import com.egoal.darkestpixeldungeon.items.bags.PotionBandolier
import com.egoal.darkestpixeldungeon.items.bags.ScrollHolder
import com.egoal.darkestpixeldungeon.items.bags.WandHolster
Expand All @@ -33,7 +33,13 @@ import com.egoal.darkestpixeldungeon.messages.M

enum class Challenge {
LowPressure,
Gifted,
Gifted {
override fun affect(hero: Hero) {
val perk = ExtraPerkChoice()
hero.heroPerk.add(perk)
PerkGain.Show(hero, perk)
}
},
// BruteCourage,
Immortality {
override fun live(hero: Hero) {
Expand Down
13 changes: 4 additions & 9 deletions core/src/main/java/com/egoal/darkestpixeldungeon/DarkestPixelDungeon.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,6 @@ public DarkestPixelDungeon() {
"Wandmaker$Rotberry$Seed");

//0.4.0
//equipment
com.watabou.utils.Bundle.addAlias(
com.egoal.darkestpixeldungeon.items.weapon.melee.WornShortsword
.class,
"com.egoal.darkestpixeldungeon.items.weapon.melee.ShortSword");
//enchants/glyphs
com.watabou.utils.Bundle.addAlias(
com.egoal.darkestpixeldungeon.items.weapon.enchantments.Grim.class,
Expand Down Expand Up @@ -441,18 +436,18 @@ public static int brightness() {
}

public static void language(Languages lang) {
Preferences.INSTANCE.put(Preferences.KEY_LANG, lang.code());
Preferences.INSTANCE.put(Preferences.KEY_LANG, lang.getCode());
}

public static Languages language() {
String code = Preferences.INSTANCE.getString(Preferences.KEY_LANG, null);
if (code == null) {
Languages lang = Languages.matchLocale(Locale.getDefault());
if (lang.status() == Languages.Status.REVIEWED)
Languages lang = Languages.Companion.matchLocale(Locale.getDefault());
if (lang.getStatus() == Languages.Status.REVIEWED)
return lang;
else
return Languages.ENGLISH;
} else return Languages.matchCode(code);
} else return Languages.Companion.matchCode(code);
}

public static void classicFont(boolean classic) {
Expand Down
3 changes: 2 additions & 1 deletion core/src/main/java/com/egoal/darkestpixeldungeon/actors/buffs/Mending.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import com.egoal.darkestpixeldungeon.messages.Messages
import com.egoal.darkestpixeldungeon.ui.BuffIndicator
import com.egoal.darkestpixeldungeon.utils.GLog
import com.watabou.utils.Bundle
import kotlin.math.ceil

/**
* Created by 93942 on 9/6/2018.
Expand Down Expand Up @@ -39,7 +40,7 @@ class Mending : Buff() {
}

override fun act(): Boolean {
val v = Math.ceil((recoveryValue / 4f).toDouble()).toInt()
val v = ceil(recoveryValue / 4f).toInt()
recoveryValue -= v
if (v <= 0.1) {
detach()
Expand Down
4 changes: 3 additions & 1 deletion core/src/main/java/com/egoal/darkestpixeldungeon/actors/buffs/TempPathLight.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ class TempPathLight(val path: ArrayList<Int>) : FlavourBuff() {
inner class Light : Luminary() {
override fun light(level: Level) {
for (i in path)
for (n in PathFinder.NEIGHBOURS9) Level.lighted[i + n] = true
if (i > level.width() && i < level.length() - level.width() - 1)
for (n in PathFinder.NEIGHBOURS9)
Level.lighted[i + n] = true
}

override fun createVisual(): LightVisual? = null
Expand Down
Loading

0 comments on commit c73e5d6

Please sign in to comment.