Merge pull request #13 from ElMoha943/dev

Fixed posible bug in attackspeed and bumped es lang file

configs/_dictionaries/terraria_es.yml

@@ -9,6 +9,7 @@ dictionary:
   display-name-silver_ore: "&7Mineral de Plata"
   display-name-tungsten_ore: "&9Mineral de Tungsteno"
   display-name-platinum_ore: "&9Mineral de Platino"
+  isplay-name-crimson_ore: "&5Mineral de Carmesi"
   display-name-demonite_ore: "&5Mineral de Demonio"
   display-name-meteorite_ore: "&5Mineral de Meteorito"
   display-name-hellstone_ore: "&cMineral de Piedra Infernal"
@@ -34,6 +35,7 @@ dictionary:
   display-name-silver_bar: "&7Lingote de Plata"
   display-name-tungsten_bar: "&9Lingote de Tungsteno"
   display-name-platinum_bar: "&9Lingote de Platino"
+  display-name-crimson_bar: "&5Lingote de Carmesi"
   display-name-demonite_bar: "&5Lingote de Demonio"
   display-name-meteorite_bar: "&5Lingote de Meteorito"
   display-name-hellstone_bar: "&cLingote de Piedra Infernal"
@@ -53,6 +55,7 @@ dictionary:
   display-name-silver_sword: "&7Espada de Plata"
   display-name-tungsten_sword: "&9Espada de Tungsteno"
   display-name-platinum_sword: "&9Espada de Platino"
+  display-name-crimson_sword: "&5Espada Carmesi"
   display-name-demonite_sword: "&5Espada Endemoniada"
   display-name-meteorite_sword: "&5Espada de Meteorito"
   display-name-hellstone_sword: "&cEspada Fundida"
@@ -72,6 +75,7 @@ dictionary:
   display-name-silver_pickaxe: "&7Pico de Plata"
   display-name-tungsten_pickaxe: "&9Pico de Tungsteno"
   display-name-platinum_pickaxe: "&9Pico de Platino"
+  display-name-crimson_pickaxe: "&5Pico Carmesi"
   display-name-demonite_pickaxe: "&5Pico Endemoniado"
   display-name-meteorite_pickaxe: "&5Pico de Meteorito"
   display-name-hellstone_pickaxe: "&cPico Fundido"
@@ -91,6 +95,7 @@ dictionary:
   display-name-silver_axe: "&7Hacha de Plata"
   display-name-tungsten_axe: "&9Hacha de Tungsteno"
   display-name-platinum_axe: "&9Hacha de Platino"
+  display-name-crimson_axe: "&5Hacha Carmesi"
   display-name-demonite_axe: "&5Hacha Endemoniada"
   display-name-meteorite_axe: "&5Hacha de Meteorito"
   display-name-hellstone_axe: "&cHacha Fundida"
@@ -110,6 +115,7 @@ dictionary:
   display-name-silver_shovel: "&7Pala de Plata"
   display-name-tungsten_shovel: "&9Pala de Tungsteno"
   display-name-platinum_shovel: "&9Pala de Platino"
+  display-name-crimson_shovel: "&5Pala Carmesi"
   display-name-demonite_shovel: "&5Pala Endemoniada"
   display-name-meteorite_shovel: "&5Pala de Meteorito"
   display-name-hellstone_shovel: "&cPala Fundida"
@@ -123,23 +129,24 @@ dictionary:
   display-name-luminite_shovel: "&6Pala de Lumen"
 # Azadas
   display-category-hoes:  "&eAzadas"
-  display-name-copper_hoe: "&7Copper Azada"
-  display-name-tin_hoe: "&7Tin Azada"
-  display-name-lead_hoe: "&7Lead Azada"
-  display-name-silver_hoe: "&7Silver Azada"
-  display-name-tungsten_hoe: "&9Tungsten Azada"
-  display-name-platinum_hoe: "&9Platinum Azada"
-  display-name-demonite_hoe: "&5Demonite Azada"
-  display-name-meteorite_hoe: "&5Meteorite Azada"
-  display-name-hellstone_hoe: "&cHellstone Azada"
-  display-name-cobalt_hoe: "&aCobalt Azada"
-  display-name-palladium_hoe: "&aPalladium Azada"
-  display-name-orichalcum_hoe: "&aOrichalcum Azada"
-  display-name-mythril_hoe: "&aMythril Azada"
-  display-name-adamantite_hoe: "&aAdamantite Azada"
-  display-name-titanium_hoe: "&aTitanium Azada"
-  display-name-chlorophyte_hoe: "&6Chlorophyte Azada"
-  display-name-luminite_hoe: "&6Luminite Azada"
+  display-name-copper_hoe: "&7Azada de Cobre"
+  display-name-tin_hoe: "&7Azada de Estaño"
+  display-name-lead_hoe: "&7Azada de Plomo"
+  display-name-silver_hoe: "&7Azada de Plata"
+  display-name-tungsten_hoe: "&9Azada de Tungsteno"
+  display-name-platinum_hoe: "&9Azada de Platino"
+  display-name-crimson_hoe: "&5Azada Carmesi"
+  display-name-demonite_hoe: "&5Azada Endemoniada"
+  display-name-meteorite_hoe: "&5Azada de Meteorito"
+  display-name-hellstone_hoe: "&cAzada Infernal"
+  display-name-cobalt_hoe: "&aAzada de Cobalto"
+  display-name-palladium_hoe: "&aAzada de Paladio"
+  display-name-orichalcum_hoe: "&aAzada de Oricalco"
+  display-name-mythril_hoe: "&aAzada de Mythril"
+  display-name-adamantite_hoe: "&aAzada de Aadamantita"
+  display-name-titanium_hoe: "&aAzada de Titanio"
+  display-name-chlorophyte_hoe: "&6Azada de Clorofita"
+  display-name-luminite_hoe: "&6Azada de Luminita"
 # Armaduras
   display-category-armors: "&eArmaduras"
   display-name-copper_helmet: "&7Casco de Cobre"
@@ -166,6 +173,10 @@ dictionary:
   display-name-platinum_chest: "&9Coraza de Platino"
   display-name-platinum_legs: "&9Pantalones de Platino"
   display-name-platinum_boots: "&9Botas de Platino"
+  display-name-crimson_helmet: "&aCasco Carmesi"
+  display-name-crimson_chest: "&aCoraza Carmesi"
+  display-name-crimson_legs: "&aPantalones Carmesi"
+  display-name-crimson_boots: "&aBotas Carmesi"
   display-name-demonite_helmet: "&5Casco Endemoniado"
   display-name-demonite_chest: "&5Coraza Endemoniada"
   display-name-demonite_legs: "&5Pantalones Endemoniados"
@@ -217,6 +228,7 @@ dictionary:
   display-name-raw_silver: "&7Plata Cruda"
   display-name-raw_tungsten: "&9Tungsteno Crudo"
   display-name-raw_platinum: "&9Platino Crudo"
+  display-name-raw_crimtane: "&aCarmesita Cruda"
   display-name-raw_demonite: "&5Endemoniado Crudo"
   display-name-raw_meteorite: "&5Meteorito Crudo"
   display-name-raw_hellstone: "&cFundido Crudo"
@@ -239,26 +251,26 @@ dictionary:
   display-name-shrimp: "&eShrimp"
   display-name-trout: "&eTrout"
   display-name-tuna: "&eTuna"
-  display-name-armored_cavefish: "&eArmored Cavefish"
-  display-name-blue_jellyfish: "&eBlue Jellyfish"
-  display-name-crimson_tigerfish: "&eCrimson Tigerfish"
+  display-name-armored_cavefish: "&ePez Cavernario Acorazado"
+  display-name-blue_jellyfish: "&eMedusa Azul"
+  display-name-crimson_tigerfish: "&ePez Tigre Carmesí"
   display-name-damselfish: "&eDamselfish"
-  display-name-double_cod: "&eDouble Cod"
+  display-name-double_cod: "&eBacalao Doble"
   display-name-ebonkoi: "&eEbonkoi"
-  display-name-frost_minnow: "&eFrost Minnow"
-  display-name-green_jellyfish: "&eGreen Jellyfish"
+  display-name-frost_minnow: "&ePececillo de escarcha"
+  display-name-green_jellyfish: "&eMedusa Verde"
   display-name-hemopiranha: "&eHemopiranha"
   display-name-honeyfin: "&eHoneyfin"
-  display-name-pink_jellyfish: "&ePink Jellyfish"
-  display-name-specular_fish: "&eSpecular Fish"
-  display-name-stinkfish: "&eStinkfish"
+  display-name-pink_jellyfish: "&eMedusa Rosa"
+  display-name-specular_fish: "&ePez Espejo"
+  display-name-stinkfish: "&ePez Apestoso"
   display-name-variegated_lardfish: "&eVariegated Lardfish"
   display-name-flarefin_koi: "&eFlarefin Koi"
-  display-name-obsidifish: "&eObsidifish"
-  display-name-princess_fish: "&ePrincess Fish"
+  display-name-obsidifish: "&ePez Obsidiana"
+  display-name-princess_fish: "&ePez Princesa"
   display-name-prismite: "&ePrismite"
-  display-name-chaos_fish: "&eChaos Fish"
-  display-name-golden_carp: "&eGolden Carp"
+  display-name-chaos_fish: "&ePez Caos"
+  display-name-golden_carp: "&eCarpa Dorada"
 # Comida
   display-category-food: "&eComida"
   display-name-cooked_fish: "&ePescado Cocinado"
@@ -281,4 +293,29 @@ dictionary:
   display-name-sitting_ducks_fishing_pole: "&eCaña de Pescar de Pato Sentado"
   display-name-hotline_fishing_hook: "&eGancho de Pesca de Linea Caliente"
   display-name-golden_fishing_rod: "&eCaña de Pescar de Oro"
+# Lore
+  lore-can_fish_in_lava: "&cPuede pescar en lava"
+  lore-fish-common: "&7El pez mas comun, se encuentra en cualquier lugar."
+  lore-fish-common-ocean: "&7Pez comun encontrado en el oceano."
+  lore-fish-common-jungle: "&7Pez comun encontrado en biomas humedos."
+  lore-fish-common-desert: "&7Pez comun encontrado en biomas calidos."
+  lore-fish-common-ice: "&7Pez comun encontrado en biomas frios."
+  lore-fish-uncommon-ocean: "&9Pez poco comun encontrado en el oceano."
+  lore-fish-uncommon-jungle: "&9Pez poco comun encontrado en biomas humedos."
+  lore-fish-uncommon-ice: "&9Pez poco comun encontrado en biomas frios."
+  lore-fish-uncommon-underground: "&9Pez poco comun encontrado bajo tierra."
+  lore-fish-uncommon-jungle_underground: "&9UPez poco comun encontrado en biomas humedos subterraneos."
+  lore-fish-uncommon-cavern: "&9Pez poco comun encontrado en cavernas."
+  lore-fish-uncommon-crimson: "&9Pez poco comun encontrado en el crimson."
+  lore-fish-uncommon-corruption: "&9Pez poco comun encontrado en biomas corruptos."
+  lore-fish-uncommon-sky: "&9Pez poco comun encontrado en altitudes altas."
+  lore-fish-uncommon-honey: "&9Pez poco comun encontrado al pescar en miel."
+  lore-fish-rare-hell: "&aPez raro encontrado en el inframundo."
+  lore-fish-rare-hallow: "&aPez raro encontrado en la bendicion."
+  lore-fish-very_rare-hallow: "&bPez muy raro encontrado en la bendicion."
+  lore-fish-legendary_underground: "&6Pez legendario encontrado bajo tierra."
+  lore-fish-legendary-hallow_underground: "&6Pez legendario encontradio en la bendicion subterranea."
+  lore-fish-neon_tetra: "&3&oSus escapas coloridas se venderan bien."
+  lore-fish-rock_lobster: "&3&oPero no era una roca!"
+  lore-fish-golden_carp: "&3Bastante brillante. Probablemente se venda bien."
 

configs/tools/axes.yml

@@ -14,6 +14,7 @@ items:
     attribute_modifiers:
       mainhand:
         attackDamage: 8
+        attackSpeed: 0.8
   tin_axe:
     display_name: display-name-tin_axe
     resource:
@@ -26,6 +27,7 @@ items:
     attribute_modifiers:
       mainhand:
         attackDamage: 8.5
+        attackSpeed: 0.8
   lead_axe:
     display_name: display-name-lead_axe
     resource:
@@ -38,6 +40,7 @@ items:
     attribute_modifiers:
       mainhand:
         attackDamage: 8.75
+        attackSpeed: 0.8
   #iron_axe
   silver_axe:
     display_name: display-name-silver_axe
@@ -51,6 +54,7 @@ items:
     attribute_modifiers:
       mainhand:
         attackDamage: 9.25
+        attackSpeed: 0.9
   #gold_axe
   tungsten_axe:
     display_name: display-name-tungsten_axe
@@ -64,6 +68,7 @@ items:
     attribute_modifiers:
       mainhand:
         attackDamage: 9.5
+        attackSpeed: 0.9
   platinum_axe:
     display_name: display-name-platinum_axe
     resource:
@@ -76,6 +81,7 @@ items:
     attribute_modifiers:
       mainhand:
         attackDamage: 9.75
+        attackSpeed: 0.9
   #---FACE 2
   crimson_axe:
     display_name: display-name-crimson_axe
@@ -89,6 +95,7 @@ items:
     attribute_modifiers:
       mainhand:
         attackDamage: 10
+        attackSpeed: 1
   demonite_axe:
     display_name: display-name-demonite_axe
     resource:
@@ -101,6 +108,7 @@ items:
     attribute_modifiers:
       mainhand:
         attackDamage: 10
+        attackSpeed: 1
   meteorite_axe:
     display_name: display-name-meteorite_axe
     resource:
@@ -113,6 +121,7 @@ items:
     attribute_modifiers:
       mainhand:
         attackDamage: 10.5
+        attackSpeed: 1
   hellstone_axe:
     display_name: display-name-hellstone_axe
     resource:
@@ -125,6 +134,7 @@ items:
     attribute_modifiers:
       mainhand:
         attackDamage: 11
+        attackSpeed: 1
   #---FACE 3
   cobalt_axe:
     display_name: display-name-cobalt_axe
@@ -138,6 +148,7 @@ items:
     attribute_modifiers:
       mainhand:
         attackDamage: 13
+        attackSpeed: 1
   palladium_axe:
     display_name: display-name-palladium_axe
     resource:
@@ -150,6 +161,7 @@ items:
     attribute_modifiers:
       mainhand:
         attackDamage: 13.5
+        attackSpeed: 1
   orichalcum_axe:
     display_name: display-name-orichalcum_axe
     resource:
@@ -162,6 +174,7 @@ items:
     attribute_modifiers:
       mainhand:
         attackDamage: 14
+        attackSpeed: 1
   mythril_axe:
     display_name: display-name-mythril_axe
     resource:
@@ -174,6 +187,7 @@ items:
     attribute_modifiers:
       mainhand:
         attackDamage: 14.5
+        attackSpeed: 1
   adamantite_axe:
     display_name: display-name-adamantite_axe
     resource:
@@ -186,6 +200,7 @@ items:
     attribute_modifiers:
       mainhand:
         attackDamage: 15
+        attackSpeed: 1
   titanium_axe:
     display_name: display-name-titanium_axe
     resource:
@@ -196,6 +211,7 @@ items:
     attribute_modifiers:
       mainhand:
         attackDamage: 15.5
+        attackSpeed: 1
   #---FACE 4
   chlorophyte_axe:
     display_name: display-name-chlorophyte_axe
@@ -209,6 +225,7 @@ items:
     attribute_modifiers:
       mainhand:
         attackDamage: 16
+        attackSpeed: 1
   #shroomite_axe
   luminite_axe:
     display_name: display-name-luminite_axe
@@ -221,4 +238,5 @@ items:
       max_custom_durability: 3000
     attribute_modifiers:
       mainhand:
-        attackDamage: 18
+        attackDamage: 18
+        attackSpeed: 1