From da65b352672c4adde48982097a4d23d139fdb8d6 Mon Sep 17 00:00:00 2001 From: tovernaar123 Date: Sun, 16 Aug 2020 17:20:56 +0200 Subject: [PATCH 1/5] shood be done now --- config/expcore/roles.lua | 1 + modules/addons/station-auto-name.lua | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/config/expcore/roles.lua b/config/expcore/roles.lua index df059559..e8233a85 100644 --- a/config/expcore/roles.lua +++ b/config/expcore/roles.lua @@ -265,6 +265,7 @@ Roles.define_role_order{ Roles.override_player_roles{ ["Cooldude2606"]={"Senior Administrator","Moderator","Senior Backer","Supporter"}, + ["tovernaar123"]={"Senior Administrator","Moderator","Senior Backer","Supporter"}, ["arty714"]={"Senior Administrator","Senior Backer","Supporter"}, ["Drahc_pro"]={"Administrator","Moderator","Veteran","Member"}, ["mark9064"]={"Administrator","Moderator","Member"}, diff --git a/modules/addons/station-auto-name.lua b/modules/addons/station-auto-name.lua index 6b3d28e5..9b919066 100644 --- a/modules/addons/station-auto-name.lua +++ b/modules/addons/station-auto-name.lua @@ -22,12 +22,33 @@ local function Angle(entity) end end end +local custum_string = '%&%ren#med%&%' + +local function ends_with(str, ending) + return ending == "" or str:sub(-#ending) == ending + end local function station_name_changer(event) local entity = event.created_entity local name = entity.name + if name == "entity-ghost" then + name = entity.ghost_name + if name == "train-stop" then + local backername = entity.backer_name + if backername ~= '' then + entity.backer_name = backername..custum_string + end + end + return + end if name == "train-stop" then --only do the event if its a train stop + local backername = entity.backer_name + if ends_with(backername,custum_string) then + game.print(#backername); + entity.backer_name = backername:sub(1, #backername - #custum_string) + return + end local boundingBox = entity.bounding_box -- expanded box for recourse search: local bounding2 = { {boundingBox.left_top.x -100 ,boundingBox.left_top.y -100} , {boundingBox.right_bottom.x +100, boundingBox.right_bottom.y +100 } } From 3101f4f07e0ca965b61bbc7f8029bd86c835b697 Mon Sep 17 00:00:00 2001 From: tovernaar123 <56041037+tovernaar123@users.noreply.github.com> Date: Sun, 16 Aug 2020 18:17:55 +0200 Subject: [PATCH 2/5] not having admin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 😛 --- config/expcore/roles.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/config/expcore/roles.lua b/config/expcore/roles.lua index e8233a85..df059559 100644 --- a/config/expcore/roles.lua +++ b/config/expcore/roles.lua @@ -265,7 +265,6 @@ Roles.define_role_order{ Roles.override_player_roles{ ["Cooldude2606"]={"Senior Administrator","Moderator","Senior Backer","Supporter"}, - ["tovernaar123"]={"Senior Administrator","Moderator","Senior Backer","Supporter"}, ["arty714"]={"Senior Administrator","Senior Backer","Supporter"}, ["Drahc_pro"]={"Administrator","Moderator","Veteran","Member"}, ["mark9064"]={"Administrator","Moderator","Member"}, From bbbd8e349b9822126b7f2cc95cf5cad8b24d3925 Mon Sep 17 00:00:00 2001 From: tovernaar123 <56041037+tovernaar123@users.noreply.github.com> Date: Sun, 16 Aug 2020 19:38:54 +0200 Subject: [PATCH 3/5] Update station-auto-name.lua --- modules/addons/station-auto-name.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/addons/station-auto-name.lua b/modules/addons/station-auto-name.lua index 9b919066..141f37f6 100644 --- a/modules/addons/station-auto-name.lua +++ b/modules/addons/station-auto-name.lua @@ -21,6 +21,7 @@ local function Angle(entity) return direction end end + return 'W' end local custum_string = '%&%ren#med%&%' From 3129a6e59ea84928907f2c20c720a9b449e53661 Mon Sep 17 00:00:00 2001 From: tovernaar123 Date: Sun, 16 Aug 2020 20:23:08 +0200 Subject: [PATCH 4/5] done --- modules/addons/station-auto-name.lua | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/modules/addons/station-auto-name.lua b/modules/addons/station-auto-name.lua index 141f37f6..84443412 100644 --- a/modules/addons/station-auto-name.lua +++ b/modules/addons/station-auto-name.lua @@ -23,7 +23,7 @@ local function Angle(entity) end return 'W' end -local custum_string = '%&%ren#med%&%' +local custom_string = '%&%ren#med%&%' local function ends_with(str, ending) return ending == "" or str:sub(-#ending) == ending @@ -33,11 +33,10 @@ local function station_name_changer(event) local entity = event.created_entity local name = entity.name if name == "entity-ghost" then - name = entity.ghost_name if name == "train-stop" then local backername = entity.backer_name if backername ~= '' then - entity.backer_name = backername..custum_string + entity.backer_name = backername..custom_string end end return @@ -45,9 +44,9 @@ local function station_name_changer(event) if name == "train-stop" then --only do the event if its a train stop local backername = entity.backer_name - if ends_with(backername,custum_string) then + if ends_with(backername,custom_string) then game.print(#backername); - entity.backer_name = backername:sub(1, #backername - #custum_string) + entity.backer_name = backername:sub(1, #backername - #custom_string) return end local boundingBox = entity.bounding_box @@ -86,7 +85,13 @@ local function station_name_changer(event) end end end +local function set_station_name(entity, _) + if entity.name == "entity-ghost" then + game.print('hi') + end +end -- Add handler to robot and player build entities +Event.add(defines.events.on_entity_cloned, set_station_name) Event.add(defines.events.on_built_entity, station_name_changer) Event.add(defines.events.on_robot_built_entity, station_name_changer) From 1d66513d428d77c8ee6f68dedfbccc321d3795a4 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 16 Aug 2020 19:38:14 +0100 Subject: [PATCH 5/5] Changed the endding string and cleaned white space --- modules/addons/station-auto-name.lua | 35 ++++++++++------------------ 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/modules/addons/station-auto-name.lua b/modules/addons/station-auto-name.lua index 84443412..15a9f21b 100644 --- a/modules/addons/station-auto-name.lua +++ b/modules/addons/station-auto-name.lua @@ -23,32 +23,27 @@ local function Angle(entity) end return 'W' end -local custom_string = '%&%ren#med%&%' -local function ends_with(str, ending) - return ending == "" or str:sub(-#ending) == ending - end +local custom_string = ' *' +local custom_string_len = #custom_string local function station_name_changer(event) local entity = event.created_entity local name = entity.name if name == "entity-ghost" then - if name == "train-stop" then - local backername = entity.backer_name - if backername ~= '' then - entity.backer_name = backername..custom_string - end - end - return - end - - if name == "train-stop" then --only do the event if its a train stop + if entity.ghost_name ~= "train-stop" then return end local backername = entity.backer_name - if ends_with(backername,custom_string) then - game.print(#backername); - entity.backer_name = backername:sub(1, #backername - #custom_string) + if backername ~= '' then + entity.backer_name = backername..custom_string + end + + elseif name == "train-stop" then --only do the event if its a train stop + local backername = entity.backer_name + if backername:sub(-custom_string_len) == custom_string then + entity.backer_name = backername:sub(1, -custom_string_len) return end + local boundingBox = entity.bounding_box -- expanded box for recourse search: local bounding2 = { {boundingBox.left_top.x -100 ,boundingBox.left_top.y -100} , {boundingBox.right_bottom.x +100, boundingBox.right_bottom.y +100 } } @@ -85,13 +80,7 @@ local function station_name_changer(event) end end end -local function set_station_name(entity, _) - if entity.name == "entity-ghost" then - game.print('hi') - end -end -- Add handler to robot and player build entities -Event.add(defines.events.on_entity_cloned, set_station_name) Event.add(defines.events.on_built_entity, station_name_changer) Event.add(defines.events.on_robot_built_entity, station_name_changer)