From d4950a990bf824c3c549655d3f61b8d3421f3501 Mon Sep 17 00:00:00 2001
From: BadM0dder <109397107+BadM0dder@users.noreply.github.com>
Date: Wed, 5 Mar 2025 22:14:59 -0500
Subject: [PATCH 1/3] GREAT WELDING
40k aegis (30 seconds -> 40 seconds)
Macro Cannon, Heavy Macro Cannon, and Lance battery brought into same vibes with mk2 coil gun.
FAS Guns and Barbettes, (Brought from 15 seconds to 150 seconds on light guns, 120 seconds to 250 seconds on heavy guns) (this brings them in line with NHI)
---
.../40k-Weapons-Mod/Data/Cubeblocks_IMP.sbc | 12 ++++++------
.../Data/CubeBlocks/203Triple.sbc | 8 ++++----
.../Data/CubeBlocks/203Twin.sbc | 1 +
.../Data/CubeBlocks/508mm twin.sbc | 2 +-
.../Data/CubeBlocks/5InchQF.sbc | 1 +
.../Data/CubeBlocks/BarbetteSet.sbc | 6 +++---
.../Data/CubeBlocks/BoforTwinMain.sbc | 1 +
.../Data/CubeBlocks/Mk25 Rangefinder.sbc | 1 +
.../Data/CubeBlocks/OerlikonDual.sbc | 1 +
.../Data/CubeBlocks/OerlikonMain.sbc | 1 +
.../Data/CubeBlocks/PomPomMain.sbc | 1 +
.../Data/CubeBlocks/QuadBofor.sbc | 1 +
.../Data/CubeBlocks/TorpBarbette.sbc | 1 +
.../TaitMod_Fletcher/Data/Cubeblocks.sbc | 18 +++++++++---------
14 files changed, 32 insertions(+), 23 deletions(-)
diff --git a/Weapon Mods/40k-Weapons-Mod/Data/Cubeblocks_IMP.sbc b/Weapon Mods/40k-Weapons-Mod/Data/Cubeblocks_IMP.sbc
index 23d7d8d73..558f6e379 100644
--- a/Weapon Mods/40k-Weapons-Mod/Data/Cubeblocks_IMP.sbc
+++ b/Weapon Mods/40k-Weapons-Mod/Data/Cubeblocks_IMP.sbc
@@ -157,7 +157,7 @@
Macro
Light
- 120
+ 150
@@ -216,7 +216,7 @@
HeavyMacro
Light
- 180
+ 240
@@ -331,7 +331,7 @@
Lance
Light
- 120
+ 210
@@ -387,7 +387,7 @@
LightLance
Light
- 100
+ 180
@@ -443,7 +443,7 @@
HeavyLance
Light
- 140
+ 300
@@ -669,7 +669,7 @@
Aegis
Light
- 30
+ 40
diff --git a/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/203Triple.sbc b/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/203Triple.sbc
index f884acb3e..04e918f3f 100644
--- a/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/203Triple.sbc
+++ b/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/203Triple.sbc
@@ -16,10 +16,10 @@
[Shell Speed: 1000m/s | 1100m/s]
[Damage Types: Energy | Kinetic]
- Triple barreled 203mm/8 Inch used commonly by the Us navy during ww2 and into the cold war period
- Medium to long range artillery turret, used heavily on heavy cruisers likt eh Des Moines.
+ Triple barreled 203mm/8 Inch used commonly by the USN during WW2 and into the cold war period.
+ Medium to long range artillery turret, used heavily on heavy cruisers like Des Moines.
- Textures\GUI\Icons\8Inch55RF.dds
+ Textures\GUI\Icons\8Inch55Main.dds
Large
TriangleMesh
@@ -42,7 +42,7 @@
Z
Y
- 30
+ 180
203mmQuad
diff --git a/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/203Twin.sbc b/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/203Twin.sbc
index ba258c82f..d15636517 100644
--- a/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/203Twin.sbc
+++ b/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/203Twin.sbc
@@ -41,6 +41,7 @@
Z
Y
+ 180
203mmTwin
diff --git a/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/508mm twin.sbc b/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/508mm twin.sbc
index b77417e82..fa34538ae 100644
--- a/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/508mm twin.sbc
+++ b/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/508mm twin.sbc
@@ -38,7 +38,7 @@
- 120
+ 360
20InchTwin
Z
Y
diff --git a/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/5InchQF.sbc b/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/5InchQF.sbc
index 3445f5c0f..ba49f1bdb 100644
--- a/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/5InchQF.sbc
+++ b/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/5InchQF.sbc
@@ -35,6 +35,7 @@
+ 150
Z
Y
diff --git a/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/BarbetteSet.sbc b/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/BarbetteSet.sbc
index f3d57b1d1..c9e636c2e 100644
--- a/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/BarbetteSet.sbc
+++ b/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/BarbetteSet.sbc
@@ -35,7 +35,7 @@
Barbette5x5
Light
- 15
+ 420
Default
Damage_HeavyMech_Damaged
ParticleHeavyMech
@@ -80,7 +80,7 @@
Barbette3x3
X
Light
- 10
+ 270
Default
Damage_HeavyMech_Damaged
ParticleHeavyMech
@@ -125,7 +125,7 @@
Barbette1x1
X
Light
- 5
+ 30
Default
Damage_HeavyMech_Damaged
ParticleHeavyMech
diff --git a/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/BoforTwinMain.sbc b/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/BoforTwinMain.sbc
index 3d43a76c5..0acb07cd0 100644
--- a/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/BoforTwinMain.sbc
+++ b/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/BoforTwinMain.sbc
@@ -28,6 +28,7 @@
+ 15
diff --git a/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/Mk25 Rangefinder.sbc b/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/Mk25 Rangefinder.sbc
index 0dc421de0..3bd92f2d9 100644
--- a/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/Mk25 Rangefinder.sbc
+++ b/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/Mk25 Rangefinder.sbc
@@ -20,6 +20,7 @@
Models\Rangefinder\Mk25 Rangefinder.mwm
true
+ 15
diff --git a/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/OerlikonDual.sbc b/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/OerlikonDual.sbc
index 05e50411f..e2da86684 100644
--- a/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/OerlikonDual.sbc
+++ b/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/OerlikonDual.sbc
@@ -28,6 +28,7 @@
+ 15
OerlikonDual
Z
Y
diff --git a/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/OerlikonMain.sbc b/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/OerlikonMain.sbc
index 706ef0a2a..268ff0b93 100644
--- a/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/OerlikonMain.sbc
+++ b/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/OerlikonMain.sbc
@@ -29,6 +29,7 @@
+ 15
diff --git a/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/PomPomMain.sbc b/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/PomPomMain.sbc
index a972af33e..bb598ea27 100644
--- a/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/PomPomMain.sbc
+++ b/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/PomPomMain.sbc
@@ -31,6 +31,7 @@
+ 15
PomPomMain
Z
Y
diff --git a/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/QuadBofor.sbc b/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/QuadBofor.sbc
index c1ccaed6c..6834b3a3d 100644
--- a/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/QuadBofor.sbc
+++ b/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/QuadBofor.sbc
@@ -37,6 +37,7 @@
QuadBofor
+ 15
Z
Y
diff --git a/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/TorpBarbette.sbc b/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/TorpBarbette.sbc
index c130dca25..e9f5eeef8 100644
--- a/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/TorpBarbette.sbc
+++ b/Weapon Mods/TaitMod_Fletcher/Data/CubeBlocks/TorpBarbette.sbc
@@ -35,6 +35,7 @@
+ 540
diff --git a/Weapon Mods/TaitMod_Fletcher/Data/Cubeblocks.sbc b/Weapon Mods/TaitMod_Fletcher/Data/Cubeblocks.sbc
index 0dfa34b19..a58a04132 100644
--- a/Weapon Mods/TaitMod_Fletcher/Data/Cubeblocks.sbc
+++ b/Weapon Mods/TaitMod_Fletcher/Data/Cubeblocks.sbc
@@ -774,7 +774,7 @@
Z
Y
Light
- 40
+ 150
Textures\GUI\HUD\USAASight.dds
300
@@ -827,7 +827,7 @@
-
+
@@ -850,7 +850,7 @@
Z
Y
Light
- 40
+ 150
Textures\GUI\HUD\USAASight.dds
200
@@ -931,7 +931,7 @@
Z
Y
Light
- 30
+ 150
Textures\GUI\HUD\USAASight.dds
120
@@ -1008,7 +1008,7 @@
Z
Y
Light
- 40
+ 150
Textures\GUI\HUD\USGunsight.dds
100
@@ -1084,7 +1084,7 @@
Z
Y
Light
- 120
+ 250
Textures\GUI\HUD\USGunsight.dds
100
@@ -1168,7 +1168,7 @@
Z
Y
Light
- 120
+ 250
Textures\GUI\HUD\GermanTankSight.dds
100
@@ -1244,7 +1244,7 @@
Z
Y
Light
- 120
+ 250
Textures\GUI\HUD\GermanTankSight.dds
100
@@ -1466,7 +1466,7 @@
Z
Y
Light
- 120
+ 250
Textures\GUI\HUD\GermanTankSight.dds
100
From c9a6e2d404da8fba8e65220fad28227bc191e0f6 Mon Sep 17 00:00:00 2001
From: Aristeas <94058548+ari-steas@users.noreply.github.com>
Date: Fri, 14 Mar 2025 21:31:21 -0500
Subject: [PATCH 2/3] Update Aristeas NewUniversalUpload.yml
---
.github/workflows/Aristeas NewUniversalUpload.yml | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/.github/workflows/Aristeas NewUniversalUpload.yml b/.github/workflows/Aristeas NewUniversalUpload.yml
index 3b259788a..5d4672807 100644
--- a/.github/workflows/Aristeas NewUniversalUpload.yml
+++ b/.github/workflows/Aristeas NewUniversalUpload.yml
@@ -14,12 +14,6 @@ jobs:
- uses: actions/checkout@v4.1.4
with:
fetch-depth: 0
-
- - name: Get changed files
- id: changed-files
- uses: tj-actions/changed-files@v44
- with:
- separator: ','
#- name: List all changed files
# env:
@@ -30,6 +24,6 @@ jobs:
# done
- id: test_SEWT
run: |
- & "C:\Program Files\SCUniversalUpload\SC_NewUniversalUpload.exe" --repo "${{ github.workspace }}" --changes "${{ steps.changed-files.outputs.all_changed_and_modified_files }}" --changelog "${{ github.event.head_commit.message }}"
+ & "C:\Program Files\SCUniversalUpload\SC_NewUniversalUpload.exe" --repo "${{ github.workspace }}" --changelog "${{ github.event.head_commit.message }}"
- uses: EndBug/add-and-commit@v9
From 25bc3ef239e8bb9af6030e69afcfc49a341f88bb Mon Sep 17 00:00:00 2001
From: Aristeas <94058548+ari-steas@users.noreply.github.com>
Date: Fri, 14 Mar 2025 22:21:54 -0500
Subject: [PATCH 3/3] Update Aristeas_BuildScripts.yml
---
.github/workflows/Aristeas_BuildScripts.yml | 6 ------
1 file changed, 6 deletions(-)
diff --git a/.github/workflows/Aristeas_BuildScripts.yml b/.github/workflows/Aristeas_BuildScripts.yml
index a6767072d..37bea3400 100644
--- a/.github/workflows/Aristeas_BuildScripts.yml
+++ b/.github/workflows/Aristeas_BuildScripts.yml
@@ -13,12 +13,6 @@ jobs:
- uses: actions/checkout@v4.1.4
with:
fetch-depth: 0
-
- - name: Get changed files
- id: changed-files
- uses: tj-actions/changed-files@v44
- with:
- separator: ','
#- name: List all changed files
# env: