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 mtn_v3

Browse Source
This commit is contained in:
Gerkiz 2021-10-02 21:40:02 +02:00 committed by GitHub
commit af84582559
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 58 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/issue_template.md vendored Normal file
View File

@ -0,0 +1,7 @@
# Please follow the general troubleshooting steps first:
- [ ] Have you checked to ensure there aren't other open [Issues](../../../issues) for the same issue?
### Bug reports:
Please replace this line with a brief summary of your issue.

14
.github/pull_request_template.md vendored Normal file
View File

@ -0,0 +1,14 @@
### All Submissions:
- [ ] Have you checked to ensure there aren't other open [Pull Requests](../../../pulls) for the same update/change?
### Tested Changes:
1. [ ] Does your submission pass tests?
2. [ ] Have you lint your code locally prior to submission?
### Changes to Core Features:
- [ ] Have you added an explanation of what your changes do and why you'd like us to include them?
- [ ] Have you written new tests for your core changes, as applicable?
- [ ] Have you successfully ran tests with your changes locally?

14
locale/en/mtn_fortress_v3.cfg
View File

@ -78,16 +78,16 @@ artillery_unlocked=Artillery has now been unlocked at the market!
[main_market]
chest=Upgrades the amount of chests that can be placed outside.\nCan be purchased multiple times.
locomotive_max_health=Upgrades the train health.\nCan be purchased multiple times.
locomotive_xp_aura=Upgrades the XP aura that is around the train.
xp_points_boost=Upgrades the amount of XP points you get inside the XP aura
chest=Upgrades the amount of chests that can be placed outside.\nCan be purchased multiple times. [__1__/7]
locomotive_max_health=Upgrades the train health.\nCan be purchased multiple times. [__1__/99]
locomotive_xp_aura=Upgrades the XP aura that is around the train. [__1__]
xp_points_boost=Upgrades the amount of XP points you get inside the XP aura [__1__]
explosive_bullets=Upgrades ordinary SMG ammo to explosive bullets.
reroll_market_items=Will reroll the items in the market and shuffle prices.
purchase_pickaxe=Upgrade the teams Pickaxe to tier: __1__
purchase_pickaxe=Upgrade the teams Pickaxe to tier: __1__ [__2__/58]
sold_out=Sold out!
flamethrower_turret=Upgrades the amount of flamethrowers that can be placed.
land_mine=Upgrades the amount of landmines that can be placed.
flamethrower_turret=Upgrades the amount of flamethrowers that can be placed. [__1__]
land_mine=Upgrades the amount of landmines that can be placed. [__1__]
car=Portable Car Surface\nCan be killed easily.
tank=Portable Tank Surface\nChonk tank, can resist heavy damage.
tank_cannon_na=Tank Cannon\nAvailable after wave __1__.

14
locale/ru/mtn_fortress_v3.cfg
View File

@ -76,16 +76,16 @@ discharge_unlocked=Электроразрядная защита теперь д
artillery_unlocked=Артиллерия теперь доступна на рынке!
[main_market]
chest=Увеличивает количество сундуков, которые можно разместить снаружи.\nМожно купить несколько раз.
locomotive_max_health=Улучшает здоровье поезда.\nМожно купить несколько раз.
locomotive_xp_aura=Улучшает зону опыта вокруг поезда.
xp_points_boost=Увеличивает количество очков опыта, которые вы получаете внутри зоны опыта.
chest=Увеличивает количество сундуков, которые можно разместить снаружи.\nМожно купить несколько раз. [__1__/7]
locomotive_max_health=Улучшает здоровье поезда.\nМожно купить несколько раз. [__1__/99]
locomotive_xp_aura=Улучшает зону опыта вокруг поезда. [__1__]
xp_points_boost=Увеличивает количество очков опыта, которые вы получаете внутри зоны опыта. [__1__]
explosive_bullets=Улучшает боеприпасы обычных пистолетов-пулеметов до разрывных пуль.
reroll_market_items=Изменит предметы на рынке и перемешает цены.
purchase_pickaxe=Улучшит кирку команды до уровня: __1__
purchase_pickaxe=Улучшит кирку команды до уровня: __1__ [__2__/58]
sold_out=Продано!
flamethrower_turret=Увеличивает количество размещаемых огнемётов.
land_mine=Увеличивает количество размещаемых мин.
flamethrower_turret=Увеличивает количество размещаемых огнемётов. [__1__]
land_mine=Увеличивает количество размещаемых мин. [__1__]
car=Портативная поверхность автомобиля\nМожет быть легко убита.
tank=Портативная поверхность танка\nКрутой танк, может противостоять тяжёлым повреждениям.
tank_cannon_na=Танковая пушка\nДоступна после волны __1__.

14
locale/zh-CN/mtn_fortress_v3.cfg
View File

@ -75,16 +75,16 @@ new_items_at_market=火车市场已经解锁了新物品!
[main_market]
chest=提高了可以在外面放置的箱子数量.\n可以多次购买.
locomotive_max_health=升级火车生命.\n可以多次购买
locomotive_xp_aura=升级火车周围的经验光环。
xp_points_boost=升级您在经验光环中获得的经验值
chest=提高了可以在外面放置的箱子数量.\n可以多次购买. [__1__/7]
locomotive_max_health=升级火车生命.\n可以多次购买 [__1__/99]
locomotive_xp_aura=升级火车周围的经验光环。 [__1__]
xp_points_boost=升级您在经验光环中获得的经验值 [__1__]
explosive_bullets=将普通的SMG弹药升级为爆炸子弹.
reroll_market_items=重置市场的商品并调整价格.
purchase_pickaxe=将团队镐升级到等级：__1__
purchase_pickaxe=将团队镐升级到等级：__1__ [__2__/58]
sold_out=售罄!
flamethrower_turret=升级可以放置的火焰喷射器的数量.
land_mine=升级可以放置的地雷数量.
flamethrower_turret=升级可以放置的火焰喷射器的数量. [__1__]
land_mine=升级可以放置的地雷数量. [__1__]
car=便携汽车操作\n可以更容易打死.
tank=便携坦克操作\n大坦克, 可以抵抗严重伤害.
tank_cannon_na=坦克炮\n在__1__波之后可用.

42
maps/mountain_fortress_v3/locomotive.lua
View File

@ -1139,13 +1139,9 @@ local function gui_click(event)
return
end
if name == 'chest_limit_outside' then
if this.chest_limit_outside_upgrades == 8 then
local main_market_items = WPT.get('main_market_items')
main_market_items['chest_limit_outside'].enabled = false
main_market_items['chest_limit_outside'].tooltip = ({'locomotive.limit_reached'})
if this.chest_limit_outside_upgrades == 7 then
redraw_market_items(data.item_frame, player, data.search_text)
return player.print(({'locomotive.chests_full'}), {r = 0.98, g = 0.66, b = 0.22})
player.print(({'locomotive.chests_full'}), {r = 0.98, g = 0.66, b = 0.22})
end
player.remove_item({name = item.value, count = item.price})
@ -1164,13 +1160,6 @@ local function gui_click(event)
return
end
if name == 'locomotive_max_health' then
if this.health_upgrades >= this.health_upgrades_limit then
local main_market_items = WPT.get('main_market_items')
main_market_items['locomotive_max_health'].enabled = false
main_market_items['locomotive_max_health'].tooltip = ({'locomotive.limit_reached'})
redraw_market_items(data.item_frame, player, data.search_text)
return
end
player.remove_item({name = item.value, count = item.price})
local message = ({'locomotive.health_bought_info', shopkeeper, player.name, format_number(item.price, true)})
@ -2202,6 +2191,7 @@ function Public.get_items()
local flame_turret = WPT.get('upgrades').flame_turret.bought
local landmine = WPT.get('upgrades').landmine.bought
local fixed_prices = WPT.get('marked_fixed_prices')
local health_upgrades_limit = WPT.get('health_upgrades_limit')
local chest_limit_cost = round(fixed_prices.chest_limit_cost * (1 + chest_limit_outside_upgrades))
local health_cost = round(fixed_prices.health_cost * (1 + health_upgrades))
@ -2232,7 +2222,7 @@ function Public.get_items()
stack = 1,
value = 'coin',
price = pickaxe_cost,
tooltip = ({'main_market.purchase_pickaxe', offer}),
tooltip = ({'main_market.purchase_pickaxe', offer, pickaxe_tier-1}),
sprite = 'achievement/delivery-service',
enabled = true,
upgrade = true,
@ -2240,14 +2230,14 @@ function Public.get_items()
}
end
if main_market_items['chest_limit_outside'] then
if chest_limit_outside_upgrades == 8 then
main_market_items['chest_limit_outside'] = {
stack = 1,
value = 'coin',
price = chest_limit_cost,
tooltip = main_market_items['chest_limit_outside'].tooltip,
tooltip = ({'locomotive.limit_reached'}),
sprite = 'achievement/so-long-and-thanks-for-all-the-fish',
enabled = main_market_items['chest_limit_outside'].enabled,
enabled = false,
upgrade = true,
static = true
}
@ -2256,7 +2246,7 @@ function Public.get_items()
stack = 1,
value = 'coin',
price = chest_limit_cost,
tooltip = ({'main_market.chest'}),
tooltip = ({'main_market.chest', chest_limit_outside_upgrades-1}),
sprite = 'achievement/so-long-and-thanks-for-all-the-fish',
enabled = true,
upgrade = true,
@ -2264,14 +2254,14 @@ function Public.get_items()
}
end
if main_market_items['locomotive_max_health'] then
if health_upgrades >= health_upgrades_limit then
main_market_items['locomotive_max_health'] = {
stack = 1,
value = 'coin',
price = health_cost,
tooltip = main_market_items['locomotive_max_health'].tooltip,
tooltip = ({'locomotive.limit_reached'}),
sprite = 'achievement/getting-on-track',
enabled = main_market_items['locomotive_max_health'].enabled,
enabled = false,
upgrade = true,
static = true
}
@ -2280,7 +2270,7 @@ function Public.get_items()
stack = 1,
value = 'coin',
price = health_cost,
tooltip = ({'main_market.locomotive_max_health'}),
tooltip = ({'main_market.locomotive_max_health', health_upgrades-1}),
sprite = 'achievement/getting-on-track',
enabled = true,
upgrade = true,
@ -2292,7 +2282,7 @@ function Public.get_items()
stack = 1,
value = 'coin',
price = aura_cost,
tooltip = ({'main_market.locomotive_xp_aura'}),
tooltip = ({'main_market.locomotive_xp_aura', aura_upgrades}),
sprite = 'achievement/tech-maniac',
enabled = true,
upgrade = true,
@ -2302,7 +2292,7 @@ function Public.get_items()
stack = 1,
value = 'coin',
price = xp_point_boost_cost,
tooltip = ({'main_market.xp_points_boost'}),
tooltip = ({'main_market.xp_points_boost', xp_points_upgrade}),
sprite = 'achievement/trans-factorio-express',
enabled = true,
upgrade = true,
@ -2335,7 +2325,7 @@ function Public.get_items()
stack = 1,
value = 'coin',
price = flamethrower_turrets_cost,
tooltip = ({'main_market.flamethrower_turret'}),
tooltip = ({'main_market.flamethrower_turret', flame_turret}),
sprite = 'achievement/pyromaniac',
enabled = true,
upgrade = true,
@ -2345,7 +2335,7 @@ function Public.get_items()
stack = 1,
value = 'coin',
price = land_mine_cost,
tooltip = ({'main_market.land_mine'}),
tooltip = ({'main_market.land_mine', landmine}),
sprite = 'achievement/watch-your-step',
enabled = true,
upgrade = true,