Skip to content

Commit

Permalink
Merge pull request #26 from Sh1penfire/testing
Browse files Browse the repository at this point in the history
Balancing changes/QoL changes
  • Loading branch information
Eschatologue authored Apr 22, 2021
2 parents 3aec1ac + f47db06 commit 3d8f24c
Show file tree
Hide file tree
Showing 43 changed files with 512 additions and 297 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/Changelog.md
7 changes: 4 additions & 3 deletions bundles/bundle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,10 @@ block.heavy-armaments-t3-1_beam.name = Silence
block.heavy-armaments-t3-1_beam.description = Launches 'EMP' energy shells which temporarly disables enemy unit.
block.heavy-armaments-t3-1_beam.details = Based on ancient blueprints found deep beneath the ruins of 'London' in Terra. 'Quell your voice, silence your heart' was written in its blueprint.

block.heavy-armaments-t3-2_beam.name = Zounderkite
block.heavy-armaments-t3-2_beam.description = Deploys deadly aerial mine over long distance.
block.heavy-armaments-t3-2_beam.details = Launches devastating aerial mine that seeks targets dumb enough to get close, hence its name 'Zounderkite'.
;MineLauncher
block.heavy-armaments-t3_minelauncher.name = Zounderkite
block.heavy-armaments-t3_minelauncher.description = Deploy mines over distance. Mine effects varies based on ammo.
block.heavy-armaments-t3_minelauncher.details = Mines are banned in various nation due to its indiscriminate nature of killing both armed and innocents, although those laws doesnt applies in Serpulo since everything is trying to kill you.

;Gatlings
block.heavy-armaments-t3-1_gatling.name = Razorback
Expand Down
11 changes: 6 additions & 5 deletions content/blocks/defense/enhanced-mend-projector.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"type": "MendProjector",
"health": 1000,
"health": 600,
"size": 3,
"itemCapacity": 50,
"range": 150,
"reload": 100,
"color": "#17C50B",
"reload": 120,
"baseColor": "#17C50B",
"buildCostMultiplier": 0.5,
"healPercent": 75,
"healPercent": 55,
"consumes": {
"power": 20,
"items": {
Expand All @@ -19,6 +19,7 @@
]
}
},
//requiremenst'; {"}";,' no idea how to balance this one anyrmeo, but I tried
"requirements": [
{
"item": "phase-fabric",
Expand All @@ -34,7 +35,7 @@
},
{
"item": "titanium",
"amount": 1500
"amount": 1350
}
],
"category": "effect",
Expand Down
6 changes: 3 additions & 3 deletions content/blocks/defense/overdriver.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"size": 1,
"range": 48,
"reload": 66,
"speedBoost": 1.25,
"speedBoost": 1.225,
"buildCostMultiplier": 0.8,
"phaseRangeBoost": 60,
"speedBoostPhase": 0.5,
Expand All @@ -27,11 +27,11 @@
},
{
"item": "silicon",
"amount": 25
"amount": 20
},
{
"item": "titanium",
"amount": 50
"amount": 35
}
],
"category": "effect",
Expand Down
8 changes: 4 additions & 4 deletions content/blocks/defense/regenerator.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
"type": "MendProjector",
"health": 250,
"size": 2,
"range": 150,
"range": 165,
"reload": 18,
"phaseBoost": 2,
"color": "#17C50B",
"baseColor": "#17C50B",
"buildCostMultiplier": 0.8,
"healPercent": 0.8,
"healPercent": 0.6,
"consumes": {
"power": 2,
"items": {
Expand All @@ -23,7 +23,7 @@
"requirements": [
{
"item": "lead",
"amount": 200
"amount": 175
},
{
"item": "silicon",
Expand Down
9 changes: 4 additions & 5 deletions content/blocks/drills/stationary-excavator.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
"type": "Drill",
"size": 2,
"tier": 0,
"drillTime": 48,
"drillTime": 44,
"liquidBoostIntensity": 1,
"warmupSpeed": 0.003,
"rotateSpeed": 8,
"rotateSpeed": 9,
"consumes": {
"power": 1.5,
"power": 1.20,
"liquid": {
"liquid": "water",
"amount": 0.5
Expand All @@ -34,6 +34,5 @@
}
],
"category": "production",
"research": "laser-drill",
"idleSound": "respawning"
"research": "laser-drill"
}
2 changes: 1 addition & 1 deletion content/blocks/effect/beacon.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "LightBlock",
"BuildVisibility": "lightingOnly",
//"BuildVisibility": "lightingOnly",
"health": 250,
"size": 2,
"brightness": 0.7,
Expand Down
2 changes: 1 addition & 1 deletion content/blocks/production/carburizing-furnace.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
},
{
"item": "titanium",
"amount": 30
"amount": 25
}
]
}
Expand Down
10 changes: 5 additions & 5 deletions content/blocks/production/coal-liquefier.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
"hasPower": true,
"hasLiquids": true,
"hasItems": true,
"craftTime": 60,
"craftTime": 50,
"itemCapacity": 30,
"liquidCapacity" : 120,
"updateEffect": "oily",
"drawLiquidLight": true,
"outputLiquid": {
"liquid": "oil",
"amount": 30
"amount": 35
},
"consumes": {
"power": 1.2,
Expand All @@ -26,7 +26,7 @@
},
"liquid": {
"liquid": "water",
"amount": 0.8
"amount": 0.85
}
},
"requirements": [
Expand All @@ -36,15 +36,15 @@
},
{
"item": "titanium",
"amount": 120
"amount": 135
},
{
"item": "metaglass",
"amount": 150
},
{
"item": "plastanium",
"amount": 140
"amount": 85
}
],
"drawer": "drawMixer",
Expand Down
2 changes: 2 additions & 0 deletions content/blocks/turrets/EN/t2_beam.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
"type": "BasicBulletType",
"speed": 6,
"lifetime": 40,
"homingPower": 0.05,
"status": "shocked",
"damage": 12,
"height": 20,
"width": 8,
Expand Down
19 changes: 10 additions & 9 deletions content/blocks/turrets/EN/t3-1_beam.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"type": "PowerTurret",
"size": 3,
"health": 500,
"range": 480,
"reloadTime": 120,
"inaccuracy": 3,
"shots": 1,
"range": 260,
"reloadTime": 165,
"shots": 3,
"burstSpacing": 12,
"inaccuracy": 7,
"targetAir": false,
"targetGround": true,
"shootCone": 1,
"spread": 2,
"recoil": 9,
"restitution": 0.05,
"rotateSpeed": 3,
"shootSound": "laser",
Expand All @@ -19,20 +19,21 @@
"shootType": {
"type": "ArtilleryBulletType",
"status": {
"name": "EMP",
"name": "HAI-EMP",
"localizedName" : "EMP",
"speedMultiplier": 0.2,
"reloadMultiplier": 0,
"effect": "hitFuse"
},
"damage": 15,
"speed": 3,
"splashDamage": 90,
"speed": 3.5,
"splashDamage": 25,
"splashDamageRadius": 64,
"statusDuration": 90,
"height": 35,
"width": 15,
"lifetime": 90,
"lightning": 8,
"lightning": 10,
"lightningLength": 12,
"frontColor": "E8D174",
"backColor": "F3E979",
Expand Down
90 changes: 0 additions & 90 deletions content/blocks/turrets/EN/t3-2_beam.json

This file was deleted.

Loading

0 comments on commit 3d8f24c

Please sign in to comment.