OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-01-18 01:27:25 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into title_screen

Browse Source
This commit is contained in:
Zukero
2018-01-15 11:35:11 +01:00
parent b87617e7eb 421a03980a
commit 332eee0736
5 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
AndorsTrail/res/raw/conversationlist_lodar.json
View File

@@ -533,12 +533,14 @@
{
"requireType":"questProgress",
"requireID":"shortcut_lodar",
"value":10
"value":10,
"negate":true
},
{
"requireType":"questProgress",
"requireID":"shortcut_lodar",
"value":30
"value":30,
"negate":true
}
]
},
@@ -559,7 +561,8 @@
{
"requireType":"questProgress",
"requireID":"shortcut_lodar",
"value":30
"value":30,
"negate":true
}
]
},
@@ -575,12 +578,14 @@
{
"requireType":"questProgress",
"requireID":"shortcut_lodar",
"value":10
"value":10,
"negate":true
},
{
"requireType":"questProgress",
"requireID":"shortcut_lodar",
"value":30
"value":30,
"negate":true
}
]
},
@@ -596,7 +601,8 @@
{
"requireType":"questProgress",
"requireID":"shortcut_lodar",
"value":50
"value":50,
"negate":true
}
]
},

3
AndorsTrail/res/raw/conversationlist_pathway_fallhaven.json
View File

@@ -143,7 +143,8 @@
{
"requireType":"questProgress",
"requireID":"pathway_fallhaven",
"value":40
"value":40,
"negate":true
}
]
}

9
AndorsTrail/res/raw/conversationlist_shortcut_lodar.json
View File

@@ -12,7 +12,8 @@
{
"requireType":"questProgress",
"requireID":"lodar2",
"value":50
"value":50,
"negate":true
}
]
},
@@ -22,7 +23,8 @@
{
"requireType":"questProgress",
"requireID":"shortcut_lodar",
"value":22
"value":22,
"negate":true
}
]
},
@@ -56,7 +58,8 @@
{
"requireType":"questProgress",
"requireID":"shortcut_lodar",
"value":40
"value":40,
"negate":true
}
]
},

16
AndorsTrail/res/raw/conversationlist_vilegard_shops.json
View File

@@ -61,7 +61,7 @@
]
},
{
"nextPhraseID":"vilegard_shop_notrust"
"nextPhraseID":"vilegard_shop_notrust_smith"
}
]
},
@@ -105,6 +105,20 @@
{
"id":"vilegard_shop_notrust",
"message":"You are an outsider. We don't like outsiders here in Vilegard. Please leave.",
"replies":[
{
"text":"Why is everyone in Vilegard so suspicious of outsiders?",
"nextPhraseID":"vilegard_shop_notrust_2"
},
{
"text":"Can I see what items you have for sale?",
"nextPhraseID":"vilegard_shop_notrust_2"
}
]
},
{
"id":"vilegard_shop_notrust_smith",
"message":"You are an outsider. We don't like outsiders here in Vilegard. Please leave.",
"replies":[
{
"text":"Why is everyone in Vilegard so suspicious of outsiders?",

1
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java
View File

@@ -293,6 +293,7 @@ public final class ConversationController {
break;
case factionScore:
result = player.getAlignment(requirement.requireID) >= requirement.value;
break;
default:
result = true;
}