Merge branch 'experimental' into endgame

Project.xml

@@ -26,6 +26,7 @@
  <define name="ACHIEVEMENTS_ALLOWED" />
  <define name="DISCORD_ALLOWED" />
  <define name="TRANSLATIONS_ALLOWED" />
+ <define name="IRIS_DEBUG"/>
 
  <define name="SHOW_LOADING_SCREEN" />
  <define name="PSYCH_WATERMARKS"/> <!-- DELETE THIS TO REMOVE THE PSYCH LOGO FROM LOADING SCREEN -->
@@ -109,9 +110,9 @@
 
  <!--Psych stuff needed-->
  <haxelib name="linc_luajit" if="LUA_ALLOWED"/>
- <haxelib name="SScript" if="HSCRIPT_ALLOWED" version="17.1.618"/>
- <haxelib name="hxvlc" if="VIDEOS_ALLOWED"/>
- <haxelib name="hxdiscord_rpc" if="DISCORD_ALLOWED"/>
+ <haxelib name="hscript-iris" if="HSCRIPT_ALLOWED" version="1.1.0"/>
+ <haxelib name="hxvlc" if="VIDEOS_ALLOWED" version="1.8.2"/>
+ <haxelib name="hxdiscord_rpc" version="1.2.4" if="DISCORD_ALLOWED"/>
  <haxelib name="flxanimate"/>
 
  <!-- Disable Discord IO Thread -->
@@ -121,6 +122,7 @@
  <!-- Enables a terminal log prompt on debug builds -->
  <haxelib name="hxcpp-debug-server" if="debug"/>
  <haxedef name="HXC_LIBVLC_LOGGING" if="VIDEOS_ALLOWED debug" />
+ <haxedef name="HXVLC_NO_SHARE_DIRECTORY" if="VIDEOS_ALLOWED" />
 
  <!-- ______________________________ Haxedefines _____________________________ -->
 

assets/base_game/shared/data/2hot/preload.json

@@ -0,0 +1,12 @@
+{
+ "images/spraycanAtlas/": 3,
+ "images/PicoBullet": 2,
+ "images/spraypaintExplosionEZ": 3,
+
+ "sounds/Darnell_Lighter": 3,
+ "sounds/Kick_Can_UP": 3,
+ "sounds/Kick_Can_FORWARD": 3,
+ "sounds/Gun_Prep": 3,
+ "sounds/Pico_Bonk": 3,
+ "sounds/shots/": 3
+}

assets/base_game/shared/data/stress/preload.json

@@ -1,3 +1,3 @@
 {
- "images": ["tankmanKilled1"]
+ "images/tankmanKilled1": 3
 }

assets/base_game/shared/stages/phillyBlazin.json

@@ -20,7 +20,9 @@
 
  "images/phillyBlazin/streetBlur": 3,
  "images/phillyBlazin/skyBlur": 2,
- "images/phillyBlazin/lightning": 2
+ "images/phillyBlazin/lightning": 2,
+
+ "sounds/lightning/": 3
  },
 
  "_editorMeta": {

assets/base_game/shared/stages/phillyStreets.json

@@ -18,6 +18,7 @@
  "images/abot/systemEyes/": 3,
  "images/abot/abotSystem/": 3,
 
+ "images/SpraycanPile": 3,
  "images/phillyStreets/phillyConstruction": 3,
  "images/phillyStreets/phillyHighwayLights": 3,
  "images/phillyStreets/phillyHighway": 3,

assets/secrets/images/PessyBump.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextureAtlas imagePath="PessyBump.png">
+ <!-- Created with Adobe Animate version 23.0.2.103 -->
+ <!-- http://www.adobe.com/products/animate.html -->
+ <SubTexture name="Pessy Title Bump0000" x="1076" y="2" width="539" height="563" frameX="0" frameY="-6" frameWidth="539" frameHeight="569"/>
+ <SubTexture name="Pessy Title Bump0001" x="1076" y="2" width="539" height="563" frameX="0" frameY="-6" frameWidth="539" frameHeight="569"/>
+ <SubTexture name="Pessy Title Bump0002" x="1617" y="2" width="539" height="556" frameX="0" frameY="-13" frameWidth="539" frameHeight="569"/>
+ <SubTexture name="Pessy Title Bump0003" x="1617" y="2" width="539" height="556" frameX="0" frameY="-13" frameWidth="539" frameHeight="569"/>
+ <SubTexture name="Pessy Title Bump0004" x="2691" y="562" width="535" height="556" frameX="0" frameY="-13" frameWidth="539" frameHeight="569"/>
+ <SubTexture name="Pessy Title Bump0005" x="2691" y="1120" width="535" height="556" frameX="0" frameY="-13" frameWidth="539" frameHeight="569"/>
+ <SubTexture name="Pessy Title Bump0006" x="2154" y="1122" width="535" height="556" frameX="0" frameY="-13" frameWidth="539" frameHeight="569"/>
+ <SubTexture name="Pessy Title Bump0007" x="2" y="1144" width="535" height="562" frameX="0" frameY="-7" frameWidth="539" frameHeight="569"/>
+ <SubTexture name="Pessy Title Bump0008" x="2" y="1144" width="535" height="562" frameX="0" frameY="-7" frameWidth="539" frameHeight="569"/>
+ <SubTexture name="Pessy Title Bump0009" x="1076" y="567" width="535" height="567" frameX="0" frameY="-2" frameWidth="539" frameHeight="569"/>
+ <SubTexture name="Pessy Title Bump0010" x="1076" y="567" width="535" height="567" frameX="0" frameY="-2" frameWidth="539" frameHeight="569"/>
+ <SubTexture name="Pessy Title Bump0011" x="2" y="2" width="535" height="569" frameX="0" frameY="0" frameWidth="539" frameHeight="569"/>
+ <SubTexture name="Pessy Title Bump0012" x="2" y="2" width="535" height="569" frameX="0" frameY="0" frameWidth="539" frameHeight="569"/>
+ <SubTexture name="Pessy Title Bump0013" x="2" y="573" width="535" height="569" frameX="0" frameY="0" frameWidth="539" frameHeight="569"/>
+ <SubTexture name="Pessy Title Bump0014" x="2" y="573" width="535" height="569" frameX="0" frameY="0" frameWidth="539" frameHeight="569"/>
+ <SubTexture name="Pessy Title Bump0015" x="1613" y="567" width="539" height="557" frameX="0" frameY="-12" frameWidth="539" frameHeight="569"/>
+ <SubTexture name="Pessy Title Bump0016" x="1613" y="567" width="539" height="557" frameX="0" frameY="-12" frameWidth="539" frameHeight="569"/>
+ <SubTexture name="Pessy Title Bump0017" x="1613" y="1126" width="539" height="555" frameX="0" frameY="-14" frameWidth="539" frameHeight="569"/>
+ <SubTexture name="Pessy Title Bump0018" x="1613" y="1126" width="539" height="555" frameX="0" frameY="-14" frameWidth="539" frameHeight="569"/>
+ <SubTexture name="Pessy Title Bump0019" x="2158" y="2" width="535" height="558" frameX="0" frameY="-11" frameWidth="539" frameHeight="569"/>
+ <SubTexture name="Pessy Title Bump0020" x="2695" y="2" width="535" height="558" frameX="0" frameY="-11" frameWidth="539" frameHeight="569"/>
+ <SubTexture name="Pessy Title Bump0021" x="2154" y="562" width="535" height="558" frameX="0" frameY="-11" frameWidth="539" frameHeight="569"/>
+ <SubTexture name="Pessy Title Bump0022" x="539" y="1144" width="535" height="562" frameX="0" frameY="-7" frameWidth="539" frameHeight="569"/>
+ <SubTexture name="Pessy Title Bump0023" x="539" y="1144" width="535" height="562" frameX="0" frameY="-7" frameWidth="539" frameHeight="569"/>
+ <SubTexture name="Pessy Title Bump0024" x="1076" y="1136" width="535" height="567" frameX="0" frameY="-2" frameWidth="539" frameHeight="569"/>
+ <SubTexture name="Pessy Title Bump0025" x="1076" y="1136" width="535" height="567" frameX="0" frameY="-2" frameWidth="539" frameHeight="569"/>
+ <SubTexture name="Pessy Title Bump0026" x="539" y="2" width="535" height="569" frameX="0" frameY="0" frameWidth="539" frameHeight="569"/>
+ <SubTexture name="Pessy Title Bump0027" x="539" y="2" width="535" height="569" frameX="0" frameY="0" frameWidth="539" frameHeight="569"/>
+ <SubTexture name="Pessy Title Bump0028" x="539" y="573" width="535" height="569" frameX="0" frameY="0" frameWidth="539" frameHeight="569"/>
+ <SubTexture name="Pessy Title Bump0029" x="539" y="573" width="535" height="569" frameX="0" frameY="0" frameWidth="539" frameHeight="569"/>
+</TextureAtlas>

assets/secrets/images/ShadowBump.xml

@@ -8,4 +8,23 @@
  <SubTexture name="Shadow Title Bump0003" x="393" y="4" width="385" height="582"/>
  <SubTexture name="Shadow Title Bump0004" x="782" y="4" width="385" height="582"/>
  <SubTexture name="Shadow Title Bump0005" x="782" y="4" width="385" height="582"/>
+ <SubTexture name="Shadow Title Bump0006" x="782" y="4" width="385" height="582"/>
+ <SubTexture name="Shadow Title Bump0007" x="782" y="4" width="385" height="582"/>
+ <SubTexture name="Shadow Title Bump0008" x="782" y="4" width="385" height="582"/>
+ <SubTexture name="Shadow Title Bump0009" x="782" y="4" width="385" height="582"/>
+ <SubTexture name="Shadow Title Bump0010" x="782" y="4" width="385" height="582"/>
+ <SubTexture name="Shadow Title Bump0011" x="782" y="4" width="385" height="582"/>
+ <SubTexture name="Shadow Title Bump0012" x="782" y="4" width="385" height="582"/>
+ <SubTexture name="Shadow Title Bump0013" x="782" y="4" width="385" height="582"/>
+ <SubTexture name="Shadow Title Bump0014" x="782" y="4" width="385" height="582"/>
+ <SubTexture name="Shadow Title Bump0015" x="782" y="4" width="385" height="582"/>
+ <SubTexture name="Shadow Title Bump0016" x="782" y="4" width="385" height="582"/>
+ <SubTexture name="Shadow Title Bump0017" x="782" y="4" width="385" height="582"/>
+ <SubTexture name="Shadow Title Bump0018" x="782" y="4" width="385" height="582"/>
+ <SubTexture name="Shadow Title Bump0019" x="782" y="4" width="385" height="582"/>
+ <SubTexture name="Shadow Title Bump0020" x="782" y="4" width="385" height="582"/>
+ <SubTexture name="Shadow Title Bump0021" x="782" y="4" width="385" height="582"/>
+ <SubTexture name="Shadow Title Bump0022" x="782" y="4" width="385" height="582"/>
+ <SubTexture name="Shadow Title Bump0023" x="782" y="4" width="385" height="582"/>
+ <SubTexture name="Shadow Title Bump0024" x="782" y="4" width="385" height="582"/>
 </TextureAtlas>

assets/secrets/images/ZRiverBump.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextureAtlas imagePath="ZRiverBump.png">
+ <!-- Created with Adobe Animate version 22.0.7.214 -->
+ <!-- http://www.adobe.com/products/animate.html -->
+ <SubTexture name="River Title Bump0000" x="438" y="667" width="436" height="653" frameX="0" frameY="-10" frameWidth="436" frameHeight="663"/>
+ <SubTexture name="River Title Bump0001" x="438" y="1322" width="436" height="653" frameX="0" frameY="-10" frameWidth="436" frameHeight="663"/>
+ <SubTexture name="River Title Bump0002" x="876" y="1321" width="434" height="646" frameX="0" frameY="-17" frameWidth="436" frameHeight="663"/>
+ <SubTexture name="River Title Bump0003" x="1312" y="1330" width="434" height="646" frameX="0" frameY="-17" frameWidth="436" frameHeight="663"/>
+ <SubTexture name="River Title Bump0004" x="876" y="667" width="434" height="652" frameX="0" frameY="-11" frameWidth="436" frameHeight="663"/>
+ <SubTexture name="River Title Bump0005" x="876" y="667" width="434" height="652" frameX="0" frameY="-11" frameWidth="436" frameHeight="663"/>
+ <SubTexture name="River Title Bump0006" x="2" y="667" width="434" height="658" frameX="0" frameY="-5" frameWidth="436" frameHeight="663"/>
+ <SubTexture name="River Title Bump0007" x="2" y="1327" width="434" height="658" frameX="0" frameY="-5" frameWidth="436" frameHeight="663"/>
+ <SubTexture name="River Title Bump0008" x="1746" y="2" width="434" height="662" frameX="0" frameY="-1" frameWidth="436" frameHeight="663"/>
+ <SubTexture name="River Title Bump0009" x="1746" y="666" width="434" height="662" frameX="0" frameY="-1" frameWidth="436" frameHeight="663"/>
+ <SubTexture name="River Title Bump0010" x="2" y="2" width="434" height="663" frameX="0" frameY="0" frameWidth="436" frameHeight="663"/>
+ <SubTexture name="River Title Bump0011" x="2" y="2" width="434" height="663" frameX="0" frameY="0" frameWidth="436" frameHeight="663"/>
+ <SubTexture name="River Title Bump0012" x="438" y="2" width="434" height="663" frameX="0" frameY="0" frameWidth="436" frameHeight="663"/>
+ <SubTexture name="River Title Bump0013" x="874" y="2" width="434" height="663" frameX="0" frameY="0" frameWidth="436" frameHeight="663"/>
+ <SubTexture name="River Title Bump0014" x="1310" y="2" width="434" height="663" frameX="0" frameY="0" frameWidth="436" frameHeight="663"/>
+</TextureAtlas>

assets/shared/images/gfDanceTitle.json

@@ -1,10 +1,15 @@
 { 
- "titlex":-150,
- "titley":-100,
- "startx":100,
- "starty":576,
- "gfx":512,
- "gfy":40,
- "backgroundSprite":"",
- "bpm":102
+ "titlex": -150,
+ "titley": -100,
+ "startx": 100,
+ "starty": 576,
+ "gfx": 512,
+ "gfy": 40,
+ "backgroundSprite": "",
+ "bpm": 102,
+
+ "animation": "gfDance",
+ "dance_left": [30, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14],
+ "dance_right": [15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29],
+ "idle": false
 }

assets/shared/images/noteSplashes/noteSplashes-diamond.json

@@ -6,9 +6,11 @@
  95,
  68
  ],
- "maxFps": 26,
+ "fps": [
+ 22,
+ 26
+ ],
  "prefix": "note splash diamond purple 10",
- "minFps": 22,
  "name": "purple",
  "indices": []
  },
@@ -18,9 +20,11 @@
  106,
  60
  ],
- "maxFps": 26,
+ "fps": [
+ 22,
+ 26
+ ],
  "prefix": "note splash diamond blue 20",
- "minFps": 22,
  "name": "blue2",
  "indices": []
  },
@@ -30,9 +34,11 @@
  106,
  60
  ],
- "maxFps": 26,
+ "fps": [
+ 22,
+ 26
+ ],
  "prefix": "note splash diamond red 20",
- "minFps": 22,
  "name": "red2",
  "indices": []
  },
@@ -42,9 +48,11 @@
  95,
  68
  ],
- "maxFps": 26,
+ "fps": [
+ 22,
+ 26
+ ],
  "prefix": "note splash diamond red 10",
- "minFps": 22,
  "name": "red",
  "indices": []
  },
@@ -54,9 +62,11 @@
  106,
  60
  ],
- "maxFps": 26,
+ "fps": [
+ 22,
+ 26
+ ],
  "prefix": "note splash diamond purple 20",
- "minFps": 22,
  "name": "purple2",
  "indices": []
  },
@@ -66,9 +76,11 @@
  95,
  68
  ],
- "maxFps": 26,
+ "fps": [
+ 22,
+ 26
+ ],
  "prefix": "note splash diamond blue 10",
- "minFps": 22,
  "name": "blue",
  "indices": []
  },
@@ -78,9 +90,11 @@
  106,
  60
  ],
- "maxFps": 26,
+ "fps": [
+ 22,
+ 26
+ ],
  "prefix": "note splash diamond green 20",
- "minFps": 22,
  "name": "green2",
  "indices": []
  },
@@ -90,16 +104,16 @@
  95,
  68
  ],
- "maxFps": 26,
+ "fps": [
+ 22,
+ 26
+ ],
  "prefix": "note splash diamond green 10",
- "minFps": 22,
  "name": "green",
  "indices": []
  }
  },
- "affectedByShader": true,
- "scale": [
- 1,
- 1
- ]
+ "allowRGB": true,
+ "allowPixel": true,
+ "scale": 1
 }