Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
Firefighter_LuisPARRA_YanisLOUNADI
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package 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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
PARRA Luis
Firefighter_LuisPARRA_YanisLOUNADI
Commits
6f5f8f59
Commit
6f5f8f59
authored
1 year ago
by
plojolo
Browse files
Options
Downloads
Patches
Plain Diff
Le ne se lance plus automatiquement
parent
7853e20a
Branches
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#25925
passed
1 year ago
Stage: build
Stage: test
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/controller/Controller.java
+4
-5
4 additions, 5 deletions
src/main/java/controller/Controller.java
src/main/resources/view/view.fxml
+4
-2
4 additions, 2 deletions
src/main/resources/view/view.fxml
with
8 additions
and
7 deletions
src/main/java/controller/Controller.java
+
4
−
5
View file @
6f5f8f59
...
...
@@ -3,7 +3,6 @@ package controller;
import
javafx.animation.Animation
;
import
javafx.animation.KeyFrame
;
import
javafx.animation.Timeline
;
import
javafx.beans.property.StringProperty
;
import
javafx.event.ActionEvent
;
import
javafx.event.EventHandler
;
import
javafx.fxml.FXML
;
...
...
@@ -12,7 +11,6 @@ import javafx.scene.control.Label;
import
javafx.scene.control.TextField
;
import
javafx.scene.control.ToggleButton
;
import
javafx.scene.control.ToggleGroup
;
import
javafx.scene.layout.StackPane
;
import
javafx.scene.layout.VBox
;
import
javafx.scene.paint.Color
;
import
javafx.util.Duration
;
...
...
@@ -50,7 +48,7 @@ public class Controller {
private
Timeline
timeline
;
private
Board
<
List
<
ModelElements
>>
board
;
public
static
final
HashMap
<
String
,
Integer
>
elementsCountFireFighter
=
new
HashMap
<
String
,
Integer
>()
{
public
static
final
HashMap
<
String
,
Integer
>
elementsCountFireFighter
=
new
HashMap
<>()
{
{
put
(
"fire_count"
,
5
);
put
(
"firefighter_count"
,
6
);
...
...
@@ -61,7 +59,7 @@ public class Controller {
put
(
"rockery_count"
,
4
);
}
};
public
static
final
HashMap
<
String
,
Integer
>
elementsCountRockScissorPaper
=
new
HashMap
<
String
,
Integer
>()
{
public
static
final
HashMap
<
String
,
Integer
>
elementsCountRockScissorPaper
=
new
HashMap
<>()
{
{
put
(
"rock_count"
,
3
);
put
(
"scissor_count"
,
3
);
...
...
@@ -162,7 +160,8 @@ public class Controller {
elementsCount
=
elementsCountFireFighter
;
gamemode
=
0
;
}
repaintGrid
();
restartButtonAction
();
pause
();
}
public
void
play
()
{
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/view/view.fxml
+
4
−
2
View file @
6f5f8f59
...
...
@@ -42,8 +42,10 @@
prefHeight=
"24.0"
prefWidth=
"200.0"
/>
<VBox
fx:id=
"parameters"
>
</VBox>
<Separator
maxHeight=
"-Infinity"
maxWidth=
"-Infinity"
prefHeight=
"24.0"
prefWidth=
"200.0"
/>
<Button
fx:id=
"changeGamemode"
maxHeight=
"-Infinity"
maxWidth=
"-Infinity"
mnemonicParsing=
"false"
onAction=
"#changeGamemode"
prefHeight=
"
24
.0"
mnemonicParsing=
"false"
onAction=
"#changeGamemode"
prefHeight=
"
50
.0"
prefWidth=
"200.0"
text=
"Change Gamemode"
/>
<Separator
maxHeight=
"-Infinity"
maxWidth=
"-Infinity"
...
...
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