Skip to content

Commit

Permalink
removed sa alias from modifier buttons,
Browse files Browse the repository at this point in the history
added def interpreter to compile.py
  • Loading branch information
FancyBanana committed Mar 19, 2018
1 parent 29d9d2e commit b761850
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 12 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
temp
**/__pycache__
wiki
*.zip
*.zip
.mypy_cache/
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Place your settings in this file to overwrite default and user settings.
{
"python.pythonPath": "C:\\Program Files\\Python36\\python3.exe"
"python.pythonPath": "C:\\Program Files\\Python36\\python.exe"
}
1 change: 1 addition & 0 deletions compile.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#! python
from compiler.compiler import compile
from config import CFG

Expand Down
6 changes: 2 additions & 4 deletions compiler/modifiers.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ def compileModifiers(modifiers, modifiables):
# alias that contains modifier commands
'fm': "fm_mod_"+modifier_name,
# script facing aliases for button presses
'sa': "sa_mod_"+modifier_name,
'pse': "+se_mod_"+modifier_name,
'mse': "-se_mod_"+modifier_name,
# aliases for user binds
Expand All @@ -61,7 +60,6 @@ def compileModifiers(modifiers, modifiables):
'reset': "mod_"+modifier_name+"_reset",
}
# resetting/setting values of script aliases
resets += ['alias ' + pre['sa'] + ' none; ']
resets += ['alias ' + pre['pse'] + ' none; ']
resets += ['alias ' + pre['mse'] + ' none; ']
resets += ['alias ' + pre['set'] + ' none; ']
Expand All @@ -71,8 +69,8 @@ def compileModifiers(modifiers, modifiables):
def_binds += ['//bind <key> ' + pre['pu']]
# some logic for press/toggle type of modifiers
if modifier_type == "press":
text += ['alias %s "%s; %s; %s;" ' %
(pre['pu'], pre['fm'], pre['pse'], pre['sa'])]
text += ['alias %s "%s; %s;"' %
(pre['pu'], pre['fm'], pre['pse'])]
text += ['alias %s "fm_reset; %s;"' % (pre['mu'], pre['mse'])]
elif modifier_type == "toggle":
text += ['alias %s %s; ' % (pre['ft'], pre['pft'])]
Expand Down
4 changes: 2 additions & 2 deletions output/modifiers.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ alias fm_reset13 "alias fc_slot1 sc_slot1; alias +fe_slot2 +se_slot2; alias -fe_
alias fm_reset14 "alias +fe_slot5 +se_slot5; alias -fe_slot5 -se_slot5; alias fc_slot5 sc_slot5; alias +fe_slot6 +se_slot6; alias -fe_slot6 -se_slot6; alias fc_slot6 sc_slot6; alias +fe_lastinv +se_lastinv; alias -fe_lastinv -se_lastinv; alias +fe_invnext +se_invnext; fm_reset15;"
alias fm_reset15 "alias +fe_invprev +se_invprev; alias -fe_invprev -se_invprev; "

alias +u_mod_pa "fm_mod_pa; +se_mod_pa; sa_mod_pa;"
alias +u_mod_pa "fm_mod_pa; +se_mod_pa;"
alias -u_mod_pa "fm_reset; -se_mod_pa;"
alias fm_mod_pa "mod_pa_set; alias mod_reset mod_pa_reset; fm_mod_pa0;"
alias fm_mod_pa0 "alias -fe_attack -se_attack_pa; alias fc_attack sc_attack_pa; alias +fe_attack2 +se_attack2_pa; alias -fe_attack2 -se_attack2_pa; alias fc_attack2 sc_attack2_pa; alias +fe_attack3 +se_attack3_pa; alias -fe_attack3 -se_attack3_pa; alias fc_attack3 sc_attack3_pa; alias +fe_ctx1 +se_ctx1_pa; fm_mod_pa1;"
Expand All @@ -42,7 +42,7 @@ alias fm_mod_pa13 "alias fc_slot1 sc_slot1_pa; alias +fe_slot2 +se_slot2_pa; ali
alias fm_mod_pa14 "alias +fe_slot5 +se_slot5_pa; alias -fe_slot5 -se_slot5_pa; alias fc_slot5 sc_slot5_pa; alias +fe_slot6 +se_slot6_pa; alias -fe_slot6 -se_slot6_pa; alias fc_slot6 sc_slot6_pa; alias +fe_lastinv +se_lastinv_pa; alias -fe_lastinv -se_lastinv_pa; alias +fe_invnext +se_invnext_pa; fm_mod_pa15;"
alias fm_mod_pa15 "alias +fe_invprev +se_invprev_pa; alias -fe_invprev -se_invprev_pa; "

alias +u_mod_pb "fm_mod_pb; +se_mod_pb; sa_mod_pb;"
alias +u_mod_pb "fm_mod_pb; +se_mod_pb;"
alias -u_mod_pb "fm_reset; -se_mod_pb;"
alias fm_mod_pb "mod_pb_set; alias mod_reset mod_pb_reset; fm_mod_pb0;"
alias fm_mod_pb0 "alias -fe_attack -se_attack_pb; alias fc_attack sc_attack_pb; alias +fe_attack2 +se_attack2_pb; alias -fe_attack2 -se_attack2_pb; alias fc_attack2 sc_attack2_pb; alias +fe_attack3 +se_attack3_pb; alias -fe_attack3 -se_attack3_pb; alias fc_attack3 sc_attack3_pb; alias +fe_ctx1 +se_ctx1_pb; fm_mod_pb1;"
Expand Down
4 changes: 0 additions & 4 deletions output/resets.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ alias -se_taunt5 none;
alias -se_taunt6 none;
alias -se_taunt7 none;
alias -se_taunt8 none;
alias sa_mod_pa none;
alias +se_mod_pa none;
alias -se_mod_pa none;
alias mod_pa_set none;
Expand Down Expand Up @@ -269,7 +268,6 @@ alias +se_invnext_pa +se_invnext;
alias -se_invnext_pa -se_invnext;
alias +se_invprev_pa +se_invprev;
alias -se_invprev_pa -se_invprev;
alias sa_mod_pb none;
alias +se_mod_pb none;
alias -se_mod_pb none;
alias mod_pb_set none;
Expand Down Expand Up @@ -427,7 +425,6 @@ alias +se_invnext_pb +se_invnext;
alias -se_invnext_pb -se_invnext;
alias +se_invprev_pb +se_invprev;
alias -se_invprev_pb -se_invprev;
alias sa_mod_ta none;
alias +se_mod_ta none;
alias -se_mod_ta none;
alias mod_ta_set none;
Expand Down Expand Up @@ -585,7 +582,6 @@ alias +se_invnext_ta +se_invnext;
alias -se_invnext_ta -se_invnext;
alias +se_invprev_ta +se_invprev;
alias -se_invprev_ta -se_invprev;
alias sa_mod_tb none;
alias +se_mod_tb none;
alias -se_mod_tb none;
alias mod_tb_set none;
Expand Down

0 comments on commit b761850

Please sign in to comment.