Skip to content

Commit

Permalink
Update data to 1.1.110.
Browse files Browse the repository at this point in the history
  • Loading branch information
@KirkMcDonald
KirkMcDonald committed Oct 9, 2024
1 parent 7436ee3 commit c7df837
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 12 deletions.
2 changes: 1 addition & 1 deletion calc.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
<td class="changecell">
<div class="changebox">
Recent changes:<br>
2021-01-29 - Updated to 1.1.19
2024-10-09 - Updated to 1.1.110
</div>
</td>
</tr>
Expand Down
15 changes: 11 additions & 4 deletions data/vanilla-1.1.19-expensive.json → data/vanilla-1.1.110-expensive.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -308,10 +308,12 @@
"x": 32,
"y": 0
}, {
"draw_as_light": true,
"filename": "__base__/graphics/entity/heat-exchanger/heatex-endings-heated.png",
"frame_count": 1,
"height": 32,
"hr_version": {
"draw_as_light": true,
"filename": "__base__/graphics/entity/heat-exchanger/hr-heatex-endings-heated.png",
"frame_count": 1,
"height": 64,
Expand Down Expand Up @@ -353,10 +355,12 @@
"x": 0,
"y": 0
}, {
"draw_as_light": true,
"filename": "__base__/graphics/entity/heat-exchanger/heatex-endings-heated.png",
"frame_count": 1,
"height": 32,
"hr_version": {
"draw_as_light": true,
"filename": "__base__/graphics/entity/heat-exchanger/hr-heatex-endings-heated.png",
"frame_count": 1,
"height": 64,
Expand Down Expand Up @@ -398,10 +402,12 @@
"x": 64,
"y": 0
}, {
"draw_as_light": true,
"filename": "__base__/graphics/entity/heat-exchanger/heatex-endings-heated.png",
"frame_count": 1,
"height": 32,
"hr_version": {
"draw_as_light": true,
"filename": "__base__/graphics/entity/heat-exchanger/hr-heatex-endings-heated.png",
"frame_count": 1,
"height": 64,
Expand Down Expand Up @@ -443,10 +449,12 @@
"x": 96,
"y": 0
}, {
"draw_as_light": true,
"filename": "__base__/graphics/entity/heat-exchanger/heatex-endings-heated.png",
"frame_count": 1,
"height": 32,
"hr_version": {
"draw_as_light": true,
"filename": "__base__/graphics/entity/heat-exchanger/hr-heatex-endings-heated.png",
"frame_count": 1,
"height": 64,
Expand Down Expand Up @@ -3726,7 +3734,7 @@
},
"name": "tank-cannon",
"order": "z[tank]-a[cannon]",
"stack_size": 5,
"stack_size": 1,
"subgroup": "gun",
"type": "gun"
},
Expand Down Expand Up @@ -9849,8 +9857,7 @@
"energy_usage": 250000,
"icon_col": 8,
"icon_row": 11,
"idle_energy_usage": "10KW",
"lamp_energy_usage": "10KW",
"lamp_energy_usage": "0KW",
"localized_name": {
"en": "Rocket silo"
},
Expand Down Expand Up @@ -9883,7 +9890,7 @@
"name": "no module"
}
},
"hash": "3d3a8d8b3ece0e13191a2ea142d21131",
"hash": "e52bb55c81cc32ee4d4000353822efb8",
"height": 512,
"width": 480
},
Expand Down
15 changes: 11 additions & 4 deletions data/vanilla-1.1.19.json → data/vanilla-1.1.110.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -308,10 +308,12 @@
"x": 32,
"y": 0
}, {
"draw_as_light": true,
"filename": "__base__/graphics/entity/heat-exchanger/heatex-endings-heated.png",
"frame_count": 1,
"height": 32,
"hr_version": {
"draw_as_light": true,
"filename": "__base__/graphics/entity/heat-exchanger/hr-heatex-endings-heated.png",
"frame_count": 1,
"height": 64,
Expand Down Expand Up @@ -353,10 +355,12 @@
"x": 0,
"y": 0
}, {
"draw_as_light": true,
"filename": "__base__/graphics/entity/heat-exchanger/heatex-endings-heated.png",
"frame_count": 1,
"height": 32,
"hr_version": {
"draw_as_light": true,
"filename": "__base__/graphics/entity/heat-exchanger/hr-heatex-endings-heated.png",
"frame_count": 1,
"height": 64,
Expand Down Expand Up @@ -398,10 +402,12 @@
"x": 64,
"y": 0
}, {
"draw_as_light": true,
"filename": "__base__/graphics/entity/heat-exchanger/heatex-endings-heated.png",
"frame_count": 1,
"height": 32,
"hr_version": {
"draw_as_light": true,
"filename": "__base__/graphics/entity/heat-exchanger/hr-heatex-endings-heated.png",
"frame_count": 1,
"height": 64,
Expand Down Expand Up @@ -443,10 +449,12 @@
"x": 96,
"y": 0
}, {
"draw_as_light": true,
"filename": "__base__/graphics/entity/heat-exchanger/heatex-endings-heated.png",
"frame_count": 1,
"height": 32,
"hr_version": {
"draw_as_light": true,
"filename": "__base__/graphics/entity/heat-exchanger/hr-heatex-endings-heated.png",
"frame_count": 1,
"height": 64,
Expand Down Expand Up @@ -3726,7 +3734,7 @@
},
"name": "tank-cannon",
"order": "z[tank]-a[cannon]",
"stack_size": 5,
"stack_size": 1,
"subgroup": "gun",
"type": "gun"
},
Expand Down Expand Up @@ -9849,8 +9857,7 @@
"energy_usage": 250000,
"icon_col": 8,
"icon_row": 11,
"idle_energy_usage": "10KW",
"lamp_energy_usage": "10KW",
"lamp_energy_usage": "0KW",
"localized_name": {
"en": "Rocket silo"
},
Expand Down Expand Up @@ -9883,7 +9890,7 @@
"name": "no module"
}
},
"hash": "3d3a8d8b3ece0e13191a2ea142d21131",
"hash": "e52bb55c81cc32ee4d4000353822efb8",
"height": 512,
"width": 480
},
Expand Down
Binary file removed images/sprite-sheet-3d3a8d8b3ece0e13191a2ea142d21131.png
View file
Binary file not shown.
Binary file added images/sprite-sheet-e52bb55c81cc32ee4d4000353822efb8.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 7 additions & 3 deletions settings.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ function Modification(name, filename, legacy, sheetSize) {
}

var MODIFICATIONS = {
"1-1-19": new Modification("Vanilla 1.1.19", "vanilla-1.1.19.json", false, [480, 512]),
"1-1-19x": new Modification("Vanilla 1.1.19 - Expensive", "vanilla-1.1.19-expensive.json", false, [480, 512]),
//"1-1-19": new Modification("Vanilla 1.1.19", "vanilla-1.1.19.json", false, [480, 512]),
//"1-1-19x": new Modification("Vanilla 1.1.19 - Expensive", "vanilla-1.1.19-expensive.json", false, [480, 512]),
"1-1-110": new Modification("Vanilla 1.1.110", "vanilla-1.1.110.json", false, [480, 512]),
"1-1-110x": new Modification("Vanilla 1.1.110 - Expensive", "vanilla-1.1.110-expensive.json", false, [480, 512]),
}

var DEFAULT_MODIFICATION = "1-1-19"
var DEFAULT_MODIFICATION = "1-1-110"

function addOverrideOptions(version) {
var tag = "local-" + version.replace(/\./g, "-")
Expand All @@ -39,6 +41,8 @@ function addOverrideOptions(version) {
// Ideally we'd write this as a generalized function, but for now we can hard-
// code these version upgrades.
var modUpdates = {
"1-1-19": "1-1-110",
"1-1-19x": "1-1-110x",
}

function normalizeDataSetName(modName) {
Expand Down

0 comments on commit c7df837

Please sign in to comment.