Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -durN starbound.assets.636.orig/biomes/surface/magma/magma.undergroundparallax starbound.assets.636/biomes/surface/magma/magma.undergroundparallax
- --- starbound.assets.636.orig/biomes/surface/magma/magma.undergroundparallax 2014-01-29 03:58:27.126650300 +0100
- +++ starbound.assets.636/biomes/surface/magma/magma.undergroundparallax 2014-01-29 14:38:40.781788400 +0100
- @@ -1,7 +1,7 @@
- {
- "image" : "magmaunderground.png?brightness=-65",
- "dividerimage" : "rockdivider.png?brightness=-65",
- - "nohueshift" : 1,
- + "nohueshift" : true,
- "parallax" : 1.1,
- "origin" : [0, 395]
- }
- diff -durN starbound.assets.636.orig/biomes/surface/ocean/ocean.undergroundparallax starbound.assets.636/biomes/surface/ocean/ocean.undergroundparallax
- --- starbound.assets.636.orig/biomes/surface/ocean/ocean.undergroundparallax 2014-01-29 03:58:27.235677600 +0100
- +++ starbound.assets.636/biomes/surface/ocean/ocean.undergroundparallax 2014-01-29 04:07:04.853321800 +0100
- @@ -1,7 +1,7 @@
- {
- "image" : "oceanunderground.png",
- "dividerimage" : "rockdivider.png",
- - "nohueshift" : 1,
- + "nohueshift" : true,
- "parallax" : 1,
- "origin" : [0, 180]
- }
- diff -durN starbound.assets.636.orig/biomes/surface/volcanic/volcanic.parallax starbound.assets.636/biomes/surface/volcanic/volcanic.parallax
- --- starbound.assets.636.orig/biomes/surface/volcanic/volcanic.parallax 2014-01-29 03:58:27.424726500 +0100
- +++ starbound.assets.636/biomes/surface/volcanic/volcanic.parallax 2014-01-29 04:05:56.593001300 +0100
- @@ -72,7 +72,7 @@
- "nightCorrelation" : 0,
- "minSpeed" : 0,
- "maxSpeed" : 0,
- - "nohueshift" : 1,
- + "nohueshift" : true,
- "modifiers" : "",
- "fadePercent" : 0.04
- },
- @@ -83,7 +83,7 @@
- "nightCorrelation" : 0,
- "minSpeed" : 0,
- "maxSpeed" : 0,
- - "nohueshift" : 1,
- + "nohueshift" : true,
- "modifiers" : "",
- "fadePercent" : 0.03
- },
- @@ -94,7 +94,7 @@
- "nightCorrelation" : 0,
- "minSpeed" : 0,
- "maxSpeed" : 0,
- - "nohueshift" : 1,
- + "nohueshift" : true,
- "modifiers" : "",
- "fadePercent" : 0.015
- },
- diff -durN starbound.assets.636.orig/npcs/sleepstate.lua starbound.assets.636/npcs/sleepstate.lua
- --- starbound.assets.636.orig/npcs/sleepstate.lua 2014-01-29 03:58:48.405752200 +0100
- +++ starbound.assets.636/npcs/sleepstate.lua 2014-01-31 13:54:42.610682300 +0100
- @@ -29,7 +29,10 @@
- end
- local bedPosition = vec2.add(world.entityPosition(stateData.bedId), { 0, 1 })
- - local toTarget = world.distance(bedPosition, entity.position())
- + if bedPosition == nil then return true end
- + local po = entity.position()
- + if po == nil then return true end
- + local toTarget = world.distance(bedPosition, po)
- if world.magnitude(toTarget) < entity.configParameter("sleep.lieDownRadius") then
- entity.setLounging(stateData.bedId)
- else
- diff -durN starbound.assets.636.orig/scripts/vec2.lua starbound.assets.636/scripts/vec2.lua
- --- starbound.assets.636.orig/scripts/vec2.lua 2014-01-29 03:59:07.696995800 +0100
- +++ starbound.assets.636/scripts/vec2.lua 2014-01-29 04:02:38.537703400 +0100
- @@ -3,31 +3,38 @@
- vec2 = {}
- function vec2.eq(vector1, vector2)
- + if vector1 == nil then return vector1 end
- + if vector2 == nil then return vector2 end
- return vector1[1] == vector2[1] and vector1[2] == vector2[2]
- end
- function vec2.dup(vector)
- + if vector == nil then return vector end
- return { vector[1], vector[2] }
- end
- function vec2.norm(vector)
- + if vector == nil then return vector end
- local magnitude = world.magnitude(vector)
- return vec2.div(vector, magnitude)
- end
- function vec2.mul(vector, scalar)
- + if vector == nil then return vector end
- vector[1] = vector[1] * scalar
- vector[2] = vector[2] * scalar
- return vector
- end
- function vec2.div(vector, scalar)
- + if vector == nil then return vector end
- vector[1] = vector[1] / scalar
- vector[2] = vector[2] / scalar
- return vector
- end
- function vec2.add(vector, scalar_or_vector)
- + if vector == nil then return vector end
- if type(scalar_or_vector) == "table" then
- vector[1] = vector[1] + scalar_or_vector[1]
- vector[2] = vector[2] + scalar_or_vector[2]
- @@ -40,6 +47,7 @@
- end
- function vec2.sub(vector, scalar_or_vector)
- + if vector == nil then return vector end
- if type(scalar_or_vector) == "table" then
- vector[1] = vector[1] - scalar_or_vector[1]
- vector[2] = vector[2] - scalar_or_vector[2]
- @@ -52,6 +60,7 @@
- end
- function vec2.angle(vector)
- + if vector == nil then return vector end
- local angle = math.atan2(vector[2], vector[1])
- if angle < 0 then angle = angle + 2 * math.pi end
- if vector[1] < 0 then angle = math.pi - angle end
- @@ -59,6 +68,7 @@
- end
- function vec2.rotate(vector, angle)
- + if vector == nil then return vector end
- local sinAngle = math.sin(angle)
- local cosAngle = math.cos(angle)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement