LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.9.0: added more talent icons

Browse Source
This commit is contained in:
Evan Debenham 2020-09-22 14:44:10 -04:00
parent 73426c3f17
commit 4361fc0d98
5 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/src/main/assets/interfaces/talent_icons.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 586 B

After

Width:  |  Height:  |  Size: 867 B

26
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java
View File

@ -3,7 +3,7 @@
* Copyright (C) 2012-2015 Oleg Dolya * Copyright (C) 2012-2015 Oleg Dolya
* *
* Shattered Pixel Dungeon * 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 * 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 * it under the terms of the GNU General Public License as published by
@ -52,20 +52,20 @@ public enum Talent {
TEST_SUBJECT(2), TEST_SUBJECT(2),
IRON_WILL(3), IRON_WILL(3),
ENERGIZING_MEAL(16), ENERGIZING_MEAL(4),
SCHOLARS_INTUITION(17), SCHOLARS_INTUITION(5),
TESTED_HYPOTHESIS(18), TESTED_HYPOTHESIS(6),
ENERGIZING_UPGRADE(19), ENERGIZING_UPGRADE(7),
RATIONED_MEAL(32), RATIONED_MEAL(8),
THIEFS_INTUITION(33), THIEFS_INTUITION(9),
SUCKER_PUNCH(34), SUCKER_PUNCH(10),
MENDING_SHADOWS(35), MENDING_SHADOWS(11),
INVIGORATING_MEAL(48), INVIGORATING_MEAL(12),
SURVIVALISTS_INTUITION(49), SURVIVALISTS_INTUITION(13),
FOLLOWUP_STRIKE(50), FOLLOWUP_STRIKE(14),
NATURES_AID(51); NATURES_AID(15);
int icon; int icon;

3
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/TalentButton.java
View File

@ -3,7 +3,7 @@
* Copyright (C) 2012-2015 Oleg Dolya * Copyright (C) 2012-2015 Oleg Dolya
* *
* Shattered Pixel Dungeon * 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 * 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 * 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) { if (Dungeon.hero.talentPointsAvailable() > 0) {
Dungeon.hero.upgradeTalent(talent); Dungeon.hero.upgradeTalent(talent);
float oldWidth = fill.width(); float oldWidth = fill.width();
pointsInTalent++;
layout(); layout();
Sample.INSTANCE.play(Assets.Sounds.LEVELUP, 0.7f, 1.2f); Sample.INSTANCE.play(Assets.Sounds.LEVELUP, 0.7f, 1.2f);
Emitter emitter = (Emitter) parent.recycle(Emitter.class); Emitter emitter = (Emitter) parent.recycle(Emitter.class);

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/TalentsPane.java
View File

@ -3,7 +3,7 @@
* Copyright (C) 2012-2015 Oleg Dolya * Copyright (C) 2012-2015 Oleg Dolya
* *
* Shattered Pixel Dungeon * 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 * 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 * it under the terms of the GNU General Public License as published by

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoTalent.java
View File

@ -3,7 +3,7 @@
* Copyright (C) 2012-2015 Oleg Dolya * Copyright (C) 2012-2015 Oleg Dolya
* *
* Shattered Pixel Dungeon * 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 * 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 * it under the terms of the GNU General Public License as published by