提交: 23c932413c6df16a806041c379d966a32f0abfeb - fma (git)

First Machine Age's Mods (Combined repo.)

Commit MetaInfo

• 修訂: 23c932413c6df16a806041c379d966a32f0abfeb (tree)
• 時間: 2020-10-31 08:28:29
• 作者: melchior <melchior@user...>
• Commiter: melchior

Log Message

W.I.P. Mostly fixed bounds and coord settings

Change Summary

• modified: Assorted/assets/defensive/blocktypes/stone/false_wall.json
• modified: Assorted/assets/defensive/shapes/block/stone/false_wall_upper.json

差異

--- a/Assorted/assets/defensive/blocktypes/stone/false_wall.json
+++ b/Assorted/assets/defensive/blocktypes/stone/false_wall.json
@@ -32,8 +32,8 @@
 		
 		"*-east-down-closed-*": { base:"block/stone/false_wall_lower", rotateY: 90 },
 		"*-east-up-closed-*": { base: "block/stone/false_wall_upper", rotateY: 90 },
-		"*-east-down-opened-*": { base: "block/stone/false_wall_lower", rotateY: 180, offsetX: -0.80 },
-		"*-east-up-opened-*": { base: "block/stone/false_wall_upper",  rotateY: 180, offsetX: -0.80 },
+		"*-east-down-opened-*": { base: "block/stone/false_wall_lower", rotateY: 180, offsetX: -0.20 },
+		"*-east-up-opened-*": { base: "block/stone/false_wall_upper",  rotateY: 180, offsetX: -0.20 },
 		
 		"*-south-down-closed-*": { base: "block/stone/false_wall_lower", rotateY: 180 },
 		"*-south-up-closed-*": { base: "block/stone/false_wall_upper", rotateY:180 },
@@ -42,8 +42,8 @@
 		
 		"*-west-down-closed-*": { base: "block/stone/false_wall_lower", rotateY: 270 },
 		"*-west-up-closed-*": { base: "block/stone/false_wall_upper", rotateY: 270 },
-		"*-west-down-opened-*": { base: "block/stone/false_wall_lower", rotateY: 0, offsetX: -0.80 },
-		"*-west-up-opened-*": { base: "block/stone/false_wall_upper", rotateY: 0, offsetX: -0.80 },				
+		"*-west-down-opened-*": { base: "block/stone/false_wall_lower", rotateY: 0, offsetX: -0.20 },
+		"*-west-up-opened-*": { base: "block/stone/false_wall_upper", rotateY: 0, offsetX: -0.20 },				
 	},
 	blockmaterial: "Stone",
 	replaceable: 500,
@@ -80,47 +80,47 @@
 		],		
 		"*-north-up-closed-*": [		
 		{ x1: 0, y1: 0, z1: 0, x2: 1, y2: 1, z2: 0.25 },				
-		{ x1: 0.4, y1: 0.5, z1: 0, x2: 0.9, y2: 0.65, z2: 0.25 }
+		{ x1: 0.45, y1: 0.5, z1: 0.15, x2: 0.95, y2: 0.65, z2: 0.25 }
 		],		
 		"*-west-down-closed-*": [	
-		{ x1: 0, y1: 0, z1: 0.875, x2: 1, y2: 1, z2: 1 , rotateY: 90},		
+		{ x1: 0, y1: 0, z1: 0, x2: 1, y2: 1, z2: 0.25, rotateY: 270 },		
 		],		
 		"*-west-up-closed-*": [		
-		{ x1: 0, y1: 0, z1: 0.875, x2: 1, y2: 1, z2: 1 , rotateY: 90},
-		{ x1: 0.05, y1: 0.225, z1: 0.67, x2: 0.4125, y2: 0.55, z2: 0.875 , rotateY: 90}				
+		{ x1: 0, y1: 0, z1: 0, x2: 1, y2: 1, z2: 0.25 , rotateY: 270},				
+		{ x1: 0.45, y1: 0.5, z1: 0.15, x2: 0.95, y2: 0.65, z2: 0.25, rotateY: 270 }
 		],		
 		"*-east-down-closed-*": [	
-		{ x1: 0, y1: 0, z1: 0.875, x2: 1, y2: 1, z2: 1 , rotateY: 270},		
+		{ x1: 0, y1: 0, z1: 0, x2: 1, y2: 1, z2: 0.25, rotateY: 90 },		
 		],		
 		"*-east-up-closed-*": [		
-		{ x1: 0, y1: 0, z1: 0.875, x2: 1, y2: 1, z2: 1 , rotateY: 270},
-		{ x1: 0.05, y1: 0.225, z1: 0.67, x2: 0.4125, y2: 0.55, z2: 0.875, rotateY: 270}				
+		{ x1: 0, y1: 0, z1: 0, x2: 1, y2: 1, z2: 0.25, rotateY: 90 },				
+		{ x1: 0.45, y1: 0.5, z1: 0.15, x2: 0.95, y2: 0.65, z2: 0.25, rotateY: 90 }
 		],		
 		"*-south-down-closed-*": [	
-		{ x1: 0, y1: 0, z1: 0.875, x2: 1, y2: 1, z2: 1 , rotateY: 180},		
+		{ x1: 0, y1: 0, z1: 0, x2: 1, y2: 1, z2: 0.25, rotateY: 180 },		
 		],		
 		"*-south-up-closed-*": [		
-		{ x1: 0, y1: 0, z1: 0.875, x2: 1, y2: 1, z2: 1 , rotateY: 180},
-		{ x1: 0.05, y1: 0.225, z1: 0.67, x2: 0.4125, y2: 0.55, z2: 0.875 , rotateY: 180}				
+		{ x1: 0, y1: 0, z1: 0, x2: 1, y2: 1, z2: 0.25, rotateY:180 },				
+		{ x1: 0.45, y1: 0.5, z1: 0.15, x2: 0.95, y2: 0.65, z2: 0.25, rotateY:180 }
 		],		
 	},	
-	collisionbox: { x1: 0, y1: 0, z1: 0.875, x2: 1, y2: 1, z2: 1,
+	collisionbox: { x1: 0, y1: 0, z1: 0, x2: 1, y2: 1, z2: 0.25,
 		rotateYByType: {
-			"*-north-*-opened-*": -90,
+			"*-north-*-opened-*": 90,
 			"*-north-*-closed-*": 0,
-			"*-west-*-opened-*": 0,
-			"*-west-*-closed-*": 270,
+			"*-west-*-opened-*": -180,
+			"*-west-*-closed-*": -90,
 			"*-east-*-opened-*": 180,
 			"*-east-*-closed-*": 90,
-			"*-south-*-opened-*": 270,
-			"*-south-*-closed-*": 180,
+			"*-south-*-opened-*": 180,
+			"*-south-*-closed-*": -90,
 		}
 	},	
-	sounds: {
-		"place": "game:block/planks",
-		"hit": "game:block/planks",
-		"break": "game:block/planks",
-		"walk": "game:walk/wood"
+	sounds: {		
+		"walk": "game:walk/stone",
+        byTool: {
+			"Pickaxe": { hit: "game:block/rock-hit-pickaxe", break: "game:block/rock-break-pickaxe" }
+		}
 	},
 	materialDensity: 5000
 }

--- a/Assorted/assets/defensive/shapes/block/stone/false_wall_upper.json
+++ b/Assorted/assets/defensive/shapes/block/stone/false_wall_upper.json
@@ -7,8 +7,8 @@
 	"textureHeight": 16,
 	"textureSizes": {
 	},
-	"textures": { 
-		"stone": "game:block/stone/brick/granite",
+	"textures": {
+        "stone": "game:block/stone/brick/granite",
 		"wood": "game:block/wood/planks/wood"
 	},
 	"elements": [
@@ -59,12 +59,12 @@
 					"to": [ 12.0, 15.0, 3.0 ], 
 					"rotationOrigin": [ 3.0, 0.0, 0.0 ],
 					"faces": {
-						"north": { "texture": "#wood", "uv": [ 0.0, 7.5, 2.0, 21.5 ] },
-						"east": { "texture": "#wood", "uv": [ 1.0, 1.5, 2.0, 15.5 ] },
-						"south": { "texture": "#wood", "uv": [ 0.0, 7.0, 2.0, 21.0 ] },
-						"west": { "texture": "#wood", "uv": [ 1.0, 1.5, 2.0, 15.5 ] },
-						"up": { "texture": "#wood", "uv": [ 0.0, 2.5, 2.0, 3.5 ] },
-						"down": { "texture": "#wood", "uv": [ 0.0, 12.0, 2.0, 13.0 ] }
+						"north": { "texture": "#wood", "uv": [ 0.5, 1.0, 14.5, 3.0 ], "rotation": 90 },
+						"east": { "texture": "#wood", "uv": [ 1.0, 1.5, 15.0, 2.5 ], "rotation": 90 },
+						"south": { "texture": "#wood", "uv": [ 1.0, 1.5, 15.0, 3.5 ], "rotation": 90 },
+						"west": { "texture": "#wood", "uv": [ 1.0, 1.5, 15.0, 2.5 ], "rotation": 90 },
+						"up": { "texture": "#wood", "uv": [ 1.5, 2.5, 3.5, 3.5 ] },
+						"down": { "texture": "#wood", "uv": [ 2.0, 12.0, 4.0, 13.0 ] }
 					},
 					"children": [
 						{
@@ -73,12 +73,12 @@
 							"to": [ 6.35, 9.05, -0.1 ], 
 							"rotationOrigin": [ 0.0, 7.0, 0.0 ],
 							"faces": {
-								"north": { "texture": "#null", "uv": [ 0.0, 0.0, 9.0, 2.0 ] },
-								"east": { "texture": "#null", "uv": [ 0.0, 0.0, 0.5, 2.0 ] },
-								"south": { "texture": "#null", "uv": [ 0.0, 0.0, 9.0, 2.0 ] },
-								"west": { "texture": "#null", "uv": [ 0.0, 0.0, 0.5, 2.0 ] },
-								"up": { "texture": "#null", "uv": [ 0.0, 0.0, 9.0, 0.5 ] },
-								"down": { "texture": "#null", "uv": [ 0.0, 0.0, 9.0, 0.5 ] }
+								"north": { "texture": "#wood", "uv": [ 0.0, 0.0, 9.0, 2.0 ] },
+								"east": { "texture": "#wood", "uv": [ 0.0, 0.0, 0.5, 2.0 ] },
+								"south": { "texture": "#wood", "uv": [ 0.0, 0.0, 9.0, 2.0 ] },
+								"west": { "texture": "#wood", "uv": [ 0.0, 0.0, 0.5, 2.0 ] },
+								"up": { "texture": "#wood", "uv": [ 0.0, 0.0, 9.0, 0.5 ] },
+								"down": { "texture": "#wood", "uv": [ 0.0, 0.0, 9.0, 0.5 ] }
 							},
 							"children": [
 								{
@@ -86,12 +86,12 @@
 									"from": [ 1.5, 0.5, 0.75 ], 
 									"to": [ 2.35, 1.35, 3.75 ], 
 									"faces": {
-										"north": { "texture": "#null", "uv": [ 0.0, 0.0, 0.5, 0.5 ] },
-										"east": { "texture": "#null", "uv": [ 0.0, 0.0, 3.0, 0.5 ] },
-										"south": { "texture": "#null", "uv": [ 0.0, 0.0, 0.5, 0.5 ] },
-										"west": { "texture": "#null", "uv": [ 0.0, 0.0, 3.0, 0.5 ] },
-										"up": { "texture": "#null", "uv": [ 0.0, 0.0, 0.5, 3.0 ] },
-										"down": { "texture": "#null", "uv": [ 0.0, 0.0, 0.5, 3.0 ] }
+										"north": { "texture": "#wood", "uv": [ 0.0, 0.0, 0.5, 0.5 ] },
+										"east": { "texture": "#wood", "uv": [ 0.0, 0.0, 3.0, 0.5 ] },
+										"south": { "texture": "#wood", "uv": [ 0.0, 0.0, 0.5, 0.5 ] },
+										"west": { "texture": "#wood", "uv": [ 0.0, 0.0, 3.0, 0.5 ] },
+										"up": { "texture": "#wood", "uv": [ 0.0, 0.0, 0.5, 3.0 ] },
+										"down": { "texture": "#wood", "uv": [ 0.0, 0.0, 0.5, 3.0 ] }
 									}
 								},
 								{
@@ -100,12 +100,12 @@
 									"to": [ 6.35, 1.35, 3.75 ], 
 									"rotationOrigin": [ 4.0, 0.0, -1.0 ],
 									"faces": {
-										"north": { "texture": "#null", "uv": [ 0.0, 0.0, 0.5, 0.5 ] },
-										"east": { "texture": "#null", "uv": [ 0.0, 0.0, 3.0, 0.5 ] },
-										"south": { "texture": "#null", "uv": [ 0.0, 0.0, 0.5, 0.5 ] },
-										"west": { "texture": "#null", "uv": [ 0.0, 0.0, 3.0, 0.5 ] },
-										"up": { "texture": "#null", "uv": [ 0.0, 0.0, 0.5, 3.0 ] },
-										"down": { "texture": "#null", "uv": [ 0.0, 0.0, 0.5, 3.0 ] }
+										"north": { "texture": "#wood", "uv": [ 0.0, 0.0, 0.5, 0.5 ] },
+										"east": { "texture": "#wood", "uv": [ 0.0, 0.0, 3.0, 0.5 ] },
+										"south": { "texture": "#wood", "uv": [ 0.0, 0.0, 0.5, 0.5 ] },
+										"west": { "texture": "#wood", "uv": [ 0.0, 0.0, 3.0, 0.5 ] },
+										"up": { "texture": "#wood", "uv": [ 0.0, 0.0, 0.5, 3.0 ] },
+										"down": { "texture": "#wood", "uv": [ 0.0, 0.0, 0.5, 3.0 ] }
 									}
 								}
 							]