Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename and clean up MapleOxQuiz

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:57:16 +02:00
parent fb6123e4cc
commit d2881942d8
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/server/events/gm/MapleOxQuiz.java → src/main/java/server/events/gm/OxQuiz.java
View File

@@ -35,17 +35,16 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
*
* @author FloppyDisk * @author FloppyDisk
*/ */
public final class MapleOxQuiz { public final class OxQuiz {
private int round = 1; private int round = 1;
private int question = 1; private int question = 1;
private MapleMap map = null; private MapleMap map = null;
private int expGain = 200; private final int expGain = 200;
private static DataProvider stringData = DataProviderFactory.getDataProvider(WZFiles.ETC); private static final DataProvider stringData = DataProviderFactory.getDataProvider(WZFiles.ETC);
public MapleOxQuiz(MapleMap map) { public OxQuiz(MapleMap map) {
this.map = map; this.map = map;
this.round = Randomizer.nextInt(9); this.round = Randomizer.nextInt(9);
this.question = 1; this.question = 1;

8
src/main/java/server/maps/MapleMap.java
View File

@@ -122,7 +122,7 @@ public class MapleMap {
private float recovery = 1.0f; private float recovery = 1.0f;
private int protectItem = 0; private int protectItem = 0;
private boolean town; private boolean town;
private MapleOxQuiz ox; private OxQuiz ox;
private boolean isOxQuiz = false; private boolean isOxQuiz = false;
private boolean dropsOn = true; private boolean dropsOn = true;
private String onFirstUserEnter; private String onFirstUserEnter;
@@ -3753,11 +3753,11 @@ public class MapleMap {
} }
} }
public MapleOxQuiz getOx() { public OxQuiz getOx() {
return ox; return ox;
} }
public void setOx(MapleOxQuiz set) { public void setOx(OxQuiz set) {
this.ox = set; this.ox = set;
} }
@@ -3900,7 +3900,7 @@ public class MapleMap {
chr.setOla(new Ola(chr)); chr.setOla(new Ola(chr));
chr.getOla().startOla(); chr.getOla().startOla();
} else if (this.mapid == 109020001 && getOx() == null) { } else if (this.mapid == 109020001 && getOx() == null) {
setOx(new MapleOxQuiz(this)); setOx(new OxQuiz(this));
getOx().sendQuestion(); getOx().sendQuestion();
setOxQuiz(true); setOxQuiz(true);
} else if (this.mapid == 109060000 && getSnowball(chr.getTeam()) == null) { } else if (this.mapid == 109060000 && getSnowball(chr.getTeam()) == null) {