From 4361fc0d9893f1f448305b37f68af34bb661303b Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Tue, 22 Sep 2020 14:44:10 -0400 Subject: [PATCH] v0.9.0: added more talent icons --- .../main/assets/interfaces/talent_icons.png | Bin 586 -> 867 bytes .../actors/hero/Talent.java | 26 +++++++++--------- .../ui/TalentButton.java | 3 +- .../shatteredpixeldungeon/ui/TalentsPane.java | 2 +- .../windows/WndInfoTalent.java | 2 +- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/core/src/main/assets/interfaces/talent_icons.png b/core/src/main/assets/interfaces/talent_icons.png index 76201b99cd005d751d25337c0ea728382266902e..095b739874022a156797e9a5bf6df005c14c202e 100644 GIT binary patch literal 867 zcmV-p1DyPcP)7R|Nj7)nE(KL{{TUQf2q>{8XABN z4bsNF|1&cHSSFc|T+GbO|Iac_JuY#Lt8M@Q00DGTPE!Ct=GbNc00P5FL_t(|0i~9Q zc7;d`L*KF*Skim>{~ujpMVaH{IQ6FC7j&No1}CS}KZ(<6N!0q^g!7X{04WFf1t*OJ zV~lkS3kWvk__hI%;6GyC1S148d5(4FO3;WI& zTLEwg00|b9yaZ?j>xw;q1SkgozU{y#tSbd@YVjfbdwg#R0%!2Gz;=GV@8{>61v2QM zUPR|Nenf;Ky+K?B1)cx!HWJ0ygBk#Eehziys5Pg#5xtRS4_*O;1>Q?(D{CVr0XuLn z!b>2|TVRra_{gxBH$eRTasIIYiFO{ia~~KMnPwjN+TrcMG=ee@eD@@n`KE&*LD@)C zumsT%a4`u1^AKUEGo%P$ra(GK;Jl|`6c3J=S3{@AdO@%Awm+U=KHHI^Pt{Fk~U(l+y4)Y zd)7DM+5+=C!Ji-JF9ir59y~xE6JO5*WC5IfvZ2g_nfk6E&x5oNEO>r?czAx6fKdtb z%^S&on95F!dI^mj%!YW(UsKB{0Zjd`mS}m;ykJIAn-k?8_9xK t3+g;5g1VKN&jM4H@U`IQk8>8B{s-~zX?WqpBV7Oh002ovPDHLkV1g)UdAk4r literal 586 zcmV-Q0=4~#P)m0|6!_Fi?Qe%*J3~z(8vNXt!)(69|GR?CVb8lgkRw z2>fOR6$r!-OeLhI3Q

IgJ<93tq7Gg6h`c9bR_c_F6Fsm5=nYFP9rRUv~ap)k>2( zUuT7&zhNr^Ku;Fa3=jZ-;DQ1?XE6Xo76JgIg%rav0eS$KR<#d56~LzeC;$UMWWE)t zQ2B4U{@ULH!1)#+^w-oESUxt*R#1W#VB9nt>I=-9=4DwqJbrFK0Qeh}Ky@D!!@2Rs z17I~Aj<^7Bx7+zT03g&z4hY5=&IDtq3Ipu}A5^YJb}$eY5dg4=@C5!B0Pl|~FjnzQ zrY*q0=Ou(6IuL!xJ4OHq9zT@_z-Yw)xY;?j0CzF#)kazg;uW#{002_bpN%v>fPBbk zBh3%Qy=F_tXd(eX03cONrx*_@n#cfnIG+_@{}$i%JK9L_15cO9hg9i=raL4X882{| zd@ip8biV{5God%3^#k-Vw0?lTh^!wVtYX43`mg8MB;*4`D|QKN)6tvIj2(Xr&EnxN zBC~q=tJoeN`Z2QS*Tzl*5K2I3LjD-?7g6_D@!#tFIWB&n_<`aFiXSL`p!k8}2Z|r~ Y0_KHCq0x7Lga7~l07*qoM6N<$f>l`YX#fBK 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 4ce40b532..060efd029 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 @@ -3,7 +3,7 @@ * Copyright (C) 2012-2015 Oleg Dolya * * Shattered Pixel Dungeon - * Copyright (C) 2014-2020 Evan Debenham + * Copyright (C) 2014-2021 Evan Debenham * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -52,20 +52,20 @@ public enum Talent { TEST_SUBJECT(2), IRON_WILL(3), - ENERGIZING_MEAL(16), - SCHOLARS_INTUITION(17), - TESTED_HYPOTHESIS(18), - ENERGIZING_UPGRADE(19), + ENERGIZING_MEAL(4), + SCHOLARS_INTUITION(5), + TESTED_HYPOTHESIS(6), + ENERGIZING_UPGRADE(7), - RATIONED_MEAL(32), - THIEFS_INTUITION(33), - SUCKER_PUNCH(34), - MENDING_SHADOWS(35), + RATIONED_MEAL(8), + THIEFS_INTUITION(9), + SUCKER_PUNCH(10), + MENDING_SHADOWS(11), - INVIGORATING_MEAL(48), - SURVIVALISTS_INTUITION(49), - FOLLOWUP_STRIKE(50), - NATURES_AID(51); + INVIGORATING_MEAL(12), + SURVIVALISTS_INTUITION(13), + FOLLOWUP_STRIKE(14), + NATURES_AID(15); int icon; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/TalentButton.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/TalentButton.java index 4d7cf14b3..c9abb514e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/TalentButton.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/TalentButton.java @@ -3,7 +3,7 @@ * Copyright (C) 2012-2015 Oleg Dolya * * Shattered Pixel Dungeon - * Copyright (C) 2014-2020 Evan Debenham + * Copyright (C) 2014-2021 Evan Debenham * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -142,6 +142,7 @@ public class TalentButton extends Button { if (Dungeon.hero.talentPointsAvailable() > 0) { Dungeon.hero.upgradeTalent(talent); float oldWidth = fill.width(); + pointsInTalent++; layout(); Sample.INSTANCE.play(Assets.Sounds.LEVELUP, 0.7f, 1.2f); Emitter emitter = (Emitter) parent.recycle(Emitter.class); 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 5bdc1fdf0..d50ffafa3 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/TalentsPane.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/TalentsPane.java @@ -3,7 +3,7 @@ * Copyright (C) 2012-2015 Oleg Dolya * * Shattered Pixel Dungeon - * Copyright (C) 2014-2020 Evan Debenham + * Copyright (C) 2014-2021 Evan Debenham * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoTalent.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoTalent.java index 893019a07..6a8f720a1 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoTalent.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoTalent.java @@ -3,7 +3,7 @@ * Copyright (C) 2012-2015 Oleg Dolya * * Shattered Pixel Dungeon - * Copyright (C) 2014-2020 Evan Debenham + * Copyright (C) 2014-2021 Evan Debenham * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by