Merge pull request #183 from FiendsOfTheElements/dev

Merge dev to master (2.3.1)
FiendsOfTheElements · Jul 7, 2018 · 80b46f9 · 80b46f9
2 parents 3734a48 + eeb23ee
commit 80b46f9
Show file tree

Hide file tree

Showing 13 changed files with 1,210 additions and 1,206 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -68,7 +68,7 @@ jobs:
             docker build -t entroper/finalfantasyrandomizer:alpha -f Dockerfile.debug . && \
             docker push entroper/finalfantasyrandomizer:alpha
 
-  deploy:
+  deploy_production:
     <<: *defaults
     steps:
       - checkout

diff --git a/FF1Lib/FF1Rom.cs b/FF1Lib/FF1Rom.cs
@@ -13,7 +13,7 @@ namespace FF1Lib
 	// ReSharper disable once InconsistentNaming
 	public partial class FF1Rom : NesRom
 	{
-		public const string Version = "2.3.0";
+		public const string Version = "2.3.1";
 
 		public const int RngOffset = 0x7F100;
 		public const int RngSize = 256;

diff --git a/FF1Lib/presets/alpha-debug.json b/FF1Lib/presets/alpha-debug.json
@@ -1,112 +1,112 @@
 {
-  "Name": "ALPHA DEBUG",
-
-  "Flags": {
-
-    "Shops": true,
-    "Treasures": true,
-    "NPCItems": true,
-    "NPCFetchItems": true,
-    "RandomWares": true,
-    "RandomLoot": false,
-
-    "ShardHunt": false,
-    "ExtraShards": false,
-    "TransformFinalFormation": false,
-
-    "MagicShops": true,
-    "MagicLevels": true,
-    "MagicPermissions": false,
-    "ItemMagic": true,
-
-    "Rng": true,
-    "EnemyFormationsFrequency": true,
-    "EnemyFormationsUnrunnable": true,
-    "EnemyFormationsSurprise": true,
-
-    "EnemyScripts": true,
-    "EnemySkillsSpells": true,
-    "EnemyStatusAttacks": true,
-    "AllowUnsafePirates": true,
-
-    "OrdealsPillars": true,
-    "SkyCastle4FTeleporters": true,
-    "TitansTrove": true,
-    "CrownlessOrdeals": true,
-    "ChaosRush": false,
-    "Floors": true,
-
-    "MapOpenProgression": true,
-    "Entrances": true,
-    "Towns": true,
-
-    "IncentivizeFreeNPCs": true,
-    "IncentivizeFetchNPCs": false,
-    "IncentivizeTail": false,
-    "IncentivizeFetchItems": false,
-
-    "IncentivizeMarsh": false,
-    "IncentivizeEarth": false,
-    "IncentivizeVolcano": false,
-    "IncentivizeIceCave": false,
-    "IncentivizeOrdeals": false,
-    "IncentivizeSeaShrine": false,
-
-    "IncentivizeConeria": false,
-    "IncentivizeMarshKeyLocked": false,
-    "IncentivizeSkyPalace": false,
-
-    "IncentivizeMasamune": true,
-    "IncentivizeOpal": false,
-    "IncentivizeRibbon": false,
-    "IncentivizeRibbon2": false,
-    "Incentivize65K": false,
-    "IncentivizeBad": false,
-
-    "IncentivizeDefCastArmor": false,
-    "IncentivizeOffCastArmor": false,
-    "IncentivizeOtherCastArmor": false,
-    "IncentivizeDefCastWeapon": false,
-    "IncentivizeOffCastWeapon": false,
-    "IncentivizeOtherCastWeapon": false,
-
-    "EarlySarda": true,
-    "EarlySage": true,
-    "OnlyRequireGameIsBeatable": false,
-
-    "FreeBridge": false,
-    "FreeAirship": false,
-    "FreeOrbs": false,
-    "VanillaStartingGold": false,
-    "EasyMode": false,
-
-    "SpeedHacks": true,
-    "NoPartyShuffle": true,
-    "Dash": true,
-    "BuyTen": true,
-
-    "IdentifyTreasures": true,
-    "WaitWhenUnrunnable": true,
-
-    "HouseMPRestoration": true,
-    "WeaponStats": true,
-    "ChanceToRun": true,
-    "SpellBugs": true,
-    "BlackBeltAbsorb": true,
-
-    "EnemyStatusAttackBug": true,
-    "EnemySpellsTargetingAllies": true,
-    "EnemyElementalResistancesBug": true,
-    "ImproveTurnOrderRandomization": true,
-
-    "EnemyScaleFactor": 1.5,
-    "PriceScaleFactor": 4.0,
-    "ExpMultiplier": 4.0,
-    "ExpBonus": 400,
-    "ProgressiveScaleMode": 1,
-    "EncounterRate": 8.0,
-    "ForcedPartyMembers": 2
-
-  }
+	"Name": "ALPHA DEBUG",
+
+	"Flags": {
+
+		"Shops": true,
+		"Treasures": true,
+		"NPCItems": true,
+		"NPCFetchItems": true,
+		"RandomWares": true,
+		"RandomLoot": false,
+
+		"ShardHunt": false,
+		"ExtraShards": false,
+		"TransformFinalFormation": false,
+
+		"MagicShops": true,
+		"MagicLevels": true,
+		"MagicPermissions": false,
+		"ItemMagic": true,
+
+		"Rng": true,
+		"EnemyFormationsFrequency": true,
+		"EnemyFormationsUnrunnable": true,
+		"EnemyFormationsSurprise": true,
+
+		"EnemyScripts": true,
+		"EnemySkillsSpells": true,
+		"EnemyStatusAttacks": true,
+		"AllowUnsafePirates": true,
+
+		"OrdealsPillars": true,
+		"SkyCastle4FTeleporters": true,
+		"TitansTrove": true,
+		"CrownlessOrdeals": true,
+		"ChaosRush": false,
+		"Floors": true,
+
+		"MapOpenProgression": true,
+		"Entrances": true,
+		"Towns": true,
+
+		"IncentivizeFreeNPCs": true,
+		"IncentivizeFetchNPCs": false,
+		"IncentivizeTail": false,
+		"IncentivizeFetchItems": false,
+
+		"IncentivizeMarsh": false,
+		"IncentivizeEarth": false,
+		"IncentivizeVolcano": false,
+		"IncentivizeIceCave": false,
+		"IncentivizeOrdeals": false,
+		"IncentivizeSeaShrine": false,
+
+		"IncentivizeConeria": false,
+		"IncentivizeMarshKeyLocked": false,
+		"IncentivizeSkyPalace": false,
+
+		"IncentivizeMasamune": true,
+		"IncentivizeOpal": false,
+		"IncentivizeRibbon": false,
+		"IncentivizeRibbon2": false,
+		"Incentivize65K": false,
+		"IncentivizeBad": false,
+
+		"IncentivizeDefCastArmor": false,
+		"IncentivizeOffCastArmor": false,
+		"IncentivizeOtherCastArmor": false,
+		"IncentivizeDefCastWeapon": false,
+		"IncentivizeOffCastWeapon": false,
+		"IncentivizeOtherCastWeapon": false,
+
+		"EarlySarda": true,
+		"EarlySage": true,
+		"OnlyRequireGameIsBeatable": false,
+
+		"FreeBridge": false,
+		"FreeAirship": false,
+		"FreeOrbs": false,
+		"VanillaStartingGold": false,
+		"EasyMode": false,
+
+		"SpeedHacks": true,
+		"NoPartyShuffle": true,
+		"Dash": true,
+		"BuyTen": true,
+
+		"IdentifyTreasures": true,
+		"WaitWhenUnrunnable": true,
+
+		"HouseMPRestoration": true,
+		"WeaponStats": true,
+		"ChanceToRun": true,
+		"SpellBugs": true,
+		"BlackBeltAbsorb": true,
+
+		"EnemyStatusAttackBug": true,
+		"EnemySpellsTargetingAllies": true,
+		"EnemyElementalResistancesBug": true,
+		"ImproveTurnOrderRandomization": true,
+
+		"EnemyScaleFactor": 1.5,
+		"PriceScaleFactor": 4.0,
+		"ExpMultiplier": 4.0,
+		"ExpBonus": 400,
+		"ProgressiveScaleMode": 1,
+		"EncounterRate": 8.0,
+		"ForcedPartyMembers": 2
+
+	}
 
 }