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.

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

Improve compatibility with all mods that add dungeons to Garden planet #3529

Merged
merged 4 commits into from
Jan 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions quests/fu_questlines/tutorial/start_basics3b.questtemplate
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id" : "start_basics3b",
"prerequisites" : [ "start_basics3" ],
"title" : "Homestead III (pt 2)",
"text" : "Sometimes, the darkness can prove a horrible hindrance. That's where tha ^orange;Oil^reset; I got ya ter make comes in: You can craft a ^orange;Lantern Stick^reset; to see in the dark at a ^orange;Foraging Station^reset;. ^green;Research^reset; into ^orange;Agriculture^reset; to learn how.",
"text" : "Sometimes, the darkness can prove a horrible hindrance. That's where tha ^orange;Oil^reset; I got ya ter make comes in: You can craft a ^orange;Lantern Stick^reset; to see in the dark at a ^orange;Foraging Table^reset;. ^green;Research^reset; into ^orange;Agriculture^reset; to learn how.",
"completionText" : "Now you'll be able to slap that on your head and travel without needing to hold a flashlight! Also, I found some ^orange;Plant Fibre^reset; in storage. Why don't you take it?",
"moneyRange" : [33, 44],
"rewards" : [ [ [ "plantfibre",100 ],[ "fuscienceresource",110 ] ] ],
Expand Down Expand Up @@ -30,4 +30,4 @@
}
]
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"mainQuest" : true,
"title" : "Ship Repairs",
"text" : "Perhaps this friendly creature can help me ^green;repair the ship^reset; and get away from this star system. I'll need to work at it either way, using my ^orange;Personal Tricorder^reset; to conduct research whenever I can.",
"completionText" : "Thanks to ^green;Vinalisj^reset;, you've managed your first steps towards escaping this planet. He's given you a key for a nearby ^orange;Dark Cavern^reset; and wants you to check it for ^green;Energy Sources^reset; that may prove vital in your repairs.",
"completionText" : "Thanks to ^green;Vinalisj^reset;, you've managed your first steps towards escaping this planet. He asked you to visit a nearby ^orange;Dark Cavern^reset;, which seems to have an ^green;Energy Source^reset; that may prove vital in your repairs.",
"moneyRange" : [50, 50],
"canBeAbandoned" : false,
"invisible" : false,
Expand All @@ -27,7 +27,7 @@
"scienceoutpostCinema" : "/cinematics/fuCore/scienceoutpost_unlocked.cinematic",
"descriptions" : {
"makeFurnace":"Research ^cyan;Geology^reset; and create a ^orange;Furnace^reset;.",
"makeForaging":"Research ^cyan;Agriculture^reset; and create a ^orange;Foraging Station^reset;.",
"makeForaging":"Research ^cyan;Agriculture^reset; and create a ^orange;Foraging Table^reset;.",
"makeTable" : "Research ^cyan;Engineering^reset; and create a ^orange;Machining Table^reset;.",
"makeWire" : "Use a ^cyan;Machining Table^reset; to create ^orange;Wire^reset;",
"makeElectromagnet" : "Use a ^cyan;Machining Table^reset; to create an ^orange;Electromagnet^reset;",
Expand Down
2 changes: 1 addition & 1 deletion radiomessages/fu_quests.radiomessages
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"type" : "quest",
"senderName" : "Vinalisj",
"portraitImage": "/interface/chatbubbles/fuvintalk.png:<frame>",
"text" : "That takes care of step one! Use your ^orange;Furnace^reset; to smelt ores into metal bars. Next, ^green;Research^reset; how to make a ^orange;Foraging Station^reset; in the ^cyan;Agriculture^reset; research tree. Craft one.",
"text" : "That takes care of step one! Use your ^orange;Furnace^reset; to smelt ores into metal bars. Next, ^green;Research^reset; how to make a ^orange;Foraging Table^reset; in the ^cyan;Agriculture^reset; research tree. Craft one.",
"portraitFrames" : 9,
"persistTime" : 20.0
},
Expand Down
2 changes: 1 addition & 1 deletion species/glitch.species.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"op" : "replace",
"path" : "/charCreationTooltip/description",
"value" : "Their creation is lost to history. This suits them just fine, as they prefer a primitive state of being. Their medieval culture favors training with shields, maces and crossbows.
"value" : "Their creation is lost to history. This suits them just fine, as they prefer a primitive state of being. Their medieval culture favors training with shields, hammers and bows.

^orange;Diet^reset;: Robotic/Omnivore

Expand Down
4 changes: 2 additions & 2 deletions terrestrial_worlds.config.patch
Original file line number Diff line number Diff line change
Expand Up @@ -910,12 +910,12 @@
{
"op": "replace",
"path": "/planetTypes/garden/layers/surface/dungeonCountRange/0",
"value": 4
"value": 10
},
{
"op": "replace",
"path": "/planetTypes/garden/layers/surface/dungeonCountRange/1",
"value": 4
"value": 10
},
{
"op": "add",
Expand Down
2 changes: 1 addition & 1 deletion zb/researchTree/fu_agriculture.config
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@
"xenolab2" : ["Amazing Gene Extraction","^orange;Tier 4^reset;\n\nYou've improved even further on your Xenolab design. Your new ^cyan;Advanced Xenolab^reset; works incredibly fast."],
"treecloner" : ["Tree Cloning","^orange;Tier 3^reset;\n\nYou've used your knowledge of genetic engineering to splice trees together into strange combined forms with the trunk of one tree and the leaves of another. The possibilities are immense, and experimentation will yield great results."],

"farming1" : ["Farming","^orange;Tier 1^reset;\n\nYou've learned some more complex methods of farming and can now build several helpful farming objects. The ^cyan;Growing Tray^reset; is the most important of these, as it will automatically grow seeds placed inside with the help of fertilizers that increase yields far beyond what is possible through manual labor. Craft it at your ^orange;Foraging Station^reset;."],
"farming1" : ["Farming","^orange;Tier 1^reset;\n\nYou've learned some more complex methods of farming and can now build several helpful farming objects. The ^cyan;Growing Tray^reset; is the most important of these, as it will automatically grow seeds placed inside with the help of fertilizers that increase yields far beyond what is possible through manual labor. Craft it at your ^orange;Foraging Table^reset;."],
"farming2" : ["Advanced Farming","^orange;Tier 2^reset;\n\nWith a ^cyan;Heatlamp Tray^reset; made at your ^orange;Electronics Center^reset;, you can turn electrical power into faster plant growth. They'll use more water per plant than a Growing Tray, but the added speed is worth it! \n\nIn addition, you've learned to create hydroponic and aeroponic tubing, more advanced sprinkler systems, and other useful farming enhancements for farming the old-fashioned way if you prefer that."],
"farming3" : ["Farming Mastery","^orange;Tier 3^reset;\n\nYou can make an hydroponics-powered Growing Tray that operates even faster when powered, and doesn't use extra water like the Heatlamp Tray does. You can find it at your ^orange;Electronics Center^reset;."],
"gathering1" : ["Gathering","^orange;Tier 1^reset;\n\nYou've learned hunter-gatherer skills like trapping, fishing and creating specialized weapons designed to maximize usable material from the things you kill."],
Expand Down
Loading