Merge pull request #16 from phantomindex/master

Some changering around lang
PhantomBot · Jan 9, 2017 · 369a081 · 369a081
2 parents acee0e0 + ffbd5db
commit 369a081
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 13 deletions.
diff --git a/pokemonSystem/scripts/games/pokemonSystem.js b/pokemonSystem/scripts/games/pokemonSystem.js
@@ -456,6 +456,7 @@
         if (chance >= 4) {
             $.inidb.incr(username, 'pcandy', 1);
             candy = $.lang.get('waifugames.candy.dropped');
+            candy2 = $.lang.get('waifugames.candy.dropped2');
         }
 
         if (chance <= 4) {
@@ -467,7 +468,7 @@
                 $.say($.lang.get('waifugames.catch.new', rare + $.userPrefix(username, true), unlock, replace(waifu), id, $.shortenURL.getShortURL(link) + candy));
             }
         } else {
-            $.say($.lang.get('waifugames.catch.miss', $.userPrefix(username, true), replace(waifu), id) + candy);
+            $.say($.lang.get('waifugames.catch.miss', $.userPrefix(username, true), replace(waifu), id), candy2);
             return;
         }
     }
@@ -745,7 +746,7 @@
         $.inidb.incr(username, 'pLove', id, 1*amount);
         $.inidb.incr(username, 'pLewdness', id, 1*amount);
         $.inidb.decr(username, 'pcandy', 1*amount);
-        $.say($.lang.get('waifuGames.candy.use', $.whisperPrefix(username), replace(getWaifu(id)), replace2(getWaifu(id)), (25*amount), getEXP(username, id), getLevel(username, id), getCandy(username, id)));
+        $.say($.lang.get('waifuGames.candy.use', $.whisperPrefix(username), replace(getWaifu(id)), replace2(getWaifu(id)), (100*amount), getEXP(username, id), getLevel(username, id), getCandy(username, id)));
     }
 
     /*
@@ -826,7 +827,9 @@
                 $.say($.lang.get('waifugames.fight.usage'));
                 return;
             }
+            if ($.isOnline($.channelName)) {
             startBattle(sender, action.toLowerCase(), args.slice(1).join(' '));
+          }
         }
 
         if (command.equalsIgnoreCase('candy')) {

diff --git a/pokemonSystem/scripts/lang/custom/games/games-pokemonSystem.js b/pokemonSystem/scripts/lang/custom/games/games-pokemonSystem.js
@@ -6,11 +6,12 @@ $.lang.register('waifugames.marry.null', '$1 you must specify a Pokémon you own
 $.lang.register('waifugames.marry.already', '$1 you are already married to $2!');
 $.lang.register('waifugames.exist.404', '$1 that Pokémon does not exist!');
 $.lang.register('waifugames.profile.success', '$1 you own $2 out of $3 Pokémon characters and you have $4 pieces of candy. $5% Progress');
-$.lang.register('waifugames.candy.get', '$1 you have $2 of XP Candy! Each candy increases your waifu\'s EXP by 100.');
-$.lang.register('waifugames.candy.missing', 'That Pokémon is not in your harem!');
-$.lang.register('waifugames.candy.use', '$1 increased $2\'s EXP by $3! $4 now has $5 EXP at (level: $6). You have $7 candy left!');
+$.lang.register('waifugames.candy.get', '$1 you have $2 Candies! Each candy increases your Pokémon EXP by 100.');
+$.lang.register('waifugames.candy.missing', 'That Pokémon is not in your team!');
+$.lang.register('waifugames.candy.use', '$1 increased $2\'s EXP by $4! Your Pokémon now has $5 EXP at (level: $6). You have $7 candy left!');
 $.lang.register('waifugames.candy.nostock', '$1 you don\'t have any candy left!');
-$.lang.register('waifugames.candy.dropped', ' Candy dropped');
+$.lang.register('waifugames.candy.dropped', ' , it was holding a (Candy)');
+$.lang.register('waifugames.candy.dropped2', 'and dropped a (Candy)');
 $.lang.register('waifugames.checkwaifu.success', '$1 You own $2 of: $3 #$4. $5 $6!');
 $.lang.register('waifugames.checkwaifu.stats', 'Level: $1, Atk: $2, Def: $3, Bond: $4%');
 $.lang.register('waifugames.catch.miss', '$1 $2 #$3 noticed you and dodged the Pokéball! It got away.');

diff --git a/waifuGames/scripts/games/waifuGames.js b/waifuGames/scripts/games/waifuGames.js
@@ -358,7 +358,7 @@
      * @return {String}
      */
     function replace(str) {
-        return str.replace(/=/, '(').replace('[Rare]', '(Rare)').replace(/=/g, ')');
+        return str.replace(/=/, '(').replace('[Rare]', '').replace(/=/g, ')');
     }
 
     /*
@@ -442,7 +442,7 @@
             rare = '';
 
         if (waifu.includes('[Rare]')) {
-            rare = ('/me +' + $.getPointsString(reward) + ' ');
+            rare = ('/me RARE! +' + $.getPointsString(reward) + ' ');
             if ($.inidb.get('settings', 'rChance') == 'true') {
                 chance = $.randRange(1, 4);
             } else {
@@ -456,6 +456,7 @@
         if (chance >= 4) {
             $.inidb.incr(username, 'candy', 1);
             candy = $.lang.get('waifugames.candy.dropped');
+            candy2 = $.lang.get('waifugames.candy.dropped2');
         }
 
         if (chance <= 4) {
@@ -467,7 +468,7 @@
                 $.say($.lang.get('waifugames.catch.new', rare + $.userPrefix(username, true), unlock, replace(waifu), id, $.shortenURL.getShortURL(link) + candy));
             }
         } else {
-            $.say($.lang.get('waifugames.catch.miss', $.userPrefix(username, true), replace(waifu), id) + candy);
+            $.say($.lang.get('waifugames.catch.miss', $.userPrefix(username, true), replace(waifu), id, candy2));
             return;
         }
     }
@@ -747,7 +748,7 @@
         $.inidb.incr(username, 'wLove', id, 1*amount);
         $.inidb.incr(username, 'wLewdness', id, 1*amount);
         $.inidb.decr(username, 'candy', 1*amount);
-        $.say($.lang.get('waifuGames.candy.use', $.whisperPrefix(username), replace(getWaifu(id)), replace2(getWaifu(id)), (25*amount), getEXP(username, id), getLevel(username, id), getCandy(username, id)));
+        $.say($.lang.get('waifuGames.candy.use', $.whisperPrefix(username), replace(getWaifu(id)), replace2(getWaifu(id)), (100*amount), getEXP(username, id), getLevel(username, id), getCandy(username, id)));
     }
 
     /*
@@ -828,7 +829,9 @@
                 $.say($.lang.get('waifugames.fight.usage'));
                 return;
             }
+            if ($.isOnline($.channelName)) {
             startBattle(sender, action.toLowerCase(), args.slice(1).join(' '));
+          }
         }
 
         if (command.equalsIgnoreCase('candy')) {

diff --git a/waifuGames/scripts/lang/custom/games/games-waifuGames.js b/waifuGames/scripts/lang/custom/games/games-waifuGames.js
@@ -8,12 +8,13 @@ $.lang.register('waifugames.exist.404', '$1 that waifu does not exist!');
 $.lang.register('waifugames.profile.success', '$1 you own $2 out of $3 waifu characters and you have $4 pieces of candy. $5% Progress');
 $.lang.register('waifugames.candy.get', '$1 you have $2 of XP Candy! Each candy increases your waifu\'s EXP by 100.');
 $.lang.register('waifugames.candy.missing', 'That waifu is not in your harem!');
-$.lang.register('waifugames.candy.use', '$1 increased $2\'s EXP by $3! $4 now has $5 EXP at (level: $6). You have $7 candy left!');
+$.lang.register('waifugames.candy.use', '$1 increased $2\'s EXP by $4! She now has $5 EXP at (level: $6). You have $7 candy left!');
 $.lang.register('waifugames.candy.nostock', '$1 you don\'t have any candy left!');
-$.lang.register('waifugames.candy.dropped', ' Candy dropped');
+$.lang.register('waifugames.candy.dropped', ' , She was holding a (Candy)');
+$.lang.register('waifugames.candy.dropped2', 'and dropped a (Candy)');
 $.lang.register('waifugames.checkwaifu.success', '$1 You own $2 of: $3 #$4. $5 $6!');
 $.lang.register('waifugames.checkwaifu.stats', 'Level: $1, Atk: $2, Def: $3, Love: $4%');
-$.lang.register('waifugames.catch.miss', '$1 $2 #$3 noticed you and slapped you before running away!');
+$.lang.register('waifugames.catch.miss', '$1 $2 #$3 noticed you and slapped you $4 before running away!');
 $.lang.register('waifugames.catch.own', '$1 seduced another +$2: $3 #$4. $5!');
 $.lang.register('waifugames.catch.new', '$1 seduced +$2: $3 #$4. $5!');
 $.lang.register('waifugames.catch.rare', 'Latest [Rare] Waifu caught: $3 #$4 by $1!');