Skip to content

Commit

Permalink
3.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
smlbiobot committed Sep 2, 2018
1 parent f7acdd6 commit 6118c96
Show file tree
Hide file tree
Showing 33 changed files with 7,771 additions and 7,182 deletions.
15 changes: 11 additions & 4 deletions assets/csv_client/client_globals.csv
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,8 @@
,,,,"clashroyale.scinbox.qq.com",
,,,,"video.qq.com",
,,,,"v.qq.com",
,,,,"tesports-clashroyale.scinbox.qq.com",
,,,,"esports-clashroyale.scinbox.qq.com",
"ROYAL_BOX_URL_PARAM_USER_AGENT",,,"supercell-in-game",,
"ROYAL_BOX_PASS_ALL_EVENT_TIMES",,"TRUE",,,
"LOAD_ONLY_LOWRES_TEX",,"FALSE",,,
Expand Down Expand Up @@ -407,7 +409,7 @@
"MANDATORY_CONTENT_MAX_RETRY_COUNT_BEFORE_ERROR",6,,,,
"SHOW_ACHIEVEMENT_REMOVAL_NOTICE",,"TRUE",,,
"CLASH_ROYALE_MIN_PLATFORM_VERSION",,,"8,2",,
"CLASH_ROYALE_MIN_PLATFORM_VERSION_ANDROID",,,4.2,,
"CLASH_ROYALE_MIN_PLATFORM_VERSION_ANDROID",,,"4.2",,
"WEB_VIEW_LOADING_INDICATOR_SHOW_AFTER_MS",0,,,,
"BATTLE_CANCEL_COOLDOWN_S",10,,,,
"ENABLE_JOINING_2V2_CLAN_SURVIVAL_WHEN_NOT_JOINED",,"TRUE",,,
Expand Down Expand Up @@ -442,7 +444,7 @@
"SHOW_CLAN_WAR_LEADERBOARDS",,"TRUE",,,
"CLAN_WAR_NAME_AMOUNT_A",37,,,,
"CLAN_WAR_NAME_AMOUNT_B",3,,,,
"CLAN_WAR_NAME_AMOUNT_C",26,,,,
"CLAN_WAR_NAME_AMOUNT_C",32,,,,
"DISABLE_IPHONE_X_BLUR_CLAN_RESULTS",,"TRUE",,,
"DISABLE_IPHONE_X_BLUR_CLAN_COLLECTION",,"FALSE",,,
"ENABLE_CSE_TO_SSE_EVENTS",,"TRUE",,,
Expand Down Expand Up @@ -496,10 +498,15 @@
"EMOTES_ENABLED_SPELL_PAGE",,"TRUE",,,
"EMOTES_ENABLED_INGAME_SPECTATOR",,"TRUE",,,
"EMOTES_ENABLED_INGAME_PLAYER",,"TRUE",,,
"ESPORTS_TAB_ENABLED",,FALSE,,,
"ENABLE_OLD_HELPSHIFT",,"TRUE",,,
"ESPORTS_TAB_ENABLED",,"TRUE",,,
"ENABLE_OLD_HELPSHIFT",,"FALSE",,,
"XP_TO_SHOW_NEW_EMOTES",8,,,,
"DOUBLE_TAP_TO_TOGGLE_WAR",,"TRUE",,,
"DOUBLE_TAP_TO_TOGGLE_SPELL",,"TRUE",,,
"HIDE_SHOP_OFFERS_ONCE_FULLY_PURCHASED",,"TRUE",,,
"SHOW_API_TOKEN_IN_SETTINGS",,"TRUE",,,
"USE_VI_FALLBACK_FONT",,"TRUE",,,
"USE_SAME_LEVELS_FOR_ALL_CARDS",,"TRUE",,,
"ENABLE_RANDOM_DECK_BUTTON_SPELL_PAGE",,"FALSE",,,
"EMOTE_CHAT_MIN_TIME_CYCLE_MS",5000,,,,
"EMOTE_CHAT_MAX_TIME_CYCLE_MS",30000,,,,
1 change: 1 addition & 0 deletions assets/csv_client/credits.csv
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"Brice Laville Saint-Martin",
"Lassi Leppinen",
"Jani Lintunen",
"Matt Millwood",
"Taneli Oksama",
"Martin Schjøler",
"Jarno Seppänen",
Expand Down
53 changes: 46 additions & 7 deletions assets/csv_client/effects.csv
Original file line number Diff line number Diff line change
Expand Up @@ -1353,13 +1353,13 @@
,,,,,,,,"ParticleEmitter",,,"heal_ground_ring_short",,"Base",,,,,,,,,,
,,,,,,,,"ParticleEmitter",,,"heal_particle_lines_short",,"Object",,,,,,,,,,
,,,,,10,,,"ParticleEmitter",,,"heal_border_burst_short",,"Base",,,,,,,,,,
"Zap2_effect",,,250,,150,,"sound_spell_zap","ParticleEmitter",,,"Spell_zap_smoke1",,"Object",,,,,,,,,,
,,,,,200,,,"ParticleEmitter",,,"Spell_zap_hitSpot",,"Ground",,,,,,,,,,
,,,,,200,,,"ParticleEmitter",,,"Spell_zap_hitSpot2",,"Ground",,,,,,,,,,
,,,,,50,,,"ParticleEmitter",,,"Spell_zap_sparks",,"Object",,,,,,,,,,
,,,,,50,,,"ParticleEmitter",,,"Spell_zap_Flash",,"Ground",,,,,,,,,,
,,,,,,,,"ParticleEmitter",,,"Zap_hit_area",,"Base",,,,,,,,,,
,,,,,,,,"Filter","sc/effects.sc","filter_target",,,"Base",,,,,,,,,,
"Zap2_effect",,,200,,150,50,"sound_spell_zap","ParticleEmitter",,,"Spell_zap_smoke1",,"Object",,,,,,,,,,
,,,,,200,50,,"ParticleEmitter",,,"Spell_zap_hitSpot",,"Ground",,,,,,,,,,
,,,,,200,50,,"ParticleEmitter",,,"Spell_zap_hitSpot2",,"Ground",,,,,,,,,,
,,,,,50,50,,"ParticleEmitter",,,"Spell_zap_sparks",,"Object",,,,,,,,,,
,,,,,50,50,,"ParticleEmitter",,,"Spell_zap_Flash",,"Ground",,,,,,,,,,
,,,,,,50,,"ParticleEmitter",,,"Zap_hit_area",,"Base",,,,,,,,,,
,,,,,,50,,"Filter","sc/effects.sc","filter_target",,,"Base",,,,,,,,,,
"challenge_unlock",,,,,,,,"SWF",,,,,"Above",,,,,,,,,,
,,,,,,,,"ParticleEmitter",,,"chest_landing_puff_giant",,"Above",,,,,,,,,,
,,,,,,,,"ParticleEmitter",,,"chest_landing_giantBurst",,"Base",,,,,,,,,,
Expand Down Expand Up @@ -1707,3 +1707,42 @@
,,,,,,,,"ParticleEmitter",,,"royal_hog_dustPuff",,"Ground",,,,,,,,,,
,,,,,,,,,,,,,,60,,,,,,,,,
,,,,,,,,,,,,,,60,,,,,,,,,
"goblin_giant_deploy",,,,,,,"sound_goblin_giant_deploy","SWF",,,"giant_deploy_dustPuff",,"Object",100,,,"giant_deploy_enemy",,,,,,
,,,,,,,,"Effect",,,,"Deploy_ground_fx_largeSize","Base",,,,,,,,,,
"goblin_giant_steps",,,,,,,"sound_goblin_giant_steps","SWF",,,,,"Ground",100,,,,,,,,,
"goblin_giant_attack_start",,,,,,,"sound_goblin_giant_attack_start","SWF",,,,,"Object",100,,,,,,,,,
"goblin_giant_hit",,,,,,,"sound_goblin_giant_hit","SWF",,,,,"Object",100,,,,,,,,,
,,,,,,,,"ParticleEmitter",,,"giant_hit_sparks",,"Above",,,,,,,,,,
,,,,,25,,,"ParticleEmitter",,,"giant_hit_puff1",,"Object",,,,,,,,,,
,,,,,,,,"ParticleEmitter","sc/effects.sc","giant_hit_blow","giant_hitpuff2",,"Object",,,,,,,,,,
"goblin_giant_die",,,,,,,"sound_goblin_giant_die","Effect","sc/effects.sc","RoundExplosion","Death_sparkle_still1","death_giant1","Object",100,,,"giant_die_enemy",,,,,,
"giant_sparks","true",,,,,,,"ParticleEmitter",,,"giant_sparks",,"Object",,,,,,,,,,
,,,,,,,,"ParticleEmitter",,,"electro_wizard_hit_burst",,"Object",,,,,,,,,,
"Zap3_effect",,,200,,150,50,"sound_spell_zap","ParticleEmitter",,,"Spell_zap_smoke1",,"Object",,,,,,,,,,
,,,,,150,50,,"ParticleEmitter",,,"Spell_zap_hitSpot",,"Ground",,,,,,,,,,
,,,,,200,50,,"ParticleEmitter",,,"Spell_zap_hitSpot2",,"Ground",,,,,,,,,,
,,,,,50,100,,"ParticleEmitter",,,"Spell_zap_sparks",,"Object",,,,,,,,,,
,,,,,50,100,,"ParticleEmitter",,,"Spell_zap_Flash",,"Ground",,,,,,,,,,
,,,,,,75,,"Filter","sc/effects.sc","filter_target",,,"Base",,,,,,,,,,
"DragonRingEmitter","true","true",,,,,,"ParticleEmitter",,,"DragonRingTrail",,"Object",50,,,,,,,,,
,,,,,100,,,"ParticleEmitter",,,"DragonRingTrail",,"Object",,,,,,,,,,
,,,,,200,,,"ParticleEmitter",,,"DragonRingTrail",,"Object",,,,,,,,,,
,,,,,300,,,"ParticleEmitter",,,"DragonRingTrail",,"Object",,,,,,,,,,
,,,,,400,,,"ParticleEmitter",,,"DragonRingTrail",,"Object",,,,,,,,,,
,,,,,500,,,"ParticleEmitter",,,"DragonRingTrail",,"Object",,,,,,,,,,
,,,,,600,,,"ParticleEmitter",,,"DragonRingTrail",,"Object",,,,,,,,,,
,,,,,700,,,"ParticleEmitter",,,"DragonRingTrail",,"Object",,,,,,,,,,
"root_effect",,,,,,100,,"SWF","sc/effects.sc","spell_root_base","IceGolem_snowPile1",,"Ground",,,,,,,,,,
,,,,,,100,,"SWF","sc/effects.sc","spell_root_front","IceGolem_ground_area",,"Object",,,,,,,,,,
,,,,,,100,,"ParticleEmitter","sc/effects.sc","spell_root_front","magic_archer_arrow_die_sparks_blue",,"Object",,,,,,,,,,
"mystery_tease",,,500,,,,"Card_bonus_reveal","ParticleEmitter",,,"mystery_tease",,"Above",,,,,,,"BlueLighning",,,
,,,,,,,,"ParticleEmitter",,,"mystery_particles",,"Above",,,,,,,"RedLightning",,,
"electro_dragon_load_weapon_1",,,,,,,"sound_electro_dragon_load_1","SWF",,,,,"Above",,,,,,,,,,
"electro_dragon_load_weapon_2",,,,,,,"sound_electro_dragon_load_2","SWF",,,,,"Above",,,,,,,,,,
"electro_dragon_load_weapon_3",,,,,,,"sound_electro_dragon_load_3","SWF",,,,,"Above",,,,,,,,,,
"electro_dragon_attack",,,,,,,"sound_electro_dragon_attack","SWF",,,,,"Above",,,,,,,,,,
"openSack_effect",,,,,,,,"SWF",,,,,"Above",,,,,,,,,,
,,,,,,,,"ParticleEmitter",,,"openSack",,"Object",,,,,,,,,,
,,,,,,,,"ParticleEmitter",,,"openSack_smoke",,"Base",,,,,,,,,,
,,,,,,,,"ParticleEmitter",,,"openSack_goldDust",,"Base",,,,,,,,,,
"trade_complete_confetti",,,,,,,,"ParticleEmitter",,,"trade_complete_confetti",,"Above",,,,"win_battle_confetti_red",,,,,,
Loading

0 comments on commit 6118c96

Please sign in to comment.