Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
stuff
  • Loading branch information
TerminusEst13 committed Oct 19, 2015
1 parent 05c4c97 commit 4eceed0
Show file tree
Hide file tree
Showing 8 changed files with 36 additions and 170 deletions.
22 changes: 22 additions & 0 deletions _zip-jukebox.bat
@@ -0,0 +1,22 @@
@echo off
color F

set NAME=te13-metaljukebox
set /p TYPE="Would you like to build a pk3 or pk7? (default pk3): " % = %

cd metal-jukebox-pk3

if (%TYPE%) == (pk7) (goto PK7) else (goto PK3)

:PK7
echo Building PK7
..\tools\7za a -t7z ..\%NAME%.pk7 *.* *
goto Done

:PK3
echo Building PK3
..\tools\7za a -tzip ..\%NAME%.pk3 *.* *
goto Done

:Done
pause >nul
20 changes: 10 additions & 10 deletions butts2-ssh.txt
@@ -1,27 +1,20 @@
1: Style swapping needs to be polished.
^- Melee style (Needs a name)
D: Back special
^- Melee style
E: Style special
^- Ranged style (Needs a name)
^- Ranged style
B: Forward special (In, needs new graphics/sounds)
C: Side special (In, needs new graphics/sounds)
D: Back special
E: Style special
^- Trickster style (Needs a name)
^- Trickster style
B: Forward special
C: Side special
D: Back special (In, needs new graphics/sounds)
E: Style special (In, needs new graphics/sounds)
^- Some kind of visual effect after swapping
(Orbs flying around you?)

2: Soul acquiring mechanic
^- Separate Shihong's bullets from Hae-Lin's
4: BFG9000 replacement
5: Gameplay mechanic for Triumph sword (What happens when you get higher ammo? What can you use it for?)
10: The trickster grapplebeam can lag people out when people teleport and go a long way away from the source. Is there a way to have the beam snap when teleporting?
11: Separate Hae-Lin's quotes from Shihong's
^- Find a voice actress
12: Separate Hae-Lin's pickups from Shihong's (Berserk, Megasphere)
13: Blursphere replacement
14: Allmap replacement
Expand All @@ -41,23 +34,30 @@
A: Passive buff (Faster melee speed, hits harder)
B: Forward special
C: Side special
D: Back special
^- Ranged style (Needs a name)
A: Passive buff (Bullets get tracers, ranking bonus partially applies to guns)
^- Trickster style
A: Passive buff (Can grab walls, jetpack regenerates faster. In, needs separated)
C: Side special
^- Unique icons showing what the styles are
A: Gold Fist
B: Blue Gun
C: Purple dodging icon?
^- Different color than purple for trickster (Magenta. Fairly red-ish, but still purple)
2: Soul acquiring mechanic
^- Separate Shihong's bullets from Hae-Lin's
3: Rehaul the Teleport/Dash entirely into a jet thruster.
5: Gameplay mechanic for Triumph sword (What happens when you get higher ammo? What can you use it for?)
6: Muzzle flash for Striker revolver (Two, one for normal shot and one for final shot)
7: Original sounds for low on health (look at Pres' submitted Marathon sounds, find source stock sounds)
8: New HUD
9: Better names for Avenger/Enforcer/Rebellion
^- Challenger
^- Ruin
^- Hunter
11: Separate Hae-Lin's quotes from Shihong's
^- Find a voice actress
15: What to do with Rebellion? Dual-wielding is fun, and dual-wielding pistols in a stylish action game is kind of mandatory. But the current execution is very eehhh. The Striker is more accurate, the Avenger does more damage, and the Enforcer is faster, and tapping away rapidly at the keys to try and get the damage edge is clunky and unwieldy.
^- Alternate burst-fire mode. Hold-down fire for a rapid trio of shots from both guns.
16: 19 spawning sounds
Expand Down
3 changes: 2 additions & 1 deletion changelog.txt
Expand Up @@ -19,8 +19,9 @@ FROM 0.82 TO 0.XX
- Special inputs now require fire to be held down first.
- Hae-Lin can no longer accientally crush herself by dashing while Falling damage is turned on.
- The pickup message for the Berserk has been changed since people were confused as to what it actually does.
- The air control in both Zandronum and ZDoom has been dramatically improved to allow more ease of use in aerial dodging and mobility. dst_oldaircontrol allows for swapping back to the original.
- The air control in both Zandronum and ZDoom has been unified to allow more ease of use in aerial dodging and mobility. dst_oldaircontrol allows for swapping back to the original, but only on map load.
- Destroyed barrel/lamp/candelabra pieces now have actual collision data.
- Several GLdef errors have been fixed.



Expand Down
2 changes: 1 addition & 1 deletion pk3/GLDEFS.txt
Expand Up @@ -662,7 +662,7 @@ brightmap texture sw1wdmet

brightmap texture sw2brik
{
map "brightmaps/sw1wdmet.png"
map "brightmaps/sw2brik.png"
iwad
}

Expand Down
2 changes: 1 addition & 1 deletion pk3/acs/weeaboo.c
Expand Up @@ -544,7 +544,7 @@ script WEEB_CLIENTDECORATE (int boreshut, int bowlshot) clientside

case 3:
if (CheckInventory("IsJungHaeLin") == 1) { Log(s:"\cfThe \cjOmen \cfwarhammer. You may wield it..."); }
else if (CheckInventory("IsSSH") == 1) { Log(s:"\cj01-T Triumph\cn SSH pattern identified. Authorization successful."); }
else if (CheckInventory("IsSSH") == 1) { Log(s:"\cj01-T Tiger\cn SSH pattern identified. Authorization successful."); }
break;

case 4:
Expand Down
Binary file modified pk3/acs/weeaboo.o
Binary file not shown.
Binary file removed ssh/Chinese Characters 2b.txt
Binary file not shown.

0 comments on commit 4eceed0

Please sign in to comment.