Mirrors/WarsmashModEngine
1
0
Fork 0
mirror of https://github.com/Retera/WarsmashModEngine.git synced 2022-07-31 17:38:59 +02:00
Code Issues Projects Releases Wiki Activity

Fix command card cancel menu icon, fix terrain handling missing cliff, improve build food cost handling

Browse Source
This commit is contained in:
Retera 2020-12-24 08:46:56 -05:00
parent 6849d269ac
commit 5283b7a038
5 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/etheller/warsmash/viewer5/handlers/w3x/environment/Terrain.java
View File

@ -244,6 +244,10 @@ public class Terrain {
// Cliff Textures // Cliff Textures
for (final War3ID cliffTile : w3eFile.getCliffTiles()) { for (final War3ID cliffTile : w3eFile.getCliffTiles()) {
final Element cliffInfo = this.cliffTable.get(cliffTile.asStringValue()); final Element cliffInfo = this.cliffTable.get(cliffTile.asStringValue());
if(cliffInfo == null) {
System.err.println("Missing cliff type: " + cliffTile.asStringValue());
continue;
}
final String texDir = cliffInfo.getField("texDir"); final String texDir = cliffInfo.getField("texDir");
final String texFile = cliffInfo.getField("texFile"); final String texFile = cliffInfo.getField("texFile");
try (InputStream imageStream = dataSource.getResourceAsStream(texDir + "\\" + texFile + texturesExt)) { try (InputStream imageStream = dataSource.getResourceAsStream(texDir + "\\" + texFile + texturesExt)) {

5
core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/AbstractCAbilityBuild.java
View File

@ -40,8 +40,13 @@ public abstract class AbstractCAbilityBuild extends AbstractCAbility implements
final CPlayer player = game.getPlayer(unit.getPlayerIndex()); final CPlayer player = game.getPlayer(unit.getPlayerIndex());
if (player.getGold() >= unitType.getGoldCost()) { if (player.getGold() >= unitType.getGoldCost()) {
if (player.getLumber() >= unitType.getLumberCost()) { if (player.getLumber() >= unitType.getLumberCost()) {
if ((player.getFoodUsed() + unitType.getFoodUsed()) <= player.getFoodCap()) {
receiver.useOk(); receiver.useOk();
} }
else {
receiver.notEnoughResources(ResourceType.FOOD);
}
}
else { else {
receiver.notEnoughResources(ResourceType.LUMBER); receiver.notEnoughResources(ResourceType.LUMBER);
} }

3
core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityOrcBuild.java
View File

@ -59,6 +59,9 @@ public class CAbilityOrcBuild extends AbstractCAbilityBuild {
} }
final CPlayer player = game.getPlayer(caster.getPlayerIndex()); final CPlayer player = game.getPlayer(caster.getPlayerIndex());
player.chargeFor(unitType); player.chargeFor(unitType);
if (unitType.getFoodUsed() != 0) {
player.setFoodUsed(player.getFoodUsed() + unitType.getFoodUsed());
}
return this.buildBehavior.reset(point, orderId, getBaseOrderId()); return this.buildBehavior.reset(point, orderId, getBaseOrderId());
} }

4
core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/CBehaviorOrcBuild.java
View File

@ -14,6 +14,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting
import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CAbstractRangedBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CAbstractRangedBehavior;
import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior;
import com.etheller.warsmash.viewer5.handlers.w3x.simulation.pathing.CBuildingPathingType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.pathing.CBuildingPathingType;
import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer;
public class CBehaviorOrcBuild extends CAbstractRangedBehavior { public class CBehaviorOrcBuild extends CAbstractRangedBehavior {
private int highlightOrderId; private int highlightOrderId;
@ -63,6 +64,7 @@ public class CBehaviorOrcBuild extends CAbstractRangedBehavior {
constructedStructure.setWorkerInside(this.unit); constructedStructure.setWorkerInside(this.unit);
constructedStructure.setLife(simulation, constructedStructure.setLife(simulation,
constructedStructure.getMaximumLife() * WarsmashConstants.BUILDING_CONSTRUCT_START_LIFE); constructedStructure.getMaximumLife() * WarsmashConstants.BUILDING_CONSTRUCT_START_LIFE);
constructedStructure.setFoodUsed(unitTypeToCreate.getFoodUsed());
constructedStructure.add(simulation, constructedStructure.add(simulation,
new CAbilityBuildInProgress(simulation.getHandleIdAllocator().createId())); new CAbilityBuildInProgress(simulation.getHandleIdAllocator().createId()));
for (final CAbility ability : constructedStructure.getAbilities()) { for (final CAbility ability : constructedStructure.getAbilities()) {
@ -74,6 +76,8 @@ public class CBehaviorOrcBuild extends CAbstractRangedBehavior {
simulation.unitConstructedEvent(this.unit, constructedStructure); simulation.unitConstructedEvent(this.unit, constructedStructure);
} }
else { else {
CPlayer player = simulation.getPlayer(this.unit.getPlayerIndex());
player.setFoodUsed(player.getFoodUsed() - unitTypeToCreate.getFoodUsed());
simulation.getCommandErrorListener().showCantPlaceError(); simulation.getCommandErrorListener().showCantPlaceError();
} }
return this.unit.pollNextOrderBehavior(simulation); return this.unit.pollNextOrderBehavior(simulation);

2
core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/CommandCardIcon.java
View File

@ -117,7 +117,7 @@ public class CommandCardIcon extends AbstractRenderableFrame implements Clickabl
@Override @Override
public UIFrame touchDown(final float screenX, final float screenY, final int button) { public UIFrame touchDown(final float screenX, final float screenY, final int button) {
if (isVisible() && this.renderBounds.contains(screenX, screenY)) { if (isVisible() && this.renderBounds.contains(screenX, screenY)) {
if (this.orderId != 0) { if (this.orderId != 0 || menuButton) {
return this; return this;
} }
} }