Skip to content

Commit 80b46f9

Browse files
EntroperEntroper
authored
Merge pull request #183 from FiendsOfTheElements/dev
Merge dev to master (2.3.1)
2 parents 3734a48 + eeb23ee commit 80b46f9

13 files changed

Lines changed: 1210 additions & 1206 deletions

‎.circleci/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
docker build -t entroper/finalfantasyrandomizer:alpha -f Dockerfile.debug . && \
6969
docker push entroper/finalfantasyrandomizer:alpha
7070
71-
deploy:
71+
deploy_production:
7272
<<: *defaults
7373
steps:
7474
- checkout

‎FF1Lib/FF1Rom.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace FF1Lib
1313
// ReSharper disable once InconsistentNaming
1414
public partial class FF1Rom : NesRom
1515
{
16-
public const string Version = "2.3.0";
16+
public const string Version = "2.3.1";
1717

1818
public const int RngOffset = 0x7F100;
1919
public const int RngSize = 256;

‎FF1Lib/presets/alpha-debug.json‎

Lines changed: 109 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -1,112 +1,112 @@
11
{
2-
"Name": "ALPHA DEBUG",
3-
4-
"Flags": {
5-
6-
"Shops": true,
7-
"Treasures": true,
8-
"NPCItems": true,
9-
"NPCFetchItems": true,
10-
"RandomWares": true,
11-
"RandomLoot": false,
12-
13-
"ShardHunt": false,
14-
"ExtraShards": false,
15-
"TransformFinalFormation": false,
16-
17-
"MagicShops": true,
18-
"MagicLevels": true,
19-
"MagicPermissions": false,
20-
"ItemMagic": true,
21-
22-
"Rng": true,
23-
"EnemyFormationsFrequency": true,
24-
"EnemyFormationsUnrunnable": true,
25-
"EnemyFormationsSurprise": true,
26-
27-
"EnemyScripts": true,
28-
"EnemySkillsSpells": true,
29-
"EnemyStatusAttacks": true,
30-
"AllowUnsafePirates": true,
31-
32-
"OrdealsPillars": true,
33-
"SkyCastle4FTeleporters": true,
34-
"TitansTrove": true,
35-
"CrownlessOrdeals": true,
36-
"ChaosRush": false,
37-
"Floors": true,
38-
39-
"MapOpenProgression": true,
40-
"Entrances": true,
41-
"Towns": true,
42-
43-
"IncentivizeFreeNPCs": true,
44-
"IncentivizeFetchNPCs": false,
45-
"IncentivizeTail": false,
46-
"IncentivizeFetchItems": false,
47-
48-
"IncentivizeMarsh": false,
49-
"IncentivizeEarth": false,
50-
"IncentivizeVolcano": false,
51-
"IncentivizeIceCave": false,
52-
"IncentivizeOrdeals": false,
53-
"IncentivizeSeaShrine": false,
54-
55-
"IncentivizeConeria": false,
56-
"IncentivizeMarshKeyLocked": false,
57-
"IncentivizeSkyPalace": false,
58-
59-
"IncentivizeMasamune": true,
60-
"IncentivizeOpal": false,
61-
"IncentivizeRibbon": false,
62-
"IncentivizeRibbon2": false,
63-
"Incentivize65K": false,
64-
"IncentivizeBad": false,
65-
66-
"IncentivizeDefCastArmor": false,
67-
"IncentivizeOffCastArmor": false,
68-
"IncentivizeOtherCastArmor": false,
69-
"IncentivizeDefCastWeapon": false,
70-
"IncentivizeOffCastWeapon": false,
71-
"IncentivizeOtherCastWeapon": false,
72-
73-
"EarlySarda": true,
74-
"EarlySage": true,
75-
"OnlyRequireGameIsBeatable": false,
76-
77-
"FreeBridge": false,
78-
"FreeAirship": false,
79-
"FreeOrbs": false,
80-
"VanillaStartingGold": false,
81-
"EasyMode": false,
82-
83-
"SpeedHacks": true,
84-
"NoPartyShuffle": true,
85-
"Dash": true,
86-
"BuyTen": true,
87-
88-
"IdentifyTreasures": true,
89-
"WaitWhenUnrunnable": true,
90-
91-
"HouseMPRestoration": true,
92-
"WeaponStats": true,
93-
"ChanceToRun": true,
94-
"SpellBugs": true,
95-
"BlackBeltAbsorb": true,
96-
97-
"EnemyStatusAttackBug": true,
98-
"EnemySpellsTargetingAllies": true,
99-
"EnemyElementalResistancesBug": true,
100-
"ImproveTurnOrderRandomization": true,
101-
102-
"EnemyScaleFactor": 1.5,
103-
"PriceScaleFactor": 4.0,
104-
"ExpMultiplier": 4.0,
105-
"ExpBonus": 400,
106-
"ProgressiveScaleMode": 1,
107-
"EncounterRate": 8.0,
108-
"ForcedPartyMembers": 2
109-
110-
}
2+
"Name": "ALPHA DEBUG",
3+
4+
"Flags": {
5+
6+
"Shops": true,
7+
"Treasures": true,
8+
"NPCItems": true,
9+
"NPCFetchItems": true,
10+
"RandomWares": true,
11+
"RandomLoot": false,
12+
13+
"ShardHunt": false,
14+
"ExtraShards": false,
15+
"TransformFinalFormation": false,
16+
17+
"MagicShops": true,
18+
"MagicLevels": true,
19+
"MagicPermissions": false,
20+
"ItemMagic": true,
21+
22+
"Rng": true,
23+
"EnemyFormationsFrequency": true,
24+
"EnemyFormationsUnrunnable": true,
25+
"EnemyFormationsSurprise": true,
26+
27+
"EnemyScripts": true,
28+
"EnemySkillsSpells": true,
29+
"EnemyStatusAttacks": true,
30+
"AllowUnsafePirates": true,
31+
32+
"OrdealsPillars": true,
33+
"SkyCastle4FTeleporters": true,
34+
"TitansTrove": true,
35+
"CrownlessOrdeals": true,
36+
"ChaosRush": false,
37+
"Floors": true,
38+
39+
"MapOpenProgression": true,
40+
"Entrances": true,
41+
"Towns": true,
42+
43+
"IncentivizeFreeNPCs": true,
44+
"IncentivizeFetchNPCs": false,
45+
"IncentivizeTail": false,
46+
"IncentivizeFetchItems": false,
47+
48+
"IncentivizeMarsh": false,
49+
"IncentivizeEarth": false,
50+
"IncentivizeVolcano": false,
51+
"IncentivizeIceCave": false,
52+
"IncentivizeOrdeals": false,
53+
"IncentivizeSeaShrine": false,
54+
55+
"IncentivizeConeria": false,
56+
"IncentivizeMarshKeyLocked": false,
57+
"IncentivizeSkyPalace": false,
58+
59+
"IncentivizeMasamune": true,
60+
"IncentivizeOpal": false,
61+
"IncentivizeRibbon": false,
62+
"IncentivizeRibbon2": false,
63+
"Incentivize65K": false,
64+
"IncentivizeBad": false,
65+
66+
"IncentivizeDefCastArmor": false,
67+
"IncentivizeOffCastArmor": false,
68+
"IncentivizeOtherCastArmor": false,
69+
"IncentivizeDefCastWeapon": false,
70+
"IncentivizeOffCastWeapon": false,
71+
"IncentivizeOtherCastWeapon": false,
72+
73+
"EarlySarda": true,
74+
"EarlySage": true,
75+
"OnlyRequireGameIsBeatable": false,
76+
77+
"FreeBridge": false,
78+
"FreeAirship": false,
79+
"FreeOrbs": false,
80+
"VanillaStartingGold": false,
81+
"EasyMode": false,
82+
83+
"SpeedHacks": true,
84+
"NoPartyShuffle": true,
85+
"Dash": true,
86+
"BuyTen": true,
87+
88+
"IdentifyTreasures": true,
89+
"WaitWhenUnrunnable": true,
90+
91+
"HouseMPRestoration": true,
92+
"WeaponStats": true,
93+
"ChanceToRun": true,
94+
"SpellBugs": true,
95+
"BlackBeltAbsorb": true,
96+
97+
"EnemyStatusAttackBug": true,
98+
"EnemySpellsTargetingAllies": true,
99+
"EnemyElementalResistancesBug": true,
100+
"ImproveTurnOrderRandomization": true,
101+
102+
"EnemyScaleFactor": 1.5,
103+
"PriceScaleFactor": 4.0,
104+
"ExpMultiplier": 4.0,
105+
"ExpBonus": 400,
106+
"ProgressiveScaleMode": 1,
107+
"EncounterRate": 8.0,
108+
"ForcedPartyMembers": 2
109+
110+
}
111111

112112
}

0 commit comments

Comments
 (0)