From 621404ba333cc39774da081e018050618855d3ae Mon Sep 17 00:00:00 2001 From: melchior Date: Sun, 10 Oct 2021 16:12:36 -0400 Subject: [PATCH] add barricade block WIP: new kind of barricade (1/3) --- Assorted/Assorted.csproj | 28 +++++++++++++++++ .../blocktypes/wood/log_barricade.json | 30 ++++++++++++++++--- Assorted/assets/defensive/lang/en.json | 4 ++- .../shapes/block/stone/climbing_slab.json | 22 +++++++------- .../shapes/block/wood/log_barricade.json | 11 +++---- Assorted/modinfo.json | 6 ++-- 6 files changed, 75 insertions(+), 26 deletions(-) diff --git a/Assorted/Assorted.csproj b/Assorted/Assorted.csproj index 19c45b6..d7f3761 100644 --- a/Assorted/Assorted.csproj +++ b/Assorted/Assorted.csproj @@ -100,6 +100,7 @@ + @@ -218,6 +219,33 @@ Always + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + \ No newline at end of file diff --git a/Assorted/assets/defensive/blocktypes/wood/log_barricade.json b/Assorted/assets/defensive/blocktypes/wood/log_barricade.json index 8899cda..4668964 100644 --- a/Assorted/assets/defensive/blocktypes/wood/log_barricade.json +++ b/Assorted/assets/defensive/blocktypes/wood/log_barricade.json @@ -7,9 +7,31 @@ ], creativeinventory: { "general": ["log_barricade-ns"], "construction": ["log_barricade-ns"] }, shapeByType: { - "*-ns": { base: "block/wood/log_barricade" }, - "*-we": { base: "block/wood/log_barricade", rotateY: 90}, + "*-ns": { base: "block/wood/log_barricade", + alternates: + [ + { base: "block/wood/log_barricade2" }, + ] + }, + "*-we": { base: "block/wood/log_barricade", rotateY: 90, + alternates: + [ + { base: "block/wood/log_barricade2" , rotateY: 90 }, + ] + }, }, + collisionbox: { x1: 0, y1: 0, z1: 0.3, x2: 1, y2: 1.1, z2: 0.71, + rotateYByType: { + "*-ns": 0, + "*-we": 90, + }, + }, + selectionbox: { x1: 0, y1: 0, z1: 0.3, x2: 1, y2: 1.1, z2: 0.71, + rotateYByType: { + "*-ns": 0, + "*-we": 90, + }, + }, sidesolid: { all: false, down: true, up: true }, @@ -45,8 +67,8 @@ lightAbsorption: 5, combustibleProps: { - burnTemperature: 800, - burnDuration: 80, + burnTemperature: 700, + burnDuration: 72, }, maxStackSize: 16, materialDensity: 700, diff --git a/Assorted/assets/defensive/lang/en.json b/Assorted/assets/defensive/lang/en.json index 4ffbda1..8635d5e 100644 --- a/Assorted/assets/defensive/lang/en.json +++ b/Assorted/assets/defensive/lang/en.json @@ -10,16 +10,18 @@ "defensive:block-false_wall-*": "False wall", "defensive:block-enclosed_candle-*":"Enclosed candle holder", "defensive:block-false_floor-*":"False Floor", + "defensive:block-log_barricade-*":"Log Barricade", "defensive:blockdesc-grille_vertical-*": "A vertical grille of latticed wrought iron bars.", "defensive:blockdesc-boltable_door-*":"Integrated bolt lock.", "defensive:blockdesc-grille_horizontal-*": "A horizontal grille of latticed wrought iron bars.", "defensive:blockdesc-grille_vertical-*": "Vertical cross-bars of sturdy iron.", + "defensive:blockdesc-log_barricade-*":"A rough barrier fit for the Frontier.", "game:tabname-defensive":"Defensive Stuff", "defensive:placefailure-requirehorizontalside": "Cannot place block here! It needs one solid sided block adjacent.", - "defensive:ingameerror-requirehorizontalside": "2Cannot place block here! It needs one solid sided block adjacent.", + "defensive:ingameerror-requirehorizontalside": "Cannot place that here! Needs an adjacent solid sided block.", "defensive:ingameerror-boltedclosed":"Bolted Shut.", "defensive:bolted_shut": "Bolted Shut!", "defensive:bolted_open": "Its Open.", diff --git a/Assorted/assets/defensive/shapes/block/stone/climbing_slab.json b/Assorted/assets/defensive/shapes/block/stone/climbing_slab.json index 04279b3..9eda624 100644 --- a/Assorted/assets/defensive/shapes/block/stone/climbing_slab.json +++ b/Assorted/assets/defensive/shapes/block/stone/climbing_slab.json @@ -15,20 +15,20 @@ { "name": "Slab", "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 16.0, 8.0 ], + "to": [ 16.0, 16.0, 12.0 ], "faces": { "north": { "texture": "#brick", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "east": { "texture": "#brick", "uv": [ 0.0, 0.0, 8.0, 16.0 ] }, + "east": { "texture": "#brick", "uv": [ 0.0, 0.0, 12.0, 16.0 ] }, "south": { "texture": "#brick", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "west": { "texture": "#brick", "uv": [ 0.0, 0.0, 8.0, 16.0 ] }, - "up": { "texture": "#brick", "uv": [ 0.0, 0.0, 16.0, 8.0 ] }, - "down": { "texture": "#brick", "uv": [ 0.0, 0.0, 16.0, 8.0 ] } + "west": { "texture": "#brick", "uv": [ 0.0, 0.0, 12.0, 16.0 ] }, + "up": { "texture": "#brick", "uv": [ 0.0, 0.0, 16.0, 12.0 ] }, + "down": { "texture": "#brick", "uv": [ 0.0, 0.0, 16.0, 12.0 ] } }, "children": [ { "name": "Foothold1", - "from": [ 2.0, 1.0, 8.0 ], - "to": [ 8.0, 3.0, 12.0 ], + "from": [ 1.2, 1.5, 12.0 ], + "to": [ 7.2, 3.5, 16.0 ], "rotationOrigin": [ 2.0, 1.0, 8.0 ], "faces": { "north": { "texture": "#smoothstone", "uv": [ 5.0, 6.5, 7.0, 12.5 ], "rotation": 90 }, @@ -41,8 +41,8 @@ }, { "name": "Foothold2", - "from": [ 7.0, 6.0, 8.0 ], - "to": [ 13.0, 8.0, 12.0 ], + "from": [ 8.5, 5.5, 12.0 ], + "to": [ 14.5, 7.5, 16.0 ], "rotationOrigin": [ 7.0, 5.0, 8.0 ], "faces": { "north": { "texture": "#smoothstone", "uv": [ 1.5, 7.5, 7.5, 9.5 ] }, @@ -55,8 +55,8 @@ }, { "name": "Foothold3", - "from": [ 2.0, 11.0, 8.0 ], - "to": [ 8.0, 13.0, 12.0 ], + "from": [ 1.5, 11.0, 12.0 ], + "to": [ 7.5, 13.0, 16.0 ], "rotationOrigin": [ 2.0, 9.0, 8.0 ], "faces": { "north": { "texture": "#smoothstone", "uv": [ 5.0, 10.5, 11.0, 12.5 ] }, diff --git a/Assorted/assets/defensive/shapes/block/wood/log_barricade.json b/Assorted/assets/defensive/shapes/block/wood/log_barricade.json index 4502ec7..60dd389 100644 --- a/Assorted/assets/defensive/shapes/block/wood/log_barricade.json +++ b/Assorted/assets/defensive/shapes/block/wood/log_barricade.json @@ -8,9 +8,6 @@ "textureSizes": { }, "textures": { - "side": "game:block/wood/firewood/side", - "vines": "game:block/vines/basket/normal-westeast", - "toplog": "game:block/wood/firewood/front" }, "elements": [ { @@ -60,8 +57,8 @@ }, { "name": "FrontLog2", - "from": [ -2.0, 0.0, 9.5 ], - "to": [ 2.0, 16.0, 13.5 ], + "from": [ -2.0, 2.0, 9.5 ], + "to": [ 2.0, 18.0, 13.5 ], "rotationOrigin": [ 0.0, 0.0, 0.0 ], "rotationY": 45.0, "faces": { @@ -90,8 +87,8 @@ }, { "name": "Binding4", - "from": [ -0.25, 3.5, -0.25 ], - "to": [ 4.25, 4.5, 4.25 ], + "from": [ -0.25, 1.5, -0.25 ], + "to": [ 4.25, 2.5, 4.25 ], "rotationOrigin": [ 1.5, 0.0, 1.5 ], "rotationY": -5.122641596244655E-6, "faces": { diff --git a/Assorted/modinfo.json b/Assorted/modinfo.json index 55a4011..d28ee7e 100644 --- a/Assorted/modinfo.json +++ b/Assorted/modinfo.json @@ -1,12 +1,12 @@ { "type": "code", "name": "Defensive Structures", - "description" : "Defensive structures and emplacements, ideal for stone castles...", + "description" : "Defensive structures & emplacements, ideal for outposts, castles, forts...", "authors": ["Melchior"], - "version": "0.1.5", + "version": "0.1.6", "ModID":"defensive", "dependencies": { - "game": "1.15.3", + "game": "1.15.6", "survival": "" }, "website": "http://noname.nope"