adjusted potions, refined level up message animation

fixed incorrect translation used on axe double strike regen skill

Changed migration so that skills and skill groups foreign key to entity_id instead of character_id
This commit is contained in:
Monty 2021-01-12 01:57:13 +01:00 committed by Sam
parent de5c5702b3
commit 5362000de4
7 changed files with 131 additions and 112 deletions

View File

@ -7,7 +7,7 @@ ItemDef(
Buff((
kind: Potion,
data: (
strength: 2000.0,
strength: 1000.0,
duration: Some((
secs: 1,
nanos: 0,

View File

@ -7,7 +7,7 @@ ItemDef(
Buff((
kind: Potion,
data: (
strength: 1000.0,
strength: 750.0,
duration: Some((
secs: 1,
nanos: 0,

View File

@ -10,199 +10,199 @@
// Skills
// General
"hud.skill.inc_health_title": "Increase Health",
"hud.skill.inc_health": "Increases max health by 5{}",
"hud.skill.inc_health": "Increases max health by 5{SP}",
"hud.skill.inc_stam_title": "Increase Stamina",
"hud.skill.inc_stam": "Increases max stamina by 5{}",
"hud.skill.inc_stam": "Increases max stamina by 5{SP}",
"hud.skill.unlck_sword_title": "Unlock Sword",
"hud.skill.unlck_sword": "Unlocks sword skill tree{}",
"hud.skill.unlck_sword": "Unlocks sword skill tree{SP}",
"hud.skill.unlck_axe_title": "Unlock Axe",
"hud.skill.unlck_axe": "Unlocks axe skill tree{}",
"hud.skill.unlck_axe": "Unlocks axe skill tree{SP}",
"hud.skill.unlck_hammer_title": "Unlock Hammer",
"hud.skill.unlck_hammer": "Unlocks hammer skill tree{}",
"hud.skill.unlck_hammer": "Unlocks hammer skill tree{SP}",
"hud.skill.unlck_bow_title": "Unlock Bow",
"hud.skill.unlck_bow": "Unlocks bow skill tree{}",
"hud.skill.unlck_bow": "Unlocks bow skill tree{SP}",
"hud.skill.unlck_staff_title": "Unlock Staff",
"hud.skill.unlck_staff": "Unlocks staff skill tree{}",
"hud.skill.unlck_staff": "Unlocks staff skill tree{SP}",
"hud.skill.unlck_sceptre_title": "Unlock Sceptre",
"hud.skill.unlck_sceptre": "Unlocks sceptre skill tree{}",
"hud.skill.unlck_sceptre": "Unlocks sceptre skill tree{SP}",
"hud.skill.dodge_title": "Dodge",
"hud.skill.dodge": "Dodging avoids melee attacks{}",
"hud.skill.dodge": "Dodging avoids melee attacks{SP}",
"hud.skill.roll_stamina_title": "Roll Stamina Cost",
"hud.skill.roll_stamina": "Rolling uses 20% less stamina{}",
"hud.skill.roll_stamina": "Rolling uses 20% less stamina{SP}",
"hud.skill.roll_speed_title": "Rolling Speed",
"hud.skill.roll_speed": "Roll 30% faster{}",
"hud.skill.roll_speed": "Roll 30% faster{SP}",
"hud.skill.roll_dur_title": "Rolling Duration",
"hud.skill.roll_dur": "Roll for 20% more time{}",
"hud.skill.roll_dur": "Roll for 20% more time{SP}",
// Sceptre
"hud.skill.sc_projectile_speed_title": "Projectile Speed",
"hud.skill.sc_projectile_speed": "Projectile threw 25% faster{}",
"hud.skill.sc_projectile_speed": "Projectile threw 25% faster{SP}",
"hud.skill.sc_energy_cost_title" : "Energy Cost",
"hud.skill.sc_energy_cost" : "Decreases energy cost of bomb by 20%{}",
"hud.skill.sc_energy_cost" : "Decreases energy cost of bomb by 20%{SP}",
"hud.skill.sc_radius_title" : "Radius",
"hud.skill.sc_radius" : "Increases radius by 40%{}",
"hud.skill.sc_radius" : "Increases radius by 40%{SP}",
"hud.skill.sc_damage_title" : "Damage",
"hud.skill.sc_damage" : "Increases damage by 20%{}",
"hud.skill.sc_damage" : "Increases damage by 20%{SP}",
"hud.skill.sc_heal_title" : "Heal",
"hud.skill.sc_heal" : "Increases healing by 20%{}",
"hud.skill.sc_heal" : "Increases healing by 20%{SP}",
"hud.skill.sc_heal_cost_title" : "Heal Cost",
"hud.skill.sc_heal_cost" : "Use 10% less energy when healing{}",
"hud.skill.sc_heal_cost" : "Use 10% less energy when healing{SP}",
"hud.skill.sc_lifesteal_efficiency_title" : "Lifesteal Efficiency",
"hud.skill.sc_lifesteal_efficiency" : "Thieve 50% more health{}",
"hud.skill.sc_lifesteal_efficiency" : "Thieve 50% more health{SP}",
"hud.skill.sc_range_title" : "Range",
"hud.skill.sc_range" : "Longer beam, by 25%{}",
"hud.skill.sc_range" : "Longer beam, by 25%{SP}",
"hud.skill.sc_energy_regen_title" : "Energy Regen",
"hud.skill.sc_energy_regen" : "Increases energy regen from dealing damage by 10%{}",
"hud.skill.sc_energy_regen" : "Increases energy regen from dealing damage by 10%{SP}",
"hud.skill.sc_damage_title" : "Damage",
"hud.skill.sc_damage" : "Increases damage by 30%{}",
"hud.skill.sc_damage" : "Increases damage by 30%{SP}",
"hud.skill.sc_beam_heal_title" : "Beam Heal",
"hud.skill.sc_beam_heal" : "Increased healing from the beam by 20%{}",
"hud.skill.sc_beam_heal" : "Increased healing from the beam by 20%{SP}",
// Staff
"hud.skill.st_shockwave_range_title" : "Shockwave Range",
"hud.skill.st_shockwave_range" : "throw things that used to be out of reach, range increased 20%{}",
"hud.skill.st_shockwave_range" : "throw things that used to be out of reach, range increased 20%{SP}",
"hud.skill.st_shockwave_cost_title" : "Shockwave Cost",
"hud.skill.st_shockwave_cost" : "Decreases the energy cost to throw helpless villagers by 20%{}",
"hud.skill.st_shockwave_cost" : "Decreases the energy cost to throw helpless villagers by 20%{SP}",
"hud.skill.st_shockwave_knockback_title" : "Shockwave Knockback",
"hud.skill.st_shockwave_knockback" : "Increases throw potential by 30%{}",
"hud.skill.st_shockwave_knockback" : "Increases throw potential by 30%{SP}",
"hud.skill.st_shockwave_damage_title" : "Shockwave Damage",
"hud.skill.st_shockwave_damage" : "Increases the damage done by 30%{}",
"hud.skill.st_shockwave_damage" : "Increases the damage done by 30%{SP}",
"hud.skill.st_shockwave_unlock_title" : "Shockwave Unlock",
"hud.skill.st_shockwave_unlock" : "Unlocks the ability to throw enemies away using fire{}",
"hud.skill.st_shockwave_unlock" : "Unlocks the ability to throw enemies away using fire{SP}",
"hud.skill.st_flame_velocity_title" : "Flame Velocity",
"hud.skill.st_flame_velocity" : "Gets the fire there faster, 25% faster{}",
"hud.skill.st_flame_velocity" : "Gets the fire there faster, 25% faster{SP}",
"hud.skill.st_flamethrower_range_title" : "Flamethrower Range",
"hud.skill.st_flamethrower_range" : "For when the flames just won't reach, they go 25% further{}",
"hud.skill.st_flamethrower_range" : "For when the flames just won't reach, they go 25% further{SP}",
"hud.skill.st_energy_drain_title" : "Energy Drain",
"hud.skill.st_energy_drain" : "Decreases the rate energy is drained by 20%{}",
"hud.skill.st_energy_drain" : "Decreases the rate energy is drained by 20%{SP}",
"hud.skill.st_flamethrower_damage_title" : "Flamethrower Damage",
"hud.skill.st_flamethrower_damage" : "Increases damage by 30%{}",
"hud.skill.st_flamethrower_damage" : "Increases damage by 30%{SP}",
"hud.skill.st_explosion_radius_title" : "Explosion Radius",
"hud.skill.st_explosion_radius" : "Bigger is better, increases explosion radius by 10%{}",
"hud.skill.st_explosion_radius" : "Bigger is better, increases explosion radius by 10%{SP}",
"hud.skill.st_stamina_regen_title" : "Stamina Regen",
"hud.skill.st_stamina_regen" : "Increases stamina gain by 20%{}",
"hud.skill.st_stamina_regen" : "Increases stamina gain by 20%{SP}",
"hud.skill.st_damage_title" : "Damage",
"hud.skill.st_damage" : "Increases damage by 20%{}",
"hud.skill.st_damage" : "Increases damage by 20%{SP}",
"hud.skill.st_explosion_title" : "Explosion",
"hud.skill.st_explosion" : "When fire just isn't enough{}",
"hud.skill.st_explosion" : "When fire just isn't enough{SP}",
// Bow
"hud.skill.bow_projectile_speed_title" : "Projectile Speed",
"hud.skill.bow_projectile_speed" : "Allows you to shoot arrows further, faster, by 50%{}",
"hud.skill.bow_projectile_speed" : "Allows you to shoot arrows further, faster, by 50%{SP}",
"hud.skill.bow_arrow_count_title" : "Arrow Count",
"hud.skill.bow_arrow_count" : "shoot an additional arrow when you leap{}",
"hud.skill.bow_arrow_count" : "shoot an additional arrow when you leap{SP}",
"hud.skill.bow_repeater_cost_title" : "Repeater Cost",
"hud.skill.bow_repeater_cost" : "Decreases the energy cost to become a gliding repeater by 25%{}",
"hud.skill.bow_repeater_cost" : "Decreases the energy cost to become a gliding repeater by 25%{SP}",
"hud.skill.bow_repeater_glide_title" : "Repeater Glide",
"hud.skill.bow_repeater_glide" : "Glide further while repeating{}",
"hud.skill.bow_repeater_glide" : "Glide further while repeating{SP}",
"hud.skill.bow_repeater_damage_title" : "Repeater Damage",
"hud.skill.bow_repeater_damage" : "Increases the damage done by 30%{}",
"hud.skill.bow_repeater_damage" : "Increases the damage done by 30%{SP}",
"hud.skill.bow_repeater_unlock_title" : "Repeater Unlock",
"hud.skill.bow_repeater_unlock" : "Unlocks the ability to leap in the air and shoot a barrage of arrows{}",
"hud.skill.bow_repeater_unlock" : "Unlocks the ability to leap in the air and shoot a barrage of arrows{SP}",
"hud.skill.bow_charged_knockback_title" : "Charged Knockback",
"hud.skill.bow_charged_knockback" : "throw enemies further by 50%{}",
"hud.skill.bow_charged_knockback" : "throw enemies further by 50%{SP}",
"hud.skill.bow_charged_move_speed_title" : "Charged Move Speed",
"hud.skill.bow_charged_move_speed" : "Increases how fast you can shuffle while charging the attack by 25%{}",
"hud.skill.bow_charged_move_speed" : "Increases how fast you can shuffle while charging the attack by 25%{SP}",
"hud.skill.bow_charged_speed_title" : "Charged Speed",
"hud.skill.bow_charged_speed" : "Increases the rate that you charge the attack by 25%{}",
"hud.skill.bow_charged_speed" : "Increases the rate that you charge the attack by 25%{SP}",
"hud.skill.bow_charged_projectile_speed_title" : "Charged Projectile Speed",
"hud.skill.bow_charged_projectile_speed" : "Increases throw potential applied to arrow while charging by 20%{}",
"hud.skill.bow_charged_projectile_speed" : "Increases throw potential applied to arrow while charging by 20%{SP}",
"hud.skill.bow_charged_drain_title" : "Charged Drain",
"hud.skill.bow_charged_drain" : "Decreases the rate of stamina drain by 25%{}",
"hud.skill.bow_charged_drain" : "Decreases the rate of stamina drain by 25%{SP}",
"hud.skill.bow_charged_damage_title" : "Charged Damage",
"hud.skill.bow_charged_damage" : "Increases damage by 25%{}",
"hud.skill.bow_charged_damage" : "Increases damage by 25%{SP}",
"hud.skill.bow_energy_regen_title" : "Energy Regen",
"hud.skill.bow_energy_regen" : "Increases stamina gain by 50%{}",
"hud.skill.bow_energy_regen" : "Increases stamina gain by 50%{SP}",
"hud.skill.bow_damage_title" : "Damage",
"hud.skill.bow_damage" : "Increases damage by 30%{}",
"hud.skill.bow_damage" : "Increases damage by 30%{SP}",
// Hammer
"hud.skill.hmr_leap_radius_title" : "Leap Radius",
"hud.skill.hmr_leap_radius" : "Increases attack radius on ground slam by 1 meter{}",
"hud.skill.hmr_leap_radius" : "Increases attack radius on ground slam by 1 meter{SP}",
"hud.skill.hmr_leap_distance_title" : "Leap Distance",
"hud.skill.hmr_leap_distance" : "Increases distance of leap by 25%{}",
"hud.skill.hmr_leap_distance" : "Increases distance of leap by 25%{SP}",
"hud.skill.hmr_leap_cost_title" : "Leap Cost",
"hud.skill.hmr_leap_cost" : "Decreases cost of leap by 25%{}",
"hud.skill.hmr_leap_cost" : "Decreases cost of leap by 25%{SP}",
"hud.skill.hmr_leap_knockback_title" : "Leap Knockback",
"hud.skill.hmr_leap_knockback" : "Increases knockback from leap by 50%{}",
"hud.skill.hmr_leap_knockback" : "Increases knockback from leap by 50%{SP}",
"hud.skill.hmr_leap_damage_title" : "Leap Damage",
"hud.skill.hmr_leap_damage" : "Increases damage of leap by 40%{}",
"hud.skill.hmr_leap_damage" : "Increases damage of leap by 40%{SP}",
"hud.skill.hmr_unlock_leap_title" : "Unlock Leap",
"hud.skill.hmr_unlock_leap" : "Unlocks a leap{}",
"hud.skill.hmr_unlock_leap" : "Unlocks a leap{SP}",
"hud.skill.hmr_charged_rate_title" : "Charge Rate",
"hud.skill.hmr_charged_rate" : "Increases the rate that you charge the swing by 25%{}",
"hud.skill.hmr_charged_rate" : "Increases the rate that you charge the swing by 25%{SP}",
"hud.skill.hmr_charged_melee_nrg_drain_title" : "Charged Melee Energy Drain",
"hud.skill.hmr_charged_melee_nrg_drain" : "Decreases the rate energy drains when charging by 25%{}",
"hud.skill.hmr_charged_melee_nrg_drain" : "Decreases the rate energy drains when charging by 25%{SP}",
"hud.skill.hmr_charged_melee_damage_title" : "Charged Melee Damage",
"hud.skill.hmr_charged_melee_damage" : "Increases the damage of the charged swing by 25%{}",
"hud.skill.hmr_charged_melee_damage" : "Increases the damage of the charged swing by 25%{SP}",
"hud.skill.hmr_charged_melee_knockback_title" : "Charged Melee Knockback",
"hud.skill.hmr_charged_melee_knockback" : "Massively increases throw potential of swing by 50%{}",
"hud.skill.hmr_charged_melee_knockback" : "Massively increases throw potential of swing by 50%{SP}",
"hud.skill.hmr_single_strike_regen_title" : "Single Strike Regen",
"hud.skill.hmr_single_strike_regen" : "Increases stamina gain with each successive strike{}",
"hud.skill.hmr_single_strike_regen" : "Increases stamina gain with each successive strike{SP}",
"hud.skill.hmr_single_strike_speed_title" : "Single Strike Speed",
"hud.skill.hmr_single_strike_speed" : "Increases the attack speed with each successive strike{}",
"hud.skill.hmr_single_strike_speed" : "Increases the attack speed with each successive strike{SP}",
"hud.skill.hmr_single_strike_damage_title" : "Single Strike Damage",
"hud.skill.hmr_single_strike_damage" : "Increases the damage with each successive strike{}",
"hud.skill.hmr_single_strike_damage" : "Increases the damage with each successive strike{SP}",
"hud.skill.hmr_single_strike_knockback_title" : "Single Strike Knockback",
"hud.skill.hmr_single_strike_knockback" : "Increase throw potential of swings by 50%{}",
"hud.skill.hmr_single_strike_knockback" : "Increase throw potential of swings by 50%{SP}",
"hud.skill." : "",
// Sword
"hud.skill.sw_trip_str_combo_title": "Triple Strike Combo",
"hud.skill.sw_trip_str_combo": "Unlocks combo scaling on triple strike{}",
"hud.skill.sw_trip_str_combo": "Unlocks combo scaling on triple strike{SP}",
"hud.skill.sw_trip_str_dmg_title": "Triple Strike Damage",
"hud.skill.sw_trip_str_dmg": "Increases the damage each successive strike does{}",
"hud.skill.sw_trip_str_dmg": "Increases the damage each successive strike does{SP}",
"hud.skill.sw_trip_str_sp_title": "Triple Strike Speed",
"hud.skill.sw_trip_str_sp": "Increases attack speed gained by each successive strike{}",
"hud.skill.sw_trip_str_sp": "Increases attack speed gained by each successive strike{SP}",
"hud.skill.sw_trip_str_reg_title": "Triple Strike Regen",
"hud.skill.sw_trip_str_reg": "Increases stamina gain on each successive strike{}",
"hud.skill.sw_trip_str_reg": "Increases stamina gain on each successive strike{SP}",
"hud.skill.sw_dash_dmg_title": "Dash Damage",
"hud.skill.sw_dash_dmg": "Increases initial damage of the dash by 20%{}",
"hud.skill.sw_dash_dmg": "Increases initial damage of the dash by 20%{SP}",
"hud.skill.sw_dash_drain_title": "Dash Drain",
"hud.skill.sw_dash_drain": "Decreases the rate energy is drained while dashing by 25%{}",
"hud.skill.sw_dash_drain": "Decreases the rate energy is drained while dashing by 25%{SP}",
"hud.skill.sw_dash_cost_title": "Dash Cost",
"hud.skill.sw_dash_cost": "Decreases the initial cost of the dash by 25%{}",
"hud.skill.sw_dash_cost": "Decreases the initial cost of the dash by 25%{SP}",
"hud.skill.sw_dash_speed_title": "Dash Speed",
"hud.skill.sw_dash_speed": "Increases how fast you go while dashing by 30%{}",
"hud.skill.sw_dash_speed": "Increases how fast you go while dashing by 30%{SP}",
"hud.skill.sw_dash_inf_title": "Dash Infinite",
"hud.skill.sw_dash_inf": "Allows you to dash for as long as you have energy{}",
"hud.skill.sw_dash_inf": "Allows you to dash for as long as you have energy{SP}",
"hud.skill.sw_dash_scale_title": "Dash Scaling Damage",
"hud.skill.sw_dash_scale": "Increases the damage scaling from the dash by 20%{}",
"hud.skill.sw_dash_scale": "Increases the damage scaling from the dash by 20%{SP}",
"hud.skill.sw_spin_title": "Spin Unlock",
"hud.skill.sw_spin": "Unlocks the sword spin{}",
"hud.skill.sw_spin": "Unlocks the sword spin{SP}",
"hud.skill.sw_spin_dmg_title": "Spin Damage",
"hud.skill.sw_spin_dmg": "Increases the damage done by 40%{}",
"hud.skill.sw_spin_dmg": "Increases the damage done by 40%{SP}",
"hud.skill.sw_spin_spd_title": "Spin Speed",
"hud.skill.sw_spin_spd": "Increase the speed at which you spin by 25%{}",
"hud.skill.sw_spin_spd": "Increase the speed at which you spin by 25%{SP}",
"hud.skill.sw_spin_cost_title": "Spin Cost",
"hud.skill.sw_spin_cost": "Decreases the energy cost of each spin by 25%{}",
"hud.skill.sw_spin_cost": "Decreases the energy cost of each spin by 25%{SP}",
"hud.skill.sw_spin_spins_title": "Spin Spins",
"hud.skill.sw_spin_spins": "Increases the number of times you can spin{}",
"hud.skill.sw_spin_spins": "Increases the number of times you can spin{SP}",
"hud.skill.sw_interrupt_title": "Interrupting Attacks",
"hud.skill.sw_interrupt": "Allows you to immediately cancel an attack with another attack{}",
"hud.skill.sw_interrupt": "Allows you to immediately cancel an attack with another attack{SP}",
"hud.skill.axe_double_strike_combo_title": "Double Strike Combo",
"hud.skill.axe_double_strike_combo": "Unlocks a second strike{}",
"hud.skill.axe_double_strike_combo": "Unlocks a second strike{SP}",
"hud.skill.axe_double_strike_damage_title": "Double Strike Damage",
"hud.skill.axe_double_strike_damage": "Increases the damage dealt in each successive strike{}",
"hud.skill.axe_double_strike_damage": "Increases the damage dealt in each successive strike{SP}",
"hud.skill.axe_double_strike_speed_title": "Double Strike Speed",
"hud.skill.axe_double_strike_speed": "Increases the attack speed with each successive strike{}",
"hud.skill.axe_double_strike_speed": "Increases the attack speed with each successive strike{SP}",
"hud.skill.axe_double_strike_regen_title": "Double Strike Regen",
"hud.skill.axe_double_strike_regen": "Increases stamina gain with each successive strike{}",
"hud.skill.axe_double_strike_regen": "Increases stamina gain with each successive strike{SP}",
"hud.skill.axe_infinite_axe_spin_title": "Infinite Axe Spin",
"hud.skill.axe_infinite_axe_spin": "Spin for as long as you have energy{}",
"hud.skill.axe_infinite_axe_spin": "Spin for as long as you have energy{SP}",
"hud.skill.axe_spin_damage_title": "Spin Damage",
"hud.skill.axe_spin_damage": "Increases the damage each spin does by 30%{}",
"hud.skill.axe_spin_damage": "Increases the damage each spin does by 30%{SP}",
"hud.skill.axe_spin_helicopter_title": "Spin Helicopter",
"hud.skill.axe_spin_helicopter": "You fall a little slower while spinning{}",
"hud.skill.axe_spin_helicopter": "You fall a little slower while spinning{SP}",
"hud.skill.axe_spin_speed_title": "Spin Speed",
"hud.skill.axe_spin_speed": "Increases your spin speed by 25%{}",
"hud.skill.axe_spin_speed": "Increases your spin speed by 25%{SP}",
"hud.skill.axe_spin_cost_title": "Spin Cost",
"hud.skill.axe_spin_cost": "Decreases stamina cost of spinning by 25%",
"hud.skill.axe_unlock_leap_title": "Unlock Leap",
"hud.skill.axe_unlock_leap": "Unlocks a leap spin{}",
"hud.skill.axe_unlock_leap": "Unlocks a leap spin{SP}",
"hud.skill.axe_leap_damage_title": "Leap Damage",
"hud.skill.axe_leap_damage": "Increases damage of leap by 35%{}",
"hud.skill.axe_leap_damage": "Increases damage of leap by 35%{SP}",
"hud.skill.axe_leap_knockback_title": "Leap Knockback",
"hud.skill.axe_leap_knockback": "Increases knockback from leap by 40%",
"hud.skill.axe_leap_cost_title": "Leap Cost",
"hud.skill.axe_leap_cost": "Decreases cost of leap by 25%{}",
"hud.skill.axe_leap_cost": "Decreases cost of leap by 25%{SP}",
"hud.skill.axe_leap_distance_title": "Leap Distance",
"hud.skill.axe_leap_distance": "Increases distance of leap by 20%{}",
"hud.skill.axe_leap_distance": "Increases distance of leap by 20%{SP}",
},

View File

@ -33,22 +33,22 @@ DROP TABLE stats;
-- Creates new table for skill groups
CREATE TABLE skill_group (
character_id INTEGER NOT NULL,
entity_id INTEGER NOT NULL,
skill_group_type TEXT NOT NULL,
exp INTEGER NOT NULL,
available_sp INTEGER NOT NULL,
earned_sp INTEGER NOT NULL,
FOREIGN KEY(character_id) REFERENCES character(character_id),
PRIMARY KEY(character_id,skill_group_type)
earned_sp INTEGER NOT NULL,
FOREIGN KEY(entity_id) REFERENCES entity(entity_id),
PRIMARY KEY(entity_id,skill_group_type)
);
-- Creates new table for skills
CREATE TABLE skill (
character_id INTEGER NOT NULL,
skill TEXT NOT NULL,
level INTEGER,
FOREIGN KEY(character_id) REFERENCES character(character_id),
PRIMARY KEY(character_id,skill)
entity_id INTEGER NOT NULL,
skill TEXT NOT NULL,
level INTEGER,
FOREIGN KEY(entity_id) REFERENCES entity(entity_id),
PRIMARY KEY(entity_id,skill)
);
-- Inserts starting skill group for everyone

View File

@ -1551,11 +1551,11 @@ impl<'a> Widget for Diary<'a> {
self.tooltip_manager,
&self
.localized_strings
.get("hud.skill.axe_double_strike_speed_title"),
.get("hud.skill.axe_double_strike_regen_title"),
&add_sp_cost_tooltip(
&self
.localized_strings
.get("hud.skill.axe_double_strike_speed"),
.get("hud.skill.axe_double_strike_regen"),
skill,
&self.stats.skill_set,
&self.localized_strings,
@ -3449,7 +3449,7 @@ fn add_sp_cost_tooltip<'a>(
match skill_set.skills.get(&skill).copied() {
Some(level) if level == skill.get_max_level() => tooltip.replace("{}", ""),
_ => tooltip.replace(
"{}",
"{SP}",
&localized_strings.get("hud.skill.req_sp").replace(
"{number}",
&format!("{}", skill_set.skill_point_cost(skill)),

View File

@ -1148,9 +1148,14 @@ impl Hud {
1.0
};
// Background image
let offset = if display.timer < tweak!(2.0) {
300.0 - (display.timer as f64 - tweak!(2.0)) * tweak!(-300.0)
} else {
300.0
};
Image::new(self.imgs.level_up)
.w_h(328.0, 126.0)
.mid_top_with_margin_on(ui_widgets.window, tweak!(300.0))
.mid_top_with_margin_on(ui_widgets.window, offset)
.graphics_for(ui_widgets.window)
.color(Some(Color::Rgba(1.0, 1.0, 1.0, fade)))
.set(self.ids.player_rank_up, ui_widgets);

View File

@ -398,12 +398,26 @@ impl<'a> Widget for Overhead<'a> {
_ => XP_COLOR,
};
Image::new(self.imgs.indicator_bubble)
.w_h(5.0 * BARSIZE, 5.0 * BARSIZE)
.x_y(tweak!(-37.0) * BARSIZE, MANA_BAR_Y + tweak!(7.5))
.color(Some(indicator_col))
if combat_rating > artifact && !self.in_group {
let skull_ani = ((self.pulse * 0.7/* speed factor */).cos() * 0.5 + 0.5) * 10.0; //Animation timer
Image::new(if skull_ani as i32 == 1 && rand::random::<f32>() < 0.9 {
self.imgs.skull_2
} else {
self.imgs.skull
})
.w_h(18.0 * BARSIZE, 18.0 * BARSIZE)
.x_y(-39.0 * BARSIZE, MANA_BAR_Y + 7.0)
.color(Some(Color::Rgba(1.0, 1.0, 1.0, 1.0)))
.parent(id)
.set(state.ids.level, ui);
.set(state.ids.level_skull, ui);
} else {
Image::new(self.imgs.indicator_bubble)
.w_h(5.0 * BARSIZE, 5.0 * BARSIZE)
.x_y(tweak!(-37.0) * BARSIZE, MANA_BAR_Y + tweak!(7.5))
.color(Some(indicator_col))
.parent(id)
.set(state.ids.level, ui);
}
}
}
// Speech bubble