develop #2

Open

Fateme_Azizi wants to merge 21 commits from develop into main

pull from: develop

merge into: :main

:main

:develop

Conversation 0 Commits 21 Files Changed 37

+737 -396

Fateme_Azizi commented 2026-05-16 00:28:07 +00:00

Owner

Copy Link

Copy Source

No description provided.

Fateme_Azizi added 21 commits 2026-05-16 00:28:08 +00:00

add Assassin.java and Wizard.java 95c9181cf3

add AssassinWeapon and KnightWeapon and WizardWeapon 8894866b68

add Dragon and Goblin and Vampire 494f97935e

implement Entity class e14965a649

implement Player class 8decc4d7d8

implement Knight and Wizard and Assassin classes 021a147dcf

add PlayStats c315d5f9ed

add EnemyStats adaaf565b8

delete armor and weapon 74d11ad284

edit Entity afc563822e

edit Player 858649285d

edit Knight and Wizard and Assassin 5c066131d7

implement PlayerStats 6ceff6068a

implement EnemyStats b5c3f6f338

implement Goblin and Skeleton and Vampire cc49f6bb27

implement Location e84b860502

implement Main 0ed8894365

implement Dragon 9c1ff5c518

edit README 2ccaa6a06f

edit player and Main 676db1a225

final edit 09c3847592

Fateme_Azizi requested review from mobin 2026-05-16 00:28:08 +00:00

You are not authorized to merge this pull request.

This pull request can be merged automatically.

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin develop:develop

git checkout develop

Sign in to join this conversation.

Reviewers

No Reviewers

mobin

Labels

No items

No labels

Milestone

No items

No Milestone

Assignees

Clear assignees

Fateme_Azizi

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: Fateme_Azizi/HW-04-JAVA-KNIGHT#2