HansGR
diff --git a/‎args/chests.py‎
Lines changed: 13 additions & 0 deletions b/‎args/chests.py‎
Lines changed: 13 additions & 0 deletions
diff --git a/‎args/items.py‎
Lines changed: 3 additions & 0 deletions b/‎args/items.py‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎args/shops.py‎
Lines changed: 6 additions & 0 deletions b/‎args/shops.py‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎data/coliseum.py‎
Lines changed: 16 additions & 10 deletions b/‎data/coliseum.py‎
Lines changed: 16 additions & 10 deletions
diff --git a/‎data/shops.py‎
Lines changed: 4 additions & 0 deletions b/‎data/shops.py‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎event/start.py‎
Lines changed: 24 additions & 0 deletions b/‎event/start.py‎
Lines changed: 24 additions & 0 deletions
diff --git a/‎graphics/palettes/custom/Antlion-Astaroth-FF4.pal‎
0 Bytes b/‎graphics/palettes/custom/Antlion-Astaroth-FF4.pal‎
0 Bytes
diff --git a/‎graphics/palettes/custom/Atma-Astaroth-FF6.pal‎
0 Bytes b/‎graphics/palettes/custom/Atma-Astaroth-FF6.pal‎
0 Bytes
diff --git a/‎graphics/palettes/custom/Boy-Zozma-FF6.pal‎
0 Bytes b/‎graphics/palettes/custom/Boy-Zozma-FF6.pal‎
0 Bytes
diff --git a/‎graphics/palettes/custom/Cagnazzo-Astaroth-FF4.pal‎
0 Bytes b/‎graphics/palettes/custom/Cagnazzo-Astaroth-FF4.pal‎
0 Bytes
@@ -14,6 +14,9 @@ def parse(parser):
                                  help = "Chest contents randomized by tier. Probability of higher tiers begins low and increases as more chests are opened")
     chests_contents.add_argument("-cce", "--chest-contents-empty", action = "store_true",
                                  help = "Chest contents empty")
+    chests_contents.add_argument("-cam", "--chest-all-monsters", default = None, type = int,
+                                 metavar = "PERCENT", choices = range(101),
+                                 help="Chest contents all monster-in-a-boxes and given percent bosses")
 
     chests.add_argument("-chrm", "--chest-random-monsters", default = [0, 0], type = int,
                                  nargs = 2, metavar = ("ENEMY", "BOSS"), choices = range(101),
@@ -22,6 +25,12 @@ def parse(parser):
     chests.add_argument("-cms", "--chest-monsters-shuffle", action = "store_true",
                         help = "Monsters-in-a-box shuffled but locations unchanged")
 
+    chests.add_argument("-ntc", "--no-trash-chests",  action = "store_true",
+                       help="Replace Low Tier Items with gold in chests")
+
+
+
+
 def process(args):
     if args.chest_contents_shuffle_random is not None:
         args.chest_contents_shuffle_random_percent = args.chest_contents_shuffle_random
@@ -47,6 +56,8 @@ def flags(args):
 
     if args.chest_monsters_shuffle:
         flags += " -cms"
+    if args.no_trash_chests:
+        flags += " -ntc"
 
     return flags
 
@@ -62,6 +73,8 @@ def options(args):
         contents_value = "Random Scaled"
     elif args.chest_contents_empty:
         contents_value = "Empty"
+    elif args.chest_all_monsters:
+        contents_value = "All MiaB"
 
     result.append(("Contents", contents_value, "contents_value"))
     if args.chest_contents_shuffle_random:
 
@@ -57,6 +57,8 @@ def parse(parser):
                        help="Atma Weapon moved to higher tier and divisor reduced from 64 to 32")
 
 
+
+
 def process(args):
     from constants.items import good_items, stronger_items, premium_items
     from constants.items import id_name, name_id
@@ -178,6 +180,7 @@ def flags(args):
     if args.stronger_atma_weapon:
         flags += " -saw"
 
+
     return flags
 
 
 
@@ -53,6 +53,9 @@ def parse(parser):
     shops.add_argument("-snil", "--shops-no-illuminas", action = "store_true",
                        help = "Illuminas not sold in shops")
 
+    shops.add_argument("-nts", "--no-trash-shops",  action = "store_true",
+                       help="Omit Low tier items in shops")
+
 def process(args):
     if args.shop_inventory_shuffle_random is not None:
         args.shop_inventory_shuffle_random_percent = args.shop_inventory_shuffle_random
@@ -106,6 +109,9 @@ def flags(args):
     if args.shops_no_illuminas:
         flags += " -snil"
 
+    if args.no_trash_shops:
+        flags += " -nts"
+
     return flags
 
 def options(args):
 
@@ -30,9 +30,11 @@ def shuffle_opponents(self):
         for match_index, match in enumerate(self.matches):
             match.opponent = opponents[match_index]
 
-    def randomize_opponents(self):
+    def randomize_opponents(self, random_opponent_percent = None):
+        import random
+
         for match in self.matches:
-            match.opponent = self.enemies.get_random()
+            match.opponent = self.enemies.get_random() if random_opponent_percent is not None and (random.random() < random_opponent_percent) else match.opponent
 
     def shuffle_rewards(self):
         rewards = []
@@ -44,9 +46,11 @@ def shuffle_rewards(self):
         for match_index, match in enumerate(self.matches):
             match.reward = rewards[match_index]
 
-    def randomize_rewards(self):
+    def randomize_rewards(self, random_reward_percent = None):
+        import random
+
         for match in self.matches:
-            match.reward = self.items.get_random()
+            match.reward = self.items.get_random() if random_reward_percent is not None and (random.random() < random_reward_percent) else match.reward
 
     def remove_excluded_items(self):
         import random
@@ -76,15 +80,17 @@ def randomize_rewards_hidden(self):
             self.matches[match_index].reward_hidden = 1
 
     def mod(self):
-        if self.args.coliseum_opponents_shuffle:
+        if self.args.coliseum_opponents_random:
+            self.randomize_opponents(self.args.coliseum_opponents_random / 100.0)
+        elif self.args.coliseum_opponents_shuffle_random:
             self.shuffle_opponents()
-        elif self.args.coliseum_opponents_random:
-            self.randomize_opponents()
+            self.randomize_opponents(self.args.coliseum_opponents_shuffle_random / 100.0)
 
-        if self.args.coliseum_rewards_shuffle:
+        if self.args.coliseum_rewards_random:
+            self.randomize_rewards(self.args.coliseum_rewards_random / 100.0)
+        elif self.args.coliseum_rewards_shuffle_random:
             self.shuffle_rewards()
-        elif self.args.coliseum_rewards_random:
-            self.randomize_rewards()
+            self.randomize_rewards(self.args.coliseum_rewards_shuffle_random / 100.0)
 
         self.remove_excluded_items()
 
 
@@ -1,3 +1,5 @@
+from constants.items import TRASH_IDS
+from data.item import Item
 from data.shop import Shop
 from data.structures import DataArray
 
@@ -226,6 +228,8 @@ def remove_excluded_items(self):
             exclude.append(self.items.get_id("Exp. Egg"))
         if self.args.shops_no_illuminas:
             exclude.append(self.items.get_id("Illumina"))
+        if self.args.no_trash_shops:
+            exclude.extend(TRASH_IDS)
 
         for shop in self.shops:
             for item in exclude:
 
@@ -59,6 +59,27 @@ def init_event_bits(self, space):
             field.SetBattleEventBit(battle_bit.MAGIC_POINTS_AFTER_BATTLE),
         )
 
+    def no_random_encounters_mod(self):
+        # Set all encounter rates to zero
+        # (normal.  no Charm Bangle or Moogle Charm)
+        # C0/C29F:	C000   ("less encounter" frequency ==> looks like "normal encounter")
+        # C0/C2A1:	6000   ("norm encounter" frequency ==> looks like "less encounter")
+        # C0/C2A3:	8001   ("more encounter" frequency ==> looks right)
+        # C0/C2A5:	0000   ("no encounter" frequency ==> looks right)
+        #
+        # (Charm Bangle, halves of above numbers)
+        # C0/C2A7:	6000   ("less encounter" frequency ==> looks like "normal encounter")
+        # C0/C2A9:	3000   ("norm encounter" frequency ==> looks like "less encounter")
+        # C0/C2AB:	C000   ("more encounter" frequency ==> looks right)
+        # C0/C2AD:	0000   ("no encounter" frequency ==> looks right)
+        self.rom.set_bytes(0x0c29f, [0x00 for i in range(64)])  # Set all encounter rates to zero
+        rate = 0x10  # 1/3 charm bangle
+        self.rom.set_bytes(0x0c2af, [rate, 0x00, rate, 0x00, rate, 0x00])  # Set World Map -  Moogle Charm encounter rates to non-zero
+
+        # Rename moogle charm to moogle curse: in data.items
+
+
+
     def mod(self):
         self.intro_loop_mod()
         self.init_characters_mod()
@@ -68,6 +89,9 @@ def mod(self):
         self.start_items_mod()
         self.start_game_mod()
 
+        if self.args.no_random_encounters:
+            self.no_random_encounters_mod()
+
         # where the game begins after intro/pregame
         space = Reserve(0xc9a4f, 0xc9ad4, "setup and start game", field.NOP())
         space.write(