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

Misc. fixes: rain watering crops, Getting Started quest, Blade Tree Dart #3514

Merged
merged 5 commits into from
Nov 25, 2023
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
10 changes: 0 additions & 10 deletions biomes/surface/strangeseafloor.biome
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,6 @@
"spawnProfile" : {
"groups" : [
{
"select" : 3,
"pool" : [
[ 0.1, "eyeslime" ],
[ 0.4, "eyeslimeking" ],
[ 0.1, "eyejelly" ],
[ 0.4, "eyejellyking" ],
[ 0.4, "anglure6" ],
[ 1, "garflipp" ]
]
},{
"select" : 5,
"pool" : [
[ 0.18, "smallFishOcean1" ],
Expand Down
2 changes: 1 addition & 1 deletion items/generic/loot/fuancientkey.item
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"price" : 100,
"itemTags" :[ "artifactBasic" ],
"inventoryIcon" : "fuancientkey.png",
"description" : "A strange device made by the Ancients.",
"description" : "^red;This item is no longer needed, it's safe to sell it.^reset;\nA strange device made by the Ancients.",
"shortdescription" : "Ancient Device",
"maxStack" : 1
}
3 changes: 1 addition & 2 deletions items/throwables/ise3/bladetreeblade.thrownitem
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
"edgeTrigger" : true,
"windupTime" : 0.0,
"cooldown" : 0.4,
"timeToLive" : 1.2,


"category" : "throwableItem",
"projectileType" : "bladetreedart",
"projectileConfig" : {
Expand Down
1 change: 0 additions & 1 deletion npcs/merchantpools.config.patch
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
{"item": {"name": "ancienttemplemap"}, "prerequisiteQuest": "outpostclue"},
{"item": {"name": "mecharmmissilerack-recipe"}, "prerequisiteQuest": "mechupgrade1"},
{"item": {"name": "mecharmsinrack-recipe"}, "prerequisiteQuest": "mechupgrade1"},
{"item": {"name": "fuancientkey"}, "prerequisiteQuest": "create_matterassembler"},
{"item": {"name": "fuorangebag"}, "prerequisiteQuest": "create_clothingfabricator3c"},
{"item": {"name": "alien_trophy", "parameters": {"genomeInspected": true, "category": "artifactResearched"}}, "prerequisiteQuest": "evernight.gearup"},
{"item": {"name": "temple_trophy", "parameters": {"genomeInspected": true, "category": "artifactResearched"}}, "prerequisiteQuest": "ancienttemple.gearup"},
Expand Down
2 changes: 0 additions & 2 deletions quests/scripts/story/gaterepair.lua
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ end


function checkGate()
--if player.hasItem({name = "fuancientkey", count = 1}) then
if player.hasCompletedQuest("create_matterassembler") then
self.gateUid = "ancientgate2"
else
Expand Down Expand Up @@ -197,7 +196,6 @@ function repairGate()
else
storage.stage = 3
quest.setObjectiveList({{self.descriptions.makeTable, false}})
player.radioMessage("fu_start_needstricorder")
self.state:set(self.stages[storage.stage])
end

Expand Down
1 change: 0 additions & 1 deletion quests/scripts/tutorial/fu_start.lua
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ function setStage(newStage)
player.radioMessage("fu_start_Complete1a", 1)
player.radioMessage("fu_start_Complete1b", 1)
player.radioMessage("fu_start_Complete1c", 1)
player.giveItem("fuancientkey")
end
storage.missionStage = newStage
end
Expand Down
22 changes: 1 addition & 21 deletions radiomessages/fu_quests.radiomessages
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
"type" : "quest",
"senderName" : "Vinalisj",
"portraitImage": "/interface/chatbubbles/fuvintalk.png:<frame>",
"text" : "In order to access the cave, you're going to need this ^orange;key^reset; that I interestingly found in the ^green;old, ruined house^reset; on the surface. It seems to react with the cavern, allowing entrance. ^red;Keep it with you, or you won't be able to enter^reset;!",
"text" : "The cave was previously locked, but I just opened it with a ^orange;key^reset; that I interestingly found in the ^green;old, ruined house^reset; on the surface. You should be able to enter now.",
"portraitFrames" : 9,
"portraitSpeed" : 3,
"persistTime" : 20.0
Expand Down Expand Up @@ -150,26 +150,6 @@
"persistTime" : 20.0
},

"fu_start_needstricorder" : {
"type" : "quest",
"senderName" : "Vinalisj",
"portraitImage": "/interface/chatbubbles/fuvintalk.png:<frame>",
"text" : "The ^orange;Ancient Device^reset; will probably allow you to interface with the ^orange;power source^reset;! I've heard they react to the technology of their creators.",
"portraitFrames" : 9,
"portraitSpeed" : 3,
"persistTime" : 20.0
},

"fu_start_needstricorder2" : {
"type" : "quest",
"senderName" : "Vinalisj",
"portraitImage": "/interface/chatbubbles/fuvintalk.png:<frame>",
"text" : "Without a ^orange;Tricorder^reset; we won't be able to proceed. It needs to interface with this machine to properly enable the power.",
"portraitFrames" : 9,
"portraitSpeed" : 3,
"persistTime" : 20.0
},

"fu_outpost1" : {
"type" : "quest",
"senderName" : "Vinalisj",
Expand Down
2 changes: 1 addition & 1 deletion tech/items/combatmaneuvering1.item
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"price" : 100,
"category" : "Tech",
"inventoryIcon" : "/tech/dashcombat.png",
"description" : "Short-ranged double-tap dodge. Increases Shield Bash chance and Protection.",
"description" : "Short-ranged double-tap dodge. Increases Shield Bash chance and Protection.\n^green;It's safe to sell this item, you won't lose the tech.^reset;\n^yellow;In multiplayer:^reset; giving this item to another player will teach them this tech.",
"shortdescription" : "^#77acc3;Dodge^reset;",
"consumeOnPickup" : false,
"itemTags" : [ "trophy" ],
Expand Down
2 changes: 1 addition & 1 deletion tech/items/fudistortionsphere.item
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"price" : 100,
"category" : "Tech",
"inventoryIcon" : "/tech/distortionsphere.png",
"description" : "Transform into a ball! ^green;Press [F]^reset;",
"description" : "Transform into a ball! ^green;Press [F]^reset;\n^green;It's safe to sell this item, you won't lose the tech.^reset;\n^yellow;In multiplayer:^reset; giving this item to another player will teach them this tech.",
"shortdescription" : "^#77acc3;Distortion Sphere^reset;",
"consumeOnPickup" : false,
"itemTags" : [ "trophy" ],
Expand Down
2 changes: 1 addition & 1 deletion tech/items/longjump0.item
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"price" : 100,
"category" : "Tech",
"inventoryIcon" : "/tech/boostedjump.png",
"description" : "Increased jump ability.",
"description" : "Increased jump ability.\n^green;It's safe to sell this item, you won't lose the tech.^reset;\n^yellow;In multiplayer:^reset; giving this item to another player will teach them this tech.",
"shortdescription" : "^#77acc3;Boosted Jump^reset;",
// "learnBlueprintsOnPickup" : [ "longjump_tech" ],
"consumeOnPickup" : false,
Expand Down
11 changes: 11 additions & 0 deletions weather/bog/bograin.weather
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,17 @@
"spawnAboveRegion" : 30,
"spawnHorizontalPad" : 30,
"windAffectAmount" : 1.0
},
{
"projectile" : "lightwater",
"parameters" : {
"power" : 0
},
"velocity" : [0, -100],
"ratePerX" : 0.1,
"spawnAboveRegion" : 30,
"spawnHorizontalPad" : 10,
"windAffectAmount" : 1
}
],

Expand Down
11 changes: 11 additions & 0 deletions weather/rain/bloodrain.weather
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,17 @@
"spawnAboveRegion" : 30,
"spawnHorizontalPad" : 30,
"windAffectAmount" : 1.0
},
{
"projectile" : "lightwater",
"parameters" : {
"power" : 0
},
"velocity" : [0, -100],
"ratePerX" : 0.1,
"spawnAboveRegion" : 30,
"spawnHorizontalPad" : 10,
"windAffectAmount" : 1
}
],

Expand Down
11 changes: 11 additions & 0 deletions weather/rain/fububblerain.weather
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,17 @@
"spawnAboveRegion" : 30,
"spawnHorizontalPad" : 30,
"windAffectAmount" : 0.0
},
{
"projectile" : "lightwater",
"parameters" : {
"power" : 0
},
"velocity" : [0, -100],
"ratePerX" : 0.1,
"spawnAboveRegion" : 30,
"spawnHorizontalPad" : 10,
"windAffectAmount" : 1
}
],

Expand Down
11 changes: 11 additions & 0 deletions weather/rain/mistyrain.weather
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,17 @@
"spawnAboveRegion" : 30,
"spawnHorizontalPad" : 30,
"windAffectAmount" : 1.0
},
{
"projectile" : "lightwater",
"parameters" : {
"power" : 0
},
"velocity" : [0, -100],
"ratePerX" : 0.1,
"spawnAboveRegion" : 30,
"spawnHorizontalPad" : 10,
"windAffectAmount" : 1
}
],

Expand Down
Loading