Skip to content

Commit

Permalink
apply mass internal rename; fix #16
Browse files Browse the repository at this point in the history
  • Loading branch information
Anarchid committed Aug 14, 2019
1 parent 20b66e5 commit 3794cc2
Show file tree
Hide file tree
Showing 15 changed files with 405 additions and 405 deletions.
174 changes: 87 additions & 87 deletions src/zkgbai/economy/EconomyManager.java
View file

Large diffs are not rendered by default.

304 changes: 152 additions & 152 deletions src/zkgbai/economy/FactoryManager.java
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions src/zkgbai/economy/TerrainAnalyzer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ public TerrainAnalyzer(){
this.initialFacList = new ArrayList<String>();
this.path = callback.getPathing();

vehPath = callback.getUnitDefByName("corned").getMoveData().getPathType();
botPath = callback.getUnitDefByName("armrectr").getMoveData().getPathType();
spiderPath = callback.getUnitDefByName("arm_spider").getMoveData().getPathType();
hoverPath = callback.getUnitDefByName("corch").getMoveData().getPathType();
vehPath = callback.getUnitDefByName("vehcon").getMoveData().getPathType();
botPath = callback.getUnitDefByName("cloakcon").getMoveData().getPathType();
spiderPath = callback.getUnitDefByName("spidercon").getMoveData().getPathType();
hoverPath = callback.getUnitDefByName("hovercon").getMoveData().getPathType();
amphPath = callback.getUnitDefByName("amphcon").getMoveData().getPathType();
boatPath = callback.getUnitDefByName("shipcon").getMoveData().getPathType();

Expand Down
4 changes: 2 additions & 2 deletions src/zkgbai/economy/tasks/RepairTask.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ public RepairTask(Unit target) {
String defName = target.getDef().getName();

UnitClasses unitTypes = UnitClasses.getInstance();
if (unitTypes.shieldMobs.contains(target.getDef().getName()) && !target.getDef().getName().equals("funnelweb")){
if (unitTypes.shieldMobs.contains(target.getDef().getName()) && !target.getDef().getName().equals("striderfunnelweb")){
this.isShieldMob = true;
}

if (defName.equals("correap") || defName.equals("tawf114") || defName.equals("corgol")){
if (defName.equals("tankassault") || defName.equals("tankriot") || defName.equals("tankheavyassault")){
this.isTank = true;
}
}
Expand Down
12 changes: 6 additions & 6 deletions src/zkgbai/graph/GraphManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public GraphManager(ZKGraphBasedAI ai){

this.metalSpots = new ArrayList<MetalSpot>();
this.links = new ArrayList<Link>();
this.mexDef = ai.getCallback().getUnitDefByName("cormex");
this.mexDef = ai.getCallback().getUnitDefByName("staticmex");
this.mexDefID = mexDef.getUnitDefId();
this.m = callback.getResourceByName("Metal");
this.e = callback.getResourceByName("Energy");
Expand All @@ -89,11 +89,11 @@ public GraphManager(ZKGraphBasedAI ai){

// hardwired for now because of segfaults upon segfaults
pylonDefs = new java.util.HashMap<String, Integer>();
pylonDefs.put("armwin", 60);
pylonDefs.put("armsolar", 100);
pylonDefs.put("armestor", 500);
pylonDefs.put("armfus", 150);
pylonDefs.put("cafus", 150);
pylonDefs.put("energywind", 60);
pylonDefs.put("energysolar", 100);
pylonDefs.put("energypylon", 500);
pylonDefs.put("energyfusion", 150);
pylonDefs.put("energysingu", 150);

final int width = callback.getMap().getWidth()/4;
final int height = callback.getMap().getHeight()/4;
Expand Down
4 changes: 2 additions & 2 deletions src/zkgbai/kgbutil/Pathfinder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,9 @@ public Deque<AIFloat3> findPath(Unit u, AIFloat3 target, CostSupplier costs) {
if (u.getDef().getMoveData() != null) {
maxSlope = u.getDef().getMoveData().getMaxSlope();
flyer = false;
if (maxSlope == callback.getUnitDefByName("arm_spider").getMoveData().getMaxSlope()){
if (maxSlope == callback.getUnitDefByName("spidercon").getMoveData().getMaxSlope()){
// use special pathing for spiders, since they favor hills.
if (u.getDef().getName().equals("armflea") || u.getDef().getName().equals("armspy")){
if (u.getDef().getName().equals("spiderscout") || u.getDef().getName().equals("spiderantiheavy")){
costs = SPIDER_RAIDER_PATH;
}else {
costs = SPIDER_PATH;
Expand Down
24 changes: 12 additions & 12 deletions src/zkgbai/military/Enemy.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,26 +97,26 @@ public void updateFromUnitDef(UnitDef u, float cost){

String defName = ud.getName();

if (defName.equals("corgarp") || defName.equals("armsnipe") || defName.equals("armmanni")
|| defName.equals("amphfloater") || defName.equals("armsptk")){
if (defName.equals("veharty") || defName.equals("cloaksnipe") || defName.equals("hoverarty")
|| defName.equals("amphfloater") || defName.equals("spiderskirm")){
this.isMinorCancer = true;
}

if (defName.equals("dante") || defName.equals("scorpion") || defName.equals("funnelweb") || defName.equals("armbanth") || defName.equals("armorco")
|| defName.equals("amphassault") || defName.equals("armraven") || defName.equals("armcrabe") || defName.equals("corgol") || defName.equals("correap")
|| defName.equals("shieldfelon") || u.getName().equals("capturecar") || u.getName().contains("com")){
if (defName.equals("striderdante") || defName.equals("striderscorpion") || defName.equals("striderfunnelweb") || defName.equals("striderbantha") || defName.equals("striderdetriment")
|| defName.equals("amphassault") || defName.equals("striderarty") || defName.equals("spidercrabe") || defName.equals("tankheavyassault") || defName.equals("tankassault")
|| defName.equals("shieldfelon") || u.getName().equals("vehcapture") || u.getName().contains("com")){
this.isMajorCancer = true;
}

if(u.getWeaponMounts().size() > 0){
this.threatRadius = u.getMaxWeaponRange();
if ((u.getTooltip().contains("Riot") || u.getTooltip().contains("Anti-Swarm") || u.getName().equals("screamer") || u.getName().equals("corflak"))
&& !defName.equals("dante")){
if ((u.getTooltip().contains("Riot") || u.getTooltip().contains("Anti-Swarm") || u.getName().equals("turretaaheavy") || u.getName().equals("turretaaflak"))
&& !defName.equals("striderdante")){
// identify riots
this.isRiot = true;
}

if (defName.equals("corhlt") || defName.equals("amphraider3")){
if (defName.equals("turretheavylaser") || defName.equals("amphraid")){
isStrong = true;
}

Expand All @@ -135,7 +135,7 @@ public void updateFromUnitDef(UnitDef u, float cost){
this.isRaider = true;
}

if ((u.getTooltip().contains("Arti") || u.getTooltip().contains("Skirm") || u.getName().equals("cormist")) || u.isBuilder() && !u.getTooltip().contains("Riot")){
if ((u.getTooltip().contains("Arti") || u.getTooltip().contains("Skirm") || u.getName().equals("vehsupport")) || u.isBuilder() && !u.getTooltip().contains("Riot")){
// identify arty/skirms
this.isArty = true;
}
Expand All @@ -144,11 +144,11 @@ public void updateFromUnitDef(UnitDef u, float cost){
this.isAA = true;
}

if (ud.getName().equals("gunshipsupport") || ud.getName().equals("armbrawl") || ud.getName().equals("corcrw") || ud.getName().equals("slowmort")){
if (ud.getName().equals("gunshipskirm") || ud.getName().equals("gunshipheavyskirm") || ud.getName().equals("gunshipkrow") || ud.getName().equals("jumpskirm")){
isFlexAA = true;
}

if (ud.getName().equals("armbrtha") || ud.getName().equals("corsilo") || ud.getName().equals("tacnuke")
if (ud.getName().equals("staticheavyarty") || ud.getName().equals("staticnuke") || ud.getName().equals("tacnuke")
|| ud.getName().equals("napalmmissile") || ud.getName().equals("raveparty") || ud.getName().equals("zenith")
|| ud.getName().equals("mahlazer")){
this.isSuperWep = true;
Expand Down Expand Up @@ -190,7 +190,7 @@ public float getDanger(){
}
danger = (ud.getPower() + health)/10f;

if (isFlamer || ud.getName().equals("arm_venom") || ud.getName().equals("amphraider2")){
if (isFlamer || ud.getName().equals("spideremp") || ud.getName().equals("amphimpulse")){
danger += 100f;
}
if (isRiot || isStrong){
Expand Down
64 changes: 32 additions & 32 deletions src/zkgbai/military/MilitaryManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public MilitaryManager(ZKGraphBasedAI ai){

this.AAs = new HashMap<Integer, Raider>();

this.nano = callback.getUnitDefByName("armnanotc").getUnitDefId();
this.nano = callback.getUnitDefByName("staticcon").getUnitDefId();
this.unitTypes = UnitClasses.getInstance();
this.m = callback.getResourceByName("Metal");

Expand Down Expand Up @@ -139,7 +139,7 @@ public int init(int AIID, OOAICallback cb){
private void paintValueMap(String wepName){
valueGraphics.clear();
int r, rr;
if (wepName.equals("corsilo")) {
if (wepName.equals("staticnuke")) {
r = 28; // general superwep kill radius
rr = 40;
}else{
Expand All @@ -148,7 +148,7 @@ private void paintValueMap(String wepName){
}
for(Enemy t:targets.values()){
AIFloat3 position = t.position;
if (position != null && t.identified && t.ud != null && !t.isNanoSpam && !t.ud.isAbleToFly() && !t.ud.getName().equals("corrazor") && !t.ud.getName().equals("armpb")){
if (position != null && t.identified && t.ud != null && !t.isNanoSpam && !t.ud.isAbleToFly() && !t.ud.getName().equals("turretaalaser") && !t.ud.getName().equals("turretgauss")){
int x = (int) (position.x / 32);
int y = (int) (position.z / 32);
int value = (int) Math.min(t.ud.getCost(m)/10f, 750f);
Expand Down Expand Up @@ -897,7 +897,7 @@ public AIFloat3 getBerthaTarget(AIFloat3 origin){

// for berthas the more expensive the target the better
for (Enemy e : targets.values()) {
if (!e.identified || e.position == null || e.position.equals(nullpos) || e.isNanoSpam || distance(e.position, origin) > 6200 || e.ud.isAbleToFly() || (e.ud.getName().equals("armamd") && !hasNuke)
if (!e.identified || e.position == null || e.position.equals(nullpos) || e.isNanoSpam || distance(e.position, origin) > 6200 || e.ud.isAbleToFly() || (e.ud.getName().equals("staticantinuke") && !hasNuke)
|| (e.ud.getSpeed() > 0 && e.ud.getBuildSpeed() > 8f)){
// berthas can't target things outside their range, and are not good vs air.
// we also ignore antinukes because kgb doesn't build nukes anyway.
Expand Down Expand Up @@ -1205,7 +1205,7 @@ public AIFloat3 getRaiderRally(AIFloat3 pos){
if (e.isMajorCancer){
tmpcost /= 4;
tmpcost -= 1000;
}else if (e.isMinorCancer || (e.isAA && !e.ud.getName().equals("corrazor"))){
}else if (e.isMinorCancer || (e.isAA && !e.ud.getName().equals("turretaalaser"))){
tmpcost /= 2;
tmpcost -= 500;
}
Expand Down Expand Up @@ -1314,27 +1314,27 @@ private void updateTargets() {
for (Enemy t: targets.values()){
if (t.identified){
String defName = t.ud.getName();
if (defName.equals("corhlt") || defName.equals("armpb") || defName.equals("armdeva") || defName.equals("armcrabe")
|| defName.equals("corrl") || defName.equals("corllt") || defName.equals("amphassault")) {
if (defName.equals("turretheavylaser") || defName.equals("turretgauss") || defName.equals("turretriot") || defName.equals("spidercrabe")
|| defName.equals("turretmissile") || defName.equals("turretlaser") || defName.equals("amphassault")) {
enemyPorcValue += t.ud.getCost(m);
}else if (defName.equals("armanni") || defName.equals("cordoom") || defName.equals("corjamt") || defName.equals("core_spectre")) {
}else if (defName.equals("turretantiheavy") || defName.equals("turretheavy") || defName.equals("staticshield") || defName.equals("shieldshield")) {
enemyPorcValue += 1.5f * t.ud.getCost(m);
}else if (defName.equals("shieldfelon")){
enemyPorcValue += 2f * t.ud.getCost(m);
}else if (defName.equals("cormist")) {
}else if (defName.equals("vehsupport")) {
slasherSpam++;
}else if (t.isRaider){
slasherSpam--;
}else if (defName.equals("armamd")){
}else if (defName.equals("staticantinuke")){
enemyHasAntiNuke = true;
}else if (defName.equals("corsilo")){
}else if (defName.equals("staticnuke")){
enemyHasNuke = true;
}else if (defName.equals("armbanth")){
}else if (defName.equals("striderbantha")){
enemyHeavyFactor++;
}else if (defName.equals("armorco")){
}else if (defName.equals("striderdetriment")){
enemyHeavyFactor += 2;
}else if (t.ud.isAbleToFly() && !t.isNanoSpam){
if (defName.equals("attackdrone") || defName.equals("battledrone") || defName.equals("carrydrone")){
if (defName.equals("dronelight") || defName.equals("droneheavyslow") || defName.equals("dronecarry")){
enemyAirValue += 25f;
}else {
enemyAirValue += t.ud.getBuildTime();
Expand Down Expand Up @@ -1523,7 +1523,7 @@ public int enemyLeaveRadar(Unit enemy) {
public int enemyDestroyed(Unit unit, Unit attacker) {
if(targets.containsKey(unit.getUnitId())){
Enemy e = targets.get(unit.getUnitId());
if (e.identified && e.ud != null && (e.ud.getName().equals("cafus") || e.ud.getName().equals("amgeo")) && !e.isNanoSpam){
if (e.identified && e.ud != null && (e.ud.getName().equals("energysingu") || e.ud.getName().equals("energyheavygeo")) && !e.isNanoSpam){
callback.getGame().sendTextMessage("/say <ZKGBAI> SHINY!", 0);
}

Expand Down Expand Up @@ -1552,14 +1552,14 @@ public int unitFinished(Unit unit) {
String defName = unit.getDef().getName();

// enable snipers and penetrators to shoot radar dots
if (defName.equals("armsnipe") || defName.equals("armmanni")){
if (defName.equals("cloaksnipe") || defName.equals("hoverarty")){
ArrayList<Float> params = new ArrayList<>();
params.add((float) 0);
unit.executeCustomCommand(CMD_DONT_FIRE_AT_RADAR, params, (short) 0, frame+60);
unit.setMoveState(1, (short) 0, frame + 10);
}

if (defName.equals("corsilo")){
if (defName.equals("staticnuke")){
hasNuke = true;
miscHandler.addNuke(unit);
}
Expand All @@ -1573,14 +1573,14 @@ public int unitFinished(Unit unit) {
}

// disable air strafe for brawlers
if (defName.equals("armbrawl")){
if (defName.equals("gunshipheavyskirm")){
ArrayList<Float> params = new ArrayList<>();
params.add((float) 0);
unit.executeCustomCommand(CMD_AIR_STRAFE, params, (short) 0, frame+30);
}

// set blastwings to land when idle
if (defName.equals("blastwing")){
if (defName.equals("gunshipbomb")){
unit.setIdleMode(1, (short) 0, frame+30);
}

Expand All @@ -1589,16 +1589,16 @@ public int unitFinished(Unit unit) {
}

// Activate outlaws
if (defName.equals("cormak")){
if (defName.equals("shieldriot")){
unit.setOn(true, (short) 0, frame+300);
}

if (defName.equals("fighter")){
if (defName.equals("planefighter")){
unit.setMoveState(0, (short) 0, frame + 10);
miscHandler.addSwift(unit);
}

if (defName.equals("corvamp")){
if (defName.equals("planeheavyfighter")){
unit.setMoveState(1, (short) 0, frame + 10);
Raider f = new Raider(unit, unit.getDef().getCost(m));
hawks.put(f.id, f);
Expand All @@ -1608,14 +1608,14 @@ public int unitFinished(Unit unit) {
}
}

if (defName.equals("armcomdgun")){
if (defName.equals("striderantiheavy")){
unit.setMoveState(0, (short) 0, frame + 10);
unit.setFireState(1, (short) 0, frame + 10);
Raider f = new Raider(unit, unit.getDef().getCost(m));
miscHandler.addUlti(f);
}

if (defName.equals("corcrw")){
if (defName.equals("gunshipkrow")){
unit.setMoveState(1, (short) 0, frame + 10);
Krow f = new Krow(unit, unit.getDef().getCost(m));
miscHandler.addKrow(f);
Expand Down Expand Up @@ -1655,7 +1655,7 @@ public int unitFinished(Unit unit) {
Fighter f = new Fighter(unit, unit.getDef().getCost(m));
miscHandler.addSupport(f);
}else if(unitTypes.loners.contains(defName)) {
if (defName.equals("cormist") || defName.equals("armcrabe")) {
if (defName.equals("vehsupport") || defName.equals("spidercrabe")) {
unit.setMoveState(0, (short) 0, frame + 10);
ArrayList<Float> params = new ArrayList<>();
params.add((float) 1);
Expand All @@ -1666,7 +1666,7 @@ public int unitFinished(Unit unit) {
Fighter f = new Fighter(unit, unit.getDef().getCost(m));
miscHandler.addLoner(f);
}else if (unitTypes.arties.contains(defName)){
if (defName.equals("armmerl") || defName.equals("cormart") || defName.equals("armraven") || defName.equals("trem")){
if (defName.equals("vehheavyarty") || defName.equals("tankarty") || defName.equals("striderarty") || defName.equals("tankheavyarty")){
unit.setMoveState(0, (short) 0, frame + 10);
ArrayList<Float> params = new ArrayList<>();
params.add((float) 1);
Expand Down Expand Up @@ -1697,7 +1697,7 @@ public int unitFinished(Unit unit) {
unit.setFireState(2, (short) 0, frame + 10);
Fighter f = new Fighter(unit, unit.getDef().getCost(m));
bomberHandler.addBomber(f);
}else if (defName.equals("armbrtha")) {
}else if (defName.equals("staticheavyarty")) {
miscHandler.addBertha(unit);
}

Expand All @@ -1714,7 +1714,7 @@ public int unitCreated(Unit unit, Unit builder){
String defName = unit.getDef().getName();

// Paint ally threat for porc
if (unit.getDef().getSpeed() == 0 && unit.getDef().isAbleToAttack() && !unit.getDef().getName().equals("armbrtha")){
if (unit.getDef().getSpeed() == 0 && unit.getDef().isAbleToAttack() && !unit.getDef().getName().equals("staticheavyarty")){
int power = (int) ((unit.getPower() + unit.getMaxHealth())/10);
float radius = unit.getMaxRange();
AIFloat3 pos = unit.getPos();
Expand All @@ -1738,7 +1738,7 @@ public int unitDestroyed(Unit unit, Unit attacker) {
bomberHandler.removeUnit(unit);
miscHandler.removeUnit(unit);

if (unit.getDef().getName().equals("corsilo")){
if (unit.getDef().getName().equals("staticnuke")){
hasNuke = false;
}

Expand All @@ -1762,7 +1762,7 @@ public int unitDestroyed(Unit unit, Unit attacker) {
lastDefenseFrame = frame;
DefenseTarget dt = null;

float udmg = (unit.getDef().getName().equals("cormex") && graphManager.isFrontLine(unit.getPos())) ? 1500f : unit.getMaxHealth();
float udmg = (unit.getDef().getName().equals("staticmex") && graphManager.isFrontLine(unit.getPos())) ? 1500f : unit.getMaxHealth();
if (attacker != null){
if (attacker.getPos() != null && attacker.getDef() != null && !attacker.getDef().isAbleToFly()) {
dt = new DefenseTarget(attacker.getPos(), udmg + attacker.getMaxHealth(), frame);
Expand All @@ -1785,7 +1785,7 @@ public int unitDestroyed(Unit unit, Unit attacker) {
}

// Unpaint ally threat for porc
if (unit.getDef().getSpeed() == 0 && unit.getDef().isAbleToAttack() && !unit.getDef().getName().equals("armbrtha")){
if (unit.getDef().getSpeed() == 0 && unit.getDef().isAbleToAttack() && !unit.getDef().getName().equals("staticheavyarty")){
int power = (int) ((unit.getPower() + unit.getMaxHealth())/10);
float radius = unit.getMaxRange();
AIFloat3 pos = unit.getPos();
Expand Down Expand Up @@ -1838,7 +1838,7 @@ public int unitDamaged(Unit h, Unit attacker, float damage, AIFloat3 dir, Weapon

// don't create defense targets vs air units.
if (dt != null) {
if (weaponDef != null && weaponDef.getName().startsWith("armbrawl")) {
if (weaponDef != null && weaponDef.getName().startsWith("gunshipheavyskirm")) {
airDefenseTargets.add(dt);
} else {
defenseTargets.add(dt);
Expand Down
Loading

0 comments on commit 3794cc2

Please sign in to comment.