Nicola/TalesOfNovariel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added new slimes, fixed slime generation

Browse Source
This commit is contained in:
TAASONI3
2024-01-04 15:27:48 +01:00
parent dae53866e4
commit 4d2c52ded5
58 changed files with 6602 additions and 6477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
Assets/Scripts/InteractableObjects/Enemy.cs
View File

@@ -2,6 +2,7 @@ using Assets.Scripts;
using Assets.Scripts.Player;
using Assets.Scripts.Slimes;
using Newtonsoft.Json.Linq;
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
@@ -10,80 +11,38 @@ namespace Assets.Scripts.InteractableObjects
{
public class Enemy : InteractableObject
{
string enemyname;
System.Random rand = new System.Random();
BasicSlime slime;
SlimeFactory factory = new SlimeFactory();
void Start()
{
enemyname = gameObject.name;
if (enemyname.Contains("("))
{
enemyname = enemyname.Split('(')[0];
}
renameEnemy();
}
public SlimeType slimeType;
public override void handleInteraction(GameObject player)
{
keepAlive = true;
}
private void renameEnemy()
{
switch (enemyname)
{
case "SlimeMageIdle":
enemyname = "Slime Mage";
break;
case "SlimeBaseIdle":
enemyname = "Slime";
break;
case "SlimeMetalIdle":
enemyname = "Slime Metal";
break;
case "SlimeMiniBossIdle":
enemyname = "Slime MiniBoss";
break;
case "SlimeWarriorIdle":
enemyname = "Slime Warrior";
break;
case "SlimeForestIdle":
enemyname = "Slime Forest";
break;
case "SlimeBossIdle":
enemyname = "Slime Boss";
break;
}
}
public void scaleEnemy(PlayerGameObject player)
{
if (slime == null)
{
switch (enemyname)
switch (slimeType)
{
case "Slime Mage":
case SlimeType.MAGE:
slime = factory.generateMageSlime(player);
break;
case "Slime":
case SlimeType.NORMAL:
slime = factory.generateNormalSlime(player);
break;
case "Slime Metal":
case SlimeType.METAL:
slime = factory.generateMetalSlime(player);
break;
case "Slime MiniBoss":
slime = factory.generateMiniBossSlime(player);
break;
case "Slime Warrior":
case SlimeType.WARRIOR:
slime = factory.generateWarriorSlime(player);
break;
case "Slime Forest":
case SlimeType.FOREST:
slime = factory.generateForestSlime(player);
break;
case "Slime Boss":
case SlimeType.BOSS:
slime = factory.generateBossSlime(player);
break;
}
@@ -97,7 +56,7 @@ namespace Assets.Scripts.InteractableObjects
public string getEnemyName()
{
return enemyname;
return slimeType.ToString().ToLower() + " slime";
}
public int calculateDamage()
@@ -128,7 +87,7 @@ namespace Assets.Scripts.InteractableObjects
public string saveEnemy()
{
string result = "";
result = result + FileHandler.generateJSON("enemyname", "\"" + enemyname + "\"");
result = result + FileHandler.generateJSON("enemytype", "\"" + slimeType.ToString().ToLower() + "\"");
if (slime != null)
{
result = result + ",\r\n" + slime.saveSlime();
@@ -139,6 +98,7 @@ namespace Assets.Scripts.InteractableObjects
public void loadEnemy(JToken json)
{
slime = new BasicSlime(json);
slimeType = (SlimeType)Enum.Parse(typeof(SlimeType), json["enemytype"].ToString());
}
}
}