Commit 0f141c2
authored
d_a_npc_jagar - ~94% (#2309)
* Began work on d_a_npc_jagar
* Major work on daNpc_Jagar_c::create()
* Jagar create() - 11%
* Continued work on daNpc_Jagar_c
* Jagar create() - 87%
* Continues work on Jagar
* Work on Jagar.checkChangeEvt()
* Working on Jagar.talk()
* Work on Jagar.changeBtp()
* Jagar.checkChangeJoint() & checkRemoveJoint()
* Jagar.chkAction() & setAction()
* Jagar.chkChuMotion()
* Jagar.chkSitMotion() & chkSitMotion2()
* Jagar.chkToMotion()
* Jagar.CreateHeap()
* Jagar.createHeapCallBack() & ctrlJointCallBack()
* Jagar.cuAnger()
* Jagar.cutClimbUp() - 92%
* Jagar.setAttnPos() - 85%
* Jagar.cutConversationWithBou() - 48%
* Jagar work and daNpcT_c::getActorDistance - 83%
* Jagar setParam work and daNpcT_c::getActorDistance - 85%
* Prep Jagar push to main
* little cleanup
* Fixed return type discrepancy
* Fixed *other* return type issues & variable names for Jagar
* Jagar talkWithBou work
* Work on Jagar talk
* Data & function cleanup
* I dont remember what i added this time lol
* Finished some functions
* Reworking Jagar talk()
* Finished some functions
* Attempting to rework cutNeedYourHelp
* Almost(ish) done with Jaggle
* Almost done with Jaggle
* Took out inline assembly in Jagar.chkToMotion()
* Cleanup
* Minor variable initialization change
* Small cleanup
* Hopefully fixed d_a_npc_bou compilation error1 parent 53ae95c commit 0f141c2
File tree
5 files changed
+1729
-1567
lines changed- include/d/actor
- src/d/actor
5 files changed
+1729
-1567
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
14 | 66 | | |
15 | 67 | | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
16 | 78 | | |
17 | 79 | | |
18 | 80 | | |
| |||
23 | 85 | | |
24 | 86 | | |
25 | 87 | | |
26 | | - | |
| 88 | + | |
27 | 89 | | |
28 | 90 | | |
29 | 91 | | |
| |||
69 | 131 | | |
70 | 132 | | |
71 | 133 | | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
72 | 140 | | |
73 | 141 | | |
74 | 142 | | |
| |||
88 | 156 | | |
89 | 157 | | |
90 | 158 | | |
91 | | - | |
| 159 | + | |
92 | 160 | | |
93 | 161 | | |
94 | 162 | | |
95 | 163 | | |
96 | | - | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
97 | 169 | | |
98 | 170 | | |
99 | 171 | | |
100 | 172 | | |
101 | | - | |
102 | | - | |
103 | | - | |
104 | | - | |
105 | | - | |
106 | | - | |
107 | | - | |
108 | 173 | | |
109 | 174 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | | - | |
| 14 | + | |
| 15 | + | |
15 | 16 | | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
16 | 27 | | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | | - | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
26 | 37 | | |
27 | 38 | | |
28 | 39 | | |
29 | | - | |
| 40 | + | |
30 | 41 | | |
31 | 42 | | |
32 | | - | |
33 | | - | |
| 43 | + | |
| 44 | + | |
34 | 45 | | |
35 | 46 | | |
36 | 47 | | |
37 | 48 | | |
38 | | - | |
| 49 | + | |
39 | 50 | | |
40 | | - | |
41 | | - | |
42 | | - | |
43 | | - | |
44 | | - | |
45 | | - | |
46 | | - | |
47 | | - | |
48 | | - | |
49 | | - | |
50 | | - | |
51 | | - | |
52 | | - | |
53 | | - | |
54 | | - | |
55 | | - | |
56 | | - | |
57 | | - | |
58 | | - | |
59 | | - | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
60 | 73 | | |
61 | 74 | | |
62 | 75 | | |
63 | | - | |
64 | | - | |
65 | | - | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
66 | 79 | | |
67 | 80 | | |
68 | 81 | | |
69 | | - | |
70 | | - | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
71 | 91 | | |
| 92 | + | |
| 93 | + | |
72 | 94 | | |
73 | | - | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
74 | 114 | | |
75 | 115 | | |
76 | 116 | | |
77 | 117 | | |
78 | 118 | | |
79 | 119 | | |
80 | | - | |
| 120 | + | |
81 | 121 | | |
82 | | - | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
83 | 169 | | |
84 | 170 | | |
85 | 171 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1102 | 1102 | | |
1103 | 1103 | | |
1104 | 1104 | | |
| 1105 | + | |
| 1106 | + | |
1105 | 1107 | | |
1106 | 1108 | | |
1107 | 1109 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
883 | 883 | | |
884 | 884 | | |
885 | 885 | | |
886 | | - | |
887 | | - | |
888 | | - | |
889 | | - | |
890 | | - | |
891 | | - | |
892 | | - | |
893 | | - | |
894 | | - | |
895 | | - | |
896 | | - | |
| 886 | + | |
| 887 | + | |
| 888 | + | |
| 889 | + | |
| 890 | + | |
| 891 | + | |
897 | 892 | | |
898 | 893 | | |
899 | 894 | | |
| |||
1088 | 1083 | | |
1089 | 1084 | | |
1090 | 1085 | | |
1091 | | - | |
1092 | | - | |
| 1086 | + | |
| 1087 | + | |
| 1088 | + | |
| 1089 | + | |
| 1090 | + | |
| 1091 | + | |
| 1092 | + | |
| 1093 | + | |
| 1094 | + | |
| 1095 | + | |
| 1096 | + | |
| 1097 | + | |
| 1098 | + | |
| 1099 | + | |
| 1100 | + | |
1093 | 1101 | | |
1094 | 1102 | | |
1095 | 1103 | | |
| |||
0 commit comments