Skip to content

Commit

Permalink
Revert "mor fih stuf"
Browse files Browse the repository at this point in the history
This reverts commit a9abc99.
  • Loading branch information
boilermaker021 committed Nov 21, 2019
1 parent a9abc99 commit 0e7fb56
Show file tree
Hide file tree
Showing 22 changed files with 67 additions and 0 deletions.
Binary file added NPCs/FishBlue.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added NPCs/FishBrown.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added NPCs/FishHeadBlue.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added NPCs/FishHeadBrown.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added NPCs/FishHeadPink.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added NPCs/FishHeadPurple.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added NPCs/FishHeadRainbow.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added NPCs/FishHeadWhite.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added NPCs/FishPink.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added NPCs/FishPurple.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added NPCs/FishRainbow.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added NPCs/FishWhite.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 37 additions & 0 deletions NPCs/WaterTown/FishBlue.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
using Terraria;
using Terraria.ID;
using Terraria.ModLoader;
using prismmod.NPCs.WaterTown;

namespace prismmod.NPCs.WaterTown
{
//@todo add head file for these NPCS
[AutoloadHead]
internal class FishBlue : FishPerson
{

public override string TownNPCName()
{
return "Blue Fish";//@todo generate random names for this fishy individual

}

public override void SetChatButtons(ref string button, ref string button2) {
button = "Bruh";
button2 = "Moment";
}
public override string GetChat()
{
return "This is the only chat message so far, stop trying for a new one.";
}
public override void OnChatButtonClicked(bool firstbutton, ref bool shop)
{
shop=true;
}

//@todo Setup Shop method



}
}
Binary file added NPCs/WaterTown/FishBlue.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added NPCs/WaterTown/FishBlue_Head.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added NPCs/WaterTown/FishBrown.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 30 additions & 0 deletions NPCs/WaterTown/FishPerson.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
using Terraria;
using Terraria.ID;
using Terraria.ModLoader;

namespace prismmod.NPCs.WaterTown
{
internal class FishPerson : ModNPC
{
public override void SetStaticDefaults()
{
Main.npcFrameCount[npc.type] = Main.npcFrameCount[NPCID.GoblinTinkerer];//107 if NPCID is incorrect
}

public override void SetDefaults()
{
npc.townNPC = true;
npc.width = 18;
npc.height = 34;
animationType = NPCID.GoblinTinkerer;
npc.aiStyle = 7;
npc.lifeMax = 75;
npc.HitSound = SoundID.NPCHit1;
npc.DeathSound = SoundID.NPCDeath1;
npc.value = 0.75f;
npc.knockBackResist = 0.5f;
npc.damage = 14;
npc.friendly=true;
}
}
}
Binary file added NPCs/WaterTown/FishPerson.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added NPCs/WaterTown/FishPink.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added NPCs/WaterTown/FishPurple.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added NPCs/WaterTown/FishRainbow.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added NPCs/WaterTown/FishWhite.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 0e7fb56

Please sign in to comment.