Skip to content

Commit

Permalink
add animated spell tome to alt skins, add wyvern campfire recipe
Browse files Browse the repository at this point in the history
  • Loading branch information
direwolf420 committed May 15, 2020
1 parent be5eced commit 2c52dc3
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 32 deletions.
19 changes: 1 addition & 18 deletions AssConfig.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using AssortedCrazyThings.Base;
using Newtonsoft.Json;
using System.ComponentModel;
using System.ComponentModel;
using Terraria.ModLoader.Config;

namespace AssortedCrazyThings
Expand Down Expand Up @@ -29,25 +27,10 @@ public class Config : ModConfig
[Tooltip("Enable/Disable Walking Tombstone spawning")]
public bool WalkingTombstones;

[Header("Resulting Behavior")]

[JsonIgnore]
[Label("Cute Slimes Potion Only Status")]
public string CuteSlimesPotionOnlyStatus => GetStatus(CuteSlimesPotionOnly);

[JsonIgnore]
[Label("Walking Tombstones Status")]
public string WalkingTombstonesStatus => GetStatus(WalkingTombstones);

public override bool AcceptClientChanges(ModConfig pendingConfig, int whoAmI, ref string message)
{
message = "Only the host of this world can change the config! Do so in singleplayer.";
return false;
}

private string GetStatus(bool b)
{
return b ? "Enabled" : "Disabled";
}
}
}
6 changes: 6 additions & 0 deletions AssortedCrazyThings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,12 @@ public override void AddRecipeGroups()
ItemID.GoldBar,
ItemID.PlatinumBar
}));

RecipeGroup.RegisterGroup("ACT:AdamantiteTitanium", new RecipeGroup(() => Language.GetTextValue("LegacyMisc.37") + " " + Lang.GetItemNameValue(ItemID.AdamantiteBar), new int[]
{
ItemID.AdamantiteBar,
ItemID.TitaniumBar
}));
}

/// <summary>
Expand Down
7 changes: 3 additions & 4 deletions Items/Placeable/WyvernCampfireItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,15 @@ public override void SetDefaults()
item.useStyle = ItemUseStyleID.SwingThrow;
item.consumable = true;
item.rare = -11;
item.value = Item.buyPrice(0, 10, 0, 0);
item.value = Item.buyPrice(0, 11, 50, 0);
item.createTile = ModContent.TileType<WyvernCampfireTile>();
}

public override void AddRecipes()
{
ModRecipe recipe = new ModRecipe(mod);
recipe.anyWood = true;
recipe.AddIngredient(ItemID.Wood, 10);
recipe.AddIngredient(ModContent.ItemType<CaughtDungeonSoulFreed>(), 5);
recipe.AddIngredient(ItemID.GiantHarpyFeather);
recipe.AddRecipeGroup("ACT:AdamantiteTitanium", 12);
recipe.SetResult(this);
recipe.AddRecipe();
}
Expand Down
2 changes: 1 addition & 1 deletion PetPlayer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -749,7 +749,7 @@ public static CircleUIConf GetPetCultistConf()

public static CircleUIConf GetAnimatedTomeConf()
{
List<string> tooltips = new List<string>() { "Green", "Blue", "Purple", "Pink", "Yellow" };
List<string> tooltips = new List<string>() { "Green", "Blue", "Purple", "Pink", "Yellow", "Spell" };

return CircleUIHandler.PetConf("AnimatedTomeProj", tooltips);
}
Expand Down
7 changes: 0 additions & 7 deletions Projectiles/Pets/AnimatedTomeProj.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,6 @@ public override void AI()
}
AssAI.ZephyrfishAI(projectile);
AssAI.ZephyrfishDraw(projectile);

//if (Main.rand.NextFloat() < 0.1f)
//{
// Dust dust = Dust.NewDustDirect(projectile.position, projectile.width, projectile.height, 15, 0f, 0f, 0, new Color(255, 255, 255), 1f)];
// dust.velocity *= 0.2f;
// dust.noLight = true; //doesnt work
//}
}

public override bool PreDraw(SpriteBatch spriteBatch, Color lightColor)
Expand Down
Binary file added Projectiles/Pets/AnimatedTomeProj_5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions build.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ author = Harblesnargits, direwolf420
version = 1.3.1
displayName = Assorted Crazy Things
hideResources = true
buildIgnore = *.csproj, *.user, *.md, obj\*, bin\*, .vs\*, Wiki\*, Guides\*, .gitignore
homepage = https://github.com/Werebearguy/AssortedCrazyThings/wiki
buildIgnore = *.csproj, *.user, *.md, obj\*, bin\*, .vs\*, Wiki\*, Guides\*, .gitignore, sample.png
homepage = https://forums.terraria.org/index.php?threads/.74330/

0 comments on commit 2c52dc3

Please sign in to comment.