added font, updated ui, fixed some code

This commit is contained in:
TAASONI3
2023-12-13 12:49:38 +01:00
parent 10ad860d3e
commit 17a0a22dd4
65 changed files with 1697 additions and 5019 deletions

View File

@@ -1,4 +1,5 @@
using Newtonsoft.Json.Linq;
using Assets.Scripts.Player;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -21,20 +22,18 @@ namespace Assets.Scripts.Slimes
protected Item item;
protected int luck;
public BasicSlime(Player player)
public BasicSlime(PlayerGameObject player)
{
//health,maxHealth,secondary,maxSecondary,strength,dexterity,intelligence,level,experience,maxExperience,points,luck
int[] playerStats = player.getStats();
maxHealth = playerStats[1];
maxHealth = player.getPlayerStat("MaxHealth").getAmount();
health = maxHealth;
maxSecondary = playerStats[3];
maxSecondary = player.getPlayerStat("MaxSecondary").getAmount();
secondary = maxSecondary;
strength = playerStats[4];
dexterity = playerStats[5];
intelligence = playerStats[6];
experience = (int)(10 + playerStats[7] * 2.5f);
level = playerStats[7];
luck = playerStats[11];
strength = player.getPlayerStat("Strength").getAmount();
dexterity = player.getPlayerStat("Dexterity").getAmount();
intelligence = player.getPlayerStat("Intelligence").getAmount();
experience = (int)(10 + player.getPlayerStat("Experience").getAmount() * 2.5f);
level = player.getPlayerStat("Level").getAmount();
luck = player.getPlayerStat("Luck").getAmount();
}
public BasicSlime(JToken json)

View File

@@ -3,12 +3,13 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Assets.Scripts.Player;
namespace Assets.Scripts.Slimes
{
class BossSlime : BasicSlime
{
public BossSlime(Player player) : base(player)
public BossSlime(PlayerGameObject player) : base(player)
{
intelligence = intelligence + 5;
strength = strength + 10;

View File

@@ -3,12 +3,13 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Assets.Scripts.Player;
namespace Assets.Scripts.Slimes
{
class ForestSlime : BasicSlime
{
public ForestSlime(Player player) : base(player)
public ForestSlime(PlayerGameObject player) : base(player)
{
//intelligence = intelligence;
//strength = strength;

View File

@@ -3,12 +3,13 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Assets.Scripts.Player;
namespace Assets.Scripts.Slimes
{
public class MageSlime : BasicSlime
{
public MageSlime(Player player) : base(player)
public MageSlime(PlayerGameObject player) : base(player)
{
intelligence = intelligence + 2;
strength = strength - 2;

View File

@@ -3,12 +3,13 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Assets.Scripts.Player;
namespace Assets.Scripts.Slimes
{
class MetalSlime : BasicSlime
{
public MetalSlime(Player player) : base(player)
public MetalSlime(PlayerGameObject player) : base(player)
{
//intelligence = intelligence;
strength = strength + 2;

View File

@@ -3,12 +3,13 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Assets.Scripts.Player;
namespace Assets.Scripts.Slimes
{
class MiniBossSlime : BasicSlime
{
public MiniBossSlime(Player player) : base(player)
public MiniBossSlime(PlayerGameObject player) : base(player)
{
intelligence = intelligence + 3;
strength = strength + 3;

View File

@@ -3,12 +3,13 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Assets.Scripts.Player;
namespace Assets.Scripts.Slimes
{
class NormalSlime : BasicSlime
{
public NormalSlime(Player player) : base(player)
public NormalSlime(PlayerGameObject player) : base(player)
{
maxHealth = maxHealth + 10;
health = maxHealth;

View File

@@ -3,42 +3,43 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Assets.Scripts.Player;
namespace Assets.Scripts.Slimes
{
class SlimeFactory
{
public NormalSlime generateNormalSlime(Player player)
public NormalSlime generateNormalSlime(PlayerGameObject player)
{
return new NormalSlime(player);
}
public MageSlime generateMageSlime(Player player)
public MageSlime generateMageSlime(PlayerGameObject player)
{
return new MageSlime(player);
}
public MetalSlime generateMetalSlime(Player player)
public MetalSlime generateMetalSlime(PlayerGameObject player)
{
return new MetalSlime(player);
}
public MiniBossSlime generateMiniBossSlime(Player player)
public MiniBossSlime generateMiniBossSlime(PlayerGameObject player)
{
return new MiniBossSlime(player);
}
public WarriorSlime generateWarriorSlime(Player player)
public WarriorSlime generateWarriorSlime(PlayerGameObject player)
{
return new WarriorSlime(player);
}
public ForestSlime generateForestSlime(Player player)
public ForestSlime generateForestSlime(PlayerGameObject player)
{
return new ForestSlime(player);
}
public BossSlime generateBossSlime(Player player)
public BossSlime generateBossSlime(PlayerGameObject player)
{
return new BossSlime(player);
}

View File

@@ -3,12 +3,13 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Assets.Scripts.Player;
namespace Assets.Scripts.Slimes
{
class WarriorSlime : BasicSlime
{
public WarriorSlime(Player player) : base(player)
public WarriorSlime(PlayerGameObject player) : base(player)
{
intelligence = intelligence - 2;
strength = strength + 2;