Skip to content

Commit 7c33666

Browse files
lkno0705lkno0705
authored
Merge pull request #18 from LittleBeasts/itemsRessource
Items ressource
2 parents 83a2a20 + e4afa73 commit 7c33666

4 files changed

Lines changed: 152 additions & 3 deletions

File tree

‎.github/workflows/maven.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ jobs:
2424
id: bump_version
2525
uses: christian-draeger/increment-semantic-version@1.0.2
2626
with:
27-
current-version: '1.0.1-alpha1'
28-
version-fragment: 'major'
27+
current-version: '2.0.0-alpha1'
28+
version-fragment: 'bug'
2929
- name: Upload Artifacts
3030
run: mkdir builds && cp target/*.jar builds/calculationEngine-${{ steps.bump_version.outputs.next-version }}.jar
3131
- uses: actions/upload-artifact@v2

‎src/main/java/config/LootConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ public class LootConfig {
99
public static final int dropCommon = 60;
1010
public static final int dropRare = 35;
1111
public static final int dropLegendary = 5;
12-
public static final JSONObject itemList = readJson("./src/main/java/JSON/items.JSON");
12+
public static final JSONObject itemList = readJson(LootConfig.class.getResource("/items.JSON").getPath());
1313
}

src/main/java/JSON/items.JSON renamed to src/main/resources/items.JSON

File renamed without changes.

‎src/test/resources/items.JSON‎

Lines changed: 149 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
1+
{
2+
"cage": {
3+
"name": "Cage",
4+
"spriteName": "sprite_name",
5+
"id": "#7",
6+
"description": "Cage to catch a litteBeast",
7+
"probability": "90",
8+
"uses": 1,
9+
"effects": "Catch",
10+
"unique": false,
11+
"type": "cage",
12+
"bonusStats":[
13+
10,
14+
10,
15+
10,
16+
10,
17+
10,
18+
10,
19+
0
20+
],
21+
"rarity": "common"
22+
},
23+
"aHealingPotion": {
24+
"name": "A healing potion",
25+
"spriteName": "sprite_name",
26+
"id": "#2",
27+
"description": "Heals a portion of your life",
28+
"probability": "80",
29+
"uses": 1,
30+
"effects": "Heals 10HP",
31+
"unique": false,
32+
"type": "consumable",
33+
"bonusStats":[
34+
10,
35+
10,
36+
10,
37+
10,
38+
10,
39+
10,
40+
0
41+
],
42+
"rarity": "common"
43+
},
44+
"aGreaterHealingPotion": {
45+
"id": "#5",
46+
"name": "A greater healing potion",
47+
"spriteName": "sprite_name",
48+
"description": "Heals a portion of your life",
49+
"probability": "20",
50+
"uses": 1,
51+
"effects": "Heals 10HP",
52+
"type": "consumable",
53+
"unique": false,
54+
"bonusStats":[
55+
10,
56+
10,
57+
10,
58+
10,
59+
10,
60+
10,
61+
0
62+
],
63+
"rarity": "common"
64+
},
65+
"stickOfBeating": {
66+
"id": "#3",
67+
"name": "The Stick of Beating",
68+
"spriteName": "sprite_name",
69+
"description": "It's a stick, you can hit someone with it. Don't.",
70+
"probability": "80",
71+
"uses": 1,
72+
"effects": "It hurts.",
73+
"type": "weapon",
74+
"unique": false,
75+
"bonusStats":[
76+
10,
77+
10,
78+
10,
79+
10,
80+
10,
81+
10,
82+
0
83+
],
84+
"rarity": "rare"
85+
},
86+
"StickOfMoreBeating": {
87+
"id": "#4",
88+
"name": "The Stick of more Beating",
89+
"spriteName": "sprite_name",
90+
"description": "It's a stick, you can hit someone with it. Do.",
91+
"probability": "20",
92+
"uses": 1,
93+
"effects": "It hurts.",
94+
"type": "weapon",
95+
"unique": false,
96+
"bonusStats":[
97+
10,
98+
10,
99+
10,
100+
10,
101+
10,
102+
10,
103+
0
104+
],
105+
"rarity": "rare"
106+
},
107+
"hammerOfZordon": {
108+
"id": "#1",
109+
"name": "The Hammer of Zordon",
110+
"spriteName": "sprite_name",
111+
"description": "It's Zordons Hammer, what do you think it will do?",
112+
"probability": "90",
113+
"uses": 1,
114+
"effects": "Hammers like crazy",
115+
"type": "weapon",
116+
"unique": false,
117+
"bonusStats":[
118+
10,
119+
10,
120+
10,
121+
10,
122+
10,
123+
10,
124+
0
125+
],
126+
"rarity": "legendary"
127+
},
128+
"hammerOfKarl": {
129+
"id": "#6",
130+
"name": "The Hammer of Karl",
131+
"spriteName": "sprite_name",
132+
"description": "It's Karls Hammer, it hammers",
133+
"probability": "10",
134+
"uses": 1,
135+
"effects": "Hammers like totally crazy",
136+
"type": "weapon",
137+
"unique": false,
138+
"bonusStats":[
139+
10,
140+
10,
141+
10,
142+
10,
143+
10,
144+
10,
145+
0
146+
],
147+
"rarity": "legendary"
148+
}
149+
}

0 commit comments

Comments
 (0)