games/ComfyFactorio
games/ComfyFactorio
1
0
Fork 0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2024-12-30 23:17:53 +02:00
Code Issues Releases Activity

Merge branch 'develop' into Small-locale-fix

Browse Source
This commit is contained in:
Gerkiz 2021-11-08 08:46:09 +01:00 committed by GitHub
commit ea7186de4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
locale/en/mtn_fortress_v3.cfg
View File

@ -80,6 +80,7 @@ new_items_at_market=New items have been unlocked at the locomotive market!
discharge_unlocked=Discharge defense has now been unlocked at the market!
artillery_unlocked=Artillery has now been unlocked at the market!
wd_paused=__1__ unlocked the last missing piece for the mystical chest!\n[color=yellow]Wave Defense has been paused for 15 minutes![/color]
wd_resumed=[color=yellow]Wave Defense has been resumed![/color]
mining_bonus=__1__ unlocked the last missing piece for the mystical chest!\n[color=yellow]Mining bonus has been applied for 15 minutes![/color]
movement_bonus=__1__ unlocked the last missing piece for the mystical chest!\n[color=yellow]Movement speed bonus has been applied for 15 minutes![/color]
coin_bonus=__1__ unlocked the last missing piece for the mystical chest!\n[color=yellow]Coins has been distributed![/color]

6
maps/mountain_fortress_v3/mystical_chest.lua
View File

@ -272,6 +272,8 @@ local pause_wd_token =
WD.pause(false)
local mc_rewards = WPT.get('mc_rewards')
mc_rewards.temp_boosts.wave_defense = nil
local message = ({'locomotive.wd_resumed'})
Alert.alert_all_players(15, message, nil, 'achievement/tech-maniac')
end
)
@ -408,7 +410,7 @@ local mc_random_rewards = {
name = 'Wave Defense',
str = 'wave_defense',
color = {r = 0.35, g = 0.00, b = 0.00},
tooltip = 'Selecting this will pause the wave defense for 15 minutes. Ideal if you want to take a break!',
tooltip = 'Selecting this will pause the wave defense for 5 minutes. Ideal if you want to take a break!',
func = (function(player)
local mc_rewards = WPT.get('mc_rewards')
if mc_rewards.temp_boosts.wave_defense then
@ -417,7 +419,7 @@ local mc_random_rewards = {
mc_rewards.temp_boosts.wave_defense = true
WD.pause(true)
Task.set_timeout_in_ticks(54000, pause_wd_token)
Task.set_timeout_in_ticks(18000, pause_wd_token)
local message = ({'locomotive.wd_paused', player.name})
Alert.alert_all_players(15, message, nil, 'achievement/tech-maniac')
return true

13
modules/biter_health_booster_v2.lua
View File

@ -269,6 +269,19 @@ local function on_entity_damaged(event)
return
end
local damage_type = event.damage_type
if damage_type and damage_type.name == 'electric' then
local stickers = event.entity.stickers
if stickers and #stickers > 0 then
for i = 1, #stickers, 1 do
if stickers[i].sticked_to == event.entity and stickers[i].name == 'stun-sticker' then
stickers[i].destroy()
break
end
end
end
end
if not health_pool and this.make_normal_unit_mini_bosses then
if this.biter_health_boost_forces[biter.force.index] then
Public.add_unit(biter, this.biter_health_boost_forces[biter.force.index])