Jaysyn/PRC_Merges
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated merge content

Browse Source 
Updated merge content.
This commit is contained in:
Jaysyn904
2024-09-08 13:32:17 -04:00
parent c7f6a4bc03
commit 7ad878c9d9
3 changed files with 261 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CEP2/2.69/_hak/prc8_cep269_mrg/baseitems.2da
View File

@@ -59,7 +59,7 @@
55 1549 scythe 2 4 0x1C030 1 2 WPlSc 0 1 1 1 it_bag iwplsc 0 4 4 3 **** 1.5 10 255 2 4 1 4 1 18 1 2 2290 9 8 0 0 1 **** **** **** **** **** 4 0 0 5425 0 1 120 17 **** **** **** 100 100 0 99 1 121 650 159 688 83 740 526 938 **** ****
56 1550 largeshield 2 3 0x00020 0 0 AShLw 0 1 1 1 it_bag iashlw 0 7 0 **** **** **** 10 255 **** **** **** **** 3 20 1 1 2286 30 8 0 6 0 32 **** **** **** **** 3 2 -2 5458 0 1 150 **** **** **** 15 **** **** **** 7 1 **** **** **** **** **** **** **** **** **** ****
57 1551 towershield 2 4 0x00020 0 0 AShTo 0 1 1 1 it_bag iashto 0 7 0 **** **** **** 10 255 **** **** **** **** 3 30 1 1 1717 6 8 0 6 0 32 **** **** **** **** 3 3 -10 5459 0 1 450 **** **** **** 50 **** **** **** 7 1 **** **** **** **** **** **** **** **** **** ****
58 1552 shortspear 1 4 0x1C030 1 2 WPlSs 0 1 1 1 it_bag iwplss 0 **** 1 3 **** 1.4 10 255 1 6 1 2 1 1 1 2 1672 15 8 0 0 1 **** **** **** **** **** 4 0 0 5401 0 1 30 17 **** **** **** 35 35 65 76 1 97 627 135 665 59 717 503 924 **** ****
58 16823549 shortspear 1 4 0x1C030 1 2 WPlSs 0 1 1 1 it_bag iwplss 0 **** 1 2 **** 1.4 10 255 1 6 1 2 1 1 1 2 16823550 15 8 0 0 1 **** **** **** **** **** 4 0 0 16823551 0 1 30 17 **** **** **** 35 35 65 76 1 97 627 135 665 59 717 503 924 **** ****
59 1553 shuriken 1 1 0x00010 0 0 WThSh 0 1 **** **** it_bag iwthsh 0 11 1 1 59 30 0 255 1 3 1 2 7 1 50 0.01 1705 7 8 0 2 1 **** **** **** **** **** **** 0 0 5398 0 1 0 7 5 **** **** **** **** **** 0 50 120 649 158 687 82 739 525 **** 1 ****
60 1554 sickle 2 2 0x1C030 0 2 WSpSc 0 1 1 1 it_bag iwspsc 0 **** 3 2 **** 1.1 10 255 1 6 1 2 1 6 1 2 1669 8 8 0 0 1 **** **** **** **** **** 4 0 0 5400 0 1 30 18 **** **** **** 100 100 0 22 1 98 628 136 666 60 718 504 879 **** 2
61 1555 sling 1 2 0x00030 0 0 WBwSl 0 **** **** **** it_bag iwbwsl 0 10 2 2 27 30 0 255 1 4 1 2 2 1 1 2 1677 3 8 0 1 1 **** **** **** **** **** 4 0 0 5405 0 1 1 6 3 **** **** **** **** **** 10 1 99 629 137 667 61 719 505 **** **** ****

41
CEP2/2.69/_hak/prc8_cep269_mrg/phenotype.2da
View File

@@ -16,13 +16,13 @@
12 Nightmare 16815212 17
13 Aurenthil 16815213 17
14 Br_Pony 16815214 0
15 Kensai 16797617 0
16 Assassin 16797618 0
17 Heavy 16797619 0
18 Fencing 16797620 0
19 Arcane 16797622 0
20 Demonblade 16797623 0
21 Warrior 16797624 0
15 **** **** 0
16 **** **** 0
17 **** **** 0
18 **** **** 0
19 **** **** 0
20 **** **** 0
21 **** **** 0
22 Lt_Pony 16815215 14
23 Flying 16815205 0
24 Br_Horse 16815207 0
@@ -31,10 +31,10 @@
27 L_BrHorse 16815227 2
28 L_SPony 16815228 34
29 CEP **** ****
30 MA_TigerFang 16797625 0
31 MA_SunFist 16797626 0
32 MA_DragonPalm 16797627 0
33 MA_BearClaw 16797628 0
30 **** **** 0
31 **** **** 0
32 **** **** 0
33 **** **** 0
34 L_BrPony 16815234 2
35 L_LtPony 16815235 34
36 L_WHorse 16815230 27
@@ -42,3 +42,22 @@
38 L_Nightmare 16815232 27
39 L_Aurenthil 16815233 27
40 Social 4750 0
41 **** **** 0
42 **** **** 0
43 **** **** 0
44 **** **** 0
45 **** **** 0
46 **** **** 0
47 **** **** 0
48 **** **** 0
49 Kensai 16835917 0
50 Assassin 16835918 0
51 Heavy 16835919 0
52 Fencing 16835920 0
53 Arcane 16835922 0
54 Demonblade 16835923 0
55 Warrior 16835924 0
56 MA_TigerFang 16835925 0
57 MA_SunFist 16835926 0
58 MA_DragonPalm 16835927 0
59 MA_BearClaw 16835928 0