LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.8.0: renamed references to old DM-300 fight

Browse Source
This commit is contained in:
Evan Debenham 2020-01-17 23:04:12 -05:00
parent 32a755cfee
commit 6e2e87966b
7 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java
View File

@ -43,7 +43,6 @@ import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.SpiritBow;
import com.shatteredpixel.shatteredpixeldungeon.journal.Notes;
import com.shatteredpixel.shatteredpixeldungeon.levels.CavesBossLevel;
import com.shatteredpixel.shatteredpixeldungeon.levels.CavesLevel;
import com.shatteredpixel.shatteredpixeldungeon.levels.CityBossLevel;
import com.shatteredpixel.shatteredpixeldungeon.levels.CityLevel;

8
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java
View File

@ -125,6 +125,14 @@ public class ShatteredPixelDungeon extends Game {
com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Elemental.NewbornFire.class,
"com.shatteredpixel.shatteredpixeldungeon.actors.mobs.NewbornElemental");
//v0.8.0
com.watabou.utils.Bundle.addAlias(
com.shatteredpixel.shatteredpixeldungeon.actors.mobs.OldDM300.class,
"com.shatteredpixel.shatteredpixeldungeon.actors.mobs.DM300");
com.watabou.utils.Bundle.addAlias(
com.shatteredpixel.shatteredpixeldungeon.levels.OldCavesBossLevel.class,
"com.shatteredpixel.shatteredpixeldungeon.levels.CavesBossLevel" );
}
@Override

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM300.java → core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/OldDM300.java
View File

@ -52,7 +52,7 @@ import com.watabou.utils.Bundle;
import com.watabou.utils.PathFinder;
import com.watabou.utils.Random;
public class DM300 extends Mob {
public class OldDM300 extends Mob {
{
spriteClass = DM300Sprite.class;

18
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/NewCavesBossLevel.java
View File

@ -28,7 +28,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob;
import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Electricity;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.DM300;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.OldDM300;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Pylon;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.NewDM300;
@ -321,7 +321,7 @@ public class NewCavesBossLevel extends Level {
public String tileDesc( int tile ) {
switch (tile) {
case Terrain.WATER:
return super.tileDesc( tile ) + "\n\n" + Messages.get(CavesBossLevel.class, "water_desc");
return super.tileDesc( tile ) + "\n\n" + Messages.get(NewCavesBossLevel.class, "water_desc");
case Terrain.ENTRANCE:
return Messages.get(CavesLevel.class, "entrance_desc");
case Terrain.EXIT:
@ -666,9 +666,9 @@ public class NewCavesBossLevel extends Level {
public String name(int tileX, int tileY) {
int i = tileX + tileW*(tileY + this.tileY);
if (Dungeon.level.map[i] == Terrain.INACTIVE_TRAP){
return Messages.get(CavesBossLevel.class, "wires_name");
return Messages.get(NewCavesBossLevel.class, "wires_name");
} else if (gate.inside(Dungeon.level.cellToPoint(i))){
return Messages.get(CavesBossLevel.class, "gate_name");
return Messages.get(NewCavesBossLevel.class, "gate_name");
}
return super.name(tileX, tileY);
@ -678,12 +678,12 @@ public class NewCavesBossLevel extends Level {
public String desc(int tileX, int tileY) {
int i = tileX + tileW*(tileY + this.tileY);
if (Dungeon.level.map[i] == Terrain.INACTIVE_TRAP){
return Messages.get(CavesBossLevel.class, "wires_desc");
return Messages.get(NewCavesBossLevel.class, "wires_desc");
} else if (gate.inside(Dungeon.level.cellToPoint(i))){
if (Dungeon.level.solid[i]){
return Messages.get(CavesBossLevel.class, "gate_desc");
return Messages.get(NewCavesBossLevel.class, "gate_desc");
} else {
return Messages.get(CavesBossLevel.class, "gate_desc_broken");
return Messages.get(NewCavesBossLevel.class, "gate_desc_broken");
}
}
return super.desc(tileX, tileY);
@ -749,7 +749,7 @@ public class NewCavesBossLevel extends Level {
if (c instanceof Pylon && c.alignment != Char.Alignment.NEUTRAL){
energySourceSprite = c.sprite;
break;
} else if (c instanceof DM300){
} else if (c instanceof OldDM300){
energySourceSprite = c.sprite;
}
}
@ -771,7 +771,7 @@ public class NewCavesBossLevel extends Level {
@Override
public String tileDesc() {
return Messages.get(CavesBossLevel.class, "energy_desc");
return Messages.get(NewCavesBossLevel.class, "energy_desc");
}
@Override

6
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CavesBossLevel.java → core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/OldCavesBossLevel.java
View File

@ -26,7 +26,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Bones;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.DM300;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.OldDM300;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
@ -47,7 +47,7 @@ import com.watabou.utils.PathFinder;
import com.watabou.utils.Random;
import com.watabou.utils.Rect;
public class CavesBossLevel extends Level {
public class OldCavesBossLevel extends Level {
{
color1 = 0x534f3e;
@ -231,7 +231,7 @@ public class CavesBossLevel extends Level {
}
}
DM300 boss = new DM300();
OldDM300 boss = new OldDM300();
boss.state = boss.WANDERING;
do {
boss.pos = Random.Int( length() );

14
core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors.properties
View File

@ -489,13 +489,13 @@ actors.mobs.dm200.name=DM-200
actors.mobs.dm200.vent=The DM-200 fires a toxic jet of exhaust at you!
actors.mobs.dm200.desc=The DM-200 is the second generation of dwarven 'defense machine', which was designed to protect dwarven miners in the caves and city below. They are much larger and bulkier than their predecessors, and attack with devastating hydraulic fists.\n\nTheir increased size is also their primary weakness, as they are unable to fit into the narrow tunnels and doorways of the dungeon. The dwarves were able to compensate for the DM-200's lack of mobility by allowing them to vent their toxic exhaust fumes at distant enemies, or enemies they cannot reach.
actors.mobs.dm300.name=DM-300
actors.mobs.dm300.notice=Unauthorised personnel detected.
actors.mobs.dm300.defeated=Mission failed. Shutting down.
actors.mobs.dm300.repair=DM-300 repairs itself!
actors.mobs.dm300.def_verb=blocked
actors.mobs.dm300.rankings_desc=Crushed by the DM-300
actors.mobs.dm300.desc=This machine was created by the Dwarves several centuries ago. Later, Dwarves started to replace machines with golems, elementals and even demons. Eventually it led their civilization to the decline. The DM-300 and similar machines were typically used for construction and mining, and in some cases, for city defense.
actors.mobs.olddm300.name=DM-300
actors.mobs.olddm300.notice=Unauthorised personnel detected.
actors.mobs.olddm300.defeated=Mission failed. Shutting down.
actors.mobs.olddm300.repair=DM-300 repairs itself!
actors.mobs.olddm300.def_verb=blocked
actors.mobs.olddm300.rankings_desc=Crushed by the DM-300
actors.mobs.olddm300.desc=This machine was created by the Dwarves several centuries ago. Later, Dwarves started to replace machines with golems, elementals and even demons. Eventually it led their civilization to the decline. The DM-300 and similar machines were typically used for construction and mining, and in some cases, for city defense.
actors.mobs.newdm300.name=DM-300
actors.mobs.newdm300.notice=UNAUTHORIZED PERSONNEL DETECTED!

14
core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/levels/levels.properties
View File

@ -128,13 +128,13 @@ levels.traps.worndarttrap.desc=A small dart-blower must be hidden nearby, activa
###levels
levels.cavesbosslevel.wires_name=Exposed wiring
levels.cavesbosslevel.wires_desc=The ground is partially dug up here, showing some large exposed wires. They must be connecting the various electrical machines together.\n\nThe wires must have some current running through them. If DM-300 steps here it may be able to draw power from there.
levels.cavesbosslevel.energy_desc=The ground here is sparking with electricity, and is harmful to step on. The sparks seem to be stronger in some places than others... perhaps they lead to the power source?
levels.cavesbosslevel.gate_name=Metal gate
levels.cavesbosslevel.gate_desc=A large metal gate that blocks the path into the dwarven metropolis. The metal box in the center is producing a loud humming noice, it must be connected to the circuitry and machines nearby. Perhaps destroying DM-300 will open the gate?
levels.cavesbosslevel.gate_desc_broken=The gate must have been connected to DM-300 in some way, as it exploded when DM-300 was defeated. Now only broken pieces remain.
levels.cavesbosslevel.water_desc=With all the electricity around here water might not always be safe...
levels.newcavesbosslevel.wires_name=Exposed wiring
levels.newcavesbosslevel.wires_desc=The ground is partially dug up here, showing some large exposed wires. They must be connecting the various electrical machines together.\n\nThe wires must have some current running through them. If DM-300 steps here it may be able to draw power from there.
levels.newcavesbosslevel.energy_desc=The ground here is sparking with electricity, and is harmful to step on. The sparks seem to be stronger in some places than others... perhaps they lead to the power source?
levels.newcavesbosslevel.gate_name=Metal gate
levels.newcavesbosslevel.gate_desc=A large metal gate that blocks the path into the dwarven metropolis. The metal box in the center is producing a loud humming noice, it must be connected to the circuitry and machines nearby. Perhaps destroying DM-300 will open the gate?
levels.newcavesbosslevel.gate_desc_broken=The gate must have been connected to DM-300 in some way, as it exploded when DM-300 was defeated. Now only broken pieces remain.
levels.newcavesbosslevel.water_desc=With all the electricity around here water might not always be safe...
levels.caveslevel.grass_name=Fluorescent moss
levels.caveslevel.high_grass_name=Fluorescent mushrooms