Compare commits

..

2 Commits

Author SHA1 Message Date
OMGeeky
99f4ab5e6b remove duplicates 2024-06-22 15:13:30 +02:00
Nut.andor
0b2dbe53e3 Next version numbers 2024-06-17 20:51:52 +02:00
6 changed files with 7 additions and 149 deletions

View File

@@ -3,8 +3,8 @@
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
package="com.gpl.rpg.AndorsTrail"
android:versionCode="77"
android:versionName="0.8.11"
android:versionCode="78"
android:versionName="0.8.12dev"
android:installLocation="auto"
>

View File

@@ -26,13 +26,13 @@ public final class AndorsTrailApplication extends Application {
public static final boolean DEVELOPMENT_FORCE_CONTINUEGAME = false;
public static final boolean DEVELOPMENT_DEBUGBUTTONS = false;
public static final boolean DEVELOPMENT_FASTSPEED = false;
public static final boolean DEVELOPMENT_VALIDATEDATA = false;
public static final boolean DEVELOPMENT_DEBUGMESSAGES = false;
public static final String CURRENT_VERSION_DISPLAY = "0.8.11";
public static final boolean DEVELOPMENT_VALIDATEDATA = true;
public static final boolean DEVELOPMENT_DEBUGMESSAGES = true;
public static final String CURRENT_VERSION_DISPLAY = "0.8.12dev";
public static final boolean IS_RELEASE_VERSION = !CURRENT_VERSION_DISPLAY.matches(".*[a-d].*");
public static final boolean DEVELOPMENT_INCOMPATIBLE_SAVEGAMES = DEVELOPMENT_DEBUGRESOURCES || DEVELOPMENT_DEBUGBUTTONS || DEVELOPMENT_FASTSPEED || !IS_RELEASE_VERSION;
public static final int DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION = 999;
public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION : 77;
public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION : 78;
private final AndorsTrailPreferences preferences = new AndorsTrailPreferences();
private WorldContext world = new WorldContext();

View File

@@ -3468,106 +3468,6 @@
}
]
},
{
"id":"captive_girl_selector",
"replies":[
{
"text":"N",
"nextPhraseID":"captive_girl_10",
"requires":[
{
"requireType":"questProgress",
"requireID":"wicked_witch",
"value":90,
"negate":true
},
{
"requireType":"questProgress",
"requireID":"wicked_witch",
"value":95,
"negate":true
},
{
"requireType":"questProgress",
"requireID":"wicked_witch",
"value":96,
"negate":true
}
]
},
{
"text":"N",
"nextPhraseID":"captive_girl_50",
"requires":[
{
"requireType":"questLatestProgress",
"requireID":"wicked_witch",
"value":90
}
]
},
{
"text":"N",
"nextPhraseID":"captive_girl_75",
"requires":[
{
"requireType":"questProgress",
"requireID":"wicked_witch",
"value":95
}
]
},
{
"text":"N",
"nextPhraseID":"captive_girl_31"
}
]
},
{
"id":"captive_girl_65",
"message":"Ah, YES. I remember her saying that an \"undead\" friend of her's east of here taught her how to make them.",
"replies":[
{
"text":"OK. Stay here. I will be back with more of them.",
"nextPhraseID":"X"
}
],
"rewards":[
{
"rewardType":"questProgress",
"rewardID":"wicked_witch",
"value":90
}
]
},
{
"id":"wicked_witch_reveal_girl_selector",
"replies":[
{
"text":"N",
"nextPhraseID":"wicked_witch_reveal_girl_spawn",
"requires":[
{
"requireType":"timerElapsed",
"requireID":"wicked_witch_despawn_timer",
"value":72
},
{
"requireType":"questProgress",
"requireID":"wicked_witch",
"value":96,
"negate":true
},
{
"requireType":"questProgress",
"requireID":"wicked_witch",
"value":95,
"negate":true
}
]
}
]
},
{
"id":"fix_stn_skeletons_10",
"message":"What a beautiful view from here.",

View File

@@ -34,32 +34,6 @@
}
}
},
{
"id": "shadow_slayer",
"iconID": "items_weapons:60",
"name": "Shadow of the slayer",
"category": "lsword",
"displaytype": "extraordinary",
"hasManualPrice": 1,
"baseMarketCost": 0,
"equipEffect": {
"increaseMaxAP": 2,
"increaseAttackCost": 7,
"increaseAttackChance": 25,
"increaseCriticalSkill": 10,
"setCriticalMultiplier": 2,
"increaseAttackDamage": {
"min": 5,
"max": 9
}
},
"killEffect": {
"increaseCurrentHP": {
"min": 1,
"max": 1
}
}
},
{
"id":"choatic_potion",
"iconID":"items_consumables:62",

View File

@@ -7,14 +7,6 @@
"hasManualPrice": 1,
"baseMarketCost": 6
},
{
"id": "bat_wing",
"iconID": "items_misc:46",
"name": "Bat wing",
"category": "animal",
"hasManualPrice": 1,
"baseMarketCost": 2
},
{
"id": "feather",
"iconID": "items_misc:16",
@@ -39,14 +31,6 @@
"hasManualPrice": 1,
"baseMarketCost": 1
},
{
"id": "gem6",
"iconID": "items_misc:4",
"name": "Shimmering gem",
"category": "gem",
"hasManualPrice": 1,
"baseMarketCost": 26
},
{
"id": "gem8",
"iconID": "actorconditions_1:50",

View File

@@ -1277,7 +1277,7 @@ Item categories, like all JSON-based content, is best created and edited using A
- An **item category** ***can*** have the following fields defined:
- "**actionType**" with one of the following values: "**none**", "**use**", or "**equip**". When the value is "**none**", the player can neither use nor equip items belonging to this category. This is the default value, and this field can be omitted entirely when this is the case. When the value is "**use**", the player can *consume* items belonging to this category. When the value is "**equip**", the player can equip the items belonging to this category in the equipment slot defined using the "**inventorySlot**" field for this item category. The "**inventorySlot**" field is mandatory when the value "**equip**" is used.
- "**size**" with one of the following values: "**none**", "**light**", "**std**", or "**large**". This indicate the size of the items belonging to this category, and is used by the skill system to provide benefits to using one size of equipment or another. It is also used to specify if a weapon is dual-wield or not. "**none**" is the default value, and this field can be omitted entirely when this is the case.
- "**size**" with one of the following values: "**none**", "**light**", "**std**", or "**large**". This indicate the size of the items belonging to this category, and is used by the skill system to provide benefits to using one size of equipment or another. "**none**" is the default value, and this field can be omitted entirely when this is the case.
- "**inventorySlot**" with one of the following values: "**weapon**", "**shield**", "**head**", "**body**", "**hand**", "**feet**", "**neck**", "**leftring**", or "**rightring**". This field is unused when "**actionType**" is not set to "**equip**", but is mandatory when it is. The values should be pretty self-explanatory, and define what slot of the player's equipment can be used by items belonging to this category. "**leftring**" and "**rightring**" are completely equivalent to each other in an item category definition. They are both present because the same *Enum* as the one defining equipment slots is used.