Skip to content

Commit

Permalink
v2.0.8.8
Browse files Browse the repository at this point in the history
신규 능력: 고슴도치
신규 능력: 영혼수확자

아이템 드롭 콘피그 제거
PushingArray -> PushingList로 변경, 코드 정리
Locations, Vectors를 각각 LocationUtil, VectorUtil의 내부 클래스로 변경
FastMath에서 오류가 발생하던걸 막음
  • Loading branch information
Daybreak365 committed Jan 8, 2020
1 parent 88b7638 commit deffd9e
Show file tree
Hide file tree
Showing 29 changed files with 567 additions and 221 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>DayBreak.AbilityWar</groupId>
<artifactId>AbilityWar</artifactId>
<version>2.0.8.7</version>
<version>2.0.8.8</version>
<packaging>jar</packaging>
<repositories>
<repository>
Expand Down
3 changes: 3 additions & 0 deletions src/daybreak/abilitywar/ability/AbilityFactory.java
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,9 @@ private static boolean containsName(String name) {
// v2.0.7.7
registerAbility(Vampire.class);
registerAbility(PenetrationArrow.class);
// v2.0.8.8
registerAbility(Reaper.class);
registerAbility(Hedgehog.class);

// 게임모드 전용
// 즐거운 여름휴가 게임모드
Expand Down
2 changes: 1 addition & 1 deletion src/daybreak/abilitywar/ability/list/Flora.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
import daybreak.abilitywar.utils.library.ParticleLib;
import daybreak.abilitywar.utils.library.PotionEffects;
import daybreak.abilitywar.utils.math.LocationUtil;
import daybreak.abilitywar.utils.math.VectorUtil.Vectors;
import daybreak.abilitywar.utils.math.geometry.Circle;
import daybreak.abilitywar.utils.math.geometry.Vectors;
import daybreak.abilitywar.utils.versioncompat.VersionUtil;
import org.bukkit.ChatColor;
import org.bukkit.Location;
Expand Down
2 changes: 1 addition & 1 deletion src/daybreak/abilitywar/ability/list/Hacker.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
import daybreak.abilitywar.utils.library.ParticleLib;
import daybreak.abilitywar.utils.library.ParticleLib.RGB;
import daybreak.abilitywar.utils.math.LocationUtil;
import daybreak.abilitywar.utils.math.VectorUtil.Vectors;
import daybreak.abilitywar.utils.math.geometry.Circle;
import daybreak.abilitywar.utils.math.geometry.Vectors;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.Material;
Expand Down
61 changes: 61 additions & 0 deletions src/daybreak/abilitywar/ability/list/Hedgehog.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
package daybreak.abilitywar.ability.list;

import daybreak.abilitywar.ability.AbilityBase;
import daybreak.abilitywar.ability.AbilityManifest;
import daybreak.abilitywar.ability.AbilityManifest.Rank;
import daybreak.abilitywar.ability.AbilityManifest.Species;
import daybreak.abilitywar.ability.SubscribeEvent;
import daybreak.abilitywar.ability.event.AbilityRestrictionClearEvent;
import daybreak.abilitywar.config.AbilitySettings.SettingObject;
import daybreak.abilitywar.game.games.mode.AbstractGame.Participant;
import daybreak.abilitywar.utils.math.LocationUtil;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.entity.Damageable;
import org.bukkit.entity.LivingEntity;

@AbilityManifest(Name = "고슴도치", Rank = Rank.C, Species = Species.ANIMAL)
public class Hedgehog extends AbilityBase {

public static final SettingObject<Double> DamageConfig = new SettingObject<Double>(Hedgehog.class, "Damage", 2.0,
"# 데미지") {

@Override
public boolean Condition(Double value) {
return value >= 0;
}

};

public Hedgehog(Participant participant) {
super(participant,
ChatColor.translateAlternateColorCodes('&', "&f가시로 가까이에 있는 모든 생명체를 찌릅니다."),
ChatColor.translateAlternateColorCodes('&', "&f아야! 그것 참 아프겠네요."));
}

@Override
public boolean ActiveSkill(Material materialType, ClickType ct) {
return false;
}

@Override
public void TargetSkill(Material materialType, LivingEntity entity) {
}

private final double damage = DamageConfig.getValue();

private final Timer passive = new Timer() {
@Override
protected void onProcess(int count) {
for (Damageable damageable : LocationUtil.getNearbyDamageableEntities(getPlayer(), 1.5, 1.5)) {
damageable.damage(damage, getPlayer());
}
}
}.setPeriod(10);

@SubscribeEvent(onlyRelevant = true)
private void onRestrictionClear(AbilityRestrictionClearEvent e) {
passive.startTimer();
}

}
2 changes: 1 addition & 1 deletion src/daybreak/abilitywar/ability/list/PenetrationArrow.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
import daybreak.abilitywar.utils.library.item.ItemLib;
import daybreak.abilitywar.utils.math.FastMath;
import daybreak.abilitywar.utils.math.LocationUtil;
import daybreak.abilitywar.utils.math.VectorUtil.Vectors;
import daybreak.abilitywar.utils.math.geometry.Line;
import daybreak.abilitywar.utils.math.geometry.Vectors;
import daybreak.abilitywar.utils.versioncompat.NMSUtil;
import org.bukkit.ChatColor;
import org.bukkit.GameMode;
Expand Down
Loading

0 comments on commit deffd9e

Please sign in to comment.