Skip to content

Commit

Permalink
see changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
veden committed Dec 6, 2020
1 parent d7bcd7c commit 505ad8e
Show file tree
Hide file tree
Showing 4 changed files with 139 additions and 96 deletions.
6 changes: 6 additions & 0 deletions changelog.txt
@@ -1,3 +1,9 @@
---------------------------------------------------------------------------------------------------
Version: 1.0.2
Date: 05. 12. 2020
Bugfixes:
- Fixed corpse for advanced oil refinery, chemical plant, assembler, furnace, and electric furnace

---------------------------------------------------------------------------------------------------
Version: 1.0.1
Date: 05. 12. 2020
Expand Down
4 changes: 2 additions & 2 deletions info.json
@@ -1,10 +1,10 @@
{
"name" : "RampantIndustry",
"factorio_version" : "1.1",
"version" : "1.0.1",
"version" : "1.0.2",
"title" : "Rampant Industry",
"author" : "Veden",
"homepage" : "",
"description" : "Adds advanced versions of Oil Refinery, Lab, Storage Tank, Assembler, Chemical Plant, Solar Panel, and Accumulator that are larger and more powerful than there original versions. All are configurable with settings",
"description" : "Adds advanced versions of Oil Refinery, Oil Generator, Lab, Storage Tank, Assembler, Chemical Plant, Solar Panel, and Accumulator that are larger and more powerful than there original versions. All are configurable with settings",
"dependencies" : ["base >= 1.1.0"]
}
184 changes: 93 additions & 91 deletions make.rkt
@@ -1,103 +1,105 @@
(require file/zip)
(require json)
(require json)

(define modFolder "/mnt/gallery/gameFiles/factorio/mods/")
(define zipModFolder "/data/games/factorio/mods/")
(define configuration (call-with-input-file "info.json"
(lambda (port)
(string->jsexpr (port->string port)))))
(define packageName (string-append (string-replace (hash-ref configuration 'name) " " "_")
"_"
(hash-ref configuration 'version)))
(define modFolder "/mnt/gallery/gameFiles/factorio/mods/")
(define zipModFolder "/data/games/factorio/mods/")
(define configuration (call-with-input-file "info.json"
(lambda (port)
(string->jsexpr (port->string port)))))
(define packageName (string-append (string-replace (hash-ref configuration 'name) " " "_")
"_"
(hash-ref configuration 'version)))

(define (makeZip folder)
(let ((packagePath (string->path (string-append folder
packageName
".zip"))))
(when (file-exists? packagePath)
(delete-file packagePath)))
(zip (string-append folder
packageName
".zip")
#:path-prefix packageName
(string->path "info.json")
(string->path "control.lua")
(string->path "data.lua")
(string->path "thumbnail.png")
(string->path "data-updates.lua")
(string->path "changelog.txt")
(string->path "LICENSE.md")
(string->path "settings.lua")
(string->path "README.md")
(string->path "NOTICE")
(string->path "libs")
(string->path "migrations")
(string->path "locale")
(string->path "graphics")
(string->path "prototypes")))
(define (makeZip folder)
(let ((packagePath (string->path (string-append folder
packageName
".zip"))))
(delete-directory/files (string->path (string-append folder
packageName)))
(when (file-exists? packagePath)
(delete-file packagePath)))
(zip (string-append folder
packageName
".zip")
#:path-prefix packageName
(string->path "info.json")
(string->path "control.lua")
(string->path "data.lua")
(string->path "thumbnail.png")
(string->path "data-updates.lua")
(string->path "changelog.txt")
(string->path "LICENSE.md")
(string->path "settings.lua")
(string->path "README.md")
(string->path "NOTICE")
(string->path "libs")
(string->path "migrations")
(string->path "locale")
(string->path "graphics")
(string->path "prototypes")))

(define (copyFile fileName modFolder)
(copy-file (string->path fileName)
(string->path (string-append modFolder
packageName
"/"
fileName))))
(define (copyFile fileName modFolder)
(copy-file (string->path fileName)
(string->path (string-append modFolder
packageName
"/"
fileName))))

(define (copyDirectory directoryName modFolder)
(copy-directory/files (string->path directoryName)
(string->path (string-append modFolder
packageName
"/"
directoryName))))
(define (copyDirectory directoryName modFolder)
(copy-directory/files (string->path directoryName)
(string->path (string-append modFolder
packageName
"/"
directoryName))))

(define (copyFiles modFolder)
(let ((packagePath (string->path (string-append modFolder
packageName))))
(when (directory-exists? packagePath)
(delete-directory/files packagePath))
(sleep 0.1)
(make-directory packagePath)
(copyFile "control.lua" modFolder)
(copyFile "info.json" modFolder)
(copyFile "data.lua" modFolder)
(copyFile "data-updates.lua" modFolder)
(copyFile "LICENSE.md" modFolder)
(copyFile "thumbnail.png" modFolder)
(copyFile "changelog.txt" modFolder)
(copyFile "settings.lua" modFolder)
(copyFile "NOTICE" modFolder)
(copyDirectory "libs" modFolder)
(copyDirectory "migrations" modFolder)
(copyDirectory "locale" modFolder)
(copyDirectory "graphics" modFolder)
(copyDirectory "prototypes" modFolder)))
(define (copyFiles modFolder)
(let ((packagePath (string->path (string-append modFolder
packageName))))
(when (directory-exists? packagePath)
(delete-directory/files packagePath))
(sleep 0.1)
(make-directory packagePath)
(copyFile "control.lua" modFolder)
(copyFile "info.json" modFolder)
(copyFile "data.lua" modFolder)
(copyFile "data-updates.lua" modFolder)
(copyFile "LICENSE.md" modFolder)
(copyFile "thumbnail.png" modFolder)
(copyFile "changelog.txt" modFolder)
(copyFile "settings.lua" modFolder)
(copyFile "NOTICE" modFolder)
(copyDirectory "libs" modFolder)
(copyDirectory "migrations" modFolder)
(copyDirectory "locale" modFolder)
(copyDirectory "graphics" modFolder)
(copyDirectory "prototypes" modFolder)))


(define (copy)
(set! configuration (call-with-input-file "info.json"
(lambda (port)
(string->jsexpr (port->string port)))))
(set! packageName (string-append (string-replace (hash-ref configuration 'name) " " "_")
"_"
(hash-ref configuration 'version)))
(define (copy)
(set! configuration (call-with-input-file "info.json"
(lambda (port)
(string->jsexpr (port->string port)))))
(set! packageName (string-append (string-replace (hash-ref configuration 'name) " " "_")
"_"
(hash-ref configuration 'version)))

(print (string-append "copying " (hash-ref configuration 'name) (hash-ref configuration 'version)))
(copyFiles modFolder))
(print (string-append "copying " (hash-ref configuration 'name) (hash-ref configuration 'version)))
(copyFiles modFolder))

(define (zipIt)
(set! configuration (call-with-input-file "info.json"
(lambda (port)
(string->jsexpr (port->string port)))))
(set! packageName (string-append (string-replace (hash-ref configuration 'name) " " "_")
"_"
(hash-ref configuration 'version)))
(define (zipIt)
(set! configuration (call-with-input-file "info.json"
(lambda (port)
(string->jsexpr (port->string port)))))
(set! packageName (string-append (string-replace (hash-ref configuration 'name) " " "_")
"_"
(hash-ref configuration 'version)))

(print (string-append "zipping " (hash-ref configuration 'name) (hash-ref configuration 'version)))
(makeZip modFolder))

(print (string-append "zipping " (hash-ref configuration 'name) (hash-ref configuration 'version)))
(makeZip modFolder))

(define (runStart)
;; (copyFiles modFolder)
;;(copyFiles zipModFolder)
(makeZip modFolder)
(system*/exit-code "factorio"))
(define (runStart)
;; (copyFiles modFolder)
;;(copyFiles zipModFolder)
(makeZip modFolder)
(system*/exit-code "factorio"))

41 changes: 38 additions & 3 deletions prototypes/Buildings.lua
Expand Up @@ -890,8 +890,14 @@ function buildings.enable()
end

if settings.startup["rampant-industry-enableAdvanceFurnace"].value then
local corpse = table.deepcopy(data.raw["corpse"]["steel-furnace-remnants"])
corpse.name = "advanced-furnace-corpse-rampant-industry"
scalePicture(1.5, corpse.animation)


local steelFurnace = table.deepcopy(data.raw["furnace"]["steel-furnace"])
steelFurnace.name = "advanced-furnace-rampant-industry"
steelFurnace.corpse = "advanced-furnace-corpse-rampant-industry"
steelFurnace.minable.result = "advanced-furnace-rampant-industry"
steelFurnace.minable.mining_time = 4
steelFurnace.max_health = steelFurnace.max_health * 2
Expand Down Expand Up @@ -970,6 +976,7 @@ function buildings.enable()
recipe.result = "advanced-furnace-rampant-industry"

data:extend{
corpse,
steelFurnace,
item,
recipe
Expand All @@ -984,8 +991,14 @@ function buildings.enable()

if settings.startup["rampant-industry-enableAdvanceOilRefinery"].value then

local corpse = table.deepcopy(data.raw["corpse"]["oil-refinery-remnants"])
corpse.name = "advanced-oil-refinery-corpse-rampant-industry"
scalePicture(1.5, corpse.animation)


local refinery = table.deepcopy(data.raw["assembling-machine"]["oil-refinery"])
refinery.name = "advanced-oil-refinery-rampant-industry"
refinery.corpse = "advanced-oil-refinery-corpse-rampant-industry"
refinery.minable.result = "advanced-oil-refinery-rampant-industry"
refinery.minable.mining_time = 4
refinery.max_health = refinery.max_health * 2
Expand Down Expand Up @@ -1149,6 +1162,7 @@ function buildings.enable()
recipe.result = "advanced-oil-refinery-rampant-industry"

data:extend{
corpse,
refinery,
item,
recipe
Expand All @@ -1163,8 +1177,14 @@ function buildings.enable()
end

if settings.startup["rampant-industry-enableAdvanceAssembler"].value then
local corpse = table.deepcopy(data.raw["corpse"]["assembling-machine-3-remnants"])
corpse.name = "advanced-assembler-corpse-rampant-industry"
scalePicture(1.5, corpse.animation)


local assembler = table.deepcopy(data.raw["assembling-machine"]["assembling-machine-3"])
assembler.name = "advanced-assembler-rampant-industry"
assembler.corpse = "advanced-assembler-corpse-rampant-industry"
assembler.minable.result = "advanced-assembler-rampant-industry"
assembler.minable.mining_time = 4
assembler.max_health = assembler.max_health * 2
Expand Down Expand Up @@ -1256,6 +1276,7 @@ function buildings.enable()
recipe.result = "advanced-assembler-rampant-industry"

data:extend{
corpse,
assembler,
item,
recipe
Expand All @@ -1270,8 +1291,14 @@ function buildings.enable()
end

if settings.startup["rampant-industry-enableAdvanceElectricFurnace"].value then
local corpse = table.deepcopy(data.raw["corpse"]["electric-furnace-remnants"])
corpse.name = "advanced-electric-furnace-corpse-rampant-industry"
scalePicture(1.5, corpse.animation)


local electricFurnace = table.deepcopy(data.raw["furnace"]["electric-furnace"])
electricFurnace.name = "advanced-electric-furnace-rampant-industry"
electricFurnace.corpse = "advanced-electric-furnace-corpse-rampant-industry"
electricFurnace.minable.result = "advanced-electric-furnace-rampant-industry"
electricFurnace.minable.mining_time = 4
electricFurnace.max_health = electricFurnace.max_health * 2
Expand Down Expand Up @@ -1343,6 +1370,7 @@ function buildings.enable()
recipe.result = "advanced-electric-furnace-rampant-industry"

data:extend{
corpse,
electricFurnace,
item,
recipe
Expand All @@ -1356,8 +1384,14 @@ function buildings.enable()
end

if settings.startup["rampant-industry-enableAdvanceChemicalPlant"].value then
local corpse = table.deepcopy(data.raw["corpse"]["chemical-plant-remnants"])
corpse.name = "advanced-chemical-plant-corpse-rampant-industry"
scalePicture(1.5, corpse.animation)


local assembler = table.deepcopy(data.raw["assembling-machine"]["chemical-plant"])
assembler.name = "advanced-chemical-plant-rampant-industry"
assembler.corpse = "advanced-chemical-plant-corpse-rampant-industry"
assembler.minable.result = "advanced-chemical-plant-rampant-industry"
assembler.minable.mining_time = 4
assembler.max_health = assembler.max_health * 2
Expand Down Expand Up @@ -1394,7 +1428,7 @@ function buildings.enable()

assembler.working_visualisations[1].north_animation.shift = {2.25,1.5} -- water
assembler.working_visualisations[1].north_animation.scale = 3.3
assembler.working_visualisations[1].north_animation.hr_version.shift = {2.25,1.5}
assembler.working_visualisations[1].north_animation.hr_version.shift = {2.25,1.5}
assembler.working_visualisations[1].north_animation.hr_version.scale = 1.65
assembler.working_visualisations[2].north_animation.shift = {2.25,1.5} -- foam
assembler.working_visualisations[2].north_animation.scale = 3.3
Expand All @@ -1413,7 +1447,7 @@ function buildings.enable()
assembler.working_visualisations[2].east_animation.hr_version.scale = 1.65
assembler.working_visualisations[3].east_position = {1.3,-7.8}
assembler.working_visualisations[4].east_position = {1.3,-7.1}

assembler.working_visualisations[1].south_animation.shift = {0.1,1.7}
assembler.working_visualisations[1].south_animation.scale = 3.3
assembler.working_visualisations[1].south_animation.hr_version.shift = {0.1,1.7}
Expand All @@ -1424,7 +1458,7 @@ function buildings.enable()
assembler.working_visualisations[2].south_animation.hr_version.scale = 1.65
assembler.working_visualisations[3].south_position = {0.6,-7.2}
assembler.working_visualisations[4].south_position = {0.6,-6.5}


assembler.working_visualisations[1].west_animation.shift = {-1,1.5}
assembler.working_visualisations[1].west_animation.scale = 3.3
Expand Down Expand Up @@ -1544,6 +1578,7 @@ function buildings.enable()
recipe.result = "advanced-chemical-plant-rampant-industry"

data:extend{
corpse,
assembler,
item,
recipe
Expand Down

0 comments on commit 505ad8e

Please sign in to comment.