Skip to content

Commit b37b560

Browse files
Swirek3331Swirek3331
authored
Merge pull request #2 from Swirek3331/not-main
The addition of carbon, merging
2 parents b687ae0 + 29c9de1 commit b37b560

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+639
-27
lines changed

‎README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ I was trying to make this as good readable as I can.
99

1010
I have came to conclusion, that beter will be if a new content will be developt in other branch, but some importatn bug fixes.
1111

12-
## **Other**
13-
14-
My discord username and tag: `[PL][KT][ZPGM]Swirek3331#0611`
12+
## *Other*
1513

1614
[Multicrafter-lib](https://liplum.github.io/MultiCrafterLib/)
1715

1816
[Multicrafter-lib repository](https://github.com/liplum/MultiCrafterLib)
1917

18+
[Letters](https://discord.com/channels/391020510269669376/754011833928515664/1011760437043400714)
19+
2020
## Dla wszystkich polaczków jak ja
2121

2222
Tłumaczenie contentu wychodzi razem z jego utworzeniem, a bynajmniej taki mam zamiar.
2323
Nie wiem konkrentie, ale chyba zrobię również polski opis tego co w kodzie, ale zakładm, iż ignlisz szprechacać umicie.
24-
Jak coś to `#polski` na discordzie mindustry albo pisać, byle nie dzownić, do `[PL][KT][ZPGM]Swirek3331#0611`.
24+
Jak coś to `#polski` na discordzie mindustry albo pisać, byle nie dzownić.

‎bundles/bundle.properties

+37-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,15 @@ item.altanic-wood.name = Wood
66
item.altanic-coal-coke.name = Coal Coke
77
item.altanic-feco.name = Feco
88
item.altanic-wall-alloy.name = Wall Alloy
9+
item.altanic-flux.name = Limestone
10+
item.altanic-petroleum-coke.name = Petroleum Coke
11+
12+
## liquids
13+
14+
liquid.altanic-creosote.name = Creosote Oil
15+
liquid.altanic-gas.name = Gas
16+
liquid.altanic-light-oil.name = Ligh Oil
17+
liquid.altanic-heavy-oil.name = Heavy Oil
918

1019
## blocks
1120

@@ -16,6 +25,15 @@ block.altanic-induction-smelter.name = Induction Smelter
1625
block.altanic-arc-furnace.name = Arc Furnace
1726
block.altanic-pyrolyse-oven.name = Pyrolyse Oven
1827
block.altanic-blast-furnace.name = Blast Furnace
28+
block.altanic-centrifuge.name = Centrifuge
29+
block.altanic-thermal-centrifuge.name = Thermal Centrifuge
30+
31+
### defense
32+
33+
#### walss
34+
35+
block.altanic-feco-wall-small.name = Small Feco Wall
36+
block.altanic-feco-wall.name = Feco Wall
1937

2038
# descriptions
2139

@@ -25,6 +43,15 @@ item.altanic-wood.description = Oragnic matery that has cabon in it.
2543
item.altanic-coal-coke.description = Specialy processed coal that has a high carbon content.
2644
item.altanic-feco.description = Raw material that itself is not very useful, but can be combined with other materials.
2745
item.altanic-wall-alloy.description = A special hard alloy. Perfect for defensive structures.
46+
item.altanic-flux.description = A special limestone that is used to reduce the melting point of metals.
47+
item.altanic-petroleum-coke.description = Very carbon rich, burnalbe stone, also happens that can be obtained from oil.
48+
49+
## liquids
50+
51+
liquid.altanic-creosote.description = A liquid that is byproduct of pyrolysis of wood and coal. It can be burned.
52+
liquid.altanic-gas.description = Air mixture of light carbohydrogens. Can be destilled from oil. Can be burned.
53+
liquid.altanic-light-oil.description = Light liquid part of oil. Possible to refine further.
54+
liquid.altanic-heavy-oil.description = Bad for fuel and heavy part of tar.
2855

2956
## blocks
3057

@@ -34,4 +61,13 @@ block.altanic-electric-furnace.description = A special multi-task furnace that c
3461
block.altanic-induction-smelter.description = More advanced type of multi-task furnace.
3562
block.altanic-arc-furnace.description = Nearly perfect multi-task furnace.
3663
block.altanic-pyrolyse-oven.description = Oven that can handle pyrolyse.
37-
block.altanic-blast-furnace.description = Object qualified for feco metallurgy.
64+
block.altanic-blast-furnace.description = Object qualified for feco metallurgy.
65+
block.altanic-centrifuge.description = A machine that was designed to separate liquids and solids.
66+
block.altanic-thermal-centrifuge.description = Better, more efficient centrifuge. Also has capability to separate radioactive isotopes.
67+
68+
### defense
69+
70+
#### walls
71+
72+
block.altanic-feco-wall-small.description = Smaller version of obstacle, made of wall alloy.
73+
block.altanic-feco-wall.description = Obstacle, made of wall alloy, that can be used to protect your base. Very though.

‎bundles/bundle_pl.properties

+36
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,15 @@ item.altanic-wood.name = Drewno
66
item.altanic-coal-coke.name = Koks Węglowy
77
item.altanic-feco.name = Zekoba
88
item.altanic-wall-alloy.name = Ściano-stop
9+
item.altanic-flux.name = Wapień
10+
item.altanic-petroleum-coke.name = Koks Naftowy
11+
12+
## ciecze
13+
14+
liquid.altanic-creosote.name = Kreozot
15+
liquid.altanic-gas.name = Gaz
16+
liquid.altanic-light-oil.name = Olej Lekki
17+
liquid.altanic-heavy-oil.name = Mazut
918

1019
## bloki
1120

@@ -16,6 +25,15 @@ block.altanic-induction-smelter.name = Piec Indukcyjny
1625
block.altanic-arc-furnace.name = Piecy Łukowy
1726
block.altanic-pyrolyse-oven.name = Budynek Pirolizy
1827
block.altanic-blast-furnace.name = Wielki Piec Hutniczy
28+
block.altanic-centrifuge.name = Wirówka
29+
block.altanic-thermal-centrifuge.name = Wirówka Termalna
30+
31+
### obrona
32+
33+
#### ściany
34+
35+
block.altanic-feco-wall-small.name = Mała Ściana z Zekoby
36+
block.altanic-feco-wall.name = Ściana z Zekoby
1937

2038
# opisy
2139

@@ -25,6 +43,15 @@ item.altanic-wood.description = Materia organiczna zawierająca węgiel.
2543
item.altanic-coal-coke.description = Wyngiel poddany suchej destylacji. Zawiera więcej węgla w sobie co czyni go niesamowicie wydajnym paliwem.
2644
item.altanic-feco.description = Surowy materiał, który może być zmieszany z innymi surowcami w celu uzyskania nowych materiałów.
2745
item.altanic-wall-alloy.description = Stop, który jest używany do struktur defensywnych.
46+
item.altanic-flux.description = Węglan wapnia to substancja, która jest używana w celu obniżenia temperatury topnienia metali.
47+
item.altanic-petroleum-coke.description = Pieruńsko bogaty w węgiel i łatwo palny kamień, który także może zostać wyprodukowany z mazutu.
48+
49+
## cieczy
50+
51+
liquid.altanic-creosote.description = Substancja będąca rezultatem suchej destylacji. Niewykluczone, iż palny.
52+
liquid.altanic-gas.description = Lotna mieszanina między innymi lekkich węglowodorów wydestylowywana z ropy, ale może też być pozyskany z innych źródeł.
53+
liquid.altanic-light-oil.description = Lekka część ropy naftowej. Możliwa dalsza rafinacja.
54+
liquid.heavy-oil.description = Cięższa część oleju. Niezbyt wydajny jako paliwo. Za to możliwym być dalsze przetwórstwo.
2855

2956
## bloki
3057

@@ -35,3 +62,12 @@ block.altanic-induction-smelter.description = Bardzeij zaawanosowany piec, posia
3562
block.altanic-arc-furnace.description = Arcy piec nad piecami, praktycznie.
3663
block.altanic-pyrolyse-oven.description = Obiekt specjalizujący się w suchej destylacji.
3764
block.altanic-blast-furnace.description = Blok wyspecjalizowany pod obróbkę surowego materiału jakim jest zekoba w bardziej użyteczny element.
65+
block.altanic-centrifuge.description = Maszyneria potrfiąca separować zarówno ciała stałe jak i ciecze.
66+
block.altanic-thermal-centrifuge.description = Bardziej wydajana wirówka, potrafiąca nawet operować przy izotopach promieniotwórczych.
67+
68+
### obrona
69+
70+
#### ściany
71+
72+
block.altanic-feco-wall-small.description = Mmniejsza wersja ściany z zekoby.
73+
block.altanic-feco-wall.description = Zabarykadowanie, zrobione ze ściano-stopu, służące do obrony wybranych, należnych terytorium. Pieruńsko wystrzymałe.

‎content/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Content
22

3-
Everyone else with .hjson
3+
Everyone else with .(h)json
44

55
//TO DO write structure and explanation, and something?

‎content/blocks/defense/README.md

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Defense

‎content/blocks/defense/walls/README.md

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Walls

‎content/blocks/defense/walls/feco-wall-small.hjson

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
type: Wall
2+
# defines block type, first letter must be uppercase
3+
name: Small Feco Wall
4+
size: 1
5+
health: 1080
6+
category: defense
7+
requirements: [
8+
wall-alloy/6
9+
]
10+
research: {
11+
parent: thorium-wall
12+
}

‎content/blocks/defense/walls/feco-wall.hjson

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
type: Wall
2+
name: Feco Wall
3+
size: 2
4+
health: 4320
5+
category: defense
6+
requirements: [
7+
wall-alloy/24
8+
]
9+
# With health and requiremetns just get one by one block properties and multiply them by size
10+
research: {
11+
parent: feco-wall-small
12+
}

‎content/blocks/environment/README.md

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Enviorments

‎content/blocks/environment/ores/README.md

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Ores
2+
3+
Read Items.
4+
5+
Code with *description*
6+
7+
```hsjon
8+
9+
type: OreBlock
10+
# Defines that this block in an ore.
11+
itemDrop: feco
12+
# Defines the material that is being obtained while mining.
13+
mapColor: BFA58B
14+
# Color that will be showing up in the map.
15+
# Hardnes and other are being defined in the item file.
16+
17+
```

‎content/blocks/environment/ores/calcite.hjson

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
type: OreBlock
2+
itemDrop: flux
3+
mapColor: ffffff

‎content/blocks/environment/ores/feco-ore.hjson

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
type: OreBlock
2+
# Defines that this block in an ore.
23
itemDrop: feco
3-
mapColor: DEB292
4+
# Defines the material that is being obtained while mining.
5+
mapColor: BFA58B
6+
# Color that will be showing up in the map.
7+
# Hardnes and other are being defined in the item file.

‎content/blocks/multi/README.md

+106
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,109 @@
33
Because I do not gain the knowladge about requirements in scripting, I split build cost, category and research to `hsjon` files.
44
Just read the `README.md` in [scripts folder](/scripts/README.md) for information about that kind of blocks.
55
**Requirements will be changed, many times**
6+
7+
That one with "description"
8+
9+
```hjson
10+
11+
category: crafting
12+
# cateogry
13+
requirements: [
14+
# requirements
15+
lead/50
16+
metaglass/25
17+
graphite/100
18+
titanium/45
19+
thorium/75
20+
]
21+
research: {
22+
parent: pyrolyse-oven
23+
# from where node will be going in tech tree
24+
# you can also do here research requirements by writing requirements: [], but they are optional, game has multiplier for research cost based on build
25+
}
26+
# Requiremnts are in TO DO
27+
drawer: {
28+
# component where functions from DrawBlock family are located
29+
type: multicraft.DrawRecipe
30+
# defining the type of drawer as a imported from multicraft
31+
drawers: [
32+
# defining the drawers
33+
{# recipe one
34+
type: DrawMulti
35+
drawers: [
36+
{
37+
type: DrawDefault
38+
#drawing default layer
39+
}
40+
{
41+
type: DrawFlame
42+
color: ffef99
43+
#drawing flame
44+
}
45+
]
46+
# normal DrawMulti function, but in multicraft.DrawRecipe
47+
}
48+
{# recipe two
49+
type: DrawMulti
50+
drawers: [
51+
{
52+
type: DrawDefault
53+
}
54+
{
55+
type: DrawFlame
56+
color: ffef99
57+
}
58+
]
59+
}
60+
{# recipe trzy
61+
type: DrawMulti
62+
drawers: [
63+
{
64+
type: DrawDefault
65+
}
66+
{
67+
type: DrawFlame
68+
color: ffef99
69+
}
70+
]
71+
}
72+
{# recipe sqrt(16)
73+
type: DrawMulti
74+
drawers: [
75+
{
76+
type: DrawDefault
77+
}
78+
{
79+
type: DrawFlame
80+
color: ffef99
81+
}
82+
]
83+
}
84+
{#recipe pięć
85+
type: DrawMulti
86+
drawers: [
87+
{
88+
type: DrawDefault
89+
}
90+
{
91+
type: DrawFlame
92+
color: ffef99
93+
}
94+
]
95+
}
96+
{#recipe VI
97+
type: DrawMulti
98+
drawers: [
99+
{
100+
type: DrawDefault
101+
}
102+
{
103+
type: DrawFlame
104+
color: ffef99
105+
}
106+
]
107+
}
108+
# each DrawMulti is for one recipe
109+
]
110+
}
111+
```

‎content/blocks/multi/blast-furnace.hjson

+36
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,42 @@ drawer: {
5959
}
6060
]
6161
}
62+
{# recipe sqrt(16)
63+
type: DrawMulti
64+
drawers: [
65+
{
66+
type: DrawDefault
67+
}
68+
{
69+
type: DrawFlame
70+
color: ffef99
71+
}
72+
]
73+
}
74+
{#recipe pięć
75+
type: DrawMulti
76+
drawers: [
77+
{
78+
type: DrawDefault
79+
}
80+
{
81+
type: DrawFlame
82+
color: ffef99
83+
}
84+
]
85+
}
86+
{#recipe VI
87+
type: DrawMulti
88+
drawers: [
89+
{
90+
type: DrawDefault
91+
}
92+
{
93+
type: DrawFlame
94+
color: ffef99
95+
}
96+
]
97+
}
6298
# each DrawMulti is for one recipe
6399
]
64100
}

0 commit comments

Comments
 (0)