Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
ProgArkProject
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
Sixten Müller
ProgArkProject
Commits
a79e5e0e
Commit
a79e5e0e
authored
1 year ago
by
Kristoffer Krogh Wetterhus
Browse files
Options
Downloads
Patches
Plain Diff
Small changes
parent
e4730d87
No related branches found
No related tags found
2 merge requests
!22
Resolve "Create game model"
,
!18
Draft: Resolve "Create game model"
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
core/src/com/wordbattle/game/model/WordTest.java
+1
-1
1 addition, 1 deletion
core/src/com/wordbattle/game/model/WordTest.java
core/src/com/wordbattle/game/model/words.txt
+9
-10
9 additions, 10 deletions
core/src/com/wordbattle/game/model/words.txt
with
10 additions
and
11 deletions
core/src/com/wordbattle/game/model/WordTest.java
+
1
−
1
View file @
a79e5e0e
...
...
@@ -11,7 +11,7 @@ public class WordTest {
System
.
out
.
println
(
"Word: "
+
word
.
getWord
());
// Test the getLetters method
int
numberOfRandomLetters
=
7
;
int
numberOfRandomLetters
=
3
;
System
.
out
.
println
(
"Letters:"
);
word
.
getLetters
(
numberOfRandomLetters
);
System
.
out
.
println
(
word
.
checkWord
(
"lemon"
));
...
...
This diff is collapsed.
Click to expand it.
core/src/com/wordbattle/game/model/words.txt
+
9
−
10
View file @
a79e5e0e
Dyr:Hund,Katt,Løve,Elefant,Tiger,Sjiraff,Bjørn,Hval,Kanin,Hai,Ape,Rev,Slange,Pingvin,Kamel,Ørn,Flamingo,Hjort,Frosk,Puma,Gepard,Skilpadde,Krokodille,Bison,Sebra
Mat:Pizza,Pasta,Salat,Suppe,Sushi,Burger,Taco,Kebab,Ris,Kjøtt,Kylling,Biff,Pølse,Kotelett,Iskrem,Omelett,Yoghurt,Bønner,Kake,Brød,Rull,Toast
Frukt:Eple,Banan,Drue,Kiwi,Pære,Melon,Fiken,Aprikos,Mango,Avokado,Fersken,Kirsebær,Lime,Nype,Jordbær,Appelsin,Nektarin,Plomme,Ananas,Papaya
Land:Norge,Sverige,Danmark,Tyskland,Frankrike,Spania,Italia,Kina,Japan,Russland,Brasil,India,Egypt,Mexico,Tyrkia,Hellas,Polen,Canada,Nederland,Belgia,Østerrike,Australia,Argentina,Peru
Yrker:Lærer,Lege,Kokk,Sanger,Tannlege,Advokat,Politi,Bonde,Pilot,Frisør,Artist,Forfatter,Maler,Snekker,Tegner,Dyrker,Sjåfør,Kjøper,Skredder,Ingeniør,Rektor,Guide
Farger:Rød,Blå,Grønn,Gul,Svart,Hvit,Grå,Rosa,Brun,Cyan,Lilla,Indigo,Turkis,Oransj,Gull,Sølv,Krem,Koral,Lavendel,Oliven,Beige,Perle,Kobber
Sport:Fotball,Tennis,Svømming,Håndball,Golf,Sykling,Ski,Roing,Surfing,Skøyter,Boksing,Løping,Klatring,Rugby,Hockey,Badminton,Turn,Basket,Stuping,Baseball,Fekting,Judo
Klær:Bukse,Sko,Kjole,Skjørt,Jakke,Lue,Shorts,Støvler,Dress,Sokker,Slips,Genser,Votter,Caps,Hatt,Hanske,Sandal,Skjerf,Tights
Transport:Bil,Sykkel,Buss,Tog,Fly,Skip,Taxi,Båt,Ferge,Kjerre,Slede,Tralle,Vogn,ATV,Lastebil,Drone,Ubåt,Flåte
Ferie:Strand,Fjell,Sol,Vann,Skog,Snø,Park,Basseng,Camping,Reise,Safari,Festival,Kultur,Mat,Slott,Hotell,Spa,Skogstur,Fjelltur,Yoga,Party,Utforske,Chill
\ No newline at end of file
Animals:Tiger,Eagle,Dolphin,Giraffe,Lion,Catfish,Dog,Mouse,Rabbit,Parrot,Squirrel,Penguin,Zebra,Spider,Hamster,Hedgehog,Jaguar,Koala,Beaver,Donkey,Ferret,Rabbit,Sheep,Skunk,Snake
Fruits:Apple,Banana,Orange,Mango,Kiwi,Grapes,Papaya,Cherry,Lemon,Melon,Peach,Pear,Plum,Fig,Guava,Lychee,Papaya,Berry,Lime,Grape,Raisin,Dates,Prune,Olive,Tamarind
Colors:Red,Blue,Green,Yellow,Orange,Purple,Pink,Brown,Black,White,Gray,Cyan,Amber,Olive,Indigo,Maroon,Magenta,Coral,Beige,Violet,Silver,Gold,Teal,Peach,Tan
Countries:USA,China,India,Brazil,Russia,Japan,Mexico,France,Italy,Canada,Spain,UK,Germany,Turkey,Iran,Iraq,Egypt,Peru,Chile,Nigeria,Kenya,Ghana,Uganda,Morocco,Cuba,Norway
Occupations:Doctor,Teacher,Engineer,Lawyer,Nurse,Artist,Pilot,Chef,Actor,Singer,Police,Farmer,Writer,Dentist,Driver,Sailor,Baker,Barber,Tailor,Editor,Porter,Singer,Pilot,Dancer
Sports:Soccer,Tennis,Boxing,Hockey,Golf,Rugby,Cricket,Bowling,Cycling,Fencing,Swimming,Running,Climbing,Jumping,Skiing,Skating,Rowing,Racing,Diving,Surfing,Gymnast,Archery,Sprinter,Jogging
Vehicles:Car,Truck,Plane,Train,Boat,Ferry,Scooter,Moped,Bike,Drone,Sled,Kayak,Yacht,Tram,Tank,Lorry,Buggy,Coach,Jet,Taxi,Van
Weather:Sunny,Rainy,Cloudy,Windy,Stormy,Snowy,Foggy,Hail,Freeze,Tornado,Blizzard,Drizzle,Monsoon,Drought,Flood,Thunder,Shower,Rainbow,Sunset,Sunrise,Misty,Frosty,Chilly
Emotions:Happy,Sad,Angry,Nervous,Calm,Brave,Proud,Shy,Grief,Guilt,Fear,Love,Hate,Hope,Trust,Jealous,Excited,Lonely,Bored,Content,Joyful,Ecstatic,Amused,Curious
\ No newline at end of file
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