• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javaandroidc++linuxc#objective-c誰得cocoaqtpythonrubywindowsphpgameguibathyscaphec翻訳omegat計画中(planning stage)frameworktwitterdombtronvb.nettestarduinodirectxpreviewerゲームエンジン

First Machine Age's Mods (Combined repo.)


Commit MetaInfo

Revisãof409c44ff0ed48b7ab0debffe16aa6caf73f9be1 (tree)
Hora2021-05-05 03:07:43
Autormelchior <melchior@user...>
Commitermelchior

Mensagem de Log

D.S. updates

Mudança Sumário

Diff

--- a/Assorted/Assorted.csproj
+++ b/Assorted/Assorted.csproj
@@ -20,7 +20,7 @@
2020 <ConsolePause>false</ConsolePause>
2121 <CustomCommands>
2222 <CustomCommands>
23- <Command type="AfterBuild" command="7z -tzip a Defensive_${ProjectConfig}.zip" workingdir="${TargetDir}" />
23+ <Command type="AfterBuild" command="7z a -tzip -x!*.zip -aoa Defensive_${ProjectConfig}.zip" workingdir="${TargetDir}" />
2424 <Command type="AfterClean" command="rm -f *.zip" workingdir="${TargetDir}" />
2525 </CustomCommands>
2626 </CustomCommands>
@@ -31,6 +31,12 @@
3131 <ErrorReport>prompt</ErrorReport>
3232 <WarningLevel>4</WarningLevel>
3333 <ConsolePause>false</ConsolePause>
34+ <CustomCommands>
35+ <CustomCommands>
36+ <Command type="AfterBuild" command="7z -tzip a Defensive_${ProjectConfig}.zip" workingdir="${TargetDir}" />
37+ <Command type="AfterClean" command="rm -f *.zip" workingdir="${TargetDir}" />
38+ </CustomCommands>
39+ </CustomCommands>
3440 </PropertyGroup>
3541 <ItemGroup>
3642 <Reference Include="System" />
@@ -209,6 +215,9 @@
209215 <None Include="assets\defensive\recipes\grid\false_wall.json">
210216 <CopyToOutputDirectory>Always</CopyToOutputDirectory>
211217 </None>
218+ <None Include="assets\defensive\recipes\grid\enclosed_candle.json">
219+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
220+ </None>
212221 </ItemGroup>
213222 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
214223 </Project>
\ No newline at end of file
--- a/Assorted/assets/defensive/blocktypes/ceramic/enclosed_candle.json
+++ b/Assorted/assets/defensive/blocktypes/ceramic/enclosed_candle.json
@@ -25,7 +25,7 @@
2525 "semi_t_cera": { base: "ceramic/semi_t_cera" },
2626 "brown1": { base: "game:block/clay/hardened/brown1"}
2727 },
28- creativeinventory: { "general": ["*-north"], "decorative": ["*-north"] },
28+ creativeinventory: { "general": ["*-north"], "decorative": ["*-north"], "defensive": ["*-north"] },
2929 replaceable: 300,
3030 resistance: 0.25,
3131 maxStackSize: 4,
--- a/Assorted/assets/defensive/blocktypes/metal/brazier.json
+++ b/Assorted/assets/defensive/blocktypes/metal/brazier.json
@@ -30,7 +30,7 @@
3030 "coal": { base: "game:block/coal/charcoal"},
3131 "rusty-iron": { base: "game:block/currency/rusty-iron"},
3232 },
33- creativeinventory: { "general": ["*"], "decorative": ["*"] },
33+ creativeinventory: { "general": ["*"], "decorative": ["*"] , "defensive": ["*"] },
3434 blockmaterial: "Metal",
3535 replaceable: 200,
3636 lightAbsorption: 0,
--- a/Assorted/assets/defensive/blocktypes/metal/grille_horizontal.json
+++ b/Assorted/assets/defensive/blocktypes/metal/grille_horizontal.json
@@ -23,7 +23,7 @@
2323 behaviors: [
2424 {name: "HorizontalOrientable", properties: { dropBlockFace: "north" }}, {name: "FreeReinforcement", properties: { howmuch: 15 }}
2525 ],
26- creativeinventory: { "general": ["grille_horizontal-north"], "decorative": ["grille_horizontal-north"] },
26+ creativeinventory: { "general": ["grille_horizontal-north"], "decorative": ["grille_horizontal-north"] , "defensive": ["grille_horizontal-north"] },
2727 resistance: 4,
2828 rainPermeable: true,
2929 lightAbsorption: 0,
--- a/Assorted/assets/defensive/blocktypes/metal/grille_vertical.json
+++ b/Assorted/assets/defensive/blocktypes/metal/grille_vertical.json
@@ -22,7 +22,7 @@
2222 {name: "VerticalOrentiation" },
2323 {name: "FreeReinforcement", properties: { howmuch: 15 }}
2424 ],
25- creativeinventory: { "general": ["grille_vertical-up"], "decorative": ["grille_vertical-up"] },
25+ creativeinventory: { "general": ["grille_vertical-up"], "decorative": ["grille_vertical-up"] , "defensive": ["grille_vertical-up"] },
2626 resistance: 4,
2727 rainPermeable: true,
2828 lightAbsorption: 0,
--- a/Assorted/assets/defensive/blocktypes/stone/false_wall.json
+++ b/Assorted/assets/defensive/blocktypes/stone/false_wall.json
@@ -18,7 +18,7 @@
1818 { code: "state", states: ["closed", "opened"] },
1919 { code: "material", loadFromProperties: "block/rock" },
2020 ],
21- creativeinventory: { "general": ["false_wall-north-down-closed-*"], "decorative": ["false_wall-north-down-closed-*"] },
21+ creativeinventory: { "general": ["false_wall-north-down-closed-*"], "decorative": ["false_wall-north-down-closed-*"], "defensive": ["false_wall-north-down-closed-*"] },
2222 textures: {
2323 "stone": { base: "game:block/stone/brick/{material}1" },
2424 "wood": { base: "game:block/wood/planks/oak1" },
--- a/Assorted/assets/defensive/blocktypes/stone/sconse_brick.json
+++ b/Assorted/assets/defensive/blocktypes/stone/sconse_brick.json
@@ -33,7 +33,7 @@
3333 {name: "HorizontalOrientable", properties: { dropBlockFace: "north" }}
3434 ],
3535 renderpass: "OpaqueNoCull",
36- creativeinventory: { "general": ["*-north"], "construction": ["*-north"] },
36+ creativeinventory: { "general": ["*-north"], "construction": ["*-north"] , "defensive": ["*-north"] },
3737 replaceable: 200,
3838 resistance: 4,
3939 rainPermeable: false,
--- a/Assorted/assets/defensive/blocktypes/stone/slot_hole.json
+++ b/Assorted/assets/defensive/blocktypes/stone/slot_hole.json
@@ -23,7 +23,7 @@
2323 behaviors: [
2424 { name: "VerticalOrentiation" }
2525 ],
26- creativeinventory: { "general": ["slot_hole-*-up"], "decorative": ["slot_hole-*-up"] },
26+ creativeinventory: { "general": ["slot_hole-*-up"], "decorative": ["slot_hole-*-up"], "defensive": ["slot_hole-*-up"] },
2727 resistance: 2,
2828 rainPermeable: true,
2929 lightAbsorption: 0,
@@ -41,9 +41,9 @@
4141 ],
4242 materialDensity: 600,
4343 sounds: {
44- "walk": "walk/stone",
44+ "walk": "game:walk/stone",
4545 byTool: {
46- "Pickaxe": { hit: "block/rock-hit-pickaxe", break: "block/rock-break-pickaxe" }
46+ "Pickaxe": { hit: "game:block/rock-hit-pickaxe", break: "game:block/rock-break-pickaxe" }
4747 }
4848 },
4949 }
--- a/Assorted/assets/defensive/blocktypes/stone/slot_vert.json
+++ b/Assorted/assets/defensive/blocktypes/stone/slot_vert.json
@@ -23,7 +23,7 @@
2323 behaviors: [
2424 {name: "HorizontalOrientable", properties: { dropBlockFace: "north" }}
2525 ],
26- creativeinventory: { "general": ["slot_vertical-*-north"], "decorative": ["slot_vertical-*-north"] },
26+ creativeinventory: { "general": ["slot_vertical-*-north"], "decorative": ["slot_vertical-*-north"], "defensive": ["slot_vertical-*-north"] },
2727 resistance: 2,
2828 rainPermeable: true,
2929 lightAbsorption: 0,
@@ -65,9 +65,9 @@
6565 },
6666 materialDensity: 600,
6767 sounds: {
68- "walk": "walk/stone",
68+ "walk": "game:walk/stone",
6969 byTool: {
70- "Pickaxe": { hit: "block/rock-hit-pickaxe", break: "block/rock-break-pickaxe" }
70+ "Pickaxe": { hit: "game:block/rock-hit-pickaxe", break: "game:block/rock-break-pickaxe" }
7171 }
7272 },
7373 }
--- a/Assorted/assets/defensive/blocktypes/wood/boltable_door.json
+++ b/Assorted/assets/defensive/blocktypes/wood/boltable_door.json
@@ -17,7 +17,7 @@
1717 { code: "part", states: ["down", "up"] },
1818 { code: "state", states: ["closed", "opened"] },
1919 ],
20- creativeinventory: { "general": ["boltable_door-north-down-closed"], "decorative": ["boltable_door-north-down-closed"] },
20+ creativeinventory: { "general": ["boltable_door-north-down-closed"], "decorative": ["boltable_door-north-down-closed"], "defensive": ["boltable_door-north-down-closed"] },
2121 textures: {
2222 "wall-inside": { base:"game:block/wood/crate/wall-inside"},
2323 "oak2": { base:"game:block/wood/planks/oak2"},
--- a/Assorted/assets/defensive/blocktypes/wood/false_floor.json
+++ b/Assorted/assets/defensive/blocktypes/wood/false_floor.json
@@ -6,7 +6,7 @@
66 { code: "material", loadFromProperties: "block/rock" },
77 ],
88 behaviors: [{name: "NeedSides", properties: { applicableMaterials: ["Soil", "Wood", "Stone", "Ore", "Metal", "Mantle", "Ceramic", "Brick", "Other"]} }],
9- creativeinventory: { "general": ["*"], "terrain": ["*"] },
9+ creativeinventory: { "general": ["*"], "terrain": ["*"], "defensive": ["*"] },
1010 shape: { base: "block/wood/false_floor" },
1111 blockmaterial: "Stone",
1212 texturesByType: {
--- /dev/null
+++ b/Assorted/assets/defensive/recipes/grid/enclosed_candle.json
@@ -0,0 +1,13 @@
1+{
2+ ingredientPattern: "PPP QCQ _B_",
3+ ingredients: {
4+ "P": { type: "item", code: "game:clay-*" },
5+ "Q": { type:"item", code:"game:clearquartz"},
6+ "C": { type: "item", code: "game:candle" },
7+ "B": { type: "block", code: "game:bowl-burned" },
8+ },
9+ width: 3,
10+ height: 3,
11+ output: { type: "block", code: "defensive:enclosed_candle-north" }
12+}
13+