Skip to content

Commit

Permalink
stuff and things
Browse files Browse the repository at this point in the history
  • Loading branch information
sayterdarkwynd committed Sep 26, 2016
1 parent 49a7e2b commit e41b565
Show file tree
Hide file tree
Showing 15 changed files with 75 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .metadata

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion items/active/weapons/melee/axe/fucultaxe.activeitem
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"primaryAbilityType" : "axecleave",
"primaryAbility" : {
"fireTime" : 0.4,
"baseDps" : 12,
"baseDps" : 8,
"damageConfig" : {
"damageSourceKind" : "axe",
"knockback" : 15
Expand Down
4 changes: 2 additions & 2 deletions quests/stations/designlab/fuquest_bracken.questtemplate
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id" : "fuquest_bracken",
"title" : "^cyan;Silky Smoothe",
"text" : "Sweet. Now that you have a ^orange;Gene Design Lab^reset; we can really get working! The first plant you'll probably want to make is the ^orange;bracken tree^reset;, as the silk it creates ultimately leads to ^green;advanced plastic^reset;. Without plastic, you're sunk.",
"completionText" : "As you unlock more blueprints, you will find your potential for death, destruction and protection will increase exponentially.",
"completionText" : "Bravo. You'll need a ^green;lot of plastic^reset; so keep stocked! Now let's help you see in the dark, shall we?",
"rewards" : [
[ [ "glass", 2] ]
],
Expand All @@ -14,7 +14,7 @@
"portraits" : {
"default" : "player"
},
//"followUp" : "fuquest_methanol",
"followUp" : "fuquest_oonforta",
"conditions" : [
{
"type" : "gatherItem",
Expand Down
27 changes: 27 additions & 0 deletions quests/stations/designlab/fuquest_mutavisk.questtemplate
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"id" : "fuquest_mutavisk",
"title" : "^cyan;Advanced Textiles",
"text" : "The ^orange;Mutavisk^reset; seed is extremely useful, being the sole source in the galaxy of the wonderous textile known as ^orange;Mutavisk Silk^reset;. Why not try crafting a few seeds?",
"completionText" : "Now that you know the basics, you should be able to whip up a wide array of useful plants. Each provides different benefits, so tailor your farm to your personal needs!",
"rewards" : [
[ [ "glass", 2] ]
],
"moneyRange" : [10, 10],

"updateDelta" : 10,
"script" : "/quests/scripts/main.lua",
"scriptConfig" : {
"portraits" : {
"default" : "player"
},
//"followUp" : "fuquest_mutavisk",
"conditions" : [
{
"type" : "gatherItem",
"itemName" : "mutaviskseed",
"count" : 1,
"consume" : false
}
]
}
}
27 changes: 27 additions & 0 deletions quests/stations/designlab/fuquest_oonforta.questtemplate
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"id" : "fuquest_oonforta",
"title" : "^cyan;Light in the Darkness",
"text" : "The ^orange;Oonforta^reset; is a weird but useful fungus. It produces light when thrown, and will be invaluable to you. ^orange;Create some now^reset; and try them out!",
"completionText" : "Great work. Next, I suggest you start getting to work crafting ^orange;Mutavisk Seeds^reset; and start a farm. You'll want the textiles they can create fairly soon.",
"rewards" : [
[ [ "glass", 2] ]
],
"moneyRange" : [10, 10],

"updateDelta" : 10,
"script" : "/quests/scripts/main.lua",
"scriptConfig" : {
"portraits" : {
"default" : "player"
},
"followUp" : "fuquest_mutavisk",
"conditions" : [
{
"type" : "gatherItem",
"itemName" : "oonfortaseed",
"count" : 1,
"consume" : false
}
]
}
}
2 changes: 1 addition & 1 deletion quests/stations/extractor/fuquest_silicon.questtemplate
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"id" : "fuquest_silicon",
"title" : "^cyan;Silicon Valley",
"text" : "^orange;Sand^reset; might get everywhere but it is a valuable source of ^orange;silicon^reset;. With this resource, you will open up an entire new branch of research.",
"text" : "^orange;Sand^reset; might get everywhere but it is a valuable source of ^orange;silicon^reset;. It is most abundant on ^orange;desert^reset; biomes.",
"completionText" : "Now perhaps it's time you created a ^orange;Bio-Chem Lab^reset; and start learning about the wonders of chemistry!",
"rewards" : [
[ [ "glass", 2] ]
Expand Down
2 changes: 1 addition & 1 deletion radiomessages/fu_resources.radiomessages
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@

"pickupBone" : {
"type" : "tutorial",
"text" : "You've found some bone. While somewhat grisly and primitive it can still produce various useful goods including weapons, armor and bonemeal."
"text" : "You've found some bone. While somewhat grisly and primitive it can still produce various useful goods including weapons and armor."
},

"pickupLeather" : {
Expand Down
4 changes: 2 additions & 2 deletions recipes/furniture1/fufoodstorage.recipe
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"input" : [
{ "item" : "darkwoodmaterial", "count" : 4 },
{ "item" : "copperbar", "count" : 3 },
{ "item" : "fabric", "count" : 3 }
{ "item" : "copperbar", "count" : 2 },
{ "item" : "fabric", "count" : 2 }
],
"output" : {
"item" : "fufoodstorage",
Expand Down
4 changes: 2 additions & 2 deletions recipes/furniture1/fugallows.recipe
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"input" : [
{ "item" : "darkwoodmaterial", "count" : 14 },
{ "item" : "climbingrope", "count" : 5 }
{ "item" : "darkwoodmaterial", "count" : 12 },
{ "item" : "climbingrope", "count" : 3 }
],
"output" : {
"item" : "fugallows",
Expand Down
4 changes: 2 additions & 2 deletions recipes/furniture1/fuhaypilewheelbarrow.recipe
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"input" : [
{ "item" : "darkwoodmaterial", "count" : 6 },
{ "item" : "wheat", "count" : 4 }
{ "item" : "darkwoodmaterial", "count" : 3 },
{ "item" : "wheat", "count" : 2 }
],
"output" : {
"item" : "fuhaypilewheelbarrow",
Expand Down
4 changes: 2 additions & 2 deletions recipes/furniture1/fuhayrollwheelbarrow.recipe
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"input" : [
{ "item" : "darkwoodmaterial", "count" : 6 },
{ "item" : "wheat", "count" : 6 }
{ "item" : "darkwoodmaterial", "count" : 3 },
{ "item" : "wheat", "count" : 3 }
],
"output" : {
"item" : "fuhayrollwheelbarrow",
Expand Down
4 changes: 2 additions & 2 deletions recipes/furniture1/fuhaystackwheelbarrow.recipe
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"input" : [
{ "item" : "darkwoodmaterial", "count" : 6 },
{ "item" : "wheat", "count" : 8 }
{ "item" : "darkwoodmaterial", "count" : 3 },
{ "item" : "wheat", "count" : 5 }
],
"output" : {
"item" : "fuhaystackwheelbarrow",
Expand Down
4 changes: 2 additions & 2 deletions recipes/furniture1/fumerchantcart.recipe
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"input" : [
{ "item" : "darkwoodmaterial", "count" : 36 },
{ "item" : "fabric", "count" : 10 }
{ "item" : "darkwoodmaterial", "count" : 12 },
{ "item" : "fabric", "count" : 6 }
],
"output" : {
"item" : "fumerchantcart",
Expand Down
4 changes: 2 additions & 2 deletions recipes/furniture1/fuokeaglitchwagon.recipe
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"input" : [
{ "item" : "darkwoodmaterial", "count" : 24 },
{ "item" : "ironbar", "count" : 8 }
{ "item" : "darkwoodmaterial", "count" : 16 },
{ "item" : "ironbar", "count" : 4 }
],
"output" : {
"item" : "fuokeaglitchwagon",
Expand Down
2 changes: 1 addition & 1 deletion recipes/weapons/hellfirebow.recipe
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"input" : [
{ "item" : "scorchedcore", "count" : 4 },
{ "item" : "volatilepowder", "count" : 4 },
{ "item" : "zerchesiumbar", "count" : 5 }
{ "item" : "pyreitebar", "count" : 4 }
],
"output" : {
"item" : "hellfirebow",
Expand Down

0 comments on commit e41b565

Please sign in to comment.