コミット: 66937a22478d726533179f3517396a0d9893098d - fma (git)

First Machine Age's Mods (Combined repo.)

コミットメタ情報

• リビジョン: 66937a22478d726533179f3517396a0d9893098d (tree)
• 日時: 2022-02-05 09:28:43
• 作者: melchior <melchior@user...>
• コミッター: melchior

ログメッセージ

Mostly functional brazier

Should also decay (untested)

変更サマリ

• modified: Assorted/BlockClasses/RectangularBrazier.cs
• modified: Assorted/assets/defensive/blocktypes/metal/brazier.json
• modified: Assorted/assets/defensive/lang/en.json

差分

--- a/Assorted/BlockClasses/RectangularBrazier.cs
+++ b/Assorted/BlockClasses/RectangularBrazier.cs
@@ -16,17 +16,24 @@ namespace FirstMachineAge
 	{
 		private const string stateKey = @"state";
 		private const string fuledValue = @"fueled";
+		private const string extinguishedValue = @"extinguished";
 		private const string litValue = @"lit";
 		private const float ignitionTime = 2f;
 		private const int fuelReqt = 5;
 		private const float fireDmg = 0.5f;
-		private WorldInteraction[ ] interactMustFuel, interactMustIgnight;
+		private const int fuel_Temp = 999;
+		private const int fuel_Duration = 30;
 
+		private WorldInteraction[ ] interactMustFuel, interactMustIgnight;
+		private string flameoutPercentKey = @"flameoutPercent";
+		private WeatherSystemBase weatherSys;
 
 		public override void OnLoaded(ICoreAPI api)
 		{
 		base.OnLoaded(api);
 
+		weatherSys = api.ModLoader.GetModSystem<WeatherSystemBase>( );
+
 		if (api.Side.IsClient( )) 
 			{
 			var clientAPI = api as ICoreClientAPI;
@@ -35,7 +42,7 @@ namespace FirstMachineAge
 			List<ItemStack> ignitionSources = new List<ItemStack>();
 
 			foreach (CollectibleObject obj in api.World.Collectibles) {
-			if (obj.CombustibleProps?.BurnTemperature >= 999 && obj.CombustibleProps?.BurnDuration >= 30) 
+			if (obj.CombustibleProps?.BurnTemperature >= fuel_Temp && obj.CombustibleProps?.BurnDuration >= fuel_Duration) 
 			{
 				List<ItemStack> stacks = obj.GetHandBookStacks(clientAPI);
 				if (stacks != null) solidFuels.AddRange(stacks);
@@ -81,6 +88,13 @@ namespace FirstMachineAge
 			}
 		}
 
+		public float FlameoutPercent {
+			get
+			{
+			return this.Attributes[flameoutPercentKey].AsFloat(0.01f);
+			}
+		}
+
 		public override EnumIgniteState OnTryIgniteBlock(EntityAgent byEntity, BlockPos pos, float secondsIgniting)
 		{
 			if (Fueled) 
@@ -113,7 +127,7 @@ namespace FirstMachineAge
 			if ((!Fueled && !Lit) 
 			    && hbItemStack != null 
 			    && hbItemStack.Class == EnumItemClass.Item 
-			    && hbItemStack.Item?.CombustibleProps.BurnTemperature >= 999 && hbItemStack.Item?.CombustibleProps.BurnDuration >= 30) 
+			    && hbItemStack.Item?.CombustibleProps.BurnTemperature >= fuel_Temp && hbItemStack.Item?.CombustibleProps.BurnDuration >= fuel_Duration) 
 			{		
 			if (byPlayer != null && byPlayer.WorldData.CurrentGameMode == EnumGameMode.Survival) {
 				if (byPlayer.InventoryManager.ActiveHotbarSlot.StackSize >= fuelReqt) {
@@ -151,8 +165,8 @@ namespace FirstMachineAge
 			{
 				if (entity is EntityAgent && entity.Alive) 
 				{					
-				entity.ReceiveDamage(new DamageSource( ) { Source = EnumDamageSource.Block, SourceBlock = this, Type = EnumDamageType.Fire, SourcePos = pos.ToVec3d( ) }, fireDmg);
-
+				entity.ReceiveDamage(new DamageSource( ) { Source = EnumDamageSource.Block, SourceBlock = this, Type = EnumDamageType.Fire, SourcePos = pos.ToVec3d( ), DamageTier = 5, KnockbackStrength = 0.25f }, fireDmg);
+				if (Sounds?.Inside != null)	world.PlaySoundAt(Sounds.Inside, entity.Pos.X, entity.Pos.Y, entity.Pos.Z);
 				}
 			}
 		}
@@ -171,6 +185,38 @@ namespace FirstMachineAge
 		return null;//Must be burning
 		}
 
+
+		public override bool ShouldReceiveServerGameTicks(IWorldAccessor world, BlockPos pos, Random offThreadRandom, out object extra)
+		{
+		extra = null;
+
+		if (Lit) { 			
+			var rainLevel = world.BlockAccessor.GetRainMapHeightAt(pos);
+			if (pos.Y >= rainLevel) { //Brr, its Wet out here!
+			var rainPos = new BlockPos(pos.X, rainLevel, pos.Z);
+			var precip = weatherSys.GetPrecipitation(pos.ToVec3d());
+
+			if (precip >= 0.4) { return true; }
+			if (offThreadRandom.NextDouble( ) <= (FlameoutPercent * 10) ) { return true; }			
+			}
+			else if (offThreadRandom.NextDouble( ) <= FlameoutPercent){ return true; }
+			}
+
+		return false;
+		}
+
+		public override void OnServerGameTick(IWorldAccessor world, BlockPos pos, object extra = null)
+		{
+			if (Lit) {			
+				#if DEBUG
+				api.Logger.VerboseDebug("Got server-game tick for flameout! @ {0}", pos);
+				#endif
+
+				Block extinctBlock = world.GetBlock(CodeWithVariant(stateKey, extinguishedValue));
+				world.BlockAccessor.ExchangeBlock(extinctBlock.BlockId, pos);
+				world.BlockAccessor.MarkBlockDirty(pos);
+				}			
+		}
 	}
 }
 

--- a/Assorted/assets/defensive/blocktypes/metal/brazier.json
+++ b/Assorted/assets/defensive/blocktypes/metal/brazier.json
@@ -3,7 +3,7 @@
 	class: "RectangularBrazier",
 	maxstacksize: 1,
 	variantgroups: [
-		{ code: "state", states: ["empty","fueled","lit","extinct"] }
+		{ code: "state", states: ["empty","fueled","lit","extinguished"] }
 	],	
     behaviorsByType: {
 	"*-lit": [{ name: "HeatSource", properties: { heatStrength: 8 } }],	
@@ -24,7 +24,7 @@
 			base: "block/metal/brazier2", SelectiveElements:["Base/Leg*","Base/Grille1","Base/Embers"],
 			
 		},
-		"*-extinct": { 
+		"*-extinguished": { 
 			base: "block/metal/brazier2", SelectiveElements:["Base/Leg*","Base/Grille1","Base/Ash/Lump*"],
 			
 		},		
@@ -36,12 +36,8 @@
 		"coal": { base:  "game:block/coal/charcoal"},
 		"rusty-iron": { base: "game:block/currency/rusty-iron"},		
     },
-	attributes: {
-        transientProps: {
-			convertFrom: "brazier-lit", 
-			convertTo: "brazier-extinct", 
-			inGameHours: "100",
-		}		
+	attributes: {       		
+		flameoutPercent: 0.001,				
     },
 	creativeinventory: { "decorative": ["brazier-empty"] , "defensive": ["brazier-empty"] },
 	blockmaterial: "Metal",
@@ -56,8 +52,8 @@
 	particlePropertiesByType: {
 		"*-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 }],
+			hsvaColor: [{ avg: 34, var: 10 }, { avg: 255, var: 0 }, { avg: 240, var: 10 },  { avg: 200, var: 50 }],
+            posOffset: [{ avg: 0.1, var: 0.5 },{ avg: -0.2, var: 0.0 },{ avg: 0.1, var: 0.25 }],
         	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 },
@@ -76,7 +72,8 @@
 		"place": "game:block/anvil",
 		"break": "game:block/anvil",
 		"hit": "game:block/anvil",
-		ambientByType: { "*-lit": "game:effect/embers" }
+		ambientByType: { "*-lit": "game:effect/embers" },
+        insideByType: { "*-lit": "game:effect/extinguish1" },
 	},
 	drops: [
 		 { type: "block", code: "brazier-empty", quantity: { avg: 1 } }

--- a/Assorted/assets/defensive/lang/en.json
+++ b/Assorted/assets/defensive/lang/en.json
@@ -26,7 +26,7 @@
     "defensive:blockdesc-log_barricade-*":"A rough barrier fit for the Frontier.",
     "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-extinguished":"Needs fuel again...",
 	"defensive:blockdesc-brazier-lit":"What a lovely warm glow.",
 
     "game:tabname-defensive":"Defensive Stuff",