XE1M3:

* cut some more chunks out of the third area of the ravine * added a blue force field switch near the blast boots * fixed hangar 1 door screaming in flemoid instead of making the correct door noises
XE1M2: Fleshed out some of the areas a little more
2024-05-26 13:46:23 -07:00 · 2024-05-26 13:42:18 -07:00 · 2024-05-26 12:27:44 -07:00 · 2024-05-25 14:00:14 -07:00 · 2024-05-25 13:29:38 -07:00 · 2024-05-25 12:20:20 -07:00
18 changed files with 32 additions and 7 deletions
--- a/.woodpecker/make-pk3.yaml
+++ b/.woodpecker/make-pk3.yaml
@@ -4,18 +4,21 @@ steps:
    pull: true
    commands:
      - apt update && apt upgrade -y && apt install -y zip
-      - xargs -a .pk3include -I% find . -wholename ./% | zip zorch_squadron.pk3 -@
+      - xargs -a .pk3include -I% find . -wholename ./% | zip zorch_squadron.${CI_COMMIT_TAG}.pk3 -@
    when:
-      - event: [tag]
+      - event: tag
+        ref: refs/tags/v*.*.*
  publish:
    image: woodpeckerci/plugin-gitea-release
    when:
-      - event: [tag]
+      - event: tag
+        ref: refs/tags/v*.*.*
    settings:
      base_url: https://vcs.otl-hga.net
      files:
-        - "zorch_squadron.pk3"
+        - "zorch_squadron.*.pk3"
      prerelease: true
      target: trunk
+      #note: "${CI_COMMIT_MESSAGE}"
      api_key:
        from_secret: WOODPECKER_CI_TOKEN
--- a/7
+++ b/7
@@ -38,9 +38,16 @@ map XE1M2 lookup HUSTR_XE1M2 {
 map XE1M3 lookup HUSTR_XE1M3 {
 	Cluster = 11
 	InterMusic = D_HGAINT
+	Next = XE1M4
 	Sky1 = "CJSKY3A"
 }

+map XE1M4 lookup HUSTR_XE1M4 {
+	Cluster = 11
+	InterMusic = D_HGAINT
+	Sky1 = "FVOID"
+}
+
 DoomEdNums {
 	2001 = LargeZorcherHGA
 	2002 = RapidZorcherHGA
--- a/PNAMES.lmp
+++ b/PNAMES.lmp
--- a/TEXTURES.txt
+++ b/TEXTURES.txt
@@ -1,5 +1,5 @@
 // Texture definitions generated by SLADE3
-// on Wed Jan 17 19:08:52 2024
+// on Sun May 26 12:27:08 2024

 Texture "GRNOA0", 64, 45
 {
@@ -101,4 +101,19 @@ Texture "FFLDFLEM", 128, 128
 	Patch "FFLDFLEM", 0, 0
 }

+Texture "EMPL001", 128, 128
+{
+	Patch "EMPL001", 0, 0
+}
+
+Texture "FVOID", 4, 4
+{
+	Patch "FVOID", 0, 0
+}
+
+Texture "EMPL002", 128, 128
+{
+	Patch "EMPL002", 0, 0
+}
+
 // End of texture definitions
--- a/maps/XE1M3.wad
+++ b/maps/XE1M3.wad
--- a/maps/XE1M4.wad
+++ b/maps/XE1M4.wad
--- a/maps/xe1m1.wad
+++ b/maps/xe1m1.wad
--- a/maps/xe1m2.wad
+++ b/maps/xe1m2.wad
--- a/res/crap/DCAFE007.png
+++ b/res/crap/DCAFE007.png
--- a/res/crap/jerma.jpg
+++ b/res/crap/jerma.jpg
--- a/res/crap/mike-stoklasa.jpg
+++ b/res/crap/mike-stoklasa.jpg
--- a/res/crap/rich-evans.png
+++ b/res/crap/rich-evans.png
--- a/res/crap/rowan-atkinson.jpg
+++ b/res/crap/rowan-atkinson.jpg
--- a/res/xcf/PORT.xcf
+++ b/res/xcf/PORT.xcf
--- a/textures/EMPL001.png
+++ b/textures/EMPL001.png
--- a/textures/EMPL002.png
+++ b/textures/EMPL002.png
--- a/textures/FVOID.png
+++ b/textures/FVOID.png
--- a/zscript/actor/blast_boots.zs
+++ b/zscript/actor/blast_boots.zs
@@ -40,7 +40,7 @@ class PowerBlastJump : Powerup {
 	override void Tick() {
 		Super.Tick();
 		if (blasting) {
-			ply.AddZ(8);
+			ply.AddZ(12);
 		}
 	}

@@ -57,7 +57,7 @@ class InvBlastBoots : PowerupGiver {
 		+COUNTITEM
 		Tag "$TAG_BLASTBOOTS";
 		Powerup.Type "PowerBlastJump";
-		Powerup.Duration 10; // ten tics should be enough for the engine to go "oh yeah powerup" while still being an instant-effect
+		Powerup.Duration 35;

 		Inventory.Icon "NULLA0";
 		Inventory.AltHUDIcon "NULLA0";
Author	SHA1	Message	Date
Nicole O'Connor	f90c11811b	XE1M3: * cut some more chunks out of the third area of the ravine * added a blue force field switch near the blast boots * fixed hangar 1 door screaming in flemoid instead of making the correct door noises	2024-05-26 13:46:23 -07:00
Nicole O'Connor	fe728c1d1e	XE1M2: Fleshed out some of the areas a little more	2024-05-26 13:42:18 -07:00
Nicole O'Connor	b8e8d477a1	deduplicate PORT in favor of preexisting EMPL	2024-05-26 12:27:44 -07:00
Nicole O'Connor	db94592adc	created portrait textures for RLM boys (PORTRICH, PORTMIKE), PORT.xcf file for making more portraits	2024-05-25 14:00:14 -07:00
Nicole O'Connor	ee3395728e	add XE1M4 to MAPINFO	2024-05-25 13:29:38 -07:00
Nicole O'Connor	ab5c881805	add FVOID, resource files for new DCAFE style textures for XE1M3 (and beyond!)	2024-05-25 12:20:20 -07:00
Nicole O'Connor	18ac5fb780	XE1M3: All checks were successful ci/woodpecker/push/make-pk3 Pipeline was successful Details * flag first bridge points with comments for visibility * add first employee poster	2024-03-03 15:55:45 -08:00
Nicole O'Connor	c7f58163ea	that made woodpecker mad All checks were successful ci/woodpecker/push/make-pk3 Pipeline was successful Details	2024-02-16 18:48:50 -08:00
Nicole O'Connor	51bc4d9c42	add commit messages to releases	2024-02-16 18:44:47 -08:00
Nicole O'Connor	f32c64418a	XE1M1: All checks were successful ci/woodpecker/push/make-pk3 Pipeline was successful Details * fixed some texture errors * fine tuned vent near the elevator; should be easier to get on board and ride all the way to the top * extended the earthquake after the oh shit moment	2024-02-16 18:28:25 -08:00
Nicole O'Connor	f3de3888d5	initial tuning attempt on the blast boots	2024-02-16 18:06:34 -08:00
Nicole O'Connor	55e09fb9d9	XE1M2: * extruded some more area beyond the yellow forcefield, move red key to future Executive Boardroom™ * yellow key warehouse has a new floor texture and a hopefully working switch for the secret * committed some engine crimes to make a building taller	2024-02-16 17:54:13 -08:00
Nicole O'Connor	e2ab974f70	release pipeline now only runs on semver tags	2024-02-16 17:01:36 -08:00