Browse Source

add place markers

tags/1.6.3
Alison Watson 1 year ago
parent
commit
44f9fa2641
86 changed files with 202 additions and 92 deletions
  1. BIN
      pk7/acs/lithmain.bin
  2. BIN
      pk7/fonts/areaname/00000030.png
  3. BIN
      pk7/fonts/areaname/00000031.png
  4. BIN
      pk7/fonts/areaname/00000032.png
  5. BIN
      pk7/fonts/areaname/00000033.png
  6. BIN
      pk7/fonts/areaname/00000034.png
  7. BIN
      pk7/fonts/areaname/00000035.png
  8. BIN
      pk7/fonts/areaname/00000036.png
  9. BIN
      pk7/fonts/areaname/00000037.png
  10. BIN
      pk7/fonts/areaname/00000038.png
  11. BIN
      pk7/fonts/areaname/00000039.png
  12. BIN
      pk7/fonts/areaname/00000041.png
  13. BIN
      pk7/fonts/areaname/00000042.png
  14. BIN
      pk7/fonts/areaname/00000043.png
  15. BIN
      pk7/fonts/areaname/00000044.png
  16. BIN
      pk7/fonts/areaname/00000045.png
  17. BIN
      pk7/fonts/areaname/00000046.png
  18. BIN
      pk7/fonts/areaname/00000047.png
  19. BIN
      pk7/fonts/areaname/00000048.png
  20. BIN
      pk7/fonts/areaname/00000049.png
  21. BIN
      pk7/fonts/areaname/0000004A.png
  22. BIN
      pk7/fonts/areaname/0000004B.png
  23. BIN
      pk7/fonts/areaname/0000004C.png
  24. BIN
      pk7/fonts/areaname/0000004D.png
  25. BIN
      pk7/fonts/areaname/0000004E.png
  26. BIN
      pk7/fonts/areaname/0000004F.png
  27. BIN
      pk7/fonts/areaname/00000050.png
  28. BIN
      pk7/fonts/areaname/00000051.png
  29. BIN
      pk7/fonts/areaname/00000052.png
  30. BIN
      pk7/fonts/areaname/00000053.png
  31. BIN
      pk7/fonts/areaname/00000054.png
  32. BIN
      pk7/fonts/areaname/00000055.png
  33. BIN
      pk7/fonts/areaname/00000056.png
  34. BIN
      pk7/fonts/areaname/00000057.png
  35. BIN
      pk7/fonts/areaname/00000058.png
  36. BIN
      pk7/fonts/areaname/00000059.png
  37. BIN
      pk7/fonts/areaname/0000005A.png
  38. BIN
      pk7/fonts/areaname/00000061.png
  39. BIN
      pk7/fonts/areaname/00000062.png
  40. BIN
      pk7/fonts/areaname/00000063.png
  41. BIN
      pk7/fonts/areaname/00000064.png
  42. BIN
      pk7/fonts/areaname/00000065.png
  43. BIN
      pk7/fonts/areaname/00000066.png
  44. BIN
      pk7/fonts/areaname/00000067.png
  45. BIN
      pk7/fonts/areaname/00000068.png
  46. BIN
      pk7/fonts/areaname/00000069.png
  47. BIN
      pk7/fonts/areaname/0000006A.png
  48. BIN
      pk7/fonts/areaname/0000006B.png
  49. BIN
      pk7/fonts/areaname/0000006C.png
  50. BIN
      pk7/fonts/areaname/0000006D.png
  51. BIN
      pk7/fonts/areaname/0000006E.png
  52. BIN
      pk7/fonts/areaname/0000006F.png
  53. BIN
      pk7/fonts/areaname/00000070.png
  54. BIN
      pk7/fonts/areaname/00000071.png
  55. BIN
      pk7/fonts/areaname/00000072.png
  56. BIN
      pk7/fonts/areaname/00000073.png
  57. BIN
      pk7/fonts/areaname/00000074.png
  58. BIN
      pk7/fonts/areaname/00000075.png
  59. BIN
      pk7/fonts/areaname/00000076.png
  60. BIN
      pk7/fonts/areaname/00000077.png
  61. BIN
      pk7/fonts/areaname/00000078.png
  62. BIN
      pk7/fonts/areaname/00000079.png
  63. BIN
      pk7/fonts/areaname/0000007A.png
  64. +2
    -0
      pk7/fonts/areaname/font.inf
  65. +0
    -7
      pk7/language.gfx.txt
  66. +7
    -0
      pk7/language.txt
  67. +1
    -1
      pk7/lzscript/Client/Draw.zsc
  68. +6
    -0
      pk7/lzscript/Constants.zsc
  69. +1
    -0
      pk7/lzscript/Decorations.zsc
  70. +5
    -10
      pk7/lzscript/Decorations/Advice.zsc
  71. +31
    -0
      pk7/lzscript/Decorations/Marker.zsc
  72. +16
    -6
      pk7/lzscript/Player.zsc
  73. +1
    -1
      pk7/lzscript/Playsim/Cyberspace.zsc
  74. +1
    -0
      pk7/mapinfo.txt
  75. +8
    -0
      pk7_ep1/language.gfx.txt
  76. BIN
      pk7_ep1/maps/M1A1.wad
  77. BIN
      pk7_ep1/maps/M1A2.wad
  78. +1
    -0
      source/Headers/m_stab.h
  79. +32
    -8
      source/Main/p_player.c
  80. +1
    -0
      text/en/Misc.txt
  81. +24
    -0
      text/en/Misc/Markers.txt
  82. +1
    -1
      tools/comprsnd.rb
  83. +4
    -3
      tools/genbuild.rb
  84. +0
    -31
      tools/getcmap.rb
  85. +8
    -9
      tools/hashfs.rb
  86. +52
    -15
      tools/mkfont.rb

BIN
pk7/acs/lithmain.bin View File


BIN
pk7/fonts/areaname/00000030.png View File

Before After
Width: 18  |  Height: 36  |  Size: 564B

BIN
pk7/fonts/areaname/00000031.png View File

Before After
Width: 14  |  Height: 36  |  Size: 427B

BIN
pk7/fonts/areaname/00000032.png View File

Before After
Width: 18  |  Height: 36  |  Size: 642B

BIN
pk7/fonts/areaname/00000033.png View File

Before After
Width: 18  |  Height: 36  |  Size: 615B

BIN
pk7/fonts/areaname/00000034.png View File

Before After
Width: 18  |  Height: 36  |  Size: 531B

BIN
pk7/fonts/areaname/00000035.png View File

Before After
Width: 18  |  Height: 36  |  Size: 563B

BIN
pk7/fonts/areaname/00000036.png View File

Before After
Width: 18  |  Height: 36  |  Size: 574B

BIN
pk7/fonts/areaname/00000037.png View File

Before After
Width: 17  |  Height: 36  |  Size: 596B

BIN
pk7/fonts/areaname/00000038.png View File

Before After
Width: 18  |  Height: 36  |  Size: 610B

BIN
pk7/fonts/areaname/00000039.png View File

Before After
Width: 18  |  Height: 36  |  Size: 575B

BIN
pk7/fonts/areaname/00000041.png View File

Before After
Width: 18  |  Height: 36  |  Size: 539B

BIN
pk7/fonts/areaname/00000042.png View File

Before After
Width: 18  |  Height: 36  |  Size: 577B

BIN
pk7/fonts/areaname/00000043.png View File

Before After
Width: 18  |  Height: 36  |  Size: 462B

BIN
pk7/fonts/areaname/00000044.png View File

Before After
Width: 18  |  Height: 36  |  Size: 514B

BIN
pk7/fonts/areaname/00000045.png View File

Before After
Width: 18  |  Height: 36  |  Size: 535B

BIN
pk7/fonts/areaname/00000046.png View File

Before After
Width: 17  |  Height: 36  |  Size: 502B

BIN
pk7/fonts/areaname/00000047.png View File

Before After
Width: 18  |  Height: 36  |  Size: 551B

BIN
pk7/fonts/areaname/00000048.png View File

Before After
Width: 18  |  Height: 36  |  Size: 516B

BIN
pk7/fonts/areaname/00000049.png View File

Before After
Width: 10  |  Height: 36  |  Size: 396B

BIN
pk7/fonts/areaname/0000004A.png View File

Before After
Width: 18  |  Height: 36  |  Size: 502B

BIN
pk7/fonts/areaname/0000004B.png View File

Before After
Width: 18  |  Height: 36  |  Size: 546B

BIN
pk7/fonts/areaname/0000004C.png View File

Before After
Width: 18  |  Height: 36  |  Size: 409B

BIN
pk7/fonts/areaname/0000004D.png View File

Before After
Width: 18  |  Height: 36  |  Size: 475B

BIN
pk7/fonts/areaname/0000004E.png View File

Before After
Width: 18  |  Height: 36  |  Size: 452B

BIN
pk7/fonts/areaname/0000004F.png View File

Before After
Width: 18  |  Height: 36  |  Size: 507B

BIN
pk7/fonts/areaname/00000050.png View File

Before After
Width: 18  |  Height: 36  |  Size: 540B

BIN
pk7/fonts/areaname/00000051.png View File

Before After
Width: 18  |  Height: 36  |  Size: 499B

BIN
pk7/fonts/areaname/00000052.png View File

Before After
Width: 18  |  Height: 36  |  Size: 630B

BIN
pk7/fonts/areaname/00000053.png View File

Before After
Width: 18  |  Height: 36  |  Size: 652B

BIN
pk7/fonts/areaname/00000054.png View File

Before After
Width: 18  |  Height: 36  |  Size: 432B

BIN
pk7/fonts/areaname/00000055.png View File

Before After
Width: 18  |  Height: 36  |  Size: 475B

BIN
pk7/fonts/areaname/00000056.png View File

Before After
Width: 18  |  Height: 36  |  Size: 515B

BIN
pk7/fonts/areaname/00000057.png View File

Before After
Width: 18  |  Height: 36  |  Size: 497B

BIN
pk7/fonts/areaname/00000058.png View File

Before After
Width: 18  |  Height: 36  |  Size: 561B

BIN
pk7/fonts/areaname/00000059.png View File

Before After
Width: 18  |  Height: 36  |  Size: 533B

BIN
pk7/fonts/areaname/0000005A.png View File

Before After
Width: 18  |  Height: 36  |  Size: 566B

BIN
pk7/fonts/areaname/00000061.png View File

Before After
Width: 18  |  Height: 36  |  Size: 477B

BIN
pk7/fonts/areaname/00000062.png View File

Before After
Width: 18  |  Height: 36  |  Size: 584B

BIN
pk7/fonts/areaname/00000063.png View File

Before After
Width: 18  |  Height: 36  |  Size: 475B

BIN
pk7/fonts/areaname/00000064.png View File

Before After
Width: 18  |  Height: 36  |  Size: 515B

BIN
pk7/fonts/areaname/00000065.png View File

Before After
Width: 18  |  Height: 36  |  Size: 540B

BIN
pk7/fonts/areaname/00000066.png View File

Before After
Width: 17  |  Height: 36  |  Size: 511B

BIN
pk7/fonts/areaname/00000067.png View File

Before After
Width: 18  |  Height: 36  |  Size: 552B

BIN
pk7/fonts/areaname/00000068.png View File

Before After
Width: 18  |  Height: 36  |  Size: 516B

BIN
pk7/fonts/areaname/00000069.png View File

Before After
Width: 10  |  Height: 36  |  Size: 400B

BIN
pk7/fonts/areaname/0000006A.png View File

Before After
Width: 18  |  Height: 36  |  Size: 494B

BIN
pk7/fonts/areaname/0000006B.png View File

Before After
Width: 18  |  Height: 36  |  Size: 531B

BIN
pk7/fonts/areaname/0000006C.png View File

Before After
Width: 18  |  Height: 36  |  Size: 416B

BIN
pk7/fonts/areaname/0000006D.png View File

Before After
Width: 18  |  Height: 36  |  Size: 495B

BIN
pk7/fonts/areaname/0000006E.png View File

Before After
Width: 18  |  Height: 36  |  Size: 460B

BIN
pk7/fonts/areaname/0000006F.png View File

Before After
Width: 18  |  Height: 36  |  Size: 518B

BIN
pk7/fonts/areaname/00000070.png View File

Before After
Width: 18  |  Height: 36  |  Size: 535B

BIN
pk7/fonts/areaname/00000071.png View File

Before After
Width: 18  |  Height: 36  |  Size: 516B

BIN
pk7/fonts/areaname/00000072.png View File

Before After
Width: 18  |  Height: 36  |  Size: 600B

BIN
pk7/fonts/areaname/00000073.png View File

Before After
Width: 18  |  Height: 36  |  Size: 595B

BIN
pk7/fonts/areaname/00000074.png View File

Before After
Width: 18  |  Height: 36  |  Size: 435B

BIN
pk7/fonts/areaname/00000075.png View File

Before After
Width: 18  |  Height: 36  |  Size: 485B

BIN
pk7/fonts/areaname/00000076.png View File

Before After
Width: 18  |  Height: 36  |  Size: 529B

BIN
pk7/fonts/areaname/00000077.png View File

Before After
Width: 18  |  Height: 36  |  Size: 502B

BIN
pk7/fonts/areaname/00000078.png View File

Before After
Width: 18  |  Height: 36  |  Size: 548B

BIN
pk7/fonts/areaname/00000079.png View File

Before After
Width: 18  |  Height: 36  |  Size: 525B

BIN
pk7/fonts/areaname/0000007A.png View File

Before After
Width: 18  |  Height: 36  |  Size: 567B

+ 2
- 0
pk7/fonts/areaname/font.inf View File

@@ -0,0 +1,2 @@
FontHeight 30
SpaceWidth 10

+ 0
- 7
pk7/language.gfx.txt View File

@@ -140,14 +140,7 @@ identifier,default
:Portraits:Marine,lgfx/Portraits/Marine.png
:RifleScope,lgfx/RifleScope.png
:Terminal:01602,lgfx/Terminal/01602.png
:Terminal:1,lgfx/Terminal/1.png
:Terminal:2,lgfx/Terminal/2.png
:Terminal:3,lgfx/Terminal/3.png
:Terminal:AOF,lgfx/Terminal/AOF.png
:Terminal:LogonAOF,lgfx/Terminal/LogonAOF.png
:Terminal:LogonData,lgfx/Terminal/LogonData.png
:Terminal:Teleport,lgfx/Terminal/Teleport.png
:Terminal:UAC,lgfx/Terminal/UAC.png
:UI:ArmorInter,lgfx/UI/ArmorInter.png
:UI:AttrBar1,lgfx/UI/AttrBar1.png
:UI:AttrBar2,lgfx/UI/AttrBar2.png


+ 7
- 0
pk7/language.txt View File

@@ -1159,6 +1159,13 @@
"LITH_UPDATE_1_2_Page2" = "\cj| Made the pistol do more damage\n\cj| Probably fixed more crashes\n\cj| Made combat rifle spit blood better\n\cj| Made the cannon a bit easier to aim\n\cj| Fixed revenant missiles changing state when adrenaline is activated\n\cj| Fixed all the crashes ever probably\n\cj| Changed the pistol's capacity to 14 rounds instead of 7\n\cj| Moved murderous enemies to the Extra Hard skill\n\cj| Fixed not being able to pick up weapons sometimes\n\cj| Made the pistol, rocket launcher and shotgun's firing animations better\n\cj| Fixed the spiral rocket attack not being strong enough and not doing\n\cj damage to Cyberdemons\n\cj| Gave the Gauss Rifle 5 extra rounds\n\cj| Fixed scopes being offset wrong\n\cj| Buffed the rocket launcher's attacks\n\cj| Nerfed the shotgun's attacks\n\cj| Fixed the barrier powerup acting weirdly sometimes\n\cj| Fixed flashes not showing up on players in co-op\n\cj| Reduced file size by compressing music\n\cj| Made the punctuator cannon's attacks pitchable\n\cj| Buffed bosses quite a bit\n\cj| Buffed some weapons";
"LITH_UPDATE_1_1" = "\cf(\ciJan. 19, 2017\cf) \cjFrom \cn1.0\cj to \cf1.1\cj:\n\cd+ Added an indicator for weapons that take ammo and ones that have\n\cd magazines\n\cd+ Added reloading to the rifle, which now has a 40-round magazine that\n\cd must be reloaded but doesn't take ammo\n\cd+ Added the Defensive Mini Nuke upgrade\n\cd+ Made the player explode on death in singleplayer, togglable\n\cd with lith_sv_revenge\n\cd+ Gave grenades a small smoke trail\n\cd+ Added weapon readying sounds to the Former Human and Former\n\cd Sergeant\n\cd+ Added the Adrenaline Injector upgrade\n\cd+ Moved the HUD into an upgrade, so it can be disabled (also gives you\n\cd extra score)\n\cd+ Gave the Mancubus a new attack\n\cd+ Gave the Cyberdemon a new attack\n\cd+ Added powerups to the shop\n\cd+ Added a score multiplier view to the upgrades shop so you can see\n\cd what gives how much\n\cd+ Added the Instant Death downgrade\n\cd+ Added reloading to the Gauss Shotgun (now Gauss Rifle), which has a\n\cd 10-round magazine";
"LITH_UPDATE_1_1_Page2" = "\cd+ Added a settings page to the CBI which lets you set up CVars\n\cd+ Gave the Hell Knight a new attack\n\cd+ Gave the Omega Cannon new sprites, new effects and better balance\n\cd+ Added the Reactive Armor 2 upgrade\n\cd+ Added the Omega Railgun upgrade!\n\cd+ Gave the Shotgun new sprites/animations by Sgt. Shivers\n\cd+ Gave the Megasphere and Soulsphere new sprites\n\cd+ Added a custom Teleport Fog effect\n\cd+ Gave the Baron of Hell a new attack\n\cd+ Made the Blur Sphere into a Barrier powerup\n\cd+ Added fun\n\cj| Fixed the laser rifle making too many particles, destroying FPS (sadly\n\cj it doesn't look as nice anymore)\n\cj| Fixed a potential script overrun in the first tic that could cause\n\cj weird bugs\n\cj| Fixed deselecting the Punctuator Cannon while scoped breaking things\n\cj| Fixed the Blue Skull Key giving a wrong pickup message\n\cj| Made inputs a bit snappier\n\cj| Improved scope visuals\n\cj| Fixed enemies not giving score on XDeath\n\cj| Changed the price of Torgue Mode";
"LITH_ADVICE_Terminal" = "Walk up to the terminal and press {+use} to read it.\n\nSome terminals may be necessary to progress.\n";
"LITH_ADVICE_Jump" = "Press {+jump} to climb the barrier.\n";
"LITH_ADVICE_DoubleJump" = "Some classes can double-jump or temporarily fly.\n\nTry pressing {+jump} or {+speed} mid-air to get up to the platform.\n";
"LITH_MARKER_Unknown" = "Unknown";
"LITH_MARKER_M1A1_EscapePod" = "Escape Pod 02C3";
"LITH_MARKER_M1A1_Quarters" = "Personal Quarters";
"LITH_MARKER_M1A1_TeleportBay" = "Teleport Bay 1E14";
"QUITMSG1" = "Hold it, your contract isn't complete yet!";
"QUITMSG2" = "I got nothing.";
"QUITMSG3" = "Leave before I make you leave!";


+ 1
- 1
pk7/lzscript/Client/Draw.zsc View File

@@ -555,7 +555,7 @@ override void RenderOverlay(RenderEvent evt)
break;
}

let p = Lith_Player(evt.Camera);
let p = Lith_Player(evt.camera);
if(p && p.m_Cs) p.m_Cs.Lith_Render();
}



+ 6
- 0
pk7/lzscript/Constants.zsc View File

@@ -150,6 +150,12 @@ enum ASCII
Ch_Color = Ch_FS,
}

enum Lith_StatNum {
_stat_mapmark = Thinker.STAT_USER + 7,
_stat_advicemark,
_stat_cyberspace,
}

const IFIX = 65536;
const FIX = 65536.0;



+ 1
- 0
pk7/lzscript/Decorations.zsc View File

@@ -14,6 +14,7 @@
#include "lzscript/Decorations/Candles.zsc"
#include "lzscript/Decorations/Chair.zsc"
#include "lzscript/Decorations/Lamps.zsc"
#include "lzscript/Decorations/Marker.zsc"
#include "lzscript/Decorations/TechPillar.zsc"
#include "lzscript/Decorations/TorchBase.zsc"
#include "lzscript/Decorations/TorchSmall.zsc"


+ 5
- 10
pk7/lzscript/Decorations/Advice.zsc View File

@@ -7,17 +7,12 @@
* ---------------------------------------------------------------------------|
*/

class Lith_AdviceObject : Actor
{
default
{
/*$Category "Decoration" */

Height 32;
Radius 20;
Scale 0.7;
class Lith_AdviceMarker : Lith_MapMarker {
override void beginPlay() {
changeTid(level.findUniqueTid());
setTag(StringTable.localize(curSector.getUdmfString('user_advice')));
changeStatNum(_stat_advicemark);
}

}

/* EOF */

+ 31
- 0
pk7/lzscript/Decorations/Marker.zsc View File

@@ -0,0 +1,31 @@
/* ---------------------------------------------------------------------------|
*
* Distributed under the CC0 public domain license.
* By Alison Sanderson. Attribution is encouraged, though not required.
* See licenses/cc0.txt for more information.
*
* ---------------------------------------------------------------------------|
*/

class Lith_MapMarker : Actor {
default {
+NOBLOCKMAP
+NOGRAVITY
+DONTSPLASH
+INVISIBLE
}

override void beginPlay() {
changeTid(level.findUniqueTid());
setTag(StringTable.localize(curSector.getUdmfString('user_marker')));
changeStatNum(_stat_mapmark);
}

states {
Spawn:
TNT1 A -1;
stop;
}
}

/* EOF */

+ 16
- 6
pk7/lzscript/Player.zsc View File

@@ -107,6 +107,8 @@ double m_IYaw, m_LastIYaw;
double m_ZVel, m_LastZVel;
double m_VZVel, m_LastVZVel;

Lith_MapMarker m_curMark;

property ViewBob: m_VBob;

override void BeginPlay()
@@ -329,8 +331,7 @@ void Lith_PreTick()
m_QY = Lith_Quaternion.Create(- angle, 0, 0, 1);

/* stupid hack to keep the view from moving around */
if(ACS_ExecuteWithResult(lsc_pdata, pdata_semifrozen))
{
if(ACS_ExecuteWithResult(lsc_pdata, pdata_semifrozen)) {
angle -= 1;
pitch -= 1;
A_SetAngle(angle + 1, SPF_INTERPOLATE);
@@ -341,8 +342,7 @@ void Lith_PreTick()
if(m_CS) m_CS.Lith_RotateView(2);

/* draw stuff if we're the camera */
if(players[consoleplayer].camera == self)
{
if(players[consoleplayer].camera == self) {
if(m_CS) m_CS.Lith_DrawFrame();
Lith_URANUS.LE();
}
@@ -350,6 +350,8 @@ void Lith_PreTick()

void Lith_PostTick()
{
if(!player) return;

if(CVar.GetCVar('lith_player_rainshader', player).getBool())
Lith_RainEffect();
else
@@ -359,8 +361,6 @@ void Lith_PostTick()

Lith_URANUS.LZ(self, 320, 240);

if(!player) return;

if(health > 0 && CVar.GetCVar('lith_xhair_enable', player).getBool())
Lith_Crosshair();

@@ -368,6 +368,16 @@ void Lith_PostTick()
if(playeringame[i] && players[i] != player && players[i].mo)
Lith_PlayerIndicator(players[i]);

Lith_MapMarker th;
for(let it = ThinkerIterator.create("Lith_MapMarker", _stat_mapmark);
(th = (Lith_MapMarker(it.next())));) {
if(th.cursector == cursector && th != m_curMark &&
(!m_curMark || th.getTag() != m_curMark.getTag())) {
m_curMark = th;
CallACS("Lith_Markiplier", m_curMark.tid);
}
}

m_LastIPitch = m_IPitch;
m_LastVPitch = m_VPitch;
m_IPitch = Lith_UTIL.Lerp(m_IPitch, Pitch, 0.377);


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

@@ -64,7 +64,7 @@ static Lith_Cyberspace CreateDerived(class<Lith_Cyberspace> type)
for(int x = 0; x < cs.RW; x++)
cs.m_CamX[x] = x / float(cs.RW) * 2 - 1;

cs.ChangeStatNum(Thinker.STAT_USER + 7);
cs.changeStatNum(_stat_cyberspace);

CallACS("Lith_CSLoadMap");



+ 1
- 0
pk7/mapinfo.txt View File

@@ -194,6 +194,7 @@ doomednums
22431 = Lith_Chair
22432 = Lith_BoomBarrel
22433 = Lith_AdviceMarker
22434 = Lith_MapMarker
}

damagetype Lith_NoDamage


+ 8
- 0
pk7_ep1/language.gfx.txt View File

@@ -0,0 +1,8 @@
identifier,default
:Terminal:1,lgfx/Terminal/1.png
:Terminal:2,lgfx/Terminal/2.png
:Terminal:3,lgfx/Terminal/3.png
:Terminal:AOF,lgfx/Terminal/AOF.png
:Terminal:LogonAOF,lgfx/Terminal/LogonAOF.png
:Terminal:LogonData,lgfx/Terminal/LogonData.png
:Terminal:UAC,lgfx/Terminal/UAC.png

BIN
pk7_ep1/maps/M1A1.wad View File


BIN
pk7_ep1/maps/M1A2.wad View File


+ 1
- 0
source/Headers/m_stab.h View File

@@ -34,6 +34,7 @@ X(s_RLFormer, "RLFormer")
X(s_SHADOW, "SHADOW")
X(s_SOLID, "SOLID")
X(s_alienfont, "alienfont")
X(s_areaname, "areaname")
X(s_bigupper, "bigupper")
X(s_chfont, "chfont")
X(s_cnfont, "cnfont")


+ 32
- 8
source/Main/p_player.c View File

@@ -518,11 +518,37 @@ static void P_Scr_PTickPre(struct player *p)

/* Scripts ----------------------------------------------------------------- */

script_str ext("ACS") addr("Lith_Markiplier")
void Sc_MapMarker(i32 tid) {
enum {ticks = 35 * 2};

str text = GetPropS(tid, APROP_NameTag);

while(!player_init) ACS_Delay(1);

ACS_Delay(5);

with_player(LocalPlayer) {
for(i32 i = 0; i < ticks; i++) {
k32 alpha;

/**/ if(i < 15) alpha = i / 15.0;
else if(i > ticks - 15) alpha = (ticks - i) / 15.0;
else alpha = 1.0;

i32 x = absk(ACS_Sin(i / (k32)ticks / 4.0)) / 4.0 * 800.0;

SetSize(640, 480);
PrintTextA_str(text, s_areaname, CR_WHITE, x,4, 80,0, alpha);

ACS_Delay(1);
}
}
}

script ext("ACS") addr(lsc_drawplayericon)
void Sc_DrawPlayerIcon(i32 num, i32 x, i32 y)
{
with_player(&players[num])
{
void Sc_DrawPlayerIcon(i32 num, i32 x, i32 y) {
with_player(&players[num]) {
k32 a = absk((x - 160) / 90.0);
if(a < 0.2) a = 0.2;
else if(a > 1.0) a = 1.0;
@@ -535,10 +561,8 @@ void Sc_DrawPlayerIcon(i32 num, i32 x, i32 y)
}

script_str type("net") ext("ACS") addr("Lith_Glare")
void Sc_Glare(void)
{
with_player(LocalPlayer)
{
void Sc_Glare(void) {
with_player(LocalPlayer) {
ACS_FadeTo(255, 255, 255, 1.0, 0.0);

ACS_LocalAmbientSound(ss_player_glare, 127);


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

@@ -3,6 +3,7 @@
## See licenses/cc0.txt for more information.

!!include Misc/Changes.txt
!!include Misc/Markers.txt
!!include Misc/QuitMessages.txt
!!include Misc/Settings.txt
!!include Misc/UI.txt


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

@@ -0,0 +1,24 @@
## Distributed under the CC0 public domain license.
## By Alison Sanderson. Attribution is encouraged, though not required.
## See licenses/cc0.txt for more information.

@@ \#ADVICE_Terminal
Walk up to the terminal and press {+use} to read it.

Some terminals may be necessary to progress.

@@ \#ADVICE_Jump
Press {+jump} to climb the barrier.

@@ \#ADVICE_DoubleJump
Some classes can double-jump or temporarily fly.

Try pressing {+jump} or {+speed} mid-air to get up to the platform.

== \#MARKER_Unknown | Unknown

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

## EOF

+ 1
- 1
tools/comprsnd.rb View File

@@ -12,7 +12,7 @@
##
## ---------------------------------------------------------------------------|

Dir[ARGV[0]].each do |f|
Dir.glob(ARGV[0]).each do |f|
if File.file?(f) && open(f) do |f| f.readpartial(4) == "fLaC" end
puts "*** #{f}"
`flac --best --no-padding --preserve-modtime -f "#{f}" -o "#{f}" 2>&1`


+ 4
- 3
tools/genbuild.rb View File

@@ -57,13 +57,14 @@ DECOIN = %W"
$#{HDR}/w_scorenums.h
"
TEXTIN = %w"text/Text.txt"
HSFSIN = %w"pk7/language.gfx.txt:pk7/:lgfx"
HSFSIN = %w"pk7/language.gfx.txt:pk7/:lgfx
pk7_ep1/language.gfx.txt:pk7_ep1/:lgfx"
SNDSIN = %w"text/Sounds.txt"
DEPS = [*UPGCHO, *WEPCHO, *MONCHO,
Dir["source/Headers/*"].map do |s|
Dir.glob("source/Headers/*").map do |s|
"$#{HDR}/#{File.basename s}"
end].uniq
SRCS = [*Dir["source/Main/*"], *UPGCCO, *WEPCCO].map do |s|
SRCS = [*Dir.glob("source/Main/*"), *UPGCCO, *WEPCCO].map do |s|
File.basename s
end.uniq



+ 0
- 31
tools/getcmap.rb View File

@@ -1,31 +0,0 @@
#!/usr/bin/env ruby
# frozen_string_literal: true
## ---------------------------------------------------------------------------|
##
## Distributed under the CC0 public domain license.
## By Alison Sanderson. Attribution is encouraged, though not required.
## See licenses/cc0.txt for more information.
##
## ---------------------------------------------------------------------------|
##
## Generates a character map from the text directory.
##
## ---------------------------------------------------------------------------|

require_relative "corinth.rb"

require 'set'

chs = Set[]

`find text -type f -name '*.txt'`.split("\n").each do |f|
f.replace(open(f).read).each_char do |c| chs << c end
end

chs.delete " "
chs.delete "\n"
chs.delete "\u{5c}"

print chs.to_a.sort!.join

## EOF

+ 8
- 9
tools/hashfs.rb View File

@@ -16,12 +16,14 @@ require_relative "corinth.rb"

require 'fileutils'

def run of, pkdir, dir
of.puts "identifier,default"

pdir = "#{pkdir}#{dir}"
re = /#{Regexp.escape pdir}\/(.+)\.png/
for arg in ARGV
fname, pkdir, dir = arg.split ":"
pdir = "#{pkdir}#{dir}"
re = /#{Regexp.escape pdir}\/(.+)\.png/
names = Dir.glob("#{pdir}/**/*.png").sort

of = open fname, "w"
of.puts "identifier,default"
for item in names
unless item.include? "/Font/"
m = re.match item
@@ -30,7 +32,4 @@ def run of, pkdir, dir
end
end

for arg in ARGV
fname, pkdir, dir = arg.split ":"
run open(fname, "w"), pkdir, dir
end
## EOF

+ 52
- 15
tools/mkfont.rb View File

@@ -14,34 +14,71 @@

require_relative "corinth.rb"

FONTS=[[8, "MisakiG"], [8, "MisakiM"], [8, "JFDot8"], [16, "JFDot16"]]
CMAP=`tools/getcmap.rb`
require 'set'

out = []
Font = Struct.new :pt, :name, :cmap, :body

for sz, f in FONTS
fontfile = "bin/#{f}.ttf"
unless FileTest.exist? fontfile
system *%W"wget http://mab.greyserv.net/f/#{f}.ttf -O #{fontfile}"
cmap_all = Set[]

Dir.glob("text/**/*.txt").each do |f|
open(f).each_char do |c|
cmap_all.add c
end
end

cmap_all.delete " "
cmap_all.delete "\n"
cmap_all.delete "\u{5c}"

cmap_all = cmap_all.to_a.sort
cmap_anm = [*"a".."z", *"A".."Z", *"0".."9"]

fonts = []
fonts.push Font.new 8, "MisakiG", cmap_all
fonts.push Font.new 8, "MisakiM", cmap_all
fonts.push Font.new 8, "JFDot8", cmap_all
fonts.push Font.new 16, "JFDot16", cmap_all
fonts.push Font.new(30, "AreaName", cmap_anm, lambda do |words, ch|
words.push *%W"-stroke black -strokewidth 5 label:#{ch}
-stroke none label:#{ch}
-composite"
end)

pngquant_in = []
advpng_in = []

for fnt in fonts
ttf = "bin/#{fnt.name}.ttf"

unless FileTest.exist? ttf
system *%W"wget http://mab.greyserv.net/f/#{fnt.name}.ttf -O #{ttf}"
end

outdir = "pk7/fonts/#{f.downcase}"
outdir = "pk7/fonts/#{fnt.name.downcase}"

`rm -f #{outdir}/*.png`
system *%W"rm -f".push(*Dir.glob("#{outdir}/*.png"))

words = %W"convert -depth 1 -font #{fontfile} -pointsize #{sz} -background none -fill white"
words = %W"convert -depth 1 -font #{ttf} -pointsize #{fnt.pt}
-background none -fill white"

for ch in CMAP.each_char
for ch in fnt.cmap
num = sprintf "%08X", ch.ord
f = "#{outdir}/#{num}.png"
out.push f
words.push *%W"( label:#{ch} -write #{f} )"
pngquant_in.push f unless fnt.body
advpng_in.push f
words.push "("
if fnt.body
fnt.body.call words, ch
else
words.push "label:#{ch}"
end
words.push *%W"-write #{f} )"
end

system *words
end

system *%W"pngquant --ext .png -f 2".push(*out)
system *%W"advpng -z4".push(*out)
system *%w"pngquant --ext .png -f 8 -s 1".push(*pngquant_in)
system *%w"advpng -z4".push(*advpng_in)

## EOF

Loading…
Cancel
Save