IsleHorse/HISP
1
0
Fork 0
mirror of https://github.com/islehorse/HISP.git synced 2025-04-21 12:19:15 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

add npc wandering to db, and add %GOTO NPC

Browse source
This commit is contained in:
SilicaAndPina 2021-02-13 15:23:37 +13:00
parent e32dabb1b4
commit bdebe4d84a
4 changed files with 282 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Horse Isle Server/HorseIsleServer/Game/Chat/Command.cs
View file

@ -258,6 +258,7 @@ namespace HISP.Game.Chat
{
user.Teleport(waypnt.PosX, waypnt.PosY);
teleported = true;
break;
}
}
if(!teleported)
@ -268,7 +269,33 @@ namespace HISP.Game.Chat
return false;
}
}
if(args[0].Contains(","))
else if(args[0] == "NPC")
{
if (args.Length < 2)
return false;
try
{
string npcName = string.Join(" ", args, 1, args.Length - 1);
bool teleported = false;
foreach (Npc.NpcEntry npc in Npc.NpcList)
{
if (npc.Name.ToLower().StartsWith(npcName.ToLower()))
{
user.Teleport(npc.X, npc.Y);
teleported = true;
break;
}
}
if (!teleported)
return false;
}
catch (Exception)
{
return false;
}
}
else if(args[0].Contains(","))
{
try
{
@ -282,6 +309,10 @@ namespace HISP.Game.Chat
return false;
}
}
else
{
return false;
}

122
Horse Isle Server/HorseIsleServer/Game/Npc.cs
View file

@ -25,14 +25,75 @@ namespace HISP.Game
}
public class NpcEntry
{
public int Id;
public NpcEntry(int npcId, int posX, int posY, bool npcMoves, int udlrStartX=0, int udlrStartY=0)
{
id = npcId;
x = posX;
y = posY;
Moves = npcMoves;
UDLRStartX = udlrStartX;
UDLRStartY = udlrStartY;
if(Moves)
{
if(Database.HasNpcPos(id))
{
udlrScriptPos = Database.GetNpcUdlrPointer(npcId);
x = Database.GetNpcPosX(npcId);
y = Database.GetNpcPosY(npcId);
}
else
{
if(udlrStartX != 0 && udlrStartY != 0)
{
x = udlrStartX;
y = udlrStartY;
}
udlrScriptPos = 0;
Database.AddNpcPos(npcId, x, Y, udlrScriptPos);
}
}
}
private int id;
public string Name;
public string AdminDescription;
public string ShortDescription;
public string LongDescription;
public bool Moves;
public int X;
public int Y;
private int x;
private int y;
public int Id
{
get
{
return id;
}
}
public int X
{
get
{
return x;
}
set
{
Database.SetNpcX(id, value);
x = value;
}
}
public int Y
{
get
{
return y;
}
set
{
Database.SetNpcY(id, value);
y = value;
}
}
public string StayOn;
public int RequiresQuestIdCompleted;
public int RequiresQuestIdNotCompleted;
@ -45,6 +106,18 @@ namespace HISP.Game
private int udlrScriptPos = 0;
public int UdlrScriptPos
{
get
{
return udlrScriptPos;
}
set
{
Database.SetNpcUdlrPointer(Id, value);
udlrScriptPos = value;
}
}
private bool canNpcBeHere(int x, int y)
{
// Horses cannot be in towns.
@ -101,33 +174,30 @@ namespace HISP.Game
}
else // Is Scripted.
{
if (GameServer.GetUsersAt(this.X, this.Y, true, true).Length > 0)
return;
X = UDLRStartX;
Y = UDLRStartY;
for(int i = 0; i < udlrScriptPos; i++)
if (UdlrScriptPos + 1 >= UDLRScript.Length)
UdlrScriptPos = 0;
else
UdlrScriptPos++;
switch (UDLRScript.ToLower()[UdlrScriptPos])
{
switch (UDLRScript.ToLower()[i])
{
case 'u':
Y++;
break;
case 'd':
Y--;
break;
case 'l':
X--;
break;
case 'r':
X++;
break;
}
case 'u':
Y++;
break;
case 'd':
Y--;
break;
case 'l':
X--;
break;
case 'r':
X++;
break;
}
udlrScriptPos++;
if (udlrScriptPos > UDLRScript.Length)
udlrScriptPos = 0;
}
}
}