From a2d22e4f8ecf8c263efedd6bc3fbd6c0d907b262 Mon Sep 17 00:00:00 2001 From: sigonasr2 Date: Mon, 27 Jun 2022 21:19:49 -0500 Subject: [PATCH] Remove data tile dependency for water level tile. Not really necessary Co-authored-by: r3cp3ct <45179536+r3cp3ct@users.noreply.github.com> Co-authored-by: sigonasr2 --- maps/world1.map | Bin 299108 -> 299092 bytes src/sig/events/WaterEvent.java | 10 +--------- src/sig/objects/LevelRenderer.java | 1 - 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/maps/world1.map b/maps/world1.map index 5864c0824d8765bf8a403e3332832fafa590207b..b2264029001aef375331a4161b7da0c8d48b2c3e 100644 GIT binary patch delta 37 qcmaE|Kp@tU57N!>FEiB9v7)7SDOki>0VUXaH2Vw;vRs;a#p$Omr delta 53 zcmcbzKFEiB9v7$v5&Oki=5X_&$#&mh4E!U{mF*vKFt55x*UtOx+2 COAJH+ diff --git a/src/sig/events/WaterEvent.java b/src/sig/events/WaterEvent.java index fa8e253..b0b53cb 100644 --- a/src/sig/events/WaterEvent.java +++ b/src/sig/events/WaterEvent.java @@ -12,15 +12,7 @@ public class WaterEvent implements Event{ @Override public boolean performCollision(int x, int y) { - char val1=RabiClone.CURRENT_MAP.getMap().getDataTileValue(x/Tile.TILE_WIDTH+1, y/Tile.TILE_HEIGHT); - char val2=RabiClone.CURRENT_MAP.getMap().getDataTileValue(x/Tile.TILE_WIDTH, y/Tile.TILE_HEIGHT+1); - if (val1!=Character.MAX_VALUE) { - RabiClone.CURRENT_MAP.getMap().setWaterLevel(val1); - //System.out.println("Water level set to "+(int)RabiClone.CURRENT_MAP.getMap().getWaterLevel()); - } else { - RabiClone.CURRENT_MAP.getMap().setWaterLevel(val2); - //System.out.println("Water level set to "+(int)RabiClone.CURRENT_MAP.getMap().getWaterLevel()); - } + RabiClone.CURRENT_MAP.getMap().setWaterLevel((char)(y/Tile.TILE_HEIGHT*Tile.TILE_HEIGHT)); return true; } diff --git a/src/sig/objects/LevelRenderer.java b/src/sig/objects/LevelRenderer.java index fe5f1b5..90a9bdb 100644 --- a/src/sig/objects/LevelRenderer.java +++ b/src/sig/objects/LevelRenderer.java @@ -1,7 +1,6 @@ package sig.objects; import java.awt.event.KeyEvent; -import java.util.Arrays; import sig.RabiClone; import sig.engine.Action;