100 и 130 мм пушки

AdventureTimeSS14 · Dec 20, 2024 · 680dc3d · 680dc3d
1 parent 512d90c
commit 680dc3d
Show file tree

Hide file tree

Showing 34 changed files with 583 additions and 6 deletions.
diff --git a/...obalEvents/ShipBattle/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/ship_shells.yml b/...obalEvents/ShipBattle/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/ship_shells.yml
@@ -36,7 +36,7 @@
   - type: Sprite
     sprite: ADT/ADTGlobalEvents/ShipBattle/Objects/Weapons/Guns/Ammunition/Casings/100mm.rsi
     layers:
-    - state: base_he
+    - state: he
       map: ["enum.AmmoVisualLayers.Base"]
   - type: Appearance
   - type: SpentAmmoVisuals
@@ -46,6 +46,8 @@
     price: 100
   - type: Item
     size: Ginormous
+    sprite: ADT/ADTGlobalEvents/ShipBattle/Objects/Weapons/Guns/Ammunition/Casings/100mm.rsi
+    heldPrefix: he
   - type: MultiHandedItem
   - type: ClothingSpeedModifier
     walkModifier: 0.9
@@ -63,8 +65,12 @@
   - type: Sprite
     sprite: ADT/ADTGlobalEvents/ShipBattle/Objects/Weapons/Guns/Ammunition/Casings/100mm.rsi
     layers:
-    - state: base_emp
+    - state: emp
       map: ["enum.AmmoVisualLayers.Base"]
+  - type: Item
+    size: Ginormous
+    sprite: ADT/ADTGlobalEvents/ShipBattle/Objects/Weapons/Guns/Ammunition/Casings/100mm.rsi
+    heldPrefix: emp
 
 - type: entity
   parent: ADTShipBattle100mmHEShell
@@ -76,8 +82,12 @@
   - type: Sprite
     sprite: ADT/ADTGlobalEvents/ShipBattle/Objects/Weapons/Guns/Ammunition/Casings/100mm.rsi
     layers:
-    - state: base_ap
+    - state: ap
       map: ["enum.AmmoVisualLayers.Base"]
+  - type: Item
+    size: Ginormous
+    sprite: ADT/ADTGlobalEvents/ShipBattle/Objects/Weapons/Guns/Ammunition/Casings/100mm.rsi
+    heldPrefix: ap
 
 #130 мм снаряды
 - type: entity
@@ -93,8 +103,12 @@
   - type: Sprite
     sprite: ADT/ADTGlobalEvents/ShipBattle/Objects/Weapons/Guns/Ammunition/Casings/130mm.rsi
     layers:
-    - state: base_he
+    - state: he
       map: ["enum.AmmoVisualLayers.Base"]
+  - type: Item
+    size: Ginormous
+    sprite: ADT/ADTGlobalEvents/ShipBattle/Objects/Weapons/Guns/Ammunition/Casings/130mm.rsi
+    heldPrefix: he
   - type: StaticPrice
     price: 200
   - type: ClothingSpeedModifier
@@ -111,8 +125,12 @@
   - type: Sprite
     sprite: ADT/ADTGlobalEvents/ShipBattle/Objects/Weapons/Guns/Ammunition/Casings/130mm.rsi
     layers:
-    - state: base_emp
+    - state: emp
       map: ["enum.AmmoVisualLayers.Base"]
+  - type: Item
+    size: Ginormous
+    sprite: ADT/ADTGlobalEvents/ShipBattle/Objects/Weapons/Guns/Ammunition/Casings/130mm.rsi
+    heldPrefix: emp
 
 - type: entity
   parent: ADTShipBattle130mmHEShell
@@ -124,5 +142,9 @@
   - type: Sprite
     sprite: ADT/ADTGlobalEvents/ShipBattle/Objects/Weapons/Guns/Ammunition/Casings/130mm.rsi
     layers:
-    - state: base_ap
+    - state: ap
       map: ["enum.AmmoVisualLayers.Base"]
+  - type: Item
+    size: Ginormous
+    sprite: ADT/ADTGlobalEvents/ShipBattle/Objects/Weapons/Guns/Ammunition/Casings/130mm.rsi
+    heldPrefix: ap
diff --git a/...balEvents/ShipBattle/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/ship_shells.yml b/...balEvents/ShipBattle/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/ship_shells.yml
@@ -11,3 +11,141 @@
         Structural: 100
   - type: StaminaDamageOnCollide
     damage: 75
+  - type: TimedDespawn
+    lifetime: 20
+
+#100 mm
+- type: entity
+  id: ADTShipBattleBullet100mmHE
+  name: 100 mm HE
+  parent: BaseBulletTrigger
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
+    layers:
+      - state: grenade
+  - type: ExplodeOnTrigger
+  - type: Explosive
+    explosionType: Default
+    totalIntensity: 300 # a ~2 tile radius
+    intensitySlope: 5
+    maxIntensity: 10
+  - type: Projectile
+    damage:
+      types:
+        Piercing: 200
+        Structural: 500
+  - type: TimedDespawn
+    lifetime: 20
+
+- type: entity
+  id: ADTShipBattleBullet100mmEMP
+  name: 100 mm EMP
+  parent: BaseBulletTrigger
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
+    layers:
+      - state: frag
+  - type: EmpOnTrigger
+    range: 7
+    energyConsumption: 50000
+    disableDuration: 5
+  - type: Ammo
+    muzzleFlash: null
+  - type: PointLight
+    radius: 3.5
+    color: blue
+    energy: 0.5
+  - type: TimedDespawn
+    lifetime: 20
+
+- type: entity
+  categories: [ HideSpawnMenu ]
+  parent: BaseBullet
+  id: ADTShipBattleBullet100mmAP
+  name: 100 mm EMP
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Piercing: 500 # ADT tweak
+        Structural: 1000
+  - type: StaminaDamageOnCollide
+    damage: 300
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
+    layers:
+      - state: frag
+  - type: TimedDespawn
+    lifetime: 20
+
+#100 mm
+- type: entity
+  id: ADTShipBattleBullet130mmHE
+  name: 130 mm HE
+  parent: BaseBulletTrigger
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
+    layers:
+      - state: grenade
+  - type: ExplodeOnTrigger
+  - type: Explosive
+    explosionType: Default
+    totalIntensity: 450 # a ~2 tile radius
+    intensitySlope: 4
+    maxIntensity: 15
+  - type: Projectile
+    damage:
+      types:
+        Piercing: 200
+        Structural: 500
+  - type: TimedDespawn
+    lifetime: 20
+
+- type: entity
+  id: ADTShipBattleBullet130mmEMP
+  name: 130 mm EMP
+  parent: BaseBulletTrigger
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
+    layers:
+      - state: frag
+  - type: EmpOnTrigger
+    range: 7
+    energyConsumption: 50000
+    disableDuration: 10
+  - type: Ammo
+    muzzleFlash: null
+  - type: PointLight
+    radius: 3.5
+    color: blue
+    energy: 0.5
+  - type: TimedDespawn
+    lifetime: 20
+
+- type: entity
+  categories: [ HideSpawnMenu ]
+  parent: BaseBullet
+  id: ADTShipBattleBullet130mmAP
+  name: 130 mm EMP
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Piercing: 500 # ADT tweak
+        Structural: 1500
+  - type: StaminaDamageOnCollide
+    damage: 300
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
+    layers:
+      - state: frag
+  - type: TimedDespawn
+    lifetime: 20