Skip to content

Commit dfc9257

Browse files
jagprog5jagprog5
committed
More structures
1 parent 7d2f189 commit dfc9257

13 files changed

+257
-5
lines changed

‎CHANGELOG.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
* Minor edit readme
2-
* Fix metadata on structures
1+
* Added more structures
2+
* Tweaked ebwizardry (books are consumed)
3+
* Minor edit shader default settings

‎manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
]
1010
},
1111
"manifestType": "minecraftModpack",
12-
"manifestVersion": 16,
12+
"manifestVersion": 17,
1313
"name": "John's 1.12.2",
1414
"author": "",
1515
"files": [
@@ -275,7 +275,7 @@
275275
},
276276
{
277277
"projectID": 263420,
278-
"fileID": 5637004,
278+
"fileID": 5688821,
279279
"required": true
280280
},
281281
{

‎overrides/config/ebwizardry/ebwizardry.cfg

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,27 @@ artefacts {
235235
# Set to false to disable this item
236236
B:"ebwizardry:ring_stormcloud"=true
237237

238+
# Set to false to disable this item
239+
B:"mospells:amulet_earth"=true
240+
241+
# Set to false to disable this item
242+
B:"mospells:amulet_frostmaw"=true
243+
244+
# Set to false to disable this item
245+
B:"mospells:amulet_golden_sun"=true
246+
247+
# Set to false to disable this item
248+
B:"mospells:charm_cold_winds"=true
249+
250+
# Set to false to disable this item
251+
B:"mospells:charm_monster_tome"=true
252+
253+
# Set to false to disable this item
254+
B:"mospells:ring_ice_crystal"=true
255+
256+
# Set to false to disable this item
257+
B:"mospells:ring_wind_touch"=true
258+
238259
# Set to false to disable this item
239260
B:"tfspellpack:amulet_carminite"=true
240261

@@ -453,6 +474,17 @@ gameplay {
453474
# Whether spells cast by dispensers can destroy blocks in the world. Wizardry makes every attempt to respect protection mods and plugins, but cannot guarantee it will work in all cases for every mod. If you need absolutely watertight anti-grief, disable this setting.
454475
B:dispenserBlockDamage=true
455476

477+
# Whether damage should be registered with the old system (wizardry_magic/indirect_wizardry_magic) prefixed damage with the elements like necromancy_indirect_wizardry_magic, necromancy_wizardry_magic. This is disabled by default to not break existing modpacks.The intention of this setting is to allow differentiating various damage types for e.g. the Distinct Damage Descriptions mod
478+
B:damageTypePerElement=true
479+
480+
# Whether spell books are consumed when they are bound to a wand.
481+
# Default was false. This feels better
482+
B:singleUseSpellBooks=true
483+
484+
# Whether to prevent binding the same spell to a wand multiple times
485+
# default was false. makes more sense to have spells be unique on a wand
486+
B:preventBindingSameSpellTwiceToWands=true
487+
456488
# Whether to allow players to move other players around using magic.
457489
B:playersMoveEachOther=true
458490

@@ -474,6 +506,14 @@ gameplay {
474506

475507
# Whether using bonemeal on grass blocks has a chance to grow crystal flowers.
476508
B:bonemealGrowsCrystalFlowers=true
509+
510+
# Whether wands only decrement their cooldowns if a player holds them.
511+
# default was false. true makes more consistent with vanilla
512+
B:wandsMustBeHeldToDecrementCooldown=true
513+
}
514+
515+
516+
general {
477517
}
478518

479519

@@ -1077,6 +1117,57 @@ spells {
10771117
# Set to false to disable this spell
10781118
B:"ebwizardry:zombie_apocalypse"=true
10791119

1120+
# Set to false to disable this spell
1121+
B:"mospells:frost_breath"=true
1122+
1123+
# Set to false to disable this spell
1124+
B:"mospells:frozen_orb"=true
1125+
1126+
# Set to false to disable this spell
1127+
B:"mospells:lesser_geomancy"=true
1128+
1129+
# Set to false to disable this spell
1130+
B:"mospells:naga_aspect"=true
1131+
1132+
# Set to false to disable this spell
1133+
B:"mospells:pillar"=true
1134+
1135+
# Set to false to disable this spell
1136+
B:"mospells:poison_ball"=true
1137+
1138+
# Set to false to disable this spell
1139+
B:"mospells:rupture"=true
1140+
1141+
# Set to false to disable this spell
1142+
B:"mospells:solar_beam"=true
1143+
1144+
# Set to false to disable this spell
1145+
B:"mospells:solar_flare"=true
1146+
1147+
# Set to false to disable this spell
1148+
B:"mospells:summon_barakoa_spirit"=true
1149+
1150+
# Set to false to disable this spell
1151+
B:"mospells:summon_frostmaw"=true
1152+
1153+
# Set to false to disable this spell
1154+
B:"mospells:summon_naga"=true
1155+
1156+
# Set to false to disable this spell
1157+
B:"mospells:summon_spirit_pack"=true
1158+
1159+
# Set to false to disable this spell
1160+
B:"mospells:suns_blessing"=true
1161+
1162+
# Set to false to disable this spell
1163+
B:"mospells:sunstrike"=true
1164+
1165+
# Set to false to disable this spell
1166+
B:"mospells:supernova"=true
1167+
1168+
# Set to false to disable this spell
1169+
B:"mospells:winds_of_winter"=true
1170+
10801171
# Set to false to disable this spell
10811172
B:"tfspellpack:acid_rain"=true
10821173

@@ -1273,6 +1364,24 @@ tweaks {
12731364
gold_ingot 3
12741365
emerald 6
12751366
>
1367+
1368+
# The fraction by which cooldowns are reduced for each level of cooldown upgrade.
1369+
D:cooldown_reduction_per_level=0.15
1370+
1371+
# The fraction by which potency is increased for each tier of matching wand. May cause extreme lag with high values!
1372+
D:potency_increase_per_tier=0.15
1373+
1374+
# The fraction by which spell duration is increased for each level of duration upgrade.
1375+
D:duration_increase_per_level=0.25
1376+
1377+
# The fraction by which spell range is increased for each level of range upgrade. May cause extreme lag with high values!
1378+
D:range_increase_per_level=0.25
1379+
1380+
# The fraction by which spell blast is increased for each level of blast upgrade. May cause extreme lag with high values!
1381+
D:blast_increase_per_level=0.25
1382+
1383+
# The fraction by which movement speed is reduced per level of frost effect.
1384+
D:frost_slowness_increase_per_level=0.5
12761385
}
12771386

12781387

‎overrides/config/reccomplex.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ balancing {
5757

5858
# Resource Expression that will be applied to each loading structure, determining if it should be set to 'active'. [default: ]
5959
# remove all recurrent complex structures except for a few
60-
S:structureGenerationMatcher=!$reccomplex | BrownMushroom | ClayWaterMound | ClayWaterMound1 | PyramidMazeClosedDoorway | PyramidMazeCorridorCollapse | PyramidMazePagoda | PyramidMazePath | PyramidMazePillar | PyramidMazeScriptureTurn | PyramidMazeSpiderTurn | PyramidMazeStairCorridor | PyramidMazeStairTurn | PyramidMazeZombieTable | DesertBeacon | DesertFort | FallenPalmTree | ForestBeacon | GiganticTree | GiganticTree1 | IceThorn | IceThorn1 | IceThorn2 | IceThorn3 | IceThorn4 | JungleTreeHuge | Mopane | OakTreeBig | OakTreeHuge | PirateHideout | RedMushroom | RedMushroom1 | SmallFortRuins | MesoMazeCorridorCollapse | MesoMazeGrowth | MesoMazePagoda | MesoMazePath | MesoMazeSpiderTurn | MesoMazeStairCorridor | MesoMazeStairTurn | MesoMazeZombieTable | SnakeTemple | StoneIceBoulder | StoneIceBoulder1 | StoneIceBoulder2 | StoneIceBoulder3 | TemplePyramid | TemplePyramid1 | TribalJungleHead | UndergroundTreeoid | VeldtBath
60+
S:structureGenerationMatcher=!$reccomplex | BrownMushroom | ClayWaterMound | ClayWaterMound1 | PyramidMazeClosedDoorway | PyramidMazeCorridorCollapse | PyramidMazePagoda | PyramidMazePath | PyramidMazePillar | PyramidMazeScriptureTurn | PyramidMazeSpiderTurn | PyramidMazeStairCorridor | PyramidMazeStairTurn | PyramidMazeZombieTable | DesertBeacon | DesertFort | FallenPalmTree | GiganticTree | GiganticTree1 | IceThorn | IceThorn1 | IceThorn2 | IceThorn3 | IceThorn4 | JungleTreeHuge | Mopane | OakTreeBig | OakTreeHuge | PirateHideout | RedMushroom | RedMushroom1 | SmallFortRuins | MesoMazeCorridorCollapse | MesoMazeGrowth | MesoMazePagoda | MesoMazePath | MesoMazeSpiderTurn | MesoMazeStairCorridor | MesoMazeStairTurn | MesoMazeZombieTable | SnakeTemple | StoneIceBoulder | StoneIceBoulder1 | StoneIceBoulder2 | StoneIceBoulder3 | TemplePyramid | TemplePyramid1 | TribalJungleHead | UndergroundTreeoid | VeldtBath
6161

6262
# Resource Expression that will be applied to each loading structure, determining if it should be loaded. [default: ]
6363
S:structureLoadMatcher=

‎overrides/shaderpacks/MakeUp-UltraFast-8.9b.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ SHADOW_CASTING=false
99
SIMPLE_AUTOEXP=true
1010
SUN_REFLECTION=0
1111
USE_BASIC_SH=false
12+
WATER_ABSORPTION=0.07
1213
WAVING=0

‎overrides/structures/active/ChestInIce.rcst

1.83 KB
Binary file not shown.

‎overrides/structures/active/ForestBeaconJAG.rcst

1.67 KB
Binary file not shown.

‎overrides/structures/active/ForestBeaconLoot.rcig

Lines changed: 141 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
1+
{
2+
"version": 2,
3+
"inventoryGeneratorID": "forest_beacon_loot_group_id",
4+
"items": [
5+
{
6+
"weight": 0.005751589313149452,
7+
"min": 1,
8+
"max": 1,
9+
"item": {
10+
"id": "minecraft:wooden_axe",
11+
"damage": 10000,
12+
"count": 1,
13+
"tag": {
14+
"nbtType": "compound",
15+
"nbt": {
16+
"ench": {
17+
"nbtType": "list",
18+
"nbt": [
19+
{
20+
"nbtType": "compound",
21+
"nbt": {
22+
"lvl": {
23+
"nbtType": "int",
24+
"nbt": 50
25+
},
26+
"id": {
27+
"nbtType": "int",
28+
"nbt": 16
29+
}
30+
}
31+
},
32+
{
33+
"nbtType": "compound",
34+
"nbt": {
35+
"lvl": {
36+
"nbtType": "int",
37+
"nbt": 5
38+
},
39+
"id": {
40+
"nbtType": "int",
41+
"nbt": 19
42+
}
43+
}
44+
},
45+
{
46+
"nbtType": "compound",
47+
"nbt": {
48+
"lvl": {
49+
"nbtType": "int",
50+
"nbt": 1
51+
},
52+
"id": {
53+
"nbtType": "int",
54+
"nbt": 51
55+
}
56+
}
57+
}
58+
]
59+
},
60+
"display": {
61+
"nbtType": "compound",
62+
"nbt": {
63+
"Lore": {
64+
"nbtType": "list",
65+
"nbt": [
66+
{
67+
"nbtType": "string",
68+
"nbt": "Annihilates itself after one use"
69+
}
70+
]
71+
},
72+
"Name": {
73+
"nbtType": "string",
74+
"nbt": "Splintering Axe"
75+
}
76+
}
77+
},
78+
"AttributeModifiers": {
79+
"nbtType": "list",
80+
"nbt": [
81+
{
82+
"nbtType": "compound",
83+
"nbt": {
84+
"UUIDMost": {
85+
"nbtType": "int",
86+
"nbt": -871380948
87+
},
88+
"UUIDLeast": {
89+
"nbtType": "int",
90+
"nbt": -590699294
91+
},
92+
"Amount": {
93+
"nbtType": "double",
94+
"nbt": -3.95
95+
},
96+
"Slot": {
97+
"nbtType": "string",
98+
"nbt": "mainhand"
99+
},
100+
"AttributeName": {
101+
"nbtType": "string",
102+
"nbt": "generic.attackSpeed"
103+
},
104+
"Operation": {
105+
"nbtType": "int",
106+
"nbt": 0
107+
},
108+
"Name": {
109+
"nbtType": "string",
110+
"nbt": "generic.attackSpeed"
111+
}
112+
}
113+
}
114+
]
115+
}
116+
}
117+
}
118+
}
119+
},
120+
{
121+
"weight": 1.0,
122+
"min": 1,
123+
"max": 1,
124+
"item": {
125+
"id": "reccomplex:inventory_generation_single_tag",
126+
"damage": 0,
127+
"count": 1,
128+
"tag": {
129+
"nbtType": "compound",
130+
"nbt": {
131+
"itemCollectionKey": {
132+
"nbtType": "string",
133+
"nbt": "AbandonedBurnable"
134+
}
135+
}
136+
}
137+
}
138+
}
139+
],
140+
"dependencyExpression": ""
141+
}

‎overrides/structures/active/OceanOutpost.rcst

5.34 KB
Binary file not shown.

‎overrides/structures/active/OceanOutpostTrap.rcst

5.6 KB
Binary file not shown.

0 commit comments

Comments
 (0)