summaryrefslogtreecommitdiff
path: root/tile_config.diff
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2020-07-18 12:58:45 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2020-07-18 12:58:45 -0700
commita4617ac0915f59ccd2338362181087322759e2c0 (patch)
tree73f4a7e5fe8d13c3929426f2f1f82d20a8f70bf7 /tile_config.diff
parentSynced with upstream - bg_floor (diff)
downloadcataclysm-dda-tileset_undeadpeople-legacy-a4617ac0915f59ccd2338362181087322759e2c0.tar.xz
Synced with upstream - decided to umprove planter even more
Added readme explaining the changes Added diff for indicating precise changes and making updates easier.
Diffstat (limited to 'tile_config.diff')
-rw-r--r--tile_config.diff88
1 files changed, 88 insertions, 0 deletions
diff --git a/tile_config.diff b/tile_config.diff
new file mode 100644
index 0000000..ef64397
--- /dev/null
+++ b/tile_config.diff
@@ -0,0 +1,88 @@
+--- a/tile_config.json
++++ b/tile_config.json
+@@ -685,6 +685,9 @@
+ { "id": "gloves_fur", "fg": 378, "rotates": false },
+ { "id": "gloves_leather", "fg": 379, "rotates": false },
+ { "id": "gloves_light", "fg": 380, "rotates": false },
++ { "id": "maid_gloves_cotton", "fg": 381, "rotates": false },
++ { "id": "maid_gloves_leather", "fg": 381, "rotates": false },
++ { "id": "maid_gloves_armor", "fg": 381, "rotates": false },
+ { "id": "gloves_liner", "fg": 381, "rotates": false },
+ { "id": "thermal_gloves", "fg": 381, "bg": 957, "rotates": false },
+ { "id": "thermal_gloves_on", "fg": 381, "bg": 957, "rotates": false },
+@@ -1055,6 +1058,9 @@
+ { "id": "overlay_worn_gloves_wsurvivor", "fg": 613, "rotates": false },
+ { "id": "overlay_worn_gloves_xlsurvivor", "fg": 613, "rotates": false },
+ { "id": "overlay_worn_gloves_light", "fg": 614, "rotates": false },
++ { "id": "overlay_worn_maid_gloves_cotton", "fg": 614, "rotates": false },
++ { "id": "overlay_worn_maid_gloves_leather", "fg": 614, "rotates": false },
++ { "id": "overlay_worn_maid_gloves_armor", "fg": 614, "rotates": false },
+ { "id": "overlay_worn_gloves_liner", "fg": 614, "rotates": false },
+ { "id": "overlay_worn_gloves_wraps", "fg": 614, "rotates": false },
+ { "id": "overlay_worn_gloves_wraps_wool", "fg": 614, "rotates": false },
+@@ -1185,6 +1191,9 @@
+ { "id": "overlay_worn_loincloth_leather", "fg": 694, "rotates": false },
+ { "id": "overlay_worn_loincloth_wool", "fg": 694, "rotates": false },
+ { "id": "overlay_worn_long_glove_white", "fg": 695, "rotates": false },
++ { "id": "overlay_worn_maid_gloves_long_cotton", "fg": 695, "rotates": false },
++ { "id": "overlay_worn_maid_gloves_long_leather", "fg": 695, "rotates": false },
++ { "id": "overlay_worn_maid_gloves_long_armor", "fg": 695, "rotates": false },
+ { "id": [ "overlay_worn_gauntlets_bone", "overlay_worn_t_gauntlets_take" ], "fg": 695, "rotates": false },
+ { "id": "overlay_worn_sockmitts", "fg": 695, "rotates": false },
+ { "id": "overlay_worn_lowtops", "fg": 696, "rotates": false },
+@@ -6198,6 +6207,7 @@
+ { "id": "summon_alchemic_golem", "fg": 1222, "rotates": false },
+ { "id": "blob_gohan", "fg": 157, "rotates": false },
+ { "id": [ "assassins_throwing_dagger", "makeshift_throwing_knife" ], "fg": 239, "rotates": false },
++ { "id": "maid_master", "fg": 4575, "rotates": false },
+ { "id": [ "mon_shoggoth_maid", "mini_shoggoth", "res_shoggoth" ], "fg": 4577, "rotates": false },
+ {
+ "id": [
+@@ -18830,6 +18840,7 @@
+ { "id": "kawaii_hat_cotton", "fg": 405, "rotates": false },
+ { "id": "kawaii_tailskirt_mini", "fg": 495, "rotates": false },
+ { "id": "kawaii_vest", "fg": 946, "rotates": false },
++ { "id": "kawaii_vest_armor", "fg": 946, "rotates": false },
+ { "id": "kawaii_bikini_bottom_black", "fg": 836, "rotates": false },
+ { "id": "kawaii_bikini_top_black", "fg": 539, "rotates": false },
+ { "id": "kawaii_maid_hardcase", "fg": 273, "rotates": false },
+@@ -18876,8 +18887,10 @@
+ { "id": "kawaii_tights_black", "fg": 22246, "rotates": false },
+ { "id": "kawaii_tights_white", "fg": 22247, "rotates": false },
+ { "id": "kawaii_maid_dress_long", "fg": 22248, "rotates": false },
+- { "id": "kawaii_boots_hi", "fg": 22249, "rotates": false },
+- { "id": "kawaii_shoes_hi", "fg": 22250, "rotates": false },
++ { "id": "kawaii_maid_dress_long_leather", "fg": 22248, "rotates": false },
++ { "id": "kawaii_maid_dress_long_armor", "fg": 22248, "rotates": false },
++ { "id": "kawaii_boots_hi", "fg": 22237, "rotates": false },
++ { "id": "kawaii_shoes_hi", "fg": 345, "rotates": false },
+ { "id": [ "kawaii_glass_bow", "t_wakyu_nami", "t_wakyu_nobi" ], "fg": 22251, "rotates": false },
+ { "id": "kawaii_knife_steak_twin", "fg": 22252, "rotates": false },
+ { "id": [ "kawaii_sword_steel", "t_kensi" ], "fg": 22253, "rotates": false },
+@@ -18921,6 +18934,7 @@
+ { "id": "overlay_worn_kawaii_hat_cotton", "fg": 22204, "rotates": false },
+ { "id": "overlay_worn_kawaii_tailskirt_mini", "fg": 22205, "rotates": false },
+ { "id": "overlay_worn_kawaii_vest", "fg": 22206, "rotates": false },
++ { "id": "overlay_worn_kawaii_vest_armor", "fg": 22206, "rotates": false },
+ { "id": "overlay_worn_kawaii_bikini_bottom_black", "fg": 22207, "rotates": false },
+ { "id": "overlay_worn_kawaii_bikini_top_black", "fg": 22208, "rotates": false },
+ { "id": "overlay_worn_kawaii_maid_hardcase", "fg": 22209, "rotates": false },
+@@ -18972,6 +18986,8 @@
+ { "id": "overlay_worn_kawaii_tights_black", "fg": 22246, "rotates": false },
+ { "id": "overlay_worn_kawaii_tights_white", "fg": 22247, "rotates": false },
+ { "id": "overlay_worn_kawaii_maid_dress_long", "fg": 22248, "rotates": false },
++ { "id": "overlay_worn_kawaii_maid_dress_long_leather", "fg": 22248, "rotates": false },
++ { "id": "overlay_worn_kawaii_maid_dress_long_armor", "fg": 22248, "rotates": false },
+ { "id": "overlay_worn_kawaii_boots_hi", "fg": 22249, "rotates": false },
+ { "id": "overlay_worn_kawaii_shoes_hi", "fg": 22250, "rotates": false },
+ {
+@@ -19940,6 +19956,9 @@
+ { "id": "overlay_worn_gloves_fsurvivor", "fg": 23133, "rotates": false },
+ { "id": "overlay_worn_gloves_medical", "fg": 23134, "rotates": false },
+ { "id": "long_glove_white", "fg": 23135 },
++ { "id": "maid_gloves_long_cotton", "fg": 23135 },
++ { "id": "maid_gloves_long_leather", "fg": 23135 },
++ { "id": "maid_gloves_long_armor", "fg": 23135 },
+ { "id": "glove_jackson", "fg": 23136 },
+ { "id": "overlay_worn_glove_jackson", "fg": 23137, "rotates": false },
+ { "id": "anbc_suit", "fg": 23138 },