1
0
mirror of https://github.com/Oarcinae/FactorioScenarioMultiplayerSpawn.git synced 2025-01-22 03:08:49 +02:00

Fixes for 1.1.0 and some minor cleanup on the game "options/info" tab.

This commit is contained in:
Oarcinae 2020-11-24 20:31:54 -05:00
parent cc59de2605
commit 977bc7056b
5 changed files with 32 additions and 20 deletions

View File

@ -41,14 +41,12 @@ end
-- Used by AddOarcGuiTab
function CreateGameOptionsTab(tab_container, player)
if global.oarc_announcements == nil then
global.oarc_announcements = "No announcements... Stay tuned."
if global.oarc_announcements ~= nil then
AddLabel(tab_container, "announcement_info_label", "Server announcements:", my_label_header_style)
AddLabel(tab_container, "announcement_info_txt", global.oarc_announcements, my_longer_label_style)
AddSpacerLine(tab_container)
end
AddLabel(tab_container, "announcement_info_label", "Server announcements:", my_label_header_style)
AddLabel(tab_container, "announcement_info_txt", global.oarc_announcements, my_longer_label_style)
AddSpacerLine(tab_container)
-- General Server Info:
AddLabel(tab_container, "info_1", global.ocfg.welcome_msg, my_longer_label_style)
AddLabel(tab_container, "info_2", global.ocfg.server_rules, my_longer_label_style)
@ -64,17 +62,14 @@ function CreateGameOptionsTab(tab_container, player)
local enemy_text="Server Run Time: " .. formattime_hours_mins(game.tick) .. "\n" ..
"Current Evolution: " .. string.format("%.4f", game.forces["enemy"].evolution_factor) .. "\n" ..
"Enemy evolution time factor: " .. game.map_settings.enemy_evolution.time_factor .. "\n" ..
"Enemy evolution pollution factor: " .. game.map_settings.enemy_evolution.pollution_factor .. "\n" ..
"Enemy evolution destroy factor: " .. game.map_settings.enemy_evolution.destroy_factor .. "\n" ..
"Enemy evolution time/pollution/destroy factors: " .. game.map_settings.enemy_evolution.time_factor .. "/" ..
game.map_settings.enemy_evolution.pollution_factor .. "/" ..
game.map_settings.enemy_evolution.destroy_factor .. "\n" ..
"Enemy expansion is " .. enemy_expansion_txt
AddLabel(tab_container, "enemy_info", enemy_text, my_longer_label_style)
AddSpacerLine(tab_container)
-- Game Mode:
AddLabel(tab_container, "core_mod_en", "Core game mode (separate spawns) is enabled.", my_longer_label_style)
-- Soft Mods:
local soft_mods_string = "Oarc Core"
if (global.ocfg.enable_undecorator) then
@ -98,6 +93,9 @@ function CreateGameOptionsTab(tab_container, player)
if (global.ocfg.enable_chest_sharing) then
soft_mods_string = soft_mods_string .. ", Item & Energy Sharing"
end
if (global.ocfg.enable_magic_factories) then
soft_mods_string = soft_mods_string .. ", Special Map Chunks"
end
if (global.ocfg.enable_offline_protect) then
soft_mods_string = soft_mods_string .. ", Offline Attack Inhibitor"
end

View File

@ -4,6 +4,7 @@
require("lib/oarc_store_player_items")
require("lib/oarc_store_map_features")
local mod_gui = require("mod-gui")
-- NAME of the top level element (outer frame)
OARC_STORE_GUI = "oarc_store_gui"

View File

@ -1,5 +1,7 @@
-- oarc_gui_tabs.lua
local mod_gui = require("mod-gui")
--------------------------------------------------------------------------------
-- GUI Tab Handler
--------------------------------------------------------------------------------

View File

@ -4,6 +4,7 @@
require("lib/shared_chests")
require("lib/map_features")
local mod_gui = require("mod-gui")
OARC_STORE_MAP_TEXT =
{
@ -88,6 +89,14 @@ OARC_STORE_MAP_FEATURES =
text="Convert this special chunk into a rocket launch pad. This allows you to build a rocket silo here!"},
},
-- special_chunks_upgrades = {
-- ["big-electric-pole"] = {
-- cost = 0,
-- text = "Upgrade your special chunk so that it pulls power from the cloud! Refills the accumulator from the cloud automatically if it falls below 50%."
-- }
-- }
special_buttons = {
["assembling-machine-1"] = {
initial_cost = 10,
@ -99,17 +108,17 @@ OARC_STORE_MAP_FEATURES =
},
reset_buttons = {
["crash-site-generator"] = {
["electronic-circuit"] = {
initial_cost = 5000,
solo_force = true,
text="DESTROY your base and restart. This allows you to choose a new spawn and will completely destroy all your buildings and your force. All technology progress will be reset. You get to keep your current items and armor! [color=red]THERE IS NO CONFIRMATION PROMPT! THIS CAN NOT BE UNDONE![/color]"
},
["crash-site-lab-broken"] = {
["advanced-circuit"] = {
initial_cost = 5000,
solo_force = true,
text="ABANDON your base and restart. This allows you to choose a new spawn and will move all your buildings to a neutral force. They will still be on the map and can be interacted with, but will not be owned by any player or player force. All radars will be destroyed to help trim map size. You get to keep your current items and armor! [color=red]THERE IS NO CONFIRMATION PROMPT! THIS CAN NOT BE UNDONE![/color]"
},
["crash-site-chest-1"] = {
["processing-unit"] = {
initial_cost = 5000,
text="Restart your game. This will reset your player, your force and your base. [color=red]THERE IS NO CONFIRMATION PROMPT! THIS CAN NOT BE UNDONE![/color]"
}
@ -307,13 +316,13 @@ function OarcMapFeatureStoreButton(event)
result = true
elseif (button.name == "offshore-pump") then
result = ConvertWoodenChestToWaterFill(player)
elseif (button.name == "crash-site-generator") then
elseif (button.name == "electronic-circuit") then
ResetPlayerAndDestroyForce(player)
result = true
elseif (button.name == "crash-site-lab-broken") then
elseif (button.name == "advanced-circuit") then
ResetPlayerAndAbandonForce(player)
result = true
elseif (button.name == "crash-site-chest-1") then
elseif (button.name == "processing-unit") then
ResetPlayerAndMergeForceToNeutral(player)
result = true
end

View File

@ -2,6 +2,8 @@
-- May 2020
-- Adding microtransactions.
local mod_gui = require("mod-gui")
OARC_STORE_PLAYER_ITEMS =
{
["Guns"] = {
@ -10,7 +12,7 @@ OARC_STORE_PLAYER_ITEMS =
["submachine-gun"] = {cost = 10, count = 1, play_time_locked=false},
["flamethrower"] = {cost = 50, count = 1, play_time_locked=true},
["rocket-launcher"] = {cost = 50, count = 1, play_time_locked=true},
["railgun"] = {cost = 250, count = 1, play_time_locked=true},
-- ["railgun"] = {cost = 250, count = 1, play_time_locked=true}, -- SAD
},
["Turrets"] = {
@ -26,7 +28,7 @@ OARC_STORE_PLAYER_ITEMS =
["shotgun-shell"] = {cost = 10, count = 10, play_time_locked=false},
["flamethrower-ammo"] = {cost = 50, count = 10, play_time_locked=true},
["rocket"] = {cost = 100, count = 10, play_time_locked=true},
["railgun-dart"] = {cost = 250, count = 10, play_time_locked=true},
-- ["railgun-dart"] = {cost = 250, count = 10, play_time_locked=true}, -- SAD
["atomic-bomb"] = {cost = 1000, count = 1, play_time_locked=true},
["artillery-shell"] = {cost = 50, count = 1, play_time_locked=true},