konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.6.0: bugfixes relating to swordsword and grass terrain flags

Browse Source
This commit is contained in:
Evan Debenham
2017-03-17 14:21:30 -04:00
parent 3d46ab9f48
commit a7102d0c8b
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/RegularLevel.java
+12 -3
View File
@@ -271,7 +271,10 @@ public abstract class RegularLevel extends Level {
type = Heap.Type.HEAP; type = Heap.Type.HEAP;
} }
int cell = randomDropCell(); int cell = randomDropCell();
if (map[cell] == Terrain.HIGH_GRASS) map[cell] = Terrain.GRASS; if (map[cell] == Terrain.HIGH_GRASS) {
map[cell] = Terrain.GRASS;
losBlocking[cell] = false;
}
drop( Generator.random(), cell ).type = type; drop( Generator.random(), cell ).type = type;
} }
@@ -291,13 +294,19 @@ public abstract class RegularLevel extends Level {
} }
} while (traps.get(cell) instanceof ExplosiveTrap); } while (traps.get(cell) instanceof ExplosiveTrap);
drop( item, cell ).type = Heap.Type.HEAP; drop( item, cell ).type = Heap.Type.HEAP;
if (map[cell] == Terrain.HIGH_GRASS) map[cell] = Terrain.GRASS; if (map[cell] == Terrain.HIGH_GRASS) {
map[cell] = Terrain.GRASS;
losBlocking[cell] = false;
}
} }
Item item = Bones.get(); Item item = Bones.get();
if (item != null) { if (item != null) {
int cell = randomDropCell(); int cell = randomDropCell();
if (map[cell] == Terrain.HIGH_GRASS) map[cell] = Terrain.GRASS; if (map[cell] == Terrain.HIGH_GRASS) {
map[cell] = Terrain.GRASS;
losBlocking[cell] = false;
}
drop( item, cell ).type = Heap.Type.REMAINS; drop( item, cell ).type = Heap.Type.REMAINS;
} }
} }
core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties
+2 -2
View File
@@ -845,8 +845,8 @@ items.weapon.melee.meleeweapon.stats_unknown=Typically this _tier-%1$d_ melee we
items.weapon.melee.meleeweapon.probably_too_heavy=Probably this weapon is too heavy for you. items.weapon.melee.meleeweapon.probably_too_heavy=Probably this weapon is too heavy for you.
items.weapon.melee.meleeweapon.stats_desc= items.weapon.melee.meleeweapon.stats_desc=
items.weapon.melee.newshortsword.name=shortsword items.weapon.melee.shortsword.name=shortsword
items.weapon.melee.newshortsword.desc=A quite short sword, only a few inches longer than a dagger. items.weapon.melee.shortsword.desc=A quite short sword, only a few inches longer than a dagger.
items.weapon.melee.quarterstaff.name=quarterstaff items.weapon.melee.quarterstaff.name=quarterstaff
items.weapon.melee.quarterstaff.stats_desc=This weapon blocks some damage. items.weapon.melee.quarterstaff.stats_desc=This weapon blocks some damage.