From 3dbb088946a3e1cefd8dc7d1994da196fe3c056d Mon Sep 17 00:00:00 2001
From: Patrickisdom <venomchristiaan@gmail.com>
Date: Thu, 21 Feb 2019 12:31:21 +0100
Subject: [PATCH] Ends the Valentine Event
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
💔
---
.gitlab-ci.yml | 2 +-
js/spniOption.js | 2 +-
js/spniTitle.js | 79 +++++++++++++++----------------------------
opponents/listing.xml | 33 ++++++++++--------
prod-config.xml | 4 +--
5 files changed, 50 insertions(+), 70 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 43059e887bf..f39a798a202 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ pages:
- find `python opponents/list_opponents.py` -iname "*.png" -o -iname "*.gif" -o -iname "*.jpg" -o -iname "*.xml" -o -iname "*.js" -o -iname "*.css" | tar -cT - | tar -C .public -x
- python opponents/gzip_dialogue.py .public/opponents/*/behaviour.xml
- python opponents/analyze_image_space.py .public/opponents
- - python opponents/copy_event_alts.py .public/ ./ valentines
+# - python opponents/copy_event_alts.py .public/ ./ valentines
- mv .public public
artifacts:
paths:
diff --git a/js/spniOption.js b/js/spniOption.js
index d03acbe0f67..796beaf9c96 100644
--- a/js/spniOption.js
+++ b/js/spniOption.js
@@ -47,7 +47,7 @@ var backgrounds = [
{ name: 'romantic', location: 'indoors' },
{ name: 'classic', location: 'indoors' }
];
-var defaultBackground = 23;
+var defaultBackground = 1;
var selectedBackground = defaultBackground-1;
/**********************************************************************
diff --git a/js/spniTitle.js b/js/spniTitle.js
index 2b83072f7c4..efccfc89a7c 100644
--- a/js/spniTitle.js
+++ b/js/spniTitle.js
@@ -22,7 +22,10 @@ $titleCandy = [$("#left-title-candy"), $("#right-title-candy")];
**********************************************************************/
var CANDY_LIST = [
- /*
+ "meia/0-disappointed.png",
+ "meia/1-busy.png",
+ "meia/2-pleased.png",
+ "meia/2-addressing.png",
"elizabeth/0-calm.png",
"elizabeth/1-awkward.png",
"elizabeth/2-interested.png",
@@ -35,6 +38,10 @@ var CANDY_LIST = [
"pit/1-happy.png",
"pit/2-pumped.png",
"pit/3-shy.png",
+ "uravity/0-calm.png",
+ "uravity/1-heroic.png",
+ "uravity/2-happy.png",
+ "uravity/3-embarrassed.png",
"misato/0-Confident.png",
"misato/1-Happy.png",
"misato/2-Smug.png",
@@ -43,6 +50,10 @@ var CANDY_LIST = [
"palutena/1-calm.png",
"palutena/2-tranquil.png",
"palutena/3-surprised.png",
+ "zone-tan/0-calm.png",
+ "zone-tan/1-interested.png",
+ "zone-tan/1-serene2.png",
+ "zone-tan/2-wink.png",
"videl/0-confident.png",
"videl/1-flying.png",
"videl/2-happy.png",
@@ -75,14 +86,30 @@ var CANDY_LIST = [
"jin/1-Excited.png",
"jin/2-Happy.png",
"jin/3-Flirt.png",
+ "corrin_m/0-calm.png",
+ "corrin_m/1-happy.png",
+ "corrin_m/2-excited.png",
+ "corrin_m/3-shy.png",
"futaba/0-happy.png",
"futaba/1-triumphant.png",
"futaba/2-awkward.png",
"futaba/3-excited.png",
+ "monika/0-writing-tip.png",
+ "monika/1-interested.png",
+ "monika/2-happy.png",
+ "monika/3-shy-happy.png",
"velma/0-happy.png",
"velma/0-calm.png",
"velma/1-confident.png",
"velma/1-shocked.png",
+ "d.va/0-winking.png",
+ "d.va/1-excited.png",
+ "d.va/2-peace.png",
+ "d.va/3-shocked.png",
+ "nagisa/0-dango.png",
+ "nagisa/1-calm.png",
+ "nagisa/2-interested.png",
+ "nagisa/3-veryembarrassed.png",
"gwen/0-start.png",
"gwen/2-happy.png",
"gwen/2-normal.png",
@@ -135,60 +162,10 @@ var CANDY_LIST = [
"zizou/1-excited.png",
"zizou/2-happy.png",
"zizou/3-interested.png",
-
"nagisa/0-dango.png",
"nagisa/1-calm.png",
"nagisa/2-interested.png",
"nagisa/3-veryembarrassed.png",
- */
- "reskins/meia_cupid/0-disappointed.png",
- "reskins/meia_cupid/1-busy.png",
- "reskins/meia_cupid/2-pleased.png",
- "reskins/meia_cupid/2-addressing.png",
- "reskins/cheerleaderochako/0-calm.png",
- "reskins/cheerleaderochako/1-heroic.png",
- "reskins/cheerleaderochako/2-happy.png",
- "reskins/cheerleaderochako/3-embarrassed.png",
- "reskins/zone-tan_valentine/0-calm.png",
- "reskins/zone-tan_valentine/1-interested.png",
- "reskins/zone-tan_valentine/1-serene2.png",
- "reskins/zone-tan_valentine/2-wink.png",
- "reskins/corrin_m_valentine/0-calm.png",
- "reskins/corrin_m_valentine/1-happy.png",
- "reskins/corrin_m_valentine/2-excited.png",
- "reskins/corrin_m_valentine/3-shy.png",
- "reskins/monika_love_bug/0-writing-tip.png",
- "reskins/monika_love_bug/1-interested.png",
- "reskins/monika_love_bug/2-happy.png",
- "reskins/monika_love_bug/3-shy-happy.png",
- "reskins/d.va_cruiser/0-winking.png",
- "reskins/d.va_cruiser/1-excited.png",
- "reskins/d.va_cruiser/2-peace.png",
- "reskins/d.va_cruiser/3-shocked.png",
- "reskins/flower_girl_ini/0-sleepy.png",
- "reskins/flower_girl_ini/1-excited.png",
- "reskins/flower_girl_ini/2-dumb.png",
- "reskins/flower_girl_ini/3-cracker.png",
- "reskins/dapper_date/0-calm.png",
- "reskins/dapper_date/1-joyful.png",
- "reskins/dapper_date/2-pleasant.png",
- "reskins/dapper_date/3-perky.png",
- "reskins/festival_aella/0-happy.png",
- "reskins/festival_aella/1-flustered.png",
- "reskins/festival_aella/2-interested.png",
- "reskins/festival_aella/2-happy.png",
- "reskins/lynbride/0-calm.png",
- "reskins/lynbride/1-happy.png",
- "reskins/lynbride/2-interested.png",
- "reskins/lynbride/3-happy.png",
- "reskins/chiakimaid/0-sleepy.png",
- "reskins/chiakimaid/1-happy.png",
- "reskins/chiakimaid/2-excited.png",
- "reskins/chiakimaid/3-embarrassed.png",
- "reskins/zizou_valentine/0-happy.png",
- "reskins/zizou_valentine/1-excited.png",
- "reskins/zizou_valentine/2-appreciative.png",
- "reskins/zizou_valentine/2-puzzled.png",
];
var clothingChoices = [];
diff --git a/opponents/listing.xml b/opponents/listing.xml
index e29a76d4cad..9ed3421ee0d 100644
--- a/opponents/listing.xml
+++ b/opponents/listing.xml
@@ -8,46 +8,46 @@
<!-- Individual Listings -->
<individuals>
- <opponent release="147">ini</opponent>
- <opponent release="100">meia</opponent>
- <opponent release="140">haru</opponent>
- <opponent release="103">corrin_m</opponent>
- <opponent release="125">monika</opponent>
- <opponent release="51">lyn</opponent>
- <opponent release="42">nagisa</opponent>
- <opponent release="106">chiaki</opponent>
- <opponent release="108">aella</opponent>
- <opponent release="112">uravity</opponent>
- <opponent release="84">zizou</opponent>
- <opponent release="64">zone-tan</opponent>
- <opponent release="49">d.va</opponent>
- <opponent release="107">kyu</opponent>
<opponent release="117">jura</opponent>
<opponent release="82">marinette</opponent>
<opponent release="57">revy</opponent>
<opponent release="101">pit</opponent>
<opponent release="119">amalia</opponent>
<opponent release="114">misato</opponent>
+ <opponent release="112">uravity</opponent>
<opponent release="139">kizuna</opponent>
+ <opponent release="100">meia</opponent>
<opponent release="133">natsuki</opponent>
+ <opponent release="125">monika</opponent>
<opponent release="143">sayori</opponent>
<opponent release="87">palutena</opponent>
<opponent release="5">elizabeth</opponent>
<opponent release="130">shimakaze</opponent>
+ <opponent release="64">zone-tan</opponent>
+ <opponent release="69">twilight</opponent>
+ <opponent release="107">kyu</opponent>
<opponent release="50">raven</opponent>
<opponent release="105">9s</opponent>
+ <opponent release="84">zizou</opponent>
<opponent release="85">sola</opponent>
<opponent release="92">aimee</opponent>
+ <opponent release="136">remilia</opponent>
+ <opponent release="96">futaba</opponent>
<opponent release="131">ryuji</opponent>
+ <opponent release="140">haru</opponent>
<opponent release="122">jin</opponent>
<opponent release="21">kyoko</opponent>
+ <opponent release="106">chiaki</opponent>
<opponent release="116">mahiru</opponent>
<opponent release="97">gwen</opponent>
<opponent release="91">florina</opponent>
+ <opponent release="51">lyn</opponent>
<opponent release="134">catria</opponent>
<opponent release="86">rinkah</opponent>
+ <opponent release="103">corrin_m</opponent>
<opponent release="90">corrin_f</opponent>
<opponent release="34">mia</opponent>
+ <opponent release="42">nagisa</opponent>
<opponent release="46">ruby</opponent>
<opponent release="68">weiss</opponent>
<opponent release="79">blake</opponent>
@@ -71,6 +71,7 @@
<opponent release="137">navi</opponent>
<opponent release="63">zelda</opponent>
<opponent release="113">saki</opponent>
+ <opponent release="49">d.va</opponent>
<opponent release="93">mei</opponent>
<opponent release="33">tracer</opponent>
<opponent release="9">nugi-chan</opponent>
@@ -90,21 +91,23 @@
<opponent release="110">felicia</opponent>
<opponent release="118">velma</opponent>
<opponent release="62">elaine</opponent>
+ <opponent release="108">aella</opponent>
<opponent release="126">black_canary</opponent>
<opponent release="48">buffy</opponent>
<opponent release="56">xander</opponent>
<opponent release="99">alpha</opponent>
<opponent release="47">sonya</opponent>
<opponent release="54">meg</opponent>
+ <opponent release="95">kurumu</opponent>
<opponent release="74">captain_falcon</opponent>
<opponent release="72">mettaton</opponent>
<opponent release="144">pinkie_pie</opponent>
<opponent release="145">kamina</opponent>
<opponent release="146">miko</opponent>
+ <opponent release="147">ini</opponent>
<opponent release="148">coco</opponent>
<opponent release="149">rarity</opponent>
<opponent release="32">sheena</opponent>
- <opponent release="96">futaba</opponent>
<opponent status="testing">sayaka</opponent>
<opponent status="testing">kali</opponent>
<opponent status="testing">hanako</opponent>
diff --git a/prod-config.xml b/prod-config.xml
index f3dc7060ac7..b791113f7a4 100644
--- a/prod-config.xml
+++ b/prod-config.xml
@@ -2,7 +2,7 @@
<config>
<debug>false</debug> <!-- true or false -->
- <alternate-costumes>true</alternate-costumes>
- <force-alternate-costume>valentines</force-alternate-costume>
+ <alternate-costumes>false</alternate-costumes>
+ <!--<force-alternate-costume>valentines</force-alternate-costume>-->
<commit>__CI_COMMIT_SHA</commit>
</config>
--
GitLab