AndorsTrailRelease/archived-ATCS
1
0
Fork 0
mirror of https://github.com/AndorsTrailRelease/ATCS.git synced 2025-10-27 18:44:03 +01:00
Code Issues 1 Packages Projects Releases 5 Wiki Activity

Added random requirement and a null pointer fix for the droplist editor

Browse Source 
- used in conversations and replace areas
- using the droplist chance editor
This commit is contained in:
Gonk
2019-05-12 11:45:48 +02:00
parent e12c6bcc25
commit 5a3315da1a
4 changed files with 44 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/com/gpl/rpg/atcontentstudio/model/gamedata/Requirement.java
View File

@@ -54,7 +54,8 @@ public class Requirement extends JSONElement {
spentGold,
consumedBonemeals,
hasActorCondition,
factionScore
factionScore,
random
}
public enum SkillID {
@@ -104,9 +105,21 @@ public class Requirement extends JSONElement {
@Override
public String getDesc() {
String obj_id = "";
if (required_obj_id != null)
{
obj_id = required_obj_id;
if (type != null && type == RequirementType.random){
obj_id = " Chance " + obj_id + (required_obj_id.contains("/") ? "" : "%");
}
else {
obj_id += ":";
}
}
return ((negated != null && negated) ? "NOT " : "")
+(type == null ? "" : type.toString()+":")
+(required_obj_id == null ? "" : required_obj_id+":")
+obj_id
+(required_value == null ? "" : required_value.toString());
}
@@ -173,6 +186,7 @@ public class Requirement extends JSONElement {
case spentGold:
case timerElapsed:
case factionScore:
case random:
break;
}
if (this.required_obj != null) this.required_obj.addBacklink((GameDataElement) this.parent);
@@ -225,6 +239,12 @@ public class Requirement extends JSONElement {
required_obj_id = null;
required_value = null;
}
if(destType==RequirementType.random)
{
required_obj_id = "50/100";
}
type = destType;
}

7
src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/DialogueEditor.java
View File

@@ -123,7 +123,7 @@ public class DialogueEditor extends JSONElementEditor {
private MyComboBox requirementObj;
@SuppressWarnings("rawtypes")
private JComboBox requirementSkill;
private JTextField requirementObjId;
private JComponent requirementObjId;
private JComponent requirementValue;
private BooleanBasedCheckBox requirementNegated;
@@ -722,6 +722,11 @@ public class DialogueEditor extends JSONElementEditor {
requirementObjId = null;
requirementValue = addIntegerField(pane, "Quantity: ", requirement.required_value, false, writable, listener);
break;
case random:
requirementObj = null;
requirementObjId = addChanceField(pane, "Chance: ", requirement.required_obj_id, "50/100", writable, listener);
requirementValue = null;
break;
case hasActorCondition:
requirementObj = addActorConditionBox(pane, project, "Actor Condition: ", (ActorCondition) requirement.required_obj, writable, listener);
requirementObjId = null;

4
src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/DroplistEditor.java
View File

@@ -221,9 +221,9 @@ public class DroplistEditor extends JSONElementEditor {
Droplist.DroppedItem di = (Droplist.DroppedItem)value;
if (di.item != null) {
label.setIcon(new ImageIcon(di.item.getIcon()));
label.setText(di.chance+(di.chance.contains("/") ? "" : "%")+" to get "+di.quantity_min+"-"+di.quantity_max+" "+di.item.getDesc());
label.setText(di.chance+(di.chance != null && di.chance.contains("/") ? "" : "%")+" to get "+di.quantity_min+"-"+di.quantity_max+" "+di.item.getDesc());
} else if (!isNull(di)) {
label.setText(di.chance+(di.chance.contains("/") ? "" : "%")+" to get "+di.quantity_min+"-"+di.quantity_max+" "+di.item_id);
label.setText(di.chance+(di.chance != null && di.chance.contains("/") ? "" : "%")+" to get "+di.quantity_min+"-"+di.quantity_max+" "+di.item_id);
} else {
label.setText("New, undefined, dropped item.");
}

20
src/com/gpl/rpg/atcontentstudio/ui/map/TMXMapEditor.java
View File

@@ -173,7 +173,7 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
private JPanel requirementParamsPane;
@SuppressWarnings("rawtypes")
private JComboBox requirementObj;
private JTextField requirementObjId;
private JComponent requirementObjId;
private JComponent requirementValue;
private BooleanBasedCheckBox requirementNegated;
@@ -675,6 +675,11 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
requirementObjId = null;
requirementValue = addIntegerField(pane, "Quantity: ", requirement.required_value, false, writable, listener);
break;
case random:
requirementObj = null;
requirementObjId = addChanceField(pane, "Chance: ", requirement.required_obj_id, "50/100", writable, listener);
requirementValue = null;
break;
case hasActorCondition:
requirementObj = addActorConditionBox(pane, project, "Actor Condition: ", (ActorCondition) requirement.required_obj, writable, listener);
requirementObjId = null;
@@ -2318,11 +2323,14 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
if (!activeReplacements.containsKey(area)) {
activeReplacements.put(area, true);
}
for (ReplaceArea.Replacement repl : area.replacements) {
if (replacementsForLayer.get(repl.sourceLayer) == null) {
replacementsForLayer.put(repl.sourceLayer, new ArrayList<ReplaceArea>());
}
replacementsForLayer.get(repl.sourceLayer).add(area);
if(area.replacements != null) {
for (ReplaceArea.Replacement repl : area.replacements) {
if (replacementsForLayer.get(repl.sourceLayer) == null) {
replacementsForLayer.put(repl.sourceLayer, new ArrayList<ReplaceArea>());
}
replacementsForLayer.get(repl.sourceLayer).add(area);
}
}
}
}