Browse Source

bwuh

master
Alison Watson 2 months ago
parent
commit
883887f0f0
8 changed files with 11 additions and 7 deletions
  1. BIN
      pk7/acs/lithmain.bin
  2. +1
    -0
      pk7/language.txt
  3. +5
    -3
      pk7/lzscript/6_DarkLord/0_Weapon.zsc
  4. +1
    -1
      pk7/lzscript/Playsim/Events.zsc
  5. +3
    -3
      pk7/lzscript/Playsim/Player.zsc
  6. BIN
      pk7/sprites/WeaponsA/ASPGA0.png
  7. BIN
      pk7/sprites/WeaponsA/ASPGB0.png
  8. +1
    -0
      text/en/Misc/Markers.txt

BIN
pk7/acs/lithmain.bin View File


+ 1
- 0
pk7/language.txt View File

@@ -1358,6 +1358,7 @@
"LITH_MARKER_Unknown" = "Unknown";
"LITH_MARKER_M1A1_EscapePod" = "Escape Pod 02C3";
"LITH_MARKER_M1A1_Quarters" = "Personal Quarters";
"LITH_MARKER_M1A1_Maintenance" = "Maintenance Area";
"LITH_MARKER_M1A1_TeleportBay" = "Teleport Bay 1E14";
"QUITMSG1" = "Hold it, your contract isn't complete yet!";
"QUITMSG2" = "I got nothing.";


+ 5
- 3
pk7/lzscript/6_DarkLord/0_Weapon.zsc View File

@@ -174,7 +174,6 @@ override void tick() {

states(Weapon) {
_Sprint:
#### # 0 A_JumpIf(invoker is "Lith_DualRocket", "_SprintLoop");
#### # 1 offset(1, 34);
#### # 1 offset(4, 40);
#### # 1 offset(10, 55);
@@ -182,7 +181,11 @@ _Sprint:
#### # 1 offset(21, 90);
#### # 1 offset(24, 120);
#### # 1 offset(25, 160) Lith_Sprint;
TNT1 A 1 offset(1, 32) Lith_Sprint;
TNT1 A 1 offset(1, 32) {
Lith_Sprint();
A_Overlay(_psp_double_lg, "Null");
A_Overlay(_psp_double_rg, "Null");
}
_SprintLoop:
DSPG A 0 Lith_JumpIfSprint;
DSPG # 1 offset(-18, 45) Lith_Sprint;
@@ -208,7 +211,6 @@ _SprintLoop:
DSPG # 1 offset(-20, 45) Lith_Sprint;
loop;
_SprintDone:
TNT1 A 0 A_JumpIf(invoker is "Lith_DualRocket", "Select");
TNT1 A 1 offset(1, 32) A_Lower(60);
TNT1 A 0 resolveState("Select");
stop;


+ 1
- 1
pk7/lzscript/Playsim/Events.zsc View File

@@ -149,7 +149,7 @@ override void WorldLoaded(WorldEvent ev)
Sector sec = level.sectors[i];
if(sec.getTexture(Sector.Ceiling) == skyflatnum) {
if(in_hell) sec.setColor("#ff7777");
sec.lightlevel = clamp(sec.lightlevel * lith_sv_skydarkening, 64, 255);
sec.lightlevel = int(clamp(sec.lightlevel * lith_sv_skydarkening, 64.0, 255.0));
}
}
}


+ 3
- 3
pk7/lzscript/Playsim/Player.zsc View File

@@ -29,9 +29,9 @@ static void Unproject(Actor mo, double x_, double y_, double z_, int px, int py,

static void TraceFrom(Actor mo, double yaw, double pitch, double dist, double offsetz, bool floor, int px, int py, int pz) {
vector3 v = Lith_UTIL.TraceFrom(mo, yaw * 360, pitch * 360, dist, offsetz, floor);
if(px) ACS_ExecuteWithResult(lsc_setptrk32, px, v.x * FIX);
if(py) ACS_ExecuteWithResult(lsc_setptrk32, py, v.y * FIX);
if(pz) ACS_ExecuteWithResult(lsc_setptrk32, pz, v.z * FIX);
if(px) ACS_ExecuteWithResult(lsc_setptrk32, px, int(v.x * FIX));
if(py) ACS_ExecuteWithResult(lsc_setptrk32, py, int(v.y * FIX));
if(pz) ACS_ExecuteWithResult(lsc_setptrk32, pz, int(v.z * FIX));
}

static void PlayerInit(Actor mo_) {


BIN
pk7/sprites/WeaponsA/ASPGA0.png View File

Before After
Width: 104  |  Height: 91  |  Size: 13KB

BIN
pk7/sprites/WeaponsA/ASPGB0.png View File

Before After
Width: 104  |  Height: 91  |  Size: 13KB

+ 1
- 0
text/en/Misc/Markers.txt View File

@@ -33,6 +33,7 @@ Press {+crouch} to crouch into the vent.

== \#MARKER_M1A1_EscapePod | Escape Pod 02C3
== \#MARKER_M1A1_Quarters | Personal Quarters
== \#MARKER_M1A1_Maintenance | Maintenance Area
== \#MARKER_M1A1_TeleportBay | Teleport Bay 1E14

## EOF

Loading…
Cancel
Save