Skip to content

Commit

Permalink
Merge branch 'develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
vampcat authored Dec 30, 2017
2 parents 936fc23 + e24fe12 commit da62f70
Show file tree
Hide file tree
Showing 34 changed files with 659 additions and 0 deletions.
3 changes: 3 additions & 0 deletions README.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
all sprites from MillionthVector are licensed under a Creative Commons Attribution 4.0 International License.
millionthvector.blogspot.id
^^^
1 change: 1 addition & 0 deletions engine/src/main/java/org/destinationsol/ModuleManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ public ModuleManager() {
requiredModules.add(registry.getLatestModuleVersion(new Name("federal")));
requiredModules.add(registry.getLatestModuleVersion(new Name("organic")));
requiredModules.add(registry.getLatestModuleVersion(new Name("tribe")));
requiredModules.add(registry.getLatestModuleVersion(new Name("deepspace")));

loadEnvironment(requiredModules);
}
Expand Down
23 changes: 23 additions & 0 deletions modules/deepspace/assets/configs/playerSpawnConfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"Alien Capital": {
"hull": "deepspace:aliencapital",
"items": "core:advancedArmor core:advancedShield core:cannon-1 core:cannon-2 ",
"money": 2000000
},
"Little Knight":{
"hull" : "deepspace:littleKnight",
"items": "99*rep core:advancedArmor core:advancedShield core:fixedGun 99*core:bulletClip",
"money": 10000
},
"Alien Attacker":{
"hull" : "deepspace:alienattacker",
"items": "99*rep core:advancedArmor-1 core:advancedShield-1 deepspace:alienGun-1 99*deepspace:alienbulletClip",
"money": 10000
},
"Alien General":{
"hull" : "deepspace:aliengeneral",
"items": "99*rep core:advancedArmor-1 core:advancedShield-1 deepspace:alienBomb-1 deepspace:alienBomb-2 99*deepspace:biobombClip",
"money": 10000
}
}

45 changes: 45 additions & 0 deletions modules/deepspace/assets/configs/projectilesConfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"biobomb": {
"dmg": 13,
"dmgType": "explosion",
"spdLen": 0,
"physSize": 0.1,
"zeroAbsSpd": true,

"tex": "biobomb",
"texSz": 0.3,

"collisionEffectBg": {
"effectFile": "core:explSmoke",
"size": 0.6,
"tex": "smoke",
"floatsUp": true,
"tint": "smoke"
},

"collisionEffect": {
"effectFile": "core:explFire",
"size": 0.4,
"tex": "fire",
"tint": "fire"
},

"collisionSound": "core:shipExplosion"
},

"alienbullet": {
"dmg": 5,
"spdLen": 10,
"dmgType": "bullet",

"tex": "alienbullet",
"texSz": 0.02,
"stretch": true,
"collisionEffect": {
"effectFile": "core:spark",
"size": 0.5,
"tex": "spark",
"tint": "fire"
}
}
}
10 changes: 10 additions & 0 deletions modules/deepspace/assets/configs/startingStation.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"hull": "deepspace:deepspaceStation",
"items": "core:gun core:gun",

"guard": {
"hull": "deepspace:alienAttacker",
"items": "core:fixedGun core:fixedShotGun core:mediumArmor+core:heavyArmor core:shield+core:bigShield",
"density": 3
}
}
19 changes: 19 additions & 0 deletions modules/deepspace/assets/configs/systemsConfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"hard": {
"hard": true,
"constantAllies": [
{
"hull": "deepspace:deepspaceStation",
"items": "core:cannon core:gun",
"repairer": true,
"density": 1,

"guard":{
"hull": "core:imperialSmall",
"items": "core:advancedArmor core:advancedShield deepspace:aliengun",
"density": 4
}
}
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"projectile": "alienbullet",
"size": 65,
"price": 20,
"displayName": "alienBullets",
"plural": "alienbullets",
"iconName": "alienbulletClip"
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"projectile": "biobomb",
"size": 35,
"price": 30,
"displayName": "BioBombs",
"plural": "biobombs",
"iconName": "biobombClip"
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions modules/deepspace/assets/items/guns/alienBomb/alienBomb.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*
Ship sprite from MillionthVector is licensed under a Creative Commons Attribution 4.0 International License.
millionthvector.blogspot.id
*/

{
"fixed": true,
"maxAngleVar": 25,
"angleVarDamp": 6,
"angleVarPerShot": 2,
"timeBetweenShots": 0.27,
"reloadTime": 1,
"price": 350,
"clipName": "deepspace:biobombClip",
"gunLength": 0.26,
"texLenPerc": 0.87,
"displayName": "Alien Bomb",
"shootSounds": [
"core:rocketLauncherShoot"
],
"shootSoundPitch": 0.8,
"reloadSounds": [
"core:rocketLauncherReload"
]
}
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.
19 changes: 19 additions & 0 deletions modules/deepspace/assets/items/guns/alienGun/alienGun.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"maxAngleVar": 10,
"angleVarDamp": 6,
"angleVarPerShot": 1,
"timeBetweenShots": 0.13,
"reloadTime": 1,
"price": 120,
"clipName": "deepspace:alienbulletClip",
"gunLength": 0.16,
"texLenPerc": 0.7,
"displayName": "Alien Gun",
"lightOnShot": true,
"shootSounds": [
"core:waveGun"
],
"reloadSounds": [
"core:gunReload"
]
}
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.
97 changes: 97 additions & 0 deletions modules/deepspace/assets/ships/alienAttacker/alienattacker.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
/*
Ship sprite from MillionthVector is licensed under a Creative Commons Attribution 4.0 International License.
millionthvector.blogspot.id
*/


{
"size": 0.6,
"maxLife": 70,
"type": "std",
"price": 400,
"hirePrice": 700,
"ability": {
"type": "sloMo",
"factor": 0.4,
"rechargeTime": 5
},
"e1Pos": "0.15 0.42",
"e2Pos": "0.15 0.52",
"displayName": "Fighter",
"engine": "core:imperialEngine",
"gunSlots": [
{
"position": "0.6 0.7",
"isUnderneathHull": true,
"allowsRotation": true
}
],
"rigidBody": {
"origin":{"x":0.8,"y":0.67},
"polygons":[[
{
"x":0.8525000214576721,
"y":0.6737500429153442
},
{
"x":0.6124999523162842,
"y":0.71875
},
{
"x":0.12999996542930603,
"y":0.57874995470047
},
{
"x":0.13499999046325684,
"y":0.4337500035762787
},
{
"x":0.6549999713897705,
"y":0.26875001192092896
},
{
"x":0.8650000095367432,
"y":0.3387500047683716
},
{
"x":0.8950000405311584,
"y":0.5137500166893005
}
]],
"circles":[
],
"shapes":[{
"type":"POLYGON",
"vertices":[
{
"x":0.8525000214576721,
"y":0.6737500429153442
},
{
"x":0.6124999523162842,
"y":0.71875
},
{
"x":0.12999996542930603,
"y":0.57874995470047
},
{
"x":0.13499999046325684,
"y":0.4337500035762787
},
{
"x":0.6549999713897705,
"y":0.26875001192092896
},
{
"x":0.8650000095367432,
"y":0.3387500047683716
},
{
"x":0.8950000405311584,
"y":0.5137500166893005
}
]
}]
}
}
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

0 comments on commit da62f70

Please sign in to comment.