From 6794004d9410fdd904f8d428a57f5af7216b1452 Mon Sep 17 00:00:00 2001 From: infinitefusion Date: Sun, 13 Mar 2022 21:09:50 -0400 Subject: [PATCH] trainer card fixes --- Data/Map148.rxdata | Bin 12597 -> 12616 bytes Data/Map196.rxdata | Bin 9823 -> 9823 bytes Data/Map228.rxdata | Bin 14470 -> 14470 bytes Data/Map354.rxdata | Bin 7047 -> 7044 bytes Data/Map563.rxdata | Bin 38336 -> 39263 bytes Data/Map565.rxdata | Bin 15515 -> 14995 bytes Data/MapInfos.rxdata | Bin 36405 -> 36405 bytes Data/Scripts.rxdata | Bin 576 -> 576 bytes .../005_Battle scene/007_Scene_Initialize.rb | 1 - .../005_Overworld_RoamingPokemon.rb | 9 +- .../012_Overworld/004_Overworld_FieldMoves.rb | 3 +- Data/Scripts/013_Items/002_Item_Effects.rb | 4 +- Data/Scripts/016_UI/012_UI_TrainerCard.rb | 42 +++- Data/Scripts/050_AddOns/Footprints.rb | 225 ++++++++++++++++++ Data/Scripts/050_AddOns/New Balls.rb | 5 - Data/System.rxdata | Bin 27464 -> 27462 bytes Data/items.dat | Bin 117878 -> 117897 bytes Data/messages.dat | Bin 31185509 -> 31185509 bytes 18 files changed, 271 insertions(+), 18 deletions(-) create mode 100644 Data/Scripts/050_AddOns/Footprints.rb diff --git a/Data/Map148.rxdata b/Data/Map148.rxdata index b71634c6b2df6cf3c53ce6f7a214bff6b40d3e64..314e9981145f5cb72d3f95cad8adb854178aa4a2 100644 GIT binary patch literal 12616 zcmeGjTXP#{buAc4mi#%gW#`t^S*r<2AQ;(oF5QnZ+c;6v!5vIdQ)c|2uBFe?sipnI zYS)g)zyr78Hk}4upeZw4UMTqmyfMQQyul+c@H;xgz&Wd3X(da}N={4?S_!ls2hvm1|NMO>TGcV*S72>>mjn?_A!&Tq(_ zKYv`4rn)YSvLn=sZ$y&`YOK~lQJ6Xt?Ev&|7 z9Fp(}Od@44OGwDYF3OSsTk@GWpWTeXC%&9-B8|7CV~aRXZN_{?2Tw@37bz`e4a!AM$bz#^!o`xtco%owaC#t7CP~_heJ}fg=-&!-O)f>*%#g)s~ zE~);KVrR*@cSN-)YeKc9YFC8XqwggT<-K9{{Nh*4YE!i>15DJCx>u2E#n=_9+_DK& zQjsV1y1HeQ&?f4(C2L3;8a{g+TIVcL2DH6l3Br+kgljg{ZO1}htwmp+`@TFen8}U(9M-~VXLT`Vnq~pRM=LV(&>>zn9?a%JW)tl zv`0sPJ_hI|5?@-{hX<#;o#a7k@7+ngBdn&nC#u!UE~ho4sn#u76r$8if!vbMw;ZwK zY_Xu@@e?_IlKhOw1pI8x19kjN@gR!FEWIb^j6CR=r60L?7;;|?Pwpe1oX>5=l<+M4yA*$Pj7PL^TWTH1Q zKeXO17oY^uHqLSfXVAT- zLr&bRW>L!Vj2+#l@w~=#+k$dgSja7IX^VQnFrkLYX0Eltwk5vd2(#FPI4&+*M!f<> zsV(f+)$6T$Q@BjljUw1hnD`HFQ>sRyMoFnS8{wZlel#! zo4umN^d_Y6?_HSJ;yUt>fO*NM5}aYF;M24G7$}&nlYSUV9*grhyp20d-?|I7dQ(b^ zCjih($)6_B&s%xl(I)fK6z3KC`Ir1t-)96u(ntNLPXw3;@}oZq3QRnN6d)0dERWP* z+NAg^Eix{R{(tt9p&)TXfS;25^fZ4V$IoP-i@ zGrObefkT_C7?%*G)4-$LGq`?)Z)>jU{fplfAkcHkV~7 zj;1k}&7%#c02`}79F0~_9%l^QhYWoAiPRFRmslu5mXwh71dBz8lG0mGvMXqVV`zgZ zv_TAJJsY4c+I1aYx2iQ3K4jc0toJ;q4^YC2^T-ORj94LEmQ$P9FuUwVGwJ#k9@NAd zo;iiJK`nWAw8u!GcBimkphuc1AFTWbny;%NP`aW}i9@=_26RqL`Jn=Ms@ivQytwaRK_^G@$-v1mqEGma8kkWG zQDwBZD~syaXikB{0{o?U1@`~`=wjQbNvF{}!Jr{Qu*Sst3a}7LfQ>^6@M>O4niUY| zcv6?<1zWAQW(;61sc)zz9#u%3G65w{JzDdNa57+y?97eY$M;?%yt`k9qe^sCL$jf4 z=<+H$B}1pAUNjBUT~3+8`CKa*dNVlB%Km((|A3=wvewp6&mb*wk2K^CFamDcXOiPC z8Lq)1lum;cV$VY~R^7BhG*+%W?Z#?6N_*m?w8%s9GFfH=O zAqaL2%ZP;_OK!W-wSpjuJ1^SUZ^2fNbIFgwT zX8Ws<@*0atn0pFs@chr!uAmKQuJ!`P!5mISY2MlpHjP{t+>hcKfw87S(@bqvHyoU( zR*hx>KdH;(XJRG8HXJRHr^$8X^8BZ8%(&n^==Dz%ijsZ8*SZqCt`9+NRrzZqcqyA{;r^QahW(cPZYbPTawa*O zRFvPdkJ%sC!=Z3bCQl_#Bd(&{h!3kJHMy9~xVXb&4zvCOwQS>`u?EH(7;9jxfg{ww zMs##yUq1xy=v0pa^Xwt&(P3)YyUbvN9$RkB-yT@`D-776$9rst)tEUD_aL2Gtic?% zI}+|U***3x_U(~yzr()EzR!Lz67E6rJgxUWj6R5d6#dn68&glK-v9sj>Yk=H=v(|1 m0p*GfFX5MC@td{Mp|5ci=)1QFO6q%1!jHJSZ@T}Jp!^r{h`*Kq literal 12597 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 J`)2wx{~P z>P9MUKoYxCSkhF24AxmJXHCehLt+^}SusJv|r9l~*@r6GnPr2=gN6sO~qNM`kZF%g8KKp@$hw7tnH2tsW28sXo`4uIq8+7O1a> zyPa#yr_59>XTR|W_#+N?+jurV%y=i>$wBExSGp5#9~B4SIrbxH^qC(q-v8X3Zo)^1 zcV}O=!;*3LWwvWwMR1WygWzbrV1Zu*ZU4&@dp&W$-?uMK-XlC^2Q#%JUWVbjv}YQ4 zFm;cY98SZ7p;vGk5{(W{oO97RVI1(N{XViZCUSWF)PL!$>b;wH2t&_Gg3sdg?~L0tr@D6I>JNLU+t6OU?pU3;An zkPzJ9&Vm1-=_&NoM&d*`p!82b`~z?Ui3_~9Z)a!M-$_g;V!euYcjnD+-uun(&CIUi zXEj?NzIF4uuHP`LV|v0^UM<`Dgj;g8QQ&rlmn=foCqMA=0#J*D^VcKyj>}9 zhualfPs`Yd23>zk)Q;#AMtvPwy_j1wOT3WLCylyQTFFsqE?WyU_h6e`*iK*Y^)hc?Lfx)at4gEZHz)XaV7OvH{BWP5S*D9dG9is*_pOmQ zXaq6>R5IL4C6R=C=Hfvme3@P5=h>V5G`qr&a3I{(E}UT=8Cyzty4AP}M^fbJFG9`@ zJ(0C5);Y!fT>UC8<9wIO9`L0gS zy$4HzReH6$oUNIa`ifP%13Qk|I)*-b>B_=|%NH)sc_9zAF8u?ISv_FPZ$iwY5c6?} zImIEyXtDzhbXpLj$qsgCEy?DSQ;5 z`5@autK84+VGi`Q+inhQCtrUS^wx;hMH=^?U8m^KcC-5w-POI;?Pjxc2is?M2&992 zy9eSg)a`ig5{Ou9UI*=-1nrK2b~O$Qb3nVa;s5XGx6j2p9c?lXrr&0sI|%n5-(+3_ z?M{MrXF$6Nc$CEl6i^YnZ@V)p>NJT1AEI^?+>rPA6Jy`)aZy9h!}_%h!}_%h!}_%h!}_%h!}_%I2;DV z>+XY|AF5mGBXvjJFU}9@>KfA|jzaBp9fhb3(zn-_%Rz!^VzPjliPkfG>?RHdQLzeXY0Pw<= zb+g?LXsg*~Qza`zoJve3XdJd&kHXf{j%?mdVtv>qh=zD%sVJmBw3XV%9_bKxiXsqY z&I%hm3p8;iG}I5qFD(`2-6S3YZOeZ*@B?T-*zJ1k6Q_uYz7ZP6-)gt(#VhrX+9Sj; z+NS5LK$Cc3J4BRdsBA(ETcL*{X2B8p*J`&Luq1VE2gX67h^zbR6E`ZtlbQ_bO{z{& zq(%fn_>B5OMB)X#ZKq(NlW^O1cciZ;FlvZM(YLds(GoSyc_}lNG$Fj}7q27f0Jg^1V+KS4Yy!EeGt{2dofc+l*dSdrxV62v1P1RkN`cQ_*1YrCr;9w`T{$PXD^ zFrs!SR5p>AOoZ_y4-%DPk`Z;rJC!)y22XI(>nwB=&e$L~#Ck6rs>fU+Pi1~l4I!{i(AXW)O`KyIHrZlTl#%etBt!L}g)K!v5_CJ*bIhG@%-`ybAEAJ6e$f66j=2b_8w0d9 zb+g!89j#4!YZF;V3>+>4;s4sI(!+1wXa28x{Pu6#f_s{`2dIvCa!l Lv8mGi`JVDO_x^&6 literal 14470 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 X{F#Hlfgirw+(gNFsc$m;flK)pNn5Aa literal 7047 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 d4HUBSMTC6u!QaBGunsp-gg;l9ykL0J zc;Ry3(MzH}C@}>32QdBuBX7p&U*O3X6Fu8fG%+VTJ994I`ObGXR+R7S%KSZNVC{a) zS6`u(3bnFStKTyRn#4*`3ta|@ zGm_+H3M1-X?ojvfn>%c3xPf_$#MmU~WWdy^kubyCY083gC$VjOLZ)ek^pU0+?8mU( zd0oV*9+rZp2ZhNkE)4DXXt8$uZ|zYm9OFh(m{_h0nixw^i-sD{;@N(YW(Mp~SWesC z#?~UhoU+rrDHD$|D->zV1J&8-T7l1K*q~|lPfcE+UKA)BL}gHgyh8Xd2+=^!kPOv{ zNRl)+7)c47B|!vUCo=!b6Uj2uVlqLqWGclBf=W#xmaQf?ZV(i2q+g4Sj$Fm#uWI0G z@0jVgIbf3;l3GXv=eCF`2)A%=8Hvip^(?W3Ai5n-3Q6)PZ6rQnk%9lIoRVz(7Va3g zWe=1ZP>pVngYk4z-J)RJ(al?csskYU|q)+`@}Wj>4oAyo9ah2M$I!voY`D%f z?Ot@lg0l`T$`)9;9e_DW@E(E+S>tjz?uOvwu>d-vg-m?p*5qc5^2QAn^M}E29)P|_ zUik8Kzw+J#_{{;UoQ*WK`WDGDzi6R#dB8mz%NSbgI6tu#9vR;Xy`z67tF9>48= zmNY&+mpw$bY6!|-jX6HYA?_&T>6?kx4dZ}7p-`O4DSLj{8?&}%z$+5&U^0UfDO A7ytkO delta 378 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 JX8VS3ya0jqATIy_ diff --git a/Data/Scripts.rxdata b/Data/Scripts.rxdata index 6b564aa8fea1180dd7c2aa43997c766b8c82bf46..ae261f3c1039b7d0edd8c0ce25335eda3358a348 100644 GIT binary patch delta 551 zcmV+?0@(e)1i%E4B!7dHM2id@TZ!(W+g3fbTDTDunPdX)20OBy(k)m(?m+eSH4G60Y_UwPt&S2OzPC1+f=j`-kKr zw0;r|2Pm>`B*nPK#1Do_N#$TI86J{q{u|-L65h?{^S1ZTyg({T6k%}7riI)GQwUCh z9RupThMb-hH-8vTMp4@>v=t#(cS(+FBPHzkp2D}vl$8N4pbzR&vCw!2(YV|ocheM- zWrEby0c z%;d0KLO=tk>+Vj2_DR?flW~Qqk?QraL2)aYxqakO1b>fRQCe2|5atoQzxLHRZliU6 zZN)b7rt7ZPS1L27KfjZH(J2r`+LhQBb%R3fj9Isn9qzekueS0}R)h|53W66?X!~(O z(`kjUYUusc>BO(}EA^7xk4lE)^FBh&D_aG93I9iaasHW-UvaL~lV>U8Y_-2eJSF delta 551 zcmV+?0@(e)1i%E4B!4ebVl6Vuv6bi^x^2}{tA!h&$RrbRH`tNwlx_+CeeHx`qJCT~ z&y45I%$w&sSnh>^OrZg(EF6`70g;2Ng@^pWKdTVR%cM;1>wH?LN^?xZ|XZLh{o>DlG)!k`4 zJ8#_i{AIC779XF#eqSzD;~BFm5u4R)b0%kx&>R|VrKPWZKx6n0;U36Zt|f7oQ2U1x zGIoAKhXa&ZHKZ^pHDpAJKHJcS`7fm2K zMs5tK^BQt?)PKTaJRZ@uTWBjnwCs{R)mACkiXDS*l`Sg^LP8(Zr($972BLBKL2jlg z6weZqYEfE~EiCbu z^~~fjpF_kVsO#>|qV`GL5R(awsa5**u|e@GnfiU?lz+lwSCo~N*~dAB_m{pp$91&M zZ=Bdh!Svnr`bt&i^%r*1FFFCDNxKsFqHa)_n=$Klvc;W{?bTKO$&1({PC$xc0&PED zXeO-?77e|hI-P`--UOJ$V;tnu1L%@&)#X1yuqS_fG}^25H@RL3>v+3R9GJT}0(Xt$ pLg0Ue6Cj9ee6+8;QVVH;7|XRK!@)n1$P>4G+LB}leFN|fU4wnN5Jdn0 diff --git a/Data/Scripts/011_Battle/005_Battle scene/007_Scene_Initialize.rb b/Data/Scripts/011_Battle/005_Battle scene/007_Scene_Initialize.rb index d36e1766a..e28e2a711 100644 --- a/Data/Scripts/011_Battle/005_Battle scene/007_Scene_Initialize.rb +++ b/Data/Scripts/011_Battle/005_Battle scene/007_Scene_Initialize.rb @@ -131,7 +131,6 @@ class PokeBattle_Scene # enemyBase = "Graphics/Battlebacks/"+baseFilename+"_base1" # messageBG = "Graphics/Battlebacks/"+messageFilename+"_message" - battleBG = "Graphics/Battlebacks/battlebg/"+backdropFilename playerBase = "Graphics/Battlebacks/playerbase/"+baseFilename enemyBase = "Graphics/Battlebacks/enemybase/"+baseFilename diff --git a/Data/Scripts/012_Overworld/002_Battle triggering/005_Overworld_RoamingPokemon.rb b/Data/Scripts/012_Overworld/002_Battle triggering/005_Overworld_RoamingPokemon.rb index a5257e067..27f818810 100644 --- a/Data/Scripts/012_Overworld/002_Battle triggering/005_Overworld_RoamingPokemon.rb +++ b/Data/Scripts/012_Overworld/002_Battle triggering/005_Overworld_RoamingPokemon.rb @@ -85,9 +85,12 @@ def pbRoamPokemonOne(idxRoamer) if rand(32)==0 newMapChoices.push(mapIDs[rand(mapIDs.length)]) end - # Choose a random new map to roam to - if newMapChoices.length>0 - $PokemonGlobal.roamPosition[idxRoamer] = newMapChoices[rand(newMapChoices.length)] + #50% chance of moving to a new map + if rand(2)==0 + # Choose a random new map to roam to + if newMapChoices.length>0 + $PokemonGlobal.roamPosition[idxRoamer] = newMapChoices[rand(newMapChoices.length)] + end end end diff --git a/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb b/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb index 77e8269de..29e7297ae 100644 --- a/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb +++ b/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb @@ -390,7 +390,8 @@ Events.onAction += proc { |_sender, _e| break end if surface_map_id && - $MapFactory.getTerrainTag(surface_map_id, $game_player.x, $game_player.y).can_dive + #$MapFactory.getTerrainTag(surface_map_id, $game_player.x, $game_player.y).can_dive + $MapFactory.getTerrainTag(surface_map_id, $game_player.x, $game_player.y).can_surf pbSurfacing end else diff --git a/Data/Scripts/013_Items/002_Item_Effects.rb b/Data/Scripts/013_Items/002_Item_Effects.rb index 54aa79b85..004c79c12 100644 --- a/Data/Scripts/013_Items/002_Item_Effects.rb +++ b/Data/Scripts/013_Items/002_Item_Effects.rb @@ -38,7 +38,7 @@ ItemHandlers::UseFromBag.add(:BICYCLE,proc { |item| next (pbBikeCheck) ? 2 : 0 }) -ItemHandlers::UseFromBag.copy(:BICYCLE,:MACHBIKE,:ACROBIKE) +ItemHandlers::UseFromBag.copy(:BICYCLE,:RACEBIKE) ItemHandlers::UseFromBag.add(:OLDROD,proc { |item| notCliff = $game_map.passable?($game_player.x,$game_player.y,$game_player.direction,$game_player) @@ -227,7 +227,7 @@ ItemHandlers::UseInField.add(:BICYCLE,proc { |item| next 0 }) -ItemHandlers::UseInField.copy(:BICYCLE,:MACHBIKE,:ACROBIKE) +ItemHandlers::UseInField.copy(:BICYCLE,:RACEBIKE) ItemHandlers::UseInField.add(:OLDROD,proc { |item| notCliff = $game_map.passable?($game_player.x,$game_player.y,$game_player.direction,$game_player) diff --git a/Data/Scripts/016_UI/012_UI_TrainerCard.rb b/Data/Scripts/016_UI/012_UI_TrainerCard.rb index 60a3f488c..80644841e 100644 --- a/Data/Scripts/016_UI/012_UI_TrainerCard.rb +++ b/Data/Scripts/016_UI/012_UI_TrainerCard.rb @@ -18,10 +18,19 @@ class PokemonTrainerCard_Scene end cardexists = pbResolveBitmap(sprintf("Graphics/Pictures/Trainer Card/card_f")) @sprites["card"] = IconSprite.new(0,0,@viewport) + is_postgame = $game_switches[BEAT_THE_LEAGUE] if $Trainer.female? && cardexists - @sprites["card"].setBitmap("Graphics/Pictures/Trainer Card/card_f") + path = "Graphics/Pictures/Trainer Card/card_f" + if is_postgame + path+="_postgame" + end + @sprites["card"].setBitmap(path) else - @sprites["card"].setBitmap("Graphics/Pictures/Trainer Card/card") + path = "Graphics/Pictures/Trainer Card/card" + if is_postgame + path+="_postgame" + end + @sprites["card"].setBitmap(path) end @sprites["overlay"] = BitmapSprite.new(Graphics.width,Graphics.height,@viewport) pbSetSystemFont(@sprites["overlay"].bitmap) @@ -64,17 +73,38 @@ class PokemonTrainerCard_Scene ] pbDrawTextPositions(overlay,textPositions) x = 72 - region = pbGetCurrentRegion(0) # Get the current region imagePositions = [] - for i in 0...8 - if $Trainer.badges[i+region*8] - imagePositions.push(["Graphics/Pictures/Trainer Card/icon_badges",x,310,i*32,region*32,32,32]) + postgame = $game_switches[BEAT_THE_LEAGUE] + numberOfBadgesDisplayed = postgame ? 16 : 8 + for i in 0...numberOfBadgesDisplayed + badgeRow= i<8 ? 0 : 1 + if $Trainer.badges[i] + if i == 8 + x =72 + end + badge_graphic_x = badgeRow == 0 ? i*32 : (i-8)*32 + badge_graphic_y =badgeRow*32 + y = getBadgeDisplayHeight(postgame,i) + imagePositions.push(["Graphics/Pictures/Trainer Card/icon_badges",x,y,badge_graphic_x,badge_graphic_y,32,32]) end x += 48 end pbDrawImagePositions(overlay,imagePositions) end + def getBadgeDisplayHeight(postgame,i) + if postgame + if i < 8 + y=310 + else + y=344 + end + else + y = 312 + end + return y + end + def pbTrainerCard pbSEPlay("GUI trainer card open") loop do diff --git a/Data/Scripts/050_AddOns/Footprints.rb b/Data/Scripts/050_AddOns/Footprints.rb new file mode 100644 index 000000000..986d975d3 --- /dev/null +++ b/Data/Scripts/050_AddOns/Footprints.rb @@ -0,0 +1,225 @@ +#=============================================================================== +# Klein Footprints / WolfPP for Pokémon Essentials +# Give credits if you're using this! +# http://kleinstudio.deviantart.com +# +# bo4p5687 update (v.19) +#=============================================================================== + +# Fix event comment +def pbEventCommentInput(*args) + parameters = [] + list = *args[0].list # Event or event page + elements = *args[1] # Number of elements + trigger = *args[2] # Trigger + return nil if list == nil + return nil unless list.is_a?(Array) + for item in list + next unless item.code == 108 || item.code == 408 + if item.parameters[0] == trigger[0] + start = list.index(item) + 1 + finish = start + elements[0] + for id in start...finish + next if !list[id] + parameters.push(list[id].parameters[0]) + end + return parameters + end + end + return nil +end + +module FootprintVariables + # If you set pokemon here, they doesn't have footprints + FOLLOWING_DONT_WALK = [ + # Example: + # 12,15,17 + ] + + # Set here the terrain tag for footprints, 3 is sand + TERRAIN_FOOT = 3 + + # Initial opacity for footprints + FOOT_OPACITY = 62 + + # Delay velocity + FOOT_DELAY = 1.1 + + def self.get_new_id + newId = 1 + while !$game_map.events[newId].nil? do + break if $game_map.events[newId].erased + newId += 1 + end + return newId + end + + def self.show(event, position) + if event != $game_player + return if event.character_name == "" || event.character_name == "nil" || event.name.include?("/nofoot/") + return if pbEventCommentInput(event, 0, "NoFoot") + if $Trainer.party.length > 0 + return if (!($game_map.events[event] && $game_map.events[event].name == "Dependent") && + (FOLLOWING_DONT_WALK.include?($Trainer.party[0].species) || $PokemonGlobal.bicycle)) + end + end + character_sprites = $scene.spriteset.character_sprites + viewport = $scene.spriteset.viewport1 + footsprites = $scene.spriteset.footsprites + nid = self.get_new_id + rpgEvent = RPG::Event.new(position[0], position[1]) + rpgEvent.id = nid + fev = Game_Event.new($game_map.map_id, rpgEvent, $game_map) + eventsprite = Sprite_Character.new(viewport, fev) + character_sprites.push(eventsprite) + footsprites.push(Footsprite.new(eventsprite, fev, viewport, $game_map, position[2], nid, character_sprites, (event==$game_player))) + end + +end + +class Game_Event < Game_Character + attr_reader :erased +end + +class Sprite_Character + alias old_initialize_foot initialize + def initialize(viewport, character=nil) + old_initialize_foot(viewport, character) + @disposed = false + end + + alias old_update_foot update + def update + return if @disposed + old_update_foot + end + + alias old_dispose_foot dispose + def dispose + old_dispose_foot + @disposed = true + end +end + +class Spriteset_Map + attr_accessor :character_sprites + attr_accessor :footsprites + + alias old_initialize initialize + def initialize(map=nil) + old_initialize(map) + @footsprites = [] + end + + def viewport1 + return @@viewport1 + end + + def putFootprint(event, pos) + return FootprintVariables.show(event, pos) + end + + alias old_dispose dispose + def dispose + old_dispose + @footsprites.each { |sprite| sprite.dispose } if !@footsprites.nil? + @footsprites.clear + end + + alias old_update update + def update + old_update + return if @footsprites.nil? + @footsprites.each { |sprite| sprite.update } + end +end + +class Scene_Map + def spriteset? + return !@spritesets.nil? + end +end + +class Game_Character + + def get_last_pos + case direction + when 2 then return [@x, @y-1, direction] # Move down + when 4 then return [@x+1, @y, direction] # Move left + when 6 then return [@x-1, @y, direction] # Move right + when 8 then return [@x, @y+1, direction] # Move up + end + return false + end + + def foot_prints? + return $game_map.terrain_tag(get_last_pos[0], get_last_pos[1]) == FootprintVariables::TERRAIN_FOOT && $scene.is_a?(Scene_Map) && $scene.spriteset? + end + + alias leave_tile_footprints triggerLeaveTile + def triggerLeaveTile + leave_tile_footprints + $scene.spriteset.putFootprint(self, get_last_pos) if foot_prints? + end + +end + +class Footsprite + def initialize(sprite,event,viewport,map,direction,nid,chardata,player) + @rsprite = sprite + # Sprite + @sprite = Sprite.new(viewport) + file = player && $PokemonGlobal.bicycle ? "footsetbike.png" : "footset.png" + @sprite.bitmap = RPG::Cache.load_bitmap("Graphics/Pictures/", file) + # Set position + @realwidth = @sprite.bitmap.width/4 + @sprite.src_rect.width = @realwidth + @opacity = FootprintVariables::FOOT_OPACITY + setFootset(direction) + # Values + @map = map + @event = event + @disposed = false + @eventid = nid + @viewport = viewport + @chardata = chardata + update + end + + def setFootset(direction) + @sprite.src_rect.x = + case direction + when 2 then 0 # Move down + when 4 then @realwidth * 3 # Move left + when 6 then @realwidth * 2 # Move right + when 8 then @realwidth # Move up + end + @sprite.opacity = @opacity + end + + def dispose + return if @disposed + @disposed = true + @event.erase + (0...@chardata.length).each { |i| @chardata.delete_at(i) if @chardata[i] == @rsprite } + @rsprite.dispose + @sprite.dispose + @sprite = nil + end + + def update + return if @disposed + x = @rsprite.x - @rsprite.ox + y = @rsprite.y - @rsprite.oy + width = @rsprite.src_rect.width + height = @rsprite.src_rect.height + @sprite.x = x + width / 2 + @sprite.y = y + height + @sprite.ox = @realwidth / 2 + @sprite.oy = @sprite.bitmap.height + @sprite.z = @rsprite.z - 2 + @opacity -= FootprintVariables::FOOT_DELAY + @sprite.opacity = @opacity + dispose if @sprite.opacity <= 0 + end +end \ No newline at end of file diff --git a/Data/Scripts/050_AddOns/New Balls.rb b/Data/Scripts/050_AddOns/New Balls.rb index 78811475d..da775d3d0 100644 --- a/Data/Scripts/050_AddOns/New Balls.rb +++ b/Data/Scripts/050_AddOns/New Balls.rb @@ -70,31 +70,26 @@ BallHandlers::OnCatch.add(:PERFECTBALL,proc{|ball,battle,pokemon| #DREAMBALL - endormi BallHandlers::ModifyCatchRate.add(:DREAMBALL,proc{|ball,catchRate,battle,battler| battler.status = :SLEEP - catchRate = 1 next catchRate }) #TOXICBALL - empoisonné BallHandlers::ModifyCatchRate.add(:TOXICBALL,proc{|ball,catchRate,battle,battler| battler.status = :POISON - catchRate = 1 next catchRate }) #SCORCHBALL - brulé BallHandlers::ModifyCatchRate.add(:SCORCHBALL,proc{|ball,catchRate,battle,battler| battler.status = :BURN - catchRate = 1 next catchRate }) #FROSTBALL - frozen BallHandlers::ModifyCatchRate.add(:FROSTBALL,proc{|ball,catchRate,battle,battler| battler.status = :FROZEN - catchRate = 1 next catchRate }) #SPARKBALL - paralizé BallHandlers::ModifyCatchRate.add(:SPARKBALL,proc{|ball,catchRate,battle,battler| battler.status = :PARALYSIS - catchRate = 1 next catchRate }) #PUREBALL - marche mieux quand pas de status diff --git a/Data/System.rxdata b/Data/System.rxdata index 809e0fc347f8ed19b1bc1693f13834b9bef5fbe0..925287174025bbff1c9de4c257a252d3f320e848 100644 GIT binary patch delta 26 icmX?cjq%tu#trwxSeS)Uk~TjUYYk+~-<*|kj|l*tSqm2c delta 28 kcmX?hjq$`a#trwxSXmZCEo9vMNUSxGiSfwhjEs9s0J{MUF#rGn diff --git a/Data/items.dat b/Data/items.dat index 31c76737f889d3823650414bfe7760c3600e6b34..ecd8a5dad9a8c2e64b162b0827aac77bef0afac0 100644 GIT binary patch delta 154 zcmex1gS~Sm`-E~vorx8<*}gDZ^D0G7e;C6kHaVZMYjQB7^JW{SaweuPjGMQzgvv5q zV4uvRw2v7?pH@1+%+w(~xkq^yGn0V&WOtPvApRuP&0y&*s(Zo0MQT9h3Vxdn)iq`? vGreP)9JPNRklHMD;1eU04&!FNLqD0A7*A~GILgHg($Fk?V!QAO#$*-%@jo+E delta 129 zcmeC2$^LBy`-F1F2@@-BPyWg1Jb4;pGE)ol=HHAvn3!HLZ{ErhD$CR%JefynA0xx$ zvq}emp;_(3cC{0X$t(arKrXic diff --git a/Data/messages.dat b/Data/messages.dat index 3736e91bb2533ef7ce6f40f95253ecf19da5e37a..9c6df5721731bd8a7c05771872bc1c98f9f966d2 100644 GIT binary patch delta 2557 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 TD-V>1$|L2m<0PNW(YW4!t~>Fl