Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Colony expedition system #10113

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
123 commits
Select commit Hold shift + click to select a range
88ce1d8
Temp
Thodor12 Jan 14, 2024
da9e661
Finish off visitor type system
Thodor12 Jan 15, 2024
916d80d
Merge branch 'version/main' into feature/visitor_types
Thodor12 Jan 15, 2024
35c7eb2
Final
Thodor12 Jan 15, 2024
513380e
Fix
Thodor12 Jan 15, 2024
1d61cd2
Merge branch 'version/main' into feature/visitor_types
Thodor12 Jan 17, 2024
5ca75e1
Fixes
Thodor12 Jan 17, 2024
871f59f
Port expeditions
Thodor12 Jan 20, 2024
c0b2b71
Lot of fixes
Thodor12 Jan 25, 2024
3fefe0f
Temp
Thodor12 Jan 28, 2024
9719e45
Merge branch 'version/main' into feature/visitor_types
Thodor12 Jan 28, 2024
74a655a
Move
Thodor12 Jan 28, 2024
c309ff5
Merge branch 'feature/visitor_types' into feature/colony_expeditions_120
Thodor12 Jan 28, 2024
06bb8cb
Move
Thodor12 Jan 28, 2024
1cb0b13
Merge branch 'version/main' into feature/colony_expeditions_120
Thodor12 Feb 4, 2024
63e435e
Fixes
Thodor12 Feb 4, 2024
3abacb1
Merge branch 'version/main' into feature/visitor_types
Thodor12 Feb 4, 2024
ab04bb8
Fix
Thodor12 Feb 4, 2024
3f5a362
Merge branch 'feature/visitor_types' into feature/colony_expeditions_120
Thodor12 Feb 4, 2024
99a600d
Merge branch 'version/main' into feature/visitor_types
Thodor12 Feb 4, 2024
90771e4
Temp
Thodor12 Feb 14, 2024
6be5771
Merge branch 'version/main' into feature/colony_expeditions_120
Thodor12 Feb 14, 2024
9fe28ba
Merge branch 'version/main' into feature/visitor_types
Thodor12 Feb 14, 2024
befff5c
Temp
Thodor12 Feb 15, 2024
af5148f
Updates
Thodor12 Feb 16, 2024
696725d
Merge branch 'version/main' into feature/colony_expeditions_120
Thodor12 Feb 19, 2024
506a9c3
Merge branch 'version/main' into feature/visitor_types
Thodor12 Feb 19, 2024
d1cc472
Expedition spawning works
Thodor12 Feb 20, 2024
ac9b1ec
Merge branch 'version/main' into feature/colony_expeditions_120
Thodor12 Feb 23, 2024
78ba4c2
Merge branch 'version/main' into feature/colony_expeditions_120
Thodor12 Feb 28, 2024
aa2602c
Starting expeditions fully functional
Thodor12 Mar 1, 2024
e247aca
Merge branch 'version/main' into feature/colony_expeditions_120
Thodor12 Mar 3, 2024
78f2231
Ending expeditions
Thodor12 Mar 5, 2024
0d4f7d4
Start townhall UI
Thodor12 Mar 9, 2024
9778f15
Merge branch 'version/main' into feature/visitor_types
Thodor12 Mar 9, 2024
27cbc57
Merge branch 'feature/visitor_types' into feature/colony_expeditions_120
Thodor12 Mar 9, 2024
45c3eda
Merge branch 'version/main' into feature/colony_expeditions_120
Thodor12 Mar 13, 2024
96d5697
Update
Thodor12 Mar 14, 2024
04c4bce
Updates to GUI
Thodor12 Mar 14, 2024
260673e
Start of the details for expeditions
Thodor12 Mar 15, 2024
254dd9f
Merge branch 'version/main' into feature/colony_expeditions_120
Thodor12 Mar 17, 2024
03b0a95
Updates
Thodor12 Mar 17, 2024
b2a7ff7
Merge branch 'version/main' into feature/colony_expeditions_120
Thodor12 Mar 19, 2024
c9400d1
Merge branch 'version/main' into feature/colony_expeditions_120
Thodor12 Mar 20, 2024
56c4122
Updates
Thodor12 Mar 26, 2024
25e0403
Member serialization fixes
Thodor12 Mar 28, 2024
4e291e7
Scaling mob fights and better structure handling
Thodor12 Mar 28, 2024
266045a
Merge branch 'version/main' into feature/colony_expeditions_120
Thodor12 Apr 2, 2024
13d17ef
Updates
Thodor12 Apr 18, 2024
305e415
Merge branch 'refs/heads/version/main' into feature/colony_expedition…
Thodor12 Apr 18, 2024
9ed0e49
Fix
Thodor12 Apr 18, 2024
4a44137
Fixes
Thodor12 Apr 18, 2024
b725644
Fixes
Thodor12 Apr 18, 2024
f05b86f
Imports
Thodor12 Apr 18, 2024
1249aa3
Undo custom texture visitor data
Thodor12 Apr 18, 2024
e532f0b
Update
Thodor12 Apr 24, 2024
ec15ca6
Update
Thodor12 May 6, 2024
590cde6
Merge branch 'refs/heads/version/main' into feature/colony_expedition…
Thodor12 May 9, 2024
ec1f490
Update
Thodor12 May 12, 2024
f587a82
Update interaction with expedition sheet
Thodor12 Jun 2, 2024
ac7a34e
Fix interaction with guards list
Thodor12 Jun 10, 2024
7e6734f
Merge branch 'refs/heads/version/main' into feature/colony_expedition…
Thodor12 Jun 10, 2024
722327b
Fixes
Thodor12 Jun 10, 2024
a642571
Merge branch 'refs/heads/version/main' into feature/colony_expedition…
Thodor12 Jun 15, 2024
c5343d9
Updates
Thodor12 Jun 16, 2024
d17e795
Fixes
Thodor12 Jun 16, 2024
95d8bae
Create datagenerators
Thodor12 Jun 16, 2024
79ac2b7
Update datagenerators
Thodor12 Jun 20, 2024
56d0e79
Merge branch 'refs/heads/version/main' into feature/colony_expedition…
Thodor12 Jun 20, 2024
9f4f902
Fixes
Thodor12 Jul 2, 2024
03850b5
Start filling loot tables
Thodor12 Jul 16, 2024
51ff3cd
Merge branch 'refs/heads/version/main' into feature/colony_expedition…
Thodor12 Jul 16, 2024
0455b53
Merge branch 'refs/heads/version/main' into feature/colony_expedition…
Thodor12 Jul 21, 2024
b94ca33
Allow expedition difficulty as a loot param
Thodor12 Jul 21, 2024
75f9b47
First 5 structure loot tables
Thodor12 Jul 22, 2024
7337972
Mansion loot table
Thodor12 Jul 22, 2024
7a76cab
Allow several structures in a row not to create new stages and armor …
Thodor12 Jul 29, 2024
0af7e24
Removed luck from impacting loot tables, created and modified a bunch…
Thodor12 Jul 31, 2024
013aea7
Merge branch 'refs/heads/version/main' into feature/colony_expedition…
Thodor12 Aug 1, 2024
2af0eaf
Fix
Thodor12 Aug 1, 2024
9c4028d
Merge branch 'refs/heads/version/main' into feature/colony_expedition…
Thodor12 Aug 6, 2024
36e438b
Lots more loot tables
Thodor12 Aug 6, 2024
8771b0f
Add ruined portal, remove qualities
Thodor12 Aug 8, 2024
770b99b
Last structure loot tables
Thodor12 Aug 11, 2024
33db988
Remove ocean ruins
Thodor12 Aug 11, 2024
92c0de9
Revert build.gradle
Thodor12 Aug 12, 2024
08b7a6d
Merge branch 'version/main' into feature/colony_expeditions_120
Thodor12 Aug 12, 2024
cd40c92
Merge branch 'version/main' into feature/colony_expeditions_120
Thodor12 Aug 12, 2024
6c0bff5
Update datagen (please don't bork everything)
Thodor12 Aug 12, 2024
40e6362
Fix datagen
Thodor12 Aug 12, 2024
9a0edf9
Undo
Thodor12 Aug 12, 2024
a993b86
Undo
Thodor12 Aug 12, 2024
9c5d382
Javadoc
Thodor12 Aug 12, 2024
d5f1abd
Javadoc
Thodor12 Aug 12, 2024
1f97eea
Remove
Thodor12 Aug 12, 2024
a7df0e2
Undo
Thodor12 Aug 12, 2024
d8a0aca
Undo
Thodor12 Aug 12, 2024
e9a8d20
Update
Thodor12 Aug 12, 2024
d471237
Undo
Thodor12 Aug 12, 2024
7035705
Undo
Thodor12 Aug 12, 2024
83c54ab
Update
Thodor12 Aug 12, 2024
f663160
Rename
Thodor12 Aug 12, 2024
9b122e9
Javadoc
Thodor12 Aug 12, 2024
fd8ec6d
Javadoc
Thodor12 Aug 12, 2024
059aecd
Javadoc and update
Thodor12 Aug 12, 2024
9be0990
Allow void input materials
Thodor12 Aug 12, 2024
15340bb
Start generation of expedition loot tables themselves + fixes
Thodor12 Aug 13, 2024
bdef08f
Update expedition difficulty param to support multiple difficulties a…
Thodor12 Aug 15, 2024
d66de15
Start generation of expedition loot tables
Thodor12 Aug 15, 2024
317d1a3
Merge branch 'version/main' into feature/colony_expeditions_120
Thodor12 Aug 18, 2024
0f2aaa0
Merge branch 'version/main' into feature/colony_expeditions_120
Thodor12 Aug 26, 2024
f5056f7
Updates
Thodor12 Aug 26, 2024
bd6afc1
Updates
Thodor12 Sep 5, 2024
68de0c7
Add textures
Thodor12 Sep 5, 2024
b966114
Merge branch 'version/main' into feature/colony_expeditions_120
Thodor12 Sep 6, 2024
3975fa7
Updates
Thodor12 Sep 7, 2024
7760b64
Merge branch 'version/main' into feature/colony_expeditions_120
Thodor12 Sep 9, 2024
11dfee5
Merge branch 'version/main' into feature/colony_expeditions_120
Thodor12 Sep 12, 2024
ed5f875
Bugfixes
Thodor12 Sep 12, 2024
bde7c2f
Improve setup
Thodor12 Sep 15, 2024
bb5a8a0
Merge branch 'version/main' into feature/colony_expeditions_120
Thodor12 Sep 15, 2024
4c06816
Conversion to equipment type from tool type
Thodor12 Sep 15, 2024
e015f9f
Merge branch 'version/main' into feature/colony_expeditions_120
Thodor12 Sep 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ mappingsChannel=official
mappingsVersion=1.20.1

dataGeneratorsVersion=1.19.3-0.1.54-ALPHA
blockUI_version=1.20.1-1.0.139-BETA
blockUI_version=1.20.1-1.0.155-BETA
structurize_version=1.20.1-1.0.740-BETA
domumOrnamentumVersion=1.20.1-1.0.184-BETA
multiPistonVersion=1.20-1.2.30-ALPHA
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"armor": 0,
"damage": 6.0,
"entity-type": "minecraft:blaze",
"health": 20.0,
"loot-table": "minecraft:entities/blaze",
"reflect": 0.0,
"xp": 10.0
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"armor": 0,
"damage": 4.0,
"entity-type": "minecraft:cave_spider",
"health": 12.0,
"loot-table": "minecraft:entities/cave_spider",
"reflect": 0.0,
"xp": 5.0
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"armor": 0,
"damage": 22.0,
"entity-type": "minecraft:creeper",
"health": 20.0,
"loot-table": "minecraft:entities/creeper",
"reflect": 20.0,
"xp": 5.0
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"armor": 0,
"damage": 3.0,
"entity-type": "minecraft:drowned",
"health": 20.0,
"loot-table": "minecraft:entities/drowned",
"reflect": 0.0,
"xp": 5.0
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"armor": 0,
"damage": 11.0,
"entity-type": "minecraft:drowned",
"health": 20.0,
"loot-table": "minecraft:entities/drowned",
"reflect": 0.0,
"xp": 10.0
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"armor": 0,
"damage": 8.0,
"entity-type": "minecraft:elder_guardian",
"health": 80.0,
"loot-table": "minecraft:entities/elder_guardian",
"reflect": 0.0,
"xp": 10.0
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"armor": 0,
"damage": 7.0,
"entity-type": "minecraft:enderman",
"health": 40.0,
"loot-table": "minecraft:entities/enderman",
"reflect": 0.0,
"xp": 5.0
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"armor": 0,
"damage": 6.0,
"entity-type": "minecraft:evoker",
"health": 24.0,
"loot-table": "minecraft:entities/evoker",
"reflect": 0.0,
"xp": 10.0
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"armor": 0,
"damage": 6.0,
"entity-type": "minecraft:guardian",
"health": 30.0,
"loot-table": "minecraft:entities/guardian",
"reflect": 0.0,
"xp": 10.0
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"armor": 0,
"damage": 8.0,
"entity-type": "minecraft:hoglin",
"health": 40.0,
"loot-table": "minecraft:entities/hoglin",
"reflect": 0.0,
"xp": 5.0
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"armor": 0,
"damage": 6.0,
"entity-type": "minecraft:magma_cube",
"health": 16.0,
"loot-table": "minecraft:entities/magma_cube",
"reflect": 0.0,
"xp": 4.0
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"armor": 0,
"damage": 4.0,
"entity-type": "minecraft:magma_cube",
"health": 4.0,
"loot-table": "minecraft:entities/magma_cube",
"reflect": 0.0,
"xp": 2.0
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"armor": 0,
"damage": 3.0,
"entity-type": "minecraft:magma_cube",
"health": 1.0,
"loot-table": "minecraft:entities/magma_cube",
"reflect": 0.0,
"xp": 1.0
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"armor": 0,
"damage": 8.0,
"entity-type": "minecraft:piglin",
"health": 16.0,
"loot-table": "minecraft:entities/piglin",
"reflect": 0.0,
"xp": 5.0
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"armor": 0,
"damage": 13.0,
"entity-type": "minecraft:piglin_brute",
"health": 50.0,
"loot-table": "minecraft:entities/piglin_brute",
"reflect": 0.0,
"xp": 20.0
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"armor": 0,
"damage": 8.0,
"entity-type": "minecraft:pillager",
"health": 80.0,
"loot-table": "minecraft:entities/pillager",
"reflect": 0.0,
"xp": 10.0
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"armor": 0,
"damage": 8.0,
"entity-type": "minecraft:pillager",
"health": 80.0,
"loot-table": "minecraft:entities/pillager",
"reflect": 0.0,
"xp": 10.0
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"armor": 0,
"damage": 4.0,
"entity-type": "minecraft:shulker",
"health": 30.0,
"loot-table": "minecraft:entities/shulker",
"reflect": 0.0,
"xp": 5.0
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"armor": 0,
"damage": 3.0,
"entity-type": "minecraft:skeleton",
"health": 20.0,
"loot-table": "minecraft:entities/skeleton",
"reflect": 0.0,
"xp": 10.0
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"armor": 0,
"damage": 2.0,
"entity-type": "minecraft:spider",
"health": 16.0,
"loot-table": "minecraft:entities/spider",
"reflect": 0.0,
"xp": 5.0
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"armor": 0,
"damage": 9.0,
"entity-type": "minecraft:vex",
"health": 14.0,
"loot-table": "minecraft:entities/vex",
"reflect": 0.0,
"xp": 5.0
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"armor": 0,
"damage": 13.0,
"entity-type": "minecraft:vindicator",
"health": 24.0,
"loot-table": "minecraft:entities/vindicator",
"reflect": 0.0,
"xp": 5.0
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"armor": 0,
"damage": 30.0,
"entity-type": "minecraft:warden",
"health": 500.0,
"loot-table": "minecraft:entities/warden",
"reflect": 0.0,
"xp": 5.0
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"armor": 0,
"damage": 4.0,
"entity-type": "minecraft:witch",
"health": 26.0,
"loot-table": "minecraft:entities/witch",
"reflect": 0.0,
"xp": 10.0
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"armor": 0,
"damage": 11.0,
"entity-type": "minecraft:wither_skeleton",
"health": 20.0,
"loot-table": "minecraft:entities/wither_skeleton",
"reflect": 0.0,
"xp": 10.0
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"armor": 0,
"damage": 2.5,
"entity-type": "minecraft:zombie",
"health": 20.0,
"loot-table": "minecraft:entities/zombie",
"reflect": 0.0,
"xp": 5.0
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"armor": 0,
"damage": 11.0,
"entity-type": "minecraft:zombified_piglin",
"health": 20.0,
"loot-table": "minecraft:entities/zombified_piglin",
"reflect": 0.0,
"xp": 10.0
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"difficulty": "hard",
"dimension": "minecraft:the_end",
"guards": 6,
"loot-table": "minecolonies:expeditions/expedition_end",
"name": "com.minecolonies.core.expedition_types.end.name",
"requirements": [
{
"type": "tool",
"amount": 1,
"equipment": "minecolonies:sword"
},
{
"type": "tool",
"amount": 1,
"equipment": "minecolonies:pickaxe"
},
{
"type": "tool",
"amount": 1,
"equipment": "minecolonies:shovel"
},
{
"type": "tool",
"amount": 1,
"equipment": "minecolonies:helmet"
},
{
"type": "tool",
"amount": 1,
"equipment": "minecolonies:chestplate"
},
{
"type": "tool",
"amount": 1,
"equipment": "minecolonies:leggings"
},
{
"type": "tool",
"amount": 1,
"equipment": "minecolonies:boots"
},
{
"type": "food",
"amount": 128
}
],
"to-text": "com.minecolonies.core.expedition_types.end.to_text"
}
Loading