Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-09-28 22:47:38 +02:00
Code Issues Projects Releases Wiki Activity

Add player kill related placeholders

Browse Source 
- %plan_player_player_caused_deaths%
- %plan_player_deaths%
- %plan_player_mob_caused_deaths%
- %plan_player_kdr%
- %plan_player_mob_kdr%
- %plan_player_recent_kill_<1-10>%
- %plan_player_recent_death_<1-10>%

Affected issues:
- Close #1312
This commit is contained in:
Risto Lahtela 2021-08-08 16:24:11 +03:00
parent 62cf3ddc6c
commit 2b257d5373
1 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Plan/common/src/main/java/com/djrapitops/plan/placeholder/PlayerPlaceHolders.java
View File

@ -23,6 +23,7 @@ import com.djrapitops.plan.delivery.domain.mutators.PlayerVersusMutator;
import com.djrapitops.plan.delivery.domain.mutators.SessionsMutator;
import com.djrapitops.plan.delivery.formatting.Formatter;
import com.djrapitops.plan.delivery.formatting.Formatters;
import com.djrapitops.plan.gathering.domain.PlayerKill;
import com.djrapitops.plan.identification.Server;
import com.djrapitops.plan.identification.ServerInfo;
import com.djrapitops.plan.settings.config.PlanConfig;
@ -157,6 +158,45 @@ public class PlayerPlaceHolders implements Placeholders {
config.get(TimeSettings.ACTIVE_PLAY_THRESHOLD)
).getGroup()
);
registerKillPlaceholders(placeholders, time);
}
private void registerKillPlaceholders(PlanPlaceholders placeholders, Formatter<Long> time) {
placeholders.register("player_player_caused_deaths",
player -> PlayerVersusMutator.forContainer(player).toPlayerDeathCount()
);
placeholders.register("player_deaths",
player -> PlayerVersusMutator.forContainer(player).toDeathCount()
);
placeholders.register("player_mob_caused_deaths",
player -> PlayerVersusMutator.forContainer(player).toMobDeathCount()
);
placeholders.register("player_kdr",
player -> PlayerVersusMutator.forContainer(player).toKillDeathRatio()
);
placeholders.register("player_mob_kdr",
player -> PlayerVersusMutator.forContainer(player).toMobKillDeathRatio()
);
for (int i = 1; i <= 10; i++) {
final int index = i;
placeholders.register("player_recent_kill_" + index,
player -> player.getValue(PlayerKeys.PLAYER_KILLS)
.filter(list -> list.size() >= index)
.map(list -> list.get(index))
.map(PlayerKill::getVictim)
.map(PlayerKill.Victim::getName)
.orElse("-")
);
placeholders.register("player_recent_death_" + index,
player -> player.getValue(PlayerKeys.PLAYER_DEATHS_KILLS)
.filter(list -> list.size() >= index)
.map(list -> list.get(index))
.map(PlayerKill::getKiller)
.map(PlayerKill.Killer::getName)
.orElse("-")
);
}
}
private void registerPlaytimePlaceholders(PlanPlaceholders placeholders, Formatter<Long> time) {