Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: ohgoditburns/starbound
base: 978afdd01b55941122c7bed68aea5a449b20e9ea
...
head fork: ohgoditburns/starbound
compare: 4b30fa7290fccc38be4092ccd97d5ccfa6c31a03
  • 11 commits
  • 3,343 files changed
  • 1 commit comment
  • 1 contributor
Showing with 5,326 additions and 1,432 deletions.
  1. +1 −1  assets/animations/coldbreath/coldbreath.animation
  2. +7 −0 assets/animations/lightsmoke/lightsmoke.animation
  3. +6 −0 assets/animations/lightsmoke/lightsmoke.frames
  4. +1 −1  assets/animations/muzzleflash/bloodvomitmuzzle/bloodvomitmuzzle.animation
  5. +1 −1  assets/animations/muzzleflash/bulletmuzzle1/bulletmuzzle1.animation
  6. +1 −1  assets/animations/muzzleflash/bulletmuzzle2/bulletmuzzle2.animation
  7. +1 −1  assets/animations/muzzleflash/bulletmuzzle3/bulletmuzzle3.animation
  8. +1 −1  assets/animations/muzzleflash/bulletmuzzle4/bulletmuzzle4.animation
  9. +1 −1  assets/animations/muzzleflash/electromuzzle/electromuzzle.animation
  10. +1 −1  assets/animations/muzzleflash/flamemuzzle/flamemuzzle.animation
  11. +1 −1  assets/animations/muzzleflash/plasmamuzzle1/plasmamuzzle1.animation
  12. +1 −1  assets/animations/muzzleflash/plasmamuzzle2/plasmamuzzle2.animation
  13. +1 −1  assets/animations/muzzleflash/plasmamuzzle3/plasmamuzzle3.animation
  14. +1 −1  assets/animations/muzzleflash/plasmamuzzle4/plasmamuzzle4.animation
  15. +1 −1  assets/animations/muzzleflash/plasmamuzzle5/plasmamuzzle5.animation
  16. +1 −1  assets/animations/muzzleflash/smokemuzzle/smokemuzzle.animation
  17. +1 −1  assets/animations/muzzleflash/tankflashmuzzle/tankflashmuzzle.animation
  18. +1 −1  assets/animations/penguingeneralspawn/penguingeneralspawn.animation
  19. +1 −1  assets/animations/penguintankspawn/penguintankspawn.animation
  20. +1 −1  assets/animations/penguintrooperspawn/penguintrooperspawn.animation
  21. +7 −0 assets/animations/sparkles/shieldspark.animation
  22. +1 −1  assets/assets.config
  23. +2 −0  assets/biomes/space/asteroids.spacebiome
  24. +16 −56 assets/biomes/surface/arctic/arctic.surfacebiome
  25. +14 −39 assets/biomes/surface/arid/arid.surfacebiome
  26. +12 −31 assets/biomes/surface/asteroidfield/asteroidfield.surfacebiome
  27. +15 −46 assets/biomes/surface/barren/barren.surfacebiome
  28. +15 −43 assets/biomes/surface/desert/desert.surfacebiome
  29. +11 −11 assets/biomes/surface/forest/forest.parallax
  30. +17 −69 assets/biomes/surface/forest/forest.surfacebiome
  31. +17 −71 assets/biomes/surface/grasslands/grasslands.surfacebiome
  32. +3 −1 assets/biomes/surface/jungle/jungle.parallax
  33. +14 −53 assets/biomes/surface/jungle/jungle.surfacebiome
  34. +13 −41 assets/biomes/surface/magma/magma.surfacebiome
  35. +12 −32 assets/biomes/surface/moon/moon.surfacebiome
  36. +10 −21 assets/biomes/surface/ocean/ocean.surfacebiome
  37. +78 −0 assets/biomes/surface/outpost/asteroidfield.parallax
  38. +6 −0 assets/biomes/surface/outpost/moon.undergroundparallax
  39. +103 −0 assets/biomes/surface/outpost/outpost.surfacebiome
  40. +16 −64 assets/biomes/surface/savannah/savannah.surfacebiome
  41. +17 −63 assets/biomes/surface/snow/snow.surfacebiome
  42. +15 −52 assets/biomes/surface/tentacles/tentacles.surfacebiome
  43. +17 −56 assets/biomes/surface/tundra/tundra.surfacebiome
  44. +13 −44 assets/biomes/surface/volcanic/volcanic.surfacebiome
  45. +3 −2 assets/biomes/surface_detached/ariddetached/aridbones.surfacebiome
  46. +2 −2 assets/biomes/surface_detached/ariddetached/shrubby.surfacebiome
  47. +2 −2 assets/biomes/surface_detached/desertdetached/bones/bones.surfacebiome
  48. +2 −2 assets/biomes/surface_detached/desertdetached/colourful/colourful.surfacebiome
  49. +2 −2 assets/biomes/surface_detached/desertdetached/oasis/oasis.surfacebiome
  50. +2 −2 assets/biomes/surface_detached/desertdetached/sandstone/sandstone.surfacebiome
  51. +2 −2 assets/biomes/surface_detached/desertdetached/tar/tar.surfacebiome
  52. +3 −2 assets/biomes/surface_detached/forestdetached/charred/charred.surfacebiome
  53. +2 −2 assets/biomes/surface_detached/forestdetached/eyepatch/eyepatch.surfacebiome
  54. +2 −0  assets/biomes/surface_detached/forestdetached/flowers/flowers.surfacebiome
  55. +2 −0  assets/biomes/surface_detached/forestdetached/mushroompatch/mushroompatch.surfacebiome
  56. +2 −0  assets/biomes/surface_detached/forestdetached/rocky/rocky.surfacebiome
  57. +2 −0  assets/biomes/surface_detached/forestdetached/toxicplains/toxicplains.surfacebiome
  58. +3 −0  assets/biomes/surface_detached/jungledetached/flesh/flesh.surfacebiome
  59. +2 −0  assets/biomes/surface_detached/jungledetached/giantflowers/giantflowers.surfacebiome
  60. +2 −0  assets/biomes/surface_detached/magmadetached/crystalline/crystalline.surfacebiome
  61. +2 −0  assets/biomes/surface_detached/magmadetached/rust/rust.surfacebiome
  62. +2 −0  assets/biomes/surface_detached/snowdetached/geometric/geometric.surfacebiome
  63. +3 −0  assets/biomes/surface_detached/snowdetached/ice/ice.surfacebiome
  64. +2 −0  assets/biomes/surface_detached/snowdetached/orb/orb.surfacebiome
  65. +2 −2 assets/biomes/surface_detached/snowdetached/spring/spring.surfacebiome
  66. +3 −0  assets/biomes/underground/generic/bottom/rock04layer.undergroundbiome
  67. +3 −0  assets/biomes/underground/generic/bottom/rock12layer.undergroundbiome
  68. +3 −0  assets/biomes/underground/generic/bottom/rock14layer.undergroundbiome
  69. +3 −0  assets/biomes/underground/generic/bottom/rock15layer.undergroundbiome
  70. +3 −0  assets/biomes/underground/generic/bottom/rock17layer.undergroundbiome
  71. +2 −0  assets/biomes/underground/generic/core/blaststonecorelayer.corebiome
  72. +2 −0  assets/biomes/underground/generic/core/magmarockcorelayer.corebiome
  73. +2 −0  assets/biomes/underground/generic/core/obisidiancorelayer.corebiome
  74. +3 −0  assets/biomes/underground/generic/middle/rock01layer.undergroundbiome
  75. +1 −0  assets/biomes/underground/generic/middle/rock02.undergroundbiome
  76. +1 −0  assets/biomes/underground/generic/middle/rock03.undergroundbiome
  77. +1 −0  assets/biomes/underground/generic/middle/rock19.undergroundbiome
  78. +3 −0  assets/biomes/underground/generic/middle/rock20.undergroundbiome
  79. +3 −0  assets/biomes/underground/generic/top/claylayer.undergroundbiome
  80. +3 −0  assets/biomes/underground/generic/top/drydirtlayer.undergroundbiome
  81. +3 −0  assets/biomes/underground/generic/top/drysandlayer.undergroundbiome
  82. +3 −0  assets/biomes/underground/generic/top/gravellayer.undergroundbiome
  83. +3 −0  assets/biomes/underground/generic/top/mudlayer.undergroundbiome
  84. +3 −0  assets/biomes/underground/generic/top/sandlayer.undergroundbiome
  85. +3 −0  assets/biomes/underground/generic/top/sandstonelayer.undergroundbiome
  86. +3 −0  assets/biomes/underground/undergroundtest/undergroundtest1.undergroundbiome
  87. +3 −0  assets/biomes/underground/undergroundtest/undergroundtest2.undergroundbiome
  88. +3 −0  assets/biomes/underground_detached/abandonedmines/abandonedmines.undergroundbiome
  89. +3 −0  assets/biomes/underground_detached/bonecaves/bonecaves.undergroundbiome
  90. +5 −2 assets/biomes/underground_detached/cellcave/cellcave.undergroundbiome
  91. +3 −0  assets/biomes/underground_detached/colorful/colorfulcave.undergroundbiome
  92. +16 −0 assets/biomes/underground_detached/coralcave/coralcave.undergroundbiome
  93. +3 −0  assets/biomes/underground_detached/crystalcave/crystalcave.undergroundbiome
  94. +3 −0  assets/biomes/underground_detached/fleshcave/fleshcave.undergroundbiome
  95. +16 −2 assets/biomes/underground_detached/heck/heck.undergroundbiome
  96. +100 −0 assets/biomes/underground_detached/hive/hive.undergroundbiome
  97. 0  assets/biomes/underground_detached/{old → }/hive/hive.undergroundparallax
  98. +3 −0  assets/biomes/underground_detached/icecaves/icecaves.undergroundbiome
  99. +3 −0  assets/biomes/underground_detached/mushrooms/mushrooms.undergroundbiome
  100. +0 −23 assets/biomes/underground_detached/old/hive/hive.undergroundbiome
  101. +3 −0  assets/biomes/underground_detached/old/shadowrealm/shadow.undergroundbiome
  102. +3 −0  assets/biomes/underground_detached/old/shroomcave/shroomcave.undergroundbiome
  103. +3 −0  assets/biomes/underground_detached/old/slime/slime.undergroundbiome
  104. +3 −0  assets/biomes/underground_detached/old/sulphur/sulphur.undergroundbiome
  105. +25 −0 assets/biomes/underground_detached/slime/slime.undergroundbiome
  106. +3 −0  assets/biomes/underground_detached/tarpit/tarpit.undergroundbiome
  107. +3 −0  assets/biomes/underground_detached/village/village.undergroundbiome
  108. +3 −0  assets/biomes/underground_detached/wilderness/wilderness.undergroundbiome
  109. +191 −0 assets/biomes/underground_detached/zen/zen.undergroundbiome
  110. +6 −0 assets/biomes/underground_detached/zen/zen.undergroundparallax
  111. +46 −78 assets/celestial.config
  112. +8 −0 assets/celestial/names.config
  113. +6 −0 assets/cinematics/busy2.frames
  114. +6 −0 assets/cinematics/chuckles.frames
  115. +38 −11 assets/cinematics/splash.cinematic
  116. +7 −8 assets/client.config
  117. +19 −19 assets/damage/damageresponse/groundnpc.config
  118. +1,051 −0 assets/damage/lash.damage
  119. +2 −2 assets/default_actor_movement.config
  120. +3 −2 assets/default_configuration.config
  121. +18 −2 assets/dungeons/other/naturalcave/naturalcave.dungeon
  122. +1,886 −0 assets/dungeons/other/outpost/outpost.dungeon
  123. 0  assets/dungeons/{ → other}/scifidungeon/scifidungeon.dungeon
  124. +24 −0 assets/effects/defaultlightblue.effectsource
  125. +34 −0 assets/help.config
  126. BIN  assets/hobo.ttf
  127. +66 −15 assets/interface.config
  128. +253 −0 assets/interface/ai/ai.config
  129. +13 −0 assets/interface/ai/apexai.frames
  130. +13 −0 assets/interface/ai/avianai.frames
  131. +7 −0 assets/interface/ai/default.frames
  132. +13 −0 assets/interface/ai/floranai.frames
  133. +13 −0 assets/interface/ai/glitchai.frames
  134. +13 −0 assets/interface/ai/humanai.frames
  135. +13 −0 assets/interface/ai/hylotlai.frames
  136. +6 −0 assets/interface/ai/scanlines.frames
  137. +6 −0 assets/interface/ai/staticapexhylotl.frames
  138. +6 −0 assets/interface/ai/staticavian.frames
  139. +6 −0 assets/interface/ai/staticfloran.frames
  140. +6 −0 assets/interface/ai/staticglitch.frames
  141. +6 −0 assets/interface/ai/statichuman.frames
  142. +6 −0 assets/interface/ai/staticright.frames
  143. +13 −0 assets/interface/chargingcursor.frames
  144. +264 −133 assets/interface/cockpit/cockpit.config
  145. +1 −1  assets/interface/cockpit/consoleanim/consolejump6.frames
  146. +1 −1  assets/interface/cockpit/consoleanim/default.frames
  147. +6 −6 assets/interface/itemdescriptions/armor.itemdescription
  148. +4 −4 assets/interface/itemdescriptions/base.itemdescription
  149. +4 −4 assets/interface/itemdescriptions/consumable.itemdescription
  150. +12 −12 assets/interface/itemdescriptions/gun.itemdescription
  151. +4 −4 assets/interface/itemdescriptions/object.itemdescription
  152. +60 −0 assets/interface/itemdescriptions/shield.itemdescription
  153. +10 −10 assets/interface/itemdescriptions/sword.itemdescription
  154. +2 −2 assets/interface/itemdescriptions/tech.itemdescription
  155. +6 −6 assets/interface/itemdescriptions/tool.itemdescription
  156. +6 −6 assets/interface/tooltips/armor.tooltip
  157. +4 −4 assets/interface/tooltips/base.tooltip
  158. +4 −4 assets/interface/tooltips/consumable.tooltip
  159. +12 −12 assets/interface/tooltips/gun.tooltip
  160. +4 −4 assets/interface/tooltips/object.tooltip
  161. +46 −0 assets/interface/tooltips/shield.tooltip
  162. +10 −10 assets/interface/tooltips/sword.tooltip
  163. +2 −2 assets/interface/tooltips/tech.tooltip
  164. +4 −4 assets/interface/tooltips/tool.tooltip
  165. +4 −4 assets/interface/windowconfig/3dprinter.config
  166. +4 −4 assets/interface/windowconfig/anvil.config
  167. +4 −4 assets/interface/windowconfig/capturestation.config
  168. +4 −4 assets/interface/windowconfig/codex.config
  169. +4 −4 assets/interface/windowconfig/crafting.config
  170. +4 −4 assets/interface/windowconfig/craftingtable.config
  171. +2 −2 assets/interface/windowconfig/error.config
  172. +4 −4 assets/interface/windowconfig/frogmerchant.config
  173. +4 −4 assets/interface/windowconfig/heartforge.config
  174. +4 −4 assets/interface/windowconfig/holidaycraftingtable.config
  175. +4 −4 assets/interface/windowconfig/kitchen.config
  176. +4 −4 assets/interface/windowconfig/metalworkstation.config
  177. +4 −4 assets/interface/windowconfig/molemerchant.config
  178. +4 −4 assets/interface/windowconfig/newquest.config
  179. +4 −4 assets/interface/windowconfig/pixelcompressor.config
  180. +2 −2 assets/interface/windowconfig/popup.config
  181. +4 −4 assets/interface/windowconfig/questcomplete.config
  182. +6 −6 assets/interface/windowconfig/questlog.config
  183. +4 −4 assets/interface/windowconfig/robotcraftingtable.config
  184. +4 −4 assets/interface/windowconfig/shop.config
  185. +2 −2 assets/interface/windowconfig/songbook.config
  186. +4 −4 assets/interface/windowconfig/spinningwheel.config
  187. +6 −6 assets/interface/windowconfig/streamingvideo.config
  188. +3 −3 assets/interface/windowconfig/tech.config
  189. +67 −0 assets/interface/windowconfig/teleportfailsafeui.config
  190. +4 −4 assets/interface/windowconfig/wiringstation.config
  191. +1 −1  assets/items/armors/apex/apex-tier1/apextier1.chest
  192. +1 −1  assets/items/armors/apex/apex-tier1/apextier1.head
  193. +1 −1  assets/items/armors/apex/apex-tier1/apextier1.legs
  194. +1 −1  assets/items/armors/apex/apex-tier10/apextier10.chest
  195. +1 −1  assets/items/armors/apex/apex-tier10/apextier10.head
  196. +1 −1  assets/items/armors/apex/apex-tier10/apextier10.legs
  197. +1 −1  assets/items/armors/apex/apex-tier2/apextier2.chest
  198. +1 −1  assets/items/armors/apex/apex-tier2/apextier2.head
  199. +1 −1  assets/items/armors/apex/apex-tier2/apextier2.legs
  200. +1 −1  assets/items/armors/apex/apex-tier3/apextier3.chest
  201. +1 −1  assets/items/armors/apex/apex-tier3/apextier3.head
  202. +1 −1  assets/items/armors/apex/apex-tier3/apextier3.legs
  203. +1 −1  assets/items/armors/apex/apex-tier4/apextier4.chest
  204. +1 −1  assets/items/armors/apex/apex-tier4/apextier4.head
  205. +1 −1  assets/items/armors/apex/apex-tier4/apextier4.legs
  206. +1 −1  assets/items/armors/apex/apex-tier5/apextier5.chest
  207. +1 −1  assets/items/armors/apex/apex-tier5/apextier5.head
  208. +1 −1  assets/items/armors/apex/apex-tier5/apextier5.legs
  209. +1 −1  assets/items/armors/apex/apex-tier6/apextier6.chest
  210. +1 −1  assets/items/armors/apex/apex-tier6/apextier6.head
  211. +1 −1  assets/items/armors/apex/apex-tier6/apextier6.legs
  212. +1 −1  assets/items/armors/apex/apex-tier7/apextier7.chest
  213. +1 −1  assets/items/armors/apex/apex-tier7/apextier7.head
  214. +1 −1  assets/items/armors/apex/apex-tier7/apextier7.legs
  215. +1 −1  assets/items/armors/apex/apex-tier8/apextier8.chest
  216. +1 −1  assets/items/armors/apex/apex-tier8/apextier8.head
  217. +1 −1  assets/items/armors/apex/apex-tier8/apextier8.legs
  218. +1 −1  assets/items/armors/apex/apex-tier9/apextier9.chest
  219. +1 −1  assets/items/armors/apex/apex-tier9/apextier9.head
  220. +1 −1  assets/items/armors/apex/apex-tier9/apextier9.legs
  221. +1 −1  assets/items/armors/apex/apexcommander/apexcommander.chest
  222. +1 −1  assets/items/armors/apex/apexcommander/apexcommander.legs
  223. +1 −1  assets/items/armors/apex/apexnavy/apexnavy.chest
  224. +1 −1  assets/items/armors/apex/apexnavy/apexnavy.legs
  225. +1 −1  assets/items/armors/apex/apexofficer/apexofficer.chest
  226. +1 −1  assets/items/armors/apex/apexofficer/apexofficer.legs
  227. +1 −1  assets/items/armors/apex/apexspecialist/apexspecialist.chest
  228. +1 −1  assets/items/armors/apex/apexspecialist/apexspecialist.legs
  229. +1 −1  assets/items/armors/aqua/aqua-kimono/kimono.chest
  230. +1 −1  assets/items/armors/aqua/aqua-kimono/kimono.legs
  231. +1 −1  assets/items/armors/aqua/aqua-monk/monk.chest
  232. +1 −1  assets/items/armors/aqua/aqua-monk/monk.legs
  233. +1 −1  assets/items/armors/aqua/aqua-tier1/aquatier1.chest
  234. +1 −1  assets/items/armors/aqua/aqua-tier1/aquatier1.head
  235. +1 −1  assets/items/armors/aqua/aqua-tier1/aquatier1.legs
  236. +1 −1  assets/items/armors/aqua/aqua-tier10/aquatier10.chest
  237. +1 −1  assets/items/armors/aqua/aqua-tier10/aquatier10.head
  238. +1 −1  assets/items/armors/aqua/aqua-tier10/aquatier10.legs
  239. +1 −1  assets/items/armors/aqua/aqua-tier2/aquatier2.chest
  240. +1 −1  assets/items/armors/aqua/aqua-tier2/aquatier2.head
  241. +1 −1  assets/items/armors/aqua/aqua-tier2/aquatier2.legs
  242. +1 −1  assets/items/armors/aqua/aqua-tier3/aquatier3.chest
  243. +1 −1  assets/items/armors/aqua/aqua-tier3/aquatier3.head
  244. +1 −1  assets/items/armors/aqua/aqua-tier3/aquatier3.legs
  245. +1 −1  assets/items/armors/aqua/aqua-tier4/aquatier4.chest
  246. +1 −1  assets/items/armors/aqua/aqua-tier4/aquatier4.head
  247. +1 −1  assets/items/armors/aqua/aqua-tier4/aquatier4.legs
  248. +1 −1  assets/items/armors/aqua/aqua-tier5/aquatier5.chest
  249. +1 −1  assets/items/armors/aqua/aqua-tier5/aquatier5.head
  250. +1 −1  assets/items/armors/aqua/aqua-tier5/aquatier5.legs
  251. +1 −1  assets/items/armors/aqua/aqua-tier6/aquatier6.chest
  252. +1 −1  assets/items/armors/aqua/aqua-tier6/aquatier6.head
  253. +1 −1  assets/items/armors/aqua/aqua-tier6/aquatier6.legs
  254. +1 −1  assets/items/armors/aqua/aqua-tier7/aquatier7.chest
  255. +1 −1  assets/items/armors/aqua/aqua-tier7/aquatier7.head
  256. +1 −1  assets/items/armors/aqua/aqua-tier7/aquatier7.legs
  257. +1 −1  assets/items/armors/aqua/aqua-tier8/aquatier8.chest
  258. +1 −1  assets/items/armors/aqua/aqua-tier8/aquatier8.head
  259. +1 −1  assets/items/armors/aqua/aqua-tier8/aquatier8.legs
  260. +1 −1  assets/items/armors/aqua/aqua-tier9/aquatier9.chest
  261. +1 −1  assets/items/armors/aqua/aqua-tier9/aquatier9.head
  262. +1 −1  assets/items/armors/aqua/aqua-tier9/aquatier9.legs
  263. +1 −1  assets/items/armors/aqua/aqua-traditional/traditional.chest
  264. +1 −1  assets/items/armors/aqua/aqua-traditional/traditional.legs
  265. +1 −1  assets/items/armors/aqua/aqua-trainee/trainee.chest
  266. +1 −1  assets/items/armors/aqua/aqua-trainee/trainee.legs
  267. +1 −1  assets/items/armors/avian/avian-tier1/aviantier1.chest
  268. +1 −1  assets/items/armors/avian/avian-tier1/aviantier1.head
  269. +1 −1  assets/items/armors/avian/avian-tier1/aviantier1.legs
  270. +1 −1  assets/items/armors/avian/avian-tier10/aviantier10.chest
  271. +1 −1  assets/items/armors/avian/avian-tier10/aviantier10.head
  272. +1 −1  assets/items/armors/avian/avian-tier10/aviantier10.legs
  273. +1 −1  assets/items/armors/avian/avian-tier2/aviantier2.chest
  274. +1 −1  assets/items/armors/avian/avian-tier2/aviantier2.head
  275. +1 −1  assets/items/armors/avian/avian-tier2/aviantier2.legs
  276. +1 −1  assets/items/armors/avian/avian-tier3/aviantier3.chest
  277. +1 −1  assets/items/armors/avian/avian-tier3/aviantier3.head
  278. +1 −1  assets/items/armors/avian/avian-tier3/aviantier3.legs
  279. +1 −1  assets/items/armors/avian/avian-tier4/aviantier4.chest
  280. +1 −1  assets/items/armors/avian/avian-tier4/aviantier4.head
  281. +1 −1  assets/items/armors/avian/avian-tier4/aviantier4.legs
  282. +1 −1  assets/items/armors/avian/avian-tier5/aviantier5.chest
  283. +1 −1  assets/items/armors/avian/avian-tier5/aviantier5.head
  284. +1 −1  assets/items/armors/avian/avian-tier5/aviantier5.legs
  285. +1 −1  assets/items/armors/avian/avian-tier6/aviantier6.chest
  286. +1 −1  assets/items/armors/avian/avian-tier6/aviantier6.head
  287. +1 −1  assets/items/armors/avian/avian-tier6/aviantier6.legs
  288. +1 −1  assets/items/armors/avian/avian-tier7/aviantier7.chest
  289. +1 −1  assets/items/armors/avian/avian-tier7/aviantier7.head
  290. +1 −1  assets/items/armors/avian/avian-tier7/aviantier7.legs
  291. +1 −1  assets/items/armors/avian/avian-tier8/aviantier8.chest
  292. +1 −1  assets/items/armors/avian/avian-tier8/aviantier8.head
  293. +1 −1  assets/items/armors/avian/avian-tier8/aviantier8.legs
  294. +1 −1  assets/items/armors/avian/avian-tier9/aviantier9.chest
  295. +1 −1  assets/items/armors/avian/avian-tier9/aviantier9.head
  296. +1 −1  assets/items/armors/avian/avian-tier9/aviantier9.legs
  297. +1 −1  assets/items/armors/avian/avianadventurer/avianadventurer.chest
  298. +1 −1  assets/items/armors/avian/avianadventurer/avianadventurer.legs
  299. +1 −1  assets/items/armors/avian/aviancommoner/aviancommoner.chest
  300. +1 −1  assets/items/armors/avian/aviancommoner/aviancommoner.legs
Sorry, we could not display the entire diff because too many files (3,343) changed.
View
2  assets/animations/coldbreath/coldbreath.animation
@@ -3,5 +3,5 @@
"variants" : 1,
"frameNumber" : 8,
"animationCycle" : 0.6,
- "offset" : [-3, 0]
+ "offset" : [3, 0]
}
View
7 assets/animations/lightsmoke/lightsmoke.animation
@@ -0,0 +1,7 @@
+{
+ "frames" : "lightsmoke.png",
+ "variants" : 1,
+ "frameNumber" : 8,
+ "animationCycle" : 0.5,
+ "offset" : [0, 0]
+}
View
6 assets/animations/lightsmoke/lightsmoke.frames
@@ -0,0 +1,6 @@
+{
+ "frameGrid" : {
+ "size" : [8, 8],
+ "dimensions" : [8, 1]
+ }
+}
View
2  assets/animations/muzzleflash/bloodvomitmuzzle/bloodvomitmuzzle.animation
@@ -3,5 +3,5 @@
"variants" : 1,
"frameNumber" : 5,
"animationCycle" : 0.2,
- "offset" : [-3, 0]
+ "offset" : [0.375, 0]
}
View
2  assets/animations/muzzleflash/bulletmuzzle1/bulletmuzzle1.animation
@@ -3,5 +3,5 @@
"variants" : 3,
"frameNumber" : 2,
"animationCycle" : 0.03,
- "offset" : [-3, 0]
+ "offset" : [0.375, 0]
}
View
2  assets/animations/muzzleflash/bulletmuzzle2/bulletmuzzle2.animation
@@ -3,5 +3,5 @@
"variants" : 3,
"frameNumber" : 2,
"animationCycle" : 0.03,
- "offset" : [-3, 0]
+ "offset" : [0.375, 0]
}
View
2  assets/animations/muzzleflash/bulletmuzzle3/bulletmuzzle3.animation
@@ -3,5 +3,5 @@
"variants" : 3,
"frameNumber" : 2,
"animationCycle" : 0.03,
- "offset" : [-3, 0]
+ "offset" : [0.375, 0]
}
View
2  assets/animations/muzzleflash/bulletmuzzle4/bulletmuzzle4.animation
@@ -3,5 +3,5 @@
"variants" : 3,
"frameNumber" : 2,
"animationCycle" : 0.03,
- "offset" : [-3, 0]
+ "offset" : [0.375, 0]
}
View
2  assets/animations/muzzleflash/electromuzzle/electromuzzle.animation
@@ -3,5 +3,5 @@
"variants" : 1,
"frameNumber" : 4,
"animationCycle" : 0.03,
- "offset" : [-3, 0]
+ "offset" : [0.375, 0]
}
View
2  assets/animations/muzzleflash/flamemuzzle/flamemuzzle.animation
@@ -3,5 +3,5 @@
"variants" : 3,
"frameNumber" : 2,
"animationCycle" : 0.03,
- "offset" : [-3, 0]
+ "offset" : [0.375, 0]
}
View
2  assets/animations/muzzleflash/plasmamuzzle1/plasmamuzzle1.animation
@@ -3,5 +3,5 @@
"variants" : 2,
"frameNumber" : 4,
"animationCycle" : 0.03,
- "offset" : [-3, 0]
+ "offset" : [0.375, 0]
}
View
2  assets/animations/muzzleflash/plasmamuzzle2/plasmamuzzle2.animation
@@ -3,5 +3,5 @@
"variants" : 1,
"frameNumber" : 3,
"animationCycle" : 0.03,
- "offset" : [-3, 0]
+ "offset" : [0.375, 0]
}
View
2  assets/animations/muzzleflash/plasmamuzzle3/plasmamuzzle3.animation
@@ -3,5 +3,5 @@
"variants" : 1,
"frameNumber" : 4,
"animationCycle" : 0.03,
- "offset" : [-3, 0]
+ "offset" : [0.375, 0]
}
View
2  assets/animations/muzzleflash/plasmamuzzle4/plasmamuzzle4.animation
@@ -3,5 +3,5 @@
"variants" : 1,
"frameNumber" : 4,
"animationCycle" : 0.03,
- "offset" : [-3, 0]
+ "offset" : [0.375, 0]
}
View
2  assets/animations/muzzleflash/plasmamuzzle5/plasmamuzzle5.animation
@@ -3,5 +3,5 @@
"variants" : 1,
"frameNumber" : 3,
"animationCycle" : 0.03,
- "offset" : [-3, 0]
+ "offset" : [0.375, 0]
}
View
2  assets/animations/muzzleflash/smokemuzzle/smokemuzzle.animation
@@ -3,5 +3,5 @@
"variants" : 1,
"frameNumber" : 8,
"animationCycle" : 0.6,
- "offset" : [-3, 0]
+ "offset" : [0.375, 0]
}
View
2  assets/animations/muzzleflash/tankflashmuzzle/tankflashmuzzle.animation
@@ -3,5 +3,5 @@
"variants" : 1,
"frameNumber" : 10,
"animationCycle" : 0.6,
- "offset" : [-18, 0]
+ "offset" : [2.25, 0]
}
View
2  assets/animations/penguingeneralspawn/penguingeneralspawn.animation
@@ -3,5 +3,5 @@
"variants" : 1,
"frameNumber" : 16,
"animationCycle" : 1.0,
- "offset" : [0, 1]
+ "offset" : [0, 0.125]
}
View
2  assets/animations/penguintankspawn/penguintankspawn.animation
@@ -3,5 +3,5 @@
"variants" : 1,
"frameNumber" : 16,
"animationCycle" : 1.0,
- "offset" : [0, 1]
+ "offset" : [0, 0.125]
}
View
2  assets/animations/penguintrooperspawn/penguintrooperspawn.animation
@@ -3,5 +3,5 @@
"variants" : 1,
"frameNumber" : 16,
"animationCycle" : 1.0,
- "offset" : [0, 1]
+ "offset" : [0, 0.125]
}
View
7 assets/animations/sparkles/shieldspark.animation
@@ -0,0 +1,7 @@
+{
+ "frames" : "sparkle1.png",
+ "variants" : 1,
+ "frameNumber" : 4,
+ "animationCycle" : 0.6,
+ "offset" : [0, 0]
+}
View
2  assets/assets.config
@@ -16,5 +16,5 @@
"missingAssetsImage" : "/assetmissing.png",
"missingAssetsAudio" : "/assetmissing.wav",
- "version" : "Enraged Koala 20140424"
+ "version" : "Rampaging Koala 20140618"
}
View
2  assets/biomes/space/asteroids.spacebiome
@@ -1,5 +1,7 @@
{
"name" : "asteroids",
+ "friendlyName" : "Asteroids",
+ "requiredStatuses" : [ "beamaxe" ],
"mainBlock" : "meteoriterock",
"ores" : "plutoniumBasicLeveledOres",
View
72 assets/biomes/surface/arctic/arctic.surfacebiome
@@ -1,7 +1,10 @@
{
"name" : "arctic",
+ "friendlyName" : "Arctic",
"caveLiquidType" : "water",
"oceanLiquidType" : "ocean",
+ "requiredStatuses" : [ "beamaxe" ],
+ "spawnProfile" : "surfacemix",
"hueShiftOptions" : [0],
"skyOptions" : [
@@ -136,61 +139,19 @@
"undergroundParallax" : "arctic.undergroundparallax",
"weather" : [
- [
- [0.6, "snow" ],
- [0.3, "clear" ],
- [0.1, "snowstorm" ]
- ],
- [
- [0.7, "snow" ],
- [0.3, "clear" ]
- ],
- [
- [0.7, "snow" ],
- [0.3, "clear" ]
- ],
- [
- [0.2, "icestorm" ],
- [0.5, "snow" ],
- [0.3, "clear" ]
- ],
- [
- [0.1, "glowingrain" ],
- [0.9, "clear" ]
- ],
- [
- [0.005, "meteorshower" ],
- [0.995, "clear" ]
- ],
- [
- [0.001, "largemeteor" ],
- [0.999, "clear" ]
- ],
- [
- [0.25, "hailstones" ],
- [0.25, "snow" ],
- [0.5, "clear" ]
- ],
- [
- [0.25, "snow" ],
- [0.15, "snowstorm" ],
- [0.6, "clear" ]
- ],
- [
- [0.9, "snowstorm" ],
- [0.1, "clear" ]
- ],
- [
- [0.6, "snow" ],
- [0.3, "clear" ],
- [0.1, "spacedustshower" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ]
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:veryCommonSnow",
+ "/weather.config:veryCommonSnow",
+ "/weather.config:commonSnowAndHail",
+ "/weather.config:commonSnowAndIcestorm",
+ "/weather.config:veryCommonSnowAndSnowstorm",
+ "/weather.config:commonSnowAndSnowstorm",
+ "/weather.config:rareMeteorShower",
+ "/weather.config:uncommonGlowingRain",
+ "/weather.config:veryCommonSnowAndSpacedust",
+ "/weather.config:veryCommonSnowstorm",
+ "/weather.config:veryRareLargeMeteorShower"
],
"statusParameters" : {
@@ -558,6 +519,5 @@
}
},
"allowedDetachedBiomes" : [ "geometric", "orb", "spring", "ice", "arctic", "arid", "desert", "forest", "grasslands", "jungle", "magma", "ocean", "savannah", "snow", "tentacles", "tundra", "volcanic" ]
-
// "allowedDetachedBiomes" : [ "ice", "spring" ]
}
View
53 assets/biomes/surface/arid/arid.surfacebiome
@@ -1,6 +1,9 @@
{
"name" : "arid",
+ "friendlyName" : "Arid",
"caveLiquidType" : [ "water", "acid", "tarliquid" ],
+ "requiredStatuses" : [ "beamaxe" ],
+ "spawnProfile" : "surfacemix",
"hueShiftOptions" : [-180, -135, -90, -45, 0, 45, 90, 135, 180],
"skyOptions" : [
@@ -141,45 +144,17 @@
},
"weather" : [
- [
- [0.1, "glowingrain" ],
- [0.9, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [0.005, "meteorshower" ],
- [0.995, "clear" ]
- ],
- [
- [0.001, "largemeteor" ],
- [0.999, "clear" ]
- ],
- [
- [0.8, "sandstorm" ],
- [0.2, "clear" ]
- ],
- [
- [0.25, "sandstorm" ],
- [0.75, "clear" ]
- ],
- [
- [0.1, "spacedustshower" ],
- [0.90, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ]
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:commonSandstorm",
+ "/weather.config:rareMeteorShower",
+ "/weather.config:uncommonGlowingRain",
+ "/weather.config:uncommonSpacedust",
+ "/weather.config:veryCommonSandstorm",
+ "/weather.config:veryRareLargeMeteorShower"
],
View
43 assets/biomes/surface/asteroidfield/asteroidfield.surfacebiome
@@ -1,6 +1,9 @@
{
"name" : "asteroidfield",
+ "friendlyName" : "Asteroid Field",
"barren" : true,
+ "requiredStatuses" : [ "beamaxe", "breathProtection" ],
+ "spawnProfile" : "surfaceairless",
"hueShiftOptions" : [-180, -25, 25],
"skyOptions" : [
@@ -36,36 +39,15 @@
},
"weather" : [
- [
- [0.1, "glowingrain" ],
- [0.9, "clear" ]
- ],
- [
- [0.03, "meteorshower" ],
- [0.97, "clear" ]
- ],
- [
- [0.01, "largemeteor" ],
- [0.99, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ]
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:uncommonGlowingRain",
+ "/weather.config:rareLargeMeteorShower",
+ "/weather.config:uncommonMeteorShower"
],
"ambientNoises" : {
@@ -133,5 +115,4 @@
"items" : [ ]
}
}
-
}
View
61 assets/biomes/surface/barren/barren.surfacebiome
@@ -1,5 +1,8 @@
{
"name" : "barren",
+ "friendlyName" : "Barren",
+ "requiredStatuses" : [ "beamaxe" ],
+ "spawnProfile" : "surfacesparse",
"hueShiftOptions" : [-180, -135, -90, -45, 0, 45, 90, 135, 180],
"skyOptions" : [
@@ -140,52 +143,18 @@
},
"weather" : [
- [
- [0.1, "rain" ],
- [0.05, "storm" ],
- [0.025, "glowingrain" ],
- [0.125, "drizzle" ],
- [0.7, "clear" ]
- ],
- [
- [0.8, "sandstorm" ],
- [0.2, "clear" ]
- ],
- [
- [0.25, "sandstorm" ],
- [0.75, "clear" ]
- ],
- [
- [0.05, "acidrain" ],
- [0.95, "clear" ]
- ],
- [
- [0.005, "meteorshower" ],
- [0.995, "clear" ]
- ],
- [
- [0.001, "largemeteor" ],
- [0.999, "clear" ]
- ],
- [
- [0.1, "spacedustshower" ],
- [0.90, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ]
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:commonLightRainMix",
+ "/weather.config:commonSandstorm",
+ "/weather.config:rareAcidRain",
+ "/weather.config:rareMeteorShower",
+ "/weather.config:uncommonSpacedustShower",
+ "/weather.config:veryCommonSandstorm",
+ "/weather.config:veryRareLargeMeteorShower"
],
"ambientNoises" : {
View
58 assets/biomes/surface/desert/desert.surfacebiome
@@ -1,5 +1,8 @@
{
"name" : "desert",
+ "friendlyName" : "Desert",
+ "requiredStatuses" : [ "beamaxe" ],
+ "spawnProfile" : "surfacesparse",
"hueShiftOptions" : [-56, -45, -16, -26, 0],
"skyOptions" : [
@@ -137,47 +140,18 @@
},
"weather" : [
- [
- [0.7, "clear" ],
- [0.3, "sandstorm" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [0.1, "glowingrain" ],
- [0.9, "clear" ]
- ],
- [
- [0.05, "acidrain" ],
- [0.95, "clear" ]
- ],
- [
- [0.005, "meteorshower" ],
- [0.995, "clear" ]
- ],
- [
- [0.001, "largemeteor" ],
- [0.999, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ]
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:commonSandstorm",
+ "/weather.config:rareAcidRain",
+ "/weather.config:rareMeteorShower",
+ "/weather.config:uncommonGlowingRain",
+ "/weather.config:veryRareLargeMeteorShower"
],
"parallax" : "desert.parallax",
@@ -550,6 +524,4 @@
},
"allowedDetachedBiomes" : [ "bones", "sandstone", "tar", "oasis", "colourful", "arctic", "arid", "desert", "forest", "grasslands", "jungle", "magma", "ocean", "savannah", "snow", "tentacles", "tundra", "volcanic" ]
-
-
}
View
22 assets/biomes/surface/forest/forest.parallax
@@ -9,9 +9,9 @@
"mod2Count" : 0
},
"forestback" : {
- "baseCount" : 4,
- "mod1Count" : 2,
- "mod2Count" : 9
+ "baseCount" : 1,
+ "mod1Count" : 0,
+ "mod2Count" : 0
},
"clouds1" : {
"baseCount" : 2,
@@ -55,7 +55,7 @@
{
"kind" : "forestfront",
"offset" : [0, 400],
- "parallax" : 2.4,
+ "parallax" : 2,
"nightCorrelation" : 0,
"minSpeed" : 0,
"maxSpeed" : 0,
@@ -75,24 +75,24 @@
{
"kind" : "foliage/treefront",
- "offset" : [0, 295],
+ "offset" : [0, 255],
"parallax" : 3,
"nightCorrelation" : 0,
"minSpeed" : 0,
"maxSpeed" : 0,
- "modifiers" : "?saturation=-15?brightness=-20",
- "fadePercent" : 0.10
+ "modifiers" : "?saturation=-10?brightness=5",
+ "fadePercent" : 0.03
},
{
"kind" : "foliage/treeback",
- "offset" : [0, 340],
- "parallax" : 5,
+ "offset" : [0, 235],
+ "parallax" : 3.5,
"nightCorrelation" : 0,
"minSpeed" : 0,
"maxSpeed" : 0,
- "modifiers" : "?saturation=-15?brightness=-10",
- "fadePercent" : 0.20
+ "modifiers" : "?saturation=-5?brightness=10",
+ "fadePercent" : 0.03
},
{
View
86 assets/biomes/surface/forest/forest.surfacebiome
@@ -1,8 +1,11 @@
{
"name" : "forest",
+ "friendlyName" : "Forest",
"caveLiquidType" : [ "water", "acid", "tarliquid" ],
+ "requiredStatuses" : [ "beamaxe" ],
+ "spawnProfile" : "surfacemix",
- "hueShiftOptions" : [-180, -135, -90, -66, -45, 0, 45, 90, 135, 180],
+ "hueShiftOptions" : [-30, -20, -15, -10, -5, 0, 5, 10, 15, 20, 30],
"skyOptions" : [
{
@@ -135,74 +138,18 @@
"undergroundParallax" : "forest.undergroundparallax",
"weather" : [
- [
- [0.1, "rain" ],
- [0.05, "storm" ],
- [0.025, "glowingrain" ],
- [0.125, "drizzle" ],
- [0.7, "clear" ]
- ],
- [
- [0.1, "rain" ],
- [0.05, "storm" ],
- [0.025, "windstorm" ],
- [0.125, "drizzle" ],
- [0.7, "clear" ]
- ],
- [
- [0.1, "rain" ],
- [0.05, "storm" ],
- [0.025, "groundmist" ],
- [0.125, "drizzle" ],
- [0.7, "clear" ]
- ],
- [
- [0.05, "acidrain" ],
- [0.95, "clear" ]
- ],
- [
- [0.1, "snow" ],
- [0.9, "clear" ]
- ],
- [
- [0.005, "meteorshower" ],
- [0.995, "clear" ]
- ],
- [
- [0.001, "largemeteor" ],
- [0.999, "clear" ]
- ],
- [
- [0.1, "rain" ],
- [0.05, "storm" ],
- [0.025, "hailstones" ],
- [0.125, "drizzle" ],
- [0.6, "clear" ],
- [0.1, "fog" ]
- ],
- [
- [0.1, "spacedustshower" ],
- [0.90, "clear" ]
- ],
- [
- [0.2, "fog" ],
- [0.90, "clear" ]
- ],
- [
- [0.05, "ember" ],
- [0.95, "clear" ]
- ],
- [
- [0.1, "rain" ],
- [0.05, "storm" ],
- [0.025, "glowingrain" ],
- [0.125, "drizzle" ],
- [0.7, "clear" ]
- ],
- [
- [0.02, "spacejunk" ],
- [0.98, "clear" ]
- ]
+ "/weather.config:commonLightRainMixAndGlowingRain",
+ "/weather.config:commonLightRainMixAndGlowingRain",
+ "/weather.config:commonLightRainMixAndGroundmist",
+ "/weather.config:commonLightRainMixAndHail",
+ "/weather.config:commonLightRainMixAndWindstorm",
+ "/weather.config:rareAcidRain",
+ "/weather.config:rareEmber",
+ "/weather.config:rareMeteorShower",
+ "/weather.config:rareSpacejunk",
+ "/weather.config:uncommonSnow",
+ "/weather.config:uncommonSpacedust",
+ "/weather.config:veryRareLargeMeteorShower"
],
"statusParameters" : {
@@ -615,6 +562,7 @@
"temperatureVariability" : 3
}
},
+
"allowedDetachedBiomes" : [ "toxicplains", "flowers", "eyepatch", "mushroompatch", "arctic", "arid", "desert", "forest", "grasslands", "jungle", "magma", "ocean", "savannah", "snow", "tentacles", "tundra", "volcanic" ]
// "allowedDetachedBiomes" : [ "toxicplains", "charred", "flowers", "eyepatch", "mushroompatch", "rocky" ]
}
View
88 assets/biomes/surface/grasslands/grasslands.surfacebiome
@@ -1,6 +1,9 @@
{
"name" : "grasslands",
+ "friendlyName" : "Grasslands",
"caveLiquidType" : [ "water", "acid", "tarliquid" ],
+ "requiredStatuses" : [ "beamaxe" ],
+ "spawnProfile" : "surfacemix",
"hueShiftOptions" : [-180, -135, -90, -45, 0, 45, 90, 135, 180],
"skyOptions" : [
@@ -134,76 +137,20 @@
"undergroundParallax" : "grasslands.undergroundparallax",
"weather" : [
- [
- [0.1, "rain" ],
- [0.05, "storm" ],
- [0.025, "glowingrain" ],
- [0.125, "drizzle" ],
- [0.7, "clear" ]
- ],
- [
- [0.1, "rain" ],
- [0.05, "storm" ],
- [0.025, "windstorm" ],
- [0.125, "drizzle" ],
- [0.7, "clear" ]
- ],
- [
- [0.1, "rain" ],
- [0.05, "storm" ],
- [0.025, "groundmist" ],
- [0.125, "drizzle" ],
- [0.7, "clear" ]
- ],
- [
- [0.05, "acidrain" ],
- [0.95, "clear" ]
- ],
- [
- [0.1, "snow" ],
- [0.9, "clear" ]
- ],
- [
- [0.005, "meteorshower" ],
- [0.995, "clear" ]
- ],
- [
- [0.001, "largemeteor" ],
- [0.999, "clear" ]
- ],
- [
- [0.1, "spacedustshower" ],
- [0.90, "clear" ]
- ],
- [
- [0.1, "rain" ],
- [0.05, "storm" ],
- [0.025, "hailstones" ],
- [0.125, "drizzle" ],
- [0.6, "clear" ],
- [0.1, "fog" ]
- ],
- [
- [0.2, "fog" ],
- [0.8, "clear" ]
- ],
- [
- [0.1, "rain" ],
- [0.05, "storm" ],
- [0.025, "glowingrain" ],
- [0.125, "drizzle" ],
- [0.7, "clear" ]
- ],
- [
- [0.02, "spacejunk" ],
- [0.98, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ]
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:commonLightRainMixAndGlowingRain",
+ "/weather.config:commonLightRainMixAndGlowingRain",
+ "/weather.config:commonLightRainMixAndGroundmist",
+ "/weather.config:commonLightRainMixAndHail",
+ "/weather.config:commonLightRainMixAndWindstorm",
+ "/weather.config:rareAcidRain",
+ "/weather.config:rareEmber",
+ "/weather.config:rareMeteorShower",
+ "/weather.config:rareSpacejunk",
+ "/weather.config:uncommonSnow",
+ "/weather.config:uncommonSpacedust",
+ "/weather.config:veryRareLargeMeteorShower"
],
"ambientNoises" : {
@@ -536,5 +483,4 @@
},
"allowedDetachedBiomes" : [ "flowers", "arctic", "arid", "desert", "forest", "grasslands", "jungle", "magma", "ocean", "savannah", "snow", "tentacles", "tundra", "volcanic" ]
-
}
View
4 assets/biomes/surface/jungle/jungle.parallax
@@ -50,7 +50,7 @@
{
"kind" : "junglefront",
"offset" : [0, 400],
- "parallax" : 2.4,
+ "parallax" : 2,
"nightCorrelation" : 0,
"minSpeed" : 0,
"maxSpeed" : 0,
@@ -67,6 +67,7 @@
"modifiers" : "?saturation=-5?brightness=10",
"fadePercent" : 0.03
},
+
{
"kind" : "foliage/treefront",
"offset" : [0, 255],
@@ -77,6 +78,7 @@
"modifiers" : "?saturation=-10?brightness=5",
"fadePercent" : 0.03
},
+
{
"kind" : "foliage/treeback",
"offset" : [0, 235],
View
67 assets/biomes/surface/jungle/jungle.surfacebiome
@@ -1,6 +1,9 @@
{
"name" : "jungle",
+ "friendlyName" : "Jungle",
"caveLiquidType" : [ "water", "acid", "tarliquid" ],
+ "requiredStatuses" : [ "beamaxe" ],
+ "spawnProfile" : "surfacemix",
"hueShiftOptions" : [-180, -135, -90, -45, 0, 45, 90, 135, 180],
"skyOptions" : [
@@ -140,59 +143,17 @@
"undergroundParallax" : "jungle.undergroundparallax",
"weather" : [
- [
- [0.1, "rain" ],
- [0.05, "storm" ],
- [0.025, "glowingrain" ],
- [0.125, "drizzle" ],
- [0.7, "clear" ]
- ],
- [
- [0.1, "rain" ],
- [0.05, "storm" ],
- [0.025, "glowingrain" ],
- [0.125, "drizzle" ],
- [0.7, "clear" ]
- ],
- [
- [0.1, "rain" ],
- [0.05, "storm" ],
- [0.025, "glowingrain" ],
- [0.125, "drizzle" ],
- [0.7, "clear" ]
- ],
- [
- [0.05, "acidrain" ],
- [0.95, "clear" ]
- ],
- [
- [0.005, "meteorshower" ],
- [0.995, "clear" ]
- ],
- [
- [0.001, "largemeteor" ],
- [0.999, "clear" ]
- ],
- [
- [0.2, "groundmist" ],
- [0.8, "clear" ]
- ],
- [
- [0.02, "spacejunk" ],
- [0.98, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ]
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:commonLightRainMixAndGlowingRain",
+ "/weather.config:commonLightRainMixAndGlowingRain",
+ "/weather.config:commonLightRainMixAndGlowingRain",
+ "/weather.config:rareAcidRain",
+ "/weather.config:rareMeteorShower",
+ "/weather.config:rareSpacejunk",
+ "/weather.config:veryRareLargeMeteorShower"
],
"ambientNoises" : {
View
54 assets/biomes/surface/magma/magma.surfacebiome
@@ -1,6 +1,9 @@
{
"name" : "magma",
+ "friendlyName" : "Magma",
"caveLiquidType" : "lava",
+ "requiredStatuses" : [ "beamaxe" ],
+ "spawnProfile" : "surfacemix",
"hueShiftOptions" : [-18, 0, 15],
"skyOptions" : [
@@ -140,46 +143,16 @@
},
"weather" : [
- [
- [0.1, "rain" ],
- [0.05, "storm" ],
- [0.025, "glowingrain" ],
- [0.125, "drizzle" ],
- [0.7, "clear" ]
- ],
- [
- [0.25, "ash" ],
- [0.75, "clear" ]
- ],
- [
- [0.1, "spacedustshower" ],
- [0.90, "clear" ]
- ],
- [
- [0.25, "ember" ],
- [0.75, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [0.05, "acidrain" ],
- [0.95, "clear" ]
- ],
- [
- [0.005, "meteorshower" ],
- [0.995, "clear" ]
- ],
- [
- [0.001, "largemeteor" ],
- [0.999, "clear" ]
- ]
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:commonAsh",
+ "/weather.config:commonEmber",
+ "/weather.config:commonLightRainMixAndGlowingRain",
+ "/weather.config:rareAcidRain",
+ "/weather.config:rareMeteorShower",
+ "/weather.config:uncommonSpacedust",
+ "/weather.config:veryRareLargeMeteorShower"
],
"ambientNoises" : {
@@ -503,6 +476,5 @@
},
"allowedDetachedBiomes" : [ "crystalline", "rust", "arctic", "arid", "desert", "forest", "grasslands", "jungle", "magma", "ocean", "savannah", "snow", "tentacles", "tundra", "volcanic" ]
-
// "allowedDetachedBiomes" : [ "crystalline" ]
}
View
44 assets/biomes/surface/moon/moon.surfacebiome
@@ -1,6 +1,9 @@
{
"name" : "moon",
+ "friendlyName" : "Moon",
"barren" : true,
+ "requiredStatuses" : [ "beamaxe", "breathProtection" ],
+ "spawnProfile" : "surfaceairless",
"hueShiftOptions" : [-180, -135, -90, -45, 0, 45, 90, 135, 180],
"skyOptions" : [
@@ -141,37 +144,15 @@
},
"weather" : [
- [
- [0.1, "glowingrain" ],
- [0.9, "clear" ]
- ],
- [
- [0.005, "meteorshower" ],
- [0.995, "clear" ]
- ],
- [
- [0.001, "largemeteor" ],
- [0.999, "clear" ]
- ],
- [
- [0.02, "spacejunk" ],
- [0.98, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ]
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:rareMeteorShower",
+ "/weather.config:rareSpacejunk",
+ "/weather.config:uncommonGlowingRain",
+ "/weather.config:veryRareLargeMeteorShower"
],
"ambientNoises" : {
@@ -424,5 +405,4 @@
"temperatureVariability" : 10
}
}
-
}
View
31 assets/biomes/surface/ocean/ocean.surfacebiome
@@ -1,7 +1,10 @@
{
"name" : "ocean",
+ "friendlyName" : "Ocean",
"caveLiquidType" : "water",
"oceanLiquidType" : "ocean",
+ "requiredStatuses" : [ "beamaxe" ],
+ "spawnProfile" : "surfacemix",
"hueShiftOptions" : [-60, -45, 0, 45, 60],
"skyOptions" : [
@@ -138,27 +141,13 @@
},
"weather" : [
- [
- [1, "rain" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ]
+ "/weather.config:alwaysRaining",
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:clear"
],
"parallax" : "ocean.parallax",
View
78 assets/biomes/surface/outpost/asteroidfield.parallax
@@ -0,0 +1,78 @@
+{
+ "settings" : {
+ "verticalOrigin" : 0,
+ "definitions" : {
+ "asteroidfront" : {
+ "baseCount" : 4,
+ "mod1Count" : 0,
+ "mod2Count" : 0
+ },
+ "asteroidback" : {
+ "baseCount" : 4,
+ "mod1Count" : 0,
+ "mod2Count" : 0
+ },
+ "asteroidback2" : {
+ "baseCount" : 4,
+ "mod1Count" : 0,
+ "mod2Count" : 0
+ }
+ }
+ },
+ "layers" : [
+ {
+ "kind" : "asteroidfront",
+ "offset" : [0, 0],
+ "parallax" : [10, 9999],
+ "nightCorrelation" : 0,
+ "minSpeed" : 0,
+ "maxSpeed" : 0,
+ "modifiers" : ""
+ },
+ {
+ "kind" : "asteroidfront",
+ "offset" : [133, 0],
+ "parallax" : [10, 9999],
+ "nightCorrelation" : 0,
+ "minSpeed" : 0,
+ "maxSpeed" : 0,
+ "modifiers" : ""
+ },
+ {
+ "kind" : "asteroidback",
+ "offset" : [0, 0],
+ "parallax" : [20, 9999],
+ "nightCorrelation" : 0,
+ "minSpeed" : 0,
+ "maxSpeed" : 0,
+ "modifiers" : ""
+ },
+ {
+ "kind" : "asteroidback",
+ "offset" : [133, 0],
+ "parallax" : [20, 9999],
+ "nightCorrelation" : 0,
+ "minSpeed" : 0,
+ "maxSpeed" : 0,
+ "modifiers" : ""
+ },
+ {
+ "kind" : "asteroidback2",
+ "offset" : [0, 0],
+ "parallax" : [9999, 9999],
+ "nightCorrelation" : 0,
+ "minSpeed" : 0,
+ "maxSpeed" : 0,
+ "modifiers" : ""
+ },
+ {
+ "kind" : "asteroidback2",
+ "offset" : [133, 0],
+ "parallax" : [9999, 9999],
+ "nightCorrelation" : 0,
+ "minSpeed" : 0,
+ "maxSpeed" : 0,
+ "modifiers" : ""
+ }
+ ]
+}
View
6 assets/biomes/surface/outpost/moon.undergroundparallax
@@ -0,0 +1,6 @@
+{
+ "image" : "desertunderground.png?brightness=-65",
+ "dividerimage" : "rockdivider.png?brightness=-65",
+ "parallax" : 1.1,
+ "origin" : [0, 395]
+}
View
103 assets/biomes/surface/outpost/outpost.surfacebiome
@@ -0,0 +1,103 @@
+{
+ "name" : "outpost",
+ "friendlyName" : "Outpost",
+ "barren" : true,
+ "requiredStatuses" : [ "beamaxe" ],
+ "spawnProfile" : "surfaceairless",
+
+ "hueShiftOptions" : [-180, -25, 25],
+ "skyOptions" : [
+
+ {
+ "mainColor" : [255, 255, 255],
+
+ "morningColors" : [ [255, 224, 129], [252, 230, 164] ],
+ "dayColors" : [ [255, 152, 107], [255, 183, 152] ],
+ "eveningColors" : [ [254, 121, 69], [254, 165, 129] ],
+ "nightColors" : [ [60, 0, 0], [20, 0, 0] ],
+
+ "morningLightColor" : [202, 177, 100],
+ "dayLightColor" : [202, 138, 100],
+ "eveningLightColor" : [202, 100, 100],
+ "nightLightColor" : [40, 17, 17]
+ }
+ ],
+
+ "surfaceParameters" : {
+ "mainBlock" : "meteoriterock",
+ "subBlocks" : [ "magmarock", "rock19" ],
+
+ "parallax" : "asteroidfield.parallax",
+ "undergroundParallax" : "moon.undergroundparallax",
+
+ "statusParameters" : {
+ "temperatureBounds" : [-30, -30],
+ "dayNightTemperatureVariability" : 20,
+ "temperatureVariability" : 10,
+ "breathable" : false
+ },
+
+ "weather" : [
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:uncommonGlowingRain",
+ "/weather.config:rareLargeMeteorShower",
+ "/weather.config:uncommonMeteorShower"
+ ],
+
+ "ambientNoises" : {
+ "day" : {
+ "tracks" : [ "/sfx/environmental/moon_surface.ogg" ]
+ },
+ "night" : {
+ "tracks" : [ "/sfx/environmental/moon_surface.ogg" ]
+ }
+ },
+
+ "undergroundAmbientNoises" : {
+ "day" : {
+ "tracks" : [ "/sfx/environmental/moon_underground.ogg" ]
+ },
+ "night" : {
+ "tracks" : [ "/sfx/environmental/moon_underground.ogg" ]
+ }
+ },
+
+ "musicTrack" : {
+ "day" : {
+ "tracks" : [ "/music/arctic-constellation1.ogg", "/music/arctic-constellation2.ogg", "/music/mercury.ogg", "/music/mira.ogg", "/music/procyon.ogg", "/music/tranquility-base.ogg", "/music/psyche.ogg", "/music/accretion-Disc.ogg", "/music/cygnus-x1.ogg", "/music/eridanus-supervoid.ogg", "/music/horsehead-nebula.ogg", "/music/large-magellanic-cloud.ogg", "/music/M54.ogg", "/music/Nomads.ogg", "/music/on-the-beach-at-night.ogg" ]
+ },
+ "night" : {
+ "tracks" : [ "/music/arctic-constellation1.ogg", "/music/arctic-constellation2.ogg", "/music/mercury.ogg", "/music/mira.ogg", "/music/procyon.ogg", "/music/tranquility-base.ogg", "/music/psyche.ogg", "/music/accretion-Disc.ogg", "/music/cygnus-x1.ogg", "/music/eridanus-supervoid.ogg", "/music/horsehead-nebula.ogg", "/music/large-magellanic-cloud.ogg", "/music/M54.ogg", "/music/Nomads.ogg", "/music/on-the-beach-at-night.ogg" ]
+ }
+ },
+
+ "undergroundMusicTrack" : {
+ "day" : {
+ "tracks" : [ "/music/arctic-constellation1.ogg", "/music/arctic-constellation2.ogg", "/music/mercury.ogg", "/music/mira.ogg", "/music/procyon.ogg", "/music/tranquility-base.ogg", "/music/psyche.ogg", "/music/accretion-Disc.ogg", "/music/cygnus-x1.ogg", "/music/eridanus-supervoid.ogg", "/music/horsehead-nebula.ogg", "/music/large-magellanic-cloud.ogg", "/music/M54.ogg", "/music/Nomads.ogg", "/music/on-the-beach-at-night.ogg" ]
+ },
+ "night" : {
+ "tracks" : [ "/music/arctic-constellation1.ogg", "/music/arctic-constellation2.ogg", "/music/mercury.ogg", "/music/mira.ogg", "/music/procyon.ogg", "/music/tranquility-base.ogg", "/music/psyche.ogg", "/music/accretion-Disc.ogg", "/music/cygnus-x1.ogg", "/music/eridanus-supervoid.ogg", "/music/horsehead-nebula.ogg", "/music/large-magellanic-cloud.ogg", "/music/M54.ogg", "/music/Nomads.ogg", "/music/on-the-beach-at-night.ogg" ]
+ }
+ },
+
+ "undergroundPlaceables" : { }
+ },
+
+ "subSurfaceParameters" : {
+ "statusParameters" : {
+ "temperatureBounds" : [-100, -100],
+ "dayNightTemperatureVariability" : -50,
+ "temperatureVariability" : 0
+ },
+
+ "undergroundPlaceables" : {
+
+ "items" : [ ]
+ }
+ }
+}
View
80 assets/biomes/surface/savannah/savannah.surfacebiome
@@ -1,6 +1,9 @@
{
"name" : "savannah",
+ "friendlyName" : "Savannah",
"caveLiquidType" : [ "water", "acid", "tarliquid" ],
+ "requiredStatuses" : [ "beamaxe" ],
+ "spawnProfile" : "surfacemix",
"hueShiftOptions" : [0],
"skyOptions" : [
@@ -134,69 +137,19 @@
"undergroundParallax" : "savannah.undergroundparallax",
"weather" : [
- [
- [0.1, "rain" ],
- [0.05, "storm" ],
- [0.025, "glowingrain" ],
- [0.125, "drizzle" ],
- [0.7, "clear" ]
- ],
- [
- [0.1, "rain" ],
- [0.05, "storm" ],
- [0.025, "windstorm" ],
- [0.125, "drizzle" ],
- [0.7, "clear" ]
- ],
- [
- [0.1, "rain" ],
- [0.05, "storm" ],
- [0.025, "groundmist" ],
- [0.125, "drizzle" ],
- [0.6, "clear" ],
- [0.1, "fog" ]
- ],
- [
- [0.05, "acidrain" ],
- [0.95, "clear" ]
- ],
- [
- [0.005, "meteorshower" ],
- [0.995, "clear" ]
- ],
- [
- [0.001, "largemeteor" ],
- [0.999, "clear" ]
- ],
- [
- [0.2, "sandstorm" ],
- [0.8, "clear" ]
- ],
- [
- [0.1, "spacedustshower" ],
- [0.90, "clear" ]
- ],
- [
- [0.2, "fog" ],
- [0.8, "clear" ]
- ],
- [
- [0.1, "rain" ],
- [0.05, "storm" ],
- [0.025, "glowingrain" ],
- [0.125, "drizzle" ],
- [0.7, "clear" ]
- ],
- [
- [0.02, "spacejunk" ],
- [0.98, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ]
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:commonFog",
+ "/weather.config:commonLightRainMixAndGlowingRain",
+ "/weather.config:commonLightRainMixAndGlowingRain",
+ "/weather.config:commonLightRainMixAndGroundmist",
+ "/weather.config:commonLightRainMixAndWindstorm",
+ "/weather.config:rareAcidRain",
+ "/weather.config:rareMeteorShower",
+ "/weather.config:rareSpacejunk",
+ "/weather.config:commonSandstorm",
+ "/weather.config:uncommonSpacedust",
+ "/weather.config:veryRareLargeMeteorShower"
],
"statusParameters" : {
@@ -534,5 +487,4 @@
},
"allowedDetachedBiomes" : [ "crystalline", "rust", "arctic", "arid", "desert", "forest", "grasslands", "jungle", "magma", "ocean", "savannah", "snow", "tentacles", "tundra", "volcanic" ]
-
}
View
80 assets/biomes/surface/snow/snow.surfacebiome
@@ -1,6 +1,9 @@
{
"name" : "snow",
+ "friendlyName" : "Snow",
"caveLiquidType" : [ "water", "acid", "tarliquid" ],
+ "requiredStatuses" : [ "beamaxe" ],
+ "spawnProfile" : "surfacemix",
"hueShiftOptions" : [-180, 0, 45, 30],
"skyOptions" : [
@@ -139,68 +142,20 @@
"undergroundParallax" : "snow.undergroundparallax",
"weather" : [
- [
- [0.1, "rain" ],
- [0.05, "storm" ],
- [0.025, "glowingrain" ],
- [0.125, "drizzle" ],
- [0.7, "clear" ]
- ],
- [
- [0.6, "snow" ],
- [0.3, "clear" ],
- [0.1, "snowstorm" ]
- ],
- [
- [0.7, "snow" ],
- [0.3, "clear" ]
- ],
- [
- [0.7, "snow" ],
- [0.3, "clear" ]
- ],
- [
- [0.05, "acidrain" ],
- [0.95, "clear" ]
- ],
- [
- [0.2, "icestorm" ],
- [0.5, "snow" ],
- [0.3, "clear" ]
- ],
- [
- [0.005, "meteorshower" ],
- [0.995, "clear" ]
- ],
- [
- [0.001, "largemeteor" ],
- [0.999, "clear" ]
- ],
- [
- [0.25, "hailstones" ],
- [0.25, "snow" ],
- [0.5, "clear" ]
- ],
- [
- [0.25, "snow" ],
- [0.15, "snowstorm" ],
- [0.6, "clear" ]
- ],
- [
- [0.9, "snowstorm" ],
- [0.1, "clear" ]
- ],
- [
- [0.6, "snow" ],
- [0.3, "clear" ],
- [0.1, "spacedustshower" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ]
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:commonLightRainMixAndGlowingRain",
+ "/weather.config:commonSnowAndHail",
+ "/weather.config:commonSnowAndIcestorm",
+ "/weather.config:commonSnowAndSnowstorm",
+ "/weather.config:rareAcidRain",
+ "/weather.config:rareMeteorShower",
+ "/weather.config:veryCommonSnow",
+ "/weather.config:veryCommonSnow",
+ "/weather.config:veryCommonSnowAndSpacedust",
+ "/weather.config:veryCommonSnowAndSnowstorm",
+ "/weather.config:veryCommonSnowstorm",
+ "/weather.config:veryRareLargeMeteorShower"
],
"ambientNoises" : {
@@ -607,6 +562,5 @@
}
},
"allowedDetachedBiomes" : [ "geometric", "orb", "spring", "ice", "arctic", "arid", "desert", "forest", "grasslands", "jungle", "magma", "ocean", "savannah", "snow", "tentacles", "tundra", "volcanic" ]
-
// "allowedDetachedBiomes" : [ "ice", "spring" ]
}
View
67 assets/biomes/surface/tentacles/tentacles.surfacebiome
@@ -1,6 +1,9 @@
{
"name" : "tentacles",
+ "friendlyName" : "Tentacles",
"caveLiquidType" : "tentaclejuice",
+ "requiredStatuses" : [ "beamaxe" ],
+ "spawnProfile" : "surfacemix",
"hueShiftOptions" : [-45, 0, 45],
"skyOptions" : [
@@ -137,57 +140,18 @@
},
"weather" : [
- [
- [0.1, "rain" ],
- [0.05, "storm" ],
- [0.025, "glowingrain" ],
- [0.125, "drizzle" ],
- [0.7, "clear" ]
- ],
- [
- [0.1, "rain" ],
- [0.05, "storm" ],
- [0.025, "glowingrain" ],
- [0.125, "drizzle" ],
- [0.7, "clear" ]
- ],
- [
- [0.1, "rain" ],
- [0.05, "storm" ],
- [0.025, "glowingrain" ],
- [0.125, "drizzle" ],
- [0.7, "clear" ]
- ],
- [
- [0.55, "acidrain" ],
- [0.55, "clear" ]
- ],
- [
- [0.005, "meteorshower" ],
- [0.995, "clear" ]
- ],
- [
- [0.001, "largemeteor" ],
- [0.999, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ]
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:commonLightRainMixAndGlowingRain",
+ "/weather.config:commonLightRainMixAndGlowingRain",
+ "/weather.config:commonLightRainMixAndGlowingRain",
+ "/weather.config:rareMeteorShower",
+ "/weather.config:veryCommonAcidRain",
+ "/weather.config:veryRareLargeMeteorShower"
],
"parallax" : "tentacles.parallax",
@@ -505,5 +469,4 @@
},
"allowedDetachedBiomes" : [ "forest", "arid", "desert", "grasslands", "jungle", "magma", "savannah", "snow", "tundra", "volcanic" ]
-
}
View
73 assets/biomes/surface/tundra/tundra.surfacebiome
@@ -1,6 +1,9 @@
{
"name" : "tundra",
+ "friendlyName" : "Tundra",
"caveLiquidType" : "water",
+ "requiredStatuses" : [ "beamaxe" ],
+ "spawnProfile" : "surfacemix",
"hueShiftOptions" : [0],
"skyOptions" : [
@@ -134,61 +137,19 @@
"undergroundParallax" : "tundra.undergroundparallax",
"weather" : [
- [
- [0.6, "snow" ],
- [0.3, "clear" ],
- [0.1, "snowstorm" ]
- ],
- [
- [0.7, "snow" ],
- [0.3, "clear" ]
- ],
- [
- [0.7, "snow" ],
- [0.3, "clear" ]
- ],
- [
- [0.1, "glowingrain" ],
- [0.9, "clear" ]
- ],
- [
- [0.2, "icestorm" ],
- [0.5, "snow" ],
- [0.3, "clear" ]
- ],
- [
- [0.005, "meteorshower" ],
- [0.995, "clear" ]
- ],
- [
- [0.001, "largemeteor" ],
- [0.999, "clear" ]
- ],
- [
- [0.25, "hailstones" ],
- [0.25, "snow" ],
- [0.5, "clear" ]
- ],
- [
- [0.25, "snow" ],
- [0.15, "snowstorm" ],
- [0.6, "clear" ]
- ],
- [
- [0.9, "snowstorm" ],
- [0.1, "clear" ]
- ],
- [
- [0.6, "snow" ],
- [0.3, "clear" ],
- [0.1, "spacedustshower" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ]
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:commonSnowAndHail",
+ "/weather.config:commonSnowAndIcestorm",
+ "/weather.config:commonSnowAndSnowstorm",
+ "/weather.config:rareMeteorShower",
+ "/weather.config:uncommonGlowingRain",
+ "/weather.config:veryCommonSnow",
+ "/weather.config:veryCommonSnow",
+ "/weather.config:veryCommonSnowAndSnowstorm",
+ "/weather.config:veryCommonSnowAndSpacedust",
+ "/weather.config:veryCommonSnowstorm",
+ "/weather.config:veryRareLargeMeteorShower"
],
"statusParameters" : {
@@ -580,7 +541,7 @@
]
}
},
- "allowedDetachedBiomes" : [ "geometric", "orb", "spring", "ice", "arctic", "arid", "desert", "forest", "grasslands", "jungle", "magma", "ocean", "savannah", "snow", "tentacles", "tundra", "volcanic" ]
+ "allowedDetachedBiomes" : [ "geometric", "orb", "spring", "ice", "arctic", "arid", "desert", "forest", "grasslands", "jungle", "magma", "ocean", "savannah", "snow", "tentacles", "tundra", "volcanic" ]
// "allowedDetachedBiomes" : [ "ice", "spring" ]
}
View
57 assets/biomes/surface/volcanic/volcanic.surfacebiome
@@ -1,6 +1,9 @@
{
"name" : "volcanic",
+ "friendlyName" : "Volcanic",
"caveLiquidType" : "lava",
+ "requiredStatuses" : [ "beamaxe" ],
+ "spawnProfile" : "surfacemix",
"hueShiftOptions" : [-54, -120, 0, 20],
"skyOptions" : [
@@ -140,46 +143,16 @@
},
"weather" : [
- [
- [0.1, "rain" ],
- [0.05, "storm" ],
- [0.025, "glowingrain" ],
- [0.125, "drizzle" ],
- [0.7, "clear" ]
- ],
- [
- [0.05, "acidrain" ],
- [0.95, "clear" ]
- ],
- [
- [0.03, "meteorshower" ],
- [0.97, "clear" ]
- ],
- [
- [0.01, "largemeteor" ],
- [0.99, "clear" ]
- ],
- [
- [0.25, "ash" ],
- [0.75, "clear" ]
- ],
- [
- [0.1, "spacedustshower" ],
- [0.90, "clear" ]
- ],
- [
- [0.25, "ember" ],
- [0.75, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ],
- [
- [1.0, "clear" ]
- ]
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:clear",
+ "/weather.config:commonAsh",
+ "/weather.config:commonEmber",
+ "/weather.config:commonLightRainMixAndGlowingRain",
+ "/weather.config:rareAcidRain",
+ "/weather.config:rareLargeMeteorShower",
+ "/weather.config:uncommonMeteorShower",
+ "/weather.config:uncommonSpacedust"
],
"ambientNoises" : {
@@ -504,9 +477,5 @@
},
"allowedDetachedBiomes" : [ "crystalline", "rust", "arctic", "arid", "desert", "forest", "grasslands", "jungle", "magma", "ocean", "savannah", "snow", "tentacles", "tundra", "volcanic" ]
-
// "allowedDetachedBiomes" : [ "crystalline" ]
-
-
-
}
View
5 assets/biomes/surface_detached/ariddetached/aridbones.surfacebiome
@@ -1,5 +1,8 @@
{
"name" : "aridbones",
+ "friendlyName" : "Aridbones",