提交: 8628bffda799ce0a7cd7752bf7f9e5050f88cc51 - fma (git)

First Machine Age's Mods (Combined repo.)

Commit MetaInfo

• 修订版: 8628bffda799ce0a7cd7752bf7f9e5050f88cc51 (tree)
• 时间: 2022-02-04 09:46:01
• 作者: melchior <melchior@user...>
• Commiter: melchior

Log Message

Working Brazier

Mostly functional, tweaks still needed

更改概述

• modified: Assorted/Assorted.csproj
• modified: Assorted/AssortedModLoader.cs
• modified: Assorted/assets/defensive/blocktypes/metal/brazier.json
• modified: Assorted/assets/defensive/blocktypes/metal/crusie_lamp.json
• modified: Assorted/assets/defensive/lang/en.json
• modified: Assorted/assets/defensive/shapes/block/metal/brazier2.json
• modified: Assorted/modinfo.json

差异

--- a/Assorted/Assorted.csproj
+++ b/Assorted/Assorted.csproj
@@ -90,6 +90,7 @@
     <Compile Include="BlockClasses\CollapsingBlock.cs" />
     <Compile Include="BlockClasses\FalseWall.cs" />
     <Compile Include="BlockBehaviors\BlockBehaviorNeedSides.cs" />
+    <Compile Include="BlockClasses\RectangularBrazier.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="BlockClasses\" />

--- a/Assorted/AssortedModLoader.cs
+++ b/Assorted/AssortedModLoader.cs
@@ -61,18 +61,20 @@ namespace FirstMachineAge
 
 		private void RegisterBlockClasses( )
 		{
-		CoreAPI.RegisterBlockClass("BoltableDoor", typeof(BoltableDoor));
-		CoreAPI.RegisterBlockClass("FalseWall", typeof(FalseWall));
-		CoreAPI.RegisterBlockEntityClass(BoltableDoorEntityNameKey, typeof(BoltableDoorBlockEntity));
+		CoreAPI.RegisterBlockClass(@"BoltableDoor", typeof(BoltableDoor));
+		CoreAPI.RegisterBlockClass(@"FalseWall", typeof(FalseWall));		
+		CoreAPI.RegisterBlockClass(@"CollapsingBlock", typeof(CollapsingBlock));
+		CoreAPI.RegisterBlockClass(@"RectangularBrazier", typeof(RectangularBrazier));
+
 
-		CoreAPI.RegisterBlockClass("CollapsingBlock", typeof(CollapsingBlock));
+		CoreAPI.RegisterBlockEntityClass(BoltableDoorEntityNameKey, typeof(BoltableDoorBlockEntity));
 		}
 
 		private void RegisterBehaviorClasses( )
 		{
-		CoreAPI.RegisterBlockBehaviorClass("FreeReinforcement", typeof(BlockBehaviorFreeReinforcement));
-		CoreAPI.RegisterBlockBehaviorClass("VerticalOrentiation",typeof(BlockBehaviorVerticalOrientation));
-		CoreAPI.RegisterBlockBehaviorClass("NeedSides", typeof(BlockBehaviorNeedSides));
+		CoreAPI.RegisterBlockBehaviorClass(@"FreeReinforcement", typeof(BlockBehaviorFreeReinforcement));
+		CoreAPI.RegisterBlockBehaviorClass(@"VerticalOrentiation",typeof(BlockBehaviorVerticalOrientation));
+		CoreAPI.RegisterBlockBehaviorClass(@"NeedSides", typeof(BlockBehaviorNeedSides));
 		}
 	}
 

--- a/Assorted/assets/defensive/blocktypes/metal/brazier.json
+++ b/Assorted/assets/defensive/blocktypes/metal/brazier.json
@@ -1,29 +1,31 @@
 {
-	code: "brazier",		
+	code: "brazier",	
+	class: "RectangularBrazier",
 	maxstacksize: 1,
 	variantgroups: [
-		{ code: "state", states: ["unfueld","unlit","ignighted","extinguished"] }
+		{ code: "state", states: ["empty","fueled","lit","extinct"] }
 	],	
     behaviorsByType: {
-	"*-ignighted": [{ name: "HeatSource", properties: { heatStrength: 8 } }],	
-    "*": [{name: "Unstable"}],
+	"*-lit": [{ name: "HeatSource", properties: { heatStrength: 8 } }],	
+	"*-fueled": [{ name: "Ignitable" }],
+    "*": [{name: "UnstableFalling"}],
 	},
     renderpass: "OpaqueNoCull",
 	shapeByType: {
-        "*-unfueld": { 
+        "*-empty": { 
 			base: "block/metal/brazier2", SelectiveElements:["Base/Leg*","Base/Grille1"],
 			
 		},
-		"*-unlit": { 
+		"*-fueled": { 
 			base: "block/metal/brazier2", SelectiveElements:["Base/Leg*","Base/Grille1","Base/Fuel/Coal*",],
 			
 		},
-		"*-ignighted": { 
-			base: "block/metal/brazier2", SelectiveElements:["Base/Leg*","Base/Grille1","Base/Fuel/Embers"],
+		"*-lit": { 
+			base: "block/metal/brazier2", SelectiveElements:["Base/Leg*","Base/Grille1","Base/Embers"],
 			
 		},
-		"*-extinguished": { 
-			base: "block/metal/brazier2", SelectiveElements:["Base/Leg*","Base/Grille1","Base/Fuel/Ash/Lump*"],
+		"*-extinct": { 
+			base: "block/metal/brazier2", SelectiveElements:["Base/Leg*","Base/Grille1","Base/Ash/Lump*"],
 			
 		},		
 	},
@@ -34,7 +36,14 @@
 		"coal": { base:  "game:block/coal/charcoal"},
 		"rusty-iron": { base: "game:block/currency/rusty-iron"},		
     },
-	creativeinventory: { "general": ["*"], "decorative": ["*"] , "defensive": ["*"] },
+	attributes: {
+        transientProps: {
+			convertFrom: "brazier-lit", 
+			convertTo: "brazier-extinct", 
+			inGameHours: "100",
+		}		
+    },
+	creativeinventory: { "decorative": ["brazier-empty"] , "defensive": ["brazier-empty"] },
 	blockmaterial: "Metal",
 	replaceable: 200,
 	lightAbsorption: 0,
@@ -42,23 +51,24 @@
 	sideopaque: { all: false },
 	sidesolid: { all: false },
 	lightHsvByType: {		
-		"*-ignighted": [8, 5, 10],			
+		"*-lit": [8, 12, 5],			
 	},
 	particlePropertiesByType: {
-		"*-ignighted": [
-			{
-			"__comment": "Fire quads",
-			hsvaColor: [{ avg: 20, var: 20 }, { avg: 255, var: 50 }, { avg: 255, var: 50 },  { avg: 255, var: 0 }],
-			opacityEvolve: { transform: "quadratic", factor: -16 },
-			gravityEffect: { avg: 0, var: 0 },
+		"*-lit": [
+			{			
+			hsvaColor: [{ avg: 50, var: 10 }, { avg: 255, var: 0 }, { avg: 200, var: 10 },  { avg: 250, var: 0 }],
+            posOffset: [{ avg: 0.55, var: 0.06 },{ avg: 0.65, var: -0.9 },{ avg: 0.0, var: -0.35 }],
+        	velocity: [{ avg: 0.1, var: 0.5 },{ avg: 0.1, var: -0.1 },{ avg: -0.2, var: -0.1 }],
+			opacityEvolve: { transform: "linear", factor: -90 },
+			gravityEffect: { avg: -0.02, var: 0.0 },
 			velocity: [ { avg: 0, var: 0.0125 }, { avg: 0.03, var: 0.01 }, { avg: 0, var: 0.0125 }],
-			quantity: { avg: 0.1 },
+			quantity: { avg: 0.3 },
 			size: { avg: 0.05, var: 0.025 },
-			lifeLength: { avg: 0.5 },
-			sizeEvolve: { transform: "linear", factor: 0.1 },
+			lifeLength: { avg: 0.15, var: 0.35 },
+			sizeEvolve: { transform: "linear", factor: -0.15 },
 			particleModel: "Quad",
 			vertexFlags: 128,
-			windAffectednes: 0.05
+			windAffectednes: 0.3
 			}	
         ]	
 	},
@@ -66,10 +76,10 @@
 		"place": "game:block/anvil",
 		"break": "game:block/anvil",
 		"hit": "game:block/anvil",
-		ambientByType: { "*-ignighted": "game:effect/embers" }
+		ambientByType: { "*-lit": "game:effect/embers" }
 	},
 	drops: [
-		 { type: "block", code: "brazier-unlit", quantity: { avg: 1 } }
+		 { type: "block", code: "brazier-empty", quantity: { avg: 1 } }
 	],
 	materialDensity: 9000,	
 	collisionSelectionBox: { x1: 0, y1: 0, z1: 0.25, x2: 1, y2: 0.75, z2: 0.75 },

--- a/Assorted/assets/defensive/blocktypes/metal/crusie_lamp.json
+++ b/Assorted/assets/defensive/blocktypes/metal/crusie_lamp.json
@@ -49,7 +49,7 @@
             { avg: 0.0, var: 0.0 },{ avg: 0, var: 0 },{ avg: 0.0, var: 0.0 }
         ],
         hsvaColor: [
-           { avg: 140, var: 15 }, { avg: 250, var: 5 }, { avg: 200, var: 5 },  { avg: 150, var: 0 }
+           { avg: 140, var: 15 }, { avg: 200, var: 5 }, { avg: 200, var: 5 },  { avg: 10, var: 5 }
         ],
         quantity: { avg: 3, var: 1 },
         lifeLength: { avg: 0.12, var: 0.03 },
@@ -57,7 +57,7 @@
         size: { avg: 0.06, var: 0.01 },
         particleModel: "Quad",
         sizeEvolve: { transform: "linear", factor: 0.12 },
-        opacityEvolve: { transform: "quadratic", factor: -25 },
+        opacityEvolve: { transform: "quadratic", factor: -5 },
 		redEvolve: { transform: "quadratic", factor: -1, maxvalue: 30 },
         dieInLiquid: true,        
 		windAffectednes: 0.06,
@@ -71,7 +71,7 @@
             { avg: 0.0, var: 0.0 },{ avg: 0, var: 0 },{ avg: 0.0, var: 0.0 }
         ],
         hsvaColor: [
-           { avg: 140, var: 15 }, { avg: 250, var: 5 }, { avg: 200, var: 5 },  { avg: 150, var: 0 }
+           { avg: 140, var: 15 }, { avg: 200, var: 5 }, { avg: 200, var: 5 },  { avg: 10, var: 5 }
         ],
         quantity: { avg: 3, var: 1 },
         lifeLength: { avg: 0.12, var: 0.03 },
@@ -79,7 +79,7 @@
         size: { avg: 0.06, var: 0.01 },
         particleModel: "Quad",
         sizeEvolve: { transform: "linear", factor: 0.12 },
-        opacityEvolve: { transform: "quadratic", factor: -25 },
+        opacityEvolve: { transform: "quadratic", factor: -5 },
 		redEvolve: { transform: "quadratic", factor: -1, maxvalue: 30 },
         dieInLiquid: true,        
 		windAffectednes: 0.06,
@@ -93,7 +93,7 @@
             { avg: 0.0, var: 0.0 },{ avg: 0, var: 0 },{ avg: 0.0, var: 0.0 }
         ],
         hsvaColor: [
-           { avg: 140, var: 15 }, { avg: 250, var: 5 }, { avg: 200, var: 5 },  { avg: 150, var: 0 }
+           { avg: 140, var: 15 }, { avg: 200, var: 5 }, { avg: 200, var: 5 },  { avg: 10, var: 5 }
         ],
         quantity: { avg: 3, var: 1 },
         lifeLength: { avg: 0.12, var: 0.03 },
@@ -101,7 +101,7 @@
         size: { avg: 0.06, var: 0.01 },
         particleModel: "Quad",
         sizeEvolve: { transform: "linear", factor: 0.12 },
-        opacityEvolve: { transform: "quadratic", factor: -25 },
+        opacityEvolve: { transform: "quadratic", factor: -5 },
 		redEvolve: { transform: "quadratic", factor: -1, maxvalue: 30 },
         dieInLiquid: true,        
 		windAffectednes: 0.06,
@@ -115,7 +115,7 @@
             { avg: 0.0, var: 0.0 },{ avg: 0, var: 0 },{ avg: 0.0, var: 0.0 }
         ],
         hsvaColor: [
-           { avg: 140, var: 15 }, { avg: 250, var: 5 }, { avg: 200, var: 5 },  { avg: 150, var: 0 }
+           { avg: 140, var: 15 }, { avg: 200, var: 5 }, { avg: 200, var: 5 },  { avg: 10, var: 5 }
         ],
         quantity: { avg: 3, var: 1 },
         lifeLength: { avg: 0.12, var: 0.03 },
@@ -123,7 +123,7 @@
         size: { avg: 0.06, var: 0.01 },
         particleModel: "Quad",
         sizeEvolve: { transform: "linear", factor: 0.12 },
-        opacityEvolve: { transform: "quadratic", factor: -25 },
+        opacityEvolve: { transform: "quadratic", factor: -5 },
 		redEvolve: { transform: "quadratic", factor: -1, maxvalue: 30 },
         dieInLiquid: true,        
 		windAffectednes: 0.06,

--- a/Assorted/assets/defensive/lang/en.json
+++ b/Assorted/assets/defensive/lang/en.json
@@ -15,6 +15,7 @@
     "defensive:block-log_cornercade-*":"Log Corner Barricade",
     "defensive:block-crusie_lamp-oil":"Crusie Lamp (oil)",
     "defensive:block-crusie_lamp-alcohol":"Crusie Lamp (spirit)",
+    "defensive:block-brazier-*":"Rectangular Brazier",
 
     "defensive:item-crusie_shell":"Incomplete Crusie Lamp (shell)",
 
@@ -23,13 +24,17 @@
 	"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.",
-    "defensive:blockdesc-crusie_lamp-*":"Burn the midnight fuel 4x FASTER.",
+    "defensive:blockdesc-crusie_lamp-*":"Burn that midnight fuel faster.",
+	"defensive:blockdesc-brazier-empty":"Needs fuel...",
+	"defensive:blockdesc-brazier-extinct":"Needs fuel again...",
+	"defensive:blockdesc-brazier-lit":"What a lovely warm glow.",
 
     "game:tabname-defensive":"Defensive Stuff",
 
 	"defensive:placefailure-requirehorizontalside": "Cannot 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:ingameerror-lackfuel":"Insufficient for fueling this, needs more fuel...",
     "defensive:bolted_shut": "<font color='red'>Bolted Shut!</font>",
     "defensive:bolted_open": "Its Open.",
 }
\ No newline at end of file

--- a/Assorted/assets/defensive/shapes/block/metal/brazier2.json
+++ b/Assorted/assets/defensive/shapes/block/metal/brazier2.json
@@ -174,11 +174,11 @@
 					"rotationOrigin": [ 8.0, -1.75, 0.75 ],
 					"rotationX": -45.0,
 					"faces": {
-						"north": { "texture": "#ember", "uv": [ 1.0, 10.5, 14.0, 13.0 ], "glow": 128 },
-						"east": { "texture": "#ember", "uv": [ 6.0, 4.5, 13.0, 7.0 ], "glow": 128 },
-						"south": { "texture": "#ember", "uv": [ 1.0, 5.5, 14.0, 8.0 ], "glow": 128 },
-						"west": { "texture": "#ember", "uv": [ 5.5, 4.5, 12.5, 7.0 ], "glow": 128 },
-						"up": { "texture": "#ember", "uv": [ 1.0, 4.5, 14.0, 11.5 ], "glow": 128 },
+						"north": { "texture": "#ember", "uv": [ 1.0, 10.5, 14.0, 13.0 ], "glow": 255 },
+						"east": { "texture": "#ember", "uv": [ 6.0, 4.5, 13.0, 7.0 ], "glow": 255 },
+						"south": { "texture": "#ember", "uv": [ 1.0, 5.5, 14.0, 8.0 ], "glow": 255 },
+						"west": { "texture": "#ember", "uv": [ 5.5, 4.5, 12.5, 7.0 ], "glow": 255 },
+						"up": { "texture": "#ember", "uv": [ 1.0, 4.5, 14.0, 11.5 ], "glow": 255 },
 						"down": { "texture": "#ember", "uv": [ 0.5, 4.0, 13.5, 11.0 ], "enabled": false }
 					}
 				},

--- a/Assorted/modinfo.json
+++ b/Assorted/modinfo.json
@@ -1,7 +1,7 @@
 {
   "type": "code",
   "name": "Defensive Structures",
-  "description" : "Defensive structures & emplacements, ideal for outposts, castles, forts...",
+  "description" : "Defensive structures & barriers; ideal for outposts, castles, forts...",
   "authors": ["Melchior"],
   "version": "0.1.6",
 	"ModID":"defensive",