From 532acd7444ca5490e2cecde5d54ee0018bc6141c Mon Sep 17 00:00:00 2001 From: Gerkiz Date: Wed, 9 Dec 2020 19:59:49 +0100 Subject: [PATCH] tweaks to mtn fortress --- commands/misc.lua | 78 +++++++++++---------- maps/mountain_fortress_v3/basic_markets.lua | 4 +- maps/mountain_fortress_v3/ic/functions.lua | 24 +++---- maps/mountain_fortress_v3/loot.lua | 2 + 4 files changed, 56 insertions(+), 52 deletions(-) diff --git a/commands/misc.lua b/commands/misc.lua index ceb720f5..dbaa7ba3 100644 --- a/commands/misc.lua +++ b/commands/misc.lua @@ -282,7 +282,7 @@ commands.add_command( p_modifer[player.index].character_mining_speed_modifier['creative'] = 50 p_modifer[player.index].character_health_bonus['creative'] = 2000 p_modifer[player.index].character_crafting_speed_modifier['creative'] = 50 - v.character_inventory_slots_bonus = p_modifer[k].character_inventory_slots_bonus['creative'] + v.character_inventory_slots_bonus = p_modifer[player.index].character_inventory_slots_bonus['creative'] v.insert {name = _k, count = _v.stack_size} v.print('[CREATIVE] Inserted all base items.', Color.success) Modifiers.update_player_modifiers(player) @@ -394,42 +394,46 @@ local on_player_joined_game = function(event) end function Public.insert_all_items(player) - if player.character ~= nil then - if player.get_inventory(defines.inventory.character_armor) then - player.get_inventory(defines.inventory.character_armor).clear() - end - player.insert {name = 'power-armor-mk2', count = 1} - local p_armor = player.get_inventory(5)[1].grid - if p_armor and p_armor.valid then - p_armor.put({name = 'fusion-reactor-equipment'}) - p_armor.put({name = 'fusion-reactor-equipment'}) - p_armor.put({name = 'fusion-reactor-equipment'}) - p_armor.put({name = 'exoskeleton-equipment'}) - p_armor.put({name = 'exoskeleton-equipment'}) - p_armor.put({name = 'exoskeleton-equipment'}) - p_armor.put({name = 'energy-shield-mk2-equipment'}) - p_armor.put({name = 'energy-shield-mk2-equipment'}) - p_armor.put({name = 'energy-shield-mk2-equipment'}) - p_armor.put({name = 'energy-shield-mk2-equipment'}) - p_armor.put({name = 'personal-roboport-mk2-equipment'}) - p_armor.put({name = 'night-vision-equipment'}) - p_armor.put({name = 'battery-mk2-equipment'}) - p_armor.put({name = 'battery-mk2-equipment'}) - end - local item = game.item_prototypes - local i = 0 - local p_modifer = Modifiers.get_table() - for _k, _v in pairs(item) do - i = i + 1 - if _k and _v.type ~= 'mining-tool' then - p_modifer[player.index].character_inventory_slots_bonus['creative'] = tonumber(i) - p_modifer[player.index].character_mining_speed_modifier['creative'] = 50 - p_modifer[player.index].character_health_bonus['creative'] = 2000 - p_modifer[player.index].character_crafting_speed_modifier['creative'] = 50 - player.character_inventory_slots_bonus = p_modifer[player.index].character_inventory_slots_bonus['creative'] - player.insert {name = _k, count = _v.stack_size} - player.print('[CREATIVE] Inserted all base items.', Color.success) - Modifiers.update_player_modifiers(player) + if this.creative_enabled then + if not this.players[player.index] then + if player.character ~= nil then + if player.get_inventory(defines.inventory.character_armor) then + player.get_inventory(defines.inventory.character_armor).clear() + end + player.insert {name = 'power-armor-mk2', count = 1} + local p_armor = player.get_inventory(5)[1].grid + if p_armor and p_armor.valid then + p_armor.put({name = 'fusion-reactor-equipment'}) + p_armor.put({name = 'fusion-reactor-equipment'}) + p_armor.put({name = 'fusion-reactor-equipment'}) + p_armor.put({name = 'exoskeleton-equipment'}) + p_armor.put({name = 'exoskeleton-equipment'}) + p_armor.put({name = 'exoskeleton-equipment'}) + p_armor.put({name = 'energy-shield-mk2-equipment'}) + p_armor.put({name = 'energy-shield-mk2-equipment'}) + p_armor.put({name = 'energy-shield-mk2-equipment'}) + p_armor.put({name = 'energy-shield-mk2-equipment'}) + p_armor.put({name = 'personal-roboport-mk2-equipment'}) + p_armor.put({name = 'night-vision-equipment'}) + p_armor.put({name = 'battery-mk2-equipment'}) + p_armor.put({name = 'battery-mk2-equipment'}) + end + local item = game.item_prototypes + local i = 0 + local p_modifer = Modifiers.get_table() + for _k, _v in pairs(item) do + i = i + 1 + if _k and _v.type ~= 'mining-tool' then + p_modifer[player.index].character_inventory_slots_bonus['creative'] = tonumber(i) + p_modifer[player.index].character_mining_speed_modifier['creative'] = 50 + p_modifer[player.index].character_health_bonus['creative'] = 2000 + p_modifer[player.index].character_crafting_speed_modifier['creative'] = 50 + player.character_inventory_slots_bonus = p_modifer[player.index].character_inventory_slots_bonus['creative'] + player.insert {name = _k, count = _v.stack_size} + player.print('[CREATIVE] Inserted all base items.', Color.success) + Modifiers.update_player_modifiers(player) + end + end end end end diff --git a/maps/mountain_fortress_v3/basic_markets.lua b/maps/mountain_fortress_v3/basic_markets.lua index 0efaac19..d56b6ec2 100644 --- a/maps/mountain_fortress_v3/basic_markets.lua +++ b/maps/mountain_fortress_v3/basic_markets.lua @@ -52,7 +52,7 @@ market.caspules = { ['defender-capsule'] = {value = 8, rarity = 1}, ['distractor-capsule'] = {value = 20, rarity = 5}, ['destroyer-capsule'] = {value = 32, rarity = 7}, - ['discharge-defense-remote'] = {value = 64, rarity = 6}, + ['discharge-defense-remote'] = {value = 2000, rarity = 8}, ['artillery-targeting-remote'] = {value = 32, rarity = 7}, ['raw-fish'] = {value = 6, rarity = 1} } @@ -73,7 +73,7 @@ market.equipment = { ['battery-equipment'] = {value = 160, rarity = 2}, ['battery-mk2-equipment'] = {value = 2000, rarity = 8}, ['personal-laser-defense-equipment'] = {value = 2500, rarity = 7}, - ['discharge-defense-equipment'] = {value = 2000, rarity = 5}, + ['discharge-defense-equipment'] = {value = 8000, rarity = 7}, ['belt-immunity-equipment'] = {value = 200, rarity = 1}, ['exoskeleton-equipment'] = {value = 800, rarity = 3}, ['personal-roboport-equipment'] = {value = 500, rarity = 3}, diff --git a/maps/mountain_fortress_v3/ic/functions.lua b/maps/mountain_fortress_v3/ic/functions.lua index 04b99d2b..a0c73202 100644 --- a/maps/mountain_fortress_v3/ic/functions.lua +++ b/maps/mountain_fortress_v3/ic/functions.lua @@ -166,18 +166,16 @@ local function get_owner_car_name(ic, player) return false end -local function get_saved_entity(cars, entity, index) - for k, car in pairs(cars) do - if index and index.name ~= entity.name then - local msg = - table.concat( - { - 'The built entity is not the same as the saved one. ', - 'Saved entity is: ' .. upperCase(car.name) .. ' - Built entity is: ' .. upperCase(entity.name) .. '. ' - } - ) - return false, msg - end +local function get_saved_entity(entity, index) + if index and index.name ~= entity.name then + local msg = + table.concat( + { + 'The built entity is not the same as the saved one. ', + 'Saved entity is: ' .. upperCase(index.name) .. ' - Built entity is: ' .. upperCase(entity.name) .. '. ' + } + ) + return false, msg end return true end @@ -378,7 +376,7 @@ local function restore_surface(ic, player, entity) end if saved_surfaces[player.index] then - local success, msg = get_saved_entity(cars, ce, index) + local success, msg = get_saved_entity(ce, index) if not success then player.print(msg, Color.warning) return true diff --git a/maps/mountain_fortress_v3/loot.lua b/maps/mountain_fortress_v3/loot.lua index f42019bc..23e6d8ac 100644 --- a/maps/mountain_fortress_v3/loot.lua +++ b/maps/mountain_fortress_v3/loot.lua @@ -16,6 +16,8 @@ local blacklist = { ['artillery-wagon'] = true, ['artillery-turret'] = true, ['landfill'] = true, + ['discharge-defense-equipment'] = true, + ['discharge-defense-remote'] = true, ['fluid-wagon'] = true, ['pistol'] = true }