Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

backlog of changes #3611

Merged
merged 21 commits into from
Dec 27, 2024
Merged

backlog of changes #3611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
7e2f926
cattle feed nerf
giantcavespider Oct 14, 2023
b12c906
fix monster/npc fall damage
giantcavespider Mar 18, 2024
e343bce
don't do that
giantcavespider Mar 25, 2024
6c5c727
swimming script ignores flyers
giantcavespider Mar 25, 2024
fe2c661
update block descriptions
giantcavespider Sep 26, 2024
e22bf36
why
giantcavespider Oct 1, 2024
cdd83e0
remove forced gravity from lush dungeons
giantcavespider Oct 23, 2024
2bf67d5
rename skath ship images to be properly used by intro cinematic
giantcavespider Oct 23, 2024
c5d6908
goof
giantcavespider Oct 24, 2024
8b43c61
fix freeze error
giantcavespider Nov 2, 2024
8721746
add groups to hand crafting recipes for compatibility
giantcavespider Nov 13, 2024
7cdf962
failsafe
giantcavespider Nov 16, 2024
3a0162c
extraction recipe tweaks
giantcavespider Nov 16, 2024
a370a2c
make terramart eggs expensive again
giantcavespider Nov 17, 2024
4fe1822
shut up sail
giantcavespider Nov 17, 2024
b7e07e8
tweak fall damage again
giantcavespider Nov 18, 2024
9e19a80
fix misleading hunger information
giantcavespider Nov 24, 2024
fbbda28
Revert "fix misleading hunger information"
giantcavespider Nov 24, 2024
bef6e30
make madness adult poptop pet use correct monster
giantcavespider Nov 28, 2024
1999b7e
remove almost-never-seen dialog code
giantcavespider Dec 20, 2024
47649ee
capitalization fix
giantcavespider Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion biomes/underground_detached/precursorunderground.biome
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
"type" : "object",
"objectSets" : [
{
"pool" : [ [0.35, "invisiblelight"], [0.35, "invisiblesparker"], [0.35, "teslaspike"], [0.35, "tesla"], [0.35, "coppersupport"],[0.35, "junctionbox" ], [0.55, "device1" ], [0.35, "metallicmachine1" ],[0.35, "metallicmachine2" ],[0.35, "metallicmachine3" ],[0.35, "metallicmachine4" ],[0.35, "metallicmachine5" ],[0.35, "metallicmachine6" ],[0.35, "metallicmachine7" ],[0.35, "tetrapod" ],[0.35, "tech2" ],[0.35, "outpostcargocrate" ],[0.35, "outpostcargocrateshort" ],[0.35, "outpostgenerator" ],[0.35, "outpostconsole" ],[0.35, "outpostradardish" ],[0.35, "outpostsecurityconsole" ],[0.35, "outposttank" ],[0.35, "roofvent" ],[0.35, "outpostlamp" ],[0.35, "sawblade2" ],[0.35, "ancientbouldertrap" ],[0.35, "airbooster" ],[0.35, "ancientconsole" ], [0.35, "wreckconsole1" ], [0.35, "wreckconsole2" ], [0.35, "wreckconsole3" ], [ 0.35, "wreckturbine2" ], [ 0.35, "wreckturbines" ], [ 0.35, "ancienticetrap" ], [ 0.35, "ancientpillar" ], [ 0.35, "ancientcrystaltrap" ], [ 0.35, "jumpbooster" ], [ 0.35, "powerbooster" ], [ 0.35, "speedbooster" ] ],
"pool" : [ [0.35, "invisiblelight"], [0.35, "invisiblesparker"], [0.35, "teslaspike"], [0.35, "tesla"], [0.35, "coppersupport"],[0.35, "junctionbox" ], [0.55, "device1" ], [0.35, "metallicmachine1" ],[0.35, "metallicmachine2" ],[0.35, "metallicmachine3" ],[0.35, "metallicmachine4" ],[0.35, "metallicmachine5" ],[0.35, "metallicmachine6" ],[0.35, "metallicmachine7" ],[0.35, "tetrapod" ],[0.35, "tech2" ],[0.35, "outpostcargocrate" ],[0.35, "outpostcargocrateshort" ],[0.35, "outpostgenerator" ],[0.35, "outpostconsole" ],[0.35, "outpostradardish" ],[0.35, "outpostsecurityconsole" ],[0.35, "outposttank" ],[0.35, "roofvent" ],[0.35, "outpostlamp" ],[0.35, "sawblade2" ],[0.35, "ancientbouldertrap" ],[0.35, "airbooster" ],[0.35, "wreckconsole1" ], [0.35, "wreckconsole2" ], [0.35, "wreckconsole3" ], [ 0.35, "wreckturbine2" ], [ 0.35, "wreckturbines" ], [ 0.35, "ancienticetrap" ], [ 0.35, "ancientpillar" ], [ 0.35, "ancientcrystaltrap" ], [ 0.35, "jumpbooster" ], [ 0.35, "powerbooster" ], [ 0.35, "speedbooster" ] ],
"parameters" : { }
}
]
Expand Down
0 cinematics/story/skathShip.png → cinematics/story/smallship/skathShip.png
View file
Open in desktop
File renamed without changes
0 cinematics/story/skathShip2.png → cinematics/story/smallship/skathShip2.png
View file
Open in desktop
File renamed without changes
0 cinematics/story/skathShip3.png → cinematics/story/smallship/skathShip3.png
View file
Open in desktop
File renamed without changes
0 cinematics/story/skathShip4.png → cinematics/story/smallship/skathShip4.png
View file
Open in desktop
File renamed without changes
336 changes: 3 additions & 333 deletions dialog/converse.config.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,334 +1,4 @@
[{
"op": "add",
"path": "/converse/default/shadow",
"value": [
"...", "...", "...", "..."
]
},
{
"op": "add",
"path": "/converse/default/fumantizi",
"value": [
"Hello.",
"How are you?",
"How are you doing?",
"Nice to meet you.",
"I hope you are well, my friend.",
"Big Ape is watching.",
"I hope you have a pleasant day.",
"It is good to see you.",
"Can I help you?",
"Good day, my friend.",
"Hello, stranger.",
"Welcome.",
"Welcome, my friend.",
"It is nice to meet you.",
"Please, stay a while.",
"How do you do, my friend?",
"Greetings, stranger, and welcome.",
"Hello, friend.",
"How is it going?",
"Have a good day.",
"Can I offer you anything, my friend?",
"Pleased to meet you, friend.",
"Have a good day.",
"Make yourself at home.",
"Hi there.",
"Hi.",
"Ok, nice to meet you.",
"Alright, my friend?",
"Hey there, strange person.",
"Hello to you."
]
},
{
"op": "add",
"path": "/converse/default/fumantis",
"value": [
"Hello.",
"How are you?",
"How are you doing?",
"Nice to meet you.",
"I hope you are well, my friend.",
"Big Ape is watching.",
"I hope you have a pleasant day.",
"It is good to see you.",
"Can I help you?",
"Good day, my friend.",
"Hello, stranger.",
"Welcome.",
"Welcome, my friend.",
"It is nice to meet you.",
"Please, stay a while.",
"How do you do, my friend?",
"Greetings, stranger, and welcome.",
"Hello, friend.",
"How is it going?",
"Have a good day.",
"Can I offer you anything, my friend?",
"Pleased to meet you, friend.",
"Have a good day.",
"Make yourself at home.",
"Hi there.",
"Hi.",
"Ok, nice to meet you.",
"Alright, my friend?",
"Hey there, strange person.",
"Hello to you."
]
},
{
"op": "add",
"path": "/converse/default/fuizku",
"value": [
"Hello.",
"How are you?",
"How are you doing?",
"Nice to meet you.",
"I hope you are well, my friend.",
"Big Ape is watching.",
"I hope you have a pleasant day.",
"It is good to see you.",
"Can I help you?",
"Good day, my friend.",
"Hello, stranger.",
"Welcome.",
"Welcome, my friend.",
"It is nice to meet you.",
"Please, stay a while.",
"How do you do, my friend?",
"Greetings, stranger, and welcome.",
"Hello, friend.",
"How is it going?",
"Have a good day.",
"Can I offer you anything, my friend?",
"Pleased to meet you, friend.",
"Have a good day.",
"Make yourself at home.",
"Hi there.",
"Hi.",
"Ok, nice to meet you.",
"Alright, my friend?",
"Hey there, strange person.",
"Hello to you."
]
},
{
"op": "add",
"path": "/converse/default/slimeperson",
"value": [
"Hello.",
"How are you?",
"How are you doing?",
"Nice to meet you.",
"I hope you are well, my friend.",
"Big Ape is watching.",
"I hope you have a pleasant day.",
"It is good to see you.",
"Can I help you?",
"Good day, my friend.",
"Hello, stranger.",
"Welcome.",
"Welcome, my friend.",
"It is nice to meet you.",
"Please, stay a while.",
"How do you do, my friend?",
"Greetings, stranger, and welcome.",
"Hello, friend.",
"How is it going?",
"Have a good day.",
"Can I offer you anything, my friend?",
"Pleased to meet you, friend.",
"Have a good day.",
"Make yourself at home.",
"Hi there.",
"Hi.",
"Ok, nice to meet you.",
"Alright, my friend?",
"Hey there, strange person.",
"Hello to you."
]
},
{
"op": "add",
"path": "/converse/default/fuslimeperson",
"value": [
"Hello.",
"How are you?",
"How are you doing?",
"Nice to meet you.",
"I hope you are well, my friend.",
"Big Ape is watching.",
"I hope you have a pleasant day.",
"It is good to see you.",
"Can I help you?",
"Good day, my friend.",
"Hello, stranger.",
"Welcome.",
"Welcome, my friend.",
"It is nice to meet you.",
"Please, stay a while.",
"How do you do, my friend?",
"Greetings, stranger, and welcome.",
"Hello, friend.",
"How is it going?",
"Have a good day.",
"Can I offer you anything, my friend?",
"Pleased to meet you, friend.",
"Have a good day.",
"Make yourself at home.",
"Hi there.",
"Hi.",
"Ok, nice to meet you.",
"Alright, my friend?",
"Hey there, strange person.",
"Hello to you."
]
},
{
"op": "add",
"path": "/converse/default/veluu",
"value": [
"Hello.",
"How are you?",
"How are you doing?",
"Nice to meet you.",
"I hope you are well, my friend.",
"Big Ape is watching.",
"I hope you have a pleasant day.",
"It is good to see you.",
"Can I help you?",
"Good day, my friend.",
"Hello, stranger.",
"Welcome.",
"Welcome, my friend.",
"It is nice to meet you.",
"Please, stay a while.",
"How do you do, my friend?",
"Greetings, stranger, and welcome.",
"Hello, friend.",
"How is it going?",
"Have a good day.",
"Can I offer you anything, my friend?",
"Pleased to meet you, friend.",
"Have a good day.",
"Make yourself at home.",
"Hi there.",
"Hi.",
"Ok, nice to meet you.",
"Alright, my friend?",
"Hey there, strange person.",
"Hello to you."
]
},
{
"op": "add",
"path": "/converse/default/fudarkizku",
"value": [
"Hello.",
"How are you?",
"How are you doing?",
"Nice to meet you.",
"I hope you are well, my friend.",
"Why do you sound like a Glitch?", "Are you related to the Glitch in any way?",
"I hope you have a pleasant day.",
"It is good to see you.",
"Can I help you?",
"Good day, my friend.",
"Hello, stranger.",
"Welcome.",
"Welcome, my friend.",
"It is nice to meet you.",
"Please, stay a while.",
"How do you do, my friend?",
"Greetings, stranger, and welcome.",
"Hello, friend.",
"How is it going?",
"Have a good day.",
"Can I offer you anything, my friend?",
"Pleased to meet you, friend.",
"Have a good day.",
"Make yourself at home.",
"Hi there.",
"Hi.",
"Ok, nice to meet you.",
"Alright, my friend?",
"Hey there, strange person.",
"Hello to you."
]
},
{
"op": "add",
"path": "/converse/default/fuanodyne",
"value": [
"Hello.",
"How are you?",
"How are you doing?",
"Nice to meet you.",
"I hope you are well, my friend.",
"Big Ape is watching.",
"I hope you have a pleasant day.",
"It is good to see you.",
"Can I help you?",
"Good day, my friend.",
"Hello, stranger.",
"Welcome.",
"Welcome, my friend.",
"It is nice to meet you.",
"Please, stay a while.",
"How do you do, my friend?",
"Greetings, stranger, and welcome.",
"Hello, friend.",
"How is it going?",
"Have a good day.",
"Can I offer you anything, my friend?",
"Pleased to meet you, friend.",
"Have a good day.",
"Make yourself at home.",
"Hi there.",
"Hi.",
"Ok, nice to meet you.",
"Alright, my friend?",
"Hey there, strange person.",
"Hello to you."
]
},
{
"op": "add",
"path": "/converse/default/elduukhar",
"value": [
"Hello.",
"How are you?",
"How are you doing?",
"Nice to meet you.",
"I hope you are well, my friend.",
"Big Ape is watching.",
"I hope you have a pleasant day.",
"It is good to see you.",
"Can I help you?",
"Good day, my friend.",
"Hello, stranger.",
"Welcome.",
"Welcome, my friend.",
"It is nice to meet you.",
"Please, stay a while.",
"How do you do, my friend?",
"Greetings, stranger, and welcome.",
"Hello, friend.",
"How is it going?",
"Have a good day.",
"Can I offer you anything, my friend?",
"Pleased to meet you, friend.",
"Have a good day.",
"Make yourself at home.",
"Hi there.",
"Hi.",
"Ok, nice to meet you.",
"Alright, my friend?",
"Hey there, strange person.",
"Hello to you."
]
},
[
{
"op": "add",
"path": "/greeting/human/elduukhar",
Expand Down Expand Up @@ -1341,7 +1011,7 @@
"There is nothing better than Banana shake on summer beach right? No? Oh..",
"I dont want to be rude, but why do you hate sun so much?",
"Has the Miniknog started employing Nightar?",
"Is the Matriarch something like big ape for you?",
"Is the Matriarch something like Big Ape for you?",
"Can Nightar eat bananas?",
"I work in a lab - we could do some tests, make some improvements - maybe make you sun proof.",
"Your kind are scary to some. Do not be offended if some Apex are wary of you.",
Expand Down Expand Up @@ -2768,4 +2438,4 @@
"Have you come to praise Kluex as well?"
]
}
]
]
1 change: 0 additions & 1 deletion dungeons/other/outpost/medic1.dungeon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

"anchor" : [ "medic1" ],

"gravity" : 80,
"maxRadius" : 1000000,
"maxParts" : 100,
"protected" : true
Expand Down
1 change: 0 additions & 1 deletion dungeons/other/outpost/starterhouse.dungeon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

"anchor" : [ "starterhouse" ],

"gravity" : 80,
"maxRadius" : 1000000,
"maxParts" : 100,
"protected" : false
Expand Down
3 changes: 1 addition & 2 deletions interface/scripted/mmupgrade/mmupgradegui.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
require "/scripts/util.lua"
require "/interface/scripted/mmutility/mmutility.lua"

function init()
self.baseStats = {
Expand Down Expand Up @@ -122,7 +121,7 @@ function giveRacialManipulator()
mm.parameters.upgrades[#mm.parameters.upgrades + 1] = "liquidcollection"
end
if manip.rangeBonus then
status.setStatusProperty("bonusBeamGunRadius", getMMRange(mm))
status.setStatusProperty("bonusBeamGunRadius", manip.rangeBonus+status.statusProperty("bonusBeamGunRadius", 0))
end

local newcfg = root.itemConfig(manip.item).config
Expand Down
Loading