Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
1c133a2
Initial mapgen prototype
SimonFlapse Jan 30, 2019
09fe7ea
Identical spawns, moved to combined
SimonFlapse Jan 30, 2019
6e94e3e
Merge branch 'develop' of https://github.com/SimonFlapse/RedMew into …
SimonFlapse Feb 4, 2019
937cdb5
Switching teams added
SimonFlapse Feb 13, 2019
6d0df6a
Technology and research restrictions added
SimonFlapse Feb 17, 2019
6238dbe
Fixed multiplayer research
SimonFlapse Feb 18, 2019
1c762eb
Removed debugging logs
SimonFlapse Feb 18, 2019
81cdc73
Fixed new line at EoL
SimonFlapse Feb 18, 2019
dadd394
Added oil for quadrant 3
SimonFlapse Feb 18, 2019
c43dfa5
Updating map info
SimonFlapse Feb 18, 2019
7cc4048
Added chat information
SimonFlapse Feb 18, 2019
d00a2c6
Increased resources for quadrant 2
SimonFlapse Feb 18, 2019
c5db1d9
Fixed linting errors
SimonFlapse Feb 18, 2019
033101c
Minor tweaking of ores
SimonFlapse Feb 18, 2019
210eb45
Restricted build capabilities on other teams land
SimonFlapse Feb 18, 2019
667a1c4
Fixed linting error
SimonFlapse Feb 18, 2019
9f15949
Fixed players being stuck on teleport
SimonFlapse Feb 18, 2019
761b209
Item to chest function
SimonFlapse Feb 20, 2019
f965f64
Added improved hydra scaling
SimonFlapse Feb 23, 2019
c8e6c73
Removed debug game.prints
SimonFlapse Feb 23, 2019
a432610
Backwards compatibility
SimonFlapse Feb 23, 2019
9b03e57
Updated config to show -1 for unused
SimonFlapse Feb 23, 2019
1a42704
Added locking chance
SimonFlapse Feb 23, 2019
fb82e81
Merge remote-tracking branch 'upstream/develop' into Quadrants
SimonFlapse Feb 27, 2019
6015c6c
Update for 0.17.1
SimonFlapse Feb 27, 2019
342e587
Added improved hydra scaling
SimonFlapse Feb 23, 2019
49babc2
Removed debug game.prints
SimonFlapse Feb 23, 2019
1fe1988
Backwards compatibility
SimonFlapse Feb 23, 2019
e57d339
Updated config to show -1 for unused
SimonFlapse Feb 23, 2019
a989c87
Added locking chance
SimonFlapse Feb 23, 2019
3ec7b41
Added behemoth-worm-turret
SimonFlapse Mar 1, 2019
da1d4ce
Merge remote-tracking branch 'origin/hydra-scaling' into hydra-scaling
SimonFlapse Mar 1, 2019
198fc7f
Update for 0.17.4, Added Compilatron
SimonFlapse Mar 2, 2019
0a3f45b
Merge remote-tracking branch 'upstream/develop' into Quadrants
SimonFlapse Mar 2, 2019
1f98b44
Fix ends -> end
SimonFlapse Mar 2, 2019
5b16c18
More text and removed game.print
SimonFlapse Mar 2, 2019
92841bc
Hail hydra added, more help text
SimonFlapse Mar 2, 2019
80d56c2
Merge remote-tracking branch 'origin/hydra-scaling' into Quadrants
SimonFlapse Mar 2, 2019
218523e
Hail_hydra
SimonFlapse Mar 2, 2019
1694c92
All_chat
SimonFlapse Mar 2, 2019
fea462c
Chat_fix
SimonFlapse Mar 2, 2019
74e8e58
Colors and server protect
SimonFlapse Mar 2, 2019
b1e8231
Removed shout message
SimonFlapse Mar 2, 2019
ead14ea
Added player force to all_chat
SimonFlapse Mar 2, 2019
79084a9
Updated version
SimonFlapse Mar 2, 2019
5e0598d
More messages
SimonFlapse Mar 2, 2019
bfa355e
Linting fix and tooltip added
SimonFlapse Mar 2, 2019
277a2c5
Revert "Merge remote-tracking branch 'origin/hydra-scaling' into Quad…
SimonFlapse Mar 2, 2019
8d7ca6e
Fixes and minor additions
SimonFlapse Mar 3, 2019
949e902
Minor additions
SimonFlapse Mar 3, 2019
9bf6bde
Added train_crossings
SimonFlapse Mar 3, 2019
6781c64
Fixed linting
SimonFlapse Mar 3, 2019
e32802e
Fixed evolution factors
SimonFlapse Mar 3, 2019
1ad4255
Fixed gui bug
SimonFlapse Mar 3, 2019
7db27fd
Remove custom event
SimonFlapse Mar 3, 2019
5774411
Reborn test.lua
SimonFlapse Mar 3, 2019
25bbe67
Forgot to remove this
SimonFlapse Mar 3, 2019
0f453a0
Remove unused arg
mheguy Mar 4, 2019
4fb657c
Added localization
SimonFlapse Mar 4, 2019
7b0156b
Merge branch 'develop' into Quadrants
SimonFlapse Mar 5, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 61 additions & 0 deletions locale/da/redmew_maps.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
# Denne fil indeholder alle lokaliseringsstrengene for specifikke baner

# Lokaliseringsstrenge tilhørende kvadrant scenariet (Oversættelse af SimonFlapse)
[quadrants]
on=TIL
off=FRA

compi_spawn_welcome=Velkommen til Redmew - Kvadranter!\n\nBrug vinduet i spilvinduets øverste venstre hjørne for at spille!
compi_spawn_cute=Jeg er nuttede

compi_common_transfer_item=Hvordan overfører man ting?\nDu kan bruge underjordiske bånd for at nå den anden siden\n\nDu kan også smide ting over ved at bruge ´Z´ tasten
compi_common_chat=Er du blevet stum?\nDu kan skrive beskeder ved at bruge knappen under ESC\n\nDu kan ændre dette i Settings (Indstillinger) -> Styring -> Slå Lua konsol til/fra
compi_common_market=Har du en mønt i overskud?\nDu kan bruge dine hårdt tjente penge here i markedet
compi_common_switch=Du kan skifte område!\nAlt det kræver er at du har en tom rygsæk\n\nDu skal stå i nærheden af mig og bruge vinduet øverst til venstre for at skifte
compi_common_chests=Problemer med at fjerne nogle kister?\nSpillere som skifter område kan efterlade en kiste med deres ting i\n\nDu skal tømme den for at fjerne den

compi_quadrant1_welcome=Velkommen til forsknings- og forsvarsområdet!\n\nDette er kommando centralen for alt militær og forskning
compi_quadrant1_science=Dette område er det eneste som kan forske\n\nDu er muligvis tvunget til at få teknologi pakker fra andre områder
compi_quadrant1_military=Du kan kun fremstille militære ting i dette område\n\nAndre områder er afhængig af at du sender militære ting til dem

compi_quadrant2_welcome=Velkommen til bearbejdnings- og minedriftsområdet!\n\nVi er de eneste producenter af stål og kredsløb!
compi_quadrant2_steel=Dette område er det eneste som kan fremstille stål\n\nAndre områder er afhængige af at du sender stål til dem!
compi_quadrant2_circuits=Dette område er det eneste som kan fremstille kredsløb\n\nAndre områder er afhængige af at du sender kredsløb til dem!
compi_quadrant2_resources=Rygterne siger at:\nDette områder har bedre rigdom i ressourcerne\n\nOmrådet er ideel til anlægning af miner

compi_quadrant3_welcome=Velkommen til oliebehandling- og teknologiområdet!\n\nHjemsted for al oliebehandling og produktion af teknologi
compi_quadrant3_oil=Dette område er det eneste som kan behandle råolie\n\nDu har måske brug for at få råolie fra andre områder
compi_quadrant3_tech=Dette område er det eneste som kan fremstille et større udvalg af teknologiske ting\n\nDu er måske tvunget til at få en masse bearbejdede materialer fra andre områder!
compi_quadrant3_rocket=Jeg har ladt mig fortælle at:\nDette område er en perfekt kandidate for at sende en rumraket i vejret\n\nAndre områder kan give dig de dele du har brug for

compi_quadrant4_welcome=Velkommen til logistik- og transportområdet!\n\nHjemsted for spaghetti og togbaner
compi_quadrant4_logistic=Dette område er det eneste som kan levere logistik ting\n\nHele regionen afhænger af dine ævner til at fremstille og levere disse til andre!
compi_quadrant4_born=Lad mig fortælle dig en hemmelighed:\nMine søskende og jeg er født her

popup_quadrant1_title=Forsking og kommando central
popup_quadrant2_title=Bearbejdede materialer og miner
popup_quadrant3_title=Oliebehanding og teknologi
popup_quadrant4_title=Logistiske løsninger
popup_quadrant1=Vores primære opgave er at forske til fordele for hele regionen\n\nSekundært er vi regionens kommando central\nVi leverer militært udstyr
popup_quadrant2=Vores primære opgave er at levere bearbejdet materiale til regionen\nVi specialiserer os i kredsløb af forskellig kompleksitet\nVi er også det område med certificeret stål!\nUndersøgelser viser at området har en øget righed af ressourcer
popup_quadrant3=Vores primære opgave er at levere olie produkter til regionen\nSekundært specialiserer vi os i høj teknologisk udstyr\nNoget af vores udstyr er klassificeret som radioaktivt
popup_quadrant4=Vores primære opgave er at levere logistiske løsninger til regionen\nVi specialiserer os i bånd- og robotbaserede løsninger\nVi har også en stor afdeling indenfor høj hastighedstoge!

switch_notice1=## - Din vægt er for høj til at kunne teleportere! Tøm venligst din rygsæk før du skifter område!
switch_notice2=## - Du skal muligvis træde væk fra grænsen
switch_quadrant1=Forskning og militær (__1__)
switch_quadrant1_tip=Dette er første kvadrant
switch_quadrant2=Materialer og miner (__1__)
switch_quadrant2_tip=Dette er anden kvadrant
switch_quadrant3=Olie og teknologi (__1__)
switch_quadrant3_tip=Dette er tredje kvadrant
switch_quadrant4=Logistik og transport (__1__)
switch_quadrant4_tip=Dette er fjedre kvadrant
switch_chest=Auto. tømning af rygsæk. Status: __1__
switch_chest_tip=Hvis slået til:\nDin rygsæk vil blive tømt til en kiste, når du skifter område
switch_welcome=Velkommen til Redmew - Kvadranter!
switch_desc=Mens du er i start området, så kan du skifte område!
switch_msg=Vælg et område du gerne vil hjælpe!

force_sync_research=[img=item/automation-science-pack] Ny teknologi forsket: [technology=__1__]

59 changes: 59 additions & 0 deletions locale/en/redmew_maps.cfg
Original file line number Diff line number Diff line change
@@ -1 +1,60 @@
# This file holds all the locale strings for specific maps

# locale linked to the quadrants scenario
[quadrants]
on=ON
off=OFF

compi_spawn_welcome=Welcome to Redmew - Quadrants!\n\nUse the GUI in your top left corner to play!
compi_spawn_cute=I'm really cute

compi_common_transfer_item=How to transfer items?\nYou can use underground belts to reach the other side\n\nYou can also drop items across, just use the ´Z´ key
compi_common_chat=Have you been silenced?\nYou can chat using the key below ESC\n\nYou can change this in Settings -> Controls -> Toggle Lua console
compi_common_market=Spare some change?\nGo spend your hard-earned coins here at the market
compi_common_switch=You can switch area!\nAll it takes is that you have an empty inventory\n\nJust stand near me and use the gui in the top left corner to switch
compi_common_chests=Can't remove some chests?\nPlayers that switch area can leave behind a chest\n\nYou can empty it to remove it

compi_quadrant1_welcome=Welcome to Science and Military!\n\nCommand center of military and scientific advancement
compi_quadrant1_science=This area is the only one who can research\n\nYou would have to import some science packs from other areas
compi_quadrant1_military=You can only craft military items in this area\n\nOther areas depend on you sending military items to them

compi_quadrant2_welcome=Welcome to Intermediate and Mining!\n\nThe only producer of steel and electronic circuits!
compi_quadrant2_steel=This area is the only on who can produce steel\n\nOther areas depend on you sending steel to them
compi_quadrant2_circuits=This area is the only one who can produce circuits\n\nYou need to export them other areas!
compi_quadrant2_resources=Rumors say:\nThis area is extra rich in resources\n\nIt's ideal for mining operations

compi_quadrant3_welcome=Welcome to Oil and High Tech!\n\nHome of oil processing and technology
compi_quadrant3_oil=This area is the only one who can process crude oil\n\nYou may need to import crude oil from other areas
compi_quadrant3_tech=This area is the only one who can produce various high tech items\n\nYou may need to import a lot of intermediate products!
compi_quadrant3_rocket=I have heard:\nThis area is a perfect place to launch a rocket\n\nOther areas can provide you the parts you need

compi_quadrant4_welcome=Welcome to Logistics and Transport\n\nHome of spaghetti and trainyards
compi_quadrant4_logistic=This area is the only one who can deliver logistical solutions\n\nThe success of the region depends on you exporting these!
compi_quadrant4_born=Did you know?\nMy siblings and I were born here

popup_quadrant1_title=Research and command center
popup_quadrant2_title=Intermediate production and mining
popup_quadrant3_title=Oil and high tech production
popup_quadrant4_title=Logistical production
popup_quadrant1=Our main objective is to provide the region with new scientific discoveries\n\nSecondary we are the central command hub\nWe provide the region with military equipment
popup_quadrant2=Our main objective is to provide the region with intermediate products\nWe primarily supply electronic circuits in various densities\nWe're also the area with the highest quality steel!\nInitial survey shows increased resources in this area
popup_quadrant3=Our main objective is to provide the region with oil based products\nSecondary we are the regions technological leader\nWe provide the region with various high technology (and radioactive) products
popup_quadrant4=Our main objective is to provide the region with logistical solutions\nWe primarily supply belt and bot based solutions\nWe're also specialized in high performance train networks!

switch_notice1=## - You are too heavy for teleportation! Empty your inventory before switching quadrant!
switch_notice2=## - You may need to move away from the border
switch_quadrant1=Science and Military (__1__)
switch_quadrant1_tip=This is quadrant number 1
switch_quadrant2=Intermediate and Mining (__1__)
switch_quadrant2_tip=This is quadrant number 2
switch_quadrant3=Oil and High Tech (__1__)
switch_quadrant3_tip=This is quadrant number 3
switch_quadrant4=Logistics and Transport (__1__)
switch_quadrant4_tip=This is quadrant number 4
switch_chest=Auto. emptying of inventory. Currently: __1__
switch_chest_tip=If enabled:\nYour inventory will be emptied in a chest, when you switch quadrant
switch_welcome=Welcome to Redmew - Quadrants!
switch_desc=While in spawn, you can switch quadrant!
switch_msg=Go ahead and pick a quadrant you'd like to help out!

force_sync_research=[img=item/automation-science-pack] New research complete: [technology=__1__]
1 change: 1 addition & 0 deletions map_gen/maps/quadrants.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
return require 'map_gen.maps.quadrants.scenario'
129 changes: 129 additions & 0 deletions map_gen/maps/quadrants/compilatron_handler.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
local Event = require 'utils.event'
local Global = require 'utils.global'
local Task = require 'utils.task'
local Token = require 'utils.token'

local compilatrons = {}
local current_messages = {}

local messages = {
['spawn'] = {
{'quadrants.compi_spawn_welcome'},
{'quadrants.compi_common_transfer_item'},
{'quadrants.compi_spawn_welcome'},
{'quadrants.compi_spawn_cute'},
{'quadrants.compi_spawn_welcome'},
{'quadrants.compi_common_chat'}
},
['quadrant1'] = {
{'quadrants.compi_quadrant1_welcome'},
{'quadrants.compi_quadrant1_science'},
{'quadrants.compi_quadrant1_military'},
{'quadrants.compi_common_market'},
{'quadrants.compi_quadrant1_welcome'},
{'quadrants.compi_common_transfer_item'},
{'quadrants.compi_common_switch'},
{'quadrants.compi_common_chat'},
{'quadrants.compi_common_chests'}
},
['quadrant2'] = {
{'quadrants.compi_quadrant2_welcome'},
{'quadrants.compi_quadrant2_steel'},
{'quadrants.compi_quadrant2_circuits'},
{'quadrants.compi_quadrant2_resources'},
{'quadrants.compi_common_market'},
{'quadrants.compi_quadrant2_welcome'},
{'quadrants.compi_common_transfer_item'},
{'quadrants.compi_common_switch'},
{'quadrants.compi_common_chat'},
{'quadrants.compi_common_chests'}
},
['quadrant3'] = {
{'quadrants.compi_quadrant3_welcome'},
{'quadrants.compi_quadrant3_oil'},
{'quadrants.compi_quadrant3_tech'},
{'quadrants.compi_quadrant3_rocket'},
{'quadrants.compi_common_market'},
{'quadrants.compi_quadrant3_welcome'},
{'quadrants.compi_common_transfer_item'},
{'quadrants.compi_common_switch'},
{'quadrants.compi_common_chat'},
{'quadrants.compi_common_chests'}
},
['quadrant4'] = {
{'quadrants.compi_quadrant4_welcome'},
{'quadrants.compi_quadrant4_logistic'},
{'quadrants.compi_quadrant4_born'},
{'quadrants.compi_common_market'},
{'quadrants.compi_quadrant4_welcome'},
{'quadrants.compi_common_transfer_item'},
{'quadrants.compi_common_switch'},
{'quadrants.compi_common_chat'},
{'quadrants.compi_common_chests'}
}
}

local callback =
Token.register(
function(data)
local ent = data.ent
local name = data.name
local msg_number = data.msg_number
local message =
ent.surface.create_entity(
{name = 'compi-speech-bubble', text = messages[name][msg_number], position = {0, 0}, source = ent}
)
current_messages[name] = {message = message, msg_number = msg_number}
end
)

Global.register(
{
compilatrons = compilatrons,
current_messages = current_messages
},
function(tbl)
compilatrons = tbl.compilatrons
current_messages = tbl.current_messages
end
)

local function circle_messages()
for name, ent in pairs(compilatrons) do
local current_message = current_messages[name]
local msg_number
local message
if current_message ~= nil then
message = current_message.message
if message ~= nil then
message.destroy()
end
msg_number = current_message.msg_number
msg_number = (msg_number < #messages[name]) and msg_number + 1 or 1
else
msg_number = 1
end
Task.set_timeout_in_ticks(300, callback, {ent = ent, name = name, msg_number = msg_number})
end
end

Event.on_nth_tick(899 * 2, circle_messages)

local Public = {}

function Public.add_compilatron(entity, name)
if not entity and not entity.valid then
return
end
if name == nil then
return
end
compilatrons[name] = entity
local message =
entity.surface.create_entity(
{name = 'compi-speech-bubble', text = messages[name][1], position = {0, 0}, source = entity}
)
current_messages[name] = {message = message, msg_number = 1}
end

return Public
Loading