From 398f8c43182766f4ec9859de71c7896804a8eb8e Mon Sep 17 00:00:00 2001 From: nossr50 Date: Wed, 4 Apr 2012 07:59:37 -0700 Subject: [PATCH] Daze now deals 4 DMG on proc to help make Archery hit harder --- Changelog.txt | 1 + src/main/java/com/gmail/nossr50/Combat.java | 2 -- src/main/java/com/gmail/nossr50/skills/Archery.java | 2 ++ src/main/resources/locale/locale_de.properties | 2 +- src/main/resources/locale/locale_en_us.properties | 2 +- src/main/resources/locale/locale_es_es.properties | 2 +- src/main/resources/locale/locale_fi.properties | 2 +- src/main/resources/locale/locale_fr.properties | 2 +- src/main/resources/locale/locale_it.properties | 2 +- src/main/resources/locale/locale_nl.properties | 2 +- src/main/resources/locale/locale_pl.properties | 2 +- src/main/resources/locale/locale_pt_br.properties | 2 +- src/main/resources/locale/locale_ru.properties | 2 +- 13 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index 842d9a8ae..eeea34a41 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -9,6 +9,7 @@ Key: Version 1.3.06-dev + Added API functions for obtaining offline profiles & profiles via player names + + Changed Archery's Daze to deal 4 DMG on proc (2 Hearts) + Changed /addlevel command to work for offline users + Changed PlayerProfile constructor to always take a boolean + Changed getPlayerProfile funtion to work for online & offline users diff --git a/src/main/java/com/gmail/nossr50/Combat.java b/src/main/java/com/gmail/nossr50/Combat.java index 297be521a..a2e533cbd 100644 --- a/src/main/java/com/gmail/nossr50/Combat.java +++ b/src/main/java/com/gmail/nossr50/Combat.java @@ -204,10 +204,8 @@ public class Combat { /* Every 100 skill levels Archery gains 20% damage bonus, set that here */ //TODO: Work in progress for balancing out Archery, will work on it more later... - //System.out.println("DEBUG 0: "+event.getDamage()); int archeryBonus = (int)(event.getDamage() * dmgBonusPercent); event.setDamage(event.getDamage() + archeryBonus); - //System.out.println("DEBUG 1: "+event.getDamage()); if (mcPermissions.getInstance().trackArrows(attacker)) { Archery.trackArrows(pluginx, target, PPa); diff --git a/src/main/java/com/gmail/nossr50/skills/Archery.java b/src/main/java/com/gmail/nossr50/skills/Archery.java index 893e00a7e..1d9a2428e 100644 --- a/src/main/java/com/gmail/nossr50/skills/Archery.java +++ b/src/main/java/com/gmail/nossr50/skills/Archery.java @@ -8,6 +8,7 @@ import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; +import com.gmail.nossr50.Combat; import com.gmail.nossr50.Users; import com.gmail.nossr50.m; import com.gmail.nossr50.mcMMO; @@ -62,6 +63,7 @@ public class Archery { if (random.nextInt(2000) <= skillCheck && mcPermissions.getInstance().daze(attacker)) { defender.teleport(loc); + Combat.dealDamage(defender, 4); defender.sendMessage(mcLocale.getString("Combat.TouchedFuzzy")); attacker.sendMessage(mcLocale.getString("Combat.TargetDazed")); } diff --git a/src/main/resources/locale/locale_de.properties b/src/main/resources/locale/locale_de.properties index ac3fc8ec8..b443d2e67 100644 --- a/src/main/resources/locale/locale_de.properties +++ b/src/main/resources/locale/locale_de.properties @@ -76,7 +76,7 @@ m.XPGainArchery=[[YELLOW]]Monster/Spieler angreifen m.EffectsArchery1_0=[[YELLOW]]Entzuenden m.EffectsArchery1_1=[[AQUA]]25% Chance das Feind Feuer faengt m.EffectsArchery2_0=[[YELLOW]]Blenden (Spieler) -m.EffectsArchery2_1=[[AQUA]]Disorientiert Feinde +m.EffectsArchery2_1=Disorients foes and deals 4 DMG m.EffectsArchery3_0=[[YELLOW]]Schaden+ m.EffectsArchery3_1=[[AQUA]]Modifiziert Schaden m.EffectsArchery4_0=[[YELLOW]]Pfeil Rueckgewinnung diff --git a/src/main/resources/locale/locale_en_us.properties b/src/main/resources/locale/locale_en_us.properties index f60f9aa16..05bfffc0f 100644 --- a/src/main/resources/locale/locale_en_us.properties +++ b/src/main/resources/locale/locale_en_us.properties @@ -76,7 +76,7 @@ m.XPGainArchery=Attacking Monsters m.EffectsArchery1_0=Skill Shot m.EffectsArchery1_1=Increases damage done by Bows m.EffectsArchery2_0=Daze (Players) -m.EffectsArchery2_1=Disorients foes +m.EffectsArchery2_1=Disorients foes and deals 4 DMG m.EffectsArchery3_0=Damage+ m.EffectsArchery3_1=Modifies Damage m.EffectsArchery4_0=Arrow Retrieval diff --git a/src/main/resources/locale/locale_es_es.properties b/src/main/resources/locale/locale_es_es.properties index bb83e1d34..ff8cdc40d 100644 --- a/src/main/resources/locale/locale_es_es.properties +++ b/src/main/resources/locale/locale_es_es.properties @@ -77,7 +77,7 @@ m.XPGainArchery=Ataque a monstruos m.EffectsArchery1_0=Ignicion m.EffectsArchery1_1=25% de posibilidades de que un enemigo arda en llamas m.EffectsArchery2_0=Aturdir (Jugadores) -m.EffectsArchery2_1=Desorienta a los enemigos +m.EffectsArchery2_1=Disorients foes and deals 4 DMG m.EffectsArchery3_0=+ Daño m.EffectsArchery3_1=Modifica el daño m.EffectsArchery4_0=Recuperación de flecha diff --git a/src/main/resources/locale/locale_fi.properties b/src/main/resources/locale/locale_fi.properties index 22ee79a7b..b23d5a30a 100644 --- a/src/main/resources/locale/locale_fi.properties +++ b/src/main/resources/locale/locale_fi.properties @@ -77,7 +77,7 @@ m.XPGainArchery=Hy m.EffectsArchery1_0=Sytytys m.EffectsArchery1_1=25% Todennäköisyys että vihollinen syttyy tuleen m.EffectsArchery2_0=Pökerrys (Pelaajat) -m.EffectsArchery2_1=Saa viholliset pois tolaltaan +m.EffectsArchery2_1=Disorients foes and deals 4 DMG m.EffectsArchery3_0=Vahinko+ m.EffectsArchery3_1=Muokkaa vahinkoa m.EffectsArchery4_0=Nuolenkeräys diff --git a/src/main/resources/locale/locale_fr.properties b/src/main/resources/locale/locale_fr.properties index 62a371642..e555c60a5 100644 --- a/src/main/resources/locale/locale_fr.properties +++ b/src/main/resources/locale/locale_fr.properties @@ -77,7 +77,7 @@ m.XPGainArchery=Attaquer les monstres m.EffectsArchery1_0=Allumage m.EffectsArchery1_1=25% de chances que l'ennemi s'enflamme m.EffectsArchery2_0=Étourdir (les joueurs) -m.EffectsArchery2_1=Étourdi les joueurs +m.EffectsArchery2_1=Disorients foes and deals 4 DMG m.EffectsArchery3_0=Dégâts+ m.EffectsArchery3_1=Augmente les dégâts m.EffectsArchery4_0=Récupération de flèches diff --git a/src/main/resources/locale/locale_it.properties b/src/main/resources/locale/locale_it.properties index b13f52574..233f0a884 100644 --- a/src/main/resources/locale/locale_it.properties +++ b/src/main/resources/locale/locale_it.properties @@ -77,7 +77,7 @@ m.XPGainArchery=Attacca mostri m.EffectsArchery1_0=Accensione m.EffectsArchery1_1=25% La chance contro i nemici si accende m.EffectsArchery2_0=Stordimento (Giocatori) -m.EffectsArchery2_1=Disorienta i nemici +m.EffectsArchery2_1=Disorients foes and deals 4 DMG m.EffectsArchery3_0=Danno+ m.EffectsArchery3_1=Danni modificati m.EffectsArchery4_0=Richiamo della freccia diff --git a/src/main/resources/locale/locale_nl.properties b/src/main/resources/locale/locale_nl.properties index bdf73305a..8e0b54b90 100644 --- a/src/main/resources/locale/locale_nl.properties +++ b/src/main/resources/locale/locale_nl.properties @@ -83,7 +83,7 @@ m.XPGainArchery=Schiet op vijanden m.EffectsArchery1_0=Brandende pijl m.EffectsArchery1_1=25% kans dat een vijand verbrand m.EffectsArchery2_0=Verdoof (Players) -m.EffectsArchery2_1=Gedesorienteerde vijanden +m.EffectsArchery2_1=Disorients foes and deals 4 DMG m.EffectsArchery3_0=Schade+ m.EffectsArchery3_1=Verhoogt schade m.EffectsArchery4_0=Pijlen terugkrijgen diff --git a/src/main/resources/locale/locale_pl.properties b/src/main/resources/locale/locale_pl.properties index b27d1db9e..3095ac8e3 100644 --- a/src/main/resources/locale/locale_pl.properties +++ b/src/main/resources/locale/locale_pl.properties @@ -77,7 +77,7 @@ m.XPGainArchery=Atakowanie potworow przy uzyciu luku. m.EffectsArchery1_0=Podpalenie m.EffectsArchery1_1=25% szansa na podpalenie wroga. m.EffectsArchery2_0=Oszolomienie(Tylko na graczy) -m.EffectsArchery2_1=Dezorientuje przeciwnika. +m.EffectsArchery2_1=Disorients foes and deals 4 DMG m.EffectsArchery3_0=Wieksze obrazenia m.EffectsArchery3_1=Zwieksza obrazenia zadawane lukiem. m.EffectsArchery4_0=Odzyskiwanie strzal diff --git a/src/main/resources/locale/locale_pt_br.properties b/src/main/resources/locale/locale_pt_br.properties index 17a692408..65887b87d 100644 --- a/src/main/resources/locale/locale_pt_br.properties +++ b/src/main/resources/locale/locale_pt_br.properties @@ -79,7 +79,7 @@ m.XPGainArchery=Atacando monstros/ m.EffectsArchery1_0=Igniçao m.EffectsArchery1_1=25% de chance dos inimigos pegarem fogo m.EffectsArchery2_0=Atordoar (Jogadores) -m.EffectsArchery2_1=Desorienta os adversários +m.EffectsArchery2_1=Disorients foes and deals 4 DMG m.EffectsArchery3_0=+Dano m.EffectsArchery3_1=Aumenta o Dano m.EffectsArchery4_0=Recuperar Flechas diff --git a/src/main/resources/locale/locale_ru.properties b/src/main/resources/locale/locale_ru.properties index 30d733dc2..cc4dd9b2c 100644 --- a/src/main/resources/locale/locale_ru.properties +++ b/src/main/resources/locale/locale_ru.properties @@ -77,7 +77,7 @@ m.XPGainArchery= m.EffectsArchery1_0=Ïîäæ¸ã m.EffectsArchery1_1=25% øàíñ, ÷òî öåëü ïîäîæã¸òñÿ m.EffectsArchery2_0=Øîêèðîâàíèå(Èãðîêîâ) -m.EffectsArchery2_1=Äåçîðèåíòèðóåò âðàãîâ +m.EffectsArchery2_1=Disorients foes and deals 4 DMG m.EffectsArchery3_0=Óðîí+ m.EffectsArchery3_1=Óëó÷øàåò Óðîí m.EffectsArchery4_0=Ïîëó÷åíèå ñòðåë