• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#objective-cqt誰得cocoawindowspythonphprubygameguibathyscaphec翻訳omegat計画中(planning stage)frameworktwittertestdombtronvb.netdirectxarduinopreviewerゲームエンジン

First Machine Age's Mods (Combined repo.)


Commit MetaInfo

Revision058a1c0a15889d6e8ec031980270a5823c64a357 (tree)
Time2022-02-09 09:13:33
Authormelchior <melchior@user...>
Commitermelchior

Log Message

Brazier complete

Change Summary

Incremental Difference

--- a/Assorted/Assorted.csproj
+++ b/Assorted/Assorted.csproj
@@ -168,7 +168,6 @@
168168 <CopyToOutputDirectory>Always</CopyToOutputDirectory>
169169 </None>
170170 <None Include="assets\defensive\shapes\block\metal\brazier2.json">
171- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
172171 </None>
173172 <None Include="assets\defensive\blocktypes\metal\brazier.json">
174173 <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -274,6 +273,12 @@
274273 <None Include="assets\defensive\recipes\grid\crusie_lamp.json">
275274 <CopyToOutputDirectory>Always</CopyToOutputDirectory>
276275 </None>
276+ <None Include="assets\defensive\shapes\block\metal\brazier3.json">
277+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
278+ </None>
279+ <None Include="modicon.png">
280+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
281+ </None>
277282 </ItemGroup>
278283 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
279284 </Project>
\ No newline at end of file
--- a/Assorted/BlockClasses/RectangularBrazier.cs
+++ b/Assorted/BlockClasses/RectangularBrazier.cs
@@ -190,13 +190,13 @@ namespace FirstMachineAge
190190 {
191191 extra = null;
192192
193- if (Lit) {
193+ if (Lit && DateTime.Now.Second == 0) {
194194 var rainLevel = world.BlockAccessor.GetRainMapHeightAt(pos);
195195 if (pos.Y >= rainLevel) { //Brr, its Wet out here!
196196 var rainPos = new BlockPos(pos.X, rainLevel, pos.Z);
197197 var precip = weatherSys.GetPrecipitation(pos.ToVec3d());
198198
199- if (precip >= 0.4) { return true; }
199+ if (precip >= 0.3) { return true; }
200200 if (offThreadRandom.NextDouble( ) <= (FlameoutPercent * 10) ) { return true; }
201201 }
202202 else if (offThreadRandom.NextDouble( ) <= FlameoutPercent){ return true; }
--- a/Assorted/assets/defensive/blocktypes/metal/brazier.json
+++ b/Assorted/assets/defensive/blocktypes/metal/brazier.json
@@ -13,19 +13,19 @@
1313 renderpass: "OpaqueNoCull",
1414 shapeByType: {
1515 "*-empty": {
16- base: "block/metal/brazier2", SelectiveElements:["Base/Leg*","Base/Grille1"],
16+ base: "block/metal/brazier3", SelectiveElements:["Base/Leg*","Base/Grille1"],
1717
1818 },
1919 "*-fueled": {
20- base: "block/metal/brazier2", SelectiveElements:["Base/Leg*","Base/Grille1","Base/Fuel/Coal*",],
20+ base: "block/metal/brazier3", SelectiveElements:["Base/Leg*","Base/Grille1","Base/Fuel/Coal*",],
2121
2222 },
2323 "*-lit": {
24- base: "block/metal/brazier2", SelectiveElements:["Base/Leg*","Base/Grille1","Base/Embers"],
24+ base: "block/metal/brazier3", SelectiveElements:["Base/Leg*","Base/Grille1","Base/Embers"],
2525
2626 },
2727 "*-extinguished": {
28- base: "block/metal/brazier2", SelectiveElements:["Base/Leg*","Base/Grille1","Base/Ash/Lump*"],
28+ base: "block/metal/brazier3", SelectiveElements:["Base/Leg*","Base/Grille1","Base/Ash/Lump*"],
2929
3030 },
3131 },
@@ -37,7 +37,7 @@
3737 "rusty-iron": { base: "game:block/currency/rusty-iron"},
3838 },
3939 attributes: {
40- flameoutPercent: 0.001,
40+ flameoutPercent: 0.0001,
4141 },
4242 creativeinventory: { "decorative": ["brazier-empty"] , "defensive": ["brazier-empty"] },
4343 blockmaterial: "Metal",
@@ -79,6 +79,6 @@
7979 { type: "block", code: "brazier-empty", quantity: { avg: 1 } }
8080 ],
8181 materialDensity: 9000,
82- collisionSelectionBox: { x1: 0, y1: 0, z1: 0.25, x2: 1, y2: 0.75, z2: 0.75 },
82+ collisionSelectionBox: { x1: 0.089, y1: 0.0625, z1: 0.089, x2: 0.9, y2: 0.75, z2: 0.9 },
8383 rainPermeable: false,
8484 }
\ No newline at end of file
--- a/Assorted/assets/defensive/lang/en.json
+++ b/Assorted/assets/defensive/lang/en.json
@@ -15,7 +15,7 @@
1515 "defensive:block-log_cornercade-*":"Log Corner Barricade",
1616 "defensive:block-crusie_lamp-oil":"Crusie Lamp (oil)",
1717 "defensive:block-crusie_lamp-alcohol":"Crusie Lamp (spirit)",
18- "defensive:block-brazier-*":"Rectangular Brazier",
18+ "defensive:block-brazier-*":"Square Brazier",
1919
2020 "defensive:item-crusie_shell":"Incomplete Crusie Lamp (shell)",
2121
@@ -27,7 +27,7 @@
2727 "defensive:blockdesc-crusie_lamp-*":"Burn that midnight fuel faster.",
2828 "defensive:blockdesc-brazier-empty":"Needs fuel...",
2929 "defensive:blockdesc-brazier-extinguished":"Needs fuel again...",
30- "defensive:blockdesc-brazier-lit":"What a lovely warm glow.",
30+ "defensive:blockdesc-brazier-lit":"It glows, radiating warmth.",
3131
3232 "game:tabname-defensive":"Defensive Stuff",
3333
--- /dev/null
+++ b/Assorted/assets/defensive/shapes/block/metal/brazier3.json
@@ -0,0 +1,255 @@
1+{
2+ "editor": {
3+ "allAngles": true,
4+ "entityTextureMode": false
5+ },
6+ "textureWidth": 16,
7+ "textureHeight": 16,
8+ "textureSizes": {
9+ },
10+ "textures": {
11+ "nailtexture": "block/nailtexture",
12+ "aged": "block/metal/torchholder/aged",
13+ "rusty-iron": "block/currency/rusty-iron"
14+ },
15+ "elements": [
16+ {
17+ "name": "Base",
18+ "from": [ 2.0, 6.5, 6.5 ],
19+ "to": [ 14.0, 9.5, 9.5 ],
20+ "rotationOrigin": [ 8.0, 8.0, 8.0 ],
21+ "rotationX": 45.0,
22+ "faces": {
23+ "north": { "texture": "#rusty-iron", "uv": [ 0.0, 10.5, 12.0, 13.5 ], "enabled": false },
24+ "east": { "texture": "#rusty-iron", "uv": [ 10.0, 10.5, 13.0, 13.5 ] },
25+ "south": { "texture": "#rusty-iron", "uv": [ 9.0, 0.0, 12.0, 12.0 ], "rotation": 90 },
26+ "west": { "texture": "#rusty-iron", "uv": [ 10.5, 11.5, 13.5, 14.5 ] },
27+ "up": { "texture": "#rusty-iron", "uv": [ 0.0, 10.5, 12.0, 13.5 ], "enabled": false },
28+ "down": { "texture": "#rusty-iron", "uv": [ 8.0, 0.0, 11.0, 12.0 ], "rotation": 90 }
29+ },
30+ "children": [
31+ {
32+ "name": "Leg1",
33+ "from": [ 0.0, -9.0, 2.0 ],
34+ "to": [ 2.0, 0.0, 3.0 ],
35+ "rotationOrigin": [ 0.0, -9.0, 2.0 ],
36+ "faces": {
37+ "north": { "texture": "#rusty-iron", "uv": [ 9.5, 7.0, 11.5, 16.0 ] },
38+ "east": { "texture": "#rusty-iron", "uv": [ 9.5, 7.0, 10.5, 16.0 ] },
39+ "south": { "texture": "#rusty-iron", "uv": [ 9.5, 7.0, 11.5, 16.0 ] },
40+ "west": { "texture": "#rusty-iron", "uv": [ 10.0, 6.5, 11.0, 15.5 ] },
41+ "up": { "texture": "#rusty-iron", "uv": [ 13.0, 13.5, 15.0, 14.5 ], "enabled": false },
42+ "down": { "texture": "#rusty-iron", "uv": [ 11.5, 11.0, 13.5, 12.0 ] }
43+ }
44+ },
45+ {
46+ "name": "Leg2",
47+ "from": [ 0.0, 0.0, 3.0 ],
48+ "to": [ 2.0, 1.0, 12.0 ],
49+ "rotationOrigin": [ 0.0, 0.0, 3.0 ],
50+ "faces": {
51+ "north": { "texture": "#rusty-iron", "uv": [ 6.0, 4.5, 8.0, 5.5 ], "enabled": false },
52+ "east": { "texture": "#rusty-iron", "uv": [ 8.5, 0.0, 9.5, 9.0 ], "rotation": 90 },
53+ "south": { "texture": "#rusty-iron", "uv": [ 2.0, 10.5, 4.0, 11.5 ] },
54+ "west": { "texture": "#rusty-iron", "uv": [ 7.0, 12.0, 16.0, 13.0 ] },
55+ "up": { "texture": "#rusty-iron", "uv": [ 8.5, 0.0, 10.5, 9.0 ] },
56+ "down": { "texture": "#rusty-iron", "uv": [ 8.5, 0.0, 10.5, 9.0 ] }
57+ }
58+ },
59+ {
60+ "name": "Leg3",
61+ "from": [ 10.0, 0.0, 3.0 ],
62+ "to": [ 12.0, 1.0, 12.0 ],
63+ "rotationOrigin": [ 0.0, 0.0, 3.0 ],
64+ "faces": {
65+ "north": { "texture": "#rusty-iron", "uv": [ 6.5, 12.0, 8.5, 13.0 ], "enabled": false },
66+ "east": { "texture": "#rusty-iron", "uv": [ 8.0, 0.0, 9.0, 9.0 ], "rotation": 90 },
67+ "south": { "texture": "#rusty-iron", "uv": [ 6.5, 8.0, 8.5, 9.0 ] },
68+ "west": { "texture": "#rusty-iron", "uv": [ 8.5, 0.0, 9.5, 9.0 ], "rotation": 90 },
69+ "up": { "texture": "#rusty-iron", "uv": [ 9.0, 0.5, 11.0, 9.5 ] },
70+ "down": { "texture": "#rusty-iron", "uv": [ 9.5, 0.0, 11.5, 9.0 ] }
71+ }
72+ },
73+ {
74+ "name": "Leg4",
75+ "from": [ 10.0, -9.0, 2.0 ],
76+ "to": [ 12.0, 0.0, 3.0 ],
77+ "rotationOrigin": [ 0.0, -9.0, 2.0 ],
78+ "faces": {
79+ "north": { "texture": "#rusty-iron", "uv": [ 9.0, 0.0, 11.0, 9.0 ] },
80+ "east": { "texture": "#rusty-iron", "uv": [ 7.5, 0.0, 8.5, 9.0 ] },
81+ "south": { "texture": "#rusty-iron", "uv": [ 10.5, 0.0, 12.5, 9.0 ] },
82+ "west": { "texture": "#rusty-iron", "uv": [ 7.5, 2.0, 8.5, 11.0 ] },
83+ "up": { "texture": "#rusty-iron", "uv": [ 3.5, 9.0, 5.5, 10.0 ], "enabled": false },
84+ "down": { "texture": "#rusty-iron", "uv": [ 1.0, 9.0, 3.0, 10.0 ] }
85+ }
86+ },
87+ {
88+ "name": "Grille1",
89+ "from": [ -0.5, -4.5, -4.0 ],
90+ "to": [ 12.5, 8.5, 0.0 ],
91+ "renderPass": 1,
92+ "rotationOrigin": [ 0.0, 0.0, 0.0 ],
93+ "rotationX": 45.0,
94+ "faces": {
95+ "north": { "texture": "#rusty-iron", "uv": [ 0.0, 0.0, 13.0, 13.0 ], "enabled": false },
96+ "east": { "texture": "#aged", "uv": [ 0.0, 0.0, 13.0, 4.0 ], "rotation": 90 },
97+ "south": { "texture": "#aged", "uv": [ 1.0, 2.5, 14.0, 15.5 ], "snapUv": false },
98+ "west": { "texture": "#aged", "uv": [ 1.5, 0.0, 14.5, 4.0 ], "rotation": 270 },
99+ "up": { "texture": "#aged", "uv": [ 0.0, 0.0, 13.0, 4.0 ] },
100+ "down": { "texture": "#aged", "uv": [ 0.0, 0.0, 16.0, 4.0 ], "autoUv": false, "snapUv": false }
101+ }
102+ },
103+ {
104+ "name": "Fuel",
105+ "from": [ 0.05, 0.03, -2.5 ],
106+ "to": [ 12.05, 3.53, 9.5 ],
107+ "rotationOrigin": [ 8.0, -1.75, 0.75 ],
108+ "rotationX": -45.0,
109+ "faces": {
110+ "north": { "texture": "#coal", "uv": [ 1.0, 10.5, 13.0, 14.0 ] },
111+ "east": { "texture": "#coal", "uv": [ 2.5, 4.5, 14.5, 8.0 ] },
112+ "south": { "texture": "#coal", "uv": [ 1.0, 5.5, 13.0, 9.0 ] },
113+ "west": { "texture": "#coal", "uv": [ 2.5, 4.5, 14.5, 8.0 ] },
114+ "up": { "texture": "#coal", "uv": [ 3.0, 2.0, 15.0, 14.0 ] },
115+ "down": { "texture": "#coal", "uv": [ 2.0, 2.5, 14.0, 14.5 ] }
116+ },
117+ "children": [
118+ {
119+ "name": "Coal3",
120+ "from": [ 8.6, 1.5, 5.3 ],
121+ "to": [ 10.6, 3.5, 7.3 ],
122+ "rotationOrigin": [ 8.0, 0.0, 3.0 ],
123+ "rotationY": -22.0,
124+ "rotationZ": 44.0,
125+ "faces": {
126+ "north": { "texture": "#coal", "uv": [ 3.5, 4.0, 5.5, 6.0 ] },
127+ "east": { "texture": "#coal", "uv": [ 4.0, 4.5, 6.0, 6.5 ] },
128+ "south": { "texture": "#coal", "uv": [ 6.0, 3.0, 8.0, 5.0 ] },
129+ "west": { "texture": "#coal", "uv": [ 2.0, 3.5, 4.0, 5.5 ] },
130+ "up": { "texture": "#coal", "uv": [ 4.0, 2.0, 6.0, 4.0 ] },
131+ "down": { "texture": "#coal", "uv": [ 4.5, 4.0, 6.5, 6.0 ] }
132+ }
133+ },
134+ {
135+ "name": "Coal1",
136+ "from": [ 1.0, 2.0, 0.0 ],
137+ "to": [ 3.0, 4.0, 2.0 ],
138+ "rotationOrigin": [ 0.0, 4.0, 4.0 ],
139+ "rotationX": 10.999998264185962,
140+ "rotationY": -22.499998378659544,
141+ "rotationZ": 2.3102947268384569E-7,
142+ "faces": {
143+ "north": { "texture": "#coal", "uv": [ 8.5, 7.5, 10.5, 9.5 ] },
144+ "east": { "texture": "#coal", "uv": [ 5.5, 8.5, 7.5, 10.5 ] },
145+ "south": { "texture": "#coal", "uv": [ 6.0, 4.5, 8.0, 6.5 ] },
146+ "west": { "texture": "#coal", "uv": [ 2.0, 4.5, 4.0, 6.5 ] },
147+ "up": { "texture": "#coal", "uv": [ 4.0, 5.5, 6.0, 7.5 ] },
148+ "down": { "texture": "#coal", "uv": [ 4.5, 4.0, 6.5, 6.0 ] }
149+ }
150+ },
151+ {
152+ "name": "Coal2",
153+ "from": [ 6.6, 2.0, 8.7 ],
154+ "to": [ 9.6, 3.5, 10.2 ],
155+ "rotationOrigin": [ 11.0, 4.0, 5.0 ],
156+ "rotationX": -1.0871917705741253E-7,
157+ "rotationY": 10.999998595248558,
158+ "rotationZ": -10.999996287822809,
159+ "faces": {
160+ "north": { "texture": "#coal", "uv": [ 3.5, 4.0, 6.5, 5.5 ] },
161+ "east": { "texture": "#coal", "uv": [ 4.0, 4.5, 5.5, 6.0 ] },
162+ "south": { "texture": "#coal", "uv": [ 6.0, 3.0, 9.0, 4.5 ] },
163+ "west": { "texture": "#coal", "uv": [ 2.0, 3.5, 3.5, 5.0 ] },
164+ "up": { "texture": "#coal", "uv": [ 4.0, 2.0, 7.0, 3.5 ] },
165+ "down": { "texture": "#coal", "uv": [ 4.5, 4.0, 7.5, 5.5 ] }
166+ }
167+ }
168+ ]
169+ },
170+ {
171+ "name": "Embers",
172+ "from": [ -0.05, 0.03, -2.5 ],
173+ "to": [ 11.95, 3.53, 9.5 ],
174+ "rotationOrigin": [ 8.0, -1.75, 0.75 ],
175+ "rotationX": -45.0,
176+ "faces": {
177+ "north": { "texture": "#ember", "uv": [ 2.5, 8.5, 14.5, 12.0 ], "glow": 255 },
178+ "east": { "texture": "#ember", "uv": [ 0.5, 6.5, 12.5, 10.0 ], "glow": 255 },
179+ "south": { "texture": "#ember", "uv": [ 2.5, 7.0, 14.5, 10.5 ], "glow": 255 },
180+ "west": { "texture": "#ember", "uv": [ 2.5, 9.0, 14.5, 12.5 ], "glow": 255 },
181+ "up": { "texture": "#ember", "uv": [ 2.5, 2.0, 14.5, 14.0 ], "glow": 255 },
182+ "down": { "texture": "#ember", "uv": [ 0.5, 4.0, 12.5, 16.0 ], "enabled": false }
183+ }
184+ },
185+ {
186+ "name": "Ash",
187+ "from": [ 0.0, 0.03, -2.5 ],
188+ "to": [ 12.0, 1.03, 9.5 ],
189+ "rotationOrigin": [ 8.0, -1.75, 0.75 ],
190+ "rotationX": -45.0,
191+ "faces": {
192+ "north": { "texture": "#nailtexture", "uv": [ 1.0, 10.5, 13.0, 11.5 ] },
193+ "east": { "texture": "#nailtexture", "uv": [ 3.0, 6.0, 15.0, 7.0 ] },
194+ "south": { "texture": "#nailtexture", "uv": [ 1.0, 5.5, 13.0, 6.5 ] },
195+ "west": { "texture": "#nailtexture", "uv": [ 2.5, 5.0, 14.5, 6.0 ] },
196+ "up": { "texture": "#nailtexture", "uv": [ 1.5, 3.0, 13.5, 15.0 ] },
197+ "down": { "texture": "#nailtexture", "uv": [ 3.0, 3.0, 15.0, 15.0 ] }
198+ },
199+ "children": [
200+ {
201+ "name": "Lump1",
202+ "from": [ 1.0, 0.75, 0.0 ],
203+ "to": [ 3.0, 1.75, 2.0 ],
204+ "rotationOrigin": [ 0.0, 3.0, 4.0 ],
205+ "rotationX": 4.6205893791518866E-7,
206+ "rotationY": -47.0,
207+ "rotationZ": -6.0,
208+ "faces": {
209+ "north": { "texture": "#nailtexture", "uv": [ 8.5, 7.5, 10.5, 8.5 ] },
210+ "east": { "texture": "#nailtexture", "uv": [ 5.5, 8.5, 7.5, 9.5 ] },
211+ "south": { "texture": "#nailtexture", "uv": [ 6.0, 4.5, 8.0, 5.5 ] },
212+ "west": { "texture": "#nailtexture", "uv": [ 2.0, 4.5, 4.0, 5.5 ] },
213+ "up": { "texture": "#nailtexture", "uv": [ 4.0, 5.5, 6.0, 7.5 ] },
214+ "down": { "texture": "#nailtexture", "uv": [ 4.5, 4.0, 6.5, 6.0 ] }
215+ }
216+ },
217+ {
218+ "name": "Lump2",
219+ "from": [ 8.4, 1.0, 1.0 ],
220+ "to": [ 10.4, 2.0, 2.0 ],
221+ "rotationOrigin": [ 8.0, 0.0, 4.0 ],
222+ "rotationX": -6.0,
223+ "rotationY": -64.0,
224+ "rotationZ": -14.0,
225+ "faces": {
226+ "north": { "texture": "#nailtexture", "uv": [ 0.0, 0.0, 2.0, 1.0 ] },
227+ "east": { "texture": "#nailtexture", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
228+ "south": { "texture": "#nailtexture", "uv": [ 0.0, 0.0, 2.0, 1.0 ] },
229+ "west": { "texture": "#nailtexture", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
230+ "up": { "texture": "#nailtexture", "uv": [ 0.0, 0.0, 2.0, 1.0 ] },
231+ "down": { "texture": "#nailtexture", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }
232+ }
233+ },
234+ {
235+ "name": "Lump3",
236+ "from": [ 12.5, 0.75, 1.0 ],
237+ "to": [ 14.0, 1.75, 2.5 ],
238+ "rotationOrigin": [ 8.0, 1.0, 4.0 ],
239+ "rotationX": -6.0,
240+ "rotationY": -91.0,
241+ "rotationZ": -3.0,
242+ "faces": {
243+ "north": { "texture": "#nailtexture", "uv": [ 0.0, 0.0, 1.5, 1.0 ] },
244+ "east": { "texture": "#nailtexture", "uv": [ 0.0, 0.0, 1.5, 1.0 ] },
245+ "south": { "texture": "#nailtexture", "uv": [ 0.0, 0.0, 1.5, 1.0 ] },
246+ "west": { "texture": "#nailtexture", "uv": [ 0.0, 0.0, 1.5, 1.0 ] },
247+ "up": { "texture": "#nailtexture", "uv": [ 0.0, 0.0, 1.5, 1.5 ] },
248+ "down": { "texture": "#nailtexture", "uv": [ 0.0, 0.0, 1.5, 1.5 ] }
249+ }
250+ }
251+ ]
252+ }
253+ ]
254+ }
255+ ]}
\ No newline at end of file
Binary files /dev/null and b/Assorted/modicon.png differ