OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-02-23 15:38:29 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Merge branch 'factionscoreequals' into nut_arulir_mountain

Browse Source
This commit is contained in:
Gonk
2019-10-30 22:48:17 +01:00
parent 17e6cf3bec 755854c93a
commit 045b4708fa
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

3
AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/script/Requirement.java
View File

@@ -19,6 +19,7 @@ public final class Requirement {
,hasActorCondition
,factionScore
,random
,factionScoreEquals
}
public final RequirementType requireType;
@@ -83,6 +84,8 @@ public final class Requirement {
case timerElapsed:
return requireID != null && value >= 0;
case wear:
case factionScore:
case factionScoreEquals:
return requireID != null;
default:
return false;