From 180af8e9feef60c19eb281909f1fce58f366f513 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 19 Jan 2023 17:15:38 -0500 Subject: [PATCH] v2.0.0: renamed the adept to the monk, and made the monk a better icon --- .../src/main/assets/interfaces/hero_icons.png | Bin 1365 -> 1413 bytes .../assets/messages/actors/actors.properties | 6 +++--- .../actors/hero/HeroClass.java | 4 +--- .../actors/hero/HeroSubClass.java | 2 +- .../actors/hero/Talent.java | 2 +- .../shatteredpixeldungeon/ui/HeroIcon.java | 2 +- 6 files changed, 7 insertions(+), 9 deletions(-) diff --git a/core/src/main/assets/interfaces/hero_icons.png b/core/src/main/assets/interfaces/hero_icons.png index 689683d7a46060289faf073d983a295bd71ca827..d33a0a7ce6adb19f9a04081804ee3791bd22aed1 100644 GIT binary patch delta 1265 zcmV@ZZpg?|5p=TcXxOH+hzYM07qnvLb5Cyxunw6QEnc4sUZ&z>X(sG466!L*K zchp+WoCX<6u|z2|iBf(gO0mSyUpEcEo+R|=8O(rLn3=90Lx8~in*tNPwuXCuJo zrdS=Dbv*Ug(13RSleQ;7eg%J^uO~nbSXgM9g#{C+HEJjpYN!Tueg()3y#apVS3ne? z{u0o}B*eWM(E0toC^0OW!P4>+V*v<|AL;=n=HsS-m6e$|%+x zPr`rzsWk;{WX!CXt$Z1h-?5N(qeyZBLf?p3f<}a!p|S^R0r-W*dpCcJc|adtHN+D1 z1jx&!fHoFC#5qVpN&tR{y%#U5WB6+iA_7(kh$9fRRtv!21uU9z ztAM-bQSAOMAX5o2`~-gtWl+HQAC7ZCDP=8D%6g*w-*opV8jPe%mRM_Di9++im{LX!D!qM z$93isrEDikX%nUFBud##e1Ai`iSM7FU6PfdBmb+}!^eAiDy>f3drJ5d{*P1q9&tkxj@1R0G1V0s_n~FE6DhKz<+n z;+-=SjWCPLDV;x%7yr-zv#YBs_lwRi1_t04h`C9-kH3Gu1ZLOQ*Yb<(AFu@YK~nr8 z#Q1BQFdhK%i|ik;3GoAZ`3342D#y_52JIzlMf?OaUXz5mHOko{X@1>heq0RLD4_{9hT zvg40MPzJ;I1Z?5&0(8m4w*+MWC;?&K3jY{OAoJFkr$Bc6qXf7;W?`%V5wkF20QM0A zM*KR4g@Tl}3sPzeQram}23|0nMLcG@z0sH&B z6>#7H0f$ZzApgE!_s0r)8hzcr1<>I_KBP!EuQVL=57z<=&oZ3bip1%#Pv!Y?~} zfC;DvXaW|0oR|Xq7Z(@i{w@5nDq* z7a_)9+l27|kYAMk0h<|9$_y zU^ei)Af>BpSWv}Q&C>Yx_Tn1#O?8u0Yw zFCTh;0-h1ONfC`!o&;czb)(0r)k2Aja(g1OTN$ybb`{4zG(zN{P00000NkvXXu0mjfi6SZ; diff --git a/core/src/main/assets/messages/actors/actors.properties b/core/src/main/assets/messages/actors/actors.properties index 629190915..b7769a63a 100644 --- a/core/src/main/assets/messages/actors/actors.properties +++ b/core/src/main/assets/messages/actors/actors.properties @@ -549,9 +549,9 @@ actors.hero.herosubclass.warden_desc=The Warden has a strong connection to natur actors.hero.herosubclass.champion=champion actors.hero.herosubclass.champion_short_desc=The _Champion_ can wield a two weapons. Her regular attacks use her primary weapon, but she can swap weapons and use either weapon's ability. actors.hero.herosubclass.champion_desc=The Champion is a master of melee weapons who can equip a secondary weapon in addition to her primary one. Her regular attacks use her primary weapon, but she can swap her primary weapon instantly.\n\nThe secondary weapon's ability can be used at any time and has its own ability charges. Her secondary weapon charges have a 50% reduced charge cap and charge speed. -actors.hero.herosubclass.adept=adept -actors.hero.herosubclass.adept_short_desc=The _Adept_ builds energy while fighting. This energy can be spent on a variety of unique abilities. -actors.hero.herosubclass.adept_desc=The Adept is a master of ... . As she defeats enemies, she gains energy which can be used on a variety of defensive and utlity-focused abilities. This energy does not fade over time, but has a cap based on the Adept's level.\n\nTODO +actors.hero.herosubclass.monk=monk +actors.hero.herosubclass.monk_short_desc=The _Monk_ builds energy while fighting. This energy can be spent on a variety of unique abilities. +actors.hero.herosubclass.monk_desc=The Monk is a master of ... . As she defeats enemies, she gains energy which can be used on a variety of defensive and utlity-focused abilities. This energy does not fade over time, but has a cap based on the Monk's level.\n\nTODO ##talents actors.hero.talent$improvisedprojectilecooldown.name=improvised projectiles cooldown diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java index 66f7e1a8c..4e2344377 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java @@ -27,7 +27,6 @@ import com.shatteredpixel.shatteredpixeldungeon.Challenges; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.QuickSlot; import com.shatteredpixel.shatteredpixeldungeon.SPDSettings; -import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.ArmorAbility; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.duelist.Challenge; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.huntress.NaturesPower; @@ -65,7 +64,6 @@ import com.shatteredpixel.shatteredpixeldungeon.items.weapon.SpiritBow; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.Dagger; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.Gloves; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MagesStaff; -import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MeleeWeapon; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.Rapier; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.WornShortsword; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.ThrowingKnife; @@ -80,7 +78,7 @@ public enum HeroClass { MAGE( HeroSubClass.BATTLEMAGE, HeroSubClass.WARLOCK ), ROGUE( HeroSubClass.ASSASSIN, HeroSubClass.FREERUNNER ), HUNTRESS( HeroSubClass.SNIPER, HeroSubClass.WARDEN ), - DUELIST( HeroSubClass.CHAMPION, HeroSubClass.ADEPT ); + DUELIST( HeroSubClass.CHAMPION, HeroSubClass.MONK); private HeroSubClass[] subClasses; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroSubClass.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroSubClass.java index cfb2f828a..b362a2e73 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroSubClass.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroSubClass.java @@ -45,7 +45,7 @@ public enum HeroSubClass { WARDEN(HeroIcon.WARDEN), CHAMPION(HeroIcon.CHAMPION), - ADEPT(HeroIcon.ADEPT); + MONK(HeroIcon.MONK); int icon; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java index 27bc7bac3..ef1d93c6b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java @@ -794,7 +794,7 @@ public enum Talent { case CHAMPION: Collections.addAll(tierTalents, SECONDARY_CHARGE, TWIN_UPGRADES, COMBINED_LETHALITY); break; - case ADEPT: + case MONK: Collections.addAll(tierTalents, DUELIST_S2_1, DUELIST_S2_2, DUELIST_S2_3); break; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/HeroIcon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/HeroIcon.java index 70274adcb..d1e76d185 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/HeroIcon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/HeroIcon.java @@ -46,7 +46,7 @@ public class HeroIcon extends Image { public static final int SNIPER = 6; public static final int WARDEN = 7; public static final int CHAMPION = 8; - public static final int ADEPT = 9; + public static final int MONK = 9; //abilities public static final int HEROIC_LEAP = 16;