Skip to content

Commit

Permalink
Clean up and correct issues discovered while doing release testing (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
LegacyKing committed Jan 1, 2017
1 parent 98ee3fe commit 43c20cd
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 26 deletions.
7 changes: 5 additions & 2 deletions code/gradle/release.gradle
Expand Up @@ -226,7 +226,7 @@ task layoutNsisOptional(type: Copy, dependsOn: copyToRoot) {
with optionalData
}


// The perl executable is flagged as an error - not using currently.
// Generate the publisher/data list for the Windows installer script
task genDataList << {
new ByteArrayOutputStream().withStream { os ->
Expand All @@ -240,6 +240,7 @@ task genDataList << {
}
}


// Create the version specific config files for NSIS
task genProjectNsis << {
new File("${projectDir}/installers/win-installer/project.nsh").write("""
Expand Down Expand Up @@ -330,7 +331,9 @@ task checksum(dependsOn: assembleArtifacts) << {
}
}

task prepareRelease (dependsOn: ['clean', 'build', 'genDataList']) {

// genDataList removed as it causes release errors , 'genDataList'
task prepareRelease (dependsOn: ['clean', 'build']) {
description="Prepare PCGen for release. This will update and commit the version, do a clean build including the unit tests and generate the data list for the installer."
}

Expand Down
Expand Up @@ -13,9 +13,19 @@ Constrict KEY:Crawling Vine ~ Constrict CATEGORY:Special Ability TYPE:
CATEGORY=Internal|Eidolon Companion Progression ~ Standard.MOD DEFINE:IsWildCallerEidolon|0 ABILITY:Internal|AUTOMATIC|Eidolon ~ Wild Caller|PREVAREQ:IsWildCallerEidolon,1 BONUS:VAR|IsWildCallerEidolon|mastervar("IsWildCallerEidolon")
CATEGORY=Internal|Eidolon Companion Progression ~ Standard.MOD DEFINE:ShaitanBinder|0 ABILITY:Internal|AUTOMATIC|Eidolon ~ Shaitan Binder|PREVAREQ:ShaitanBinder,1 BONUS:VAR|ShaitanBinder|mastervar("ShaitanBinder")

Eidolon ~ Wild Caller CATEGORY:Internal BONUS:VAR|EidolonEvolution|(MasterLevel>=4)+(MasterLevel>=8)+(MasterLevel>=12)+(MasterLevel>=16)+(MasterLevel>=20)
Eidolon ~ Wild Caller DEFINE:PlantEidolon|0 BONUS:VAR|PlantEidolon|1 CATEGORY:Internal BONUS:VAR|EidolonEvolution|(MasterLevel>=4)+(MasterLevel>=8)+(MasterLevel>=12)+(MasterLevel>=16)+(MasterLevel>=20)
Eidolon ~ Shaitan Binder CATEGORY:Internal ABILITY:Special Ability|AUTOMATIC|Evolution ~ Basic Magic|PREVARGTEQ:MasterLevel,4 ABILITY:Special Ability|AUTOMATIC|Evolution ~ Minor Magic|PREVARGTEQ:MasterLevel,6 ABILITY:Special Ability|AUTOMATIC|Evolution ~ Major Magic|PREVARGTEQ:MasterLevel,8 ABILITY:Special Ability|AUTOMATIC|Shaitan Binder Eidolon ~ Earth Glide|PREVARGTEQ:MasterLevel,10|PREABILITY:1,CATEGORY=Special Ability,Evolution ~ Burrow ABILITY:Special Ability|AUTOMATIC|Evolution ~ Ultimate Magic|PREVARGTEQ:MasterLevel,12 ABILITY:Special Ability|AUTOMATIC|Shaitan Binder Eidolon ~ Noble Eidolon|PREVARGTEQ:MasterLevel,20 BONUS:ABILITYPOOL|Shaitan Binder Eidolon Stat Bonus|1|PREABILITY:1,CATEGORY=Internal,Eidolon Type ~ Biped BONUS:VAR|Eidolon_CF_ShareSpells|1

#
# Plant Eidolon Support
#
Cactus KEY:Eidolon Type ~ Cactus CATEGORY:Internal TYPE:EidolonTypeSelection PREVAREQ:PlantEidolon,1 TEMPLATE:LEGS 2 ABILITY:Eidolon Evolution|AUTOMATIC|Evolution ~ Arms ABILITY:Eidolon Evolution|AUTOMATIC|Evolution ~ Sting ABILITY:Eidolon Evolution|AUTOMATIC|Evolution ~ Tail ABILITY:Eidolon Evolution|AUTOMATIC|Evolution ~ Legs BONUS:STAT|STR|4|TYPE=Racial BONUS:STAT|DEX|2|TYPE=Racial BONUS:VAR|EidolonFortGood,EidolonRefGood|1|TYPE=Base BONUS:MOVEADD|TYPE.Walk|10
Conifer KEY:Eidolon Type ~ Conifer CATEGORY:Internal TYPE:EidolonTypeSelection PREVAREQ:PlantEidolon,1 TEMPLATE:LEGS 2 ABILITY:Eidolon Evolution|AUTOMATIC|Evolution ~ Clawed Hands|PREVAREQ:RemoveEidolonBaseClaws,0 ABILITY:Eidolon Evolution|AUTOMATIC|Evolution ~ Arms ABILITY:Eidolon Evolution|AUTOMATIC|Evolution ~ Legs ABILITY:Eidolon Evolution|AUTOMATIC|Evolution ~ Resist Cold BONUS:STAT|STR|4|TYPE=Racial BONUS:STAT|DEX|2|TYPE=Racial BONUS:STAT|CON|2|TYPE=Racial BONUS:VAR|EidolonFortGood,EidolonWillGood|1|TYPE=Base BONUS:MOVEADD|TYPE.Walk|10
Mushroom KEY:Eidolon Type ~ Mushroom CATEGORY:Internal TYPE:EidolonTypeSelection PREVAREQ:PlantEidolon,1 TEMPLATE:LEGS 2 ABILITY:Eidolon Evolution|AUTOMATIC|Evolution ~ Bite ABILITY:Eidolon Evolution|AUTOMATIC|Evolution ~ Arms ABILITY:Eidolon Evolution|AUTOMATIC|Evolution ~ Legs ABILITY:Eidolon Evolution|AUTOMATIC|Evolution ~ Poison STR BONUS:STAT|STR|4|TYPE=Racial BONUS:STAT|DEX|4|TYPE=Racial BONUS:VAR|EidolonFortGood,EidolonReflexGood|1|TYPE=Base
Tree KEY:Eidolon Type ~ Tree CATEGORY:Internal TYPE:EidolonTypeSelection PREVAREQ:PlantEidolon,1 TEMPLATE:LEGS 2 ABILITY:Eidolon Evolution|AUTOMATIC|Evolution ~ Improved Natural Armor ABILITY:Eidolon Evolution|AUTOMATIC|Evolution ~ Arms ABILITY:Eidolon Evolution|AUTOMATIC|Evolution ~ Legs ABILITY:Eidolon Evolution|AUTOMATIC|Evolution ~ Slam ABILITY:Eidolon Evolution|AUTOMATIC|Evolution ~ Slam BONUS:STAT|STR|6|TYPE=Racial BONUS:STAT|DEX|2|TYPE=Racial BONUS:VAR|EidolonFortGood,EidolonReflexGood|1|TYPE=Base




###Block: Shaitan Binder Eidolon Abilities
# Ability Name Unique Key Category of Ability Type Required Ability Required Race Required Stat Var. Min. Value Define Innate Spells Description Modify VAR Cost Source, Long Desc. Source, Short Desc. Source Page
Expand Down
Expand Up @@ -676,16 +676,16 @@ FACTDEF:ABILITY|Rogue_Archetype_RogueTalent14 DATAFORMAT:BOOLEAN REQUIRED:NO S
FACTDEF:ABILITY|Rogue_Archetype_RogueTalent16 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO VISIBLE:YES DISPLAYNAME:RogueTalent16 EXPLANATION:Remove Rogue RogueTalent16
FACTDEF:ABILITY|Rogue_Archetype_RogueTalent18 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO VISIBLE:YES DISPLAYNAME:RogueTalent18 EXPLANATION:Remove Rogue RogueTalent18
FACTDEF:ABILITY|Rogue_Archetype_RogueTalent20 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO VISIBLE:YES DISPLAYNAME:RogueTalent20 EXPLANATION:Remove Rogue RogueTalent20
FACTDEF:ABILITY|Rogue_Archetype_SneakAttack1 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO
FACTDEF:ABILITY|Rogue_Archetype_SneakAttack3 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO
FACTDEF:ABILITY|Rogue_Archetype_SneakAttack5 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO
FACTDEF:ABILITY|Rogue_Archetype_SneakAttack7 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO
FACTDEF:ABILITY|Rogue_Archetype_SneakAttack9 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO
FACTDEF:ABILITY|Rogue_Archetype_SneakAttack11 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO
FACTDEF:ABILITY|Rogue_Archetype_SneakAttack13 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO
FACTDEF:ABILITY|Rogue_Archetype_SneakAttack15 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO
FACTDEF:ABILITY|Rogue_Archetype_SneakAttack17 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO
FACTDEF:ABILITY|Rogue_Archetype_SneakAttack19 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO
FACTDEF:ABILITY|Rogue_Archetype_SneakAttack1 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO VISIBLE:YES
FACTDEF:ABILITY|Rogue_Archetype_SneakAttack3 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO VISIBLE:YES
FACTDEF:ABILITY|Rogue_Archetype_SneakAttack5 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO VISIBLE:YES
FACTDEF:ABILITY|Rogue_Archetype_SneakAttack7 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO VISIBLE:YES
FACTDEF:ABILITY|Rogue_Archetype_SneakAttack9 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO VISIBLE:YES
FACTDEF:ABILITY|Rogue_Archetype_SneakAttack11 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO VISIBLE:YES
FACTDEF:ABILITY|Rogue_Archetype_SneakAttack13 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO VISIBLE:YES
FACTDEF:ABILITY|Rogue_Archetype_SneakAttack15 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO VISIBLE:YES
FACTDEF:ABILITY|Rogue_Archetype_SneakAttack17 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO VISIBLE:YES
FACTDEF:ABILITY|Rogue_Archetype_SneakAttack19 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO VISIBLE:YES

# Rogue Class Feature
FACTDEF:ABILITY|Rogue_CF_ClassSkills DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO VISIBLE:YES DISPLAYNAME:ClassSkills EXPLANATION:Remove Rogue ClassSkills
Expand Down Expand Up @@ -716,16 +716,16 @@ FACTDEF:ABILITY|Rogue_CF_RogueTalent14 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTA
FACTDEF:ABILITY|Rogue_CF_RogueTalent16 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO VISIBLE:YES DISPLAYNAME:RogueTalent16 EXPLANATION:Remove Rogue RogueTalent16
FACTDEF:ABILITY|Rogue_CF_RogueTalent18 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO VISIBLE:YES DISPLAYNAME:RogueTalent18 EXPLANATION:Remove Rogue RogueTalent18
FACTDEF:ABILITY|Rogue_CF_RogueTalent20 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO VISIBLE:YES DISPLAYNAME:RogueTalent20 EXPLANATION:Remove Rogue RogueTalent20
FACTDEF:ABILITY|Rogue_CF_SneakAttack1 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO
FACTDEF:ABILITY|Rogue_CF_SneakAttack3 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO
FACTDEF:ABILITY|Rogue_CF_SneakAttack5 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO
FACTDEF:ABILITY|Rogue_CF_SneakAttack7 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO
FACTDEF:ABILITY|Rogue_CF_SneakAttack9 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO
FACTDEF:ABILITY|Rogue_CF_SneakAttack11 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO
FACTDEF:ABILITY|Rogue_CF_SneakAttack13 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO
FACTDEF:ABILITY|Rogue_CF_SneakAttack15 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO
FACTDEF:ABILITY|Rogue_CF_SneakAttack17 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO
FACTDEF:ABILITY|Rogue_CF_SneakAttack19 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO
FACTDEF:ABILITY|Rogue_CF_SneakAttack1 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO VISIBLE:YES
FACTDEF:ABILITY|Rogue_CF_SneakAttack3 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO VISIBLE:YES
FACTDEF:ABILITY|Rogue_CF_SneakAttack5 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO VISIBLE:YES
FACTDEF:ABILITY|Rogue_CF_SneakAttack7 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO VISIBLE:YES
FACTDEF:ABILITY|Rogue_CF_SneakAttack9 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO VISIBLE:YES
FACTDEF:ABILITY|Rogue_CF_SneakAttack11 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO VISIBLE:YES
FACTDEF:ABILITY|Rogue_CF_SneakAttack13 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO VISIBLE:YES
FACTDEF:ABILITY|Rogue_CF_SneakAttack15 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO VISIBLE:YES
FACTDEF:ABILITY|Rogue_CF_SneakAttack17 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO VISIBLE:YES
FACTDEF:ABILITY|Rogue_CF_SneakAttack19 DATAFORMAT:BOOLEAN REQUIRED:NO SELECTABLE:NO VISIBLE:YES



Expand Down Expand Up @@ -868,7 +868,7 @@ FACTDEF:ABILITY|QualifiedForDragonDisciple DATAFORMAT:BOOLEAN REQUIRED:NO SELEC

###Block: Saves File
# Name Dataformat Required Selectable Visible Displayname Explanation
FACTDEF:CHECK|MainStat DATAFORMAT:STRING EXPLANATION:Output the Stat a save uses to the OS
FACTDEF:CHECK|MainStat DATAFORMAT:STRING VISIBLE:YES EXPLANATION:Output the Stat a save uses to the OS


#############################
Expand Down
2 changes: 1 addition & 1 deletion system/gameModes/Immortal/miscinfo.lst
Expand Up @@ -290,7 +290,7 @@ DIESIZES:1,2,3,MIN=4,6,8,10,MAX=12,20,100,1000
#RESIZABLEEQUIPTYPE:Shield|Weapon|Armor|Ammunition|Resizable


#DEFAULTDATASET:3.5 RSRD|SRD 3.5 for Game Masters (includes Monsters)
#DEFAULTDATASET:3.5 RSRD

#
# DONE
Expand Down
2 changes: 1 addition & 1 deletion system/gameModes/OSRIC/miscinfo.lst
Expand Up @@ -290,7 +290,7 @@ DIESIZES:1,2,3,MIN=4,6,8,10,MAX=12,20,100,1000
RESIZABLEEQUIPTYPE:Shield|Weapon|Armor|Ammunition|Resizable


#DEFAULTDATASET:3.5 RSRD|SRD 3.5 for Game Masters (includes Monsters)
#DEFAULTDATASET:3.5 RSRD

#
# DONE
Expand Down

0 comments on commit 43c20cd

Please sign in to comment.