juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into ed-05-08-2024-upstream

Browse Source
This commit is contained in:
Ed
2024-08-05 21:08:20 +03:00
committed by GitHub
parent f5c0efd3cd 6ab9ca6bd0
commit 38c3bf2595
17 changed files with 295 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Content.Server/_CP14/Shuttles/CP14ExpeditionSystem.cs
View File

@@ -29,6 +29,11 @@ public sealed class CP14ExpeditionSystem : EntitySystem
/// </summary>
public float ArrivalTime { get; private set; }
/// <summary>
/// If enabled then spawns players on an expedition ship.
/// </summary>
public bool Enabled { get; private set; }
public override void Initialize()
{
base.Initialize();
@@ -38,12 +43,17 @@ public sealed class CP14ExpeditionSystem : EntitySystem
SubscribeLocalEvent<CP14StationExpeditionTargetComponent, FTLCompletedEvent>(OnExpeditionShipLanded);
ArrivalTime = _cfgManager.GetCVar(CCVars.CP14ExpeditionArrivalTime);
_cfgManager.OnValueChanged(CCVars.CP14ExpeditionArrivalTime, time => ArrivalTime = time, true);
}
Enabled = _cfgManager.GetCVar(CCVars.CP14ExpeditionShip);
_cfgManager.OnValueChanged(CCVars.CP14ExpeditionArrivalTime, time => ArrivalTime = time, true);
_cfgManager.OnValueChanged(CCVars.CP14ExpeditionShip, value => Enabled = value, true);
}
private void OnPostInitSetupExpeditionShip(Entity<CP14StationExpeditionTargetComponent> station, ref StationPostInitEvent args)
{
if (!Enabled)
return;
if (!Deleted(station.Comp.Shuttle))
return;
@@ -97,6 +107,9 @@ public sealed class CP14ExpeditionSystem : EntitySystem
public void HandlePlayerSpawning(PlayerSpawningEvent ev)
{
if (!Enabled)
return;
if (ev.SpawnResult != null)
return;

14
Content.Shared/CCVar/CCVars.cs
View File

@@ -11,11 +11,17 @@ namespace Content.Shared.CCVar
public sealed class CCVars : CVars
{
#region CP14
/// <summary>
/// how long does it take to fly an expedition ship to an expedition point?
/// </summary>
public static readonly CVarDef<float> CP14ExpeditionArrivalTime =
CVarDef.Create("cp14.arrival_time", 180f, CVar.SERVERONLY);
/// <summary>
/// is the expedition ship's system enabled?
/// </summary>
public static readonly CVarDef<bool> CP14ExpeditionShip =
CVarDef.Create("cp14.arrivals_ship", true, CVar.SERVERONLY);
#endregion
/*
* Server
@@ -1500,7 +1506,7 @@ namespace Content.Shared.CCVar
/// Whether the arrivals shuttle is enabled.
/// </summary>
public static readonly CVarDef<bool> ArrivalsShuttles =
CVarDef.Create("shuttle.arrivals", true, CVar.SERVERONLY);
CVarDef.Create("shuttle.arrivals", false, CVar.SERVERONLY); //CP14 arrivals disabled
/// <summary>
/// The map to use for the arrivals station.
@@ -1627,7 +1633,7 @@ namespace Content.Shared.CCVar
/// Whether the emergency shuttle is enabled or should the round just end.
/// </summary>
public static readonly CVarDef<bool> EmergencyShuttleEnabled =
CVarDef.Create("shuttle.emergency", true, CVar.SERVERONLY);
CVarDef.Create("shuttle.emergency", false, CVar.SERVERONLY); //CP14 Emergency disabled
/// <summary>
/// The percentage of time passed from the initial call to when the shuttle can no longer be recalled.

5
Resources/ConfigPresets/Build/development.toml
View File

@@ -1,4 +1,7 @@
[game]
[cp14]
arrivals_ship = false
[game]
# Straight in-game baby
lobbyenabled = false
# Dev map for faster loading & convenience

89
Resources/Prototypes/_CP14/Entities/Actions/Spells/earth_wall.yml Normal file
View File

@@ -0,0 +1,89 @@
- type: entity
id: CP14ActionSpellEarthWall
name: Earth wall
description: Raises a solid wall of earth from the bowels.
components:
- type: CP14MagicEffect
manaCost: 15
telegraphyEffects:
- !type:CP14SpellSpawnEntityOnTarget
spawns:
- CP14ImpactEffectEarthWall
effects:
- !type:CP14SpellSpawnEntityOnTarget
spawns:
- CP14WallSpawnEarthWall
- type: CP14MagicEffectVerbalAspect
startSpeech: "Surgite terram..."
endSpeech: "de profundis terrae"
- type: CP14MagicEffectCastingVisual
proto: CP14RuneEarthWall
- type: WorldTargetAction
useDelay: 10
range: 10
itemIconStyle: BigAction
sound: !type:SoundPathSpecifier
path: /Audio/Magic/rumble.ogg
icon:
sprite: _CP14/Effects/Magic/spells_icons.rsi
state: earth_wall
event: !type:CP14DelayedWorldTargetActionEvent
delay: 1
- type: entity
id: CP14RuneEarthWall
parent: CP14BaseMagicRune
categories: [ HideSpawnMenu ]
components:
- type: PointLight
color: "#8f6a2b"
- type: Sprite
layers:
- state: medium_line
color: "#8f6a2b"
shader: unshaded
- state: medium_circle
color: "#8f6a2b"
shader: unshaded
- type: entity
id: CP14ImpactEffectEarthWall
parent: CP14BaseMagicImpact
categories: [ HideSpawnMenu ]
components:
- type: Sprite
layers:
- state: particles_up
color: "#8f6a2b"
shader: unshaded
- type: entity
id: CP14WallSpawnEarthWall
noSpawn: True
placement:
mode: SnapgridCenter
components:
- type: Transform
anchored: True
- type: InteractionOutline
- type: Physics
bodyType: Static
- type: Sprite
offset: 0, 0.2
sprite: _CP14/Effects/cubeup.rsi
state: cube_up
- type: Fixtures
fixtures:
portalFixture:
shape:
!type:PhysShapeAabb
bounds: "-0.25,-0.48,0.25,0.48"
mask:
- FullTileMask
layer:
- WallLayer
hard: false
- type: TimedDespawn
lifetime: 1.2
- type: SpawnOnDespawn
prototype: CP14WallDirt

70
Resources/Prototypes/_CP14/Entities/Actions/Spells/ice_floor.yml Normal file
View File

@@ -0,0 +1,70 @@
- type: entity
id: CP14ActionSpellIceFloor
name: Ice floor
description: Covers a specified area of land with slippery ice.
components:
- type: CP14MagicEffect
manaCost: 10
telegraphyEffects:
- !type:CP14SpellSpawnEntityOnTarget
spawns:
- CP14ImpactEffectIceFloor
effects:
- !type:CP14SpellSpawnEntityOnTarget
spawns:
- CP14IceFloor
- type: CP14MagicEffectVerbalAspect
startSpeech: "Humus deorsum..."
endSpeech: "operietur glacie"
- type: CP14MagicEffectCastingVisual
proto: CP14RuneIceFloor
- type: WorldTargetAction
useDelay: 5
range: 5
itemIconStyle: BigAction
sound: !type:SoundPathSpecifier
path: /Audio/Magic/rumble.ogg
icon:
sprite: _CP14/Effects/Magic/spells_icons.rsi
state: ice_floor
event: !type:CP14DelayedWorldTargetActionEvent
delay: 1
breakOnMove: false
- type: entity
id: CP14RuneIceFloor
parent: CP14BaseMagicRune
categories: [ HideSpawnMenu ]
components:
- type: PointLight
color: "#5eabeb"
- type: Sprite
layers:
- state: medium_circle
color: "#5eabeb"
shader: unshaded
- type: entity
id: CP14ImpactEffectIceFloor
parent: CP14BaseMagicImpact
categories: [ HideSpawnMenu ]
components:
- type: Sprite
layers:
- state: particles_up
color: "#5eabeb"
shader: unshaded
- type: entity
id: CP14IceFloor
parent: IceCrust
name: ice crust
description: It's cold and slippery.
components:
- type: Slippery
paralyzeTime: 1
launchForwardsMultiplier: 1.5
- type: StepTrigger
intersectRatio: 0.2
- type: CollisionWake
enabled: false

38
Resources/Prototypes/_CP14/Entities/Clothing/Rings/ring.yml
View File

@@ -135,4 +135,40 @@
- type: CP14SpellStorageAccessWearing
- type: CP14SpellStorage
spells:
- CP14ActionSpellShadowGrab
- CP14ActionSpellShadowGrab
- type: entity
id: CP14ClothingRingEarthWall
parent: CP14ClothingRingBase
name: conductive ring
description: A standard mana-conductive ring that allows the user to heal physical injuries.
suffix: Earth wall
components:
- type: Sprite
layers:
- state: brass_ring
- state: berill_stone_small
- type: CP14SpellStorageRequireAttune
- type: CP14MagicAttuningItem
- type: CP14SpellStorageAccessWearing
- type: CP14SpellStorage
spells:
- CP14ActionSpellEarthWall
- type: entity
id: CP14ClothingRingIceFloor
parent: CP14ClothingRingBase
name: conductive ring
description: A standard mana-conductive ring that allows the user to heal physical injuries.
suffix: Ice floor
components:
- type: Sprite
layers:
- state: brass_ring
- state: saphhire_stone_small
- type: CP14SpellStorageRequireAttune
- type: CP14MagicAttuningItem
- type: CP14SpellStorageAccessWearing
- type: CP14SpellStorage
spells:
- CP14ActionSpellIceFloor

4
Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/battleHammer.yml
View File

@@ -22,7 +22,7 @@
- type: MeleeWeapon
angle: 120
attackRate: 0.7
range: 1.8
range: 1.6
wideAnimationRotation: 320
wideAnimation: CP14WeaponArcSlash
damage:
@@ -36,7 +36,7 @@
- type: IncreaseDamageOnWield
damage:
types:
Blunt: 9
Blunt: 8
Structural: 10
- type: StaminaDamageOnHit
damage: 10

8
Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/battleStaff.yml
View File

@@ -24,21 +24,21 @@
- type: IncreaseDamageOnWield
damage:
types:
Blunt: 5
Blunt: 4
- type: MeleeWeapon
angle: 100
attackRate: 1.3
range: 1.5
range: 1.3
wideAnimationRotation: -30
wideAnimation: CP14WeaponArcSlash
damage:
types:
Blunt: 5
Blunt: 4
soundHit:
collection: MetalThud
cPAnimationLength: 0.3
cPAnimationOffset: -1.3
- type: StaminaDamageOnHit
damage: 12
damage: 9
- type: CP14Currency
currency: 20

22
Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml
View File

@@ -66,4 +66,24 @@
sprite: _CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi
- type: Tag
tags:
- CP14HerbalGathering
- CP14HerbalGathering
- type: MeleeWeapon
angle: 110
attackRate: 0.6
range: 1.4
wideAnimationRotation: 205
wideAnimation: CP14WeaponArcSlash
damage:
types:
Slash: 4
Blunt: 3
soundHit:
collection: MetalThud
cPAnimationLength: 0.6
- type: Wieldable
- type: IncreaseDamageOnWield
damage:
types:
Slash: 6
- type: CP14Currency
currency: 2000

BIN
Resources/Textures/_CP14/Clothing/Rings/rings.rsi/berill_stone_small.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 164 B

3
Resources/Textures/_CP14/Clothing/Rings/rings.rsi/meta.json
View File

@@ -21,6 +21,9 @@
},
{
"name": "amethyst_stone_small"
},
{
"name": "berill_stone_small"
}
]
}

BIN
Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/earth_wall.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/ice_floor.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

6
Resources/Textures/_CP14/Effects/Magic/spells_icons.rsi/meta.json
View File

@@ -27,6 +27,12 @@
},
{
"name": "shadow_grab"
},
{
"name": "ice_floor"
},
{
"name": "earth_wall"
}
]
}

BIN
Resources/Textures/_CP14/Effects/cubeup.rsi/cube_up.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.4 KiB

30
Resources/Textures/_CP14/Effects/cubeup.rsi/meta.json Normal file
View File

@@ -0,0 +1,30 @@
{
"version": 1,
"license": "All rights reserved for the CrystallPunk14 project only",
"copyright": "Created by TheShuEd (Discord) and modified by Jaraten (github/Discord) for CrystallPunk14",
"size": {
"x": 32,
"y": 48
},
"states": [
{
"name": "cube_up",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
}
]
}

8
Resources/Textures/_CP14/Shaders/wave.swsl
View File

@@ -3,9 +3,9 @@ preset raw;
varying highp vec2 Pos;
varying highp vec4 VtxModulate;
uniform highp float Speed = 3.0;
uniform highp float Dis = 10.0;
uniform highp float Offset = 0.0;
uniform highp float Speed;
uniform highp float Dis;
uniform highp float Offset;
void fragment() {
// Re-create base mvp
@@ -21,4 +21,4 @@ void vertex() {
UV = mix(modifyUV.xy, modifyUV.zw, tCoord);
UV2 = tCoord2;
VtxModulate = zFromSrgb(modulate);
}
}