-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #35 from Kanaede/main
Master Update
- Loading branch information
Showing
15 changed files
with
266 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| { | ||
| "type":"ItemTurret", | ||
| "category":"turret", | ||
| "health":46000, | ||
| "size":12, | ||
| "range":1200, | ||
| "maxAmmo":2, | ||
| "ammoPerShot":1, | ||
| "reload":1500, | ||
| "cooldown":1200, | ||
| "shake":5, | ||
| "tergetAir":true, | ||
| "tergetGround":true, | ||
| "ammoUseEffect":"none", | ||
| "rotateSpeed": 0.3, | ||
| "shootSound":"sniper-short", | ||
| "displayAmmoMultiplier":false, | ||
| "minRange":180, | ||
| "coolantMultiplier":0.5, | ||
| "predictTarget":true, | ||
| "ammoTypes":{ | ||
| "fuse-stone":{ | ||
| "type":"BasicBulletType", | ||
| "height":70, | ||
| "width":50, | ||
| "lifetime":9, | ||
| "speed":150, | ||
| "ammoMultiplier":1, | ||
| "damage":70000, | ||
| "splashDamage":26000, | ||
| "scaledSplashDamage": true, | ||
| "splashDamageRadius": 600, | ||
| "frontColor": "FFFFFFFF", | ||
| "backColor": "FCC01CFF", | ||
| "hitEffect": "hitBulletBig", | ||
| "despawnEffect": "flakExplosion", | ||
| "buildingDamageMultiplier": 0.5, | ||
| "smokeEffect": "shootBigSmoke", | ||
| "hittable":false, | ||
| "trailChance": 1, | ||
| "trailRotation": true, | ||
| "predictTarget":false, | ||
| "trailEffect": { | ||
| "type":"multiEffect", | ||
| "effects":[ | ||
| { | ||
| "type": "ParticleEffect", | ||
| "particles": 1, | ||
| "sizeFrom": 100, | ||
| "sizeTo": 50, | ||
| "length":1, | ||
| "lifetime": 40, | ||
| "colorFrom": "FCC01CFF", | ||
| "colorTo": "FCC01C00", | ||
| "region": "turret-expansion-rail", | ||
| "sinScl":0 | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| }, | ||
| "requirements":[ | ||
| "copper/8000", | ||
| "lead/8200", | ||
| "metaglass/7900", | ||
| "thorium/6700", | ||
| "plastanium/5200", | ||
| "surge-alloy/3000" | ||
| ], | ||
| "research":"foreshadow", | ||
| "consumes":{ | ||
| "power":40, | ||
| "coolant":{ | ||
| "amount":1.2 | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| { | ||
| "type":"GenericCrafter", | ||
| "category":"crafting", | ||
| "hasPower":true, | ||
| "hasLiquid":true, | ||
| "size":4, | ||
| "craftTime":300, | ||
| "outputItem":"fuse-stone", | ||
| "consumes":{ | ||
| "power":100, | ||
| "items":[ | ||
| {"item":"titanium","amount":60}, | ||
| {"item":"plastanium","amount":40}, | ||
| {"item":"surge-alloy","amount":40} | ||
| ], | ||
| "liquid":"slag/1" | ||
| }, | ||
| "requirements":[ | ||
| {"item":"thorium","amount":400}, | ||
| {"item":"plastanium","amount":270}, | ||
| {"item":"phase-fabric","amount":430} | ||
| ], | ||
| "research":"alloy-smelter", | ||
| "drawer":{ | ||
| "type":"MultiDraw", | ||
| "drawers":[ | ||
| { | ||
| "type": "DrawParticles", | ||
| "color": "9681fb", | ||
| "alpha": 0.4, | ||
| "blending": "additive", | ||
| "particleSize": 4, | ||
| "particleRad": 16, | ||
| "particles": 43, | ||
| "fadeMargin": 0.8, | ||
| "rotateScl": 4, | ||
| "particleLife": 40 | ||
| }, | ||
| { | ||
| "type": "DrawCrucibleFlame", | ||
| "flameColor": "9681fb", | ||
| "midColor": "bf92f9", | ||
| "alpha": 0.6, | ||
| "particleSize": 4, | ||
| "particleRad": 11, | ||
| "particles": 43, | ||
| "fadeMargin": 0.8, | ||
| "rotateScl": 4, | ||
| "particleLife": 80 | ||
| }, | ||
| { | ||
| "type": "DrawPlasma", | ||
| "suffix": "-plasma-", | ||
| "plasma1": "9681fb", | ||
| "plasma2": "bf92f9" | ||
| }, | ||
| { | ||
| "type": "DrawDefault" | ||
| } | ||
| ] | ||
| }, | ||
| "effectChance": 0.5, | ||
| "generateEffectRange": 1, | ||
| "generateEffect": { | ||
| "type": "RadialEffect", | ||
| "effect": { | ||
| "type": "multiEffect", | ||
| "effects": [ | ||
| { | ||
| "type": "ParticleEffect", | ||
| "particles": 3, | ||
| "lifetime": 60, | ||
| "interp": "circleOut", | ||
| "length": 30, | ||
| "cone": -8, | ||
| "sizeFrom": 3, | ||
| "sizeTo": 0, | ||
| "colorFrom": "9681fb", | ||
| "colorTo": "9681fb" | ||
| } | ||
| ] | ||
| }, | ||
| "rotationOffset": 45, | ||
| "lengthOffset": 12, | ||
| "amount": 4 | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| { | ||
| "type":"ItemTurret", | ||
| "category":"turret", | ||
| "size":5, | ||
| "reload":80, | ||
| "maxAmmo":30, | ||
| "ammoPerShot":3, | ||
| "innacuracy":10, | ||
| "velocityRnd":-1, | ||
| "xRand":2, | ||
| "targetAir":false, | ||
| "shake":2, | ||
| "rotateSpeed":3, | ||
| "range":390, | ||
| "minRange":45, | ||
| "ammoUseEffect":"casing2Double", | ||
| "shootCone":1, | ||
| "recoil":9, | ||
| "shootSound":"heavy-artillery", | ||
| "shootEffect":"shootBig2", | ||
| "shoot":{ | ||
| "type":"ShootMulti", | ||
| "source":{ | ||
| "type":"ShootAlternate", | ||
| "barrels":1, | ||
| "shots":6 | ||
| } | ||
| }, | ||
| "ammoTypes":{ | ||
| "graphite":{ | ||
| "type":"ArtilleryBulletType", | ||
| "height":20, | ||
| "width":17, | ||
| "lifetime":50, | ||
| "speed":4, | ||
| "splashDamage":60, | ||
| "splashDamageRadius":50, | ||
| "frontColor":"fff8e8ff", | ||
| "backColor":"f9c27aff", | ||
| "collidesAir":false, | ||
| "scaleLife":true, | ||
| "hitShake":2, | ||
| "ammoMultiplier":1 | ||
| } | ||
| }, | ||
| "requirements":[ | ||
| {"item":"graphite","amount":200}, | ||
| {"item":"titanium","amount":230}, | ||
| {"item":"plastanium","amount":210} | ||
| ], | ||
| "research":"ripple", | ||
| "researchMultiplier":3 | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
File renamed without changes
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.