Skip to content

Commit

Permalink
tons of minor fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@sayterdarkwynd
sayterdarkwynd committed Sep 15, 2016
1 parent f398355 commit 7b66e9e
Show file tree
Hide file tree
Showing 92 changed files with 337 additions and 207 deletions.
172 changes: 54 additions & 118 deletions dungeons/other/outpost/scienceoutpost.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@
"y":1040
},
{
"gid":5141,
"gid":2147488789,
"height":40,
"id":5264,
"name":"",
Expand All @@ -235,8 +235,8 @@
"type":"",
"visible":true,
"width":40,
"x":1576,
"y":920
"x":1288,
"y":1032
},
{
"gid":5132,
Expand Down Expand Up @@ -382,22 +382,6 @@
"x":1720,
"y":1032
},
{
"gid":2147488353,
"height":16,
"id":5278,
"name":"",
"properties":
{

},
"rotation":0,
"type":"",
"visible":true,
"width":42,
"x":1480,
"y":920
},
{
"gid":2147487492,
"height":40,
Expand Down Expand Up @@ -1726,22 +1710,6 @@
"x":1856,
"y":728
},
{
"gid":2147485427,
"height":16,
"id":5378,
"name":"",
"properties":
{

},
"rotation":0,
"type":"",
"visible":true,
"width":40,
"x":1656,
"y":920
},
{
"gid":1751,
"height":32,
Expand Down Expand Up @@ -1934,22 +1902,6 @@
"x":1416,
"y":1064
},
{
"gid":5138,
"height":24,
"id":5391,
"name":"",
"properties":
{

},
"rotation":0,
"type":"",
"visible":true,
"width":24,
"x":1624,
"y":920
},
{
"gid":3703,
"height":96,
Expand Down Expand Up @@ -2046,22 +1998,6 @@
"x":1432,
"y":904
},
{
"gid":2147488730,
"height":15,
"id":5399,
"name":"",
"properties":
{

},
"rotation":0,
"type":"",
"visible":true,
"width":33,
"x":1656,
"y":904
},
{
"gid":1636,
"height":56,
Expand Down Expand Up @@ -2687,7 +2623,7 @@
"y":808
},
{
"gid":2147484014,
"gid":366,
"height":40,
"id":5443,
"name":"",
Expand All @@ -2699,7 +2635,7 @@
"type":"",
"visible":true,
"width":32,
"x":1272,
"x":1240,
"y":1032
},
{
Expand Down Expand Up @@ -2878,22 +2814,6 @@
"x":2840,
"y":1032
},
{
"gid":2147488895,
"height":16,
"id":5458,
"name":"",
"properties":
{

},
"rotation":0,
"type":"",
"visible":true,
"width":24,
"x":1488,
"y":904
},
{
"gid":3568,
"height":8,
Expand Down Expand Up @@ -3307,8 +3227,8 @@
"type":"",
"visible":true,
"width":32,
"x":1792,
"y":904
"x":1584,
"y":896
},
{
"gid":4917,
Expand Down Expand Up @@ -4111,7 +4031,7 @@
"y":784
},
{
"gid":5483,
"gid":5485,
"height":16,
"id":5555,
"name":"",
Expand All @@ -4127,7 +4047,7 @@
"y":752
},
{
"gid":2147489131,
"gid":2147489133,
"height":16,
"id":5557,
"name":"",
Expand All @@ -4143,7 +4063,7 @@
"y":752
},
{
"gid":5483,
"gid":5485,
"height":16,
"id":5558,
"name":"",
Expand All @@ -4159,7 +4079,7 @@
"y":752
},
{
"gid":2147489131,
"gid":2147489133,
"height":16,
"id":5559,
"name":"",
Expand All @@ -4175,7 +4095,7 @@
"y":752
},
{
"gid":5483,
"gid":5485,
"height":16,
"id":5560,
"name":"",
Expand All @@ -4191,7 +4111,7 @@
"y":792
},
{
"gid":2147489131,
"gid":2147489133,
"height":16,
"id":5561,
"name":"",
Expand All @@ -4207,7 +4127,7 @@
"y":792
},
{
"gid":5483,
"gid":5485,
"height":16,
"id":5562,
"name":"",
Expand All @@ -4223,7 +4143,7 @@
"y":792
},
{
"gid":2147489131,
"gid":2147489133,
"height":16,
"id":5563,
"name":"",
Expand Down Expand Up @@ -4735,7 +4655,7 @@
"y":960
},
{
"gid":2147489347,
"gid":2147489349,
"height":24,
"id":5951,
"name":"",
Expand All @@ -4751,7 +4671,7 @@
"y":960
},
{
"gid":2147489348,
"gid":2147489350,
"height":24,
"id":5952,
"name":"",
Expand Down Expand Up @@ -5361,7 +5281,7 @@
{
"gid":2147488901,
"height":56,
"id":6084,
"id":6085,
"name":"",
"properties":
{
Expand All @@ -5371,13 +5291,13 @@
"type":"",
"visible":true,
"width":56,
"x":1224,
"y":1000
"x":1200,
"y":920
},
{
"gid":2147488901,
"height":56,
"id":6085,
"gid":2147488882,
"height":46,
"id":6086,
"name":"",
"properties":
{
Expand All @@ -5386,14 +5306,30 @@
"rotation":0,
"type":"",
"visible":true,
"width":56,
"x":1208,
"width":88,
"x":1728,
"y":920
},
{
"gid":2147488882,
"height":46,
"id":6086,
"gid":2147488947,
"height":34,
"id":6091,
"name":"",
"properties":
{

},
"rotation":0,
"type":"",
"visible":true,
"width":43,
"x":1472,
"y":920
},
{
"gid":2147488946,
"height":48,
"id":6093,
"name":"",
"properties":
{
Expand All @@ -5403,7 +5339,7 @@
"type":"",
"visible":true,
"width":88,
"x":1704,
"x":1632,
"y":920
}],
"opacity":1,
Expand Down Expand Up @@ -6214,8 +6150,8 @@
"type":"",
"visible":true,
"width":8,
"x":1632,
"y":880
"x":1592,
"y":896
},
{
"height":8,
Expand Down Expand Up @@ -6452,8 +6388,8 @@
"type":"",
"visible":true,
"width":8,
"x":1312,
"y":984
"x":1368,
"y":992
},
{
"height":8,
Expand Down Expand Up @@ -6741,7 +6677,7 @@
"x":0,
"y":0
}],
"nextobjectid":6088,
"nextobjectid":6094,
"orientation":"orthogonal",
"properties":
{
Expand Down Expand Up @@ -6855,19 +6791,19 @@
"source":"..\/..\/..\/tilesets\/frackinuniverse-custom\/fu_stations.json"
},
{
"firstgid":5298,
"firstgid":5300,
"source":"..\/..\/..\/..\/..\/assets\/packed\/tilesets\/packed\/objects-by-category\/wire.json"
},
{
"firstgid":5483,
"firstgid":5485,
"source":"..\/..\/..\/..\/..\/assets\/packed\/tilesets\/packed\/objects-by-colonytag\/ancient.json"
},
{
"firstgid":5588,
"firstgid":5590,
"source":"..\/..\/..\/tilesets\/frackinuniverse-custom\/fumaterials2.json"
},
{
"firstgid":5683,
"firstgid":5685,
"source":"..\/..\/..\/..\/..\/assets\/packed\/tilesets\/packed\/objects-by-colonytag\/outpost.json"
}],
"tilewidth":8,
Expand Down
2 changes: 1 addition & 1 deletion items/active/weapons/ranged/abilities/lunarishrapnelbomb/lunarishrapnelbomb.weaponability
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"projectileType" : "starburst",
"projectileParameters" : { "speed" : 25 },

"baseDamage" : 6,
"baseDamage" : 7,
"energyUsage" : 40,

"fireTime" : 2.0,
Expand Down
Loading

0 comments on commit 7b66e9e

Please sign in to comment.