Skip to content

Commit

Permalink
Added Yuoki Industries to defaultsets
Browse files Browse the repository at this point in the history
Rough forced reset of mod
  • Loading branch information
Nexela committed Jul 10, 2016
1 parent 0ec69ee commit 54cce5b
Show file tree
Hide file tree
Showing 7 changed files with 69 additions and 10 deletions.
4 changes: 4 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
1.3.16
-Add YI defaultsets
-Force Reset of sets

1.3.15
-shuttle train support
-removed color coding locos since it is not needed for factorio .13
Expand Down
8 changes: 5 additions & 3 deletions control.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ loader.addSets "settings/bob-sets" -- Bobwarfare added tanks 2 and 3
loader.addSets "settings/farl-sets"
loader.extendItemArray "settings/ammobox-items"
loader.addSets "settings/ammobox-sets"
loader.addSets "settings/yuoki-ind-sets"
loader.addItemArray "settings/yuoki-ind-newitems" --New Ammo Catergories for YI
loader.extendItemArray "settings/yuoki-ind-items" -- YI Bullets
loader.addSets "settings/yuoki-ind-sets" -- YI Item Sets
loader.addSets "settings/shuttle-train-sets" -- Autofill for shuttle trains
loader.extendItemArray "settings/aircraft-items"
loader.addSets "settings/aircraft-sets"
Expand All @@ -36,7 +38,7 @@ local order = {
--

script.on_configuration_changed(function()
initMod()
initMod(true)
end)

script.on_init(function()
Expand Down Expand Up @@ -259,7 +261,7 @@ function initMod(reset)

else
loader.updateFuelArrays(global.item_arrays)
end
end
end

function isValidEntity(name)
Expand Down
2 changes: 1 addition & 1 deletion info.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "autofill",
"version": "1.3.15",
"version": "1.3.16",
"factorio_version": "0.13",
"title": "Autofill",
"author": "rk84",
Expand Down
6 changes: 3 additions & 3 deletions settings/bob-sets.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
local locomotiveFillSet = {group="locomotives", slots={1}, "fuels-high"}
local boilerFillSet = {group="burners", limits={5}, "fuels-high"}
local turretFillSet = {group="turrets", limits= {10}, "ammo-bullets"}
local turretFillSet = {priority=2, group="turrets", limits= {10}, "ammo-bullets"}

return {
-- bobpower
Expand All @@ -16,8 +16,8 @@ return {
["bob-sniper-turret-1"] = turretFillSet,
["bob-sniper-turret-2"] = turretFillSet,
["bob-sniper-turret-3"] = turretFillSet,
["tank-2"] ={priority={1}, slots={3,1,1,1}, "fuels-all", "ammo-bullets", "ammo-shells", "ammo-artillery" },
["tank-3"] ={priority={1}, slots={4,1,1,1}, "fuels-all", "ammo-bullets", "ammo-battery", "ammo-shells", "ammo-artillery" },
["tank-2"] ={priority=2, slots={3,1,1,1}, "fuels-all", "ammo-bullets", "ammo-shells", "ammo-artillery" },
["tank-3"] ={priority=2, slots={4,1,1,1}, "fuels-all", "ammo-bullets", "ammo-battery", "ammo-shells", "ammo-artillery" },
--["tank"] = {priority=order.default, slots={2,1,1}, "fuels-all", "ammo-bullets", "ammo-shells" },

-- boblogistics
Expand Down
20 changes: 20 additions & 0 deletions settings/yuoki-ind-items.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
--
-- Disclaimer: mp warranty void if edited.
--

--[[
y-bullet-case=Bullet Case -- Not needed
y-ammo-acid=Acid Ammo -- Not Needed?
y-ammo-acid-2=Acid Projectile
y-ammo-hohlspitz=Standard Ammo
y-ammo-explosiv=Explosive Ammo
y-ammo-poison=Poison Ammo
y-ammo-biggun=Tracer Ammo
y-ammo-krakon=Impact Ammo
--]]


return {
["ammo-bullets"] = {"y-ammo-acid-2","y-ammo-hohlspitz", "y-ammo-explosiv", "y-ammo-poison", "y-ammo-biggun", "y-ammo-krakon"}
}

11 changes: 11 additions & 0 deletions settings/yuoki-ind-newitems.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--
-- Disclaimer: mp warranty void if edited.
--

--y_ammo_plasma=Plasma Capsule
--y_ammo_flame=Blaze-Mixture Canister

return {
["ammo-yi-plasma"] = {"y_ammo_plasma"},
["ammo-yi-chem"] = {"y_ammo_flame"}
}
28 changes: 25 additions & 3 deletions settings/yuoki-ind-sets.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,31 @@
-- Disclaimer: mp warranty void if edited.
--

local turretset = {group="turrets", limits= {20}, "ammo-bullets" }
--[[
y_turret_gun1f12=T-GUN (Big Barrel)
y_turret_gun2f12=T-GUN (Double Barrel)
y_turret_laser22f12=T-LAS (D20-R33)
y-laser-def-s4=T-LAS (D18-R26)
y_turret_plasma=T-PLASMA
y_turret_flame=T-CHEMIC
y-boiler-t2=Boiler 540/2
y-boiler-t3=Boiler 1M8/3
y-boiler-iv=Boiler 3M6/4
y-obninsk-reactor=Obnisnk AM-1/1951
--]]

local turretFillSet = {priority=2, group="turrets", limits= {20}, "ammo-bullets" }
local plasmaFillSet = {priority=1, group="plasmaturrets", limits= {20}, "ammo-yi-plasma" }
local chemFillSet = {priority=1, group="chemturrets", limits= {20}, "ammo-yi-chem" }
local boilerFillSet = {group="burners", limits={5}, "fuels-high"}

return {
["y_turret_gun1f12"] = turretset,
["y_turret_gun2f12"] = turretset
["y_turret_gun1f12"] = turretFillSet,
["y_turret_gun2f12"] = turretFillSet,
["y_turret_plasma"]= plasmaFillSet,
["y_turret_flame"] = chemFillSet,
["y-boiler-t2"] = boilerFillSet,
["y-boiler-t3"] = boilerFillSet,
["y-boiler-iv"] = boilerFillSet,
["y-obninsk-reactor"] = boilerFillSet
}

0 comments on commit 54cce5b

Please sign in to comment.