Skip to content

Commit

Permalink
Merge pull request #4 from luisadha/v1.6
Browse files Browse the repository at this point in the history
many major changes
  • Loading branch information
luisadha authored Sep 30, 2023
2 parents 4a66742 + b08ae70 commit c02621d
Show file tree
Hide file tree
Showing 17 changed files with 566 additions and 389 deletions.
1 change: 0 additions & 1 deletion ADHAYA_PROFILE-rapsh.js

This file was deleted.

1 change: 1 addition & 0 deletions Adha_PROFILE-rapsh.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"FIRSTNAME": "rudin", "LASTNAME": "adha", "ALIAS": "Adha", "COST TO STATE":" "", "CARS IMPOUNDED":" "", "CARS MONITORED":" "", "BOUNTY":" "", "FINES DUE": "", "PERSUIT_EVADED": "", "BUSTED": ""}
26 changes: 26 additions & 0 deletions Changelog.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# BIG UPDATE

- Imporve signin Animations
- Improve Searching database Animations
- Improve CLI/UX
- Impove Table
- Support Color
- Themes (Experimental)
- Add existing alias already (Experimental)
- Add logo Police
- Rebuild Structure
- Impove random algorithm
- Static data

# Soon/PR

# please update Save current progress to json
# please add more category section
# please update themes fetures
# please generate random ID
# please add feature vehicles input





1 change: 1 addition & 0 deletions _PROFILE-rapsh.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"FIRSTNAME": "", "LASTNAME": "", "ALIAS": "", "COST TO STATE":" "", "CARS IMPOUNDED":" "", "CARS MONITORED":" "", "BOUNTY":" "", "FINES DUE": "", "PERSUIT_EVADED": "", "BUSTED": ""}
1 change: 0 additions & 1 deletion _PROFILE-rapsh.json

This file was deleted.

14 changes: 7 additions & 7 deletions current_alias.data
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
PROFILE: ADHAYA
COST TO STATE: 56,258,989
CARS IMPOUNDED: null
CARS IMMOBILIZED: null
BOUNTY: 85,982,471
FINES DUE: 350,492
PURSUITS EVADED: null
BUSTED: null
COST TO STATE: 55,392,073
CARS IMPOUNDED: 0-10
CARS MONITORED: 1-99
BOUNTY: 11,974,832
FINES DUE: 36,907
PURSUITS EVADED: 1-999
BUSTED: 0 - 15
7 changes: 7 additions & 0 deletions dependencies.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
- COLUMNS = 70
- LINES = 13
- bash
- python3
= tabulate python module
- tput

212 changes: 212 additions & 0 deletions lib/libanimation.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,212 @@
source ~/rapsh/lib/libcolor-rapsh.sh
source ~/rapsh/lib/libmain-rapsh.sh
source ~/rapsh/lib/librand-rapsh.sh

searchMostWantedAnimationStart() {


echo -e " SEARCHING DATABASE -/"; sleep ${DELAY[3]};
echo -e " RETRIEVING LIST -/"; sleep ${DELAY[2]};
printf %"$COLUMNS"s |tr " " ".";
echo


echo -e " >ALLAN, WES"; sleep ${DELAY[1]};
echo -e " >CALLAHAN, CLARENCE"; sleep ${DELAY[1]};
echo -e " >DOMINGO, HECTOR"; sleep ${DELAY[1]};
echo -e " >MCCREA, RONALD"; sleep ${DELAY[1]};
echo -e " >${LASTNAME}, ${NAME}"; sleep ${DELAY[1]};
echo -e " >SATO, TORU"; sleep ${DELAY[1]};
echo -e " >VEGA, JOE"; sleep ${DELAY[1]};
echo ''; sleep ${DELAY[3]};
}


function searchMostWantedAnimationEnd() {
echo -e ' SELECTION MADE, RETRIEVING ALIAS...';
sleep ${DELAY[3]};
echo -e ' LOADING OK... '; sleep ${DELAY[2]};
printf %"$COLUMNS"s |tr " " "."; sleep 1.2;
sleep ${DELAY[4]};
}

searchMostWantedAnimation1(){
echo -e " SEARCHING DATABASE -/" $Color_Off
echo -e " RETRIEVING LIST -/" $Color_Off
printf %"$COLUMNS"s | tr " " "."
echo

local _webster="$(echo -e "$COLUMNS - 14" | bc )"
echo -e "${SETMYCOLOR} >ALLAN, WES$(printf %"$_webster"s |tr " " " ")" $Color_Off
echo -e " >CALLAHAN, CLARENCE" $Color_Off
echo -e " >DOMINGO, HECTOR" $Color_Off
echo -e " >MCCREA, RONALD" $Color_Off
echo -e " >${LASTNAME}, ${NAME}" $Color_Off
echo -e " >SATO, TORU" $Color_Off
echo -e " >VEGA, JOE" $Color_Off
echo '';
}


searchMostWantedAnimation2() {
echo -e " SEARCHING DATABASE -/" $Color_Off
echo -e " RETRIEVING LIST -/" $Color_Off
printf %"$COLUMNS"s | tr " " "."
echo

local _razor="$(echo -e "$COLUMNS - 22" | bc)"

echo -e " >ALLAN, WES" $Color_Off
echo -e "${SETMYCOLOR} >CALLAHAN, CLARENCE$(printf %"$_razor"s | tr " " " ")" $Color_Off
echo -e " >DOMINGO, HECTOR" $Color_Off
echo -e " >MCCREA, RONALD" $Color_Off
echo -e " >${LASTNAME}, ${NAME}" $Color_Off
echo -e " >SATO, TORU" $Color_Off
echo -e " >VEGA, JOE" $Color_Off
echo '';
}

searchMostWantedAnimation3() {
echo -e " SEARCHING DATABASE -/" $Color_Off
echo -e " RETRIEVING LIST -/" $Color_Off
printf %"$COLUMNS"s |tr " " "."
echo

local _ming="$(echo -e "$COLUMNS - 19" | bc)"

echo -e " >ALLAN, WES" $Color_Off
echo -e " >CALLAHAN, CLARENCE" $Color_Off
echo -e "${SETMYCOLOR} >DOMINGO, HECTOR$(printf %"$_ming"s |tr " " " ")" ${Color_Off}
echo -e " >MCCREA, RONALD" ${Color_Off}
echo -e " >${LASTNAME}, ${NAME}" $Color_Off
echo -e " >SATO, TORU" $Color_Off
echo -e " >VEGA, JOE" $Color_Off
echo '';
}

searchMostWantedAnimation4() {
echo -e " SEARCHING DATABASE -/" $Color_Off
echo -e " RETRIEVING LIST -/" $Color_Off
printf %"$COLUMNS"s |tr " " "."
echo

local _ronnie="$(echo -e "$COLUMNS - 18" | bc)"
echo -e " >ALLAN, WES" $Color_Off
echo -e " >CALLAHAN, CLARENCE" $Color_Off
echo -e " >DOMINGO, HECTOR" $Color_Off
echo -e "${SETMYCOLOR} >MCCREA, RONALD$(printf %"$_ronnie"s |tr " " " ")" $Color_Off
echo -e " >${LASTNAME}, ${NAME}" $Color_Off
echo -e " >SATO, TORU" $Color_Off
echo -e " >VEGA, JOE" $Color_Off
echo '';
}

searchMostWantedAnimation5() {
echo -e " SEARCHING DATABASE -/" $Color_Off
echo -e " RETRIEVING LIST -/" $Color_Off
printf %"$COLUMNS"s |tr " " "."
echo

local _playerLenght="$(echo -e " >${LASTNAME}, ${NAME}" | wc -L)"

local _player="$(echo -e "$COLUMNS - $_playerLenght" | bc)"
echo -e " >ALLAN, WES" $Color_Off
echo -e " >CALLAHAN, CLARENCE" $Color_Off
echo -e " >DOMINGO, HECTOR" $Color_Off
echo -e " >MCCREA, RONALD" $Color_Off
echo -e "${SETMYCOLOR} >${LASTNAME}, ${NAME}$(printf %"$_player"s |tr " " " ")" $Color_Off
echo -e " >SATO, TORU" $Color_Off
echo -e " >VEGA, JOE" $Color_Off
echo '';

}


searchMostWantedAnimation6() {
echo -e " SEARCHING DATABASE -/" $Color_Off
echo -e " RETRIEVING LIST -/" $Color_Off
printf %"$COLUMNS"s |tr " " "."
echo

local _bull="$(echo -e "$COLUMNS - 14" | bc)"


echo -e " >ALLAN, WES" $Color_Off
echo -e " >CALLAHAN, CLARENCE" $Color_Off
echo -e " >DOMINGO, HECTOR " $Color_Off
echo -e " >MCCREA, RONALD" $Color_Off
echo -e " >${LASTNAME}, ${NAME}" $Color_Off
echo -e "$SETMYCOLOR >SATO, TORU$(printf %"$_bull"s |tr " " " ")" $Color_Off
echo -e " >VEGA, JOE" $Color_Off
echo '';
}

searchMostWantedAnimation7() {
echo -e " SEARCHING DATABASE -/" $Color_Off
echo -e " RETRIEVING LIST -/" $Color_Off
printf %"$COLUMNS"s |tr " " "."
echo

local _jv="$(echo -e "$COLUMNS - 13" | bc )"
echo -e " >ALLAN, WES" $Color_Off
echo -e " >CALLAHAN, CLARENCE" $Color_Off
echo -e " >DOMINGO, HECTOR" $Color_Off
echo -e " >MCCREA, RONALD" $Color_Off
echo -e " >${LASTNAME}, ${NAME} " $Color_Off
echo -e " >SATO, TORU" $Color_Off
echo -e "${SETMYCOLOR} >VEGA, JOE$(printf %"$_jv"s |tr " " " ")" $Color_Off
echo '';

}


afterSignInAnimation() {
searchMostWantedAnimationStart; sleep ${DELAY[0]}; clear;
searchMostWantedAnimation1; sleep ${DELAY[0]}; clear;
searchMostWantedAnimation2; sleep ${DELAY[0]}; clear;
searchMostWantedAnimation3; sleep ${DELAY[0]}; clear;
searchMostWantedAnimation4; sleep ${DELAY[0]}; clear;
searchMostWantedAnimation5; sleep ${DELAY[0]}; clear;
searchMostWantedAnimation6; sleep ${DELAY[0]}; clear;
searchMostWantedAnimation7; sleep ${DELAY[0]}; clear;
searchMostWantedAnimation6; sleep ${DELAY[0]}; clear;
searchMostWantedAnimation5; sleep 0.4; searchMostWantedAnimationEnd;
}

signInAnimation() {
MESSAGE_OPTIONAL="$1"
max=$2

# Menghitung posisi tengah layar
cols=$(tput cols)
middle=$((cols / 2))

until false; do
i=0

# clear
spinner=( '-/' '\-' '-/' '\-' )

while [ $i -le $max ]; do
for ANIMATION in "${spinner[@]}"; do
echo -n -e "\r" # Hapus baris sebelumnya
tput sc
tput cup 13 $middle # Posisikan kursor ke tengah
echo -n "${MESSAGE_OPTIONAL} ${ANIMATION}"
sleep 0.5
if [ $i -eq 15 ]; then

tput rc

# clear
# afterSignInAnimation;
#clear
#accessedMenu;
sleep 10000
exit 1;
fi
let i++
done
done
done
}
35 changes: 21 additions & 14 deletions lib/libcolor-rapsh.sh
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
PREFIX='\e[3;m'
DELAY=1 # Number of seconds to display results
RPD="ROCKPORT POLICE DEPARTEMENT";
SETMYCOLOR="\e[3;m\r" #invert color
DELAY=("0.3" "0.5" "1.3" "1.5" "1.7")
RPD="R O C K P O R T P O L I C E D E P A R T E M E N T";
SETMYCOLOR="${On_IGreen}${BIBlack}"
THEME_DOT="."
RPD2="ROCKPORT P.D."
ITALIC='\e[3;m\r'

ITALIC='\e[3;m\r'
SV="${e93}SIGIN IN:${e92}"
PV="${e93}PASSWORD:${e92}"
RAPSH_DIR="$HOME/rapsh/"
# Reset
Color_Off='\033[0m' # Text Reset

e39="\e[39m"
e91="\e[91m"
e93="\e[93m"
e92="\e[92m"
e34="\e[34m"
# Regular Colors
Black='\033[0;30m' # Black
Red='\033[0;31m' # Red
Expand Down Expand Up @@ -102,15 +108,15 @@ draw() {

local padding_length=$((($terminal_width - $text_length - 4) / 2))

echo -e "$(printf "%${padding_length}s")$wellcome_str$(printf "%${padding_length}s")"
echo -n -e "$(printf "%${padding_length}s")$wellcome_str$(printf "%${padding_length}s")"
}

local star=" "

local abc=$(echo "${star}$(draw)" | wc -L)
local cba=$((COLUMNS - abc))

echo -e "${star}$(draw)$(printf %"$cba"s "$star")"
echo -n -e "${star}$(draw)$(printf %"$cba"s "$star")"
}
function getAsciiShieldLogos() {
public_Banner "..... ....." #1
Expand All @@ -131,12 +137,15 @@ public_Banner ".............................................." #15
public_Banner ".........................................." #16
public_Banner "...................................." #17
public_Banner "........................" #18
public_Banner "......" #19
public_Banner " " #20
public_Banner "......." #19
local quote="'"
public_Banner "$quote" #20
public_Banner " " #21
}

function public_Footer() {
echo -e "1) SUMMARY\t2) VEHICLE DATABASE\t3) INFRACTIONS\t4) COST TO STATE\t5) TOP 5 PURSUITS\t6) RANGKINGS\t7) SAVE CURRENT PROGRESS\t0) EXIT";
echo -e "1) SUMMARY\t2) VEHICLE DATABASE\t3) INFRACTIONS\t4) COST TO STATE\t5) TOP 5 PURSUITS\t6) RANGKINGS\t7) SAVE CURRENT STAT\t0) EXIT";

}
function public_Header() {
local arg="$2"
Expand Down Expand Up @@ -176,14 +185,12 @@ printf " Enter selection [0-4] > %$((${COLUMNS:-`tput cols`}-25))s\n" ''
function _menu_theme_dot() {

newLine; #echo -e "
colm=$(python3 ~/rapsh/theme/dot_theme.py | column -ts "+|" -L | sed "s/ /${THEME_DOT}/g" | wc -L)
colm=$(python3 ~/rapsh/theme/dot_theme.py | column -ts "+|=" -L | sed "s/ /${THEME_DOT}/g" | sed "s/=/-/g" | wc -L)
export COLUMNS=$colm
echo
printf %"$colm"s | tr " " "-"
newLine
python3 ~/rapsh/theme/dot_theme.py | column -ts "+|" -L | sed "s/ /${THEME_DOT}/g"
python3 ~/rapsh/theme/dangerline_theme.py | column -ts "+|" -L | sed "s/ /${THEME_DOT}/g" |sed "s/=/-/g" |sed "s/--//g" | sed "s/-//g"

printf %"$colm"s | tr " " "-"
newLine
}

Expand Down
Loading

0 comments on commit c02621d

Please sign in to comment.