1
0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-01-04 00:15:45 +02:00

loaders hotfix

This commit is contained in:
MewMew 2018-09-27 14:51:53 +02:00
parent 3172574446
commit a62519d018
3 changed files with 339 additions and 9 deletions

View File

@ -518,7 +518,7 @@ local function treasure_chest(position, surface)
{{name = "explosive-uranium-cannon-shell", count = math_random(16,32)}, weight = 5, evolution_min = 0.6, evolution_max = 1},
{{name = "explosive-cannon-shell", count = math_random(16,32)}, weight = 5, evolution_min = 0.4, evolution_max = 0.8},
{{name = "shotgun", count = 1}, weight = 5, evolution_min = 0.0, evolution_max = 0.2},
{{name = "shotgun-shell", count = 1}, weight = 5, evolution_min = 0.0, evolution_max = 0.2},
{{name = "shotgun-shell", count = math_random(16,32)}, weight = 5, evolution_min = 0.0, evolution_max = 0.2},
{{name = "combat-shotgun", count = 1}, weight = 10, evolution_min = 0.3, evolution_max = 0.8},
{{name = "piercing-shotgun-shell", count = math_random(16,32)}, weight = 10, evolution_min = 0.2, evolution_max = 1},
{{name = "flamethrower", count = 1}, weight = 3, evolution_min = 0.3, evolution_max = 0.6},
@ -592,7 +592,7 @@ local function treasure_chest(position, surface)
{{name = "assembling-machine-2", count = math_random(4,16)}, weight = 3, evolution_min = 0.2, evolution_max = 0.8},
{{name = "assembling-machine-3", count = math_random(4,16)}, weight = 3, evolution_min = 0.5, evolution_max = 1},
{{name = "accumulator", count = math_random(8,16)}, weight = 3, evolution_min = 0.4, evolution_max = 1},
{{name = "offshore-pump", count = math_random(4,8)}, weight = 3, evolution_min = 0.0, evolution_max = 0.1},
{{name = "offshore-pump", count = math_random(4,8)}, weight = 2, evolution_min = 0.0, evolution_max = 0.1},
{{name = "beacon", count = math_random(4,8)}, weight = 3, evolution_min = 0.7, evolution_max = 1},
{{name = "boiler", count = math_random(4,8)}, weight = 3, evolution_min = 0.0, evolution_max = 0.3},
{{name = "steam-engine", count = math_random(4,8)}, weight = 3, evolution_min = 0.0, evolution_max = 0.5},
@ -636,9 +636,9 @@ local function treasure_chest(position, surface)
{{name = "gate", count = math_random(25,50)}, weight = 1, evolution_min = 0.1, evolution_max = 0.5},
{{name = "storage-tank", count = math_random(8,16)}, weight = 3, evolution_min = 0.3, evolution_max = 0.6},
{{name = "train-stop", count = math_random(2,4)}, weight = 1, evolution_min = 0.2, evolution_max = 0.7},
{{name = "express-loader", count = math_random(2,4)}, weight = 2, evolution_min = 0.5, evolution_max = 1},
{{name = "fast-loader", count = math_random(2,4)}, weight = 2, evolution_min = 0.2, evolution_max = 0.7},
{{name = "loader", count = math_random(2,4)}, weight = 2, evolution_min = 0.0, evolution_max = 0.5},
{{name = "express-loader", count = math_random(2,4)}, weight = 1, evolution_min = 0.5, evolution_max = 1},
{{name = "fast-loader", count = math_random(2,4)}, weight = 1, evolution_min = 0.2, evolution_max = 0.7},
{{name = "loader", count = math_random(2,4)}, weight = 1, evolution_min = 0.0, evolution_max = 0.5},
{{name = "lab", count = math_random(4,8)}, weight = 2, evolution_min = 0.0, evolution_max = 0.1},
--{{name = "roboport", count = math_random(2,4)}, weight = 2, evolution_min = 0.6, evolution_max = 1},
@ -918,6 +918,7 @@ local function on_player_joined_game(event)
end
local inserters = {"inserter", "long-handed-inserter", "burner-inserter", "fast-inserter", "filter-inserter", "stack-filter-inserter", "stack-inserter"}
local loaders = {"loader", "fast-loader", "express-loader"}
local function on_built_entity(event)
for _, e in pairs(inserters) do
if e == event.created_entity.name then
@ -950,7 +951,25 @@ local function on_built_entity(event)
break
end
end
for _, e in pairs(loaders) do
if e == event.created_entity.name then
local surface = event.created_entity.surface
local a = {
left_top = {x = event.created_entity.position.x - 2, y = event.created_entity.position.y - 2},
right_bottom = {x = event.created_entity.position.x + 2, y = event.created_entity.position.y + 2}
}
local found = surface.find_entities_filtered{area = a, name = "infinity-chest"}
if found[1] then
event.created_entity.die("enemy")
if event.player_index then
local player = game.players[event.player_index]
player.print("The mysterious chest noticed your greed and devoured your device.", { r=0.75, g=0.0, b=0.0})
end
end
end
end
local name = event.created_entity.name
if name == "flamethrower-turret" or name == "laser-turret" then --or name == "gun-turret" then
if event.created_entity.position.y < 0 then
@ -1032,8 +1051,12 @@ function cheat_mode()
game.players[1].insert({name="fusion-reactor-equipment", count=4})
game.players[1].insert({name="personal-laser-defense-equipment", count=8})
game.players[1].insert({name="rocket-launcher"})
game.players[1].insert({name="explosive-rocket", count=200})
game.speed = 2
game.players[1].insert({name="explosive-rocket", count=200})
game.players[1].insert({name="loader"})
game.players[1].insert({name="fast-loader"})
game.players[1].insert({name="express-loader"})
game.players[1].insert({name="infinity-chest"})
game.speed = 3
surface.daytime = 1
surface.freeze_daytime = 1
game.player.force.research_all_technologies()

View File

@ -1,5 +1,5 @@
local index = {
"blkCUwDfFaRxezkA", "PEVkYcsbVwnnKWKm", "RmApKqaHBnDdjlUf", "eovuYGvdICGhruuU", "xFbpVDlWSNPmGqQf", "lktJcRqsleypbFqW", "MYmwDgcTBIOgADTD", "ArNWzzewJtYSbxVw", "oYQcJazDfTUtymDW"
"blkCUwDfFaRxezkA", "PEVkYcsbVwnnKWKm", "RmApKqaHBnDdjlUf", "eovuYGvdICGhruuU", "xFbpVDlWSNPmGqQf", "lktJcRqsleypbFqW", "MYmwDgcTBIOgADTD", "ArNWzzewJtYSbxVw", "oYQcJazDfTUtymDW", "pFvIWAWWsePfBElD"
}
local data = {}

View File

@ -0,0 +1,307 @@
local playsession = {
{"mewmew", {1408636}},
{"PHMRanger", {117724}},
{"crayzz2", {235254}},
{"Kyte", {238098}},
{"Cheeseftw", {1093038}},
{"N355A", {1002147}},
{"Xenoica", {1308911}},
{"skudd3r", {5016476}},
{"dog80", {283704}},
{"Oradominus", {5158669}},
{"ManuelG", {682203}},
{"coucounoir", {1680582}},
{"ThisIsMathias", {807017}},
{"mcschnee", {1235263}},
{"Ruslan_kc", {509482}},
{"UTIDI", {1231442}},
{"Jaskarox", {328985}},
{"adlmr", {229874}},
{"Lagger289", {240858}},
{"dmcdouga", {142428}},
{"siniidrooq", {1411439}},
{"floxys", {911463}},
{"dpoba", {2109594}},
{"Schallfalke", {31015}},
{"Unrealrules", {58942}},
{"ailishi19", {1127045}},
{"Farglon", {352467}},
{"Tamika", {647343}},
{"Mao_TheCat", {4506}},
{"I_dream_of_corn", {312679}},
{"Daultash", {267323}},
{"Slas", {34568}},
{"pigwithtach", {143809}},
{"robertkruijt", {2050862}},
{"Muugin", {129843}},
{"alnmike", {72383}},
{"Altech", {15624}},
{"Jonathan88", {2066}},
{"Yardsnake", {983763}},
{"tafyline", {115949}},
{"djragebutt", {80319}},
{"beranabus", {137360}},
{"Hempy", {555470}},
{"hunter117x", {342368}},
{"twinotter", {680993}},
{"Colaorom", {17669}},
{"lintaba", {19250}},
{"mar123322", {43129}},
{"redlabel", {2768251}},
{"Crateer", {7223}},
{"Hazzari", {39782}},
{"TNT_MAN1111", {114645}},
{"Paperpersonplan", {120575}},
{"maxim67899", {176923}},
{"ButtDealer", {3961}},
{"sellarsarem", {553400}},
{"joe32", {1011606}},
{"eyescreamxd", {4597}},
{"cko6o4ku", {69859}},
{"snoetje", {2020279}},
{"Gerkiz", {791723}},
{"Yaxley", {272714}},
{"gompaw", {83705}},
{"lnm_2000", {2688}},
{"abnoeh", {586653}},
{"upek", {147728}},
{"kuumottaja", {853831}},
{"Lunex", {3436}},
{"Guitoune", {6659}},
{"Wadiyatalkinbeet", {551020}},
{"DanielZeil", {5647}},
{"Terarink", {5516304}},
{"Raijin-Kizuku", {3752}},
{"SPARKZ102", {33263}},
{"YANQINHONG", {7505}},
{"edenpoi", {8097}},
{"rachet303", {2318160}},
{"quaatal", {464998}},
{"ANV1L", {2788017}},
{"303Mark", {589597}},
{"settan", {963228}},
{"hsxu", {294119}},
{"mutawa", {396315}},
{"umbrax", {247991}},
{"everLord", {167788}},
{"Vinocamp", {4385}},
{"Fatou", {1499592}},
{"Reaper3D", {8989}},
{"StandaardStefan", {663201}},
{"grahamm", {38767}},
{"HS44", {6301}},
{"TheFlameWillFade", {3542}},
{"_DreamKeeper_", {12701}},
{"untamedx2", {1722986}},
{"MuErTe", {4921}},
{"Progman", {8324}},
{"Kevin_Ar18", {70074}},
{"aledeludx", {822004}},
{"telke", {19478}},
{"RoninM3", {466871}},
{"zinerco", {15393}},
{"TickTack0", {44250}},
{"Ardordo", {1010925}},
{"TheWickedMaster", {28321}},
{"petterah", {637344}},
{"odgaar", {3148}},
{"maxxcz", {14822}},
{"StarLite", {6925}},
{"Matthias2912", {5615}},
{"Bemm", {188182}},
{"pickles28", {265927}},
{"ExtremeWill", {22054}},
{"MafungoLoud", {195986}},
{"Nexarius", {7056}},
{"steelhero", {223075}},
{"fusionross", {726}},
{"pepsin92", {110456}},
{"GuidoCram", {3150}},
{"Dirty_Shirt", {23480}},
{"penguincc3", {1241539}},
{"_hash", {6470}},
{"captcougar1969", {357926}},
{"impisa", {3240}},
{"CustomSocks", {777037}},
{"mac637", {5021}},
{"Conor0709", {25802}},
{"elsancho", {8527}},
{"liltaco", {473017}},
{"Pinkskin", {27193}},
{"CommanderFrog", {628481}},
{"datadrian", {517157}},
{"Afrobroz", {2388}},
{"cpt_beefheart", {6028}},
{"ColonelWill", {3705}},
{"fluffysmellypompom", {10642}},
{"Cramly", {12203}},
{"ONail", {891963}},
{"Jimmyneutronslayer99738", {13206}},
{"Shanchan", {76541}},
{"fengjuanluoye", {15059}},
{"x3kx3k", {24327}},
{"deegeeooh", {23505}},
{"Augster137", {11215}},
{"squishybanana", {13779}},
{"lazerandy", {9263}},
{"PogomanD", {1061}},
{"sukram72", {56547}},
{"R26", {13842}},
{"14nickel", {8517}},
{"Conan_Doyil", {16949}},
{"Chevalier1200", {1388656}},
{"Brinsin", {36195}},
{"TasteRevenge", {9055}},
{"Daniilys", {20015}},
{"williambellwisdo", {459516}},
{"atlas_242", {8216}},
{"Drezik99", {3768}},
{"heyqule", {89639}},
{"Mselvage1231", {352668}},
{"cpenguinred", {771975}},
{"FluidMotion", {162210}},
{"nizzy", {4929}},
{"IsThisNameTakenAlready", {289}},
{"W1R3M4N", {5489}},
{"dignissi", {229078}},
{"ClemZouill", {7046}},
{"moocat12", {348414}},
{"bimmer28", {7259}},
{"MontrealCrook", {3935}},
{"Jecht8", {4962}},
{"Sunherald", {446839}},
{"newklear", {119464}},
{"Eddyy", {14673}},
{"Phil535", {16126}},
{"Lestibornes", {13496}},
{"Rick556", {24950}},
{"ZTX", {64280}},
{"ZumbieHater", {91369}},
{"david38901", {1306}},
{"Aronak", {4482}},
{"Eric_the_Red", {5903}},
{"Nagrom_17", {3554}},
{"Konoha_God", {27843}},
{"HKHKQOO", {1934}},
{"liziyang42", {1593}},
{"Turboknot", {198335}},
{"Scynic", {9251}},
{"Chemino", {21637}},
{"AwkwardNoah", {54072}},
{"froody", {559676}},
{"Rickvs", {13832}},
{"slikasandr", {192789}},
{"Silly511", {205}},
{"Mehdi5555", {12267}},
{"willzcn", {76479}},
{"Fantagma", {234957}},
{"ponderer1", {310843}},
{"Furancebob", {254130}},
{"Arfloot", {364852}},
{"3061867813", {41871}},
{"Ruby_Schnee_nee_Rose", {18775}},
{"zombie11145", {22230}},
{"ne0h", {25836}},
{"Graphene314", {3828}},
{"Kokasion", {734}},
{"Majora320", {20469}},
{"Gizan", {274279}},
{"SherlockGY", {14210}},
{"synclind", {8678}},
{"Tomtompro", {14449}},
{"sh4dyn4sty", {11262}},
{"Subsup", {8701}},
{"seapunk", {19272}},
{"Tallios", {9433}},
{"Pallando", {529245}},
{"Steel_Wolf", {12123}},
{"anb505", {24634}},
{"vedolv", {4444}},
{"AndersDeNeef", {666083}},
{"Mkirby9674", {3974}},
{"cinzhal", {32369}},
{"Giatros", {568409}},
{"Akhrem", {14502}},
{"Ruuyji", {293007}},
{"lpp5", {42916}},
{"HydraX26", {249603}},
{"MaxMM", {186335}},
{"ihatehangovers", {25790}},
{"Tulmius", {71089}},
{"arkanan", {613947}},
{"CotNip", {10314}},
{"henrycn1997", {15799}},
{"YagaoDirac", {48767}},
{"ZwerOxotnik", {8513}},
{"Namelesshunter", {28089}},
{"bumledyret", {4189}},
{"working.worker", {36344}},
{"gloigek", {5899}},
{"SuchRandom", {10868}},
{"pilatos2003", {581593}},
{"SMikiS", {594166}},
{"TilenT2", {1221}},
{"Markius", {1523525}},
{"Quadrum", {137096}},
{"jarkkiharkki", {1406}},
{"DeathCompany", {31520}},
{"Coyote101", {8382}},
{"Gouzi001", {164909}},
{"Factor_XXX", {24641}},
{"badbeachboy", {39145}},
{"lividjoker", {15316}},
{"JinNJuice", {202986}},
{"Wabago", {170145}},
{"XGhozt", {74421}},
{"legogo29", {13267}},
{"rbartos", {8506}},
{"zobi1000", {3261}},
{"dac844", {29230}},
{"Slayerfear", {18275}},
{"antarcus", {6663}},
{"Bronco", {14936}},
{"seticivo", {8696}},
{"JaJaBings", {919061}},
{"c9gun", {2405}},
{"Felix61391", {10191}},
{"icraftsam", {181694}},
{"SpikeLGWG", {85996}},
{"aarturr", {91131}},
{"sto0rmy", {11256}},
{"XaLpHa1989", {28259}},
{"Gloiner", {5342}},
{"ESWAT", {3299}},
{"REDgalko", {28283}},
{"A10warthog", {43930}},
{"Razzeeyy", {37538}},
{"datboy", {741}},
{"oturw", {5556}},
{"userguide", {132315}},
{"Framfab", {182609}},
{"Drlloyd1337", {31443}},
{"Ilasiak", {3692}},
{"Idifix", {47075}},
{"fenderpuddy", {120398}},
{"christ010", {24838}},
{"npo6ka", {120324}},
{"Serule", {233370}},
{"fuckyouandfuckhertoo", {1047}},
{"haudfl", {18460}},
{"Undying29", {1615}},
{"peirs", {18656}},
{"mrzenka04", {160188}},
{"beggs2k", {466903}},
{"Factorian12321", {9293}},
{"LymBAOBEI", {12506}},
{"jrz126", {4552}},
{"JoaquinNsr80", {15009}},
{"OmegaLunch", {550}},
{"chromaddict", {8759}},
{"AdipemDragon", {37667}},
{"leetsui", {700}},
{"Leminge", {3713}},
{"Hadi", {30122}},
{"Herkules1983", {304517}},
{"guiltyvictim", {12431}}
}
return playsession