Skip to content

Commit

Permalink
Removed 3rd party taunts
Browse files Browse the repository at this point in the history
  • Loading branch information
PerryRylance committed Oct 5, 2020
1 parent 13086c9 commit 0f2fe23
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion dist/assets.json
@@ -1 +1 @@
{"":{"sprites":{"explosion.png":"/sprites/explosion.png","smokeparticle.png":"/sprites/smokeparticle.png","compass":{"outer.png":"/sprites/compass/outer.png","inner":{"compass-inner0.png":"/sprites/compass/inner/compass-inner0.png","compass-inner1.png":"/sprites/compass/inner/compass-inner1.png","compass-inner2.png":"/sprites/compass/inner/compass-inner2.png"}},"lightning":{"Layer 10.png":"/sprites/lightning/Layer 10.png","Layer 11.png":"/sprites/lightning/Layer 11.png","Layer 12.png":"/sprites/lightning/Layer 12.png","Layer 2.png":"/sprites/lightning/Layer 2.png","Layer 3.png":"/sprites/lightning/Layer 3.png","Layer 4.png":"/sprites/lightning/Layer 4.png","Layer 5.png":"/sprites/lightning/Layer 5.png","Layer 6.png":"/sprites/lightning/Layer 6.png","Layer 7.png":"/sprites/lightning/Layer 7.png","Layer 8.png":"/sprites/lightning/Layer 8.png","Layer 9.png":"/sprites/lightning/Layer 9.png"},"stars":{"plain.png":"/sprites/stars/plain.png","star-2.png":"/sprites/stars/star-2.png"}},"sounds":{"334268__projectsu012__launching-1.wav":"/sounds/334268__projectsu012__launching-1.wav","458669__jorgerosa__missile-launch.mp3":"/sounds/458669__jorgerosa__missile-launch.mp3","521377__jarusca__rocket-launch.mp3":"/sounds/521377__jarusca__rocket-launch.mp3","Balloon Popping-SoundBible.com-1247261379.mp3":"/sounds/Balloon Popping-SoundBible.com-1247261379.mp3","shocks":{"shock-1.mp3":"/sounds/shocks/shock-1.mp3","shock-2.mp3":"/sounds/shocks/shock-2.mp3","shock-3.mp3":"/sounds/shocks/shock-3.mp3"},"explosions":{"large":{"268554__cydon__explosion-004.mp3":"/sounds/explosions/large/268554__cydon__explosion-004.mp3","268555__cydon__explosion-003.mp3":"/sounds/explosions/large/268555__cydon__explosion-003.mp3","268556__cydon__explosion-002.mp3":"/sounds/explosions/large/268556__cydon__explosion-002.mp3","268557__cydon__explosion-001.mp3":"/sounds/explosions/large/268557__cydon__explosion-001.mp3"},"small":{"268550__cydon__bang-004.mp3":"/sounds/explosions/small/268550__cydon__bang-004.mp3","268551__cydon__bang-003.mp3":"/sounds/explosions/small/268551__cydon__bang-003.mp3","268553__cydon__bang-001.mp3":"/sounds/explosions/small/268553__cydon__bang-001.mp3"}}},"textures":{"5203-v5.jpg":"/textures/5203-v5.jpg","7971-red.jpg":"/textures/7971-red.jpg","7971.jpg":"/textures/7971.jpg","planet":{"damage":{"10287.jpg":"/textures/planet/damage/10287.jpg","10575.jpg":"/textures/planet/damage/10575.jpg","11954-v1.jpg":"/textures/planet/damage/11954-v1.jpg","11954-v2.jpg":"/textures/planet/damage/11954-v2.jpg","3241.jpg":"/textures/planet/damage/3241.jpg","6147.jpg":"/textures/planet/damage/6147.jpg"},"surface":{"11382-v7.jpg":"/textures/planet/surface/11382-v7.jpg","11382.jpg":"/textures/planet/surface/11382.jpg","11623-v2.jpg":"/textures/planet/surface/11623-v2.jpg","11623-v4.jpg":"/textures/planet/surface/11623-v4.jpg","11623-v5.jpg":"/textures/planet/surface/11623-v5.jpg","11623-v6.jpg":"/textures/planet/surface/11623-v6.jpg","11623.jpg":"/textures/planet/surface/11623.jpg","13306-v4.jpg":"/textures/planet/surface/13306-v4.jpg","2977.jpg":"/textures/planet/surface/2977.jpg","3215-v5.jpg":"/textures/planet/surface/3215-v5.jpg","3215.jpg":"/textures/planet/surface/3215.jpg","3982-v3.jpg":"/textures/planet/surface/3982-v3.jpg","3982-v4.jpg":"/textures/planet/surface/3982-v4.jpg","3982.jpg":"/textures/planet/surface/3982.jpg","7491-v5.jpg":"/textures/planet/surface/7491-v5.jpg","7491.jpg":"/textures/planet/surface/7491.jpg","7492-v5.jpg":"/textures/planet/surface/7492-v5.jpg","7492.jpg":"/textures/planet/surface/7492.jpg","795.jpg":"/textures/planet/surface/795.jpg","849-v7.jpg":"/textures/planet/surface/849-v7.jpg","849.jpg":"/textures/planet/surface/849.jpg","9701.jpg":"/textures/planet/surface/9701.jpg","9703-v1.jpg":"/textures/planet/surface/9703-v1.jpg","9703-v5.jpg":"/textures/planet/surface/9703-v5.jpg"}}},"models":{"ships":{"Low_poly_UFO.mtl":"/models/ships/Low_poly_UFO.mtl","Low_poly_UFO.obj":"/models/ships/Low_poly_UFO.obj","Triton.mtl":"/models/ships/Triton.mtl","Triton.obj":"/models/ships/Triton.obj","ufo_diffuse.png":"/models/ships/ufo_diffuse.png","ufo_diffuse2.png":"/models/ships/ufo_diffuse2.png","ufo_diffuse2_glow.png":"/models/ships/ufo_diffuse2_glow.png","ufo_diffuse_glow.png":"/models/ships/ufo_diffuse_glow.png","ufo_normal.png":"/models/ships/ufo_normal.png","ufo_spec.png":"/models/ships/ufo_spec.png"}}}}
{"":{"sprites":{"explosion.png":"/sprites/explosion.png","smokeparticle.png":"/sprites/smokeparticle.png","compass":{"outer.png":"/sprites/compass/outer.png","inner":{"compass-inner0.png":"/sprites/compass/inner/compass-inner0.png","compass-inner1.png":"/sprites/compass/inner/compass-inner1.png","compass-inner2.png":"/sprites/compass/inner/compass-inner2.png"}},"stars":{"plain.png":"/sprites/stars/plain.png","star-2.png":"/sprites/stars/star-2.png"},"lightning":{"Layer 10.png":"/sprites/lightning/Layer 10.png","Layer 11.png":"/sprites/lightning/Layer 11.png","Layer 12.png":"/sprites/lightning/Layer 12.png","Layer 2.png":"/sprites/lightning/Layer 2.png","Layer 3.png":"/sprites/lightning/Layer 3.png","Layer 4.png":"/sprites/lightning/Layer 4.png","Layer 5.png":"/sprites/lightning/Layer 5.png","Layer 6.png":"/sprites/lightning/Layer 6.png","Layer 7.png":"/sprites/lightning/Layer 7.png","Layer 8.png":"/sprites/lightning/Layer 8.png","Layer 9.png":"/sprites/lightning/Layer 9.png"}},"sounds":{"334268__projectsu012__launching-1.wav":"/sounds/334268__projectsu012__launching-1.wav","458669__jorgerosa__missile-launch.mp3":"/sounds/458669__jorgerosa__missile-launch.mp3","521377__jarusca__rocket-launch.mp3":"/sounds/521377__jarusca__rocket-launch.mp3","Balloon Popping-SoundBible.com-1247261379.mp3":"/sounds/Balloon Popping-SoundBible.com-1247261379.mp3","shocks":{"shock-1.mp3":"/sounds/shocks/shock-1.mp3","shock-2.mp3":"/sounds/shocks/shock-2.mp3","shock-3.mp3":"/sounds/shocks/shock-3.mp3"},"explosions":{"large":{"268554__cydon__explosion-004.mp3":"/sounds/explosions/large/268554__cydon__explosion-004.mp3","268555__cydon__explosion-003.mp3":"/sounds/explosions/large/268555__cydon__explosion-003.mp3","268556__cydon__explosion-002.mp3":"/sounds/explosions/large/268556__cydon__explosion-002.mp3","268557__cydon__explosion-001.mp3":"/sounds/explosions/large/268557__cydon__explosion-001.mp3"},"small":{"268550__cydon__bang-004.mp3":"/sounds/explosions/small/268550__cydon__bang-004.mp3","268551__cydon__bang-003.mp3":"/sounds/explosions/small/268551__cydon__bang-003.mp3","268553__cydon__bang-001.mp3":"/sounds/explosions/small/268553__cydon__bang-001.mp3"}}},"textures":{"5203-v5.jpg":"/textures/5203-v5.jpg","7971-red.jpg":"/textures/7971-red.jpg","7971.jpg":"/textures/7971.jpg","planet":{"damage":{"10287.jpg":"/textures/planet/damage/10287.jpg","10575.jpg":"/textures/planet/damage/10575.jpg","11954-v1.jpg":"/textures/planet/damage/11954-v1.jpg","11954-v2.jpg":"/textures/planet/damage/11954-v2.jpg","3241.jpg":"/textures/planet/damage/3241.jpg","6147.jpg":"/textures/planet/damage/6147.jpg"},"surface":{"11382-v7.jpg":"/textures/planet/surface/11382-v7.jpg","11382.jpg":"/textures/planet/surface/11382.jpg","11623-v2.jpg":"/textures/planet/surface/11623-v2.jpg","11623-v4.jpg":"/textures/planet/surface/11623-v4.jpg","11623-v5.jpg":"/textures/planet/surface/11623-v5.jpg","11623-v6.jpg":"/textures/planet/surface/11623-v6.jpg","11623.jpg":"/textures/planet/surface/11623.jpg","13306-v4.jpg":"/textures/planet/surface/13306-v4.jpg","2977.jpg":"/textures/planet/surface/2977.jpg","3215-v5.jpg":"/textures/planet/surface/3215-v5.jpg","3215.jpg":"/textures/planet/surface/3215.jpg","3982-v3.jpg":"/textures/planet/surface/3982-v3.jpg","3982-v4.jpg":"/textures/planet/surface/3982-v4.jpg","3982.jpg":"/textures/planet/surface/3982.jpg","7491-v5.jpg":"/textures/planet/surface/7491-v5.jpg","7491.jpg":"/textures/planet/surface/7491.jpg","7492-v5.jpg":"/textures/planet/surface/7492-v5.jpg","7492.jpg":"/textures/planet/surface/7492.jpg","795.jpg":"/textures/planet/surface/795.jpg","849-v7.jpg":"/textures/planet/surface/849-v7.jpg","849.jpg":"/textures/planet/surface/849.jpg","9701.jpg":"/textures/planet/surface/9701.jpg","9703-v1.jpg":"/textures/planet/surface/9703-v1.jpg","9703-v5.jpg":"/textures/planet/surface/9703-v5.jpg"}}},"models":{"ships":{"Low_poly_UFO.mtl":"/models/ships/Low_poly_UFO.mtl","Low_poly_UFO.obj":"/models/ships/Low_poly_UFO.obj","Triton.mtl":"/models/ships/Triton.mtl","Triton.obj":"/models/ships/Triton.obj","ufo_diffuse.png":"/models/ships/ufo_diffuse.png","ufo_diffuse2.png":"/models/ships/ufo_diffuse2.png","ufo_diffuse2_glow.png":"/models/ships/ufo_diffuse2_glow.png","ufo_diffuse_glow.png":"/models/ships/ufo_diffuse_glow.png","ufo_normal.png":"/models/ships/ufo_normal.png","ufo_spec.png":"/models/ships/ufo_spec.png"}}}}
3 changes: 2 additions & 1 deletion dist/js/entry.js
Expand Up @@ -59380,7 +59380,8 @@ var Taunt = /*#__PURE__*/function () {
result = json._sResult;
},
complete: function complete() {
callback(result);
// callback(result);
callback("TODO: Add AI generated dialogue here");
}
});
}
Expand Down
2 changes: 1 addition & 1 deletion dist/js/entry.js.map

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion src/js/game/Taunt.js
Expand Up @@ -19,7 +19,8 @@ export default class Taunt

complete: function()
{
callback(result);
// callback(result);
callback("TODO: Add AI generated dialogue here");
}

});
Expand Down

0 comments on commit 0f2fe23

Please sign in to comment.