neelthee-mansion 2.2.3__tar.gz → 2.2.5__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (19) hide show
  1. {neelthee_mansion-2.2.3 → neelthee_mansion-2.2.5}/PKG-INFO +1 -1
  2. {neelthee_mansion-2.2.3 → neelthee_mansion-2.2.5}/neelthee_mansion/Mansion_of_Amnesia.py +0 -9
  3. {neelthee_mansion-2.2.3 → neelthee_mansion-2.2.5}/neelthee_mansion/Rooms.py +0 -7
  4. {neelthee_mansion-2.2.3 → neelthee_mansion-2.2.5}/neelthee_mansion/creatures.py +2 -0
  5. {neelthee_mansion-2.2.3 → neelthee_mansion-2.2.5}/neelthee_mansion/utils.py +1 -1
  6. {neelthee_mansion-2.2.3 → neelthee_mansion-2.2.5}/neelthee_mansion.egg-info/PKG-INFO +1 -1
  7. {neelthee_mansion-2.2.3 → neelthee_mansion-2.2.5}/setup.py +1 -1
  8. {neelthee_mansion-2.2.3 → neelthee_mansion-2.2.5}/README.md +0 -0
  9. {neelthee_mansion-2.2.3 → neelthee_mansion-2.2.5}/neelthee_mansion/Quests.py +0 -0
  10. {neelthee_mansion-2.2.3 → neelthee_mansion-2.2.5}/neelthee_mansion/__init__.py +0 -0
  11. {neelthee_mansion-2.2.3 → neelthee_mansion-2.2.5}/neelthee_mansion/__main__.py +0 -0
  12. {neelthee_mansion-2.2.3 → neelthee_mansion-2.2.5}/neelthee_mansion/all_game_utils.py +0 -0
  13. {neelthee_mansion-2.2.3 → neelthee_mansion-2.2.5}/neelthee_mansion/items.py +0 -0
  14. {neelthee_mansion-2.2.3 → neelthee_mansion-2.2.5}/neelthee_mansion.egg-info/SOURCES.txt +0 -0
  15. {neelthee_mansion-2.2.3 → neelthee_mansion-2.2.5}/neelthee_mansion.egg-info/dependency_links.txt +0 -0
  16. {neelthee_mansion-2.2.3 → neelthee_mansion-2.2.5}/neelthee_mansion.egg-info/entry_points.txt +0 -0
  17. {neelthee_mansion-2.2.3 → neelthee_mansion-2.2.5}/neelthee_mansion.egg-info/requires.txt +0 -0
  18. {neelthee_mansion-2.2.3 → neelthee_mansion-2.2.5}/neelthee_mansion.egg-info/top_level.txt +0 -0
  19. {neelthee_mansion-2.2.3 → neelthee_mansion-2.2.5}/setup.cfg +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: neelthee_mansion
3
- Version: 2.2.3
3
+ Version: 2.2.5
4
4
  Summary: A text-based adventure game set in Neel-thee’s mansion.
5
5
  Home-page: https://github.com/Flameblade375/neelthee_mansion
6
6
  Author: Alexander.E.F
@@ -750,14 +750,6 @@ commands = {
750
750
  def quit():
751
751
  exit()
752
752
 
753
- def do_random_event():
754
- if 'Random events' in ROOMS[CURRENTROOM] and 'Event chance' in ROOMS[CURRENTROOM]:
755
- if random() <= ROOMS[CURRENTROOM]['Event chance']:
756
- if is_executable(Event['Event code']):
757
- Event = choice(ROOMS[CURRENTROOM]['Random events'])
758
- type_text(Event['Output text'])
759
- exec(Event['Event code'])
760
-
761
753
  guards = [
762
754
  Guard(
763
755
  name="Guard",
@@ -911,7 +903,6 @@ def main():
911
903
  for ___ in GameState['collected items']:
912
904
  if isinstance(___, item):
913
905
  quest_manager.update_objective(f"Colect {___.name}")
914
- do_random_event()
915
906
 
916
907
 
917
908
 
@@ -176,13 +176,6 @@ ROOMS = {
176
176
  'I wonder if there is anything salvageable in the %*RED*%cupboards%*RESET*%',
177
177
  'I should probably look around',
178
178
  ],
179
- 'Event chance': 0.1,
180
- 'Random events': [
181
- {
182
- 'Output text': "You hear a bang and the cupboard door swings open slowly and the cord is gone",
183
- 'Event code': "ROOMS['Kitchen']['containers']['cupboards'].take_contents()"
184
- },
185
- ],
186
179
  },
187
180
 
188
181
  'Dining Room': {
@@ -214,10 +214,12 @@ class base_ability:
214
214
 
215
215
  def activate(self, target: creature, damage: int = 5):
216
216
  self.ready = False
217
+ self.current_cooldown = 0
217
218
  print(f"Ability {self.name} will be ready after {self.cooldown_time} commands.")
218
219
 
219
220
  def Tick(self):
220
221
  self.current_cooldown += 1
222
+ self.check_cooldown
221
223
 
222
224
  def check_cooldown(self):
223
225
  if self.current_cooldown >= self.cooldown_time:
@@ -235,7 +235,7 @@ def clamp(value, min = 0, max = 0):
235
235
 
236
236
  def is_executable(code_str):
237
237
  try:
238
- compile(code_str, '<string>', 'exec')
238
+ compile(code_str, '<string>')
239
239
  return True
240
240
  except SyntaxError:
241
241
  return False
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: neelthee-mansion
3
- Version: 2.2.3
3
+ Version: 2.2.5
4
4
  Summary: A text-based adventure game set in Neel-thee’s mansion.
5
5
  Home-page: https://github.com/Flameblade375/neelthee_mansion
6
6
  Author: Alexander.E.F
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
2
2
 
3
3
  setup(
4
4
  name='neelthee_mansion',
5
- version='2.2.3',
5
+ version='2.2.5',
6
6
  packages=find_packages(), # Automatically finds all packages and modules
7
7
  install_requires=[
8
8
  'psutil', 'playsound', 'requests', 'keyboard', 'pandas', 'validators', 'dicttoxml', 'pytz',