rt_medieval wall smoothing (#7251)
@@ -12,6 +12,10 @@
|
|||||||
abstract_type = /turf/simulated/wall/rt_medieval
|
abstract_type = /turf/simulated/wall/rt_medieval
|
||||||
integrity_flags = INTEGRITY_INDESTRUCTIBLE
|
integrity_flags = INTEGRITY_INDESTRUCTIBLE
|
||||||
material_system = FALSE
|
material_system = FALSE
|
||||||
|
base_icon_state = "wall"
|
||||||
|
icon_state = "wall-0"
|
||||||
|
// needed due to base wall being steel :/
|
||||||
|
color = null
|
||||||
|
|
||||||
// TODO: destructible sprites, consturction, shift these slowly into
|
// TODO: destructible sprites, consturction, shift these slowly into
|
||||||
// materials system. wall themes/styles?
|
// materials system. wall themes/styles?
|
||||||
@@ -21,46 +25,38 @@
|
|||||||
name = "archaic terrain wall"
|
name = "archaic terrain wall"
|
||||||
desc = "You don't how this was made, but it doesn't look very welcoming."
|
desc = "You don't how this was made, but it doesn't look very welcoming."
|
||||||
icon = 'icons/turf/walls/rt_medieval/boss.dmi'
|
icon = 'icons/turf/walls/rt_medieval/boss.dmi'
|
||||||
icon_state = "boss"
|
|
||||||
|
|
||||||
/turf/simulated/wall/rt_medieval/brick
|
|
||||||
name = "archaic brick wall"
|
|
||||||
desc = "An archaic wall made from brick. It looks sturdy."
|
|
||||||
icon = 'icons/turf/walls/rt_medieval/brick.dmi'
|
|
||||||
icon_state = "brick"
|
|
||||||
|
|
||||||
/turf/simulated/wall/rt_medieval/stone
|
/turf/simulated/wall/rt_medieval/stone
|
||||||
name = "archaic stone wall"
|
name = "archaic stone wall"
|
||||||
desc = "An archaic wall made from stone. It looks sturdy."
|
desc = "An archaic wall made from stone. It looks sturdy."
|
||||||
icon = 'icons/turf/walls/rt_medieval/stone.dmi'
|
icon = 'icons/turf/walls/rt_medieval/stone.dmi'
|
||||||
icon_state = "stone"
|
|
||||||
|
|
||||||
/turf/simulated/wall/rt_medieval/stone/brick
|
/turf/simulated/wall/rt_medieval/stone/brick
|
||||||
name = "archaic stone brick wall"
|
name = "archaic stone brick wall"
|
||||||
desc = "An archaic wall made from stone brick. It looks sturdy."
|
desc = "An archaic wall made from stone brick. It looks sturdy."
|
||||||
icon = 'icons/turf/walls/rt_medieval/stone/brick.dmi'
|
icon = 'icons/turf/walls/rt_medieval/stone/brick.dmi'
|
||||||
icon_state = "stone_brick"
|
|
||||||
|
|
||||||
/turf/simulated/wall/rt_medieval/stone/craft
|
/turf/simulated/wall/rt_medieval/stone/craft
|
||||||
name = "archaic craft stone wall"
|
name = "archaic craft stone wall"
|
||||||
desc = "An archaic wall made from textured stone. It looks sturdy."
|
desc = "An archaic wall made from textured stone. It looks sturdy."
|
||||||
icon = 'icons/turf/walls/rt_medieval/stone/craft.dmi'
|
icon = 'icons/turf/walls/rt_medieval/stone/craft.dmi'
|
||||||
icon_state = "stone_craft"
|
|
||||||
|
|
||||||
/turf/simulated/wall/rt_medieval/stone/moss_red
|
/turf/simulated/wall/rt_medieval/stone/moss_red
|
||||||
name = "archaic mossy stone wall"
|
name = "archaic mossy stone wall"
|
||||||
desc = "An archaic wall made from stone. It looks sturdy."
|
desc = "An archaic wall made from stone. It looks sturdy."
|
||||||
icon = 'icons/turf/walls/rt_medieval/stone/moss_red.dmi'
|
icon = 'icons/turf/walls/rt_medieval/stone/moss_red.dmi'
|
||||||
icon_state = "stone_moss_red"
|
|
||||||
|
/turf/simulated/wall/rt_medieval/stone/moss_green
|
||||||
|
name = "archaic mossy stone wall"
|
||||||
|
desc = "An archaic wall made from stone. It looks sturdy."
|
||||||
|
icon = 'icons/turf/walls/rt_medieval/stone/moss_green.dmi'
|
||||||
|
|
||||||
/turf/simulated/wall/rt_medieval/stone/moss_blue
|
/turf/simulated/wall/rt_medieval/stone/moss_blue
|
||||||
name = "archaic mossy stone wall"
|
name = "archaic mossy stone wall"
|
||||||
desc = "An archaic wall made from stone. It looks sturdy."
|
desc = "An archaic wall made from stone. It looks sturdy."
|
||||||
icon = 'icons/turf/walls/rt_medieval/stone/moss_blue.dmi'
|
icon = 'icons/turf/walls/rt_medieval/stone/moss_blue.dmi'
|
||||||
icon_state = "stone_moss_blue"
|
|
||||||
|
|
||||||
/turf/simulated/wall/rt_medieval/wood
|
/turf/simulated/wall/rt_medieval/wood
|
||||||
name = "archaic wooden wall"
|
name = "archaic wooden wall"
|
||||||
desc = "An archaic wall made from wood. It looks sturdy."
|
desc = "An archaic wall made from wood. It looks sturdy."
|
||||||
icon = 'icons/turf/walls/rt_medieval/wood.dmi'
|
icon = 'icons/turf/walls/rt_medieval/wood.dmi'
|
||||||
icon_state = "wood"
|
|
||||||
|
|||||||
@@ -3,6 +3,8 @@
|
|||||||
* Surely, *surely*, such a nice, amazing thing wouldn't be entirely shitcode.
|
* Surely, *surely*, such a nice, amazing thing wouldn't be entirely shitcode.
|
||||||
* Right?
|
* Right?
|
||||||
*
|
*
|
||||||
|
* TODO: /turf/simulated/wall/material; do not have steel defines on base.
|
||||||
|
*
|
||||||
* ## Material System
|
* ## Material System
|
||||||
*
|
*
|
||||||
* By default, walls are made out of /datum/material's.
|
* By default, walls are made out of /datum/material's.
|
||||||
|
|||||||
3
icon_cutter_templates/README.md
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
# Icon cutter templates
|
||||||
|
|
||||||
|
Templates for the automated icon cutter.
|
||||||
3
icon_cutter_templates/impl/README.md
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
# Implementation Templates
|
||||||
|
|
||||||
|
Organized templates for Citadel RP's features.
|
||||||
14
icon_cutter_templates/impl/wall/rt_medieval.toml
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
template = "impl/wall_default.toml"
|
||||||
|
|
||||||
|
output_name = "wall"
|
||||||
|
smooth_diagonally = false
|
||||||
|
|
||||||
|
[positions]
|
||||||
|
convex = 0
|
||||||
|
horizontal = 1
|
||||||
|
vertical = 2
|
||||||
|
concave = 3
|
||||||
|
|
||||||
|
[cut_pos]
|
||||||
|
x = 16
|
||||||
|
y = 16
|
||||||
14
icon_cutter_templates/impl/wall_default.toml
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
mode = "BitmaskSlice"
|
||||||
|
produce_dirs = false
|
||||||
|
|
||||||
|
[icon_size]
|
||||||
|
x = 32
|
||||||
|
y = 32
|
||||||
|
|
||||||
|
[output_icon_pos]
|
||||||
|
x = 0
|
||||||
|
y = 0
|
||||||
|
|
||||||
|
[output_icon_size]
|
||||||
|
x = 32
|
||||||
|
y = 32
|
||||||
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 11 KiB |
BIN
icons/turf/walls/rt_medieval/boss.png
Normal file
|
After Width: | Height: | Size: 1.5 KiB |
10
icons/turf/walls/rt_medieval/boss.png.toml
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
template = "impl/wall/rt_medieval.toml"
|
||||||
|
|
||||||
|
smooth_diagonally = true
|
||||||
|
|
||||||
|
[positions]
|
||||||
|
convex = 0
|
||||||
|
vertical = 1
|
||||||
|
horizontal = 2
|
||||||
|
concave = 3
|
||||||
|
flat = 4
|
||||||
|
Before Width: | Height: | Size: 577 B |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 20 KiB |
BIN
icons/turf/walls/rt_medieval/stone.png
Normal file
|
After Width: | Height: | Size: 2.6 KiB |
10
icons/turf/walls/rt_medieval/stone.png.toml
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
template = "impl/wall/rt_medieval.toml"
|
||||||
|
|
||||||
|
smooth_diagonally = true
|
||||||
|
|
||||||
|
[positions]
|
||||||
|
convex = 0
|
||||||
|
vertical = 1
|
||||||
|
horizontal = 2
|
||||||
|
flat = 3
|
||||||
|
concave = 4
|
||||||
|
Before Width: | Height: | Size: 931 B After Width: | Height: | Size: 10 KiB |
BIN
icons/turf/walls/rt_medieval/stone/brick.png
Normal file
|
After Width: | Height: | Size: 1.1 KiB |
10
icons/turf/walls/rt_medieval/stone/brick.png.toml
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
template = "impl/wall/rt_medieval.toml"
|
||||||
|
|
||||||
|
smooth_diagonally = true
|
||||||
|
|
||||||
|
[positions]
|
||||||
|
convex = 1
|
||||||
|
vertical = 4
|
||||||
|
horizontal = 0
|
||||||
|
concave = 3
|
||||||
|
flat = 2
|
||||||
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 19 KiB |
BIN
icons/turf/walls/rt_medieval/stone/craft.png
Normal file
|
After Width: | Height: | Size: 1.8 KiB |
10
icons/turf/walls/rt_medieval/stone/craft.png.toml
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
template = "impl/wall/rt_medieval.toml"
|
||||||
|
|
||||||
|
smooth_diagonally = true
|
||||||
|
|
||||||
|
[positions]
|
||||||
|
convex = 0
|
||||||
|
vertical = 1
|
||||||
|
horizontal = 2
|
||||||
|
concave = 3
|
||||||
|
flat = 4
|
||||||
|
Before Width: | Height: | Size: 992 B After Width: | Height: | Size: 21 KiB |
BIN
icons/turf/walls/rt_medieval/stone/moss_blue.png
Normal file
|
After Width: | Height: | Size: 2.6 KiB |
10
icons/turf/walls/rt_medieval/stone/moss_blue.png.toml
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
template = "impl/wall/rt_medieval.toml"
|
||||||
|
|
||||||
|
smooth_diagonally = true
|
||||||
|
|
||||||
|
[positions]
|
||||||
|
convex = 0
|
||||||
|
vertical = 1
|
||||||
|
horizontal = 2
|
||||||
|
concave = 3
|
||||||
|
flat = 4
|
||||||
BIN
icons/turf/walls/rt_medieval/stone/moss_green.dmi
Normal file
|
After Width: | Height: | Size: 21 KiB |
BIN
icons/turf/walls/rt_medieval/stone/moss_green.png
Normal file
|
After Width: | Height: | Size: 2.7 KiB |
10
icons/turf/walls/rt_medieval/stone/moss_green.png.toml
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
template = "impl/wall/rt_medieval.toml"
|
||||||
|
|
||||||
|
smooth_diagonally = true
|
||||||
|
|
||||||
|
[positions]
|
||||||
|
convex = 0
|
||||||
|
vertical = 1
|
||||||
|
horizontal = 2
|
||||||
|
concave = 3
|
||||||
|
flat = 4
|
||||||
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 22 KiB |
BIN
icons/turf/walls/rt_medieval/stone/moss_red.png
Normal file
|
After Width: | Height: | Size: 2.7 KiB |
10
icons/turf/walls/rt_medieval/stone/moss_red.png.toml
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
template = "impl/wall/rt_medieval.toml"
|
||||||
|
|
||||||
|
smooth_diagonally = true
|
||||||
|
|
||||||
|
[positions]
|
||||||
|
convex = 0
|
||||||
|
vertical = 1
|
||||||
|
horizontal = 2
|
||||||
|
concave = 3
|
||||||
|
flat = 4
|
||||||
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 14 KiB |
BIN
icons/turf/walls/rt_medieval/wood.png
Normal file
|
After Width: | Height: | Size: 1.2 KiB |
10
icons/turf/walls/rt_medieval/wood.png.toml
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
template = "impl/wall/rt_medieval.toml"
|
||||||
|
|
||||||
|
smooth_diagonally = true
|
||||||
|
|
||||||
|
[positions]
|
||||||
|
convex = 0
|
||||||
|
vertical = 1
|
||||||
|
horizontal = 2
|
||||||
|
concave = 3
|
||||||
|
flat = 4
|
||||||
@@ -141,7 +141,7 @@ export const IconCutterTarget = new Juke.Target({
|
|||||||
const standard_inputs = [
|
const standard_inputs = [
|
||||||
`icons/**/*.png.toml`,
|
`icons/**/*.png.toml`,
|
||||||
`icons/**/*.dmi.toml`,
|
`icons/**/*.dmi.toml`,
|
||||||
`cutter_templates/**/*.toml`,
|
`icon_cutter_templates/**/*.toml`,
|
||||||
cutter_path,
|
cutter_path,
|
||||||
];
|
];
|
||||||
// Alright we're gonna search out any existing toml files and convert
|
// Alright we're gonna search out any existing toml files and convert
|
||||||
@@ -169,7 +169,7 @@ export const IconCutterTarget = new Juke.Target({
|
|||||||
await Juke.exec(cutter_path, [
|
await Juke.exec(cutter_path, [
|
||||||
"--dont-wait",
|
"--dont-wait",
|
||||||
"--templates",
|
"--templates",
|
||||||
"cutter_templates",
|
"icon_cutter_templates",
|
||||||
"icons",
|
"icons",
|
||||||
]);
|
]);
|
||||||
},
|
},
|
||||||
|
|||||||