Tweaks

Author: charon25

atoms.py

@@ -131,7 +131,8 @@ def generate_random(previous_atoms):
         while True:
             x, y = Atom.generate_random_position(co.H_RADIUS)
             if all(not atom.isColliding(x, y, co.H_RADIUS) for atom in previous_atoms):
-                break
+                if math.dist((x, y), (co.RESTART_BTN_POS_X, co.RESTART_BTN_POS_X)) > co.H_RADIUS + 20:
+                    break
         return Hydrogen(x, y)
 
 
@@ -144,7 +145,8 @@ def generate_random(previous_atoms):
         while True:
             x, y = Atom.generate_random_position(co.O_RADIUS)
             if all(not atom.isColliding(x, y, co.O_RADIUS) for atom in previous_atoms):
-                break
+                if math.dist((x, y), (co.RESTART_BTN_POS_X, co.RESTART_BTN_POS_X)) > co.O_RADIUS + 20:
+                    break
         return Oxygen(x, y)
 
 
@@ -157,7 +159,8 @@ def generate_random(previous_atoms):
         while True:
             x, y = Atom.generate_random_position(co.N_RADIUS)
             if all(not atom.isColliding(x, y, co.N_RADIUS) for atom in previous_atoms):
-                break
+                if math.dist((x, y), (co.RESTART_BTN_POS_X, co.RESTART_BTN_POS_X)) > co.N_RADIUS + 20:
+                    break
         return Nitrogen(x, y)
 
 
@@ -170,7 +173,8 @@ def generate_random(previous_atoms):
         while True:
             x, y = Atom.generate_random_position(co.C_RADIUS)
             if all(not atom.isColliding(x, y, co.C_RADIUS) for atom in previous_atoms):
-                break
+                if math.dist((x, y), (co.RESTART_BTN_POS_X, co.RESTART_BTN_POS_X)) > co.C_RADIUS + 20:
+                    break
         return Carbon(x, y)
 
 
@@ -183,5 +187,6 @@ def generate_random(previous_atoms):
         while True:
             x, y = Atom.generate_random_position(co.ELECTRON_RADIUS)
             if all(not atom.isColliding(x, y, co.ELECTRON_RADIUS) for atom in previous_atoms):
-                break
+                if math.dist((x, y), (co.RESTART_BTN_POS_X, co.RESTART_BTN_POS_X)) > co.ELECTRON_RADIUS + 20:
+                    break
         return Electron(x, y)

constants.py

@@ -25,7 +25,7 @@ class GameState(IntEnum):
 SPAWN_BORDER_MARGIN_LEFT = 100
 SPAWN_COLLIDES_MARGIN = 8
 T0_SPAWN = 1.5 * 60
-TINF_SPAWN = 3.5 * 60
+TINF_SPAWN = 4 * 60
 MAX_SPAWN_AT_ONCE = 3
 ONLY_HYDROGEN = 0
 ONLY_OXYGEN = ONLY_HYDROGEN + 2
@@ -180,7 +180,7 @@ def FORMULA_TEXT_COLOR(bonds_count):
         'You can get bonus points',
         'by discovering new molecules',
         '',
-        'Pick up electrons to enter a spawning frenzy!']
+        'Pick up electrons to make more atoms appear!']
 ]
 TUTO_LAST_ATOM_FRAME = 2
 ## Frame 0
@@ -244,7 +244,7 @@ def FORMULA_TEXT_COLOR(bonds_count):
 ELECTRON_TEXTURE = pyghelper.Image.create('resources/textures/electron.png')
 ELECTRON_PROBABILITY = 1 / (60 * 10)
 ELECTRON_MULTIPLIER = 0.2
-ELECTRON_DURATION = 2 * 60
+ELECTRON_DURATION = int(2.5 * 60)
 
 # Indice
 HINT_DURATION = 20

resources/molecules.txt

@@ -5,7 +5,6 @@ H2O2	Hydrogen peroxide
 H3N	Ammonia
 HNO	Nitroxyl
 N2	Dinitrogen
-NO2	Nitrogen dioxide
 O3	Ozone
 CH2O	Formaldehyde
 CH4	Methane
@@ -20,6 +19,7 @@ CH2O2	Formic acid
 CH3N	Methanimine
 CH4O	Methanol
 CHNO	Isocyanic acid
+H2O4	Tetraoxidane
 H4N2	Hydrazine
 HNO3	Nitric acid
 C2O2	Ethylene dione