move upgrade model to diamond_sword

OKTW-Network · Jan 16, 2019 · 5a8dc16 · 5a8dc16
1 parent 9cbaf15
commit 5a8dc16
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 20 deletions.
diff --git a/assets/minecraft/models/item/diamond_sword.json b/assets/minecraft/models/item/diamond_sword.json
@@ -5,20 +5,27 @@
     },
 	"overrides": [
 		{ "predicate": {"damaged": 0, "damage": 0}, "model": "item/diamond_sword"},
-		{ "predicate": {"damaged": 0, "damage": 0.00064061499}, "model": "galaxy/sword_ch_on"},
-		{ "predicate": {"damaged": 0, "damage": 0.9916720051249199}, "model": "galaxy/sword_scabbard"},
-		{ "predicate": {"damaged": 0, "damage": 0.9923126201153107}, "model": "galaxy/sword_off"},
-		{ "predicate": {"damaged": 0, "damage": 0.9929532351057015}, "model": "galaxy/sword_on"},
-		{ "predicate": {"damaged": 0, "damage": 0.9935938500960922}, "model": "galaxy/w_pistol_ori"},
-		{ "predicate": {"damaged": 0, "damage": 0.994234465086483},  "model": "galaxy/sword_fire_off"},
-		{ "predicate": {"damaged": 0, "damage": 0.9948750800768738}, "model": "galaxy/sword_fire_on"},
-		{ "predicate": {"damaged": 0, "damage": 0.9955156950672646}, "model": "galaxy/pistol_ran"},
-		{ "predicate": {"damaged": 0, "damage": 0.9961563100576553}, "model": "galaxy/pistol_gra"},
-		{ "predicate": {"damaged": 0, "damage": 0.9967969250480461}, "model": "galaxy/pistol"},
-		{ "predicate": {"damaged": 0, "damage": 0.9974375400384369}, "model": "galaxy/sword_magi_off"},
-		{ "predicate": {"damaged": 0, "damage": 0.9980781550288277}, "model": "galaxy/sword_magi_on"},
-		{ "predicate": {"damaged": 0, "damage": 0.9987187700192184}, "model": "galaxy/sniper_aiming"},
-		{ "predicate": {"damaged": 0, "damage": 0.9993593850096092}, "model": "galaxy/sniper"},
+		{ "##inGameDMG": 1540, "predicate": {"damaged": 0, "damage": 0.9865470852017937}, "model": "galaxy/upgrade_cooling_lv5"},
+		{ "##inGameDMG": 1541, "predicate": {"damaged": 0, "damage": 0.9871877001921845}, "model": "galaxy/upgrade_cooling_lv4"},
+		{ "##inGameDMG": 1542, "predicate": {"damaged": 0, "damage": 0.9878283151825753}, "model": "galaxy/upgrade_cooling_lv3"},
+		{ "##inGameDMG": 1543, "predicate": {"damaged": 0, "damage": 0.988468930172966},  "model": "galaxy/upgrade_cooling_lv2"},
+		{ "##inGameDMG": 1544, "predicate": {"damaged": 0, "damage": 0.9891095451633568}, "model": "galaxy/upgrade_cooling_lv1"},
+		{ "##inGameDMG": 1545, "predicate": {"damaged": 0, "damage": 0.9897501601537476}, "model": "galaxy/upgrade_base"},
+		{ "##inGameDMG": 1546, "predicate": {"damaged": 0, "damage": 0.9903907751441384}, "model": "galaxy/diamond_sword"},
+		{ "##inGameDMG": 1547, "predicate": {"damaged": 0, "damage": 0.9910313901345291}, "model": "galaxy/sword_ch_on"},
+		{ "##inGameDMG": 1548, "predicate": {"damaged": 0, "damage": 0.9916720051249199}, "model": "galaxy/sword_scabbard"},
+		{ "##inGameDMG": 1549, "predicate": {"damaged": 0, "damage": 0.9923126201153107}, "model": "galaxy/sword_off"},
+		{ "##inGameDMG": 1550, "predicate": {"damaged": 0, "damage": 0.9929532351057015}, "model": "galaxy/sword_on"},
+		{ "##inGameDMG": 1551, "predicate": {"damaged": 0, "damage": 0.9935938500960922}, "model": "galaxy/w_pistol_ori"},
+		{ "##inGameDMG": 1552, "predicate": {"damaged": 0, "damage": 0.994234465086483},  "model": "galaxy/sword_fire_off"},
+		{ "##inGameDMG": 1553, "predicate": {"damaged": 0, "damage": 0.9948750800768738}, "model": "galaxy/sword_fire_on"},
+		{ "##inGameDMG": 1554, "predicate": {"damaged": 0, "damage": 0.9955156950672646}, "model": "galaxy/pistol_ran"},
+		{ "##inGameDMG": 1555, "predicate": {"damaged": 0, "damage": 0.9961563100576553}, "model": "galaxy/pistol_gra"},
+		{ "##inGameDMG": 1556, "predicate": {"damaged": 0, "damage": 0.9967969250480461}, "model": "galaxy/pistol"},
+		{ "##inGameDMG": 1557, "predicate": {"damaged": 0, "damage": 0.9974375400384369}, "model": "galaxy/sword_magi_off"},
+		{ "##inGameDMG": 1558, "predicate": {"damaged": 0, "damage": 0.9980781550288277}, "model": "galaxy/sword_magi_on"},
+		{ "##inGameDMG": 1559, "predicate": {"damaged": 0, "damage": 0.9987187700192184}, "model": "galaxy/sniper_aiming"},
+		{ "##inGameDMG": 1560, "predicate": {"damaged": 0, "damage": 0.9993593850096092}, "model": "galaxy/sniper"},
 		{ "predicate": {"damaged": 0, "damage": 1.0}, "model": "item/diamond_sword"},
 		{ "predicate": {"damaged": 1, "damage": 0}, "model": "item/diamond_sword"}
 	]

diff --git a/assets/minecraft/models/item/stone_sword.json b/assets/minecraft/models/item/stone_sword.json
@@ -5,12 +5,6 @@
     },
 	"overrides": [
 		{ "predicate": {"damaged": 0, "damage": 0}, "model": "item/stone_sword"},
-		{ "##inGameDMG": 114, "predicate": {"damaged": 0, "damage": 0.8702290076335878}, "model": "galaxy/upgrade_base"},
-		{ "##inGameDMG": 115, "predicate": {"damaged": 0, "damage": 0.8778625954198473}, "model": "galaxy/upgrade_cooling_lv5"},
-		{ "##inGameDMG": 116, "predicate": {"damaged": 0, "damage": 0.8854961832061069}, "model": "galaxy/upgrade_cooling_lv4"},
-		{ "##inGameDMG": 117, "predicate": {"damaged": 0, "damage": 0.8931297709923664}, "model": "galaxy/upgrade_cooling_lv3"},
-		{ "##inGameDMG": 118, "predicate": {"damaged": 0, "damage": 0.900763358778626},  "model": "galaxy/upgrade_cooling_lv2"},
-		{ "##inGameDMG": 119, "predicate": {"damaged": 0, "damage": 0.9083969465648855}, "model": "galaxy/upgrade_cooling_lv1"},
 		{ "##inGameDMG": 120, "predicate": {"damaged": 0, "damage": 0.916030534351145},  "model": "galaxy/part_base"},
 		{ "##inGameDMG": 121, "predicate": {"damaged": 0, "damage": 0.9236641221374046}, "model": "galaxy/part_rawbase"},
 		{ "##inGameDMG": 122, "predicate": {"damaged": 0, "damage": 0.9312977099236641}, "model": "galaxy/part_scope"},