Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
GalaxyTrucker
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
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
Leonard Haddad
GalaxyTrucker
Commits
4ea7176c
Commit
4ea7176c
authored
4 years ago
by
Samuel Nejati Masouleh
Browse files
Options
Downloads
Patches
Plain Diff
Waffen Dublizieren Bug vorerst gelöst.
parent
4d75d843
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
core/src/com/galaxytrucker/galaxytruckerreloaded/View/Screen/GamePlay.java
+9
-4
9 additions, 4 deletions
...xytrucker/galaxytruckerreloaded/View/Screen/GamePlay.java
database.mv.db
+0
-0
0 additions, 0 deletions
database.mv.db
with
9 additions
and
4 deletions
core/src/com/galaxytrucker/galaxytruckerreloaded/View/Screen/GamePlay.java
+
9
−
4
View file @
4ea7176c
...
...
@@ -583,13 +583,18 @@ public class GamePlay implements Screen {
*/
public
List
<
Weapon
>
loadWeapons
()
{
List
<
Weapon
>
weapons
=
main
.
getClient
().
getMyShip
().
getInventory
();
for
(
Room
r
:
main
.
getClient
().
getMyShip
().
getSystems
())
{
if
(
r
instanceof
System
)
{
if
(((
System
)
r
).
getSystemType
()
==
SystemType
.
WEAPON_SYSTEM
)
{
weapons
.
addAll
(((
System
)
r
).
getShipWeapons
());
//todo: Die Startwaffen sollten beim Spielstart ins Inventory hinzugefügt werden.
if
(
weapons
.
size
()
==
0
)
{
for
(
Room
r
:
main
.
getClient
().
getMyShip
().
getSystems
())
{
if
(
r
instanceof
System
)
{
if
(((
System
)
r
).
getSystemType
()
==
SystemType
.
WEAPON_SYSTEM
)
{
weapons
.
addAll
(((
System
)
r
).
getShipWeapons
());
}
}
}
}
//BIS HIER LÖSCHEN
return
weapons
;
}
...
...
This diff is collapsed.
Click to expand it.
database.mv.db
+
0
−
0
View file @
4ea7176c
No preview for this file type
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment