Snowscape/Server
1
0
Fork 0
forked from 2009Scape/Server
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Bots update (#38)

Browse source 
* Bot fixes & improvements

* Accurate bot combat stats generation

* Fix AIP crash
This commit is contained in:
Daniel Ginovker 2019-11-08 15:52:32 -05:00 • committed by GitHub
parent f0935785cc
commit 9df584962f
8 changed files with 72 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -62,3 +62,6 @@ Errors could not find library:
- `09HDscape-client/lib` directory
- `09HDscape-client/clientlibs.jar` file
- `09HDscape-management-server/lib` director
Errors regarding java.nio.BufferUnderflowException in server:
- Reclone the repository. This happened to me (Red Bracket) once, could never reproduce.

4
Server/data/botdata/namesandarmorscript
View file

@ -3,7 +3,7 @@
This script is run with OSBot. Created by Red Bracket.
namesandarmor.txt has the following format:
name:cblevel:helmet:cape:neck:weapon:chest:shield:unknown:legs:gloves:boots:
name:cblevel:helmet:cape:neck:weapon:chest:shield:unknown:legs:unknown:gloves:boots:
*/
@ -29,7 +29,7 @@ public class Reader extends Script {
names.add(p.getName());
String equipment = getOthersEquipment(p);
//Format:
//name:cblevel:helmet:cape:neck:weapon:chest:shield:unknown:legs:gloves:boots:
//name:cblevel:helmet:cape:neck:weapon:chest:shield:unknown:legs:unknown:gloves:boots:
log2(p.getName()
+ ":" + p.getCombatLevel()
+ ":" + equipment);

1
Server/data/botdata/pestcontrolcopies.txt Normal file
View file

@ -0,0 +1 @@
sicriona:103:1163:1023:1725:1333:1127:1201:0:1079:0:2922:1061:0:

89
Server/src/org/crandor/game/node/entity/player/ai/AIPlayer.java
View file

@ -78,17 +78,21 @@ public class AIPlayer extends Player {
private Player controler;
/**
* Constructs a new {@code AIPlayer} {@code Object}.
*
* @param l The location.
*/
public AIPlayer(Location l) {
this(retrieveRandomName(), l);
this(retrieveRandomName(), l, null);
}
public AIPlayer(String fileName, Location l) {
this(retrieveRandomName(fileName), l, null);
}
@SuppressWarnings("deprecation")
private AIPlayer(String name, Location l) {
private AIPlayer(String name, Location l, String ignored) {
super(new PlayerDetails("/aip" + (currentUID + 1) + ":" + name));
super.setLocation(startLocation = l);
super.artificial = true;
@ -106,16 +110,7 @@ public class AIPlayer extends Player {
public void updateRandomValues() {
this.getAppearance().setGender(RandomFunction.random(5) == 1 ? Gender.FEMALE : Gender.MALE);
//Create realistic player stats
int maxLevel = RandomFunction.random((int) (Integer.parseInt(OSRScopyLine.split(":")[1])*0.78));
for (int i = 0; i < Skills.NUM_SKILLS; i++) {
this.getSkills().setLevel(i, RandomFunction.linearDecreaseRand(maxLevel));
this.getSkills().setStaticLevel(i, RandomFunction.linearDecreaseRand(maxLevel));
}
this.getSkills().setLevel(Skills.HITPOINTS, 10);
this.getSkills().setStaticLevel(Skills.HITPOINTS, 10);
//Create armor as fetched from OSRS
setLevels();
giveArmor();
this.setDirection(Direction.values()[new Random().nextInt(Direction.values().length)]); //Random facing dir
@ -123,8 +118,36 @@ public class AIPlayer extends Player {
this.getAppearance().sync();
}
private void setLevels() {
//Create realistic player stats
int maxLevel = RandomFunction.random(1, Math.min(parseOSRS(1), 99));
for (int i = 0; i < Skills.NUM_SKILLS; i++) {
this.getSkills().setStaticLevel(i, RandomFunction.linearDecreaseRand(maxLevel));
}
int combatLevelsLeft = parseOSRS(1);
int hitpoints = Math.max(RandomFunction.random(10, Math.min(maxLevel, combatLevelsLeft*4)), 10);
combatLevelsLeft -= 0.25*hitpoints;
int prayer = combatLevelsLeft > 0 ? RandomFunction.random(Math.min(maxLevel, combatLevelsLeft*8)) : 1;
combatLevelsLeft -= 0.125*prayer;
int defence = combatLevelsLeft > 0 ? RandomFunction.random(Math.min(maxLevel, combatLevelsLeft*4)) : 1;
combatLevelsLeft -= 0.25*defence;
combatLevelsLeft = Math.min(combatLevelsLeft, 199);
int attack = combatLevelsLeft > 0 ? RandomFunction.normalRandDist(Math.min(maxLevel, combatLevelsLeft*3)) : 1;
int strength = combatLevelsLeft > 0 ? combatLevelsLeft*3 - attack : 1;
this.getSkills().setStaticLevel(Skills.HITPOINTS, hitpoints);
this.getSkills().setStaticLevel(Skills.PRAYER, prayer);
this.getSkills().setStaticLevel(Skills.DEFENCE, defence);
this.getSkills().setStaticLevel(Skills.ATTACK, attack);
this.getSkills().setStaticLevel(Skills.STRENGTH, strength);
this.getSkills().setStaticLevel(Skills.RANGE, combatLevelsLeft/2);
this.getSkills().setStaticLevel(Skills.MAGIC, combatLevelsLeft/2);
}
private void giveArmor() {
//name:cblevel:helmet2:cape3:neck4:weapon5:chest6:shield7:unknown8:legs9:unknown10:gloves11:boots12:
//name:cblevel:helmet2:cape3:neck4:weapon5:chest6:shield7:unknown8:legs9:unknown10:gloves11:boots12:
//sicriona:103:1163: 1023: 1725 :1333: 1127 :1201 :0: 1079 :0: 2922: 1061:0:
equipIfExists(new Item(parseOSRS(2)), EquipmentContainer.SLOT_HAT);
equipIfExists(new Item(parseOSRS(3)), EquipmentContainer.SLOT_CAPE);
@ -137,41 +160,47 @@ public class AIPlayer extends Player {
equipIfExists(new Item(parseOSRS(12)), EquipmentContainer.SLOT_FEET);
}
private int parseOSRS(int index)
{
private int parseOSRS(int index) {
return Integer.parseInt(OSRScopyLine.split(":")[index]);
}
private void equipIfExists(Item e, int slot)
{
if (e.getId() != 0)
private void equipIfExists(Item e, int slot) {
if (e.getId() != 0)
getEquipment().replace(e, slot);
}
/**
* Get a bot name and read other stats while you're at it
* Get a bot content
*/
public static String retrieveRandomName()
{
String name = null;
public static void updateRandomOSRScopyLine(String fileName) {
Random rand = new Random();
int n = 0;
try {
for(Scanner sc = new Scanner(new File("./data/botdata/namesandarmor.txt")); sc.hasNext(); )
{
for (Scanner sc = new Scanner(new File("./data/botdata/" + fileName)); sc.hasNext(); ) {
++n;
String line = sc.nextLine();
if(rand.nextInt(n) == 0)
{
name = line.split(":")[0];
if (rand.nextInt(n) == 0) { //Chance of overwriting line is lower and lower
OSRScopyLine = line;
if (line.length() < 3) //probably an empty line
{
System.out.println("Something went wrong reading line [" + line + "] from /data/botdata/" + fileName);
updateRandomOSRScopyLine(fileName);
}
}
}
} catch (FileNotFoundException e) {
System.out.println("Missing namesandarmor.txt!");
System.out.println("Missing " + fileName);
e.printStackTrace();
}
}
return name;
private static String retrieveRandomName(String fileName) {
updateRandomOSRScopyLine(fileName);
return OSRScopyLine.split(":")[0];
}
private static String retrieveRandomName() {
return retrieveRandomName("namesandarmor.txt");
}
@Override

13
Server/src/org/crandor/game/node/entity/player/ai/minigamebots/pestcontrol/PestControlTestBot.java
View file

@ -33,7 +33,7 @@ public class PestControlTestBot extends PvMBots {
}
public PestControlTestBot(Location l) {
super(legitimizeLocation(l));
super("pestcontrolcopies.txt", legitimizeLocation(l));
randomType = new Random().nextInt(100);
}
@ -110,17 +110,6 @@ public class PestControlTestBot extends PvMBots {
}
}
/*
if (randomType < 20)
{
this.getUpdateMasks().register(new ChatFlag(new ChatMessage(this, "Meee", 0, 0)));
}
Node test = getClosestNodeWithEntry(5, GATE_ENTRIES);
if (!this.inCombat() && test != null) {
InteractionPacket.handleObjectInteraction(this, 0, test.getLocation(), test.getId());
}
*/
}
private int insideBoatWalks = 3;

4
Server/src/org/crandor/game/node/entity/player/ai/pvmbots/PvMBots.java
View file

@ -28,6 +28,10 @@ public class PvMBots extends AIPlayer {
super(l);
}
public PvMBots(String copyFromFile, Location l) {
super(copyFromFile, l);
}
public List<Entity> FindTargets(Entity entity, int radius) {
List<Entity> targets = new ArrayList<>();

36
Server/src/org/crandor/game/node/entity/player/ai/pvmbots/PvMBotsBuilder.java
View file

@ -144,31 +144,7 @@ public final class PvMBotsBuilder{
}
}
public static void customizePestControlBot(PestControlTestBot p)
{
p.getSkills().setLevel(Skills.SLAYER, 99);
p.getSkills().setStaticLevel(Skills.SLAYER, 99);
int combatType = RandomFunction.getRandom(2);
buildMaxMeleeStats(p);
buildMaxMeleeEquipment(p);
switch(combatType)
{
case 0:
{
break;
}
case 1:
{
break;
}
default:
{
break;
}
}
}
private static void buildMaxMeleeStats(AIPlayer p)
private static void buildMaxMeleeStats(AIPlayer p)
{
p.getSkills().setLevel(Skills.ATTACK, 99);
p.getSkills().setStaticLevel(Skills.ATTACK, 99);
@ -468,16 +444,6 @@ public final class PvMBotsBuilder{
{
final PvMBots bot = PvMBotsBuilder.create(loc);
bot.getAppearance().setGender(RandomFunction.random(3) == 1 ? Gender.FEMALE : Gender.MALE);
}
public static void spawnPestControlTestBot(Location loc)
{
final PestControlTestBot bot = PvMBotsBuilder.createPestControlTestBot(loc);
bot.getAppearance().setGender(RandomFunction.random(3) == 1 ? Gender.FEMALE : Gender.MALE);
customizePestControlBot(bot);
}
public static void spawnLowest(Location loc)

2
Server/src/plugin/command/AIPCommandPlugin.java
View file

@ -257,7 +257,7 @@ public final class AIPCommandPlugin extends CommandPlugin {
arg2 = 123;
}
for (int pestBotsAmount = 0; pestBotsAmount < arg2; pestBotsAmount++) {
PvMBotsBuilder.spawnPestControlTestBot(player.getLocation());
PvMBotsBuilder.createPestControlTestBot(player.getLocation());
}
return true;
case "bots":