diff --git a/bundles/bundle.properties b/bundles/bundle.properties index 2ced32d..dae8721 100644 --- a/bundles/bundle.properties +++ b/bundles/bundle.properties @@ -32,6 +32,8 @@ block.gravillaso-magneturn-wall-large.description = Protects structures from ene ###Blocks-Drills block.gravillaso-deep-oil-pump.name = Oil Pump block.gravillaso-deep-oil-pump.description = Uses colossal amounts of power to drill deep oil mine. +block.gravillaso-overdrive-drill.name = Overdrive Drill +block.gravillaso-overdrive-drill.description = [red]In developing ###Blocks-Liquids block.gravillaso-gravitium-conduit.name = Gravitium Conduit block.gravillaso-gravitium-conduit.description = Moves liquids forward. Transports faster and stores more than pulse conduits. @@ -52,6 +54,7 @@ block.gravillaso-anxiety.name = Anxiety block.gravillaso-anxiety.description = A turret that uses magnetism for very fast fire block.gravillaso-arhiepiscop.name = Arhiepiscop block.gravillaso-arhiepiscop.description = [red]In developing +block.gravillaso-arhiepiscop.details = You feel love? block.gravillaso-destiny.name = Destiny block.gravillaso-destiny.description = Shoots motionless electric spears\nFast reload allows you to keep up with fast enemies. block.gravillaso-divine-storm.name = Divine Storm @@ -74,6 +77,8 @@ block.gravillaso-molecular-converter.description = The simplest molecular recons block.gravillaso-molecular-reconstructor.name = Molecular Reconstructor block.gravillaso-molecular-reconstructor.description = The true molecular reconstructor, creates a new substance from titanium, lead, silicon and is cooled with water. ###Blocks-Power +block.gravillaso-benzine-generator.name = Benzine Generator +block.gravillaso-benzine-generator.description = [red]In developing block.gravillaso-sunshine.name = Sunshine block.gravillaso-sunshine.description = Emits powerful beams of light block.gravillaso-spore-generator.name = Spore Generator diff --git a/bundles/bundle_ru.properties b/bundles/bundle_ru.properties index 0364a66..09d6702 100644 --- a/bundles/bundle_ru.properties +++ b/bundles/bundle_ru.properties @@ -5,7 +5,7 @@ ui.github = GitHub ui.trello = Trello ###Units unit.gravillaso-release.name = Релиз -unit.gravillaso-release.description = [red]В разработке[white]\nКакая ирония +unit.gravillaso-release.description = [red]В разработке[white] unit.gravillaso-update.name = Апдейт unit.gravillaso-update.description = [orange]Скоро ###Liquids @@ -32,6 +32,8 @@ block.gravillaso-magneturn-wall-large.description = Защищает конст ###Blocks-Drills block.gravillaso-deep-oil-pump.name = Нефтяная помпа block.gravillaso-deep-oil-pump.description = Использует колосальное количество энергии для бурения глубокой нефтяной шахты. +block.gravillaso-overdrive-drill.name = Перегруженый бур +block.gravillaso-overdrive-drill.description = [red]В разработке ###Blocks-Liquids block.gravillaso-gravitium-conduit.name = Гравитиумовый трубопровод block.gravillaso-gravitium-conduit.description = Передвигает жидкости вперёд. Работает быстреее чем пульсовой трубопровод. @@ -52,6 +54,7 @@ block.gravillaso-anxiety.name = Тревожность block.gravillaso-anxiety.description = Турель использующая магнетизм для очень быстрого огня. block.gravillaso-arhiepiscop.name = Архиепископ block.gravillaso-arhiepiscop.description = [red]В разработке +block.gravillaso-arhiepiscop.details = Ты чувствуешь любовь? block.gravillaso-destiny.name = Провидение block.gravillaso-destiny.description = Среляет неподвижными электрическими копьями\nБыстрая перезарядка позволяет поспевать за быстрыми врагами. block.gravillaso-divine-storm.name = Божественный шторм diff --git a/content/blocks/defense/gravitol-wall-large.hjson b/content/blocks/defense/gravitol-wall-large.hjson index b4ce768..56de075 100644 --- a/content/blocks/defense/gravitol-wall-large.hjson +++ b/content/blocks/defense/gravitol-wall-large.hjson @@ -7,3 +7,5 @@ requirements: [ ] category: defense research: gravitol-wall +insulated: true +absorbLasers: true \ No newline at end of file diff --git a/content/blocks/defense/gravitol-wall.hjson b/content/blocks/defense/gravitol-wall.hjson index 5b64ac7..ff30834 100644 --- a/content/blocks/defense/gravitol-wall.hjson +++ b/content/blocks/defense/gravitol-wall.hjson @@ -7,3 +7,5 @@ requirements: [ ] category: defense research: surge-wall +insulated: true +absorbLasers: true \ No newline at end of file diff --git a/content/blocks/drills/overdrive-drill.hjson b/content/blocks/drills/overdrive-drill.hjson new file mode 100644 index 0000000..055cf12 --- /dev/null +++ b/content/blocks/drills/overdrive-drill.hjson @@ -0,0 +1,32 @@ +type: Drill +drawRim: true +health: 780 +size: 4 +liquidCpacity: 20 +itemCapacity: 20 +tier: 4 +drillTime: 187 +// gravillaso/scripts/python/drillSpeed.py -run this file with python to math this +liquidBoostIntensity: 2 +warmupSpeed: 0.01 +rotateSpeed: 7 +requirements: [ + copper/90 + thorium/75 + plastanium/55 + gravitol/25 + silicon/80 +] +consumes: { + power: 3.5 + liquid:{ + liquid:"water" + amount:0.18 + optional:true + booster:true +} +} +category: production +research: { + parent: "blast-drill" +} \ No newline at end of file diff --git a/content/blocks/environment/burning-ground-wall.hjson b/content/blocks/environment/burning-ground-wall.hjson new file mode 100644 index 0000000..140e3d5 --- /dev/null +++ b/content/blocks/environment/burning-ground-wall.hjson @@ -0,0 +1,6 @@ +type: StaticWall +name: Burning Ground Wall +variants: 2 +inEditor: true +breakable: false +targetable: false \ No newline at end of file diff --git a/content/blocks/environment/burning-ground.hjson b/content/blocks/environment/burning-ground.hjson new file mode 100644 index 0000000..5d93eb3 --- /dev/null +++ b/content/blocks/environment/burning-ground.hjson @@ -0,0 +1,10 @@ +type: Floor +name: Burning ground +variants: 4 +damageTaken: 2.75 +speedMultiplier: 0.8 +walkEffect: smeltsmoke +status: melting +statusDuration: 247 +#decoration: air +#wall: air-wall \ No newline at end of file diff --git a/content/blocks/environment/iron-wall.hjson.beta b/content/blocks/environment/iron-wall.hjson.beta index dbe21d0..74feaa8 100644 --- a/content/blocks/environment/iron-wall.hjson.beta +++ b/content/blocks/environment/iron-wall.hjson.beta @@ -1,6 +1,6 @@ -name: Obsidian Block type: StaticWall +variants: 1 +inEditor: true breakable: false -alwaysReplace: false -solid: true -variants: 1 \ No newline at end of file +targetable: false +name: TEST \ No newline at end of file diff --git a/content/blocks/power/benzine-generator.hjson b/content/blocks/power/benzine-generator.hjson new file mode 100644 index 0000000..86eed7e --- /dev/null +++ b/content/blocks/power/benzine-generator.hjson @@ -0,0 +1,27 @@ +type: SingleTypeGenerator +health: 540 +size: 3 +itemCapacity: 20 +liquidCapacity: 45 +itemDuration: 80 +powerProduction: 26 +consumes: { + items: { + items: [ + blast-compound/1 + ] + } + liquid: { + liquid: benzine + amount: 0.12 + } +} +requirements: [ +copper/90 +lead/70 +metaglass/100 +silicon/25 +thorium/40 +] +category: power +research: differential-generator \ No newline at end of file diff --git a/content/blocks/power/benzine-generator.hjson.beta b/content/blocks/power/benzine-generator.hjson.beta deleted file mode 100644 index 34bd0fa..0000000 --- a/content/blocks/power/benzine-generator.hjson.beta +++ /dev/null @@ -1,17 +0,0 @@ -type: ItemLiquidGenerator -size: 3 -explosiveness: 0.0 -heat: 0.0 -totalTime: 1 -generateTime: 80.0 -productionEfficiency: 4.0 -powerProduction - -requirements: [ -thorium/90 -metaglass/400 -titanium/100 -lead/70 -] -category: power -research: duo \ No newline at end of file diff --git a/content/blocks/production/benzine-barrel.hjson b/content/blocks/production/benzine-barrel.hjson index 149d253..c55c9b0 100644 --- a/content/blocks/production/benzine-barrel.hjson +++ b/content/blocks/production/benzine-barrel.hjson @@ -22,7 +22,7 @@ requirements: [ silicon/35 metaglass/70 ] -outputLiquid: benzine/5 +outputLiquid: benzine/2.5 research: { parent: "cryofluid-mixer" } \ No newline at end of file diff --git a/content/blocks/cores/molecular-core.hjson b/content/blocks/storages/molecular-core.hjson similarity index 100% rename from content/blocks/cores/molecular-core.hjson rename to content/blocks/storages/molecular-core.hjson diff --git a/content/blocks/turrets/arhiepiscop.hjson b/content/blocks/turrets/arhiepiscop.hjson new file mode 100644 index 0000000..8550f7d --- /dev/null +++ b/content/blocks/turrets/arhiepiscop.hjson @@ -0,0 +1,32 @@ +type: PowerTurret +health: 1360 +size: 3 +reloadTime: 20 +inaccuracy: 0 +range: 165 +powerUse: 16 +heatColor: "5c5c02" +shootType:{ + type: LightningBulletType + lightningColor: "#f2f2c4" + lightningLength: 26 + speed: 0.001 + lifetime: 50 + damage: 58 + x: 0 + y: 0 + buildingDamageMultiplier: 0.75 +} +requirements: [ + graphite/220 + metaglass/230 + phase-fabric/120 + surge-alloy/220 +] +coolantMultiplier: 8 +shootSound: spark +shootEffect: redgeneratespark +targetAir: false +targetGround: true +category: turret +research: destiny \ No newline at end of file diff --git a/content/blocks/turrets/divine-storm.hjson b/content/blocks/turrets/divine-storm.hjson index 0c18c20..5f2e0bb 100644 --- a/content/blocks/turrets/divine-storm.hjson +++ b/content/blocks/turrets/divine-storm.hjson @@ -19,14 +19,15 @@ ammoTypes: { shootEffect: shootSmall smokeEffect: shootSmallSmoke ammoMultiplier: 1 + homingPower: 0 } - coal: { + scrap: { type: BasicBulletType lifetime: 120 - speed: 2 - damage: 3 - width: 3 - height: 6 + speed: 3 + damage: 7 + width: 4 + height: 7 shootEffect: shootSmall smokeEffect: shootSmallSmoke ammoMultiplier: 1 @@ -36,8 +37,8 @@ ammoTypes: { lifetime: 280 speed: 4.75 damage: 16 - width: 3 - height: 6 + width: 4 + height: 7 shootEffect: shootSmall smokeEffect: shootSmallSmoke } @@ -60,7 +61,7 @@ requirements: [ ] category: turret research: { - parent: scatter + parent: duo requirements: [ copper/2500 metaglass/150 diff --git a/content/blocks/turrets/renunciation.hjson b/content/blocks/turrets/renunciation.hjson index 898230d..c907af4 100644 --- a/content/blocks/turrets/renunciation.hjson +++ b/content/blocks/turrets/renunciation.hjson @@ -110,11 +110,4 @@ requirements: [ category: turret research: { parent: swarmer - requirements: [ - graphite/9500 - thorium/7600 - gravitol/2340 - surge-alloy/2980 - magneturn/1620 - ] } \ No newline at end of file diff --git a/mod.json b/mod.json index 09094e1..82553e0 100644 --- a/mod.json +++ b/mod.json @@ -2,7 +2,7 @@ name: "gravillaso" displayName: "[purple]Gravillaso[white] Mod" author: "[orange]NickName73" description: "Gravillaso - mod based on magnetic materials\n\n\nDevelopers: \nNickName73\nCREAsTIVE\nSpriters:\nRadmir Yakupov\nCat fat" -version: " 0.12.3b" +version: " 0.12.4b" minGameVersion: "120" dependencies: [ ] \ No newline at end of file diff --git a/sprites/blocks/drills/overdrive-drill/overdrive-drill-item.png b/sprites/blocks/drills/overdrive-drill/overdrive-drill-item.png new file mode 100644 index 0000000..02b9a2e Binary files /dev/null and b/sprites/blocks/drills/overdrive-drill/overdrive-drill-item.png differ diff --git a/sprites/blocks/drills/overdrive-drill/overdrive-drill-rim.png b/sprites/blocks/drills/overdrive-drill/overdrive-drill-rim.png index 239bd75..6b03d73 100644 Binary files a/sprites/blocks/drills/overdrive-drill/overdrive-drill-rim.png and b/sprites/blocks/drills/overdrive-drill/overdrive-drill-rim.png differ diff --git a/sprites/blocks/drills/overdrive-drill/overdrive-drill-top.png b/sprites/blocks/drills/overdrive-drill/overdrive-drill-top.png index 814f622..e2f1656 100644 Binary files a/sprites/blocks/drills/overdrive-drill/overdrive-drill-top.png and b/sprites/blocks/drills/overdrive-drill/overdrive-drill-top.png differ diff --git a/sprites/blocks/environment/burning-ground-wall-large.png b/sprites/blocks/environment/burning-ground-wall-large.png new file mode 100644 index 0000000..2b5f470 Binary files /dev/null and b/sprites/blocks/environment/burning-ground-wall-large.png differ diff --git a/sprites/blocks/environment/burning-ground-wall1.png b/sprites/blocks/environment/burning-ground-wall1.png new file mode 100644 index 0000000..4ff772c Binary files /dev/null and b/sprites/blocks/environment/burning-ground-wall1.png differ diff --git a/sprites/blocks/environment/burning-ground-wall2.png b/sprites/blocks/environment/burning-ground-wall2.png new file mode 100644 index 0000000..cb222dd Binary files /dev/null and b/sprites/blocks/environment/burning-ground-wall2.png differ diff --git a/sprites/blocks/environment/burning-ground1.png b/sprites/blocks/environment/burning-ground1.png new file mode 100644 index 0000000..fa3ddab Binary files /dev/null and b/sprites/blocks/environment/burning-ground1.png differ diff --git a/sprites/blocks/environment/burning-ground2.png b/sprites/blocks/environment/burning-ground2.png new file mode 100644 index 0000000..7f2f5a5 Binary files /dev/null and b/sprites/blocks/environment/burning-ground2.png differ diff --git a/sprites/blocks/environment/burning-ground3.png b/sprites/blocks/environment/burning-ground3.png new file mode 100644 index 0000000..3a11f84 Binary files /dev/null and b/sprites/blocks/environment/burning-ground3.png differ diff --git a/sprites/blocks/environment/burning-ground4.png b/sprites/blocks/environment/burning-ground4.png new file mode 100644 index 0000000..993ec0a Binary files /dev/null and b/sprites/blocks/environment/burning-ground4.png differ diff --git a/sprites/blocks/power/benzine-generator-liquid.png b/sprites/blocks/power/benzine-generator-liquid.png new file mode 100644 index 0000000..3b4b636 Binary files /dev/null and b/sprites/blocks/power/benzine-generator-liquid.png differ diff --git a/sprites/blocks/power/benzine-generator-top.png b/sprites/blocks/power/benzine-generator-top.png new file mode 100644 index 0000000..8b4e86b Binary files /dev/null and b/sprites/blocks/power/benzine-generator-top.png differ diff --git a/sprites/blocks/power/benzine-generator.png b/sprites/blocks/power/benzine-generator.png new file mode 100644 index 0000000..b74a651 Binary files /dev/null and b/sprites/blocks/power/benzine-generator.png differ diff --git a/sprites/blocks/cores/molecular-core-team.png b/sprites/blocks/storages/molecular-core-team.png similarity index 100% rename from sprites/blocks/cores/molecular-core-team.png rename to sprites/blocks/storages/molecular-core-team.png diff --git a/sprites/blocks/cores/molecular-core.png b/sprites/blocks/storages/molecular-core.png similarity index 100% rename from sprites/blocks/cores/molecular-core.png rename to sprites/blocks/storages/molecular-core.png diff --git a/sprites/blocks/turrets/arhiepiscop-heat.png b/sprites/blocks/turrets/arhiepiscop-heat.png new file mode 100644 index 0000000..ad282bf Binary files /dev/null and b/sprites/blocks/turrets/arhiepiscop-heat.png differ diff --git a/sprites/blocks/turrets/arhiepiscop.png b/sprites/blocks/turrets/arhiepiscop.png new file mode 100644 index 0000000..e310371 Binary files /dev/null and b/sprites/blocks/turrets/arhiepiscop.png differ diff --git a/sprites/units/weapon/ambience-old.png b/sprites/units/weapon/ambience-old.png new file mode 100644 index 0000000..8839911 Binary files /dev/null and b/sprites/units/weapon/ambience-old.png differ diff --git a/sprites/units/weapon/ambience.png b/sprites/units/weapon/ambience.png index 8839911..d42728e 100644 Binary files a/sprites/units/weapon/ambience.png and b/sprites/units/weapon/ambience.png differ