From eda94b107412270d433c381f81d6ecd10cadd8b4 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Mon, 2 Nov 2020 16:27:32 -0500 Subject: [PATCH] v0.9.1: added baseline functionality for tier 2 talents. --- .../main/assets/interfaces/talent_button.png | Bin 4033 -> 287 bytes .../main/assets/interfaces/talent_icons.png | Bin 868 -> 996 bytes .../src/main/assets/messages/ui/ui.properties | 1 + .../actors/hero/Talent.java | 67 ++++++++++++++---- .../shatteredpixeldungeon/ui/TalentsPane.java | 6 +- 5 files changed, 60 insertions(+), 14 deletions(-) diff --git a/core/src/main/assets/interfaces/talent_button.png b/core/src/main/assets/interfaces/talent_button.png index c082ffe4f3037fe169ca84d9df394e21dcdabd01..f65bf57a00a5376ef06883e6ae2331d5400f659f 100644 GIT binary patch delta 272 zcmX>oKc8uWL_G^L0|P_A=H%@_N+rN2#1%*{UN*IFQgdW%a8r9_dUir#S(c}_bN}R) z-Kt`m za8B{-31Rt!iOauzNN(S|%X=O}kN(VU$!F~@aWPCjr4{jf_R1+A75AD4`K~$a70NF8 z@gbw8Vpz=TNeaK;733`OSaUY$E6<)2?cr%p*Sx$Ma;k{o?uz+Gba? R0o}^U;OXk;vd$@?2>@^0b58&O literal 4033 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 diff --git a/core/src/main/assets/interfaces/talent_icons.png b/core/src/main/assets/interfaces/talent_icons.png index 364d95a320eef3576f9d4136fccde67bdd53cfc0..8239f73f274aa911a79be684e30b7c9098cad20d 100644 GIT binary patch delta 909 zcmV;819JT22IL1JiBL{Q4GJ0x0000DNk~Le000310000$2m=5B0K$V=jFBN`e*;HJ zL_t(|0qvTHa^pA1`+`K$lnP8^Fmnx zt;1nK0!aA55zq~YF2G}->sSkzZ*C5q8SetlUr0b(SOuW3>seo@O9<#)2lrb&0fHs= zHN*f|kPk<9{vzAprSr!W&=_DkDZpo;GDl$x*o(<%1b7WRf&_$tLbbpue_$U1$n_6K z{k#Db5KzAyKDPi8yWJu2tNo4hdmCIpxM8AW4rgX70jwO4!m;*oY?z_~T5H@2__PSl zunL$1Y6@tJfV;acftUh(7Jy(@7pXEe1hga|SHKpaP6)u%5YR-L0(b#{>7;=Bd-Ra7 zIs#T)3*i6$`T~3(;9?->e;4YYM^OReeL&>L0@R&r3y5+!QmhunVk< zJ`W3zoriB>GXa;afdmi+)Eopjf2WRs)|vz~h#MiWf+J5^fSzRpe>4k_0q2K21$zFc zq5_%)bZ|8&+_V71as2zOfPnT@0KN^vBfv92c>epnpn&}S0C@&L8u|qU_&$Im765|) ziVDd00skPN<`l@~@Hhob-9>N^uoz$vPbpCN0^aLm>V7w2=WC2Bw!oCmqM*#(j zp#tUbMgpFnE#M_FfByPk>u;DJI5`Ef0G!-RXJ#`2@CuyX1>W8y;O(uffYutkzVgb+ zbHJMgyb%K4MHK<9!>bH%>LjS#D{49Z$H#{ZR1nYvp!^{K1_93@K=DNl0c`;dfe;`p zz&s;X0UregykY?YJO!RR&abxemlBZf144lE69Ui|At3UXV-PUj2jEp;X?pydJOgS7 z$mKAO?au|Y3Cck10$u`(3YbDbhf~|&x(6zM1p(uIfTw^}j0Yi~f{F+j?*lBL{!w_m j4;VffDqalzl*4}lBwyoV#y^a600000NkvXXu0mjf5Wjw? delta 780 zcmV+n1M~dk2jm7JiBL{Q4GJ0x0000DNk~Le0000$0000$2m=5B0G+pi?2#d6e*(uz zL_t(|0i~9QZrv~t1QlnkxcBz|Um7m%4amb=_f3&xUfFv;9OQ2t0e_8>8^E1&zVIZ>yQE={DoS(6cz;hpkK<}?$7@Q$s z?Yb1b(0+C02JK=O;1@v^QUdwU#7=a&zK%@l5dkLZe z=9A#|R{kpk2xy`O@W#I&U>NfLy4FnJ;H!Fd!IR z;LD`RD+*!X8Q49cIOJg!7)D?ofer9dFJbTx%7QZlzHk~HZV{*iwR|p{`7RLC zNUVSg9O~y91pW7cUV+5YDTR5!N)bp$0!2ZZ2OkSk3GFzi5=d@he-OyLvLJ8cIegwm z3dn-|`vJ)U2SJ|)9}B`^`u%bKqTuln!Bfk^ONu3Qfgs5?`DaOa7hYa0czKBe=7FA{ zha$cQF9=?y;MGBJX2G)!N^hb$r|!Vt-rj7mfUmRpbQTai3W0H_1bp6I0Rjhs1n-pK zEeM{4pfE~!9D(<}V)-U$^I!_hPl5j|0(c9;JP=)As2UY%6^w+>JD7P@6Ke%DkrqaQ zOF-b;w2ifggLlF_pafs?i^N;x#y=TeEu?haF~95oc{yL+hb~>RFg>n0000< KMNUMnLSTX$eOWL7 diff --git a/core/src/main/assets/messages/ui/ui.properties b/core/src/main/assets/messages/ui/ui.properties index 5585d1a62..6878bd6aa 100644 --- a/core/src/main/assets/messages/ui/ui.properties +++ b/core/src/main/assets/messages/ui/ui.properties @@ -1,6 +1,7 @@ ui.quickslotbutton.select_item=Quickslot an item ui.talentspane.tier=tier %d +ui.talentspane.unlock_tier2=Reach level 6 to unlock more talents. ui.talentspane.coming_soon=More talents coming soon! ui.toolbar.examine_prompt=Press again to search\nPress a tile to examine 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 c71893a8e..3894bbc44 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 @@ -53,21 +53,41 @@ public enum Talent { ARMSMASTERS_INTUITION(1), TEST_SUBJECT(2), IRON_WILL(3), + TEST_WARRIOR_T2_1(4), + TEST_WARRIOR_T2_2(5), + TEST_WARRIOR_T2_3(6), + TEST_WARRIOR_T2_4(7), + TEST_WARRIOR_T2_5(8), - ENERGIZING_MEAL(4), - SCHOLARS_INTUITION(5), - TESTED_HYPOTHESIS(6), - ENERGIZING_UPGRADE(7), + ENERGIZING_MEAL(16), + SCHOLARS_INTUITION(17), + TESTED_HYPOTHESIS(18), + ENERGIZING_UPGRADE(19), + TEST_MAGE_T2_1(20), + TEST_MAGE_T2_2(21), + TEST_MAGE_T2_3(22), + TEST_MAGE_T2_4(23), + TEST_MAGE_T2_5(24), - RATIONED_MEAL(8), - THIEFS_INTUITION(9), - SUCKER_PUNCH(10), - MENDING_SHADOWS(11), + RATIONED_MEAL(32), + THIEFS_INTUITION(33), + SUCKER_PUNCH(34), + MENDING_SHADOWS(35), + TEST_ROGUE_T2_1(36), + TEST_ROGUE_T2_2(37), + TEST_ROGUE_T2_3(38), + TEST_ROGUE_T2_4(39), + TEST_ROGUE_T2_5(40), - INVIGORATING_MEAL(12), - SURVIVALISTS_INTUITION(13), - FOLLOWUP_STRIKE(14), - NATURES_AID(15); + INVIGORATING_MEAL(48), + SURVIVALISTS_INTUITION(49), + FOLLOWUP_STRIKE(50), + NATURES_AID(51), + TEST_HUNTRESS_T2_1(52), + TEST_HUNTRESS_T2_2(53), + TEST_HUNTRESS_T2_3(54), + TEST_HUNTRESS_T2_4(55), + TEST_HUNTRESS_T2_5(56); int icon; @@ -202,7 +222,7 @@ public enum Talent { public static class SuckerPunchTracker extends Buff{}; public static class FollowupStrikeTracker extends Buff{}; - public static final int MAX_TALENT_TIERS = 1; + public static final int MAX_TALENT_TIERS = 2; public static void initClassTalents( Hero hero ){ initClassTalents( hero.heroClass, hero.talents ); @@ -236,6 +256,27 @@ public enum Talent { tierTalents.clear(); //tier 2+ + switch (cls){ + case WARRIOR: default: + Collections.addAll(tierTalents, TEST_WARRIOR_T2_1, TEST_WARRIOR_T2_2, TEST_WARRIOR_T2_3, TEST_WARRIOR_T2_4, TEST_WARRIOR_T2_5); + break; + case MAGE: + Collections.addAll(tierTalents, TEST_MAGE_T2_1, TEST_MAGE_T2_2, TEST_MAGE_T2_3, TEST_MAGE_T2_4, TEST_MAGE_T2_5); + break; + case ROGUE: + Collections.addAll(tierTalents, TEST_ROGUE_T2_1, TEST_ROGUE_T2_2, TEST_ROGUE_T2_3, TEST_ROGUE_T2_4, TEST_ROGUE_T2_5); + break; + case HUNTRESS: + Collections.addAll(tierTalents, TEST_HUNTRESS_T2_1, TEST_HUNTRESS_T2_2, TEST_HUNTRESS_T2_3, TEST_HUNTRESS_T2_4, TEST_HUNTRESS_T2_5); + break; + } + for (Talent talent : tierTalents){ + talents.get(1).put(talent, 0); + } + tierTalents.clear(); + + + //tier 3+ //TBD } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/TalentsPane.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/TalentsPane.java index 1f3253406..f4768c8e9 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/TalentsPane.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/TalentsPane.java @@ -76,7 +76,11 @@ public class TalentsPane extends ScrollPane { blocker = new ColorBlock(0, 0, 0xFF222222); content.add(blocker); - blockText = PixelScene.renderTextBlock(Messages.get(this, "coming_soon"), 6); + if (tiersAvailable == 1) { + blockText = PixelScene.renderTextBlock(Messages.get(this, "unlock_tier2"), 6); + } else { + blockText = PixelScene.renderTextBlock(Messages.get(this, "coming_soon"), 6); + } content.add(blockText); }