Skip to content

Commit

Permalink
Update #10.0
Browse files Browse the repository at this point in the history
  • Loading branch information
3Snake3 committed Oct 3, 2021
1 parent 13c4cfb commit 8fc0d7d
Show file tree
Hide file tree
Showing 287 changed files with 3,152 additions and 696 deletions.
374 changes: 241 additions & 133 deletions bundles/bundle.properties

Large diffs are not rendered by default.

183 changes: 144 additions & 39 deletions bundles/bundle_ru.properties

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions content/blocks/distribution/creostone-bridge-conveyor.hjson
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ bufferCapacity: 20
requirements: [
copper/9
lead/9
creostone/7
creostone/5
metaglass/4
]

research: creotite-converter
research: bridge-conveyor
2 changes: 2 additions & 0 deletions content/blocks/distribution/creostone-conveyor.hjson
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ category: distribution
health: 85
speed: 0.13
displayedSpeed: 17.8
placeableLiquid: true

requirements: [
graphite/1
titanium/1
creostone/1
metaglass/1
]

research: titanium-conveyor
File renamed without changes.
File renamed without changes.
56 changes: 56 additions & 0 deletions content/blocks/effect/push-projector.hjson
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
type: PowerTurret
reloadTime: 180
size: 3
recoilAmount: 0
rotateSpeed: 0
shootLength: 0
shootCone: 360
shots: 360
group: projectors
emitLight: true
lightRadius: 75
heatColor: 91abff
powerUse: 5
consumes: {
liquid: water/2
}
shootType: {
sprite: adc-none-bullet
width: 3
height: 3
hitEffect: none
despawnEffect: none
knockback: 4
damage: 0
pierce: true
pierceBuilding: true
hittable: false
reflectable: false
speed: 6
lifetime: 25
shootEffect: {
type: WaveEffect
sides: 6
sizeFrom: 0
sizeTo: 150
strokeFrom: 4
strokeTo: 0
colorFrom: 6a75c4
colorTo: 8ca4f5
lifetime: 25
}
smokeEffect: none
}
range: 150
category: effect
shootSound: release
requirements: [
copper/225
graphite/125
plastanium/85
phase-fabric/60
]
research: {
parent: force-projector
objectives: [core-nucleus]
}
186 changes: 186 additions & 0 deletions content/blocks/effect/spraying-projector.hjson
Original file line number Diff line number Diff line change
@@ -0,0 +1,186 @@
type: ItemTurret
category: effect

size: 2

reloadTime: 100
recoilAmount: 0
shots: 360
shootCone: 360
range: 200
shootSound: release
shootLength: 0
inaccuracy: 0
rotateSpeed: 10

emitLight: true
lightRadius: 75

coolantMultiplier: 0.3
coolantUsage: 1

group: projectors

ammoTypes: {
pyratite: {
sprite: adc-none-bullet
hitEffect: none
despawnEffect: none
shootEffect: {
type: WaveEffect
sides: 0
sizeFrom: 0
sizeTo: 200
strokeFrom: 4
strokeTo: 4
colorFrom: f6e096
colorTo: f6e096
lifetime: 20
}
damage: 0
speed: 10
lifetime: 20
pierce: true
pierceBuilding: true
hittable: false
reflectable: false
status: burning
statusDuration: 60
}
spore-pod: {
sprite: adc-none-bullet
hitEffect: none
despawnEffect: none
speed: 10
lifetime: 20
shootEffect: {
type: WaveEffect
lifetime: 20
sides: 0
sizeFrom: 0
sizeTo: 200
strokeFrom: 4
strokeTo: 4
colorFrom: a488eb
colorTo: a488eb
}
damage: 0
pierce: true
pierceBuilding: true
hittable: false
reflectable: false
status: spore-slowed
statusDuration: 60
}
creostone: {
sprite: adc-none-bullet
speed: 10
lifetime: 20
hitEffect: none
despawnEffect: none
shootEffect: {
type: WaveEffect
lifetime: 20
sides: 0
sizeFrom: 0
sizeTo: 200
strokeFrom: 4
strokeTo: 4
colorFrom: eb8778
colorTo: eb8778
}
damage: 0
pierce: true
pierceBuilding: true
hittable: false
reflectable: false
status: melting
statusDuration: 60
}
thorium: {
sprite: adc-none-bullet
speed: 10
lifetime: 20
hitEffect: none
despawnEffect: none
shootEffect: {
type: WaveEffect
lifetime: 20
sides: 0
sizeFrom: 0
sizeTo: 200
strokeFrom: 4
strokeTo: 4
colorFrom: f9a3c7
colorTo: f9a3c7
}
damage: 0
pierce: true
pierceBuilding: true
hittable: false
reflectable: false
status: corroded
statusDuration: 60
}
ice-cube: {
sprite: adc-none-bullet
speed: 10
lifetime: 20
hitEffect: none
despawnEffect: none
shootEffect: {
type: WaveEffect
lifetime: 20
sides: 0
sizeFrom: 0
sizeTo: 200
strokeFrom: 4
strokeTo: 4
colorFrom: 8ca4f5
colorTo: 8ca4f5
}
damage: 0
pierce: true
pierceBuilding: true
hittable: false
reflectable: false
status: wet
statusDuration: 60
}
cryocube: {
sprite: adc-none-bullet
speed: 10
lifetime: 20
hitEffect: none
despawnEffect: none
shootEffect: {
type: WaveEffect
lifetime: 20
sides: 0
sizeFrom: 0
sizeTo: 200
strokeFrom: 4
strokeTo: 4
colorFrom: 86ceeb
colorTo: 86ceeb
}
damage: 0
pierce: true
pierceBuilding: true
hittable: false
reflectable: false
status: freezing
statusDuration: 60
}
}

requirements: [
copper/200
graphite/95
silicon/70
titanium/80
]

consumes: {
power: 3.8
}
44 changes: 0 additions & 44 deletions content/blocks/effects/freeze-projector.hjson

This file was deleted.

10 changes: 10 additions & 0 deletions content/blocks/environment/creo-sand.hjson
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
type: Floor
itemDrop: creosand
damageTaken: 0.8
status: corroded
statusDuration: 180
playerUnmineable: true
attributes: {
heat: 0.25
oil: 0.55
}
10 changes: 10 additions & 0 deletions content/blocks/environment/ledonite-selections.hjson
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
type: Floor
attributes: {
water: 1.15
heat: -1.15
}
blendGroup: darksand
emitLight: true
lightRadius: 50
lightColor: c1f4ff
variants: 3
8 changes: 8 additions & 0 deletions content/blocks/environment/ledonite.hjson
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
liquidDrop: ledonite-liquid
cacheLayer: water
variants: 0
emitLight: true
lightRadius: 40
attributes: {
water: 1.5
}
5 changes: 5 additions & 0 deletions content/blocks/environment/ore-creostone.hjson
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
type: OreBlock
itemDrop: creostone
oreDefault: true
oreThreshold: 0.908
oreScale: 26
21 changes: 11 additions & 10 deletions content/blocks/liquid/upgraded-pump.hjson
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
type: Pump

category: liquid

size: 3
health: 860
hasPower: true

pumpAmount: 0.40
liquidCapacity: 60

hasPower: true
placeableLiquid: true



requirements: [
graphite/150
silicon/100
titanium/75
metaglass/65
thorium/45
graphite/270
metaglass/220
silicon/175
titanium/90
thorium/90
]

consumes: {
power: 2.5
power: 3
}

research: thermal-pump
Loading

0 comments on commit 8fc0d7d

Please sign in to comment.