Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
CM1101 Team Project
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Harry Wyatt
CM1101 Team Project
Merge requests
!2
Merge new item id system
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Merge new item id system
item_id_test
into
main
Overview
0
Commits
2
Pipelines
0
Changes
3
Merged
Thomas Glasper
requested to merge
item_id_test
into
main
2 years ago
Overview
0
Commits
2
Pipelines
0
Changes
4
Expand
0
0
Merge request reports
Viewing commit
603cd7e6
Prev
Next
Show latest version
4 files
+
111
−
10
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
4
Search (e.g. *.vue) (Ctrl+P)
603cd7e6
Merge branch 'main' into 'item_id_test'
· 603cd7e6
Thomas Glasper
authored
2 years ago
# Conflicts: # item_dist.py
game.py
+
4
−
4
Options
@@ -7,6 +7,8 @@ from gameparser import *
from
enemies
import
*
from
item_dist
import
*
from
enemies_dist
import
populate_enemies
from
minigame
import
MiniGame
from
minigame_map
import
game_map
,
game_info
import
random
def
display_inventory
():
@@ -332,11 +334,9 @@ def combat(enemy):
def
puzzle
():
pass
def
chest
():
pass
def
boss_battle
():
pass
game
=
MiniGame
(
game_map
,
game_info
,
random
.
randint
(
1
,
3
))
game
.
game_loop
()
def
list_of_items
(
items
):
if
len
(
items
)
>
0
:
Loading